[pull] main from microsoft:main

extensions/copilot/package.json

@@ -89,6 +89,7 @@
 	"l10n": "./l10n",
 	"enabledApiProposals": [
 		"agentSessionsWorkspace",
+		"agentsWindowConfiguration",
 		"chatDebug",
 		"chatHooks",
 		"extensionsAny",
@@ -3137,7 +3138,13 @@
 						"additionalProperties": {
 							"type": "boolean"
 						},
-						"markdownDescription": "Enable or disable auto triggering of Copilot completions for specified [languages](https://code.visualstudio.com/docs/languages/identifiers). You can still trigger suggestions manually using `Alt + \\`"
+						"markdownDescription": "Enable or disable auto triggering of Copilot completions for specified [languages](https://code.visualstudio.com/docs/languages/identifiers). You can still trigger suggestions manually using `Alt + \\`",
+						"agentsWindow": {
+							"default": {
+								"markdown": true,
+								"plaintext": true
+							}
+						}
 					},
 					"github.copilot.selectedCompletionModel": {
 						"type": "string",
@@ -3306,7 +3313,10 @@
 						"markdownDescription": "%github.copilot.config.githubMcpServer.enabled%",
 						"tags": [
 							"experimental"
-						]
+						],
+						"agentsWindow": {
+							"default": true
+						}
 					},
 					"github.copilot.chat.githubMcpServer.toolsets": {
 						"type": "array",
@@ -3652,7 +3662,10 @@
 							"experimental",
 							"onExP"
 						],
