[pull] main from microsoft:main

README.md

@@ -25,7 +25,7 @@ There are many ways in which you can participate in this project, for example:
 
 * [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues), and help us verify as they are checked in
 * Review [source code changes](https://github.com/microsoft/vscode/pulls)
-* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to and new content.
+* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to new content.
 
 If you are interested in fixing issues and contributing directly to the code base,
 please see the document [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute), which covers the following:

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

@@ -162,6 +162,9 @@ export class CopilotCLIModels extends Disposable implements ICopilotCLIModels {
 			} satisfies CopilotCLIModelInfo));
 		} catch (ex) {
 			this.logService.error(`[CopilotCLISession] Failed to fetch models`, ex);
+			// Clear cached promise so subsequent calls retry instead of
+			// permanently returning an empty list after a transient failure.
+			this._availableModels = undefined;
 			return [];
 		}
 	}
@@ -280,8 +283,9 @@ export interface CLIAgentInfo {
 	readonly agent: Readonly<SweCustomAgent>;
 	/** File URI for prompt-file agents, synthetic `copilotcli:` URI for SDK-only agents. */
 	readonly sourceUri: URI;
-	readonly extensionId?: string;
-	readonly pluginUri?: URI;
+	readonly source: vscode.ChatResourceSource;
+	readonly extensionId: string | undefined;
+	readonly pluginUri: URI | undefined;
 }
 
 export interface ICopilotCLIAgents {
@@ -374,7 +378,7 @@ export class CopilotCLIAgents extends Disposable implements ICopilotCLIAgents {
 			});
 		}
 
-		return this._agentsPromise.then(infos => infos.map(i => ({ agent: this.cloneAgent(i.agent), sourceUri: i.sourceUri })));
+		return this._agentsPromise.then(infos => infos.map(i => ({ agent: this.cloneAgent(i.agent), sourceUri: i.sourceUri, source: i.source, extensionId: i.extensionId, pluginUri: i.pluginUri })));
 	}
 
 	async getAgentsImpl(): Promise<readonly CLIAgentInfo[]> {
@@ -435,6 +439,9 @@ export class CopilotCLIAgents extends Disposable implements ICopilotCLIAgents {
 				...(model ? { model } : {}),
 			},
 			sourceUri: customAgent.uri,
+			source: customAgent.source,
+			extensionId: customAgent.extensionId,
+			pluginUri: customAgent.pluginUri
 		};
 	}
 
@@ -563,7 +570,12 @@ export class CopilotCLISDK implements ICopilotCLISDK {
 				host: 'https://github.com',
 				copilotUser: {
 					endpoints: {
-						api: overrideProxyUrl
+						api: overrideProxyUrl,
+						// `proxy` must also point at the mock server so that SDK
+						// calls to /copilot_internal/v2/token and /models/session
+						// are routed to the mock instead of the real GitHub API
+						// (which would reject the fake HMAC with a 401).
+						proxy: overrideProxyUrl,
 					}
 				}
 			};

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

@@ -1037,6 +1037,9 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 				shutdown = sessionManager.closeSession(sessionId).catch(error => {
 					this.logService.error(`[CopilotCLISession] Failed to close session ${sessionId} after fetching chat history: ${error}`);
 				});
+			} catch (error) {
+				this.logService.error(`[CopilotCLISession] Failed to read session ${sessionId}, it may be corrupted: ${error}`);
+				return { history: [], events: [] };
 			} finally {
 				await shutdown;
 			}

extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts

@@ -88,13 +88,14 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 	 */
 	private async getAgentItems(_token: vscode.CancellationToken): Promise<vscode.ChatSessionCustomizationItem[]> {
 		const agentInfos = await this.copilotCLIAgents.getAgents();
-		return agentInfos.map(({ agent, sourceUri, pluginUri, extensionId }) => ({
+		return agentInfos.map(({ agent, sourceUri, pluginUri, extensionId, source }) => ({
 			uri: sourceUri,
 			type: vscode.ChatSessionCustomizationType.Agent,
 			name: agent.displayName || agent.name,
 			description: agent.description,
 			extensionId,
-			pluginUri
+			pluginUri,
+			source
 		}));
 	}
 
@@ -137,6 +138,7 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 				name: basename(uri),
 				description: undefined,
 				groupKey: 'agent-instructions',
+				source: 'local', // these are surfaced by the extension, even if they come from the workspace
 				extensionId: undefined,
 				pluginUri: undefined
 			});
@@ -172,7 +174,8 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 					badge,
 					badgeTooltip,
 					extensionId: instruction.extensionId,
-					pluginUri: instruction.pluginUri
+					pluginUri: instruction.pluginUri,
+					source: instruction.source
 				});
 			} else {
 				items.push({
@@ -182,7 +185,8 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 					description,
 					groupKey: 'on-demand-instructions',
 					extensionId: instruction.extensionId,
-					pluginUri: instruction.pluginUri
+					pluginUri: instruction.pluginUri,
+					source: instruction.source
 				});
 			}
 		}
@@ -201,6 +205,7 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 			description: s.description,
 			extensionId: s.extensionId,
 			pluginUri: s.pluginUri,
