fix(app-server): speed up shutdown#23578
Merged
Merged
Conversation
bolinfest
reviewed
May 20, 2026
bolinfest
reviewed
May 20, 2026
bolinfest
approved these changes
May 20, 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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Why
Pressing
Ctrl+CorCtrl+Din the TUI could make Codex pause during shutdown when app-server background work still held outbound sender clones.Shutdown tracing against the current
~/.codexpath found three relevant holders:SkillsWatcherkept its event-loop task alive until the shutdown timeout path.AppServerAttestationProviderretained a strongArc<OutgoingMessageSender>, which could keep outbound teardown waiting after the processor task had exited.apps/listtask could still own an outbound sender when shutdown began, causing the in-process app-server runtime to wait for its outbound channel to close.What Changed
SkillsWatcheran explicit shutdownCancellationTokenand cancel it from app-server teardown so its event loop drops the outbound sender promptly.AppServerAttestationProviderto keep aWeak<OutgoingMessageSender>and return immediately when it can no longer be upgraded.AppsRequestProcessora shutdownCancellationTokenand cancel in-flight backgroundapps/listwork during teardown.How to Test
Ctrl+C.Ctrl+Dand confirm the same prompt exit path.Focused manual trace validation from the investigation:
attestation.provider=1and laterapps.list.task=1.Ctrl+Dtraces showedapp_server.runtime.outbound_state_after_processor_joinwithowners=none,app_server.runtime.wait_outbound_handle = 0ms, and total TUI app-server shutdown around18ms.Targeted validation:
RUST_MIN_STACK=8388608 cargo test -p codex-app-server