@codingame/monaco-vscode-api 16.1.0 → 17.0.0

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

@@ -7,6 +7,7 @@ import { ConfigurationTarget } from "../../../../platform/configuration/common/c
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
 import { StorageScope } from "../../../../platform/storage/common/storage.js";
 import { IWorkspaceFolderData } from "../../../../platform/workspace/common/workspace.js";
+import { ToolProgress } from "../../chat/common/languageModelToolsService.js";
 import { McpServerRequestHandler } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/mcpServerRequestHandler";
 import { MCP } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/modelContextProtocol";
 export declare const extensionMcpCollectionPrefix = "ext.";
@@ -18,6 +19,7 @@ export interface McpCollectionDefinition {
     readonly serverDefinitions: IObservable<readonly McpServerDefinition[]>;
     readonly isTrustedByDefault: boolean;
     readonly scope: StorageScope;
+    resolveServerLanch?(definition: McpServerDefinition): Promise<McpServerLaunch | undefined>;
     readonly lazy?: {
         isCached: boolean;
         load(): Promise<void>;
@@ -42,6 +44,8 @@ export declare namespace McpCollectionDefinition {
         readonly label: string;
         readonly isTrustedByDefault: boolean;
         readonly scope: StorageScope;
+        readonly canResolveLaunch: boolean;
+        readonly extensionId: string;
     }
     function equals(a: McpCollectionDefinition, b: McpCollectionDefinition): boolean;
 }
@@ -51,6 +55,7 @@ export interface McpServerDefinition {
     readonly launch: McpServerLaunch;
     readonly roots?: URI[] | undefined;
     readonly variableReplacement?: McpServerDefinitionVariableReplacement;
+    readonly cacheNonce?: string;
     readonly presentation?: {
         readonly order?: number;
         readonly origin?: Location;
@@ -60,6 +65,7 @@ export declare namespace McpServerDefinition {
     interface Serialized {
         readonly id: string;
         readonly label: string;
+        readonly cacheNonce?: string;
         readonly launch: McpServerLaunch.Serialized;
         readonly variableReplacement?: McpServerDefinitionVariableReplacement.Serialized;
     }
@@ -114,18 +120,20 @@ export interface IMcpServer extends IDisposable {
 export declare enum McpServerToolsState {
     Unknown = 0,
     Cached = 1,
-    RefreshingFromUnknown = 2,
-    RefreshingFromCached = 3,
-    Live = 4
+    Outdated = 2,
+    RefreshingFromUnknown = 3,
+    RefreshingFromCached = 4,
+    Live = 5
 }
 export interface IMcpTool {
     readonly id: string;
     readonly definition: MCP.Tool;
     call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult>;
+    callWithProgress(params: Record<string, unknown>, progress: ToolProgress, token?: CancellationToken): Promise<MCP.CallToolResult>;
 }
 export declare enum McpServerTransportType {
     Stdio = 1,
-    SSE = 2
+    HTTP = 2
 }
 export interface McpServerTransportStdio {
     readonly type: McpServerTransportType.Stdio;
@@ -135,18 +143,18 @@ export interface McpServerTransportStdio {
     readonly env: Record<string, string | number | null>;
     readonly envFile: string | undefined;
 }
-export interface McpServerTransportSSE {
-    readonly type: McpServerTransportType.SSE;
+export interface McpServerTransportHTTP {
+    readonly type: McpServerTransportType.HTTP;
     readonly uri: URI;
     readonly headers: [
         string,
         string
     ][];
 }
-export type McpServerLaunch = McpServerTransportStdio | McpServerTransportSSE;
+export type McpServerLaunch = McpServerTransportStdio | McpServerTransportHTTP;
 export declare namespace McpServerLaunch {
     type Serialized = {
-        type: McpServerTransportType.SSE;
+        type: McpServerTransportType.HTTP;
         uri: UriComponents;
         headers: [
             string,
@@ -167,6 +175,7 @@ export interface IMcpServerConnection extends IDisposable {
     readonly definition: McpServerDefinition;
     readonly state: IObservable<McpConnectionState>;
     readonly handler: IObservable<McpServerRequestHandler | undefined>;
+    readonly launchDefinition: McpServerLaunch;
     start(): Promise<McpConnectionState>;
     stop(): Promise<void>;
 }
@@ -192,6 +201,8 @@ export declare namespace McpConnectionState {
     }
     interface Error {
         readonly state: Kind.Error;
+        readonly code?: string;
+        readonly shouldRetry?: boolean;
         readonly message: string;
     }
 }

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

@@ -1,7 +1,7 @@
 
+import { equals } from '../../../../base/common/arrays.js';
 import { assertNever } from '../../../../base/common/assert.js';
 import { equals as equals$1 } from '../../../../base/common/objects.js';
-import { equals } from '../../../../base/common/arrays.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
@@ -39,6 +39,7 @@ var McpServerDefinition;
         return {
             id: def.id,
             label: def.label,
+            cacheNonce: def.cacheNonce,
             launch: McpServerLaunch.fromSerialized(def.launch),
             variableReplacement: def.variableReplacement ? McpServerDefinitionVariableReplacement.fromSerialized(def.variableReplacement) : undefined,
         };
@@ -79,14 +80,15 @@ var McpServerToolsState;
 (function (McpServerToolsState) {
     McpServerToolsState[McpServerToolsState["Unknown"] = 0] = "Unknown";
     McpServerToolsState[McpServerToolsState["Cached"] = 1] = "Cached";
-    McpServerToolsState[McpServerToolsState["RefreshingFromUnknown"] = 2] = "RefreshingFromUnknown";
-    McpServerToolsState[McpServerToolsState["RefreshingFromCached"] = 3] = "RefreshingFromCached";
-    McpServerToolsState[McpServerToolsState["Live"] = 4] = "Live";
+    McpServerToolsState[McpServerToolsState["Outdated"] = 2] = "Outdated";
+    McpServerToolsState[McpServerToolsState["RefreshingFromUnknown"] = 3] = "RefreshingFromUnknown";
+    McpServerToolsState[McpServerToolsState["RefreshingFromCached"] = 4] = "RefreshingFromCached";
+    McpServerToolsState[McpServerToolsState["Live"] = 5] = "Live";
 })(McpServerToolsState || (McpServerToolsState = {}));
 var McpServerTransportType;
 (function (McpServerTransportType) {
     McpServerTransportType[McpServerTransportType["Stdio"] = 1] = "Stdio";
-    McpServerTransportType[McpServerTransportType["SSE"] = 2] = "SSE";
+    McpServerTransportType[McpServerTransportType["HTTP"] = 2] = "HTTP";
 })(McpServerTransportType || (McpServerTransportType = {}));
 var McpServerLaunch;
 (function (McpServerLaunch) {
@@ -96,7 +98,7 @@ var McpServerLaunch;
     McpServerLaunch.toSerialized = toSerialized;
     function fromSerialized(launch) {
         switch (launch.type) {
-            case McpServerTransportType.SSE:
+            case McpServerTransportType.HTTP:
                 return { type: launch.type, uri: URI.revive(launch.uri), headers: launch.headers };
             case McpServerTransportType.Stdio:
                 return {
@@ -123,13 +125,13 @@ var McpConnectionState;
     McpConnectionState.toString = (s) => {
         switch (s.state) {
             case Kind.Stopped:
-                return localize(7672, 'Stopped');
+                return localize(7759, 'Stopped');
             case Kind.Starting:
-                return localize(7673, 'Starting');
+                return localize(7760, 'Starting');
             case Kind.Running:
-                return localize(7674, 'Running');
+                return localize(7761, 'Running');
             case Kind.Error:
-                return localize(7675, 'Error {0}', s.message);
+                return localize(7762, 'Error {0}', s.message);
             default:
                 assertNever();
         }

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

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 export declare const IMultiDiffSourceResolverService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMultiDiffSourceResolverService>;
 export interface IMultiDiffSourceResolverService {
     readonly _serviceBrand: undefined;

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

@@ -3,8 +3,8 @@ import { CodeWindow } from "../../../../../base/browser/window.js";
 import { Event } from "../../../../../base/common/event.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { type ServicesAccessor } from "../../../../../platform/instantiation/common/instantiation.js";
-import { INotebookEditorCreationOptions, INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { NotebookEditorWidget } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
+import { INotebookEditorCreationOptions, INotebookEditor } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { NotebookEditorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
 import { IBorrowValue } from "./notebookEditorService.js";
 export declare const INotebookEditorService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookEditorService>;
 export interface INotebookEditorService {

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.d.ts

@@ -19,9 +19,9 @@ import { IFileReadLimits } from "../../../../platform/files/common/files.js";
 import { UndoRedoGroup } from "../../../../platform/undoRedo/common/undoRedo.js";
 import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from "../../../common/editor.js";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
-import { ICellExecutionError } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecutionError } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 import { INotebookTextModelLike } from "./notebookKernelService.js";
-import { ICellRange } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { RegisteredEditorPriority } from "../../../services/editor/common/editorResolverService.js";
 import { IWorkingCopyBackupMeta, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { SnapshotContext } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
@@ -30,6 +30,7 @@ export declare const NOTEBOOK_DIFF_EDITOR_ID = "workbench.editor.notebookTextDif
 export declare const NOTEBOOK_MULTI_DIFF_EDITOR_ID = "workbench.editor.notebookMultiTextDiffEditor";
 export declare const INTERACTIVE_WINDOW_EDITOR_ID = "workbench.editor.interactive";
 export declare const REPL_EDITOR_ID = "workbench.editor.repl";
+export declare const NOTEBOOK_OUTPUT_EDITOR_ID = "workbench.editor.notebookOutputEditor";
 export declare const EXECUTE_REPL_COMMAND_ID = "replNotebook.input.execute";
 export declare enum CellKind {
     Markup = 1,
@@ -472,6 +473,7 @@ export declare namespace CellUri {
     } | undefined;
     function generateCellOutputUriWithId(notebook: URI, outputId?: string): URI;
     function generateCellOutputUriWithIndex(notebook: URI, cellUri: URI, outputIndex: number): URI;
+    function generateOutputEditorUri(notebook: URI, cellId: string, cellIndex: number, outputId: string, outputIndex: number): URI;
     function parseCellOutputUri(uri: URI): {
         notebook: URI;
         openIn: string;
@@ -479,6 +481,7 @@ export declare namespace CellUri {
         cellFragment?: string;
         outputIndex?: number;
         cellHandle?: number;
+        cellIndex?: number;
     } | undefined;
     function generateCellPropertyUri(notebook: URI, handle: number, scheme: string): URI;
     function parseCellPropertyUri(uri: URI, propertyScheme: string): {
@@ -499,8 +502,8 @@ export declare function diff<T>(before: T[], after: T[], contains: (a: T) => boo
 export interface ICellEditorViewState {
     selections: editorCommon.ICursorState[];
 }
-export declare const NOTEBOOK_EDITOR_CURSOR_BOUNDARY: RawContextKey<"both" | "none" | "top" | "bottom">;
-export declare const NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY: RawContextKey<"both" | "none" | "end" | "start">;
+export declare const NOTEBOOK_EDITOR_CURSOR_BOUNDARY: RawContextKey<"top" | "bottom" | "none" | "both">;
+export declare const NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY: RawContextKey<"start" | "end" | "none" | "both">;
 export interface INotebookLoadOptions {
     forceReadFromFile?: boolean;
     readonly limits?: IFileReadLimits;
@@ -632,6 +635,7 @@ export declare const NotebookSetting: {
     readonly stickyScrollMode: "notebook.stickyScroll.mode";
     readonly undoRedoPerCell: "notebook.undoRedoPerCell";
     readonly consolidatedOutputButton: "notebook.consolidatedOutputButton";
+    readonly openOutputInPreviewEditor: "notebook.output.openInPreviewEditor.enabled";
     readonly showFoldingControls: "notebook.showFoldingControls";
     readonly dragAndDropEnabled: "notebook.dragAndDropEnabled";
     readonly cellEditorOptionsCustomizations: "notebook.editorOptionsCustomizations";

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -14,6 +14,7 @@ const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
 const NOTEBOOK_MULTI_DIFF_EDITOR_ID = 'workbench.editor.notebookMultiTextDiffEditor';
 const INTERACTIVE_WINDOW_EDITOR_ID = 'workbench.editor.interactive';
 const REPL_EDITOR_ID = 'workbench.editor.repl';
+const NOTEBOOK_OUTPUT_EDITOR_ID = 'workbench.editor.notebookOutputEditor';
 var CellKind;
 (function (CellKind) {
     CellKind[CellKind["Markup"] = 1] = "Markup";
@@ -152,6 +153,19 @@ var CellUri;
         });
     }
     CellUri.generateCellOutputUriWithIndex = generateCellOutputUriWithIndex;
+    function generateOutputEditorUri(notebook, cellId, cellIndex, outputId, outputIndex) {
+        return notebook.with({
+            scheme: Schemas.vscodeNotebookCellOutput,
+            query: ( ( new URLSearchParams({
+                openIn: 'notebookOutputEditor',
+                notebook: ( notebook.toString()),
+                cellIndex: String(cellIndex),
+                outputId: outputId,
+                outputIndex: String(outputIndex),
+            })).toString())
+        });
+    }
+    CellUri.generateOutputEditorUri = generateOutputEditorUri;
     function parseCellOutputUri(uri) {
         return extractCellOutputDetails(uri);
     }
@@ -303,6 +317,7 @@ const NotebookSetting = {
     stickyScrollMode: 'notebook.stickyScroll.mode',
     undoRedoPerCell: 'notebook.undoRedoPerCell',
     consolidatedOutputButton: 'notebook.consolidatedOutputButton',
+    openOutputInPreviewEditor: 'notebook.output.openInPreviewEditor.enabled',
     showFoldingControls: 'notebook.showFoldingControls',
     dragAndDropEnabled: 'notebook.dragAndDropEnabled',
     cellEditorOptionsCustomizations: 'notebook.editorOptionsCustomizations',
@@ -438,4 +453,4 @@ function formatStreamText(buffer) {
     return VSBuffer.fromString(fixCarriageReturn(fixBackspace(textDecoder.decode(buffer.buffer))));
 }
 
-export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NOTEBOOK_MULTI_DIFF_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookMetadataUri, NotebookRendererMatch, NotebookRunState, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, REPL_EDITOR_ID, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };
+export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NOTEBOOK_MULTI_DIFF_EDITOR_ID, NOTEBOOK_OUTPUT_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookMetadataUri, NotebookRendererMatch, NotebookRunState, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, REPL_EDITOR_ID, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionService.d.ts

@@ -1,5 +1,5 @@
 import { IOutputDto, IOutputItemDto } from "./notebookCommon.js";
-import { INotebookCellExecution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { INotebookCellExecution } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare enum CellExecutionUpdateType {
     Output = 1,
     OutputItems = 2,

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

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { INotebookTextModel } from "./notebookCommon.js";
 import { ICellExecutionParticipant } from "./notebookExecutionService.js";
 export declare const INotebookExecutionService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookExecutionService>;

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

@@ -1,6 +1,6 @@
 import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
-import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookFailStateChangedEvent, INotebookCellExecution, INotebookExecution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookFailStateChangedEvent, INotebookCellExecution, INotebookExecution } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare const INotebookExecutionStateService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookExecutionStateService>;
 export interface INotebookExecutionStateService {
     _serviceBrand: undefined;

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

@@ -5,11 +5,11 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
 import { ConfigurationTarget } from "../../../../platform/configuration/common/configuration.js";
 import { SnapshotContext } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { NotebookExtensionDescription, IOutputDto, IOrderedMimeType, INotebookRendererInfo, INotebookStaticPreloadInfo, INotebookContributionData } from "./notebookCommon.js";
 import { NotebookProviderInfo } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/notebookProvider";
-import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookService";
+import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookService";
 export declare const INotebookService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookService>;
 export interface INotebookService {
     readonly _serviceBrand: undefined;

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

@@ -1,11 +1,14 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { QuickDiffProvider, QuickDiff } from "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiffProvider, QuickDiff } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 export declare const IQuickDiffService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IQuickDiffService>;
 export interface IQuickDiffService {
     readonly _serviceBrand: undefined;
     readonly onDidChangeQuickDiffProviders: Event<void>;
+    readonly providers: readonly QuickDiffProvider[];
     addQuickDiffProvider(quickDiff: QuickDiffProvider): IDisposable;
     getQuickDiffs(uri: URI, language?: string, isSynchronized?: boolean): Promise<QuickDiff[]>;
+    toggleQuickDiffProviderVisibility(id: string): void;
+    isQuickDiffProviderVisible(id: string): boolean;
 }

package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.d.ts

@@ -1,17 +1,25 @@
 import { URI } from "../../../../base/common/uri.js";
 import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
-import { QuickDiff, QuickDiffProvider } from "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiff, QuickDiffProvider } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 import { IQuickDiffService } from "./quickDiff.service.js";
 import { IUriIdentityService } from "../../../../platform/uriIdentity/common/uriIdentity.service.js";
+import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 export declare class QuickDiffService extends Disposable implements IQuickDiffService {
+    private readonly storageService;
     private readonly uriIdentityService;
     readonly _serviceBrand: undefined;
+    private static readonly STORAGE_KEY;
     private quickDiffProviders;
+    get providers(): readonly QuickDiffProvider[];
     private readonly _onDidChangeQuickDiffProviders;
     readonly onDidChangeQuickDiffProviders: import("../../../../base/common/event.js").Event<void>;
-    constructor(uriIdentityService: IUriIdentityService);
+    private hiddenQuickDiffProviders;
+    constructor(storageService: IStorageService, uriIdentityService: IUriIdentityService);
     addQuickDiffProvider(quickDiff: QuickDiffProvider): IDisposable;
-    private isQuickDiff;
     getQuickDiffs(uri: URI, language?: string, isSynchronized?: boolean): Promise<QuickDiff[]>;
+    toggleQuickDiffProviderVisibility(id: string): void;
+    isQuickDiffProviderVisible(id: string): boolean;
+    private loadState;
+    private saveState;
 }
 export declare function getOriginalResource(quickDiffService: IQuickDiffService, uri: URI, language: string | undefined, isSynchronized: boolean | undefined): Promise<URI | null>;

package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js

@@ -5,7 +5,10 @@ import { isEqualOrParent } from '../../../../base/common/resources.js';
 import { score } from '../../../../editor/common/languageSelector.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 
+var QuickDiffService_1;
 function createProviderComparer(uri) {
     return (a, b) => {
         if (a.rootUri && !b.rootUri) {
@@ -20,7 +23,7 @@ function createProviderComparer(uri) {
         const aIsParent = isEqualOrParent(uri, a.rootUri);
         const bIsParent = isEqualOrParent(uri, b.rootUri);
         if (aIsParent && bIsParent) {
-            return a.rootUri.fsPath.length - b.rootUri.fsPath.length;
+            return providerComparer(a, b);
         }
         else if (aIsParent) {
             return -1;
@@ -33,13 +36,36 @@ function createProviderComparer(uri) {
         }
     };
 }
+function providerComparer(a, b) {
+    if (a.kind === 'primary') {
+        return -1;
+    }
+    else if (b.kind === 'primary') {
+        return 1;
+    }
+    else if (a.kind === 'secondary') {
+        return -1;
+    }
+    else if (b.kind === 'secondary') {
+        return 1;
+    }
+    return 0;
+}
 let QuickDiffService = class QuickDiffService extends Disposable {
-    constructor(uriIdentityService) {
+    static { QuickDiffService_1 = this; }
+    static { this.STORAGE_KEY = 'workbench.scm.quickDiffProviders.hidden'; }
+    get providers() {
+        return Array.from(this.quickDiffProviders).sort(providerComparer);
+    }
+    constructor(storageService, uriIdentityService) {
         super();
+        this.storageService = storageService;
         this.uriIdentityService = uriIdentityService;
         this.quickDiffProviders = ( new Set());
         this._onDidChangeQuickDiffProviders = this._register(( new Emitter()));
         this.onDidChangeQuickDiffProviders = this._onDidChangeQuickDiffProviders.event;
+        this.hiddenQuickDiffProviders = ( new Set());
+        this.loadState();
     }
     addQuickDiffProvider(quickDiff) {
         this.quickDiffProviders.add(quickDiff);
@@ -51,28 +77,63 @@ let QuickDiffService = class QuickDiffService extends Disposable {
             }
         };
     }
-    isQuickDiff(diff) {
-        return !!diff.originalResource && (typeof diff.label === 'string') && (typeof diff.isSCM === 'boolean');
-    }
     async getQuickDiffs(uri, language = '', isSynchronized = false) {
         const providers = Array.from(this.quickDiffProviders)
             .filter(provider => !provider.rootUri || this.uriIdentityService.extUri.isEqualOrParent(uri, provider.rootUri))
             .sort(createProviderComparer(uri));
-        const diffs = await Promise.all(( providers.map(async (provider) => {
+        const quickDiffOriginalResources = await Promise.all(( providers.map(async (provider) => {
             const scoreValue = provider.selector ? score(provider.selector, uri, language, isSynchronized, undefined, undefined) : 10;
-            const diff = {
-                originalResource: scoreValue > 0 ? (await provider.getOriginalResource(uri)) ?? undefined : undefined,
-                label: provider.label,
-                isSCM: provider.isSCM,
-                visible: provider.visible
-            };
-            return diff;
+            const originalResource = scoreValue > 0 ? (await provider.getOriginalResource(uri)) ?? undefined : undefined;
+            return { provider, originalResource };
         })));
-        return diffs.filter(this.isQuickDiff);
+        const quickDiffs = [];
+        for (const { provider, originalResource } of quickDiffOriginalResources) {
+            if (!originalResource) {
+                continue;
+            }
+            quickDiffs.push({
+                id: provider.id,
+                label: provider.label,
+                kind: provider.kind,
+                originalResource,
+            });
+        }
+        return quickDiffs;
+    }
+    toggleQuickDiffProviderVisibility(id) {
+        if (this.isQuickDiffProviderVisible(id)) {
+            this.hiddenQuickDiffProviders.add(id);
+        }
+        else {
+            this.hiddenQuickDiffProviders.delete(id);
+        }
+        this.saveState();
+        this._onDidChangeQuickDiffProviders.fire();
+    }
+    isQuickDiffProviderVisible(id) {
+        return !( this.hiddenQuickDiffProviders.has(id));
+    }
+    loadState() {
+        const raw = this.storageService.get(QuickDiffService_1.STORAGE_KEY, StorageScope.PROFILE);
+        if (raw) {
+            try {
+                this.hiddenQuickDiffProviders = ( new Set(JSON.parse(raw)));
+            }
+            catch { }
+        }
+    }
+    saveState() {
+        if (this.hiddenQuickDiffProviders.size === 0) {
+            this.storageService.remove(QuickDiffService_1.STORAGE_KEY, StorageScope.PROFILE);
+        }
+        else {
+            this.storageService.store(QuickDiffService_1.STORAGE_KEY, JSON.stringify(Array.from(this.hiddenQuickDiffProviders)), StorageScope.PROFILE, StorageTarget.USER);
+        }
     }
 };
-QuickDiffService = ( __decorate([
-    ( __param(0, IUriIdentityService))
+QuickDiffService = QuickDiffService_1 = ( __decorate([
+    ( __param(0, IStorageService)),
+    ( __param(1, IUriIdentityService))
 ], QuickDiffService));
 async function getOriginalResource(quickDiffService, uri, language, isSynchronized) {
     const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js

@@ -27,7 +27,7 @@ class SnippetCompletion {
     constructor(snippet, range) {
         this.snippet = snippet;
         this.label = { label: snippet.prefix, description: snippet.name };
-        this.detail = ( localize(9491, "{0} ({1})", snippet.description || snippet.name, snippet.source));
+        this.detail = ( localize(9597, "{0} ({1})", snippet.description || snippet.name, snippet.source));
         this.insertText = snippet.codeSnippet;
         this.extensionId = snippet.extensionId;
         this.range = range;
@@ -121,14 +121,14 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
             let to = i + 1;
             for (; to < suggestions.length && item.label === suggestions[to].label; to++) {
                 suggestions[to].label.label = ( localize(
-                    9492,
+                    9598,
                     "{0}, {1}",
                     suggestions[to].label.label,
                     suggestions[to].snippet.name
                 ));
             }
             if (to > i + 1) {
-                suggestions[i].label.label = ( localize(9492, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
+                suggestions[i].label.label = ( localize(9598, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
                 i = to;
             }
         }

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js

@@ -207,14 +207,14 @@ class SnippetFile {
             source = this._extension.displayName || this._extension.name;
         }
         else if (this.source === SnippetSource.Workspace) {
-            source = ( localize(9508, "Workspace Snippet"));
+            source = ( localize(9614, "Workspace Snippet"));
         }
         else {
             if (this.isGlobalSnippets) {
-                source = ( localize(9509, "Global User Snippet"));
+                source = ( localize(9615, "Global User Snippet"));
             }
             else {
-                source = ( localize(9510, "User Snippet"));
+                source = ( localize(9616, "User Snippet"));
             }
         }
         for (const _prefix of Iterable.wrap(prefix)) {