@codingame/monaco-vscode-extensions-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
@@ -13,8 +13,16 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { hasValidDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
+import { isIChatViewViewContext, ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
+import { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -75,7 +83,8 @@ class ObservableChatSession extends Disposable {
                         prompt: turn.prompt,
                         participant: turn.participant,
                         command: turn.command,
-                        variableData: variables ? { variables } : undefined
+                        variableData: variables ? { variables } : undefined,
+                        id: turn.id
                     };
                 }
                 return {
@@ -98,7 +107,7 @@ class ObservableChatSession extends Disposable {
                         return confirmInterrupt();
                     }
                     return this._dialogService.confirm({
-                        message: ( localize(2466, 'Are you sure you want to interrupt the active session?'))
+                        message: ( localize(2479, 'Are you sure you want to interrupt the active session?'))
                     }).then(confirmed => {
                         if (confirmed.confirmed) {
                             return confirmInterrupt();
@@ -216,10 +225,12 @@ class ObservableChatSession extends Disposable {
     }
 }
 let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
-    constructor(_extHostContext, _chatSessionsService, _dialogService, _editorService, editorGroupService, _logService) {
+    constructor(_extHostContext, _chatSessionsService, _chatService, _chatWidgetService, _dialogService, _editorService, editorGroupService, _logService) {
         super();
         this._extHostContext = _extHostContext;
         this._chatSessionsService = _chatSessionsService;
+        this._chatService = _chatService;
+        this._chatWidgetService = _chatWidgetService;
         this._dialogService = _dialogService;
         this._editorService = _editorService;
         this.editorGroupService = editorGroupService;
@@ -245,7 +256,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
         const changeEmitter = disposables.add(( new Emitter()));
         const provider = {
             chatSessionType,
-            onDidChangeChatSessionItems: changeEmitter.event,
+            onDidChangeChatSessionItems: Event.debounce(changeEmitter.event, (_, e) => e, 200),
             provideChatSessionItems: (token) => this._provideChatSessionItems(handle, token),
             provideNewChatSessionItem: (options, token) => this._provideNewChatSessionItem(handle, options, token)
         };
@@ -255,10 +266,15 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             provider,
             onDidChangeItems: changeEmitter,
         });
+        disposables.add(this._chatSessionsService.registerChatModelChangeListeners(this._chatService, chatSessionType, () => changeEmitter.fire()));
     }
     $onDidChangeChatSessionItems(handle) {
         this._itemProvidersRegistrations.get(handle)?.onDidChangeItems.fire();
     }
+    $onDidChangeChatSessionOptions(handle, sessionResourceComponents, updates) {
+        const sessionResource = URI.revive(sessionResourceComponents);
+        this._chatSessionsService.notifySessionOptionsChange(sessionResource, updates);
+    }
     async $onDidCommitChatSessionItem(handle, originalComponents, modifiedCompoennts) {
         const originalResource = URI.revive(originalComponents);
         const modifiedResource = URI.revive(modifiedCompoennts);
@@ -269,19 +285,20 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             return;
         }
         const originalEditor = this._editorService.editors.find(editor => editor.resource?.toString() === ( originalResource.toString()));
+        const originalModel = this._chatService.getSession(originalResource);
         const contribution = this._chatSessionsService.getAllChatSessionContributions().find(c => c.type === chatSessionType);
         const originalGroup = this.editorGroupService.groups.find(group => ( group.editors.some(editor => isEqual(editor.resource, originalResource))))
             ?? this.editorGroupService.activeGroup;
         const options = {
             title: {
                 preferred: originalEditor?.getName() || undefined,
-                fallback: ( localize(2467, "{0}", contribution?.displayName)),
+                fallback: ( localize(2480, "{0}", contribution?.displayName)),
             }
         };
+        const newSession = await this._chatSessionsService.getOrCreateChatSession(URI.revive(modifiedResource), CancellationToken.None);
         if (originalEditor) {
-            const newSession = await this._chatSessionsService.getOrCreateChatSession(URI.revive(modifiedResource), CancellationToken.None);
-            newSession.initialEditingSession = originalEditor instanceof ChatEditorInput
-                ? originalEditor.transferOutEditingSession()
+            newSession.transferredState = originalEditor instanceof ChatEditorInput
+                ? { editingSession: originalEditor.transferOutEditingSession(), inputState: originalModel?.inputModel.toJSON() }
                 : undefined;
             this._editorService.replaceEditors([{
                     editor: originalEditor,
@@ -290,21 +307,50 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
                         options,
                     },
                 }], originalGroup);
+            return;
+        }
+        if (originalModel) {
+            newSession.transferredState = {
+                editingSession: originalModel.editingSession,
+                inputState: originalModel.inputModel.toJSON()
+            };
+        }
+        const chatViewWidget = this._chatWidgetService.getWidgetBySessionResource(originalResource);
+        if (chatViewWidget && isIChatViewViewContext(chatViewWidget.viewContext)) {
+            await this._chatWidgetService.openSession(modifiedResource, ChatViewPaneTarget, { preserveFocus: true });
         }
         else {
-            this._logService.warn(`Original chat session editor not found for resource ${( originalResource.toString())}`);
-            this._editorService.openEditor({ resource: modifiedResource }, originalGroup);
+            const ref = await this._chatService.loadSessionForResource(modifiedResource, ChatAgentLocation.Chat, CancellationToken.None);
+            ref?.dispose();
         }
     }
     async _provideChatSessionItems(handle, token) {
         try {
             const sessions = await this._proxy.$provideChatSessionItems(handle, token);
-            return ( sessions.map(session => ({
-                ...session,
-                id: session.id,
-                resource: URI.revive(session.resource),
-                iconPath: session.iconPath,
-                tooltip: session.tooltip ? this._reviveTooltip(session.tooltip) : undefined
+            return Promise.all(( sessions.map(async (session) => {
+                const uri = URI.revive(session.resource);
+                const model = this._chatService.getSession(uri);
+                if (model) {
+                    session = await this.handleSessionModelOverrides(model, session);
+                }
+                if (!session.changes || !model) {
+                    const stats = (await this._chatService.getMetadataForSession(uri))?.stats;
+                    const diffs = {
+                        files: stats?.fileCount || 0,
+                        insertions: stats?.added || 0,
+                        deletions: stats?.removed || 0
+                    };
+                    if (hasValidDiff(diffs)) {
+                        session.changes = diffs;
+                    }
+                }
+                return {
+                    ...session,
+                    changes: revive(session.changes),
+                    resource: uri,
+                    iconPath: session.iconPath,
+                    tooltip: session.tooltip ? this._reviveTooltip(session.tooltip) : undefined,
+                };
             })));
         }
         catch (error) {
@@ -312,6 +358,26 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
         }
         return [];
     }
+    async handleSessionModelOverrides(model, session) {
+        const inProgress = this._chatSessionsService.getInProgress();
+        if (inProgress.length) {
+            session.description = this._chatSessionsService.getInProgressSessionDescription(model);
+        }
+        if (!(session.changes instanceof Array)) {
+            const modelStats = await awaitStatsForSession(model);
+            if (modelStats) {
+                session.changes = {
+                    files: modelStats.fileCount,
+                    insertions: modelStats.added,
+                    deletions: modelStats.removed
+                };
+            }
+        }
+        if (model.lastRequest?.response?.state === ResponseModelState.NeedsInput) {
+            session.status = ChatSessionStatus.NeedsInput;
+        }
+        return session;
+    }
     async _provideNewChatSessionItem(handle, options, token) {
         try {
             const chatSessionItem = await this._proxy.$provideNewChatSessionItem(handle, options, token);
@@ -320,7 +386,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             }
             return {
                 ...chatSessionItem,
-                id: chatSessionItem.id,
+                changes: revive(chatSessionItem.changes),
                 resource: URI.revive(chatSessionItem.resource),
                 iconPath: chatSessionItem.iconPath,
                 tooltip: chatSessionItem.tooltip ? this._reviveTooltip(chatSessionItem.tooltip) : undefined,
@@ -458,10 +524,12 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
 MainThreadChatSessions = __decorate([
     extHostNamedCustomer(MainContext.MainThreadChatSessions),
     ( __param(1, IChatSessionsService)),
-    ( __param(2, IDialogService)),
-    ( __param(3, IEditorService)),
-    ( __param(4, IEditorGroupsService)),
-    ( __param(5, ILogService))
+    ( __param(2, IChatService)),
+    ( __param(3, IChatWidgetService)),
+    ( __param(4, IDialogService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, IEditorGroupsService)),
+    ( __param(7, ILogService))
 ], MainThreadChatSessions);
 
 export { MainThreadChatSessions, ObservableChatSession };

package/vscode/src/vs/workbench/api/browser/mainThreadChatStatus.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatStatusItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatusItemService.service";
+import { IChatStatusItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { ChatStatusItemDto, MainThreadChatStatusShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadChatStatus extends Disposable implements MainThreadChatStatusShape {

package/vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IChatStatusItemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatusItemService.service';
+import { IChatStatusItemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 

package/vscode/src/vs/workbench/api/browser/mainThreadComments.d.ts

@@ -11,7 +11,7 @@ import { ICommentService } from "@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { CommentProviderFeatures, ExtHostCommentsShape, MainThreadCommentsShape, CommentThreadChanges } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { MarshalledId } from "@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds";
-import { ICellRange } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { MarshalledCommentThread } from "../../common/comments.js";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -8,20 +8,20 @@ import { CommentThreadCollapsibleState } from '@codingame/monaco-vscode-api/vsco
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ICommentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/comments/browser/commentService.service';
-import { CommentsPanel } from '@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common/vscode/vs/workbench/contrib/comments/browser/commentsView';
+import { CommentsPanel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE } from '@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
+import { COMMENTS_VIEW_ID, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
 import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { revealCommentThread } from '@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common/vscode/vs/workbench/contrib/comments/browser/commentsController';
+import { revealCommentThread } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/comments/browser/commentsController';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
@@ -424,7 +424,7 @@ class MainThreadCommentController extends Disposable {
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2468, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2481, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -22,19 +22,19 @@ import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { reviveWebviewExtension } from './mainThreadWebviews.js';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { CustomEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { ICustomEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { CustomTextEditorModel } from '../../contrib/customEditor/common/customTextEditorModel.js';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { ResourceWorkingCopy } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
-import { NO_TYPE_ID, WorkingCopyCapabilities } from '@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { ResourceWorkingCopy } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
+import { NO_TYPE_ID, WorkingCopyCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
@@ -303,7 +303,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    2469,
+                    2482,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
@@ -371,7 +371,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(2470, "Edit")),
+            label: label ?? ( localize(2483, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.d.ts

@@ -5,6 +5,7 @@ import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadTextEditor } from "./mainThreadEditor.js";
+import { IMainThreadEditorLocator } from "./mainThreadEditors.js";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
@@ -17,7 +18,7 @@ import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IPaneCompositePartService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IQuickDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service";
-export declare class MainThreadDocumentsAndEditors {
+export declare class MainThreadDocumentsAndEditors implements IMainThreadEditorLocator {
     private readonly _modelService;
     private readonly _textFileService;
     private readonly _editorService;

package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js

@@ -13,7 +13,7 @@ import { MainThreadDocuments } from './mainThreadDocuments.js';
 import { MainThreadTextEditor } from './mainThreadEditor.js';
 import { MainThreadTextEditors } from './mainThreadEditors.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';

package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js

@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2471, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2484, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         }));
         return raceCancellationError(p, token);

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.d.ts

@@ -1,7 +1,7 @@
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { MainThreadEditorTabsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js

@@ -9,18 +9,18 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { ExtHostContext, TabInputKind, TabModelOperationKind, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { EditorResourceAccessor, SideBySideEditor, GroupModelChangeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
-import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common/vscode/vs/workbench/common/editor/editorGroupModel';
+import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorGroupModel';
 import { SideBySideEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { InteractiveEditorInput } from '@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
-import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { TerminalEditorInput } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { WebviewInput } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/textResourceEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CustomEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { InteractiveEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
+import { MergeEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { TerminalEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupDirection, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';

package/vscode/src/vs/workbench/api/browser/mainThreadEditors.d.ts

@@ -6,7 +6,7 @@ import { IDecorationOptions, IDecorationRenderOptions } from "@codingame/monaco-
 import { ISingleEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation";
 import { MainThreadTextEditor } from "./mainThreadEditor.js";
 import { IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";

package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js

@@ -8,7 +8,7 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { isTextEditorDiffInformationEqual, EditorResolution, EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2472,
+                    2485,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [toAction({ id: 'reload', label: ( localize(2473, "Reload Window")), run: () => this._hostService.reload() })]
+                    primary: [toAction({ id: 'reload', label: ( localize(2486, "Reload Window")), run: () => this._hostService.reload() })]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2474,
+                        2487,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -116,13 +116,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2475,
+                        2488,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [toAction({ id: 'manageWorkspaceTrust', label: ( localize(2476, "Manage Workspace Trust")), run: () => this._commandService.executeCommand('workbench.trust.manage') })]
+                        primary: [toAction({ id: 'manageWorkspaceTrust', label: ( localize(2489, "Manage Workspace Trust")), run: () => this._commandService.executeCommand('workbench.trust.manage') })]
                     }
                 });
             }
@@ -130,14 +130,14 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2477,
+                        2490,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
                         primary: [toAction({
-                                id: 'enable', label: ( localize(2478, "Enable and Reload")), enabled: true,
+                                id: 'enable', label: ( localize(2491, "Enable and Reload")), enabled: true,
                                 run: () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                     .then(() => this._hostService.reload(), e => this._notificationService.error(e))
                             })]
@@ -148,7 +148,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2479,
+                        2492,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -169,7 +169,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2480,
+                    2493,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
@@ -178,7 +178,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                             id: 'install',
-                            label: ( localize(2481, "Install and Reload")),
+                            label: ( localize(2494, "Install and Reload")),
                             run: () => this._extensionsWorkbenchService.install(dependencyExtension)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))
                         })]
@@ -187,7 +187,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
         }
         else {
             this._notificationService.error(( localize(
-                2482,
+                2495,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency