@codingame/monaco-vscode-api 34.1.3 → 35.0.1

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

@@ -0,0 +1,10 @@
+import type * as vscode from "vscode";
+import { ExtHostAgentEditorCommentsShape, IAgentEditorCommentDto, IMainContext } from "./extHost.protocol.js";
+export declare class ExtHostAgentEditorComments implements ExtHostAgentEditorCommentsShape {
+    private static handlePool;
+    private readonly proxy;
+    private readonly providers;
+    constructor(mainContext: IMainContext);
+    createAgentEditorComments(uri: vscode.Uri): vscode.AgentEditorCommentsProvider;
+    $acceptAgentEditorComments(handle: number, comments: IAgentEditorCommentDto[]): void;
+}

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

@@ -0,0 +1,56 @@
+
+import { Emitter } from '../../../base/common/event.js';
+import { MainContext } from './extHost.protocol.js';
+import { Range } from './extHostTypeConverters.js';
+
+class ExtHostAgentEditorCommentsProvider {
+    get comments() {
+        return this._comments;
+    }
+    constructor(handle, proxy, onDispose) {
+        this.handle = handle;
+        this.proxy = proxy;
+        this.onDispose = onDispose;
+        this._onDidChange = ( new Emitter());
+        this.onDidChange = this._onDidChange.event;
+        this._comments = [];
+    }
+    $acceptComments(comments) {
+        this._comments = ( comments.map(comment => ( Object.freeze({
+            id: comment.id,
+            range: Range.to(comment.range),
+            body: comment.body,
+            author: comment.author
+        }))));
+        this._onDidChange.fire();
+    }
+    addComment(range, body) {
+        this.proxy.$addComment(this.handle, Range.from(range), body);
+    }
+    dispose() {
+        this.proxy.$disposeAgentEditorComments(this.handle);
+        this._onDidChange.dispose();
+        this.onDispose(this.handle);
+    }
+}
+class ExtHostAgentEditorComments {
+    static {
+        this.handlePool = 0;
+    }
+    constructor(mainContext) {
+        this.providers = ( new Map());
+        this.proxy = ( mainContext.getProxy(MainContext.MainThreadAgentEditorComments));
+    }
+    createAgentEditorComments(uri) {
+        const handle = ExtHostAgentEditorComments.handlePool++;
+        const provider = ( new ExtHostAgentEditorCommentsProvider(handle, this.proxy, h => this.providers.delete(h)));
+        this.providers.set(handle, provider);
+        this.proxy.$createAgentEditorComments(handle, uri);
+        return provider;
+    }
+    $acceptAgentEditorComments(handle, comments) {
+        this.providers.get(handle)?.$acceptComments(comments);
+    }
+}
+
+export { ExtHostAgentEditorComments };

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

