@codingame/monaco-vscode-extensions-service-override 19.1.4 → 20.0.1

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

@@ -9,9 +9,10 @@ import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severit
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 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 { McpServerTransportType, McpServerDefinition, McpServerLaunch, McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { McpServerTransportType, McpServerDefinition, McpServerTrust, McpServerLaunch, McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IAuthenticationMcpAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service';
 import { IAuthenticationMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service';
 import { IAuthenticationMcpUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service';
@@ -74,10 +75,12 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             const serverDefinitions = observableValue('mcpServers', servers);
             const handle = this._mcpRegistry.registerCollection({
                 ...collection,
+                source: ( new ExtensionIdentifier(collection.extensionId)),
                 resolveServerLanch: collection.canResolveLaunch ? (async (def) => {
                     const r = await this._proxy.$resolveMcpLaunch(collection.id, def.label);
                     return r ? McpServerLaunch.fromSerialized(r) : undefined;
                 }) : undefined,
+                trustBehavior: collection.isTrustedByDefault ? McpServerTrust.Kind.Trusted : McpServerTrust.Kind.TrustedOnNonce,
                 remoteAuthority: this._extHostContext.remoteAuthority,
                 serverDefinitions,
             });
@@ -174,9 +177,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2454, "Incorrect account detected")),
+            message: ( localize(2481, "Incorrect account detected")),
             detail: ( localize(
-                2455,
+                2482,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -185,11 +188,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2456, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2483, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2457, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2484, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -202,20 +205,20 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession
             ? ( localize(
-            2458,
+            2485,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ))
             : ( localize(
-            2459,
+            2486,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [
             {
-                label: ( localize(2460, "&&Allow")),
+                label: ( localize(2487, "&&Allow")),
                 run() {
                     return true;
                 },

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

@@ -60,13 +60,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2461, "Extension"));
+                source = ( localize(2488, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2462, "Manage Extension")),
+                    label: ( localize(2489, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -103,13 +103,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2463, "Cancel")),
+                    label: ( localize(2490, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2464, "&&OK")),
+                    label: ( localize(2491, "&&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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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/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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-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/mainThreadNotebookSaveParticipant.js

@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2465, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2492, "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(2466, "Show Output")),
+            name: ( localize(2493, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2467, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2494, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2468, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2495, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {

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

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

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

@@ -4,6 +4,7 @@ import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { MainThreadSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, SCMHistoryItemRefsChangeEventDto, SCMHistoryItemRefDto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
@@ -27,7 +28,10 @@ export declare class MainThreadSCM implements MainThreadSCMShape {
     private readonly _disposables;
     constructor(extHostContext: IExtHostContext, scmService: ISCMService, scmViewService: ISCMViewService, languageService: ILanguageService, modelService: IModelService, textModelService: ITextModelService, quickDiffService: IQuickDiffService, _uriIdentService: IUriIdentityService, workspaceContextService: IWorkspaceContextService);
     dispose(): void;
-    $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
+    $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: UriComponents | {
+        light: UriComponents;
+        dark: UriComponents;
+    } | ThemeIcon | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
     $updateSourceControl(handle: number, features: SCMProviderFeatures): Promise<void>;
     $unregisterSourceControl(handle: number): Promise<void>;
     $registerGroups(sourceControlHandle: number, groups: [

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

@@ -12,7 +12,7 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
-import { ResourceTree } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -21,7 +21,7 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
-import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
@@ -200,13 +200,19 @@ class MainThreadSCMHistoryProvider {
     }
 }
 class MainThreadSCMProvider {
-    static { this.ID_HANDLE = 0; }
-    get id() { return this._id; }
+    get id() { return `scm${this._handle}`; }
+    get parentId() {
+        return this._parentHandle !== undefined
+            ? `scm${this._parentHandle}`
+            : undefined;
+    }
+    get providerId() { return this._providerId; }
     get handle() { return this._handle; }
     get label() { return this._label; }
     get rootUri() { return this._rootUri; }
+    get iconPath() { return this._iconPath; }
     get inputBoxTextModel() { return this._inputBoxTextModel; }
-    get contextValue() { return this._providerId; }
+    get contextValue() { return this._contextValue; }
     get acceptInputCommand() { return this.features.acceptInputCommand; }
     get count() { return this._count; }
     get statusBarCommands() { return this._statusBarCommands; }
@@ -214,17 +220,18 @@ class MainThreadSCMProvider {
     get commitTemplate() { return this._commitTemplate; }
     get actionButton() { return this._actionButton; }
     get historyProvider() { return this._historyProvider; }
-    constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
+    constructor(proxy, _handle, _parentHandle, _providerId, _label, _rootUri, _iconPath, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
         this.proxy = proxy;
         this._handle = _handle;
+        this._parentHandle = _parentHandle;
         this._providerId = _providerId;
         this._label = _label;
         this._rootUri = _rootUri;
+        this._iconPath = _iconPath;
         this._inputBoxTextModel = _inputBoxTextModel;
         this._quickDiffService = _quickDiffService;
         this._uriIdentService = _uriIdentService;
         this._workspaceContextService = _workspaceContextService;
-        this._id = `scm${MainThreadSCMProvider.ID_HANDLE++}`;
         this.groups = [];
         this._onDidChangeResourceGroups = ( new Emitter());
         this.onDidChangeResourceGroups = this._onDidChangeResourceGroups.event;
@@ -232,6 +239,7 @@ class MainThreadSCMProvider {
         this.onDidChangeResources = this._onDidChangeResources.event;
         this._groupsByHandle = Object.create(null);
         this.features = {};
+        this._contextValue = observableValue(this, undefined);
         this._count = observableValue(this, undefined);
         this._statusBarCommands = observableValue(this, undefined);
         this._commitTemplate = observableValue(this, '');
@@ -255,6 +263,9 @@ class MainThreadSCMProvider {
         if (typeof features.actionButton !== 'undefined') {
             this._actionButton.set(features.actionButton ?? undefined, undefined);
         }
+        if (typeof features.contextValue !== 'undefined') {
+            this._contextValue.set(features.contextValue, undefined);
+        }
         if (typeof features.count !== 'undefined') {
             this._count.set(features.count, undefined);
         }
@@ -442,15 +453,17 @@ let MainThreadSCM = class MainThreadSCM {
         this._repositoryDisposables.clear();
         this._disposables.dispose();
     }
-    async $registerSourceControl(handle, id, label, rootUri, inputBoxDocumentUri) {
+    async $registerSourceControl(handle, parentHandle, id, label, rootUri, iconPath, inputBoxDocumentUri) {
         this._repositoryBarriers.set(handle, ( new Barrier()));
         const inputBoxTextModelRef = await this.textModelService.createModelReference(URI.revive(inputBoxDocumentUri));
         const provider = ( new MainThreadSCMProvider(
             this._proxy,
             handle,
+            parentHandle,
             id,
             label,
             rootUri ? URI.revive(rootUri) : undefined,
+            getIconFromIconDto(iconPath),
             inputBoxTextModelRef.object.textEditorModel,
             this.quickDiffService,
             this._uriIdentService,

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(2470, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2497, "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/mainThreadSecretState.d.ts

@@ -16,6 +16,8 @@ export declare class MainThreadSecretState extends Disposable implements MainThr
     private doSetPassword;
     $deletePassword(extensionId: string, key: string): Promise<void>;
     private doDeletePassword;
+    $getKeys(extensionId: string): Promise<string[]>;
+    private doGetKeys;
     private getKey;
     private parseKey;
 }

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

@@ -16,13 +16,9 @@ let MainThreadSecretState = class MainThreadSecretState extends Disposable {
         this._sequencer = ( new SequencerByKey());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostSecretState));
         this._register(this.secretStorageService.onDidChangeSecret((e) => {
-            try {
-                const { extensionId, key } = this.parseKey(e);
-                if (extensionId && key) {
-                    this._proxy.$onDidChangePassword({ extensionId, key });
-                }
-            }
-            catch (e) {
+            const parsedKey = this.parseKey(e);
+            if (parsedKey) {
+                this._proxy.$onDidChangePassword(parsedKey);
             }
         }));
     }
@@ -54,11 +50,32 @@ let MainThreadSecretState = class MainThreadSecretState extends Disposable {
         await this.secretStorageService.delete(fullKey);
         this.logService.trace('[mainThreadSecretState] Password deleted for: ', extensionId, key);
     }
+    $getKeys(extensionId) {
+        this.logService.trace(`[mainThreadSecretState] Getting keys for ${extensionId} extension: `);
+        return this._sequencer.queue(extensionId, () => this.doGetKeys(extensionId));
+    }
+    async doGetKeys(extensionId) {
+        if (!this.secretStorageService.keys) {
+            throw ( new Error('Secret storage service does not support keys() method'));
+        }
+        const allKeys = await ( this.secretStorageService.keys());
+        const keys = ( ( allKeys
+            .map(key => this.parseKey(key)))
+            .filter((parsedKey) => parsedKey !== undefined && parsedKey.extensionId === extensionId)
+            .map(({ key }) => key));
+        this.logService.trace(`[mainThreadSecretState] Got ${keys.length}key(s) for: `, extensionId);
+        return keys;
+    }
     getKey(extensionId, key) {
         return JSON.stringify({ extensionId, key });
     }
     parseKey(key) {
-        return JSON.parse(key);
+        try {
+            return JSON.parse(key);
+        }
+        catch {
+            return undefined;
+        }
     }
 };
 MainThreadSecretState = __decorate([

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(2471, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2498, '{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/mainThreadTerminalService.d.ts

@@ -10,7 +10,7 @@ import { IEnvironmentVariableService } from "@codingame/monaco-vscode-api/vscode
 import { ITerminalProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
-import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
 import { ITerminalLinkProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service";
 import { ITerminalQuickFixService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service";
 import { ITerminalCompletionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service";

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

@@ -17,7 +17,7 @@ import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ITerminalLinkProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service';
-import { TerminalQuickFixType } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
+import { TerminalQuickFixType } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
 import { ITerminalQuickFixService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service';
 import { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalCompletionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service';
@@ -228,7 +228,10 @@ let MainThreadTerminalService = class MainThreadTerminalService {
             provideCompletions: async (commandLine, cursorPosition, allowFallbackCompletions, token) => {
                 const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition, allowFallbackCompletions }, token);
                 return {
-                    items: completions?.items.map(c => ({ ...c, provider: id })),
+                    items: completions?.items.map(c => ({
+                        provider: `ext:${id}`,
+                        ...c,
+                    })),
                     resourceRequestConfig: completions?.resourceRequestConfig
                 };
             }

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

@@ -3,10 +3,12 @@ import { type MainThreadTerminalShellIntegrationShape } from "@codingame/monaco-
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { type IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 export declare class MainThreadTerminalShellIntegration extends Disposable implements MainThreadTerminalShellIntegrationShape {
     private readonly _terminalService;
+    private readonly _extensionService;
     private readonly _proxy;
-    constructor(extHostContext: IExtHostContext, _terminalService: ITerminalService, workbenchEnvironmentService: IWorkbenchEnvironmentService);
+    constructor(extHostContext: IExtHostContext, _terminalService: ITerminalService, workbenchEnvironmentService: IWorkbenchEnvironmentService, _extensionService: IExtensionService);
     $executeCommand(terminalId: number, commandLine: string): void;
     private _enableShellIntegration;
 }

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

@@ -8,11 +8,13 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { TerminalShellExecutionCommandLineConfidence } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegration extends Disposable {
-    constructor(extHostContext, _terminalService, workbenchEnvironmentService) {
+    constructor(extHostContext, _terminalService, workbenchEnvironmentService, _extensionService) {
         super();
         this._terminalService = _terminalService;
+        this._extensionService = _extensionService;
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostTerminalShellIntegration));
         const instanceDataListeners = ( new Map());
         this._register(toDisposable(() => {
@@ -73,6 +75,10 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
         this._terminalService.getInstanceFromId(terminalId)?.runCommand(commandLine, true);
     }
     _enableShellIntegration(instance) {
+        this._extensionService.activateByEvent('onTerminalShellIntegration:*');
+        if (instance.shellType) {
+            this._extensionService.activateByEvent(`onTerminalShellIntegration:${instance.shellType}`);
+        }
         this._proxy.$shellIntegrationChange(instance.instanceId);
         const cwdDetection = instance.capabilities.get(TerminalCapability.CwdDetection);
         if (cwdDetection) {
@@ -83,7 +89,8 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
 MainThreadTerminalShellIntegration = __decorate([
     extHostNamedCustomer(MainContext.MainThreadTerminalShellIntegration),
     ( __param(1, ITerminalService)),
-    ( __param(2, IWorkbenchEnvironmentService))
+    ( __param(2, IWorkbenchEnvironmentService)),
+    ( __param(3, IExtensionService))
 ], MainThreadTerminalShellIntegration);
 function convertToExtHostCommandLineConfidence(command) {
     switch (command.commandLineConfidence) {

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(
-            2472,
+            2499,
             "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(2473, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2500, "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(2474, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action('default', ( localize(2501, "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(2475, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
+                            message: ( localize(2502, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
                             actions: {
                                 primary: [
                                     openDefaultAction

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

@@ -8,6 +8,7 @@ import { MainThreadWebviews } from './mainThreadWebviews.js';
 import { MainThreadWebviewsViews } from './mainThreadWebviewViews.js';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { MainThreadChatOutputRenderer } from './mainThreadChatOutputRenderer.js';
 
 let MainThreadWebviewManager = class MainThreadWebviewManager extends Disposable {
     constructor(context, instantiationService) {
@@ -20,6 +21,8 @@ let MainThreadWebviewManager = class MainThreadWebviewManager extends Disposable
         context.set(MainContext.MainThreadCustomEditors, customEditors);
         const webviewViews = this._register(instantiationService.createInstance(MainThreadWebviewsViews, context, webviews));
         context.set(MainContext.MainThreadWebviewViews, webviewViews);
+        const chatOutputRenderers = this._register(instantiationService.createInstance(MainThreadChatOutputRenderer, context, webviews));
+        context.set(MainContext.MainThreadChatOutputRenderer, chatOutputRenderers);
     }
 };
 MainThreadWebviewManager = __decorate([

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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-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-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-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';

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

@@ -2,9 +2,9 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription } from "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebview, WebviewContentOptions, WebviewExtensionDescription } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadWebviews extends Disposable implements extHostProtocol.MainThreadWebviewsShape {
     private readonly _openerService;
     private readonly _productService;
@@ -12,7 +12,7 @@ export declare class MainThreadWebviews extends Disposable implements extHostPro
     private readonly _proxy;
     private readonly _webviews;
     constructor(context: IExtHostContext, _openerService: IOpenerService, _productService: IProductService);
-    addWebview(handle: extHostProtocol.WebviewHandle, webview: IOverlayWebview, options: {
+    addWebview(handle: extHostProtocol.WebviewHandle, webview: IWebview, options: {
         serializeBuffersForPostMessage: boolean;
     }): void;
     $setHtml(handle: extHostProtocol.WebviewHandle, value: string): void;