[cherry-pick] Fix tool_search bookkeeping when resuming from stateful marker#314231
Merged
Conversation
vs-code-engineering
Bot
added
the
cherry-pick-artifact
Contributor
blocks-ci screenshots changedReplace the contents of Updated blocks-ci-screenshots.md<!-- auto-generated by CI — do not edit manually -->
#### editor/codeEditor/CodeEditor/Dark
#### editor/codeEditor/CodeEditor/Light
#### editor/inlineChatZoneWidget/InlineChatZoneWidget/Dark
#### editor/inlineChatZoneWidget/InlineChatZoneWidget/Light
#### editor/inlineChatZoneWidget/InlineChatZoneWidgetTerminated/Dark
#### editor/inlineChatZoneWidget/InlineChatZoneWidgetTerminated/Light
 |
dmitrivMS
approved these changes
May 4, 2026
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.
Cherry-pick of #314217 from
main.Fixes #313899
When resuming from a Responses API
previous_response_id, the assistant message carrying the stateful marker (and thetool_search_callit emitted) was being sliced out of the input. Bookkeeping (toolSearchCallIds,toolSearchLoadedTools) was populated only while iterating that post-marker slice, so the subsequent tool result was incorrectly serialized asfunction_call_outputinstead oftool_search_output, leaving deferred MCP tool definitions unloaded on the server. The model would acknowledge the names returned bytool_searchbut couldn't actually invoke the tool.Pre-scan the full
messages[]for tool_search calls and their results before applying the slice.