@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -1,12 +1,14 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
-import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
@@ -14,12 +16,11 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { IVoiceSessionController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/voiceSessionController.service';
 import { getEditingSessionContext, EditingSessionAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
 import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, ACTION_ID_NEW_EDIT_SESSION, handleCurrentEditingSession, clearChatSessionPreservingType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { clearChatEditor } from './chatClear.js';
 import { AgentSessionProviders, AgentSessionsViewerOrientation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 
 function isNewEditSessionActionContext(arg) {
     if (arg && typeof arg === "object") {
@@ -37,10 +38,46 @@ function isNewEditSessionActionContext(arg) {
     }
     return false;
 }
+class NewChatAction extends Action2 {
+    constructor() {
+        super({
+            id: ACTION_ID_NEW_CHAT,
+            title: ( localize2(5709, "New Chat")),
+            category: CHAT_CATEGORY,
+            icon: Codicon.plus,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
+            f1: true,
+            menu: [{
+                id: MenuId.ChatContext,
+                group: "z_clear"
+            }, {
+                id: MenuId.ChatNewMenu,
+                group: "1_open",
+                order: 1,
+                when: ( ContextKeyExpr.and(( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("copilot")), ( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("new-session")), ( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("comment"))))
+            }],
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib + 1,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyN,
+                secondary: [KeyMod.CtrlCmd | KeyCode.KeyL],
+                mac: {
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyN,
+                    secondary: [KeyMod.WinCtrl | KeyCode.KeyL]
+                },
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.inChatEditor.negate())))
+            }
+        });
+    }
+    async run(accessor, ...args) {
+        const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
+        const context = getEditingSessionContext(accessor, args);
+        await runNewChatAction(accessor, context, executeCommandContext);
+    }
+}
 function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         submenu: MenuId.ChatNewMenu,
-        title: ( localize2(5313, "New Chat")),
+        title: ( localize2(5709, "New Chat")),
         icon: Codicon.plus,
         when: ( ContextKeyExpr.equals("view", ChatViewId)),
         group: "navigation",
@@ -51,7 +88,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chatEditor.newChat",
-                title: ( localize2(5314, "New Chat")),
+                title: ( localize2(5710, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled
@@ -61,42 +98,7 @@ function registerNewChatActions() {
             await clearChatEditor(accessor);
         }
     });
