@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/skillActions.js

@@ -16,8 +16,8 @@ class ManageSkillsAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_SKILLS_ACTION_ID,
-            title: ( localize2(7118, "Configure Skills...")),
-            shortTitle: ( localize2(7119, "Skills")),
+            title: ( localize2(7626, "Configure Skills...")),
+            shortTitle: ( localize2(7627, "Skills")),
             icon: Codicon.lightbulb,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -34,7 +34,7 @@ class ManageSkillsAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(7120, "Select the skill to open"));
+        const placeholder = ( localize(7628, "Select the skill to open"));
         const result = await pickers.selectPromptFile({
             placeholder,
             type: PromptsType.skill,

package/vscode/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.js

@@ -119,25 +119,25 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
                 }
                 const parts = [];
                 if (collectionEvent.applyingInstructionsCount > 0) {
-                    parts.push(( localize(7121, "{0} applying", collectionEvent.applyingInstructionsCount)));
+                    parts.push(( localize(7629, "{0} applying", collectionEvent.applyingInstructionsCount)));
                 }
                 if (collectionEvent.referencedInstructionsCount > 0) {
-                    parts.push(( localize(7122, "{0} referenced", collectionEvent.referencedInstructionsCount)));
+                    parts.push(( localize(7630, "{0} referenced", collectionEvent.referencedInstructionsCount)));
                 }
                 if (collectionEvent.agentInstructionsCount > 0) {
-                    parts.push(( localize(7123, "{0} agent", collectionEvent.agentInstructionsCount)));
+                    parts.push(( localize(7631, "{0} agent", collectionEvent.agentInstructionsCount)));
                 }
                 if (collectionEvent.listedInstructionsCount > 0) {
-                    parts.push(( localize(7124, "{0} listed", collectionEvent.listedInstructionsCount)));
+                    parts.push(( localize(7632, "{0} listed", collectionEvent.listedInstructionsCount)));
                 }
                 const durationStr = debugInfo.durationInMillis.toFixed(1);
                 const summary = parts.length > 0 ? ( localize(
-                    7125,
+                    7633,
                     "Resolved {0} customizations ({1}) in {2}ms",
                     collectionEvent.totalInstructionsCount,
                     parts.join(", "),
                     durationStr
-                )) : ( localize(7126, "No customizations resolved"));
+                )) : ( localize(7634, "No customizations resolved"));
                 const detailSummaries = ( debugInfo.debugDetails.map(e => {
                     const detail = e.reason ? `${e.name} — ${e.reason}` : e.name;
                     return `[${e.category}] ${detail}`;
@@ -154,7 +154,7 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
                         this._customizationEventDetails.delete(first);
                     }
                 }
-                chatDebugService.log(sessionResource, ( localize(7127, "Resolve Customizations")), details, undefined, {
+                chatDebugService.log(sessionResource, ( localize(7635, "Resolve Customizations")), details, undefined, {
                     id: customizationEventId,
                     category: "customization"
                 });
@@ -174,9 +174,9 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
         switch (discoveryInfo.type) {
         case PromptsType.prompt:
             return {
-                name: ( localize(7128, "Slash Commands Discovery")),
-                details: loadedCount === 1 ? ( localize(7129, "Resolved {0} slash command in {1}ms", loadedCount, durationInMillis)) : ( localize(
-                    7130,
+                name: ( localize(7636, "Slash Commands Discovery")),
+                details: loadedCount === 1 ? ( localize(7637, "Resolved {0} slash command in {1}ms", loadedCount, durationInMillis)) : ( localize(
+                    7638,
                     "Resolved {0} slash commands in {1}ms",
                     loadedCount,
                     durationInMillis
@@ -184,33 +184,33 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
             };
         case PromptsType.agent:
             return {
-                name: ( localize(7131, "Agent Discovery")),
-                details: loadedCount === 1 ? ( localize(7132, "Resolved {0} agent in {1}ms", loadedCount, durationInMillis)) : ( localize(7133, "Resolved {0} agents in {1}ms", loadedCount, durationInMillis))
+                name: ( localize(7639, "Agent Discovery")),
+                details: loadedCount === 1 ? ( localize(7640, "Resolved {0} agent in {1}ms", loadedCount, durationInMillis)) : ( localize(7641, "Resolved {0} agents in {1}ms", loadedCount, durationInMillis))
             };
         case PromptsType.skill:
             return {
-                name: ( localize(7134, "Skill Discovery")),
-                details: loadedCount === 1 ? ( localize(7135, "Resolved {0} skill in {1}ms", loadedCount, durationInMillis)) : ( localize(7136, "Resolved {0} skills in {1}ms", loadedCount, durationInMillis))
+                name: ( localize(7642, "Skill Discovery")),
+                details: loadedCount === 1 ? ( localize(7643, "Resolved {0} skill in {1}ms", loadedCount, durationInMillis)) : ( localize(7644, "Resolved {0} skills in {1}ms", loadedCount, durationInMillis))
             };
         case PromptsType.instructions:
             return {
-                name: ( localize(7137, "Instructions Discovery")),
-                details: loadedCount === 1 ? ( localize(7138, "Resolved {0} instruction in {1}ms", loadedCount, durationInMillis)) : ( localize(7139, "Resolved {0} instructions in {1}ms", loadedCount, durationInMillis))
+                name: ( localize(7645, "Instructions Discovery")),
+                details: loadedCount === 1 ? ( localize(7646, "Resolved {0} instruction in {1}ms", loadedCount, durationInMillis)) : ( localize(7647, "Resolved {0} instructions in {1}ms", loadedCount, durationInMillis))
             };
         case PromptsType.hook:
             {
                 const hookDiscoveryInfo = discoveryInfo;
                 const hookCount = hookDiscoveryInfo.hooksInfo ? ( Object.values(hookDiscoveryInfo.hooksInfo.hooks)).reduce((total, hooks) => total + hooks.length, 0) : loadedCount;
                 const details = skippedCount > 0 ? ( localize(
-                    7140,
+                    7648,
                     "Resolved {0} hooks from {1} files in {2}ms, skipped {3}",
                     hookCount,
                     loadedCount,
                     durationInMillis,
                     skippedCount
-                )) : hookCount === 1 ? ( localize(7141, "Resolved {0} hook in {1}ms", hookCount, durationInMillis)) : ( localize(7142, "Resolved {0} hooks in {1}ms", hookCount, durationInMillis));
+                )) : hookCount === 1 ? ( localize(7649, "Resolved {0} hook in {1}ms", hookCount, durationInMillis)) : ( localize(7650, "Resolved {0} hooks in {1}ms", hookCount, durationInMillis));
                 return {
-                    name: ( localize(7143, "Hook Discovery")),
+                    name: ( localize(7651, "Hook Discovery")),
                     details
                 };
             }
@@ -238,7 +238,7 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
                 const commands = hooks[hookType];
                 if (commands && commands.length > 0) {
                     for (const cmd of commands) {
-                        const commandLabel = formatHookCommandLabel(cmd, OS) || ( localize(7144, "(unknown command)"));
+                        const commandLabel = formatHookCommandLabel(cmd, OS) || ( localize(7652, "(unknown command)"));
                         logs.push({
                             category: "hook",
                             name: commandLabel,

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

@@ -0,0 +1,17 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+/**
+ * Contributes the built-in "client" tool sets surfaced as rows in the Chat Customizations → Tools section.
+ */
+export declare class ClientToolSetsContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.chat.clientToolSets";
+    constructor(toolsService: ILanguageModelToolsService, workspaceService: IAICustomizationWorkspaceService);
+    /**
+     * Creates a tool set and keeps its membership in sync with the tools registered under the
+     * reference names in {@link IDynamicToolSetSpec.members}. Returns a disposable that removes the
+     * tool set and all of its member registrations.
+     */
+    private _registerDynamicToolSet;
+}

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

@@ -0,0 +1,117 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { browserChatToolReferenceNames } from '../../../../../platform/browserView/common/browserChatToolReferenceNames.js';
+import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+
+let ClientToolSetsContribution = class ClientToolSetsContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.chat.clientToolSets";
+    }
+    constructor(toolsService, workspaceService) {
+        super();
+        if (!workspaceService.isSessionsWindow) {
+            this._register(this._registerDynamicToolSet(toolsService, {
+                id: "vscode-tasks",
+                referenceName: "vscodeTasks",
+                icon: Codicon.tasklist,
+                description: ( localize(7656, "Tasks and Problems")),
+                detail: ( localize(7657, "Create and run tasks and inspect workspace problems.")),
+                members: ["createAndRunTask", "runTask", "getTaskOutput", "problems"]
+            }));
+        }
+        this._register(this._registerDynamicToolSet(toolsService, {
+            id: "vscode-browser",
+            referenceName: "vscodeBrowser",
+            icon: Codicon.browser,
+            description: ( localize(7658, "Integrated Browser")),
+            detail: ( localize(7659, "Open, navigate, and inspect pages in the built-in browser.")),
+            members: browserChatToolReferenceNames
+        }));
+        this._register(this._registerDynamicToolSet(toolsService, {
+            id: "vscode-general",
+            referenceName: "vscodeGeneral",
+            icon: Codicon.vscode,
+            description: ( localize(7660, "VS Code")),
+            detail: ( localize(
+                7661,
+                "Navigate code, manage extensions, and run built-in VS Code commands."
+            )),
+            members: [
+                "runTests",
+                "testFailure",
+                "rename",
+                "usages",
+                "extensions",
+                "installExtension",
+                "newWorkspace",
+                "runCommand",
+                "toolSearch",
+                "vscodeAPI"
+            ]
+        }));
+        if (!workspaceService.isSessionsWindow) {
+            this._register(this._registerDynamicToolSet(toolsService, {
+                id: "vscode-notebooks",
+                referenceName: "vscodeNotebooks",
+                icon: Codicon.notebook,
+                description: ( localize(7662, "Jupyter Notebooks")),
+                detail: ( localize(7663, "Create and edit Jupyter notebooks and run their cells.")),
+                members: [
+                    "createJupyterNotebook",
+                    "editNotebook",
+                    "runNotebookCell",
+                    "getNotebookSummary",
+                    "readNotebookCellOutput"
+                ]
+            }));
+        }
+    }
+    _registerDynamicToolSet(toolsService, spec) {
+        const store = ( new DisposableStore());
+        const toolSet = store.add(
+            toolsService.createToolSet(ToolDataSource.Internal, spec.id, spec.referenceName, {
+                icon: spec.icon,
+                description: spec.description,
+                detail: spec.detail,
+                hiddenInToolsPicker: true
+            })
+        );
+        const members = ( new Map());
+        const reconcile = () => {
+            for (const name of spec.members) {
+                const tool = toolsService.getToolByName(name) ?? toolsService.getTool(name);
+                const existing = members.get(name);
+                if (tool === existing?.tool) {
+                    continue;
+                }
+                existing?.disposable.dispose();
+                members.delete(name);
+                if (tool) {
+                    members.set(name, {
+                        tool,
+                        disposable: toolSet.addTool(tool)
+                    });
+                }
+            }
+        };
+        store.add(toolsService.onDidChangeTools(() => reconcile()));
+        store.add(toDisposable(() => {
+            for (const {
+                disposable
+            } of ( members.values())) {
+                disposable.dispose();
+            }
+            members.clear();
+        }));
+        reconcile();
+        return store;
+    }
+};
+ClientToolSetsContribution = ( __decorate([( __param(0, ILanguageModelToolsService)), ( __param(1, IAICustomizationWorkspaceService))], ClientToolSetsContribution));
+
+export { ClientToolSetsContribution };

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

@@ -15,8 +15,8 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
-const RUN_WITHOUT_APPROVAL = ( localize(7148, "without approval"));
-const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(7149, "without reviewing result"));
+const RUN_WITHOUT_APPROVAL = ( localize(7664, "without approval"));
+const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(7665, "without reviewing result"));
 class GenericConfirmStore extends Disposable {
     constructor(_storageKey, _instantiationService) {
         super();
@@ -275,9 +275,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 arguments: combinationArgs
             } = ref.combination;
             actions.push({
-                label: ( localize(7150, "{0} in this Session", combinationLabel)),
+                label: ( localize(7666, "{0} in this Session", combinationLabel)),
                 detail: ( localize(
-                    7151,
+                    7667,
                     "Allow this particular combination of tool and arguments in this session without confirmation."
                 )),
                 divider: !!actions.length,
@@ -287,9 +287,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(7152, "{0} in this Workspace", combinationLabel)),
+                label: ( localize(7668, "{0} in this Workspace", combinationLabel)),
                 detail: ( localize(
-                    7153,
+                    7669,
                     "Allow this particular combination of tool and arguments in this workspace without confirmation."
                 )),
                 scope: "workspace",
@@ -298,9 +298,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(7154, "Always {0}", combinationLabel)),
+                label: ( localize(7670, "Always {0}", combinationLabel)),
                 detail: ( localize(
-                    7155,
+                    7671,
                     "Always allow this particular combination of tool and arguments without confirmation."
                 )),
                 scope: "profile",
@@ -311,8 +311,8 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             });
         }
         actions.push({
-            label: ( localize(7156, "Allow in this Session")),
-            detail: ( localize(7157, "Allow this tool to run in this session without confirmation.")),
+            label: ( localize(7672, "Allow in this Session")),
+            detail: ( localize(7673, "Allow this tool to run in this session without confirmation.")),
             divider: !!actions.length,
             scope: "session",
             select: async () => {
@@ -320,16 +320,16 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(7158, "Allow in this Workspace")),
-            detail: ( localize(7159, "Allow this tool to run in this workspace without confirmation.")),
+            label: ( localize(7674, "Allow in this Workspace")),
+            detail: ( localize(7675, "Allow this tool to run in this workspace without confirmation.")),
             scope: "workspace",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "workspace");
                 return true;
             }
         }, {
-            label: ( localize(7160, "Always Allow")),
-            detail: ( localize(7161, "Always allow this tool to run without confirmation.")),
+            label: ( localize(7676, "Always Allow")),
+            detail: ( localize(7677, "Always allow this tool to run without confirmation.")),
             scope: "profile",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "profile");
@@ -342,9 +342,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(7162, "Allow Tools from {0} in this Session", serverLabel)),
+                label: ( localize(7678, "Allow Tools from {0} in this Session", serverLabel)),
                 detail: ( localize(
-                    7163,
+                    7679,
                     "Allow all tools from this server to run in this session without confirmation."
                 )),
                 divider: true,
@@ -354,9 +354,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(7164, "Allow Tools from {0} in this Workspace", serverLabel)),
+                label: ( localize(7680, "Allow Tools from {0} in this Workspace", serverLabel)),
                 detail: ( localize(
-                    7165,
+                    7681,
                     "Allow all tools from this server to run in this workspace without confirmation."
                 )),
                 scope: "workspace",
@@ -365,9 +365,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(7166, "Always Allow Tools from {0}", serverLabel)),
+                label: ( localize(7682, "Always Allow Tools from {0}", serverLabel)),
                 detail: ( localize(
-                    7167,
+                    7683,
                     "Always allow all tools from this server to run without confirmation."
                 )),
                 scope: "profile",
@@ -389,9 +389,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(7168, "Allow Without Review in this Session")),
+            label: ( localize(7684, "Allow Without Review in this Session")),
             detail: ( localize(
-                7169,
+                7685,
                 "Allow results from this tool to be sent without confirmation in this session."
             )),
             divider: !!actions.length,
@@ -401,9 +401,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(7170, "Allow Without Review in this Workspace")),
+            label: ( localize(7686, "Allow Without Review in this Workspace")),
             detail: ( localize(
-                7171,
+                7687,
                 "Allow results from this tool to be sent without confirmation in this workspace."
             )),
             scope: "workspace",
@@ -412,9 +412,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(7172, "Always Allow Without Review")),
+            label: ( localize(7688, "Always Allow Without Review")),
             detail: ( localize(
-                7173,
+                7689,
                 "Always allow results from this tool to be sent without confirmation."
             )),
             scope: "profile",
@@ -429,9 +429,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(7174, "Allow Tools from {0} Without Review in this Session", serverLabel)),
+                label: ( localize(7690, "Allow Tools from {0} Without Review in this Session", serverLabel)),
                 detail: ( localize(
-                    7175,
+                    7691,
                     "Allow results from all tools from this server to be sent without confirmation in this session."
                 )),
                 divider: true,
