feat: enhance Copilot CLI session management with system message support (#4891)

Author: DonJayamanne

src/extension/chatSessions/claude/node/sessionParser/test/claudeCodeSessionService.spec.ts

@@ -78,7 +78,6 @@ class MockFolderRepositoryManager implements IFolderRepositoryManager {
 	async initializeFolderRepository(): Promise<{ folder: undefined; repository: undefined; worktree: undefined; worktreeProperties: undefined; trusted: undefined }> { return { folder: undefined, repository: undefined, worktree: undefined, worktreeProperties: undefined, trusted: undefined }; }
 	async getRepositoryInfo(): Promise<{ repository: undefined; headBranchName: undefined }> { return { repository: undefined, headBranchName: undefined }; }
 	async getFolderMRU(): Promise<FolderRepositoryMRUEntry[]> { return this._mruEntries; }
-	async deleteMRUEntry(): Promise<void> { }
 }
 
 // #endregion
@@ -476,7 +475,7 @@ describe('ClaudeCodeSessionService', () => {
 			noWorkspaceTestingServiceCollection.define(IFolderRepositoryManager, noWorkspaceFolderManager);
 
 			noWorkspaceFolderManager.setMRUEntries([
-				{ folder: mruFolder, repository: undefined, lastAccessed: Date.now(), isUntitledSessionSelection: false },
+				{ folder: mruFolder, repository: undefined, lastAccessed: Date.now() },
 			]);
 
 			const accessor = noWorkspaceTestingServiceCollection.createTestingAccessor();
@@ -515,8 +514,8 @@ describe('ClaudeCodeSessionService', () => {
 			const mruFolder2 = URI.file('/another/project');
 
 			noWorkspaceFolderManager.setMRUEntries([
-				{ folder: mruFolder, repository: undefined, lastAccessed: Date.now(), isUntitledSessionSelection: false },
-				{ folder: mruFolder2, repository: undefined, lastAccessed: Date.now() - 1000, isUntitledSessionSelection: false },
+				{ folder: mruFolder, repository: undefined, lastAccessed: Date.now() },
+				{ folder: mruFolder2, repository: undefined, lastAccessed: Date.now() - 1000 },
 			]);
 
 			const multiMruServiceCollection = store.add(createExtensionUnitTestingServices(store));

src/extension/chatSessions/claude/node/test/claudeProjectFolders.spec.ts

@@ -25,7 +25,6 @@ class MockFolderRepositoryManager implements IFolderRepositoryManager {
 	async initializeFolderRepository(): Promise<{ folder: undefined; repository: undefined; worktree: undefined; worktreeProperties: undefined; trusted: undefined }> { return { folder: undefined, repository: undefined, worktree: undefined, worktreeProperties: undefined, trusted: undefined }; }
 	async getRepositoryInfo(): Promise<any> { return undefined; }
 	async getFolderMRU(): Promise<FolderRepositoryMRUEntry[]> { return this._mruEntries; }
-	async deleteMRUEntry(): Promise<void> { }
 }
 
 // #endregion
@@ -90,7 +89,7 @@ describe('getProjectFolders', () => {
 		const mruFolder = URI.file('/Users/test/recent-project');
 		const workspace = new TestWorkspaceService([]);
 		const folderManager = new MockFolderRepositoryManager();
-		folderManager.setMRUEntries([{ folder: mruFolder, repository: undefined, lastAccessed: Date.now(), isUntitledSessionSelection: false }]);
+		folderManager.setMRUEntries([{ folder: mruFolder, repository: undefined, lastAccessed: Date.now() }]);
 
 		const result = await getProjectFolders(workspace, folderManager);
 
@@ -113,7 +112,7 @@ describe('getProjectFolders', () => {
 		const mruFolder = URI.file('/Users/test/mru-folder');
 		const workspace = new TestWorkspaceService([workspaceFolder]);
 		const folderManager = new MockFolderRepositoryManager();
-		folderManager.setMRUEntries([{ folder: mruFolder, repository: undefined, lastAccessed: Date.now(), isUntitledSessionSelection: false }]);
+		folderManager.setMRUEntries([{ folder: mruFolder, repository: undefined, lastAccessed: Date.now() }]);
 
 		const result = await getProjectFolders(workspace, folderManager);
 

src/extension/chatSessions/common/chatSessionMetadataStore.ts

@@ -80,7 +80,6 @@ export interface IChatSessionMetadataStore {
 	getWorktreeProperties(folder: Uri): Promise<ChatSessionWorktreeProperties | undefined>;
 	getSessionWorkspaceFolder(sessionId: string): Promise<vscode.Uri | undefined>;
 	getSessionWorkspaceFolderEntry(sessionId: string): Promise<WorkspaceFolderEntry | undefined>;
-	getUsedWorkspaceFolders(): Promise<WorkspaceFolderEntry[]>;
 	getAdditionalWorkspaces(sessionId: string): Promise<IWorkspaceInfo[]>;
 	setAdditionalWorkspaces(sessionId: string, workspaces: IWorkspaceInfo[]): Promise<void>;
 	getSessionFirstUserMessage(sessionId: string): Promise<string | undefined>;

src/extension/chatSessions/common/chatSessionWorkspaceFolderService.ts

@@ -17,11 +17,6 @@ export const IChatSessionWorkspaceFolderService = createServiceIdentifier<IChatS
  */
 export interface IChatSessionWorkspaceFolderService {
 	readonly _serviceBrand: undefined;
-	getRecentFolders(): Promise<{ folder: vscode.Uri; lastAccessTime: number }[]>;
-	/**
-	 * Delete a recent folder from all tracked sessions.
-	 */
-	deleteRecentFolder(folder: vscode.Uri): Promise<void>;
 	deleteTrackedWorkspaceFolder(sessionId: string): Promise<void>;
 	/**
 	 * Track workspace folder selection for a session (for folders without git repos in multi-root workspaces)

src/extension/chatSessions/common/folderRepositoryManager.ts

@@ -78,11 +78,6 @@ export interface FolderRepositoryMRUEntry {
 	 * Timestamp of last access (milliseconds since epoch).
 	 */
 	readonly lastAccessed: number;
-
-	/**
-	 * Whether this entry was used in an untitled session.
-	 */
-	readonly isUntitledSessionSelection: boolean;
 }
 
 export const IFolderRepositoryManager = createServiceIdentifier<IFolderRepositoryManager>('IFolderRepositoryManager');
@@ -152,6 +147,7 @@ export interface IFolderRepositoryManager {
 	): Promise<{ repository: vscode.Uri | undefined; headBranchName: string | undefined }>;
 
 	/**
+	 * @deprecated
 	 * Get list of most recently used folders and repositories.
 	 *
 	 * This is used for empty workspaces to show a list of previously used
@@ -161,9 +157,4 @@ export interface IFolderRepositoryManager {
 	 *          limited to 10 items, with non-existent paths filtered out
 	 */
 	getFolderMRU(): Promise<FolderRepositoryMRUEntry[]>;
-
-	/**
-	 * Delete an entry from the MRU list.
-	 */
-	deleteMRUEntry(folder: vscode.Uri): Promise<void>;
 }

src/extension/chatSessions/common/test/mockChatSessionMetadataStore.ts

@@ -61,10 +61,6 @@ export class MockChatSessionMetadataStore implements IChatSessionMetadataStore {
 		return undefined;
 	}
 
-	async getUsedWorkspaceFolders(): Promise<WorkspaceFolderEntry[]> {
-		return Array.from(this._workspaceFolders.values());
-	}
-
 	async getAdditionalWorkspaces(sessionId: string): Promise<IWorkspaceInfo[]> {
 		return this._additionalWorkspaces.get(sessionId) ?? [];
 	}

src/extension/chatSessions/copilotcli/node/copilotcliSessionService.ts

@@ -62,7 +62,6 @@ export interface ICopilotCLISessionItem {
 	readonly status?: ChatSessionStatus;
 	readonly workingDirectory?: Uri;
 }
-
 export type ExtendedChatRequest = ChatRequest & { prompt: string };
 export type ISessionOptions = {
 	model?: string;

src/extension/chatSessions/copilotcli/node/test/copilotCliSessionService.spec.ts

@@ -62,8 +62,6 @@ class NullAgentSessionsWorkspace implements IAgentSessionsWorkspace {
 }
 
 class NullChatSessionWorkspaceFolderService extends mock<IChatSessionWorkspaceFolderService>() {
-	override getRecentFolders = vi.fn(async () => []);
-	override deleteRecentFolder = vi.fn(async () => { });
 	override deleteTrackedWorkspaceFolder = vi.fn(async () => { });
 	override trackSessionWorkspaceFolder = vi.fn(async () => { });
 	override getSessionWorkspaceFolder = vi.fn(async () => undefined);

src/extension/chatSessions/vscode-node/chatSessionMetadataStoreImpl.ts

@@ -12,7 +12,6 @@ import { findLast } from '../../../util/vs/base/common/arraysFind';
 import { SequencerByKey, ThrottledDelayer } from '../../../util/vs/base/common/async';
 import { Lazy } from '../../../util/vs/base/common/lazy';
 import { Disposable } from '../../../util/vs/base/common/lifecycle';
-import { ResourceMap } from '../../../util/vs/base/common/map';
 import { dirname, isEqual } from '../../../util/vs/base/common/resources';
 import { ChatSessionMetadataFile, IChatSessionMetadataStore, RequestDetails, WorkspaceFolderEntry } from '../common/chatSessionMetadataStore';
 import { ChatSessionWorktreeData, ChatSessionWorktreeProperties } from '../common/chatSessionWorktreeService';
@@ -245,18 +244,6 @@ export class ChatSessionMetadataStore extends Disposable implements IChatSession
 		return metadata.workspaceFolder;
 	}
 
-	async getUsedWorkspaceFolders(): Promise<WorkspaceFolderEntry[]> {
-		await this._intialize.value;
-		const entries = new ResourceMap<number>();
-		for (const metadata of Object.values(this._cache)) {
-			if (metadata.workspaceFolder?.folderPath) {
-				const folderUri = Uri.file(metadata.workspaceFolder.folderPath);
-				entries.set(folderUri, Math.max(entries.get(folderUri) ?? 0, metadata.workspaceFolder.timestamp));
-			}
-		}
-		return Array.from(entries.entries()).map(([folderUri, timestamp]) => ({ folderPath: folderUri.fsPath, timestamp }));
-	}
-
 	async getAdditionalWorkspaces(sessionId: string): Promise<IWorkspaceInfo[]> {
 		const metadata = await this.getSessionMetadata(sessionId);
 		if (!metadata?.additionalWorkspaces?.length) {

src/extension/chatSessions/vscode-node/chatSessionWorkspaceFolderServiceImpl.ts

@@ -10,12 +10,10 @@ import { IGitService } from '../../../platform/git/common/gitService';
 import { parseGitChangesRaw } from '../../../platform/git/vscode-node/utils';
 import { DiffChange } from '../../../platform/git/vscode/git';
 import { ILogService } from '../../../platform/log/common/logService';
-import { coalesce } from '../../../util/vs/base/common/arrays';
 import { SequencerByKey } from '../../../util/vs/base/common/async';
 import { Disposable } from '../../../util/vs/base/common/lifecycle';
-import { ResourceMap, ResourceSet } from '../../../util/vs/base/common/map';
+import { ResourceMap } from '../../../util/vs/base/common/map';
 import * as path from '../../../util/vs/base/common/path';
-import { isEqual } from '../../../util/vs/base/common/resources';
 import { generateUuid } from '../../../util/vs/base/common/uuid';
 import { IChatSessionMetadataStore, WorkspaceFolderEntry } from '../common/chatSessionMetadataStore';
 import { IChatSessionWorkspaceFolderService } from '../common/chatSessionWorkspaceFolderService';
@@ -32,8 +30,6 @@ export class ChatSessionWorkspaceFolderService extends Disposable implements ICh
 
 	private readonly workspaceFolderChanges = new ResourceMap<ChatSessionWorktreeFile[]>();
 	private readonly workspaceState = new Map<string, WorkspaceFolderEntry>();
-	private recentFolders: { folder: vscode.Uri; lastAccessTime: number }[] = [];
-	private readonly deletedFolders = new ResourceSet();
 	private readonly workspaceChangesSequencer = new SequencerByKey<string>();
 
 	constructor(
@@ -45,28 +41,6 @@ export class ChatSessionWorkspaceFolderService extends Disposable implements ICh
 		super();
 	}
 
-	public async deleteRecentFolder(folder: vscode.Uri): Promise<void> {
-		this.recentFolders = this.recentFolders.filter(entry => !isEqual(entry.folder, folder));
-		this.deletedFolders.add(folder);
-	}
-
-	public async getRecentFolders(): Promise<{ folder: vscode.Uri; lastAccessTime: number }[]> {
-		const items = await this.metadataStore.getUsedWorkspaceFolders();
-		this.recentFolders = coalesce(items.map(item => {
-			if (!item.folderPath) {
-				return;
-			}
-			const folder = vscode.Uri.file(item.folderPath);
-			if (this.deletedFolders.has(folder)) {
-				return;
-			}
-			return {
-				folder,
-				lastAccessTime: item.timestamp
-			};
-		})).sort((a, b) => b.lastAccessTime - a.lastAccessTime);
-		return this.recentFolders;
-	}
 	async deleteTrackedWorkspaceFolder(sessionId: string): Promise<void> {
 		this.workspaceState.delete(sessionId);
 		await this.metadataStore.deleteSessionMetadata(sessionId);