@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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

@@ -1,6 +1,5 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { hash } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -14,22 +13,27 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { getModeNameForTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { chatVariableLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { ChatStopCancellationNoopEventName } 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 { ChatModeKind, ChatConfiguration, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind, ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
-import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { isInClaudeAgentsFolder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { AgentSessionProviders, getAgentSessionProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { getEditingSessionContext } from '../chatEditing/chatEditingActions.js';
 import { ctxHasEditorModification, ctxIsGlobalEditingSession, ctxHasRequestInProgress } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
-import { CHAT_CATEGORY, handleModeSwitch, ACTION_ID_NEW_CHAT, handleCurrentEditingSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, handleModeSwitch, ACTION_ID_NEW_CHAT, handleCurrentEditingSession, clearChatSessionPreservingType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { CreateRemoteAgentJobAction } from './chatContinueInAction.js';
+import { CTX_HOVER_MODE } from '../../../inlineChat/common/inlineChat.js';
 
 class SubmitAction extends Action2 {
     async run(accessor, ...args) {
@@ -66,13 +70,13 @@ class SubmitAction extends Action2 {
                 if (editsToUndo === 1) {
                     if (entriesModifiedInRequestsToRemove.length === 1) {
                         message = ( localize(
-                            4779,
+                            4876,
                             "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(
-                            4780,
+                            4877,
                             "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                             entriesModifiedInRequestsToRemove.length
                         ));
@@ -80,24 +84,24 @@ class SubmitAction extends Action2 {
                 } else {
                     if (entriesModifiedInRequestsToRemove.length === 1) {
                         message = ( localize(
-                            4781,
+                            4878,
                             "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                             basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
                         ));
                     } else {
                         message = ( localize(
-                            4782,
+                            4879,
                             "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(4783, "Do you want to undo your last edit?")) : ( localize(4784, "Do you want to undo {0} edits?", editsToUndo)),
+                    title: editsToUndo === 1 ? ( localize(4880, "Do you want to undo your last edit?")) : ( localize(4881, "Do you want to undo {0} edits?", editsToUndo)),
                     message: message,
-                    primaryButton: ( localize(4785, "Yes")),
+                    primaryButton: ( localize(4882, "Yes")),
                     checkbox: {
-                        label: ( localize(4786, "Don't ask again")),
+                        label: ( localize(4883, "Don't ask again")),
                         checked: false
                     },
                     type: "info"
@@ -149,9 +153,13 @@ class SubmitAction extends Action2 {
 }
 const requestInProgressOrPendingToolCall = ( ContextKeyExpr.or(
     ChatContextKeys.requestInProgress,
-    ChatContextKeys.Editing.hasToolConfirmation
+    ChatContextKeys.Editing.hasToolConfirmation,
+    ChatContextKeys.Editing.hasQuestionCarousel
 ));
-const whenNotInProgress = ( ContextKeyExpr.and(( ChatContextKeys.requestInProgress.negate()), ( ChatContextKeys.Editing.hasToolConfirmation.negate())));
+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 whenNotInProgress = ( ChatContextKeys.requestInProgress.negate());
 class ChatSubmitAction extends SubmitAction {
     static {
         this.ID = "workbench.action.chat.submit";
@@ -165,15 +173,15 @@ class ChatSubmitAction extends SubmitAction {
         ));
         super({
             id: ChatSubmitAction.ID,
-            title: ( localize2(4787, "Send")),
+            title: ( localize2(4884, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
-            icon: Codicon.send,
+            icon: Codicon.arrowUp,
             precondition,
             toggled: {
                 condition: ChatContextKeys.lockedToCodingAgent,
-                icon: Codicon.send,
-                tooltip: ( localize(4788, "Send to Agent"))
+                icon: Codicon.arrowUp,
+                tooltip: ( localize(4885, "Send to Agent"))
             },
             keybinding: {
                 when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.withinEditSessionDiff.negate()))),
@@ -183,11 +191,11 @@ class ChatSubmitAction extends SubmitAction {
             menu: [{
                 id: MenuId.ChatExecute,
                 order: 4,
-                when: ( ContextKeyExpr.and(whenNotInProgress, menuCondition, ( ChatContextKeys.withinEditSessionDiff.negate()))),
+                when: ( ContextKeyExpr.and(whenNotInProgress, menuCondition, ( ChatContextKeys.withinEditSessionDiff.negate()), noQuestionCarouselOrHasInput)),
                 group: "navigation",
                 alt: {
                     id: "workbench.action.chat.sendToNewChat",
-                    title: ( localize2(4789, "Send to New Chat")),
+                    title: ( localize2(4886, "Send to New Chat")),
                     icon: Codicon.plus
                 }
             }, {
@@ -207,7 +215,7 @@ class ToggleChatModeAction extends Action2 {
     constructor() {
         super({
             id: ToggleChatModeAction.ID,
-            title: ( localize2(4790, "Switch to Next Agent")),
+            title: ( localize2(4887, "Switch to Next Agent")),
             f1: true,
             category: CHAT_CATEGORY,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.requestInProgress.negate())))
@@ -215,7 +223,6 @@ class ToggleChatModeAction extends Action2 {
     }
     async run(accessor, ...args) {
         const commandService = accessor.get(ICommandService);
-        const configurationService = accessor.get(IConfigurationService);
         const instaService = accessor.get(IInstantiationService);
         const modeService = accessor.get(IChatModeService);
         const telemetryService = accessor.get(ITelemetryService);
@@ -232,7 +239,7 @@ class ToggleChatModeAction extends Action2 {
         }
         const chatSession = widget.viewModel?.model;
         const requestCount = chatSession?.getRequests().length ?? 0;
-        const switchToMode = (arg && (modeService.findModeById(arg.modeId) || modeService.findModeByName(arg.modeId))) ?? this.getNextMode(widget, requestCount, configurationService, modeService);
+        const switchToMode = (arg && (modeService.findModeById(arg.modeId) || modeService.findModeByName(arg.modeId))) ?? this.getNextMode(widget, requestCount, modeService);
         const currentMode = widget.input.currentModeObs.get();
         if (switchToMode.id === currentMode.id) {
             return;
@@ -251,13 +258,6 @@ class ToggleChatModeAction extends Action2 {
         const extensionId = switchToMode.source?.storage === "extension" ? switchToMode.source.extensionId.value : undefined;
         const toolsCount = switchToMode.customTools?.get()?.length ?? 0;
         const handoffsCount = switchToMode.handOffs?.get()?.length ?? 0;
-        const getModeNameForTelemetry = mode => {
-            const modeStorage = mode.source?.storage;
-            if (modeStorage === PromptsStorage.local || modeStorage === PromptsStorage.user) {
-                return String(hash(mode.name.get()));
-            }
-            return mode.name.get();
-        };
         const modeUri = switchToMode.uri?.get();
         const isClaudeAgent = modeUri ? isInClaudeAgentsFolder(modeUri) : undefined;
         telemetryService.publicLog2("chat.modeChange", {
@@ -275,10 +275,10 @@ class ToggleChatModeAction extends Action2 {
             await commandService.executeCommand(ACTION_ID_NEW_CHAT);
         }
     }
-    getNextMode(chatWidget, requestCount, configurationService, modeService) {
+    getNextMode(chatWidget, requestCount, modeService) {
         const modes = modeService.getModes();
         const flat = [...modes.builtin.filter(mode => {
-            return mode.kind !== ChatModeKind.Edit || configurationService.getValue(ChatConfiguration.Edits2Enabled) || requestCount === 0;
+            return mode.kind !== ChatModeKind.Edit || requestCount === 0;
         }), ...(modes.custom ?? [])];
         const curModeIndex = flat.findIndex(mode => mode.id === chatWidget.input.currentModeObs.get().id);
         const newMode = flat[(curModeIndex + 1) % flat.length];
@@ -292,7 +292,7 @@ class SwitchToNextModelAction extends Action2 {
     constructor() {
         super({
             id: SwitchToNextModelAction.ID,
-            title: ( localize2(4791, "Switch to Next Model")),
+            title: ( localize2(4888, "Switch to Next Model")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled
@@ -311,7 +311,7 @@ class OpenModelPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenModelPickerAction.ID,
-            title: ( localize2(4792, "Open Model Picker")),
+            title: ( localize2(4889, "Open Model Picker")),
             category: CHAT_CATEGORY,
             f1: false,
             keybinding: {
@@ -324,8 +324,8 @@ class OpenModelPickerAction extends Action2 {
                 id: MenuId.ChatInput,
                 order: 3,
                 group: "navigation",
-                when: ( ContextKeyExpr.and(( ChatContextKeys.lockedToCodingAgent.negate()), ( ContextKeyExpr.or(( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Chat)), ( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditorInline)), ( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook)), ( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal)))), (
-                ContextKeyExpr.or(( ChatContextKeys.inAgentSessionsWelcome.negate()), ( ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local))))))
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.chatSessionHasTargetedModels)), ( ContextKeyExpr.or(( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Chat)), ( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditorInline)), ( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook)), ( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal)))), (
+                ContextKeyExpr.or(( ChatContextKeys.inAgentSessionsWelcome.negate()), ChatContextKeys.chatSessionHasTargetedModels, ( ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local))))))
             }
         });
     }
@@ -338,6 +338,34 @@ class OpenModelPickerAction extends Action2 {
         }
     }
 }
+class OpenPermissionPickerAction extends Action2 {
+    static {
+        this.ID = "workbench.action.chat.openPermissionPicker";
+    }
+    constructor() {
+        super({
+            id: OpenPermissionPickerAction.ID,
+            title: ( localize2(4890, "Open Permission Picker")),
+            tooltip: ( localize(4891, "Set Permissions")),
+            category: CHAT_CATEGORY,
+            f1: false,
+            precondition: ChatContextKeys.enabled,
+            menu: {
+                id: MenuId.ChatInputSecondary,
+                order: 10,
+                group: "navigation",
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Ask)), ( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.lockedToCodingAgent.negate()), ( IsSessionsWindowContext.negate())))
+            }
+        });
+    }
+    async run(accessor) {
+        const widgetService = accessor.get(IChatWidgetService);
+        const widget = widgetService.lastFocusedWidget;
+        if (widget) {
+            widget.input.openPermissionPicker();
+        }
+    }
+}
 class OpenModePickerAction extends Action2 {
     static {
         this.ID = "workbench.action.chat.openModePicker";
@@ -345,8 +373,8 @@ class OpenModePickerAction extends Action2 {
     constructor() {
         super({
             id: OpenModePickerAction.ID,
-            title: ( localize2(4793, "Open Agent Picker")),
-            tooltip: ( localize(4794, "Set Agent")),
+            title: ( localize2(4892, "Open Agent Picker")),
+            tooltip: ( localize(4893, "Set Agent")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -359,7 +387,7 @@ class OpenModePickerAction extends Action2 {
                 id: MenuId.ChatInput,
                 order: 1,
                 when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.chatSessionHasCustomAgentTarget)), (
-                ContextKeyExpr.or(( ChatContextKeys.inAgentSessionsWelcome.negate()), ( ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local)))))),
+                ContextKeyExpr.or(( ChatContextKeys.inAgentSessionsWelcome.negate()), ChatContextKeys.chatSessionHasCustomAgentTarget, ( ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local)))))),
                 group: "navigation"
             }]
         });
@@ -379,15 +407,20 @@ class OpenSessionTargetPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenSessionTargetPickerAction.ID,
-            title: ( localize2(4795, "Open Session Target Picker")),
-            tooltip: ( localize(4796, "Set Session Target")),
+            title: ( localize2(4894, "Open Session Target Picker")),
+            tooltip: ( localize(4895, "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()))),
             menu: [{
                 id: MenuId.ChatInput,
                 order: 0,
-                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ChatContextKeys.chatSessionIsEmpty)),
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ChatContextKeys.chatSessionIsEmpty, IsSessionsWindowContext)),
+                group: "navigation"
+            }, {
+                id: MenuId.ChatInputSecondary,
+                order: 0,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ( IsSessionsWindowContext.negate()), ChatContextKeys.chatSessionIsEmpty)),
                 group: "navigation"
             }]
         });
@@ -407,15 +440,20 @@ class OpenDelegationPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenDelegationPickerAction.ID,
-            title: ( localize2(4797, "Open Delegation Picker")),
-            tooltip: ( localize(4798, "Delegate Session")),
+            title: ( localize2(4896, "Open Delegation Picker")),
+            tooltip: ( localize(4897, "Delegate Session")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.chatSessionIsEmpty.negate()), ( ChatContextKeys.currentlyEditingInput.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
             menu: [{
                 id: MenuId.ChatInput,
                 order: 0.5,
-                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.chatSessionIsEmpty.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.chatSessionIsEmpty.negate()), IsSessionsWindowContext)),
+                group: "navigation"
+            }, {
+                id: MenuId.ChatInputSecondary,
+                order: 0.5,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.chatSessionIsEmpty.negate()), ( IsSessionsWindowContext.negate()))),
                 group: "navigation"
             }]
         });
@@ -435,15 +473,20 @@ class OpenWorkspacePickerAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspacePickerAction.ID,
-            title: ( localize2(4799, "Open Workspace Picker")),
-            tooltip: ( localize(4800, "Select Target Workspace")),
+            title: ( localize2(4898, "Open Workspace Picker")),
+            tooltip: ( localize(4899, "Select Target Workspace")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.inAgentSessionsWelcome)),
             menu: [{
                 id: MenuId.ChatInput,
                 order: 0.6,
-                when: ( ContextKeyExpr.and(ChatContextKeys.inAgentSessionsWelcome, ( ChatContextKeys.chatSessionType.isEqualTo("local")))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inAgentSessionsWelcome, ( ChatContextKeys.chatSessionType.isEqualTo("local")), IsSessionsWindowContext)),
+                group: "navigation"
+            }, {
+                id: MenuId.ChatInputSecondary,
+                order: 0.6,
+                when: ( ContextKeyExpr.and(ChatContextKeys.inAgentSessionsWelcome, ( ChatContextKeys.chatSessionType.isEqualTo("local")), ( IsSessionsWindowContext.negate()))),
                 group: "navigation"
             }]
         });
