@codingame/monaco-vscode-api 26.1.1 → 26.2.0

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js

@@ -9,25 +9,25 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 function getSyncAreaLabel(source) {
     switch (source) {
     case SyncResource.Settings:
-        return localize(14996, "Settings");
+        return localize(15186, "Settings");
     case SyncResource.Keybindings:
-        return localize(14997, "Keyboard Shortcuts");
+        return localize(15187, "Keyboard Shortcuts");
     case SyncResource.Snippets:
-        return localize(14998, "Snippets");
+        return localize(15188, "Snippets");
     case SyncResource.Prompts:
-        return localize(14999, "Prompts and Instructions");
+        return localize(15189, "Prompts and Instructions");
     case SyncResource.Tasks:
-        return localize(15000, "Tasks");
+        return localize(15190, "Tasks");
     case SyncResource.Mcp:
-        return localize(15001, "MCP Servers");
+        return localize(15191, "MCP Servers");
     case SyncResource.Extensions:
-        return localize(15002, "Extensions");
+        return localize(15192, "Extensions");
     case SyncResource.GlobalState:
-        return localize(15003, "UI State");
+        return localize(15193, "UI State");
     case SyncResource.Profiles:
-        return localize(15004, "Profiles");
+        return localize(15194, "Profiles");
     case SyncResource.WorkspaceState:
-        return localize(15005, "Workspace State");
+        return localize(15195, "Workspace State");
     }
 }
 var AccountStatus;
@@ -36,8 +36,8 @@ var AccountStatus;
     AccountStatus["Unavailable"] = "unavailable";
     AccountStatus["Available"] = "available";
 })(AccountStatus || (AccountStatus = {}));
