@codingame/monaco-vscode-api 17.2.0 → 18.0.0

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

@@ -253,10 +253,12 @@ class ExtHostTreeViews extends Disposable {
     }
     convertArgument(arg) {
         const treeView = this.treeViews.get(arg.$treeViewId);
-        if (treeView && '$treeItemHandle' in arg) {
-            return treeView.getExtensionElement(arg.$treeItemHandle);
+        const asItemHandle = arg;
+        if (treeView && asItemHandle.$treeItemHandle) {
+            return treeView.getExtensionElement(asItemHandle.$treeItemHandle);
         }
-        if (treeView && '$focusedTreeItem' in arg && arg.$focusedTreeItem) {
+        const asPaneHandle = arg;
+        if (treeView && asPaneHandle.$focusedTreeItem) {
             return treeView.focusedElement;
         }
         return null;
@@ -670,7 +672,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(2570, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2594, 'Element with id {0} is already registered', extTreeItem.id))));
         }
         this.addNodeToCache(element, node);
         this.addNodeToParentCache(node, parentNode);

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

@@ -148,12 +148,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(2571, "Private")),
+                            label: ( localize(2595, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(2572, "Public")),
+                            label: ( localize(2596, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

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

@@ -22,13 +22,13 @@ import { IViewBadge } from "../../common/views.js";
 import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/chatAgents.js";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
 import { IChatRequestVariableEntry } from "../../contrib/chat/common/chatModel.js";
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
 import { IToolData, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
 import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";
 import * as notebooks from "../../contrib/notebook/common/notebookCommon.js";
-import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
-import * as search from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search";
+import { ICellRange } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import * as search from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/search";
 import { CoverageDetails, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestRunProfileReference, ITestTag, TestRunProfileBitset } from "../../contrib/testing/common/testTypes.js";
 import { EditorGroupColumn } from "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
@@ -310,9 +310,6 @@ export declare namespace NotebookCellExecutionSummary {
     function to(data: notebooks.NotebookCellInternalMetadata): vscode.NotebookCellExecutionSummary;
     function from(data: vscode.NotebookCellExecutionSummary): Partial<notebooks.NotebookCellInternalMetadata>;
 }
-export declare namespace NotebookCellExecutionState {
-    function to(state: notebooks.NotebookCellExecutionState): vscode.NotebookCellExecutionState | undefined;
-}
 export declare namespace NotebookCellKind {
     function from(data: vscode.NotebookCellKind): notebooks.CellKind;
     function to(data: notebooks.CellKind): vscode.NotebookCellKind;
@@ -487,6 +484,10 @@ export declare namespace ChatResponseMovePart {
     function from(part: vscode.ChatResponseMovePart): Dto<IChatMoveMessage>;
     function to(part: Dto<IChatMoveMessage>): vscode.ChatResponseMovePart;
 }
+export declare namespace ChatPrepareToolInvocationPart {
+    function from(part: vscode.ChatPrepareToolInvocationPart): IChatPrepareToolInvocationPart;
+    function to(part: IChatPrepareToolInvocationPart): vscode.ChatPrepareToolInvocationPart;
+}
 export declare namespace ChatTask {
     function from(part: vscode.ChatResponseProgressPart2): IChatTaskDto;
 }
@@ -515,7 +516,7 @@ export declare namespace ChatResponseCodeCitationPart {
     function from(part: vscode.ChatResponseCodeCitationPart): Dto<IChatCodeCitation>;
 }
 export declare namespace ChatResponsePart {
-    function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseReferencePart2 | vscode.ChatResponseMovePart | vscode.ChatResponseNotebookEditPart | vscode.ChatResponseExtensionsPart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto;
+    function from(part: vscode.ExtendedChatResponsePart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto;
     function to(part: extHostProtocol.IChatProgressDto, commandsConverter: CommandsConverter): vscode.ChatResponsePart | undefined;
     function toContent(part: extHostProtocol.IChatContentProgressDto, commandsConverter: CommandsConverter): vscode.ChatResponseMarkdownPart | vscode.ChatResponseFileTreePart | vscode.ChatResponseAnchorPart | vscode.ChatResponseCommandButtonPart | undefined;
 }
@@ -523,7 +524,7 @@ export declare namespace ChatAgentRequest {
     function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [
         vscode.Uri,
         readonly vscode.Diagnostic[]
-    ][], toolSelection: vscode.ChatRequestToolSelection | undefined, tools: Map<string, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest;
+    ][], tools: Map<string, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest;
 }
 export declare namespace ChatRequestDraft {
     function to(request: IChatRequestDraft): vscode.ChatRequestDraft;

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

@@ -28,14 +28,14 @@ import { SaveReason, DEFAULT_EDITOR_ASSOCIATION } from '../../common/editor.js';
 import { isImageVariableEntry } from '../../contrib/chat/common/chatModel.js';
 import { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState } from '../../contrib/debug/common/debug.js';
-import { CellEditType, NotebookCellExecutionState as NotebookCellExecutionState$1, CellKind, CellStatusbarAlignment } from '../../contrib/notebook/common/notebookCommon.js';
+import { CellEditType, CellKind, CellStatusbarAlignment } from '../../contrib/notebook/common/notebookCommon.js';
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { TestMessageType, namespaceTestTag, denamespaceTestTag, TestRunProfileBitset, DetailType } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Location as Location$1, StandardTokenType as StandardTokenType$1, DiagnosticTag as DiagnosticTag$1, Diagnostic as Diagnostic$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, DecorationRangeBehavior as DecorationRangeBehavior$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, EndOfLine as EndOfLine$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookCellKind as NotebookCellKind$1, NotebookCellData as NotebookCellData$1, NotebookData as NotebookData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelDataPart, LanguageModelToolResultPart2, LanguageModelExtraDataPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseExtensionsPart as ChatResponseExtensionsPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, LanguageModelToolResult2 as LanguageModelToolResult2$1, ChatImageMimeType } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Location as Location$1, StandardTokenType as StandardTokenType$1, DiagnosticTag as DiagnosticTag$1, Diagnostic as Diagnostic$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, DecorationRangeBehavior as DecorationRangeBehavior$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, EndOfLine as EndOfLine$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellKind as NotebookCellKind$1, NotebookCellData as NotebookCellData$1, NotebookData as NotebookData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelDataPart, LanguageModelToolResultPart2, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatImageMimeType, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatPrepareToolInvocationPart as ChatPrepareToolInvocationPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseExtensionsPart as ChatResponseExtensionsPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, LanguageModelToolResult2 as LanguageModelToolResult2$1 } from './extHostTypes.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { AiSettingsSearchResultKind } from '../../services/aiSettingsSearch/common/aiSettingsSearch.js';
 import { McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
@@ -1541,24 +1541,6 @@ var NotebookCellExecutionSummary;
     }
     NotebookCellExecutionSummary.from = from;
 })(NotebookCellExecutionSummary || (NotebookCellExecutionSummary = {}));
-var NotebookCellExecutionState;
-(function (NotebookCellExecutionState) {
-    function to(state) {
-        if (state === NotebookCellExecutionState$1.Unconfirmed) {
-            return NotebookCellExecutionState$2.Pending;
-        }
-        else if (state === NotebookCellExecutionState$1.Pending) {
-            return undefined;
-        }
-        else if (state === NotebookCellExecutionState$1.Executing) {
-            return NotebookCellExecutionState$2.Executing;
-        }
-        else {
-            throw ( new Error(`Unknown state: ${state}`));
-        }
-    }
-    NotebookCellExecutionState.to = to;
-})(NotebookCellExecutionState || (NotebookCellExecutionState = {}));
 var NotebookCellKind;
 (function (NotebookCellKind) {
     function from(data) {
@@ -2171,12 +2153,13 @@ var LanguageModelChatMessage;
                 }));
                 return new LanguageModelToolResultPart(c.toolCallId, content, c.isError);
             }
-            else if (c.type === 'image_url' || c.type === 'extra_data') {
+            else if (c.type === 'image_url') {
                 return undefined;
             }
-            else {
+            else if (c.type === 'tool_use') {
                 return new LanguageModelToolCallPart(c.toolCallId, c.name, c.parameters);
             }
+            return undefined;
         })).filter(c => c !== undefined);
         const role = LanguageModelChatMessageRole.to(message.role);
         const result = new LanguageModelChatMessage$1(role, content, message.name);
