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

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileContributions.js

@@ -5,7 +5,7 @@ import { PromptBodyAutocompletion } from './languageProviders/promptBodyAutocomp
 import { PromptHeaderAutocompletion } from './languageProviders/promptHeaderAutocompletion.js';
 import { PromptHoverProvider } from './languageProviders/promptHovers.js';
 import { PromptHeaderDefinitionProvider } from './languageProviders/PromptHeaderDefinitionProvider.js';
-import { PromptValidatorContribution } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator';
+import { PromptValidatorContribution } from './languageProviders/promptValidator.js';
 import { PromptDocumentSemanticTokensProvider } from './languageProviders/promptDocumentSemanticTokensProvider.js';
 import { PromptCodeActionProvider } from './languageProviders/promptCodeActions.js';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.d.ts

@@ -23,6 +23,7 @@ import { ParsedPromptFile } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IChatPromptSlashCommand, IConfiguredHooksInfo, ICustomAgent, IPromptPath, IAgentSkill, PromptsStorage, IPromptFileContext, IPromptFileResource, IPromptDiscoveryInfo, IResolvedAgentFile, Logger, IPromptDiscoveryLogEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
@@ -68,6 +69,7 @@ export declare class PromptsService extends Disposable implements IPromptsServic
     private readonly pathService;
     private readonly contextKeyService;
     private readonly agentPluginService;
+    private readonly workspaceTrustService;
     readonly _serviceBrand: undefined;
     /**
      * Prompt files locator utility.
@@ -120,10 +122,11 @@ export declare class PromptsService extends Disposable implements IPromptsServic
     private readonly _contributedWhenKeys;
     private readonly _contributedWhenClauses;
     private readonly _onDidContributedWhenChange;
+    private readonly _onDidChangeInstructions;
     private readonly _onDidPluginPromptFilesChange;
     private readonly _onDidPluginHooksChange;
     private _pluginPromptFilesByType;
-    constructor(logger: ILogService, labelService: ILabelService, modelService: IModelService, instantiationService: IInstantiationService, userDataService: IUserDataProfileService, configurationService: IConfigurationService, fileService: IFileService, filesConfigService: IFilesConfigurationService, storageService: IStorageService, extensionService: IExtensionService, telemetryService: ITelemetryService, workspaceService: IWorkspaceContextService, pathService: IPathService, contextKeyService: IContextKeyService, agentPluginService: IAgentPluginService);
+    constructor(logger: ILogService, labelService: ILabelService, modelService: IModelService, instantiationService: IInstantiationService, userDataService: IUserDataProfileService, configurationService: IConfigurationService, fileService: IFileService, filesConfigService: IFilesConfigurationService, storageService: IStorageService, extensionService: IExtensionService, telemetryService: ITelemetryService, workspaceService: IWorkspaceContextService, pathService: IPathService, contextKeyService: IContextKeyService, agentPluginService: IAgentPluginService, workspaceTrustService: IWorkspaceTrustManagementService);
     private watchPluginPromptFilesForType;
     protected createPromptFilesLocator(): PromptFilesLocator;
     private getFileLocatorEvent;
@@ -174,6 +177,7 @@ export declare class PromptsService extends Disposable implements IPromptsServic
      * Emitter for custom agents change events.
      */
     get onDidChangeCustomAgents(): Event<void>;
+    get onDidChangeInstructions(): Event<void>;
     getCustomAgents(token: CancellationToken, sessionResource?: URI): Promise<readonly ICustomAgent[]>;
     private computeCustomAgents;
     parseNew(uri: URI, token: CancellationToken): Promise<ParsedPromptFile>;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js