-const SYNC_TITLE = ( localize2(15006, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon("settings-sync-view-icon", Codicon.sync, ( localize(15007, "View icon of the Settings Sync view.")));
+const SYNC_TITLE = ( localize2(15196, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon("settings-sync-view-icon", Codicon.sync, ( localize(15197, "View icon of the Settings Sync view.")));
 const CONTEXT_SYNC_STATE = ( new RawContextKey("syncStatus", SyncStatus.Uninitialized));
 const CONTEXT_SYNC_ENABLEMENT = ( new RawContextKey("syncEnabled", false));
 const CONTEXT_ACCOUNT_STATE = ( new RawContextKey("userDataSyncAccountStatus", AccountStatus.Uninitialized));
@@ -50,7 +50,7 @@ const SYNC_VIEW_CONTAINER_ID = "workbench.view.sync";
 const SYNC_CONFLICTS_VIEW_ID = "workbench.views.sync.conflicts";
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: "workbench.userDataSync.actions.downloadSyncActivity",
-    title: ( localize2(15008, "Download Settings Sync Activity")),
+    title: ( localize2(15198, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)), ( CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))))

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -285,7 +285,7 @@ let ViewsService = class ViewsService extends Disposable {
         return this.viewDescriptorService.getViewDescriptorById(( viewId.toString()));
     }
     getFocusedViewName() {
-        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(15014, "Text Editor")) : undefined;
+        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(15204, "Text Editor")) : undefined;
         return this.getFocusedView()?.name?.value ?? textEditorFocused ?? "";
     }
     async openView(id, focus) {
@@ -391,12 +391,12 @@ let ViewsService = class ViewsService extends Disposable {
                             const originalTitle = typeof title === "string" ? title : title.original;
                             if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return {
-                                    value: ( localize(15015, "Show {0}", localizedTitle)),
+                                    value: ( localize(15205, "Show {0}", localizedTitle)),
                                     original: `Show ${originalTitle}`
                                 };
                             } else {
                                 return {
-                                    value: ( localize(15016, "Toggle {0}", localizedTitle)),
+                                    value: ( localize(15206, "Toggle {0}", localizedTitle)),
                                     original: `Toggle ${originalTitle}`
                                 };
                             }
@@ -468,12 +468,12 @@ let ViewsService = class ViewsService extends Disposable {
                         const originalTitle = typeof title === "string" ? title : title.original;
                         if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                             return {
-                                value: ( localize(15015, "Show {0}", localizedTitle)),
+                                value: ( localize(15205, "Show {0}", localizedTitle)),
                                 original: `Show ${originalTitle}`
                             };
                         } else {
                             return {
-                                value: ( localize(15016, "Toggle {0}", localizedTitle)),
+                                value: ( localize(15206, "Toggle {0}", localizedTitle)),
                                 original: `Toggle ${originalTitle}`
                             };
                         }
@@ -486,7 +486,7 @@ let ViewsService = class ViewsService extends Disposable {
                     } : undefined,
                     f1: viewDescriptor.openCommandActionDescriptor ? true : undefined,
                     metadata: {
-                        description: ( localize(15017, "Opens view {0}", viewDescriptor.name.value)),
+                        description: ( localize(15207, "Opens view {0}", viewDescriptor.name.value)),
                         args: [{
                             name: "options",
                             schema: {
@@ -495,7 +495,7 @@ let ViewsService = class ViewsService extends Disposable {
                                     "preserveFocus": {
                                         type: "boolean",
                                         default: false,
-                                        description: ( localize(15018, "Whether to preserve the existing focus when opening the view."))
+                                        description: ( localize(15208, "Whether to preserve the existing focus when opening the view."))
                                     }
                                 }
                             }
@@ -542,7 +542,7 @@ let ViewsService = class ViewsService extends Disposable {
     registerFocusViewAction(viewDescriptor, category) {
         return registerAction2(class FocusViewAction extends Action2 {
             constructor() {
-                const title = ( localize2(15019, "Focus on {0} View", viewDescriptor.name.value));
+                const title = ( localize2(15209, "Focus on {0} View", viewDescriptor.name.value));
                 super({
                     id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
                     title,
@@ -588,7 +588,7 @@ let ViewsService = class ViewsService extends Disposable {
             constructor() {
                 super({
                     id: `${viewDescriptor.id}.resetViewLocation`,
-                    title: ( localize2(15020, "Reset Location")),
+                    title: ( localize2(15210, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewTitleContext,
                         when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewDescriptor.id)), ( ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)))))),

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js

@@ -453,7 +453,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         const saveCancellation = ( new CancellationTokenSource());
         return this.progressService.withProgress({
-            title: ( localize(15033, "Saving '{0}'", this.name)),
+            title: ( localize(15223, "Saving '{0}'", this.name)),
             location: ProgressLocation.Window,
             cancellable: true,
             delay: this.isDirty() ? 3000 : 5000
@@ -512,7 +512,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             versionId = this.versionId;
             this.inErrorMode = false;
             progress.report({
-                message: ( localize(15034, "Writing into file..."))
+                message: ( localize(15224, "Writing into file..."))
             });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertReturnsDefined(this.lastResolvedFileStat);
@@ -608,13 +608,13 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         let message;
         if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             message = ( localize(
-                15035,
+                15225,
                 "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?",
                 this.name
             ));
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.overwrite",
-                label: ( localize(15036, "Overwrite")),
+                label: ( localize(15226, "Overwrite")),
                 run: () => this.save({
                     ...options,
                     ignoreModifiedSince: true,
@@ -623,7 +623,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }));
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.revert",
-                label: ( localize(15037, "Revert")),
+                label: ( localize(15227, "Revert")),
                 run: () => this.revert()
             }));
         }
@@ -638,7 +638,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             if (canSaveElevated && (isPermissionDenied || triedToUnlock)) {
                 primaryActions.push(toAction({
                     id: "fileWorkingCopy.saveElevated",
-                    label: triedToUnlock ? isWindows ? ( localize(15038, "Overwrite as Admin...")) : ( localize(15039, "Overwrite as Sudo...")) : isWindows ? ( localize(15040, "Retry as Admin...")) : ( localize(15041, "Retry as Sudo...")),
+                    label: triedToUnlock ? isWindows ? ( localize(15228, "Overwrite as Admin...")) : ( localize(15229, "Overwrite as Sudo...")) : isWindows ? ( localize(15230, "Retry as Admin...")) : ( localize(15231, "Retry as Sudo...")),
                     run: () => {
                         this.save({
                             ...options,
@@ -652,7 +652,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             else if (isWriteLocked) {
                 primaryActions.push(toAction({
                     id: "fileWorkingCopy.unlock",
-                    label: ( localize(15036, "Overwrite")),
+                    label: ( localize(15226, "Overwrite")),
                     run: () => this.save({
                         ...options,
                         writeUnlock: true,
@@ -663,7 +663,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             else {
                 primaryActions.push(toAction({
                     id: "fileWorkingCopy.retry",
-                    label: ( localize(15042, "Retry")),
+                    label: ( localize(15232, "Retry")),
                     run: () => this.save({
                         ...options,
                         reason: SaveReason.EXPLICIT
@@ -672,7 +672,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.saveAs",
-                label: ( localize(15043, "Save As...")),
+                label: ( localize(15233, "Save As...")),
                 run: async () => {
                     const editor = this.workingCopyEditorService.findEditor(this);
                     if (editor) {
@@ -688,40 +688,40 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }));
             primaryActions.push(toAction({
                 id: "fileWorkingCopy.revert",
-                label: ( localize(15037, "Revert")),
+                label: ( localize(15227, "Revert")),
                 run: () => this.revert()
             }));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ? ( localize(
-                        15044,
+                        15234,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                         this.name
                     )) : ( localize(
-                        15045,
+                        15235,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                         this.name
                     ));
                 } else {
                     message = ( localize(
-                        15046,
+                        15236,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         this.name
                     ));
                 }
             } else if (canSaveElevated && isPermissionDenied) {
                 message = isWindows ? ( localize(
-                    15047,
+                    15237,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                     this.name
                 )) : ( localize(
-                    15048,
+                    15238,
                     "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                     this.name
                 ));
             } else {
                 message = ( localize(
-                    15049,
+                    15239,
                     "Failed to save '{0}': {1}",
                     this.name,
                     toErrorMessage(error, false)

package/vscode/src/vs/workbench/services/workspaces/browser/workspaces.d.ts

@@ -1,4 +1,4 @@
 import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "../../../../platform/workspace/common/workspace.js";
 import { URI } from "../../../../base/common/uri.js";
-export declare function getWorkspaceIdentifier(workspaceUri: URI): IWorkspaceIdentifier;
-export declare function getSingleFolderWorkspaceIdentifier(folderUri: URI): ISingleFolderWorkspaceIdentifier;
+export declare function getWorkspaceIdentifier(workspaceUri: URI, id?: string): IWorkspaceIdentifier;
+export declare function getSingleFolderWorkspaceIdentifier(folderUri: URI, id?: string): ISingleFolderWorkspaceIdentifier;

package/vscode/src/vs/workbench/services/workspaces/browser/workspaces.js

@@ -1,15 +1,15 @@
 
 import { hash } from '../../../../base/common/hash.js';
 
-function getWorkspaceIdentifier(workspaceUri) {
+function getWorkspaceIdentifier(workspaceUri, id) {
     return {
-        id: getWorkspaceId(workspaceUri),
+        id: id ?? getWorkspaceId(workspaceUri),
         configPath: workspaceUri
     };
 }
-function getSingleFolderWorkspaceIdentifier(folderUri) {
+function getSingleFolderWorkspaceIdentifier(folderUri, id) {
     return {
-        id: getWorkspaceId(folderUri),
+        id: id ?? getWorkspaceId(folderUri),
         uri: folderUri
     };
 }

package/vscode-dts/vscode.proposed.chatHooks.d.ts

@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// version: 6
+
+declare module 'vscode' {
+
+	/**
+	 * The type of hook to execute.
+	 */
+	export type ChatHookType = 'SessionStart' | 'UserPromptSubmit' | 'PreToolUse' | 'PostToolUse' | 'PreCompact' | 'SubagentStart' | 'SubagentStop' | 'Stop';
+
+	/**
+	 * A resolved hook command ready for execution.
+	 * The command has already been resolved for the current platform.
+	 */
+	export interface ChatHookCommand {
+		/**
+		 * The shell command to execute, already resolved for the current platform.
+		 */
+		readonly command: string;
+		/**
+		 * Working directory for the command.
+		 */
+		readonly cwd?: Uri;
+		/**
+		 * Additional environment variables for the command.
+		 */
+		readonly env?: Record<string, string>;
+		/**
+		 * Maximum execution time in seconds.
+		 */
+		readonly timeout?: number;
+	}
+
+	/**
+	 * Collected hooks for a chat request, organized by hook type.
+	 */
+	export interface ChatRequestHooks {
+		readonly [hookType: string]: readonly ChatHookCommand[];
+	}
+
+	/**
+	 * The kind of result from executing a hook command.
+	 * - 'success': Hook executed successfully (exit code 0)
+	 * - 'error': Blocking error shown to model (exit code 2)
+	 * - 'warning': Non-blocking warning shown to user only (other exit codes)
+	 */
+	export type ChatHookResultKind = 'success' | 'error' | 'warning';
+
+	/**
+	 * Result of executing a hook command.
+	 * Contains common flow control fields and the hook's output.
+	 */
+	export interface ChatHookResult {
+		/**
+		 * The kind of result from executing the hook.
+		 */
+		readonly resultKind: ChatHookResultKind;
+		/**
+		 * If set, the agent should stop processing entirely after this hook.
+		 * The message is shown to the user but not to the agent.
+		 */
+		readonly stopReason?: string;
+		/**
+		 * Warning message shown to the user.
+		 */
+		readonly warningMessage?: string;
+		/**
+		 * The hook's output (hook-specific fields only).
+		 * For errors, this is the error message string.
+		 */
+		readonly output: unknown;
+	}
+
+	export interface ChatRequest {
+		/**
+		 * Resolved hook commands for this request, organized by hook type.
+		 * The commands have already been resolved for the current platform.
+		 * Only present when hooks are enabled.
+		 */
+		readonly hooks?: ChatRequestHooks;
+	}
+
+	/**
+	 * A progress part representing the execution result of a hook.
+	 * Hooks are user-configured scripts that run at specific points during chat processing.
+	 * If {@link stopReason} is set, the hook blocked/denied the operation.
+	 */
+	export class ChatResponseHookPart {
+		/** The type of hook that was executed */
+		hookType: ChatHookType;
+		/** If set, the hook blocked processing. This message is shown to the user. */
+		stopReason?: string;
+		/** Warning/system message from the hook, shown to the user */
+		systemMessage?: string;
+		/** Optional metadata associated with the hook execution */
+		metadata?: { readonly [key: string]: unknown };
+
+		/**
+		 * Creates a new hook progress part.
+		 * @param hookType The type of hook that was executed
+		 * @param stopReason Message shown when processing was stopped
+		 * @param systemMessage Warning/system message from the hook
+		 * @param metadata Optional metadata
+		 */
+		constructor(hookType: ChatHookType, stopReason?: string, systemMessage?: string, metadata?: { readonly [key: string]: unknown });
+	}
+
+	export interface ExtendedChatResponseParts {
+		ChatResponseHookPart: ChatResponseHookPart;
+	}
+
+	export interface ChatResponseStream {
+
+		/**
+		 * Push a hook execution result to this stream.
+		 * @param hookType The type of hook that was executed
+		 * @param stopReason If set, the hook blocked processing. This message is shown to the user.
+		 * @param systemMessage Warning/system message from the hook
+		 */
+		hookProgress(hookType: ChatHookType, stopReason?: string, systemMessage?: string): void;
+	}
+}

package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts

@@ -346,7 +346,31 @@ declare module 'vscode' {
 		constructor(uris: Uri[], callback: () => Thenable<unknown>);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseWorkspaceEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart | ChatResponseQuestionCarouselPart;
+	/**
+	 * Internal type that lists all the proposed chat response parts. This is used to generate `ExtendedChatResponsePart`
+	 * which is the actual type used in this API. This is done so that other proposals can easily add their own response parts
+	 * without having to modify this file.
+	 */
+	export interface ExtendedChatResponseParts {
+		ChatResponsePart: ChatResponsePart;
+		ChatResponseTextEditPart: ChatResponseTextEditPart;
+		ChatResponseNotebookEditPart: ChatResponseNotebookEditPart;
+		ChatResponseWorkspaceEditPart: ChatResponseWorkspaceEditPart;
+		ChatResponseConfirmationPart: ChatResponseConfirmationPart;
+		ChatResponseCodeCitationPart: ChatResponseCodeCitationPart;
+		ChatResponseReferencePart2: ChatResponseReferencePart2;
+		ChatResponseMovePart: ChatResponseMovePart;
+		ChatResponseExtensionsPart: ChatResponseExtensionsPart;
+		ChatResponsePullRequestPart: ChatResponsePullRequestPart;
+		ChatToolInvocationPart: ChatToolInvocationPart;
+		ChatResponseMultiDiffPart: ChatResponseMultiDiffPart;
+		ChatResponseThinkingProgressPart: ChatResponseThinkingProgressPart;
+		ChatResponseExternalEditPart: ChatResponseExternalEditPart;
+		ChatResponseQuestionCarouselPart: ChatResponseQuestionCarouselPart;
+	}
+
+	export type ExtendedChatResponsePart = ExtendedChatResponseParts[keyof ExtendedChatResponseParts];
+
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
 		constructor(value: string | MarkdownString);

package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 12
+// version: 13
 
 declare module 'vscode' {
 
@@ -110,6 +110,11 @@ declare module 'vscode' {
 		 * Display name of the subagent that is invoking this request.
 		 */
 		readonly subAgentName?: string;
+
+		/**
+		 * Whether any hooks are enabled for this request.
+		 */
+		readonly hasHooksEnabled: boolean;
 	}
 
 	export enum ChatRequestEditedFileEventKind {
@@ -244,6 +249,8 @@ declare module 'vscode' {
 		provideFileIgnored(uri: Uri, token: CancellationToken): ProviderResult<boolean>;
 	}
 
+	export type PreToolUsePermissionDecision = 'allow' | 'deny' | 'ask';
+
 	export interface LanguageModelToolInvocationOptions<T> {
 		chatRequestId?: string;
 		/** @deprecated Use {@link chatSessionResource} instead */
@@ -255,6 +262,16 @@ declare module 'vscode' {
 		 * Unique ID for the subagent invocation, used to group tool calls from the same subagent run together.
 		 */
 		subAgentInvocationId?: string;
+		/**
+		 * Pre-tool-use hook result, if the hook was already executed by the caller.
+		 * When provided, the tools service will skip executing its own preToolUse hook
+		 * and use this result for permission decisions and input modifications instead.
+		 */
+		preToolUseResult?: {
+			permissionDecision?: PreToolUsePermissionDecision;
+			permissionDecisionReason?: string;
+			updatedInput?: object;
+		};
 	}
 
 	export interface LanguageModelToolInvocationPrepareOptions<T> {
@@ -267,6 +284,10 @@ declare module 'vscode' {
 		chatSessionId?: string;
 		chatSessionResource?: Uri;
 		chatInteractionId?: string;
+		/**
+		 * If set, tells the tool that it should include confirmation messages.
+		 */
+		forceConfirmationReason?: string;
 	}
 
 	export interface PreparedToolInvocation {
@@ -339,4 +360,17 @@ declare module 'vscode' {
 	}
 
 	// #endregion
+
+	// #region Steering
+
+	export interface ChatContext {
+		/**
+		 * Set to `true` by the editor to request the language model gracefully
+		 * stop after its next opportunity. When set, it's likely that the editor
+		 * will immediately follow up with a new request in the same conversation.
+		 */
+		readonly yieldRequested: boolean;
+	}
+
+	// #endregion
 }

package/vscode-dts/vscode.proposed.d.ts

@@ -11,6 +11,7 @@ import "./vscode.proposed.authSession.d.ts"
 import "./vscode.proposed.authenticationChallenges.d.ts"
 import "./vscode.proposed.canonicalUriProvider.d.ts"
 import "./vscode.proposed.chatContextProvider.d.ts"
+import "./vscode.proposed.chatHooks.d.ts"
 import "./vscode.proposed.chatOutputRenderer.d.ts"
 import "./vscode.proposed.chatParticipantAdditions.d.ts"
 import "./vscode.proposed.chatParticipantPrivate.d.ts"

package/workbench.js

@@ -30,10 +30,10 @@ function resolveWorkspace(configuration) {
         workspace = configuration.workspaceProvider.workspace;
     }
     if (workspace != null && isWorkspaceToOpen(workspace)) {
-        return getWorkspaceIdentifier$1(workspace.workspaceUri);
+        return getWorkspaceIdentifier$1(workspace.workspaceUri, workspace.id);
     }
     if (workspace != null && isFolderToOpen(workspace)) {
-        return getSingleFolderWorkspaceIdentifier(workspace.folderUri);
+        return getSingleFolderWorkspaceIdentifier(workspace.folderUri, workspace.id);
     }
     return UNKNOWN_EMPTY_WINDOW_WORKSPACE;
 }