@@ -2271,8 +2254,8 @@ var LanguageModelChatMessage2;
             else if (c.type === 'image_url') {
                 return new LanguageModelDataPart(c.value.data.buffer, c.value.mimeType);
             }
-            else if (c.type === 'extra_data') {
-                return new LanguageModelExtraDataPart(c.kind, c.data);
+            else if (c.type === 'data') {
+                return new LanguageModelDataPart(c.data.buffer, c.mimeType);
             }
             else {
                 return new LanguageModelToolCallPart(c.toolCallId, c.name, c.parameters);
@@ -2325,14 +2308,23 @@ var LanguageModelChatMessage2;
                 };
             }
             else if (c instanceof LanguageModelDataPart) {
-                const value = {
-                    mimeType: c.mimeType,
-                    data: VSBuffer.wrap(c.data),
-                };
-                return {
-                    type: 'image_url',
-                    value: value
-                };
+                if (isImageDataPart(c)) {
+                    const value = {
+                        mimeType: c.mimeType,
+                        data: VSBuffer.wrap(c.data),
+                    };
+                    return {
+                        type: 'image_url',
+                        value: value
+                    };
+                }
+                else {
+                    return {
+                        type: 'data',
+                        mimeType: c.mimeType,
+                        data: VSBuffer.wrap(c.data),
+                    };
+                }
             }
             else if (c instanceof LanguageModelToolCallPart) {
                 return {
@@ -2348,13 +2340,6 @@ var LanguageModelChatMessage2;
                     value: c.value
                 };
             }
