@codingame/monaco-vscode-chat-service-override 4.5.1 → 5.0.0

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

@@ -1,38 +1,28 @@
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isExportableSessionData } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatImportExport";
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localizeWithPath(
-    'vs/workbench/contrib/chat/browser/actions/chatImportExport',
-    'chat.file.label',
-    "Chat Session"
-)), extensions: ['json'] }];
+const filters = [{ name: ( localizeWithPath(_moduleId, 0, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatImportExport',
-                        'chat.export.label',
-                        "Export Session"
-                    )) + '...',
-                    original: 'Export Session...'
-                },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 1, "Export Chat...")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
         }
@@ -65,16 +55,9 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatImportExport',
-                        'chat.import.label',
-                        "Import Session"
-                    )) + '...',
-                    original: 'Import Session...'
-                },
+                title: ( localize2WithPath(_moduleId, 2, "Import Chat...")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
         }
@@ -93,9 +76,9 @@ function registerChatExportActions() {
             }
             const content = await fileService.readFile(result[0]);
             try {
-                const data = JSON.parse(( content.value.toString()));
+                const data = JSON.parse(( (content.value.toString())));
                 if (!isExportableSessionData(data)) {
-                    throw new Error('Invalid chat session data');
+                    throw ( (new Error('Invalid chat session data')));
                 }
                 await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { data }, pinned: true } });
             }

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

@@ -1,125 +1,76 @@
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { AUX_WINDOW_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatMoveActions";
 var MoveToNewLocation;
-( (function(MoveToNewLocation) {
+( ((function(MoveToNewLocation) {
     MoveToNewLocation["Editor"] = "Editor";
     MoveToNewLocation["Window"] = "Window";
-})(MoveToNewLocation || (MoveToNewLocation = {})));
-const getMoveToChatActionDescriptorForViewTitle = (viewId, providerId, moveTo) => ({
-    id: `workbench.action.chat.${providerId}.openIn${moveTo}`,
-    title: {
-        value: moveTo === MoveToNewLocation.Editor ? ( localizeWithPath(
-            'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-            'chat.openInEditor.label',
-            "Open Chat in Editor"
-        )) : ( localizeWithPath(
-            'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-            'chat.openInNewWindow.label',
-            "Open Chat in New Window"
-        )),
-        original: moveTo === MoveToNewLocation.Editor ? 'Open Chat in Editor' : 'Open Chat in New Window',
-    },
-    category: CHAT_CATEGORY,
-    precondition: CONTEXT_PROVIDER_EXISTS,
-    f1: false,
-    viewId,
-    menu: {
-        id: MenuId.ViewTitle,
-        when: ( ContextKeyExpr.equals('view', viewId)),
-        order: 0
-    },
-});
-function getMoveToEditorAction(viewId, providerId) {
-    return getMoveToAction(viewId, providerId, MoveToNewLocation.Editor);
-}
-function getMoveToNewWindowAction(viewId, providerId) {
-    return getMoveToAction(viewId, providerId, MoveToNewLocation.Window);
-}
-function getMoveToAction(viewId, providerId, moveTo) {
-    return class MoveToAction extends ViewAction {
-        constructor() {
-            super(getMoveToChatActionDescriptorForViewTitle(viewId, providerId, moveTo));
-        }
-        async runInView(accessor, view) {
-            const viewModel = view.widget.viewModel;
-            if (!viewModel) {
-                return;
-            }
-            const editorService = accessor.get(IEditorService);
-            const sessionId = viewModel.sessionId;
-            const viewState = view.widget.getViewState();
-            view.clear();
-            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
-        }
-    };
-}
+})(MoveToNewLocation || (MoveToNewLocation = {}))));
 function registerMoveActions() {
     registerAction2(class GlobalMoveToEditorAction extends Action2 {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-                    'interactiveSession.openInEditor.label',
-                    "Open Chat in Editor"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
-                f1: true
+                precondition: CONTEXT_CHAT_ENABLED,
+                f1: true,
+                menu: {
+                    id: MenuId.ViewTitle,
+                    when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                    order: 0
+                },
             });
         }
         async run(accessor, ...args) {
-            executeMoveToAction(accessor, MoveToNewLocation.Editor);
+            const context = args[0];
+            executeMoveToAction(accessor, MoveToNewLocation.Editor, isChatViewTitleActionContext(context) ? context.chatView : undefined);
         }
     });
     registerAction2(class GlobalMoveToNewWindowAction extends Action2 {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-                    'interactiveSession.openInNewWindow.label',
-                    "Open Chat in New Window"
-                )),
+                title: ( localize2WithPath(_moduleId, 1, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
-                f1: true
+                precondition: CONTEXT_CHAT_ENABLED,
+                f1: true,
+                menu: {
+                    id: MenuId.ViewTitle,
+                    when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                    order: 0
+                },
             });
         }
         async run(accessor, ...args) {
-            executeMoveToAction(accessor, MoveToNewLocation.Window);
+            const context = args[0];
+            executeMoveToAction(accessor, MoveToNewLocation.Window, isChatViewTitleActionContext(context) ? context.chatView : undefined);
         }
     });
     registerAction2(class GlobalMoveToSidebarAction extends Action2 {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-                    'interactiveSession.openInSidebar.label',
-                    "Open Chat in Side Bar"
-                )),
+                title: ( localize2WithPath(_moduleId, 2, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 menu: [{
                         id: MenuId.EditorTitle,
                         order: 0,
-                        when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)),
+                        when: ( (ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID))),
                     }]
             });
         }