+			source: s.source
 		}));
 	}
 
@@ -216,6 +221,7 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 			description: undefined,
 			extensionId: h.extensionId,
 			pluginUri: h.pluginUri,
+			source: h.source
 		}));
 	}
 
@@ -230,6 +236,7 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 			description: undefined,
 			extensionId: undefined,
 			pluginUri: undefined,
+			source: 'plugin'
 		}));
 	}
 }

extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLICustomizationProvider.spec.ts

@@ -42,6 +42,9 @@ function makeAgentInfo(name: string, description = '', displayName?: string): CL
 	return {
 		agent: makeSweAgent(name, description, displayName),
 		sourceUri: URI.from({ scheme: 'copilotcli', path: `/agents/${name}` }),
+		source: 'local',
+		extensionId: undefined,
+		pluginUri: undefined,
 	};
 }
 
@@ -50,6 +53,9 @@ function makeFileAgentInfo(name: string, fileUri: URI, description = ''): CLIAge
 	return {
 		agent: makeSweAgent(name, description),
 		sourceUri: fileUri,
+		source: 'local',
+		extensionId: undefined,
+		pluginUri: undefined,
 	};
 }
 

extensions/copilot/src/extension/chatSessions/vscode-node/claudeCustomizationProvider.ts

@@ -110,6 +110,7 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 				description: agent.description,
 				extensionId: undefined,
 				pluginUri: undefined,
+				source: 'builtin'
 				// No groupKey — vscode infers Built-in from non-file: scheme
 			});
 		}
@@ -126,6 +127,7 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 						description: agent.description,
 						extensionId: agent.extensionId,
 						pluginUri: agent.pluginUri,
+						source: agent.source
 					});
 				}
 			}
@@ -150,6 +152,7 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 					description: skill.description,
 					extensionId: skill.extensionId,
 					pluginUri: skill.pluginUri,
+					source: skill.source
 				};
 				skillItems.push(item);
 			}
