@codingame/monaco-vscode-api 21.6.0 → 22.0.1

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

@@ -487,7 +487,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(2641, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(2647, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( new Promise(r => {
@@ -570,15 +570,15 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
             this._proxy.$unregisterProfileProvider(id);
         }));
     }
-    registerTerminalCompletionProvider(extension, provider, ...triggerCharacters) {
-        if (( this._completionProviders.has(provider.id))) {
-            throw ( new Error(`Terminal completion provider "${provider.id}" already registered`));
+    registerTerminalCompletionProvider(extension, id, provider, ...triggerCharacters) {
+        if (( this._completionProviders.has(id))) {
+            throw ( new Error(`Terminal completion provider "${id}" already registered`));
         }
-        this._completionProviders.set(provider.id, provider);
-        this._proxy.$registerCompletionProvider(provider.id, extension.identifier.value, ...triggerCharacters);
+        this._completionProviders.set(id, provider);
+        this._proxy.$registerCompletionProvider(id, extension.identifier.value, ...triggerCharacters);
         return ( new Disposable$1(() => {
-            this._completionProviders.delete(provider.id);
-            this._proxy.$unregisterCompletionProvider(provider.id);
+            this._completionProviders.delete(id);
+            this._proxy.$unregisterCompletionProvider(id);
         }));
     }
     async $provideTerminalCompletions(id, options) {

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

@@ -8,7 +8,8 @@ import { NoTreeViewError } from '../../common/views.js';
 import { asPromise } from '../../../base/common/async.js';
 import { ViewBadge, DataTransfer as DataTransfer$1, TreeItemCheckboxState, TreeItem, TreeItemCollapsibleState, ThemeIcon } from './extHostTypes.js';
 import { isString, isUndefinedOrNull } from '../../../base/common/types.js';
-import { equals, coalesce } from '../../../base/common/arrays.js';
+import { distinct, equals, coalesce } from '../../../base/common/arrays.js';
+import { LogLevel } from '../../../platform/log/common/log.js';
 import { DataTransfer, MarkdownString, ViewBadge as ViewBadge$1 } from './extHostTypeConverters.js';
 import { isMarkdownString } from '../../../base/common/htmlContent.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
@@ -347,13 +348,23 @@ class ExtHostTreeView extends Disposable {
         }, 200, true);
         this._register(onDidChangeData(({ message, elements }) => {
             if (elements.length) {
+                elements = distinct(elements);
                 this._refreshQueue = this._refreshQueue.then(() => {
                     const _promiseCallback = promiseCallback;
                     refreshingPromise = null;
                     const childrenToClear = Array.from(this._nodesToClear);
+                    this._nodesToClear.clear();
+                    this._debugLogRefresh('start', elements, childrenToClear);
                     return this._refresh(elements).then(() => {
+                        this._debugLogRefresh('done', elements, childrenToClear);
                         this._clearNodes(childrenToClear);
                         return _promiseCallback();
+                    }).catch(e => {
+                        const message = e instanceof Error ? e.message : JSON.stringify(e);
+                        this._debugLogRefresh('error', elements, childrenToClear);
+                        this._clearNodes(childrenToClear);
+                        this._logService.error(`Unable to refresh tree view ${this._viewId}: ${message}`);
+                        return _promiseCallback();
                     });
                 });
             }
@@ -362,6 +373,45 @@ class ExtHostTreeView extends Disposable {
             }
         }));
     }
+    _debugCollectHandles(elements) {
+        const changed = [];
+        for (const el of elements) {
+            if (!el) {
+                changed.push('<root>');
+                continue;
+            }
+            const node = this._nodes.get(el);
+            if (node) {
+                changed.push(node.item.handle);
+            }
+        }
+        const roots = this._roots?.map(r => r.item.handle) ?? [];
+        return { changed, roots };
+    }
+    _debugLogRefresh(phase, elements, childrenToClear) {
+        if (!this._isDebugLogging()) {
+            return;
+        }
+        try {
+            const snapshot = this._debugCollectHandles(elements);
+            snapshot.clearing = ( childrenToClear.map(n => n.item.handle));
+            const changedCount = snapshot.changed.length;
+            const nodesToClearLen = childrenToClear.length;
+            this._logService.debug(`[TreeView:${this._viewId}] refresh ${phase} changed=${changedCount} nodesToClear=${nodesToClearLen} elements.size=${this._elements.size} nodes.size=${this._nodes.size} handles=${JSON.stringify(snapshot)}`);
+        }
+        catch {
+            this._logService.debug(`[TreeView:${this._viewId}] refresh ${phase} (snapshot failed)`);
+        }
+    }
+    _isDebugLogging() {
+        try {
+            const level = this._logService.getLevel();
+            return (level === LogLevel.Debug) || (level === LogLevel.Trace);
+        }
+        catch {
+            return false;
+        }
+    }
     async getChildren(parentHandle) {
         const parentElement = parentHandle ? this.getExtensionElement(parentHandle) : undefined;
         if (parentHandle && !parentElement) {
@@ -581,8 +631,8 @@ class ExtHostTreeView extends Disposable {
         this._addChildrenToClear(parentElement);
         const cts = ( new CancellationTokenSource(this._refreshCancellationSource.token));
         try {
-            const parentNode = parentElement ? this._nodes.get(parentElement) : undefined;
             const elements = await this._dataProvider.getChildren(parentElement);
+            const parentNode = parentElement ? this._nodes.get(parentElement) : undefined;
             if (cts.token.isCancellationRequested) {
                 return undefined;
             }
@@ -678,7 +728,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(2642, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2648, '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.d.ts

@@ -26,6 +26,7 @@ export interface IExtHostTunnelService extends ExtHostTunnelServiceShape {
     setTunnelFactory(provider: vscode.RemoteAuthorityResolver | undefined, managedRemoteAuthority: vscode.ManagedResolvedAuthority | undefined): Promise<IDisposable>;
     registerPortsAttributesProvider(portSelector: PortAttributesSelector, provider: vscode.PortAttributesProvider): IDisposable;
     registerTunnelProvider(provider: vscode.TunnelProvider, information: vscode.TunnelInformation): Promise<IDisposable>;
+    hasTunnelProvider(): Promise<boolean>;
 }
 export declare const IExtHostTunnelService: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostTunnelService>;
 export declare class ExtHostTunnelService extends Disposable implements IExtHostTunnelService {
@@ -47,6 +48,7 @@ export declare class ExtHostTunnelService extends Disposable implements IExtHost
     $providePortAttributes(handles: number[], ports: number[], pid: number | undefined, commandLine: string | undefined, cancellationToken: vscode.CancellationToken): Promise<ProvidedPortAttributes[]>;
     $registerCandidateFinder(_enable: boolean): Promise<void>;
     registerTunnelProvider(provider: vscode.TunnelProvider, information: vscode.TunnelInformation): Promise<IDisposable>;
+    hasTunnelProvider(): Promise<boolean>;
     /**
      * Applies the tunnel metadata and factory found in the remote authority
      * resolver to the tunnel system.

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

@@ -131,6 +131,9 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
             this._proxy.$setTunnelProvider(undefined, false);
         }));
     }
+    hasTunnelProvider() {
+        return this._proxy.$hasTunnelProvider();
+    }
     async setTunnelFactory(provider, managedRemoteAuthority) {
         if (provider) {
             if (provider.candidatePortSource !== undefined) {
@@ -148,12 +151,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(2643, "Private")),
+                            label: ( localize(2649, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(2644, "Public")),
+                            label: ( localize(2650, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

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

@@ -22,6 +22,7 @@ import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
 import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
+import { IChatRequestModeInstructions } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-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 { IChatRequestVariableEntry } from "../../contrib/chat/common/chatVariableEntries.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
@@ -31,10 +32,10 @@ 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-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
-import * as search from "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/search";
+import * as search from "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/search";
 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-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import * as extHostProtocol from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
@@ -566,6 +567,9 @@ export declare namespace ChatPromptReference {
 export declare namespace ChatLanguageModelToolReference {
     function to(variable: IChatRequestVariableEntry): vscode.ChatLanguageModelToolReference;
 }
+export declare namespace ChatRequestModeInstructions {
+    function to(mode: IChatRequestModeInstructions | undefined): vscode.ChatRequestModeInstructions | undefined;
+}
 export declare namespace ChatAgentCompletionItem {
     function from(item: vscode.ChatCompletionItem, commandsConverter: CommandsConverter, disposables: DisposableStore): extHostProtocol.IChatAgentCompletionItem;
 }

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

@@ -24,7 +24,7 @@ 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 { isImageVariableEntry } from '../../contrib/chat/common/chatVariableEntries.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 { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
@@ -2675,7 +2675,8 @@ var ChatToolInvocationPart;
             isComplete: part.isComplete ?? true,
             source: ToolDataSource.External,
             toolSpecificData: part.toolSpecificData ? convertToolSpecificData(part.toolSpecificData) : undefined,
-            presentation: undefined
+            presentation: undefined,
+            fromSubAgent: part.fromSubAgent
         };
     }
     ChatToolInvocationPart.from = from;
@@ -2716,6 +2717,7 @@ var ChatToolInvocationPart;
         if (part.toolSpecificData) {
             toolInvocation.toolSpecificData = convertFromInternalToolSpecificData(part.toolSpecificData);
         }
+        toolInvocation.fromSubAgent = part.fromSubAgent;
         return toolInvocation;
     }
     ChatToolInvocationPart.to = to;
@@ -2999,6 +3001,7 @@ var ChatAgentRequest;
             attempt: request.attempt ?? 0,
             enableCommandDetection: request.enableCommandDetection ?? true,
             isParticipantDetected: request.isParticipantDetected ?? false,
+            sessionId: request.sessionId,
             references: ( variableReferences
                 .map(v => ChatPromptReference.to(v, diagnostics, logService)))
                 .filter(isDefined),
@@ -3011,7 +3014,8 @@ var ChatAgentRequest;
             tools,
             model,
             editedFileEvents: request.editedFileEvents,
-            modeInstructions: request.modeInstructions,
+            modeInstructions: request.modeInstructions?.content,
+            modeInstructions2: ChatRequestModeInstructions.to(request.modeInstructions),
         };
         if (!isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
             delete requestWithAllProps.id;
@@ -3021,6 +3025,7 @@ var ChatAgentRequest;
             delete requestWithAllProps.location;
             delete requestWithAllProps.location2;
             delete requestWithAllProps.editedFileEvents;
+            delete requestWithAllProps.sessionId;
         }
         if (!isProposedApiEnabled(extension, 'chatParticipantAdditions')) {
             delete requestWithAllProps.acceptedConfirmationData;
@@ -3047,8 +3052,8 @@ var ChatLocation;
         switch (loc) {
             case ChatAgentLocation.Notebook: return ChatLocation$1.Notebook;
             case ChatAgentLocation.Terminal: return ChatLocation$1.Terminal;
-            case ChatAgentLocation.Panel: return ChatLocation$1.Panel;
-            case ChatAgentLocation.Editor: return ChatLocation$1.Editor;
+            case ChatAgentLocation.Chat: return ChatLocation$1.Panel;
+            case ChatAgentLocation.EditorInline: return ChatLocation$1.Editor;
         }
     }
     ChatLocation.to = to;
@@ -3056,8 +3061,8 @@ var ChatLocation;
         switch (loc) {
             case ChatLocation$1.Notebook: return ChatAgentLocation.Notebook;
             case ChatLocation$1.Terminal: return ChatAgentLocation.Terminal;
-            case ChatLocation$1.Panel: return ChatAgentLocation.Panel;
-            case ChatLocation$1.Editor: return ChatAgentLocation.Editor;
+            case ChatLocation$1.Panel: return ChatAgentLocation.Chat;
+            case ChatLocation$1.Editor: return ChatAgentLocation.EditorInline;
         }
     }
     ChatLocation.from = from;
@@ -3105,10 +3110,17 @@ var ChatPromptReference;
                     })];
             })).filter(([, d]) => d.length > 0));
         }
+        let toolReferences;
+        if (isPromptFileVariableEntry(variable) || isPromptTextVariableEntry(variable)) {
+            if (variable.toolReferences) {
+                toolReferences = ChatLanguageModelToolReferences.to(variable.toolReferences);
+            }
+        }
         return {
             id: variable.id,
             name: variable.name,
             range: variable.range && [variable.range.start, variable.range.endExclusive],
+            toolReferences,
             value,
             modelDescription: variable.modelDescription,
         };
@@ -3129,6 +3141,39 @@ var ChatLanguageModelToolReference;
     }
     ChatLanguageModelToolReference.to = to;
 })(ChatLanguageModelToolReference || (ChatLanguageModelToolReference = {}));
+var ChatLanguageModelToolReferences;
+(function (ChatLanguageModelToolReferences) {
+    function to(variables) {
+        const toolReferences = [];
+        for (const v of variables) {
+            if (v.kind === 'tool') {
+                toolReferences.push(ChatLanguageModelToolReference.to(v));
+            }
+            else if (v.kind === 'toolset') {
+                toolReferences.push(...( v.value.map(ChatLanguageModelToolReference.to)));
+            }
+            else {
+                throw ( new Error('Invalid tool reference in prompt variables'));
+            }
+        }
+        return toolReferences;
+    }
+    ChatLanguageModelToolReferences.to = to;
+})(ChatLanguageModelToolReferences || (ChatLanguageModelToolReferences = {}));
+var ChatRequestModeInstructions;
+(function (ChatRequestModeInstructions) {
+    function to(mode) {
+        if (mode) {
+            return {
+                content: mode.content,
+                toolReferences: ChatLanguageModelToolReferences.to(mode.toolReferences),
+                metadata: mode.metadata
+            };
+        }
+        return undefined;
+    }
+    ChatRequestModeInstructions.to = to;
+})(ChatRequestModeInstructions || (ChatRequestModeInstructions = {}));
 var ChatAgentCompletionItem;
 (function (ChatAgentCompletionItem) {
     function from(item, commandsConverter, disposables) {
@@ -3289,6 +3334,7 @@ var TerminalResourceRequestConfig;
             ...resourceRequestConfig,
             pathSeparator,
             cwd: resourceRequestConfig.cwd,
+            globPattern: GlobPattern.from(resourceRequestConfig.globPattern) ?? undefined
         };
     }
     TerminalResourceRequestConfig.from = from;
@@ -3442,7 +3488,7 @@ var LanguageModelToolResult;
 var LanguageModelToolResult2;
 (function (LanguageModelToolResult2) {
     function to(result) {
-        return new LanguageModelToolResult2$1(( result.content.map(item => {
+        const toolResult = new LanguageModelToolResult2$1(( result.content.map(item => {
             if (item.kind === 'text') {
                 return new LanguageModelTextPart(item.value, item.audience);
             }
@@ -3453,6 +3499,10 @@ var LanguageModelToolResult2;
                 return new LanguageModelPromptTsxPart(item.value);
             }
         })));
+        if (result.toolMetadata) {
+            toolResult.toolMetadata = result.toolMetadata;
+        }
+        return toolResult;
     }
     LanguageModelToolResult2.to = to;
     function from(result, extension) {
@@ -3517,6 +3567,7 @@ var LanguageModelToolResult2;
             })),
             toolResultMessage: MarkdownString.fromStrict(result.toolResultMessage),
             toolResultDetails: detailsDto,
+            toolMetadata: result.toolMetadata,
         };
         return hasBuffers ? ( new SerializableObjectWithBuffers(dto)) : dto;
     }
@@ -3576,4 +3627,4 @@ var McpServerDefinition;
     McpServerDefinition.from = from;
 })(McpServerDefinition || (McpServerDefinition = {}));
 
-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, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, ChatToolInvocationPart, CodeActionTriggerKind, Color, ColorPresentation, CompletionCommand, 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, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReason, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolSource, 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 };
+export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPrepareToolInvocationPart, ChatPromptReference, ChatRequestDraft, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, ChatToolInvocationPart, CodeActionTriggerKind, Color, ColorPresentation, CompletionCommand, 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, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReason, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolSource, 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

@@ -8,29 +8,29 @@ import { ExtensionIdentifier, IExtensionDescription } from "../../../platform/ex
 import { FileSystemProviderErrorCode } from "../../../platform/files/common/files.js";
 import { RemoteAuthorityResolverErrorCode } from "../../../platform/remote/common/remoteAuthorityResolver.js";
 import { IRelativePatternDto } from "./extHost.protocol.js";
-import { Position } from "./extHostTypes/position.js";
-import { Range } from "./extHostTypes/range.js";
 import { CodeActionKind } from "./extHostTypes/codeActionKind.js";
-import { Location } from "./extHostTypes/location.js";
 import { Diagnostic } from "./extHostTypes/diagnostic.js";
-import { TextEdit } from "./extHostTypes/textEdit.js";
-import { WorkspaceEdit } from "./extHostTypes/workspaceEdit.js";
-import { SnippetString } from "./extHostTypes/snippetString.js";
+import { Location } from "./extHostTypes/location.js";
 import { MarkdownString } from "./extHostTypes/markdownString.js";
+import { Position } from "./extHostTypes/position.js";
+import { Range } from "./extHostTypes/range.js";
+import { SnippetString } from "./extHostTypes/snippetString.js";
 import { SymbolKind, SymbolTag } from "./extHostTypes/symbolInformation.js";
+import { TextEdit } from "./extHostTypes/textEdit.js";
+import { WorkspaceEdit } from "./extHostTypes/workspaceEdit.js";
+export { CodeActionKind } from "./extHostTypes/codeActionKind.js";
+export { Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag } from "./extHostTypes/diagnostic.js";
+export { Location } from "./extHostTypes/location.js";
+export { MarkdownString } from "./extHostTypes/markdownString.js";
+export { NotebookCellData, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookEdit, NotebookRange } from "./extHostTypes/notebooks.js";
 export { Position } from "./extHostTypes/position.js";
 export { Range } from "./extHostTypes/range.js";
 export { Selection } from "./extHostTypes/selection.js";
-export { CodeActionKind } from "./extHostTypes/codeActionKind.js";
-export { Location } from "./extHostTypes/location.js";
-export { Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag } from "./extHostTypes/diagnostic.js";
-export { EndOfLine, TextEdit } from "./extHostTypes/textEdit.js";
-export { FileEditType, WorkspaceEdit } from "./extHostTypes/workspaceEdit.js";
 export { SnippetString } from "./extHostTypes/snippetString.js";
 export { SnippetTextEdit } from "./extHostTypes/snippetTextEdit.js";
-export { NotebookCellKind, NotebookRange, NotebookCellData, NotebookCellOutput, NotebookData, NotebookEdit, NotebookCellOutputItem } from "./extHostTypes/notebooks.js";
-export { MarkdownString } from "./extHostTypes/markdownString.js";
-export { SymbolKind, SymbolTag, SymbolInformation } from "./extHostTypes/symbolInformation.js";
+export { SymbolInformation, SymbolKind, SymbolTag } from "./extHostTypes/symbolInformation.js";
+export { EndOfLine, TextEdit } from "./extHostTypes/textEdit.js";
+export { FileEditType, WorkspaceEdit } from "./extHostTypes/workspaceEdit.js";
 export declare enum TerminalOutputAnchor {
     Top = 0,
     Bottom = 1
@@ -1596,6 +1596,7 @@ export declare class ChatToolInvocationPart {
     isConfirmed?: boolean;
     isComplete?: boolean;
     toolSpecificData?: ChatTerminalToolInvocationData2;
+    fromSubAgent?: boolean;
     constructor(toolName: string, toolCallId: string, isError?: boolean);
 }
 export declare class ChatRequestTurn implements vscode.ChatRequestTurn2 {
@@ -1828,6 +1829,9 @@ export declare class LanguageModelToolResult2 {
     };
 }
 export declare class ExtendedLanguageModelToolResult extends LanguageModelToolResult {
+    toolResultMessage?: string | MarkdownString;
+    toolResultDetails?: Array<URI | Location>;
+    toolMetadata?: unknown;
 }
 export declare enum LanguageModelChatToolMode {
     Auto = 1,

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

@@ -14,18 +14,18 @@ import { ExtensionIdentifier } from '../../../platform/extensions/common/extensi
 import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from '../../../platform/files/common/files.js';
 import { RemoteAuthorityResolverErrorCode } from '../../../platform/remote/common/remoteAuthorityResolver.js';
 import { es5ClassCompat } from './extHostTypes/es5ClassCompat.js';
-import { Range } from './extHostTypes/range.js';
 import { MarkdownString } from './extHostTypes/markdownString.js';
-export { Position } from './extHostTypes/position.js';
-export { Selection } from './extHostTypes/selection.js';
+import { Range } from './extHostTypes/range.js';
 export { CodeActionKind } from './extHostTypes/codeActionKind.js';
-export { Location } from './extHostTypes/location.js';
 export { Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag } from './extHostTypes/diagnostic.js';
-export { EndOfLine, TextEdit } from './extHostTypes/textEdit.js';
-export { FileEditType, WorkspaceEdit } from './extHostTypes/workspaceEdit.js';
-export { SnippetString } from './extHostTypes/snippetString.js';
+export { Location } from './extHostTypes/location.js';
 export { NotebookCellData, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookEdit, NotebookRange } from './extHostTypes/notebooks.js';
+export { Position } from './extHostTypes/position.js';
+export { Selection } from './extHostTypes/selection.js';
+export { SnippetString } from './extHostTypes/snippetString.js';
 export { SymbolInformation, SymbolKind, SymbolTag } from './extHostTypes/symbolInformation.js';
+export { EndOfLine, TextEdit } from './extHostTypes/textEdit.js';
+export { FileEditType, WorkspaceEdit } from './extHostTypes/workspaceEdit.js';
 
 var Disposable_1, DocumentSymbol_1, TaskGroup_1, Task_1, TreeItem_1, FileSystemError_1, TestMessage_1;
 var TerminalOutputAnchor;

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-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 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

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

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

@@ -16,7 +16,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'jsonValidation',
     defaultExtensionKind: ['workspace', 'web'],
     jsonSchema: {
-        description: ( localize(2646, 'Contributes json schema configuration.')),
+        description: ( localize(2652, 'Contributes json schema configuration.')),
         type: 'array',
         defaultSnippets: [{ body: [{ fileMatch: '${1:file.json}', url: '${2:url}' }] }],
         items: {
@@ -26,7 +26,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 fileMatch: {
                     type: ['string', 'array'],
                     description: ( localize(
-                        2647,
+                        2653,
                         'The file pattern (or an array of patterns) to match, for example "package.json" or "*.launch". Exclusion patterns start with \'!\''
                     )),
                     items: {
@@ -35,7 +35,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 url: {
                     description: ( localize(
-                        2648,
+                        2654,
                         'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'
                     )),
                     type: 'string'
@@ -52,20 +52,20 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(2649, "'configuration.jsonValidation' must be a array")));
+                    collector.error(( localize(2655, "'configuration.jsonValidation' must be a array")));
                     return;
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
                         collector.error(( localize(
-                            2650,
+                            2656,
                             "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
                         )));
                         return;
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( localize(2651, "'configuration.jsonValidation.url' must be a URL or relative path")));
+                        collector.error(( localize(2657, "'configuration.jsonValidation.url' must be a URL or relative path")));
                         return;
                     }
                     if (uri.startsWith('./')) {
@@ -73,7 +73,7 @@ class JSONValidationExtensionPoint {
                             const colorThemeLocation = joinPath(extensionLocation, uri);
                             if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
                                 collector.warn(( localize(
-                                    2652,
+                                    2658,
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                                     configurationExtPoint.name,
                                     (colorThemeLocation.toString()),
@@ -83,7 +83,7 @@ class JSONValidationExtensionPoint {
                         }
                         catch (e) {
                             collector.error(( localize(
-                                2653,
+                                2659,
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
                                 e.message
                             )));
@@ -91,7 +91,7 @@ class JSONValidationExtensionPoint {
                     }
                     else if (!/^[^:/?#]+:\/\//.test(uri)) {
                         collector.error(( localize(
-                            2654,
+                            2660,
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
                         )));
                         return;
@@ -115,8 +115,8 @@ class JSONValidationDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(2655, "File Match")),
-            ( localize(2656, "Schema")),
+            ( localize(2661, "File Match")),
+            ( localize(2662, "Schema")),
         ];
         const rows = ( contrib.map(v => {
             return [
@@ -135,7 +135,7 @@ class JSONValidationDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'jsonValidation',
-    label: ( localize(2657, "JSON Validation")),
+    label: ( localize(2663, "JSON Validation")),
     access: {
         canToggle: false
     },