@codingame/monaco-vscode-api 33.0.8 → 34.0.0

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

@@ -22,6 +22,7 @@ import { equals } from '../../../base/common/arrays.js';
 import { IExtHostProgress } from './extHostProgress.js';
 import { isCancellationError, CancellationError } from '../../../base/common/errors.js';
 import { SequencerByKey, raceCancellationError } from '../../../base/common/async.js';
+import { XaaifyAuthProvider } from './extHostXaaAuthProvider.js';
 import { observableValue } from '../../../base/common/observableInternal/observables/observableValue.js';
 import { derivedOpts } from '../../../base/common/observableInternal/observables/derived.js';
 import { autorun } from '../../../base/common/observableInternal/reactions/autorun.js';
@@ -44,6 +45,7 @@ let ExtHostAuthentication = class ExtHostAuthentication {
         this._extHostLoggerService = _extHostLoggerService;
         this._logService = _logService;
         this._dynamicAuthProviderCtor = DynamicAuthProvider;
+        this._xaaAuthProviderCtor = XaaifyAuthProvider(DynamicAuthProvider);
         this._authenticationProviders = ( new Map());
         this._providerOperations = ( new SequencerByKey());
         this._onDidChangeSessions = ( new Emitter());
@@ -299,6 +301,63 @@ let ExtHostAuthentication = class ExtHostAuthentication {
         });
         return provider.id;
     }
+    async $registerXaaAuthProvider(issuerComponents, serverMetadata, clientId, clientSecret, initialTokens) {
+        const issuer = URI.revive(issuerComponents);
+        if (!clientId) {
+            this._logService.info(
+                `Prompting user for client registration details for XAA issuer ${( issuer.toString())}`
+            );
+            const clientDetails = await this._proxy.$promptForClientRegistration(( issuer.toString()));
+            if (!clientDetails) {
+                throw ( new Error("User did not provide client details"));
+            }
+            clientId = clientDetails.clientId;
+            clientSecret = clientDetails.clientSecret;
+        }
+        const provider = new this._xaaAuthProviderCtor(
+            this._extHostWindow,
+            this._extHostUrls,
+            this._initData,
+            this._extHostProgress,
+            this._extHostLoggerService,
+            this._proxy,
+            issuer,
+            serverMetadata,
+             undefined,
+            clientId,
+            clientSecret,
+            this._onDidDynamicAuthProviderTokensChange,
+            initialTokens || []
+        );
+        await this._providerOperations.queue(provider.id, async () => {
+            this._authenticationProviders.set(provider.id, {
+                label: provider.label,
+                provider,
+                disposable: Disposable.from(
+                    provider,
+                    provider.onDidChangeSessions(e => this._proxy.$sendDidChangeSessions(provider.id, e)),
+                    provider.onDidChangeClientId(() => this._proxy.$sendDidChangeDynamicProviderInfo({
+                        providerId: provider.id,
+                        clientId: provider.clientId,
+                        clientSecret: provider.clientSecret
+                    }))
+                ),
+                options: {
+                    supportsMultipleAccounts: true
+                }
+            });
+            await this._proxy.$registerDynamicAuthenticationProvider({
+                id: provider.id,
+                label: provider.label,
+                supportsMultipleAccounts: true,
+                authorizationServer: issuerComponents,
+                resourceServer: undefined,
+                clientId: provider.clientId,
+                clientSecret: provider.clientSecret
+            });
+        });
+        return provider.id;
+    }
     async $onDidChangeDynamicAuthProviderTokens(authProviderId, clientId, tokens) {
         this._onDidDynamicAuthProviderTokensChange.fire({
             authProviderId,
@@ -372,7 +431,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2801, "URL Handler")),
+                label: ( localize(2859, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -451,7 +510,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     id: this.id
                 }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2802, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2860, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -463,12 +522,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     break;
                 }
                 const message = isCancellationError(err) ? ( localize(
-                    2803,
+                    2861,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 )) : ( localize(
-                    2804,
+                    2862,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -567,7 +626,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2805, "Complete the authentication in the browser window that has opened."))
+            message: ( localize(2863, "Complete the authentication in the browser window that has opened."))
         });
         let code;
         try {
@@ -850,4 +909,4 @@ class TokenStore {
     }
 }
 
