Update app/agent/executor.py

app/agent/executor.py

@@ -1,54 +1,108 @@
 from tools_runtime import execute_tool_call
 from self_heal import SelfHealer
-from agent import Agent
 
 
 class Executor:
 
     def __init__(self, llm=None):
+        self.llm = llm
         self.healer = SelfHealer(llm=llm)
-        self.agent = Agent()
 
     # =====================================================
-    # MAIN PLAN EXECUTION LOOP (HYBRID MODE)
+    # PLAN EXECUTION (SAFE PIPELINE)
     # =====================================================
     def run_plan(self, plan):
 
         results = []
 
-        for step in plan.get("steps", []):
+        steps = plan.get("steps", [])
+        if not isinstance(steps, list):
+            return {"error": "Invalid plan format"}
+
+        for step in steps:
 
             print(f"🚀 Executing step: {step}")
 
-            # =================================================
-            # MODE 1: LOW-LEVEL TOOL EXECUTION
-            # =================================================
-            tool_result = execute_tool_call({
-                "tool": "run_shell",
-                "args": {"cmd": step}
-            })
+            # ==============================
+            # TOOL EXECUTION LAYER
+            # ==============================
+            tool_result = self._execute_as_tool(step)
+
+            # ==============================
+            # SELF HEALING LAYER
+            # ==============================
+            try:
+                fix = self.healer.heal(step, tool_result)
+
+                if fix:
+                    print("🛠️ Self-healing triggered")
+                    tool_result = execute_tool_call(fix)
 
-            # =================================================
-            # SELF HEAL CHECK (LOW LEVEL)
-            # =================================================
-            fix = self.healer.heal(step, tool_result)
+            except Exception as e:
+                tool_result = {
+                    "error": f"healer failed: {str(e)}"
+                }
 
-            if fix:
-                print("🛠️ Self-healing triggered (tool retry)")
-                tool_result = execute_tool_call(fix)
+            # ==============================
+            # LLM ANALYSIS (NO RECURSION)
+            # ==============================
+            llm_result = None
 
-            # =================================================
-            # MODE 2: LLM FALLBACK (HIGH-LEVEL EXECUTION)
-            # =================================================
-            llm_result = self.agent.run(step)
+            if self.llm:
+                try:
+                    llm_result = self.llm([
+                        {
+                            "role": "system",
+                            "content": "Analyze execution result only. Do NOT execute tools."
+                        },
+                        {
+                            "role": "user",
+                            "content": f"Step: {step}\nResult: {tool_result}"
+                        }
+                    ])
+                except Exception as e:
+                    llm_result = {"error": str(e)}
 
-            # =================================================
-            # MERGE RESULTS
-            # =================================================
+            # ==============================
+            # STORE RESULT
+            # ==============================
             results.append({
                 "step": step,
                 "tool_result": tool_result,
                 "llm_result": llm_result
             })
 
-        return results
+        return results
+
+    # =====================================================
+    # TOOL EXECUTION SAFE WRAPPER
+    # =====================================================
+    def _execute_as_tool(self, step):
+
+        try:
+            # STEP NORMALIZATION
+            if isinstance(step, str):
+
+                # default safe shell execution
+                return execute_tool_call({
+                    "tool": "run_shell",
+                    "args": {
+                        "cmd": step
+                    }
+                })
+
+            elif isinstance(step, dict):
+
+                return execute_tool_call(step)
+
+            else:
+
+                return {
+                    "error": "Invalid step type"
+                }
+
+        except Exception as e:
+
+            return {
+                "error": str(e)
+            }