Skip to content

Expose worktree-owned SCM changes under active agent rows#285

Merged
NagyVikt merged 1 commit intomainfrom
agent/codex/nest-active-agent-changes-2026-04-22-10-53
Apr 22, 2026
Merged

Expose worktree-owned SCM changes under active agent rows#285
NagyVikt merged 1 commit intomainfrom
agent/codex/nest-active-agent-changes-2026-04-22-10-53

Conversation

@NagyVikt
Copy link
Copy Markdown
Collaborator

Automated by scripts/agent-branch-finish.sh (PR flow).

The VS Code Active Agents tree now nests CHANGES entries under the owning session when the repo path lives inside that session worktree, and leaves only unmatched paths in a Repo root bucket.

Full verification was blocked by runtime-template parity drift in the Guardex helper shims, so the runtime copies were resynced to their template behavior and the stale merge-workflow zero-copy test was aligned with the current CLI-owned install surface.

Constraint: Preserve FolderItem/ChangeItem rendering while reusing repo-root-relative session changedPaths
Rejected: Infer ownership only from repo status prefixes | cannot localize session rows cleanly when worktree paths need worktree-relative display
Rejected: Leave runtime parity and stale test drift unresolved | full repo verification would stay red and hide the actual feature result
Confidence: high
Scope-risk: moderate
Reversibility: clean
Directive: Keep session.changedPaths repo-root-relative in session-schema and localize back to worktree-relative paths only inside the CHANGES tree builder
Tested: node --test test/vscode-active-agents-session-state.test.js; node --test test/metadata.test.js; node --test test/merge-workflow.test.js; npm test; openspec validate --specs
Not-tested: Manual VS Code SCM smoke test against a live multi-session repo
@NagyVikt NagyVikt merged commit 1082a00 into main Apr 22, 2026
1 check passed
@NagyVikt NagyVikt deleted the agent/codex/nest-active-agent-changes-2026-04-22-10-53 branch April 22, 2026 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant