When delegating to Copilot CLI do not open chat editor (#2232)

* When delegating to Copilot CLI do not open chat editor

* Update src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Address code review

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: DonJayamanne

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

@@ -26,16 +26,25 @@ export class CopilotCLIPromptResolver {
 		@IIgnoreService private readonly ignoreService: IIgnoreService,
 	) { }
 
-	public async resolvePrompt(request: vscode.ChatRequest, additionalReferences: vscode.ChatPromptReference[], token: vscode.CancellationToken): Promise<{ prompt: string; attachments: Attachment[] }> {
+	/**
+	 * Generates the final prompt for the Copilot CLI agent, resolving variables and preparing attachments.
+	 * @param request
+	 * @param prompt Provide a prompt to override the request prompt
+	 * @param additionalReferences
+	 * @param token
+	 * @returns
+	 */
+	public async resolvePrompt(request: vscode.ChatRequest, prompt: string | undefined, additionalReferences: vscode.ChatPromptReference[], token: vscode.CancellationToken): Promise<{ prompt: string; attachments: Attachment[] }> {
 		const references = request.references.concat(additionalReferences);
-		if (request.prompt.startsWith('/')) {
-			return { prompt: request.prompt, attachments: [] }; // likely a slash command, don't modify
+		prompt = prompt ?? request.prompt;
+		if (prompt.startsWith('/')) {
+			return { prompt, attachments: [] }; // likely a slash command, don't modify
 		}
 		const [variables, attachments] = await this.constructChatVariablesAndAttachments(new ChatVariablesCollection(references), token);
 		if (token.isCancellationRequested) {
-			return { prompt: request.prompt, attachments: [] };
+			return { prompt, attachments: [] };
 		}
-		const prompt = await raceCancellation(generateUserPrompt(request, variables, this.instantiationService), token);
+		prompt = await raceCancellation(generateUserPrompt(request, prompt, variables, this.instantiationService), token);
 		return { prompt: prompt ?? '', attachments };
 	}
 

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

@@ -58,7 +58,6 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 
 	private _sessionManager: Lazy<Promise<internal.LocalSessionManager>>;
 	private _sessionWrappers = new DisposableMap<string, RefCountedSession>();
-	private _newActiveSessions = new Map<string, ICopilotCLISessionItem>();
 
 
 	private readonly _onDidChangeSessions = new Emitter<void>();
@@ -118,10 +117,6 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 			// Convert SessionMetadata to ICopilotCLISession
 			const diskSessions: ICopilotCLISessionItem[] = coalesce(await Promise.all(
 				sessionMetadataList.map(async (metadata) => {
-					if (this._newActiveSessions.has(metadata.sessionId)) {
-						// This is a new session not yet persisted to disk by SDK
-						return undefined;
-					}
 					const id = metadata.sessionId;
 					const startTime = metadata.startTime.getTime();
 					const endTime = metadata.modifiedTime.getTime();
@@ -170,7 +165,7 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 			return allSessions;
 		} catch (error) {
 			this.logService.error(`Failed to get all sessions: ${error}`);
-			return Array.from(this._newActiveSessions.values());
+			return [];
 		}
 	}
 
@@ -179,26 +174,10 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 		const options = await this.createSessionsOptions({ model, workingDirectory, isolationEnabled, mcpServers, agent });
 		const sessionManager = await raceCancellationError(this.getSessionManager(), token);
 		const sdkSession = await sessionManager.createSession(options.toSessionOptions());
-		const label = labelFromPrompt(prompt);
-		const newSession: ICopilotCLISessionItem = {
-			id: sdkSession.sessionId,
-			label,
-			timing: { startTime: sdkSession.startTime.getTime() }
-		};
-		this._newActiveSessions.set(sdkSession.sessionId, newSession);
 		this.logService.trace(`[CopilotCLISession] Created new CopilotCLI session ${sdkSession.sessionId}.`);
 
 
-		const session = this.createCopilotSession(sdkSession, options, sessionManager);
-
-		session.object.add(toDisposable(() => this._newActiveSessions.delete(sdkSession.sessionId)));
-		session.object.add(session.object.onDidChangeStatus(() => {
-			// This will get swapped out as soon as the session has completed.
-			if (session.object.status === ChatSessionStatus.Completed || session.object.status === ChatSessionStatus.Failed) {
-				this._newActiveSessions.delete(sdkSession.sessionId);
-			}
-		}));
-		return session;
+		return this.createCopilotSession(sdkSession, options, sessionManager);
 	}
 
 	protected async createSessionsOptions(options: { model?: string; isolationEnabled?: boolean; workingDirectory?: Uri; mcpServers?: SessionOptions['mcpServers']; agent: SweCustomAgent | undefined }): Promise<CopilotCLISessionOptions> {
@@ -297,7 +276,6 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 		} catch (error) {
 			this.logService.error(`Failed to delete session ${sessionId}: ${error}`);
 		} finally {
-			this._newActiveSessions.delete(sessionId);
 			this._sessionWrappers.deleteAndLeak(sessionId);
 			// Possible the session was deleted in another vscode session or the like.
 			this._onDidChangeSessions.fire();

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

@@ -56,11 +56,18 @@ describe('CopilotCLIPromptResolver', () => {
 
 	it('returns original prompt unchanged for slash command', async () => {
 		const req = new TestChatRequest('/help something');
-		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 		expect(prompt).toBe('/help something');
 		expect(attachments).toHaveLength(0);
 	});
 
+	it('returns overridden prompt instead of using the request prompt', async () => {
+		const req = new TestChatRequest('/help something');
+		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, 'What is 1+2', [], CancellationToken.None);
+		expect(prompt).toBe('What is 1+2');
+		expect(attachments).toHaveLength(0);
+	});
+
 	it('collects file references and produces attachments plus reminder block', async () => {
 		// Spy on stat to simulate file type
 		const statSpy = vi.spyOn(fileSystemService, 'stat').mockResolvedValue({ type: FileType.File, size: 10 } as any);
@@ -73,7 +80,7 @@ describe('CopilotCLIPromptResolver', () => {
 			{ id: 'file-b', value: fileB, name: 'b.ts', range: [14, 15] } // 'b'
 		]);
 
-		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 
 		// Should have reminder block
 		expect(prompt).toMatch(/<reminder>/);
@@ -103,7 +110,7 @@ describe('CopilotCLIPromptResolver', () => {
 			{ id: 'diag-1', value: chatRefDiag }
 		]);
 
-		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { prompt, attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 
 		expect(prompt).toMatch(/Fix issues/);
 		expect(prompt).toMatch(/IMPORTANT: this context may or may not be relevant to your tasks. You should not respond to this context unless it is highly relevant to your task./);
@@ -122,7 +129,7 @@ describe('CopilotCLIPromptResolver', () => {
 			{ id: 'src-dir', value: dirUri, name: 'src', range: [5, 8] }
 		]);
 
-		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 		expect(attachments).toHaveLength(1);
 		expect(attachments[0].type).toBe('directory');
 		expect(attachments[0].displayName).toBe('src');
@@ -138,7 +145,7 @@ describe('CopilotCLIPromptResolver', () => {
 			{ id: 'bad', value: badUri, name: 'unknown', range: [6, 13] }
 		]);
 
-		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 		expect(attachments).toHaveLength(0); // ignored
 		expect(statSpy).toHaveBeenCalledTimes(1);
 		expect(logSpy).toHaveBeenCalled();
@@ -153,15 +160,15 @@ describe('CopilotCLIPromptResolver', () => {
 			{ id: 'file', value: fileUri, name: 'index.ts', range: [5, 10] }
 		]);
 
-		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 		expect(attachments).toHaveLength(0);
 		expect(statSpy).toHaveBeenCalledTimes(1);
 		expect(logSpy).toHaveBeenCalled();
 	});
 
 	it('no reminder block when there are no references or diagnostics', async () => {
 		const req = new TestChatRequest('Just a question');
-		const { prompt } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { prompt } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 		expect(prompt).toBe('Just a question');
 	});
 
@@ -191,7 +198,7 @@ describe('CopilotCLIPromptResolver', () => {
 			regularFileRef
 		]);
 
-		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, [], CancellationToken.None);
+		const { attachments } = await resolver.resolvePrompt(req as unknown as vscode.ChatRequest, undefined, [], CancellationToken.None);
 
 		// Prompt instructions should be filtered out, so only 2 attachments (prompt file + regular file)
 		expect(attachments).toHaveLength(2);

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

@@ -11,6 +11,7 @@ import { ConfigKey, IConfigurationService } from '../../../platform/configuratio
 import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
 import { IGitService } from '../../../platform/git/common/gitService';
 import { toGitUri } from '../../../platform/git/common/utils';
+import { ILogService } from '../../../platform/log/common/logService';
 import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
 import { disposableTimeout } from '../../../util/vs/base/common/async';
 import { isCancellationError } from '../../../util/vs/base/common/errors';
@@ -406,10 +407,10 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 		@ICopilotCLISessionService private readonly sessionService: ICopilotCLISessionService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IToolsService private readonly toolsService: IToolsService,
-		@IRunCommandExecutionService private readonly commandExecutionService: IRunCommandExecutionService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ICopilotCLISDK private readonly copilotCLISDK: ICopilotCLISDK,
+		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 	}
@@ -441,7 +442,8 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 
 			const confirmationResults = this.getAcceptedRejectedConfirmationData(request);
 			if (!chatSessionContext) {
-				/* Invoked from a 'normal' chat or 'cloud button' without CLI session context */
+				// Invoked from a 'normal' chat or 'cloud button' without CLI session context
+				// Or cases such as delegating from Regular chat to CLI chat
 				// Handle confirmation data
 				return await this.handlePushConfirmationData(request, context, stream, token);
 			}
@@ -452,7 +454,7 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 			const additionalReferences = this.previousReferences.get(id) || [];
 			this.previousReferences.delete(id);
 			const [{ prompt, attachments }, modelId, sessionAgent, defaultAgent] = await Promise.all([
-				this.promptResolver.resolvePrompt(request, additionalReferences, token),
+				this.promptResolver.resolvePrompt(request, undefined, additionalReferences, token),
 				this.getModelId(id),
 				this.copilotCLIAgents.getSessionAgent(id),
 				this.copilotCLIAgents.getDefaultAgent()
@@ -527,8 +529,8 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 		return session;
 	}
 
-	private async getModelId(sessionId: string): Promise<string | undefined> {
-		const preferredModelId = _sessionModel.get(sessionId)?.id ?? (await this.copilotCLIModels.getDefaultModel())?.id;
+	private async getModelId(sessionId: string | undefined): Promise<string | undefined> {
+		const preferredModelId = (sessionId ? _sessionModel.get(sessionId)?.id : undefined) ?? (await this.copilotCLIModels.getDefaultModel())?.id;
 		return preferredModelId ? this.copilotCLIModels.toModelProvider(preferredModelId) : undefined;
 	}
 
@@ -598,15 +600,15 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 		const isolationEnabled = this.configurationService.getConfig(ConfigKey.Advanced.CLIIsolationEnabled);
 		if (!isolationEnabled) {
 			// No isolation, proceed without worktree
-			return await this.createCLISessionAndOpen(request.prompt, request.references, context, undefined, false, stream, token);
+			return await this.createCLISessionAndSubmitRequest(request, undefined, request.references, context, undefined, false, stream, token);
 		}
 
 		// Check for uncommitted changes
 		const currentRepository = this.gitService.activeRepository?.get();
 		const hasUncommittedChanges = currentRepository?.changes && (currentRepository.changes.indexChanges.length > 0 || currentRepository.changes.workingTree.length > 0);
 		if (!hasUncommittedChanges) {
 			// No uncommitted changes, create worktree and proceed
-			return await this.createCLISessionAndOpen(request.prompt, request.references, context, undefined, true, stream, token);
+			return await this.createCLISessionAndSubmitRequest(request, undefined, request.references, context, undefined, true, stream, token);
 		}
 
 		const message =
@@ -667,7 +669,7 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 			const worktreePath = worktreePathValue ? URI.file(worktreePathValue) : undefined;
 			if (!worktreePath) {
 				stream.warning(vscode.l10n.t('Failed to create worktree. Proceeding without isolation.'));
-				return await this.createCLISessionAndOpen(prompt, references, context, undefined, false, stream, token);
+				return await this.createCLISessionAndSubmitRequest(request, prompt, references, context, undefined, false, stream, token);
 			}
 
 			// Migrate changes from active repository to worktree
@@ -713,62 +715,74 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
 				}
 			}
 
-			return await this.createCLISessionAndOpen(prompt, references, context, worktreePath, true, stream, token);
+			return await this.createCLISessionAndSubmitRequest(request, prompt, references, context, worktreePath, true, stream, token);
 		} else {
 			// Skip changes, just create worktree without migration
-			return await this.createCLISessionAndOpen(prompt, references, context, undefined, true, stream, token);
+			return await this.createCLISessionAndSubmitRequest(request, prompt, references, context, undefined, true, stream, token);
 		}
 	}
 
-	private async createCLISessionAndOpen(
-		prompt: string,
+	private async createCLISessionAndSubmitRequest(
+		request: vscode.ChatRequest,
+		userPrompt: string | undefined,
 		references: readonly vscode.ChatPromptReference[] | undefined,
 		context: vscode.ChatContext,
 		workingDirectory: Uri | undefined,
 		isolationEnabled: boolean,
 		stream: vscode.ChatResponseStream,
 		token: vscode.CancellationToken
-	): Promise<vscode.ChatResult | void> {
+	): Promise<vscode.ChatResult> {
 		let history: string | undefined;
 
 		if (this.hasHistoryToSummarize(context.history)) {
 			stream.progress(vscode.l10n.t('Analyzing chat history'));
 			history = await this.summarizer.provideChatSummary(context, token);
 		}
 
-		const requestPrompt = history ? `${prompt}\n**Summary**\n${history}` : prompt;
+		// Give priority to userPrompt if provided (e.g., from confirmation metadata)
+		userPrompt = userPrompt || request.prompt;
+		const requestPrompt = history ? `${userPrompt}\n**Summary**\n${history}` : userPrompt;
 
 		// Create worktree if isolation is enabled and we don't have one yet
-		let finalWorkingDirectory = workingDirectory;
-		if (isolationEnabled && !finalWorkingDirectory) {
+		if (isolationEnabled && !workingDirectory) {
 			const workTreePath = await this.worktreeManager.createWorktree(stream);
-			finalWorkingDirectory = workTreePath ? URI.file(workTreePath) : undefined;
+			workingDirectory = workTreePath ? URI.file(workTreePath) : undefined;
 		}
 
 		// Fallback to default directory if worktree creation failed
-		if (!finalWorkingDirectory && !isolationEnabled) {
-			finalWorkingDirectory = await this.copilotCLISDK.getDefaultWorkingDirectory();
+		if (!workingDirectory && !isolationEnabled) {
+			workingDirectory = await this.copilotCLISDK.getDefaultWorkingDirectory();
 		}
+		const [{ prompt, attachments }, model, agent] = await Promise.all([
+			this.promptResolver.resolvePrompt(request, requestPrompt, (references || []).concat([]), token),
+			this.getModelId(undefined),
+			this.copilotCLIAgents.getDefaultAgent().then(agent => this.copilotCLIAgents.resolveAgent(agent))
+		]);
 
-		const session = await this.sessionService.createSession(requestPrompt, { workingDirectory: finalWorkingDirectory, isolationEnabled }, token);
+		const session = await this.sessionService.createSession(requestPrompt, { workingDirectory, isolationEnabled, agent, model }, token);
+		this.copilotCLIAgents.trackSessionAgent(session.object.sessionId, agent?.name);
+
+		// Do not await, we want this code path to be as fast as possible.
+		if (isolationEnabled && workingDirectory) {
+			void this.worktreeManager.storeWorktreePath(session.object.sessionId, workingDirectory.fsPath);
+		}
+
+		// We don't want to block the caller anymore.
+		// The caller is most likely a chat editor or the like.
+		// Now that we've delegated it to a session, we can get out of here.
+		// Else if the request takes say 10 minutes, the caller would be blocked for that long.
+		session.object.handleRequest(request.id, prompt, attachments, model, token)
+			.catch(error => {
+				this.logService.error(`Failed to handle CLI session request: ${error}`);
+				// Optionally: stream.error(error) to notify the user
+			})
+			.finally(() => {
+				session.dispose();
+			});
 
-		if (finalWorkingDirectory) {
-			await this.worktreeManager.storeWorktreePath(session.object.sessionId, finalWorkingDirectory.fsPath);
-		}
+		stream.markdown(vscode.l10n.t('{0} agent has begun working on your request. Follow its progress in the Agents View.', 'Background Agent'));
 
-		try {
-			// Since we're going to open a new session, store the references for later use.
-			this.previousReferences.set(session.object.sessionId, (references || []).concat([]));
-			await this.commandExecutionService.executeCommand('vscode.open', SessionIdForCLI.getResource(session.object.sessionId));
-			await this.commandExecutionService.executeCommand('workbench.action.chat.submit', { inputValue: requestPrompt });
-			return {};
-		}
-		finally {
-			// The SDK doesn't save the session as no messages were added,
-			// If we dispose this here, then we will not be able to find this session later.
-			// So leave this session alive till it gets used using the `getSession` API later
-			this._register(disposableTimeout(() => session.dispose(), WAIT_FOR_NEW_SESSION_TO_GET_USED));
-		}
+		return {};
 	}
 
 	private hasHistoryToSummarize(history: readonly (vscode.ChatRequestTurn | vscode.ChatResponseTurn)[]): boolean {