fix(acp): dispatch Code Mode callbacks on main runtime to prevent hangs - #10484
Merged
Abhijay007 merged 2 commits intoJul 17, 2026
Merged
Conversation
Abhijay007
requested review from
DOsinga,
The-Best-Codes,
lifeizhou-ap and
michaelneale
July 15, 2026 11:32
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 6ce8e4e763
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
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.
fixes : #10463
Summary
problem was : execute_typescript intermittently hangs when a Code Mode callback calls a subprocess MCP tool (e.g. Tavily). The callback dispatch uses Tokio primitives (Mutex, oneshot) that must be driven by the main multi-thread runtime, but the Deno op executor runs on a current_thread runtime. Polling these primitives across runtime boundaries leaves wakers stale — the task never gets woken up and hangs indefinitely.
to fix this : Capture tokio::runtime::Handle::current() in handle_execute_typescript and thread it down to create_tool_callback. The full dispatch + result-await is wrapped in rt.spawn(...) so it runs on the main runtime. The Deno op only awaits the JoinHandle, which is safe across runtime boundaries.
Testing
mannual and test