-export { DynamicAuthProvider, ExtHostAuthentication, IExtHostAuthentication };
+export { DynamicAuthProvider, ExtHostAuthentication, IExtHostAuthentication, TokenStore };

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

@@ -114,7 +114,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: vscode.ChatCustomAgentProvider | vscode.ChatInstructionsProvider | vscode.ChatPromptFileProvider | vscode.ChatSkillProvider | vscode.ChatHookProvider): vscode.Disposable;
     $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, token: CancellationToken): Promise<IChatSessionCustomizationItemDto[] | undefined>;
+    $provideChatSessionCustomizations(handle: number, sessionResource: UriComponents | undefined, token: CancellationToken): Promise<IChatSessionCustomizationItemDto[] | undefined>;
     $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
     }, options: {

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

@@ -715,13 +715,16 @@ class ExtHostChatAgents2 extends Disposable {
         }));
         return disposables;
     }
-    async $provideChatSessionCustomizations(handle, token) {
+    async $provideChatSessionCustomizations(handle, sessionResource, token) {
         const providerData = this._customizationProviders.get(handle);
         if (!providerData) {
             return undefined;
         }
+        if (!sessionResource) {
+            return undefined;
+        }
         try {
-            const items = await providerData.provider.provideChatSessionCustomizations(token);
+            const items = await providerData.provider.provideChatSessionCustomizations(URI.revive(sessionResource), token);
             if (!items) {
                 return undefined;
             }
@@ -730,6 +733,7 @@ class ExtHostChatAgents2 extends Disposable {
                 type: ChatSessionCustomizationType.from(item.type),
                 name: item.name,
                 description: item.description,
+                source: item.source,
                 groupKey: item.groupKey,
                 badge: item.badge,
                 badgeTooltip: item.badgeTooltip,

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

@@ -0,0 +1,7 @@
+import { Disposable } from "../../../base/common/lifecycle.js";
+import { ExtHostChatQuotaShape, IMainContext, IQuotaSnapshotsDto } from "./extHost.protocol.js";
+export declare class ExtHostChatQuota extends Disposable implements ExtHostChatQuotaShape {
+    private readonly _proxy;
+    constructor(mainContext: IMainContext);
+    updateQuotas(quotas: IQuotaSnapshotsDto): void;
+}

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

@@ -0,0 +1,15 @@
+
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { MainContext } from './extHost.protocol.js';
+
+class ExtHostChatQuota extends Disposable {
+    constructor(mainContext) {
+        super();
+        this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatQuota));
+    }
+    updateQuotas(quotas) {
+        this._proxy.$updateQuotas(quotas);
+    }
+}
+
+export { ExtHostChatQuota };

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

@@ -125,7 +125,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2806,
+                            2864,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),

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(2807, "Cannot load test runner."))));
+            throw ( new Error(( localize(2865, "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(
-                2808,
+                2866,
                 "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(
-                2809,
+                2867,
                 "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(
-                2810,
+                2868,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

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

@@ -41,10 +41,12 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     $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>;
+    private _createLanguageModelChatApi;
     selectLanguageModels(extension: IExtensionDescription, selector: vscode.LanguageModelChatSelector): Promise<vscode.LanguageModelChat[]>;
     private _sendChatRequest;
     private _convertMessages;
     $acceptResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
+    $onChatModelsChange(): void;
     $acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
     private _getAuthAccess;
     private _isUsingAuth;

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

@@ -184,6 +184,9 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                     inputCost: m.inputCost,
                     outputCost: m.outputCost,
                     cacheCost: m.cacheCost,
+                    longContextInputCost: m.longContextInputCost,
+                    longContextOutputCost: m.longContextOutputCost,
+                    longContextCacheCost: m.longContextCacheCost,
                     priceCategory: m.priceCategory,
                     maxInputTokens: m.maxInputTokens,
                     maxOutputTokens: m.maxOutputTokens,
@@ -339,11 +342,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         if (!modelId) {
             return undefined;
         }
-        let model = this._localModels.get(modelId);
-        if (!model) {
-            this._logService.warn(
-                `[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache. Trying to resolve model again.`
-            );
+        if (!( this._localModels.has(modelId))) {
             const vendor = this.getVendorFromModelIdentifier(modelId);
             if (!vendor) {
                 this._logService.warn(
@@ -351,60 +350,70 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 );
                 return undefined;
             }
-            await this.selectLanguageModels(extension, {
-                vendor
+            this._logService.trace(
+                `[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache. Trying to resolve model again.`
+            );
+            await this._proxy.$selectChatModels({
+                vendor,
+                extension: extension.identifier
             });
-            model = this._localModels.get(modelId);
-            if (!model) {
+            if (!( this._localModels.has(modelId))) {
                 this._logService.warn(
                     `[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache after re-resolving models.`
                 );
                 return undefined;
             }
         }
+        return this._createLanguageModelChatApi(extension, modelId);
+    }
+    async _createLanguageModelChatApi(extension, modelId) {
+        const model = this._localModels.get(modelId);
+        if (!model) {
+            return undefined;
+        }
         if (this._isUsingAuth(extension.identifier, model.metadata)) {
             await this._fakeAuthPopulate(model.metadata);
         }
-        let apiObject;
-        if (!apiObject) {
-            const that = this;
-            apiObject = {
-                id: model.info.id,
-                vendor: model.metadata.vendor,
-                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,
-                    editToolsHint: model.metadata.capabilities?.editTools
-                },
-                maxInputTokens: model.metadata.maxInputTokens,
-                countTokens(text, token) {
-                    if (!( that._localModels.has(modelId))) {
-                        throw LanguageModelError.NotFound(modelId);
-                    }
-                    return that._computeTokenLength(modelId, text, token ?? CancellationToken.None);
-                },
-                sendRequest(messages, options, token) {
-                    if (!( that._localModels.has(modelId))) {
-                        throw LanguageModelError.NotFound(modelId);
-                    }
-                    return that._sendChatRequest(
-                        extension,
-                        modelId,
-                        messages,
-                        options ?? {},
-                        token ?? CancellationToken.None
-                    );
+        const that = this;
+        const apiObject = {
+            id: model.info.id,
+            vendor: model.metadata.vendor,
+            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,
+            longContextInputCost: model.metadata.longContextInputCost,
+            longContextOutputCost: model.metadata.longContextOutputCost,
+            longContextCacheCost: model.metadata.longContextCacheCost,
+            priceCategory: model.metadata.priceCategory,
+            capabilities: {
+                supportsImageToText: model.metadata.capabilities?.vision ?? false,
+                supportsToolCalling: !!model.metadata.capabilities?.toolCalling,
+                editToolsHint: model.metadata.capabilities?.editTools
+            },
+            maxInputTokens: model.metadata.maxInputTokens,
+            countTokens(text, token) {
+                if (!( that._localModels.has(modelId))) {
+                    throw LanguageModelError.NotFound(modelId);
                 }
-            };
-        }
+                return that._computeTokenLength(modelId, text, token ?? CancellationToken.None);
+            },
+            sendRequest(messages, options, token) {
+                if (!( that._localModels.has(modelId))) {
+                    throw LanguageModelError.NotFound(modelId);
+                }
+                return that._sendChatRequest(
+                    extension,
+                    modelId,
+                    messages,
+                    options ?? {},
+                    token ?? CancellationToken.None
+                );
+            }
+        };
         return apiObject;
     }
     async selectLanguageModels(extension, selector) {
@@ -412,15 +421,8 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             ...selector,
             extension: extension.identifier
         });
-        const result = [];
-        const modelPromises = ( models.map(identifier => this.getLanguageModelByIdentifier(extension, identifier)));
-        const modelResults = await Promise.all(modelPromises);
-        for (const model of modelResults) {
-            if (model) {
-                result.push(model);
-            }
-        }
-        return result;
+        const modelResults = await Promise.all(( models.map(identifier => this._createLanguageModelChatApi(extension, identifier))));
+        return modelResults.filter(m => !!m);
     }
     async _sendChatRequest(extension, languageModelId, messages, options, token) {
         const internalMessages = this._convertMessages(extension, messages);
@@ -468,6 +470,9 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             data.res.handleResponsePart(chunk.value);
         }
     }
+    $onChatModelsChange() {
+        this._onDidChangeProviders.fire();
+    }
     async $acceptResponseDone(requestId, error) {
         const data = this._pendingRequest.get(requestId);
         if (!data) {
@@ -499,7 +504,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             return false;
         }
         try {
-            const detail = justification ? ( localize(2811, "Justification: {1}", to.displayName, justification)) : undefined;
+            const detail = justification ? ( localize(2869, "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(2812, "Extension Host (Remote)")) : isWorker ? ( localize(2813, "Extension Host (Worker)")) : ( localize(2814, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2870, "Extension Host (Remote)")) : isWorker ? ( localize(2871, "Extension Host (Worker)")) : ( localize(2872, "Extension Host"));
         super(loggerService.createLogger(id, {
             name
         }));

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

@@ -249,6 +249,18 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
     }
 };
 ExtHostMcpService = ( __decorate([( __param(0, IExtHostRpcService)), ( __param(1, ILogService)), ( __param(2, IExtHostInitDataService)), ( __param(3, IExtHostWorkspace)), ( __param(4, IExtHostVariableResolverProvider))], ExtHostMcpService));
+function stringifyError(err) {
+    if (!(err instanceof Error)) {
+        return String(err);
+    }
+    let msg = String(err);
+    let cause = err.cause;
+    for (let depth = 0; cause !== undefined && depth < 5; depth++) {
+        msg += `: ${cause instanceof Error ? (cause.message || String(cause)) : String(cause)}`;
+        cause = cause instanceof Error ? cause.cause : undefined;
+    }
+    return msg;
+}
 var HttpMode;
 (function(HttpMode) {
     HttpMode[HttpMode["Unknown"] = 0] = "Unknown";
@@ -289,7 +301,7 @@ class McpHTTPHandle extends Disposable {
                 await this._send(message);
             }
         } catch (err) {
-            const msg = `Error sending message to ${this._launch.uri}: ${String(err)}`;
+            const msg = `Error sending message to ${this._launch.uri}: ${stringifyError(err)}`;
             this._proxy.$onDidChangeState(this._id, {
                 state: McpConnectionState.Kind.Error,
                 message: msg
@@ -343,7 +355,6 @@ class McpHTTPHandle extends Disposable {
         const headers = {
             ...Object.fromEntries(this._launch.headers),
             "Content-Type": "application/json",
-            "Content-Length": String(asBytes.length),
             Accept: "text/event-stream, application/json"
         };
         if (sessionId) {
@@ -424,7 +435,7 @@ class McpHTTPHandle extends Disposable {
             try {
                 await this._doSSE(parser, res);
             } catch (err) {
-                this._log(LogLevel.Warning, `Error reading SSE stream: ${String(err)}`);
+                this._log(LogLevel.Warning, `Error reading SSE stream: ${stringifyError(err)}`);
             }
         } else if (contentType.startsWith("application/json")) {
             this._proxy.$onDidReceiveMessage(this._id, await res.text());
@@ -540,7 +551,7 @@ class McpHTTPHandle extends Disposable {
         this._doSSE(parser, res).catch(err => {
             this._proxy.$onDidChangeState(this._id, {
                 state: McpConnectionState.Kind.Error,
-                message: `Error reading SSE stream: ${String(err)}`
+                message: `Error reading SSE stream: ${stringifyError(err)}`
             });
         });
         return postEndpoint.p;
@@ -549,8 +560,7 @@ class McpHTTPHandle extends Disposable {
         const asBytes = ( new TextEncoder()).encode(message);
         const headers = {
             ...Object.fromEntries(this._launch.headers),
-            "Content-Type": "application/json",
-            "Content-Length": String(asBytes.length)
+            "Content-Type": "application/json"
         };
         await this._addAuthHeader(headers);
         const res = await this._fetch(url, {
@@ -596,7 +606,8 @@ class McpHTTPHandle extends Disposable {
                     authorizationServerMetadata: this._authMetadata.serverMetadata,
                     resourceMetadata: this._authMetadata.resourceMetadata,
                     scopes: this._authMetadata.scopes,
-                    clientId: this._launch.oauth?.clientId
+                    clientId: this._launch.oauth?.clientId,
+                    enterpriseManaged: this._launch.oauth?.enterpriseManaged
                 };
                 const token = await this._proxy.$getTokenFromServerMetadata(this._id, authDetails, {
                     errorOnUserInteraction,

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(2815, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+                throw new FileOperationError(( localize(2873, "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(2816, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2874, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

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

@@ -80,7 +80,8 @@ let NodeModuleAliasingModuleFactory = class NodeModuleAliasingModuleFactory {
     }
     static {
         this.aliased = ( new Map([
-            ["vscode-ripgrep", "@vscode/ripgrep"],
+            ["vscode-ripgrep", "@vscode/ripgrep-universal"],
+            ["@vscode/ripgrep", "@vscode/ripgrep-universal"],
             ["vscode-windows-registry", "@vscode/windows-registry"]
         ]));
     }

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

@@ -195,7 +195,7 @@ class ExtHostStatusBarEntry {
                 name = this._name;
             } else {
                 name = ( localize(
-                    2817,
+                    2875,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -248,7 +248,7 @@ class StatusBarMessage {
             StatusBarAlignment.Left,
             Number.MIN_VALUE
         );
-        this._item.name = ( localize(2818, "Extension Status"));
+        this._item.name = ( localize(2876, "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(
-                2819,
+                2877,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? " (Not Sent)" : ""
             )),

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

@@ -512,6 +512,12 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         }
     }
     async $acceptTerminalClosed(id, exitCode, exitReason) {
+        this._terminalLinkCache.delete(id);
+        const cancellationSource = this._terminalLinkCancellationSource.get(id);
+        if (cancellationSource) {
+            this._terminalLinkCancellationSource.delete(id);
+            cancellationSource.dispose(true);
+        }
         const index = this._getTerminalObjectIndexById(this._terminals, id);
         if (index !== null) {
             const terminal = this._terminals.splice(index, 1)[0];
@@ -551,7 +557,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         const terminal = this.getTerminalById(id);
         if (!terminal) {
             return {
-                message: ( localize(2820, "Could not find the terminal with id {0} on the extension host", id))
+                message: ( localize(2878, "Could not find the terminal with id {0} on the extension host", id))
             };
         }
         if (!terminal.isOpen) {
@@ -806,16 +812,20 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         const promises = [];
         for (const provider of this._linkProviders) {
             promises.push(Promises.withAsyncBody(async r => {
-                cancellationSource.token.onCancellationRequested(() => r({
+                const cancelSubscription = cancellationSource.token.onCancellationRequested(() => r({
                     provider,
                     links: []
                 }));
-                const links = (await provider.provideTerminalLinks(context, cancellationSource.token)) || [];
-                if (!cancellationSource.token.isCancellationRequested) {
-                    r({
-                        provider,
-                        links
-                    });
+                try {
+                    const links = (await provider.provideTerminalLinks(context, cancellationSource.token)) || [];
+                    if (!cancellationSource.token.isCancellationRequested) {
+                        r({
+                            provider,
+                            links
+                        });
+                    }
+                } finally {
+                    cancelSubscription.dispose();
                 }
             }));
         }

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(2821, "Private")),
+                        label: ( localize(2879, "Private")),
                         themeIcon: "lock"
                     }, {
                         id: "public",
-                        label: ( localize(2822, "Public")),
+                        label: ( localize(2880, "Public")),
                         themeIcon: "eye"
                     }];
                 }

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

@@ -28,7 +28,7 @@ import { IChatRequestVariableEntry } from "../../contrib/chat/common/attachments
 import { IChatSessionItem } from "../../contrib/chat/common/chatSessionsService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { ChatRequestHooks } from "../../contrib/chat/common/promptSyntax/hookSchema.js";
-import { type IParsedHookCommand } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentPlugins/common/pluginParsers";
+import { type IParsedHookCommand } from "../../../platform/agentPlugins/common/pluginParsers.js";
 import { IToolResult, ToolDataSource } from "../../contrib/chat/common/tools/languageModelToolsService.js";
 import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";