@@ -441,9 +441,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(7176, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
+                label: ( localize(7692, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
                 detail: ( localize(
-                    7177,
+                    7693,
                     "Allow results from all tools from this server to be sent without confirmation in this workspace."
                 )),
                 scope: "workspace",
@@ -452,9 +452,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(7178, "Always Allow Tools from {0} Without Review", serverLabel)),
+                label: ( localize(7694, "Always Allow Tools from {0} Without Review", serverLabel)),
                 detail: ( localize(
-                    7179,
+                    7695,
                     "Always allow results from all tools from this server to be sent without confirmation."
                 )),
                 scope: "profile",
@@ -505,7 +505,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
     manageConfirmationPreferences(tools, options) {
         const viewArgsButton = {
             iconClass: ThemeIcon.asClassName(Codicon.info),
-            tooltip: ( localize(7180, "View Arguments"))
+            tooltip: ( localize(7696, "View Arguments"))
         };
         const trackServerTool = (serverId, label, toolId, serversWithTools) => {
             if (!( serversWithTools.has(serverId))) {
@@ -652,7 +652,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-post",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(7181, "Continue without reviewing any tool results")),
+                        label: ( localize(7697, "Continue without reviewing any tool results")),
                         checked: serverPostConfirmed
                     });
                 }
@@ -661,7 +661,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-pre",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(7182, "Run any tool without approval")),
+                        label: ( localize(7698, "Run any tool without approval")),
                         checked: serverPreConfirmed
                     });
                 }
