@codingame/monaco-vscode-api 19.1.3 → 20.0.0

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js

@@ -80,8 +80,8 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         DefaultFormatter_1.extensionItemLabels.length = 0;
         DefaultFormatter_1.extensionDescriptions.length = 0;
         DefaultFormatter_1.extensionIds.push(null);
-        DefaultFormatter_1.extensionItemLabels.push(( localize(7496, 'None')));
-        DefaultFormatter_1.extensionDescriptions.push(( localize(7497, "None")));
+        DefaultFormatter_1.extensionItemLabels.push(( localize(7621, 'None')));
+        DefaultFormatter_1.extensionDescriptions.push(( localize(7622, "None")));
         for (const extension of extensions) {
             if (extension.main || extension.browser) {
                 DefaultFormatter_1.extensionIds.push(extension.identifier.value);
@@ -108,13 +108,13 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
                 const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
                 const detail = kind === FormattingKind.File
                     ? ( localize(
-                    7498,
+                    7623,
                     "Extension '{0}' is configured as formatter but it cannot format '{1}'-files",
                     extension.displayName || extension.name,
                     langName
                 ))
                     : ( localize(
-                    7499,
+                    7624,
                     "Extension '{0}' is configured as formatter but it can only format '{1}'-files as a whole, not selections or parts of it.",
                     extension.displayName || extension.name,
                     langName
@@ -128,12 +128,12 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
         const message = !defaultFormatterId
             ? ( localize(
-            7500,
+            7625,
             "There are multiple formatters for '{0}' files. One of them should be configured as default formatter.",
             DefaultFormatter_1._maybeQuotes(langName)
         ))
             : ( localize(
-            7501,
+            7626,
             "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.",
             defaultFormatterId
         ));
@@ -146,16 +146,16 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         }
         if (mode !== FormattingMode.Silent) {
             const { confirmed } = await this._dialogService.confirm({
-                message: ( localize(7502, "Configure Default Formatter")),
+                message: ( localize(7627, "Configure Default Formatter")),
                 detail: formatterOrMessage,
-                primaryButton: ( localize(7503, "&&Configure..."))
+                primaryButton: ( localize(7628, "&&Configure..."))
             });
             if (confirmed) {
                 return this._pickAndPersistDefaultFormatter(formatter, document);
             }
         }
         else {
-            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(7504, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
+            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(7629, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
         }
         return undefined;
     }
@@ -169,7 +169,7 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         }));
         const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
         const pick = await this._quickInputService.pick(picks, { placeHolder: ( localize(
-            7505,
+            7630,
             "Select a default formatter for '{0}' files",
             DefaultFormatter_1._maybeQuotes(langName)
         )) });
@@ -202,14 +202,14 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
             if (typeof result !== 'string') {
                 return;
             }
-            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(7506, "Configure...")) };
+            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(7631, "Configure...")) };
             this._languageStatusStore.add(CommandsRegistry.registerCommand(command.id, () => this._pickAndPersistDefaultFormatter(formatter, document)));
             this._languageStatusStore.add(this._languageStatusService.addStatus({
                 id: 'formatter.conflict',
-                name: ( localize(7507, "Formatter Conflicts")),
+                name: ( localize(7632, "Formatter Conflicts")),
                 selector: { language: document.getLanguageId(), pattern: document.uri.fsPath },
                 severity: Severity$1.Error,
-                label: ( localize(7508, "Formatting")),
+                label: ( localize(7633, "Formatting")),
                 detail: result,
                 busy: false,
                 source: '',
@@ -237,7 +237,7 @@ DefaultFormatter = DefaultFormatter_1 = ( __decorate([
     properties: {
         [DefaultFormatter.configName]: {
             description: ( localize(
-                7509,
+                7634,
                 "Defines a default formatter which takes precedence over all other formatter settings. Must be the identifier of an extension contributing a formatter."
             )),
             type: ['string', 'null'],
@@ -260,7 +260,7 @@ async function showFormatterPick(accessor, model, formatters) {
         const pick = {
             index,
             label: provider.displayName || '',
-            description: isDefault ? ( localize(7510, "(default)")) : undefined,
+            description: isDefault ? ( localize(7635, "(default)")) : undefined,
         };
         if (isDefault) {
             defaultFormatterPick = pick;
@@ -268,10 +268,10 @@ async function showFormatterPick(accessor, model, formatters) {
         return pick;
     }));
     const configurePick = {
-        label: ( localize(7511, "Configure Default Formatter..."))
+        label: ( localize(7636, "Configure Default Formatter..."))
     };
     const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], {
-        placeHolder: ( localize(7512, "Select a formatter")),
+        placeHolder: ( localize(7637, "Select a formatter")),
         activeItem: defaultFormatterPick
     });
     if (!pick) {
@@ -280,7 +280,7 @@ async function showFormatterPick(accessor, model, formatters) {
     else if (pick === configurePick) {
         const langName = languageService.getLanguageName(model.getLanguageId()) || model.getLanguageId();
         const pick = await quickPickService.pick(picks, { placeHolder: ( localize(
-            7505,
+            7630,
             "Select a default formatter for '{0}' files",
             DefaultFormatter._maybeQuotes(langName)
         )) });
@@ -297,7 +297,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument.multiple',
-            label: ( localize(7513, "Format Document With...")),
+            label: ( localize(7638, "Format Document With...")),
             alias: 'Format Document...',
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -327,7 +327,7 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection.multiple',
-            label: ( localize(7514, "Format Selection With...")),
+            label: ( localize(7639, "Format Selection With...")),
             alias: 'Format Code...',
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(EditorContextKeys.writable)), EditorContextKeys.hasMultipleDocumentSelectionFormattingProvider)),
             contextMenuOpts: {

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js

@@ -15,7 +15,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument.none',
-            label: ( localize2(7515, "Format Document")),
+            label: ( localize2(7640, "Format Document")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, ( EditorContextKeys.hasDocumentFormattingProvider.toNegated()))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -43,14 +43,14 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
             return commandService.executeCommand('editor.action.formatDocument');
         }
         else if (model.isTooLargeForSyncing()) {
-            notificationService.warn(( localize(7516, "This file cannot be formatted because it is too large")));
+            notificationService.warn(( localize(7641, "This file cannot be formatted because it is too large")));
         }
         else {
             const langName = model.getLanguageId();
-            const message = ( localize(7517, "There is no formatter for '{0}' files installed.", langName));
+            const message = ( localize(7642, "There is no formatter for '{0}' files installed.", langName));
             const { confirmed } = await dialogService.confirm({
                 message,
-                primaryButton: ( localize(7518, "&&Install Formatter..."))
+                primaryButton: ( localize(7643, "&&Install Formatter..."))
             });
             if (confirmed) {
                 extensionsWorkbenchService.openSearch(`category:formatters ${langName}`);

package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js

@@ -19,7 +19,7 @@ registerEditorAction(class FormatModifiedAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatChanges',
-            label: ( localize2(7519, "Format Modified Lines")),
+            label: ( localize2(7644, "Format Modified Lines")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasDocumentSelectionFormattingProvider

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -24,7 +24,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
     static { this.IsReading = ( new RawContextKey(
         'isReadingLineWithInlayHints',
         false,
-        { type: 'boolean', description: ( localize(7520, "Whether the current line and its inlay hints are currently focused")) }
+        { type: 'boolean', description: ( localize(7645, "Whether the current line and its inlay hints are currently focused")) }
     )); }
     static { this.ID = 'editor.contrib.InlayHintsAccessibility'; }
     static get(editor) {
@@ -39,7 +39,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         this._ariaElement.style.position = 'fixed';
         this._ariaElement.className = 'inlayhint-accessibility-element';
         this._ariaElement.tabIndex = 0;
-        this._ariaElement.setAttribute('aria-description', ( localize(7521, "Code with Inlay Hint Information")));
+        this._ariaElement.setAttribute('aria-description', ( localize(7646, "Code with Inlay Hint Information")));
         this._ctxIsReading = InlayHintsAccessibility_1.IsReading.bindTo(contextKeyService);
     }
     dispose() {
@@ -139,7 +139,7 @@ registerAction2(class StartReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.startReadingLineWithHint',
-            title: ( localize2(7522, "Read Line with Inlay Hints")),
+            title: ( localize2(7647, "Read Line with Inlay Hints")),
             precondition: EditorContextKeys.hasInlayHintsProvider,
             f1: true
         });
@@ -153,7 +153,7 @@ registerAction2(class StopReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.stopReadingLineWithHint',
-            title: ( localize2(7523, "Stop Inlay Hints Reading")),
+            title: ( localize2(7648, "Stop Inlay Hints Reading")),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.d.ts

@@ -2,8 +2,8 @@ import { URI } from "../../../../base/common/uri.js";
 import { ICodeEditor } from "../../../../editor/browser/editorBrowser.js";
 import { Position } from "../../../../editor/common/core/position.js";
 import { IChatEditingSession } from "../../chat/common/chatEditingService.js";
-import { IChatModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { Session } from "@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
+import { IChatModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { Session } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
 export interface ISessionKeyComputer {
     getComparisonKey(editor: ICodeEditor, uri: URI): string;
 }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service.d.ts

@@ -6,7 +6,7 @@ import { URI } from "../../../../base/common/uri.js";
 import { IActiveCodeEditor, ICodeEditor } from "../../../../editor/browser/editorBrowser.js";
 import { IRange } from "../../../../editor/common/core/range.js";
 import { IValidEditOperation } from "../../../../editor/common/model.js";
-import { Session, StashedSession } from "@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
+import { Session, StashedSession } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
 import { IInlineChatSessionEvent, IInlineChatSessionEndEvent, ISessionKeyComputer, IInlineChatSession2 } from "./inlineChatSessionService.js";
 export declare const IInlineChatSessionService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IInlineChatSessionService>;
 export interface IInlineChatSessionService {

package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js

@@ -11,8 +11,8 @@ class ListResizeColumnAction extends Action2 {
     constructor() {
         super({
             id: 'list.resizeColumn',
-            title: { value: ( localize(7737, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(7738, "List")), original: 'List' },
+            title: { value: ( localize(7864, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(7865, "List")), original: 'List' },
             precondition: WorkbenchListFocusContextKey,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js

@@ -17,14 +17,14 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
                 items.push({ label, index });
             }
         });
-        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(7739, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(7866, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(7740, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(7867, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                7741,
+                7868,
                 "Please enter a width in percentage for the '{0}' column.",
                 column.label
             )),
@@ -39,11 +39,11 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
     async _validateColumnResizeValue(input) {
         const percentage = Number.parseInt(input);
         if (input && !Number.isInteger(percentage)) {
-            return localize(7742, "Please enter an integer.");
+            return localize(7869, "Please enter an integer.");
         }
         else if (percentage < 0 || percentage > 100) {
             return localize(
-                7743,
+                7870,
                 "Please enter a number greater than 0 and less than or equal to 100."
             );
         }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.d.ts

@@ -2,7 +2,7 @@ import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { ILogger, LogLevel } from "../../../../platform/log/common/log.js";
-import { McpCollectionDefinition, McpCollectionReference, McpConnectionState, McpDefinitionReference, McpServerDefinition, McpServerLaunch } from "./mcpTypes.js";
+import { McpCollectionDefinition, McpCollectionReference, McpConnectionState, McpDefinitionReference, McpServerDefinition, McpServerLaunch, McpStartServerInteraction } from "./mcpTypes.js";
 import { MCP } from "./modelContextProtocol.js";
 export interface IMcpMessageTransport extends IDisposable {
     readonly state: IObservable<McpConnectionState>;
@@ -22,8 +22,13 @@ export interface IMcpHostDelegate {
 }
 export interface IMcpResolveConnectionOptions {
     logger: ILogger;
+    interaction?: McpStartServerInteraction;
     collectionRef: McpCollectionReference;
     definitionRef: McpDefinitionReference;
-    forceTrust?: boolean;
+    trustNonceBearer: {
+        trustedAtNonce: string | undefined;
+    };
+    promptType?: "only-new" | "all-untrusted" | "never";
+    autoTrustChanges?: boolean;
     debug?: boolean;
 }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service.d.ts

@@ -6,14 +6,17 @@ import { StorageScope } from "../../../../platform/storage/common/storage.js";
 import { IWorkspaceFolderData } from "../../../../platform/workspace/common/workspace.js";
 import { IResolvedValue } from "../../../services/configurationResolver/common/configurationResolverExpression.js";
 import { IMcpHostDelegate, IMcpResolveConnectionOptions } from "./mcpRegistryTypes.js";
-import { McpCollectionDefinition, LazyCollectionState, McpDefinitionReference, McpServerDefinition, McpCollectionReference, IMcpServerConnection } from "./mcpTypes.js";
+import { McpCollectionDefinition, LazyCollectionState, McpDefinitionReference, McpServerDefinition, IMcpServerConnection } from "./mcpTypes.js";
 export declare const IMcpRegistry: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMcpRegistry>;
 export interface IMcpRegistry {
     readonly _serviceBrand: undefined;
     readonly onDidChangeInputs: Event<void>;
     readonly collections: IObservable<readonly McpCollectionDefinition[]>;
     readonly delegates: IObservable<readonly IMcpHostDelegate[]>;
-    readonly lazyCollectionState: IObservable<LazyCollectionState>;
+    readonly lazyCollectionState: IObservable<{
+        state: LazyCollectionState;
+        collections: McpCollectionDefinition[];
+    }>;
     getServerDefinition(collectionRef: McpDefinitionReference, definitionRef: McpDefinitionReference): IObservable<{
         server: McpServerDefinition | undefined;
         collection: McpCollectionDefinition | undefined;
@@ -21,8 +24,6 @@ export interface IMcpRegistry {
     discoverCollections(): Promise<McpCollectionDefinition[]>;
     registerDelegate(delegate: IMcpHostDelegate): IDisposable;
     registerCollection(collection: McpCollectionDefinition): IDisposable;
-    resetTrust(): void;
-    getTrust(collection: McpCollectionReference): IObservable<boolean | undefined>;
     clearSavedInputs(scope: StorageScope, inputId?: string): Promise<void>;
     editSavedInput(inputId: string, folderData: IWorkspaceFolderData | undefined, configSection: string, target: ConfigurationTarget): Promise<void>;
     setSavedInput(inputId: string, target: ConfigurationTarget, value: string): Promise<void>;

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.d.ts

@@ -1,14 +1,14 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
-import { IObservable } from "../../../../base/common/observable.js";
+import { IObservable, ObservableMap } from "../../../../base/common/observable.js";
 import { URI, UriComponents } from "../../../../base/common/uri.js";
 import { Location } from "../../../../editor/common/languages.js";
 import { ConfigurationTarget } from "../../../../platform/configuration/common/configuration.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IEditorOptions } from "../../../../platform/editor/common/editor.js";
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
-import { IInstallableMcpServer as IInstallableMcpServer, IGalleryMcpServer, IMcpServerManifest } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
-import { IMcpDevModeConfig, IMcpServerConfiguration } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/platform/mcp/common/mcpPlatformTypes";
+import { IGalleryMcpServer, IInstallableMcpServer, IMcpServerManifest } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IMcpDevModeConfig, IMcpServerConfiguration } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpPlatformTypes";
 import { StorageScope } from "../../../../platform/storage/common/storage.js";
 import { IWorkspaceFolder, IWorkspaceFolderData } from "../../../../platform/workspace/common/workspace.js";
 import { IWorkbenchLocalMcpServer } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService";
@@ -24,7 +24,7 @@ export interface McpCollectionDefinition {
     readonly id: string;
     readonly label: string;
     readonly serverDefinitions: IObservable<readonly McpServerDefinition[]>;
-    readonly isTrustedByDefault: boolean;
+    readonly trustBehavior: McpServerTrust.Kind.Trusted | McpServerTrust.Kind.TrustedOnNonce;
     readonly scope: StorageScope;
     readonly configTarget: ConfigurationTarget;
     resolveServerLanch?(definition: McpServerDefinition): Promise<McpServerLaunch | undefined>;
@@ -33,6 +33,7 @@ export interface McpCollectionDefinition {
         load(): Promise<void>;
         removed?(): void;
     };
+    readonly source?: IWorkbenchMcpServer | ExtensionIdentifier;
     readonly presentation?: {
         readonly order?: number;
         readonly origin?: URI;
@@ -64,7 +65,7 @@ export interface McpServerDefinition {
     readonly launch: McpServerLaunch;
     readonly roots?: URI[] | undefined;
     readonly variableReplacement?: McpServerDefinitionVariableReplacement;
-    readonly cacheNonce?: string;
+    readonly cacheNonce: string;
     readonly devMode?: IMcpDevModeConfig;
     readonly presentation?: {
         readonly order?: number;
@@ -75,7 +76,7 @@ export declare namespace McpServerDefinition {
     interface Serialized {
         readonly id: string;
         readonly label: string;
-        readonly cacheNonce?: string;
+        readonly cacheNonce: string;
         readonly launch: McpServerLaunch.Serialized;
         readonly variableReplacement?: McpServerDefinitionVariableReplacement.Serialized;
     }
@@ -115,20 +116,43 @@ export interface McpDefinitionReference {
     id: string;
     label: string;
 }
+export declare class McpStartServerInteraction {
+    readonly participants: ObservableMap<string, {
+        s: "unknown" | "resolved";
+    } | {
+        s: "waiting";
+        definition: McpServerDefinition;
+        collection: McpCollectionDefinition;
+    }>;
+    choice?: Promise<string[] | undefined>;
+}
 export interface IMcpServerStartOpts {
-    isFromInteraction?: boolean;
+    autoTrustChanges?: boolean;
+    promptType?: "only-new" | "all-untrusted" | "never";
     debug?: boolean;
+    interaction?: McpStartServerInteraction;
+}
+export declare namespace McpServerTrust {
+    enum Kind {
+        Trusted = 0,
+        TrustedOnNonce = 1,
+        Untrusted = 2,
+        Unknown = 3
+    }
 }
 export interface IMcpServer extends IDisposable {
     readonly collection: McpCollectionReference;
     readonly definition: McpDefinitionReference;
     readonly connection: IObservable<IMcpServerConnection | undefined>;
     readonly connectionState: IObservable<McpConnectionState>;
+    readonly serverMetadata: IObservable<{
+        serverName?: string;
+        serverInstructions?: string;
+    } | undefined>;
     readDefinitions(): IObservable<{
         server: McpServerDefinition | undefined;
         collection: McpCollectionDefinition | undefined;
     }>;
-    readonly trusted: IObservable<boolean | undefined>;
     showOutput(): void;
     start(opts?: IMcpServerStartOpts): Promise<McpConnectionState>;
     stop(): Promise<void>;
@@ -230,6 +254,7 @@ export declare namespace McpServerLaunch {
     };
     function toSerialized(launch: McpServerLaunch): McpServerLaunch.Serialized;
     function fromSerialized(launch: McpServerLaunch.Serialized): McpServerLaunch;
+    function hash(launch: McpServerLaunch): Promise<string>;
 }
 export interface IMcpServerConnection extends IDisposable {
     readonly definition: McpServerDefinition;
@@ -344,7 +369,6 @@ export declare class McpServerContainers extends Disposable {
 export declare const McpServersGalleryEnabledContext: RawContextKey<boolean>;
 export declare const HasInstalledMcpServersContext: RawContextKey<boolean>;
 export declare const InstalledMcpServersViewId = "workbench.views.mcp.installed";
-export declare const mcpServerIcon: import("../../../../base/common/themables.js").ThemeIcon;
 export declare namespace McpResourceURI {
     const scheme = "mcp-resource";
     function fromServer(def: McpDefinitionReference, resourceURI: URI | string): URI;

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.js

@@ -3,16 +3,16 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { equals } from '../../../../base/common/arrays.js';
 import { assertNever } from '../../../../base/common/assert.js';
 import { encodeHex, VSBuffer, decodeHex } from '../../../../base/common/buffer.js';
-import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { equals as equals$1 } from '../../../../base/common/objects.js';
+import '../../../../base/common/observableInternal/index.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
-import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { IMcpWorkbenchService } from './mcpTypes.service.js';
 import { MCP } from './modelContextProtocol.js';
+import { ObservableMap } from '../../../../base/common/observableInternal/map.js';
 
 const extensionMcpCollectionPrefix = 'ext.';
 function extensionPrefixedIdentifier(identifier, id) {
@@ -33,7 +33,7 @@ var McpCollectionDefinition;
         return a.id === b.id
             && a.remoteAuthority === b.remoteAuthority
             && a.label === b.label
-            && a.isTrustedByDefault === b.isTrustedByDefault;
+            && a.trustBehavior === b.trustBehavior;
     }
     McpCollectionDefinition.equals = equals;
 })(McpCollectionDefinition || (McpCollectionDefinition = {}));
@@ -85,6 +85,20 @@ var LazyCollectionState;
     LazyCollectionState[LazyCollectionState["LoadingUnknown"] = 1] = "LoadingUnknown";
     LazyCollectionState[LazyCollectionState["AllKnown"] = 2] = "AllKnown";
 })(LazyCollectionState || (LazyCollectionState = {}));
+class McpStartServerInteraction {
+    constructor() {
+        this.participants = ( new ObservableMap());
+    }
+}
+var McpServerTrust;
+(function (McpServerTrust) {
+    (function (Kind) {
+        Kind[Kind["Trusted"] = 0] = "Trusted";
+        Kind[Kind["TrustedOnNonce"] = 1] = "TrustedOnNonce";
+        Kind[Kind["Untrusted"] = 2] = "Untrusted";
+        Kind[Kind["Unknown"] = 3] = "Unknown";
+    })(McpServerTrust.Kind || (McpServerTrust.Kind = {}));
+})(McpServerTrust || (McpServerTrust = {}));
 const isMcpResourceTemplate = (obj) => {
     return obj.template !== undefined;
 };
@@ -126,6 +140,11 @@ var McpServerLaunch;
         }
     }
     McpServerLaunch.fromSerialized = fromSerialized;
+    async function hash(launch) {
+        const nonce = await crypto.subtle.digest('SHA-256', ( new TextEncoder()).encode(JSON.stringify(launch)));
+        return encodeHex(VSBuffer.wrap(( new Uint8Array(nonce))));
+    }
+    McpServerLaunch.hash = hash;
 })(McpServerLaunch || (McpServerLaunch = {}));
 var McpConnectionState;
 (function (McpConnectionState) {
@@ -139,13 +158,13 @@ var McpConnectionState;
     McpConnectionState.toString = (s) => {
         switch (s.state) {
             case Kind.Stopped:
-                return localize(8209, 'Stopped');
+                return localize(8367, 'Stopped');
             case Kind.Starting:
-                return localize(8210, 'Starting');
+                return localize(8368, 'Starting');
             case Kind.Running:
-                return localize(8211, 'Running');
+                return localize(8369, 'Running');
             case Kind.Error:
-                return localize(8212, 'Error {0}', s.message);
+                return localize(8370, 'Error {0}', s.message);
             default:
                 assertNever();
         }
@@ -201,7 +220,7 @@ let McpServerContainers = class McpServerContainers extends Disposable {
     update(server) {
         for (const container of this.containers) {
             if (server && container.mcpServer) {
-                if (server.name === container.mcpServer.name) {
+                if (server.id === container.mcpServer.id) {
                     container.mcpServer = server;
                 }
             }
@@ -217,7 +236,6 @@ McpServerContainers = ( __decorate([
 const McpServersGalleryEnabledContext = ( new RawContextKey('mcpServersGalleryEnabled', false));
 const HasInstalledMcpServersContext = ( new RawContextKey('hasInstalledMcpServers', true));
 const InstalledMcpServersViewId = 'workbench.views.mcp.installed';
-const mcpServerIcon = registerIcon('mcp-server', Codicon.mcp, ( localize(8213, 'Icon used for the MCP server.')));
 var McpResourceURI;
 (function (McpResourceURI) {
     McpResourceURI.scheme = 'mcp-resource';
@@ -295,4 +313,4 @@ var McpToolName;
     McpToolName[McpToolName["MaxLength"] = 64] = "MaxLength";
 })(McpToolName || (McpToolName = {}));
 
-export { HasInstalledMcpServersContext, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerInstallState, McpServerLaunch, McpServerTransportType, McpServersGalleryEnabledContext, McpToolName, MpcResponseError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpPromptPrefix, mcpPromptReplaceSpecialChars, mcpServerIcon };
+export { HasInstalledMcpServersContext, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerInstallState, McpServerLaunch, McpServerTransportType, McpServerTrust, McpServersGalleryEnabledContext, McpStartServerInteraction, McpToolName, MpcResponseError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpPromptPrefix, mcpPromptReplaceSpecialChars };

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.service.d.ts

@@ -1,18 +1,24 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
+import { IMarkdownString } from "../../../../base/common/htmlContent.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IQueryOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
-import { IWorkbencMcpServerInstallOptions, IWorkbenchLocalMcpServer } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService";
+import { IWorkbenchLocalMcpServer, IWorkbencMcpServerInstallOptions } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService";
 import { IMcpServerSamplingConfiguration } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
-import { IMcpServer, LazyCollectionState, type IMcpConfigPath, type IMcpServerEditorOptions, type IMcpToolCallContext, type ISamplingOptions, type ISamplingResult, type IWorkbenchMcpServer } from "./mcpTypes.js";
+import { IMcpServer, LazyCollectionState, McpCollectionDefinition, type IMcpConfigPath, type IMcpServerEditorOptions, type IMcpToolCallContext, type ISamplingOptions, type ISamplingResult, type IWorkbenchMcpServer } from "./mcpTypes.js";
 import { MCP } from "./modelContextProtocol.js";
 export declare const IMcpService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMcpService>;
 export interface IMcpService {
     _serviceBrand: undefined;
     readonly servers: IObservable<readonly IMcpServer[]>;
     resetCaches(): void;
-    readonly lazyCollectionState: IObservable<LazyCollectionState>;
+    resetTrust(): void;
+    readonly lazyCollectionState: IObservable<{
+        state: LazyCollectionState;
+        collections: McpCollectionDefinition[];
+    }>;
+    autostart(token?: CancellationToken): Promise<void>;
     activateCollections(): Promise<void>;
 }
 export declare const IMcpWorkbenchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMcpWorkbenchService>;
@@ -21,8 +27,10 @@ export interface IMcpWorkbenchService {
     readonly onChange: Event<IWorkbenchMcpServer | undefined>;
     readonly onReset: Event<void>;
     readonly local: readonly IWorkbenchMcpServer[];
+    getEnabledLocalMcpServers(): IWorkbenchLocalMcpServer[];
     queryLocal(): Promise<IWorkbenchMcpServer[]>;
     queryGallery(options?: IQueryOptions, token?: CancellationToken): Promise<IWorkbenchMcpServer[]>;
+    canInstall(mcpServer: IWorkbenchMcpServer): true | IMarkdownString;
     install(server: IWorkbenchMcpServer, installOptions?: IWorkbencMcpServerInstallOptions): Promise<IWorkbenchMcpServer>;
     uninstall(mcpServer: IWorkbenchMcpServer): Promise<void>;
     getMcpConfigPath(arg: IWorkbenchLocalMcpServer): IMcpConfigPath | undefined;

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service.d.ts

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 export declare const IMultiDiffSourceResolverService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMultiDiffSourceResolverService>;
 export interface IMultiDiffSourceResolverService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service.d.ts

@@ -3,7 +3,7 @@ import { CodeWindow } from "../../../../../base/browser/window.js";
 import { Event } from "../../../../../base/common/event.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { type ServicesAccessor } from "../../../../../platform/instantiation/common/instantiation.js";
-import { INotebookEditorCreationOptions, INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditorCreationOptions, INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookEditorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
 import { IBorrowValue } from "./notebookEditorService.js";
 export declare const INotebookEditorService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookEditorService>;