Update app/agent/executor.py

app/agent/executor.py

@@ -9,52 +9,51 @@ class Executor:
         self.healer = SelfHealer(llm=llm)
 
     # =====================================================
-    # MAIN PLAN EXECUTION PIPELINE
+    # MAIN 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 steps format"}
 
+        results = []
+
         for step in steps:
 
             print(f"🚀 Executing step: {step}")
 
-            # ==============================
-            # 1. TOOL EXECUTION
-            # ==============================
+            # =========================
+            # 1. TOOL EXECUTION LAYER
+            # =========================
             tool_result = self._execute_as_tool(step)
 
-            # ==============================
-            # 2. SELF HEAL LAYER (SAFE)
-            # ==============================
+            # =========================
+            # 2. SELF HEAL (SAFE)
+            # =========================
             try:
                 fix = self.healer.heal(step, tool_result)
 
                 if isinstance(fix, dict) and "tool" in fix:
                     print("🛠️ Self-healing triggered")
 
-                    healed_result = execute_tool_call(fix)
+                    healed = execute_tool_call(fix)
 
-                    # only replace if fix is successful
-                    if healed_result:
-                        tool_result = healed_result
+                    # replace only if valid result
+                    if healed:
+                        tool_result = healed
 
             except Exception as e:
                 tool_result = {
-                    "error": f"healer crashed: {str(e)}"
+                    "error": f"healer_error: {str(e)}"
                 }
 
-            # ==============================
-            # 3. LLM ANALYSIS (SAFE NON-EXEC MODE)
-            # ==============================
+            # =========================
+            # 3. LLM ANALYSIS (NO EXECUTION)
+            # =========================
             llm_result = None
 
             if self.llm:
@@ -63,8 +62,8 @@ class Executor:
                         {
                             "role": "system",
                             "content": (
-                                "You are a strict analysis engine. "
-                                "Only analyze results. Never call tools."
+                                "You are an analysis engine. "
+                                "NEVER execute tools. Only explain results."
                             )
                         },
                         {
@@ -73,20 +72,21 @@ class Executor:
                         }
                     ])
 
-                    # SAFE extraction
                     if isinstance(response, dict):
-                        llm_result = response.get("choices", [{}])[0] \
-                            .get("message", {}) \
-                            .get("content", response)
+                        llm_result = (
+                            response.get("choices", [{}])[0]
+                            .get("message", {})
+                            .get("content", "LLM_EMPTY")
+                        )
                     else:
-                        llm_result = response
+                        llm_result = str(response)
 
                 except Exception as e:
-                    llm_result = {"error": str(e)}
+                    llm_result = f"llm_error: {str(e)}"
 
-            # ==============================
+            # =========================
             # 4. STORE RESULT
-            # ==============================
+            # =========================
             results.append({
                 "step": step,
                 "tool_result": tool_result,
@@ -104,16 +104,26 @@ class Executor:
     def _execute_as_tool(self, step):
 
         try:
-            # string step → shell execution
+            # CASE 1: string → shell command
             if isinstance(step, str):
+                cmd = step.strip()
+
+                # block fake natural language commands
+                blocked_words = ["create", "install", "open", "navigate", "save", "run"]
+                if any(w in cmd.lower().split()[0] for w in blocked_words):
+                    return {
+                        "error": "Unsafe natural-language step rejected",
+                        "step": cmd
+                    }
+
                 return execute_tool_call({
                     "tool": "run_shell",
                     "args": {
-                        "cmd": step.strip()
+                        "cmd": cmd
                     }
                 })
 
-            # dict tool call
+            # CASE 2: tool dict
             if isinstance(step, dict):
 
                 if "tool" not in step or "args" not in step: