@codingame/monaco-vscode-api 31.0.1 → 32.0.1

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

@@ -233,9 +233,9 @@ let ExtHostGitExtensionService = class ExtHostGitExtensionService extends Dispos
                 extensionId: ( new ExtensionIdentifier(GIT_EXTENSION_ID)),
                 activationEvent: "api"
             });
-            const exports$1 = this._extHostExtensionService.getExtensionExports(( new ExtensionIdentifier(GIT_EXTENSION_ID)));
-            if (!!exports$1 && typeof exports$1.getAPI === "function") {
-                this._gitApi = exports$1.getAPI(1);
+            const exports = this._extHostExtensionService.getExtensionExports(( new ExtensionIdentifier(GIT_EXTENSION_ID)));
+            if (!!exports && typeof exports.getAPI === "function") {
+                this._gitApi = exports.getAPI(1);
             }
         } catch {}
         return this._gitApi;

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

@@ -574,7 +574,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2744,
+                2787,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1832,7 +1832,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2745,
+                2788,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

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

@@ -97,7 +97,9 @@ class ExtHostLanguageModelTools {
                 chatInteractionId: isProposedApiEnabled(extension, "chatParticipantPrivate") ? options.chatInteractionId : undefined,
                 subAgentInvocationId: isProposedApiEnabled(extension, "chatParticipantPrivate") ? options.subAgentInvocationId : undefined,
                 chatStreamToolCallId: isProposedApiEnabled(extension, "chatParticipantAdditions") ? options.chatStreamToolCallId : undefined,
-                preToolUseResult: isProposedApiEnabled(extension, "chatParticipantPrivate") ? options.preToolUseResult : undefined
+                preToolUseResult: isProposedApiEnabled(extension, "chatParticipantPrivate") ? options.preToolUseResult : undefined,
+                traceparent: isProposedApiEnabled(extension, "chatParticipantPrivate") ? options.traceparent : undefined,
+                tracestate: isProposedApiEnabled(extension, "chatParticipantPrivate") ? options.tracestate : undefined
             }, token);
             const dto = result instanceof SerializableObjectWithBuffers ? result.value : result;
             return LanguageModelToolResult.to(revive(dto));
