@codingame/monaco-vscode-api 18.4.0 → 19.0.1

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.d.ts

@@ -18,6 +18,9 @@ declare const _allApiProposals: {
     authLearnMore: {
         proposal: string;
     };
+    authProviderSpecific: {
+        proposal: string;
+    };
     authSession: {
         proposal: string;
     };
@@ -213,9 +216,6 @@ declare const _allApiProposals: {
     inlineCompletionsAdditions: {
         proposal: string;
     };
-    inlineEdit: {
-        proposal: string;
-    };
     interactive: {
         proposal: string;
     };
@@ -298,6 +298,9 @@ declare const _allApiProposals: {
     quickPickSortByLabel: {
         proposal: string;
     };
+    remoteCodingAgents: {
+        proposal: string;
+    };
     resolvers: {
         proposal: string;
     };
@@ -370,6 +373,9 @@ declare const _allApiProposals: {
     testRelatedCode: {
         proposal: string;
     };
+    textDocumentChangeReason: {
+        proposal: string;
+    };
     textEditorDiffInformation: {
         proposal: string;
     };

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js

@@ -20,6 +20,9 @@ const _allApiProposals = {
     authLearnMore: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authLearnMore.d.ts',
     },
+    authProviderSpecific: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authProviderSpecific.d.ts',
+    },
     authSession: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
     },
@@ -215,9 +218,6 @@ const _allApiProposals = {
     inlineCompletionsAdditions: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
     },
-    inlineEdit: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineEdit.d.ts',
-    },
     interactive: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
     },
@@ -300,6 +300,9 @@ const _allApiProposals = {
     quickPickSortByLabel: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
     },
+    remoteCodingAgents: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.remoteCodingAgents.d.ts',
+    },
     resolvers: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
     },
@@ -372,6 +375,9 @@ const _allApiProposals = {
     testRelatedCode: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testRelatedCode.d.ts',
     },
+    textDocumentChangeReason: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textDocumentChangeReason.d.ts',
+    },
     textEditorDiffInformation: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts',
     },

package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js

