@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -1,9 +1,10 @@
 
-import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
-import { Action2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -19,22 +20,20 @@ import { IWorkbenchExtensionManagementService } from '@codingame/monaco-vscode-a
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { ChatConfiguration, VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatConfiguration, AGENT_SESSIONS_VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { findExistingChatEditorByUri, isLocalChatSessionItem } from '../chatSessions/common.js';
-import { CHAT_CATEGORY, ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { findExistingChatEditorByUri } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
+import { CHAT_CATEGORY, ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 class RenameChatSessionAction extends Action2 {
     static { this.id = 'workbench.action.chat.renameSession'; }
     constructor() {
         super({
             id: RenameChatSessionAction.id,
-            title: ( localize(4703, "Rename")),
+            title: ( localize(4730, "Rename")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.pencil,
@@ -49,40 +48,39 @@ class RenameChatSessionAction extends Action2 {
         if (!context) {
             return;
         }
-        const sessionId = context.session.id.replace('history-', '');
         const label = context.session.label;
         const chatSessionsService = accessor.get(IChatSessionsService);
         const logService = accessor.get(ILogService);
         const chatService = accessor.get(IChatService);
         try {
-            await chatSessionsService.setEditableSession(sessionId, {
+            await chatSessionsService.setEditableSession(context.session.resource, {
                 validationMessage: (value) => {
                     if (!value || value.trim().length === 0) {
-                        return { content: ( localize(4704, "Name cannot be empty")), severity: Severity.Error };
+                        return { content: ( localize(4731, "Name cannot be empty")), severity: Severity.Error };
                     }
                     if (value.length > 100) {
-                        return { content: ( localize(4705, "Name is too long (maximum 100 characters)")), severity: Severity.Error };
+                        return { content: ( localize(4732, "Name is too long (maximum 100 characters)")), severity: Severity.Error };
                     }
                     return null;
                 },
-                placeholder: ( localize(4706, "Enter new name for chat session")),
+                placeholder: ( localize(4733, "Enter new name for chat session")),
                 startingValue: label,
                 onFinish: async (value, success) => {
                     if (success && value && value.trim() !== label) {
                         try {
                             const newTitle = value.trim();
-                            chatService.setChatSessionTitle(sessionId, newTitle);
-                            chatSessionsService.notifySessionItemsChanged('local');
+                            chatService.setChatSessionTitle(context.session.resource, newTitle);
+                            chatSessionsService.notifySessionItemsChanged(localChatSessionType);
                         }
                         catch (error) {
                             logService.error(( localize(
-                                4707,
+                                4734,
                                 "Failed to rename chat session: {0}",
                                 (error instanceof Error ? error.message : String(error))
                             )));
                         }
                     }
-                    await chatSessionsService.setEditableSession(sessionId, null);
+                    await chatSessionsService.setEditableSession(context.session.resource, null);
                 }
             });
         }
@@ -96,7 +94,7 @@ class DeleteChatSessionAction extends Action2 {
     constructor() {
         super({
             id: DeleteChatSessionAction.id,
-            title: ( localize(4708, "Delete")),
+            title: ( localize(4735, "Delete")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.x,
@@ -106,21 +104,20 @@ class DeleteChatSessionAction extends Action2 {
         if (!context) {
             return;
         }
-        const sessionId = context.session.id;
         const chatService = accessor.get(IChatService);
         const dialogService = accessor.get(IDialogService);
         const logService = accessor.get(ILogService);
         const chatSessionsService = accessor.get(IChatSessionsService);
         try {
             const result = await dialogService.confirm({
-                message: ( localize(4709, "Are you sure you want to delete this chat session?")),
-                detail: ( localize(4710, "This action cannot be undone.")),
-                primaryButton: ( localize(4711, "Delete")),
+                message: ( localize(4736, "Are you sure you want to delete this chat session?")),
+                detail: ( localize(4737, "This action cannot be undone.")),
+                primaryButton: ( localize(4738, "Delete")),
                 type: 'warning'
             });
             if (result.confirmed) {
-                await chatService.removeHistoryEntry(sessionId);
-                chatSessionsService.notifySessionItemsChanged('local');
+                await chatService.removeHistoryEntry(context.session.resource);
+                chatSessionsService.notifySessionItemsChanged(localChatSessionType);
             }
         }
         catch (error) {
@@ -133,7 +130,7 @@ class OpenChatSessionInNewWindowAction extends Action2 {
     constructor() {
         super({
             id: OpenChatSessionInNewWindowAction.id,
-            title: ( localize(4712, "Open Chat in New Window")),
+            title: ( localize(4739, "Move Chat into New Window")),
             category: CHAT_CATEGORY,
             f1: false,
         });
@@ -144,28 +141,17 @@ class OpenChatSessionInNewWindowAction extends Action2 {
         }
         const editorService = accessor.get(IEditorService);
         const chatWidgetService = accessor.get(IChatWidgetService);
-        const sessionId = context.session.id;
         const editorGroupsService = accessor.get(IEditorGroupsService);
         if (context.session.provider?.chatSessionType) {
-            const uri = ChatSessionUri.forSession(context.session.provider.chatSessionType, sessionId);
-            const existingEditor = findExistingChatEditorByUri(uri, sessionId, editorGroupsService);
+            const uri = context.session.resource;
+            const existingEditor = findExistingChatEditorByUri(uri, editorGroupsService);
             if (existingEditor) {
-                await editorService.openEditor(existingEditor.editor, existingEditor.groupId);
+                await editorService.openEditor(existingEditor.editor, existingEditor.group);
                 return;
             }
-            else if (chatWidgetService.getWidgetBySessionId(sessionId)) {
+            else if (chatWidgetService.getWidgetBySessionResource(uri)) {
                 return;
             }
-            else if (isLocalChatSessionItem(context.session)) {
-                const options = {
-                    target: { sessionId },
-                    ignoreInView: true,
-                };
-                await editorService.openEditor({
-                    resource: ChatEditorInput.getNewEditorUri(),
-                    options,
-                }, AUX_WINDOW_GROUP);
-            }
             else {
                 const options = {
                     ignoreInView: true,
@@ -183,7 +169,7 @@ class OpenChatSessionInNewEditorGroupAction extends Action2 {
     constructor() {
         super({
             id: OpenChatSessionInNewEditorGroupAction.id,
-            title: ( localize(4713, "Open Chat to the Side")),
+            title: ( localize(4740, "Move Chat to the Side")),
             category: CHAT_CATEGORY,
             f1: false,
         });
@@ -194,28 +180,17 @@ class OpenChatSessionInNewEditorGroupAction extends Action2 {
         }
         const editorService = accessor.get(IEditorService);
         const chatWidgetService = accessor.get(IChatWidgetService);
-        const sessionId = context.session.id;
         const editorGroupsService = accessor.get(IEditorGroupsService);
         if (context.session.provider?.chatSessionType) {
-            const uri = ChatSessionUri.forSession(context.session.provider.chatSessionType, sessionId);
-            const existingEditor = findExistingChatEditorByUri(uri, sessionId, editorGroupsService);
+            const uri = context.session.resource;
+            const existingEditor = findExistingChatEditorByUri(uri, editorGroupsService);
             if (existingEditor) {
-                await editorService.openEditor(existingEditor.editor, existingEditor.groupId);
+                await editorService.openEditor(existingEditor.editor, existingEditor.group);
                 return;
             }
-            else if (chatWidgetService.getWidgetBySessionId(sessionId)) {
+            else if (chatWidgetService.getWidgetBySessionResource(uri)) {
                 return;
             }
-            else if (isLocalChatSessionItem(context.session)) {
-                const options = {
-                    target: { sessionId },
-                    ignoreInView: true,
-                };
-                await editorService.openEditor({
-                    resource: ChatEditorInput.getNewEditorUri(),
-                    options,
-                }, SIDE_GROUP);
-            }
             else {
                 const options = {
                     ignoreInView: true,
@@ -233,41 +208,33 @@ class OpenChatSessionInSidebarAction extends Action2 {
     constructor() {
         super({
             id: OpenChatSessionInSidebarAction.id,
-            title: ( localize(4714, "Open Chat in Sidebar")),
+            title: ( localize(4741, "Move Chat into Side Bar")),
             category: CHAT_CATEGORY,
             f1: false,
         });
     }
     async run(accessor, context) {
-        if (!context) {
-            return;
-        }
         const editorService = accessor.get(IEditorService);
         const viewsService = accessor.get(IViewsService);
         const chatWidgetService = accessor.get(IChatWidgetService);
         const editorGroupsService = accessor.get(IEditorGroupsService);
-        const sessionId = context.session.id;
-        if (context.session.provider?.chatSessionType) {
-            const uri = ChatSessionUri.forSession(context.session.provider.chatSessionType, sessionId);
-            const existingEditor = findExistingChatEditorByUri(uri, sessionId, editorGroupsService);
-            if (existingEditor) {
-                await editorService.openEditor(existingEditor.editor, existingEditor.groupId);
-                return;
-            }
-            else if (chatWidgetService.getWidgetBySessionId(sessionId)) {
-                return;
-            }
+        if (!context) {
+            return;
+        }
+        if (context.session.provider.chatSessionType !== localChatSessionType) {
+            return;
+        }
+        const existingEditor = findExistingChatEditorByUri(context.session.resource, editorGroupsService);
+        if (existingEditor) {
+            await editorService.openEditor(existingEditor.editor, existingEditor.group);
+            return;
+        }
+        else if (chatWidgetService.getWidgetBySessionResource(context.session.resource)) {
+            return;
         }
         const chatViewPane = await viewsService.openView(ChatViewId);
         if (chatViewPane) {
-            if (context.session && (isLocalChatSessionItem(context.session))) {
-                await chatViewPane.loadSession(sessionId);
-            }
-            else {
-                const providerType = context.session.provider?.chatSessionType || 'external';
-                const sessionUri = ChatSessionUri.forSession(providerType, sessionId);
-                await chatViewPane.loadSession(sessionUri);
-            }
+            await chatViewPane.loadSession(context.session.resource);
             chatViewPane.focusInput();
         }
     }
@@ -277,7 +244,7 @@ class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
     constructor() {
         super({
             id: ToggleChatSessionsDescriptionDisplayAction.id,
-            title: ( localize(4715, "Show Rich Descriptions")),
+            title: ( localize(4742, "Show Rich Descriptions")),
             category: CHAT_CATEGORY,
             f1: false,
             toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true))
@@ -289,12 +256,47 @@ class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
         await configurationService.updateValue(ChatConfiguration.ShowAgentSessionsViewDescription, !currentValue);
     }
 }
+class ToggleAgentSessionsViewLocationAction extends Action2 {
+    static { this.id = 'workbench.action.chatSessions.toggleNewSingleView'; }
+    constructor() {
+        super({
+            id: ToggleAgentSessionsViewLocationAction.id,
+            title: ( localize(4743, "Enable New Single View")),
+            category: CHAT_CATEGORY,
+            f1: false,
+            toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentSessionsViewLocation}`, 'single-view')),
+            menu: [
+                {
+                    id: MenuId.ViewContainerTitle,
+                    when: ( ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEWLET_ID)),
+                    group: '2_togglenew',
+                    order: 1
+                },
+                {
+                    id: MenuId.ViewTitle,
+                    when: ( ContextKeyExpr.equals('view', 'workbench.view.agentSessions')),
+                    group: '2_togglenew',
+                    order: 1
+                }
+            ]
+        });
+    }
+    async run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const viewsService = accessor.get(IViewsService);
+        const currentValue = configurationService.getValue(ChatConfiguration.AgentSessionsViewLocation);
+        const newValue = currentValue === 'single-view' ? 'view' : 'single-view';
+        await configurationService.updateValue(ChatConfiguration.AgentSessionsViewLocation, newValue);
+        const viewId = newValue === 'single-view' ? 'workbench.view.agentSessions' : `${AGENT_SESSIONS_VIEWLET_ID}.local`;
+        await viewsService.openView(viewId, true);
+    }
+}
 class ChatSessionsGettingStartedAction extends Action2 {
     static { this.ID = 'chat.sessions.gettingStarted'; }
     constructor() {
         super({
             id: ChatSessionsGettingStartedAction.ID,
-            title: ( localize2(4716, "Getting Started with Chat Sessions")),
+            title: ( localize2(4744, "Getting Started with Chat Sessions")),
             icon: Codicon.sendToRemoteAgent,
             f1: false,
         });
@@ -318,15 +320,15 @@ class ChatSessionsGettingStartedAction extends Action2 {
                 label: recommendation.displayName,
                 description: recommendation.description,
                 detail: extensionInstalled
-                    ? ( localize(4717, "'{0}' is already installed", recommendation.extensionName))
-                    : ( localize(4718, "Installs '{0}'", recommendation.extensionName)),
+                    ? ( localize(4745, "'{0}' is already installed", recommendation.extensionName))
+                    : ( localize(4746, "Installs '{0}'", recommendation.extensionName)),
                 extensionId: recommendation.extensionId,
                 disabled: extensionInstalled,
             };
         }));
         const selected = await quickInputService.pick(quickPickItems, {
-            title: ( localize(4719, "Install Chat Extensions")),
-            placeHolder: ( localize(4720, "Choose extensions to enhance your chat experience")),
+            title: ( localize(4747, "Install Chat Extensions")),
+            placeHolder: ( localize(4748, "Choose extensions to enhance your chat experience")),
             canPickMany: true,
         });
         if (!selected) {
@@ -344,17 +346,17 @@ class ChatSessionsGettingStartedAction extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
     command: {
         id: RenameChatSessionAction.id,
-        title: ( localize(4703, "Rename")),
+        title: ( localize(4730, "Rename")),
         icon: Codicon.pencil
     },
     group: 'inline',
     order: 1,
-    when: ( ChatContextKeys.sessionType.isEqualTo('local'))
+    when: ( ChatContextKeys.sessionType.isEqualTo(localChatSessionType))
 });
 MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
     command: {
         id: DeleteChatSessionAction.id,
-        title: ( localize(4708, "Delete")),
+        title: ( localize(4735, "Delete")),
         icon: Codicon.x
     },
     group: 'inline',
@@ -364,7 +366,7 @@ MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
 MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
     command: {
         id: OpenChatSessionInNewWindowAction.id,
-        title: ( localize(4721, "Open in New Window"))
+        title: ( localize(4749, "Open in New Window"))
     },
     group: 'navigation',
     order: 1,
@@ -372,7 +374,7 @@ MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
 MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
     command: {
         id: OpenChatSessionInNewEditorGroupAction.id,
-        title: ( localize(4722, "Open to the Side"))
+        title: ( localize(4750, "Open to the Side"))
     },
     group: 'navigation',
     order: 2,
@@ -380,30 +382,31 @@ MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
 MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
     command: {
         id: OpenChatSessionInSidebarAction.id,
-        title: ( localize(4723, "Open in Sidebar"))
+        title: ( localize(4751, "Open in Sidebar"))
     },
     group: 'navigation',
     order: 3,
+    when: ( ChatContextKeys.sessionType.isEqualTo(localChatSessionType)),
 });
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     command: {
         id: ToggleChatSessionsDescriptionDisplayAction.id,
-        title: ( localize(4715, "Show Rich Descriptions")),
+        title: ( localize(4742, "Show Rich Descriptions")),
         toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true))
     },
     group: '1_config',
     order: 1,
-    when: ( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
+    when: ( ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEWLET_ID)),
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     command: {
         id: ACTION_ID_OPEN_CHAT,
-        title: ( localize2(4724, "New Chat Editor")),
+        title: ( localize2(4752, "New Chat Editor")),
         icon: Codicon.plus
     },
     group: 'navigation',
     order: 1,
-    when: ( ContextKeyExpr.equals('view', `${VIEWLET_ID}.local`)),
+    when: ( ContextKeyExpr.equals('view', `${AGENT_SESSIONS_VIEWLET_ID}.local`)),
 });
 
-export { ChatSessionsGettingStartedAction, DeleteChatSessionAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInNewWindowAction, OpenChatSessionInSidebarAction, RenameChatSessionAction, ToggleChatSessionsDescriptionDisplayAction };
+export { ChatSessionsGettingStartedAction, DeleteChatSessionAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInNewWindowAction, OpenChatSessionInSidebarAction, RenameChatSessionAction, ToggleAgentSessionsViewLocationAction, ToggleChatSessionsDescriptionDisplayAction };

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

@@ -16,12 +16,12 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { isResponseVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ToolsScope } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatSelectedTools';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ToolsScope } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatSelectedTools';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { showToolsPicker } from './chatToolPicker.js';
 
@@ -33,9 +33,12 @@ class ToolConfirmationAction extends Action2 {
         if (!isResponseVM(lastItem)) {
             return;
         }
-        const unconfirmedToolInvocation = lastItem.model.response.value.find((item) => item.kind === 'toolInvocation' && item.isConfirmed === undefined);
-        if (unconfirmedToolInvocation) {
-            unconfirmedToolInvocation.confirmed.complete(this.getReason());
+        for (const item of lastItem.model.response.value) {
+            const state = item.kind === 'toolInvocation' ? item.state.get() : undefined;
+            if (state?.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state?.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                state.confirm(this.getReason());
+                break;
+            }
         }
         widget?.focusInput();
     }
@@ -44,7 +47,7 @@ class AcceptToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4735, "Accept")),
+            title: ( localize2(4763, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -62,7 +65,7 @@ class SkipToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: SkipToolConfirmationActionId,
-            title: ( localize2(4736, "Skip")),
+            title: ( localize2(4764, "Skip")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -81,16 +84,16 @@ class ConfigureToolsAction extends Action2 {
     constructor() {
         super({
             id: ConfigureToolsAction.ID,
-            title: ( localize(4737, "Configure Tools...")),
+            title: ( localize(4765, "Configure Tools...")),
             icon: Codicon.tools,
             f1: false,
             category: CHAT_CATEGORY,
             precondition: ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)),
             menu: [{
                     when: ( ContextKeyExpr.and(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
-                    id: MenuId.ChatExecute,
+                    id: MenuId.ChatInput,
                     group: 'navigation',
-                    order: 1,
+                    order: 100,
                 }]
         });
     }
@@ -116,23 +119,31 @@ class ConfigureToolsAction extends Action2 {
         const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
         switch (entriesScope) {
             case ToolsScope.Session:
-                placeholder = ( localize(4738, "Select tools for this chat session"));
+                placeholder = ( localize(4766, "Select tools for this chat session"));
+                description = ( localize(4767, "The selected tools were configured only for this chat session."));
+                break;
+            case ToolsScope.Agent:
+                placeholder = ( localize(4768, "Select tools for this custom agent"));
                 description = ( localize(
-                    4739,
-                    "The selected tools were configured by a prompt command and only apply to this chat session."
+                    4769,
+                    "The selected tools are configured by the '{0}' custom agent. Changes to the tools will be applied to the custom agent file as well.",
+                    widget.input.currentModeObs.get().label.get()
                 ));
                 break;
-            case ToolsScope.Mode:
-                placeholder = ( localize(4740, "Select tools for this chat mode"));
+            case ToolsScope.Agent_ReadOnly:
+                placeholder = ( localize(4770, "Select tools for this custom agent"));
                 description = ( localize(
-                    4741,
-                    "The selected tools are configured by the '{0}' chat mode. Changes to the tools will be applied to the mode file as well.",
-                    widget.input.currentModeObs.get().label
+                    4771,
+                    "The selected tools are configured by the '{0}' custom agent. Changes to the tools will only be used for this session and will not change the '{0}' custom agent.",
+                    widget.input.currentModeObs.get().label.get()
                 ));
                 break;
             case ToolsScope.Global:
-                placeholder = ( localize(4742, "Select tools that are available to chat."));
-                description = undefined;
+                placeholder = ( localize(4772, "Select tools that are available to chat."));
+                description = ( localize(
+                    4773,
+                    "The selected tools will be applied globally for all chat sessions that use the default agent."
+                ));
                 break;
         }
         const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, () => entriesMap.get());
@@ -149,7 +160,7 @@ class ConfigureToolsAction extends Action2 {
 let ConfigureToolsActionRendering = class ConfigureToolsActionRendering {
     static { this.ID = 'chat.configureToolsActionRendering'; }
     constructor(actionViewItemService) {
-        const disposable = actionViewItemService.register(MenuId.ChatExecute, ConfigureToolsAction.ID, (action, _opts, instantiationService) => {
+        const disposable = actionViewItemService.register(MenuId.ChatInput, ConfigureToolsAction.ID, (action, _opts, instantiationService) => {
             if (!(action instanceof MenuItemAction)) {
                 return undefined;
             }
@@ -180,7 +191,7 @@ let ConfigureToolsActionRendering = class ConfigureToolsActionRendering {
                 getTooltip() {
                     if (this.isAboveToolLimit()) {
                         const warningMessage = ( localize(
-                            4743,
+                            4774,
                             'More than {0} tools are enabled, you may experience degraded tool calling.',
                             this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key)
                         ));