-						"markdownDescription": "%github.copilot.chat.languageContext.typescript.enabled%"
+						"markdownDescription": "%github.copilot.chat.languageContext.typescript.enabled%",
+						"agentsWindow": {
+							"default": true
+						}
 					},
 					"github.copilot.chat.languageContext.typescript.items": {
 						"type": "string",
@@ -4648,23 +4661,32 @@
 						"tags": [
 							"advanced",
 							"experimental"
-						]
+						],
+						"agentsWindow": {
+							"default": true
+						}
 					},
 					"github.copilot.chat.cli.branchSupport.enabled": {
 						"type": "boolean",
 						"default": false,
 						"markdownDescription": "%github.copilot.config.cli.branchSupport.enabled%",
 						"tags": [
 							"advanced"
-						]
+						],
+						"agentsWindow": {
+							"default": true
+						}
 					},
 					"github.copilot.chat.cli.showExternalSessions": {
 						"type": "boolean",
 						"default": true,
 						"markdownDescription": "%github.copilot.config.cli.showExternalSessions%",
 						"tags": [
 							"advanced"
-						]
+						],
+						"agentsWindow": {
+							"default": false
+						}
 					},
 					"github.copilot.chat.cli.planExitMode.enabled": {
 						"type": "boolean",
@@ -4704,7 +4726,10 @@
 						"markdownDescription": "%github.copilot.config.cli.lazyLoadSessionItem.enabled%",
 						"tags": [
 							"advanced"
-						]
+						],
+						"agentsWindow": {
+							"default": false
+						}
 					},
 					"github.copilot.chat.cli.aiGenerateBranchNames.enabled": {
 						"type": "boolean",
@@ -4728,7 +4753,10 @@
 						"markdownDescription": "%github.copilot.config.cli.isolationOption.enabled%",
 						"tags": [
 							"advanced"
-						]
+						],
+						"agentsWindow": {
+							"default": true
+						}
 					},
 					"github.copilot.chat.cli.autoCommit.enabled": {
 						"type": "boolean",
@@ -4737,15 +4765,22 @@
 						"tags": [
 							"advanced",
 							"experimental"
-						]
+						],
+						"agentsWindow": {
+							"default": false
+						}
 					},
 					"github.copilot.chat.cli.sessionController.enabled": {
 						"type": "boolean",
 						"default": true,
 						"markdownDescription": "%github.copilot.config.cli.sessionController.enabled%",
 						"tags": [
 							"advanced"
-						]
+						],
+						"agentsWindow": {
+							"default": false,
+							"readOnly": true
+						}
 					},
 					"github.copilot.chat.cli.thinkingEffort.enabled": {
 						"type": "boolean",
@@ -4777,7 +4812,10 @@
 						"markdownDescription": "%github.copilot.config.cli.remote.enabled%",
 						"tags": [
 							"advanced"
-						]
+						],
+						"agentsWindow": {
+							"default": false
+						}
 					},
 					"github.copilot.chat.searchSubagent.enabled": {
 						"type": "boolean",

extensions/copilot/src/extension/prompts/node/agent/test/summarization.spec.tsx

@@ -31,6 +31,7 @@ import { PromptRenderer } from '../../base/promptRenderer';
 import { AgentPrompt, AgentPromptProps } from '../agentPrompt';
 import { PromptRegistry } from '../promptRegistry';
 import { ISessionTranscriptService, NullSessionTranscriptService } from '../../../../../platform/chat/common/sessionTranscriptService';
+import { ITokenizerProvider } from '../../../../../platform/tokenizer/node/tokenizer';
 import { appendTranscriptHintToSummary, ConversationHistorySummarizationPrompt, extractSummary, stripToolSearchMessages, SummarizedConversationHistory, SummarizedConversationHistoryMetadata, SummarizedConversationHistoryPropsBuilder } from '../summarizedConversationHistory';
 
 suite('Agent Summarization', () => {
@@ -40,7 +41,7 @@ suite('Agent Summarization', () => {
 
 	let conversation: Conversation;
 
-	beforeAll(() => {
+	beforeAll(async () => {
 		const testDoc = createTextDocumentData(fileTsUri, 'line 1\nline 2\n\nline 4\nline 5', 'ts').document;
 
 		const services = createExtensionUnitTestingServices();
@@ -57,6 +58,12 @@ suite('Agent Summarization', () => {
 		accessor.get(IConfigurationService).setConfig(ConfigKey.CodeGenerationInstructions, [{
 			text: 'This is a test custom instruction file',
 		} satisfies CodeGenerationTextInstruction]);
+
+		// Warm up the tokenizer once so per-test timing is predictable. The first
+		// tokenizer use parses a ~3.6MB BPE file which can take seconds on slow CI
+		// machines and would otherwise be charged to whichever test runs first.
+		const endpoint = accessor.get(IInstantiationService).createInstance(MockEndpoint, undefined);
+		await accessor.get(ITokenizerProvider).acquireTokenizer(endpoint).tokenLength('warmup');
 	});
 
 	beforeEach(() => {

extensions/git/package.json

@@ -11,6 +11,7 @@
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "enabledApiProposals": [
     "agentSessionsWorkspace",
+    "agentsWindowConfiguration",
     "canonicalUriProvider",
     "contribEditSessions",
     "contribEditorContentMenu",
@@ -3321,7 +3322,10 @@
         "git.autorefresh": {
           "type": "boolean",
           "description": "%config.autorefresh%",
-          "default": true
+          "default": true,
+          "agentsWindow": {
+            "default": true
+          }
         },
         "git.autofetch": {
           "type": [
@@ -3338,7 +3342,10 @@
           "default": false,
           "tags": [
             "usesOnlineServices"
-          ]
+          ],
+          "agentsWindow": {
+            "default": true
+          }
         },
         "git.autofetchPeriod": {
           "type": "number",
@@ -3397,7 +3404,10 @@
           "type": "boolean",
           "description": "%config.branchRandomNameEnable%",
           "default": false,
-          "scope": "resource"
+          "scope": "resource",
+          "agentsWindow": {
+            "default": true
+          }
         },
         "git.branchRandomName.dictionary": {
           "type": "array",
@@ -3695,7 +3705,10 @@
           "type": "boolean",
           "scope": "resource",
           "default": false,
-          "description": "%config.detectWorktrees%"
+          "description": "%config.detectWorktrees%",
+          "agentsWindow": {
+            "default": false
+          }
         },
         "git.detectWorktreesLimit": {
           "type": "number",
@@ -3771,7 +3784,11 @@
           "type": "boolean",
           "description": "%config.showProgress%",
           "default": true,
-          "scope": "resource"
+          "scope": "resource",
+          "agentsWindow": {
+            "default": false,
+            "readOnly": true
+          }
         },
         "git.rebaseWhenSync": {
           "type": "boolean",

extensions/markdown-language-features/package.json

@@ -215,11 +215,11 @@
       "webview/context": [
         {
           "command": "_markdown.copyImage",
-          "when": "webviewId == 'markdown.preview' && (webviewSection == 'image' || webviewSection == 'localImage')"
+          "when": "(webviewId == 'markdown.preview' || webviewId == 'vscode.markdown.preview.editor') && (webviewSection == 'image' || webviewSection == 'localImage')"
         },
         {
           "command": "_markdown.openImage",
-          "when": "webviewId == 'markdown.preview' && webviewSection == 'localImage'"
+          "when": "(webviewId == 'markdown.preview' || webviewId == 'vscode.markdown.preview.editor') && webviewSection == 'localImage'"
         }
       ],
       "editor/title": [
@@ -741,7 +741,7 @@
           },
           "markdown.preview.markEditorSelection": {
             "type": "boolean",
-            "default": true,
+            "default": false,
             "description": "%markdown.preview.markEditorSelection.desc%",
             "scope": "resource"
           },
@@ -753,7 +753,7 @@
           },
           "markdown.preview.doubleClickToSwitchToEditor": {
             "type": "boolean",
-            "default": true,
+            "default": false,
             "description": "%markdown.preview.doubleClickToSwitchToEditor.desc%",
             "scope": "resource"
           },

extensions/media-preview/src/mediaPreview.ts

@@ -31,11 +31,13 @@ export abstract class MediaPreview extends Disposable {
 	) {
 		super();
 
+		const resourceRoot = Utils.dirname(_resource).with({ query: '', fragment: '' });
+
 		_webviewEditor.webview.options = {
 			enableScripts: true,
 			enableForms: false,
 			localResourceRoots: [
-				Utils.dirname(_resource),
+				resourceRoot,
 				extensionRoot,
 			]
 		};

src/vs/base/common/defaultAccount.ts

@@ -35,6 +35,7 @@ export interface IEntitlementsData extends ILegacyQuotaSnapshotData {
 	readonly limited_user_reset_date?: string; 	// for Copilot Free
 	readonly quota_reset_date?: string; 		// for all other Copilot SKUs
 	readonly quota_reset_date_utc?: string; 	// for all other Copilot SKUs (includes time)
+	readonly token_based_billing?: boolean;
 	readonly quota_snapshots?: {
 		chat?: IQuotaSnapshotData;
 		completions?: IQuotaSnapshotData;

src/vs/editor/common/config/editorConfigurationSchema.ts

@@ -207,7 +207,8 @@ const editorConfiguration: IConfigurationNode = {
 		'diffEditor.renderSideBySide': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.renderSideBySide,
-			description: nls.localize('sideBySide', "Controls whether the diff editor shows the diff side by side or inline.")
+			description: nls.localize('sideBySide', "Controls whether the diff editor shows the diff side by side or inline."),
+			agentsWindow: { default: true },
 		},
 		'diffEditor.renderSideBySideInlineBreakpoint': {
 			type: 'number',
@@ -217,17 +218,20 @@ const editorConfiguration: IConfigurationNode = {
 		'diffEditor.useInlineViewWhenSpaceIsLimited': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.useInlineViewWhenSpaceIsLimited,
-			description: nls.localize('useInlineViewWhenSpaceIsLimited', "If enabled and the editor width is too small, the inline view is used.")
+			description: nls.localize('useInlineViewWhenSpaceIsLimited', "If enabled and the editor width is too small, the inline view is used."),
+			agentsWindow: { default: true },
 		},
 		'diffEditor.renderMarginRevertIcon': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.renderMarginRevertIcon,
-			description: nls.localize('renderMarginRevertIcon', "When enabled, the diff editor shows arrows in its glyph margin to revert changes.")
+			description: nls.localize('renderMarginRevertIcon', "When enabled, the diff editor shows arrows in its glyph margin to revert changes."),
+			agentsWindow: { default: false },
 		},
 		'diffEditor.renderGutterMenu': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.renderGutterMenu,
-			description: nls.localize('renderGutterMenu', "When enabled, the diff editor shows a special gutter for revert and stage actions.")
+			description: nls.localize('renderGutterMenu', "When enabled, the diff editor shows a special gutter for revert and stage actions."),
+			agentsWindow: { default: false },
 		},
 		'diffEditor.ignoreTrimWhitespace': {
 			type: 'boolean',
@@ -237,7 +241,8 @@ const editorConfiguration: IConfigurationNode = {
 		'diffEditor.renderIndicators': {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.renderIndicators,
-			description: nls.localize('renderIndicators', "Controls whether the diff editor shows +/- indicators for added/removed changes.")
+			description: nls.localize('renderIndicators', "Controls whether the diff editor shows +/- indicators for added/removed changes."),
+			agentsWindow: { default: false },
 		},
 		'diffEditor.codeLens': {
 			type: 'boolean',
@@ -267,6 +272,7 @@ const editorConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: diffEditorDefaultOptions.hideUnchangedRegions.enabled,
 			markdownDescription: nls.localize('hideUnchangedRegions.enabled', "Controls whether the diff editor shows unchanged regions."),
+			agentsWindow: { default: true },
 		},
 		'diffEditor.hideUnchangedRegions.revealLineCount': {
 			type: 'integer',

src/vs/platform/agentHost/browser/nullAgentHostService.ts

@@ -9,7 +9,7 @@ import { constObservable, IObservable } from '../../../base/common/observable.js
 import { URI } from '../../../base/common/uri.js';
 import type { IAgentCreateSessionConfig, IAgentHostInspectInfo, IAgentHostService, IAgentHostSocketInfo, IAgentResolveSessionConfigParams, IAgentSessionConfigCompletionsParams, IAgentSessionMetadata, AuthenticateParams, AuthenticateResult } from '../common/agentService.js';
 import type { IAgentSubscription } from '../common/state/agentSubscription.js';
-import type { CreateTerminalParams, ResolveSessionConfigResult, SessionConfigCompletionsResult } from '../common/state/protocol/commands.js';
+import type { CompletionsParams, CompletionsResult, CreateTerminalParams, ResolveSessionConfigResult, SessionConfigCompletionsResult } from '../common/state/protocol/commands.js';
 import type { ActionEnvelope, INotification, IRootConfigChangedAction, SessionAction, TerminalAction } from '../common/state/sessionActions.js';
 import type { ResourceCopyParams, ResourceCopyResult, ResourceDeleteParams, ResourceDeleteResult, ResourceListResult, ResourceMoveParams, ResourceMoveResult, ResourceReadResult, ResourceWriteParams, ResourceWriteResult } from '../common/state/sessionProtocol.js';
 import type { ComponentToState, RootState, StateComponents } from '../common/state/sessionState.js';
@@ -44,6 +44,7 @@ export class NullAgentHostService implements IAgentHostService {
 	async createSession(_config?: IAgentCreateSessionConfig): Promise<URI> { return notSupported(); }
 	async resolveSessionConfig(_params: IAgentResolveSessionConfigParams): Promise<ResolveSessionConfigResult> { return notSupported(); }
 	async sessionConfigCompletions(_params: IAgentSessionConfigCompletionsParams): Promise<SessionConfigCompletionsResult> { return notSupported(); }
+	async completions(_params: CompletionsParams): Promise<CompletionsResult> { return { items: [] }; }
 	async startWebSocketServer(): Promise<IAgentHostSocketInfo> { return notSupported(); }
 	async getInspectInfo(_tryEnable: boolean): Promise<IAgentHostInspectInfo | undefined> { return undefined; }
 	async disposeSession(_session: URI): Promise<void> { }

src/vs/platform/agentHost/browser/remoteAgentHostProtocolClient.ts

@@ -28,7 +28,7 @@ import { PROTOCOL_VERSION } from '../common/state/protocol/version/registry.js';
 import { isJsonRpcNotification, isJsonRpcRequest, isJsonRpcResponse, ProtocolError, type ProtocolMessage, type IStateSnapshot } from '../common/state/sessionProtocol.js';
 import { isClientTransport, type IProtocolTransport } from '../common/state/sessionTransport.js';
 import { AhpErrorCodes } from '../common/state/protocol/errors.js';
-import { ContentEncoding, ResourceRequestParams, type CreateTerminalParams, type ResolveSessionConfigResult, type SessionConfigCompletionsResult } from '../common/state/protocol/commands.js';
+import { ContentEncoding, ResourceRequestParams, type CompletionsParams, type CompletionsResult, type CreateTerminalParams, type ResolveSessionConfigResult, type SessionConfigCompletionsResult } from '../common/state/protocol/commands.js';
 import { decodeBase64, encodeBase64, VSBuffer } from '../../../base/common/buffer.js';
 
 const AHP_CLIENT_CONNECTION_CLOSED = -32000;
@@ -249,6 +249,10 @@ export class RemoteAgentHostProtocolClient extends Disposable implements IAgentC
 		});
 	}
 
+	async completions(params: CompletionsParams): Promise<CompletionsResult> {
+		return this._sendRequest('completions', params);
+	}
+
 	/**
 	 * Authenticate with the remote agent host using a specific scheme.
 	 */