feat: implement ClaudeCodeFolderMruService for managing recently used folders#310349
Merged
TylerLeonhardt merged 1 commit intomainfrom Apr 16, 2026
Merged
feat: implement ClaudeCodeFolderMruService for managing recently used folders#310349TylerLeonhardt merged 1 commit intomainfrom
TylerLeonhardt merged 1 commit intomainfrom
Conversation
… folders This will help us adopt SessionOptionGroupBuilder
Contributor
Screenshot ChangesBase: Changed (1)
|
| Before | After |
|---|---|
 |
 |
blocks-ci screenshots changed
Replace the contents of test/componentFixtures/blocks-ci-screenshots.md with:
Updated blocks-ci-screenshots.md
<!-- auto-generated by CI — do not edit manually -->
#### editor/codeEditor/CodeEditor/Dark
#### editor/codeEditor/CodeEditor/Light
Contributor
There was a problem hiding this comment.
Pull request overview
Implements a Claude-specific folder MRU service and wires Claude chat session UX to use the new IChatFolderMruService API (instead of the deprecated IFolderRepositoryManager.getFolderMRU()), supporting upcoming adoption of SessionOptionGroupBuilder.
Changes:
- Added
ClaudeCodeFolderMruServiceto compute/merge “recent folders” from Claude sessions, recent Git repos, and current workspace folders (with caching + delete support). - Updated
ClaudeChatSessionContentProviderand its unit tests to consumeIChatFolderMruService.getRecentlyUsedFolders(...). - Registered
IChatFolderMruServicefor Claude sessions in the chat sessions contribution and added dedicated unit tests for the new MRU service.
Show a summary per file
| File | Description |
|---|---|
| extensions/copilot/src/extension/chatSessions/vscode-node/claudeChatSessionContentProvider.ts | Swaps MRU source to IChatFolderMruService for empty-workspace defaults/options. |
| extensions/copilot/src/extension/chatSessions/vscode-node/test/claudeChatSessionContentProvider.spec.ts | Updates mocks/wiring to provide IChatFolderMruService in tests. |
| extensions/copilot/src/extension/chatSessions/vscode-node/chatSessions.ts | Registers ClaudeCodeFolderMruService as the Claude implementation of IChatFolderMruService. |
| extensions/copilot/src/extension/chatSessions/claude/node/claudeCodeFolderMru.ts | New MRU service implementation for Claude sessions (merge/sort/cache/delete). |
| extensions/copilot/src/extension/chatSessions/claude/node/test/claudeCodeFolderMru.spec.ts | New unit tests covering extraction, filtering, merge behavior, sorting, caching, and deletion. |
Copilot's findings
- Files reviewed: 5/5 changed files
- Comments generated: 2
Comment on lines
+17
to
+57
| const WORKTREE_PATH_PATTERNS = ['.claude/worktrees/', '.worktrees/copilot-'] as const; | ||
|
|
||
| function isWorktreePath(path: string): boolean { | ||
| return WORKTREE_PATH_PATTERNS.some(pattern => path.includes(pattern)); | ||
| } | ||
|
|
||
| export class ClaudeCodeFolderMruService implements IChatFolderMruService { | ||
| declare _serviceBrand: undefined; | ||
| private readonly removedFolders = new ResourceSet(); | ||
| private cachedEntries: FolderRepositoryMRUEntry[] | undefined = undefined; | ||
|
|
||
| constructor( | ||
| @IClaudeCodeSessionService private readonly sessionService: IClaudeCodeSessionService, | ||
| @IGitService private readonly gitService: IGitService, | ||
| @IWorkspaceService private readonly workspaceService: IWorkspaceService, | ||
| ) { } | ||
|
|
||
| async getRecentlyUsedFolders(token: CancellationToken): Promise<FolderRepositoryMRUEntry[]> { | ||
| const cachedEntries = this.cachedEntries; | ||
| const entries = this.getRecentlyUsedFoldersImpl(token).then(entries => { | ||
| this.cachedEntries = entries; | ||
| return entries; | ||
| }); | ||
|
|
||
| return (cachedEntries ? cachedEntries : await entries).filter(e => !this.removedFolders.has(e.folder)); | ||
| } | ||
|
|
||
| private async getRecentlyUsedFoldersImpl(token: CancellationToken): Promise<FolderRepositoryMRUEntry[]> { | ||
| const mruEntries = new ResourceMap<Mutable<FolderRepositoryMRUEntry>>(); | ||
|
|
||
| // We're getting MRU, don't delay session retrieve by more than 5s | ||
| const sessions = await raceTimeout(this.sessionService.getAllSessions(token), 5_000); | ||
|
|
||
| for (const session of (sessions ?? [])) { | ||
| if (!session.cwd) { | ||
| continue; | ||
| } | ||
| if (isWorktreePath(session.cwd)) { | ||
| continue; | ||
| } | ||
| const folderUri = URI.file(session.cwd); |
There was a problem hiding this comment.
Worktree path filtering for sessions is based on isWorktreePath(session.cwd) where cwd is a raw filesystem path string. On Windows this will typically contain backslashes, so checks for patterns like .claude/worktrees/ and .worktrees/copilot- (with /) won’t match and worktree folders may incorrectly appear in the MRU. Consider normalizing the path before matching (e.g., build a URI and check its .path, or replace \\ with / / use a platform-agnostic regex) and add a regression test for a Windows-style path.
| return entries; | ||
| }); | ||
|
|
||
| return (cachedEntries ? cachedEntries : await entries).filter(e => !this.removedFolders.has(e.folder)); |
There was a problem hiding this comment.
When cachedEntries is set, getRecentlyUsedFolders() returns the cache without awaiting the refresh promise (entries). If getRecentlyUsedFoldersImpl() rejects (e.g. session service throws), that rejection can become unhandled because nothing awaits/catches it. Consider explicitly handling errors for the background refresh (e.g. void entries.catch(...) and keep the last good cache).
Suggested change
| return (cachedEntries ? cachedEntries : await entries).filter(e => !this.removedFolders.has(e.folder)); | |
| if (cachedEntries) { | |
| void entries.catch(() => undefined); | |
| return cachedEntries.filter(e => !this.removedFolders.has(e.folder)); | |
| } | |
| return (await entries).filter(e => !this.removedFolders.has(e.folder)); |
roblourens
approved these changes
Apr 16, 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.
This will help us adopt SessionOptionGroupBuilder