-    registerAction2(class NewChatAction extends Action2 {
-        constructor() {
-            super({
-                id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(5313, "New Chat")),
-                category: CHAT_CATEGORY,
-                icon: Codicon.plus,
-                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
-                f1: true,
-                menu: [{
-                    id: MenuId.ChatContext,
-                    group: "z_clear"
-                }, {
-                    id: MenuId.ChatNewMenu,
-                    group: "1_open",
-                    order: 1,
-                    when: ( ContextKeyExpr.and(( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("copilot")), ( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("new-session")), ( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("comment"))))
-                }],
-                keybinding: {
-                    weight: KeybindingWeight.WorkbenchContrib + 1,
-                    primary: KeyMod.CtrlCmd | KeyCode.KeyN,
-                    secondary: [KeyMod.CtrlCmd | KeyCode.KeyL],
-                    mac: {
-                        primary: KeyMod.CtrlCmd | KeyCode.KeyN,
-                        secondary: [KeyMod.WinCtrl | KeyCode.KeyL]
-                    },
-                    when: ChatContextKeys.inChatSession
-                }
-            });
-        }
-        async run(accessor, ...args) {
-            const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
-            const context = getEditingSessionContext(accessor, args);
-            await runNewChatAction(accessor, context, executeCommandContext);
-        }
-    });
+    registerAction2(NewChatAction);
     const iconVariants = [{
         idSuffix: ".copilotIcon",
         iconValue: "copilot",
@@ -115,7 +117,7 @@ function registerNewChatActions() {
             constructor() {
                 super({
                     id: ACTION_ID_NEW_CHAT + variant.idSuffix,
-                    title: ( localize2(5313, "New Chat")),
+                    title: ( localize2(5709, "New Chat")),
                     category: CHAT_CATEGORY,
                     icon: variant.icon,
                     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -140,7 +142,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.newLocalChat",
-                title: ( localize2(5315, "New Local Chat")),
+                title: ( localize2(5711, "New Local Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -150,13 +152,19 @@ function registerNewChatActions() {
         async run(accessor, ...args) {
             const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
             const context = getEditingSessionContext(accessor, args);
+            if (!context?.chatWidget) {
+                const view = await accessor.get(IViewsService).openView(ChatViewId, true);
+                await view?.startNewLocalSession();
+                view?.focusInput();
+                return;
+            }
             await runNewChatAction(accessor, context, executeCommandContext, AgentSessionProviders.Local);
         }
     });
     MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(5316, "Go Back")),
+            title: ( localize2(5712, "Go Back")),
             icon: Codicon.arrowLeft
         },
         when: ( ChatContextKeys.agentSessionsViewerOrientation.notEqualsTo(AgentSessionsViewerOrientation.SideBySide)),
@@ -166,7 +174,7 @@ function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatTitleBarMenu, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(5313, "New Chat"))
+            title: ( localize2(5709, "New Chat"))
         },
         when: ChatContextKeys.enabled,
         group: "b_new",
@@ -176,7 +184,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.undoEdit",
-                title: ( localize2(5317, "Undo Last Edit")),
+                title: ( localize2(5713, "Undo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -198,7 +206,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.redoEdit",
-                title: ( localize2(5318, "Redo Last Edit")),
+                title: ( localize2(5714, "Redo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -222,8 +230,8 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.redoEdit2",
-                title: ( localize2(5319, "Redo")),
-                tooltip: ( localize2(5320, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(5715, "Redo")),
+                tooltip: ( localize2(5716, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
@@ -252,9 +260,7 @@ function registerNewChatActions() {
 }
 async function runNewChatAction(accessor, context, executeCommandContext, sessionType) {
     const accessibilityService = accessor.get(IAccessibilityService);
-    const viewsService = accessor.get(IViewsService);
-    const configurationService = accessor.get(IConfigurationService);
-    const chatSessionsService = accessor.get(IChatSessionsService);
+    const instantiationService = accessor.get(IInstantiationService);
     const {
         editingSession,
         chatWidget: widget
@@ -262,22 +268,23 @@ async function runNewChatAction(accessor, context, executeCommandContext, sessio
     if (!widget) {
         return;
     }
+    const voiceSessionController = accessor.get(IVoiceSessionController);
+    const voiceTarget = voiceSessionController.targetSession.get();
+    const currentSession = widget.viewModel?.sessionResource;
     const dialogService = accessor.get(IDialogService);
     const model = widget.viewModel?.model;
     if (model && !(await handleCurrentEditingSession(model, undefined, dialogService))) {
         return;
     }
     await editingSession?.stop();
-    await clearChatSessionPreservingType(
-        widget,
-        viewsService,
-        sessionType,
-        configurationService,
-        chatSessionsService
-    );
+    await instantiationService.invokeFunction(clearChatSessionPreservingType, widget, sessionType);
+    const newSession = widget.viewModel?.sessionResource;
+    if ((voiceSessionController.isConnected.get() || voiceSessionController.isConnecting.get()) && (!voiceTarget || (!!currentSession && isEqual(voiceTarget, currentSession))) && newSession) {
+        voiceSessionController.setTargetSession(newSession);
+    }
     widget.attachmentModel.clear(true);
     widget.focusInput();
-    accessibilityService.alert(( localize(5321, "New chat")));
+    accessibilityService.alert(( localize(5717, "New chat")));
     if (!executeCommandContext) {
         return;
     }
@@ -295,4 +302,4 @@ async function runNewChatAction(accessor, context, executeCommandContext, sessio
     }
 }
 
-export { registerNewChatActions };
+export { NewChatAction, registerNewChatActions };

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

@@ -16,10 +16,11 @@ import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatActions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { CHAT_DEBUG_HAS_ACTIVE_SESSION, CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService';
 import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatDebugEditorInput } from '../chatDebug/chatDebugEditorInput.js';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
@@ -30,7 +31,7 @@ function registerChatOpenAgentDebugPanelAction() {
         constructor() {
             super({
                 id: "workbench.action.chat.openAgentDebugPanel",
-                title: ( localize2(5322, "Open Agent Debug Logs")),
+                title: ( localize2(5718, "Open Agent Debug Logs")),
                 f1: true,
                 category: Categories.Developer,
                 precondition: ChatContextKeys.enabled
@@ -51,16 +52,11 @@ function registerChatOpenAgentDebugPanelAction() {
         constructor() {
             super({
                 id: "workbench.action.chat.openAgentDebugPanelForSession",
-                title: ( localize2(5323, "Show Agent Debug Logs")),
+                title: ( localize2(5719, "Show Agent Debug Logs")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 menu: [{
-                    id: CHAT_CONFIG_MENU_ID,
-                    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)))),
-                    order: 0,
-                    group: "4_logs"
-                }, {
                     id: MenuId.ChatWelcomeContext,
                     group: "2_settings",
                     order: 0,
@@ -99,22 +95,22 @@ function registerChatOpenAgentDebugPanelAction() {
     });
     const defaultDebugLogFileName = "agent-debug-log.json";
     const debugLogFilters = [{
-        name: ( localize(5324, "Agent Debug Log")),
+        name: ( localize(5720, "Agent Debug Log")),
         extensions: ["json"]
     }];
     registerAction2(class ExportAgentDebugLogAction extends Action2 {
         constructor() {
             super({
                 id: "workbench.action.chat.exportAgentDebugLog",
-                title: ( localize2(5325, "Export Agent Debug Log...")),
+                title: ( localize2(5721, "Export Agent Debug Log...")),
                 icon: Codicon.chatExport,
                 f1: true,
                 category: Categories.Developer,
-                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.chatIsAgentHostSession.negate()))),
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, CHAT_DEBUG_HAS_ACTIVE_SESSION, ( CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST.negate()))),
                 menu: [{
                     id: MenuId.EditorTitle,
                     group: "navigation",
-                    when: ( ActiveEditorContext.isEqualTo(ChatDebugEditorInput.ID)),
+                    when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(ChatDebugEditorInput.ID)), CHAT_DEBUG_HAS_ACTIVE_SESSION, ( CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST.negate()))),
                     order: 10
                 }]
             });
@@ -130,7 +126,7 @@ function registerChatOpenAgentDebugPanelAction() {
             if (!sessionResource) {
                 notificationService.notify({
                     severity: Severity.Info,
-                    message: ( localize(5326, "No active debug session to export. Navigate to a session first."))
+                    message: ( localize(5722, "No active debug session to export. Navigate to a session first."))
                 });
                 return;
             }
@@ -150,7 +146,7 @@ function registerChatOpenAgentDebugPanelAction() {
             if (!data) {
                 notificationService.notify({
                     severity: Severity.Warning,
-                    message: ( localize(5327, "Export is not supported by the current provider."))
+                    message: ( localize(5723, "Export is not supported by the current provider."))
                 });
                 return;
             }
@@ -158,8 +154,8 @@ function registerChatOpenAgentDebugPanelAction() {
             telemetryService.publicLog2("chatDebugLogExported", {
                 fileSizeBytes: data.byteLength
             });
-            notificationService.prompt(Severity.Info, ( localize(5328, "Agent debug log exported successfully.")), [{
-                label: ( localize(5329, "Open File")),
+            notificationService.prompt(Severity.Info, ( localize(5724, "Agent debug log exported successfully.")), [{
+                label: ( localize(5725, "Open File")),
                 run: () => openerService.open(outputPath)
             }]);
         }
@@ -168,7 +164,7 @@ function registerChatOpenAgentDebugPanelAction() {
         constructor() {
             super({
                 id: "workbench.action.chat.importAgentDebugLog",
-                title: ( localize2(5330, "Import Agent Debug Log...")),
+                title: ( localize2(5726, "Import Agent Debug Log...")),
                 icon: Codicon.chatImport,
                 f1: true,
                 category: Categories.Developer,
@@ -176,7 +172,7 @@ function registerChatOpenAgentDebugPanelAction() {
                 menu: [{
                     id: MenuId.EditorTitle,
                     group: "navigation",
-                    when: ( ActiveEditorContext.isEqualTo(ChatDebugEditorInput.ID)),
+                    when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(ChatDebugEditorInput.ID)), ( CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST.negate()))),
                     order: 11
                 }]
             });
@@ -205,8 +201,8 @@ function registerChatOpenAgentDebugPanelAction() {
                     fileSizeBytes: stat.size,
                     result: "fileTooLarge"
                 });
-                await dialogService.warn(( localize(5331, "File Too Large")), ( localize(
-                    5332,
+                await dialogService.warn(( localize(5727, "File Too Large")), ( localize(
+                    5728,
                     "The selected file ({0} MB) exceeds the 50 MB size limit for debug log imports.",
                     (stat.size / (1024 * 1024)).toFixed(1)
                 )));
@@ -221,7 +217,7 @@ function registerChatOpenAgentDebugPanelAction() {
                 });
                 notificationService.notify({
                     severity: Severity.Warning,
-                    message: ( localize(5333, "Import is not supported by the current provider."))
+                    message: ( localize(5729, "Import is not supported by the current provider."))
                 });
                 return;
             }

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

@@ -15,10 +15,10 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
-import '../../common/plugins/pluginMarketplaceService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
 import { InstalledAgentPluginsViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { parseMarketplaceReference, readConfiguredMarketplaces, parseMarketplaceReferences, MarketplaceReferenceKind } from '../../common/plugins/marketplaceReference.js';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { parseMarketplaceReference, readConfiguredMarketplaces, parseMarketplaceReferences, MarketplaceReferenceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 class ManagePluginsAction extends Action2 {
@@ -28,13 +28,9 @@ class ManagePluginsAction extends Action2 {
     constructor() {
         super({
             id: ManagePluginsAction.ID,
-            title: ( localize2(5334, "Plugins")),
+            title: ( localize2(5730, "Plugins")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
-            menu: [{
-                id: CHAT_CONFIG_MENU_ID,
-                group: "2_plugins"
-            }],
             f1: true
         });
     }
@@ -49,7 +45,7 @@ class InstallFromSourceAction extends Action2 {
     constructor() {
         super({
             id: InstallFromSourceAction.ID,
-            title: ( localize2(5335, "Install Plugin from Source")),
+            title: ( localize2(5731, "Install Plugin from Source")),
             category: CHAT_CATEGORY,
             icon: Codicon.add,
             precondition: ChatContextKeys.enabled,
@@ -68,9 +64,9 @@ class InstallFromSourceAction extends Action2 {
         const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
         const store = ( new DisposableStore());
         const inputBox = store.add(quickInputService.createInputBox());
-        inputBox.placeholder = ( localize(5336, "owner/repo, git URL, or local folder path"));
+        inputBox.placeholder = ( localize(5732, "owner/repo, git URL, or local folder path"));
         inputBox.prompt = ( localize(
-            5337,
+            5733,
             "Enter a GitHub repository, git URL, or local folder path to install a plugin from"
         ));
         inputBox.ignoreFocusOut = true;
@@ -120,7 +116,7 @@ class InstallFromSourceAction extends Action2 {
                     }
                 } catch (e) {
                     const detail = e instanceof Error ? e.message : String(e);
-                    inputBox.validationMessage = ( localize(5338, "Failed to install plugin: {0}", detail));
+                    inputBox.validationMessage = ( localize(5734, "Failed to install plugin: {0}", detail));
                     inputBox.show();
                 } finally {
                     installing = false;
@@ -140,7 +136,7 @@ class ManagePluginMarketplacesAction extends Action2 {
     constructor() {
         super({
             id: ManagePluginMarketplacesAction.ID,
-            title: ( localize2(5339, "Manage Plugin Marketplaces")),
+            title: ( localize2(5735, "Manage Plugin Marketplaces")),
             icon: Codicon.globe,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
@@ -170,18 +166,18 @@ class ManagePluginMarketplacesAction extends Action2 {
         const policyCanonicalIds = ( new Set(( parseMarketplaceReferences(extraValues).map(r => r.canonicalId))));
         if (refs.length === 0) {
             quickInputService.pick([], {
-                placeHolder: ( localize(5340, "No plugin marketplaces configured"))
+                placeHolder: ( localize(5736, "No plugin marketplaces configured"))
             });
             return;
         }
         const items = ( refs.map(ref => ({
             label: ref.displayLabel,
-            description: ref.kind === MarketplaceReferenceKind.LocalFileUri ? ( localize(5341, "Local")) : ( policyCanonicalIds.has(ref.canonicalId)) ? ( localize(5342, "{0} (managed by enterprise policy)", ref.cloneUrl)) : ref.cloneUrl,
+            description: ref.kind === MarketplaceReferenceKind.LocalFileUri ? ( localize(5737, "Local")) : ( policyCanonicalIds.has(ref.canonicalId)) ? ( localize(5738, "{0} (managed by enterprise policy)", ref.cloneUrl)) : ref.cloneUrl,
             reference: ref,
             managedByPolicy: ( policyCanonicalIds.has(ref.canonicalId))
         })));
         const selected = await quickInputService.pick(items, {
-            placeHolder: ( localize(5343, "Select a plugin marketplace"))
+            placeHolder: ( localize(5739, "Select a plugin marketplace"))
         });
         if (!selected) {
             return;
@@ -189,22 +185,22 @@ class ManagePluginMarketplacesAction extends Action2 {
         const ref = selected.reference;
         const actionItems = [{
             id: "showPlugins",
-            label: ( localize(5344, "Show Plugins"))
+            label: ( localize(5740, "Show Plugins"))
         }];
         const repoUri = pluginRepositoryService.getRepositoryUri(ref);
         const repoExists = await fileService.exists(repoUri);
         if (repoExists) {
             actionItems.push({
                 id: "openDirectory",
-                label: ( localize(5345, "Open Folder"))
+                label: ( localize(5741, "Open Folder"))
             });
         }
         actionItems.push({
             id: "removeMarketplace",
-            label: ( localize(5346, "Remove Marketplace"))
+            label: ( localize(5742, "Remove Marketplace"))
         });
         const action = await quickInputService.pick(actionItems, {
-            placeHolder: ( localize(5347, "Select an action for '{0}'", ref.displayLabel))
+            placeHolder: ( localize(5743, "Select an action for '{0}'", ref.displayLabel))
         });
         if (!action) {
             return;
@@ -222,7 +218,7 @@ class ManagePluginMarketplacesAction extends Action2 {
                     notificationService.notify({
                         severity: Severity.Warning,
                         message: ( localize(
-                            5348,
+                            5744,
                             "Enterprise policy manages '{0}', so it can't be removed here.",
                             ref.displayLabel
                         ))

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

@@ -13,7 +13,7 @@ function registerChatPromptNavigationActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.nextUserPrompt",
-                title: ( localize2(5349, "Next User Prompt")),
+                title: ( localize2(5745, "Next User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatPromptNavigationActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.previousUserPrompt",
-                title: ( localize2(5350, "Previous User Prompt")),
+                title: ( localize2(5746, "Previous User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -15,6 +15,11 @@ export declare class ChatSteerWithMessageAction extends Action2 {
     constructor();
     run(accessor: ServicesAccessor, ...args: unknown[]): void;
 }
+export declare class ChatAskInSideChatAction extends Action2 {
+    static readonly ID = "workbench.action.chat.askInSideChat";
+    constructor();
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+}
 export declare class ChatRemovePendingRequestAction extends Action2 {
     static readonly ID = "workbench.action.chat.removePendingRequest";
     constructor();