@codingame/monaco-vscode-api 21.6.0 → 22.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(7776, 'None')));
-        DefaultFormatter_1.extensionDescriptions.push(( localize(7777, "None")));
+        DefaultFormatter_1.extensionItemLabels.push(( localize(7845, 'None')));
+        DefaultFormatter_1.extensionDescriptions.push(( localize(7846, "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(
-                    7778,
+                    7847,
                     "Extension '{0}' is configured as formatter but it cannot format '{1}'-files",
                     extension.displayName || extension.name,
                     langName
                 ))
                     : ( localize(
-                    7779,
+                    7848,
                     "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(
-            7780,
+            7849,
             "There are multiple formatters for '{0}' files. One of them should be configured as default formatter.",
             DefaultFormatter_1._maybeQuotes(langName)
         ))
             : ( localize(
-            7781,
+            7850,
             "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(7782, "Configure Default Formatter")),
+                message: ( localize(7851, "Configure Default Formatter")),
                 detail: formatterOrMessage,
-                primaryButton: ( localize(7783, "&&Configure..."))
+                primaryButton: ( localize(7852, "&&Configure..."))
             });
             if (confirmed) {
                 return this._pickAndPersistDefaultFormatter(formatter, document);
             }
         }
         else {
-            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(7784, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
+            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(7853, "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(
-            7785,
+            7854,
             "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(7786, "Configure...")) };
+            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(7855, "Configure...")) };
             this._languageStatusStore.add(CommandsRegistry.registerCommand(command.id, () => this._pickAndPersistDefaultFormatter(formatter, document)));
             this._languageStatusStore.add(this._languageStatusService.addStatus({
                 id: 'formatter.conflict',
-                name: ( localize(7787, "Formatter Conflicts")),
+                name: ( localize(7856, "Formatter Conflicts")),
                 selector: { language: document.getLanguageId(), pattern: document.uri.fsPath },
                 severity: Severity$1.Error,
-                label: ( localize(7788, "Formatting")),
+                label: ( localize(7857, "Formatting")),
                 detail: result,
                 busy: false,
                 source: '',
@@ -237,7 +237,7 @@ DefaultFormatter = DefaultFormatter_1 = ( __decorate([
     properties: {
         [DefaultFormatter.configName]: {
             description: ( localize(
-                7789,
+                7858,
                 "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(7790, "(default)")) : undefined,
+            description: isDefault ? ( localize(7859, "(default)")) : undefined,
         };
         if (isDefault) {
             defaultFormatterPick = pick;
@@ -268,10 +268,10 @@ async function showFormatterPick(accessor, model, formatters) {
         return pick;
     }));
     const configurePick = {
-        label: ( localize(7791, "Configure Default Formatter..."))
+        label: ( localize(7860, "Configure Default Formatter..."))
     };
     const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], {
-        placeHolder: ( localize(7792, "Select a formatter")),
+        placeHolder: ( localize(7861, "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(
-            7785,
+            7854,
             "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(7793, "Format Document With...")),
+            label: ( localize(7862, "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(7794, "Format Selection With...")),
+            label: ( localize(7863, "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(7795, "Format Document")),
+            label: ( localize2(7864, "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(7796, "This file cannot be formatted because it is too large")));
+            notificationService.warn(( localize(7865, "This file cannot be formatted because it is too large")));
         }
         else {
             const langName = model.getLanguageId();
-            const message = ( localize(7797, "There is no formatter for '{0}' files installed.", langName));
+            const message = ( localize(7866, "There is no formatter for '{0}' files installed.", langName));
             const { confirmed } = await dialogService.confirm({
                 message,
-                primaryButton: ( localize(7798, "&&Install Formatter..."))
+                primaryButton: ( localize(7867, "&&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(7799, "Format Modified Lines")),
+            label: ( localize2(7868, "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(7800, "Whether the current line and its inlay hints are currently focused")) }
+        { type: 'boolean', description: ( localize(7869, "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(7801, "Code with Inlay Hint Information")));
+        this._ariaElement.setAttribute('aria-description', ( localize(7870, "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(7802, "Read Line with Inlay Hints")),
+            title: ( localize2(7871, "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(7803, "Stop Inlay Hints Reading")),
+            title: ( localize2(7872, "Stop Inlay Hints Reading")),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {

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(8023, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(8024, "List")), original: 'List' },
+            title: { value: ( localize(8095, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(8096, "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(8025, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(8097, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(8026, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(8098, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                8027,
+                8099,
                 "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(8028, "Please enter an integer.");
+            return localize(8100, "Please enter an integer.");
         }
         else if (percentage < 0 || percentage > 100) {
             return localize(
-                8029,
+                8101,
                 "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

@@ -20,7 +20,10 @@ export interface IMcpHostDelegate {
     readonly priority: number;
     waitForInitialProviderPromises(): Promise<void>;
     canStart(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition): boolean;
-    start(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition, resolvedLaunch: McpServerLaunch): IMcpMessageTransport;
+    substituteVariables(serverDefinition: McpServerDefinition, launch: McpServerLaunch): Promise<McpServerLaunch>;
+    start(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition, resolvedLaunch: McpServerLaunch, options?: {
+        errorOnUserInteraction?: boolean;
+    }): IMcpMessageTransport;
 }
 export interface IMcpResolveConnectionOptions {
     logger: ILogger;
@@ -45,4 +48,6 @@ export interface IMcpResolveConnectionOptions {
     autoTrustChanges?: boolean;
     /** If set, try to launch with debugging when dev mode is configured */
     debug?: boolean;
+    /** If true, throw an error if any user interaction would be required during startup. */
+    errorOnUserInteraction?: boolean;
 }

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

@@ -132,6 +132,13 @@ export declare namespace McpServerDefinitionVariableReplacement {
     function toSerialized(def: McpServerDefinitionVariableReplacement): McpServerDefinitionVariableReplacement.Serialized;
     function fromSerialized(def: McpServerDefinitionVariableReplacement.Serialized): McpServerDefinitionVariableReplacement;
 }
+export interface IAutostartResult {
+    serversRequiringInteraction: Array<{
+        serverId: string;
+        serverLabel: string;
+        errorMessage?: string;
+    }>;
+}
 export declare enum LazyCollectionState {
     HasUnknown = 0,
     LoadingUnknown = 1,
@@ -174,6 +181,11 @@ export interface IMcpServerStartOpts {
     debug?: boolean;
     /** Correlate multiple interactions such that any trust prompts are presented in combination. */
     interaction?: McpStartServerInteraction;
+    /**
+     * If true, throw an error if any user interaction would be required during startup.
+     * This includes variable resolution, trust prompts, and authentication prompts.
+     */
+    errorOnUserInteraction?: boolean;
 }
 export declare namespace McpServerTrust {
     enum Kind {
@@ -195,6 +207,7 @@ export interface IMcpServer extends IDisposable {
     readonly serverMetadata: IObservable<{
         serverName?: string;
         serverInstructions?: string;
+        icons: IMcpIcons;
     } | undefined>;
     /**
      * Full definition as it exists in the MCP registry. Unlike the references
@@ -240,6 +253,7 @@ export interface IMcpResource {
     readonly description?: string;
     readonly mimeType?: string;
     readonly sizeInBytes?: number;
+    readonly icons: IMcpIcons;
 }
 export interface IMcpResourceTemplate {
     readonly name: string;
@@ -247,6 +261,7 @@ export interface IMcpResourceTemplate {
     readonly description?: string;
     readonly mimeType?: string;
     readonly template: UriTemplate;
+    readonly icons: IMcpIcons;
     /** Gets string completions for the given template part. */
     complete(templatePart: string, prefix: string, alreadyResolved: Record<string, string | string[]>, token: CancellationToken): Promise<string[]>;
     /** Gets the resolved URI from template parts. */
@@ -290,6 +305,7 @@ export interface IMcpTool {
     readonly id: string;
     /** Name for #referencing in chat */
     readonly referenceName: string;
+    readonly icons: IMcpIcons;
     readonly definition: MCP.Tool;
     /**
      * Calls a tool
@@ -404,6 +420,7 @@ export declare namespace McpConnectionState {
     const isRunning: (s: McpConnectionState) => boolean;
     interface Stopped {
         readonly state: Kind.Stopped;
+        readonly reason?: "needs-user-interaction";
     }
     interface Starting {
         readonly state: Kind.Starting;
@@ -426,6 +443,12 @@ export declare class MpcResponseError extends Error {
 }
 export declare class McpConnectionFailedError extends Error {
 }
+export declare class UserInteractionRequiredError extends Error {
+    readonly reason: string;
+    private static readonly prefix;
+    static is(error: Error): boolean;
+    constructor(reason: string);
+}
 export interface IMcpConfigPath {
     id: string;
     key: "userLocalValue" | "userRemoteValue" | "workspaceValue" | "workspaceFolderValue";
@@ -479,6 +502,7 @@ export interface IWorkbenchMcpServer {
     readonly publisherUrl?: string;
     readonly publisherDisplayName?: string;
     readonly starsCount?: number;
+    readonly license?: string;
     readonly url?: string;
     readonly repository?: string;
     readonly config?: IMcpServerConfiguration | undefined;
@@ -536,3 +560,12 @@ export declare enum McpToolName {
     MaxPrefixLen = 18,
     MaxLength = 64
 }
+export declare const McpToolResourceLinkMimeType = "application/vnd.code.resource-link";
+export interface IMcpToolResourceLinkContents {
+    uri: UriComponents;
+    underlyingMimeType?: string;
+}
+export interface IMcpIcons {
+    /** Gets the image URI appropriate to the approximate display size */
+    getUrl(size: number): URI | undefined;
+}

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

@@ -159,13 +159,13 @@ var McpConnectionState;
     McpConnectionState.toString = (s) => {
         switch (s.state) {
             case Kind.Stopped:
-                return localize(8537, 'Stopped');
+                return localize(8627, 'Stopped');
             case Kind.Starting:
-                return localize(8538, 'Starting');
+                return localize(8628, 'Starting');
             case Kind.Running:
-                return localize(8539, 'Running');
+                return localize(8629, 'Running');
             case Kind.Error:
-                return localize(8540, 'Error {0}', s.message);
+                return localize(8630, 'Error {0}', s.message);
             default:
                 assertNever();
         }
@@ -196,6 +196,16 @@ class MpcResponseError extends Error {
 }
 class McpConnectionFailedError extends Error {
 }
+class UserInteractionRequiredError extends Error {
+    static { this.prefix = 'User interaction required: '; }
+    static is(error) {
+        return error.message.startsWith(this.prefix);
+    }
+    constructor(reason) {
+        super(`${UserInteractionRequiredError.prefix}${reason}`);
+        this.reason = reason;
+    }
+}
 var McpServerEnablementState;
 (function (McpServerEnablementState) {
     McpServerEnablementState[McpServerEnablementState["DisabledByAccess"] = 0] = "DisabledByAccess";
@@ -318,5 +328,6 @@ var McpToolName;
     McpToolName[McpToolName["MaxPrefixLen"] = 18] = "MaxPrefixLen";
     McpToolName[McpToolName["MaxLength"] = 64] = "MaxLength";
 })(McpToolName || (McpToolName = {}));
+const McpToolResourceLinkMimeType = 'application/vnd.code.resource-link';
 
-export { HasInstalledMcpServersContext, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerEnablementState, McpServerInstallState, McpServerLaunch, McpServerTransportType, McpServerTrust, McpServersGalleryStatusContext, McpStartServerInteraction, McpToolName, MpcResponseError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpPromptPrefix, mcpPromptReplaceSpecialChars };
+export { HasInstalledMcpServersContext, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerEnablementState, McpServerInstallState, McpServerLaunch, McpServerTransportType, McpServerTrust, McpServersGalleryStatusContext, McpStartServerInteraction, McpToolName, McpToolResourceLinkMimeType, MpcResponseError, UserInteractionRequiredError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpPromptPrefix, mcpPromptReplaceSpecialChars };

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

@@ -7,7 +7,7 @@ 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 { 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, McpCollectionDefinition, type IMcpConfigPath, type IMcpServerEditorOptions, type IMcpToolCallContext, type ISamplingOptions, type ISamplingResult, type IWorkbenchMcpServer } from "./mcpTypes.js";
+import { IMcpServer, LazyCollectionState, McpCollectionDefinition, IAutostartResult, type IMcpConfigPath, type IMcpServerEditorOptions, type IWorkbenchMcpServer, type ISamplingOptions, type ISamplingResult, type IMcpToolCallContext } from "./mcpTypes.js";
 import { MCP } from "./modelContextProtocol.js";
 export declare const IMcpService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMcpService>;
 export interface IMcpService {
@@ -23,7 +23,7 @@ export interface IMcpService {
         collections: McpCollectionDefinition[];
     }>;
     /** Auto-starts pending servers based on user settings. */
-    autostart(token?: CancellationToken): Promise<void>;
+    autostart(token?: CancellationToken): Promise<IAutostartResult>;
     /** Activatese extensions and runs their MCP servers. */
     activateCollections(): Promise<void>;
 }