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

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

@@ -7,8 +7,9 @@ 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-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { TerminalContribCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
-import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatAgentLocation, ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { FocusAgentSessionsAction } from '../agentSessions/agentSessionsActions.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
 
@@ -69,230 +70,238 @@ function getAccessibilityHelpText(type, keybindingService) {
     if (type === 'panelChat' || type === 'quickChat' || type === 'agentView') {
         if (type === 'quickChat') {
             content.push(( localize(
-                4549,
+                4598,
                 '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(
-                4550,
+                4599,
                 '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') {
+        else {
+            content.push(( localize(
+                4600,
+                'The 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(
+                4601,
+                'To create a new chat session, invoke the New Chat command{0}.',
+                '<keybinding:workbench.action.chat.newChat>'
+            )));
             content.push(( localize(
-                4551,
-                '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.'
+                4602,
+                'To view all chat sessions, invoke the Show Chats command{0}.',
+                '<keybinding:workbench.action.chat.history>'
+            )));
+            content.push(( localize(
+                4603,
+                'You can focus the agent sessions list by invoking the Focus Agent Sessions command{0}.',
+                `<keybinding:${FocusAgentSessionsAction.id}>`
             )));
         }
         content.push(( localize(
-            4552,
+            4604,
             '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(
-            4553,
+            4605,
             'To remove attached contexts, focus an attachment and press Delete or Backspace.'
         )));
         content.push(( localize(
-            4554,
+            4606,
             'In the input box, inspect the last response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            4555,
+            4607,
             '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(
-            4556,
+            4608,
             '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(
-            4557,
+            4609,
             'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.',
             getChatFocusKeybindingLabel(keybindingService, type, 'input')
         )));
         content.push(( localize(
-            4558,
+            4610,
             '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(
-            4559,
+            4611,
             '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(
-            4560,
+            4612,
             '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(
-            4561,
+            4613,
             '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(
-            4562,
+            4614,
             '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(
-            4563,
+            4615,
             'To focus pending chat confirmation dialogs, invoke the Focus Chat Confirmation Status command{0}.',
             '<keybinding:workbench.action.chat.focusConfirmation>'
         )));
         content.push(( localize(
-            4564,
+            4616,
             'If there are any hidden chat terminals, you can view them by invoking the View Hidden Chat Terminals command{0}.',
             '<keybinding:workbench.action.terminal.chat.viewHiddenChatTerminals>'
         )));
         content.push(( localize(
-            4565,
+            4617,
             'To focus the last chat terminal that ran a tool, invoke the Focus Most Recent Chat Terminal command{0}.',
             `<keybinding:${TerminalContribCommandId.FocusMostRecentChatTerminal}>`
         )));
         content.push(( localize(
-            4566,
+            4618,
             'To focus the output from the last chat terminal tool, invoke the Focus Most Recent Chat Terminal Output command{0}.',
             `<keybinding:${TerminalContribCommandId.FocusMostRecentChatTerminalOutput}>`
         )));
-        if (type === 'panelChat') {
-            content.push(( localize(
-                4567,
-                'To create a new chat session, invoke the New Chat command{0}.',
-                '<keybinding:workbench.action.chat.new>'
-            )));
-        }
     }
     if (type === 'editsView' || type === 'agentView') {
         if (type === 'agentView') {
             content.push(( localize(
-                4568,
+                4619,
                 '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(4569, 'The chat editing view is used to apply edits across files.')));
+            content.push(( localize(4620, 'The chat editing view is used to apply edits across files.')));
         }
         content.push(( localize(
-            4570,
+            4621,
             'It is comprised of an input box and a file working set (Shift+Tab).'
         )));
         content.push(( localize(
-            4571,
+            4622,
             'When a request is made, a progress indicator will play while the edits are being applied.'
         )));
         content.push(( localize(
-            4572,
+            4623,
             '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(
-            4573,
+            4624,
             'Navigate between edits in the editor with navigate previous{0} and next{1}',
             '<keybinding:chatEditor.action.navigatePrevious>',
             '<keybinding:chatEditor.action.navigateNext>'
         )));
         content.push(( localize(
-            4574,
+            4625,
             '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(
-            4575,
+            4626,
             '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(
-                4576,
+                4627,
                 '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(
-                4577,
+                4628,
                 'To take the action, use the accept tool command{0}.',
                 '<keybinding:workbench.action.chat.acceptTool>'
             )));
             content.push(( localize(
-                4578,
+                4629,
                 'To automatically approve tool actions without manual confirmation, set {0} to {1} in your settings.',
                 ChatConfiguration.GlobalAutoApprove,
                 'true'
             )));
             content.push(( localize(
-                4579,
+                4630,
                 'To accept a tool action, use the Accept Tool Confirmation command{0}.',
                 '<keybinding:workbench.action.chat.acceptTool>'
             )));
             content.push(( localize(
-                4580,
+                4631,
                 '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(4581, 'Some helpful commands include:')));
-        content.push(( localize(4582, '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>')));
+        content.push(( localize(4632, 'Some helpful commands include:')));
+        content.push(( localize(4633, '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>')));
         content.push(( localize(
-            4583,
+            4634,
             '- Attach Files{0}.',
             '<keybinding:workbench.action.chat.editing.attachFiles>'
         )));
         content.push(( localize(
-            4584,
+            4635,
             '- Remove File from Working Set{0}.',
             '<keybinding:chatEditing.removeFileFromWorkingSet>'
         )));
         content.push(( localize(
-            4585,
+            4636,
             '- Keep{0} and Undo File{1}.',
             '<keybinding:chatEditing.acceptFile>',
             '<keybinding:chatEditing.discardFile>'
         )));
-        content.push(( localize(4586, '- Save All Files{0}.', '<keybinding:chatEditing.saveAllFiles>')));
-        content.push(( localize(4587, '- Keep All Edits{0}.', '<keybinding:chatEditing.acceptAllFiles>')));
-        content.push(( localize(4588, '- Undo All Edits{0}.', '<keybinding:chatEditing.discardAllFiles>')));
-        content.push(( localize(4589, '- Open File in Diff{0}.', '<keybinding:chatEditing.openFileInDiff>')));
+        content.push(( localize(4637, '- Save All Files{0}.', '<keybinding:chatEditing.saveAllFiles>')));
+        content.push(( localize(4638, '- Keep All Edits{0}.', '<keybinding:chatEditing.acceptAllFiles>')));
+        content.push(( localize(4639, '- Undo All Edits{0}.', '<keybinding:chatEditing.discardAllFiles>')));
+        content.push(( localize(4640, '- 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(
-            4590,
+            4641,
             "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(
-            4591,
+            4642,
             "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.",
             '<keybinding:inlineChat.start>'
         )));
         content.push(( localize(
-            4592,
+            4643,
             '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(
-            4593,
+            4644,
             'In the input box, inspect the response in the accessible view{0}.',
             '<keybinding:editor.action.accessibleView>'
         )));
         content.push(( localize(
-            4594,
+            4645,
             "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."
         )));
         content.push(( localize(
-            4595,
+            4646,
             "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(
-            4596,
+            4647,
             "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(
-            4597,
+            4648,
             "Use tab to reach conditional parts like commands, status, message responses and more."
         )));
     }
     content.push(( localize(
-        4598,
+        4649,
         "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');
@@ -327,7 +336,7 @@ function getChatAccessibilityHelpProvider(accessor, editor, type) {
                 ctrl?.focus();
             }
         },
-        type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat
+        type === 'inlineChat' ? AccessibilityVerbositySettingId.InlineChat : AccessibilityVerbositySettingId.Chat
     ));
 }
 function getChatFocusKeybindingLabel(keybindingService, type, focus) {

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

@@ -15,7 +15,7 @@ import { IWorkbenchExtensionManagementService } from '@codingame/monaco-vscode-a
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 
 const INSTALL_CONTEXT_PREFIX = 'chat.installRecommendationAvailable';
 let ChatAgentRecommendation = class ChatAgentRecommendation extends Disposable {
@@ -47,7 +47,7 @@ let ChatAgentRecommendation = class ChatAgentRecommendation extends Disposable {
         const availabilityContextId = `${INSTALL_CONTEXT_PREFIX}.${extensionKey}`;
         const availabilityContext = ( new RawContextKey(availabilityContextId, false)).bindTo(this.contextKeyService);
         this.availabilityContextKeys.set(extensionKey, availabilityContext);
-        const title = ( localize2(4668, "New {0}", recommendation.displayName));
+        const title = ( localize2(4696, "New {0}", recommendation.displayName));
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
@@ -58,16 +58,6 @@ let ChatAgentRecommendation = class ChatAgentRecommendation extends Disposable {
                     category: CHAT_CATEGORY,
                     icon: Codicon.extensions,
                     menu: [
-                        {
-                            id: MenuId.AgentSessionsInstallMenu,
-                            group: '0_install',
-                            when: ( ContextKeyExpr.equals(availabilityContextId, true))
-                        },
-                        {
-                            id: MenuId.AgentSessionsViewTitle,
-                            group: 'navigation@98',
-                            when: ( ContextKeyExpr.equals(availabilityContextId, true))
-                        },
                         {
                             id: MenuId.ChatNewMenu,
                             group: '4_recommendations',

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

@@ -0,0 +1,3 @@
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ChatEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput";
+export declare function clearChatEditor(accessor: ServicesAccessor, chatEditorInput?: ChatEditorInput): Promise<void>;

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

@@ -0,0 +1,25 @@
+
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
+
+async function clearChatEditor(accessor, chatEditorInput) {
+    const editorService = accessor.get(IEditorService);
+    if (!chatEditorInput) {
+        const editorInput = editorService.activeEditor;
+        chatEditorInput = editorInput instanceof ChatEditorInput ? editorInput : undefined;
+    }
+    if (chatEditorInput instanceof ChatEditorInput) {
+        const resource = chatEditorInput.sessionResource && chatEditorInput.sessionResource.scheme !== Schemas.vscodeLocalChatSession
+            ? chatEditorInput.sessionResource.with({ path: `/untitled-${generateUuid()}` })
+            : ChatEditorInput.getNewEditorUri();
+        const identifier = editorService.findEditors(chatEditorInput.resource)[0];
+        await editorService.replaceEditors([{
+                editor: chatEditorInput,
+                replacement: { resource, options: { pinned: true } }
+            }], identifier.groupId);
+    }
+}
+
+export { clearChatEditor };

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

@@ -3,8 +3,8 @@ import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/p
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { ICodeBlockActionContext, ICodeCompareBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { ICodeBlockActionContext, ICodeCompareBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart";
 export interface IChatCodeBlockActionContext extends ICodeBlockActionContext {
     element: IChatResponseViewModel;
 }

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

@@ -24,13 +24,13 @@ import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { reviewEdits } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } 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 { ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.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(4671, "Apply to {0}", label);
+                        return localize(4697, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -106,7 +106,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4672, "Copy")),
+                title: ( localize2(4698, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -231,9 +231,9 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4673, "Apply in Editor")),
+                title: ( localize2(4699, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
-                f1: true,
+                f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
                 menu: [
@@ -267,7 +267,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4674, "Insert At Cursor")),
+                title: ( localize2(4700, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -301,7 +301,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4675, "Insert into New File")),
+                title: ( localize2(4701, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -361,7 +361,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4676, "Insert into Terminal")),
+                title: ( localize2(4702, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -396,17 +396,19 @@ function registerChatCodeBlockActions() {
             const editorService = accessor.get(IEditorService);
             const terminalEditorService = accessor.get(ITerminalEditorService);
             const terminalGroupService = accessor.get(ITerminalGroupService);
-            let terminal = await terminalService.getActiveOrCreateInstance();
-            const unusableTerminal = terminal.xterm?.isStdinDisabled || terminal.shellLaunchConfig.isFeatureTerminal;
-            terminal = unusableTerminal ? await terminalService.createTerminal() : terminal;
-            terminalService.setActiveInstance(terminal);
-            await terminal.focusWhenReady(true);
+            let terminal = await terminalService.getActiveOrCreateInstance({ acceptsInput: true });
+            if (terminal.xterm?.isStdinDisabled || terminal.shellLaunchConfig.isFeatureTerminal) {
+                terminal = await terminalService.createAndFocusTerminal({ location: TerminalLocation.Panel });
+            }
+            else {
+                await terminalService.focusInstance(terminal);
+            }
             if (terminal.target === TerminalLocation.Editor) {
                 const existingEditors = editorService.findEditors(terminal.resource);
                 terminalEditorService.openEditor(terminal, { viewColumn: existingEditors?.[0].groupId });
             }
             else {
-                terminalGroupService.showPanel(true);
+                await terminalGroupService.showPanel(true);
             }
             terminal.runCommand(context.code, false);
             if (isResponseVM(context.element)) {
@@ -455,7 +457,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4677, "Next Code Block")),
+                title: ( localize2(4703, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -475,7 +477,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4678, "Previous Code Block")),
+                title: ( localize2(4704, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -534,7 +536,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4679, "Apply Edits")),
+                title: ( localize2(4705, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -576,7 +578,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4680, "Discard Edits")),
+                title: ( localize2(4706, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -37,14 +37,14 @@ import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode
 import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
 import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import { SearchContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/constants';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatAgentLocation, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService, IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
-import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
-import { isQuickChat } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
+import { isQuickChat } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
+import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 import { registerPromptActions } from '../promptSyntax/promptFileActions.js';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -114,7 +114,7 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4691, "Add File to Chat")),
+            title: ( localize2(4717, "Add File to Chat")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             f1: true,
@@ -163,7 +163,7 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4692, "Add Folder to Chat")),
+            title: ( localize2(4718, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -192,7 +192,7 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4693, "Add Selection to Chat")),
+            title: ( localize2(4719, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -257,7 +257,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.insertSearchResults',
-            title: ( localize2(4694, 'Add Search Results to Chat')),
+            title: ( localize2(4720, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -323,7 +323,7 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.attachContext',
-            title: ( localize2(4695, "Add Context...")),
+            title: ( localize2(4721, "Add Context...")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -406,7 +406,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4696, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4722, 'Search attachments')),
             providerOptions,
         });
     }
@@ -474,7 +474,7 @@ class AttachContextAction extends Action2 {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4697, 'Go back ↩')),
+            label: ( localize(4723, 'Go back ↩')),
             alwaysShow: true
         };
         const configureItem = pickerConfig.configure ? {