[pull] main from microsoft:main

extensions/copilot/CONTRIBUTING.md

@@ -380,7 +380,7 @@ Object.assign(product, {
 			'publicCodeMatchesUrl': 'https://aka.ms/github-copilot-match-public-code',
 			'manageSettingsUrl': 'https://aka.ms/github-copilot-settings',
 			'managePlanUrl': 'https://aka.ms/github-copilot-manage-plan',
-			'manageAdditionalSpendUrl': 'https://aka.ms/github-copilot-manage-overage',
+			'manageOverageUrl': 'https://aka.ms/github-copilot-manage-overage',
 			'upgradePlanUrl': 'https://aka.ms/github-copilot-upgrade-plan',
 			'signUpUrl': 'https://aka.ms/github-sign-up',
 			'provider': {

extensions/copilot/package.json

@@ -6544,7 +6544,7 @@
 		"@anthropic-ai/claude-agent-sdk": "0.2.112",
 		"@anthropic-ai/sdk": "^0.82.0",
 		"@github/blackbird-external-ingest-utils": "^0.3.0",
-		"@github/copilot": "1.0.34",
+		"@github/copilot": "^1.0.39",
 		"@google/genai": "^1.22.0",
 		"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
 		"@microsoft/tiktokenizer": "^1.0.10",

extensions/copilot/src/extension/chatInputNotification/vscode-node/chatInputNotification.contribution.ts

@@ -160,14 +160,14 @@ export class ChatInputNotificationContribution extends Disposable {
 			notification.message = vscode.l10n.t('Monthly Limit Reached');
 			notification.description = vscode.l10n.t("You've made the most of Copilot. Sign in to keep going.");
 			notification.actions = [
-				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.upgradePlan' },
+				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
 				{ label: vscode.l10n.t('Sign In'), commandId: 'workbench.action.chat.triggerSetup' },
 			];
 		} else {
 			notification.message = vscode.l10n.t('Monthly Limit Reached');
 			notification.description = vscode.l10n.t("You've made the most of Copilot Free. Upgrade to keep going.");
 			notification.actions = [
-				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.upgradePlan' },
+				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
 				{ label: vscode.l10n.t('Upgrade'), commandId: 'workbench.action.chat.upgradePlan' },
 			];
 		}
@@ -187,7 +187,7 @@ export class ChatInputNotificationContribution extends Disposable {
 		notification.message = vscode.l10n.t('Monthly Limit at {0}%', warning.percentUsed);
 		notification.description = vscode.l10n.t("You're getting the most out of Copilot \u2014 upgrade to keep going.");
 		notification.actions = [
-			{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.upgradePlan' },
+			{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
 			{ label: vscode.l10n.t('Upgrade'), commandId: 'workbench.action.chat.upgradePlan' },
 		];
 

extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotCli.ts

@@ -19,6 +19,7 @@ import { createServiceIdentifier } from '../../../../util/common/services';
 import { Emitter, Event } from '../../../../util/vs/base/common/event';
 import { Lazy } from '../../../../util/vs/base/common/lazy';
 import { Disposable } from '../../../../util/vs/base/common/lifecycle';
+import { ResourceSet } from '../../../../util/vs/base/common/map';
 import { basename } from '../../../../util/vs/base/common/resources';
 import { URI } from '../../../../util/vs/base/common/uri';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
@@ -382,10 +383,13 @@ export class CopilotCLIAgents extends Disposable implements ICopilotCLIAgents {
 
 	async getAgentsImpl(): Promise<readonly CLIAgentInfo[]> {
 		const merged = new Map<string, CLIAgentInfo>();
+		const knownAgents = new ResourceSet();
 		for (const agent of await this.getSDKAgents()) {
+			const sourceUri = agent.path ? URI.file(agent.path) : URI.from({ scheme: 'copilotcli', path: `/agents/${agent.name}` });
+			knownAgents.add(sourceUri);
 			merged.set(agent.name.toLowerCase(), {
 				agent: this.cloneAgent(agent),
-				sourceUri: URI.from({ scheme: 'copilotcli', path: `/agents/${agent.name}` }),
+				sourceUri,
 			});
 		}
 		for (const customAgent of await this.promptsService.getCustomAgents(CancellationToken.None)) {
@@ -397,6 +401,9 @@ export class CopilotCLIAgents extends Disposable implements ICopilotCLIAgents {
 			if (customAgent.uri.path.toLowerCase().endsWith('.chatmode.md')) {
 				continue;
 			}
+			if (knownAgents.has(customAgent.uri)) {
+				continue;
+			}
 			const info = this.toCustomAgent(customAgent);
 			if (!info) {
 				continue;

extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotcliSession.ts

@@ -685,7 +685,7 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 				// Auto-approve all requests when the permission level allows it.
 				if (this._permissionLevel === 'autoApprove' || this._permissionLevel === 'autopilot') {
 					this.logService.trace(`[CopilotCLISession] Auto Approving ${permissionRequest.kind} request (permission level: ${this._permissionLevel})`);
-					this._sdkSession.respondToPermission(requestId, { kind: 'approved' });
+					this._sdkSession.respondToPermission(requestId, { kind: 'approve-once' });
 					return;
 				}
 
@@ -730,7 +730,7 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 					let response: PermissionRequestResult;
 					if (this._permissionLevel === 'autoApprove' || this._permissionLevel === 'autopilot') {
 						this.logService.trace(`[CopilotCLISession] Auto Approving ${permissionRequest.kind} request (permission level: ${this._permissionLevel})`);
-						response = { kind: 'approved' };
+						response = { kind: 'approve-once' };
 					} else if (this._mcState) {
 						const permissionResolutionTokenSource = new CancellationTokenSource(token);
 						try {
@@ -1846,7 +1846,7 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 							logService.warn(`[CopilotCLISession] No pending MC permission request found for prompt ${promptId}`);
 							break;
 						}
-						pendingRequest.resolve(responseData?.approved ? { kind: 'approved' } : { kind: 'denied-interactively-by-user' });
+						pendingRequest.resolve(responseData?.approved ? { kind: 'approve-once' } : { kind: 'denied-interactively-by-user' });
 						break;
 					}
 					case 'user_message':

extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotcliSessionService.ts

@@ -1235,6 +1235,7 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 	}
 
 	private createCopilotSession(sdkSession: Session, workspaceInfo: IWorkspaceInfo, agentName: string | undefined, sessionManager: internal.LocalSessionManager): RefCountedSession {
+		sdkSession.setPermissionsRequired(true);
 		const session = this.instantiationService.createInstance(CopilotCLISession, workspaceInfo, agentName, sdkSession, []);
 		this._debugFileLogger.startSession(session.sessionId).catch(err => {
 			this.logService.error('[CopilotCLISession] Failed to start debug log session', err);

extensions/copilot/src/extension/chatSessions/copilotcli/node/permissionHelpers.ts

@@ -66,30 +66,30 @@ export async function handleReadPermission(
 	const file = Uri.file(permissionRequest.path);
 
 	if (imageSupport.isTrustedImage(file)) {
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 
 	if (isFileFromSessionWorkspace(file, workspaceInfo)) {
 		logService.trace(`[CopilotCLISession] Auto Approving request to read file in session workspace ${permissionRequest.path}`);
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 
 	if (workspaceService.getWorkspaceFolder(file)) {
 		logService.trace(`[CopilotCLISession] Auto Approving request to read workspace file ${permissionRequest.path}`);
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 
 	// Auto-approve reads of internal session resources (e.g. plan.md).
 	const sessionDir = Uri.joinPath(Uri.file(getCopilotCLISessionStateDir()), sessionId);
 	if (extUriBiasedIgnorePathCase.isEqualOrParent(file, sessionDir)) {
 		logService.trace(`[CopilotCLISession] Auto Approving request to read Copilot CLI session resource ${permissionRequest.path}`);
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 
 	// Auto-approve if the file was explicitly attached by the user.
 	if (attachments.some(attachment => attachment.type === 'file' && isEqual(Uri.file(attachment.path), file))) {
 		logService.trace(`[CopilotCLISession] Auto Approving request to read attached file ${permissionRequest.path}`);
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 
 	const toolParams: CoreConfirmationToolParams = {
@@ -149,15 +149,15 @@ export async function handleWritePermission(
 		if (autoApprove) {
 			logService.trace(`[CopilotCLISession] Auto Approving request ${editFile.fsPath}`);
 			await trackEditIfNeeded(editTracker, toolCall, editFile, stream, logService);
-			return { kind: 'approved' };
+			return { kind: 'approve-once' };
 		}
 	}
 
 	// Auto-approve writes to internal session resources (e.g. plan.md).
 	const sessionDir = Uri.joinPath(Uri.file(getCopilotCLISessionStateDir()), sessionId);
 	if (editFile && extUriBiasedIgnorePathCase.isEqualOrParent(editFile, sessionDir)) {
 		logService.trace(`[CopilotCLISession] Auto Approving request to write to Copilot CLI session resource ${editFile.fsPath}`);
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 
 	// Fall back to interactive confirmation. If approved, track the edit.
@@ -174,10 +174,10 @@ export async function handleWritePermission(
 		if (editFile) {
 			await trackEditIfNeeded(editTracker, toolCall, editFile, stream, logService);
 		}
-		return { kind: 'approved' };
+		return { kind: 'approve-once' };
 	}
 	const result = await invokeConfirmationTool(toolParams, toolParentCallId, toolsService, toolInvocationToken, logService, token);
-	if (result.kind === 'approved' && editFile) {
+	if (result.kind === 'approve-once' && editFile) {
 		await trackEditIfNeeded(editTracker, toolCall, editFile, stream, logService);
 	}
 	return result;
@@ -282,7 +282,7 @@ async function invokeConfirmationTool(
 		const result = await toolsService.invokeTool(tool, { input, toolInvocationToken, subAgentInvocationId: toolParentCallId }, token);
 		const firstResultPart = result.content.at(0);
 		if (firstResultPart instanceof LanguageModelTextPart && typeof firstResultPart.value === 'string' && firstResultPart.value.toLowerCase() === 'yes') {
-			return { kind: 'approved' };
+			return { kind: 'approve-once' };
 		}
 	} catch (error) {
 		logService.error(error, `[CopilotCLISession] Permission request error`);