-            else if (c instanceof LanguageModelExtraDataPart) {
-                return {
-                    type: 'extra_data',
-                    kind: c.kind,
-                    data: c.data
-                };
-            }
             else {
                 if (typeof c !== 'string') {
                     throw ( new Error('Unexpected chat message content type llm 2'));
@@ -2373,6 +2358,18 @@ var LanguageModelChatMessage2;
     }
     LanguageModelChatMessage2.from = from;
 })(LanguageModelChatMessage2 || (LanguageModelChatMessage2 = {}));
+function isImageDataPart(part) {
+    switch (part.mimeType) {
+        case ChatImageMimeType.PNG:
+        case ChatImageMimeType.JPEG:
+        case ChatImageMimeType.GIF:
+        case ChatImageMimeType.WEBP:
+        case ChatImageMimeType.BMP:
+            return true;
+        default:
+            return false;
+    }
+}
 var ChatResponseMarkdownPart;
 (function (ChatResponseMarkdownPart) {
     function from(part) {
@@ -2549,6 +2546,20 @@ var ChatResponseMovePart;
     }
     ChatResponseMovePart.to = to;
 })(ChatResponseMovePart || (ChatResponseMovePart = {}));
+var ChatPrepareToolInvocationPart;
+(function (ChatPrepareToolInvocationPart) {
+    function from(part) {
+        return {
+            kind: 'prepareToolInvocation',
+            toolName: part.toolName,
+        };
+    }
+    ChatPrepareToolInvocationPart.from = from;
+    function to(part) {
+        return new ChatPrepareToolInvocationPart$1(part.toolName);
+    }
+    ChatPrepareToolInvocationPart.to = to;
+})(ChatPrepareToolInvocationPart || (ChatPrepareToolInvocationPart = {}));
 var ChatTask;
 (function (ChatTask) {
     function from(part) {
@@ -2744,6 +2755,9 @@ var ChatResponsePart;
         else if (part instanceof ChatResponseExtensionsPart$1) {
             return ChatResponseExtensionsPart.from(part);
         }
+        else if (part instanceof ChatPrepareToolInvocationPart$1) {
+            return ChatPrepareToolInvocationPart.from(part);
+        }
         return {
             kind: 'markdownContent',
             content: MarkdownString.from('')
@@ -2777,9 +2791,20 @@ var ChatResponsePart;
 })(ChatResponsePart || (ChatResponsePart = {}));
 var ChatAgentRequest;
 (function (ChatAgentRequest) {
-    function to(request, location2, model, diagnostics, toolSelection, tools, extension, logService) {
-        const toolReferences = request.variables.variables.filter(v => v.kind === 'tool');
-        const variableReferences = request.variables.variables.filter(v => v.kind !== 'tool');
+    function to(request, location2, model, diagnostics, tools, extension, logService) {
+        const toolReferences = [];
+        const variableReferences = [];
+        for (const v of request.variables.variables) {
+            if (v.kind === 'tool') {
+                toolReferences.push(v);
+            }
+            else if (v.kind === 'toolset') {
+                toolReferences.push(...v.value);
+            }
+            else {
+                variableReferences.push(v);
+            }
+        }
         const requestWithAllProps = {
             id: request.requestId,
             prompt: request.message,
@@ -2796,10 +2821,10 @@ var ChatAgentRequest;
             rejectedConfirmationData: request.rejectedConfirmationData,
             location2,
             toolInvocationToken: ( Object.freeze({ sessionId: request.sessionId })),
-            toolSelection,
             tools,
             model,
             editedFileEvents: request.editedFileEvents,
+            modeInstructions: request.modeInstructions,
         };
         if (!isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
             delete requestWithAllProps.id;
@@ -3278,7 +3303,7 @@ var McpServerDefinition;
             }
             : {
                 type: McpServerTransportType.Stdio,
-                cwd: item.cwd,
+                cwd: item.cwd?.fsPath,
                 args: item.args,
                 command: item.command,
                 env: item.env,
@@ -3288,4 +3313,4 @@ var McpServerDefinition;
     McpServerDefinition.from = from;
 })(McpServerDefinition || (McpServerDefinition = {}));
 
-export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestDraft, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageModelToolResult2, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalQuickFix, TerminalResourceRequestConfig, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPrepareToolInvocationPart, ChatPromptReference, ChatRequestDraft, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageModelToolResult2, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalQuickFix, TerminalResourceRequestConfig, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };

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

@@ -1783,6 +1783,10 @@ export declare class ChatResponseNotebookEditPart implements vscode.ChatResponse
     isDone?: boolean;
     constructor(uri: vscode.Uri, editsOrDone: vscode.NotebookEdit | vscode.NotebookEdit[] | true);
 }
+export declare class ChatPrepareToolInvocationPart {
+    toolName: string;
+    constructor(toolName: string);
+}
 export declare class ChatRequestTurn implements vscode.ChatRequestTurn2 {
     readonly prompt: string;
     readonly command: string | undefined;
@@ -1857,7 +1861,8 @@ export declare class PreparedTerminalToolInvocation {
     readonly command: string;
     readonly language: string;
     readonly confirmationMessages?: vscode.LanguageModelToolConfirmationMessages | undefined;
-    constructor(command: string, language: string, confirmationMessages?: vscode.LanguageModelToolConfirmationMessages | undefined);
+    readonly presentation?: "hidden" | undefined;
+    constructor(command: string, language: string, confirmationMessages?: vscode.LanguageModelToolConfirmationMessages | undefined, presentation?: "hidden" | undefined);
 }
 export declare enum ChatErrorLevel {
     Info = 0,
@@ -1875,16 +1880,16 @@ export declare class LanguageModelChatMessage implements vscode.LanguageModelCha
     constructor(role: vscode.LanguageModelChatMessageRole, content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[], name?: string);
 }
 export declare class LanguageModelChatMessage2 implements vscode.LanguageModelChatMessage2 {
-    static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[], name?: string): LanguageModelChatMessage2;
-    static Assistant(content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[], name?: string): LanguageModelChatMessage2;
+    static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string): LanguageModelChatMessage2;
+    static Assistant(content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string): LanguageModelChatMessage2;
     role: vscode.LanguageModelChatMessageRole;
     private _content;
-    set content(value: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[]);
-    get content(): (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[];
+    set content(value: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[]);
+    get content(): (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[];
     set content2(value: (string | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[] | undefined);
-    get content2(): (string | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[] | undefined;
+    get content2(): (string | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[] | undefined;
     name: string | undefined;
-    constructor(role: vscode.LanguageModelChatMessageRole, content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart | LanguageModelExtraDataPart)[], name?: string);
+    constructor(role: vscode.LanguageModelChatMessageRole, content: string | (LanguageModelTextPart | LanguageModelToolResultPart2 | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string);
 }
 export declare class LanguageModelToolCallPart implements vscode.LanguageModelToolCallPart {
     callId: string;
@@ -1905,8 +1910,8 @@ export declare class LanguageModelDataPart implements vscode.LanguageModelDataPa
     data: Uint8Array<ArrayBufferLike>;
     constructor(data: Uint8Array<ArrayBufferLike>, mimeType: string);
     static image(data: Uint8Array<ArrayBufferLike>, mimeType: ChatImageMimeType): vscode.LanguageModelDataPart;
-    static json(value: object): vscode.LanguageModelDataPart;
-    static text(value: string): vscode.LanguageModelDataPart;
+    static json(value: object, mime?: string): vscode.LanguageModelDataPart;
+    static text(value: string, mime?: string): vscode.LanguageModelDataPart;
     toJSON(): {
         $mid: MarshalledId;
         mimeType: string;
@@ -1920,16 +1925,6 @@ export declare enum ChatImageMimeType {
     WEBP = "image/webp",
     BMP = "image/bmp"
 }
-export declare class LanguageModelExtraDataPart implements vscode.LanguageModelExtraDataPart {
-    kind: string;
-    data: any;
-    constructor(kind: string, data: any);
-    toJSON(): {
-        $mid: MarshalledId;
-        kind: string;
-        data: any;
-    };
-}
 export declare class LanguageModelPromptTsxPart {
     value: unknown;
     constructor(value: unknown);

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

@@ -3663,6 +3663,11 @@ class ChatResponseNotebookEditPart {
         }
     }
 }
+class ChatPrepareToolInvocationPart {
+    constructor(toolName) {
+        this.toolName = toolName;
+    }
+}
 class ChatRequestTurn {
     constructor(prompt, command, references, participant, toolReferences, editedFileEvents) {
         this.prompt = prompt;
@@ -3739,10 +3744,11 @@ class LanguageModelToolResultPart2 {
     }
 }
 class PreparedTerminalToolInvocation {
-    constructor(command, language, confirmationMessages) {
+    constructor(command, language, confirmationMessages, presentation) {
         this.command = command;
         this.language = language;
         this.confirmationMessages = confirmationMessages;
+        this.presentation = presentation;
     }
 }
 var ChatErrorLevel;
@@ -3845,12 +3851,12 @@ class LanguageModelDataPart {
     static image(data, mimeType) {
         return ( new LanguageModelDataPart(data, mimeType));
     }
-    static json(value) {
+    static json(value, mime = 'text/x-json') {
         const rawStr = JSON.stringify(value, undefined, '\t');
-        return ( new LanguageModelDataPart(VSBuffer.fromString(rawStr).buffer, 'json'));
+        return ( new LanguageModelDataPart(VSBuffer.fromString(rawStr).buffer, mime));
     }
-    static text(value) {
-        return ( new LanguageModelDataPart(VSBuffer.fromString(value).buffer, 'text/plain'));
+    static text(value, mime = Mimes.text) {
+        return ( new LanguageModelDataPart(VSBuffer.fromString(value).buffer, mime));
     }
     toJSON() {
         return {
@@ -3868,19 +3874,6 @@ var ChatImageMimeType;
     ChatImageMimeType["WEBP"] = "image/webp";
     ChatImageMimeType["BMP"] = "image/bmp";
 })(ChatImageMimeType || (ChatImageMimeType = {}));
-class LanguageModelExtraDataPart {
-    constructor(kind, data) {
-        this.kind = kind;
-        this.data = data;
-    }
-    toJSON() {
-        return {
-            $mid: MarshalledId.LanguageModelExtraDataPart,
-            kind: this.kind,
-            data: this.data,
-        };
-    }
-}
 class LanguageModelPromptTsxPart {
     constructor(value) {
         this.value = value;
@@ -4005,4 +3998,4 @@ class McpHttpServerDefinition {
     }
 }
 
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, 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, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelExtraDataPart, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageModelToolResultPart2, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, PreparedTerminalToolInvocation, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, 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, TextEdit, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, getDebugDescriptionOfRange, getDebugDescriptionOfSelection, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatPrepareToolInvocationPart, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, 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, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageModelToolResultPart2, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, PreparedTerminalToolInvocation, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, 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, TextEdit, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, getDebugDescriptionOfRange, getDebugDescriptionOfSelection, setBreakpointId, validateTestCoverageCount };

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

@@ -1,14 +1,19 @@
 import type * as vscode from "vscode";
-import { IMainContext, ExtHostUrlsShape } from "./extHost.protocol.js";
+import { ExtHostUrlsShape } from "./extHost.protocol.js";
 import { URI, UriComponents } from "../../../base/common/uri.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+import { IExtHostRpcService } from "./extHostRpcService.js";
 export declare class ExtHostUrls implements ExtHostUrlsShape {
+    _serviceBrand: undefined;
     private static HandlePool;
     private readonly _proxy;
     private handles;
     private handlers;
-    constructor(mainContext: IMainContext);
+    constructor(extHostRpc: IExtHostRpcService);
     registerUriHandler(extension: IExtensionDescription, handler: vscode.UriHandler): vscode.Disposable;
     $handleExternalUri(handle: number, uri: UriComponents): Promise<void>;
     createAppUri(uri: URI): Promise<vscode.Uri>;
 }
+export interface IExtHostUrlsService extends ExtHostUrls {
+}
+export declare const IExtHostUrlsService: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostUrlsService>;

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

@@ -1,23 +1,28 @@
 
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { MainContext } from './extHost.protocol.js';
 import { URI } from '../../../base/common/uri.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { onUnexpectedError } from '../../../base/common/errors.js';
 import { ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
 
-class ExtHostUrls {
+var ExtHostUrls_1;
+let ExtHostUrls = class ExtHostUrls {
+    static { ExtHostUrls_1 = this; }
     static { this.HandlePool = 0; }
-    constructor(mainContext) {
+    constructor(extHostRpc) {
         this.handles = ( new ExtensionIdentifierSet());
         this.handlers = ( new Map());
-        this._proxy = ( mainContext.getProxy(MainContext.MainThreadUrls));
+        this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadUrls));
     }
     registerUriHandler(extension, handler) {
         const extensionId = extension.identifier;
         if (( this.handles.has(extensionId))) {
             throw ( new Error(`Protocol handler already registered for extension ${extensionId}`));
         }
-        const handle = ExtHostUrls.HandlePool++;
+        const handle = ExtHostUrls_1.HandlePool++;
         this.handles.add(extensionId);
         this.handlers.set(handle, handler);
         this._proxy.$registerUriHandler(handle, extensionId, extension.displayName || extension.name);
@@ -43,6 +48,10 @@ class ExtHostUrls {
     async createAppUri(uri) {
         return URI.revive(await this._proxy.$createAppUri(uri));
     }
-}
+};
+ExtHostUrls = ExtHostUrls_1 = ( __decorate([
+    ( __param(0, IExtHostRpcService))
+], ExtHostUrls));
+const IExtHostUrlsService = ( createDecorator('IExtHostUrlsService'));
 
-export { ExtHostUrls };
+export { ExtHostUrls, IExtHostUrlsService };

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

@@ -5,6 +5,7 @@ import { WindowState } from "vscode";
 import { ExtHostWindowShape, IOpenUriOptions } from "./extHost.protocol.js";
 import { IExtHostInitDataService } from "./extHostInitDataService.js";
 export declare class ExtHostWindow implements ExtHostWindowShape {
+    _serviceBrand: undefined;
     private static InitialState;
     private _proxy;
     private readonly _onDidChangeWindowState;

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

@@ -249,7 +249,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(
-                    2573,
+                    2597,
                     "Extension '{0}' failed to update workspace folders: {1}",
                     extName,
                     (error.toString())