Update github/copilot package with changes to load history (#1378)

* Reapply "Update @github/copilot package (#1372)" (#1376)

This reverts commit 1ec7602.

* Update version of github copilot

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

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

* include copilotCLIShim

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Peng Lyu <penn.lv@gmail.com>

Author: 3 people

.vscodeignore

@@ -15,6 +15,7 @@ assets/walkthroughs/**
 !dist/diffWorker.js
 !dist/webview.js
 !dist/copilotDebugCommand.js
+!dist/copilotCLIShim.js
 !dist/cli.js
 !node_modules/@vscode/copilot-typescript-server-plugin/package.json
 !node_modules/@vscode/copilot-typescript-server-plugin/dist/*.js

package-lock.json

@@ -4236,6 +4236,7 @@
 		"@types/tar": "^6.1.13",
 		"@types/vinyl": "^2.0.12",
 		"@types/vscode": "^1.102.0",
+		"@types/yargs": "^17.0.24",
 		"@typescript-eslint/eslint-plugin": "^8.35.0",
 		"@typescript-eslint/parser": "^8.32.0",
 		"@typescript-eslint/typescript-estree": "^8.26.1",
@@ -4285,6 +4286,7 @@
 		"react-dom": "17.0.2",
 		"rimraf": "^6.0.1",
 		"run-script-os": "^1.1.6",
+		"shiki": "~1.15.0",
 		"sinon": "^21.0.0",
 		"source-map-support": "^0.5.21",
 		"tar": "^7.4.3",
@@ -4300,14 +4302,12 @@
 		"vscode-languageserver-textdocument": "^1.0.12",
 		"vscode-languageserver-types": "^3.17.5",
 		"yaml": "^2.8.0",
-		"yargs": "^17.7.2",
-		"@types/yargs": "^17.0.24",
-		"shiki": "~1.15.0"
+		"yargs": "^17.7.2"
 	},
 	"dependencies": {
 		"@anthropic-ai/claude-code": "^1.0.120",
 		"@anthropic-ai/sdk": "^0.63.0",
-		"@github/copilot": "^0.0.338",
+		"@github/copilot": "^0.0.342",
 		"@google/genai": "^1.22.0",
 		"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
 		"@microsoft/tiktokenizer": "^1.0.10",

package.json

@@ -76,8 +76,8 @@ export class CopilotCLISessionService implements ICopilotCLISessionService {
 				// @github/copilot has hardcoded: import{spawn}from"node-pty"
 				await ensureNodePtyShim(this.extensionContext.extensionPath, this.envService.appRoot);
 
-				const { SessionManager } = await import('@github/copilot/sdk');
-				this._sessionManager = new SessionManager({
+				const { internal } = await import('@github/copilot/sdk');
+				this._sessionManager = new internal.CLISessionManager({
 					logger: {
 						isDebug: () => false,
 						debug: (msg: string) => this.logService.debug(msg),
@@ -209,6 +209,7 @@ export class CopilotCLISessionService implements ICopilotCLISessionService {
 			// Clean up local caches
 			this._sessions.delete(sessionId);
 			this._sessionWrappers.deleteAndDispose(sessionId);
+			this._onDidChangeSessions.fire();
 
 			return true;
 		} catch (error) {
@@ -219,7 +220,7 @@ export class CopilotCLISessionService implements ICopilotCLISessionService {
 
 	private async _generateSessionLabel(sdkSession: Session, prompt: string | undefined): Promise<string> {
 		try {
-			const chatMessages = sdkSession.chatMessages;
+			const chatMessages = await sdkSession.getChatMessages();
 
 			// Find the first user message
 			const firstUserMessage = chatMessages.find(msg => msg.role === 'user');

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

@@ -5,11 +5,34 @@
 
 import type { SDKEvent } from '@github/copilot/sdk';
 import * as l10n from '@vscode/l10n';
-import type { ChatCompletionMessageParam } from 'openai/resources/chat/completions';
 import type { ExtendedChatResponsePart } from 'vscode';
 import { URI } from '../../../../util/vs/base/common/uri';
 import { ChatRequestTurn2, ChatResponseMarkdownPart, ChatResponseThinkingProgressPart, ChatResponseTurn2, ChatToolInvocationPart, MarkdownString } from '../../../../vscodeTypes';
 
+type ChatCompletionRole = 'system' | 'user' | 'assistant' | 'tool' | (string & {});
+
+interface ChatCompletionMessageFunctionCall {
+	name: string;
+	arguments?: string;
+}
+
+interface ChatCompletionMessageToolCallLike {
+	id?: string;
+	type?: string;
+	function?: ChatCompletionMessageFunctionCall;
+}
+
+interface ChatCompletionMessageParamLike {
+	role: ChatCompletionRole;
+	content?: unknown;
+	tool_calls?: readonly ChatCompletionMessageToolCallLike[];
+	tool_call_id?: string;
+}
+
+function isUserOrAssistantRole(role: ChatCompletionRole): role is 'user' | 'assistant' {
+	return role === 'user' || role === 'assistant';
+}
+
 /**
  * CopilotCLI tool names
  */
@@ -51,12 +74,12 @@ function resolveContentToString(content: unknown): string {
  * Parse chat messages from the CopilotCLI SDK into SDKEvent format
  * Used when loading session history from disk
  */
-export function parseChatMessagesToEvents(chatMessages: readonly ChatCompletionMessageParam[]): SDKEvent[] {
+export function parseChatMessagesToEvents(chatMessages: readonly ChatCompletionMessageParamLike[]): SDKEvent[] {
 	const events: SDKEvent[] = [];
 
 	for (const msg of chatMessages) {
 		// Handle regular messages (user or assistant)
-		if (msg.role === 'user' || msg.role === 'assistant') {
+		if (isUserOrAssistantRole(msg.role)) {
 			if (msg.content) {
 				events.push({
 					type: 'message' as const,

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

@@ -6,7 +6,7 @@
 import { promises as fs } from 'fs';
 import * as path from 'path';
 
-let shimCreated = false;
+let shimCreated: Promise<void> | undefined = undefined;
 
 /**
  * Creates a node-pty ESM shim that @github/copilot can import.
@@ -21,9 +21,14 @@ let shimCreated = false;
  */
 export async function ensureNodePtyShim(extensionPath: string, vscodeAppRoot: string): Promise<void> {
 	if (shimCreated) {
-		return;
+		return shimCreated;
 	}
 
+	shimCreated = _ensureNodePtyShim(extensionPath, vscodeAppRoot);
+	return shimCreated;
+}
+
+async function _ensureNodePtyShim(extensionPath: string, vscodeAppRoot: string): Promise<void> {
 	const nodePtyDir = path.join(extensionPath, 'node_modules', 'node-pty');
 	const vscodeNodePtyPath = path.join(vscodeAppRoot, 'node_modules', 'node-pty', 'lib', 'index.js');
 
@@ -70,7 +75,6 @@ export default nodePty;
 `;
 		await fs.writeFile(path.join(nodePtyDir, 'index.mjs'), indexMjs);
 
-		shimCreated = true;
 	} catch (error) {
 		console.warn('Failed to create node-pty shim:', error);
 		throw error;

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { ChatExtendedRequestHandler } from 'vscode';
+import { ChatExtendedRequestHandler, l10n } from 'vscode';
 import { isLocation } from '../../../util/common/types';
 import { Emitter, Event } from '../../../util/vs/base/common/event';
 import { Disposable, DisposableStore, IDisposable } from '../../../util/vs/base/common/lifecycle';
@@ -78,7 +78,7 @@ export class CopilotCLIChatSessionContentProvider implements vscode.ChatSessionC
 	async provideChatSessionContent(copilotcliSessionId: string, token: vscode.CancellationToken): Promise<vscode.ChatSession> {
 		const existingSession = copilotcliSessionId && await this.sessionService.getSession(copilotcliSessionId, token);
 		const sdkSession = existingSession ? existingSession.sdkSession : undefined;
-		const chatMessages = sdkSession?.chatMessages || [];
+		const chatMessages = sdkSession ? await sdkSession.getChatMessages() : [];
 		const events = parseChatMessagesToEvents(chatMessages);
 
 		const history = existingSession ? buildChatHistoryFromEvents(events) : [];
@@ -214,15 +214,16 @@ export function registerCLIChatCommands(copilotcliSessionItemProvider: CopilotCL
 	}));
 	disposableStore.add(vscode.commands.registerCommand('github.copilot.cli.sessions.delete', async (sessionItem?: vscode.ChatSessionItem) => {
 		if (sessionItem?.id) {
+			const deleteLabel = l10n.t('Delete');
 			const result = await vscode.window.showWarningMessage(
-				`Are you sure you want to delete the session?`,
+				l10n.t('Are you sure you want to delete the session?'),
 				{ modal: true },
-				'Delete',
-				'Cancel'
+				deleteLabel
 			);
 
-			if (result === 'Delete') {
+			if (result === deleteLabel) {
 				await copilotCLISessionService.deleteSession(sessionItem.id);
+				copilotcliSessionItemProvider.refresh();
 			}
 		}
 	}));

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

@@ -13,7 +13,7 @@
 # NOTE: This file intentionally keeps logic self‑contained (no external deps) so it can be dropped into PATH directly.
 
 # Minimum required Copilot CLI version
-$RequiredVersion = "0.0.339"
+$RequiredVersion = "0.0.342"
 
 function Find-RealCopilot {
     # Find the real copilot binary, avoiding this script if it's in PATH

src/extension/chatSessions/vscode-node/copilotCLIShim.ps1

@@ -29,7 +29,7 @@ import * as path from '../../../util/vs/base/common/path';
  * NOTE: This file intentionally keeps logic self‑contained (no external deps) so it can be dropped into PATH directly.
  */
 
-const REQUIRED_VERSION = '0.0.339';
+const REQUIRED_VERSION = '0.0.342';
 const PACKAGE_NAME = '@github/copilot';
 const env = { ...process.env, PATH: (process.env.PATH || '').replaceAll(`${__dirname}${path.delimiter}`, '').replaceAll(`${path.delimiter}${__dirname}`, '') };