@@ -431,7 +431,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2859, "URL Handler")),
+                label: ( localize(2935, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -510,7 +510,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     id: this.id
                 }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2860, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2936, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -522,12 +522,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     break;
                 }
                 const message = isCancellationError(err) ? ( localize(
-                    2861,
+                    2937,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 )) : ( localize(
-                    2862,
+                    2938,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -626,7 +626,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2863, "Complete the authentication in the browser window that has opened."))
+            message: ( localize(2939, "Complete the authentication in the browser window that has opened."))
         });
         let code;
         try {

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

@@ -0,0 +1,21 @@
+import { ExtHostBrowserTunnelProxyShape } from "./extHost.protocol.js";
+export declare const IExtHostBrowserTunnelProxy: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostBrowserTunnelProxy>;
+/**
+ * Hosts (in the local node extension host) an HTTPS proxy server that routes
+ * the integrated browser's traffic through the remote agent tunnel.
+ *
+ * Running the server here — rather than in the shared process — gives it
+ * in-process access to the resolver's managed connection, so managed remotes
+ * (WSL, Dev Containers, Codespaces, Remote Tunnels) work natively, and keeps
+ * each window's traffic isolated in that window's extension host.
+ *
+ * The default (common) implementation is a no-op; only the node extension
+ * host can host a server (see `ExtHostBrowserTunnelProxy` in the node layer).
+ */
+export interface IExtHostBrowserTunnelProxy extends ExtHostBrowserTunnelProxyShape {
+    readonly _serviceBrand: undefined;
+}
+export declare class ExtHostBrowserTunnelProxy implements IExtHostBrowserTunnelProxy {
+    readonly _serviceBrand: undefined;
+    $setEnabled(_enabled: boolean): void;
+}

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

@@ -0,0 +1,9 @@
+
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+
+const IExtHostBrowserTunnelProxy = ( createDecorator("IExtHostBrowserTunnelProxy"));
+class ExtHostBrowserTunnelProxy {
+    $setEnabled(_enabled) {}
+}
+
+export { ExtHostBrowserTunnelProxy, IExtHostBrowserTunnelProxy };

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

@@ -9,7 +9,7 @@ import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelec
 import { IChatFollowup, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService/chatService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
-import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentInvokeResult, IChatAgentProgressShape, IChatSessionCustomizationItemDto, IChatSessionContextDto, IMainContext } from "./extHost.protocol.js";
+import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentInvokeResult, IChatAgentProgressShape, IChatSessionCustomizationItemDto, IChatSessionCustomizationSourceFolderDto, IChatSessionContextDto, IMainContext } from "./extHost.protocol.js";
 import { CommandsConverter, ExtHostCommands } from "./extHostCommands.js";
 import { ExtHostDiagnostics } from "./extHostDiagnostics.js";
 import { ExtHostDocuments } from "./extHostDocuments.js";
@@ -115,6 +115,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     $providePromptFiles(handle: number, type: PromptsType, context: IPromptFileContext, token: CancellationToken): Promise<IPromptFileResource[] | undefined>;
     registerChatSessionCustomizationProvider(extension: IExtensionDescription, chatSessionType: string, metadata: vscode.ChatSessionCustomizationProviderMetadata, provider: vscode.ChatSessionCustomizationProvider): vscode.Disposable;
     $provideChatSessionCustomizations(handle: number, sessionResource: UriComponents | undefined, token: CancellationToken): Promise<IChatSessionCustomizationItemDto[] | undefined>;
