@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -18,10 +18,10 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4637, "Open in Chat View")),
+                title: ( localize2(4675, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
-                icon: Codicon.commentDiscussion,
+                icon: Codicon.chatSparkle,
                 menu: {
                     id: MenuId.ChatInputSide,
                     group: 'navigation',
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.close',
-                title: ( localize2(4638, "Close Quick Chat")),
+                title: ( localize2(4676, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -59,9 +59,9 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4639, 'Quick Chat')),
+            title: ( localize2(4677, 'Open Quick Chat')),
             precondition: ChatContextKeys.enabled,
-            icon: Codicon.commentDiscussion,
+            icon: Codicon.chatSparkle,
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4640, 'Toggle the quick chat')),
+                description: ( localize(4678, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4641, "The query to open the quick chat with")),
+                                            description: ( localize(4679, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4642, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4680, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4641, "The query to open the quick chat with"))
+                                    description: ( localize(4679, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -125,7 +125,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4643, "Open Quick Chat")),
+            title: ( localize2(4681, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });

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

@@ -0,0 +1,68 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { MarshalledId } from "@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds";
+import { ChatEditorInput } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+export interface IChatSessionContext {
+    sessionId: string;
+    sessionType: "editor" | "widget";
+    currentTitle: string;
+    editorInput?: any;
+    editorGroup?: any;
+    widget?: any;
+}
+interface IMarshalledChatSessionContext {
+    $mid: MarshalledId.ChatSessionContext;
+    session: {
+        id: string;
+        label: string;
+        editor?: ChatEditorInput;
+        widget?: any;
+        sessionType?: "editor" | "widget";
+    };
+}
+export declare class RenameChatSessionAction extends Action2 {
+    static readonly id = "workbench.action.chat.renameSession";
+    constructor();
+    run(accessor: ServicesAccessor, context?: IChatSessionContext | IMarshalledChatSessionContext): Promise<void>;
+}
+/**
+ * Action to delete a chat session from history
+ */
+export declare class DeleteChatSessionAction extends Action2 {
+    static readonly id = "workbench.action.chat.deleteSession";
+    constructor();
+    run(accessor: ServicesAccessor, context?: IChatSessionContext | IMarshalledChatSessionContext): Promise<void>;
+}
+/**
+ * Action to open a chat session in a new window
+ */
+export declare class OpenChatSessionInNewWindowAction extends Action2 {
+    static readonly id = "workbench.action.chat.openSessionInNewWindow";
+    constructor();
+    run(accessor: ServicesAccessor, context?: IChatSessionContext | IMarshalledChatSessionContext): Promise<void>;
+}
+/**
+ * Action to open a chat session in a new editor group to the side
+ */
+export declare class OpenChatSessionInNewEditorGroupAction extends Action2 {
+    static readonly id = "workbench.action.chat.openSessionInNewEditorGroup";
+    constructor();
+    run(accessor: ServicesAccessor, context?: IChatSessionContext | IMarshalledChatSessionContext): Promise<void>;
+}
+/**
+ * Action to open a chat session in the sidebar (chat widget)
+ */
+export declare class OpenChatSessionInSidebarAction extends Action2 {
+    static readonly id = "workbench.action.chat.openSessionInSidebar";
+    constructor();
+    run(accessor: ServicesAccessor, context?: IChatSessionContext | IMarshalledChatSessionContext): Promise<void>;
+}
+/**
+ * Action to toggle the description display mode for Chat Sessions
+ */
+export declare class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
+    static readonly id = "workbench.action.chatSessions.toggleDescriptionDisplay";
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}
+export {};

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

