@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.js

@@ -13,14 +13,14 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
-const RUN_WITHOUT_APPROVAL = ( localize(6408, "without approval"));
-const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(6409, "without reviewing result"));
+const RUN_WITHOUT_APPROVAL = ( localize(6567, "without approval"));
+const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(6568, "without reviewing result"));
 class GenericConfirmStore extends Disposable {
     constructor(_storageKey, _instantiationService) {
         super();
         this._storageKey = _storageKey;
         this._instantiationService = _instantiationService;
-        this._memoryStore = ( new Set());
+        this._memoryStore = ( new Map());
         this._workspaceStore = ( new Lazy(() => this._register(
             this._instantiationService.createInstance(ToolConfirmStore, StorageScope.WORKSPACE, this._storageKey)
         )));
@@ -28,16 +28,20 @@ class GenericConfirmStore extends Disposable {
             this._instantiationService.createInstance(ToolConfirmStore, StorageScope.PROFILE, this._storageKey)
         )));
     }
-    setAutoConfirmation(id, scope) {
-        this._workspaceStore.value.setAutoConfirm(id, false);
-        this._profileStore.value.setAutoConfirm(id, false);
+    setAutoConfirmation(id, scope, label) {
+        this._workspaceStore.value.setAutoConfirm(id, undefined);
+        this._profileStore.value.setAutoConfirm(id, undefined);
         this._memoryStore.delete(id);
+        const entry = {
+            confirmed: true,
+            label
+        };
         if (scope === "workspace") {
-            this._workspaceStore.value.setAutoConfirm(id, true);
+            this._workspaceStore.value.setAutoConfirm(id, entry);
         } else if (scope === "profile") {
-            this._profileStore.value.setAutoConfirm(id, true);
+            this._profileStore.value.setAutoConfirm(id, entry);
         } else if (scope === "session") {
-            this._memoryStore.add(id);
+            this._memoryStore.set(id, entry);
         }
     }
     getAutoConfirmation(id) {
@@ -54,13 +58,16 @@ class GenericConfirmStore extends Disposable {
     }
     getAutoConfirmationIn(id, scope) {
         if (scope === "workspace") {
-            return this._workspaceStore.value.getAutoConfirm(id);
+            return !!this._workspaceStore.value.getAutoConfirm(id);
         } else if (scope === "profile") {
-            return this._profileStore.value.getAutoConfirm(id);
+            return !!this._profileStore.value.getAutoConfirm(id);
         } else {
             return ( this._memoryStore.has(id));
         }
     }
+    getLabel(id) {
+        return this._workspaceStore.value.getAutoConfirm(id)?.label ?? this._profileStore.value.getAutoConfirm(id)?.label ?? this._memoryStore.get(id)?.label;
+    }
     reset() {
         this._workspaceStore.value.reset();
         this._profileStore.value.reset();
@@ -95,7 +102,7 @@ class GenericConfirmStore extends Disposable {
         for (const key of this._profileStore.value.getAll()) {
             all.add(key);
         }
-        for (const key of this._memoryStore) {
+        for (const key of ( this._memoryStore.keys())) {
             all.add(key);
         }
         return all;
@@ -109,15 +116,33 @@ let ToolConfirmStore = class ToolConfirmStore extends Disposable {
         this.storageService = storageService;
         this._autoConfirmTools = ( new LRUCache(100));
         this._didChange = false;
-        const stored = storageService.getObject(this._storageKey, this._scope);
-        if (stored) {
-            for (const key of stored) {
-                this._autoConfirmTools.set(key, true);
-            }
+        const raw = storageService.get(this._storageKey, this._scope);
+        if (raw) {
+            try {
+                const parsed = JSON.parse(raw);
+                if (Array.isArray(parsed)) {
+                    for (const key of parsed) {
+                        this._autoConfirmTools.set(key, {
+                            confirmed: true
+                        });
+                    }
+                } else if (typeof parsed === "object" && parsed !== null) {
+                    for (const [key, value] of Object.entries(parsed)) {
+                        this._autoConfirmTools.set(key, {
+                            confirmed: true,
+                            label: typeof value === "string" ? value : undefined
+                        });
+                    }
+                }
+            } catch {}
         }
         this._register(storageService.onWillSaveState(() => {
             if (this._didChange) {
-                this.storageService.store(this._storageKey, [...( this._autoConfirmTools.keys())], this._scope, StorageTarget.MACHINE);
+                const data = {};
+                for (const [key, entry] of this._autoConfirmTools) {
+                    data[key] = entry.label ?? true;
+                }
+                this.storageService.store(this._storageKey, JSON.stringify(data), this._scope, StorageTarget.MACHINE);
                 this._didChange = false;
             }
         }));
@@ -127,17 +152,18 @@ let ToolConfirmStore = class ToolConfirmStore extends Disposable {
         this._didChange = true;
     }
     getAutoConfirm(id) {
-        if (this._autoConfirmTools.get(id)) {
+        const entry = this._autoConfirmTools.get(id);
+        if (entry) {
             this._didChange = true;
-            return true;
+            return entry;
         }
-        return false;
+        return undefined;
     }
-    setAutoConfirm(id, autoConfirm) {
-        if (autoConfirm) {
-            this._autoConfirmTools.set(id, true);
-        } else {
+    setAutoConfirm(id, entry) {
+        if (!entry) {
             this._autoConfirmTools.delete(id);
+        } else {
+            this._autoConfirmTools.set(id, entry);
         }
         this._didChange = true;
     }
@@ -156,6 +182,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         this._postExecutionToolConfirmStore = this._register(( new GenericConfirmStore("chat/autoconfirm-post", this._instantiationService)));
         this._preExecutionServerConfirmStore = this._register(( new GenericConfirmStore("chat/servers/autoconfirm", this._instantiationService)));
         this._postExecutionServerConfirmStore = this._register(( new GenericConfirmStore("chat/servers/autoconfirm-post", this._instantiationService)));
+        this._combinationConfirmStore = this._register(( new GenericConfirmStore("chat/autoconfirm-combination", this._instantiationService)));
     }
     getPreConfirmAction(ref) {
         const contribution = this._contributions.get(ref.toolId);
@@ -168,6 +195,12 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (contribution && contribution.canUseDefaultApprovals === false) {
             return undefined;
         }
+        if (ref.combination) {
+            const combinationResult = this._combinationConfirmStore.checkAutoConfirmation(ref.combination.key);
+            if (combinationResult) {
+                return combinationResult;
+            }
+        }
         const toolResult = this._preExecutionToolConfirmStore.checkAutoConfirmation(ref.toolId);
         if (toolResult) {
             return toolResult;
@@ -212,9 +245,50 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (contribution && contribution.canUseDefaultApprovals === false) {
             return actions;
         }
+        if (ref.combination) {
+            const {
+                label: combinationLabel,
+                key: combinationKey
+            } = ref.combination;
+            actions.push({
+                label: ( localize(6569, "{0} in this Session", combinationLabel)),
+                detail: ( localize(
+                    6570,
+                    "Allow this particular combination of tool and arguments in this session without confirmation."
+                )),
+                divider: !!actions.length,
+                scope: "session",
+                select: async () => {
+                    this._combinationConfirmStore.setAutoConfirmation(combinationKey, "session", combinationLabel);
+                    return true;
+                }
+            }, {
+                label: ( localize(6571, "{0} in this Workspace", combinationLabel)),
+                detail: ( localize(
+                    6572,
+                    "Allow this particular combination of tool and arguments in this workspace without confirmation."
+                )),
+                scope: "workspace",
+                select: async () => {
+                    this._combinationConfirmStore.setAutoConfirmation(combinationKey, "workspace", combinationLabel);
+                    return true;
+                }
+            }, {
+                label: ( localize(6573, "Always {0}", combinationLabel)),
+                detail: ( localize(
+                    6574,
+                    "Always allow this particular combination of tool and arguments without confirmation."
+                )),
+                scope: "profile",
+                select: async () => {
+                    this._combinationConfirmStore.setAutoConfirmation(combinationKey, "profile", combinationLabel);
+                    return true;
+                }
+            });
+        }
         actions.push({
-            label: ( localize(6410, "Allow in this Session")),
-            detail: ( localize(6411, "Allow this tool to run in this session without confirmation.")),
+            label: ( localize(6575, "Allow in this Session")),
+            detail: ( localize(6576, "Allow this tool to run in this session without confirmation.")),
             divider: !!actions.length,
             scope: "session",
             select: async () => {
@@ -222,16 +296,16 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6412, "Allow in this Workspace")),
-            detail: ( localize(6413, "Allow this tool to run in this workspace without confirmation.")),
+            label: ( localize(6577, "Allow in this Workspace")),
+            detail: ( localize(6578, "Allow this tool to run in this workspace without confirmation.")),
             scope: "workspace",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "workspace");
                 return true;
             }
         }, {
-            label: ( localize(6414, "Always Allow")),
-            detail: ( localize(6415, "Always allow this tool to run without confirmation.")),
+            label: ( localize(6579, "Always Allow")),
+            detail: ( localize(6580, "Always allow this tool to run without confirmation.")),
             scope: "profile",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "profile");
@@ -244,9 +318,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(6416, "Allow Tools from {0} in this Session", serverLabel)),
+                label: ( localize(6581, "Allow Tools from {0} in this Session", serverLabel)),
                 detail: ( localize(
-                    6417,
+                    6582,
                     "Allow all tools from this server to run in this session without confirmation."
                 )),
                 divider: true,
@@ -256,9 +330,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6418, "Allow Tools from {0} in this Workspace", serverLabel)),
+                label: ( localize(6583, "Allow Tools from {0} in this Workspace", serverLabel)),
                 detail: ( localize(
-                    6419,
+                    6584,
                     "Allow all tools from this server to run in this workspace without confirmation."
                 )),
                 scope: "workspace",
@@ -267,9 +341,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6420, "Always Allow Tools from {0}", serverLabel)),
+                label: ( localize(6585, "Always Allow Tools from {0}", serverLabel)),
                 detail: ( localize(
-                    6421,
+                    6586,
                     "Always allow all tools from this server to run without confirmation."
                 )),
                 scope: "profile",
@@ -291,9 +365,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(6422, "Allow Without Review in this Session")),
+            label: ( localize(6587, "Allow Without Review in this Session")),
             detail: ( localize(
-                6423,
+                6588,
                 "Allow results from this tool to be sent without confirmation in this session."
             )),
             divider: !!actions.length,
@@ -303,9 +377,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6424, "Allow Without Review in this Workspace")),
+            label: ( localize(6589, "Allow Without Review in this Workspace")),
             detail: ( localize(
-                6425,
+                6590,
                 "Allow results from this tool to be sent without confirmation in this workspace."
             )),
             scope: "workspace",
@@ -314,9 +388,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6426, "Always Allow Without Review")),
+            label: ( localize(6591, "Always Allow Without Review")),
             detail: ( localize(
-                6427,
+                6592,
                 "Always allow results from this tool to be sent without confirmation."
             )),
             scope: "profile",
