@codingame/monaco-vscode-extensions-service-override 16.1.0 → 17.0.0

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -2,13 +2,14 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DeferredPromise, AsyncIterableSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { transformErrorFromSerialization, transformErrorForSerialization } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { resizeImage } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -131,7 +132,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
                 this._logService.trace('[CHAT] request DONE', extension.value, requestId);
             }
             catch (err) {
-                this._logService.error('[CHAT] extension request ERRORED in STREAM', err, extension.value, requestId);
+                this._logService.error('[CHAT] extension request ERRORED in STREAM', toErrorMessage(err, true), extension.value, requestId);
                 this._proxy.$acceptResponseDone(requestId, transformErrorForSerialization(err));
             }
         })();
@@ -139,7 +140,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
             this._logService.debug('[CHAT] extension request DONE', extension.value, requestId);
             this._proxy.$acceptResponseDone(requestId, undefined);
         }, err => {
-            this._logService.error('[CHAT] extension request ERRORED', err, extension.value, requestId);
+            this._logService.error('[CHAT] extension request ERRORED', toErrorMessage(err, true), extension.value, requestId);
             this._proxy.$acceptResponseDone(requestId, transformErrorForSerialization(err));
         });
     }
@@ -151,7 +152,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2407, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2425, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts

@@ -1,5 +1,4 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
@@ -10,9 +9,9 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly _mcpRegistry;
     private _serverIdCounter;
     private readonly _servers;
+    private readonly _proxy;
     private readonly _collectionDefinitions;
-    private readonly _mcpEnabled;
-    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, configurationService: IConfigurationService);
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry);
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
     $onDidChangeState(id: number, update: McpConnectionState): void;

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js

