Filter Copilot CLI sessions per workspace (#2313)

* Filter Copilot CLI sessions per workspace

* Update review comments

Author: DonJayamanne

src/extension/agents/copilotcli/common/delegationSummaryService.ts

@@ -27,7 +27,7 @@ export interface IChatDelegationSummaryService {
 
 export class ChatDelegationSummaryService implements IChatDelegationSummaryService {
 	declare _serviceBrand: undefined;
-	private readonly _mementoUpdator = new Sequencer();
+	private readonly _mementoUpdater = new Sequencer();
 	private readonly _summaries = new ResourceMap<string>();
 	public readonly scheme = SummaryFileScheme;
 	constructor(
@@ -44,7 +44,7 @@ export class ChatDelegationSummaryService implements IChatDelegationSummaryServi
 			return;
 		}
 		summary = summary.substring(0, 100);
-		await this._mementoUpdator.queue(async () => {
+		await this._mementoUpdater.queue(async () => {
 			const details = this.context.globalState.get<Record<string, { summary: string; createdDateTime: number }>>(DelegationSummaryMementoKey, {});
 
 			details[sessionId] = { summary, createdDateTime: Date.now() };

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

@@ -3,15 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { Session, SessionEvent, SessionOptions, SweCustomAgent, internal } from '@github/copilot/sdk';
+import type { internal, Session, SessionEvent, SessionOptions, SweCustomAgent } from '@github/copilot/sdk';
 import type { CancellationToken, ChatRequest, Uri } from 'vscode';
 import { INativeEnvService } from '../../../../platform/env/common/envService';
+import { IVSCodeExtensionContext } from '../../../../platform/extContext/common/extensionContext';
 import { IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService';
 import { RelativePattern } from '../../../../platform/filesystem/common/fileTypes';
 import { ILogService } from '../../../../platform/log/common/logService';
+import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
 import { createServiceIdentifier } from '../../../../util/common/services';
 import { coalesce } from '../../../../util/vs/base/common/arrays';
-import { disposableTimeout, raceCancellation, raceCancellationError } from '../../../../util/vs/base/common/async';
+import { disposableTimeout, raceCancellation, raceCancellationError, Sequencer } from '../../../../util/vs/base/common/async';
 import { Emitter, Event } from '../../../../util/vs/base/common/event';
 import { Lazy } from '../../../../util/vs/base/common/lazy';
 import { Disposable, DisposableMap, IDisposable, IReference, RefCountedDisposable, toDisposable } from '../../../../util/vs/base/common/lifecycle';
@@ -24,6 +26,8 @@ import { CopilotCLISession, ICopilotCLISession } from './copilotcliSession';
 import { getCopilotLogger } from './logger';
 import { ICopilotCLIMCPHandler } from './mcpHandler';
 
+const COPILOT_CLI_WORKSPACE_SPECIFIC_SESSIONS_KEY = 'github.copilot.cli.workspaceSpecificSessions';
+
 export interface ICopilotCLISessionItem {
 	readonly id: string;
 	readonly label: string;
@@ -67,6 +71,7 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 
 	private sessionMutexForGetSession = new Map<string, Mutex>();
 
+	private readonly _mementoUpdator = new Sequencer();
 	constructor(
 		@ILogService protected readonly logService: ILogService,
 		@ICopilotCLISDK private readonly copilotCLISDK: ICopilotCLISDK,
@@ -75,6 +80,8 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 		@IFileSystemService private readonly fileSystem: IFileSystemService,
 		@ICopilotCLIMCPHandler private readonly mcpHandler: ICopilotCLIMCPHandler,
 		@ICopilotCLIAgents private readonly agents: ICopilotCLIAgents,
+		@IVSCodeExtensionContext private readonly context: IVSCodeExtensionContext,
+		@IWorkspaceService private readonly workspaceService: IWorkspaceService,
 	) {
 		super();
 		this.monitorSessionFiles();
@@ -111,12 +118,18 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 
 	async _getAllSessions(token: CancellationToken): Promise<readonly ICopilotCLISessionItem[]> {
 		try {
+			const mementoUpdateCompleted = this._mementoUpdator.queue(async () => Promise.resolve());
 			const sessionManager = await raceCancellationError(this.getSessionManager(), token);
 			const sessionMetadataList = await raceCancellationError(sessionManager.listSessions(), token);
 
+			// Wait for any pending memento updates to complete before filtering sessions.
+			await mementoUpdateCompleted;
 			// Convert SessionMetadata to ICopilotCLISession
 			const diskSessions: ICopilotCLISessionItem[] = coalesce(await Promise.all(
 				sessionMetadataList.map(async (metadata) => {
+					if (this.shouldExcludeSession(metadata.sessionId)) {
+						return;
+					}
 					const id = metadata.sessionId;
 					const startTime = metadata.startTime.getTime();
 					const endTime = metadata.modifiedTime.getTime();
@@ -195,7 +208,7 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 		const sessionManager = await raceCancellationError(this.getSessionManager(), token);
 		const sdkSession = await sessionManager.createSession(options.toSessionOptions());
 		this.logService.trace(`[CopilotCLISession] Created new CopilotCLI session ${sdkSession.sessionId}.`);
-
+		void this.updateSessionInWorkspace(sdkSession.sessionId, 'add');
 
 		return this.createCopilotSession(sdkSession, options, sessionManager);
 	}
@@ -280,6 +293,7 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 	}
 
 	public async deleteSession(sessionId: string): Promise<void> {
+		void this.updateSessionInWorkspace(sessionId, 'delete');
 		try {
 			{
 				const session = this._sessionWrappers.get(sessionId);
@@ -301,6 +315,37 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 			this._onDidChangeSessions.fire();
 		}
 	}
+
+	private async updateSessionInWorkspace(sessionId: string, operation: 'add' | 'delete'): Promise<void> {
+		// If we're not in a workspace, do not track sessions as these are global sessions.
+		if (this.workspaceService.getWorkspaceFolders().length === 0) {
+			return;
+		}
+		this._mementoUpdator.queue(async () => {
+			let trackedSessions = this.context.workspaceState.get<Record<string, { createdDateTime: number }>>(COPILOT_CLI_WORKSPACE_SPECIFIC_SESSIONS_KEY, {});
+			if (operation === 'add') {
+				trackedSessions[sessionId] = { createdDateTime: Date.now() };
+			} else {
+				delete trackedSessions[sessionId];
+			}
+
+			// If we have 100 entries or more, sort by created time and keep the recent 100 and drop the rest.
+			if (Object.keys(trackedSessions).length >= 100) {
+				const sortedSessions = Object.entries(trackedSessions).sort((a, b) => b[1].createdDateTime - a[1].createdDateTime);
+				trackedSessions = Object.fromEntries(sortedSessions.slice(0, 100));
+			}
+			await this.context.workspaceState.update(COPILOT_CLI_WORKSPACE_SPECIFIC_SESSIONS_KEY, trackedSessions);
+		});
+	}
+
+	private shouldExcludeSession(sessionId: string): boolean {
+		if (this.workspaceService.getWorkspaceFolders().length === 0) {
+			return false;
+		}
+		const trackedSessions = this.context.workspaceState.get<Record<string, { createdDateTime: number }>>(COPILOT_CLI_WORKSPACE_SPECIFIC_SESSIONS_KEY, {});
+		return !(sessionId in trackedSessions);
+	}
+
 }
 
 function labelFromPrompt(prompt: string): string {

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

@@ -5,11 +5,12 @@
 
 import type { SessionOptions, SweCustomAgent } from '@github/copilot/sdk';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { ChatContext } from 'vscode';
+import type { ChatContext, Memento } from 'vscode';
 import { CancellationToken } from 'vscode-languageserver-protocol';
 import { IAuthenticationService } from '../../../../../platform/authentication/common/authentication';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configurationService';
 import { NullNativeEnvService } from '../../../../../platform/env/common/nullEnvService';
+import { IVSCodeExtensionContext } from '../../../../../platform/extContext/common/extensionContext';
 import { MockFileSystemService } from '../../../../../platform/filesystem/node/test/mockFileSystemService';
 import { IGitService } from '../../../../../platform/git/common/gitService';
 import { ILogService } from '../../../../../platform/log/common/logService';
@@ -120,9 +121,25 @@ describe('CopilotCLISessionService', () => {
 				return disposables.add(new CopilotCLISession(options, sdkSession, gitService, logService, workspaceService, sdk, instantiationService, delegationService));
 			}
 		} as unknown as IInstantiationService;
-
+		const state: Record<string, unknown> = {};
+		const workspaceState: Memento = {
+			keys: () => Object.keys(state),
+			get: <T>(key: string, defaultValue?: T): T => {
+				if (key in state) {
+					return state[key] as T;
+				}
+				state[key] = defaultValue;
+				return defaultValue as T;
+			},
+			update: async (key: string, value: unknown) => {
+				state[key] = value;
+			}
+		};
+		const context: IVSCodeExtensionContext = new class extends mock<IVSCodeExtensionContext>() {
+			override workspaceState: Memento = workspaceState;
+		}();
 		const configurationService = accessor.get(IConfigurationService);
-		service = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, new TestWorkspaceService(), authService, configurationService), cliAgents));
+		service = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, new TestWorkspaceService(), authService, configurationService), cliAgents, context, new TestWorkspaceService()));
 		manager = await service.getSessionManager() as unknown as MockCliSdkSessionManager;
 	});
 

src/extension/chatSessions/vscode-node/test/copilotCLIChatSessionParticipant.spec.ts

@@ -177,7 +177,24 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
 				return disposables.add(session);
 			}
 		} as unknown as IInstantiationService;
-		sessionService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), mcpHandler, new NullCopilotCLIAgents()));
+		const state: Record<string, unknown> = {};
+		const workspaceState: vscode.Memento = {
+			keys: () => Object.keys(state),
+			get: <T>(key: string, defaultValue?: T): T => {
+				if (key in state) {
+					return state[key] as T;
+				}
+				state[key] = defaultValue;
+				return defaultValue as T;
+			},
+			update: async (key: string, value: unknown) => {
+				state[key] = value;
+			}
+		};
+		const context: IVSCodeExtensionContext = new class extends mock<IVSCodeExtensionContext>() {
+			override workspaceState: vscode.Memento = workspaceState;
+		}();
+		sessionService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), mcpHandler, new NullCopilotCLIAgents(), context, workspaceService));
 
 		manager = await sessionService.getSessionManager() as unknown as MockCliSdkSessionManager;