Display Copilot CLI edits when resuming a session (#1754)

* Display Copilot CLI edits when resuming a session

* Fix tests

* Fix test

* Fixes

* Fixes

* Fix issues

Author: DonJayamanne

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

@@ -15,7 +15,7 @@ import { IToolsService } from '../../../tools/common/toolsService';
 import { ExternalEditTracker } from '../../common/externalEditTracker';
 import { getAffectedUrisForEditTool } from '../common/copilotcliTools';
 import { ICopilotCLISDK } from './copilotCli';
-import { buildChatHistoryFromEvents, processToolExecutionComplete, processToolExecutionStart } from './copilotcliToolInvocationFormatter';
+import { buildChatHistoryFromEvents, isCopilotCliEditToolCall, processToolExecutionComplete, processToolExecutionStart } from './copilotcliToolInvocationFormatter';
 import { getCopilotLogger } from './logger';
 import { getConfirmationToolParams, PermissionRequest } from './permissionHelpers';
 
@@ -193,12 +193,15 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 			}
 
 			case 'tool.execution_start': {
-				const responsePart = processToolExecutionStart(event, this._toolNames, this._pendingToolInvocations);
-				const toolName = this._toolNames.get(event.data.toolCallId);
+				this._toolNames.set(event.data.toolCallId, event.data.toolName);
+				const responsePart = processToolExecutionStart(event, this._pendingToolInvocations);
+				if (isCopilotCliEditToolCall(event.data.toolName, event.data.arguments)) {
+					this._pendingToolInvocations.delete(event.data.toolCallId);
+				}
 				if (responsePart instanceof ChatResponseThinkingProgressPart) {
 					stream.push(responsePart);
 				}
-				this.logService.trace(`Start Tool ${toolName || '<unknown>'}`);
+				this.logService.trace(`Start Tool ${event.data.toolName || '<unknown>'}`);
 				break;
 			}
 

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

@@ -3,14 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ModelProvider, Session, SessionManager } from '@github/copilot/sdk';
+import type { ModelProvider, Session, SessionManager, internal } from '@github/copilot/sdk';
 import { ChatCompletionMessageParam } from 'openai/resources/chat/completions';
 import type { CancellationToken, ChatRequest } from 'vscode';
 import { ILogService } from '../../../../platform/log/common/logService';
 import { createServiceIdentifier } from '../../../../util/common/services';
 import { coalesce } from '../../../../util/vs/base/common/arrays';
 import { raceCancellationError } 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, DisposableStore, IDisposable, toDisposable } from '../../../../util/vs/base/common/lifecycle';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
 import { ChatSessionStatus } from '../../../../vscodeTypes';
@@ -51,7 +52,7 @@ export const ICopilotCLISessionService = createServiceIdentifier<ICopilotCLISess
 export class CopilotCLISessionService extends Disposable implements ICopilotCLISessionService {
 	declare _serviceBrand: undefined;
 
-	private _sessionManager: SessionManager | undefined;
+	private _sessionManager: Lazy<Promise<internal.CLISessionManager>>;
 	private _sessionWrappers = new DisposableMap<string, CopilotCLISession>();
 	private _newActiveSessions = new Map<string, ICopilotCLISessionItem>();
 
@@ -65,16 +66,17 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
-	}
 