@@ -149,7 +151,10 @@ class ExtHostLanguageModelTools {
             options.chatRequestId = dto.chatRequestId;
             options.chatInteractionId = dto.chatInteractionId;
             options.chatSessionResource = URI.revive(dto.context?.sessionResource);
+            options.workingDirectory = URI.revive(dto.context?.workingDirectory);
             options.subAgentInvocationId = dto.subAgentInvocationId;
+            options.traceparent = dto.traceparent;
+            options.tracestate = dto.tracestate;
         }
         if (isProposedApiEnabled(item.extension) && dto.modelId) {
             options.model = await this.getModel(dto.modelId, item.extension);
@@ -230,6 +235,7 @@ class ExtHostLanguageModelTools {
             chatRequestId: context.chatRequestId,
             chatSessionResource: context.chatSessionResource,
             chatInteractionId: context.chatInteractionId,
+            workingDirectory: URI.revive(context.workingDirectory),
             forceConfirmationReason: context.forceConfirmationReason
         };
         if (context.forceConfirmationReason) {

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

@@ -179,8 +179,12 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                     detail: m.detail,
                     tooltip: m.tooltip,
                     version: m.version,
-                    multiplier: m.multiplier,
                     multiplierNumeric: m.multiplierNumeric,
+                    pricing: m.pricing,
+                    inputCost: m.inputCost,
+                    outputCost: m.outputCost,
+                    cacheCost: m.cacheCost,
+                    priceCategory: m.priceCategory,
                     maxInputTokens: m.maxInputTokens,
                     maxOutputTokens: m.maxOutputTokens,
                     auth,
@@ -371,6 +375,11 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 family: model.info.family,
                 version: model.info.version,
                 name: model.info.name,
+                pricing: model.metadata.pricing,
+                inputCost: model.metadata.inputCost,
+                outputCost: model.metadata.outputCost,
+                cacheCost: model.metadata.cacheCost,
+                priceCategory: model.metadata.priceCategory,
                 capabilities: {
                     supportsImageToText: model.metadata.capabilities?.vision ?? false,
                     supportsToolCalling: !!model.metadata.capabilities?.toolCalling,
@@ -491,7 +500,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             return false;
         }
         try {
-            const detail = justification ? ( localize(2746, "Justification: {1}", to.displayName, justification)) : undefined;
+            const detail = justification ? ( localize(2789, "Justification: {1}", to.displayName, justification)) : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], {
                 forceNewSession: {
                     detail

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

@@ -8,7 +8,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? "remoteexthost" : isWorker ? "workerexthost" : "exthost";
-        const name = initData.remote.isRemote ? ( localize(2747, "Extension Host (Remote)")) : isWorker ? ( localize(2748, "Extension Host (Worker)")) : ( localize(2749, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2790, "Extension Host (Remote)")) : isWorker ? ( localize(2791, "Extension Host (Worker)")) : ( localize(2792, "Extension Host"));
         super(loggerService.createLogger(id, {
             name
         }));

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

@@ -276,7 +276,7 @@ class ExtHostNotebookController {
                 ));
             }
             if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-                throw new FileOperationError(( localize(2750, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+                throw new FileOperationError(( localize(2793, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
             }
             const data = {
                 metadata: filter(
@@ -472,7 +472,7 @@ class ExtHostNotebookController {
             mtime: options.mtime ,
             size: stat.size
         })) {
-            throw new FileOperationError(( localize(2751, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2794, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

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

@@ -928,6 +928,26 @@ let ExtHostSCM = class ExtHostSCM {
         const sourceControls = this._sourceControlsByExtension.get(extension.identifier) || [];
         sourceControls.push(sourceControl);
         this._sourceControlsByExtension.set(extension.identifier, sourceControls);
+        Event.once(sourceControl.onDidDispose)(() => {
+            this.logService.trace(
+                "ExtHostSCM#disposeSourceControl",
+                extension.identifier.value,
+                id,
+                label,
+                rootUri
+            );
+            this._sourceControls.delete(sourceControl.handle);
+            const sourceControls = this._sourceControlsByExtension.get(extension.identifier);
+            if (sourceControls) {
+                const index = sourceControls.indexOf(sourceControl);
+                if (index !== -1) {
+                    sourceControls.splice(index, 1);
+                }
+                if (sourceControls.length === 0) {
+                    this._sourceControlsByExtension.delete(extension.identifier);
+                }
+            }
+        });
         return sourceControl;
     }
     getLastInputBox(extension) {

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

@@ -195,7 +195,7 @@ class ExtHostStatusBarEntry {
                 name = this._name;
             } else {
                 name = ( localize(
-                    2752,
+                    2795,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -248,7 +248,7 @@ class StatusBarMessage {
             StatusBarAlignment.Left,
             Number.MIN_VALUE
         );
-        this._item.name = ( localize(2753, "Extension Status"));
+        this._item.name = ( localize(2796, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

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

@@ -30,7 +30,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         const id = initData.remote.isRemote ? "remoteExtHostTelemetry" : isWorker ? "workerExtHostTelemetry" : "extHostTelemetry";
         this._outputLogger = this._register(loggerService.createLogger(id, {
             name: ( localize(
-                2754,
+                2797,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? " (Not Sent)" : ""
             )),

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

@@ -551,7 +551,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         const terminal = this.getTerminalById(id);
         if (!terminal) {
             return {
-                message: ( localize(2755, "Could not find the terminal with id {0} on the extension host", id))
+                message: ( localize(2798, "Could not find the terminal with id {0} on the extension host", id))
             };
         }
         if (!terminal.isOpen) {

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

@@ -15,7 +15,7 @@ export declare class ExtHostTreeViews extends Disposable implements ExtHostTreeV
     constructor(_proxy: MainThreadTreeViewsShape, _commands: ExtHostCommands, _logService: ILogService);
     registerTreeDataProvider<T>(id: string, treeDataProvider: vscode.TreeDataProvider<T>, extension: IExtensionDescription): vscode.Disposable;
     createTreeView<T>(viewId: string, options: vscode.TreeViewOptions<T>, extension: IExtensionDescription): vscode.TreeView<T>;
-    $getChildren(treeViewId: string, treeItemHandles?: string[]): Promise<(number | ITreeItem)[][] | undefined>;
+    $getChildren(treeViewId: string, treeItemHandles?: string[]): Promise<(readonly (number | ITreeItem)[])[] | undefined>;
     $handleDrop(destinationViewId: string, requestId: number, treeDataTransferDTO: DataTransferDTO, targetItemHandle: string | undefined, token: CancellationToken, operationUuid?: string, sourceViewId?: string, sourceTreeItemHandles?: string[]): Promise<void>;
     private _addAdditionalTransferItems;
     $handleDrag(sourceViewId: string, sourceTreeItemHandles: string[], operationUuid: string, token: CancellationToken): Promise<DataTransferDTO | undefined>;

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

@@ -164,11 +164,11 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                 if (provider.tunnelFeatures?.public && (privacyOptions.length === 0)) {
                     privacyOptions = [{
                         id: "private",
-                        label: ( localize(2756, "Private")),
+                        label: ( localize(2799, "Private")),
                         themeIcon: "lock"
                     }, {
                         id: "public",
-                        label: ( localize(2757, "Public")),
+                        label: ( localize(2800, "Public")),
                         themeIcon: "eye"
                     }];
                 }

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

@@ -23,7 +23,7 @@ import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
 import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/participants/chatAgents.js";
 import { IChatRequestModeInstructions } from "../../contrib/chat/common/model/chatModel.js";
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatExternalToolInvocationUpdate, IChatFollowup, IChatHookPart, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffDataSerialized, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage, IChatWorkspaceEdit } from "../../contrib/chat/common/chatService/chatService.js";
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatExternalToolInvocationUpdate, IChatFollowup, IChatHookPart, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffDataSerialized, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage, IChatInfoMessage, IChatWorkspaceEdit } from "../../contrib/chat/common/chatService/chatService.js";
 import { IChatRequestVariableEntry } from "../../contrib/chat/common/attachments/chatVariableEntries.js";
 import { IChatSessionItem } from "../../contrib/chat/common/chatSessionsService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
@@ -507,6 +507,10 @@ export declare namespace ChatResponseWarningPart {
     function from(part: vscode.ChatResponseWarningPart): Dto<IChatWarningMessage>;
     function to(part: Dto<IChatWarningMessage>): vscode.ChatResponseWarningPart;
 }
+export declare namespace ChatResponseInfoPart {
+    function from(part: vscode.ChatResponseInfoPart): Dto<IChatInfoMessage>;
+    function to(part: Dto<IChatInfoMessage>): vscode.ChatResponseInfoPart;
+}
 export declare namespace ChatResponseExtensionsPart {
     function from(part: vscode.ChatResponseExtensionsPart): Dto<IChatExtensionsContent>;
 }

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

@@ -43,7 +43,7 @@ import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorSer
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
-import { StandardTokenType as StandardTokenType$1, ViewColumn as ViewColumn$1, DecorationRangeBehavior as DecorationRangeBehavior$1, 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, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, 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, LanguageModelDataPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelThinkingPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatQuestionType, ChatQuestion, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseFileTreePart, ChatResponseMultiDiffPart as ChatResponseMultiDiffPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatSubagentToolInvocationData, ChatTodoStatus, ChatToolInvocationPart as ChatToolInvocationPart$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, ChatResponsePullRequestPart as ChatResponsePullRequestPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, InlineCompletionDisplayLocationKind, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, McpHttpServerDefinition, McpStdioServerDefinition, SourceControlInputBoxValidationType as SourceControlInputBoxValidationType$1 } from './extHostTypes.js';
+import { StandardTokenType as StandardTokenType$1, ViewColumn as ViewColumn$1, DecorationRangeBehavior as DecorationRangeBehavior$1, 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, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, 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, LanguageModelDataPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelThinkingPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatQuestionType, ChatQuestion, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseFileTreePart, ChatResponseMultiDiffPart as ChatResponseMultiDiffPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseInfoPart as ChatResponseInfoPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatSubagentToolInvocationData, ChatTodoStatus, ChatToolInvocationPart as ChatToolInvocationPart$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, ChatResponsePullRequestPart as ChatResponsePullRequestPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1, InlineCompletionDisplayLocationKind, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, McpHttpServerDefinition, McpStdioServerDefinition, SourceControlInputBoxValidationType as SourceControlInputBoxValidationType$1 } from './extHostTypes.js';
 import { SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation } from './extHostTypes/symbolInformation.js';
 import { Position as Position$1 } from './extHostTypes/position.js';
 import { Selection as Selection$1 } from './extHostTypes/selection.js';
@@ -2829,6 +2829,20 @@ var ChatResponseWarningPart;
     }
     ChatResponseWarningPart.to = to;
 })(ChatResponseWarningPart || (ChatResponseWarningPart = {}));
+var ChatResponseInfoPart;
+(function(ChatResponseInfoPart) {
+    function from(part) {
+        return {
+            kind: "info",
+            content: MarkdownString.from(part.value)
+        };
+    }
+    ChatResponseInfoPart.from = from;
+    function to(part) {
+        return new ChatResponseInfoPart$1(part.content.value);
+    }
+    ChatResponseInfoPart.to = to;
+})(ChatResponseInfoPart || (ChatResponseInfoPart = {}));
 var ChatResponseExtensionsPart;
 (function(ChatResponseExtensionsPart) {
     function from(part) {
@@ -3294,6 +3308,8 @@ var ChatResponsePart;
             return ChatResponseCodeblockUriPart.from(part);
         } else if (part instanceof ChatResponseWarningPart$1) {
             return ChatResponseWarningPart.from(part);
+        } else if (part instanceof ChatResponseInfoPart$1) {
+            return ChatResponseInfoPart.from(part);
         } else if (part instanceof ChatResponseConfirmationPart$1) {
             return ChatResponseConfirmationPart.from(part);
         } else if (part instanceof ChatResponseQuestionCarouselPart$1) {
@@ -3388,7 +3404,8 @@ var ChatAgentRequest;
             rejectedConfirmationData: request.rejectedConfirmationData,
             location2,
             toolInvocationToken: ( Object.freeze({
-                sessionResource: request.sessionResource
+                sessionResource: request.sessionResource,
+                workingDirectory: URI.revive(request.workingDirectory)
             })),
             tools,
             model,
@@ -4197,4 +4214,4 @@ var ChatSessionItem;
     ChatSessionItem.from = from;
 })(ChatSessionItem || (ChatSessionItem = {}));
 
-export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatHookCommand, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestHooksConverter, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatSessionCustomizationType, ChatSessionItem, 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, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, 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, SourceControlInputBoxValidationType, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalCompletionResourceOptions, TerminalQuickFix, 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, ChatHookCommand, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestHooksConverter, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseHookPart, ChatResponseInfoPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatSessionCustomizationType, ChatSessionItem, 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, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, 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, SourceControlInputBoxValidationType, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalCompletionResourceOptions, TerminalQuickFix, 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

@@ -1532,6 +1532,10 @@ export declare class ChatResponseWarningPart {
     value: vscode.MarkdownString;
     constructor(value: string | vscode.MarkdownString);
 }
+export declare class ChatResponseInfoPart {
+    value: vscode.MarkdownString;
+    constructor(value: string | vscode.MarkdownString);
+}
 export declare class ChatResponseCommandButtonPart {
     value: vscode.Command;
     constructor(value: vscode.Command);
@@ -1801,10 +1805,13 @@ export declare class ChatDebugModelTurnEvent {
     created: Date;
     parentEventId?: string;
     model?: string;
+    requestName?: string;
     inputTokens?: number;
     outputTokens?: number;
+    cachedTokens?: number;
     totalTokens?: number;
     cost?: number;
+    copilotUsageNanoAiu?: number;
     durationInMillis?: number;
     constructor(created: Date);
 }
@@ -1891,12 +1898,14 @@ export declare class ChatDebugEventModelTurnContent {
     status?: string;
     durationInMillis?: number;
     timeToFirstTokenInMillis?: number;
+    requestId?: string;
     maxInputTokens?: number;
     maxOutputTokens?: number;
     inputTokens?: number;
     outputTokens?: number;
     cachedTokens?: number;
     totalTokens?: number;
+    requestOptions?: string;
     errorMessage?: string;
     sections?: ChatDebugMessageSection[];
     constructor(requestName: string);
@@ -1974,6 +1983,11 @@ export declare enum ChatErrorLevel {
     Warning = 1,
     Error = 2
 }
+export declare enum ChatInputNotificationSeverity {
+    Info = 0,
+    Warning = 1,
+    Error = 2
+}
 export declare class LanguageModelChatMessage implements vscode.LanguageModelChatMessage {
     static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string): LanguageModelChatMessage;
     static Assistant(content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart | LanguageModelDataPart)[], name?: string): LanguageModelChatMessage;

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

@@ -2473,6 +2473,16 @@ class ChatResponseWarningPart {
         this.value = typeof value === "string" ? ( new MarkdownString(value)) : value;
     }
 }
+class ChatResponseInfoPart {
+    constructor(value) {
+        if (typeof value !== "string" && value.isTrusted === true) {
+            throw ( new Error(
+                "The boolean form of MarkdownString.isTrusted is NOT supported for chat participants."
+            ));
+        }
+        this.value = typeof value === "string" ? ( new MarkdownString(value)) : value;
+    }
+}
 class ChatResponseCommandButtonPart {
     constructor(value) {
         this.value = value;
@@ -2856,6 +2866,12 @@ var ChatErrorLevel;
     ChatErrorLevel[ChatErrorLevel["Warning"] = 1] = "Warning";
     ChatErrorLevel[ChatErrorLevel["Error"] = 2] = "Error";
 })(ChatErrorLevel || (ChatErrorLevel = {}));
+var ChatInputNotificationSeverity;
+(function(ChatInputNotificationSeverity) {
+    ChatInputNotificationSeverity[ChatInputNotificationSeverity["Info"] = 0] = "Info";
+    ChatInputNotificationSeverity[ChatInputNotificationSeverity["Warning"] = 1] = "Warning";
+    ChatInputNotificationSeverity[ChatInputNotificationSeverity["Error"] = 2] = "Error";
+})(ChatInputNotificationSeverity || (ChatInputNotificationSeverity = {}));
 class LanguageModelChatMessage {
     static User(content, name) {
         return ( new LanguageModelChatMessage(LanguageModelChatMessageRole.User, content, name));
@@ -3130,4 +3146,4 @@ class McpHttpServerDefinition {
     }
 }
 
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatDebugAgentResponseEvent, ChatDebugEventHookContent, ChatDebugEventMessageContent, ChatDebugEventModelTurnContent, ChatDebugEventTextContent, ChatDebugEventToolCallContent, ChatDebugGenericEvent, ChatDebugHookResult, ChatDebugLogLevel, ChatDebugMessageContentType, ChatDebugMessageSection, ChatDebugModelTurnEvent, ChatDebugSubagentInvocationEvent, ChatDebugSubagentStatus, ChatDebugToolCallEvent, ChatDebugToolCallResult, ChatDebugUserMessageEvent, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatQuestion, ChatQuestionType, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionCustomizationType, ChatSessionStatus, ChatSubagentToolInvocationData, ChatTodoStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, McpToolInvocationContentData, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskRunOn, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatDebugAgentResponseEvent, ChatDebugEventHookContent, ChatDebugEventMessageContent, ChatDebugEventModelTurnContent, ChatDebugEventTextContent, ChatDebugEventToolCallContent, ChatDebugGenericEvent, ChatDebugHookResult, ChatDebugLogLevel, ChatDebugMessageContentType, ChatDebugMessageSection, ChatDebugModelTurnEvent, ChatDebugSubagentInvocationEvent, ChatDebugSubagentStatus, ChatDebugToolCallEvent, ChatDebugToolCallResult, ChatDebugUserMessageEvent, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatInputNotificationSeverity, ChatLocation, ChatQuestion, ChatQuestionType, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseHookPart, ChatResponseInfoPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionCustomizationType, ChatSessionStatus, ChatSubagentToolInvocationData, ChatTodoStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, McpToolInvocationContentData, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskRunOn, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };

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

@@ -39,6 +39,17 @@ export declare class ExtHostWebviews extends Disposable implements extHostProtoc
     $onMessage(handle: extHostProtocol.WebviewHandle, jsonMessage: string, buffers: SerializableObjectWithBuffers<VSBuffer[]>): void;
     $onMissingCsp(_handle: extHostProtocol.WebviewHandle, extensionId: string): void;
     createNewWebview(handle: string, options: extHostProtocol.IWebviewContentOptions, extension: IExtensionDescription): ExtHostWebview;
+    /**
+     * Ensures that the main thread side of the webview has `localResourceRoots`
+     * populated when the caller did not supply any.
+     *
+     * This honors the documented `WebviewOptions.localResourceRoots` contract
+     * ("Default to ... the workspace folders and the extension's install
+     * directory") for code paths that construct the webview's content options
+     * outside of the extension host (e.g. custom editors), where the main
+     * thread starts with empty content options.
+     */
+    ensureDefaultContentOptions(handle: extHostProtocol.WebviewHandle, contentOptions: extHostProtocol.IWebviewContentOptions, extension: IExtensionDescription): void;
     deleteWebview(handle: string): void;
     private getWebview;
 }

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

@@ -219,6 +219,15 @@ class ExtHostWebviews extends Disposable {
         });
         return webview;
     }
+    ensureDefaultContentOptions(handle, contentOptions, extension) {
+        if (contentOptions.localResourceRoots) {
+            return;
+        }
+        this._webviewProxy.$setOptions(handle, {
+            ...contentOptions,
+            localResourceRoots: getDefaultLocalResourceRoots(extension, this.workspace)
+        });
+    }
     deleteWebview(handle) {
         this._webviews.delete(handle);
     }

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

@@ -333,7 +333,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
                     }
                 };
                 this._messageService.$showMessage(Severity$1.Error, ( localize(
-                    2758,
+                    2801,
                     "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(2759, "Contributes json schema configuration.")),
+        description: ( localize(2802, "Contributes json schema configuration.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -36,7 +36,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 fileMatch: {
                     type: ["string", "array"],
                     description: ( localize(
-                        2760,
+                        2803,
                         "The file pattern (or an array of patterns) to match, for example \"package.json\" or \"*.launch\". Exclusion patterns start with '!'"
                     )),
                     items: {
@@ -45,7 +45,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 url: {
                     description: ( localize(
-                        2761,
+                        2804,
                         "A schema URL ('http:', 'https:') or relative path to the extension folder ('./')."
                     )),
                     type: "string"
@@ -62,20 +62,20 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(2762, "'configuration.jsonValidation' must be a array")));
+                    collector.error(( localize(2805, "'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(
-                            2763,
+                            2806,
                             "'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(2764, "'configuration.jsonValidation.url' must be a URL or relative path")));
+                        collector.error(( localize(2807, "'configuration.jsonValidation.url' must be a URL or relative path")));
                         return;
                     }
                     if (uri.startsWith("./")) {
@@ -83,7 +83,7 @@ class JSONValidationExtensionPoint {
                             const colorThemeLocation = joinPath(extensionLocation, uri);
                             if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
                                 collector.warn(( localize(
-                                    2765,
+                                    2808,
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                                     configurationExtPoint.name,
                                     (colorThemeLocation.toString()),
@@ -92,14 +92,14 @@ class JSONValidationExtensionPoint {
                             }
                         } catch (e) {
                             collector.error(( localize(
-                                2766,
+                                2809,
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
                                 e.message
                             )));
                         }
                     } else if (!/^[^:/?#]+:\/\//.test(uri)) {
                         collector.error(( localize(
-                            2767,
+                            2810,
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
                         )));
                         return;
@@ -128,7 +128,7 @@ class JSONValidationDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(2768, "File Match")), ( localize(2769, "Schema"))];
+        const headers = [( localize(2811, "File Match")), ( localize(2812, "Schema"))];
         const rows = ( contrib.map(v => {
             return [( new MarkdownString()).appendMarkdown(`\`${Array.isArray(v.fileMatch) ? v.fileMatch.join(", ") : v.fileMatch}\``), v.url];
         }));
@@ -143,7 +143,7 @@ class JSONValidationDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "jsonValidation",
-    label: ( localize(2770, "JSON Validation")),
+    label: ( localize(2813, "JSON Validation")),
     access: {
         canToggle: false
     },