@@ -0,0 +1,433 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { AUX_WINDOW_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { VIEWLET_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/chatSessions';
+import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { ChatViewId } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+
+function isLocalChatSessionItem(item) {
+    return ('editor' in item && 'group' in item) || ('widget' in item && 'sessionType' in item);
+}
+function isMarshalledChatSessionContext(obj) {
+    return !!obj &&
+        typeof obj === 'object' &&
+        '$mid' in obj &&
+        obj.$mid === MarshalledId.ChatSessionContext &&
+        'session' in obj;
+}
+class RenameChatSessionAction extends Action2 {
+    static { this.id = 'workbench.action.chat.renameSession'; }
+    constructor() {
+        super({
+            id: RenameChatSessionAction.id,
+            title: ( localize(4682, "Rename")),
+            f1: false,
+            category: CHAT_CATEGORY,
+            icon: Codicon.pencil,
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.F2,
+                when: ( ContextKeyExpr.equals('focusedView', 'workbench.view.chat.sessions.local'))
+            }
+        });
+    }
+    async run(accessor, context) {
+        if (!context) {
+            return;
+        }
+        let sessionContext;
+        if (isMarshalledChatSessionContext(context)) {
+            const session = context.session;
+            let actualSessionId;
+            const currentTitle = session.label;
+            if (session.id.startsWith('history-')) {
+                actualSessionId = session.id.replace('history-', '');
+            }
+            else if (session.sessionType === 'editor' && session.editor instanceof ChatEditorInput) {
+                actualSessionId = session.editor.sessionId;
+            }
+            else if (session.sessionType === 'widget' && session.widget) {
+                actualSessionId = session.widget.viewModel?.model.sessionId;
+            }
+            else {
+                actualSessionId = session.id;
+            }
+            if (!actualSessionId) {
+                return;
+            }
+            sessionContext = {
+                sessionId: actualSessionId,
+                sessionType: session.sessionType || 'editor',
+                currentTitle: currentTitle,
+                editorInput: session.editor,
+                widget: session.widget
+            };
+        }
+        else {
+            sessionContext = context;
+        }
+        const chatSessionsService = accessor.get(IChatSessionsService);
+        const logService = accessor.get(ILogService);
+        const chatService = accessor.get(IChatService);
+        try {
+            await chatSessionsService.setEditableSession(sessionContext.sessionId, {
+                validationMessage: (value) => {
+                    if (!value || value.trim().length === 0) {
+                        return { content: ( localize(4683, "Name cannot be empty")), severity: Severity.Error };
+                    }
+                    if (value.length > 100) {
+                        return { content: ( localize(4684, "Name is too long (maximum 100 characters)")), severity: Severity.Error };
+                    }
+                    return null;
+                },
+                placeholder: ( localize(4685, "Enter new name for chat session")),
+                startingValue: sessionContext.currentTitle,
+                onFinish: async (value, success) => {
+                    if (success && value && value.trim() !== sessionContext.currentTitle) {
+                        try {
+                            const newTitle = value.trim();
+                            chatService.setChatSessionTitle(sessionContext.sessionId, newTitle);
+                            chatSessionsService.notifySessionItemsChanged('local');
+                        }
+                        catch (error) {
+                            logService.error(( localize(
+                                4686,
+                                "Failed to rename chat session: {0}",
+                                (error instanceof Error ? error.message : String(error))
+                            )));
+                        }
+                    }
+                    await chatSessionsService.setEditableSession(sessionContext.sessionId, null);
+                }
+            });
+        }
+        catch (error) {
+            logService.error('Failed to rename chat session', error instanceof Error ? error.message : String(error));
+        }
+    }
+}
+class DeleteChatSessionAction extends Action2 {
+    static { this.id = 'workbench.action.chat.deleteSession'; }
+    constructor() {
+        super({
+            id: DeleteChatSessionAction.id,
+            title: ( localize(4687, "Delete")),
+            f1: false,
+            category: CHAT_CATEGORY,
+            icon: Codicon.x,
+        });
+    }
+    async run(accessor, context) {
+        if (!context) {
+            return;
+        }
+        let sessionContext;
+        if (isMarshalledChatSessionContext(context)) {
+            const session = context.session;
+            let actualSessionId;
+            const currentTitle = session.label;
+            if (session.id.startsWith('history-')) {
+                actualSessionId = session.id.replace('history-', '');
+            }
+            else if (session.sessionType === 'editor' && session.editor instanceof ChatEditorInput) {
+                actualSessionId = session.editor.sessionId;
+            }
+            else if (session.sessionType === 'widget' && session.widget) {
+                actualSessionId = session.widget.viewModel?.model.sessionId;
+            }
+            else {
+                actualSessionId = session.id;
+            }
+            if (!actualSessionId) {
+                return;
+            }
+            sessionContext = {
+                sessionId: actualSessionId,
+                sessionType: session.sessionType || 'editor',
+                currentTitle: currentTitle,
+                editorInput: session.editor,
+                widget: session.widget
+            };
+        }
+        else {
+            sessionContext = context;
+        }
+        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(4688, "Are you sure you want to delete this chat session?")),
+                detail: ( localize(4689, "This action cannot be undone.")),
+                primaryButton: ( localize(4690, "Delete")),
+                type: 'warning'
+            });
+            if (result.confirmed) {
+                await chatService.removeHistoryEntry(sessionContext.sessionId);
+                chatSessionsService.notifySessionItemsChanged('local');
+            }
+        }
+        catch (error) {
+            logService.error('Failed to delete chat session', error instanceof Error ? error.message : String(error));
+        }
+    }
+}
+class OpenChatSessionInNewWindowAction extends Action2 {
+    static { this.id = 'workbench.action.chat.openSessionInNewWindow'; }
+    constructor() {
+        super({
+            id: OpenChatSessionInNewWindowAction.id,
+            title: ( localize(4691, "Open Chat in New Window")),
+            category: CHAT_CATEGORY,
+            f1: false,
+        });
+    }
+    async run(accessor, context) {
+        if (!context) {
+            return;
+        }
+        const editorService = accessor.get(IEditorService);
+        let sessionId;
+        let sessionItem;
+        if (isMarshalledChatSessionContext(context)) {
+            const session = context.session;
+            sessionItem = session;
+            if (isLocalChatSessionItem(session)) {
+                if (session.sessionType === 'editor' && session.editor instanceof ChatEditorInput) {
+                    sessionId = session.editor.sessionId || session.id;
+                }
+                else if (session.sessionType === 'widget' && session.widget) {
+                    sessionId = session.widget.viewModel?.model.sessionId || session.id;
+                }
+                else {
+                    sessionId = session.id;
+                }
+            }
+            else {
+                sessionId = session.id;
+            }
+        }
+        else {
+            sessionId = context.sessionId;
+        }
+        if (sessionItem && (isLocalChatSessionItem(sessionItem) || sessionId.startsWith('history-'))) {
+            const sessionIdWithoutHistory = sessionId.replace('history-', '');
+            const options = {
+                target: { sessionId: sessionIdWithoutHistory },
+                pinned: true,
+                auxiliary: { compact: false },
+                ignoreInView: true
+            };
+            await editorService.openEditor({
+                resource: ChatEditorInput.getNewEditorUri(),
+                options,
+            }, AUX_WINDOW_GROUP);
+        }
+        else {
+            const providerType = sessionItem && sessionItem.provider?.chatSessionType || 'external';
+            await editorService.openEditor({
+                resource: ChatSessionUri.forSession(providerType, sessionId),
+                options: {
+                    pinned: true,
+                    auxiliary: { compact: false }
+                }
+            }, AUX_WINDOW_GROUP);
+        }
+    }
+}
+class OpenChatSessionInNewEditorGroupAction extends Action2 {
+    static { this.id = 'workbench.action.chat.openSessionInNewEditorGroup'; }
+    constructor() {
+        super({
+            id: OpenChatSessionInNewEditorGroupAction.id,
+            title: ( localize(4692, "Open Chat to the Side")),
+            category: CHAT_CATEGORY,
+            f1: false,
+        });
+    }
+    async run(accessor, context) {
+        if (!context) {
+            return;
+        }
+        const editorService = accessor.get(IEditorService);
+        let sessionId;
+        let sessionItem;
+        if (isMarshalledChatSessionContext(context)) {
+            const session = context.session;
+            sessionItem = session;
+            if (isLocalChatSessionItem(session)) {
+                if (session.sessionType === 'editor' && session.editor instanceof ChatEditorInput) {
+                    sessionId = session.editor.sessionId || session.id;
+                }
+                else if (session.sessionType === 'widget' && session.widget) {
+                    sessionId = session.widget.viewModel?.model.sessionId || session.id;
+                }
+                else {
+                    sessionId = session.id;
+                }
+            }
+            else {
+                sessionId = session.id;
+            }
+        }
+        else {
+            sessionId = context.sessionId;
+        }
+        if (sessionItem && (isLocalChatSessionItem(sessionItem) || sessionId.startsWith('history-'))) {
+            const sessionIdWithoutHistory = sessionId.replace('history-', '');
+            const options = {
+                target: { sessionId: sessionIdWithoutHistory },
+                pinned: true,
+                ignoreInView: true,
+            };
+            await editorService.openEditor({
+                resource: ChatEditorInput.getNewEditorUri(),
+                options,
+            }, SIDE_GROUP);
+        }
+        else {
+            const providerType = sessionItem && sessionItem.provider?.chatSessionType || 'external';
+            await editorService.openEditor({
+                resource: ChatSessionUri.forSession(providerType, sessionId),
+                options: { pinned: true }
+            }, SIDE_GROUP);
+        }
+    }
+}
+class OpenChatSessionInSidebarAction extends Action2 {
+    static { this.id = 'workbench.action.chat.openSessionInSidebar'; }
+    constructor() {
+        super({
+            id: OpenChatSessionInSidebarAction.id,
+            title: ( localize(4693, "Open Chat in Sidebar")),
+            category: CHAT_CATEGORY,
+            f1: false,
+        });
+    }
+    async run(accessor, context) {
+        if (!context) {
+            return;
+        }
+        const viewsService = accessor.get(IViewsService);
+        let sessionId;
+        let sessionItem;
+        if (isMarshalledChatSessionContext(context)) {
+            const session = context.session;
+            sessionItem = session;
+            if (isLocalChatSessionItem(session)) {
+                if (session.sessionType === 'editor' && session.editor instanceof ChatEditorInput) {
+                    sessionId = session.editor.sessionId || session.id;
+                }
+                else if (session.sessionType === 'widget' && session.widget) {
+                    sessionId = session.widget.viewModel?.model.sessionId || session.id;
+                }
+                else {
+                    sessionId = session.id;
+                }
+            }
+            else {
+                sessionId = session.id;
+            }
+        }
+        else {
+            sessionId = context.sessionId;
+        }
+        const chatViewPane = await viewsService.openView(ChatViewId);
+        if (chatViewPane) {
+            if (sessionItem && (isLocalChatSessionItem(sessionItem) || sessionId.startsWith('history-'))) {
+                const sessionIdWithoutHistory = sessionId.replace('history-', '');
+                await chatViewPane.loadSession(sessionIdWithoutHistory);
+            }
+            else {
+                const providerType = sessionItem && sessionItem.provider?.chatSessionType || 'external';
+                const sessionUri = ChatSessionUri.forSession(providerType, sessionId);
+                await chatViewPane.loadSession(sessionUri);
+            }
+            chatViewPane.focusInput();
+        }
+    }
+}
+class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
+    static { this.id = 'workbench.action.chatSessions.toggleDescriptionDisplay'; }
+    constructor() {
+        super({
+            id: ToggleChatSessionsDescriptionDisplayAction.id,
+            title: ( localize(4694, "Show Rich Descriptions")),
+            category: CHAT_CATEGORY,
+            f1: false,
+            toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true))
+        });
+    }
+    async run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const currentValue = configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription);
+        await configurationService.updateValue(ChatConfiguration.ShowAgentSessionsViewDescription, !currentValue);
+    }
+}
+MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+    command: {
+        id: RenameChatSessionAction.id,
+        title: ( localize(4682, "Rename")),
+        icon: Codicon.pencil
+    },
+    group: 'inline',
+    order: 1,
+    when: ( ChatContextKeys.sessionType.isEqualTo('local'))
+});
+MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+    command: {
+        id: DeleteChatSessionAction.id,
+        title: ( localize(4687, "Delete")),
+        icon: Codicon.x
+    },
+    group: 'inline',
+    order: 2,
+    when: ( ContextKeyExpr.and(( ChatContextKeys.isHistoryItem.isEqualTo(true)), ( ChatContextKeys.isActiveSession.isEqualTo(false))))
+});
+MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+    command: {
+        id: OpenChatSessionInNewEditorGroupAction.id,
+        title: ( localize(4695, "Open to the Side"))
+    },
+    group: 'navigation',
+    order: 2,
+});
+MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+    command: {
+        id: OpenChatSessionInSidebarAction.id,
+        title: ( localize(4696, "Open in Sidebar"))
+    },
+    group: 'navigation',
+    order: 3,
+});
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+    command: {
+        id: ToggleChatSessionsDescriptionDisplayAction.id,
+        title: ( localize(4694, "Show Rich Descriptions")),
+        toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true))
+    },
+    group: '1_config',
+    order: 1,
+    when: ( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
+});
+
+export { DeleteChatSessionAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInNewWindowAction, OpenChatSessionInSidebarAction, RenameChatSessionAction, ToggleChatSessionsDescriptionDisplayAction };

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { markAsSingleton } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -15,9 +16,9 @@ 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 { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 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';
@@ -28,7 +29,7 @@ class AcceptToolConfirmation extends Action2 {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4654, "Accept")),
+            title: ( localize2(4707, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -45,9 +46,9 @@ class AcceptToolConfirmation extends Action2 {
         if (!isResponseVM(lastItem)) {
             return;
         }
-        const unconfirmedToolInvocation = lastItem.model.response.value.find((item) => item.kind === 'toolInvocation' && !item.isConfirmed);
+        const unconfirmedToolInvocation = lastItem.model.response.value.find((item) => item.kind === 'toolInvocation' && item.isConfirmed === undefined);
         if (unconfirmedToolInvocation) {
-            unconfirmedToolInvocation.confirmed.complete(true);
+            unconfirmedToolInvocation.confirmed.complete({ type: ToolConfirmKind.UserAction });
         }
         widget?.focusInput();
     }
@@ -57,7 +58,7 @@ class ConfigureToolsAction extends Action2 {
     constructor() {
         super({
             id: ConfigureToolsAction.ID,
-            title: ( localize(4655, "Configure Tools...")),
+            title: ( localize(4708, "Configure Tools...")),
             icon: Codicon.tools,
             f1: false,
             category: CHAT_CATEGORY,
@@ -92,35 +93,33 @@ class ConfigureToolsAction extends Action2 {
         const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
         switch (entriesScope) {
             case ToolsScope.Session:
-                placeholder = ( localize(4656, "Select tools for this chat session"));
+                placeholder = ( localize(4709, "Select tools for this chat session"));
                 description = ( localize(
-                    4657,
+                    4710,
                     "The selected tools were configured by a prompt command and only apply to this chat session."
                 ));
                 break;
             case ToolsScope.Mode:
-                placeholder = ( localize(4658, "Select tools for this chat mode"));
+                placeholder = ( localize(4711, "Select tools for this chat mode"));
                 description = ( localize(
-                    4659,
+                    4712,
                     "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().name
+                    widget.input.currentModeObs.get().label
                 ));
                 break;
             case ToolsScope.Global:
-                placeholder = ( localize(4660, "Select tools that are available to chat."));
+                placeholder = ( localize(4713, "Select tools that are available to chat."));
                 description = undefined;
                 break;
         }
-        const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, entriesMap.get(), newEntriesMap => {
-            for (const [item, enabled] of newEntriesMap) {
-            }
-        });
+        const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, entriesMap.get());
         if (result) {
             widget.input.selectedToolsModel.set(result, false);
         }
+        const tools = widget.input.selectedToolsModel.entriesMap.get();
         telemetryService.publicLog2('chat/selectedTools', {
-            total: widget.input.selectedToolsModel.entriesMap.get().size,
-            enabled: widget.input.selectedToolsModel.entries.get().size,
+            total: tools.size,
+            enabled: Iterable.reduce(tools, (prev, [_, enabled]) => enabled ? prev + 1 : prev, 0),
         });
     }
 }
@@ -158,7 +157,7 @@ let ConfigureToolsActionRendering = class ConfigureToolsActionRendering {
                 getTooltip() {
                     if (this.isAboveToolLimit()) {
                         const warningMessage = ( localize(
-                            4661,
+                            4714,
                             'More than {0} tools are enabled, you may experience degraded tool calling.',
                             this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key)
                         ));