+    $provideSourceFolders(handle: number, sessionResource: UriComponents, type: string, token: CancellationToken): Promise<IChatSessionCustomizationSourceFolderDto[] | undefined>;
     $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
     }, options: {

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

@@ -1,6 +1,6 @@
 
 import { coalesce } from '../../../base/common/arrays.js';
-import { DeferredPromise, raceCancellation, timeout } from '../../../base/common/async.js';
+import { DeferredPromise, raceCancellation, timeout, raceCancellationError } from '../../../base/common/async.js';
 import { CancellationTokenSource, CancellationToken } from '../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { Emitter } from '../../../base/common/event.js';
@@ -19,8 +19,8 @@ import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js'
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseInfoPart as ChatResponseInfoPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatSessionCustomizationType, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatRequestModeInstructions, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
-import { ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseQuestionCarouselPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseThinkingProgressPart, ChatResponsePullRequestPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseInfoPart, ChatResponseHookPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAutoModeResolutionPart as ChatResponseAutoModeResolutionPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseInfoPart as ChatResponseInfoPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatSessionCustomizationType, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatRequestModeInstructions, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
+import { ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseQuestionCarouselPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseThinkingProgressPart, ChatResponsePullRequestPart, ChatResponseAutoModeResolutionPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseInfoPart, ChatResponseHookPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
 import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
 import { MarkdownString } from './extHostTypes/markdownString.js';
 
@@ -345,7 +345,7 @@ class ChatAgentResponseStream {
                 },
                 push(part) {
                     throwIfDone(this.push);
-                    if (part instanceof ChatResponseTextEditPart || part instanceof ChatResponseNotebookEditPart || part instanceof ChatResponseMarkdownWithVulnerabilitiesPart || part instanceof ChatResponseWarningPart$1 || part instanceof ChatResponseConfirmationPart || part instanceof ChatResponseQuestionCarouselPart || part instanceof ChatResponseCodeCitationPart || part instanceof ChatResponseMovePart || part instanceof ChatResponseExtensionsPart || part instanceof ChatResponseExternalEditPart || part instanceof ChatResponseThinkingProgressPart || part instanceof ChatResponsePullRequestPart || part instanceof ChatResponseProgressPart2) {
+                    if (part instanceof ChatResponseTextEditPart || part instanceof ChatResponseNotebookEditPart || part instanceof ChatResponseMarkdownWithVulnerabilitiesPart || part instanceof ChatResponseWarningPart$1 || part instanceof ChatResponseConfirmationPart || part instanceof ChatResponseQuestionCarouselPart || part instanceof ChatResponseCodeCitationPart || part instanceof ChatResponseMovePart || part instanceof ChatResponseExtensionsPart || part instanceof ChatResponseExternalEditPart || part instanceof ChatResponseThinkingProgressPart || part instanceof ChatResponsePullRequestPart || part instanceof ChatResponseAutoModeResolutionPart || part instanceof ChatResponseProgressPart2) {
                         checkProposedApiEnabled(that._extension, "chatParticipantAdditions");
                     }
                     if (part instanceof ChatResponseReferencePart$1) {
@@ -356,6 +356,9 @@ class ChatAgentResponseStream {
                     } else if (part instanceof ChatResponseThinkingProgressPart) {
                         const dto = ChatResponseThinkingProgressPart$1.from(part);
                         _report(dto);
+                    } else if (part instanceof ChatResponseAutoModeResolutionPart) {
+                        const dto = ChatResponseAutoModeResolutionPart$1.from(part);
+                        _report(dto);
                     } else if (part instanceof ChatResponseAnchorPart) {
                         const dto = ChatResponseAnchorPart$1.from(part);
                         if (part.resolve) {
@@ -389,6 +392,7 @@ class ChatAgentResponseStream {
                         promptTokens: usage.promptTokens,
                         completionTokens: usage.completionTokens,
                         outputBuffer: usage.outputBuffer,
+                        copilotCredits: usage.copilotCredits,
                         promptTokenDetails: usage.promptTokenDetails
                     };
                     _report(dto);
@@ -739,12 +743,36 @@ class ExtHostChatAgents2 extends Disposable {
                 badgeTooltip: item.badgeTooltip,
                 extensionId: item.extensionId,
                 pluginUri: item.pluginUri,
+                pluginLabel: item.pluginLabel,
                 userInvocable: item.userInvocable
             })));
         } catch (err) {
             return undefined;
         }
     }
+    async $provideSourceFolders(handle, sessionResource, type, token) {
+        const providerData = this._customizationProviders.get(handle);
+        if (!providerData?.provider.provideSourceFolders) {
+            return undefined;
+        }
+        try {
+            const folders = await providerData.provider.provideSourceFolders(
+                URI.revive(sessionResource),
+                ChatSessionCustomizationType.to(type),
+                token
+            );
+            if (!folders) {
+                return undefined;
+            }
+            return ( folders.map(folder => ({
+                uri: folder.uri,
+                label: folder.label,
+                source: folder.source
+            })));
+        } catch (err) {
+            return undefined;
+        }
+    }
     async $detectChatParticipant(handle, requestDto, context, options, token) {
         const detector = this._participantDetectionProviders.get(handle);
         if (!detector) {
@@ -1395,7 +1423,7 @@ class CachedPromise {
             });
             this.cachedPromise = promise;
         }
-        return raceCancellation(this.cachedPromise, token, []);
+        return raceCancellationError(this.cachedPromise, token);
     }
     clear() {
         this.cachedPromise = undefined;

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

@@ -125,7 +125,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2864,
+                            2940,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),
@@ -317,7 +317,7 @@ let ExtHostDiagnostics = class ExtHostDiagnostics {
                         index.set(( uri.toString()), idx);
                         res.push([uri, []]);
                     }
-                    res[idx][1] = res[idx][1].concat(...diagnostics);
+                    res[idx][1] = res[idx][1].concat(diagnostics);
                 });
             }
             return res;

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

