Repository navigation
refactor(acp): make terminal cleanup session-owned - #4699
Merged
Merged
Conversation
Collapse terminalManager's split stop/wait into a single cleanup(ctx) call owned by the Session, dropping the done/closeErr fields in favor of a local result channel. Assisted-By: docker-agent
melmennaoui
approved these changes
Oct 22, 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
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
terminalManagersplit cleanup into separatestop/waitcalls and cached the result indone/closeErrfields. That split ownership made the lifecycle harder to reason about and race-prone: callers had to coordinate stop-then-wait themselves, and the cached fields could be read/written from multiple goroutines without a clear single owner.What
Collapses the split stop/wait into a single
cleanup(ctx)call, and makesSession.closethe sole owner of the cleanup result:terminalManagerdrops thedone/closeErrfields in favor of a singlecleanup(ctx)method.Session.closebuffers the cleanup result locally, retires/cancels immediately, and blocks on the manager cleanup — while still running terminal/runtime/MCP shutdown in parallel.terminal_test.goandtracing_test.go.terminal_cleanup_test.gowith race-focused coverage: synchronous retirement, simultaneous first closers, exactly-one final release, cached failure results, late terminal creation, and trace context propagation.Validation
task build,task test,task lintall pass.go test ./pkg/acp/... -race -count=1run 3x, all green (no flakes).go vet) verified forlinux/amd64andwindows/amd64.