@codingame/monaco-vscode-api 24.2.0 → 25.0.0

package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js

@@ -66,14 +66,14 @@ class RemovedResources {
         const messages = [];
         if (externalRemoval.length > 0) {
             messages.push(( localize(
-                2406,
+                2425,
                 "The following files have been closed and modified on disk: {0}.",
                 externalRemoval.join(', ')
             )));
         }
         if (noParallelUniverses.length > 0) {
             messages.push(( localize(
-                2407,
+                2426,
                 "The following files have been modified in an incompatible way: {0}.",
                 noParallelUniverses.join(', ')
             )));
@@ -247,7 +247,7 @@ class ResourceEditStack {
             const element = this._past[i];
             if (isOK && (snapshotIndex >= snapshotLength || element.id !== snapshot.elements[snapshotIndex])) {
                 isOK = false;
-                removePastAfter = 0;
+                removePastAfter = i;
             }
             if (!isOK && element.type === UndoRedoElementType.Workspace) {
                 element.removeResource(this.resourceLabel, this.strResource, RemovedResourceReason.ExternalRemoval);
@@ -696,7 +696,7 @@ let UndoRedoService = class UndoRedoService {
     _checkWorkspaceUndo(strResource, element, editStackSnapshot, checkInvalidatedResources) {
         if (element.removedResources) {
             return this._tryToSplitAndUndo(strResource, element, element.removedResources, ( localize(
-                2408,
+                2427,
                 "Could not undo '{0}' across all files. {1}",
                 element.label,
                 element.removedResources.createMessage()
@@ -704,7 +704,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (checkInvalidatedResources && element.invalidatedResources) {
             return this._tryToSplitAndUndo(strResource, element, element.invalidatedResources, ( localize(
-                2408,
+                2427,
                 "Could not undo '{0}' across all files. {1}",
                 element.label,
                 element.invalidatedResources.createMessage()
@@ -718,7 +718,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotUndoDueToResources.length > 0) {
             return this._tryToSplitAndUndo(strResource, element, null, ( localize(
-                2409,
+                2428,
                 "Could not undo '{0}' across all files because changes were made to {1}",
                 element.label,
                 cannotUndoDueToResources.join(', ')
@@ -732,7 +732,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotLockDueToResources.length > 0) {
             return this._tryToSplitAndUndo(strResource, element, null, ( localize(
-                2410,
+                2429,
                 "Could not undo '{0}' across all files because there is already an undo or redo operation running on {1}",
                 element.label,
                 cannotLockDueToResources.join(', ')
@@ -740,7 +740,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (!editStackSnapshot.isValid()) {
             return this._tryToSplitAndUndo(strResource, element, null, ( localize(
-                2411,
+                2430,
                 "Could not undo '{0}' across all files because an undo or redo operation occurred in the meantime",
                 element.label
             )));
@@ -786,14 +786,14 @@ let UndoRedoService = class UndoRedoService {
             })(UndoChoice || (UndoChoice = {}));
             const { result } = await this._dialogService.prompt({
                 type: Severity$1.Info,
-                message: ( localize(2412, "Would you like to undo '{0}' across all files?", element.label)),
+                message: ( localize(2431, "Would you like to undo '{0}' across all files?", element.label)),
                 buttons: [
                     {
-                        label: ( localize(2413, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
+                        label: ( localize(2432, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
                         run: () => UndoChoice.All
                     },
                     {
-                        label: ( localize(2414, "Undo this &&File")),
+                        label: ( localize(2433, "Undo this &&File")),
                         run: () => UndoChoice.This
                     }
                 ],
@@ -838,7 +838,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (editStack.locked) {
             const message = ( localize(
-                2415,
+                2434,
                 "Could not undo '{0}' because there is already an undo or redo operation running.",
                 element.label
             ));
@@ -921,9 +921,9 @@ let UndoRedoService = class UndoRedoService {
     }
     async _confirmAndContinueUndo(strResource, sourceId, element) {
         const result = await this._dialogService.confirm({
-            message: ( localize(2416, "Would you like to undo '{0}'?", element.label)),
-            primaryButton: ( localize(2417, "&&Yes")),
-            cancelButton: ( localize(2418, "No"))
+            message: ( localize(2435, "Would you like to undo '{0}'?", element.label)),
+            primaryButton: ( localize(2436, "&&Yes")),
+            cancelButton: ( localize(2437, "No"))
         });
         if (!result.confirmed) {
             return;
@@ -979,7 +979,7 @@ let UndoRedoService = class UndoRedoService {
     _checkWorkspaceRedo(strResource, element, editStackSnapshot, checkInvalidatedResources) {
         if (element.removedResources) {
             return this._tryToSplitAndRedo(strResource, element, element.removedResources, ( localize(
-                2419,
+                2438,
                 "Could not redo '{0}' across all files. {1}",
                 element.label,
                 element.removedResources.createMessage()
@@ -987,7 +987,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (checkInvalidatedResources && element.invalidatedResources) {
             return this._tryToSplitAndRedo(strResource, element, element.invalidatedResources, ( localize(
-                2419,
+                2438,
                 "Could not redo '{0}' across all files. {1}",
                 element.label,
                 element.invalidatedResources.createMessage()
@@ -1001,7 +1001,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotRedoDueToResources.length > 0) {
             return this._tryToSplitAndRedo(strResource, element, null, ( localize(
-                2420,
+                2439,
                 "Could not redo '{0}' across all files because changes were made to {1}",
                 element.label,
                 cannotRedoDueToResources.join(', ')
@@ -1015,7 +1015,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (cannotLockDueToResources.length > 0) {
             return this._tryToSplitAndRedo(strResource, element, null, ( localize(
-                2421,
+                2440,
                 "Could not redo '{0}' across all files because there is already an undo or redo operation running on {1}",
                 element.label,
                 cannotLockDueToResources.join(', ')
@@ -1023,7 +1023,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (!editStackSnapshot.isValid()) {
             return this._tryToSplitAndRedo(strResource, element, null, ( localize(
-                2422,
+                2441,
                 "Could not redo '{0}' across all files because an undo or redo operation occurred in the meantime",
                 element.label
             )));
@@ -1063,7 +1063,7 @@ let UndoRedoService = class UndoRedoService {
         }
         if (editStack.locked) {
             const message = ( localize(
-                2423,
+                2442,
                 "Could not redo '{0}' because there is already an undo or redo operation running.",
                 element.label
             ));

package/vscode/src/vs/{workbench/contrib → platform}/url/common/trustedDomains.d.ts

@@ -1,4 +1,4 @@
-import { URI } from "../../../../base/common/uri.js";
+import { URI } from "../../../base/common/uri.js";
 /**
  * Check whether a domain like https://www.microsoft.com matches
  * the list of trusted domains.

package/vscode/src/vs/{workbench/contrib → platform}/url/common/trustedDomains.js

@@ -1,5 +1,5 @@
 
-import { URI } from '../../../../base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 import { testUrlMatchesGlob } from './urlGlob.js';
 
 function isURLDomainTrusted(url, trustedDomains) {
@@ -35,8 +35,9 @@ function normalizeURL(url) {
 }
 const rLocalhost = /^(.+\.)?localhost(:\d+)?$/i;
 const r127 = /^127.0.0.1(:\d+)?$/;
+const rIPv6Localhost = /^\[::1\](:\d+)?$/;
 function isLocalhostAuthority(authority) {
-    return rLocalhost.test(authority) || r127.test(authority);
+    return rLocalhost.test(authority) || r127.test(authority) || rIPv6Localhost.test(authority);
 }
 
 export { isLocalhostAuthority, isURLDomainTrusted, normalizeURL };

package/vscode/src/vs/{workbench/contrib → platform}/url/common/urlGlob.d.ts

@@ -1,4 +1,4 @@
-import { URI } from "../../../../base/common/uri.js";
+import { URI } from "../../../base/common/uri.js";
 /**
  * Checks if a given URL matches a glob URL pattern.
  * The glob URL pattern can contain wildcards (*) and subdomain matching (*.)

package/vscode/src/vs/{workbench/contrib → platform}/url/common/urlGlob.js

@@ -1,5 +1,5 @@
 
-import { URI } from '../../../../base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 
 function normalizeURL(url) {
     const uri = typeof url === 'string' ? ( URI.parse(url)) : url;

package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js

@@ -165,7 +165,7 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
         return this._profilesObject;
     }
     createDefaultProfile() {
-        const defaultProfile = toUserDataProfile('__default__profile__', ( localize(2434, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
+        const defaultProfile = toUserDataProfile('__default__profile__', ( localize(2453, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
         return { ...defaultProfile, extensionsResource: this.getDefaultProfileExtensionsLocation() ?? defaultProfile.extensionsResource, isDefault: true };
     }
     async createTransientProfile(workspaceIdentifier) {

package/vscode/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.js

@@ -167,6 +167,9 @@ let AbstractJsonSynchronizer = class AbstractJsonSynchronizer extends AbstractFi
         if (originalLocalContent === null && originalRemoteContent === null && baseContent === null) {
             return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };
         }
+        originalRemoteContent = originalRemoteContent ?? '';
+        originalLocalContent = originalLocalContent ?? '';
+        baseContent = baseContent ?? '';
         if (originalLocalContent === originalRemoteContent) {
             return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };
         }

package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js

@@ -209,7 +209,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
     async performSync(remoteUserData, lastSyncUserData, strategy, userDataSyncConfiguration) {
         if (remoteUserData.syncData && remoteUserData.syncData.version > this.version) {
             throw ( new UserDataSyncError(( localize(
-                2435,
+                2454,
                 "Cannot sync {0} as its local version {1} is not compatible with its remote version {2}",
                 this.resource,
                 this.version,
@@ -544,7 +544,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(( localize(
-            2436,
+            2455,
             "Cannot parse sync data as it is not compatible with the current version."
         )), UserDataSyncErrorCode.IncompatibleRemoteContent, this.resource));
     }

package/vscode/src/vs/platform/userDataSync/common/keybindingsSync.js

@@ -66,7 +66,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             localContent = localContent || '[]';
             if (this.hasErrors(localContent, true)) {
                 throw ( new UserDataSyncError(( localize(
-                    2437,
+                    2456,
                     "Unable to sync keybindings because the content in the file is not valid. Please open the file and correct it."
                 )), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
             }
@@ -169,7 +169,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             content = content || '[]';
             if (this.hasErrors(content, true)) {
                 throw ( new UserDataSyncError(( localize(
-                    2437,
+                    2456,
                     "Unable to sync keybindings because the content in the file is not valid. Please open the file and correct it."
                 )), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
             }

package/vscode/src/vs/platform/userDataSync/common/settingsSync.js

@@ -273,7 +273,7 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
     validateContent(content) {
         if (this.hasErrors(content, false)) {
             throw ( new UserDataSyncError(( localize(
-                2438,
+                2457,
                 "Unable to sync settings as there are errors/warning in settings file."
             )), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
         }

package/vscode/src/vs/platform/userDataSync/common/userDataSync.js

@@ -51,12 +51,12 @@ function registerConfiguration() {
     configurationRegistry.registerConfiguration({
         id: 'settingsSync',
         order: 30,
-        title: ( localize(2444, "Settings Sync")),
+        title: ( localize(2463, "Settings Sync")),
         type: 'object',
         properties: {
             [CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM]: {
                 type: 'boolean',
-                description: ( localize(2445, "Synchronize keybindings for each platform.")),
+                description: ( localize(2464, "Synchronize keybindings for each platform.")),
                 default: true,
                 scope: ConfigurationScope.APPLICATION,
                 tags: ['sync', 'usesOnlineServices']
@@ -64,13 +64,13 @@ function registerConfiguration() {
             'settingsSync.ignoredExtensions': {
                 'type': 'array',
                 markdownDescription: ( localize(
-                    2446,
+                    2465,
                     "List of extensions to be ignored while synchronizing. The identifier of an extension is always `${publisher}.${name}`. For example: `vscode.csharp`."
                 )),
                 items: [{
                         type: 'string',
                         pattern: EXTENSION_IDENTIFIER_PATTERN,
-                        errorMessage: ( localize(2447, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
+                        errorMessage: ( localize(2466, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
                     }],
                 'default': [],
                 'scope': ConfigurationScope.APPLICATION,
@@ -80,7 +80,7 @@ function registerConfiguration() {
             },
             'settingsSync.ignoredSettings': {
                 'type': 'array',
-                description: ( localize(2448, "Configure settings to be ignored while synchronizing.")),
+                description: ( localize(2467, "Configure settings to be ignored while synchronizing.")),
                 'default': [],
                 'scope': ConfigurationScope.APPLICATION,
                 $ref: ignoredSettingsSchemaId,

package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js

@@ -134,7 +134,7 @@ let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disp
         const machinesData = this.parse(this.userData);
         if (machinesData.version !== UserDataSyncMachinesService_1.VERSION) {
             throw ( new Error(( localize(
-                2450,
+                2469,
                 "Cannot read machines data as the current version is incompatible. Please update {0} and try again.",
                 this.productService.nameLong
             ))));

package/vscode/src/vs/platform/webContentExtractor/common/webContentExtractor.d.ts

@@ -8,6 +8,10 @@ export interface IWebContentExtractorOptions {
      * 'false' by default.
      */
     followRedirects?: boolean;
+    /**
+     * List of trusted domain patterns for redirect validation.
+     */
+    trustedDomains?: string[];
 }
 export type WebContentExtractResult = {
     status: "ok";

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -138,7 +138,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localize(2452, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(2471, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
 const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 function isUntitledWorkspace(path, environmentService) {
     return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);

package/vscode/src/vs/workbench/api/common/extHost.api.impl.js

@@ -1271,11 +1271,11 @@ function createApiFactoryAndRegisterActors(accessor) {
                 extHostApiDeprecation.report('scm.inputBox', extension, `Use 'SourceControl.inputBox' instead`);
                 return extHostSCM.getLastInputBox(extension);
             },
-            createSourceControl(id, label, rootUri, iconPath, parent) {
-                if (iconPath || parent) {
+            createSourceControl(id, label, rootUri, iconPath, isHidden, parent) {
+                if (iconPath || isHidden || parent) {
                     checkProposedApiEnabled(extension, 'scmProviderOptions');
                 }
-                return extHostSCM.createSourceControl(extension, id, label, rootUri, iconPath, parent);
+                return extHostSCM.createSourceControl(extension, id, label, rootUri, iconPath, isHidden, parent);
             }
         };
         const comments = {

package/vscode/src/vs/workbench/api/common/extHost.protocol.d.ts

@@ -49,17 +49,17 @@ import { WorkspaceTrustRequestOptions } from "../../../platform/workspace/common
 import { SaveReason } from "../../common/editor.js";
 import { IRevealOptions, ITreeItem, IViewBadge } from "../../common/views.js";
 import { CallHierarchyItem } from "../../contrib/callHierarchy/common/callHierarchy.js";
-import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from "../../contrib/chat/common/chatAgents.js";
-import { ICodeMapperRequest, ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService";
-import { IChatContextItem, IChatContextSupport } from "../../contrib/chat/common/chatContext.js";
-import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatProgressHistoryResponseContent, IChatRequestVariableData } from "../../contrib/chat/common/chatModel.js";
-import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatExternalEditsDto, IChatFollowup, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from "../../contrib/chat/common/participants/chatAgents.js";
+import { ICodeMapperRequest, ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService";
+import { IChatContextItem, IChatContextSupport } from "../../contrib/chat/common/contextContrib/chatContext.js";
+import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from "../../contrib/chat/common/editing/chatEditingService.js";
+import { IChatProgressHistoryResponseContent, IChatRequestVariableData } from "../../contrib/chat/common/model/chatModel.js";
+import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatExternalEditsDto, IChatFollowup, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService/chatService.js";
 import { IChatSessionItem, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from "../../contrib/chat/common/chatSessionsService.js";
-import { IChatRequestVariableValue } from "../../contrib/chat/common/chatVariables.js";
+import { IChatRequestVariableValue } from "../../contrib/chat/common/attachments/chatVariables.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { IChatMessage, IChatResponsePart, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from "../../contrib/chat/common/languageModels.js";
-import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep, IToolResult, ToolDataSource } from "../../contrib/chat/common/languageModelToolsService.js";
+import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep, IToolResult, ToolDataSource } from "../../contrib/chat/common/tools/languageModelToolsService.js";
 import { ICustomAgentQueryOptions, IExternalCustomAgent } from "../../contrib/chat/common/promptSyntax/service/promptsService.js";
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from "../../contrib/debug/common/debug.js";
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
@@ -648,7 +648,9 @@ export interface TransferQuickPickItem {
 export interface TransferQuickInputButton extends quickInput.IQuickInputButton {
     handle: number;
     iconPathDto: IconPathDto;
-    checked?: boolean;
+    toggle?: {
+        checked: boolean;
+    };
     iconPath?: {
         light?: URI;
         dark: URI;
@@ -920,10 +922,10 @@ export interface MainThreadWebviewsShape extends IDisposable {
     $setOptions(handle: WebviewHandle, options: IWebviewContentOptions): void;
     $postMessage(handle: WebviewHandle, value: string, ...buffers: VSBuffer[]): Promise<boolean>;
 }
-export interface IWebviewIconPath {
+export type IWebviewIconPath = ThemeIcon | {
     readonly light: UriComponents;
     readonly dark: UriComponents;
-}
+};
 export interface IWebviewInitData {
     readonly title: string;
     readonly webviewOptions: IWebviewContentOptions;
@@ -1243,7 +1245,7 @@ export interface MainThreadChatAgentsShape2 extends IChatAgentProgressShape, IDi
     $unregisterAgentCompletionsProvider(handle: number, id: string): void;
     $updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
     $unregisterAgent(handle: number): void;
-    $transferActiveChatSession(toWorkspace: UriComponents): void;
+    $transferActiveChatSession(toWorkspace: UriComponents): Promise<void>;
 }
 export interface ICodeMapperTextEdit {
     uri: URI;
@@ -1606,7 +1608,7 @@ export interface SCMArtifactDto {
     readonly command?: ICommandDto;
 }
 export interface MainThreadSCMShape extends IDisposable {
-    $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: IconPathDto | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
+    $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: IconPathDto | undefined, isHidden: boolean | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
     $updateSourceControl(handle: number, features: SCMProviderFeatures): Promise<void>;
     $unregisterSourceControl(handle: number): Promise<void>;
     $registerGroups(sourceControlHandle: number, groups: [
@@ -2439,7 +2441,7 @@ export declare class TerminalCompletionListDto<T extends ITerminalCompletionItem
 }
 export interface TerminalCompletionResourceOptionsDto {
     showFiles?: boolean;
-    showFolders?: boolean;
+    showDirectories?: boolean;
     globPattern?: string | IRelativePattern;
     cwd: UriComponents;
     pathSeparator: string;
@@ -2924,6 +2926,20 @@ export interface IMcpAuthenticationOptions {
     errorOnUserInteraction?: boolean;
     forceNewRegistration?: boolean;
 }
+export declare enum McpAuthResourceMetadataSource {
+    Header = "header",
+    WellKnown = "wellKnown",
+    None = "none"
+}
+export declare enum McpAuthServerMetadataSource {
+    ResourceMetadata = "resourceMetadata",
+    WellKnown = "wellKnown",
+    Default = "default"
+}
+export interface IMcpAuthSetupTelemetry {
+    resourceMetadataSource: McpAuthResourceMetadataSource;
+    serverMetadataSource: McpAuthServerMetadataSource;
+}
 export interface MainThreadMcpShape {
     $onDidChangeState(id: number, state: McpConnectionState): void;
     $onDidPublishLog(id: number, level: LogLevel, log: string): void;
@@ -2932,6 +2948,7 @@ export interface MainThreadMcpShape {
     $deleteMcpCollection(collectionId: string): void;
     $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, options?: IMcpAuthenticationOptions): Promise<string | undefined>;
     $getTokenForProviderId(id: number, providerId: string, scopes: string[], options?: IMcpAuthenticationOptions): Promise<string | undefined>;
+    $logMcpAuthSetup(data: IMcpAuthSetupTelemetry): void;
 }
 export interface MainThreadDataChannelsShape extends IDisposable {
 }
@@ -3055,6 +3072,7 @@ export interface MainThreadChatSessionsShape extends IDisposable {
     $registerChatSessionContentProvider(handle: number, chatSessionScheme: string): void;
     $unregisterChatSessionContentProvider(handle: number): void;
     $onDidChangeChatSessionOptions(handle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto2>): void;
+    $onDidChangeChatSessionProviderOptions(handle: number): void;
     $handleProgressChunk(handle: number, sessionResource: UriComponents, requestId: string, chunks: (IChatProgressDto | [
         IChatProgressDto,
         number
@@ -3064,10 +3082,6 @@ export interface MainThreadChatSessionsShape extends IDisposable {
 }
 export interface ExtHostChatSessionsShape {
     $provideChatSessionItems(providerHandle: number, token: CancellationToken): Promise<Dto<IChatSessionItem>[]>;
-    $provideNewChatSessionItem(providerHandle: number, options: {
-        request: IChatAgentRequest;
-        metadata?: any;
-    }, token: CancellationToken): Promise<Dto<IChatSessionItem>>;
     $provideChatSessionContent(providerHandle: number, sessionResource: UriComponents, token: CancellationToken): Promise<ChatSessionDto>;
     $interruptChatSessionActiveResponse(providerHandle: number, sessionResource: UriComponents, requestId: string): Promise<void>;
     $disposeChatSessionContent(providerHandle: number, sessionResource: UriComponents): Promise<void>;

package/vscode/src/vs/workbench/api/common/extHost.protocol.js

@@ -100,6 +100,18 @@ var ExtHostTestingResource;
     ExtHostTestingResource[ExtHostTestingResource["Workspace"] = 0] = "Workspace";
     ExtHostTestingResource[ExtHostTestingResource["TextDocument"] = 1] = "TextDocument";
 })(ExtHostTestingResource || (ExtHostTestingResource = {}));
+var McpAuthResourceMetadataSource;
+(function (McpAuthResourceMetadataSource) {
+    McpAuthResourceMetadataSource["Header"] = "header";
+    McpAuthResourceMetadataSource["WellKnown"] = "wellKnown";
+    McpAuthResourceMetadataSource["None"] = "none";
+})(McpAuthResourceMetadataSource || (McpAuthResourceMetadataSource = {}));
+var McpAuthServerMetadataSource;
+(function (McpAuthServerMetadataSource) {
+    McpAuthServerMetadataSource["ResourceMetadata"] = "resourceMetadata";
+    McpAuthServerMetadataSource["WellKnown"] = "wellKnown";
+    McpAuthServerMetadataSource["Default"] = "default";
+})(McpAuthServerMetadataSource || (McpAuthServerMetadataSource = {}));
 const MainContext = {
     MainThreadAuthentication: ( createProxyIdentifier('MainThreadAuthentication')),
     MainThreadBulkEdits: ( createProxyIdentifier('MainThreadBulkEdits')),
@@ -255,4 +267,4 @@ const ExtHostContext = {
     ExtHostChatSessions: ( createProxyIdentifier('ExtHostChatSessions')),
 };
 
-export { CandidatePortSource, CellOutputKind, ExtHostContext, ExtHostTestingResource, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewEditorCapabilities, WebviewMessageArrayBufferViewType };
+export { CandidatePortSource, CellOutputKind, ExtHostContext, ExtHostTestingResource, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, McpAuthResourceMetadataSource, McpAuthServerMetadataSource, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewEditorCapabilities, WebviewMessageArrayBufferViewType };

package/vscode/src/vs/workbench/api/common/extHostApiCommands.js

@@ -753,6 +753,7 @@ const newCommands = [
                     attachments: v.attachments,
                     autoSend: v.autoSend,
                     position: v.position ? Position$1.from(v.position) : undefined,
+                    blockOnResponse: v.blockOnResponse
                 };
             }))],
         ApiCommandResult.Void

package/vscode/src/vs/workbench/api/common/extHostAuthentication.js

@@ -312,7 +312,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2662, "URL Handler")),
+                label: ( localize(2684, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -380,7 +380,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             try {
                 token = await this._extHostProgress.withProgressFromSource({ label: this.label, id: this.id }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2663, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2685, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -394,13 +394,13 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                 }
                 const message = isCancellationError(err)
                     ? ( localize(
-                    2664,
+                    2686,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 ))
                     : ( localize(
-                    2665,
+                    2687,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -485,7 +485,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2666, "Complete the authentication in the browser window that has opened.")),
+            message: ( localize(2688, "Complete the authentication in the browser window that has opened.")),
         });
         let code;
         try {

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.d.ts

@@ -4,9 +4,9 @@ import { Disposable, DisposableStore } from "../../../base/common/lifecycle.js";
 import { UriComponents } from "../../../base/common/uri.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
-import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelectedTools } from "../../contrib/chat/common/chatAgents.js";
-import { IChatRelatedFile, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatFollowup, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
+import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelectedTools } from "../../contrib/chat/common/participants/chatAgents.js";
+import { IChatRelatedFile, IChatRequestDraft } from "../../contrib/chat/common/editing/chatEditingService.js";
+import { IChatFollowup, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService/chatService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentProgressShape, IChatSessionContextDto, IMainContext } from "./extHost.protocol.js";
@@ -57,7 +57,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     private readonly _onDidDisposeChatSession;
     readonly onDidDisposeChatSession: import("../../../base/common/event.js").Event<string>;
     constructor(mainContext: IMainContext, _logService: ILogService, _commands: ExtHostCommands, _documents: ExtHostDocuments, _editorsAndDocuments: ExtHostDocumentsAndEditors, _languageModels: ExtHostLanguageModels, _diagnostics: ExtHostDiagnostics, _tools: ExtHostLanguageModelTools);
-    transferActiveChat(newWorkspace: vscode.Uri): void;
+    transferActiveChat(newWorkspace: vscode.Uri): Promise<void>;
     createChatAgent(extension: IExtensionDescription, id: string, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
     createDynamicChatAgent(extension: IExtensionDescription, id: string, dynamicProps: vscode.DynamicChatParticipantProps, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
     registerChatParticipantDetectionProvider(extension: IExtensionDescription, provider: vscode.ChatParticipantDetectionProvider): vscode.Disposable;

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js

@@ -12,9 +12,9 @@ import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
-import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.js';
-import { LocalChatSessionUri } from '../../contrib/chat/common/chatUri.js';
+import { isChatViewTitleActionContext } from '../../contrib/chat/common/actions/chatActions.js';
+import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
@@ -359,8 +359,8 @@ class ExtHostChatAgents2 extends Disposable {
             }
         });
     }
-    transferActiveChat(newWorkspace) {
-        this._proxy.$transferActiveChatSession(newWorkspace);
+    async transferActiveChat(newWorkspace) {
+        await this._proxy.$transferActiveChatSession(newWorkspace);
     }
     createChatAgent(extension, id, handler) {
         const handle = ExtHostChatAgents2._idPool++;
@@ -576,7 +576,7 @@ class ExtHostChatAgents2 extends Disposable {
         const res = [];
         for (const h of context.history) {
             const ehResult = ChatAgentResult.to(h.result);
-            const result = agentId === h.request.agentId ?
+            const result = agentId === h.request.agentId || (isBuiltinParticipant(h.request.agentId) && isBuiltinParticipant(agentId)) ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
             const varsWithoutTools = [];
@@ -919,5 +919,8 @@ function raceCancellationWithTimeout(cancelWait, promise, token) {
         promise.then(resolve, reject).finally(() => ref.dispose());
     }));
 }
+function isBuiltinParticipant(agentId) {
+    return agentId.startsWith('github.copilot');
+}
 
 export { ChatAgentResponseStream, ExtHostChatAgents2 };