@@ -98,12 +98,7 @@ class ExtHostEditorTabGroup {
         this._activeTabId = "";
         this._dto = dto;
         this._activeGroupIdGetter = activeGroupIdGetter;
-        for (const tabDto of dto.tabs) {
-            if (tabDto.isActive) {
-                this._activeTabId = tabDto.id;
-            }
-            this._tabs.push(( new ExtHostEditorTab(tabDto, this, () => this.activeTabId())));
-        }
+        this._reconcileTabs(dto);
     }
     get apiObject() {
         if (!this._apiObject) {
@@ -135,6 +130,28 @@ class ExtHostEditorTabGroup {
     acceptGroupDtoUpdate(dto) {
         this._dto = dto;
     }
+    acceptModelUpdate(dto) {
+        this._dto = dto;
+        this._reconcileTabs(dto);
+    }
+    _reconcileTabs(dto) {
+        const existingTabsById = ( new Map());
+        for (const tab of this._tabs) {
+            existingTabsById.set(tab.tabId, tab);
+        }
+        this._activeTabId = "";
+        this._tabs = ( dto.tabs.map(tabDto => {
+            if (tabDto.isActive) {
+                this._activeTabId = tabDto.id;
+            }
+            const existing = existingTabsById.get(tabDto.id);
+            if (existing) {
+                existing.acceptDtoUpdate(tabDto);
+                return existing;
+            }
+            return ( new ExtHostEditorTab(tabDto, this, () => this.activeTabId()));
+        }));
+    }
     acceptTabOperation(operation) {
         if (operation.kind === TabModelOperationKind.TAB_OPEN) {
             const tab = ( new ExtHostEditorTab(operation.tabDto, this, () => this.activeTabId()));
@@ -229,13 +246,19 @@ let ExtHostEditorTabs = class ExtHostEditorTabs {
         const closed = ( this._extHostTabGroups.filter(group => diff.removed.includes(group.groupId)).map(group => group.apiObject));
         const opened = [];
         const changed = [];
+        const existingGroupsById = ( new Map());
+        for (const group of this._extHostTabGroups) {
+            existingGroupsById.set(group.groupId, group);
+        }
         this._extHostTabGroups = ( tabGroups.map(tabGroup => {
-            const group = ( new ExtHostEditorTabGroup(tabGroup, () => this._activeGroupId));
-            if (diff.added.includes(group.groupId)) {
-                opened.push(group.apiObject);
-            } else {
-                changed.push(group.apiObject);
+            const existing = existingGroupsById.get(tabGroup.groupId);
+            if (existing) {
+                existing.acceptModelUpdate(tabGroup);
+                changed.push(existing.apiObject);
+                return existing;
             }
+            const group = ( new ExtHostEditorTabGroup(tabGroup, () => this._activeGroupId));
+            opened.push(group.apiObject);
             return group;
         }));
         const activeTabGroupId = assertReturnsDefined(tabGroups.find(group => group.isActive === true)?.groupId);

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

@@ -614,14 +614,14 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             extensionTestsLocationURI
         } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2865, "Cannot load test runner."))));
+            throw ( new Error(( localize(2941, "Cannot load test runner."))));
         }
         const extensionDescription = (await this.getExtensionPathIndex()).findSubstr(extensionTestsLocationURI);
         const isESM = this._isESM(extensionDescription, extensionTestsLocationURI.path);
         const testRunner = await (isESM ? this._loadESMModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))) : this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))));
         if (!testRunner || typeof testRunner.run !== "function") {
             throw ( new Error(( localize(
-                2866,
+                2942,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));

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(
-                2867,
+                2943,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1257,6 +1257,7 @@ class InlineCompletionAdapter {
                     showRange: (this._isAdditionsProposedApiEnabled && item.showRange) ? Range.from(item.showRange) : undefined,
                     command,
                     gutterMenuLinkAction: action,
+                    pid: pid,
                     idx: idx,
                     completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
                     isInlineEdit: this._isAdditionsProposedApiEnabled ? item.isInlineEdit : false,
@@ -1832,7 +1833,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2868,
+                2944,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

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

@@ -34,6 +34,7 @@ class Tool {
                 name: this._data.id,
                 description: this._data.modelDescription,
                 inputSchema: this._data.inputSchema,
+                fullReferenceName: this._data.fullReferenceName,
                 tags: this._data.tags ?? [],
                 source: undefined
             }));
@@ -300,7 +301,9 @@ class ExtHostLanguageModelTools {
             },
             icon: IconPath.from(definition.icon),
             models: definition.models,
-            toolSet: definition.toolSet
+            toolSet: definition.toolSet,
+            tags: definition.tags,
+            fullReferenceName: undefined
         };
         this._registeredTools.set(id, {
             extension,

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

@@ -29,6 +29,7 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     private readonly _localModels;
     private readonly _modelAccessList;
     private readonly _pendingRequest;
+    private readonly _pendingCancelCTS;
     private readonly _ignoredFileProviders;
     private _languageModelProxyProvider;
     constructor(extHostRpc: IExtHostRpcService, _logService: ILogService, _extHostAuthentication: IExtHostAuthentication);
@@ -38,6 +39,7 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     private getVendorFromModelIdentifier;
     $provideLanguageModelChatInfo(vendor: string, options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
     $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
+    $cancelLanguageModelChatRequest(requestId: number): void;
     $provideTokenLength(modelId: string, value: string, token: CancellationToken): Promise<number>;
     getDefaultLanguageModel(extension: IExtensionDescription, forceResolveModels?: boolean): Promise<vscode.LanguageModelChat | undefined>;
     getLanguageModelByIdentifier(extension: IExtensionDescription, modelId: string | undefined): Promise<vscode.LanguageModelChat | undefined>;

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

@@ -2,11 +2,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { AsyncIterableSource, AsyncIterableProducer, RunOnceScheduler } from '../../../base/common/async.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CancellationTokenSource, CancellationToken } from '../../../base/common/cancellation.js';
 import { transformErrorForSerialization, transformErrorFromSerialization } from '../../../base/common/errors.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
-import { toDisposable } from '../../../base/common/lifecycle.js';
+import { DisposableMap, toDisposable } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifierMap, ExtensionIdentifier, ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
@@ -95,6 +95,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         this._localModels = ( new Map());
         this._modelAccessList = ( new ExtensionIdentifierMap());
         this._pendingRequest = ( new Map());
+        this._pendingCancelCTS = ( new DisposableMap());
         this._ignoredFileProviders = ( new Map());
         this._languageAccessInformationExtensions = ( new Set());
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadLanguageModels));
@@ -103,6 +104,8 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         this._onDidChangeModelAccess.dispose();
         this._onDidChangeProviders.dispose();
         this._onDidChangeModelProxyAvailability.dispose();
+        this._pendingRequest.clear();
+        this._pendingCancelCTS.dispose();
     }
     registerLanguageModelChatProvider(extension, vendor, provider) {
         this._languageModelProviders.set(vendor, {
@@ -180,14 +183,18 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                     tooltip: m.tooltip,
                     version: m.version,
                     multiplierNumeric: m.multiplierNumeric,
+                    isBYOK: m.isBYOK,
                     pricing: m.pricing,
                     inputCost: m.inputCost,
                     outputCost: m.outputCost,
                     cacheCost: m.cacheCost,
+                    cacheWriteCost: m.cacheWriteCost,
                     longContextInputCost: m.longContextInputCost,
                     longContextOutputCost: m.longContextOutputCost,
                     longContextCacheCost: m.longContextCacheCost,
+                    longContextCacheWriteCost: m.longContextCacheWriteCost,
                     priceCategory: m.priceCategory,
+                    category: m.category,
                     maxInputTokens: m.maxInputTokens,
                     maxOutputTokens: m.maxOutputTokens,
                     auth,
@@ -196,6 +203,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                     statusIcon: m.statusIcon,
                     targetChatSessionType: m.targetChatSessionType,
                     configurationSchema: m.configurationSchema,
+                    warningText: m.warningText,
                     capabilities: m.capabilities ? {
                         vision: m.capabilities.imageInput,
                         editTools: m.capabilities.editTools,
@@ -229,6 +237,9 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         if (!data) {
             throw ( new Error(`Language model provider for '${knownModel.metadata.id}' not found.`));
         }
+        const cts = ( new CancellationTokenSource(token));
+        this._pendingCancelCTS.set(requestId, cts);
+        const providerToken = cts.token;
         const queue = [];
         const sendNow = () => {
             if (queue.length > 0) {
@@ -247,7 +258,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             }
         };
         const progress = ( new Progress(async fragment => {
-            if (token.isCancellationRequested) {
+            if (providerToken.isCancellationRequested) {
                 this._logService.warn(
                     `[CHAT](${data.extension.identifier.value}) CANNOT send progress because the REQUEST IS CANCELLED`
                 );
@@ -299,18 +310,24 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 modelConfiguration: options.configuration,
                 requestInitiator: from ? ExtensionIdentifier.toKey(from) : "core",
                 toolMode: options.toolMode ?? LanguageModelChatToolMode.Auto
-            }, progress, token);
+            }, progress, providerToken);
         } catch (err) {
+            this._pendingCancelCTS.deleteAndDispose(requestId);
             throw err;
         }
         Promise.resolve(value).then(() => {
             sendNow();
+            this._pendingCancelCTS.deleteAndDispose(requestId);
             this._proxy.$reportResponseDone(requestId, undefined);
         }, err => {
             sendNow();
+            this._pendingCancelCTS.deleteAndDispose(requestId);
             this._proxy.$reportResponseDone(requestId, transformErrorForSerialization(err));
         });
     }
+    $cancelLanguageModelChatRequest(requestId) {
+        this._pendingCancelCTS.get(requestId)?.cancel();
+    }
     $provideTokenLength(modelId, value, token) {
         const knownModel = this._localModels.get(modelId);
         if (!knownModel) {
@@ -385,10 +402,13 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             inputCost: model.metadata.inputCost,
             outputCost: model.metadata.outputCost,
             cacheCost: model.metadata.cacheCost,
+            cacheWriteCost: model.metadata.cacheWriteCost,
             longContextInputCost: model.metadata.longContextInputCost,
             longContextOutputCost: model.metadata.longContextOutputCost,
             longContextCacheCost: model.metadata.longContextCacheCost,
+            longContextCacheWriteCost: model.metadata.longContextCacheWriteCost,
             priceCategory: model.metadata.priceCategory,
+            category: model.metadata.category,
             capabilities: {
                 supportsImageToText: model.metadata.capabilities?.vision ?? false,
                 supportsToolCalling: !!model.metadata.capabilities?.toolCalling,
@@ -446,10 +466,16 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             languageModelId,
             res
         });
+        const cts = ( new CancellationTokenSource(token));
+        this._pendingCancelCTS.set(requestId, cts);
+        cts.token.onCancellationRequested(() => {
+            this._proxy.$cancelLanguageModelChatRequest(requestId);
+        });
         try {
-            await this._proxy.$tryStartChatRequest(from, languageModelId, requestId, ( new SerializableObjectWithBuffers(internalMessages)), options, token);
+            await this._proxy.$tryStartChatRequest(from, languageModelId, requestId, ( new SerializableObjectWithBuffers(internalMessages)), options, cts.token);
         } catch (error) {
             this._pendingRequest.delete(requestId);
+            this._pendingCancelCTS.deleteAndDispose(requestId);
             throw LanguageModelError.tryDeserialize(error) ?? error;
         }
         return res.apiObject;
@@ -479,6 +505,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             return;
         }
         this._pendingRequest.delete(requestId);
+        this._pendingCancelCTS.deleteAndDispose(requestId);
         if (error) {
             data.res.reject(
                 LanguageModelError.tryDeserialize(error) ?? transformErrorFromSerialization(error)
@@ -504,7 +531,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             return false;
         }
         try {
-            const detail = justification ? ( localize(2869, "Justification: {1}", to.displayName, justification)) : undefined;
+            const detail = justification ? ( localize(2945, "Justification: {1}", to.displayName, justification)) : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], {
                 forceNewSession: {
                     detail

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

@@ -10,8 +10,12 @@ export declare class ExtHostLanguages implements ExtHostLanguagesShape {
     private readonly _uriTransformer;
     private readonly _proxy;
     private _languageIds;
+    private readonly _onDidChangeSyntaxHighlighting;
+    readonly onDidChangeSyntaxHighlighting: import("../../../base/common/event.js").Event<void>;
     constructor(mainContext: IMainContext, _documents: ExtHostDocuments, _commands: CommandsConverter, _uriTransformer: IURITransformer | undefined);
     $acceptLanguageIds(ids: string[]): void;
+    $acceptSyntaxHighlightingThemeChanged(): void;
+    computeFullSyntaxHighlighting(source: string, languageId: string): Promise<vscode.SyntaxHighlightingResult>;
     getLanguages(): Promise<string[]>;
     changeLanguage(uri: vscode.Uri, languageId: string): Promise<vscode.TextDocument>;
     tokenAtPosition(document: vscode.TextDocument, position: vscode.Position): Promise<vscode.TokenInformation>;

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

@@ -6,6 +6,7 @@ import Severity$1 from '../../../base/common/severity.js';
 import { disposableTimeout } from '../../../base/common/async.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { Emitter } from '../../../base/common/event.js';
 import { Range } from './extHostTypes/range.js';
 
 class ExtHostLanguages {
@@ -14,6 +15,8 @@ class ExtHostLanguages {
         this._commands = _commands;
         this._uriTransformer = _uriTransformer;
         this._languageIds = [];
+        this._onDidChangeSyntaxHighlighting = ( new Emitter());
+        this.onDidChangeSyntaxHighlighting = this._onDidChangeSyntaxHighlighting.event;
         this._handlePool = 0;
         this._ids = ( new Set());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadLanguages));
@@ -21,6 +24,13 @@ class ExtHostLanguages {
     $acceptLanguageIds(ids) {
         this._languageIds = ids;
     }
+    $acceptSyntaxHighlightingThemeChanged() {
+        this._onDidChangeSyntaxHighlighting.fire();
+    }
+    async computeFullSyntaxHighlighting(source, languageId) {
+        const result = await this._proxy.$computeFullSyntaxHighlighting(source, languageId);
+        return result;
+    }
     async getLanguages() {
         return this._languageIds.slice(0);
     }

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(2870, "Extension Host (Remote)")) : isWorker ? ( localize(2871, "Extension Host (Worker)")) : ( localize(2872, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2946, "Extension Host (Remote)")) : isWorker ? ( localize(2947, "Extension Host (Worker)")) : ( localize(2948, "Extension Host"));
         super(loggerService.createLogger(id, {
             name
         }));