@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -1,26 +1,19 @@
 
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 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 '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
-import { MenuEntryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, MenuId, MenuItemAction, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId, registerAction2 } 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { 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/actions/chatContextKeys';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind, ChatConfiguration } 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-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatSelectedTools';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -37,7 +30,7 @@ class ToolConfirmationAction extends Action2 {
             return;
         }
         for (const item of lastItem.model.response.value) {
-            const state = item.kind === 'toolInvocation' ? item.state.get() : undefined;
+            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;
@@ -50,54 +43,60 @@ class AcceptToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4807, "Accept")),
+            title: ( localize2(4851, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
                 when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.Editing.hasToolConfirmation)),
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                weight: KeybindingWeight.WorkbenchContrib + 1,
-            },
+                weight: KeybindingWeight.WorkbenchContrib + 1
+            }
         });
     }
     getReason() {
-        return { type: ToolConfirmKind.UserAction };
+        return {
+            type: ToolConfirmKind.UserAction
+        };
     }
 }
 class SkipToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: SkipToolConfirmationActionId,
-            title: ( localize2(4808, "Skip")),
+            title: ( localize2(4852, "Skip")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
                 when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.Editing.hasToolConfirmation)),
                 primary: KeyMod.CtrlCmd | KeyCode.Enter | KeyMod.Alt,
