Update app/agent/executor.py

app/agent/executor.py

@@ -26,14 +26,19 @@ class Executor:
 
             print(f"🚀 Executing step: {step}")
 
-            # =========================
-            # 1. TOOL EXECUTION LAYER
-            # =========================
-            tool_result = self._execute_as_tool(step)
-
-            # =========================
-            # 2. SELF HEAL (SAFE)
-            # =========================
+            # =================================================
+            # STEP 1: NORMALIZE STEP (CRITICAL FIX)
+            # =================================================
+            action = self._interpret_step(step)
+
+            # =================================================
+            # STEP 2: EXECUTE TOOL ONLY
+            # =================================================
+            tool_result = self._execute_tool(action)
+
+            # =================================================
+            # STEP 3: SELF HEAL (SAFE)
+            # =================================================
             try:
                 fix = self.healer.heal(step, tool_result)
 
@@ -42,7 +47,6 @@ class Executor:
 
                     healed = execute_tool_call(fix)
 
-                    # replace only if valid result
                     if healed:
                         tool_result = healed
 
@@ -51,9 +55,9 @@ class Executor:
                     "error": f"healer_error: {str(e)}"
                 }
 
-            # =========================
-            # 3. LLM ANALYSIS (NO EXECUTION)
-            # =========================
+            # =================================================
+            # STEP 4: LLM ANALYSIS ONLY (NO EXECUTION)
+            # =================================================
             llm_result = None
 
             if self.llm:
@@ -62,13 +66,17 @@ class Executor:
                         {
                             "role": "system",
                             "content": (
-                                "You are an analysis engine. "
-                                "NEVER execute tools. Only explain results."
+                                "You are a code execution analyzer. "
+                                "DO NOT execute anything. Only explain results."
                             )
                         },
                         {
                             "role": "user",
-                            "content": f"Step:\n{step}\n\nResult:\n{tool_result}"
+                            "content": f"""
+Step: {step}
+Action: {action}
+Result: {tool_result}
+"""
                         }
                     ])
 
@@ -84,11 +92,12 @@ class Executor:
                 except Exception as e:
                     llm_result = f"llm_error: {str(e)}"
 
-            # =========================
-            # 4. STORE RESULT
-            # =========================
+            # =================================================
+            # STEP 5: STORE RESULT
+            # =================================================
             results.append({
                 "step": step,
+                "action": action,
                 "tool_result": tool_result,
                 "llm_result": llm_result
             })
@@ -99,39 +108,69 @@ class Executor:
         }
 
     # =====================================================
-    # SAFE TOOL EXECUTION WRAPPER
+    # 🔥 CORE FIX: STEP INTERPRETER (IMPORTANT)
     # =====================================================
-    def _execute_as_tool(self, step):
+    def _interpret_step(self, step):
 
-        try:
-            # 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
-                    }
+        # CASE 1: already structured tool
+        if isinstance(step, dict):
+            return step
+
+        # CASE 2: string → convert ONLY safe shell commands
+        if isinstance(step, str):
+
+            cmd = step.strip()
 
-                return execute_tool_call({
-                    "tool": "run_shell",
+            # ❌ block natural language completely
+            blocked_keywords = [
+                "create", "install", "open", "navigate",
+                "run", "save", "write", "make"
+            ]
+
+            first_word = cmd.lower().split()[0] if cmd.split() else ""
+
+            if first_word in blocked_keywords:
+                return {
+                    "tool": "noop",
                     "args": {
-                        "cmd": cmd
+                        "reason": "natural_language_blocked",
+                        "input": cmd
                     }
-                })
+                }
+
+            # allow only real shell commands
+            return {
+                "tool": "run_shell",
+                "args": {
+                    "cmd": cmd
+                }
+            }
+
+        return {
+            "tool": "noop",
+            "args": {
+                "reason": "invalid_step_type"
+            }
+        }
 
-            # CASE 2: tool dict
-            if isinstance(step, dict):
+    # =====================================================
+    # SAFE TOOL EXECUTION
+    # =====================================================
+    def _execute_tool(self, action):
 
-                if "tool" not in step or "args" not in step:
-                    return {"error": "Invalid tool format"}
+        try:
+            if not isinstance(action, dict):
+                return {"error": "invalid_action"}
 
-                return execute_tool_call(step)
+            if action.get("tool") == "noop":
+                return {
+                    "status": "skipped",
+                    "reason": action.get("args", {}).get("reason", "unknown")
+                }
 
-            return {"error": "Unsupported step type"}
+            return execute_tool_call(action)
 
         except Exception as e:
-            return {"error": str(e)}
+            return {
+                "error": str(e)
+            }