@@ -128,15 +79,13 @@ function registerMoveActions() {
         }
     });
 }
-async function executeMoveToAction(accessor, moveTo) {
+async function executeMoveToAction(accessor, moveTo, chatView) {
     const widgetService = accessor.get(IChatWidgetService);
     const viewService = accessor.get(IViewsService);
-    const chatService = accessor.get(IChatService);
     const editorService = accessor.get(IEditorService);
-    const widget = widgetService.lastFocusedWidget;
+    const widget = chatView?.widget ?? widgetService.lastFocusedWidget;
     if (!widget || !('viewId' in widget.viewContext)) {
-        const providerId = chatService.getProviderInfos()[0].id;
-        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         return;
     }
     const viewModel = widget.viewModel;
@@ -152,21 +101,16 @@ async function executeMoveToAction(accessor, moveTo) {
 async function moveToSidebar(accessor) {
     const viewsService = accessor.get(IViewsService);
     const editorService = accessor.get(IEditorService);
-    const chatContribService = accessor.get(IChatContributionService);
     const editorGroupService = accessor.get(IEditorGroupsService);
     const chatEditorInput = editorService.activeEditor;
-    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId && chatEditorInput.providerId) {
+    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
         await editorService.closeEditor({ editor: chatEditorInput, groupId: editorGroupService.activeGroup.id });
-        const viewId = chatContribService.getViewIdForProvider(chatEditorInput.providerId);
-        const view = await viewsService.openView(viewId);
+        const view = await viewsService.openView(CHAT_VIEW_ID);
         view.loadSession(chatEditorInput.sessionId);
     }
     else {
-        const chatService = accessor.get(IChatService);
-        const providerId = chatService.getProviderInfos()[0].id;
-        const viewId = chatContribService.getViewIdForProvider(providerId);
-        await viewsService.openView(viewId);
+        await viewsService.openView(CHAT_VIEW_ID);
     }
 }
 
-export { getMoveToAction, getMoveToEditorAction, getMoveToNewWindowAction, registerMoveActions };
+export { registerMoveActions };

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

@@ -1,13 +1,14 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CONTEXT_RESPONSE_VOTE, CONTEXT_RESPONSE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_FILTERED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_REQUEST } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { CONTEXT_RESPONSE_VOTE, CONTEXT_RESPONSE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_FILTERED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_REQUEST, CONTEXT_CHAT_LOCATION, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { InteractiveSessionVoteDirection } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isResponseVM, isRequestVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
@@ -15,20 +16,17 @@ import { NOTEBOOK_EDITOR_ID, CellKind } from 'vscode/vscode/vs/workbench/contrib
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatTitleActions";
 function registerChatTitleActions() {
     registerAction2(class MarkHelpfulAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.markHelpful',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                    'interactive.helpful.label',
-                    "Helpful"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "Helpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
-                toggled: ( CONTEXT_RESPONSE_VOTE.isEqualTo('up')),
+                toggled: ( (CONTEXT_RESPONSE_VOTE.isEqualTo('up'))),
                 menu: {
                     id: MenuId.ChatMessageTitle,
                     group: 'navigation',
@@ -44,7 +42,6 @@ function registerChatTitleActions() {
             }
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
-                providerId: item.providerId,
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
@@ -61,15 +58,11 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.markUnhelpful',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                    'interactive.unhelpful.label',
-                    "Unhelpful"
-                )),
+                title: ( localize2WithPath(_moduleId, 1, "Unhelpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
-                toggled: ( CONTEXT_RESPONSE_VOTE.isEqualTo('down')),
+                toggled: ( (CONTEXT_RESPONSE_VOTE.isEqualTo('down'))),
                 menu: {
                     id: MenuId.ChatMessageTitle,
                     group: 'navigation',
@@ -85,7 +78,6 @@ function registerChatTitleActions() {
             }
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
-                providerId: item.providerId,
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
@@ -102,11 +94,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.reportIssueForBug',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                    'interactive.reportIssueForBug.label',
-                    "Report Issue"
-                )),
+                title: ( localize2WithPath(_moduleId, 2, "Report Issue")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -114,7 +102,7 @@ function registerChatTitleActions() {
                     id: MenuId.ChatMessageTitle,
                     group: 'navigation',
                     order: 3,
-                    when: ( ContextKeyExpr.and(CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE))
+                    when: ( (ContextKeyExpr.and(CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE)))
                 }
             });
         }
@@ -125,7 +113,6 @@ function registerChatTitleActions() {
             }
             const chatService = accessor.get(IChatService);
             chatService.notifyUserAction({
-                providerId: item.providerId,
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
@@ -140,11 +127,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNotebook',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                    'interactive.insertIntoNotebook.label',
-                    "Insert into Notebook"
-                )),
+                title: ( localize2WithPath(_moduleId, 3, "Insert into Notebook")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -152,7 +135,11 @@ function registerChatTitleActions() {
                     id: MenuId.ChatMessageTitle,
                     group: 'navigation',
                     isHiddenByDefault: true,
-                    when: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CONTEXT_RESPONSE, ( CONTEXT_RESPONSE_FILTERED.negate())))
+                    when: ( (ContextKeyExpr.and(
+                        NOTEBOOK_IS_ACTIVE_EDITOR,
+                        CONTEXT_RESPONSE,
+                         (CONTEXT_RESPONSE_FILTERED.negate())
+                    )))
                 }
             });
         }