@@ -2,30 +2,25 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { LogLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
-import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
-import { mcpEnabledSection } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpServerTransportType, McpServerDefinition, McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { McpServerTransportType, McpServerDefinition, McpServerLaunch, McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { ExtensionHostKind, extensionHostKindToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 let MainThreadMcp = class MainThreadMcp extends Disposable {
-    constructor(_extHostContext, _mcpRegistry, configurationService) {
+    constructor(_extHostContext, _mcpRegistry) {
         super();
         this._extHostContext = _extHostContext;
         this._mcpRegistry = _mcpRegistry;
         this._serverIdCounter = 0;
         this._servers = ( new Map());
         this._collectionDefinitions = this._register(( new DisposableMap()));
-        const proxy = ( _extHostContext.getProxy(ExtHostContext.ExtHostMcp));
-        this._mcpEnabled = observableConfigValue(mcpEnabledSection, true, configurationService);
+        const proxy = this._proxy = ( _extHostContext.getProxy(ExtHostContext.ExtHostMcp));
         this._register(this._mcpRegistry.registerDelegate({
             priority: _extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker ? 0 : 1,
             waitForInitialProviderPromises() {
@@ -61,24 +56,19 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         }
         else {
             const serverDefinitions = observableValue('mcpServers', servers);
-            const store = ( new DisposableStore());
-            const handle = store.add(( new MutableDisposable()));
-            store.add(autorun(reader => {
-                if (this._mcpEnabled.read(reader)) {
-                    handle.value = this._mcpRegistry.registerCollection({
-                        ...collection,
-                        remoteAuthority: this._extHostContext.remoteAuthority,
-                        serverDefinitions,
-                    });
-                }
-                else {
-                    handle.clear();
-                }
-            }));
+            const handle = this._mcpRegistry.registerCollection({
+                ...collection,
+                resolveServerLanch: collection.canResolveLaunch ? (async (def) => {
+                    const r = await this._proxy.$resolveMcpLaunch(collection.id, def.label);
+                    return r ? McpServerLaunch.fromSerialized(r) : undefined;
+                }) : undefined,
+                remoteAuthority: this._extHostContext.remoteAuthority,
+                serverDefinitions,
+            });
             this._collectionDefinitions.set(collection.id, {
                 fromExtHost: collection,
                 servers: serverDefinitions,
-                dispose: () => store.dispose(),
+                dispose: () => handle.dispose(),
             });
         }
     }
@@ -116,8 +106,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
 };
 MainThreadMcp = __decorate([
     extHostNamedCustomer(MainContext.MainThreadMcp),
-    ( __param(1, IMcpRegistry)),
-    ( __param(2, IConfigurationService))
+    ( __param(1, IMcpRegistry))
 ], MainThreadMcp);
 class ExtHostMcpServerLaunch extends Disposable {
     pushLog(level, message) {
@@ -132,7 +121,12 @@ class ExtHostMcpServerLaunch extends Disposable {
             this.pushLog(LogLevel.Warning, `Failed to parse message: ${JSON.stringify(message)}`);
         }
         if (parsed) {
-            this._onDidReceiveMessage.fire(parsed);
+            if (Array.isArray(parsed)) {
+                parsed.forEach(p => this._onDidReceiveMessage.fire(p));
+            }
+            else {
+                this._onDidReceiveMessage.fire(parsed);
+            }
         }
     }
     constructor(extHostKind, stop, send) {

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -51,13 +51,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 };
             }
             if (!source) {
-                source = ( localize(2408, "Extension"));
+                source = ( localize(2426, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2409, "Manage Extension")),
+                    label: ( localize(2427, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -92,13 +92,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2410, "Cancel")),
+                    label: ( localize(2428, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2411, "&&OK")),
+                    label: ( localize(2429, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebook.js

@@ -11,7 +11,7 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js

@@ -8,8 +8,8 @@ import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDto.d.ts

@@ -1,6 +1,6 @@
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import * as notebookCommon from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ICellExecuteUpdate, ICellExecutionComplete } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecuteUpdate, ICellExecutionComplete } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare namespace NotebookDto {
     function toNotebookOutputItemDto(item: notebookCommon.IOutputItemDto): extHostProtocol.NotebookOutputItemDto;
     function toNotebookOutputDto(output: notebookCommon.IOutputDto): extHostProtocol.NotebookOutputDto;

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.d.ts

@@ -1,8 +1,8 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { ICellRange } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js

@@ -5,9 +5,9 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtHostContext, NotebookEditorRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js

@@ -10,7 +10,7 @@ import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { NotebookExecutionType } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -6,7 +6,7 @@ import { extHostCustomer } from '../../services/extensions/common/extHostCustome
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2412, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2430, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js

@@ -69,11 +69,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2413, "Show Output")),
+            name: ( localize(2431, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2414, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2432, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2415, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2433, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -28,7 +28,7 @@ let MainThreadProgress = class MainThreadProgress {
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                         id: extensionId,
-                        label: ( localize(2416, "Manage Extension")),
+                        label: ( localize(2434, "Manage Extension")),
                         run: () => this._commandService.executeCommand('_extensions.manage', extensionId)
                     })]
             };

package/vscode/src/vs/workbench/api/browser/mainThreadQuickDiff.d.ts

@@ -7,7 +7,7 @@ export declare class MainThreadQuickDiff implements MainThreadQuickDiffShape {
     private readonly proxy;
     private providerDisposables;
     constructor(extHostContext: IExtHostContext, quickDiffService: IQuickDiffService);
-    $registerQuickDiffProvider(handle: number, selector: IDocumentFilterDto[], label: string, rootUri: UriComponents | undefined, visible: boolean): Promise<void>;
+    $registerQuickDiffProvider(handle: number, selector: IDocumentFilterDto[], id: string, label: string, rootUri: UriComponents | undefined): Promise<void>;
     $unregisterQuickDiffProvider(handle: number): Promise<void>;
     dispose(): void;
 }

package/vscode/src/vs/workbench/api/browser/mainThreadQuickDiff.js

@@ -13,13 +13,13 @@ let MainThreadQuickDiff = class MainThreadQuickDiff {
         this.providerDisposables = ( new DisposableMap());
         this.proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostQuickDiff));
     }
-    async $registerQuickDiffProvider(handle, selector, label, rootUri, visible) {
+    async $registerQuickDiffProvider(handle, selector, id, label, rootUri) {
         const provider = {
+            id,
             label,
             rootUri: URI.revive(rootUri),
             selector,
-            isSCM: false,
-            visible,
+            kind: 'contributed',
             getOriginalResource: async (uri) => {
                 return URI.revive(await this.proxy.$provideOriginalResource(handle, uri, CancellationToken.None));
             }

package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js

@@ -232,8 +232,6 @@ class MainThreadSCMProvider {
         this._statusBarCommands = observableValue(this, undefined);
         this._commitTemplate = observableValue(this, '');
         this._actionButton = observableValue(this, undefined);
-        this.isSCM = true;
-        this.visible = true;
         this._historyProvider = observableValue(this, undefined);
         if (_rootUri) {
             const folder = this._workspaceContextService.getWorkspaceFolder(_rootUri);
@@ -261,17 +259,42 @@ class MainThreadSCMProvider {
         }
         if (features.hasQuickDiffProvider && !this._quickDiff) {
             this._quickDiff = this._quickDiffService.addQuickDiffProvider({
+                id: `${this._providerId}.quickDiffProvider`,
                 label: features.quickDiffLabel ?? this.label,
                 rootUri: this.rootUri,
-                isSCM: this.isSCM,
-                visible: this.visible,
-                getOriginalResource: (uri) => this.getOriginalResource(uri)
+                kind: 'primary',
+                getOriginalResource: async (uri) => {
+                    if (!this.features.hasQuickDiffProvider) {
+                        return null;
+                    }
+                    const result = await this.proxy.$provideOriginalResource(this.handle, uri, CancellationToken.None);
+                    return result && URI.revive(result);
+                }
             });
         }
         else if (features.hasQuickDiffProvider === false && this._quickDiff) {
             this._quickDiff.dispose();
             this._quickDiff = undefined;
         }
+        if (features.hasSecondaryQuickDiffProvider && !this._stagedQuickDiff) {
+            this._stagedQuickDiff = this._quickDiffService.addQuickDiffProvider({
+                id: `${this._providerId}.secondaryQuickDiffProvider`,
+                label: features.secondaryQuickDiffLabel ?? this.label,
+                rootUri: this.rootUri,
+                kind: 'secondary',
+                getOriginalResource: async (uri) => {
+                    if (!this.features.hasSecondaryQuickDiffProvider) {
+                        return null;
+                    }
+                    const result = await this.proxy.$provideSecondaryOriginalResource(this.handle, uri, CancellationToken.None);
+                    return result && URI.revive(result);
+                }
+            });
+        }
+        else if (features.hasSecondaryQuickDiffProvider === false && this._stagedQuickDiff) {
+            this._stagedQuickDiff.dispose();
+            this._stagedQuickDiff = undefined;
+        }
         if (features.hasHistoryProvider && !this.historyProvider.get()) {
             const historyProvider = ( new MainThreadSCMHistoryProvider(this.proxy, this.handle));
             this._historyProvider.set(historyProvider, undefined);
@@ -387,6 +410,7 @@ class MainThreadSCMProvider {
         };
     }
     dispose() {
+        this._stagedQuickDiff?.dispose();
         this._quickDiff?.dispose();
     }
 }

package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2417, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2435, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error('listener failed')));

package/vscode/src/vs/workbench/api/browser/mainThreadSearch.d.ts

@@ -6,6 +6,7 @@ import { IRawFileMatch2 } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ISearchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service";
 import { MainThreadSearchShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { AISearchKeyword } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/searchExtTypes";
 export declare class MainThreadSearch implements MainThreadSearchShape {
     private readonly _searchService;
     private readonly _telemetryService;
@@ -20,5 +21,6 @@ export declare class MainThreadSearch implements MainThreadSearchShape {
     $unregisterProvider(handle: number): void;
     $handleFileMatch(handle: number, session: number, data: UriComponents[]): void;
     $handleTextMatch(handle: number, session: number, data: IRawFileMatch2[]): void;
+    $handleKeywordResult(handle: number, session: number, data: AISearchKeyword): void;
     $handleTelemetry(eventName: string, data: any): void;
 }

package/vscode/src/vs/workbench/api/browser/mainThreadSearch.js

@@ -60,6 +60,13 @@ let MainThreadSearch = class MainThreadSearch {
         }
         provider.handleFindMatch(session, data);
     }
+    $handleKeywordResult(handle, session, data) {
+        const provider = this._searchProvider.get(handle);
+        if (!provider) {
+            throw ( new Error('Got result for unknown provider'));
+        }
+        provider.handleKeywordResult(session, data);
+    }
     $handleTelemetry(eventName, data) {
         this._telemetryService.publicLog(eventName, data);
     }
@@ -73,10 +80,11 @@ MainThreadSearch = __decorate([
 ], MainThreadSearch);
 class SearchOperation {
     static { this._idPool = 0; }
-    constructor(progress, id = ++SearchOperation._idPool, matches = ( new Map())) {
+    constructor(progress, id = ++SearchOperation._idPool, matches = ( new Map()), keywords = []) {
         this.progress = progress;
         this.id = id;
         this.matches = matches;
+        this.keywords = keywords;
     }
     addMatch(match) {
         const existingMatch = this.matches.get(( match.resource.toString()));
@@ -90,6 +98,9 @@ class SearchOperation {
         }
         this.progress?.(match);
     }
+    addKeyword(result) {
+        this.keywords.push(result);
+    }
 }
 class RemoteSearchProvider {
     constructor(searchService, type, _scheme, _handle, _proxy) {
@@ -124,7 +135,7 @@ class RemoteSearchProvider {
         const searchP = this._provideSearchResults(query, search.id, token);
         return Promise.resolve(searchP).then((result) => {
             this._searches.delete(search.id);
-            return { results: Array.from(( search.matches.values())), stats: result.stats, limitHit: result.limitHit, messages: result.messages };
+            return { results: Array.from(( search.matches.values())), aiKeywords: Array.from(search.keywords), stats: result.stats, limitHit: result.limitHit, messages: result.messages };
         }, err => {
             this._searches.delete(search.id);
             return Promise.reject(err);
@@ -149,7 +160,14 @@ class RemoteSearchProvider {
             }
         });
     }
-    _provideSearchResults(query, session, token) {
+    handleKeywordResult(session, data) {
+        const searchOp = this._searches.get(session);
+        if (!searchOp) {
+            return;
+        }
+        searchOp.addKeyword(data);
+    }
+    _provideSearchResults(query, session, token, onKeywordResult) {
         switch (query.type) {
             case QueryType.File:
                 return this._proxy.$provideFileSearchResults(this._handle, session, query, token);

package/vscode/src/vs/workbench/api/browser/mainThreadSecretState.d.ts

@@ -3,7 +3,7 @@ import { IExtHostContext } from "../../services/extensions/common/extHostCustome
 import { MainThreadSecretStateShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ISecretStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
 export declare class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape {
     private readonly secretStorageService;
     private readonly logService;

package/vscode/src/vs/workbench/api/browser/mainThreadSecretState.js

@@ -6,7 +6,7 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 
 let MainThreadSecretState = class MainThreadSecretState extends Disposable {
     constructor(extHostContext, secretStorageService, logService, environmentService) {

package/vscode/src/vs/workbench/api/browser/mainThreadSpeech.js

@@ -64,7 +64,13 @@ let MainThreadSpeech = class MainThreadSpeech {
                     onDidChange: onDidChange.event,
                     synthesize: async (text) => {
                         await this.proxy.$synthesizeSpeech(session, text);
-                        await raceCancellation(Event.toPromise(Event.filter(onDidChange.event, e => e.status === TextToSpeechStatus.Stopped)), token);
+                        const disposable = ( new DisposableStore());
+                        try {
+                            await raceCancellation(Event.toPromise(Event.filter(onDidChange.event, e => e.status === TextToSpeechStatus.Stopped, disposable), disposable), token);
+                        }
+                        finally {
+                            disposable.dispose();
+                        }
                     }
                 };
             },

package/vscode/src/vs/workbench/api/browser/mainThreadTask.js

@@ -405,7 +405,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2418, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2436, '{0}: {1}', source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -112,13 +112,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2419,
+            2437,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-                label: ( localize(2420, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2438, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
                 run: async () => {
                     this.elevateionRetry = true;
                     await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);

package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js

@@ -52,7 +52,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 }
                 catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action('default', ( localize(2421, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action('default', ( localize(2439, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId,
@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2422, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
+                            message: ( localize(2440, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
                             actions: {
                                 primary: [
                                     openDefaultAction

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { WebviewInput } from "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";

package/vscode/src/vs/workbench/api/browser/mainThreadWebviewPanels.js

@@ -7,11 +7,11 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { DiffEditorInput } from '@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common/vscode/vs/workbench/common/editor/diffEditorInput';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewInput } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupsOrder, GroupLocation, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ACTIVE_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';