@@ -168,23 +171,23 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 
 	private async discoverInstructions(): Promise<vscode.ChatSessionCustomizationItem[]> {
 		const items: vscode.ChatSessionCustomizationItem[] = [];
-		const candidates: URI[] = [];
+		const candidates: { uri: URI; source: vscode.ChatResourceSource }[] = [];
 
 		for (const folder of this.workspaceService.getWorkspaceFolders()) {
 			for (const entry of WORKSPACE_INSTRUCTION_PATHS) {
 				if (typeof entry === 'string') {
-					candidates.push(URI.joinPath(folder, entry));
+					candidates.push({ uri: URI.joinPath(folder, entry), source: 'local' });
 				} else {
-					candidates.push(URI.joinPath(folder, ...entry));
+					candidates.push({ uri: URI.joinPath(folder, ...entry), source: 'local' });
 				}
 			}
 		}
 
 		for (const entry of HOME_INSTRUCTION_PATHS) {
-			candidates.push(URI.joinPath(this.envService.userHome, ...entry));
+			candidates.push({ uri: URI.joinPath(this.envService.userHome, ...entry), source: 'user' });
 		}
 
-		for (const uri of candidates) {
+		for (const { uri, source } of candidates) {
 			if (await this.fileExists(uri)) {
 				const name = basename(uri).replace(/\.md$/i, '');
 				items.push({
@@ -194,10 +197,10 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 					description: undefined,
 					extensionId: undefined,
 					pluginUri: undefined,
+					source,
 				});
 			}
 		}
-
 		return items;
 	}
 
@@ -214,9 +217,9 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 		const items: vscode.ChatSessionCustomizationItem[] = [];
 		const settingsPaths = this.getSettingsFilePaths();
 
-		for (const settingsUri of settingsPaths) {
+		for (const { uri, source } of settingsPaths) {
 			try {
-				const content = await this.fileSystemService.readFile(settingsUri);
+				const content = await this.fileSystemService.readFile(uri);
 				const settings: HooksSettings = JSON.parse(new TextDecoder().decode(content));
 				if (!settings.hooks) {
 					continue;
@@ -232,12 +235,13 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 						for (const hook of matcher.hooks) {
 							const matcherLabel = matcher.matcher === '*' ? '' : ` (${matcher.matcher})`;
 							items.push({
-								uri: settingsUri,
+								uri,
 								type: vscode.ChatSessionCustomizationType.Hook,
 								name: `${eventId}${matcherLabel}`,
 								description: hook.command,
 								extensionId: undefined,
 								pluginUri: undefined,
+								source
 							});
 						}
 					}
@@ -250,15 +254,15 @@ export class ClaudeCustomizationProvider extends Disposable implements vscode.Ch
 		return items;
 	}
 
-	private getSettingsFilePaths(): URI[] {
-		const paths: URI[] = [];
+	private getSettingsFilePaths(): { uri: URI; source: vscode.ChatResourceSource }[] {
+		const paths: { uri: URI; source: vscode.ChatResourceSource }[] = [];
 
 		for (const folder of this.workspaceService.getWorkspaceFolders()) {
-			paths.push(URI.joinPath(folder, '.claude', 'settings.json'));
-			paths.push(URI.joinPath(folder, '.claude', 'settings.local.json'));
+			paths.push({ uri: URI.joinPath(folder, '.claude', 'settings.json'), source: 'local' });
+			paths.push({ uri: URI.joinPath(folder, '.claude', 'settings.local.json'), source: 'local' });
 		}
 
-		paths.push(URI.joinPath(this.envService.userHome, '.claude', 'settings.json'));
+		paths.push({ uri: URI.joinPath(this.envService.userHome, '.claude', 'settings.json'), source: 'user' });
 		return paths;
 	}
 

extensions/copilot/src/extension/test/vscode-node/sanity.sanity-test.ts

@@ -113,7 +113,10 @@ suite('Copilot Chat Sanity Test', function () {
 			// (and what kind of parts).
 			const runAgentRequest = async (): Promise<SpyChatResponseStream> => {
 				const stream = new SpyChatResponseStream();
-				const testRequest = new TestChatRequest(`You must use the get_errors tool to check the window for errors. It may fail, that's ok, just testing, don't retry.`);
+				// Keep the instruction unconditional. Any hedging language ("it may
+				// fail, that's ok", "it's fine if it errors") gives newer models cover
+				// to skip the invocation entirely and just narrate a plausible failure.
+				const testRequest = new TestChatRequest(`Call the get_errors tool now to check the current window for errors. You must invoke the tool exactly once, then reply with a brief summary of whatever it returned.`);
 				testRequest.tools.set(ContributedToolName.GetErrors, true);
 				const interactiveSession = instaService.createInstance(ChatParticipantRequestHandler, [], testRequest, stream, fakeToken, { agentName: '', agentId: '', intentId: Intent.Agent }, () => false, undefined);
 

extensions/mermaid-markdown-features/package.json

@@ -82,26 +82,44 @@
           "order": 0,
           "type": "string",
           "enum": [
+            "vscode",
             "base",
             "forest",
             "dark",
             "default",
             "neutral"
           ],
-          "default": "default",
+          "enumDescriptions": [
+            "%config.markdown-mermaid.theme.vscode.description%",
+            "%config.markdown-mermaid.theme.base.description%",
+            "%config.markdown-mermaid.theme.forest.description%",
+            "%config.markdown-mermaid.theme.dark.description%",
+            "%config.markdown-mermaid.theme.default.description%",
+            "%config.markdown-mermaid.theme.neutral.description%"
+          ],
+          "default": "vscode",
           "description": "%config.markdown-mermaid.lightModeTheme.description%"
         },
         "markdown-mermaid.darkModeTheme": {
           "order": 1,
           "type": "string",
           "enum": [
+            "vscode",
             "base",
             "forest",
             "dark",
             "default",
             "neutral"
           ],
-          "default": "dark",
+          "enumDescriptions": [
+            "%config.markdown-mermaid.theme.vscode.description%",
+            "%config.markdown-mermaid.theme.base.description%",
+            "%config.markdown-mermaid.theme.forest.description%",
+            "%config.markdown-mermaid.theme.dark.description%",
+            "%config.markdown-mermaid.theme.default.description%",
+            "%config.markdown-mermaid.theme.neutral.description%"
+          ],
+          "default": "vscode",
           "description": "%config.markdown-mermaid.darkModeTheme.description%"
         },
         "markdown-mermaid.languages": {
@@ -170,6 +188,7 @@
       {
         "id": "vscode.markdown-it.mermaid-extension",
         "displayName": "Markdown-It Mermaid Renderer",
+        "requiresMessaging": "optional",
         "entrypoint": {
           "extends": "vscode.markdown-it-renderer",
           "path": "./notebook-out/index.js"

extensions/mermaid-markdown-features/package.nls.json

@@ -7,6 +7,12 @@
 	"config.title": "Mermaid",
 	"config.markdown-mermaid.lightModeTheme.description": "Default Mermaid theme for light mode.",
 	"config.markdown-mermaid.darkModeTheme.description": "Default Mermaid theme for dark mode.",
+	"config.markdown-mermaid.theme.vscode.description": "Mermaid theme derived from the current VS Code color theme.",
+	"config.markdown-mermaid.theme.base.description": "Built-in Mermaid theme. The only Mermaid theme that can be customized with theme variables.",
+	"config.markdown-mermaid.theme.forest.description": "Built-in Mermaid theme using shades of green.",
+	"config.markdown-mermaid.theme.dark.description": "Built-in Mermaid theme for dark backgrounds.",
+	"config.markdown-mermaid.theme.default.description": "The default built-in Mermaid theme. Works well with light backgrounds.",
+	"config.markdown-mermaid.theme.neutral.description": "Built-in Mermaid theme using a neutral grayscale palette. Suitable for black and white prints.",
 	"config.markdown-mermaid.languages.description": "Default languages in Markdown.",
 	"config.markdown-mermaid.maxTextSize.description": "The maximum allowed size of the user's text diagram.",
 	"config.markdown-mermaid.mouseNavigation.enabled.description": "Controls when mouse-based navigation is enabled on Mermaid diagrams.",