@codingame/monaco-vscode-chat-service-override 26.2.2 → 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,7 +1,8 @@
 
 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 { 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';
 
@@ -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(5717, "(empty command)"));
+                    const commandLabel = formatHookCommandLabel(command, os) || ( localize(6298, "(empty command)"));
                     parsedHooks.push({
                         hookType,
                         hookTypeLabel: hookTypeMeta.label,
@@ -129,13 +157,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(5717, "(empty command)"));
+                        const commandLabel = formatHookCommandLabel(command, os) || ( localize(6298, "(empty command)"));
                         parsedHooks.push({
                             hookType,
                             hookTypeLabel: hookTypeMeta.label,
@@ -156,7 +184,42 @@ async function parseAllHookFiles(
             }
         }
     }
+    {
+        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(5792, "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(5793, "{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(
@@ -61,23 +61,23 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
             return undefined;
         }
         let value = toolsAttr.value;
-        if (value.type === "string") {
+        if (value.type === "scalar") {
             value = parseCommaSeparatedList(value);
         }
-        if (value.type !== "array") {
+        if (value.type !== "sequence") {
             return undefined;
         }
         const items = value.items;
-        const selectedTools = ( items.filter(item => item.type === "string").map(item => item.value));
+        const selectedTools = ( items.filter(item => item.type === "scalar").map(item => item.value));
         const codeLens = {
             range: toolsAttr.range.collapseToStart(),
             command: {
-                title: ( localize(5794, "Configure Tools...")),
+                title: ( localize(6382, "Configure Tools...")),
                 id: this.cmdId,
                 arguments: [
                     model,
-                    toolsAttr.range,
-                    toolsAttr.value.type === "string",
+                    toolsAttr.value.range,
+                    toolsAttr.value.type === "scalar",
                     selectedTools,
                     target
                 ]
@@ -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(5795, "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(5796, "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(5797, "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(
-            5798,
+            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(
-                5799,
+                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(
-                5800,
+                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(
-                5801,
+                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(5802, "&&Yes")),
-            cancelButton: ( localize(5803, "No")),
+            primaryButton: ( localize(6390, "&&Yes")),
+            cancelButton: ( localize(6391, "No")),
             message,
             custom: {
                 markdownDetails: [{

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

@@ -1,3 +1,7 @@
+/**
+ * Action ID for the `Configure Prompt Files...` action.
+ */
+export declare const CONFIGURE_PROMPTS_ACTION_ID = "workbench.action.chat.configure.prompts";
 /**
  * Helper to register all the `Run Current Prompt` actions.
  */

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(5804, "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(5805, "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(
-            5806,
+            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(5807, "Configure Prompt Files...")),
-            shortTitle: ( localize2(5808, "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(5809, "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(5810, "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() {
@@ -205,4 +205,4 @@ function registerRunPromptActions() {
     registerAction2(ManagePromptFilesAction);
 }
 
-export { registerRunPromptActions };
+export { CONFIGURE_PROMPTS_ACTION_ID, registerRunPromptActions };

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(5811, "Save As Prompt File")), ( localize2(5812, "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(5813, "Save As Agent File")), ( localize2(5814, "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(5815, "Save As Instructions File")), ( localize2(5816, "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.d.ts

@@ -1,3 +1,7 @@
+/**
+ * Action ID for the `Configure Skills` action.
+ */
+export declare const CONFIGURE_SKILLS_ACTION_ID = "workbench.action.chat.configure.skills";
 /**
  * Helper to register the `Manage Skills` action.
  */

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(5817, "Configure Skills...")),
-            shortTitle: ( localize2(5818, "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(5819, "Select the skill to open"));
+        const placeholder = ( localize(6407, "Select the skill to open"));
         const result = await pickers.selectPromptFile({
             placeholder,
             type: PromptsType.skill,
@@ -49,4 +49,4 @@ function registerSkillActions() {
     registerAction2(ManageSkillsAction);
 }
 
-export { registerSkillActions };
+export { CONFIGURE_SKILLS_ACTION_ID, registerSkillActions };

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

@@ -0,0 +1,22 @@
+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 { IChatDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
+/**
+ * Bridges {@link IPromptsService} discovery log events to {@link IChatDebugService}.
+ *
+ * This contribution listens for discovery events emitted by the prompts service
+ * and forwards them as debug log entries. It also registers a resolve provider
+ * so expanding a discovery event in the debug panel shows the full file list.
+ */
+export declare class PromptsDebugContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.promptsDebug";
+    private static readonly MAX_DISCOVERY_DETAILS;
+    /**
+     * Maps debug event IDs to their discovery info, so that
+     * {@link IChatDebugService.resolveEvent} can return rich details.
+     */
+    private readonly _discoveryEventDetails;
+    constructor(promptsService: IPromptsService, chatDebugService: IChatDebugService);
+    private _resolveDiscoveryEvent;
+}

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

@@ -0,0 +1,76 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
+
+var PromptsDebugContribution_1;
+let PromptsDebugContribution = class PromptsDebugContribution extends Disposable {
+    static {
+        PromptsDebugContribution_1 = this;
+    }
+    static {
+        this.ID = "workbench.contrib.promptsDebug";
+    }
+    static {
+        this.MAX_DISCOVERY_DETAILS = 10_000;
+    }
+    constructor(promptsService, chatDebugService) {
+        super();
+        this._discoveryEventDetails = ( new Map());
+        this._register(promptsService.onDidLogDiscovery(entry => {
+            let eventId;
+            if (entry.discoveryInfo) {
+                eventId = generateUuid();
+                this._discoveryEventDetails.set(eventId, entry.discoveryInfo);
+                if (this._discoveryEventDetails.size > PromptsDebugContribution_1.MAX_DISCOVERY_DETAILS) {
+                    const first = ( this._discoveryEventDetails.keys()).next().value;
+                    if (first !== undefined) {
+                        this._discoveryEventDetails.delete(first);
+                    }
+                }
+            }
+            chatDebugService.log(entry.sessionResource, entry.name, entry.details, undefined, {
+                id: eventId,
+                category: entry.category
+            });
+        }));
+        this._register(chatDebugService.registerProvider({
+            provideChatDebugLog: async () => undefined,
+            resolveChatDebugLogEvent: async eventId => {
+                return this._resolveDiscoveryEvent(eventId);
+            }
+        }));
+    }
+    _resolveDiscoveryEvent(eventId) {
+        const info = this._discoveryEventDetails.get(eventId);
+        if (!info) {
+            return undefined;
+        }
+        return {
+            kind: "fileList",
+            discoveryType: info.type,
+            files: ( info.files.map(f => ({
+                uri: f.uri,
+                name: f.name,
+                status: f.status,
+                storage: f.storage,
+                extensionId: f.extensionId,
+                skipReason: f.skipReason,
+                errorMessage: f.errorMessage,
+                duplicateOf: f.duplicateOf
+            }))),
+            sourceFolders: info.sourceFolders?.map(sf => ({
+                uri: sf.uri,
+                storage: sf.storage,
+                exists: sf.exists,
+                fileCount: sf.fileCount,
+                errorMessage: sf.errorMessage
+            }))
+        };
+    }
+};
+PromptsDebugContribution = PromptsDebugContribution_1 = ( __decorate([( __param(0, IPromptsService)), ( __param(1, IChatDebugService))], PromptsDebugContribution));
+
+export { PromptsDebugContribution };

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

@@ -0,0 +1,5 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
+export declare function editingEntriesContainResource(entries: readonly IModifiedFileEntry[], resourceUri: URI): boolean;
+export declare function agentSessionContainsResource(session: IAgentSession, resourceUri: URI): boolean;

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

@@ -0,0 +1,30 @@
+
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+
+function editingEntriesContainResource(entries, resourceUri) {
+    for (const entry of entries) {
+        if (isEqual(entry.modifiedURI, resourceUri) || isEqual(entry.originalURI, resourceUri)) {
+            return true;
+        }
+    }
+    return false;
+}
+function agentSessionContainsResource(session, resourceUri) {
+    if (!(session.changes instanceof Array)) {
+        return false;
+    }
+    for (const change of session.changes) {
+        if (isIChatSessionFileChange2(change)) {
+            if (isEqual(change.uri, resourceUri) || (change.originalUri && isEqual(change.originalUri, resourceUri)) || (change.modifiedUri && isEqual(change.modifiedUri, resourceUri))) {
+                return true;
+            }
+        }
+        else if (isEqual(change.modifiedUri, resourceUri) || (change.originalUri && isEqual(change.originalUri, resourceUri))) {
+            return true;
+        }
+    }
+    return false;
+}
+
+export { agentSessionContainsResource, editingEntriesContainResource };

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;
 }