@@ -176,11 +163,11 @@ function registerChatTitleActions() {
                 const index = Math.max(focusRange.end, 0);
                 const bulkEditService = accessor.get(IBulkEditService);
                 await bulkEditService.apply([
-                    ( new ResourceNotebookCellEdit(notebookEditor.textModel.uri, {
+                    ( (new ResourceNotebookCellEdit(notebookEditor.textModel.uri, {
                         editType: 1 ,
                         index: index,
                         count: 0,
-                        cells: ( splitContents.map(content => {
+                        cells: ( (splitContents.map(content => {
                             const kind = content.type === 'markdown' ? CellKind.Markup : CellKind.Code;
                             const language = content.type === 'markdown' ? 'markdown' : content.language;
                             const mime = content.type === 'markdown' ? 'text/markdown' : `text/x-${content.language}`;
@@ -192,8 +179,8 @@ function registerChatTitleActions() {
                                 outputs: [],
                                 metadata: {}
                             };
-                        }))
-                    }))
+                        })))
+                    })))
                 ], { quotableLabel: 'Insert into Notebook' });
             }
         }
@@ -202,11 +189,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.remove',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                    'chat.remove.label',
-                    "Remove Request and Response"
-                )),
+                title: ( localize2WithPath(_moduleId, 4, "Remove Request and Response")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.x,
@@ -215,7 +198,7 @@ function registerChatTitleActions() {
                     mac: {
                         primary: 2048  | 1 ,
                     },
-                    when: ( ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ( CONTEXT_IN_CHAT_INPUT.negate()))),
+                    when: ( (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate())))),
                     weight: 200 ,
                 },
                 menu: {
@@ -241,6 +224,85 @@ function registerChatTitleActions() {
             }
         }
     });
+    const rerunMenu = MenuId.for('ChatMessageTitle#Rerun');
+    MenuRegistry.appendMenuItem(MenuId.ChatMessageTitle, {
+        submenu: rerunMenu,
+        title: ( localizeWithPath(_moduleId, 5, "Rerun...")),
+        icon: Codicon.refresh,
+        group: 'navigation',
+        order: -10,
+        when: ( (ContextKeyExpr.and(
+            CONTEXT_RESPONSE,
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))
+        )))
+    });
+    registerAction2(class RerunAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.rerun',
+                title: ( localize2WithPath(_moduleId, 6, "Rerun Request")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.refresh,
+                precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))),
+                menu: {
+                    id: rerunMenu,
+                    group: 'navigation',
+                    order: -1,
+                }
+            });
+        }
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const chatService = accessor.get(IChatService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            let item = args[0];
+            if (!isResponseVM(item)) {
+                item = widget?.getFocus();
+            }
+            if (!isResponseVM(item) || !widget) {
+                return;
+            }
+            const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
+            if (request) {
+                await chatService.resendRequest(request, { noCommandDetection: false, attempt: request.attempt + 1, location: widget.location, implicitVariablesEnabled: true });
+            }
+        }
+    });
+    registerAction2(class RerunWithoutCommandDetectionAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.rerunWithoutCommandDetection',
+                title: ( localize2WithPath(_moduleId, 7, "Rerun without Command Detection")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.refresh,
+                precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))),
+                menu: {
+                    when: CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND,
+                    id: rerunMenu,
+                    group: 'navigation',
+                    order: -1,
+                }
+            });
+        }
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const chatService = accessor.get(IChatService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            let item = args[0];
+            if (!isResponseVM(item)) {
+                item = widget?.getFocus();
+            }
+            if (!isResponseVM(item) || !widget) {
+                return;
+            }
+            const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
+            if (request) {
+                await chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt, location: widget.location, implicitVariablesEnabled: true });
+            }
+        }
+    });
 }
 function splitMarkdownAndCodeBlocks(markdown) {
     const lexer = new marked_1.Lexer();