@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/hookUtils.d.ts

@@ -3,7 +3,8 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { HookType, IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { HookType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
 /**
@@ -21,6 +22,18 @@ import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/com
  * @returns The selection range for the field value, or undefined if not found
  */
 export declare function findHookCommandSelection(content: string, hookType: string, index: number, fieldName: string): ITextEditorSelection | undefined;
+/**
+ * Finds the selection range for a hook command string in a YAML/Markdown file
+ * (e.g., an agent `.md` file with YAML frontmatter).
+ *
+ * Searches for the command text within command field lines and selects the value.
+ * Supports all hook command field keys: command, windows, linux, osx, bash, powershell.
+ *
+ * @param content The full file content
+ * @param commandText The command string to locate
+ * @returns The selection range, or undefined if not found
+ */
+export declare function findHookCommandInYaml(content: string, commandText: string): ITextEditorSelection | undefined;
 /**
  * Parsed hook information.
  */
@@ -36,10 +49,14 @@ export interface IParsedHook {
     originalHookTypeId: string;
     /** If true, this hook is disabled via `disableAllHooks: true` in its file */
     disabled?: boolean;
+    /** If set, this hook came from a custom agent's frontmatter */
+    agentName?: string;
 }
 export interface IParseAllHookFilesOptions {
     /** Additional file URIs to parse (e.g., files skipped due to disableAllHooks) */
     additionalDisabledFileUris?: readonly URI[];
+    /** If true, also collect hooks from custom agent frontmatter */
+    includeAgentHooks?: boolean;
 }
 /**
  * Parses all hook files and extracts individual hooks.

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

@@ -1,8 +1,9 @@
 
 import { findNodeAtLocation, parseTree, parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { HOOK_TYPES, formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { parseHooksFromFile } from '../../common/promptSyntax/hookCompatibility.js';
+import { formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { HOOK_METADATA, HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
+import { parseHooksFromFile, parseHooksIgnoringDisableAll } from '../../common/promptSyntax/hookCompatibility.js';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 function offsetToPosition(content, offset) {
@@ -69,6 +70,33 @@ function findHookCommandSelection(content, hookType, index, fieldName) {
         endColumn: end.column
     };
 }
+function findHookCommandInYaml(content, commandText) {
+    const commandFieldKeys = ["command", "windows", "linux", "osx", "bash", "powershell"];
+    const lines = content.split("\n");
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const trimmed = line.trimStart();
+        const matchedKey = commandFieldKeys.find(key => trimmed.startsWith(`${key}:`) || trimmed.startsWith(`- ${key}:`));
+        if (!matchedKey) {
+            continue;
+        }
+        const colonIdx = line.indexOf(":");
+        const idx = line.indexOf(commandText, colonIdx + 1);
+        if (idx !== -1) {
+            const afterIdx = idx + commandText.length;
+            const charAfter = afterIdx < line.length ? line.charCodeAt(afterIdx) : -1;
+            if (charAfter === -1 || charAfter === 34  || charAfter === 39  || charAfter === 32  || charAfter === 9 ) {
+                return {
+                    startLineNumber: i + 1,
+                    startColumn: idx + 1,
+                    endLineNumber: i + 1,
+                    endColumn: idx + 1 + commandText.length
+                };
+            }
+        }
+    }
+    return undefined;
+}
 async function parseAllHookFiles(
     promptsService,
     fileService,
@@ -92,13 +120,13 @@ async function parseAllHookFiles(
                 hooks: commands,
                 originalId
             }] of hooks) {
-                const hookTypeMeta = HOOK_TYPES.find(h => h.id === hookType);
+                const hookTypeMeta = HOOK_METADATA[hookType];
                 if (!hookTypeMeta) {
                     continue;
                 }
                 for (let i = 0; i < commands.length; i++) {
                     const command = commands[i];
-                    const commandLabel = formatHookCommandLabel(command, os) || ( localize(6205, "(empty command)"));
+                    const commandLabel = formatHookCommandLabel(command, os) || ( localize(6298, "(empty command)"));
                     parsedHooks.push({
                         hookType,
                         hookTypeLabel: hookTypeMeta.label,
@@ -117,7 +145,81 @@ async function parseAllHookFiles(
             console.error("Failed to read or parse hook file", ( hookFile.uri.toString()), error);
         }
     }
+    if (options?.additionalDisabledFileUris) {
+        for (const uri of options.additionalDisabledFileUris) {
+            try {
+                const content = await fileService.readFile(uri);
+                const json = parse(( content.value.toString()));
+                const {
+                    hooks
+                } = parseHooksIgnoringDisableAll(uri, json, workspaceRootUri, userHome);
+                for (const [hookType, {
+                    hooks: commands,
+                    originalId
+                }] of hooks) {
+                    const hookTypeMeta = HOOK_METADATA[hookType];
+                    if (!hookTypeMeta) {
+                        continue;
+                    }
+                    for (let i = 0; i < commands.length; i++) {
+                        const command = commands[i];
+                        const commandLabel = formatHookCommandLabel(command, os) || ( localize(6298, "(empty command)"));
+                        parsedHooks.push({
+                            hookType,
+                            hookTypeLabel: hookTypeMeta.label,
+                            command,
+                            commandLabel,
+                            fileUri: uri,
+                            filePath: labelService.getUriLabel(uri, {
+                                relative: true
+                            }),
+                            index: i,
+                            originalHookTypeId: originalId,
+                            disabled: true
+                        });
+                    }
+                }
+            } catch (error) {
+                console.error("Failed to read or parse disabled hook file", ( uri.toString()), error);
+            }
+        }
+    }
+    {
+        const agents = await promptsService.getCustomAgents(token);
+        for (const agent of agents) {
+            if (!agent.hooks) {
+                continue;
+            }
+            for (const hookTypeValue of ( Object.values(HookType))) {
+                const commands = agent.hooks[hookTypeValue];
+                if (!commands || commands.length === 0) {
+                    continue;
+                }
+                const hookTypeMeta = HOOK_METADATA[hookTypeValue];
+                if (!hookTypeMeta) {
+                    continue;
+                }
+                for (let i = 0; i < commands.length; i++) {
+                    const command = commands[i];
+                    const commandLabel = formatHookCommandLabel(command, os) || ( localize(6298, "(empty command)"));
+                    parsedHooks.push({
+                        hookType: hookTypeValue,
+                        hookTypeLabel: hookTypeMeta.label,
+                        command,
+                        commandLabel,
+                        fileUri: agent.uri,
+                        filePath: labelService.getUriLabel(agent.uri, {
+                            relative: true
+                        }),
+                        index: i,
+                        originalHookTypeId: hookTypeValue,
+                        agentName: agent.name
+                    });
+                }
+            }
+        }
+    }
     return parsedHooks;
 }
 
-export { findHookCommandSelection, parseAllHookFiles };
+export { findHookCommandInYaml, findHookCommandSelection, parseAllHookFiles };

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

@@ -38,11 +38,11 @@ let PromptCodingAgentActionOverlayWidget = class PromptCodingAgentActionOverlayW
         this._domNode = $(".prompt-coding-agent-action-overlay");
         this._button = this._register(( new Button(this._domNode, {
             supportIcons: true,
-            title: ( localize(6285, "Run prompt file in a remote coding agent"))
+            title: ( localize(6380, "Run prompt file in a remote coding agent"))
         })));
         this._button.element.style.background = "var(--vscode-button-background)";
         this._button.element.style.color = "var(--vscode-button-foreground)";
-        this._button.label = ( localize(6286, "{0} Delegate to Copilot coding agent", "$(cloud-upload)"));
+        this._button.label = ( localize(6381, "{0} Delegate to Copilot coding agent", "$(cloud-upload)"));
         this._register(this._button.onDidClick(async () => {
             await this._execute();
         }));

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

@@ -14,9 +14,9 @@ import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { registerEditorFeature } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorFeatures';
 import { PromptFileRewriter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { isTarget, PromptHeaderAttributes, parseCommaSeparatedList } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
-import { getTarget, isVSCodeOrDefaultTarget } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator';
+import { PromptHeaderAttributes, parseCommaSeparatedList } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { isBoolean } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { isTarget, getTarget, isVSCodeOrDefaultTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptFileAttributes';
 
 let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disposable {
     constructor(
@@ -72,7 +72,7 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
         const codeLens = {
             range: toolsAttr.range.collapseToStart(),
             command: {
-                title: ( localize(6287, "Configure Tools...")),
+                title: ( localize(6382, "Configure Tools...")),
                 id: this.cmdId,
                 arguments: [
                     model,
@@ -89,7 +89,7 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
     }
     async updateTools(model, range, isString, selectedTools, target) {
         const selectedToolsNow = () => this.languageModelToolsService.toToolAndToolSetEnablementMap(selectedTools, undefined);
-        const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, ( localize(6288, "Select tools")), "codeLens", undefined, selectedToolsNow);
+        const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, ( localize(6383, "Select tools")), "codeLens", undefined, selectedToolsNow);
         if (!newSelectedAfter) {
             return;
         }

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

@@ -85,7 +85,7 @@ let PromptUrlHandler = class PromptUrlHandler extends Disposable {
             }, CancellationToken.None);
             if (result.res.statusCode !== 200) {
                 this.logService.error(`[PromptUrlHandler] Failed to fetch URL: ${urlString}`);
-                this.notificationService.error(( localize(6289, "Failed to fetch URL: {0}", urlString)));
+                this.notificationService.error(( localize(6384, "Failed to fetch URL: {0}", urlString)));
                 return true;
             }
             const responseData = ( (await streamToBuffer(result.stream)).toString());
@@ -115,28 +115,28 @@ let PromptUrlHandler = class PromptUrlHandler extends Disposable {
         const detail = ( new MarkdownString("", {
             supportHtml: true
         }));
-        detail.appendMarkdown(( localize(6290, "This will access {0}.\n\n", `[${uriLabel}](${( url.toString())})`)));
+        detail.appendMarkdown(( localize(6385, "This will access {0}.\n\n", `[${uriLabel}](${( url.toString())})`)));
         detail.appendMarkdown(( localize(
-            6291,
+            6386,
             "If you did not initiate this request, it may represent an attempted attack on your system. Unless you took an explicit action to initiate this request, you should press 'No'"
         )));
         let message;
         switch (promptType) {
         case PromptsType.prompt:
             message = ( localize(
-                6292,
+                6387,
                 "An external application wants to create a prompt file with content from a URL. Do you want to continue by selecting a destination folder and name?"
             ));
             break;
         case PromptsType.instructions:
             message = ( localize(
-                6293,
+                6388,
                 "An external application wants to create an instructions file with content from a URL. Do you want to continue by selecting a destination folder and name?"
             ));
             break;
         default:
             message = ( localize(
-                6294,
+                6389,
                 "An external application wants to create a custom agent with content from a URL. Do you want to continue by selecting a destination folder and name?"
             ));
             break;
@@ -145,8 +145,8 @@ let PromptUrlHandler = class PromptUrlHandler extends Disposable {
             confirmed
         } = await this.dialogService.confirm({
             type: "warning",
-            primaryButton: ( localize(6295, "&&Yes")),
-            cancelButton: ( localize(6296, "No")),
+            primaryButton: ( localize(6390, "&&Yes")),
+            cancelButton: ( localize(6391, "No")),
             message,
             custom: {
                 markdownDetails: [{

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

@@ -70,7 +70,7 @@ class RunPromptBaseAction extends Action2 {
         return widget;
     }
 }
-const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(6297, "Run Prompt in Current Chat"));
+const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(6392, "Run Prompt in Current Chat"));
 const RUN_CURRENT_PROMPT_ACTION_ICON = Codicon.playCircle;
 class RunCurrentPromptAction extends RunPromptBaseAction {
     constructor() {
@@ -89,7 +89,7 @@ class RunSelectedPromptAction extends Action2 {
     constructor() {
         super({
             id: RUN_SELECTED_PROMPT_ACTION_ID,
-            title: ( localize2(6298, "Run Prompt...")),
+            title: ( localize2(6393, "Run Prompt...")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -108,7 +108,7 @@ class RunSelectedPromptAction extends Action2 {
         const widgetService = accessor.get(IChatWidgetService);
         const pickers = instaService.createInstance(PromptFilePickers);
         const placeholder = ( localize(
-            6299,
+            6394,
             "Select the prompt file to run (hold {0}-key to use in new chat)",
             UILabelProvider.modifierLabels[OS].ctrlKey
         ));
@@ -140,8 +140,8 @@ class ManagePromptFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_PROMPTS_ACTION_ID,
-            title: ( localize2(6300, "Configure Prompt Files...")),
-            shortTitle: ( localize2(6301, "Prompt Files")),
+            title: ( localize2(6395, "Configure Prompt Files...")),
+            shortTitle: ( localize2(6396, "Prompt Files")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -158,7 +158,7 @@ class ManagePromptFilesAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(6302, "Select the prompt file to open"));
+        const placeholder = ( localize(6397, "Select the prompt file to open"));
         const result = await pickers.selectPromptFile({
             placeholder,
             type: PromptsType.prompt,
@@ -178,7 +178,7 @@ function getActivePromptFileUri(accessor) {
     return undefined;
 }
 const RUN_CURRENT_PROMPT_IN_NEW_CHAT_ACTION_ID = "workbench.action.chat.run-in-new-chat.prompt.current";
-const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(6303, "Run Prompt In New Chat"));
+const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(6398, "Run Prompt In New Chat"));
 const RUN_IN_NEW_CHAT_ACTION_ICON = Codicon.play;
 class RunCurrentPromptInNewChatAction extends RunPromptBaseAction {
     constructor() {

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

@@ -78,19 +78,19 @@ function createOptions(id, title, description, languageId) {
 const SAVE_AS_PROMPT_FILE_ACTION_ID = "workbench.action.chat.save-as-prompt";
 class SaveAsPromptFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(6304, "Save As Prompt File")), ( localize2(6305, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
+        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(6399, "Save As Prompt File")), ( localize2(6400, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
     }
 }
 const SAVE_AS_AGENT_FILE_ACTION_ID = "workbench.action.chat.save-as-agent";
 class SaveAsAgentFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(6306, "Save As Agent File")), ( localize2(6307, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
+        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(6401, "Save As Agent File")), ( localize2(6402, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
     }
 }
 const SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID = "workbench.action.chat.save-as-instructions";
 class SaveAsInstructionsFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(6308, "Save As Instructions File")), ( localize2(6309, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
+        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(6403, "Save As Instructions File")), ( localize2(6404, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
     }
 }
 

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(6310, "Configure Skills...")),
-            shortTitle: ( localize2(6311, "Skills")),
+            title: ( localize2(6405, "Configure Skills...")),
+            shortTitle: ( localize2(6406, "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(6312, "Select the skill to open"));
+        const placeholder = ( localize(6407, "Select the skill to open"));
         const result = await pickers.selectPromptFile({
             placeholder,
             type: PromptsType.skill,

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

@@ -20,8 +20,10 @@ export declare class LanguageModelToolsConfirmationService extends Disposable im
     getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];
     getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];
     registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable;
+    toolCanManageConfirmation(tool: IToolData): boolean;
     manageConfirmationPreferences(tools: readonly IToolData[], options?: {
         defaultScope?: "workspace" | "profile" | "session";
+        focusToolId?: string;
     }): void;
     resetToolAutoConfirmation(): void;
 }

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

@@ -13,8 +13,8 @@ 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(6313, "without approval"));
-const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(6314, "without reviewing result"));
+const RUN_WITHOUT_APPROVAL = ( localize(6408, "without approval"));
+const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(6409, "without reviewing result"));
 class GenericConfirmStore extends Disposable {
     constructor(_storageKey, _instantiationService) {
         super();
@@ -213,8 +213,8 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(6315, "Allow in this Session")),
-            detail: ( localize(6316, "Allow this tool to run in this session without confirmation.")),
+            label: ( localize(6410, "Allow in this Session")),
+            detail: ( localize(6411, "Allow this tool to run in this session without confirmation.")),
             divider: !!actions.length,
             scope: "session",
             select: async () => {
@@ -222,16 +222,16 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6317, "Allow in this Workspace")),
-            detail: ( localize(6318, "Allow this tool to run in this workspace without confirmation.")),
+            label: ( localize(6412, "Allow in this Workspace")),
+            detail: ( localize(6413, "Allow this tool to run in this workspace without confirmation.")),
             scope: "workspace",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "workspace");
                 return true;
             }
         }, {
-            label: ( localize(6319, "Always Allow")),
-            detail: ( localize(6320, "Always allow this tool to run without confirmation.")),
+            label: ( localize(6414, "Always Allow")),
+            detail: ( localize(6415, "Always allow this tool to run without confirmation.")),
             scope: "profile",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "profile");
@@ -244,9 +244,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(6321, "Allow Tools from {0} in this Session", serverLabel)),
+                label: ( localize(6416, "Allow Tools from {0} in this Session", serverLabel)),
                 detail: ( localize(
-                    6322,
+                    6417,
                     "Allow all tools from this server to run in this session without confirmation."
                 )),
                 divider: true,
@@ -256,9 +256,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6323, "Allow Tools from {0} in this Workspace", serverLabel)),
+                label: ( localize(6418, "Allow Tools from {0} in this Workspace", serverLabel)),
                 detail: ( localize(
-                    6324,
+                    6419,
                     "Allow all tools from this server to run in this workspace without confirmation."
                 )),
                 scope: "workspace",
@@ -267,9 +267,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6325, "Always Allow Tools from {0}", serverLabel)),
+                label: ( localize(6420, "Always Allow Tools from {0}", serverLabel)),
                 detail: ( localize(
-                    6326,
+                    6421,
                     "Always allow all tools from this server to run without confirmation."
                 )),
                 scope: "profile",
@@ -291,9 +291,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(6327, "Allow Without Review in this Session")),
+            label: ( localize(6422, "Allow Without Review in this Session")),
             detail: ( localize(
-                6328,
+                6423,
                 "Allow results from this tool to be sent without confirmation in this session."
             )),
             divider: !!actions.length,
@@ -303,9 +303,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6329, "Allow Without Review in this Workspace")),
+            label: ( localize(6424, "Allow Without Review in this Workspace")),
             detail: ( localize(
-                6330,
+                6425,
                 "Allow results from this tool to be sent without confirmation in this workspace."
             )),
             scope: "workspace",
@@ -314,9 +314,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6331, "Always Allow Without Review")),
+            label: ( localize(6426, "Always Allow Without Review")),
             detail: ( localize(
-                6332,
+                6427,
                 "Always allow results from this tool to be sent without confirmation."
             )),
             scope: "profile",
@@ -331,9 +331,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(6333, "Allow Tools from {0} Without Review in this Session", serverLabel)),
+                label: ( localize(6428, "Allow Tools from {0} Without Review in this Session", serverLabel)),
                 detail: ( localize(
-                    6334,
+                    6429,
                     "Allow results from all tools from this server to be sent without confirmation in this session."
                 )),
                 divider: true,
@@ -343,9 +343,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6335, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
+                label: ( localize(6430, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
                 detail: ( localize(
-                    6336,
+                    6431,
                     "Allow results from all tools from this server to be sent without confirmation in this workspace."
                 )),
                 scope: "workspace",
@@ -354,9 +354,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6337, "Always Allow Tools from {0} Without Review", serverLabel)),
+                label: ( localize(6432, "Always Allow Tools from {0} Without Review", serverLabel)),
                 detail: ( localize(
-                    6338,
+                    6433,
                     "Always allow results from all tools from this server to be sent without confirmation."
                 )),
                 scope: "profile",
@@ -376,6 +376,9 @@ 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);
+    }
     manageConfirmationPreferences(tools, options) {
         const trackServerTool = (serverId, label, toolId, serversWithTools) => {
             if (!( serversWithTools.has(serverId))) {
@@ -495,7 +498,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-post",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(6339, "Continue without reviewing any tool results")),
+                        label: ( localize(6434, "Continue without reviewing any tool results")),
                         checked: serverPostConfirmed
                     });
                 }
@@ -504,7 +507,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-pre",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(6340, "Run any tool without approval")),
+                        label: ( localize(6435, "Run any tool without approval")),
                         checked: serverPreConfirmed
                     });
                 }
@@ -590,7 +593,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     description,
                     checked,
                     pickable,
-                    collapsed: true,
+                    collapsed: tools.length > 1,
                     children: toolChildren.length > 0 ? toolChildren : undefined
                 });
             }
@@ -603,7 +606,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (currentScope !== "session") {
             const scopeButton = {
                 iconClass: ThemeIcon.asClassName(Codicon.folder),
-                tooltip: ( localize(6341, "Configure for this workspace only")),
+                tooltip: ( localize(6436, "Configure for this workspace only")),
                 toggle: {
                     checked: currentScope === "workspace"
                 },
@@ -620,9 +623,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         }
         const updatePlaceholder = () => {
             if (currentScope === "session") {
-                quickTree.placeholder = ( localize(6342, "Configure session tool approvals"));
+                quickTree.placeholder = ( localize(6437, "Configure session tool approvals"));
             } else {
-                quickTree.placeholder = currentScope === "workspace" ? ( localize(6343, "Configure workspace tool approvals")) : ( localize(6344, "Configure global tool approvals"));
+                quickTree.placeholder = currentScope === "workspace" ? ( localize(6438, "Configure workspace tool approvals")) : ( localize(6439, "Configure global tool approvals"));
             }
         };
         updatePlaceholder();
@@ -662,18 +665,32 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 i.item.onDidTriggerItemButton?.(i.button);
             }
         }));
-        disposables.add(quickTree.onDidAccept(() => {
-            for (const item of quickTree.activeItems) {
-                if (item.type === "manage") {
-                    item.onDidOpen?.();
-                    quickTree.hide();
-                }
+        disposables.add(quickTree.onDidAccept(async () => {
+            const manageItem = quickTree.activeItems.find(i => i.type === "manage");
+            if (manageItem) {
+                quickTree.hide();
+                await manageItem.onDidOpen?.();
+                this.manageConfirmationPreferences(tools, options);
             }
         }));
         disposables.add(quickTree.onDidHide(() => {
             disposables.dispose();
         }));
         quickTree.show();
+        if (options?.focusToolId) {
+            const focusToolId = options.focusToolId;
+            for (const serverItem of quickTree.itemTree) {
+                const serverItemTyped = serverItem;
+                if (serverItemTyped.children) {
+                    const toolItem = serverItemTyped.children.find(c => c.type === "tool" && c.toolId === focusToolId);
+                    if (toolItem) {
+                        quickTree.expand(serverItem);
+                        quickTree.reveal(toolItem);
+                        break;
+                    }
+                }
+            }
+        }
     }
     resetToolAutoConfirmation() {
         this._preExecutionToolConfirmStore.reset();