Repository navigation
agentHost: detach an archived chat's folders from its session - #341782
Merged
Sandeep Somavarapu (sandy081) merged 4 commits intoOct 15, 2026
Merged
Sandeep Somavarapu (sandy081) merged 4 commits into
Sandeep Somavarapu (sandy081) merged 4 commits into
Conversation
Archiving a chat removes its folders from the aggregate session workspace and unarchiving attaches them back. Folders that are the session's primary or still used by another unarchived chat stay attached, and worktrees are never deleted. Restoring a session no longer re-adds archived chats' folders. Adds a Developer: Update Session Folders with Chats action to repair sessions whose chats were archived before this change. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ving-a-chat-should-unattach-the-chat-s
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Unresolved workspace consistency issues affect concurrent chat creation, inherited folder restoration, and archived-chat details.
1 open finding
What changed in this PR
Updates Agent Host chat archiving to detach unused folders from the session workspace while retaining chat folders and worktrees.
Changes:
- Detaches folders on archive and reattaches them on unarchive.
- Adds a developer action to repair previously archived chats.
- Adds archive/worktree tests and updates service stubs.
| File | Description |
|---|---|
src/vs/sessions/contrib/sessions/browser/updateSessionFoldersAction.ts |
Adds the repair action. |
src/vs/sessions/contrib/sessions/browser/sessions.contribution.ts |
Registers the action. |
src/vs/platform/agentHost/test/node/chatContributions.test.ts |
Verifies workspace contribution calls. |
src/vs/platform/agentHost/test/node/agentSideEffects.test.ts |
Registers the service stub. |
src/vs/platform/agentHost/test/node/agentService.test.ts |
Tests detachment, reattachment, repair, and worktree preservation. |
src/vs/platform/agentHost/test/node/agentHostTurnTelemetry.test.ts |
Registers the service stub. |
src/vs/platform/agentHost/test/node/agentHostTurnHangTelemetry.test.ts |
Registers the service stub. |
src/vs/platform/agentHost/test/node/agentHostToolCallTelemetry.test.ts |
Registers the service stub. |
src/vs/platform/agentHost/node/chatContributions/chatArchive/chatArchiveContribution.ts |
Triggers workspace updates on archive changes. |
src/vs/platform/agentHost/node/chatContributions/chatArchive/archivedChatWorkspaceService.ts |
Defines the workspace attachment service contract. |
src/vs/platform/agentHost/node/agentServiceComposition.ts |
Wires the service to AgentService. |
src/vs/platform/agentHost/node/agentService.ts |
Implements attachment changes, persistence, and restore filtering. |
🧠 Review effort: Balanced
💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
…ached An archived chat's folders are detached from the session workspace, so projecting the chat's scope onto the session workspace dropped its workspace and with it the folder, branch, and pull request details. Archived chats now resolve their detached folders on their own. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Anthony Kim (anthonykim1)
approved these changes
Oct 15, 2026
Sandeep Somavarapu (sandy081)
deleted the
sandy081/agents/archiving-a-chat-should-unattach-the-chat-s
branch
October 15, 2026 15:45
This was referenced Oct 15, 2026
Member
|
Heads-up Sandeep Somavarapu (@sandy081): the test The snapshot helper waits a fixed Flagging separately from the panel fix, which passed in this run. No CI rerun was triggered. 🤖 Authored with GitHub Copilot on behalf of Ross Wollman (@rwoll). |
Sandeep Somavarapu (sandy081)
added a commit
that referenced
this pull request
Oct 15, 2026
…#341882) Archiving or unarchiving a peer chat updates the session workspace asynchronously, one update at a time per session, and each update persists the session's folders before the next starts. The tests from #341782 slept 10ms instead of waiting for these updates, so when persisting the detached worktree took longer, as on Windows CI, the unarchive had not attached it back yet. Wait for the queued updates instead, and hold the archive's persistence while unarchiving so the worktree test covers the slow case deterministically. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 of 5 tasks
Sandeep Somavarapu (sandy081)
added a commit
that referenced
this pull request
Oct 21, 2026
… chats use (#343275) * agentHost: skip git spawn for missing working directories getRepositoryRoot spawned 'git rev-parse --show-toplevel' with cwd set to the working directory even when that folder had been deleted. The resulting 'spawn git ENOENT' has empty stderr, so it was never negatively cached and was re-probed and re-logged on every refresh. Check that the directory exists before spawning git and return undefined quietly without caching, so a worktree recreated at the same path is picked up by the next lookup. A spawn ENOENT for a directory that vanished after the check is handled the same way. * agentHost: limit session changes to the folders of chats in use The Branch summary computed and watched every folder any chat of a session ever had, including archived chats and the folders subagents are pinned to (often deleted worktrees). Each git-state refresh re-armed every one of those owners through refreshBranchChangeset, which clears what is known about an unavailable owner, so a session with many archived chats and subagents kept recomputing and re-broadcasting changeset status. Move the 'only chats in use count' rule (#341782, #341885) out of AgentService into getChatsInUse and apply it to the Branch summary owners, the summary working directories and the coordinator's branch summary subscriptions. AgentService behavior is unchanged. The default chat is always kept. Also stop two ways a round restarts itself: do not dispatch a changeset status that is already current, and do not recompute an owner whose computation already ended in an error from the summary update; an explicit refresh still retries it. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * agentHost: reconcile the branch summary when a chat is archived or unarchived The branch summary subscribes to the folders of the chats in use only, but nothing re-evaluated that set when a chat's archived state changed. Archiving left the chat's changeset and file watcher subscribed, and unarchiving left it unobserved until an unrelated refresh. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * agentHost: drop explanatory inline comments added with the missing-folder and in-use fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * agentHost: name the missing-directory and spawn ENOENT checks for what they detect Review feedback: _isDirectory returned true for stat failures other than ENOENT/ENOTDIR, and isSpawnNotFoundError also matched a missing working directory. Rename them to _isMissingDirectory (true only when the path is definitely not a directory) and isSpawnEnoentError. No behavior change. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Archiving a chat now detaches its folders from the session's aggregate workspace, and unarchiving the chat attaches them back.
What changed
ChatArchiveContribution→AgentService.setArchivedChatWorkspaceAttached): when a chat's archived state changes, its folders are removed from or re-added to the session workspace, and the result is persisted.Testing
agentService.test.tscovers archive/unarchive for a chat in another folder (primary is never detached), the repair path, and a chat in its own worktree (detached without deletion).chatContributions.test.tscovers the contribution calls../scripts/test.shfor the affectedsrc/vs/platform/agentHost/test/nodesuites: passed.npm run typecheck-client,npm run precommit(hygiene),npm run eslinton changed files, andnpm run valid-layers-check: passed.Not covered