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

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

@@ -16,13 +16,14 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 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 { 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';
@@ -69,13 +70,13 @@ class SubmitAction extends Action2 {
                 if (editsToUndo === 1) {
                     if (entriesModifiedInRequestsToRemove.length === 1) {
                         message = ( localize(
-                            4868,
+                            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(
-                            4869,
+                            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
                         ));
@@ -83,24 +84,24 @@ class SubmitAction extends Action2 {
                 } else {
                     if (entriesModifiedInRequestsToRemove.length === 1) {
                         message = ( localize(
-                            4870,
+                            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(
-                            4871,
+                            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(4872, "Do you want to undo your last edit?")) : ( localize(4873, "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(4874, "Yes")),
+                    primaryButton: ( localize(4882, "Yes")),
                     checkbox: {
-                        label: ( localize(4875, "Don't ask again")),
+                        label: ( localize(4883, "Don't ask again")),
                         checked: false
                     },
                     type: "info"
@@ -155,6 +156,9 @@ const requestInProgressOrPendingToolCall = ( ContextKeyExpr.or(
     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 whenNotInProgress = ( ChatContextKeys.requestInProgress.negate());
 class ChatSubmitAction extends SubmitAction {
     static {
@@ -169,7 +173,7 @@ class ChatSubmitAction extends SubmitAction {
         ));
         super({
             id: ChatSubmitAction.ID,
-            title: ( localize2(4876, "Send")),
+            title: ( localize2(4884, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.arrowUp,
@@ -177,7 +181,7 @@ class ChatSubmitAction extends SubmitAction {
             toggled: {
                 condition: ChatContextKeys.lockedToCodingAgent,
                 icon: Codicon.arrowUp,
-                tooltip: ( localize(4877, "Send to Agent"))
+                tooltip: ( localize(4885, "Send to Agent"))
             },
             keybinding: {
                 when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.withinEditSessionDiff.negate()))),
@@ -187,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(4878, "Send to New Chat")),
+                    title: ( localize2(4886, "Send to New Chat")),
                     icon: Codicon.plus
                 }
             }, {
@@ -211,7 +215,7 @@ class ToggleChatModeAction extends Action2 {
     constructor() {
         super({
             id: ToggleChatModeAction.ID,
-            title: ( localize2(4879, "Switch to Next Agent")),
+            title: ( localize2(4887, "Switch to Next Agent")),
             f1: true,
             category: CHAT_CATEGORY,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.requestInProgress.negate())))
@@ -219,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);
@@ -236,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;
@@ -272,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];
@@ -289,7 +292,7 @@ class SwitchToNextModelAction extends Action2 {
     constructor() {
         super({
             id: SwitchToNextModelAction.ID,
-            title: ( localize2(4880, "Switch to Next Model")),
+            title: ( localize2(4888, "Switch to Next Model")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled
@@ -308,7 +311,7 @@ class OpenModelPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenModelPickerAction.ID,
-            title: ( localize2(4881, "Open Model Picker")),
+            title: ( localize2(4889, "Open Model Picker")),
             category: CHAT_CATEGORY,
             f1: false,
             keybinding: {
@@ -335,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";
@@ -342,8 +373,8 @@ class OpenModePickerAction extends Action2 {
     constructor() {
         super({
             id: OpenModePickerAction.ID,
-            title: ( localize2(4882, "Open Agent Picker")),
-            tooltip: ( localize(4883, "Set Agent")),
+            title: ( localize2(4892, "Open Agent Picker")),
+            tooltip: ( localize(4893, "Set Agent")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -356,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"
             }]
         });
@@ -376,15 +407,20 @@ class OpenSessionTargetPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenSessionTargetPickerAction.ID,
-            title: ( localize2(4884, "Open Session Target Picker")),
-            tooltip: ( localize(4885, "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"
             }]
         });
@@ -404,15 +440,20 @@ class OpenDelegationPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenDelegationPickerAction.ID,
-            title: ( localize2(4886, "Open Delegation Picker")),
-            tooltip: ( localize(4887, "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"
             }]
         });
@@ -432,15 +473,20 @@ class OpenWorkspacePickerAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspacePickerAction.ID,
-            title: ( localize2(4888, "Open Workspace Picker")),
-            tooltip: ( localize(4889, "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"
             }]
         });
@@ -454,7 +500,7 @@ class ChatSessionPrimaryPickerAction extends Action2 {
     constructor() {
         super({
             id: ChatSessionPrimaryPickerAction.ID,
-            title: ( localize2(4890, "Open Model Picker")),
+            title: ( localize2(4900, "Open Primary Session Picker")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled,
@@ -482,7 +528,7 @@ class ChangeChatModelAction extends Action2 {
     constructor() {
         super({
             id: ChangeChatModelAction.ID,
-            title: ( localize2(4891, "Change Model")),
+            title: ( localize2(4901, "Change Model")),
             category: CHAT_CATEGORY,
             f1: false,
             precondition: ChatContextKeys.enabled
@@ -514,7 +560,7 @@ class ChatEditingSessionSubmitAction extends SubmitAction {
         ));
         super({
             id: ChatEditingSessionSubmitAction.ID,
-            title: ( localize2(4892, "Send")),
+            title: ( localize2(4902, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.arrowUp,
@@ -522,11 +568,11 @@ class ChatEditingSessionSubmitAction extends SubmitAction {
             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(4878, "Send to New Chat")),
+                    title: ( localize2(4886, "Send to New Chat")),
                     icon: Codicon.plus
                 }
             }]
@@ -541,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(4893, "Send")),
+            title: ( localize2(4903, "Send")),
             f1: false,
             category: CHAT_CATEGORY,
             precondition,
@@ -569,7 +615,7 @@ class ChatSubmitWithCodebaseAction extends Action2 {
         const precondition = ( ContextKeyExpr.and(ChatContextKeys.inputHasText, whenNotInProgress));
         super({
             id: ChatSubmitWithCodebaseAction.ID,
-            title: ( localize2(4894, "Send with {0}", `${chatVariableLeader}codebase`)),
+            title: ( localize2(4904, "Send with {0}", `${chatVariableLeader}codebase`)),
             precondition,
             keybinding: {
                 when: ChatContextKeys.inChatInput,
@@ -606,7 +652,7 @@ class SendToNewChatAction extends Action2 {
         const precondition = ChatContextKeys.inputHasText;
         super({
             id: "workbench.action.chat.sendToNewChat",
-            title: ( localize2(4878, "Send to New Chat")),
+            title: ( localize2(4886, "Send to New Chat")),
             precondition,
             category: CHAT_CATEGORY,
             f1: false,
@@ -651,13 +697,13 @@ class CancelAction extends Action2 {
     constructor() {
         super({
             id: CancelAction.ID,
-            title: ( localize2(4895, "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"
             }, {
@@ -714,7 +760,7 @@ class CancelEdit extends Action2 {
     constructor() {
         super({
             id: CancelEdit.ID,
-            title: ( localize2(4896, "Cancel Edit")),
+            title: ( localize2(4906, "Cancel Edit")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.x,
@@ -755,6 +801,7 @@ function registerChatExecuteActions() {
     registerAction2(ToggleChatModeAction);
     registerAction2(SwitchToNextModelAction);
     registerAction2(OpenModelPickerAction);
+    registerAction2(OpenPermissionPickerAction);
     registerAction2(OpenModePickerAction);
     registerAction2(OpenSessionTargetPickerAction);
     registerAction2(OpenDelegationPickerAction);
@@ -764,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.js

@@ -30,7 +30,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.markHelpful",
-                title: ( localize2(4953, "Helpful")),
+                title: ( localize2(4963, "Helpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
@@ -84,7 +84,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: MarkUnhelpfulActionId,
-                title: ( localize2(4954, "Unhelpful")),
+                title: ( localize2(4964, "Unhelpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
@@ -141,7 +141,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.reportIssueForBug",
-                title: ( localize2(4955, "Report Issue")),
+                title: ( localize2(4965, "Report Issue")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -188,7 +188,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.retry",
-                title: ( localize2(4956, "Retry")),
+                title: ( localize2(4966, "Retry")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.refresh,
@@ -236,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(4957, "Do you want to retry your last request?")),
+                    title: ( localize(4967, "Do you want to retry your last request?")),
                     message: entriesModifiedInLastRequest.length === 1 ? ( localize(
-                        4958,
+                        4968,
                         "This will undo edits made to {0} since this request.",
                         basename(entriesModifiedInLastRequest[0].modifiedURI)
                     )) : ( localize(
-                        4959,
+                        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(4960, "Yes")),
+                    primaryButton: ( localize(4970, "Yes")),
                     checkbox: {
-                        label: ( localize(4961, "Don't ask again")),
+                        label: ( localize(4971, "Don't ask again")),
                         checked: false
                     },
                     type: "info"
@@ -280,7 +280,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.insertIntoNotebook",
-                title: ( localize2(4962, "Insert into Notebook")),
+                title: ( localize2(4972, "Insert into Notebook")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,

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;
+}

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

@@ -0,0 +1,106 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { Disposable, DisposableResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
+import { IChatToolInvocation, ToolConfirmKind } 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 { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { autorunIterableDelta, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+
+let AgentSessionApprovalModel = class AgentSessionApprovalModel extends Disposable {
+    constructor(_chatService, _languageService) {
+        super();
+        this._chatService = _chatService;
+        this._languageService = _languageService;
+        this._approvals = ( new Map());
+        this._modelTrackers = this._register(( new DisposableResourceMap()));
+        this._register(
+            autorunIterableDelta(reader => this._chatService.chatModels.read(reader), (
+                {
+                    addedValues,
+                    removedValues
+                }
+            ) => {
+                for (const model of addedValues) {
+                    this._modelTrackers.set(model.sessionResource, this._trackModel(model));
+                }
+                for (const model of removedValues) {
+                    this._modelTrackers.deleteAndDispose(model.sessionResource);
+                    this._approvals.get(( model.sessionResource.toString()))?.set(undefined, undefined);
+                }
+            })
+        );
+    }
+    getApproval(sessionResource) {
+        return this._getOrCreateApproval(( sessionResource.toString()));
+    }
+    _getOrCreateApproval(key) {
+        let obs = this._approvals.get(key);
+        if (!obs) {
+            obs = observableValue(`sessionApproval.${key}`, undefined);
+            this._approvals.set(key, obs);
+        }
+        return obs;
+    }
+    _trackModel(model) {
+        const settable = this._getOrCreateApproval(( model.sessionResource.toString()));
+        const setIfChanged = value => {
+            const current = settable.get();
+            if (current === value) {
+                return;
+            }
+            if (current !== undefined && value !== undefined && current.label === value.label && current.languageId === value.languageId) {
+                return;
+            }
+            settable.set(value, undefined);
+        };
+        return autorun(reader => {
+            const needsInput = model.requestNeedsInput.read(reader);
+            if (!needsInput) {
+                setIfChanged(undefined);
+                return;
+            }
+            const lastResponse = model.lastRequest?.response;
+            if (!lastResponse?.response?.value) {
+                setIfChanged(undefined);
+                return;
+            }
+            for (const part of lastResponse.response.value) {
+                if (part.kind !== "toolInvocation") {
+                    continue;
+                }
+                const state = part.state.read(reader);
+                if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                    let label;
+                    let languageId;
+                    if (part.toolSpecificData?.kind === "terminal") {
+                        const terminalData = migrateLegacyTerminalToolSpecificData(part.toolSpecificData);
+                        label = terminalData.presentationOverrides?.commandLine ?? terminalData.commandLine.forDisplay ?? terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+                        languageId = this._languageService.getLanguageIdByLanguageName(terminalData.presentationOverrides?.language ?? terminalData.language) ?? undefined;
+                    } else if (needsInput.detail) {
+                        label = needsInput.detail;
+                    } else {
+                        const msg = part.invocationMessage;
+                        label = typeof msg === "string" ? msg : renderAsPlaintext(msg);
+                    }
+                    const confirmState = state;
+                    setIfChanged({
+                        label,
+                        languageId,
+                        confirm: () => confirmState.confirm({
+                            type: ToolConfirmKind.UserAction
+                        })
+                    });
+                    return;
+                }
+            }
+            setIfChanged(undefined);
+        });
+    }
+};
+AgentSessionApprovalModel = ( __decorate([( __param(0, IChatService)), ( __param(1, ILanguageService))], AgentSessionApprovalModel));
+
+export { AgentSessionApprovalModel };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionHoverWidget.js

@@ -141,7 +141,7 @@ let AgentSessionHoverWidget = class AgentSessionHoverWidget extends Disposable {
             append(detailsRow, $("span.separator", undefined, "•"));
             const diffContainer = append(detailsRow, $(".agent-session-hover-diff"));
             if (diff.files > 0) {
-                append(diffContainer, $("span", undefined, diff.files === 1 ? ( localize(5017, "1 file")) : ( localize(5018, "{0} files", diff.files))));
+                append(diffContainer, $("span", undefined, diff.files === 1 ? ( localize(5037, "1 file")) : ( localize(5038, "{0} files", diff.files))));
             }
             if (diff.insertions > 0) {
                 append(diffContainer, $("span.insertions", undefined, `+${diff.insertions}`));
@@ -157,7 +157,7 @@ let AgentSessionHoverWidget = class AgentSessionHoverWidget extends Disposable {
         if (session.isArchived()) {
             append(detailsRow, $("span.separator", undefined, "•"));
             append(detailsRow, renderIcon(Codicon.archive));
-            append(detailsRow, $("span", undefined, ( localize(5019, "Archived"))));
+            append(detailsRow, $("span", undefined, ( localize(5039, "Archived"))));
         }
     }
     buildFallbackTooltip(session) {
@@ -194,7 +194,7 @@ let AgentSessionHoverWidget = class AgentSessionHoverWidget extends Disposable {
         if (diff && hasValidDiff(session.changes)) {
             const diffParts = [];
             if (diff.files > 0) {
-                diffParts.push(diff.files === 1 ? ( localize(5017, "1 file")) : ( localize(5018, "{0} files", diff.files)));
+                diffParts.push(diff.files === 1 ? ( localize(5037, "1 file")) : ( localize(5038, "{0} files", diff.files)));
             }
             if (diff.insertions > 0) {
                 diffParts.push(`+${diff.insertions}`);
@@ -211,7 +211,7 @@ let AgentSessionHoverWidget = class AgentSessionHoverWidget extends Disposable {
         }
         lines.push(details.join(" • "));
         if (session.isArchived()) {
-            lines.push(`$(archive) ${( localize(5019, "Archived"))}`);
+            lines.push(`$(archive) ${( localize(5039, "Archived"))}`);
         }
         return ( new MarkdownString(lines.join("\n\n"), {
             supportThemeIcons: true
@@ -228,16 +228,16 @@ let AgentSessionHoverWidget = class AgentSessionHoverWidget extends Disposable {
         let statusLabel;
         switch (status) {
         case ChatSessionStatus.NeedsInput:
-            statusLabel = ( localize(5020, "Needs Input"));
+            statusLabel = ( localize(5040, "Needs Input"));
             break;
         case ChatSessionStatus.InProgress:
-            statusLabel = ( localize(5021, "In Progress"));
+            statusLabel = ( localize(5041, "In Progress"));
             break;
         case ChatSessionStatus.Failed:
-            statusLabel = ( localize(5022, "Failed"));
+            statusLabel = ( localize(5042, "Failed"));
             break;
         default:
-            statusLabel = ( localize(5023, "Completed"));
+            statusLabel = ( localize(5043, "Completed"));
         }
         return statusLabel;
     }