Fix tool_use/tool_result validation to check ALL messages

- Previous fix only checked last message
- Now validates entire conversation for proper tool_use→tool_result pairs
- Skips any assistant message with tool_use that lacks following tool_result

Dockerfile

@@ -1,5 +1,5 @@
 # HuggingFace Spaces Dockerfile for CodePilot
-# BUILD_VERSION: 15 (v3.3.6 reset-fix - reset orchestrator for new tasks)
+# BUILD_VERSION: 16 (v3.3.7 validate-all - validate all messages for tool_use/result pairs)
 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.6-reset-fix"
-BUILD_ID = "2024-12-19-v14"
+APP_VERSION = "3.3.7-validate-all"
+BUILD_ID = "2024-12-19-v15"
 print("=" * 60)
 print(f"[STARTUP] CodePilot Chainlit App")
 print(f"[STARTUP] APP_VERSION: {APP_VERSION}")

codepilot/llm/claude_client.py

@@ -122,21 +122,52 @@ class ClaudeClient:
                     "content": pending_tool_results
                 })
 
-            # BUGFIX: Validate no dangling tool_use blocks at end of conversation
+            # BUGFIX: Validate ALL messages - each tool_use must have tool_result after
             # 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", [])
+            validated_messages = []
+            i = 0
+            while i < len(conversation_messages):
+                msg = conversation_messages[i]
+
+                # Check if this is an assistant message with tool_use
+                if msg.get("role") == "assistant":
+                    content = msg.get("content", [])
+                    has_tool_use = False
                     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]
+
+                    if has_tool_use:
+                        # Check if next message has tool_result
+                        if i + 1 < len(conversation_messages):
+                            next_msg = conversation_messages[i + 1]
+                            next_content = next_msg.get("content", [])
+                            has_tool_result = False
+                            if isinstance(next_content, list):
+                                has_tool_result = any(
+                                    isinstance(b, dict) and b.get("type") == "tool_result"
+                                    for b in next_content
+                                )
+
+                            if has_tool_result:
+                                # Valid pair - add both
+                                validated_messages.append(msg)
+                                validated_messages.append(next_msg)
+                                i += 2
+                                continue
+
+                        # No valid tool_result - skip this tool_use message
+                        print(f"[CLAUDE] Warning: Skipping assistant message with tool_use (no tool_result follows)")
+                        i += 1
+                        continue
+
+                # Regular message - add it
+                validated_messages.append(msg)
+                i += 1
+
+            conversation_messages = validated_messages
 
             # Build request parameters
             request_params = {