@@ -331,9 +405,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(6428, "Allow Tools from {0} Without Review in this Session", serverLabel)),
+                label: ( localize(6593, "Allow Tools from {0} Without Review in this Session", serverLabel)),
                 detail: ( localize(
-                    6429,
+                    6594,
                     "Allow results from all tools from this server to be sent without confirmation in this session."
                 )),
                 divider: true,
@@ -343,9 +417,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6430, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
+                label: ( localize(6595, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
                 detail: ( localize(
-                    6431,
+                    6596,
                     "Allow results from all tools from this server to be sent without confirmation in this workspace."
                 )),
                 scope: "workspace",
@@ -354,9 +428,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6432, "Always Allow Tools from {0} Without Review", serverLabel)),
+                label: ( localize(6597, "Always Allow Tools from {0} Without Review", serverLabel)),
                 detail: ( localize(
-                    6433,
+                    6598,
                     "Always allow results from all tools from this server to be sent without confirmation."
                 )),
                 scope: "profile",
@@ -377,7 +451,30 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         };
     }
     toolCanManageConfirmation(tool) {
-        return !!tool.canRequestPreApproval || !!tool.canRequestPostApproval || ( this._contributions.has(tool.id)) || !!this._preExecutionToolConfirmStore.checkAutoConfirmation(tool.id) || !!this._postExecutionToolConfirmStore.checkAutoConfirmation(tool.id);
+        return !!tool.canRequestPreApproval || !!tool.canRequestPostApproval || ( this._contributions.has(tool.id)) || !!this._preExecutionToolConfirmStore.checkAutoConfirmation(tool.id) || !!this._postExecutionToolConfirmStore.checkAutoConfirmation(tool.id) || this._hasCombinationApprovalsForTool(tool.id);
+    }
+    _hasCombinationApprovalsForTool(toolId) {
+        const prefix = toolId + ":combination:";
+        for (const key of this._combinationConfirmStore.getAllConfirmed()) {
+            if (key.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    _getCombinationApprovalsForTool(toolId, scope) {
+        const prefix = toolId + ":combination:";
+        const results = [];
+        for (const key of this._combinationConfirmStore.getAllConfirmed()) {
+            if (key.startsWith(prefix) && this._combinationConfirmStore.getAutoConfirmationIn(key, scope)) {
+                const label = this._combinationConfirmStore.getLabel(key) ?? key;
+                results.push({
+                    key,
+                    label
+                });
+            }
+        }
+        return results;
     }
     manageConfirmationPreferences(tools, options) {
         const trackServerTool = (serverId, label, toolId, serversWithTools) => {
@@ -427,6 +524,12 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 }
             }
         }
+        for (const tool of tools) {
+            if (!( relevantTools.has(tool.id)) && this._hasCombinationApprovalsForTool(tool.id)) {
+                relevantTools.add(tool.id);
+                addServerToolFromSource(tool.source, tool.id, serversWithTools);
+            }
+        }
         if (relevantTools.size === 0) {
             return;
         }
@@ -467,6 +570,19 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                             checked: this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
                         });
                     }
