@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.1

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

@@ -4,8 +4,8 @@ import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { katexContainerClassName, katexContainerLatexAttributeName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/markdown/common/markedKatexExtension';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
@@ -14,7 +14,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4703, "Copy All")),
+                title: ( localize2(4729, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -44,7 +44,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4704, "Copy")),
+                title: ( localize2(4730, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -79,7 +79,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyKatexMathSource',
-                title: ( localize2(4705, "Copy Math Source")),
+                title: ( localize2(4731, "Copy Math Source")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -3,20 +3,22 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-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 { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 function registerChatDeveloperActions() {
     registerAction2(LogChatInputHistoryAction);
     registerAction2(LogChatIndexAction);
+    registerAction2(InspectChatModelAction);
 }
 class LogChatInputHistoryAction extends Action2 {
     static { this.ID = 'workbench.action.chat.logInputHistory'; }
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4706, "Log Chat Input History")),
+            title: ( localize2(4732, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -33,7 +35,7 @@ class LogChatIndexAction extends Action2 {
     constructor() {
         super({
             id: LogChatIndexAction.ID,
-            title: ( localize2(4707, "Log Chat Index")),
+            title: ( localize2(4733, "Log Chat Index")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -45,5 +47,47 @@ class LogChatIndexAction extends Action2 {
         chatService.logChatIndex();
     }
 }
+class InspectChatModelAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.inspectChatModel'; }
+    constructor() {
+        super({
+            id: InspectChatModelAction.ID,
+            title: ( localize2(4734, "Inspect Chat Model")),
+            icon: Codicon.inspect,
+            category: Categories.Developer,
+            f1: true,
+            precondition: ChatContextKeys.enabled
+        });
+    }
+    async run(accessor, ...args) {
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        const editorService = accessor.get(IEditorService);
+        const widget = chatWidgetService.lastFocusedWidget;
+        if (!widget?.viewModel) {
+            return;
+        }
+        const model = widget.viewModel.model;
+        const modelData = model.toJSON();
+        let output = '# Chat Model Inspection\n\n';
+        const requests = modelData.requests;
+        if (requests && requests.length > 0) {
+            const latestRequest = requests[requests.length - 1];
+            if (latestRequest.response) {
+                output += '## Latest Response\n\n';
+                output += '```json\n' + JSON.stringify(latestRequest.response, null, 2) + '\n```\n\n';
+            }
+        }
+        output += '## Full Chat Model\n\n';
+        output += '```json\n' + JSON.stringify(modelData, null, 2) + '\n```\n';
+        await editorService.openEditor({
+            resource: undefined,
+            contents: output,
+            languageId: 'markdown',
+            options: {
+                pinned: true
+            }
+        });
+    }
+}
 
 export { registerChatDeveloperActions };

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

@@ -5,15 +5,15 @@ import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 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 { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4733, "Next File Tree")),
+                title: ( localize2(4760, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(4734, "Previous File Tree")),
+                title: ( localize2(4761, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -7,21 +7,21 @@ import { IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 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-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-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { isExportableSessionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(4735, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4762, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4736, "Export Chat...")),
+                title: ( localize2(4763, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -58,7 +58,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4737, "Import Chat...")),
+                title: ( localize2(4764, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,

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

@@ -12,14 +12,14 @@ import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 
 class ManageLanguageModelAuthenticationAction extends Action2 {
     static { this.ID = 'workbench.action.chat.manageLanguageModelAuthentication'; }
     constructor() {
         super({
             id: ManageLanguageModelAuthenticationAction.ID,
-            title: ( localize2(4738, 'Manage Language Model Access...')),
+            title: ( localize2(4765, 'Manage Language Model Access...')),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -90,9 +90,9 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
         if (extensionAuth.size === 0) {
             dialogService.prompt({
                 type: 'info',
-                message: ( localize(4739, 'No language models requiring authentication found.')),
+                message: ( localize(4766, 'No language models requiring authentication found.')),
                 detail: ( localize(
-                    4740,
+                    4767,
                     'There are currently no language models that require authentication.'
                 ))
             });
@@ -107,10 +107,10 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
             items.push({
                 type: 'separator',
                 id: ownerId,
-                label: ( localize(4741, '{0}', extension.displayName || extension.name)),
+                label: ( localize(4768, '{0}', extension.displayName || extension.name)),
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(Codicon.info),
-                        tooltip: ( localize(4742, 'Open Extension')),
+                        tooltip: ( localize(4769, 'Open Extension')),
                     }]
             });
             let addedTrustedSeparator = false;
@@ -119,7 +119,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     if (allowedExt.trusted && !addedTrustedSeparator) {
                         items.push({
                             type: 'separator',
-                            label: ( localize(4743, 'Trusted by Microsoft')),
+                            label: ( localize(4770, 'Trusted by Microsoft')),
                         });
                         addedTrustedSeparator = true;
                     }
@@ -132,16 +132,16 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                         disabled: allowedExt.trusted,
                         buttons: [{
                                 iconClass: ThemeIcon.asClassName(Codicon.info),
-                                tooltip: ( localize(4742, 'Open Extension')),
+                                tooltip: ( localize(4769, 'Open Extension')),
                             }]
                     });
                 }
             }
             else {
                 items.push({
-                    label: ( localize(4744, 'No extensions have access')),
+                    label: ( localize(4771, 'No extensions have access')),
                     description: ( localize(
-                        4745,
+                        4772,
                         'No extensions are currently allowed to use models from {0}',
                         ownerId
                     )),
@@ -164,8 +164,8 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     void extensionsWorkbenchService.open(extId);
                 }
             },
-            title: ( localize(4746, 'Manage Language Model Access')),
-            placeHolder: ( localize(4747, 'Choose which extensions can access language models')),
+            title: ( localize(4773, 'Manage Language Model Access')),
+            placeHolder: ( localize(4774, 'Choose which extensions can access language models')),
         });
         if (!result) {
             return;

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

@@ -9,13 +9,13 @@ import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { AUX_WINDOW_GROUP, ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-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 { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatActions';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 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-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditor } from '../widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 var MoveToNewLocation;
@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInEditor',
-                title: ( localize2(4748, "Move Chat into Editor Area")),
+                title: ( localize2(4775, "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(4749, "Move Chat into New Window")),
+                title: ( localize2(4776, "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(4750, "Move Chat into Side Bar")),
+                title: ( localize2(4777, "Move Chat into Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -89,9 +89,9 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        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)));
+        appendOpenChatInViewMenuItem(id, ( localize(4778, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4779, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4780, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, sessionResource) {

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

@@ -2,28 +2,27 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 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-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 { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/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';
+import { clearChatEditor } from './chatClear.js';
+import { AgentSessionsViewerOrientation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 
 function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         submenu: MenuId.ChatNewMenu,
-        title: ( localize2(4754, "New Chat")),
+        title: ( localize2(4781, "New Chat")),
         icon: Codicon.plus,
         when: ( ContextKeyExpr.equals('view', ChatViewId)),
         group: 'navigation',
@@ -34,15 +33,13 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(4755, "New Chat")),
+                title: ( localize2(4782, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled,
             });
         }
         async run(accessor, ...args) {
-            const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
-            accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             await clearChatEditor(accessor);
         }
     });
@@ -50,7 +47,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(4754, "New Chat")),
+                title: ( localize2(4781, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -91,13 +88,11 @@ function registerNewChatActions() {
             if (!widget) {
                 return;
             }
-            const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
             const dialogService = accessor.get(IDialogService);
             const model = widget.viewModel?.model;
             if (model && !(await handleCurrentEditingSession(model, undefined, dialogService))) {
                 return;
             }
-            accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             await editingSession?.stop();
             await widget.clear();
             widget.attachmentModel.clear(true);
@@ -123,16 +118,18 @@ function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(4756, "Go Back")),
+            title: ( localize2(4783, "Go Back")),
             icon: Codicon.arrowLeft,
         },
-        group: 'navigation'
+        when: ( ChatContextKeys.agentSessionsViewerOrientation.notEqualsTo(AgentSessionsViewerOrientation.SideBySide)),
+        group: 'navigation',
+        order: 1
     });
     registerAction2(class UndoChatEditInteractionAction extends EditingSessionAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.undoEdit',
-                title: ( localize2(4757, "Undo Last Request")),
+                title: ( localize2(4784, "Undo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -154,7 +151,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit',
-                title: ( localize2(4758, "Redo Last Request")),
+                title: ( localize2(4785, "Redo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -180,8 +177,8 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit2',
-                title: ( localize2(4759, "Redo")),
-                tooltip: ( localize2(4760, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(4786, "Redo")),
+                tooltip: ( localize2(4787, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,

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

@@ -5,15 +5,15 @@ import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 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-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 
 function registerChatPromptNavigationActions() {
     registerAction2(class NextUserPromptAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextUserPrompt',
-                title: ( localize2(4761, "Next User Prompt")),
+                title: ( localize2(4788, "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(4762, "Previous User Prompt")),
+                title: ( localize2(4789, "Previous User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -7,7 +7,7 @@ import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/v
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 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';
 
@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4763, "Open in Chat View")),
+                title: ( localize2(4790, "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(4764, "Close Quick Chat")),
+                title: ( localize2(4791, "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(4765, 'Open Quick Chat')),
+            title: ( localize2(4792, 'Open Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.chatSparkle,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4766, 'Toggle the quick chat')),
+                description: ( localize(4793, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4767, "The query to open the quick chat with")),
+                                            description: ( localize(4794, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4768, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4795, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4767, "The query to open the quick chat with"))
+                                    description: ( localize(4794, "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(4769, "Open Quick Chat")),
+            title: ( localize2(4796, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });