fix: #24090 preserve assistant tool_calls in openai-compatible replay#24170
Open
supernovae wants to merge 1 commit intoanomalyco:devfrom
Open
fix: #24090 preserve assistant tool_calls in openai-compatible replay#24170supernovae wants to merge 1 commit intoanomalyco:devfrom
supernovae wants to merge 1 commit intoanomalyco:devfrom
Conversation
Rehydrate missing assistant tool-call entries when replay history includes tool results, and add a send-time guard so outbound OpenAI-compatible payloads keep `tool_calls` aligned with `tool_call_id` results. Made-with: Cursor
Contributor
|
Thanks for your contribution! This PR doesn't have a linked issue. All PRs must reference an existing issue. Please:
See CONTRIBUTING.md for details. |
Author
Contributor
|
Hey! Your PR title Please update it to start with one of:
Where See CONTRIBUTING.md for details. |
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
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
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.
Issue for this PR
Closes #24090
Type of change
What does this PR do?
This fixes missing assistant
tool_callsduring OpenAI-compatible history replay.I added a focused repair in
MessageV2.toModelMessagesEffectso when replay containstoolresult messages, the nearest preceding assistant message is guaranteed to include matchingtool-callentries (rehydrated from recorded session tool parts, including original tool name/input).I also added a send-time guard in
session/llmmiddleware for OpenAI-compatible models. If tool-call parts are dropped during prompt conversion, the guard restores them from the original model-message source before provider serialization, keepingtool_callsandtool_call_idpaired.Regression coverage was added in:
packages/opencode/test/session/message-v2.test.tspackages/opencode/test/session/llm.test.tsHow did you verify your code works?
bun --config=./bunfig.test.toml test test/session/llm.test.tslocally (frompackages/opencode) and all tests passed, including the new replay pairing case.bun --config=./bunfig.test.toml test test/session/message-v2.test.ts; this currently fails before test execution due a pre-existing initialization error insrc/session/session.ts(ReferenceError: Cannot access 'Assistant' before initialization), not from this diff.Screenshots / recordings
N/A (non-UI change)
Checklist