@@ -26,17 +26,18 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
 import { getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_CONFIG_FOLDER, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, PromptFileSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { PromptsType, PROMPT_LANGUAGE_ID, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptsType, PROMPT_LANGUAGE_ID, Target, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
-import { PromptsStorage, ExtensionAgentSourceType, SKILL_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, Target, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { PromptsStorage, ExtensionAgentSourceType, SKILL_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { parseSubagentHooksFromYaml } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import { parseHooksFromFile, HookSourceFormat, getHookSourceFormat } from '../hookCompatibility.js';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { getTarget, mapClaudeModels, mapClaudeTools } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator';
+import { getTarget, mapClaudeModels, mapClaudeTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptFileAttributes';
 import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -83,7 +84,8 @@ let PromptsService = class PromptsService extends Disposable {
         workspaceService,
         pathService,
         contextKeyService,
-        agentPluginService
+        agentPluginService,
+        workspaceTrustService
     ) {
         super();
         this.logger = logger;
@@ -101,6 +103,7 @@ let PromptsService = class PromptsService extends Disposable {
         this.pathService = pathService;
         this.contextKeyService = contextKeyService;
         this.agentPluginService = agentPluginService;
+        this.workspaceTrustService = workspaceTrustService;
         this.cachedParsedPromptFromModels = ( new ResourceMap());
         this._onDidLogDiscovery = this._register(( new Emitter()));
         this.onDidLogDiscovery = this._onDidLogDiscovery.event;
@@ -116,6 +119,7 @@ let PromptsService = class PromptsService extends Disposable {
         this._contributedWhenKeys = ( new Set());
         this._contributedWhenClauses = ( new Map());
         this._onDidContributedWhenChange = this._register(( new Emitter()));
+        this._onDidChangeInstructions = this._register(( new Emitter()));
         this._onDidPluginPromptFilesChange = this._register(( new Emitter()));
         this._onDidPluginHooksChange = this._register(( new Emitter()));
         this._pluginPromptFilesByType = ( new Map());
@@ -137,7 +141,11 @@ let PromptsService = class PromptsService extends Disposable {
         this.cachedCustomAgents = this._register(( new CachedPromise(token => this.computeCustomAgents(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.agent),
             Event.filter(modelChangeEvent, e => e.promptType === PromptsType.agent),
-            this._onDidContributedWhenChange.event
+            this._onDidContributedWhenChange.event,
+            Event.filter(
+                this.configurationService.onDidChangeConfiguration,
+                e => e.affectsConfiguration(PromptsConfig.USE_CUSTOM_AGENT_HOOKS)
+            )
         ))));
         this.cachedSlashCommands = this._register(( new CachedPromise(token => this.computePromptSlashCommands(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.prompt),
@@ -158,7 +166,7 @@ let PromptsService = class PromptsService extends Disposable {
             () => Event.any(this.getFileLocatorEvent(PromptsType.hook), Event.filter(
                 this.configurationService.onDidChangeConfiguration,
                 e => e.affectsConfiguration(PromptsConfig.USE_CHAT_HOOKS) || e.affectsConfiguration(PromptsConfig.USE_CLAUDE_HOOKS)
-            ), this._onDidPluginHooksChange.event)
+            ), this._onDidPluginHooksChange.event, this.workspaceTrustService.onDidChangeTrust)
         )));
         this._register(this.cachedSkills.onDidChange(() => {}));
         this._register(this.cachedHooks.onDidChange(() => {}));
@@ -314,6 +322,7 @@ let PromptsService = class PromptsService extends Disposable {
             this.cachedCustomAgents.refresh();
         } else if (type === PromptsType.instructions) {
             this.cachedFileLocations[PromptsType.instructions] = undefined;
+            this._onDidChangeInstructions.fire();
         } else if (type === PromptsType.prompt) {
             this.cachedFileLocations[PromptsType.prompt] = undefined;
             this.cachedSlashCommands.refresh();
@@ -526,16 +535,23 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeCustomAgents() {
         return this.cachedCustomAgents.onDidChange;
     }
+    get onDidChangeInstructions() {
+        return Event.any(
+            this.getFileLocatorEvent(PromptsType.instructions),
+            this._onDidContributedWhenChange.event,
+            this._onDidChangeInstructions.event
+        );
+    }
     async getCustomAgents(token, sessionResource) {
         const sw = StopWatch.create();
         const result = await this.cachedCustomAgents.get(token);
         if (sessionResource) {
             const elapsed = sw.elapsed();
             const discoveryInfo = await this.getAgentDiscoveryInfo(token);
-            const details = result.length === 1 ? ( localize(7150, "Resolved {0} agent in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7151, "Resolved {0} agents in {1}ms", result.length, elapsed.toFixed(1)));
+            const details = result.length === 1 ? ( localize(7327, "Resolved {0} agent in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7328, "Resolved {0} agents in {1}ms", result.length, elapsed.toFixed(1)));
             this._onDidLogDiscovery.fire({
                 sessionResource,
-                name: ( localize(7152, "Load Agents")),
+                name: ( localize(7329, "Load Agents")),
                 details,
                 discoveryInfo,
                 category: "discovery"
@@ -547,6 +563,9 @@ let PromptsService = class PromptsService extends Disposable {
         let agentFiles = await this.listPromptFiles(PromptsType.agent, token);
         const disabledAgents = this.getDisabledPromptFiles(PromptsType.agent);
         agentFiles = agentFiles.filter(promptPath => !( disabledAgents.has(promptPath.uri)));
+        const userHomeUri = await this.pathService.userHome();
+        const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
+        const defaultFolder = this.workspaceService.getWorkspace().folders[0];
         const customAgentsResults = await Promise.allSettled(( agentFiles.map(async promptPath => {
             const uri = promptPath.uri;
             const ast = await this.parseNew(uri, token);
@@ -601,7 +620,7 @@ let PromptsService = class PromptsService extends Disposable {
             }
             const visibility = {
                 userInvocable: ast.header.userInvocable !== false,
-                agentInvocable: ast.header.infer === true || ast.header.disableModelInvocation !== true
+                agentInvocable: ast.header.infer !== undefined ? ast.header.infer === true : ast.header.disableModelInvocation !== true
             };
             let model = ast.header.model;
             if (target === Target.Claude && model) {
@@ -617,6 +636,14 @@ let PromptsService = class PromptsService extends Disposable {
             if (target === Target.Claude && tools) {
                 tools = mapClaudeTools(tools);
             }
+            let hooks;
+            const useCustomAgentHooks = this.configurationService.getValue(PromptsConfig.USE_CUSTOM_AGENT_HOOKS);
+            const hooksRaw = ast.header.hooksRaw;
+            if (useCustomAgentHooks && hooksRaw) {
+                const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(uri) ?? defaultFolder;
+                const workspaceRootUri = hookWorkspaceFolder?.uri;
+                hooks = parseSubagentHooksFromYaml(hooksRaw, workspaceRootUri, userHome, target);
+            }
             return {
                 uri,
                 name,
@@ -628,6 +655,7 @@ let PromptsService = class PromptsService extends Disposable {
                 target,
                 visibility,
                 agents,
+                hooks,
                 agentInstructions,
                 source
             };
@@ -748,17 +776,17 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(7153, "User Data");
+            return localize(7330, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    7154,
+                    7331,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
         case PromptsStorage.plugin:
-            return localize(7155, "Plugin");
+            return localize(7332, "Plugin");
         default:
             assertNever(promptPath, "Unknown prompt storage type");
         }
@@ -971,10 +999,10 @@ let PromptsService = class PromptsService extends Disposable {
         if (sessionResource) {
             const elapsed = sw.elapsed();
             const discoveryInfo = await this.getSkillDiscoveryInfo(token);
-            const details = result.length === 1 ? ( localize(7156, "Resolved {0} skill in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7157, "Resolved {0} skills in {1}ms", result.length, elapsed.toFixed(1)));
+            const details = result.length === 1 ? ( localize(7333, "Resolved {0} skill in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7334, "Resolved {0} skills in {1}ms", result.length, elapsed.toFixed(1)));
             this._onDidLogDiscovery.fire({
                 sessionResource,
-                name: ( localize(7158, "Load Skills")),
+                name: ( localize(7335, "Load Skills")),
                 details,
                 discoveryInfo,
                 category: "discovery"
@@ -1055,10 +1083,10 @@ let PromptsService = class PromptsService extends Disposable {
             const elapsed = sw.elapsed();
             const hookCount = result ? ( Object.values(result.hooks)).reduce((sum, arr) => sum + arr.length, 0) : 0;
             const discoveryInfo = await this.getHookDiscoveryInfo(token);
-            const details = hookCount === 1 ? ( localize(7159, "Resolved {0} hook in {1}ms", hookCount, elapsed.toFixed(1))) : ( localize(7160, "Resolved {0} hooks in {1}ms", hookCount, elapsed.toFixed(1)));
+            const details = hookCount === 1 ? ( localize(7336, "Resolved {0} hook in {1}ms", hookCount, elapsed.toFixed(1))) : ( localize(7337, "Resolved {0} hooks in {1}ms", hookCount, elapsed.toFixed(1)));
             this._onDidLogDiscovery.fire({
                 sessionResource,
-                name: ( localize(7161, "Load Hooks")),
+                name: ( localize(7338, "Load Hooks")),
                 details,
                 discoveryInfo,
                 category: "discovery"
@@ -1073,19 +1101,19 @@ let PromptsService = class PromptsService extends Disposable {
             const elapsed = sw.elapsed();
             const discoveryInfo = await this.getInstructionsDiscoveryInfo(token);
             const details = result.length === 1 ? ( localize(
-                7162,
+                7339,
                 "Resolved {0} instruction in {1}ms",
                 result.length,
                 elapsed.toFixed(1)
             )) : ( localize(
-                7163,
+                7340,
                 "Resolved {0} instructions in {1}ms",
                 result.length,
                 elapsed.toFixed(1)
             ));
             this._onDidLogDiscovery.fire({
                 sessionResource,
-                name: ( localize(7164, "Load Instructions")),
+                name: ( localize(7341, "Load Instructions")),
                 details,
                 discoveryInfo,
                 category: "discovery"
@@ -1098,22 +1126,16 @@ let PromptsService = class PromptsService extends Disposable {
         if (!useChatHooks) {
             return undefined;
         }
+        if (!this.workspaceTrustService.isWorkspaceTrusted()) {
+            return undefined;
+        }
         const useClaudeHooks = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_HOOKS);
         const hookFiles = await this.listPromptFiles(PromptsType.hook, token);
         this.logger.trace(`[PromptsService] Found ${hookFiles.length} hook file(s).`);
         const userHomeUri = await this.pathService.userHome();
         const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
         let hasDisabledClaudeHooks = false;
-        const collectedHooks = {
-            [HookType.SessionStart]: [],
-            [HookType.UserPromptSubmit]: [],
-            [HookType.PreToolUse]: [],
-            [HookType.PostToolUse]: [],
-            [HookType.PreCompact]: [],
-            [HookType.SubagentStart]: [],
-            [HookType.SubagentStop]: [],
-            [HookType.Stop]: []
-        };
+        const collectedHooks = ( new Map());
         const defaultFolder = this.workspaceService.getWorkspace().folders[0];
         for (const hookFile of hookFiles) {
             try {
@@ -1150,7 +1172,12 @@ let PromptsService = class PromptsService extends Disposable {
                     hooks: commands
                 }] of hooks) {
                     for (const command of commands) {
-                        collectedHooks[hookType].push(command);
+                        let bucket = collectedHooks.get(hookType);
+                        if (!bucket) {
+                            bucket = [];
+                            collectedHooks.set(hookType, bucket);
+                        }
+                        bucket.push(command);
                         this.logger.trace(
                             `[PromptsService] Collected ${hookType} hook from ${hookFile.uri} (format: ${format})`
                         );
@@ -1163,17 +1190,19 @@ let PromptsService = class PromptsService extends Disposable {
         const plugins = this.agentPluginService.plugins.get();
         for (const plugin of plugins) {
             for (const hook of plugin.hooks.get()) {
-                collectedHooks[hook.type].push(...hook.hooks);
+                let bucket = collectedHooks.get(hook.type);
+                if (!bucket) {
+                    bucket = [];
+                    collectedHooks.set(hook.type, bucket);
+                }
+                bucket.push(...hook.hooks);
             }
         }
-        const hasHooks = ( ( Object.values(collectedHooks)).some(arr => arr.length > 0));
-        if (!hasHooks) {
+        if (collectedHooks.size === 0) {
             this.logger.trace("[PromptsService] No valid hooks collected.");
             return undefined;
         }
-        const result = Object.fromEntries(
-            Object.entries(collectedHooks).filter(([_, commands]) => commands.length > 0)
-        );
+        const result = Object.fromEntries(collectedHooks);
         this.logger.trace(`[PromptsService] Collected hooks: ${JSON.stringify(( Object.keys(result)))}`);
         return {
             hooks: result,
@@ -1184,7 +1213,7 @@ let PromptsService = class PromptsService extends Disposable {
         if (sessionResource) {
             this._onDidLogDiscovery.fire({
                 sessionResource,
-                name: ( localize(7165, "Discovery {0} (Start)", type)),
+                name: ( localize(7342, "Discovery {0} (Start)", type)),
                 category: "discovery"
             });
         }
@@ -1216,10 +1245,10 @@ let PromptsService = class PromptsService extends Disposable {
             };
         }
         if (sessionResource) {
-            const details = ( localize(7166, "{0} loaded, {1} skipped", loadedCount, skippedCount));
+            const details = ( localize(7343, "{0} loaded, {1} skipped", loadedCount, skippedCount));
             this._onDidLogDiscovery.fire({
                 sessionResource,
-                name: ( localize(7167, "Discovery {0} (End)", type)),
+                name: ( localize(7344, "Discovery {0} (End)", type)),
                 details,
                 discoveryInfo: result,
                 category: "discovery"
@@ -1533,6 +1562,17 @@ let PromptsService = class PromptsService extends Disposable {
             const storage = promptPath.storage;
             const extensionId = promptPath.extension?.identifier?.value;
             const name = basename(uri);
+            if (!this.workspaceTrustService.isWorkspaceTrusted()) {
+                files.push({
+                    uri: promptPath.uri,
+                    storage: promptPath.storage,
+                    status: "skipped",
+                    skipReason: "workspace-untrusted",
+                    name: basename(promptPath.uri),
+                    extensionId: promptPath.extension?.identifier?.value
+                });
+                continue;
+            }
             if (getHookSourceFormat(uri) === HookSourceFormat.Claude && useClaudeHooks === false) {
                 files.push({
                     uri,
@@ -1602,7 +1642,7 @@ let PromptsService = class PromptsService extends Disposable {
         };
     }
 };
-PromptsService = ( __decorate([( __param(0, ILogService)), ( __param(1, ILabelService)), ( __param(2, IModelService)), ( __param(3, IInstantiationService)), ( __param(4, IUserDataProfileService)), ( __param(5, IConfigurationService)), ( __param(6, IFileService)), ( __param(7, IFilesConfigurationService)), ( __param(8, IStorageService)), ( __param(9, IExtensionService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkspaceContextService)), ( __param(12, IPathService)), ( __param(13, IContextKeyService)), ( __param(14, IAgentPluginService))], PromptsService));
+PromptsService = ( __decorate([( __param(0, ILogService)), ( __param(1, ILabelService)), ( __param(2, IModelService)), ( __param(3, IInstantiationService)), ( __param(4, IUserDataProfileService)), ( __param(5, IConfigurationService)), ( __param(6, IFileService)), ( __param(7, IFilesConfigurationService)), ( __param(8, IStorageService)), ( __param(9, IExtensionService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkspaceContextService)), ( __param(12, IPathService)), ( __param(13, IContextKeyService)), ( __param(14, IAgentPluginService)), ( __param(15, IWorkspaceTrustManagementService))], PromptsService));
 class CachedPromise extends Disposable {
     constructor(computeFn, getEvent, delay = 0) {
         super();

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.d.ts

@@ -113,7 +113,9 @@ export declare class PromptFilesLocator {
     private toAbsoluteLocations;
     /**
      * Uses the file service to resolve the provided location and return either the file at the location of files in the directory.
-     * For claude rules folders (.claude/rules), this searches recursively to support subdirectories.
+     * For instruction folders, this searches recursively (up to {@link MAX_INSTRUCTIONS_RECURSION_DEPTH} levels deep) provided
+     * the location is not a workspace folder root and does not contain wildcards, to support subdirectories while avoiding
+     * accidentally broad traversal.
      */
     private resolveFilesAtLocation;
     /**

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.js

@@ -7,10 +7,10 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { FileOperationError, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { PromptsConfig, isTildePath, getPromptFileLocationsConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { dirname, joinPath, basename, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { dirname, joinPath, basename, isEqual, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { getPromptFileType, PromptFileSource, getPromptFileDefaultLocations, getPromptFileExtension, isInClaudeRulesFolder, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { getPromptFileType, PromptFileSource, getPromptFileDefaultLocations, getPromptFileExtension, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -24,6 +24,7 @@ import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 
+const MAX_INSTRUCTIONS_RECURSION_DEPTH = 5;
 let PromptFilesLocator = class PromptFilesLocator {
     constructor(
         fileService,
@@ -90,7 +91,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                 uri: userDataPromptsHome,
                 source: PromptFileSource.CopilotPersonal,
                 storage: PromptsStorage.user,
-                displayPath: ( localize(7168, "User Data")),
+                displayPath: ( localize(7345, "User Data")),
                 isDefault: true
             }];
         }
@@ -373,11 +374,12 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return result;
     }
-    async resolveFilesAtLocation(location, type, token) {
+    async resolveFilesAtLocation(location, type, token, depth = 0) {
         if (type === PromptsType.skill) {
             return this.findAgentSkillsInFolder(location, token);
         }
-        const recursive = type === PromptsType.instructions && isInClaudeRulesFolder(joinPath(location, "dummy.md"));
+        const isWorkspaceRoot = depth === 0 && ( this.getWorkspaceFolders().some(f => isEqual(f.uri, location)));
+        const recursive = type === PromptsType.instructions && !isWorkspaceRoot && !hasGlobPattern(location.path) && depth < MAX_INSTRUCTIONS_RECURSION_DEPTH;
         try {
             const info = await this.fileService.resolve(location);
             if (token.isCancellationRequested) {
@@ -391,7 +393,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                     if (child.isFile) {
                         result.push(child.resource);
                     } else if (recursive && child.isDirectory) {
-                        const subFiles = await this.resolveFilesAtLocation(child.resource, type, token);
+                        const subFiles = await this.resolveFilesAtLocation(child.resource, type, token, depth + 1);
                         result.push(...subFiles);
                     }
                 }

package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js

@@ -20,7 +20,7 @@ var PhraseTextType;
 })(PhraseTextType || (PhraseTextType = {}));
 const VoiceChatInProgress = ( new RawContextKey("voiceChatInProgress", false, {
     type: "boolean",
-    description: ( localize(7221, "A speech-to-text session is in progress for chat."))
+    description: ( localize(7406, "A speech-to-text session is in progress for chat."))
 }));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static {

package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.d.ts

@@ -6,14 +6,22 @@ import { FileSystemProviderCapabilities, FileType, IFileSystemProviderWithFileAt
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
-export declare class ChatResponseResourceFileSystemProvider extends Disposable implements IWorkbenchContribution, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability {
+import { IChatResponseResourceFileSystemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.service";
+export declare class ChatResponseResourceFileSystemProvider extends Disposable implements IChatResponseResourceFileSystemProvider, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability {
     private readonly chatService;
     private readonly _fileService;
-    static readonly ID = "workbench.contrib.chatResponseResourceFileSystemProvider";
+    readonly _serviceBrand: undefined;
     readonly onDidChangeCapabilities: Event<any>;
     readonly onDidChangeFile: Event<any>;
     readonly capabilities: FileSystemProviderCapabilities;
+    /** In-memory store for data associated via {@link associate}, keyed by URI. */
+    private readonly _associated;
+    /** Tracks which associated URIs belong to which session, for cleanup on dispose. */
+    private readonly _sessionAssociations;
     constructor(chatService: IChatService, _fileService: IFileService);
+    associate(sessionResource: URI, data: Uint8Array | {
+        base64: string;
+    }, name?: string): URI;
     readFile(resource: URI): Promise<Uint8Array>;
     readFileStream(resource: URI): ReadableStreamEvents<Uint8Array>;
     stat(resource: URI): Promise<IStat>;
@@ -29,3 +37,7 @@ export declare class ChatResponseResourceFileSystemProvider extends Disposable i
     private findMatchingInvocation;
     private lookupURI;
 }
+export declare class ChatResponseResourceWorkbenchContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "chatResponseResourceWorkbenchContribution";
+    constructor(chatResponseResourceFsProvider: IChatResponseResourceFileSystemProvider, fileService: IFileService);
+}

package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.js

@@ -3,18 +3,19 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { VSBuffer, decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { FileSystemProviderCapabilities, FileType, createFileSystemProviderError, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { IChatResponseResourceFileSystemProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.service';
 
 let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSystemProvider extends Disposable {
-    static {
-        this.ID = "workbench.contrib.chatResponseResourceFileSystemProvider";
-    }
     constructor(chatService, _fileService) {
         super();
         this.chatService = chatService;
@@ -22,7 +23,34 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
         this.capabilities = FileSystemProviderCapabilities.None | FileSystemProviderCapabilities.Readonly | FileSystemProviderCapabilities.PathCaseSensitive | FileSystemProviderCapabilities.FileReadStream | FileSystemProviderCapabilities.FileAtomicRead | FileSystemProviderCapabilities.FileReadWrite;
-        this._register(this._fileService.registerProvider(ChatResponseResource.scheme, this));
+        this._associated = ( new ResourceMap());
+        this._sessionAssociations = ( new ResourceMap());
+        this._register(this.chatService.onDidDisposeSession(e => {
+            for (const sessionResource of e.sessionResource) {
+                const uris = this._sessionAssociations.get(sessionResource);
+                if (uris) {
+                    for (const uri of uris) {
+                        this._associated.delete(uri);
+                    }
+                    this._sessionAssociations.delete(sessionResource);
+                }
+            }
+        }));
+    }
+    associate(sessionResource, data, name) {
+        const id = generateUuid();
+        const uri = ( URI.from({
+            scheme: ChatResponseResource.scheme,
+            path: `/assoc/${id}` + (name ? `/${name}` : "")
+        }));
+        this._associated.set(uri, data);
+        let set = this._sessionAssociations.get(sessionResource);
+        if (!set) {
+            set = ( new ResourceSet());
+            this._sessionAssociations.set(sessionResource, set);
+        }
+        set.add(uri);
+        return uri;
     }
     readFile(resource) {
         return Promise.resolve(this.lookupURI(resource));
@@ -89,6 +117,15 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
         throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
     }
     lookupURI(uri) {
+        const associated = this._associated.get(uri);
+        if (associated) {
+            if (associated instanceof Uint8Array) {
+                return associated;
+            }
+            const decoded = decodeBase64(associated.base64).buffer;
+            this._associated.set(uri, decoded);
+            return decoded;
+        }
         const {
             result,
             index
@@ -108,5 +145,17 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
     }
 };
 ChatResponseResourceFileSystemProvider = ( __decorate([( __param(0, IChatService)), ( __param(1, IFileService))], ChatResponseResourceFileSystemProvider));
+let ChatResponseResourceWorkbenchContribution = class ChatResponseResourceWorkbenchContribution extends Disposable {
+    static {
+        this.ID = "chatResponseResourceWorkbenchContribution";
+    }
+    constructor(chatResponseResourceFsProvider, fileService) {
+        super();
+        this._register(
+            fileService.registerProvider(ChatResponseResource.scheme, chatResponseResourceFsProvider)
+        );
+    }
+};
+ChatResponseResourceWorkbenchContribution = ( __decorate([( __param(0, IChatResponseResourceFileSystemProvider)), ( __param(1, IFileService))], ChatResponseResourceWorkbenchContribution));
 
-export { ChatResponseResourceFileSystemProvider };
+export { ChatResponseResourceFileSystemProvider, ChatResponseResourceWorkbenchContribution };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -3,7 +3,7 @@ import './inlineChatDefaultModel.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, SubmitInlineChatInputAction, QueueInChatAction, HideInlineChatInputAction, FixDiagnosticsAction } from './inlineChatActions.js';
+import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, SubmitInlineChatInputAction, QueueInChatAction, HideInlineChatInputAction, FixDiagnosticsAction, DismissEditorAffordanceAction } from './inlineChatActions.js';
 import { CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
@@ -33,7 +33,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(9449, "Edit Code"))
+        title: ( localize(9634, "Edit Code"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -42,7 +42,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(9450, "Generate"))
+        title: ( localize(9635, "Generate"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -53,8 +53,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(9451, "Cancel Request")),
-        shortTitle: ( localize(9452, "Cancel"))
+        title: ( localize(9636, "Cancel Request")),
+        shortTitle: ( localize(9637, "Cancel"))
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))
 };
@@ -66,6 +66,7 @@ registerAction2(SubmitInlineChatInputAction);
 registerAction2(QueueInChatAction);
 registerAction2(HideInlineChatInputAction);
 registerAction2(FixDiagnosticsAction);
+registerAction2(DismissEditorAffordanceAction);
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);