@@ -5,6 +5,9 @@ public interface IPlanningHook
     Task<string> GetSummaryAdditionalRequirements(string planner, RoleDialogModel message)
         => Task.FromResult(string.Empty);
 
+    Task OnSourceCodeGenerated(string planner, RoleDialogModel msg, string language)
+        => Task.CompletedTask;
+
     Task OnPlanningCompleted(string planner, RoleDialogModel msg)
         => Task.CompletedTask;
 }
@@ -34,7 +34,7 @@ public class OneStepForwardReasoner : IRoutingReasoner
     private readonly IServiceProvider _services;
     private readonly ILogger _logger;
 
-    public OneStepForwardReasoner(IServiceProvider services, ILogger<NaiveReasoner> logger)
+    public OneStepForwardReasoner(IServiceProvider services, ILogger<OneStepForwardReasoner> logger)
     {
         _services = services;
         _logger = logger;
@@ -116,7 +116,7 @@ public async Task<bool> AgentExecuted(Agent router, FunctionCallFromLlm inst, Ro
         }
         else
         {
-            context.Empty(reason: $"Agent queue is cleared by {nameof(NaiveReasoner)}");
+            context.Empty(reason: $"Agent queue is cleared by {nameof(OneStepForwardReasoner)}");
             // context.Push(inst.OriginalAgent, "Push user goal agent");
         }
         return true;
 
@@ -33,7 +33,7 @@ public class SequentialReasoner : IRoutingReasoner
     public int MaxLoopCount => 100;
     private FunctionCallFromLlm _lastInst;
 
-    public SequentialReasoner(IServiceProvider services, ILogger<NaiveReasoner> logger)
+    public SequentialReasoner(IServiceProvider services, ILogger<SequentialReasoner> logger)
     {
         _services = services;
         _logger = logger;
 
@@ -71,13 +71,15 @@ public async Task<bool> Execute(RoleDialogModel message)
         var summary = await GetAiResponse(plannerAgent);
         message.Content = summary.Content;
 
-        // Validate the sql result
+        // Emit event if the sql statement is generated by planner
         var args = JsonSerializer.Deserialize<SummaryPlan>(message.FunctionArgs);
-        if (args.IsSqlTemplate == false) 
+        if (args != null && !args.IsSqlTemplate && args.ContainsSqlStatements) 
         {
-            await fn.InvokeFunction("validate_sql", message);
+            await HookEmitter.Emit<IPlanningHook>(_services, async hook =>
+                await hook.OnSourceCodeGenerated(nameof(TwoStageTaskPlanner), message, "sql")
+            );
         }
-        
+
         await HookEmitter.Emit<IPlanningHook>(_services, async hook =>
             await hook.OnPlanningCompleted(nameof(TwoStageTaskPlanner), message)
         );
 
@@ -4,4 +4,7 @@ public class SummaryPlan
 {
     [JsonPropertyName("is_sql_template")]
     public bool IsSqlTemplate { get; set; } = false;
+
+    [JsonPropertyName("contains_sql_statements")]
+    public bool ContainsSqlStatements { get; set; } = false;
 }
@@ -1,7 +1,7 @@
 {
   "id": "282a7128-69a1-44b0-878c-a9159b88f3b9",
   "name": "Planner",
-  "description": "Plan feasible implementation steps for user task request",
+  "description": "Plan feasible implementation steps for complex user task request",
   "type": "task",
   "createdDateTime": "2023-08-27T10:39:00Z",
   "updatedDateTime": "2023-08-27T14:39:00Z",
 
@@ -8,6 +8,10 @@
         "type": "boolean",
         "description": "If user request is to generate sql template instead of actual sql statement."
       },
+      "contains_sql_statements": {
+        "type": "boolean",
+        "description": "Set to true if the response contains sql statements."
+      },
       "related_tables": {
         "type": "array",
         "description": "table name in planning steps",
@@ -17,6 +21,6 @@
         }
       }
     },
-    "required": [ "related_tables", "is_sql_template" ]
+    "required": [ "related_tables", "is_sql_template", "contains_sql_statements" ]
   }
 }
@@ -20,14 +20,23 @@ public SqlDriverPlanningHook(IServiceProvider services)
         _services = services;
     }
 