@@ -206,7 +206,7 @@ class HTMLFileSystemProvider extends Disposable {
                 await this.delete(from, { recursive: false, useTrash: false, atomic: false });
             }
             else {
-                throw this.createFileSystemProviderError(from, ( localize(1849, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
+                throw this.createFileSystemProviderError(from, ( localize(1861, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
             }
         }
         catch (error) {
@@ -382,7 +382,7 @@ class HTMLFileSystemProvider extends Disposable {
         }
         let code = FileSystemProviderErrorCode.Unknown;
         if (error.name === 'NotAllowedError') {
-            error = ( new Error(( localize(1850, "Insufficient permissions. Please retry and allow the operation."))));
+            error = ( new Error(( localize(1862, "Insufficient permissions. Please retry and allow the operation."))));
             code = FileSystemProviderErrorCode.Unavailable;
         }
         return createFileSystemProviderError(error, code);

package/vscode/src/vs/platform/files/common/files.d.ts

@@ -100,7 +100,8 @@ export declare enum FileSystemProviderCapabilities {
     FileAtomicRead = 16384,
     FileAtomicWrite = 32768,
     FileAtomicDelete = 65536,
-    FileClone = 131072
+    FileClone = 131072,
+    FileRealpath = 262144
 }
 export interface IFileSystemProvider {
     readonly capabilities: FileSystemProviderCapabilities;
@@ -139,6 +140,10 @@ export interface IFileSystemProviderWithFileCloneCapability extends IFileSystemP
     cloneFile(from: URI, to: URI): Promise<void>;
 }
 export declare function hasFileCloneCapability(provider: IFileSystemProvider): provider is IFileSystemProviderWithFileCloneCapability;
+export interface IFileSystemProviderWithFileRealpathCapability extends IFileSystemProvider {
+    realpath(resource: URI): Promise<string>;
+}
+export declare function hasFileRealpathCapability(provider: IFileSystemProvider): provider is IFileSystemProviderWithFileRealpathCapability;
 export interface IFileSystemProviderWithOpenReadWriteCloseCapability extends IFileSystemProvider {
     open(resource: URI, opts: IFileOpenOptions): Promise<number>;
     close(fd: number): Promise<void>;

package/vscode/src/vs/platform/files/common/files.js

@@ -42,6 +42,7 @@ var FileSystemProviderCapabilities;
     FileSystemProviderCapabilities[FileSystemProviderCapabilities["FileAtomicWrite"] = 32768] = "FileAtomicWrite";
     FileSystemProviderCapabilities[FileSystemProviderCapabilities["FileAtomicDelete"] = 65536] = "FileAtomicDelete";
     FileSystemProviderCapabilities[FileSystemProviderCapabilities["FileClone"] = 131072] = "FileClone";
+    FileSystemProviderCapabilities[FileSystemProviderCapabilities["FileRealpath"] = 262144] = "FileRealpath";
 })(FileSystemProviderCapabilities || (FileSystemProviderCapabilities = {}));
 function hasReadWriteCapability(provider) {
     return !!(provider.capabilities & FileSystemProviderCapabilities.FileReadWrite);
@@ -52,6 +53,9 @@ function hasFileFolderCopyCapability(provider) {
 function hasFileCloneCapability(provider) {
     return !!(provider.capabilities & FileSystemProviderCapabilities.FileClone);
 }
+function hasFileRealpathCapability(provider) {
+    return !!(provider.capabilities & FileSystemProviderCapabilities.FileRealpath);
+}
 function hasOpenReadWriteCloseCapability(provider) {
     return !!(provider.capabilities & FileSystemProviderCapabilities.FileOpenReadWriteClose);
 }
@@ -105,7 +109,7 @@ function createFileSystemProviderError(error, code) {
 }
 function ensureFileSystemProviderError(error) {
     if (!error) {
-        return createFileSystemProviderError(( localize(1883, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
+        return createFileSystemProviderError(( localize(1895, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
     }
     return error;
 }
@@ -374,18 +378,18 @@ class ByteSize {
             size = 0;
         }
         if (size < ByteSize.KB) {
-            return localize(1884, "{0}B", size.toFixed(0));
+            return localize(1896, "{0}B", size.toFixed(0));
         }
         if (size < ByteSize.MB) {
-            return localize(1885, "{0}KB", (size / ByteSize.KB).toFixed(2));
+            return localize(1897, "{0}KB", (size / ByteSize.KB).toFixed(2));
         }
         if (size < ByteSize.GB) {
-            return localize(1886, "{0}MB", (size / ByteSize.MB).toFixed(2));
+            return localize(1898, "{0}MB", (size / ByteSize.MB).toFixed(2));
         }
         if (size < ByteSize.TB) {
-            return localize(1887, "{0}GB", (size / ByteSize.GB).toFixed(2));
+            return localize(1899, "{0}GB", (size / ByteSize.GB).toFixed(2));
         }
-        return localize(1888, "{0}TB", (size / ByteSize.TB).toFixed(2));
+        return localize(1900, "{0}TB", (size / ByteSize.TB).toFixed(2));
     }
 }
 function getLargeFileConfirmationLimit(arg) {
@@ -403,4 +407,4 @@ function getLargeFileConfirmationLimit(arg) {
     return 1024 * ByteSize.MB;
 }
 
-export { AutoSaveConfiguration, ByteSize, ETAG_DISABLED, FILES_ASSOCIATIONS_CONFIG, FILES_EXCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG, FILES_READONLY_INCLUDE_CONFIG, FileChangeFilter, FileChangeType, FileChangesEvent, FileKind, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, HotExitConfiguration, NotModifiedSinceFileOperationError, TooLargeFileOperationError, createFileSystemProviderError, ensureFileSystemProviderError, etag, getLargeFileConfirmationLimit, hasFileAtomicDeleteCapability, hasFileAtomicReadCapability, hasFileAtomicWriteCapability, hasFileCloneCapability, hasFileFolderCopyCapability, hasFileReadStreamCapability, hasOpenReadWriteCloseCapability, hasReadWriteCapability, hasReadonlyCapability, markAsFileSystemProviderError, toFileOperationResult, toFileSystemProviderErrorCode, whenProviderRegistered };
+export { AutoSaveConfiguration, ByteSize, ETAG_DISABLED, FILES_ASSOCIATIONS_CONFIG, FILES_EXCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG, FILES_READONLY_INCLUDE_CONFIG, FileChangeFilter, FileChangeType, FileChangesEvent, FileKind, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, HotExitConfiguration, NotModifiedSinceFileOperationError, TooLargeFileOperationError, createFileSystemProviderError, ensureFileSystemProviderError, etag, getLargeFileConfirmationLimit, hasFileAtomicDeleteCapability, hasFileAtomicReadCapability, hasFileAtomicWriteCapability, hasFileCloneCapability, hasFileFolderCopyCapability, hasFileReadStreamCapability, hasFileRealpathCapability, hasOpenReadWriteCloseCapability, hasReadWriteCapability, hasReadonlyCapability, markAsFileSystemProviderError, toFileOperationResult, toFileSystemProviderErrorCode, whenProviderRegistered };

package/vscode/src/vs/platform/files/common/files.service.d.ts

@@ -33,6 +33,7 @@ export interface IFileService {
         options?: IResolveFileOptions;
     }[]): Promise<IFileStatResult[]>;
     stat(resource: URI): Promise<IFileStatWithPartialMetadata>;
+    realpath(resource: URI): Promise<URI | undefined>;
     exists(resource: URI): Promise<boolean>;
     readFile(resource: URI, options?: IReadFileOptions, token?: CancellationToken): Promise<IFileContent>;
     readFileStream(resource: URI, options?: IReadFileStreamOptions, token?: CancellationToken): Promise<IFileStreamContent>;

package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js

@@ -11,7 +11,7 @@ import { localize } from '../../../nls.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { isActiveElement } from '../../../base/browser/dom.js';
 
-const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1890, "Whether suggestion are visible"))));
+const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1902, "Whether suggestion are visible"))));
 const HistoryNavigationWidgetFocusContext = 'historyNavigationWidgetFocus';
 const HistoryNavigationForwardsEnablementContext = 'historyNavigationForwardsEnabled';
 const HistoryNavigationBackwardsEnablementContext = 'historyNavigationBackwardsEnabled';

package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.d.ts

@@ -1,6 +1,6 @@
 import { Emitter, Event } from "../../../base/common/event.js";
 import { Keybinding, ResolvedKeybinding } from "../../../base/common/keybindings.js";
-import { Disposable } from "../../../base/common/lifecycle.js";
+import { Disposable, IDisposable } from "../../../base/common/lifecycle.js";
 import { ICommandService } from "../../commands/common/commands.service.js";
 import { IContextKeyServiceTarget } from "../../contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../contextkey/common/contextkey.service.js";
@@ -36,7 +36,7 @@ export declare abstract class AbstractKeybindingService extends Disposable imple
     abstract resolveKeybinding(keybinding: Keybinding): ResolvedKeybinding[];
     abstract resolveKeyboardEvent(keyboardEvent: IKeyboardEvent): ResolvedKeybinding;
     abstract resolveUserBinding(userBinding: string): ResolvedKeybinding[];
-    abstract registerSchemaContribution(contribution: KeybindingsSchemaContribution): void;
+    abstract registerSchemaContribution(contribution: KeybindingsSchemaContribution): IDisposable;
     abstract _dumpDebugInfo(): string;
     abstract _dumpDebugInfoJSON(): string;
     getDefaultKeybindingsContent(): string;

package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js

@@ -106,7 +106,7 @@ class AbstractKeybindingService extends Disposable {
                 throw illegalState('impossible');
             case 1:
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1891,
+                    1903,
                     "({0}) was pressed. Waiting for second key of chord...",
                     keypressLabel
                 )));
@@ -114,7 +114,7 @@ class AbstractKeybindingService extends Disposable {
             default: {
                 const fullKeypressLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1892,
+                    1904,
                     "({0}) was pressed. Waiting for next key of chord...",
                     fullKeypressLabel
                 )));
