Fix tool_use/tool_result mismatch error when resuming after clarification

- Add validation in Claude client to remove dangling tool_use blocks
- Recreate fresh agent instances when resuming after clarification
- Prevents stale conversation state from causing API errors

Dockerfile

@@ -1,5 +1,5 @@
 # HuggingFace Spaces Dockerfile for CodePilot
-# BUILD_VERSION: 12 (v3.3.3 simple coder - only task + plan)
+# BUILD_VERSION: 13 (v3.3.4 resume-fix - fix tool_use/tool_result bug)
 FROM python:3.11-slim
 
 # Set working directory

chainlit_app.py

@@ -20,8 +20,8 @@ from concurrent.futures import ThreadPoolExecutor
 # ============================================================
 # STARTUP VERSION CHECK - Change this to detect if rebuild worked
 # ============================================================
-APP_VERSION = "3.3.3-simple-coder"
-BUILD_ID = "2024-12-19-v11"
+APP_VERSION = "3.3.4-resume-fix"
+BUILD_ID = "2024-12-19-v12"
 print("=" * 60)
 print(f"[STARTUP] CodePilot Chainlit App")
 print(f"[STARTUP] APP_VERSION: {APP_VERSION}")

codepilot/agents/orchestrator.py

@@ -9,7 +9,7 @@ The orchestrator is the "brain" that:
 """
 
 # VERSION CHECK - If you see this, new code is running!
-ORCHESTRATOR_VERSION = "3.3.3-simple-coder"
+ORCHESTRATOR_VERSION = "3.3.4-resume-fix"
 print(f"[ORCHESTRATOR] ========== LOADING VERSION {ORCHESTRATOR_VERSION} ==========")
 
 from enum import Enum
@@ -299,6 +299,14 @@ class Orchestrator:
         Returns:
             Result dict from continued workflow
         """
+        print(f"[ORCHESTRATOR] Resuming after clarification...")
+
+        # BUGFIX: Recreate agent instances to ensure fresh conversation state
+        # This prevents any stale tool_use/tool_result state from previous runs
+        self.planner = PlannerAgent(model="claude-sonnet-4-5-20250929")
+        self.coder = CoderAgent(model="claude-sonnet-4-5-20250929")
+        self.reviewer = ReviewerAgent(model="claude-sonnet-4-5-20250929")
+
         self.provide_user_answers(user_answers)
         return self._run_full_workflow(self.context.task_description)
 

codepilot/llm/claude_client.py

@@ -122,6 +122,22 @@ class ClaudeClient:
                     "content": pending_tool_results
                 })
 
+            # BUGFIX: Validate no dangling tool_use blocks at end of conversation
+            # Claude API requires tool_result immediately after tool_use
+            if conversation_messages:
+                last_msg = conversation_messages[-1]
+                if last_msg.get("role") == "assistant":
+                    content = last_msg.get("content", [])
+                    if isinstance(content, list):
+                        has_tool_use = any(
+                            isinstance(b, dict) and b.get("type") == "tool_use"
+                            for b in content
+                        )
+                        if has_tool_use:
+                            # Dangling tool_use - remove this message to prevent API error
+                            print(f"[CLAUDE] Warning: Removing dangling assistant message with tool_use (no tool_result)")
+                            conversation_messages = conversation_messages[:-1]
+
             # Build request parameters
             request_params = {
                 "model": self.model,