@codingame/monaco-vscode-chat-service-override 21.5.1 → 22.0.0

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

@@ -1,5 +1,4 @@
 
-import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { AccessibleDiffViewerNext } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/commands';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
@@ -10,21 +9,21 @@ import { INLINE_CHAT_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1
 import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 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';
+import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
 
 class PanelChatAccessibilityHelp {
     constructor() {
         this.priority = 107;
         this.name = 'panelChat';
         this.type = AccessibleViewType.Help;
-        this.when = ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)), ( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask)), ( ContextKeyExpr.or(
+        this.when = ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask)), ( ContextKeyExpr.or(
             ChatContextKeys.inChatSession,
             ChatContextKeys.isResponse,
             ChatContextKeys.isRequest
         ))));
     }
     getProvider(accessor) {
-        const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-        return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'panelChat');
+        return getChatAccessibilityHelpProvider(accessor, undefined, 'panelChat');
     }
 }
 class QuickChatAccessibilityHelp {
@@ -39,8 +38,7 @@ class QuickChatAccessibilityHelp {
         ))));
     }
     getProvider(accessor) {
-        const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-        return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'quickChat');
+        return getChatAccessibilityHelpProvider(accessor, undefined, 'quickChat');
     }
 }
 class EditsChatAccessibilityHelp {
@@ -51,8 +49,7 @@ class EditsChatAccessibilityHelp {
         this.when = ( ContextKeyExpr.and(ChatContextKeyExprs.inEditingMode, ChatContextKeys.inChatInput));
     }
     getProvider(accessor) {
-        const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-        return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'editsView');
+        return getChatAccessibilityHelpProvider(accessor, undefined, 'editsView');
     }
 }
 class AgentChatAccessibilityHelp {
@@ -63,69 +60,83 @@ class AgentChatAccessibilityHelp {
         this.when = ( ContextKeyExpr.and(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ChatContextKeys.inChatInput));
     }
     getProvider(accessor) {
-        const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-        return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'agentView');
+        return getChatAccessibilityHelpProvider(accessor, undefined, 'agentView');
     }
 }
 function getAccessibilityHelpText(type, keybindingService) {
     const content = [];
-    if (type === 'panelChat' || type === 'quickChat') {
+    if (type === 'panelChat' || type === 'quickChat' || type === 'agentView') {
         if (type === 'quickChat') {
             content.push(( localize(
-                4472,
+                4480,
                 '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(
-                4473,
+                4481,
                 '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(
-                4474,
+                4482,
                 '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(
-                4475,
-                'In the input box, navigate to the suggested follow up question (Shift+Tab) and press Enter to run it.'
-            )));
         }
         content.push(( localize(
-            4476,
+            4483,
             '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(
-            4477,
+            4484,
             'In the input box, inspect the last response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            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.'
+            4485,
+            'To focus the chat request and response list, invoke the Focus Chat command{0}. This will move focus to the most recent response, which you can then navigate using the up and down arrow keys.',
+            getChatFocusKeybindingLabel(keybindingService, type, 'last')
         )));
         content.push(( localize(
-            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)
+            4486,
+            'To return to the last chat response you focused, invoke the Focus Last Focused Chat Response command{0}.',
+            getChatFocusKeybindingLabel(keybindingService, type, 'lastFocused')
         )));
         content.push(( localize(
-            4480,
+            4487,
             'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.',
-            getChatFocusKeybindingLabel(keybindingService, type, true)
+            getChatFocusKeybindingLabel(keybindingService, type, 'input')
         )));
         content.push(( localize(
-            4481,
+            4488,
+            'As the chat request is being processed, you will hear verbose progress updates if the request takes more than 4 seconds. This includes information like searched text for <search term> with X results, created file <file_name>, or read file <file path>. This can be disabled with accessibility.verboseChatProgressUpdates.'
+        )));
+        content.push(( localize(
+            4489,
+            '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(
+            4490,
             '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,
+            4491,
+            'To navigate to the next user prompt in the conversation, invoke the Next User Prompt command{0}.',
+            '<keybinding:workbench.action.chat.nextUserPrompt>'
+        )));
+        content.push(( localize(
+            4492,
+            'To navigate to the previous user prompt in the conversation, invoke the Previous User Prompt command{0}.',
+            '<keybinding:workbench.action.chat.previousUserPrompt>'
+        )));
+        content.push(( localize(
+            4493,
             '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(
-                4483,
+                4494,
                 'To create a new chat session, invoke the New Chat command{0}.',
                 '<keybinding:workbench.action.chat.new>'
             )));
@@ -134,139 +145,134 @@ function getAccessibilityHelpText(type, keybindingService) {
     if (type === 'editsView' || type === 'agentView') {
         if (type === 'agentView') {
             content.push(( localize(
-                4484,
+                4495,
                 '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(4485, 'The chat editing view is used to apply edits across files.')));
+            content.push(( localize(4496, 'The chat editing view is used to apply edits across files.')));
         }
         content.push(( localize(
-            4486,
+            4497,
             'It is comprised of an input box and a file working set (Shift+Tab).'
         )));
         content.push(( localize(
-            4487,
+            4498,
             'When a request is made, a progress indicator will play while the edits are being applied.'
         )));
         content.push(( localize(
-            4488,
+            4499,
             '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(
-            4489,
+            4500,
             'Navigate between edits in the editor with navigate previous{0} and next{1}',
             '<keybinding:chatEditor.action.navigatePrevious>',
             '<keybinding:chatEditor.action.navigateNext>'
         )));
         content.push(( localize(
-            4490,
+            4501,
             '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(
-            4491,
+            4502,
             '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(
-                4492,
+                4503,
                 '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(
-                4493,
+                4504,
                 'To take the action, use the accept tool command{0}.',
                 '<keybinding:workbench.action.chat.acceptTool>'
             )));
             content.push(( localize(
-                4494,
+                4505,
                 'To automatically approve tool actions without manual confirmation, set {0} to {1} in your settings.',
                 ChatConfiguration.GlobalAutoApprove,
                 'true'
             )));
             content.push(( localize(
-                4495,
+                4506,
                 'To accept a tool action, use the Accept Tool Confirmation command{0}.',
                 '<keybinding:workbench.action.chat.acceptTool>'
             )));
             content.push(( localize(
-                4496,
+                4507,
                 '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(4497, 'Some helpful commands include:')));
-        content.push(( localize(4498, '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>')));
+        content.push(( localize(4508, 'Some helpful commands include:')));
+        content.push(( localize(4509, '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>')));
         content.push(( localize(
-            4499,
+            4510,
             '- Attach Files{0}.',
             '<keybinding:workbench.action.chat.editing.attachFiles>'
         )));
         content.push(( localize(
-            4500,
+            4511,
             '- Remove File from Working Set{0}.',
             '<keybinding:chatEditing.removeFileFromWorkingSet>'
         )));
         content.push(( localize(
-            4501,
+            4512,
             '- Keep{0} and Undo File{1}.',
             '<keybinding:chatEditing.acceptFile>',
             '<keybinding:chatEditing.discardFile>'
         )));
-        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(
-            4507,
-            '- View Previous Edits{0}.',
-            '<keybinding:chatEditing.viewPreviousEdits>'
-        )));
+        content.push(( localize(4513, '- Save All Files{0}.', '<keybinding:chatEditing.saveAllFiles>')));
+        content.push(( localize(4514, '- Keep All Edits{0}.', '<keybinding:chatEditing.acceptAllFiles>')));
+        content.push(( localize(4515, '- Undo All Edits{0}.', '<keybinding:chatEditing.discardAllFiles>')));
+        content.push(( localize(4516, '- Open File in Diff{0}.', '<keybinding:chatEditing.openFileInDiff>')));
+        content.push(`- ${ChatEditingShowChangesAction.LABEL}<keybinding:chatEditing.viewChanges>`);
+        content.push(`- ${ViewPreviousEditsAction.Label}<keybinding:chatEditing.viewPreviousEdits>`);
     }
     else {
         content.push(( localize(
-            4508,
+            4517,
             "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(
-            4509,
+            4518,
             "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.",
             '<keybinding:inlineChat.start>'
         )));
         content.push(( localize(
-            4510,
+            4519,
             '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(
-            4511,
+            4520,
             'In the input box, inspect the response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            4512,
+            4521,
             "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."
         )));
         content.push(( localize(
-            4513,
+            4522,
             "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(
-            4514,
+            4523,
             "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(
-            4515,
+            4524,
             "Use tab to reach conditional parts like commands, status, message responses and more."
         )));
     }
     content.push(( localize(
-        4516,
+        4525,
         "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');
@@ -274,7 +280,7 @@ function getAccessibilityHelpText(type, keybindingService) {
 function getChatAccessibilityHelpProvider(accessor, editor, type) {
     const widgetService = accessor.get(IChatWidgetService);
     const keybindingService = accessor.get(IKeybindingService);
-    const inputEditor = type === 'panelChat' || type === 'editsView' || type === 'quickChat' ? widgetService.lastFocusedWidget?.inputEditor : editor;
+    const inputEditor = widgetService.lastFocusedWidget?.inputEditor;
     if (!inputEditor) {
         return;
     }
@@ -290,27 +296,29 @@ function getChatAccessibilityHelpProvider(accessor, editor, type) {
         { type: AccessibleViewType.Help },
         () => helpText,
         () => {
-            if (type === 'panelChat' && cachedPosition) {
-                inputEditor.setPosition(cachedPosition);
+            if (type === 'quickChat' || type === 'editsView' || type === 'agentView' || type === 'panelChat') {
+                if (cachedPosition) {
+                    inputEditor.setPosition(cachedPosition);
+                }
                 inputEditor.focus();
             }
             else if (type === 'inlineChat') {
                 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
     ));
 }
-function getChatFocusKeybindingLabel(keybindingService, type, focusInput) {
+function getChatFocusKeybindingLabel(keybindingService, type, focus) {
     let kbs;
     const fallback = ' (unassigned keybinding)';
-    if (focusInput) {
+    if (focus === 'input') {
         kbs = keybindingService.lookupKeybindings('workbench.action.chat.focusInput');
     }
+    else if (focus === 'lastFocused') {
+        kbs = keybindingService.lookupKeybindings('workbench.chat.action.focusLastFocused');
+    }
     else {
         kbs = keybindingService.lookupKeybindings('chat.action.focus');
     }
@@ -318,20 +326,20 @@ function getChatFocusKeybindingLabel(keybindingService, type, focusInput) {
         return fallback;
     }
     let kb;
-    if (type === 'panelChat') {
-        if (focusInput) {
-            kb = kbs.find(kb => kb.getAriaLabel()?.includes('DownArrow'))?.getAriaLabel();
+    if (type === 'agentView' || type === 'panelChat') {
+        if (focus !== 'input') {
+            kb = kbs.find(kb => kb.getAriaLabel()?.includes('UpArrow'))?.getAriaLabel();
         }
         else {
-            kb = kbs.find(kb => kb.getAriaLabel()?.includes('UpArrow'))?.getAriaLabel();
+            kb = kbs.find(kb => kb.getAriaLabel()?.includes('DownArrow'))?.getAriaLabel();
         }
     }
     else {
-        if (focusInput) {
-            kb = kbs.find(kb => kb.getAriaLabel()?.includes('UpArrow'))?.getAriaLabel();
+        if (focus !== 'input') {
+            kb = kbs.find(kb => kb.getAriaLabel()?.includes('DownArrow'))?.getAriaLabel();
         }
         else {
-            kb = kbs.find(kb => kb.getAriaLabel()?.includes('DownArrow'))?.getAriaLabel();
+            kb = kbs.find(kb => kb.getAriaLabel()?.includes('UpArrow'))?.getAriaLabel();
         }
     }
     return !!kb ? ` (${kb})` : fallback;

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

@@ -14,9 +14,9 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatViewId } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { EditingSessionAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
+import { getEditingSessionContext, EditingSessionAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
 import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ACTION_ID_OPEN_CHAT, CHAT_CATEGORY, ACTION_ID_NEW_CHAT, handleCurrentEditingSession, ACTION_ID_NEW_EDIT_SESSION } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { clearChatEditor } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
 
 function registerNewChatActions() {
@@ -24,7 +24,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(4587, "New Chat")),
+                title: ( localize2(4602, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled,
@@ -35,11 +35,11 @@ function registerNewChatActions() {
             await clearChatEditor(accessor);
         }
     });
-    registerAction2(class NewChatAction extends EditingSessionAction {
+    registerAction2(class NewChatAction extends Action2 {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(4588, "New Chat")),
+                title: ( localize2(4603, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled)),
@@ -53,7 +53,13 @@ function registerNewChatActions() {
                         id: MenuId.ViewTitle,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', ChatViewId)), ( ChatContextKeys.inEmptyStateWithHistoryEnabled.negate()))),
                         group: 'navigation',
-                        order: -1
+                        order: -1,
+                        alt: {
+                            id: ACTION_ID_OPEN_CHAT,
+                            title: ( localize2(4604, "New Chat Editor")),
+                            icon: Codicon.newFile,
+                            precondition: ChatContextKeys.enabled
+                        }
                     },
                     ...( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
                         id,
@@ -74,32 +80,37 @@ function registerNewChatActions() {
                 }
             });
         }
-        async runEditingSessionAction(accessor, editingSession, widget, ...args) {
-            const context = args[0];
+        async run(accessor, ...args) {
+            const executeCommandContext = args[0];
+            const context = getEditingSessionContext(accessor, args);
+            const { editingSession, chatWidget: widget } = context ?? {};
+            if (!widget) {
+                return;
+            }
             const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
             const dialogService = accessor.get(IDialogService);
-            if (!(await handleCurrentEditingSession(editingSession, undefined, dialogService))) {
+            if (editingSession && !(await handleCurrentEditingSession(editingSession, undefined, dialogService))) {
                 return;
             }
             announceChatCleared(accessibilitySignalService);
-            await editingSession.stop();
+            await editingSession?.stop();
             widget.clear();
             await widget.waitForReady();
             widget.attachmentModel.clear(true);
             widget.input.relatedFiles?.clear();
             widget.focusInput();
-            if (!context) {
+            if (!executeCommandContext) {
                 return;
             }
-            if (typeof context.agentMode === 'boolean') {
-                widget.input.setChatMode(context.agentMode ? ChatModeKind.Agent : ChatModeKind.Edit);
+            if (typeof executeCommandContext.agentMode === 'boolean') {
+                widget.input.setChatMode(executeCommandContext.agentMode ? ChatModeKind.Agent : ChatModeKind.Edit);
             }
-            if (context.inputValue) {
-                if (context.isPartialQuery) {
-                    widget.setInput(context.inputValue);
+            if (executeCommandContext.inputValue) {
+                if (executeCommandContext.isPartialQuery) {
+                    widget.setInput(executeCommandContext.inputValue);
                 }
                 else {
-                    widget.acceptInput(context.inputValue);
+                    widget.acceptInput(executeCommandContext.inputValue);
                 }
             }
         }
@@ -109,7 +120,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.undoEdit',
-                title: ( localize2(4589, "Undo Last Request")),
+                title: ( localize2(4605, "Undo Last Request")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -131,7 +142,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit',
-                title: ( localize2(4590, "Redo Last Request")),
+                title: ( localize2(4606, "Redo Last Request")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -157,8 +168,8 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit2',
-                title: ( localize2(4591, "Redo")),
-                tooltip: ( localize2(4592, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(4607, "Redo")),
+                tooltip: ( localize2(4608, "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/chatCodeblockActions.js

@@ -83,7 +83,7 @@ let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable
                     const context = this._context;
                     if (isCodeBlockActionContext(context) && context.codemapperUri) {
                         const label = labelService.getUriLabel(context.codemapperUri, { relative: true });
-                        return localize(4593, "Apply to {0}", label);
+                        return localize(4609, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -106,7 +106,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4594, "Copy")),
+                title: ( localize2(4610, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -159,6 +159,7 @@ function registerChatCodeBlockActions() {
                     modelId: request?.modelId,
                     presentation: 'codeBlock',
                     applyCodeBlockSuggestionId: undefined,
+                    source: undefined,
                 });
             }
         }
@@ -217,6 +218,7 @@ function registerChatCodeBlockActions() {
                 modelId: request?.modelId,
                 presentation: 'codeBlock',
                 applyCodeBlockSuggestionId: undefined,
+                source: undefined,
             });
         }
         if (noSelection) {
@@ -229,7 +231,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4595, "Apply in Editor")),
+                title: ( localize2(4611, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -265,7 +267,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4596, "Insert At Cursor")),
+                title: ( localize2(4612, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -299,7 +301,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4597, "Insert into New File")),
+                title: ( localize2(4613, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -350,6 +352,7 @@ function registerChatCodeBlockActions() {
                     modelId: request?.modelId,
                     presentation: 'codeBlock',
                     applyCodeBlockSuggestionId: undefined,
+                    source: undefined,
                 });
             }
         }
@@ -358,7 +361,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4598, "Insert into Terminal")),
+                title: ( localize2(4614, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -452,7 +455,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4599, "Next Code Block")),
+                title: ( localize2(4615, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -472,7 +475,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4600, "Previous Code Block")),
+                title: ( localize2(4616, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -531,7 +534,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4601, "Apply Edits")),
+                title: ( localize2(4617, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -573,7 +576,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4602, "Discard Edits")),
+                title: ( localize2(4618, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,