[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:

build/lib/extensions.ts

@@ -21,6 +21,7 @@ import { getProductionDependencies } from './dependencies.ts';
 import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts';
 import { fetchUrls, fetchGithub } from './fetch.ts';
 import { createTsgoStream, spawnTsgo } from './tsgo.ts';
+import watcher from './watch/index.ts';
 
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
@@ -617,21 +618,59 @@ export async function esbuildExtensions(taskName: string, isWatch: boolean, scri
 
 
 // Additional projects to run esbuild on. These typically build code for webviews
-const esbuildMediaScripts = [
-	'ipynb/esbuild.notebook.mts',
-	'markdown-language-features/esbuild.notebook.mts',
-	'markdown-language-features/esbuild.webview.mts',
-	'markdown-math/esbuild.notebook.mts',
-	'mermaid-markdown-features/esbuild.webview.mts',
-	'notebook-renderers/esbuild.notebook.mts',
-	'simple-browser/esbuild.webview.mts',
+const esbuildMediaScripts: { script: string; tsconfig: string }[] = [
+	{ script: 'ipynb/esbuild.notebook.mts', tsconfig: 'ipynb/notebook-src/tsconfig.json' },
+	{ script: 'markdown-language-features/esbuild.notebook.mts', tsconfig: 'markdown-language-features/notebook/tsconfig.json' },
+	{ script: 'markdown-language-features/esbuild.webview.mts', tsconfig: 'markdown-language-features/preview-src/tsconfig.json' },
+	{ script: 'markdown-math/esbuild.notebook.mts', tsconfig: 'markdown-math/notebook/tsconfig.json' },
+	{ script: 'mermaid-markdown-features/esbuild.webview.mts', tsconfig: 'mermaid-markdown-features/preview-src/tsconfig.json' },
+	{ script: 'notebook-renderers/esbuild.notebook.mts', tsconfig: 'notebook-renderers/tsconfig.json' },
+	{ script: 'simple-browser/esbuild.webview.mts', tsconfig: 'simple-browser/preview-src/tsconfig.json' },
 ];
 
 export function buildExtensionMedia(isWatch: boolean, outputRoot?: string): Promise<void> {
-	return esbuildExtensions('esbuilding extension media', isWatch, esbuildMediaScripts.map(p => ({
-		script: path.join(extensionsPath, p),
-		outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(p)) : undefined
+	const esbuildTask = esbuildExtensions('esbuilding extension media', isWatch, esbuildMediaScripts.map(({ script }) => ({
+		script: path.join(extensionsPath, script),
+		outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(script)) : undefined
 	})));
+
+	const typeCheckTasks = esbuildMediaScripts.map(({ tsconfig }) => {
+		const tsconfigPath = path.join(extensionsPath, tsconfig);
+		const config = { taskName: 'typechecking extension media (tsgo)', noEmit: true };
+		if (!isWatch) {
+			return spawnTsgo(tsconfigPath, config);
+		} else {
+			return watchTypeCheckExtensionMedia(tsconfigPath, config);
+		}
+	});
+
+	return Promise.all([esbuildTask, ...typeCheckTasks]).then(() => undefined);
+}
+
+function watchTypeCheckExtensionMedia(tsconfigPath: string, config: { taskName: string; noEmit?: boolean }): Promise<void> {
+	const srcDir = path.dirname(tsconfigPath);
+	const watchInput = watcher([
+		path.join(srcDir, '**', '*.{ts,tsx,d.ts}'),
+		tsconfigPath,
+		'!' + path.join(srcDir, '**', 'node_modules', '**'),
+		'!' + path.join(srcDir, '**', 'out', '**'),
+		'!' + path.join(srcDir, '**', 'dist', '**'),
+	], { cwd: root, base: srcDir, dot: true, readDelay: 200 });
+	const stream = watchInput
+		.pipe(util2.debounce(() => {
+			const tsgoStream = createTsgoStream(tsconfigPath, config);
+			// Always emit 'end' (even on tsgo error) so the debounce resets to idle
+			// and can process future file changes. Errors are already logged by
+			// spawnTsgo's runReporter, so swallowing the stream error is safe.
+			const result = es.through();
+			tsgoStream.on('end', () => result.emit('end'));
+			tsgoStream.on('error', () => result.emit('end'));
+			return result;
+		}, 200));
+
+	return new Promise<void>((_resolve, reject) => {
+		stream.on('error', reject);
+	});
 }
 
 export function getBuildRootsForExtension(extensionPath: string): string[] {

extensions/copilot/package.json

@@ -2263,49 +2263,49 @@
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.individual.expired%",
-        "when": "github.copilot.interactiveSession.individual.expired"
+        "when": "github.copilot.interactiveSession.individual.expired && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.enterprise%",
-        "when": "github.copilot.interactiveSession.enterprise.disabled"
+        "when": "github.copilot.interactiveSession.enterprise.disabled && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.offline%",
-        "when": "github.copilot.offline"
+        "when": "github.copilot.offline && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.invalidToken%",
-        "when": "github.copilot.interactiveSession.invalidToken"
+        "when": "github.copilot.interactiveSession.invalidToken && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.rateLimited%",
-        "when": "github.copilot.interactiveSession.rateLimited"
+        "when": "github.copilot.interactiveSession.rateLimited && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.gitHubLoginFailed%",
-        "when": "github.copilot.interactiveSession.gitHubLoginFailed"
+        "when": "github.copilot.interactiveSession.gitHubLoginFailed && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.contactSupport%",
-        "when": "github.copilot.interactiveSession.contactSupport"
+        "when": "github.copilot.interactiveSession.contactSupport && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",
         "title": "%copilot.title%",
         "content": "%github.copilot.viewsWelcome.chatDisabled%",
-        "when": "github.copilot.interactiveSession.chatDisabled"
+        "when": "github.copilot.interactiveSession.chatDisabled && !github.copilot.hasByokModels"
       },
       {
         "icon": "$(chat-sparkle)",

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

@@ -50,6 +50,11 @@ class AuthUpgradeAsk extends Disposable {
 	}
 
 	private async waitForChatEnabled() {
+		if (!this._authenticationService.anyGitHubSession) {
+			// BYOK / air-gapped: do not wait for a Copilot token that may never arrive.
+			return;
+		}
+
 		try {
 			await this._authenticationService.getCopilotToken();
 		} catch (error) {

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

@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { IAuthenticationService } from '../../../platform/authentication/common/authentication';
+import { IConfigurationService } from '../../../platform/configuration/common/configurationService';
+import { ILogService } from '../../../platform/log/common/logService';
+import { Disposable } from '../../../util/vs/base/common/lifecycle';
+
+const NOTIFICATION_ID = 'copilot.byokUtilityModelHint';
+const UTILITY_MODEL_SETTING = 'chat.utilityModel';
+const UTILITY_SMALL_MODEL_SETTING = 'chat.utilitySmallModel';
+
+/**
+ * Shows a chat input notification in air-gapped BYOK scenarios (no GitHub
+ * session) when at least one BYOK model is available but the utility model
+ * settings are still defaults. The default utility models require GitHub
+ * Copilot access, so without it the utility slots silently fall back and
+ * degrade the experience until the user points them at a BYOK model.
+ *
+ * The notification hides automatically once the user signs in, BYOK models
+ * disappear, or both utility settings are configured.
+ */
+export class ByokUtilityModelNotificationContribution extends Disposable {
+
+	private _notification: vscode.ChatInputNotification | undefined;
+	private _hasByokModels = false;
+	private _refreshing = false;
+
+	constructor(
+		@IAuthenticationService private readonly _authService: IAuthenticationService,
+		@IConfigurationService private readonly _configService: IConfigurationService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		this._register(this._authService.onDidAuthenticationChange(() => this._update()));
+		this._register(vscode.lm.onDidChangeChatModels(() => this._update()));
+		this._register(this._configService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(UTILITY_MODEL_SETTING) || e.affectsConfiguration(UTILITY_SMALL_MODEL_SETTING)) {
+				this._update();
+			}
+		}));
+
+		this._update();
+	}
+
+	private async _refreshHasByokModels(): Promise<void> {
+		if (this._refreshing) {
+			return;
+		}
+		this._refreshing = true;
+		try {
+			const models = await vscode.lm.selectChatModels({});
+			this._hasByokModels = models.some(m => m.vendor !== 'copilot');
+		} catch (err) {
+			this._logService.warn(`[ByokUtilityModelNotification] Failed to query language models: ${err}`);
+		} finally {
+			this._refreshing = false;
+		}
+	}
+
+	private async _update(): Promise<void> {
+		await this._refreshHasByokModels();
+
+		const signedOut = !this._authService.anyGitHubSession;
+		const utilityUnset = !this._isUtilityOverrideSet(UTILITY_MODEL_SETTING);
+		const utilitySmallUnset = !this._isUtilityOverrideSet(UTILITY_SMALL_MODEL_SETTING);
+
+		if (!signedOut || !this._hasByokModels || (!utilityUnset && !utilitySmallUnset)) {
+			this._hideNotification();
+			return;
+		}
+
+		this._showNotification(utilityUnset, utilitySmallUnset);
+	}
+
+	private _isUtilityOverrideSet(configKey: string): boolean {
+		const raw = this._configService.getNonExtensionConfig<unknown>(configKey);
+		return typeof raw === 'string' && raw.length > 0;
+	}
+
+	private _showNotification(utilityUnset: boolean, utilitySmallUnset: boolean): void {
+		const notification = this._ensureNotification();
+		notification.severity = vscode.ChatInputNotificationSeverity.Info;
+		notification.dismissible = true;
+		notification.autoDismissOnMessage = false;
+
+		if (utilityUnset && utilitySmallUnset) {
+			notification.message = vscode.l10n.t('Set BYOK utility models');
+			notification.description = vscode.l10n.t('Unlocks full AI features.');
+			notification.actions = [
+				{ label: vscode.l10n.t('Configure'), commandId: 'workbench.action.openSettings', commandArgs: ['chat.utility'] },
+			];
+		} else if (utilityUnset) {
+			notification.message = vscode.l10n.t('Set BYOK utility model');
+			notification.description = vscode.l10n.t('Unlocks full AI features.');
+			notification.actions = [
+				{ label: vscode.l10n.t('Configure'), commandId: 'workbench.action.openSettings', commandArgs: [UTILITY_MODEL_SETTING] },
+			];
+		} else {
+			notification.message = vscode.l10n.t('Set BYOK small utility model');
+			notification.description = vscode.l10n.t('Unlocks full AI features.');
+			notification.actions = [
+				{ label: vscode.l10n.t('Configure'), commandId: 'workbench.action.openSettings', commandArgs: [UTILITY_SMALL_MODEL_SETTING] },
+			];
+		}
+
+		notification.show();
+	}
+
+	private _ensureNotification(): vscode.ChatInputNotification {
+		if (!this._notification) {
+			this._notification = vscode.chat.createInputNotification(NOTIFICATION_ID);
+			this._register({ dispose: () => this._notification?.dispose() });
+		}
+		return this._notification;
+	}
+
+	private _hideNotification(): void {
+		this._notification?.hide();
+	}
+}