-                weight: KeybindingWeight.WorkbenchContrib + 1,
-            },
+                weight: KeybindingWeight.WorkbenchContrib + 1
+            }
         });
     }
     getReason() {
-        return { type: ToolConfirmKind.Skipped };
+        return {
+            type: ToolConfirmKind.Skipped
+        };
     }
 }
 class ConfigureToolsAction extends Action2 {
-    static { this.ID = 'workbench.action.chat.configureTools'; }
+    static {
+        this.ID = "workbench.action.chat.configureTools";
+    }
     constructor() {
         super({
             id: ConfigureToolsAction.ID,
-            title: ( localize(4809, "Configure Tools...")),
+            title: ( localize(4853, "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.ChatInput,
-                    group: 'navigation',
-                    order: 100,
-                }]
+                when: ( ContextKeyExpr.and(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.lockedToCodingAgent.negate()), ( ContextKeyExpr.notEquals(`config.${ChatConfiguration.AlternativeToolAction}`, true)))),
+                id: MenuId.ChatInput,
+                group: "navigation",
+                order: 100
+            }]
         });
     }
     async run(accessor, ...args) {
@@ -106,48 +105,46 @@ class ConfigureToolsAction extends Action2 {
         const telemetryService = accessor.get(ITelemetryService);
         let widget = chatWidgetService.lastFocusedWidget;
         if (!widget) {
-            function isChatActionContext(obj) {
-                return !!obj && typeof obj === 'object' && !!obj.widget;
-            }
-            const context = args[0];
-            if (isChatActionContext(context)) {
-                widget = context.widget;
-            }
+            widget = this.extractWidget(args);
         }
         if (!widget) {
             return;
         }
+        const source = this.extractSource(args) ?? "chatInput";
         let placeholder;
         let description;
-        const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
+        const {
+            entriesScope,
+            entriesMap
+        } = widget.input.selectedToolsModel;
         switch (entriesScope) {
-            case ToolsScope.Session:
-                placeholder = ( localize(4810, "Select tools for this chat session"));
-                description = ( localize(4811, "The selected tools were configured only for this chat session."));
-                break;
-            case ToolsScope.Agent:
-                placeholder = ( localize(4812, "Select tools for this custom agent"));
-                description = ( localize(
-                    4813,
-                    "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.Agent_ReadOnly:
-                placeholder = ( localize(4814, "Select tools for this custom agent"));
-                description = ( localize(
-                    4815,
-                    "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(4816, "Select tools that are available to chat."));
-                description = ( localize(
-                    4817,
-                    "The selected tools will be applied globally for all chat sessions that use the default agent."
-                ));
-                break;
+        case ToolsScope.Session:
+            placeholder = ( localize(4854, "Select tools for this chat session"));
+            description = ( localize(4855, "The selected tools were configured only for this chat session."));
+            break;
+        case ToolsScope.Agent:
+            placeholder = ( localize(4856, "Select tools for this custom agent"));
+            description = ( localize(
+                4857,
+                "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.Agent_ReadOnly:
+            placeholder = ( localize(4858, "Select tools for this custom agent"));
+            description = ( localize(
+                4859,
+                "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(4860, "Select tools that are available to chat."));
+            description = ( localize(
+                4861,
+                "The selected tools will be applied globally for all chat sessions that use the default agent."
+            ));
+            break;
         }
         const cts = ( new CancellationTokenSource());
         const initialMode = widget.input.currentModeObs.get();
@@ -157,87 +154,55 @@ class ConfigureToolsAction extends Action2 {
             }
         });
         try {
-            const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, () => entriesMap.get(), cts.token);
+            const result = await instaService.invokeFunction(
+                showToolsPicker,
+                placeholder,
+                source,
+                description,
+                () => entriesMap.get(),
+                widget.input.selectedLanguageModel.get()?.metadata,
+                cts.token
+            );
             if (result) {
                 widget.input.selectedToolsModel.set(result, false);
             }
-        }
-        finally {
+        } finally {
             modeListener.dispose();
             cts.dispose();
         }
         const tools = widget.input.selectedToolsModel.entriesMap.get();
-        telemetryService.publicLog2('chat/selectedTools', {
+        telemetryService.publicLog2("chat/selectedTools", {
             total: tools.size,
-            enabled: Iterable.reduce(tools, (prev, [_, enabled]) => enabled ? prev + 1 : prev, 0),
+            enabled: Iterable.reduce(tools, (prev, [_, enabled]) => enabled ? prev + 1 : prev, 0)
         });
     }
-}
-let ConfigureToolsActionRendering = class ConfigureToolsActionRendering {
-    static { this.ID = 'chat.configureToolsActionRendering'; }
-    constructor(actionViewItemService) {
-        const disposable = actionViewItemService.register(MenuId.ChatInput, ConfigureToolsAction.ID, (action, _opts, instantiationService) => {
-            if (!(action instanceof MenuItemAction)) {
-                return undefined;
+    extractWidget(args) {
+        function isChatActionContext(obj) {
+            return !!obj && typeof obj === "object" && !!obj.widget;
+        }
+        for (const arg of args) {
+            if (isChatActionContext(arg)) {
+                return arg.widget;
             }
-            return instantiationService.createInstance(class extends MenuEntryActionViewItem {
-                render(container) {
-                    super.render(container);
-                    this.warningElement = $(`.tool-warning-indicator${ThemeIcon.asCSSSelector(Codicon.warning)}`);
-                    this.warningElement.style.display = 'none';
-                    container.appendChild(this.warningElement);
-                    container.style.position = 'relative';
-                    this.updateWarningState();
-                    this._register(this._contextKeyService.onDidChangeContext(() => {
-                        this.updateWarningState();
-                    }));
-                }
-                updateWarningState() {
-                    const wasShown = this.warningElement.style.display === 'block';
-                    const shouldBeShown = this.isAboveToolLimit();
-                    if (!wasShown && shouldBeShown) {
-                        this.warningElement.style.display = 'block';
-                        this.updateTooltip();
-                    }
-                    else if (wasShown && !shouldBeShown) {
-                        this.warningElement.style.display = 'none';
-                        this.updateTooltip();
-                    }
-                }
-                getTooltip() {
-                    if (this.isAboveToolLimit()) {
-                        const warningMessage = ( localize(
-                            4818,
-                            'More than {0} tools are enabled, you may experience degraded tool calling.',
-                            this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key)
-                        ));
-                        return `${warningMessage}`;
-                    }
-                    return super.getTooltip();
-                }
-                isAboveToolLimit() {
-                    const rawToolLimit = this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key);
-                    const rawToolCount = this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolCount.key);
-                    if (rawToolLimit === undefined || rawToolCount === undefined) {
-                        return false;
-                    }
-                    const toolLimit = Number(rawToolLimit || 0);
-                    const toolCount = Number(rawToolCount || 0);
-                    return toolCount > toolLimit;
-                }
-            }, action, undefined);
-        });
-        markAsSingleton(disposable);
+        }
+        return undefined;
     }
-};
-ConfigureToolsActionRendering = ( __decorate([
-    ( __param(0, IActionViewItemService))
-], ConfigureToolsActionRendering));
+    extractSource(args) {
+        function isChatActionSource(obj) {
+            return !!obj && typeof obj === "object" && !!obj.source;
+        }
+        for (const arg of args) {
+            if (isChatActionSource(arg)) {
+                return arg.source;
+            }
+        }
+        return undefined;
+    }
+}
 function registerChatToolActions() {
     registerAction2(AcceptToolConfirmation);
     registerAction2(SkipToolConfirmation);
     registerAction2(ConfigureToolsAction);
-    registerWorkbenchContribution2(ConfigureToolsActionRendering.ID, ConfigureToolsActionRendering, WorkbenchPhase.BlockRestore);
 }
 
 export { registerChatToolActions };

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

@@ -1,6 +1,7 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ILanguageModelChatMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
+import { IToolData, IToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 /**
  * New QuickTree implementation of the tools picker.
  * Uses IQuickTree to provide a true hierarchical tree structure with:
@@ -13,7 +14,9 @@ import { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workb
  * @param placeHolder - Placeholder text shown in the picker
  * @param description - Optional description text shown in the picker
  * @param toolsEntries - Optional initial selection state for tools and toolsets
+ * @param modelId - Optional model ID to filter tools by supported models
+ * @param onUpdate - Optional callback fired when the selection changes
  * @param token - Optional cancellation token to close the picker when cancelled
  * @returns Promise resolving to the final selection map, or undefined if cancelled
  */
-export declare function showToolsPicker(accessor: ServicesAccessor, placeHolder: string, description?: string, getToolsEntries?: () => ReadonlyMap<ToolSet | IToolData, boolean>, token?: CancellationToken): Promise<ReadonlyMap<ToolSet | IToolData, boolean> | undefined>;
+export declare function showToolsPicker(accessor: ServicesAccessor, placeHolder: string, source: string, description?: string, getToolsEntries?: () => ReadonlyMap<IToolSet | IToolData, boolean>, model?: ILanguageModelChatMetadata | undefined, token?: CancellationToken): Promise<ReadonlyMap<IToolSet | IToolData, boolean> | undefined>;