@codingame/monaco-vscode-chat-service-override 31.0.1 → 32.0.0

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.js

@@ -3,6 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 
 let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
     constructor(_extensionService) {
@@ -16,33 +18,58 @@ let ChatSlashCommandService = class ChatSlashCommandService extends Disposable {
         super.dispose();
         this._commands.clear();
     }
+    getSessionScopedCommands(id) {
+        return this._commands.get(id) ?? [];
+    }
+    commandsOverlap(dataA, dataB) {
+        if (dataA.sessionTypes === undefined || dataB.sessionTypes === undefined) {
+            return true;
+        }
+        return ( dataA.sessionTypes.some(sessionType => dataB.sessionTypes?.includes(sessionType)));
+    }
+    getCommand(id, sessionType) {
+        return this.getSessionScopedCommands(id).find(candidate => matchesSessionType(candidate.data.sessionTypes, sessionType));
+    }
     registerSlashCommand(data, command) {
-        if (( this._commands.has(data.command))) {
-            throw ( new Error(`Already registered a command with id ${data.command}}`));
+        const commandsForId = this.getSessionScopedCommands(data.command);
+        if (( commandsForId.some(candidate => this.commandsOverlap(candidate.data, data)))) {
+            throw ( new Error(`Already registered a command with id ${data.command}`));
         }
-        this._commands.set(data.command, {
+        const entry = {
             data,
             command
-        });
+        };
+        commandsForId.push(entry);
+        this._commands.set(data.command, commandsForId);
         this._onDidChangeCommands.fire();
         return toDisposable(() => {
-            if (this._commands.delete(data.command)) {
-                this._onDidChangeCommands.fire();
+            const commandsForId = this._commands.get(data.command);
+            if (!commandsForId) {
+                return;
+            }
+            const entryIndex = commandsForId.indexOf(entry);
+            if (entryIndex === -1) {
+                return;
+            }
+            commandsForId.splice(entryIndex, 1);
+            if (commandsForId.length === 0) {
+                this._commands.delete(data.command);
             }
+            this._onDidChangeCommands.fire();
         });
     }
     getCommands(location, mode) {
-        return Array.from(( this._commands.values()), v => v.data).filter(
+        return Array.from(( this._commands.values())).flatMap(commands => ( commands.map(v => v.data))).filter(
             c => c.locations.includes(location) && (!c.modes || c.modes.includes(mode))
         );
     }
-    hasCommand(id) {
-        return ( this._commands.has(id));
+    hasCommand(id, sessionType) {
+        return !!this.getCommand(id, sessionType);
     }
     async executeCommand(id, prompt, progress, history, location, sessionResource, token, options) {
-        const data = this._commands.get(id);
+        const data = this.getCommand(id, getChatSessionType(sessionResource));
         if (!data) {
-            throw ( new Error("No command with id ${id} NOT registered"));
+            throw ( new Error(`No command with id ${id} NOT registered`));
         }
         if (!data.command) {
             await this._extensionService.activateByEvent(`onSlash:${id}`);

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.d.ts

@@ -13,7 +13,7 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
-import { IAgentPlugin, IAgentPluginDiscovery } from "./agentPluginService.js";
+import { IAgentPlugin, IAgentPluginDiscovery } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService";
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
 import { IMarketplacePlugin } from "./pluginMarketplaceService.js";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
@@ -32,6 +32,8 @@ export declare class AgentPluginService extends Disposable implements IAgentPlug
 interface IPluginSource {
     readonly uri: URI;
     readonly fromMarketplace: IMarketplacePlugin | undefined;
+    /** Repository root that serves as the boundary for component path resolution. */
+    readonly repositoryUri?: URI;
     /** Called when remove is invoked on the plugin */
     remove(): void;
 }
@@ -112,6 +114,20 @@ export declare class MarketplaceAgentPluginDiscovery extends AbstractAgentPlugin
     start(enablementModel: IEnablementModel): void;
     protected _discoverPluginSources(): Promise<readonly IPluginSource[]>;
 }
+/**
+ * Discovers plugins installed by the Copilot CLI under
+ * `~/.copilot/installed-plugins/<marketplace>/<plugin>/`. Each leaf directory
+ * is treated as a plugin root, allowing CLI-installed plugins (both
+ * marketplace and direct) to surface in VS Code without a separate install.
+ */
+export declare class CopilotCliAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+    private readonly _dialogService;
+    constructor(fileService: IFileService, pathService: IPathService, logService: ILogService, workspaceContextService: IWorkspaceContextService, _dialogService: IDialogService);
+    start(enablementModel: IEnablementModel): void;
+    private _getInstalledPluginsDir;
+    protected _discoverPluginSources(): Promise<readonly IPluginSource[]>;
+    private _promptRemove;
+}
 export declare class ExtensionAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
     private readonly _commandService;
     private readonly _contextKeyService;

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.js

@@ -36,7 +36,7 @@ import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { EnablementModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
-import { agentPluginDiscoveryRegistry } from './agentPluginService.js';
+import { agentPluginDiscoveryRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -121,9 +121,13 @@ class AbstractAgentPluginDiscovery extends Disposable {
             if (!( seenPluginUris.has(key))) {
                 seenPluginUris.add(key);
                 const format = await detectPluginFormat(source.uri, this._fileService);
-                plugins.push(
-                    this._toPlugin(source.uri, format, source.fromMarketplace, () => source.remove())
-                );
+                plugins.push(this._toPlugin(
+                    source.uri,
+                    format,
+                    source.fromMarketplace,
+                    source.repositoryUri,
+                    () => source.remove()
+                ));
             }
         }
         this._disposePluginEntriesExcept(seenPluginUris);
@@ -138,7 +142,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
             return false;
         }
     }
-    _toPlugin(uri, format, fromMarketplace, removeCallback) {
+    _toPlugin(uri, format, fromMarketplace, repositoryUri, removeCallback) {
         const key = ( uri.toString());
         const existing = this._pluginEntries.get(key);
         if (existing) {
@@ -169,7 +173,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
                     }
                 }
                 const paths = parseComponentPathConfig(section);
-                const dirs = resolveComponentDirs(uri, defaultPath, paths);
+                const dirs = resolveComponentDirs(uri, defaultPath, paths, repositoryUri);
                 for (const d of dirs) {
                     const watcher = this._fileService.createWatcher(d, {
                         recursive: false,
@@ -488,9 +492,11 @@ let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery exte
                 );
                 continue;
             }
+            const repositoryUri = this._pluginRepositoryService.getRepositoryUri(entry.plugin.marketplaceReference, entry.plugin.marketplaceType);
             sources.push({
                 uri: stat.resource,
                 fromMarketplace: entry.plugin,
+                repositoryUri,
                 remove: () => {
                     this._enablementModel.remove(( stat.resource.toString()));
                     this._pluginMarketplaceService.removeInstalledPlugin(entry.pluginUri);
@@ -508,10 +514,153 @@ let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery exte
     }
 };
 MarketplaceAgentPluginDiscovery = ( __decorate([( __param(0, IPluginMarketplaceService)), ( __param(1, IAgentPluginRepositoryService)), ( __param(2, IFileService)), ( __param(3, IPathService)), ( __param(4, ILogService)), ( __param(5, IWorkspaceContextService))], MarketplaceAgentPluginDiscovery));
+const COPILOT_CLI_INSTALLED_PLUGINS_DIR = ".copilot/installed-plugins";
+let CopilotCliAgentPluginDiscovery = class CopilotCliAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+    constructor(
+        fileService,
+        pathService,
+        logService,
+        workspaceContextService,
+        _dialogService
+    ) {
+        super(fileService, pathService, logService, workspaceContextService);
+        this._dialogService = _dialogService;
+    }
+    start(enablementModel) {
+        this._enablementModel = enablementModel;
+        const scheduler = this._register(( new RunOnceScheduler(() => this._refreshPlugins(), 0)));
+        const watcherStore = this._register(( new DisposableStore()));
+        const setupWatchers = async () => {
+            watcherStore.clear();
+            if (this._store.isDisposed) {
+                return;
+            }
+            const root = await this._getInstalledPluginsDir();
+            const dirsToWatch = [];
+            let candidate = root;
+            while (candidate) {
+                dirsToWatch.unshift(candidate);
+                const parent = joinPath(candidate, "..");
+                if (( parent.toString()) === ( candidate.toString())) {
+                    break;
+                }
+                if (await this._pathExists(parent)) {
+                    dirsToWatch.unshift(parent);
+                    break;
+                }
+                candidate = parent;
+            }
+            for (const dir of dirsToWatch) {
+                if (!(await this._pathExists(dir))) {
+                    continue;
+                }
+                const watcher = this._fileService.createWatcher(dir, {
+                    recursive: false,
+                    excludes: []
+                });
+                watcherStore.add(watcher);
+                watcherStore.add(watcher.onDidChange(() => {
+                    scheduler.schedule();
+                    setupWatchers().catch(() => {});
+                }));
+            }
+            let rootStat;
+            try {
+                rootStat = await this._fileService.resolve(root);
+            } catch {
+                return;
+            }
+            if (!rootStat.children) {
+                return;
+            }
+            for (const marketplaceDir of rootStat.children) {
+                if (!marketplaceDir.isDirectory) {
+                    continue;
+                }
+                const watcher = this._fileService.createWatcher(marketplaceDir.resource, {
+                    recursive: false,
+                    excludes: []
+                });
+                watcherStore.add(watcher);
+                watcherStore.add(watcher.onDidChange(() => scheduler.schedule()));
+            }
+        };
+        setupWatchers().catch(() => {});
+        scheduler.schedule();
+    }
+    async _getInstalledPluginsDir() {
+        const userHome = await this._pathService.userHome();
+        return joinPath(userHome, COPILOT_CLI_INSTALLED_PLUGINS_DIR);
+    }
+    async _discoverPluginSources() {
+        const root = await this._getInstalledPluginsDir();
+        let rootStat;
+        try {
+            rootStat = await this._fileService.resolve(root);
+        } catch {
+            return [];
+        }
+        if (!rootStat.isDirectory || !rootStat.children) {
+            return [];
+        }
+        const sources = [];
+        for (const marketplaceDir of rootStat.children) {
+            if (!marketplaceDir.isDirectory) {
+                continue;
+            }
+            let marketplaceStat;
+            try {
+                marketplaceStat = await this._fileService.resolve(marketplaceDir.resource);
+            } catch {
+                continue;
+            }
+            if (!marketplaceStat.children) {
+                continue;
+            }
+            for (const pluginDir of marketplaceStat.children) {
+                if (!pluginDir.isDirectory) {
+                    continue;
+                }
+                sources.push({
+                    uri: pluginDir.resource,
+                    fromMarketplace: undefined,
+                    remove: () => this._promptRemove(pluginDir.resource)
+                });
+            }
+        }
+        return sources;
+    }
+    async _promptRemove(resource) {
+        const {
+            confirmed
+        } = await this._dialogService.confirm({
+            message: ( localize(7732, "This plugin was installed by the Copilot CLI. Remove it from disk?")),
+            detail: ( localize(
+                7733,
+                "The plugin directory '{0}' will be moved to the trash. You can reinstall it later via the Copilot CLI.",
+                resource.fsPath
+            )),
+            primaryButton: ( localize(7734, "Remove"))
+        });
+        if (!confirmed) {
+            return;
+        }
+        try {
+            await this._fileService.del(resource, {
+                recursive: true,
+                useTrash: true
+            });
+            this._enablementModel.remove(( resource.toString()));
+        } catch (error) {
+            this._logService.error("[CopilotCliAgentPluginDiscovery] Failed to remove plugin", error);
+        }
+    }
+};
+CopilotCliAgentPluginDiscovery = ( __decorate([( __param(0, IFileService)), ( __param(1, IPathService)), ( __param(2, ILogService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IDialogService))], CopilotCliAgentPluginDiscovery));
 const epPlugins = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatPlugins",
     jsonSchema: {
-        description: ( localize(7423, "Contributes agent plugins for chat.")),
+        description: ( localize(7735, "Contributes agent plugins for chat.")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -525,13 +674,13 @@ const epPlugins = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 path: {
                     description: ( localize(
-                        7424,
+                        7736,
                         "Path to the agent plugin root directory relative to the extension root."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(7425, "(Optional) A condition which must be true to enable this plugin.")),
+                    description: ( localize(7737, "(Optional) A condition which must be true to enable this plugin.")),
                     type: "string"
                 }
             }
@@ -568,7 +717,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7426,
+                            7738,
                             "Extension '{0}' cannot register a chatPlugins entry without a path.",
                             ext.description.identifier.value
                         )));
@@ -577,7 +726,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                     const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7427,
+                            7739,
                             "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.",
                             ext.description.identifier.value,
                             raw.path
@@ -589,7 +738,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                         whenExpr = ContextKeyExpr.deserialize(raw.when);
                         if (!whenExpr) {
                             ext.collector.error(( localize(
-                                7428,
+                                7740,
                                 "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.",
                                 ext.description.identifier.value,
                                 raw.path,
@@ -660,7 +809,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                7429,
+                7741,
                 "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?",
                 extensionId
             ))
@@ -693,7 +842,7 @@ class ChatPluginsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7430, "Path")), ( localize(7431, "When"))];
+        const headers = [( localize(7742, "Path")), ( localize(7743, "When"))];
         const rows = ( contributions.map(d => [d.path, d.when ?? "-"]));
         return {
             data: {
@@ -706,11 +855,11 @@ class ChatPluginsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatPlugins",
-    label: ( localize(7432, "Chat Plugins")),
+    label: ( localize(7744, "Chat Plugins")),
     access: {
         canToggle: false
     },
     renderer: ( new SyncDescriptor(ChatPluginsDataRenderer))
 });
 
-export { AbstractAgentPluginDiscovery, AgentPluginService, ConfiguredAgentPluginDiscovery, ExtensionAgentPluginDiscovery, MarketplaceAgentPluginDiscovery };
+export { AbstractAgentPluginDiscovery, AgentPluginService, ConfiguredAgentPluginDiscovery, CopilotCliAgentPluginDiscovery, ExtensionAgentPluginDiscovery, MarketplaceAgentPluginDiscovery };

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.d.ts

@@ -152,6 +152,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     private _runUpdateCheck;
     private _fetchFromClonedRepo;
     readPluginsFromDirectory(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin[]>;
+    readSinglePluginManifest(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin | undefined>;
     private _readPluginsFromDirectory;
     /**
      * Iterates over {@link MARKETPLACE_DEFINITIONS} paths, calling

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.js

@@ -57,6 +57,16 @@ const MARKETPLACE_DEFINITIONS = [{
     type: MarketplaceType.Claude,
     path: ".claude-plugin/marketplace.json"
 }];
+const SINGLE_PLUGIN_MANIFEST_DEFINITIONS = [{
+    type: MarketplaceType.OpenPlugin,
+    path: ".plugin/plugin.json"
+}, {
+    type: MarketplaceType.Claude,
+    path: ".claude-plugin/plugin.json"
+}, {
+    type: MarketplaceType.Copilot,
+    path: "plugin.json"
+}];
 const GITHUB_MARKETPLACE_CACHE_TTL_MS = 8 * 60 * 60 * 1000;
 const GITHUB_MARKETPLACE_CACHE_STORAGE_KEY = "chat.plugins.marketplaces.githubCache.v1";
 const PLUGIN_UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
@@ -400,7 +410,13 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
             }
             try {
                 const repoDir = this._pluginRepositoryService.getRepositoryUri(reference);
-                const plugins = await this._readPluginsFromDirectory(repoDir, reference);
+                let plugins = await this._readPluginsFromDirectory(repoDir, reference);
+                if (plugins.length === 0) {
+                    const single = await this.readSinglePluginManifest(repoDir, reference);
+                    if (single) {
+                        plugins = [single];
+                    }
+                }
                 const match = plugins.find(p => {
                     const installUri = this._pluginRepositoryService.getPluginInstallUri(p);
                     return isEqual(installUri, entry.pluginUri);
@@ -526,6 +542,51 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
     async readPluginsFromDirectory(repoDir, reference) {
         return this._readPluginsFromDirectory(repoDir, reference);
     }
+    async readSinglePluginManifest(repoDir, reference) {
+        if (reference.kind !== MarketplaceReferenceKind.GitHubShorthand && reference.kind !== MarketplaceReferenceKind.GitUri) {
+            return undefined;
+        }
+        for (const def of SINGLE_PLUGIN_MANIFEST_DEFINITIONS) {
+            const manifestUri = joinPath(repoDir, def.path);
+            let manifest;
+            try {
+                const contents = await this._fileService.readFile(manifestUri);
+                const parsed = parse(( contents.value.toString()));
+                if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                    manifest = parsed;
+                }
+            } catch {
+                continue;
+            }
+            if (!manifest) {
+                continue;
+            }
+            const sourceDescriptor = reference.kind === MarketplaceReferenceKind.GitHubShorthand ? {
+                kind: PluginSourceKind.GitHub,
+                repo: reference.githubRepo
+            } : {
+                kind: PluginSourceKind.GitUrl,
+                url: reference.cloneUrl
+            };
+            const manifestName = typeof manifest["name"] === "string" && manifest["name"] ? manifest["name"] : reference.displayLabel;
+            const manifestDescription = typeof manifest["description"] === "string" ? manifest["description"] : "";
+            const manifestVersion = typeof manifest["version"] === "string" ? manifest["version"] : "";
+            return {
+                name: manifestName,
+                description: manifestDescription,
+                version: manifestVersion,
+                source: "",
+                sourceDescriptor,
+                marketplace: reference.displayLabel,
+                marketplaceReference: reference,
+                marketplaceType: def.type
+            };
+        }
+        this._logService.debug(
+            `[PluginMarketplaceService] No single-plugin manifest found in ${reference.rawValue}`
+        );
+        return undefined;
+    }
     async _readPluginsFromDirectory(repoDir, reference, token) {
         return this._readPluginsFromDefinitions(reference, async defPath => {
             if (token?.isCancellationRequested) {

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

@@ -25,7 +25,7 @@ function registerChatFilesExtensionPoint(point) {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: point,
         jsonSchema: {
-            description: ( localize(7433, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(7745, "Contributes {0} for chat prompts.", point)),
             type: "array",
             items: {
                 additionalProperties: false,
@@ -39,28 +39,28 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     path: {
                         description: point === ChatContributionPoint.chatSkills ? ( localize(
-                            7434,
+                            7746,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(7435, "Path to the file relative to the extension root.")),
+                        )) : ( localize(7747, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(7436, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(7437, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(7748, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(7749, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(7438, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(7439, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(7750, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(7751, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(7440, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(7752, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
                     },
                     sessionTypes: {
                         description: ( localize(
-                            7441,
+                            7753,
                             "(Optional) The chat session types where this entry should be offered."
                         )),
                         type: "array",
@@ -116,7 +116,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7442,
+                            7754,
                             "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
                             contributionPoint
@@ -126,7 +126,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7443,
+                            7755,
                             "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -136,7 +136,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (raw.when && !ContextKeyExpr.deserialize(raw.when)) {
                         ext.collector.error(( localize(
-                            7444,
+                            7756,
                             "Extension '{0}' {1} entry '{2}' has an invalid when clause: '{3}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -159,7 +159,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     } catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            7445,
+                            7757,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -220,7 +220,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7446, "Name")), ( localize(7447, "Description")), ( localize(7448, "Path"))];
+        const headers = [( localize(7758, "Name")), ( localize(7759, "Description")), ( localize(7760, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -235,7 +235,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(7449, "Chat Prompt Files")),
+    label: ( localize(7761, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -243,7 +243,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(7450, "Chat Instructions")),
+    label: ( localize(7762, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -251,7 +251,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(7451, "Chat Agents")),
+    label: ( localize(7763, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -259,7 +259,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(7452, "Chat Skills")),
+    label: ( localize(7764, "Chat Skills")),
     access: {
         canToggle: false
     },

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
 import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
@@ -24,7 +25,7 @@ let PromptHeaderDefinitionProvider = class PromptHeaderDefinitionProvider {
         }
         const agentAttr = header.getAttribute(PromptHeaderAttributes.agent) ?? header.getAttribute(PromptHeaderAttributes.mode);
         if (agentAttr && agentAttr.value.type === "scalar" && agentAttr.range.containsPosition(position)) {
-            const agent = this.chatModeService.findModeByName(agentAttr.value.value);
+            const agent = (await this.chatModeService.awaitModes(localChatSessionType)).findModeByName(agentAttr.value.value);
             if (agent && agent.uri) {
                 return {
                     uri: agent.uri.get(),