@codingame/monaco-vscode-api 23.3.0 → 24.1.1

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

@@ -20,6 +20,7 @@ import { ViewColumn, TerminalCompletionList, TerminalQuickFix } from './extHostT
 import { IExtHostCommands } from './extHostCommands.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isWindows } from '../../../base/common/platform.js';
+import { hasKey } from '../../../base/common/types.js';
 
 const IExtHostTerminalService = ( createDecorator('IExtHostTerminalService'));
 class ExtHostTerminal extends Disposable {
@@ -136,10 +137,10 @@ class ExtHostTerminal extends Disposable {
     }
     _serializeParentTerminal(location, parentTerminal) {
         if (typeof location === 'object') {
-            if ('parentTerminal' in location && location.parentTerminal && parentTerminal) {
+            if (hasKey(location, { parentTerminal: true }) && location.parentTerminal && parentTerminal) {
                 return { parentTerminal };
             }
-            if ('viewColumn' in location) {
+            if (hasKey(location, { viewColumn: true })) {
                 return { viewColumn: ViewColumn.from(location.viewColumn), preserveFocus: location.preserveFocus };
             }
             return undefined;
@@ -251,8 +252,6 @@ class ExtHostPseudoterminal {
     }
     async setUnicodeVersion(version) {
     }
-    async setNextCommandId(commandLine, commandId) {
-    }
     getInitialCwd() {
         return Promise.resolve('');
     }
@@ -327,8 +326,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         this._extHostCommands.registerArgumentProcessor({
             processArgument: arg => {
                 const deserialize = (arg) => {
-                    const cast = arg;
-                    return this.getTerminalById(cast.instanceId)?.value;
+                    return this.getTerminalById(arg.instanceId)?.value;
                 };
                 switch (arg?.$mid) {
                     case MarshalledId.TerminalContext: return deserialize(arg);
@@ -376,7 +374,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     }
     _serializeParentTerminal(options, internalOptions) {
         internalOptions = internalOptions ? internalOptions : {};
-        if (options.location && typeof options.location === 'object' && 'parentTerminal' in options.location) {
+        if (options.location && typeof options.location === 'object' && hasKey(options.location, { parentTerminal: true })) {
             const parentTerminal = options.location.parentTerminal;
             if (parentTerminal) {
                 const parentExtHostTerminal = this._terminals.find(t => t.value === parentTerminal);
@@ -388,7 +386,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         else if (options.location && typeof options.location !== 'object') {
             internalOptions.location = options.location;
         }
-        else if (internalOptions.location && typeof internalOptions.location === 'object' && 'splitActiveTerminal' in internalOptions.location) {
+        else if (internalOptions.location && typeof internalOptions.location === 'object' && hasKey(internalOptions.location, { splitActiveTerminal: true })) {
             internalOptions.location = { splitActiveTerminal: true };
         }
         return internalOptions;
@@ -489,7 +487,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(2667, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(2681, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( new Promise(r => {
@@ -651,13 +649,13 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         if (token.isCancellationRequested) {
             return;
         }
-        if (profile && !('options' in profile)) {
+        if (profile && !hasKey(profile, { options: true })) {
             profile = { options: profile };
         }
-        if (!profile || !('options' in profile)) {
+        if (!profile || !hasKey(profile, { options: true })) {
             throw ( new Error(`No terminal profile options provided for id "${id}"`));
         }
-        if ('pty' in profile.options) {
+        if (hasKey(profile.options, { pty: true })) {
             this.createExtensionTerminal(profile.options, options);
             return;
         }
@@ -997,7 +995,7 @@ function asTerminalIcon(iconPath) {
     if (!iconPath || typeof iconPath === 'string') {
         return undefined;
     }
-    if (!('id' in iconPath)) {
+    if (!hasKey(iconPath, { id: true })) {
         return iconPath;
     }
     return {
@@ -1012,7 +1010,6 @@ function convertMutator(mutator) {
     const newMutator = { ...mutator };
     delete newMutator.scope;
     newMutator.options = newMutator.options ?? undefined;
-    delete newMutator.variable;
     return newMutator;
 }
 

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

@@ -762,8 +762,7 @@ class MirroredChangeCollector {
         }
     }
     remove(node) {
-        if (( this.added.has(node))) {
-            this.added.delete(node);
+        if (this.added.delete(node)) {
             return;
         }
         this.updated.delete(node);

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

@@ -273,6 +273,7 @@ class ExtHostTreeViews extends Disposable {
 class ExtHostTreeView extends Disposable {
     static { this.LABEL_HANDLE_PREFIX = '0'; }
     static { this.ID_HANDLE_PREFIX = '1'; }
+    static { this.ROOT_FETCH_KEY = Symbol('extHostTreeViewRoot'); }
     get visible() { return this._visible; }
     get selectedElements() { return ( this._selectedHandles.map(handle => this.getExtensionElement(handle))).filter(element => !isUndefinedOrNull(element)); }
     get focusedElement() { return (this._focusedHandle ? this.getExtensionElement(this._focusedHandle) : undefined); }
@@ -286,6 +287,7 @@ class ExtHostTreeView extends Disposable {
         this._roots = undefined;
         this._elements = ( new Map());
         this._nodes = ( new Map());
+        this._childrenFetchTokens = ( new Map());
         this._visible = false;
         this._selectedHandles = [];
         this._focusedHandle = undefined;
@@ -631,11 +633,21 @@ class ExtHostTreeView extends Disposable {
         }
         return this._roots;
     }
+    _getFetchKey(parentElement) {
+        return parentElement ?? ExtHostTreeView.ROOT_FETCH_KEY;
+    }
     async _fetchChildrenNodes(parentElement) {
         this._addChildrenToClear(parentElement);
+        const fetchKey = this._getFetchKey(parentElement);
+        let requestId = this._childrenFetchTokens.get(fetchKey) ?? 0;
+        requestId++;
+        this._childrenFetchTokens.set(fetchKey, requestId);
         const cts = ( new CancellationTokenSource(this._refreshCancellationSource.token));
         try {
             const elements = await this._dataProvider.getChildren(parentElement);
+            if (this._childrenFetchTokens.get(fetchKey) !== requestId) {
+                return undefined;
+            }
             const parentNode = parentElement ? this._nodes.get(parentElement) : undefined;
             if (cts.token.isCancellationRequested) {
                 return undefined;
@@ -644,12 +656,18 @@ class ExtHostTreeView extends Disposable {
             const treeItems = await Promise.all(( coalesce(coalescedElements).map(element => {
                 return this._dataProvider.getTreeItem(element);
             })));
+            if (this._childrenFetchTokens.get(fetchKey) !== requestId) {
+                return undefined;
+            }
             if (cts.token.isCancellationRequested) {
                 return undefined;
             }
             const items = ( treeItems.map(
                 (item, index) => item ? this._createAndRegisterTreeNode(coalescedElements[index], item, parentNode) : null
             ));
+            if (this._childrenFetchTokens.get(fetchKey) !== requestId) {
+                return undefined;
+            }
             return coalesce(items);
         }
         finally {
@@ -732,7 +750,7 @@ class ExtHostTreeView extends Disposable {
     _createAndRegisterTreeNode(element, extTreeItem, parentNode) {
         const node = this._createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this._elements.has(node.item.handle))) {
-            throw ( new Error(( localize(2668, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2682, 'Element with id {0} is already registered', extTreeItem.id))));
         }
         this._addNodeToCache(element, node);
         this._addNodeToParentCache(node, parentNode);
@@ -916,6 +934,7 @@ class ExtHostTreeView extends Disposable {
         });
         this._nodes.clear();
         this._elements.clear();
+        this._childrenFetchTokens.clear();
     }
     _clearNodes(nodes) {
         dispose(nodes);
@@ -927,6 +946,7 @@ class ExtHostTreeView extends Disposable {
         this._nodes.clear();
         dispose(this._nodesToClear);
         this._nodesToClear.clear();
+        this._childrenFetchTokens.clear();
     }
     dispose() {
         super.dispose();

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

@@ -151,12 +151,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(2669, "Private")),
+                            label: ( localize(2683, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(2670, "Public")),
+                            label: ( localize(2684, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

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

@@ -20,10 +20,10 @@ import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from "../
 import { ProgressLocation as MainProgressLocation } from "../../../platform/progress/common/progress.js";
 import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
-import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/chatAgents.js";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatRequestModeInstructions } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffData, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
+import { IChatRequestModeInstructions } from "../../contrib/chat/common/chatModel.js";
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffDataSerialized, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
 import { IChatRequestVariableEntry } from "../../contrib/chat/common/chatVariableEntries.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { IToolResult, ToolDataSource } from "../../contrib/chat/common/languageModelToolsService.js";
@@ -31,12 +31,12 @@ import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";
 import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
 import * as notebooks from "../../contrib/notebook/common/notebookCommon.js";
-import { ICellRange } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "../../contrib/notebook/common/notebookRange.js";
 import { InputValidationType } from "../../contrib/scm/common/scm.js";
-import * as search from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
+import * as search from "../../contrib/search/common/search.js";
 import { CoverageDetails, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestRunProfileReference, ITestTag, TestRunProfileBitset } from "../../contrib/testing/common/testTypes.js";
 import { AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "../../services/editor/common/editorGroupColumn.js";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import * as extHostProtocol from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
@@ -477,8 +477,8 @@ export declare namespace ChatResponseFilesPart {
     function to(part: Dto<IChatTreeData>): vscode.ChatResponseFileTreePart;
 }
 export declare namespace ChatResponseMultiDiffPart {
-    function from(part: vscode.ChatResponseMultiDiffPart): IChatMultiDiffData;
-    function to(part: Dto<IChatMultiDiffData>): vscode.ChatResponseMultiDiffPart;
+    function from(part: vscode.ChatResponseMultiDiffPart): IChatMultiDiffDataSerialized;
+    function to(part: IChatMultiDiffDataSerialized): vscode.ChatResponseMultiDiffPart;
 }
 export declare namespace ChatResponseAnchorPart {
     function from(part: vscode.ChatResponseAnchorPart): Dto<IChatContentInlineReference>;

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

@@ -24,9 +24,10 @@ import { TrackedRangeStickiness, EndOfLineSequence } from '../../../editor/commo
 import { MarkerTag, MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { ProgressLocation as ProgressLocation$2 } from '../../../platform/progress/common/progress.js';
 import { SaveReason, DEFAULT_EDITOR_ASSOCIATION } from '../../common/editor.js';
+import { LocalChatSessionUri } from '../../contrib/chat/common/chatUri.js';
 import { isImageVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry } from '../../contrib/chat/common/chatVariableEntries.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
-import { ToolDataSource } from '../../contrib/chat/common/languageModelToolsService.js';
+import { ToolInvocationPresentation, ToolDataSource } from '../../contrib/chat/common/languageModelToolsService.js';
 import { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState } from '../../contrib/debug/common/debug.js';
 import { McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
@@ -2470,11 +2471,12 @@ var ChatResponseCodeblockUriPart;
             kind: 'codeblockUri',
             uri: part.value,
             isEdit: part.isEdit,
+            undoStopId: part.undoStopId
         };
     }
     ChatResponseCodeblockUriPart.from = from;
     function to(part) {
-        return new ChatResponseCodeblockUriPart$1(URI.revive(part.uri), part.isEdit);
+        return new ChatResponseCodeblockUriPart$1(URI.revive(part.uri), part.isEdit, part.undoStopId);
     }
     ChatResponseCodeblockUriPart.to = to;
 })(ChatResponseCodeblockUriPart || (ChatResponseCodeblockUriPart = {}));
@@ -2714,7 +2716,11 @@ var ChatToolInvocationPart;
             isComplete: part.isComplete ?? true,
             source: ToolDataSource.External,
             toolSpecificData: part.toolSpecificData ? convertToolSpecificData(part.toolSpecificData) : undefined,
-            presentation: undefined,
+            presentation: part.presentation === 'hidden'
+                ? ToolInvocationPresentation.Hidden
+                : part.presentation === 'hiddenAfterComplete'
+                    ? ToolInvocationPresentation.HiddenAfterComplete
+                    : undefined,
             fromSubAgent: part.fromSubAgent
         };
     }
@@ -3033,6 +3039,7 @@ var ChatAgentRequest;
                 variableReferences.push(v);
             }
         }
+        const sessionId = LocalChatSessionUri.parseLocalSessionId(request.sessionResource) ?? ( request.sessionResource.toString());
         const requestWithAllProps = {
             id: request.requestId,
             prompt: request.message,
@@ -3040,7 +3047,7 @@ var ChatAgentRequest;
             attempt: request.attempt ?? 0,
             enableCommandDetection: request.enableCommandDetection ?? true,
             isParticipantDetected: request.isParticipantDetected ?? false,
-            sessionId: request.sessionId,
+            sessionId,
             references: ( variableReferences
                 .map(v => ChatPromptReference.to(v, diagnostics, logService)))
                 .filter(isDefined),
@@ -3049,7 +3056,7 @@ var ChatAgentRequest;
             acceptedConfirmationData: request.acceptedConfirmationData,
             rejectedConfirmationData: request.rejectedConfirmationData,
             location2,
-            toolInvocationToken: ( Object.freeze({ sessionId: request.sessionId })),
+            toolInvocationToken: ( Object.freeze({ sessionId, sessionResource: request.sessionResource })),
             tools,
             model,
             editedFileEvents: request.editedFileEvents,
@@ -3715,6 +3722,10 @@ var McpServerDefinition;
                 type: McpServerTransportType.HTTP,
                 uri: item.uri,
                 headers: Object.entries(item.headers),
+                authentication: item.authentication ? {
+                    providerId: item.authentication.providerId,
+                    scopes: item.authentication.scopes
+                } : undefined,
             }
             : {
                 type: McpServerTransportType.Stdio,

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

@@ -1468,8 +1468,8 @@ export declare class ChatResponseMultiDiffPart {
 export declare class ChatResponseExternalEditPart {
     uris: vscode.Uri[];
     callback: () => Thenable<unknown>;
-    applied: Thenable<void>;
-    didGetApplied: () => void;
+    applied: Thenable<string>;
+    didGetApplied: (value: string) => void;
     constructor(uris: vscode.Uri[], callback: () => Thenable<unknown>);
 }
 export declare class ChatResponseAnchorPart implements vscode.ChatResponseAnchorPart {
@@ -1540,8 +1540,9 @@ export declare class ChatResponseReferencePart {
 }
 export declare class ChatResponseCodeblockUriPart {
     isEdit?: boolean;
+    undoStopId?: string;
     value: vscode.Uri;
-    constructor(value: vscode.Uri, isEdit?: boolean);
+    constructor(value: vscode.Uri, isEdit?: boolean, undoStopId?: string);
 }
 export declare class ChatResponseCodeCitationPart {
     value: vscode.Uri;
@@ -1611,6 +1612,7 @@ export declare class ChatToolInvocationPart {
     isComplete?: boolean;
     toolSpecificData?: ChatTerminalToolInvocationData2;
     fromSubAgent?: boolean;
+    presentation?: "hidden" | "hiddenAfterComplete" | undefined;
     constructor(toolName: string, toolCallId: string, isError?: boolean);
 }
 export declare class ChatRequestTurn implements vscode.ChatRequestTurn2 {
@@ -1620,7 +1622,8 @@ export declare class ChatRequestTurn implements vscode.ChatRequestTurn2 {
     readonly participant: string;
     readonly toolReferences: vscode.ChatLanguageModelToolReference[];
     readonly editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined;
-    constructor(prompt: string, command: string | undefined, references: vscode.ChatPromptReference[], participant: string, toolReferences: vscode.ChatLanguageModelToolReference[], editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined);
+    readonly id?: string | undefined;
+    constructor(prompt: string, command: string | undefined, references: vscode.ChatPromptReference[], participant: string, toolReferences: vscode.ChatLanguageModelToolReference[], editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined, id?: string | undefined);
 }
 export declare class ChatResponseTurn implements vscode.ChatResponseTurn {
     readonly response: ReadonlyArray<ChatResponseMarkdownPart | ChatResponseFileTreePart | ChatResponseAnchorPart | ChatResponseCommandButtonPart>;
@@ -1647,6 +1650,13 @@ export declare enum ChatSessionStatus {
     Completed = 1,
     InProgress = 2
 }
+export declare class ChatSessionChangedFile {
+    readonly modifiedUri: vscode.Uri;
+    readonly insertions: number;
+    readonly deletions: number;
+    readonly originalUri?: vscode.Uri | undefined;
+    constructor(modifiedUri: vscode.Uri, insertions: number, deletions: number, originalUri?: vscode.Uri | undefined);
+}
 export declare enum ChatResponseReferencePartStatusKind {
     Complete = 1,
     Partial = 2,
@@ -1658,10 +1668,11 @@ export declare enum ChatResponseClearToPreviousToolInvocationReason {
     CopyrightContentRetry = 2
 }
 export declare class ChatRequestEditorData implements vscode.ChatRequestEditorData {
+    readonly editor: vscode.TextEditor;
     readonly document: vscode.TextDocument;
     readonly selection: vscode.Selection;
     readonly wholeRange: vscode.Range;
-    constructor(document: vscode.TextDocument, selection: vscode.Selection, wholeRange: vscode.Range);
+    constructor(editor: vscode.TextEditor, document: vscode.TextDocument, selection: vscode.Selection, wholeRange: vscode.Range);
 }
 export declare class ChatRequestNotebookData implements vscode.ChatRequestNotebookData {
     readonly cell: vscode.TextDocument;
@@ -1842,6 +1853,7 @@ export declare class ExtendedLanguageModelToolResult extends LanguageModelToolRe
     toolResultMessage?: string | MarkdownString;
     toolResultDetails?: Array<URI | Location>;
     toolMetadata?: unknown;
+    hasError?: boolean;
 }
 export declare enum LanguageModelChatToolMode {
     Auto = 1,
@@ -1905,5 +1917,12 @@ export declare class McpHttpServerDefinition implements vscode.McpHttpServerDefi
     headers: Record<string, string>;
     version?: string | undefined;
     metadata?: vscode.McpServerMetadata | undefined;
-    constructor(label: string, uri: URI, headers?: Record<string, string>, version?: string | undefined, metadata?: vscode.McpServerMetadata | undefined);
+    authentication?: {
+        providerId: string;
+        scopes: string[];
+    } | undefined;
+    constructor(label: string, uri: URI, headers?: Record<string, string>, version?: string | undefined, metadata?: vscode.McpServerMetadata | undefined, authentication?: {
+        providerId: string;
+        scopes: string[];
+    } | undefined);
 }

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

@@ -2500,9 +2500,10 @@ class ChatResponseReferencePart {
     }
 }
 class ChatResponseCodeblockUriPart {
-    constructor(value, isEdit) {
+    constructor(value, isEdit, undoStopId) {
         this.value = value;
         this.isEdit = isEdit;
+        this.undoStopId = undoStopId;
     }
 }
 class ChatResponseCodeCitationPart {
@@ -2578,13 +2579,14 @@ class ChatToolInvocationPart {
     }
 }
 class ChatRequestTurn {
-    constructor(prompt, command, references, participant, toolReferences, editedFileEvents) {
+    constructor(prompt, command, references, participant, toolReferences, editedFileEvents, id) {
         this.prompt = prompt;
         this.command = command;
         this.references = references;
         this.participant = participant;
         this.toolReferences = toolReferences;
         this.editedFileEvents = editedFileEvents;
+        this.id = id;
     }
 }
 class ChatResponseTurn {
@@ -2616,6 +2618,14 @@ var ChatSessionStatus;
     ChatSessionStatus[ChatSessionStatus["Completed"] = 1] = "Completed";
     ChatSessionStatus[ChatSessionStatus["InProgress"] = 2] = "InProgress";
 })(ChatSessionStatus || (ChatSessionStatus = {}));
+class ChatSessionChangedFile {
+    constructor(modifiedUri, insertions, deletions, originalUri) {
+        this.modifiedUri = modifiedUri;
+        this.insertions = insertions;
+        this.deletions = deletions;
+        this.originalUri = originalUri;
+    }
+}
 var ChatResponseReferencePartStatusKind;
 (function (ChatResponseReferencePartStatusKind) {
     ChatResponseReferencePartStatusKind[ChatResponseReferencePartStatusKind["Complete"] = 1] = "Complete";
@@ -2629,7 +2639,8 @@ var ChatResponseClearToPreviousToolInvocationReason;
     ChatResponseClearToPreviousToolInvocationReason[ChatResponseClearToPreviousToolInvocationReason["CopyrightContentRetry"] = 2] = "CopyrightContentRetry";
 })(ChatResponseClearToPreviousToolInvocationReason || (ChatResponseClearToPreviousToolInvocationReason = {}));
 class ChatRequestEditorData {
-    constructor(document, selection, wholeRange) {
+    constructor(editor, document, selection, wholeRange) {
+        this.editor = editor;
         this.document = document;
         this.selection = selection;
         this.wholeRange = wholeRange;
@@ -2936,13 +2947,14 @@ class McpStdioServerDefinition {
     }
 }
 class McpHttpServerDefinition {
-    constructor(label, uri, headers = {}, version, metadata) {
+    constructor(label, uri, headers = {}, version, metadata, authentication) {
         this.label = label;
         this.uri = uri;
         this.headers = headers;
         this.version = version;
         this.metadata = metadata;
+        this.authentication = authentication;
     }
 }
 
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatPrepareToolInvocationPart, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResultFeedbackKind, ChatSessionStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatPrepareToolInvocationPart, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };

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

@@ -3,7 +3,7 @@ import { URI } from "../../../base/common/uri.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ExtHostWebview, ExtHostWebviews } from "./extHostWebview.js";
 import { IExtHostWorkspace } from "./extHostWorkspace.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "../../services/editor/common/editorGroupColumn.js";
 import type * as vscode from "vscode";
 import * as extHostProtocol from "./extHost.protocol.js";
 type IconPath = URI | {

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { delta as delta$1, mapArrayOrNot } from '../../../base/common/arrays.js';
-import { Barrier, AsyncIterableObject } from '../../../base/common/async.js';
+import { Barrier, AsyncIterableProducer } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, AsyncEmitter } from '../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
@@ -250,7 +250,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
                 this._unconfirmedWorkspace = undefined;
                 const options = { source: { identifier: extension.identifier, label: extension.displayName || extension.name } };
                 this._messageService.$showMessage(Severity$1.Error, ( localize(
-                    2671,
+                    2685,
                     "Extension '{0}' failed to update workspace folders: {1}",
                     extName,
                     (error.toString())
@@ -431,7 +431,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
             return {
                 options: {
                     ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-                    disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+                    disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles?.local : undefined,
                     disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles?.global : undefined,
                     disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles?.parent : undefined,
                     disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
@@ -454,7 +454,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
         const disposables = ( new DisposableStore());
         const progressEmitter = disposables.add(( new Emitter()));
         const complete = this.findTextInFilesBase(query, queryOptions, (result, uri) => progressEmitter.fire({ result, uri }), token);
-        const asyncIterable = ( new AsyncIterableObject(async (emitter) => {
+        const asyncIterable = ( new AsyncIterableProducer(async (emitter) => {
             disposables.add(progressEmitter.event(e => {
                 const result = e.result;
                 const uri = e.uri;

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

@@ -1,6 +1,6 @@
 import { URI } from "../../../base/common/uri.js";
 import { IURITransformer } from "../../../base/common/uriIpc.js";
-import { IMessagePassingProtocol } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
+import { IMessagePassingProtocol } from "../../../base/parts/ipc/common/ipc.js";
 import { MainThreadConsoleShape } from "./extHost.protocol.js";
 import { IExtensionHostInitData } from "../../services/extensions/common/extensionHostProtocol.js";
 import { ServicesAccessor } from "../../../platform/instantiation/common/instantiation.js";