@codingame/monaco-vscode-chat-service-override 26.2.2 → 27.0.0

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

@@ -21,7 +21,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
     constructor() {
         super({
             id: ManageLanguageModelAuthenticationAction.ID,
-            title: ( localize2(4813, "Manage Language Model Access...")),
+            title: ( localize2(4906, "Manage Language Model Access...")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -91,9 +91,9 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
         if (extensionAuth.size === 0) {
             dialogService.prompt({
                 type: "info",
-                message: ( localize(4814, "No language models requiring authentication found.")),
+                message: ( localize(4907, "No language models requiring authentication found.")),
                 detail: ( localize(
-                    4815,
+                    4908,
                     "There are currently no language models that require authentication."
                 ))
             });
@@ -108,10 +108,10 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
             items.push({
                 type: "separator",
                 id: ownerId,
-                label: ( localize(4816, "{0}", extension.displayName || extension.name)),
+                label: ( localize(4909, "{0}", extension.displayName || extension.name)),
                 buttons: [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localize(4817, "Open Extension"))
+                    tooltip: ( localize(4910, "Open Extension"))
                 }]
             });
             let addedTrustedSeparator = false;
@@ -120,7 +120,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     if (allowedExt.trusted && !addedTrustedSeparator) {
                         items.push({
                             type: "separator",
-                            label: ( localize(4818, "Trusted by Microsoft"))
+                            label: ( localize(4911, "Trusted by Microsoft"))
                         });
                         addedTrustedSeparator = true;
                     }
@@ -133,15 +133,15 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                         disabled: allowedExt.trusted,
                         buttons: [{
                             iconClass: ThemeIcon.asClassName(Codicon.info),
-                            tooltip: ( localize(4817, "Open Extension"))
+                            tooltip: ( localize(4910, "Open Extension"))
                         }]
                     });
                 }
             } else {
                 items.push({
-                    label: ( localize(4819, "No extensions have access")),
+                    label: ( localize(4912, "No extensions have access")),
                     description: ( localize(
-                        4820,
+                        4913,
                         "No extensions are currently allowed to use models from {0}",
                         ownerId
                     )),
@@ -164,8 +164,8 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     void extensionsWorkbenchService.open(extId);
                 }
             },
-            title: ( localize(4821, "Manage Language Model Access")),
-            placeHolder: ( localize(4822, "Choose which extensions can access language models"))
+            title: ( localize(4914, "Manage Language Model Access")),
+            placeHolder: ( localize(4915, "Choose which extensions can access language models"))
         });
         if (!result) {
             return;
@@ -188,7 +188,7 @@ class ConfigureLanguageModelsGroupAction extends Action2 {
     constructor() {
         super({
             id: "lm.addLanguageModelsProviderGroup",
-            title: ( localize(4823, "Add Language Models Group"))
+            title: ( localize(4916, "Add Language Models Group"))
         });
     }
     async run(accessor, languageModelsProviderGroup) {
@@ -208,7 +208,7 @@ class MigrateLanguageModelsGroupAction extends Action2 {
     constructor() {
         super({
             id: "lm.migrateLanguageModelsProviderGroup",
-            title: ( localize(4824, "Migrate Language Models Group"))
+            title: ( localize(4917, "Migrate Language Models Group"))
         });
     }
     async run(accessor, languageModelsProviderGroup) {

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

@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInEditor",
-                title: ( localize2(4825, "Move Chat into Editor Area")),
+                title: ( localize2(4918, "Move Chat into Editor Area")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -53,7 +53,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInNewWindow",
-                title: ( localize2(4826, "Move Chat into New Window")),
+                title: ( localize2(4919, "Move Chat into New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -78,7 +78,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInSidebar",
-                title: ( localize2(4827, "Move Chat into Side Bar")),
+                title: ( localize2(4920, "Move Chat into Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -101,9 +101,9 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        appendOpenChatInViewMenuItem(id, ( localize(4828, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4829, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4830, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
+        appendOpenChatInViewMenuItem(id, ( localize(4921, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4922, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4923, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, sessionResource) {

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

@@ -1,8 +1,6 @@
 
 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 { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 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';
@@ -10,18 +8,14 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { ChatAgentLocation, ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { LocalChatSessionUri, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
-import { ChatViewId, isIChatViewViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { getEditingSessionContext, EditingSessionAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
-import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
-import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, ACTION_ID_NEW_EDIT_SESSION, handleCurrentEditingSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+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';
@@ -45,7 +39,7 @@ function isNewEditSessionActionContext(arg) {
 function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         submenu: MenuId.ChatNewMenu,
-        title: ( localize2(4831, "New Chat")),
+        title: ( localize2(4924, "New Chat")),
         icon: Codicon.plus,
         when: ( ContextKeyExpr.equals("view", ChatViewId)),
         group: "navigation",
@@ -56,7 +50,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chatEditor.newChat",
-                title: ( localize2(4832, "New Chat")),
+                title: ( localize2(4925, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled
@@ -70,7 +64,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(4831, "New Chat")),
+                title: ( localize2(4924, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -81,12 +75,8 @@ function registerNewChatActions() {
                 }, {
                     id: MenuId.ChatNewMenu,
                     group: "1_open",
-                    order: 1
-                }, {
-                    id: MenuId.CompactWindowEditorTitle,
-                    group: "navigation",
-                    when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)),
-                    order: 1
+                    order: 1,
+                    when: ( ContextKeyExpr.and(( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("copilot")), ( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("new-session")), ( ChatContextKeys.newChatButtonExperimentIcon.notEqualsTo("comment"))))
                 }],
                 keybinding: {
                     weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -106,12 +96,50 @@ function registerNewChatActions() {
             await runNewChatAction(accessor, context, executeCommandContext);
         }
     });
+    const iconVariants = [{
+        idSuffix: ".copilotIcon",
+        iconValue: "copilot",
+        icon: Codicon.copilot
+    }, {
+        idSuffix: ".newSessionIcon",
+        iconValue: "new-session",
+        icon: Codicon.newSession
+    }, {
+        idSuffix: ".commentIcon",
+        iconValue: "comment",
+        icon: Codicon.comment
+    }];
+    for (const variant of iconVariants) {
+        registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: ACTION_ID_NEW_CHAT + variant.idSuffix,
+                    title: ( localize2(4924, "New Chat")),
+                    category: CHAT_CATEGORY,
+                    icon: variant.icon,
+                    precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
+                    f1: false,
+                    menu: [{
+                        id: MenuId.ChatNewMenu,
+                        group: "1_open",
+                        order: 1,
+                        when: ( ChatContextKeys.newChatButtonExperimentIcon.isEqualTo(variant.iconValue))
+                    }]
+                });
+            }
+            async run(accessor, ...args) {
+                const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
+                const context = getEditingSessionContext(accessor, args);
+                await runNewChatAction(accessor, context, executeCommandContext);
+            }
+        });
+    }
     CommandsRegistry.registerCommandAlias(ACTION_ID_NEW_EDIT_SESSION, ACTION_ID_NEW_CHAT);
     registerAction2(class NewLocalChatAction extends Action2 {
         constructor() {
             super({
                 id: "workbench.action.chat.newLocalChat",
-                title: ( localize2(4833, "New Local Chat")),
+                title: ( localize2(4926, "New Local Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -127,7 +155,7 @@ function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(4834, "Go Back")),
+            title: ( localize2(4927, "Go Back")),
             icon: Codicon.arrowLeft
         },
         when: ( ChatContextKeys.agentSessionsViewerOrientation.notEqualsTo(AgentSessionsViewerOrientation.SideBySide)),
@@ -138,7 +166,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.undoEdit",
-                title: ( localize2(4835, "Undo Last Edit")),
+                title: ( localize2(4928, "Undo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -160,7 +188,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.redoEdit",
-                title: ( localize2(4836, "Redo Last Edit")),
+                title: ( localize2(4929, "Redo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -184,8 +212,8 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.redoEdit2",
-                title: ( localize2(4837, "Redo")),
-                tooltip: ( localize2(4838, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(4930, "Redo")),
+                tooltip: ( localize2(4931, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
@@ -212,16 +240,6 @@ function registerNewChatActions() {
         }
     });
 }
-function getResourceForNewChatSession(sessionType) {
-    const isRemoteSession = sessionType !== localChatSessionType;
-    if (isRemoteSession) {
-        return ( URI.from({
-            scheme: sessionType,
-            path: `/untitled-${generateUuid()}`
-        }));
-    }
-    return LocalChatSessionUri.forSession(generateUuid());
-}
 async function runNewChatAction(accessor, context, executeCommandContext, sessionType) {
     const accessibilityService = accessor.get(IAccessibilityService);
     const viewsService = accessor.get(IViewsService);
@@ -239,18 +257,10 @@ async function runNewChatAction(accessor, context, executeCommandContext, sessio
         return;
     }
     await editingSession?.stop();
-    const currentResource = widget.viewModel?.model.sessionResource;
-    const newSessionType = sessionType ?? (currentResource ? getChatSessionType(currentResource) : localChatSessionType);
-    if (isIChatViewViewContext(widget.viewContext) && newSessionType !== localChatSessionType) {
-        const newResource = getResourceForNewChatSession(newSessionType);
-        const view = await viewsService.openView(ChatViewId);
-        await view.loadSession(newResource);
-    } else {
-        await widget.clear();
-    }
+    await clearChatSessionPreservingType(widget, viewsService, sessionType);
     widget.attachmentModel.clear(true);
     widget.focusInput();
-    accessibilityService.alert(( localize(4839, "New chat")));
+    accessibilityService.alert(( localize(4932, "New chat")));
     if (!executeCommandContext) {
         return;
     }

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

@@ -0,0 +1,4 @@
+/**
+ * Registers the Open Agent Debug Panel and Show Agent Logs actions.
+ */
+export declare function registerChatOpenAgentDebugPanelAction(): void;

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

@@ -0,0 +1,84 @@
+
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+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 { 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 { ChatDebugEditorInput } from '../chatDebug/chatDebugEditorInput.js';
+
+function registerChatOpenAgentDebugPanelAction() {
+    registerAction2(class OpenAgentDebugPanelAction extends Action2 {
+        constructor() {
+            super({
+                id: "workbench.action.chat.openAgentDebugPanel",
+                title: ( localize2(4933, "Open Agent Debug Panel")),
+                f1: true,
+                category: Categories.Developer,
+                precondition: ChatContextKeys.enabled
+            });
+        }
+        async run(accessor) {
+            const editorService = accessor.get(IEditorService);
+            const chatDebugService = accessor.get(IChatDebugService);
+            chatDebugService.activeSessionResource = undefined;
+            const options = {
+                pinned: true,
+                viewHint: "home"
+            };
+            await editorService.openEditor(ChatDebugEditorInput.instance, options);
+        }
+    });
+    registerAction2(class OpenAgentDebugPanelForSessionAction extends Action2 {
+        constructor() {
+            super({
+                id: "workbench.action.chat.openAgentDebugPanelForSession",
+                title: ( localize2(4934, "Show Agent Logs")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.chatSessionHasDebugData)),
+                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,
+                    when: ( ChatContextKeys.inChatEditor.negate())
+                }]
+            });
+        }
+        async run(accessor, context) {
+            const editorService = accessor.get(IEditorService);
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const chatDebugService = accessor.get(IChatDebugService);
+            let sessionResource;
+            if (URI.isUri(context)) {
+                sessionResource = context;
+            } else if (isChatViewTitleActionContext(context)) {
+                sessionResource = context.sessionResource;
+            }
+            if (!sessionResource) {
+                const widget = chatWidgetService.lastFocusedWidget;
+                sessionResource = widget?.viewModel?.sessionResource;
+            }
+            chatDebugService.activeSessionResource = sessionResource;
+            const options = {
+                pinned: true,
+                sessionResource,
+                viewHint: "logs"
+            };
+            await editorService.openEditor(ChatDebugEditorInput.instance, options);
+        }
+    });
+}
+
+export { registerChatOpenAgentDebugPanelAction };

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

@@ -0,0 +1 @@
+export declare function registerChatPluginActions(): void;

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

@@ -0,0 +1,33 @@
+
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+
+class ManagePluginsAction extends Action2 {
+    static {
+        this.ID = "workbench.action.chat.managePlugins";
+    }
+    constructor() {
+        super({
+            id: ManagePluginsAction.ID,
+            title: ( localize2(4935, "Plugins")),
+            category: CHAT_CATEGORY,
+            precondition: ChatContextKeys.enabled,
+            menu: [{
+                id: CHAT_CONFIG_MENU_ID,
+                group: "2_plugins"
+            }],
+            f1: true
+        });
+    }
+    async run(accessor) {
+        accessor.get(IExtensionsWorkbenchService).openSearch("@agentPlugins ");
+    }
+}
+function registerChatPluginActions() {
+    registerAction2(ManagePluginsAction);
+}
+
+export { registerChatPluginActions };

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(4840, "Next User Prompt")),
+                title: ( localize2(4936, "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(4841, "Previous User Prompt")),
+                title: ( localize2(4937, "Previous User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -9,17 +9,11 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatRequestQueueKind } 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 { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
-const queueingEnabledCondition = ( ContextKeyExpr.equals(`config.${ChatConfiguration.RequestQueueingEnabled}`, true));
-const requestInProgressOrPendingToolCall = ( ContextKeyExpr.or(
-    ChatContextKeys.requestInProgress,
-    ChatContextKeys.Editing.hasToolConfirmation
-));
-const queuingActionsPresent = ( ContextKeyExpr.and(queueingEnabledCondition, ( ContextKeyExpr.or(requestInProgressOrPendingToolCall, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.QueueOrSteer)))), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Sent))));
+const queuingActionsPresent = ( ContextKeyExpr.and(( ContextKeyExpr.or(ChatContextKeys.requestInProgress, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.QueueOrSteer)))), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Sent))));
 function isRemovePendingRequestContext(context) {
     return !!context && typeof context === "object" && "sessionResource" in context && "pendingRequestId" in context && URI.isUri(context.sessionResource) && typeof context.pendingRequestId === "string";
 }
@@ -30,8 +24,8 @@ class ChatQueueMessageAction extends Action2 {
     constructor() {
         super({
             id: ChatQueueMessageAction.ID,
-            title: ( localize2(4842, "Add to Queue")),
-            tooltip: ( localize(4843, "Queue this message to send after the current request completes")),
+            title: ( localize2(4938, "Add to Queue")),
+            tooltip: ( localize(4939, "Queue this message to send after the current request completes")),
             icon: Codicon.add,
             f1: false,
             category: CHAT_CATEGORY,
@@ -65,9 +59,9 @@ class ChatSteerWithMessageAction extends Action2 {
     constructor() {
         super({
             id: ChatSteerWithMessageAction.ID,
-            title: ( localize2(4844, "Steer with Message")),
+            title: ( localize2(4940, "Steer with Message")),
             tooltip: ( localize(
-                4845,
+                4941,
                 "Send this message at the next opportunity, signaling the current request to yield"
             )),
             icon: Codicon.arrowRight,
@@ -103,7 +97,7 @@ class ChatRemovePendingRequestAction extends Action2 {
     constructor() {
         super({
             id: ChatRemovePendingRequestAction.ID,
-            title: ( localize2(4846, "Remove from Queue")),
+            title: ( localize2(4942, "Remove from Queue")),
             icon: Codicon.close,
             f1: false,
             category: CHAT_CATEGORY,
@@ -111,11 +105,7 @@ class ChatRemovePendingRequestAction extends Action2 {
                 id: MenuId.ChatMessageTitle,
                 group: "navigation",
                 order: 4,
-                when: ( ContextKeyExpr.and(
-                    queueingEnabledCondition,
-                    ChatContextKeys.isRequest,
-                    ChatContextKeys.isPendingRequest
-                ))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ChatContextKeys.isPendingRequest))
             }]
         });
     }
@@ -139,7 +129,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
     constructor() {
         super({
             id: ChatSendPendingImmediatelyAction.ID,
-            title: ( localize2(4847, "Send Immediately")),
+            title: ( localize2(4943, "Send Immediately")),
             icon: Codicon.arrowUp,
             f1: false,
             category: CHAT_CATEGORY,
@@ -147,11 +137,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
                 id: MenuId.ChatMessageTitle,
                 group: "navigation",
                 order: 3,
-                when: ( ContextKeyExpr.and(
-                    queueingEnabledCondition,
-                    ChatContextKeys.isRequest,
-                    ChatContextKeys.isPendingRequest
-                ))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ChatContextKeys.isPendingRequest))
             }]
         });
     }
@@ -181,7 +167,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
             kind: r.kind
         })))];
         chatService.setPendingRequests(context.sessionResource, reordered);
-        chatService.cancelCurrentRequestForSession(context.sessionResource);
+        chatService.cancelCurrentRequestForSession(context.sessionResource, "queueRunNext");
         chatService.processPendingRequests(context.sessionResource);
     }
 }
@@ -192,7 +178,7 @@ class ChatRemoveAllPendingRequestsAction extends Action2 {
     constructor() {
         super({
             id: ChatRemoveAllPendingRequestsAction.ID,
-            title: ( localize2(4848, "Remove All Queued")),
+            title: ( localize2(4944, "Remove All Queued")),
             icon: Codicon.clearAll,
             f1: false,
             category: CHAT_CATEGORY,
@@ -200,7 +186,7 @@ class ChatRemoveAllPendingRequestsAction extends Action2 {
                 id: MenuId.ChatContext,
                 group: "navigation",
                 order: 3,
-                when: ( ContextKeyExpr.and(queueingEnabledCondition, ChatContextKeys.hasPendingRequests))
+                when: ChatContextKeys.hasPendingRequests
             }]
         });
     }
@@ -227,7 +213,7 @@ function registerChatQueueActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatExecuteQueue, {
         command: {
             id: ChatQueueMessageAction.ID,
-            title: ( localize2(4842, "Add to Queue")),
+            title: ( localize2(4938, "Add to Queue")),
             icon: Codicon.add
         },
         group: "navigation",
@@ -236,7 +222,7 @@ function registerChatQueueActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatExecuteQueue, {
         command: {
             id: ChatSteerWithMessageAction.ID,
-            title: ( localize2(4844, "Steer with Message")),
+            title: ( localize2(4940, "Steer with Message")),
             icon: Codicon.arrowRight
         },
         group: "navigation",
@@ -244,7 +230,7 @@ function registerChatQueueActions() {
     });
     MenuRegistry.appendMenuItem(MenuId.ChatExecute, {
         submenu: MenuId.ChatExecuteQueue,
-        title: ( localize2(4849, "Queue")),
+        title: ( localize2(4945, "Queue")),
         icon: Codicon.listOrdered,
         when: queuingActionsPresent,
         group: "navigation",