Repository navigation
feat(coding-agent): reconcile subagents across context changes - #121
Merged
Issacboy123 merged 2 commits intoAug 28, 2026
Merged
Issacboy123 merged 2 commits into
Issacboy123 merged 2 commits into
Conversation
Pepps233
force-pushed
the
feat/reconcile-persistent-subagents
branch
from
August 25, 2026 14:36
bf05727 to
891437e
Compare
Pepps233
self-requested a review
August 25, 2026 16:13
Pepps233
approved these changes
Aug 25, 2026
Issacboy123
force-pushed
the
feat/reconcile-persistent-subagents
branch
from
August 27, 2026 10:54
891437e to
f4e9f76
Compare
Issacboy123
force-pushed
the
feat/reconcile-persistent-subagents
branch
from
August 27, 2026 23:11
f4e9f76 to
a4ff225
Compare
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.
Summary
Keeps subagents aligned with the parent session when users switch branches or reset context. Active children are stopped safely before the parent context changes, and the subagent list is replaced with the one saved for the destination branch. If Diffex cannot safely stop the children or record a reset, it leaves the existing context in place.
Reasoning
Subagents must be reconciled at the same boundary as parent context changes or children from an abandoned branch can remain active or later reappear. Running extension cancellation and optional summarization first avoids disturbing children for a navigation that will not commit. Quiesce and reset-barrier failures are fail-closed, while cleanup failures after a committed barrier are reported as warnings because the old roster has already been durably masked.
Changes
Testing
node ../../node_modules/vitest/dist/cli.js --run test/suite/subagent-persistence.test.ts test/suite/subagent-services.test.ts test/suite/subagent-registration.test.ts test/suite/agent-session-harness-version.test.ts test/session-manager/fork-branch.test.ts test/session-selector-path-delete.test.tsnpm run check