@codingame/monaco-vscode-chat-service-override 20.5.0 → 21.0.0

package/index.js

@@ -47,17 +47,22 @@ import { ChatAttachmentResolveService } from './vscode/src/vs/workbench/contrib/
 import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service';
 import { RemoteCodingAgentsService } from './vscode/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.js';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
-import './vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js';
-import './vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task.chatAgentTools.contribution.js';
-import './vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.js';
-import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
-import './vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js';
 import { ChatSessionsService } from './vscode/src/vs/workbench/contrib/chat/browser/chatSessions.contribution.js';
 import { ChatOutputRendererService } from './vscode/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.js';
 import { IChatOutputRendererService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service';
 import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service';
 import { ChatTodoListService } from './vscode/src/vs/workbench/contrib/chat/common/chatTodoListService.js';
+import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService.service';
+import { ChatLayoutService } from './vscode/src/vs/workbench/contrib/chat/browser/chatLayoutService.js';
+import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
+import { AiEditTelemetryServiceImpl } from './vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.js';
+import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
+import { ChatModeService } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
+import './vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js';
+import './vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.js';
+import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
+import './vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js';
 
 function getServiceOverride() {
     return {
@@ -88,7 +93,10 @@ function getServiceOverride() {
         [IRemoteCodingAgentsService.toString()]: new SyncDescriptor(RemoteCodingAgentsService, [], true),
         [IChatSessionsService.toString()]: new SyncDescriptor(ChatSessionsService, [], true),
         [IChatOutputRendererService.toString()]: new SyncDescriptor(ChatOutputRendererService, [], true),
-        [IChatTodoListService.toString()]: new SyncDescriptor(ChatTodoListService, [], true)
+        [IChatTodoListService.toString()]: new SyncDescriptor(ChatTodoListService, [], true),
+        [IChatLayoutService.toString()]: new SyncDescriptor(ChatLayoutService, [], true),
+        [IAiEditTelemetryService.toString()]: new SyncDescriptor(AiEditTelemetryServiceImpl, [], true),
+        [IChatModeService.toString()]: new SyncDescriptor(ChatModeService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "20.5.0",
+  "version": "21.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - chat service-override",
   "keywords": [],
@@ -15,41 +15,43 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common": "20.5.0",
-    "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "20.5.0",
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "20.5.0",
-    "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "20.5.0",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.5.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.5.0",
-    "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common": "20.5.0",
-    "@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common": "20.5.0",
-    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "20.5.0",
-    "@codingame/monaco-vscode-6883db80-c313-54eb-8fbc-5872c56b0326-common": "20.5.0",
-    "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common": "20.5.0",
-    "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common": "20.5.0",
-    "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common": "20.5.0",
-    "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common": "20.5.0",
-    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "20.5.0",
-    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "20.5.0",
-    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.5.0",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.5.0",
-    "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common": "20.5.0",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.5.0",
-    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "20.5.0",
-    "@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common": "20.5.0",
-    "@codingame/monaco-vscode-api": "20.5.0",
-    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "20.5.0",
-    "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "20.5.0",
-    "@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common": "20.5.0",
-    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.5.0",
-    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.5.0",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.5.0",
-    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "20.5.0",
-    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "20.5.0",
-    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "20.5.0",
-    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "20.5.0",
-    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "20.5.0",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "20.5.0"
+    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "21.0.0",
+    "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common": "21.0.0",
+    "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "21.0.0",
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "21.0.0",
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.0",
+    "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common": "21.0.0",
+    "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common": "21.0.0",
+    "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common": "21.0.0",
+    "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common": "21.0.0",
+    "@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common": "21.0.0",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "21.0.0",
+    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.0.0",
+    "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common": "21.0.0",
+    "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common": "21.0.0",
+    "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common": "21.0.0",
+    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "21.0.0",
+    "@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common": "21.0.0",
+    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "21.0.0",
+    "@codingame/monaco-vscode-a175bd1a-4858-5944-9ae5-fb73305dcb13-common": "21.0.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "21.0.0",
+    "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common": "21.0.0",
+    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "21.0.0",
+    "@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common": "21.0.0",
+    "@codingame/monaco-vscode-api": "21.0.0",
+    "@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common": "21.0.0",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "21.0.0",
+    "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "21.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "21.0.0",
+    "@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common": "21.0.0",
+    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "21.0.0",
+    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "21.0.0",
+    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "21.0.0",
+    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "21.0.0",
+    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "21.0.0",
+    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "21.0.0",
+    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "21.0.0",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "21.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -0,0 +1,2 @@
+export declare const ACTION_ID_FOCUS_CHAT_CONFIRMATION = "workbench.action.chat.focusConfirmation";
+export declare function registerChatAccessibilityActions(): void;

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

@@ -0,0 +1,60 @@
+
+import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, registerAction2 } 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 { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
+
+const ACTION_ID_FOCUS_CHAT_CONFIRMATION = 'workbench.action.chat.focusConfirmation';
+class AnnounceChatConfirmationAction extends Action2 {
+    constructor() {
+        super({
+            id: ACTION_ID_FOCUS_CHAT_CONFIRMATION,
+            title: { value: ( localize(4467, 'Focus Chat Confirmation')), original: 'Focus Chat Confirmation' },
+            category: { value: ( localize(4468, 'Chat')), original: 'Chat' },
+            precondition: ChatContextKeys.enabled,
+            f1: true,
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyA | KeyMod.Shift,
+                when: CONTEXT_ACCESSIBILITY_MODE_ENABLED
+            }
+        });
+    }
+    async run(accessor) {
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        const lastFocusedWidget = chatWidgetService.lastFocusedWidget;
+        if (!lastFocusedWidget) {
+            alert(( localize(4469, 'No active chat session found.')));
+            return;
+        }
+        const viewModel = lastFocusedWidget.viewModel;
+        if (!viewModel) {
+            alert(( localize(4470, 'Chat interface not ready.')));
+            return;
+        }
+        let firstConfirmationElement;
+        const lastResponse = viewModel.getItems()[viewModel.getItems().length - 1];
+        if (isResponseVM(lastResponse)) {
+            const confirmationWidgets = lastFocusedWidget.domNode.querySelectorAll('.chat-confirmation-widget-container');
+            if (confirmationWidgets.length > 0) {
+                firstConfirmationElement = confirmationWidgets[0];
+            }
+        }
+        if (firstConfirmationElement) {
+            firstConfirmationElement.focus();
+        }
+        else {
+            alert(( localize(4471, 'No chat confirmation required')));
+        }
+    }
+}
+function registerChatAccessibilityActions() {
+    registerAction2(AnnounceChatConfirmationAction);
+}
+
+export { ACTION_ID_FOCUS_CHAT_CONFIRMATION, registerChatAccessibilityActions };

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

@@ -8,7 +8,7 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { INLINE_CHAT_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatAgentLocation, ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 class PanelChatAccessibilityHelp {
@@ -72,55 +72,60 @@ function getAccessibilityHelpText(type, keybindingService) {
     if (type === 'panelChat' || type === 'quickChat') {
         if (type === 'quickChat') {
             content.push(( localize(
-                4450,
+                4472,
                 'The quick chat view is comprised of an input box and a request/response list. The input box is used to make requests and the list is used to display responses.'
             )));
             content.push(( localize(
-                4451,
+                4473,
                 'The quick chat view is a transient interface for making and viewing requests, while the panel chat view is a persistent interface that also supports navigating suggested follow-up questions.'
             )));
         }
         if (type === 'panelChat') {
             content.push(( localize(
-                4452,
+                4474,
                 'The panel chat view is a persistent interface that also supports navigating suggested follow-up questions, while the quick chat view is a transient interface for making and viewing requests.'
             )));
             content.push(( localize(
-                4453,
+                4475,
                 'In the input box, navigate to the suggested follow up question (Shift+Tab) and press Enter to run it.'
             )));
         }
         content.push(( localize(
-            4454,
+            4476,
             'In the input box, use up and down arrows to navigate your request history. Edit input and use enter or the submit button to run a new request.'
         )));
         content.push(( localize(
-            4455,
+            4477,
             'In the input box, inspect the last response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            4456,
+            4478,
             'Chat responses will be announced as they come in. A response will indicate the number of code blocks, if any, and then the rest of the response.'
         )));
         content.push(( localize(
-            4457,
+            4479,
             'To focus the chat request/response list, which can be navigated with up and down arrows, invoke the Focus Chat command{0}.',
             getChatFocusKeybindingLabel(keybindingService, type, false)
         )));
         content.push(( localize(
-            4458,
+            4480,
             'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.',
             getChatFocusKeybindingLabel(keybindingService, type, true)
         )));
         content.push(( localize(
-            4459,
+            4481,
             'To focus the next code block within a response, invoke the Chat: Next Code Block command{0}.',
             '<keybinding:workbench.action.chat.nextCodeBlock>'
         )));
+        content.push(( localize(
+            4482,
+            'To focus pending chat confirmation dialogs, invoke the Focus Chat Confirmation Status command{0}.',
+            '<keybinding:workbench.action.chat.focusConfirmation>'
+        )));
         if (type === 'panelChat') {
             content.push(( localize(
-                4460,
+                4483,
                 'To create a new chat session, invoke the New Chat command{0}.',
                 '<keybinding:workbench.action.chat.new>'
             )));
@@ -129,137 +134,139 @@ function getAccessibilityHelpText(type, keybindingService) {
     if (type === 'editsView' || type === 'agentView') {
         if (type === 'agentView') {
             content.push(( localize(
-                4461,
+                4484,
                 'The chat agent view is used to apply edits across files in your workspace, enable running commands in the terminal, and more.'
             )));
         }
         else {
-            content.push(( localize(4462, 'The chat editing view is used to apply edits across files.')));
+            content.push(( localize(4485, 'The chat editing view is used to apply edits across files.')));
         }
         content.push(( localize(
-            4463,
+            4486,
             'It is comprised of an input box and a file working set (Shift+Tab).'
         )));
         content.push(( localize(
-            4464,
+            4487,
             'When a request is made, a progress indicator will play while the edits are being applied.'
         )));
         content.push(( localize(
-            4465,
+            4488,
             'Once the edits are applied, a sound will play to indicate the document has been opened and is ready for review. The sound can be disabled with accessibility.signals.chatEditModifiedFile.'
         )));
         content.push(( localize(
-            4466,
+            4489,
             'Navigate between edits in the editor with navigate previous{0} and next{1}',
             '<keybinding:chatEditor.action.navigatePrevious>',
             '<keybinding:chatEditor.action.navigateNext>'
         )));
         content.push(( localize(
-            4467,
+            4490,
             'In the editor, Keep{0}, Undo{1}, or Toggle the Diff{2} for the current Change.',
             '<keybinding:chatEditor.action.acceptHunk>',
             '<keybinding:chatEditor.action.undoHunk>',
             '<keybinding:chatEditor.action.toggleDiff>'
         )));
         content.push(( localize(
-            4468,
+            4491,
             'Sounds will play when a change is accepted or undone. The sounds can be disabled with accessibility.signals.editsKept and accessibility.signals.editsUndone.'
         )));
         if (type === 'agentView') {
             content.push(( localize(
-                4469,
+                4492,
                 'An alert will indicate when user action is required. For example, if the agent wants to run something in the terminal, you will hear Action Required: Run Command in Terminal.'
             )));
             content.push(( localize(
-                4470,
+                4493,
                 'To take the action, use the accept tool command{0}.',
                 '<keybinding:workbench.action.chat.acceptTool>'
             )));
             content.push(( localize(
-                4471,
-                'To automatically approve tool actions without manual confirmation, set chat.tools.autoApprove to true in your settings.'
+                4494,
+                'To automatically approve tool actions without manual confirmation, set {0} to {1} in your settings.',
+                ChatConfiguration.GlobalAutoApprove,
+                'true'
             )));
             content.push(( localize(
-                4472,
+                4495,
                 'To accept a tool action, use the Accept Tool Confirmation command{0}.',
                 '<keybinding:workbench.action.chat.acceptTool>'
             )));
             content.push(( localize(
-                4473,
+                4496,
                 'By default, when edits are made to files, they will be opened. To change this behavior, set accessibility.openChatEditedFiles to false in your settings.'
             )));
         }
-        content.push(( localize(4474, 'Some helpful commands include:')));
-        content.push(( localize(4475, '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>')));
+        content.push(( localize(4497, 'Some helpful commands include:')));
+        content.push(( localize(4498, '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>')));
         content.push(( localize(
-            4476,
+            4499,
             '- Attach Files{0}.',
             '<keybinding:workbench.action.chat.editing.attachFiles>'
         )));
         content.push(( localize(
-            4477,
+            4500,
             '- Remove File from Working Set{0}.',
             '<keybinding:chatEditing.removeFileFromWorkingSet>'
         )));
         content.push(( localize(
-            4478,
+            4501,
             '- Keep{0} and Undo File{1}.',
             '<keybinding:chatEditing.acceptFile>',
             '<keybinding:chatEditing.discardFile>'
         )));
-        content.push(( localize(4479, '- Save All Files{0}.', '<keybinding:chatEditing.saveAllFiles>')));
-        content.push(( localize(4480, '- Keep All Edits{0}.', '<keybinding:chatEditing.acceptAllFiles>')));
-        content.push(( localize(4481, '- Undo All Edits{0}.', '<keybinding:chatEditing.discardAllFiles>')));
-        content.push(( localize(4482, '- Open File in Diff{0}.', '<keybinding:chatEditing.openFileInDiff>')));
-        content.push(( localize(4483, '- View Changes{0}.', '<keybinding:chatEditing.viewChanges>')));
+        content.push(( localize(4502, '- Save All Files{0}.', '<keybinding:chatEditing.saveAllFiles>')));
+        content.push(( localize(4503, '- Keep All Edits{0}.', '<keybinding:chatEditing.acceptAllFiles>')));
+        content.push(( localize(4504, '- Undo All Edits{0}.', '<keybinding:chatEditing.discardAllFiles>')));
+        content.push(( localize(4505, '- Open File in Diff{0}.', '<keybinding:chatEditing.openFileInDiff>')));
+        content.push(( localize(4506, '- View Changes{0}.', '<keybinding:chatEditing.viewChanges>')));
         content.push('chatEditing.viewAllEdits', '- View All Edits{0}.', '<keybinding:chatEditing.viewAllEdits>');
         content.push(( localize(
-            4484,
+            4507,
             '- View Previous Edits{0}.',
             '<keybinding:chatEditing.viewPreviousEdits>'
         )));
     }
     else {
         content.push(( localize(
-            4485,
+            4508,
             "Inline chat occurs within a code editor and takes into account the current selection. It is useful for making changes to the current editor. For example, fixing diagnostics, documenting or refactoring code. Keep in mind that AI generated code may be incorrect."
         )));
         content.push(( localize(
-            4486,
+            4509,
             "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.",
             '<keybinding:inlineChat.start>'
         )));
         content.push(( localize(
-            4487,
+            4510,
             'In the input box, use Show Previous{0} and Show Next{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.',
             '<keybinding:history.showPrevious>',
             '<keybinding:history.showNext>'
         )));
         content.push(( localize(
-            4488,
+            4511,
             'In the input box, inspect the response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            4489,
+            4512,
             "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."
         )));
         content.push(( localize(
-            4490,
+            4513,
             "If a fix action is invoked, a response will indicate the problem with the current code. A diff editor will be rendered and can be reached by tabbing."
         )));
         content.push(( localize(
-            4491,
+            4514,
             "Once in the diff editor, enter review mode with{0}. Use up and down arrows to navigate lines with the proposed changes.",
             AccessibleDiffViewerNext.id
         )));
         content.push(( localize(
-            4492,
+            4515,
             "Use tab to reach conditional parts like commands, status, message responses and more."
         )));
     }
     content.push(( localize(
-        4493,
+        4516,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
     return content.join('\n');
@@ -291,6 +298,9 @@ function getChatAccessibilityHelpProvider(accessor, editor, type) {
                 const ctrl = editor?.getContribution(INLINE_CHAT_ID);
                 ctrl?.focus();
             }
+            else if (type === 'quickChat' || type === 'editsView' || type === 'agentView') {
+                widgetService.lastFocusedWidget?.focusInput();
+            }
         },
         type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat
     ));

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

@@ -24,16 +24,10 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(4548, "New Chat")),
+                title: ( localize2(4587, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled,
-                menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
-                    id,
-                    group: 'navigation',
-                    when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)),
-                    order: 1
-                })))
             });
         }
         async run(accessor, ...args) {
@@ -45,21 +39,29 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(4549, "New Chat")),
+                title: ( localize2(4588, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled)),
                 f1: true,
-                menu: [{
+                menu: [
+                    {
                         id: MenuId.ChatContext,
                         group: 'z_clear'
                     },
                     {
                         id: MenuId.ViewTitle,
-                        when: ( ContextKeyExpr.equals('view', ChatViewId)),
+                        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', ChatViewId)), ( ChatContextKeys.inEmptyStateWithHistoryEnabled.negate()))),
                         group: 'navigation',
                         order: -1
-                    }],
+                    },
+                    ...( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
+                        id,
+                        group: 'navigation',
+                        when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
+                        order: 1
+                    })))
+                ],
                 keybinding: {
                     weight: KeybindingWeight.WorkbenchContrib + 1,
                     primary: KeyMod.CtrlCmd | KeyCode.KeyN,
@@ -107,7 +109,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.undoEdit',
-                title: ( localize2(4550, "Undo Last Request")),
+                title: ( localize2(4589, "Undo Last Request")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -129,7 +131,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit',
-                title: ( localize2(4551, "Redo Last Request")),
+                title: ( localize2(4590, "Redo Last Request")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -155,14 +157,14 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit2',
-                title: ( localize2(4552, "Redo")),
-                tooltip: ( localize2(4553, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(4591, "Redo")),
+                tooltip: ( localize2(4592, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
                 menu: [{
                         id: MenuId.ChatMessageRestoreCheckpoint,
-                        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', ChatViewId)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
+                        when: ( ChatContextKeys.lockedToCodingAgent.negate()),
                         group: 'navigation',
                         order: -1
                     }]