@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.1

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.js

@@ -8,23 +8,20 @@ import { InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 var ChatGettingStartedContribution_1;
 let ChatGettingStartedContribution = class ChatGettingStartedContribution extends Disposable {
     static { ChatGettingStartedContribution_1 = this; }
     static { this.ID = 'workbench.contrib.chatGettingStarted'; }
     static { this.hideWelcomeView = 'workbench.chat.hideWelcomeView'; }
-    constructor(productService, extensionService, viewsService, extensionManagementService, storageService, layoutService) {
+    constructor(productService, extensionService, extensionManagementService, storageService, chatWidgetService) {
         super();
         this.productService = productService;
         this.extensionService = extensionService;
-        this.viewsService = viewsService;
         this.extensionManagementService = extensionManagementService;
         this.storageService = storageService;
-        this.layoutService = layoutService;
+        this.chatWidgetService = chatWidgetService;
         this.recentlyInstalled = false;
         const defaultChatAgent = this.productService.defaultChatAgent;
         const hideWelcomeView = this.storageService.getBoolean(ChatGettingStartedContribution_1.hideWelcomeView, StorageScope.APPLICATION, false);
@@ -55,7 +52,7 @@ let ChatGettingStartedContribution = class ChatGettingStartedContribution extend
         }));
     }
     async onDidInstallChat() {
-        showChatView(this.viewsService, this.layoutService);
+        this.chatWidgetService.revealWidget();
         this.storageService.store(ChatGettingStartedContribution_1.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
         this.recentlyInstalled = false;
     }
@@ -63,10 +60,9 @@ let ChatGettingStartedContribution = class ChatGettingStartedContribution extend
 ChatGettingStartedContribution = ChatGettingStartedContribution_1 = ( __decorate([
     ( __param(0, IProductService)),
     ( __param(1, IExtensionService)),
-    ( __param(2, IViewsService)),
-    ( __param(3, IExtensionManagementService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, IWorkbenchLayoutService))
+    ( __param(2, IExtensionManagementService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, IChatWidgetService))
 ], ChatGettingStartedContribution));
 
 export { ChatGettingStartedContribution };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.js

@@ -5,23 +5,23 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isExportableSessionData } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isExportableSessionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(4715, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4735, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4716, "Export Chat...")),
+                title: ( localize2(4736, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -58,7 +58,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4717, "Import Chat...")),
+                title: ( localize2(4737, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -67,7 +67,7 @@ function registerChatExportActions() {
         async run(accessor, ...args) {
             const fileDialogService = accessor.get(IFileDialogService);
             const fileService = accessor.get(IFileService);
-            const editorService = accessor.get(IEditorService);
+            const widgetService = accessor.get(IChatWidgetService);
             const defaultUri = joinPath(await fileDialogService.defaultFilePath(), defaultFileName);
             const result = await fileDialogService.showOpenDialog({
                 defaultUri,
@@ -79,12 +79,12 @@ function registerChatExportActions() {
             }
             const content = await fileService.readFile(result[0]);
             try {
-                const data = JSON.parse(( content.value.toString()));
+                const data = revive(JSON.parse(( content.value.toString())));
                 if (!isExportableSessionData(data)) {
                     throw ( new Error('Invalid chat session data'));
                 }
                 const options = { target: { data }, pinned: true };
-                await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options });
+                await widgetService.openSession(ChatEditorInput.getNewEditorUri(), undefined, options);
             }
             catch (err) {
                 throw err;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.js

@@ -6,21 +6,20 @@ import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscod
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ManageModelsAction } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/actions/manageModelsActions';
 
 class ManageLanguageModelAuthenticationAction extends Action2 {
     static { this.ID = 'workbench.action.chat.manageLanguageModelAuthentication'; }
     constructor() {
         super({
             id: ManageLanguageModelAuthenticationAction.ID,
-            title: ( localize2(4718, 'Manage Language Model Access...')),
+            title: ( localize2(4738, 'Manage Language Model Access...')),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -91,9 +90,9 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
         if (extensionAuth.size === 0) {
             dialogService.prompt({
                 type: 'info',
-                message: ( localize(4719, 'No language models requiring authentication found.')),
+                message: ( localize(4739, 'No language models requiring authentication found.')),
                 detail: ( localize(
-                    4720,
+                    4740,
                     'There are currently no language models that require authentication.'
                 ))
             });
@@ -108,10 +107,10 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
             items.push({
                 type: 'separator',
                 id: ownerId,
-                label: ( localize(4721, '{0}', extension.displayName || extension.name)),
+                label: ( localize(4741, '{0}', extension.displayName || extension.name)),
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(Codicon.info),
-                        tooltip: ( localize(4722, 'Open Extension')),
+                        tooltip: ( localize(4742, 'Open Extension')),
                     }]
             });
             let addedTrustedSeparator = false;
@@ -120,7 +119,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     if (allowedExt.trusted && !addedTrustedSeparator) {
                         items.push({
                             type: 'separator',
-                            label: ( localize(4723, 'Trusted by Microsoft')),
+                            label: ( localize(4743, 'Trusted by Microsoft')),
                         });
                         addedTrustedSeparator = true;
                     }
@@ -133,16 +132,16 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                         disabled: allowedExt.trusted,
                         buttons: [{
                                 iconClass: ThemeIcon.asClassName(Codicon.info),
-                                tooltip: ( localize(4722, 'Open Extension')),
+                                tooltip: ( localize(4742, 'Open Extension')),
                             }]
                     });
                 }
             }
             else {
                 items.push({
-                    label: ( localize(4724, 'No extensions have access')),
+                    label: ( localize(4744, 'No extensions have access')),
                     description: ( localize(
-                        4725,
+                        4745,
                         'No extensions are currently allowed to use models from {0}',
                         ownerId
                     )),
@@ -165,8 +164,8 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     void extensionsWorkbenchService.open(extId);
                 }
             },
-            title: ( localize(4726, 'Manage Language Model Access')),
-            placeHolder: ( localize(4727, 'Choose which extensions can access language models')),
+            title: ( localize(4746, 'Manage Language Model Access')),
+            placeHolder: ( localize(4747, 'Choose which extensions can access language models')),
         });
         if (!result) {
             return;
@@ -185,7 +184,6 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
 }
 function registerLanguageModelActions() {
     registerAction2(ManageLanguageModelAuthenticationAction);
-    registerAction2(ManageModelsAction);
 }
 
 export { registerLanguageModelActions };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.js

@@ -12,11 +12,11 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } 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 { ChatEditor } from '../chatEditor.js';
-import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 var MoveToNewLocation;
 (function (MoveToNewLocation) {
@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInEditor',
-                title: ( localize2(4728, "Move Chat into Editor Area")),
+                title: ( localize2(4748, "Move Chat into Editor Area")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -49,7 +49,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInNewWindow',
-                title: ( localize2(4729, "Move Chat into New Window")),
+                title: ( localize2(4749, "Move Chat into New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -70,7 +70,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInSidebar',
-                title: ( localize2(4730, "Move Chat into Side Bar")),
+                title: ( localize2(4750, "Move Chat into Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -89,31 +89,30 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        appendOpenChatInViewMenuItem(id, ( localize(4731, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4732, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4733, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
+        appendOpenChatInViewMenuItem(id, ( localize(4751, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4752, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4753, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, sessionResource) {
     const widgetService = accessor.get(IChatWidgetService);
-    const editorService = accessor.get(IEditorService);
+    const auxiliary = { compact: true, bounds: { width: 800, height: 640 } };
     const widget = (sessionResource ? widgetService.getWidgetBySessionResource(sessionResource) : undefined)
         ?? widgetService.lastFocusedWidget;
     if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Chat) {
-        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+        await widgetService.openSession(ChatEditorInput.getNewEditorUri(), moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP, { pinned: true, auxiliary });
         return;
     }
     const existingWidget = widgetService.getWidgetBySessionResource(widget.viewModel.sessionResource);
     if (!existingWidget) {
-        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+        await widgetService.openSession(ChatEditorInput.getNewEditorUri(), moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP, { pinned: true, auxiliary });
         return;
     }
-    const viewState = widget.getViewState();
     const resourceToOpen = widget.viewModel.sessionResource;
-    widget.clear();
-    await widget.waitForReady();
-    const options = { pinned: true, viewState, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } };
-    await editorService.openEditor({ resource: resourceToOpen, options }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+    const modelInputState = existingWidget.getViewState();
+    await widget.clear();
+    const options = { pinned: true, modelInputState, auxiliary };
+    await widgetService.openSession(resourceToOpen, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP, options);
 }
 async function moveToSidebar(accessor) {
     const viewsService = accessor.get(IViewsService);
@@ -123,9 +122,13 @@ async function moveToSidebar(accessor) {
     const chatEditorInput = chatEditor?.input;
     let view;
     if (chatEditor instanceof ChatEditor && chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionResource) {
+        const previousViewState = chatEditor.widget.getViewState();
         await editorService.closeEditor({ editor: chatEditor.input, groupId: editorGroupService.activeGroup.id });
         view = await viewsService.openView(ChatViewId);
-        await view.loadSession(chatEditorInput.sessionResource, chatEditor.getViewState());
+        const newModel = await view.loadSession(chatEditorInput.sessionResource);
+        if (previousViewState && newModel && !newModel.inputModel.state.get()) {
+            newModel.inputModel.setState(previousViewState);
+        }
     }
     else {
         view = await viewsService.openView(ChatViewId);

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.js

@@ -11,18 +11,19 @@ import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } 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 { getEditingSessionContext, EditingSessionAction } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
-import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, handleCurrentEditingSession, ACTION_ID_NEW_EDIT_SESSION } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { clearChatEditor } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { getEditingSessionContext, EditingSessionAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, handleCurrentEditingSession, ACTION_ID_NEW_EDIT_SESSION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { clearChatEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
 
 function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         submenu: MenuId.ChatNewMenu,
-        title: ( localize2(4734, "New Chat")),
+        title: ( localize2(4754, "New Chat")),
         icon: Codicon.plus,
         when: ( ContextKeyExpr.equals('view', ChatViewId)),
         group: 'navigation',
@@ -33,7 +34,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(4735, "New Chat")),
+                title: ( localize2(4755, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled,
@@ -49,7 +50,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(4734, "New Chat")),
+                title: ( localize2(4754, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -92,13 +93,13 @@ function registerNewChatActions() {
             }
             const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
             const dialogService = accessor.get(IDialogService);
-            if (editingSession && !(await handleCurrentEditingSession(editingSession, undefined, dialogService))) {
+            const model = widget.viewModel?.model;
+            if (model && !(await handleCurrentEditingSession(model, undefined, dialogService))) {
                 return;
             }
             accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             await editingSession?.stop();
-            widget.clear();
-            await widget.waitForReady();
+            await widget.clear();
             widget.attachmentModel.clear(true);
             widget.input.relatedFiles?.clear();
             widget.focusInput();
@@ -119,11 +120,19 @@ function registerNewChatActions() {
         }
     });
     CommandsRegistry.registerCommandAlias(ACTION_ID_NEW_EDIT_SESSION, ACTION_ID_NEW_CHAT);
+    MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
+        command: {
+            id: ACTION_ID_NEW_CHAT,
+            title: ( localize2(4756, "Go Back")),
+            icon: Codicon.arrowLeft,
+        },
+        group: 'navigation'
+    });
     registerAction2(class UndoChatEditInteractionAction extends EditingSessionAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.undoEdit',
-                title: ( localize2(4736, "Undo Last Request")),
+                title: ( localize2(4757, "Undo Last Request")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -145,7 +154,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit',
-                title: ( localize2(4737, "Redo Last Request")),
+                title: ( localize2(4758, "Redo Last Request")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -162,17 +171,17 @@ function registerNewChatActions() {
             });
         }
         async runEditingSessionAction(accessor, editingSession) {
-            const widget = accessor.get(IChatWidgetService);
+            const chatService = accessor.get(IChatService);
             await editingSession.redoInteraction();
-            widget.lastFocusedWidget?.viewModel?.model.setCheckpoint(undefined);
+            chatService.getSession(editingSession.chatSessionResource)?.setCheckpoint(undefined);
         }
     });
     registerAction2(class RedoChatCheckpoints extends EditingSessionAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit2',
-                title: ( localize2(4738, "Redo")),
-                tooltip: ( localize2(4739, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(4759, "Redo")),
+                tooltip: ( localize2(4760, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
@@ -189,7 +198,7 @@ function registerNewChatActions() {
             while (editingSession.canRedo.get()) {
                 await editingSession.redoInteraction();
             }
-            const currentWidget = widget.lastFocusedWidget;
+            const currentWidget = widget.getWidgetBySessionResource(editingSession.chatSessionResource);
             const requestText = currentWidget?.viewModel?.model.checkpoint?.message.text;
             if (currentWidget?.inputEditor.getValue() === requestText) {
                 currentWidget?.input.setValue('', false);

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.js

@@ -3,17 +3,17 @@ import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatPromptNavigationActions() {
     registerAction2(class NextUserPromptAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextUserPrompt',
-                title: ( localize2(4740, "Next User Prompt")),
+                title: ( localize2(4761, "Next User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatPromptNavigationActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousUserPrompt',
-                title: ( localize2(4741, "Previous User Prompt")),
+                title: ( localize2(4762, "Previous User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
                     weight: KeybindingWeight.WorkbenchContrib,

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.d.ts

@@ -1,2 +1,2 @@
-export { ASK_QUICK_QUESTION_ACTION_ID } from "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants";
+export { ASK_QUICK_QUESTION_ACTION_ID } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants";
 export declare function registerQuickChatActions(): void;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js

@@ -5,11 +5,11 @@ import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
-export { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+export { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 function registerQuickChatActions() {
     registerAction2(QuickChatGlobalAction);
@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4742, "Open in Chat View")),
+                title: ( localize2(4763, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.chatSparkle,
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.close',
-                title: ( localize2(4743, "Close Quick Chat")),
+                title: ( localize2(4764, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -59,7 +59,7 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4744, 'Open Quick Chat')),
+            title: ( localize2(4765, 'Open Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.chatSparkle,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4745, 'Toggle the quick chat')),
+                description: ( localize(4766, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4746, "The query to open the quick chat with")),
+                                            description: ( localize(4767, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4747, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4768, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4746, "The query to open the quick chat with"))
+                                    description: ( localize(4767, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -125,7 +125,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4748, "Open Quick Chat")),
+            title: ( localize2(4769, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatSessionActions.d.ts

@@ -1,11 +1,12 @@
 import { MarshalledId } from "@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds";
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ChatSessionItemWithProvider } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common";
-interface IMarshalledChatSessionContext {
-    $mid: MarshalledId.ChatSessionContext;
-    session: ChatSessionItemWithProvider;
+import { IChatSessionItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+export interface IMarshalledChatSessionContext {
+    readonly $mid: MarshalledId.ChatSessionContext;
+    readonly session: IChatSessionItem;
 }
+export declare function isMarshalledChatSessionContext(thing: unknown): thing is IMarshalledChatSessionContext;
 export declare class RenameChatSessionAction extends Action2 {
     static readonly id = "workbench.action.chat.renameSession";
     constructor();
@@ -19,22 +20,6 @@ export declare class DeleteChatSessionAction extends Action2 {
     constructor();
     run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void>;
 }
-/**
- * Action to open a chat session in a new window
- */
-export declare class OpenChatSessionInNewWindowAction extends Action2 {
-    static readonly id = "workbench.action.chat.openSessionInNewWindow";
-    constructor();
-    run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void>;
-}
-/**
- * Action to open a chat session in a new editor group to the side
- */
-export declare class OpenChatSessionInNewEditorGroupAction extends Action2 {
-    static readonly id = "workbench.action.chat.openSessionInNewEditorGroup";
-    constructor();
-    run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void>;
-}
 /**
  * Action to open a chat session in the sidebar (chat widget)
  */
@@ -55,13 +40,7 @@ export declare class ToggleChatSessionsDescriptionDisplayAction extends Action2
  * Action to toggle between 'view' and 'single-view' modes for Agent Sessions
  */
 export declare class ToggleAgentSessionsViewLocationAction extends Action2 {
-    static readonly id = "workbench.action.chatSessions.toggleNewSingleView";
-    constructor();
-    run(accessor: ServicesAccessor): Promise<void>;
-}
-export declare class ChatSessionsGettingStartedAction extends Action2 {
-    static readonly ID = "chat.sessions.gettingStarted";
+    static readonly id = "workbench.action.chatSessions.toggleNewCombinedView";
     constructor();
     run(accessor: ServicesAccessor): Promise<void>;
 }
-export {};