@codingame/monaco-vscode-katex-common 30.0.1 → 31.0.0

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

@@ -34,6 +34,8 @@ import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { AgentSessionProviders, getAgentSessionProviderName, getAgentSessionProviderIcon, getAgentSessionProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { isIChatViewViewContext } 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';
@@ -89,8 +91,8 @@ class ContinueChatInSessionAction extends Action2 {
     constructor() {
         super({
             id: ContinueChatInSessionAction.ID,
-            title: ( localize2(4880, "Continue Chat in...")),
-            tooltip: ( localize(4880, "Continue Chat in...")),
+            title: ( localize2(4881, "Continue Chat in...")),
+            tooltip: ( localize(4881, "Continue Chat in...")),
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.requestInProgress.negate()), ( ChatContextKeys.remoteJobCreating.negate()), ChatContextKeys.hasCanDelegateProviders)),
             menu: [{
                 id: MenuId.ChatExecute,
@@ -116,10 +118,18 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
         chatSessionsService,
         instantiationService,
         openerService,
-        telemetryService
+        telemetryService,
+        scmService,
+        workspaceContextService
     ) {
         super(action, {
-            actionProvider: ChatContinueInSessionActionItem_1.actionProvider(chatSessionsService, instantiationService, location),
+            actionProvider: ChatContinueInSessionActionItem_1.actionProvider(
+                chatSessionsService,
+                instantiationService,
+                scmService,
+                workspaceContextService,
+                location
+            ),
             actionBarActions: ChatContinueInSessionActionItem_1.getActionBarActions(openerService),
             reporter: {
                 id: "ChatContinueInSession",
@@ -134,8 +144,8 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
         const learnMoreUrl = "https://aka.ms/vscode-continue-chat-in";
         return [{
             id: "workbench.action.chat.continueChatInSession.learnMore",
-            label: ( localize(4881, "Learn More")),
-            tooltip: ( localize(4881, "Learn More")),
+            label: ( localize(4882, "Learn More")),
+            tooltip: ( localize(4882, "Learn More")),
             class: undefined,
             enabled: true,
             run: async () => {
@@ -143,11 +153,27 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
             }
         }];
     }
-    static actionProvider(chatSessionsService, instantiationService, location) {
+    static actionProvider(
+        chatSessionsService,
+        instantiationService,
+        scmService,
+        workspaceContextService,
+        location
+    ) {
         return {
             getActions: () => {
                 const actions = [];
                 const contributions = chatSessionsService.getAllChatSessionContributions();
+                const folders = workspaceContextService.getWorkspace().folders;
+                let hasGitRepo = false;
+                if (folders.length > 0) {
+                    for (const repo of scmService.repositories) {
+                        if (repo.provider.rootUri && workspaceContextService.getWorkspaceFolder(repo.provider.rootUri)) {
+                            hasGitRepo = true;
+                            break;
+                        }
+                    }
+                }
                 const backgroundContrib = contributions.find(contrib => contrib.type === AgentSessionProviders.Background);
                 if (backgroundContrib && backgroundContrib.canDelegate) {
                     actions.push(this.toAction(
@@ -159,9 +185,13 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
                 }
                 const cloudContrib = contributions.find(contrib => contrib.type === AgentSessionProviders.Cloud);
                 if (cloudContrib && cloudContrib.canDelegate) {
-                    actions.push(
-                        this.toAction(AgentSessionProviders.Cloud, cloudContrib, instantiationService, location)
-                    );
+                    actions.push(this.toAction(
+                        AgentSessionProviders.Cloud,
+                        cloudContrib,
+                        instantiationService,
+                        location,
+                        hasGitRepo
+                    ));
                 }
                 if (actions.length === 0) {
                     actions.push(this.toSetupAction(AgentSessionProviders.Background, instantiationService));
@@ -171,17 +201,17 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
             }
         };
     }
-    static toAction(provider, contrib, instantiationService, location) {
+    static toAction(provider, contrib, instantiationService, location, enabled = true) {
         return {
             id: contrib.type,
-            enabled: true,
+            enabled,
             icon: getAgentSessionProviderIcon(provider),
             class: undefined,
             description: `@${contrib.name}`,
             label: getAgentSessionProviderName(provider),
-            tooltip: ( localize(4882, "Continue in {0}", getAgentSessionProviderName(provider))),
+            tooltip: ( localize(4883, "Continue in {0}", getAgentSessionProviderName(provider))),
             category: {
-                label: ( localize(4883, "Continue In")),
+                label: ( localize(4884, "Continue In")),
                 order: 0,
                 showHeader: true
             },
@@ -200,9 +230,9 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
             icon: getAgentSessionProviderIcon(provider),
             class: undefined,
             label: getAgentSessionProviderName(provider),
-            tooltip: ( localize(4882, "Continue in {0}", getAgentSessionProviderName(provider))),
+            tooltip: ( localize(4883, "Continue in {0}", getAgentSessionProviderName(provider))),
             category: {
-                label: ( localize(4883, "Continue In")),
+                label: ( localize(4884, "Continue In")),
                 order: 0,
                 showHeader: true
             },
@@ -216,7 +246,7 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
         if (this.location === ActionLocation.Editor) {
             const view = h("span.action-widget-delegate-label", [h("span", {
                 className: ThemeIcon.asClassName(Codicon.forward)
-            }), h("span", [( localize(4884, "Continue in..."))])]);
+            }), h("span", [( localize(4885, "Continue in..."))])]);
             element.appendChild(view.root);
             return null;
         } else {
@@ -226,7 +256,7 @@ let ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = class
         }
     }
 };
-ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = ( __decorate([( __param(2, IActionWidgetService)), ( __param(3, IContextKeyService)), ( __param(4, IKeybindingService)), ( __param(5, IChatSessionsService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, ITelemetryService))], ChatContinueInSessionActionItem));
+ChatContinueInSessionActionItem = ChatContinueInSessionActionItem_1 = ( __decorate([( __param(2, IActionWidgetService)), ( __param(3, IContextKeyService)), ( __param(4, IKeybindingService)), ( __param(5, IChatSessionsService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, ITelemetryService)), ( __param(9, ISCMService)), ( __param(10, IWorkspaceContextService))], ChatContinueInSessionActionItem));
 const NEW_CHAT_SESSION_ACTION_ID = "workbench.action.chat.openNewSessionEditor";
 class CreateRemoteAgentJobAction {
     constructor() {}
@@ -377,7 +407,7 @@ class CreateRemoteAgentJobAction {
                     transcript = transcript.substring(transcript.length - maxTranscriptLength);
                 }
                 const delegationPrompt = transcript ? `The following is the conversation history from a previous ${getAgentSessionProviderName(sourceProvider)} session. Continue working on it.\n\n${transcript}\n\nUser: ${userPrompt}` : userPrompt;
-                const initialSessionOptions = [];
+                const initialSessionOptions = ( new Map());
                 const repoNwo = await this.extractRepoNwoFromSession(
                     agentSessionsService,
                     chatSessionsService,
@@ -386,15 +416,12 @@ class CreateRemoteAgentJobAction {
                     chatModel
                 );
                 if (repoNwo) {
-                    initialSessionOptions.push({
-                        optionId: "repositories",
-                        value: repoNwo
-                    });
+                    initialSessionOptions.set("repositories", repoNwo);
                 }
                 await commandService.executeCommand(actionId, {
                     prompt: delegationPrompt,
                     attachedContext: attachedContext.asArray(),
-                    initialSessionOptions: initialSessionOptions.length > 0 ? initialSessionOptions : undefined
+                    initialSessionOptions: initialSessionOptions.size > 0 ? initialSessionOptions : undefined
                 });
                 return;
             }

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

@@ -15,7 +15,7 @@ class AcceptElicitationRequestAction extends Action2 {
     constructor() {
         super({
             id: AcceptElicitationRequestActionId,
-            title: ( localize2(4893, "Accept Request")),
+            title: ( localize2(4899, "Accept Request")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {

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

@@ -1,3 +1,4 @@
+import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
@@ -83,5 +84,5 @@ export declare class CancelEdit extends Action2 {
 }
 export declare const GetHandoffsActionId = "workbench.action.chat.getHandoffs";
 export declare const ExecuteHandoffActionId = "workbench.action.chat.executeHandoff";
-export declare function registerChatExecuteActions(): void;
+export declare function registerChatExecuteActions(): DisposableStore;
 export {};

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

@@ -1,6 +1,7 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -72,13 +73,13 @@ class SubmitAction extends Action2 {
                 if (editsToUndo === 1) {
                     if (entriesModifiedInRequestsToRemove.length === 1) {
                         message = ( localize(
-                            4894,
+                            4900,
                             "This will remove your last request and undo the edits made to {0}. Do you want to proceed?",
                             basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
                         ));
                     } else {
                         message = ( localize(
-                            4895,
+                            4901,
                             "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                             entriesModifiedInRequestsToRemove.length
                         ));
@@ -86,24 +87,24 @@ class SubmitAction extends Action2 {
                 } else {
                     if (entriesModifiedInRequestsToRemove.length === 1) {
                         message = ( localize(
-                            4896,
+                            4902,
                             "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                             basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
                         ));
                     } else {
                         message = ( localize(
-                            4897,
+                            4903,
                             "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
                             entriesModifiedInRequestsToRemove.length
                         ));
                     }
                 }
                 const confirmation = shouldPrompt ? await dialogService.confirm({
-                    title: editsToUndo === 1 ? ( localize(4898, "Do you want to undo your last edit?")) : ( localize(4899, "Do you want to undo {0} edits?", editsToUndo)),
+                    title: editsToUndo === 1 ? ( localize(4904, "Do you want to undo your last edit?")) : ( localize(4905, "Do you want to undo {0} edits?", editsToUndo)),
                     message: message,
-                    primaryButton: ( localize(4900, "Yes")),
+                    primaryButton: ( localize(4906, "Yes")),
                     checkbox: {
-                        label: ( localize(4901, "Don't ask again")),
+                        label: ( localize(4907, "Don't ask again")),
                         checked: false
                     },
                     type: "info"
@@ -153,14 +154,7 @@ class SubmitAction extends Action2 {
         return ( new CreateRemoteAgentJobAction()).run(accessor, targetContribution, widget);
     }
 }
-const requestInProgressOrPendingToolCall = ( ContextKeyExpr.or(
-    ChatContextKeys.requestInProgress,
-    ChatContextKeys.Editing.hasToolConfirmation,
-    ChatContextKeys.Editing.hasQuestionCarousel
-));
-const requestInProgressWithoutInput = ( ContextKeyExpr.and(ChatContextKeys.requestInProgress, ( ChatContextKeys.inputHasText.negate())));
-const pendingToolCall = ( ContextKeyExpr.or(ChatContextKeys.Editing.hasToolConfirmation, ( ContextKeyExpr.and(ChatContextKeys.Editing.hasQuestionCarousel, ( ChatContextKeys.inputHasText.negate())))));
-const noQuestionCarouselOrHasInput = ( ContextKeyExpr.or(( ChatContextKeys.Editing.hasQuestionCarousel.negate()), ChatContextKeys.inputHasText));
+const whenNoActiveRequest = ( ChatContextKeys.hasActiveRequest.negate());
 const whenNotInProgress = ( ChatContextKeys.requestInProgress.negate());
 class ChatSubmitAction extends SubmitAction {
     static {
@@ -168,14 +162,10 @@ class ChatSubmitAction extends SubmitAction {
     }
     constructor() {
         const menuCondition = ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask));
-        const precondition = ( ContextKeyExpr.and(
-            ChatContextKeys.inputHasText,
-            whenNotInProgress,
-            ChatContextKeys.chatSessionOptionsValid
-        ));
+        const precondition = ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( ContextKeyExpr.or(whenNotInProgress, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.Sent)))), ChatContextKeys.chatSessionOptionsValid));
         super({
             id: ChatSubmitAction.ID,
-            title: ( localize2(4902, "Send")),
+            title: ( localize2(4908, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.arrowUp,
@@ -183,7 +173,7 @@ class ChatSubmitAction extends SubmitAction {
             toggled: {
                 condition: ChatContextKeys.lockedToCodingAgent,
                 icon: Codicon.arrowUp,
-                tooltip: ( localize(4903, "Send to Agent"))
+                tooltip: ( localize(4909, "Send to Agent"))
             },
             keybinding: {
                 when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.withinEditSessionDiff.negate()))),
@@ -193,18 +183,18 @@ class ChatSubmitAction extends SubmitAction {
             menu: [{
                 id: MenuId.ChatExecute,
                 order: 4,
-                when: ( ContextKeyExpr.and(whenNotInProgress, menuCondition, ( ChatContextKeys.withinEditSessionDiff.negate()), noQuestionCarouselOrHasInput)),
+                when: ( ContextKeyExpr.and(whenNoActiveRequest, menuCondition, ( ChatContextKeys.withinEditSessionDiff.negate()))),
                 group: "navigation",
                 alt: {
                     id: "workbench.action.chat.sendToNewChat",
-                    title: ( localize2(4904, "Send to New Chat")),
+                    title: ( localize2(4910, "Send to New Chat")),
                     icon: Codicon.plus
                 }
             }, {
                 id: MenuId.ChatEditorInlineExecute,
                 group: "navigation",
                 order: 4,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ctxHasEditorModification.negate()), ChatContextKeys.inputHasText)), whenNotInProgress, ( ChatContextKeys.requestInProgress.negate()), menuCondition))
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ctxHasEditorModification.negate()), ChatContextKeys.inputHasText)), whenNoActiveRequest, menuCondition))
             }]
         });
     }
@@ -217,7 +207,7 @@ class ToggleChatModeAction extends Action2 {
     constructor() {
         super({
             id: ToggleChatModeAction.ID,
-            title: ( localize2(4905, "Switch to Next Agent")),
+            title: ( localize2(4911, "Switch to Next Agent")),
             f1: true,
             category: CHAT_CATEGORY,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.requestInProgress.negate())))
@@ -294,7 +284,7 @@ class SwitchToNextModelAction extends Action2 {
     constructor() {
         super({
             id: SwitchToNextModelAction.ID,
-            title: ( localize2(4906, "Switch to Next Model")),
+            title: ( localize2(4912, "Switch to Next Model")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled
@@ -313,7 +303,7 @@ class OpenModelPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenModelPickerAction.ID,
-            title: ( localize2(4907, "Open Model Picker")),
+            title: ( localize2(4913, "Open Model Picker")),
             category: CHAT_CATEGORY,
             f1: false,
             keybinding: {
@@ -347,8 +337,8 @@ class OpenPermissionPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenPermissionPickerAction.ID,
-            title: ( localize2(4908, "Open Permission Picker")),
-            tooltip: ( localize(4909, "Set Permissions")),
+            title: ( localize2(4914, "Open Permission Picker")),
+            tooltip: ( localize(4915, "Set Permissions")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -375,8 +365,8 @@ class OpenModePickerAction extends Action2 {
     constructor() {
         super({
             id: OpenModePickerAction.ID,
-            title: ( localize2(4910, "Open Agent Picker")),
-            tooltip: ( localize(4911, "Set Agent")),
+            title: ( localize2(4916, "Open Agent Picker")),
+            tooltip: ( localize(4917, "Set Agent")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -409,8 +399,8 @@ class OpenSessionTargetPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenSessionTargetPickerAction.ID,
-            title: ( localize2(4912, "Open Session Target Picker")),
-            tooltip: ( localize(4913, "Set Session Target")),
+            title: ( localize2(4918, "Open Session Target Picker")),
+            tooltip: ( localize(4919, "Set Session Target")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(ChatContextKeys.chatSessionIsEmpty, ChatContextKeys.inAgentSessionsWelcome)), ( ChatContextKeys.currentlyEditingInput.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
@@ -442,8 +432,8 @@ class OpenDelegationPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenDelegationPickerAction.ID,
-            title: ( localize2(4914, "Open Delegation Picker")),
-            tooltip: ( localize(4915, "Delegate Session")),
+            title: ( localize2(4920, "Open Delegation Picker")),
+            tooltip: ( localize(4921, "Delegate Session")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.chatSessionIsEmpty.negate()), ( ChatContextKeys.currentlyEditingInput.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
@@ -470,8 +460,8 @@ class OpenWorkspacePickerAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspacePickerAction.ID,
-            title: ( localize2(4916, "Open Workspace Picker")),
-            tooltip: ( localize(4917, "Select Target Workspace")),
+            title: ( localize2(4922, "Open Workspace Picker")),
+            tooltip: ( localize(4923, "Select Target Workspace")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.inAgentSessionsWelcome)),
@@ -497,7 +487,7 @@ class ChatSessionPrimaryPickerAction extends Action2 {
     constructor() {
         super({
             id: ChatSessionPrimaryPickerAction.ID,
-            title: ( localize2(4918, "Open Primary Session Picker")),
+            title: ( localize2(4924, "Open Primary Session Picker")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -525,7 +515,7 @@ class ChangeChatModelAction extends Action2 {
     constructor() {
         super({
             id: ChangeChatModelAction.ID,
-            title: ( localize2(4919, "Change Model")),
+            title: ( localize2(4925, "Change Model")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled
@@ -548,7 +538,7 @@ class ChatEditingSessionSubmitAction extends SubmitAction {
         this.ID = "workbench.action.edits.submit";
     }
     constructor() {
-        const notInProgressOrEditing = ( ContextKeyExpr.and(( ContextKeyExpr.or(whenNotInProgress, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.Sent)))), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Queue)), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Steer))));
+        const notInProgressOrEditing = ( ContextKeyExpr.and(( ContextKeyExpr.or(whenNoActiveRequest, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.Sent)))), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Queue)), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Steer))));
         const menuCondition = ( ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Ask));
         const precondition = ( ContextKeyExpr.and(
             ChatContextKeys.inputHasText,
@@ -557,7 +547,7 @@ class ChatEditingSessionSubmitAction extends SubmitAction {
         ));
         super({
             id: ChatEditingSessionSubmitAction.ID,
-            title: ( localize2(4920, "Send")),
+            title: ( localize2(4926, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.arrowUp,
@@ -565,11 +555,11 @@ class ChatEditingSessionSubmitAction extends SubmitAction {
             menu: [{
                 id: MenuId.ChatExecute,
                 order: 4,
-                when: ( ContextKeyExpr.and(notInProgressOrEditing, menuCondition, noQuestionCarouselOrHasInput)),
+                when: ( ContextKeyExpr.and(notInProgressOrEditing, menuCondition)),
                 group: "navigation",
                 alt: {
                     id: "workbench.action.chat.sendToNewChat",
-                    title: ( localize2(4904, "Send to New Chat")),
+                    title: ( localize2(4910, "Send to New Chat")),
                     icon: Codicon.plus
                 }
             }]
@@ -584,7 +574,7 @@ class SubmitWithoutDispatchingAction extends Action2 {
         const precondition = ( ContextKeyExpr.and(ChatContextKeys.inputHasText, whenNotInProgress, ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask))));
         super({
             id: SubmitWithoutDispatchingAction.ID,
-            title: ( localize2(4921, "Send")),
+            title: ( localize2(4927, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             precondition,
@@ -612,7 +602,7 @@ class ChatSubmitWithCodebaseAction extends Action2 {
         const precondition = ( ContextKeyExpr.and(ChatContextKeys.inputHasText, whenNotInProgress));
         super({
             id: ChatSubmitWithCodebaseAction.ID,
-            title: ( localize2(4922, "Send with {0}", `${chatVariableLeader}codebase`)),
+            title: ( localize2(4928, "Send with {0}", `${chatVariableLeader}codebase`)),
             precondition,
             keybinding: {
                 when: ChatContextKeys.inChatInput,
@@ -649,7 +639,7 @@ class SendToNewChatAction extends Action2 {
         const precondition = ChatContextKeys.inputHasText;
         super({
             id: "workbench.action.chat.sendToNewChat",
-            title: ( localize2(4904, "Send to New Chat")),
+            title: ( localize2(4910, "Send to New Chat")),
             precondition,
             category: CHAT_CATEGORY,
             f1: false,
@@ -694,13 +684,13 @@ class CancelAction extends Action2 {
     constructor() {
         super({
             id: CancelAction.ID,
-            title: ( localize2(4923, "Cancel")),
+            title: ( localize2(4929, "Cancel")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.stopCircle,
             menu: [{
                 id: MenuId.ChatExecute,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(requestInProgressWithoutInput, pendingToolCall)), ( ChatContextKeys.remoteJobCreating.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.hasActiveRequest, ( ChatContextKeys.remoteJobCreating.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
                 order: 4,
                 group: "navigation"
             }, {
@@ -712,7 +702,7 @@ class CancelAction extends Action2 {
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 primary: KeyMod.CtrlCmd | KeyCode.Escape,
-                when: ( ContextKeyExpr.and(requestInProgressOrPendingToolCall, ( ChatContextKeys.remoteJobCreating.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.hasActiveRequest, ( ChatContextKeys.remoteJobCreating.negate()))),
                 win: {
                     primary: KeyMod.Alt | KeyCode.Backspace
                 }
@@ -757,7 +747,7 @@ class CancelEdit extends Action2 {
     constructor() {
         super({
             id: CancelEdit.ID,
-            title: ( localize2(4924, "Cancel Edit")),
+            title: ( localize2(4930, "Cancel Edit")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.x,
@@ -796,7 +786,7 @@ class GetHandoffsAction extends Action2 {
     constructor() {
         super({
             id: GetHandoffsAction.ID,
-            title: ( localize2(4925, "Get Handoffs")),
+            title: ( localize2(4931, "Get Handoffs")),
             f1: false,
             category: CHAT_CATEGORY
         });
@@ -824,7 +814,7 @@ class ExecuteHandoffAction extends Action2 {
     constructor() {
         super({
             id: ExecuteHandoffAction.ID,
-            title: ( localize2(4926, "Execute Handoff")),
+            title: ( localize2(4932, "Execute Handoff")),
             f1: false,
             category: CHAT_CATEGORY
         });
@@ -901,25 +891,27 @@ class ExecuteHandoffAction extends Action2 {
     }
 }
 function registerChatExecuteActions() {
-    registerAction2(ChatSubmitAction);
-    registerAction2(ChatEditingSessionSubmitAction);
-    registerAction2(SubmitWithoutDispatchingAction);
-    registerAction2(CancelAction);
-    registerAction2(SendToNewChatAction);
-    registerAction2(ChatSubmitWithCodebaseAction);
-    registerAction2(ToggleChatModeAction);
-    registerAction2(SwitchToNextModelAction);
-    registerAction2(OpenModelPickerAction);
-    registerAction2(OpenPermissionPickerAction);
-    registerAction2(OpenModePickerAction);
-    registerAction2(OpenSessionTargetPickerAction);
-    registerAction2(OpenDelegationPickerAction);
-    registerAction2(OpenWorkspacePickerAction);
-    registerAction2(ChatSessionPrimaryPickerAction);
-    registerAction2(ChangeChatModelAction);
-    registerAction2(CancelEdit);
-    registerAction2(GetHandoffsAction);
-    registerAction2(ExecuteHandoffAction);
+    const store = ( new DisposableStore());
+    store.add(registerAction2(ChatSubmitAction));
+    store.add(registerAction2(ChatEditingSessionSubmitAction));
+    store.add(registerAction2(SubmitWithoutDispatchingAction));
+    store.add(registerAction2(CancelAction));
+    store.add(registerAction2(SendToNewChatAction));
+    store.add(registerAction2(ChatSubmitWithCodebaseAction));
+    store.add(registerAction2(ToggleChatModeAction));
+    store.add(registerAction2(SwitchToNextModelAction));
+    store.add(registerAction2(OpenModelPickerAction));
+    store.add(registerAction2(OpenPermissionPickerAction));
+    store.add(registerAction2(OpenModePickerAction));
+    store.add(registerAction2(OpenSessionTargetPickerAction));
+    store.add(registerAction2(OpenDelegationPickerAction));
+    store.add(registerAction2(OpenWorkspacePickerAction));
+    store.add(registerAction2(ChatSessionPrimaryPickerAction));
+    store.add(registerAction2(ChangeChatModelAction));
+    store.add(registerAction2(CancelEdit));
+    store.add(registerAction2(GetHandoffsAction));
+    store.add(registerAction2(ExecuteHandoffAction));
+    return store;
 }
 
 export { CancelAction, CancelChatActionId, CancelChatEditId, CancelEdit, ChangeChatModelActionId, ChatEditingSessionSubmitAction, ChatSessionPrimaryPickerAction, ChatSubmitAction, ChatSubmitWithCodebaseAction, ExecuteHandoffActionId, GetHandoffsActionId, OpenDelegationPickerAction, OpenModePickerAction, OpenModelPickerAction, OpenPermissionPickerAction, OpenSessionTargetPickerAction, OpenWorkspacePickerAction, ToggleAgentModeActionId, registerChatExecuteActions };

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

@@ -30,7 +30,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.markHelpful",
-                title: ( localize2(5004, "Helpful")),
+                title: ( localize2(5011, "Helpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
@@ -84,7 +84,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: MarkUnhelpfulActionId,
-                title: ( localize2(5005, "Unhelpful")),
+                title: ( localize2(5012, "Unhelpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
@@ -137,7 +137,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.reportIssueForBug",
-                title: ( localize2(5006, "Report Issue")),
+                title: ( localize2(5013, "Report Issue")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -184,7 +184,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.retry",
-                title: ( localize2(5007, "Retry")),
+                title: ( localize2(5014, "Retry")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.refresh,
@@ -233,19 +233,19 @@ function registerChatTitleActions() {
                 const entriesModifiedInLastRequest = currentEditingSession.entries.get().filter(entry => entry.lastModifyingRequestId === item.requestId);
                 const shouldPrompt = entriesModifiedInLastRequest.length > 0 && configurationService.getValue("chat.editing.confirmEditRequestRetry") === true;
                 const confirmation = shouldPrompt ? await dialogService.confirm({
-                    title: ( localize(5008, "Do you want to retry your last request?")),
+                    title: ( localize(5015, "Do you want to retry your last request?")),
                     message: entriesModifiedInLastRequest.length === 1 ? ( localize(
-                        5009,
+                        5016,
                         "This will undo edits made to {0} since this request.",
                         basename(entriesModifiedInLastRequest[0].modifiedURI)
                     )) : ( localize(
-                        5010,
+                        5017,
                         "This will undo edits made to {0} files in your working set since this request. Do you want to proceed?",
                         entriesModifiedInLastRequest.length
                     )),
-                    primaryButton: ( localize(5011, "Yes")),
+                    primaryButton: ( localize(5018, "Yes")),
                     checkbox: {
-                        label: ( localize(5012, "Don't ask again")),
+                        label: ( localize(5019, "Don't ask again")),
                         checked: false
                     },
                     type: "info"
@@ -277,7 +277,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.insertIntoNotebook",
-                title: ( localize2(5013, "Insert into Notebook")),
+                title: ( localize2(5020, "Insert into Notebook")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,

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

@@ -1,3 +1,4 @@
+import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
@@ -11,4 +12,4 @@ export declare class ConfigureToolsAction extends Action2 {
     private extractWidget;
     private extractSource;
 }
-export declare function registerChatToolActions(): void;
+export declare function registerChatToolActions(): DisposableStore;