-	public async getSessionManager(): Promise<SessionManager> {
-		if (!this._sessionManager) {
+		this._sessionManager = new Lazy<Promise<internal.CLISessionManager>>(async () => {
 			const { internal } = await this.copilotCLISDK.getPackage();
-			this._sessionManager = new internal.CLISessionManager({
+			return new internal.CLISessionManager({
 				logger: getCopilotLogger(this.logService)
 			});
-		}
-		return this._sessionManager;
+		});
+	}
+
+	async getSessionManager() {
+		return this._sessionManager.value;
 	}
 
 	private _getAllSessionsProgress: Promise<readonly ICopilotCLISessionItem[]> | undefined;

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

@@ -133,7 +133,6 @@ export function buildChatHistoryFromEvents(events: readonly SessionEvent[]): (Ch
 	const turns: (ChatRequestTurn2 | ChatResponseTurn2)[] = [];
 	let currentResponseParts: ExtendedChatResponsePart[] = [];
 	const pendingToolInvocations = new Map<string, ChatToolInvocationPart>();
-	const toolNames = new Map<string, string>();
 
 	for (const event of events) {
 		switch (event.type) {
@@ -172,7 +171,7 @@ export function buildChatHistoryFromEvents(events: readonly SessionEvent[]): (Ch
 				break;
 			}
 			case 'tool.execution_start': {
-				const responsePart = processToolExecutionStart(event, toolNames, pendingToolInvocations);
+				const responsePart = processToolExecutionStart(event, pendingToolInvocations);
 				if (responsePart instanceof ChatResponseThinkingProgressPart) {
 					currentResponseParts.push(responsePart);
 				}
@@ -196,13 +195,12 @@ export function buildChatHistoryFromEvents(events: readonly SessionEvent[]): (Ch
 	return turns;
 }
 
-export function processToolExecutionStart(event: ToolExecutionStartEvent, toolNames: Map<string, string>, pendingToolInvocations: Map<string, ChatToolInvocationPart | ChatResponseThinkingProgressPart>): ChatToolInvocationPart | ChatResponseThinkingProgressPart | undefined {
+export function processToolExecutionStart(event: ToolExecutionStartEvent, pendingToolInvocations: Map<string, ChatToolInvocationPart | ChatResponseThinkingProgressPart>): ChatToolInvocationPart | ChatResponseThinkingProgressPart | undefined {
 	const toolInvocation = createCopilotCLIToolInvocation(
 		event.data.toolName,
 		event.data.toolCallId,
 		event.data.arguments
 	);
-	toolNames.set(event.data.toolCallId, event.data.toolName);
 	if (toolInvocation) {
 		// Store pending invocation to update with result later
 		pendingToolInvocations.set(event.data.toolCallId, toolInvocation);
@@ -239,9 +237,6 @@ export function createCopilotCLIToolInvocation(
 	if (toolName === CopilotCLIToolNames.ReportIntent) {
 		return undefined; // Ignore these for now
 	}
-	if (isCopilotCliEditToolCall(toolName, args)) {
-		return undefined;
-	}
 	if (toolName === CopilotCLIToolNames.Think) {
 		const thought = (args as { thought?: string })?.thought;
 		if (thought && typeof thought === 'string') {
@@ -255,8 +250,8 @@ export function createCopilotCLIToolInvocation(
 	invocation.isComplete = false;
 
 	// Format based on tool name
-	if (toolName === CopilotCLIToolNames.StrReplaceEditor && (args as StrReplaceEditorArgs)?.command === 'view') {
-		formatViewToolInvocation(invocation, args as StrReplaceEditorArgs);
+	if (toolName === CopilotCLIToolNames.StrReplaceEditor) {
+		formatStrReplaceEditorInvocation(invocation, args as StrReplaceEditorArgs);
 	} else if (toolName === CopilotCLIToolNames.Bash) {
 		formatBashInvocation(invocation, args as BashArgs);
 	} else if (toolName === CopilotCLIToolNames.View) {
@@ -272,9 +267,38 @@ function formatViewToolInvocation(invocation: ChatToolInvocationPart, args: StrR
 	const path = args.path ?? '';
 	const display = path ? formatUriForMessage(path) : '';
 
-	invocation.invocationMessage = new MarkdownString(l10n.t("Read {0}", display));
+	invocation.invocationMessage = new MarkdownString(l10n.t("Viewed {0}", display));
 }
 
+function formatStrReplaceEditorInvocation(invocation: ChatToolInvocationPart, args: StrReplaceEditorArgs): void {
+	const command = args.command;
+	const path = args.path ?? '';
+	const display = path ? formatUriForMessage(path) : '';
+
+	switch (command) {
+		case 'view':
+			if (args.view_range) {
+				invocation.invocationMessage = new MarkdownString(l10n.t("Viewed {0} (lines {1}-{2})", display, args.view_range[0], args.view_range[1]));
+			} else {
+				invocation.invocationMessage = new MarkdownString(l10n.t("Viewed {0}", display));
+			}
+			break;
+		case 'str_replace':
+			invocation.invocationMessage = new MarkdownString(l10n.t("Edited {0}", display));
+			break;
+		case 'insert':
+			invocation.invocationMessage = new MarkdownString(l10n.t("Inserted text in {0}", display));
+			break;
+		case 'create':
+			invocation.invocationMessage = new MarkdownString(l10n.t("Created {0}", display));
+			break;
+		case 'undo_edit':
+			invocation.invocationMessage = new MarkdownString(l10n.t("Undid edit in {0}", display));
+			break;
+		default:
+			invocation.invocationMessage = new MarkdownString(l10n.t("Modified {0}", display));
+	}
+}
 
 function formatBashInvocation(invocation: ChatToolInvocationPart, args: BashArgs): void {
 	const command = args.command ?? '';

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

@@ -50,7 +50,7 @@ describe('copilotcliToolInvocationFormatter', () => {
 		const invocation = createCopilotCLIToolInvocation(CopilotCLIToolNames.StrReplaceEditor, 'id3', { command: 'view', path: '/tmp/file.ts', view_range: [1, 5] }) as ChatToolInvocationPart;
 		expect(invocation).toBeInstanceOf(ChatToolInvocationPart);
 		const msg = typeof invocation.invocationMessage === 'string' ? invocation.invocationMessage : invocation.invocationMessage?.value;
-		expect(msg).toMatch(/Read/);
+		expect(msg).toMatch(/Viewed/);
 		expect(msg).toMatch(/file.ts/);
 	});
 
@@ -73,9 +73,8 @@ describe('copilotcliToolInvocationFormatter', () => {
 
 	it('processToolExecutionStart stores invocation and processToolExecutionComplete updates status on success', () => {
 		const pending = new Map<string, ChatToolInvocationPart | ChatResponseThinkingProgressPart>();
-		const names = new Map<string, string>();
 		const startEvt: ToolExecutionStart = { type: 'tool.execution_start', data: { toolName: CopilotCLIToolNames.View, toolCallId: 'call-1', arguments: { command: 'view', path: '/x.ts' } } };
-		const part = processToolExecutionStart(startEvt as any, names, pending);
+		const part = processToolExecutionStart(startEvt as any, pending);
 		expect(part).toBeInstanceOf(ChatToolInvocationPart);
 		const completeEvt: ToolExecutionComplete = { type: 'tool.execution_complete', data: { toolCallId: 'call-1', success: true } };
 		const completed = processToolExecutionComplete(completeEvt as any, pending) as ChatToolInvocationPart;
@@ -86,9 +85,8 @@ describe('copilotcliToolInvocationFormatter', () => {
 
 	it('processToolExecutionComplete marks rejected error invocation', () => {
 		const pending = new Map<string, ChatToolInvocationPart | ChatResponseThinkingProgressPart>();
-		const names = new Map<string, string>();
 		const startEvt: ToolExecutionStart = { type: 'tool.execution_start', data: { toolName: CopilotCLIToolNames.View, toolCallId: 'call-err', arguments: { command: 'view', path: '/y.ts' } } };
-		const part = processToolExecutionStart(startEvt as any, names, pending) as ChatToolInvocationPart;
+		const part = processToolExecutionStart(startEvt as any, pending) as ChatToolInvocationPart;
 		expect(part).toBeInstanceOf(ChatToolInvocationPart);
 		const completeEvt: ToolExecutionComplete = { type: 'tool.execution_complete', data: { toolCallId: 'call-err', success: false, error: { code: 'rejected', message: 'Denied' } } };
 		const completed = processToolExecutionComplete(completeEvt as any, pending) as ChatToolInvocationPart;