Updates (#1745)

Author: DonJayamanne

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

@@ -4,31 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ModelProvider } from '@github/copilot/sdk';
+import * as l10n from '@vscode/l10n';
 import type * as vscode from 'vscode';
 import { ILogService } from '../../../../platform/log/common/logService';
 import { Disposable } from '../../../../util/vs/base/common/lifecycle';
-import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
 import { CopilotCLIPromptResolver } from './copilotcliPromptResolver';
-import { CopilotCLISession } from './copilotcliSession';
 import { ICopilotCLISessionService } from './copilotcliSessionService';
 
 export class CopilotCLIAgentManager extends Disposable {
 	constructor(
 		private readonly promptResolver: CopilotCLIPromptResolver,
 		@ILogService private readonly logService: ILogService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ICopilotCLISessionService private readonly sessionService: ICopilotCLISessionService,
 	) {
 		super();
 	}
 
-	/**
-	 * Find session by SDK session ID
-	 */
-	public findSession(sessionId: string): CopilotCLISession | undefined {
-		return this.sessionService.findSessionWrapper<CopilotCLISession>(sessionId);
-	}
-
 	async handleRequest(
 		copilotcliSessionId: string | undefined,
 		request: vscode.ChatRequest,
@@ -43,14 +34,15 @@ export class CopilotCLIAgentManager extends Disposable {
 
 		const { prompt, attachments } = await this.promptResolver.resolvePrompt(request, token);
 		// Check if we already have a session wrapper
-		let session = copilotcliSessionId ? this.sessionService.findSessionWrapper<CopilotCLISession>(copilotcliSessionId) : undefined;
+		let session = copilotcliSessionId ? await this.sessionService.getSession(copilotcliSessionId, modelId, false, token) : undefined;
 
 		if (session) {
 			this.logService.trace(`[CopilotCLIAgentManager] Reusing CopilotCLI session ${copilotcliSessionId}.`);
+		} else if (copilotcliSessionId) {
+			stream.warning(l10n.t('Chat session not found.'));
+			return { copilotcliSessionId: undefined };
 		} else {
-			const sdkSession = await this.sessionService.getOrCreateSDKSession(copilotcliSessionId, prompt);
-			session = this.instantiationService.createInstance(CopilotCLISession, sdkSession);
-			this.sessionService.trackSessionWrapper(sdkSession.sessionId, session);
+			session = await this.sessionService.createSession(prompt, modelId, token);
 		}
 
 		await session.invoke(prompt, attachments, request.toolInvocationToken, stream, modelId, workingDirectory, token);

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

@@ -10,12 +10,12 @@ import { ILogService } from '../../../../platform/log/common/logService';
 import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
 import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
 import { DisposableStore } from '../../../../util/vs/base/common/lifecycle';
-import { ChatResponseThinkingProgressPart, ChatSessionStatus, EventEmitter, LanguageModelTextPart } from '../../../../vscodeTypes';
+import { ChatRequestTurn2, ChatResponseThinkingProgressPart, ChatResponseTurn2, ChatSessionStatus, EventEmitter, LanguageModelTextPart } from '../../../../vscodeTypes';
 import { IToolsService } from '../../../tools/common/toolsService';
 import { ExternalEditTracker } from '../../common/externalEditTracker';
 import { getAffectedUrisForEditTool } from '../common/copilotcliTools';
 import { ICopilotCLISDK } from './copilotCli';
-import { processToolExecutionComplete, processToolExecutionStart } from './copilotcliToolInvocationFormatter';
+import { buildChatHistoryFromEvents, processToolExecutionComplete, processToolExecutionStart } from './copilotcliToolInvocationFormatter';
 import { getCopilotLogger } from './logger';
 import { getConfirmationToolParams, PermissionRequest } from './permissionHelpers';
 
@@ -32,6 +32,14 @@ export class CopilotCLISession extends DisposableStore {
 
 	public readonly onDidChangeStatus = this._statusChange.event;
 
+	private _aborted?: boolean;
+	public get aborted(): boolean {
+		return this._aborted ?? false;
+	}
+	private readonly _onDidAbort = this.add(new EventEmitter<void>());
+
+	public readonly onDidAbort = this._onDidAbort.event;
+
 	constructor(
 		private readonly _sdkSession: Session,
 		@ILogService private readonly logService: ILogService,
@@ -128,6 +136,28 @@ export class CopilotCLISession extends DisposableStore {
 		}
 	}
 
+	addUserMessage(content: string) {
+		this._sdkSession.addEvent({ type: 'user.message', data: { content } });
+	}
+
+	addUserAssistantMessage(content: string) {
+		this._sdkSession.addEvent({
+			type: 'assistant.message', data: {
+				messageId: `msg_${Date.now()}`,
+				content
+			}
+		});
+	}
+
+	public getSelectedModelId() {
+		return this._sdkSession.getSelectedModel();
+	}
+
+	public async getChatHistory(): Promise<(ChatRequestTurn2 | ChatResponseTurn2)[]> {
+		const events = await this._sdkSession.getEvents();
+		return buildChatHistoryFromEvents(events);
+	}
+
 	private _toolNames = new Map<string, string>();
 	private _processEvent(
 		event: SessionEvent,