@@ -779,7 +779,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (currentScope !== "session") {
             const scopeButton = {
                 iconClass: ThemeIcon.asClassName(Codicon.folder),
-                tooltip: ( localize(7183, "Configure for this workspace only")),
+                tooltip: ( localize(7699, "Configure for this workspace only")),
                 toggle: {
                     checked: currentScope === "workspace"
                 },
@@ -796,9 +796,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         }
         const updatePlaceholder = () => {
             if (currentScope === "session") {
-                quickTree.placeholder = ( localize(7184, "Configure session tool approvals"));
+                quickTree.placeholder = ( localize(7700, "Configure session tool approvals"));
             } else {
-                quickTree.placeholder = currentScope === "workspace" ? ( localize(7185, "Configure workspace tool approvals")) : ( localize(7186, "Configure global tool approvals"));
+                quickTree.placeholder = currentScope === "workspace" ? ( localize(7701, "Configure workspace tool approvals")) : ( localize(7702, "Configure global tool approvals"));
             }
         };
         updatePlaceholder();
@@ -849,7 +849,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 i.item.onDidTriggerItemButton?.(i.button);
             } else if (i.item.type === "combination" && i.button === viewArgsButton && i.item.combinationArgs) {
                 this._dialogService.prompt({
-                    message: ( localize(7187, "Arguments")),
+                    message: ( localize(7703, "Arguments")),
                     buttons: [],
                     custom: {
                         markdownDetails: [{

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

@@ -21,10 +21,11 @@ import { IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { ILanguageModelChatMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service";
-import { CountTokensCallback, IBeginToolCallOptions, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolInvokedEvent, IToolResult, IToolSet, ToolDataSource, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { CountTokensCallback, IBeginToolCallOptions, IToolData, IToolImpl, IToolInvocation, IToolInvokedEvent, IToolResult, IToolSet, ToolAndToolSetEnablementMap, ToolDataSource, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IToolResultCompressor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatToolRiskAssessmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.service";
 export declare enum AutoApproveStorageKeys {
     GlobalAutoApproveOptIn = "chat.tools.global.autoApprove.optIn"
 }
@@ -45,6 +46,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private readonly _commandService;
     private readonly _chatWidgetService;
     private readonly _toolResultCompressor;
+    private readonly _riskAssessmentService;
     _serviceBrand: undefined;
     readonly vscodeToolSet: ToolSet;
     readonly executeToolSet: ToolSet;
@@ -70,7 +72,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     /** Deduplicates _checkGlobalAutoApprove calls within this window */
     private _pendingGlobalAutoApproveCheck;
     private readonly _isAgentModeEnabled;
-    constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService, _accessibilitySignalService: IAccessibilitySignalService, _storageService: IStorageService, _confirmationService: ILanguageModelToolsConfirmationService, _commandService: ICommandService, _chatWidgetService: IChatWidgetService, _toolResultCompressor: IToolResultCompressor);
+    constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService, _accessibilitySignalService: IAccessibilitySignalService, _storageService: IStorageService, _confirmationService: ILanguageModelToolsConfirmationService, _commandService: ICommandService, _chatWidgetService: IChatWidgetService, _toolResultCompressor: IToolResultCompressor, _riskAssessmentService: IChatToolRiskAssessmentService);
     private isToolEnabledForModel;
     /**
      * Returns if the given tool or toolset is permitted in the current context.
@@ -109,6 +111,26 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
      * since when the hook returns 'ask' and preparedInvocation was undefined, we create one.
      */
     private resolveAutoConfirmFromHook;
+    /**
+     * In Autopilot, runs the risk classifier on an auto-approved call and skips it when the rating
+     * is {@link ToolRiskLevel.Red}. Any other result returns the original auto-confirmation
+     * unchanged.
+     *
+     * To keep the classifier off the hot path, it only runs when all of these hold:
+     * - the call was auto-approved by the session approving everything, or is a `run_in_terminal` /
+     *   fetch call that self-approved (these can run risky commands or prompt-injected URLs without
+     *   ever showing a confirmation);
+     * - it would otherwise show a confirmation (the self-approving tools above are the exception);
+     * - the session is a local panel session at the Autopilot level with Advanced Autopilot on.
+     *
+     * This is independent of `chat.tools.riskAssessment.enabled`, which only controls the
+     * confirmation risk badge. CLI and agent-host sessions handle their own confirmations and are
+     * excluded.
+     *
+     * Fails open: a cancelled, unavailable, or failed assessment keeps the original
+     * auto-confirmation so Autopilot keeps moving.
+     */
+    private _maybeApplyAutopilotRiskGate;
     private prepareToolInvocation;
     beginToolCall(options: IBeginToolCallOptions): IChatToolInvocation | undefined;
     private _callHandleToolStream;
@@ -140,6 +162,16 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
      * via either the last request's stamped level or the live picker level.
      */
     private _isSessionInAutoApproveLevel;
+    /**
+     * True if the session's live permission picker level is Autopilot. Like
+     * {@link _isSessionLiveAutoApproveLevel}, but excludes plain Auto-Approve.
+     */
+    private _isSessionLiveAutopilotLevel;
+    /**
+     * True if the session is at the Autopilot level (not plain Auto-Approve), via either the last
+     * request's stamped level or the live picker level.
+     */
+    private _isSessionInAutopilotLevel;
     private getEligibleForAutoApprovalSpecialCase;
     private isToolEligibleForAutoApproval;
     private shouldAutoConfirm;
@@ -157,8 +189,8 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
      * @param fullReferenceNames A list of tool or toolset by their full reference names that are enabled.
      * @returns A map of tool or toolset instances to their enablement state.
      */
-    toToolAndToolSetEnablementMap(fullReferenceNames: readonly string[], model: ILanguageModelChatMetadata | undefined): IToolAndToolSetEnablementMap;
-    toFullReferenceNames(map: IToolAndToolSetEnablementMap): string[];
+    toToolAndToolSetEnablementMap(fullReferenceNames: readonly string[], model: ILanguageModelChatMetadata | undefined): ToolAndToolSetEnablementMap;
+    toFullReferenceNames(map: ToolAndToolSetEnablementMap): string[];
     toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[];
     private readonly _toolSets;
     readonly toolSets: IObservable<Iterable<ToolSet>>;
@@ -169,7 +201,10 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: {
         icon?: ThemeIcon;
         description?: string;
+        detail?: string;
         legacyFullNames?: string[];
+        deprecated?: boolean;
+        hiddenInToolsPicker?: boolean;
     }): ToolSet & IDisposable;
     private readonly allToolsIncludingDisableObs;
     private readonly toolsWithFullReferenceName;
@@ -177,4 +212,5 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     getDeprecatedFullReferenceNames(): Map<string, Set<string>>;
     getToolByFullReferenceName(fullReferenceName: string): IToolData | ToolSet | undefined;
     getFullReferenceName(tool: IToolData | IToolSet, toolSet?: IToolSet): string;
+    getFullReferenceNameMap(): Map<IToolData | IToolSet, string>;
 }