@@ -457,7 +500,7 @@ class ChatSessionPrimaryPickerAction extends Action2 {
     constructor() {
         super({
             id: ChatSessionPrimaryPickerAction.ID,
-            title: ( localize2(4801, "Open Model Picker")),
+            title: ( localize2(4900, "Open Primary Session Picker")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -485,7 +528,7 @@ class ChangeChatModelAction extends Action2 {
     constructor() {
         super({
             id: ChangeChatModelAction.ID,
-            title: ( localize2(4802, "Change Model")),
+            title: ( localize2(4901, "Change Model")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled
@@ -517,19 +560,19 @@ class ChatEditingSessionSubmitAction extends SubmitAction {
         ));
         super({
             id: ChatEditingSessionSubmitAction.ID,
-            title: ( localize2(4803, "Send")),
+            title: ( localize2(4902, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
-            icon: Codicon.send,
+            icon: Codicon.arrowUp,
             precondition,
             menu: [{
                 id: MenuId.ChatExecute,
                 order: 4,
-                when: ( ContextKeyExpr.and(notInProgressOrEditing, menuCondition)),
+                when: ( ContextKeyExpr.and(notInProgressOrEditing, menuCondition, noQuestionCarouselOrHasInput)),
                 group: "navigation",
                 alt: {
                     id: "workbench.action.chat.sendToNewChat",
-                    title: ( localize2(4789, "Send to New Chat")),
+                    title: ( localize2(4886, "Send to New Chat")),
                     icon: Codicon.plus
                 }
             }]
@@ -544,7 +587,7 @@ class SubmitWithoutDispatchingAction extends Action2 {
         const precondition = ( ContextKeyExpr.and(ChatContextKeys.inputHasText, whenNotInProgress, ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask))));
         super({
             id: SubmitWithoutDispatchingAction.ID,
-            title: ( localize2(4804, "Send")),
+            title: ( localize2(4903, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             precondition,
@@ -572,7 +615,7 @@ class ChatSubmitWithCodebaseAction extends Action2 {
         const precondition = ( ContextKeyExpr.and(ChatContextKeys.inputHasText, whenNotInProgress));
         super({
             id: ChatSubmitWithCodebaseAction.ID,
-            title: ( localize2(4805, "Send with {0}", `${chatVariableLeader}codebase`)),
+            title: ( localize2(4904, "Send with {0}", `${chatVariableLeader}codebase`)),
             precondition,
             keybinding: {
                 when: ChatContextKeys.inChatInput,
@@ -609,7 +652,7 @@ class SendToNewChatAction extends Action2 {
         const precondition = ChatContextKeys.inputHasText;
         super({
             id: "workbench.action.chat.sendToNewChat",
-            title: ( localize2(4789, "Send to New Chat")),
+            title: ( localize2(4886, "Send to New Chat")),
             precondition,
             category: CHAT_CATEGORY,
             f1: false,
@@ -623,6 +666,7 @@ class SendToNewChatAction extends Action2 {
     async run(accessor, ...args) {
         const context = args[0];
         const widgetService = accessor.get(IChatWidgetService);
+        const viewsService = accessor.get(IViewsService);
         const dialogService = accessor.get(IDialogService);
         const chatService = accessor.get(IChatService);
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
@@ -631,14 +675,15 @@ class SendToNewChatAction extends Action2 {
         }
         const inputBeforeClear = widget.getInput();
         if (widget.viewModel) {
-            chatService.cancelCurrentRequestForSession(widget.viewModel.sessionResource);
+            chatService.cancelCurrentRequestForSession(widget.viewModel.sessionResource, "newSessionAction");
         }
         if (widget.viewModel?.model) {
             if (!(await handleCurrentEditingSession(widget.viewModel.model, undefined, dialogService))) {
                 return;
             }
         }
-        await widget.clear();
+        widget.setInput("");
+        await clearChatSessionPreservingType(widget, viewsService);
         widget.acceptInput(inputBeforeClear, {
             storeToHistory: true
         });
@@ -652,18 +697,18 @@ class CancelAction extends Action2 {
     constructor() {
         super({
             id: CancelAction.ID,
-            title: ( localize2(4806, "Cancel")),
+            title: ( localize2(4905, "Cancel")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.stopCircle,
             menu: [{
                 id: MenuId.ChatExecute,
-                when: ( ContextKeyExpr.and(requestInProgressOrPendingToolCall, ( ChatContextKeys.remoteJobCreating.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(requestInProgressWithoutInput, pendingToolCall)), ( ChatContextKeys.remoteJobCreating.negate()), ( ChatContextKeys.currentlyEditing.negate()))),
                 order: 4,
                 group: "navigation"
             }, {
                 id: MenuId.ChatEditorInlineExecute,
-                when: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ctxHasRequestInProgress)),
+                when: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ctxHasRequestInProgress, ( CTX_HOVER_MODE.negate()))),
                 order: 4,
                 group: "navigation"
             }],
@@ -680,13 +725,30 @@ class CancelAction extends Action2 {
     run(accessor, ...args) {
         const context = args[0];
         const widgetService = accessor.get(IChatWidgetService);
+        const logService = accessor.get(ILogService);
+        const telemetryService = accessor.get(ITelemetryService);
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
+            telemetryService.publicLog2(ChatStopCancellationNoopEventName, {
+                source: "cancelAction",
+                reason: "noWidget",
+                requestInProgress: "unknown",
+                pendingRequests: 0
+            });
+            logService.info("ChatCancelAction#run: No focused chat widget was found");
             return;
         }
         const chatService = accessor.get(IChatService);
         if (widget.viewModel) {
-            chatService.cancelCurrentRequestForSession(widget.viewModel.sessionResource);
+            chatService.cancelCurrentRequestForSession(widget.viewModel.sessionResource, "cancelAction");
+        } else {
+            telemetryService.publicLog2(ChatStopCancellationNoopEventName, {
+                source: "cancelAction",
+                reason: "noViewModel",
+                requestInProgress: "unknown",
+                pendingRequests: 0
+            });
+            logService.info("ChatCancelAction#run: Canceled chat widget has no view model");
         }
     }
 }
@@ -698,7 +760,7 @@ class CancelEdit extends Action2 {
     constructor() {
         super({
             id: CancelEdit.ID,
-            title: ( localize2(4807, "Cancel Edit")),
+            title: ( localize2(4906, "Cancel Edit")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.x,
@@ -739,6 +801,7 @@ function registerChatExecuteActions() {
     registerAction2(ToggleChatModeAction);
     registerAction2(SwitchToNextModelAction);
     registerAction2(OpenModelPickerAction);
+    registerAction2(OpenPermissionPickerAction);
     registerAction2(OpenModePickerAction);
     registerAction2(OpenSessionTargetPickerAction);
     registerAction2(OpenDelegationPickerAction);
@@ -748,4 +811,4 @@ function registerChatExecuteActions() {
     registerAction2(CancelEdit);
 }
 
-export { CancelAction, CancelChatActionId, CancelChatEditId, CancelEdit, ChangeChatModelActionId, ChatEditingSessionSubmitAction, ChatSessionPrimaryPickerAction, ChatSubmitAction, ChatSubmitWithCodebaseAction, OpenDelegationPickerAction, OpenModePickerAction, OpenModelPickerAction, OpenSessionTargetPickerAction, OpenWorkspacePickerAction, ToggleAgentModeActionId, registerChatExecuteActions };
+export { CancelAction, CancelChatActionId, CancelChatEditId, CancelEdit, ChangeChatModelActionId, ChatEditingSessionSubmitAction, ChatSessionPrimaryPickerAction, ChatSubmitAction, ChatSubmitWithCodebaseAction, OpenDelegationPickerAction, OpenModePickerAction, OpenModelPickerAction, OpenPermissionPickerAction, OpenSessionTargetPickerAction, OpenWorkspacePickerAction, ToggleAgentModeActionId, registerChatExecuteActions };

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

@@ -1,2 +1,3 @@
+export declare const MarkHelpfulActionId = "workbench.action.chat.markHelpful";
 export declare const MarkUnhelpfulActionId = "workbench.action.chat.markUnhelpful";
 export declare function registerChatTitleActions(): void;

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

@@ -22,6 +22,7 @@ import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatWidgetService, IChatAccessibilityService } 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 MarkHelpfulActionId = "workbench.action.chat.markHelpful";
 const MarkUnhelpfulActionId = "workbench.action.chat.markUnhelpful";
 const enableFeedbackConfig = "config.telemetry.feedback.enabled";
 function registerChatTitleActions() {
@@ -29,7 +30,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.markHelpful",
-                title: ( localize2(4857, "Helpful")),
+                title: ( localize2(4963, "Helpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
@@ -83,7 +84,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: MarkUnhelpfulActionId,
-                title: ( localize2(4858, "Unhelpful")),
+                title: ( localize2(4964, "Unhelpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
@@ -140,7 +141,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.reportIssueForBug",
-                title: ( localize2(4859, "Report Issue")),
+                title: ( localize2(4965, "Report Issue")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -187,7 +188,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.retry",
-                title: ( localize2(4860, "Retry")),
+                title: ( localize2(4966, "Retry")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.refresh,
@@ -235,19 +236,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(4861, "Do you want to retry your last request?")),
+                    title: ( localize(4967, "Do you want to retry your last request?")),
                     message: entriesModifiedInLastRequest.length === 1 ? ( localize(
-                        4862,
+                        4968,
                         "This will undo edits made to {0} since this request.",
                         basename(entriesModifiedInLastRequest[0].modifiedURI)
                     )) : ( localize(
-                        4863,
+                        4969,
                         "This will undo edits made to {0} files in your working set since this request. Do you want to proceed?",
                         entriesModifiedInLastRequest.length
                     )),
-                    primaryButton: ( localize(4864, "Yes")),
+                    primaryButton: ( localize(4970, "Yes")),
                     checkbox: {
-                        label: ( localize(4865, "Don't ask again")),
+                        label: ( localize(4971, "Don't ask again")),
                         checked: false
                     },
                     type: "info"
@@ -279,7 +280,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.insertIntoNotebook",
-                title: ( localize2(4866, "Insert into Notebook")),
+                title: ( localize2(4972, "Insert into Notebook")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -366,4 +367,4 @@ function splitMarkdownAndCodeBlocks(markdown) {
     return splitContent;
 }
 
-export { MarkUnhelpfulActionId, registerChatTitleActions };
+export { MarkHelpfulActionId, MarkUnhelpfulActionId, registerChatTitleActions };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionApprovalModel.d.ts

@@ -0,0 +1,26 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+export interface IAgentSessionApprovalInfo {
+    readonly label: string;
+    readonly languageId: string | undefined;
+    confirm(): void;
+}
+/**
+ * Tracks approval state for all live chat sessions. For each session,
+ * exposes an observable that emits {@link IAgentSessionApprovalInfo}
+ * when a tool invocation is waiting for user confirmation, or `undefined`
+ * when no approval is needed.
+ */
+export declare class AgentSessionApprovalModel extends Disposable {
+    private readonly _chatService;
+    private readonly _languageService;
+    private readonly _approvals;
+    private readonly _modelTrackers;
+    constructor(_chatService: IChatService, _languageService: ILanguageService);
+    getApproval(sessionResource: URI): IObservable<IAgentSessionApprovalInfo | undefined>;
+    private _getOrCreateApproval;
+    private _trackModel;
+}