+                    const combinationApprovals = this._getCombinationApprovalsForTool(tool.id, currentScope);
+                    for (const {
+                        key,
+                        label
+                    } of combinationApprovals) {
+                        toolChildren.push({
+                            type: "combination",
+                            toolId: tool.id,
+                            combinationKey: key,
+                            label,
+                            checked: true
+                        });
+                    }
                     const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
                     const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
                     let checked;
@@ -479,6 +595,8 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     } else if (hasPost) {
                         checked = postApproval;
                         description = CONTINUE_WITHOUT_REVIEWING_RESULTS;
+                    } else if (toolChildren.length > 0) {
+                        checked = false;
                     } else {
                         continue;
                     }
@@ -498,7 +616,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-post",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(6434, "Continue without reviewing any tool results")),
+                        label: ( localize(6599, "Continue without reviewing any tool results")),
                         checked: serverPostConfirmed
                     });
                 }
@@ -507,7 +625,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-pre",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(6435, "Run any tool without approval")),
+                        label: ( localize(6600, "Run any tool without approval")),
                         checked: serverPreConfirmed
                     });
                 }
@@ -572,6 +690,19 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                             checked: this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
                         });
                     }
+                    const combinationApprovals = this._getCombinationApprovalsForTool(tool.id, currentScope);
+                    for (const {
+                        key,
+                        label
+                    } of combinationApprovals) {
+                        toolChildren.push({
+                            type: "combination",
+                            toolId: tool.id,
+                            combinationKey: key,
+                            label,
+                            checked: true
+                        });
+                    }
                     const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
                     const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
                     if (hasPre && hasPost) {
@@ -606,7 +737,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (currentScope !== "session") {
             const scopeButton = {
                 iconClass: ThemeIcon.asClassName(Codicon.folder),
-                tooltip: ( localize(6436, "Configure for this workspace only")),
+                tooltip: ( localize(6601, "Configure for this workspace only")),
                 toggle: {
                     checked: currentScope === "workspace"
                 },
@@ -623,9 +754,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         }
         const updatePlaceholder = () => {
             if (currentScope === "session") {
-                quickTree.placeholder = ( localize(6437, "Configure session tool approvals"));
+                quickTree.placeholder = ( localize(6602, "Configure session tool approvals"));
             } else {
-                quickTree.placeholder = currentScope === "workspace" ? ( localize(6438, "Configure workspace tool approvals")) : ( localize(6439, "Configure global tool approvals"));
+                quickTree.placeholder = currentScope === "workspace" ? ( localize(6603, "Configure workspace tool approvals")) : ( localize(6604, "Configure global tool approvals"));
             }
         };
         updatePlaceholder();
@@ -646,6 +777,14 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 if (tool?.canRequestPreApproval || newState === "never") {
                     this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
                 }
+                if (newState === "never") {
+                    for (const key of this._combinationConfirmStore.getAllConfirmed()) {
+                        if (key.startsWith(item.toolId + ":combination:")) {
+                            this._combinationConfirmStore.setAutoConfirmation(key, "never");
+                        }
+                    }
+                }
+                quickTree.setItemTree(buildTreeItems());
             } else if (item.type === "tool-pre" && item.toolId) {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
             } else if (item.type === "tool-post" && item.toolId) {
@@ -658,6 +797,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 quickTree.setItemTree(buildTreeItems());
             } else if (item.type === "manage") {
                 item.onDidChangeChecked?.(!!item.checked);
+            } else if (item.type === "combination" && item.combinationKey) {
+                this._combinationConfirmStore.setAutoConfirmation(item.combinationKey, newState);
+                quickTree.setItemTree(buildTreeItems());
             }
         }));
         disposables.add(quickTree.onDidTriggerItemButton(i => {
@@ -671,6 +813,8 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 quickTree.hide();
                 await manageItem.onDidOpen?.();
                 this.manageConfirmationPreferences(tools, options);
+            } else {
+                quickTree.hide();
             }
         }));
         disposables.add(quickTree.onDidHide(() => {
@@ -697,6 +841,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         this._postExecutionToolConfirmStore.reset();
         this._preExecutionServerConfirmStore.reset();
         this._postExecutionServerConfirmStore.reset();
+        this._combinationConfirmStore.reset();
         for (const contribution of ( this._contributions.values())) {
             contribution.reset?.();
         }

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.d.ts

@@ -111,6 +111,13 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     updateToolStream(toolCallId: string, partialInput: unknown, token: CancellationToken): Promise<void>;
     private playAccessibilitySignal;
     private ensureToolDetails;
+    private toolResultHasImages;
+    /**
+     * Returns true if the tool result message (or falling back to the tool invocation's
+     * pastTenseMessage from streaming) contains empty markdown links pointing to image
+     * files (the `[](imageUri)` pattern) that will be rendered as file pills by renderFileWidgets.
+     */
+    private toolResultMessageHasImageFileWidgets;
     private formatToolInput;
     private toolResultToIO;
     /**