@@ -219,7 +219,7 @@ class AbstractKeybindingService extends Disposable {
                     const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                     this._log(`+ Leaving multi-chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                     this._notificationService.status(( localize(
-                        1893,
+                        1905,
                         "The key combination ({0}, {1}) is not a command.",
                         currentChordsLabel,
                         keypressLabel
@@ -243,7 +243,7 @@ class AbstractKeybindingService extends Disposable {
                         const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                         this._log(`+ Leaving chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                         this._notificationService.status(( localize(
-                            1893,
+                            1905,
                             "The key combination ({0}, {1}) is not a command.",
                             currentChordsLabel,
                             keypressLabel

package/vscode/src/vs/platform/keybinding/common/keybinding.service.d.ts

@@ -1,5 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { Keybinding, ResolvedKeybinding } from "../../../base/common/keybindings.js";
+import { IDisposable } from "../../../base/common/lifecycle.js";
 import { IContextKeyServiceTarget } from "../../contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../contextkey/common/contextkey.service.js";
 import { IKeyboardEvent, KeybindingsSchemaContribution } from "./keybinding.js";
@@ -24,7 +25,7 @@ export interface IKeybindingService {
     getKeybindings(): readonly ResolvedKeybindingItem[];
     customKeybindingsCount(): number;
     mightProducePrintableCharacter(event: IKeyboardEvent): boolean;
-    registerSchemaContribution(contribution: KeybindingsSchemaContribution): void;
+    registerSchemaContribution(contribution: KeybindingsSchemaContribution): IDisposable;
     toggleLogging(): boolean;
     _dumpDebugInfo(): string;
     _dumpDebugInfoJSON(): string;

package/vscode/src/vs/platform/languagePacks/common/languagePacks.service.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "../../../base/common/uri.js";
-import { ILanguagePackItem } from "@codingame/monaco-vscode-f054d965-ed28-53b8-b046-94e93188218c-common/vscode/vs/platform/languagePacks/common/languagePacks";
+import { ILanguagePackItem } from "@codingame/monaco-vscode-516ccb00-d5b9-5317-baf0-fcc96e99669a-common/vscode/vs/platform/languagePacks/common/languagePacks";
 export declare const ILanguagePackService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ILanguagePackService>;
 export interface ILanguagePackService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/list/browser/listService.d.ts

@@ -30,7 +30,7 @@ export declare class ListService implements IListService {
     register(widget: WorkbenchListWidget, extraContextKeys?: (IContextKey<boolean>)[]): IDisposable;
     dispose(): void;
 }
-export declare const RawWorkbenchListScrollAtBoundaryContextKey: RawContextKey<"top" | "bottom" | "none" | "both">;
+export declare const RawWorkbenchListScrollAtBoundaryContextKey: RawContextKey<"top" | "none" | "bottom" | "both">;
 export declare const WorkbenchListScrollAtTopContextKey: import("../../contextkey/common/contextkey.js").ContextKeyExpression | undefined;
 export declare const WorkbenchListScrollAtBottomContextKey: import("../../contextkey/common/contextkey.js").ContextKeyExpression | undefined;
 export declare const RawWorkbenchListFocusContextKey: RawContextKey<boolean>;
@@ -107,12 +107,6 @@ export declare class WorkbenchTable<TRow> extends Table<TRow> {
     get useAltAsMultipleSelectionModifier(): boolean;
     dispose(): void;
 }
-export interface IOpenResourceOptions {
-    editorOptions: IEditorOptions;
-    sideBySide: boolean;
-    element: any;
-    payload: any;
-}
 export interface IOpenEvent<T> {
     editorOptions: IEditorOptions;
     sideBySide: boolean;

package/vscode/src/vs/platform/list/browser/listService.js

@@ -948,19 +948,19 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'workbench',
     order: 7,
-    title: ( localize(1901, "Workbench")),
+    title: ( localize(1913, "Workbench")),
     type: 'object',
     properties: {
         [multiSelectModifierSettingKey]: {
             type: 'string',
             enum: ['ctrlCmd', 'alt'],
             markdownEnumDescriptions: [
-                ( localize(1902, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
-                ( localize(1903, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
+                ( localize(1914, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
+                ( localize(1915, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
             ],
             default: 'ctrlCmd',
             description: ( localize(
-                1904,
+                1916,
                 "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier."
             ))
         },
@@ -969,7 +969,7 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1905,
+                1917,
                 "Controls how to open items in trees and lists using the mouse (if supported). Note that some trees and lists might choose to ignore this setting if it is not applicable."
             ))
         },
@@ -977,59 +977,59 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                1906,
+                1918,
                 "Controls whether lists and trees support horizontal scrolling in the workbench. Warning: turning on this setting has a performance implication."
             ))
         },
         [scrollByPageKey]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1907, "Controls whether clicks in the scrollbar scroll page by page."))
+            description: ( localize(1919, "Controls whether clicks in the scrollbar scroll page by page."))
         },
         [treeIndentKey]: {
             type: 'number',
             default: 8,
             minimum: 4,
             maximum: 40,
-            description: ( localize(1908, "Controls tree indentation in pixels."))
+            description: ( localize(1920, "Controls tree indentation in pixels."))
         },
         [treeRenderIndentGuidesKey]: {
             type: 'string',
             enum: ['none', 'onHover', 'always'],
             default: 'onHover',
-            description: ( localize(1909, "Controls whether the tree should render indent guides."))
+            description: ( localize(1921, "Controls whether the tree should render indent guides."))
         },
         [listSmoothScrolling]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1910, "Controls whether lists and trees have smooth scrolling.")),
+            description: ( localize(1922, "Controls whether lists and trees have smooth scrolling.")),
         },
         [mouseWheelScrollSensitivityKey]: {
             type: 'number',
             default: 1,
             markdownDescription: ( localize(
-                1911,
+                1923,
                 "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events."
             ))
         },
         [fastScrollSensitivityKey]: {
             type: 'number',
             default: 5,
-            markdownDescription: ( localize(1912, "Scrolling speed multiplier when pressing `Alt`."))
+            markdownDescription: ( localize(1924, "Scrolling speed multiplier when pressing `Alt`."))
         },
         [defaultFindModeSettingKey]: {
             type: 'string',
             enum: ['highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1913,
+                1925,
                 "Highlight elements when searching. Further up and down navigation will traverse only the highlighted elements."
             )),
-                ( localize(1914, "Filter elements when searching."))
+                ( localize(1926, "Filter elements when searching."))
             ],
             default: 'highlight',
             description: ( localize(
-                1915,
+                1927,
                 "Controls the default find mode for lists and trees in the workbench."
             ))
         },
@@ -1038,26 +1038,26 @@ configurationRegistry.registerConfiguration({
             enum: ['simple', 'highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1916,
+                1928,
                 "Simple keyboard navigation focuses elements which match the keyboard input. Matching is done only on prefixes."
             )),
                 ( localize(
-                1917,
+                1929,
                 "Highlight keyboard navigation highlights elements which match the keyboard input. Further up and down navigation will traverse only the highlighted elements."
             )),
                 ( localize(
-                1918,
+                1930,
                 "Filter keyboard navigation will filter out and hide all the elements which do not match the keyboard input."
             ))
             ],
             default: 'highlight',
             description: ( localize(
-                1919,
+                1931,
                 "Controls the keyboard navigation style for lists and trees in the workbench. Can be simple, highlight and filter."
             )),
             deprecated: true,
             deprecationMessage: ( localize(
-                1920,
+                1932,
                 "Please use 'workbench.list.defaultFindMode' and	'workbench.list.typeNavigationMode' instead."
             ))
         },
@@ -1065,12 +1065,12 @@ configurationRegistry.registerConfiguration({
             type: 'string',
             enum: ['fuzzy', 'contiguous'],
             enumDescriptions: [
-                ( localize(1921, "Use fuzzy matching when searching.")),
-                ( localize(1922, "Use contiguous matching when searching."))
+                ( localize(1933, "Use fuzzy matching when searching.")),
+                ( localize(1934, "Use contiguous matching when searching."))
             ],
             default: 'fuzzy',
             description: ( localize(
-                1923,
+                1935,
                 "Controls the type of matching used when searching lists and trees in the workbench."
             ))
         },
@@ -1079,21 +1079,21 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1924,
+                1936,
                 "Controls how tree folders are expanded when clicking the folder names. Note that some trees and lists might choose to ignore this setting if it is not applicable."
             )),
         },
         [treeStickyScroll]: {
             type: 'boolean',
             default: true,
-            description: ( localize(1925, "Controls whether sticky scrolling is enabled in trees.")),
+            description: ( localize(1937, "Controls whether sticky scrolling is enabled in trees.")),
         },
         [treeStickyScrollMaxElements]: {
             type: 'number',
             minimum: 1,
             default: 7,
             markdownDescription: ( localize(
-                1926,
+                1938,
                 "Controls the number of sticky elements displayed in the tree when {0} is enabled.",
                 '`#workbench.tree.enableStickyScroll#`'
             )),
@@ -1103,7 +1103,7 @@ configurationRegistry.registerConfiguration({
             enum: ['automatic', 'trigger'],
             default: 'automatic',
             markdownDescription: ( localize(
-                1927,
+                1939,
                 "Controls how type navigation works in lists and trees in the workbench. When set to `trigger`, type navigation begins once the `list.triggerTypeNavigation` command is run."
             )),
         }

package/vscode/src/vs/platform/log/common/log.d.ts

@@ -181,6 +181,10 @@ export declare class NullLogger implements ILogger {
 export declare class NullLogService extends NullLogger implements ILogService {
     readonly _serviceBrand: undefined;
 }
+export declare class NullLoggerService extends AbstractLoggerService {
+    constructor();
+    protected doCreateLogger(resource: URI, logLevel: LogLevel, options?: ILoggerOptions): ILogger;
+}
 export declare function getLogLevel(environmentService: IEnvironmentService): LogLevel;
 export declare function LogLevelToString(logLevel: LogLevel): string;
 export declare function LogLevelToLocalizedString(logLevel: LogLevel): ILocalizedString;

package/vscode/src/vs/platform/log/common/log.js

@@ -389,6 +389,14 @@ class NullLogger {
 }
 class NullLogService extends NullLogger {
 }
+class NullLoggerService extends AbstractLoggerService {
+    constructor() {
+        super(LogLevel.Off, ( URI.parse('log:///log')));
+    }
+    doCreateLogger(resource, logLevel, options) {
+        return ( new NullLogger());
+    }
+}
 function getLogLevel(environmentService) {
     if (environmentService.verbose) {
         return LogLevel.Trace;
@@ -413,12 +421,12 @@ function LogLevelToString(logLevel) {
 }
 function LogLevelToLocalizedString(logLevel) {
     switch (logLevel) {
-        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1928, "Trace")) };
-        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1929, "Debug")) };
-        case LogLevel.Info: return { original: 'Info', value: ( localize(1930, "Info")) };
-        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1931, "Warning")) };
-        case LogLevel.Error: return { original: 'Error', value: ( localize(1932, "Error")) };
-        case LogLevel.Off: return { original: 'Off', value: ( localize(1933, "Off")) };
+        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1940, "Trace")) };
+        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1941, "Debug")) };
+        case LogLevel.Info: return { original: 'Info', value: ( localize(1942, "Info")) };
+        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1943, "Warning")) };
+        case LogLevel.Error: return { original: 'Error', value: ( localize(1944, "Error")) };
+        case LogLevel.Off: return { original: 'Off', value: ( localize(1945, "Off")) };
     }
 }
 function parseLogLevel(logLevel) {
@@ -442,4 +450,4 @@ function parseLogLevel(logLevel) {
 }
 const CONTEXT_LOG_LEVEL = ( new RawContextKey('logLevel', LogLevelToString(LogLevel.Info)));
 
-export { AbstractLogger, AbstractLoggerService, AbstractMessageLogger, CONTEXT_LOG_LEVEL, ConsoleLogger, DEFAULT_LOG_LEVEL, LogLevel, LogLevelToLocalizedString, LogLevelToString, MultiplexLogger, NullLogService, NullLogger, canLog, getLogLevel, isLogLevel, log, parseLogLevel };
+export { AbstractLogger, AbstractLoggerService, AbstractMessageLogger, CONTEXT_LOG_LEVEL, ConsoleLogger, DEFAULT_LOG_LEVEL, LogLevel, LogLevelToLocalizedString, LogLevelToString, MultiplexLogger, NullLogService, NullLogger, NullLoggerService, canLog, getLogLevel, isLogLevel, log, parseLogLevel };

package/vscode/src/vs/platform/markers/common/markerService.js

@@ -190,7 +190,7 @@ class MarkerService {
         });
     }
     static _toMarker(owner, resource, data) {
-        let { code, severity, message, source, startLineNumber, startColumn, endLineNumber, endColumn, relatedInformation, tags, } = data;
+        let { code, severity, message, source, startLineNumber, startColumn, endLineNumber, endColumn, relatedInformation, tags, origin } = data;
         if (!message) {
             return undefined;
         }
@@ -211,6 +211,7 @@ class MarkerService {
             endColumn,
             relatedInformation,
             tags,
+            origin
         };
     }
     changeAll(owner, data) {
@@ -251,9 +252,9 @@ class MarkerService {
     }
     _createFilteredMarker(resource, reasons) {
         const message = reasons.length === 1
-            ? ( localize(1934, "Problems are paused because: \"{0}\"", reasons[0]))
+            ? ( localize(1946, "Problems are paused because: \"{0}\"", reasons[0]))
             : ( localize(
-            1935,
+            1947,
             "Problems are paused because: \"{0}\" and {1} more",
             reasons[0],
             reasons.length - 1

package/vscode/src/vs/platform/markers/common/markers.d.ts

@@ -47,6 +47,7 @@ export interface IMarkerData {
     modelVersionId?: number;
     relatedInformation?: IRelatedInformation[];
     tags?: MarkerTag[];
+    origin?: string | undefined;
 }
 export interface IResourceMarker {
     resource: URI;
@@ -69,6 +70,7 @@ export interface IMarker {
     modelVersionId?: number;
     relatedInformation?: IRelatedInformation[];
     tags?: MarkerTag[];
+    origin?: string | undefined;
 }
 export interface MarkerStatistics {
     errors: number;

package/vscode/src/vs/platform/markers/common/markers.js

@@ -20,17 +20,17 @@ var MarkerSeverity;
     }
     MarkerSeverity.compare = compare;
     const _displayStrings = Object.create(null);
-    _displayStrings[MarkerSeverity.Error] = ( localize(1936, "Error"));
-    _displayStrings[MarkerSeverity.Warning] = ( localize(1937, "Warning"));
-    _displayStrings[MarkerSeverity.Info] = ( localize(1938, "Info"));
+    _displayStrings[MarkerSeverity.Error] = ( localize(1948, "Error"));
+    _displayStrings[MarkerSeverity.Warning] = ( localize(1949, "Warning"));
+    _displayStrings[MarkerSeverity.Info] = ( localize(1950, "Info"));
     function toString(a) {
         return _displayStrings[a] || '';
     }
     MarkerSeverity.toString = toString;
     const _displayStringsPlural = Object.create(null);
-    _displayStringsPlural[MarkerSeverity.Error] = ( localize(1939, "Errors"));
-    _displayStringsPlural[MarkerSeverity.Warning] = ( localize(1940, "Warnings"));
-    _displayStringsPlural[MarkerSeverity.Info] = ( localize(1941, "Infos"));
+    _displayStringsPlural[MarkerSeverity.Error] = ( localize(1951, "Errors"));
+    _displayStringsPlural[MarkerSeverity.Warning] = ( localize(1952, "Warnings"));
+    _displayStringsPlural[MarkerSeverity.Info] = ( localize(1953, "Infos"));
     function toStringPlural(a) {
         return _displayStringsPlural[a] || '';
     }

package/vscode/src/vs/platform/mcp/common/mcpManagement.service.d.ts

@@ -1,11 +1,13 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Event } from "../../../base/common/event.js";
-import { IQueryOptions, IGalleryMcpServer, IMcpServerManifest, type DidUninstallMcpServerEvent, type ILocalMcpServer, type InstallMcpServerEvent, type InstallMcpServerResult, type PackageType, type UninstallMcpServerEvent } from "@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { URI } from "../../../base/common/uri.js";
+import { IQueryOptions, IGalleryMcpServer, IMcpServerManifest, type DidUninstallMcpServerEvent, type IInstallableMcpServer, type ILocalMcpServer, type InstallMcpServerEvent, type InstallMcpServerResult, type InstallOptions, type UninstallMcpServerEvent, type UninstallOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
 export declare const IMcpGalleryService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IMcpGalleryService>;
 export interface IMcpGalleryService {
     readonly _serviceBrand: undefined;
     isEnabled(): boolean;
     query(options?: IQueryOptions, token?: CancellationToken): Promise<IGalleryMcpServer[]>;
+    getMcpServers(servers: string[]): Promise<IGalleryMcpServer[]>;
     getManifest(extension: IGalleryMcpServer, token: CancellationToken): Promise<IMcpServerManifest>;
     getReadme(extension: IGalleryMcpServer, token: CancellationToken): Promise<string>;
 }
@@ -14,9 +16,12 @@ export interface IMcpManagementService {
     readonly _serviceBrand: undefined;
     readonly onInstallMcpServer: Event<InstallMcpServerEvent>;
     readonly onDidInstallMcpServers: Event<readonly InstallMcpServerResult[]>;
+    readonly onDidUpdateMcpServers: Event<readonly InstallMcpServerResult[]>;
     readonly onUninstallMcpServer: Event<UninstallMcpServerEvent>;
     readonly onDidUninstallMcpServer: Event<DidUninstallMcpServerEvent>;
-    getInstalled(): Promise<ILocalMcpServer[]>;
-    installFromGallery(server: IGalleryMcpServer, packageType: PackageType): Promise<void>;
-    uninstall(server: ILocalMcpServer): Promise<void>;
+    getInstalled(mcpResource?: URI): Promise<ILocalMcpServer[]>;
+    install(server: IInstallableMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
+    installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
+    updateMetadata(local: ILocalMcpServer, server: IGalleryMcpServer, profileLocation?: URI): Promise<ILocalMcpServer>;
+    uninstall(server: ILocalMcpServer, options?: UninstallOptions): Promise<void>;
 }