@codingame/monaco-vscode-api 22.1.9 → 23.0.0

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.d.ts

@@ -139,8 +139,8 @@ export interface IExtensionContainer extends IDisposable {
     update(): void;
 }
 export interface IExtensionsViewState {
-    onFocus: Event<IExtension>;
-    onBlur: Event<IExtension>;
+    readonly onFocus: Event<IExtension>;
+    readonly onBlur: Event<IExtension>;
     filters: {
         featureId?: string;
     };

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js

@@ -9,7 +9,7 @@ import { ExtensionGalleryManifestStatus } from '../../../../platform/extensionMa
 import { IExtensionsWorkbenchService } from './extensions.service.js';
 
 const VIEWLET_ID = 'workbench.view.extensions';
-const EXTENSIONS_CATEGORY = ( localize2(7431, "Extensions"));
+const EXTENSIONS_CATEGORY = ( localize2(7676, "Extensions"));
 var ExtensionState;
 (function (ExtensionState) {
     ExtensionState[ExtensionState["Installing"] = 0] = "Installing";

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

@@ -1,7 +1,7 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IMarkdownString } from "../../../../base/common/htmlContent.js";
-import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
+import { IPager } from "@codingame/monaco-vscode-2eda793f-4b5b-58e8-83c5-1bfd3bad15f1-common/vscode/vs/base/common/paging";
 import { URI } from "../../../../base/common/uri.js";
 import { IQueryOptions, IExtensionInfo, IExtensionQueryOptions, InstallOptions, InstallExtensionResult } from "../../../../platform/extensionManagement/common/extensionManagement.js";
 import { ProgressLocation } from "../../../../platform/progress/common/progress.js";

package/vscode/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.js

@@ -15,12 +15,12 @@ const SearchExtensionsToolData = {
     toolReferenceName: 'extensions',
     canBeReferencedInPrompt: true,
     icon: ThemeIcon.fromId(Codicon.extensions.id),
-    displayName: ( localize(7444, 'Search Extensions')),
+    displayName: ( localize(7689, 'Search Extensions')),
     modelDescription: ( localize(
-        7445,
+        7690,
         "This is a tool for browsing Visual Studio Code Extensions Marketplace. It allows the model to search for extensions and retrieve detailed information about them. The model should use this tool whenever it needs to discover extensions or resolve information about known ones. To use the tool, the model has to provide the category of the extensions, relevant search keywords, or known extension IDs. Note that search results may include false positives, so reviewing and filtering is recommended."
     )),
-    userDescription: ( localize(7446, 'Search for VS Code extensions')),
+    userDescription: ( localize(7691, 'Search for VS Code extensions')),
     source: ToolDataSource.Internal,
     inputSchema: {
         type: 'object',
@@ -57,7 +57,7 @@ let SearchExtensionsTool = class SearchExtensionsTool {
             return {
                 content: [{
                         kind: 'text',
-                        value: ( localize(7447, 'Please provide a category or keywords or ids to search for.'))
+                        value: ( localize(7692, 'Please provide a category or keywords or ids to search for.'))
                     }]
             };
         }

package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js

@@ -13,13 +13,13 @@ const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved';
 const COPY_PATH_COMMAND_ID = 'copyFilePath';
 const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
-const SAVE_FILE_AS_LABEL = ( localize2(7638, "Save As..."));
+const SAVE_FILE_AS_LABEL = ( localize2(7883, "Save As..."));
 const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save';
-const SAVE_FILE_LABEL = ( localize2(7639, "Save"));
+const SAVE_FILE_LABEL = ( localize2(7884, "Save"));
 const SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID = 'workbench.action.files.saveWithoutFormatting';
-const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(7640, "Save without Formatting"));
+const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(7885, "Save without Formatting"));
 const SAVE_ALL_COMMAND_ID = 'saveAll';
-const SAVE_ALL_LABEL = ( localize2(7641, "Save All"));
+const SAVE_ALL_LABEL = ( localize2(7886, "Save All"));
 const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup';
 const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles';
 const OpenEditorsGroupContext = ( new RawContextKey('groupFocusedInOpenEditors', false));
@@ -28,13 +28,13 @@ const OpenEditorsReadonlyEditorContext = ( new RawContextKey('readonlyEditorFocu
 const OpenEditorsSelectedFileOrUntitledContext = ( new RawContextKey('openEditorsSelectedFileOrUntitled', true));
 const ResourceSelectedForCompareContext = ( new RawContextKey('resourceSelectedForCompare', false));
 const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
-const REMOVE_ROOT_FOLDER_LABEL = ( localize(7642, "Remove Folder from Workspace"));
+const REMOVE_ROOT_FOLDER_LABEL = ( localize(7887, "Remove Folder from Workspace"));
 const PREVIOUS_COMPRESSED_FOLDER = 'previousCompressedFolder';
 const NEXT_COMPRESSED_FOLDER = 'nextCompressedFolder';
 const FIRST_COMPRESSED_FOLDER = 'firstCompressedFolder';
 const LAST_COMPRESSED_FOLDER = 'lastCompressedFolder';
 const NEW_UNTITLED_FILE_COMMAND_ID = 'workbench.action.files.newUntitledFile';
-const NEW_UNTITLED_FILE_LABEL = ( localize2(7643, "New Untitled Text File"));
+const NEW_UNTITLED_FILE_LABEL = ( localize2(7888, "New Untitled Text File"));
 const NEW_FILE_COMMAND_ID = 'workbench.action.files.newFile';
 
 export { COMPARE_RESOURCE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_FILE_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEXT_COMPRESSED_FOLDER, OPEN_TO_SIDE_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, OpenEditorsSelectedFileOrUntitledContext, PREVIOUS_COMPRESSED_FOLDER, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, REVEAL_IN_EXPLORER_COMMAND_ID, REVERT_FILE_COMMAND_ID, ResourceSelectedForCompareContext, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_ALL_LABEL, SAVE_FILES_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SELECT_FOR_COMPARE_COMMAND_ID };

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

@@ -2,9 +2,9 @@ import { URI } from "../../../../base/common/uri.js";
 import { ResourceFileEdit } from "../../../../editor/browser/services/bulkEditService.js";
 import { ProgressLocation } from "../../../../platform/progress/common/progress.js";
 import { IEditableData } from "../../../common/views.js";
-import { ExplorerItem } from "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common/vscode/vs/workbench/contrib/files/common/explorerModel";
+import { ExplorerItem } from "@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common/vscode/vs/workbench/contrib/files/common/explorerModel";
 import { ISortOrderConfiguration } from "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common/vscode/vs/workbench/contrib/files/common/files";
-import { IExplorerView } from "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common/vscode/vs/workbench/contrib/files/browser/files";
+import { IExplorerView } from "@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common/vscode/vs/workbench/contrib/files/browser/files";
 export interface IExplorerService {
     readonly _serviceBrand: undefined;
     readonly roots: ExplorerItem[];

package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js

@@ -32,8 +32,8 @@ let DefaultFoldingRangeProvider = class DefaultFoldingRangeProvider extends Disp
         DefaultFoldingRangeProvider_1.extensionItemLabels.length = 0;
         DefaultFoldingRangeProvider_1.extensionDescriptions.length = 0;
         DefaultFoldingRangeProvider_1.extensionIds.push(null);
-        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( localize(7842, 'All')));
-        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( localize(7843, "All active folding range providers")));
+        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( localize(8087, 'All')));
+        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( localize(8088, "All active folding range providers")));
         const languageExtensions = [];
         const otherExtensions = [];
         for (const extension of this._extensionService.extensions) {
@@ -75,7 +75,7 @@ DefaultFoldingRangeProvider = DefaultFoldingRangeProvider_1 = ( __decorate([
     properties: {
         [DefaultFoldingRangeProvider.configName]: {
             description: ( localize(
-                7844,
+                8089,
                 "Defines a default folding range provider that takes precedence over all other folding range providers. Must be the identifier of an extension contributing a folding range provider."
             )),
             type: ['string', 'null'],

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(7845, 'None')));
-        DefaultFormatter_1.extensionDescriptions.push(( localize(7846, "None")));
+        DefaultFormatter_1.extensionItemLabels.push(( localize(8090, 'None')));
+        DefaultFormatter_1.extensionDescriptions.push(( localize(8091, "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(
-                    7847,
+                    8092,
                     "Extension '{0}' is configured as formatter but it cannot format '{1}'-files",
                     extension.displayName || extension.name,
                     langName
                 ))
                     : ( localize(
-                    7848,
+                    8093,
                     "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(
-            7849,
+            8094,
             "There are multiple formatters for '{0}' files. One of them should be configured as default formatter.",
             DefaultFormatter_1._maybeQuotes(langName)
         ))
             : ( localize(
-            7850,
+            8095,
             "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(7851, "Configure Default Formatter")),
+                message: ( localize(8096, "Configure Default Formatter")),
                 detail: formatterOrMessage,
-                primaryButton: ( localize(7852, "&&Configure..."))
+                primaryButton: ( localize(8097, "&&Configure..."))
             });
             if (confirmed) {
                 return this._pickAndPersistDefaultFormatter(formatter, document);
             }
         }
         else {
-            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(7853, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
+            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(8098, "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(
-            7854,
+            8099,
             "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(7855, "Configure...")) };
+            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(8100, "Configure...")) };
             this._languageStatusStore.add(CommandsRegistry.registerCommand(command.id, () => this._pickAndPersistDefaultFormatter(formatter, document)));
             this._languageStatusStore.add(this._languageStatusService.addStatus({
                 id: 'formatter.conflict',
-                name: ( localize(7856, "Formatter Conflicts")),
+                name: ( localize(8101, "Formatter Conflicts")),
                 selector: { language: document.getLanguageId(), pattern: document.uri.fsPath },
                 severity: Severity$1.Error,
-                label: ( localize(7857, "Formatting")),
+                label: ( localize(8102, "Formatting")),
                 detail: result,
                 busy: false,
                 source: '',
@@ -237,7 +237,7 @@ DefaultFormatter = DefaultFormatter_1 = ( __decorate([
     properties: {
         [DefaultFormatter.configName]: {
             description: ( localize(
-                7858,
+                8103,
                 "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(7859, "(default)")) : undefined,
+            description: isDefault ? ( localize(8104, "(default)")) : undefined,
         };
         if (isDefault) {
             defaultFormatterPick = pick;
@@ -268,10 +268,10 @@ async function showFormatterPick(accessor, model, formatters) {
         return pick;
     }));
     const configurePick = {
-        label: ( localize(7860, "Configure Default Formatter..."))
+        label: ( localize(8105, "Configure Default Formatter..."))
     };
     const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], {
-        placeHolder: ( localize(7861, "Select a formatter")),
+        placeHolder: ( localize(8106, "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(
-            7854,
+            8099,
             "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(7862, "Format Document With...")),
+            label: ( localize(8107, "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(7863, "Format Selection With...")),
+            label: ( localize(8108, "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(7864, "Format Document")),
+            label: ( localize2(8109, "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(7865, "This file cannot be formatted because it is too large")));
+            notificationService.warn(( localize(8110, "This file cannot be formatted because it is too large")));
         }
         else {
             const langName = model.getLanguageId();
-            const message = ( localize(7866, "There is no formatter for '{0}' files installed.", langName));
+            const message = ( localize(8111, "There is no formatter for '{0}' files installed.", langName));
             const { confirmed } = await dialogService.confirm({
                 message,
-                primaryButton: ( localize(7867, "&&Install Formatter..."))
+                primaryButton: ( localize(8112, "&&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(7868, "Format Modified Lines")),
+            label: ( localize2(8113, "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(7869, "Whether the current line and its inlay hints are currently focused")) }
+        { type: 'boolean', description: ( localize(8114, "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(7870, "Code with Inlay Hint Information")));
+        this._ariaElement.setAttribute('aria-description', ( localize(8115, "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(7871, "Read Line with Inlay Hints")),
+            title: ( localize2(8116, "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(7872, "Stop Inlay Hints Reading")),
+            title: ( localize2(8117, "Stop Inlay Hints Reading")),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {

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

@@ -1,20 +1,19 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IObservable } from "../../../../base/common/observable.js";
 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-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
-import { IInlineChatSessionEvent, IInlineChatSessionEndEvent, ISessionKeyComputer, IInlineChatSession2 } from "./inlineChatSessionService.js";
+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 "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService";
 export declare const IInlineChatSessionService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IInlineChatSessionService>;
 export interface IInlineChatSessionService {
     _serviceBrand: undefined;
-    onWillStartSession: Event<IActiveCodeEditor>;
-    onDidMoveSession: Event<IInlineChatSessionEvent>;
-    onDidStashSession: Event<IInlineChatSessionEvent>;
-    onDidEndSession: Event<IInlineChatSessionEndEvent>;
+    readonly onWillStartSession: Event<IActiveCodeEditor>;
+    readonly onDidMoveSession: Event<IInlineChatSessionEvent>;
+    readonly onDidStashSession: Event<IInlineChatSessionEvent>;
+    readonly onDidEndSession: Event<IInlineChatSessionEndEvent>;
     createSession(editor: IActiveCodeEditor, options: {
         wholeRange?: IRange;
         session?: Session;
@@ -27,8 +26,8 @@ export interface IInlineChatSessionService {
     stashSession(session: Session, editor: ICodeEditor, undoCancelEdits: IValidEditOperation[]): StashedSession;
     registerSessionKeyComputer(scheme: string, value: ISessionKeyComputer): IDisposable;
     dispose(): void;
-    hideOnRequest: IObservable<boolean>;
     createSession2(editor: ICodeEditor, uri: URI, token: CancellationToken): Promise<IInlineChatSession2>;
     getSession2(uri: URI): IInlineChatSession2 | undefined;
-    onDidChangeSessions: Event<this>;
+    getSession2(sessionId: string): IInlineChatSession2 | undefined;
+    readonly onDidChangeSessions: Event<this>;
 }

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.service.d.ts

@@ -3,12 +3,12 @@ import { URI } from "../../../../base/common/uri.js";
 export declare const IInteractiveDocumentService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IInteractiveDocumentService>;
 export interface IInteractiveDocumentService {
     readonly _serviceBrand: undefined;
-    onWillAddInteractiveDocument: Event<{
+    readonly onWillAddInteractiveDocument: Event<{
         notebookUri: URI;
         inputUri: URI;
         languageId: string;
     }>;
-    onWillRemoveInteractiveDocument: Event<{
+    readonly onWillRemoveInteractiveDocument: Event<{
         notebookUri: URI;
         inputUri: URI;
     }>;

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(8095, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(8096, "List")), original: 'List' },
+            title: { value: ( localize(8350, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(8351, "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(8097, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(8352, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(8098, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(8353, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                8099,
+                8354,
                 "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(8100, "Please enter an integer.");
+            return localize(8355, "Please enter an integer.");
         }
         else if (percentage < 0 || percentage > 100) {
             return localize(
-                8101,
+                8356,
                 "Please enter a number greater than 0 and less than or equal to 100."
             );
         }

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

@@ -1,6 +1,8 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { IMarkdownString } from "../../../../base/common/htmlContent.js";
 import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable, ObservableMap } from "../../../../base/common/observable.js";
+import Severity from "../../../../base/common/severity.js";
 import { URI, UriComponents } from "../../../../base/common/uri.js";
 import { Location } from "../../../../editor/common/languages.js";
 import { ConfigurationTarget } from "../../../../platform/configuration/common/configuration.js";
@@ -95,6 +97,8 @@ export interface McpServerDefinition {
     readonly cacheNonce: string;
     /** Dev mode configuration for the server */
     readonly devMode?: IMcpDevModeConfig;
+    /** Static description of server tools/data, used to hydrate the cache. */
+    readonly staticMetadata?: McpServerStaticMetadata;
     readonly presentation?: {
         /** Sort order of the definition. */
         readonly order?: number;
@@ -102,6 +106,21 @@ export interface McpServerDefinition {
         readonly origin?: Location;
     };
 }
+export declare enum McpServerStaticToolAvailability {
+    /** Tool is expected to be present as soon as the server is started. */
+    Initial = 0,
+    /** Tool may be present later. */
+    Dynamic = 1
+}
+export interface McpServerStaticMetadata {
+    tools?: {
+        availability: McpServerStaticToolAvailability;
+        definition: MCP.Tool;
+    }[];
+    instructions?: string;
+    capabilities?: MCP.ServerCapabilities;
+    serverInfo?: MCP.Implementation;
+}
 export declare namespace McpServerDefinition {
     interface Serialized {
         readonly id: string;
@@ -109,6 +128,7 @@ export declare namespace McpServerDefinition {
         readonly cacheNonce: string;
         readonly launch: McpServerLaunch.Serialized;
         readonly variableReplacement?: McpServerDefinitionVariableReplacement.Serialized;
+        readonly staticMetadata?: McpServerStaticMetadata;
     }
     function toSerialized(def: McpServerDefinition): McpServerDefinition.Serialized;
     function fromSerialized(def: McpServerDefinition.Serialized): McpServerDefinition;
@@ -132,13 +152,17 @@ export declare namespace McpServerDefinitionVariableReplacement {
     function toSerialized(def: McpServerDefinitionVariableReplacement): McpServerDefinitionVariableReplacement.Serialized;
     function fromSerialized(def: McpServerDefinitionVariableReplacement.Serialized): McpServerDefinitionVariableReplacement;
 }
+/** An observable of the auto-starting servers. When 'starting' is empty, the operation is complete. */
 export interface IAutostartResult {
-    serversRequiringInteraction: Array<{
-        serverId: string;
-        serverLabel: string;
+    working: boolean;
+    starting: McpDefinitionReference[];
+    serversRequiringInteraction: Array<McpDefinitionReference & {
         errorMessage?: string;
     }>;
 }
+export declare namespace IAutostartResult {
+    const Empty: IAutostartResult;
+}
 export declare enum LazyCollectionState {
     HasUnknown = 0,
     LoadingUnknown = 1,
@@ -470,8 +494,9 @@ export interface IMcpServerEditorOptions extends IEditorOptions {
     sideByside?: boolean;
 }
 export declare enum McpServerEnablementState {
-    DisabledByAccess = 0,
-    Enabled = 1
+    Disabled = 0,
+    DisabledByAccess = 1,
+    Enabled = 2
 }
 export declare enum McpServerInstallState {
     Installing = 0,
@@ -484,12 +509,19 @@ export declare enum McpServerEditorTab {
     Manifest = "manifest",
     Configuration = "configuration"
 }
+export type McpServerEnablementStatus = {
+    readonly state: McpServerEnablementState;
+    readonly message?: {
+        readonly severity: Severity;
+        readonly text: IMarkdownString;
+    };
+};
 export interface IWorkbenchMcpServer {
     readonly gallery: IGalleryMcpServer | undefined;
     readonly local: IWorkbenchLocalMcpServer | undefined;
     readonly installable: IInstallableMcpServer | undefined;
     readonly installState: McpServerInstallState;
-    readonly enablementState: McpServerEnablementState;
+    readonly runtimeStatus: McpServerEnablementStatus | undefined;
     readonly id: string;
     readonly name: string;
     readonly label: string;
@@ -503,7 +535,6 @@ export interface IWorkbenchMcpServer {
     readonly publisherDisplayName?: string;
     readonly starsCount?: number;
     readonly license?: string;
-    readonly url?: string;
     readonly repository?: string;
     readonly config?: IMcpServerConfiguration | undefined;
     readonly readmeUrl?: URI;
@@ -567,5 +598,8 @@ export interface IMcpToolResourceLinkContents {
 }
 export interface IMcpIcons {
     /** Gets the image URI appropriate to the approximate display size */
-    getUrl(size: number): URI | undefined;
+    getUrl(size: number): {
+        dark: URI;
+        light?: URI;
+    } | undefined;
 }

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

@@ -38,6 +38,11 @@ var McpCollectionDefinition;
     }
     McpCollectionDefinition.equals = equals;
 })(McpCollectionDefinition || (McpCollectionDefinition = {}));
+var McpServerStaticToolAvailability;
+(function (McpServerStaticToolAvailability) {
+    McpServerStaticToolAvailability[McpServerStaticToolAvailability["Initial"] = 0] = "Initial";
+    McpServerStaticToolAvailability[McpServerStaticToolAvailability["Dynamic"] = 1] = "Dynamic";
+})(McpServerStaticToolAvailability || (McpServerStaticToolAvailability = {}));
 var McpServerDefinition;
 (function (McpServerDefinition) {
     function toSerialized(def) {
@@ -49,6 +54,7 @@ var McpServerDefinition;
             id: def.id,
             label: def.label,
             cacheNonce: def.cacheNonce,
+            staticMetadata: def.staticMetadata,
             launch: McpServerLaunch.fromSerialized(def.launch),
             variableReplacement: def.variableReplacement ? McpServerDefinitionVariableReplacement.fromSerialized(def.variableReplacement) : undefined,
         };
@@ -80,6 +86,10 @@ var McpServerDefinitionVariableReplacement;
     }
     McpServerDefinitionVariableReplacement.fromSerialized = fromSerialized;
 })(McpServerDefinitionVariableReplacement || (McpServerDefinitionVariableReplacement = {}));
+var IAutostartResult;
+(function (IAutostartResult) {
+    IAutostartResult.Empty = { working: false, starting: [], serversRequiringInteraction: [] };
+})(IAutostartResult || (IAutostartResult = {}));
 var LazyCollectionState;
 (function (LazyCollectionState) {
     LazyCollectionState[LazyCollectionState["HasUnknown"] = 0] = "HasUnknown";
@@ -159,13 +169,13 @@ var McpConnectionState;
     McpConnectionState.toString = (s) => {
         switch (s.state) {
             case Kind.Stopped:
-                return localize(8627, 'Stopped');
+                return localize(8884, 'Stopped');
             case Kind.Starting:
-                return localize(8628, 'Starting');
+                return localize(8885, 'Starting');
             case Kind.Running:
-                return localize(8629, 'Running');
+                return localize(8886, 'Running');
             case Kind.Error:
-                return localize(8630, 'Error {0}', s.message);
+                return localize(8887, 'Error {0}', s.message);
             default:
                 assertNever();
         }
@@ -208,8 +218,9 @@ class UserInteractionRequiredError extends Error {
 }
 var McpServerEnablementState;
 (function (McpServerEnablementState) {
-    McpServerEnablementState[McpServerEnablementState["DisabledByAccess"] = 0] = "DisabledByAccess";
-    McpServerEnablementState[McpServerEnablementState["Enabled"] = 1] = "Enabled";
+    McpServerEnablementState[McpServerEnablementState["Disabled"] = 0] = "Disabled";
+    McpServerEnablementState[McpServerEnablementState["DisabledByAccess"] = 1] = "DisabledByAccess";
+    McpServerEnablementState[McpServerEnablementState["Enabled"] = 2] = "Enabled";
 })(McpServerEnablementState || (McpServerEnablementState = {}));
 var McpServerInstallState;
 (function (McpServerInstallState) {
@@ -330,4 +341,4 @@ var McpToolName;
 })(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, McpToolResourceLinkMimeType, MpcResponseError, UserInteractionRequiredError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpPromptPrefix, mcpPromptReplaceSpecialChars };
+export { HasInstalledMcpServersContext, IAutostartResult, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerEnablementState, McpServerInstallState, McpServerLaunch, McpServerStaticToolAvailability, McpServerTransportType, McpServerTrust, McpServersGalleryStatusContext, McpStartServerInteraction, McpToolName, McpToolResourceLinkMimeType, MpcResponseError, UserInteractionRequiredError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpPromptPrefix, mcpPromptReplaceSpecialChars };