-    public async Task OnPlanningCompleted(string planner, RoleDialogModel msg)
+    public async Task OnSourceCodeGenerated(string planner, RoleDialogModel msg, string language)
     {
+        // envoke validate
+        if (language != "sql") 
+        { 
+            return; 
+        }
+
+        var routing = _services.GetRequiredService<IRoutingService>();
+        await routing.InvokeFunction("validate_sql", msg);
+
         await HookEmitter.Emit<ISqlDriverHook>(_services, async (hook) =>
         {
             await hook.SqlGenerated(msg);
         });
 
-       var settings = _services.GetRequiredService<SqlDriverSetting>();
+        var settings = _services.GetRequiredService<SqlDriverSetting>();
         if (!settings.ExecuteSqlSelectAutonomous)
         {
             var conversationStateService = _services.GetRequiredService<IConversationStateService>();
@@ -51,7 +60,6 @@ await HookEmitter.Emit<ISqlDriverHook>(_services, async (hook) =>
         var response = await completion.GetChatCompletions(agent, wholeDialogs);
 
         // Invoke "execute_sql"
-        var routing = _services.GetRequiredService<IRoutingService>();
         await routing.InvokeFunction(response.FunctionName, response);
 
         msg.CurrentAgentId = agent.Id;
@@ -61,6 +69,11 @@ await HookEmitter.Emit<ISqlDriverHook>(_services, async (hook) =>
         msg.StopCompletion = response.StopCompletion;
     }
 
+    public async Task OnPlanningCompleted(string planner, RoleDialogModel msg)
+    {
+       
+    }
+
     public async Task<string> GetSummaryAdditionalRequirements(string planner, RoleDialogModel message)
     {
         var settings = _services.GetRequiredService<SqlDriverSetting>();
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ public interface IPlanningHook`
`5`	`5`	`Task<string> GetSummaryAdditionalRequirements(string planner, RoleDialogModel message)`
`6`	`6`	`=> Task.FromResult(string.Empty);`
`7`	`7`
	`8`	`+ Task OnSourceCodeGenerated(string planner, RoleDialogModel msg, string language)`
	`9`	`+ => Task.CompletedTask;`
	`10`	`+`
`8`	`11`	`Task OnPlanningCompleted(string planner, RoleDialogModel msg)`
`9`	`12`	`=> Task.CompletedTask;`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class OneStepForwardReasoner : IRoutingReasoner`
`34`	`34`	`private readonly IServiceProvider _services;`
`35`	`35`	`private readonly ILogger _logger;`
`36`	`36`
`37`		`- public OneStepForwardReasoner(IServiceProvider services, ILogger<NaiveReasoner> logger)`
	`37`	`+ public OneStepForwardReasoner(IServiceProvider services, ILogger<OneStepForwardReasoner> logger)`
`38`	`38`	`{`
`39`	`39`	`_services = services;`
`40`	`40`	`_logger = logger;`
`@@ -116,7 +116,7 @@ public async Task<bool> AgentExecuted(Agent router, FunctionCallFromLlm inst, Ro`
`116`	`116`	`}`
`117`	`117`	`else`
`118`	`118`	`{`
`119`		`- context.Empty(reason: $"Agent queue is cleared by {nameof(NaiveReasoner)}");`
	`119`	`+ context.Empty(reason: $"Agent queue is cleared by {nameof(OneStepForwardReasoner)}");`
`120`	`120`	`// context.Push(inst.OriginalAgent, "Push user goal agent");`
`121`	`121`	`}`
`122`	`122`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class SequentialReasoner : IRoutingReasoner`
`33`	`33`	`public int MaxLoopCount => 100;`
`34`	`34`	`private FunctionCallFromLlm _lastInst;`
`35`	`35`
`36`		`- public SequentialReasoner(IServiceProvider services, ILogger<NaiveReasoner> logger)`
	`36`	`+ public SequentialReasoner(IServiceProvider services, ILogger<SequentialReasoner> logger)`
`37`	`37`	`{`
`38`	`38`	`_services = services;`
`39`	`39`	`_logger = logger;`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,7 @@ public class SummaryPlan`
`4`	`4`	`{`
`5`	`5`	`[JsonPropertyName("is_sql_template")]`
`6`	`6`	`public bool IsSqlTemplate { get; set; } = false;`
	`7`	`+`
	`8`	`+ [JsonPropertyName("contains_sql_statements")]`
	`9`	`+ public bool ContainsSqlStatements { get; set; } = false;`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "282a7128-69a1-44b0-878c-a9159b88f3b9",`
`3`	`3`	`"name": "Planner",`
`4`		`- "description": "Plan feasible implementation steps for user task request",`
	`4`	`+ "description": "Plan feasible implementation steps for complex user task request",`
`5`	`5`	`"type": "task",`
`6`	`6`	`"createdDateTime": "2023-08-27T10:39:00Z",`
`7`	`7`	`"updatedDateTime": "2023-08-27T14:39:00Z",`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@`
`8`	`8`	`"type": "boolean",`
`9`	`9`	`"description": "If user request is to generate sql template instead of actual sql statement."`
`10`	`10`	`},`
	`11`	`+ "contains_sql_statements": {`
	`12`	`+ "type": "boolean",`
	`13`	`+ "description": "Set to true if the response contains sql statements."`
	`14`	`+ },`
`11`	`15`	`"related_tables": {`
`12`	`16`	`"type": "array",`
`13`	`17`	`"description": "table name in planning steps",`
`@@ -17,6 +21,6 @@`
`17`	`21`	`}`
`18`	`22`	`}`
`19`	`23`	`},`
`20`		`- "required": [ "related_tables", "is_sql_template" ]`
	`24`	`+ "required": [ "related_tables", "is_sql_template", "contains_sql_statements" ]`
`21`	`25`	`}`
`22`	`26`	`}`