fix: strip orphaned tool_result messages after conversation truncation#416
Merged
yaojin3616 merged 1 commit intodataelement:mainfrom Apr 16, 2026
Merged
Conversation
1 task
up-guillaume
pushed a commit
to lesmoires/Clawith
that referenced
this pull request
Apr 20, 2026
Upstream changes integrated: - v1.8.3-beta.2: A2A async communication (notify/consult/task_delegate) - v1.8.3-beta.2: Multimodal image context persistence - v1.8.3-beta.2: New search tools (Exa, DuckDuckGo, Tavily, Google, Bing) - v1.8.3-beta.2: Drag-and-drop file upload UI - dataelement#246: Security patches (4 critical vulnerabilities) - dataelement#410: N+1 query fix for session list API - dataelement#416: Tool call message pair preservation - dataelement#437: Idempotent alembic migrations - LLM refactoring (call_llm moved to services/llm/) Fork customizations preserved: - SSO relaxation in tenants.py - Tuple guards in gateway.py - session_id removal from execute_tool (caller.py) - Hetzner Cloud tools in tool_seeder.py - Infisical/AgentMail integrations - LiteLLM MCP wrappers - AgentBay multi-region + browser_latest fixes - Custom extensions loader - Agent credentials router Conflict resolutions: - agentbay_control.py: upstream 3-phase _get_client + our browser_latest fix - agent_tools.py: our fork base + upstream A2A strip helper + search tools - caller.py: removed session_id=session_id (NameError fix) - websocket.py: retained our session_id removal - tool_seeder.py: added parameters_schema + new search tools
This was referenced Apr 27, 2026
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
tool_resultblocks in the conversation history sent to the Anthropic API.ctx_size, strip any leadingrole="tool"messages whose correspondingassistant(tool_use) message was cut off by the truncation boundary.Closes #415
Root Cause
Each
tool_callDB record expands into 2 messages (assistant + tool) during history reconstruction, soconversation[-ctx_size:]can split a pair — keeping the tool result but dropping the tool use. The Anthropic API requires everytool_resultto have a matchingtool_usein the preceding assistant message.Test plan
context_window_size = 100