Update app/agent/executor.py

app/agent/executor.py

@@ -9,62 +9,83 @@ class Executor:
         self.healer = SelfHealer(llm=llm)
 
     # =====================================================
-    # PLAN EXECUTION (SAFE PIPELINE)
+    # MAIN PLAN EXECUTION PIPELINE
     # =====================================================
     def run_plan(self, plan):
 
         results = []
 
+        if not isinstance(plan, dict):
+            return {"error": "Plan must be dict"}
+
         steps = plan.get("steps", [])
+
         if not isinstance(steps, list):
-            return {"error": "Invalid plan format"}
+            return {"error": "Invalid steps format"}
 
         for step in steps:
 
             print(f"🚀 Executing step: {step}")
 
             # ==============================
-            # TOOL EXECUTION LAYER
+            # 1. TOOL EXECUTION
             # ==============================
             tool_result = self._execute_as_tool(step)
 
             # ==============================
-            # SELF HEALING LAYER
+            # 2. SELF HEAL LAYER (SAFE)
             # ==============================
             try:
                 fix = self.healer.heal(step, tool_result)
 
-                if fix:
+                if isinstance(fix, dict) and "tool" in fix:
                     print("🛠️ Self-healing triggered")
-                    tool_result = execute_tool_call(fix)
+
+                    healed_result = execute_tool_call(fix)
+
+                    # only replace if fix is successful
+                    if healed_result:
+                        tool_result = healed_result
 
             except Exception as e:
                 tool_result = {
-                    "error": f"healer failed: {str(e)}"
+                    "error": f"healer crashed: {str(e)}"
                 }
 
             # ==============================
-            # LLM ANALYSIS (NO RECURSION)
+            # 3. LLM ANALYSIS (SAFE NON-EXEC MODE)
             # ==============================
             llm_result = None
 
             if self.llm:
                 try:
-                    llm_result = self.llm([
+                    response = self.llm([
                         {
                             "role": "system",
-                            "content": "Analyze execution result only. Do NOT execute tools."
+                            "content": (
+                                "You are a strict analysis engine. "
+                                "Only analyze results. Never call tools."
+                            )
                         },
                         {
                             "role": "user",
-                            "content": f"Step: {step}\nResult: {tool_result}"
+                            "content": f"Step:\n{step}\n\nResult:\n{tool_result}"
                         }
                     ])
+
+                    # SAFE extraction
+                    if isinstance(response, dict):
+                        llm_result = response.get("choices", [{}])[0] \
+                            .get("message", {}) \
+                            .get("content", response)
+                    else:
+                        llm_result = response
+
                 except Exception as e:
                     llm_result = {"error": str(e)}
 
             # ==============================
-            # STORE RESULT
+            # 4. STORE RESULT
             # ==============================
             results.append({
                 "step": step,
@@ -72,37 +93,35 @@ class Executor:
                 "llm_result": llm_result
             })
 
-        return results
+        return {
+            "status": "completed",
+            "results": results
+        }
 
     # =====================================================
-    # TOOL EXECUTION SAFE WRAPPER
+    # SAFE TOOL EXECUTION WRAPPER
     # =====================================================
     def _execute_as_tool(self, step):
 
         try:
-            # STEP NORMALIZATION
+            # string step → shell execution
             if isinstance(step, str):
-
-                # default safe shell execution
                 return execute_tool_call({
                     "tool": "run_shell",
                     "args": {
-                        "cmd": step
+                        "cmd": step.strip()
                     }
                 })
 
-            elif isinstance(step, dict):
+            # dict tool call
+            if isinstance(step, dict):
+
+                if "tool" not in step or "args" not in step:
+                    return {"error": "Invalid tool format"}
 
                 return execute_tool_call(step)
 
-            else:
-
-                return {
-                    "error": "Invalid step type"
-                }
+            return {"error": "Unsupported step type"}
 
         except Exception as e:
-
-            return {
-                "error": str(e)
-            }
+            return {"error": str(e)}