@codingame/monaco-vscode-chat-service-override 29.1.0 → 30.0.0

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

@@ -4,6 +4,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
@@ -90,7 +91,6 @@ interface IJsonPluginSource {
 export interface IMarketplaceInstalledPlugin {
     readonly pluginUri: URI;
     readonly plugin: IMarketplacePlugin;
-    readonly enabled: boolean;
 }
 export declare class PluginMarketplaceService extends Disposable implements IPluginMarketplaceService {
     private readonly _configurationService;
@@ -104,6 +104,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     readonly _serviceBrand: undefined;
     private readonly _gitHubMarketplaceCache;
     private readonly _installedPluginsStore;
+    private readonly _pluginMetadata;
     private readonly _trustedMarketplacesStore;
     private readonly _lastFetchedPluginsStore;
     private readonly _hasUpdatesAvailable;
@@ -113,7 +114,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     readonly hasUpdatesAvailable: IObservable<boolean>;
     readonly lastFetchedPlugins: IObservable<readonly IMarketplacePlugin[]>;
     readonly recommendedPlugins: IObservable<ReadonlySet<string>>;
-    constructor(_configurationService: IConfigurationService, _requestService: IRequestService, _fileService: IFileService, _pluginRepositoryService: IAgentPluginRepositoryService, _logService: ILogService, _storageService: IStorageService, _workspacePluginSettingsService: IWorkspacePluginSettingsService, _workspaceTrustService: IWorkspaceTrustManagementService);
+    constructor(_configurationService: IConfigurationService, _requestService: IRequestService, environmentService: IEnvironmentService, _fileService: IFileService, _pluginRepositoryService: IAgentPluginRepositoryService, _logService: ILogService, _storageService: IStorageService, _workspacePluginSettingsService: IWorkspacePluginSettingsService, _workspaceTrustService: IWorkspaceTrustManagementService);
     dispose(): void;
     clearUpdatesAvailable(): void;
     fetchMarketplacePlugins(token: CancellationToken): Promise<IMarketplacePlugin[]>;
@@ -124,8 +125,23 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     getMarketplacePluginMetadata(pluginUri: URI): IMarketplacePlugin | undefined;
     addInstalledPlugin(pluginUri: URI, plugin: IMarketplacePlugin): void;
     removeInstalledPlugin(pluginUri: URI): void;
-    setInstalledPluginEnabled(pluginUri: URI, enabled: boolean): void;
     isMarketplaceTrusted(ref: IMarketplaceReference): boolean;
+    /**
+     * For each plugin URI that has no cached metadata, walk up the directory
+     * tree from the plugin towards the agent-plugins root looking for a
+     * marketplace definition file. When found, read the marketplace plugins
+     * and match by source path to populate {@link _pluginMetadata}.
+     *
+     * After hydration completes the installed-plugins store is "touched" so
+     * that the derived {@link installedPlugins} observable re-evaluates with
+     * the newly available metadata.
+     */
+    private _hydratePluginMetadata;
+    /**
+     * Shared logic to parse a marketplace.json into {@link IMarketplacePlugin}
+     * objects. Used by both fetch and hydration paths.
+     */
+    private _parseMarketplacePlugins;
     trustMarketplace(ref: IMarketplaceReference): void;
     private _isAutoUpdateEnabled;
     /**
@@ -137,6 +153,12 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     private _fetchFromClonedRepo;
     readPluginsFromDirectory(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin[]>;
     private _readPluginsFromDirectory;
+    /**
+     * Iterates over {@link MARKETPLACE_DEFINITIONS} paths, calling
+     * {@link readJson} for each to obtain the parsed JSON. Returns the
+     * plugins from the first definition that yields a valid result.
+     */
+    private _readPluginsFromDefinitions;
 }
 /**
  * Parse a raw `source` field from marketplace.json into a structured

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

@@ -7,9 +7,10 @@ import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { isEqualOrParent, isEqual, joinPath, normalizePath, relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { joinPath, isEqualOrParent, isEqual, normalizePath, relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { observableMemento } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/observableMemento';
@@ -20,12 +21,14 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { AutoUpdateConfigurationKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
+import { FileBackedInstalledPluginsStore } from './fileBackedInstalledPluginsStore.js';
 import { IWorkspacePluginSettingsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { parseMarketplaceReferences, deduplicateMarketplaceReferences, parseMarketplaceReference, MarketplaceReferenceKind } from './marketplaceReference.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var MarketplaceType;
 (function(MarketplaceType) {
@@ -70,15 +73,6 @@ function ensureSourceDescriptor(plugin) {
         }
     };
 }
-const installedPluginsMemento = observableMemento({
-    defaultValue: [],
-    key: "chat.plugins.installed.v1",
-    toStorage: value => JSON.stringify(value),
-    fromStorage: value => {
-        const parsed = JSON.parse(value);
-        return Array.isArray(parsed) ? parsed : [];
-    }
-});
 const trustedMarketplacesMemento = observableMemento({
     defaultValue: [],
     key: "chat.plugins.trustedMarketplaces.v1",
@@ -110,6 +104,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
     constructor(
         _configurationService,
         _requestService,
+        environmentService,
         _fileService,
         _pluginRepositoryService,
         _logService,
@@ -127,11 +122,17 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         this._workspacePluginSettingsService = _workspacePluginSettingsService;
         this._workspaceTrustService = _workspaceTrustService;
         this._gitHubMarketplaceCache = ( new Lazy(() => this._loadPersistedGitHubMarketplaceCache()));
+        this._pluginMetadata = ( new Map());
         this._hasUpdatesAvailable = observableValue("hasUpdatesAvailable", false);
         this.hasUpdatesAvailable = this._hasUpdatesAvailable;
-        this._installedPluginsStore = this._register(
-            installedPluginsMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, _storageService)
-        );
+        const oldCacheRoot = joinPath(environmentService.cacheHome, "agentPlugins");
+        this._installedPluginsStore = this._register(( new FileBackedInstalledPluginsStore(
+            _pluginRepositoryService.agentPluginsHome,
+            oldCacheRoot,
+            _fileService,
+            _logService,
+            _storageService
+        )));
         this._trustedMarketplacesStore = this._register(
             trustedMarketplacesMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, _storageService)
         );
@@ -142,10 +143,19 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
             const revived = revive(s);
             return ( revived.plugins.map(ensureSourceDescriptor));
         }));
-        this.installedPlugins = ( this._installedPluginsStore.map(s => ( revive(s).map(e => ({
-            ...e,
-            plugin: ensureSourceDescriptor(e.plugin)
-        })))));
+        this.installedPlugins = ( this._installedPluginsStore.value.map(entries => {
+            const result = [];
+            for (const e of entries) {
+                const plugin = this._pluginMetadata.get(( e.pluginUri.toString()));
+                if (plugin) {
+                    result.push({
+                        pluginUri: e.pluginUri,
+                        plugin
+                    });
+                }
+            }
+            return result;
+        }));
         const workspaceTrusted = observableFromEvent(
             this,
             this._workspaceTrustService.onDidChangeTrust,
@@ -175,6 +185,13 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
                 e => e.affectsConfiguration(AutoUpdateConfigurationKey)
             )(() => this._scheduleUpdateCheck()));
         }));
+        this._register(autorun(reader => {
+            const entries = this._installedPluginsStore.value.read(reader);
+            const unhydrated = entries.filter(e => !( this._pluginMetadata.has(( e.pluginUri.toString()))));
+            if (unhydrated.length > 0) {
+                this._hydratePluginMetadata(unhydrated);
+            }
+        }));
     }
     dispose() {
         if (this._updateCheckTimer !== undefined) {
@@ -230,11 +247,11 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
             })));
         }
         let repoMayBePrivate = true;
-        for (const def of MARKETPLACE_DEFINITIONS) {
+        const plugins = await this._readPluginsFromDefinitions(reference, async defPath => {
             if (token.isCancellationRequested) {
-                return [];
+                return undefined;
             }
-            const url = `https://raw.githubusercontent.com/${repo}/main/${def.path}`;
+            const url = `https://raw.githubusercontent.com/${repo}/main/${defPath}`;
             try {
                 const context = await this._requestService.request({
                     type: "GET",
@@ -247,51 +264,25 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
                     this._logService.debug(
                         `[PluginMarketplaceService] ${url} returned status ${statusCode}, skipping`
                     );
-                    continue;
-                }
-                const json = await asJson(context);
-                if (!json?.plugins || !Array.isArray(json.plugins)) {
-                    this._logService.debug(
-                        `[PluginMarketplaceService] ${url} did not contain a valid plugins array, skipping`
-                    );
-                    continue;
+                    return undefined;
                 }
-                const plugins = json.plugins.filter(p => typeof p.name === "string" && !!p.name).flatMap(p => {
-                    const sourceDescriptor = parsePluginSource(p.source, json.metadata?.pluginRoot, {
-                        pluginName: p.name,
-                        logService: this._logService,
-                        logPrefix: `[PluginMarketplaceService]`
-                    });
-                    if (!sourceDescriptor) {
-                        return [];
-                    }
-                    const source = sourceDescriptor.kind === PluginSourceKind.RelativePath ? sourceDescriptor.path : "";
-                    return [{
-                        name: p.name,
-                        description: p.description ?? "",
-                        version: p.version ?? "",
-                        source,
-                        sourceDescriptor,
-                        marketplace: reference.displayLabel,
-                        marketplaceReference: reference,
-                        marketplaceType: def.type,
-                        readmeUri: getMarketplaceReadmeUri(repo, source)
-                    }];
-                });
-                cache.set(reference.canonicalId, {
-                    plugins,
-                    expiresAt: Date.now() + GITHUB_MARKETPLACE_CACHE_TTL_MS,
-                    referenceRawValue: reference.rawValue
-                });
-                this._savePersistedGitHubMarketplaceCache(cache);
-                return plugins;
+                return (await asJson(context)) ?? undefined;
             } catch (err) {
                 this._logService.debug(
                     `[PluginMarketplaceService] Failed to fetch marketplace.json from ${url}:`,
                     err
                 );
-                continue;
+                return undefined;
             }
+        });
+        if (plugins.length > 0) {
+            cache.set(reference.canonicalId, {
+                plugins,
+                expiresAt: Date.now() + GITHUB_MARKETPLACE_CACHE_TTL_MS,
+                referenceRawValue: reference.rawValue
+            });
+            this._savePersistedGitHubMarketplaceCache(cache);
+            return plugins;
         }
         if (repoMayBePrivate) {
             this._logService.debug(
@@ -367,40 +358,93 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         );
     }
     getMarketplacePluginMetadata(pluginUri) {
-        const installed = this.installedPlugins.get();
-        return installed.find(e => isEqualOrParent(pluginUri, e.pluginUri))?.plugin;
+        return this._pluginMetadata.get(( pluginUri.toString())) ?? [...this._pluginMetadata.entries()].find(([key]) => isEqualOrParent(pluginUri, ( URI.parse(key))))?.[1];
     }
     addInstalledPlugin(pluginUri, plugin) {
-        const current = this.installedPlugins.get();
+        this._pluginMetadata.set(( pluginUri.toString()), plugin);
+        const current = this._installedPluginsStore.get();
         const existing = current.find(e => isEqual(e.pluginUri, pluginUri));
         if (existing) {
             this._installedPluginsStore.set(( current.map(c => c === existing ? {
                 pluginUri,
-                plugin,
-                enabled: existing.enabled
+                marketplace: plugin.marketplaceReference.rawValue
             } : c)), undefined);
         } else {
             this._installedPluginsStore.set([...current, {
                 pluginUri,
-                plugin,
-                enabled: true
+                marketplace: plugin.marketplaceReference.rawValue
             }], undefined);
         }
     }
     removeInstalledPlugin(pluginUri) {
-        const current = this.installedPlugins.get();
+        this._pluginMetadata.delete(( pluginUri.toString()));
+        const current = this._installedPluginsStore.get();
         this._installedPluginsStore.set(current.filter(e => !isEqual(e.pluginUri, pluginUri)), undefined);
     }
-    setInstalledPluginEnabled(pluginUri, enabled) {
-        const current = this.installedPlugins.get();
-        this._installedPluginsStore.set(( current.map(e => isEqual(e.pluginUri, pluginUri) ? {
-            ...e,
-            enabled
-        } : e)), undefined);
-    }
     isMarketplaceTrusted(ref) {
         return this._trustedMarketplacesStore.get().includes(ref.canonicalId);
     }
+    async _hydratePluginMetadata(entries) {
+        let hydrated = 0;
+        for (const entry of entries) {
+            const key = ( entry.pluginUri.toString());
+            if (( this._pluginMetadata.has(key))) {
+                continue;
+            }
+            const reference = parseMarketplaceReference(entry.marketplace);
+            if (!reference) {
+                this._logService.debug(
+                    `[PluginMarketplaceService] Cannot parse marketplace reference '${entry.marketplace}' for ${key}`
+                );
+                continue;
+            }
+            try {
+                const repoDir = this._pluginRepositoryService.getRepositoryUri(reference);
+                const plugins = await this._readPluginsFromDirectory(repoDir, reference);
+                const match = plugins.find(p => {
+                    const installUri = this._pluginRepositoryService.getPluginInstallUri(p);
+                    return isEqual(installUri, entry.pluginUri);
+                });
+                if (match) {
+                    this._pluginMetadata.set(key, match);
+                    hydrated++;
+                }
+            } catch (err) {
+                this._logService.debug(`[PluginMarketplaceService] Failed to hydrate metadata for ${key}:`, err);
+            }
+        }
+        if (hydrated > 0) {
+            const current = this._installedPluginsStore.get();
+            this._installedPluginsStore.set([...current], undefined);
+        }
+    }
+    _parseMarketplacePlugins(json, reference, marketplaceType, repoDir) {
+        if (!json.plugins || !Array.isArray(json.plugins)) {
+            return [];
+        }
+        return json.plugins.filter(p => typeof p.name === "string" && !!p.name).flatMap(p => {
+            const sourceDescriptor = parsePluginSource(p.source, json.metadata?.pluginRoot, {
+                pluginName: p.name,
+                logService: this._logService,
+                logPrefix: "[PluginMarketplaceService]"
+            });
+            if (!sourceDescriptor) {
+                return [];
+            }
+            const source = sourceDescriptor.kind === PluginSourceKind.RelativePath ? sourceDescriptor.path : "";
+            return [{
+                name: p.name,
+                description: p.description ?? "",
+                version: p.version ?? "",
+                source,
+                sourceDescriptor,
+                marketplace: reference.displayLabel,
+                marketplaceReference: reference,
+                marketplaceType,
+                readmeUri: repoDir ? getMarketplaceReadmeFileUri(repoDir, source) : getMarketplaceReadmeUri(reference.githubRepo ?? "", source)
+            }];
+        });
+    }
     trustMarketplace(ref) {
         const current = this._trustedMarketplacesStore.get();
         if (!current.includes(ref.canonicalId)) {
@@ -426,7 +470,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
     async _runUpdateCheck() {
         this._updateCheckTimer = undefined;
         try {
-            const installed = this.installedPlugins.get().filter(e => e.enabled);
+            const installed = this.installedPlugins.get();
             if (installed.length === 0) {
                 return;
             }
@@ -483,44 +527,26 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         return this._readPluginsFromDirectory(repoDir, reference);
     }
     async _readPluginsFromDirectory(repoDir, reference, token) {
-        for (const def of MARKETPLACE_DEFINITIONS) {
+        return this._readPluginsFromDefinitions(reference, async defPath => {
             if (token?.isCancellationRequested) {
-                return [];
+                return undefined;
             }
-            const definitionUri = joinPath(repoDir, def.path);
-            let json;
+            const definitionUri = joinPath(repoDir, defPath);
             try {
                 const contents = await this._fileService.readFile(definitionUri);
-                json = parse(( contents.value.toString()));
+                return parse(( contents.value.toString()));
             } catch {
-                continue;
+                return undefined;
             }
+        }, repoDir);
+    }
+    async _readPluginsFromDefinitions(reference, readJson, repoDir) {
+        for (const def of MARKETPLACE_DEFINITIONS) {
+            const json = await readJson(def.path);
             if (!json?.plugins || !Array.isArray(json.plugins)) {
-                this._logService.debug(`[PluginMarketplaceService] ${( definitionUri.toString())} did not contain a valid plugins array, skipping`);
                 continue;
             }
-            return json.plugins.filter(p => typeof p.name === "string" && !!p.name).flatMap(p => {
-                const sourceDescriptor = parsePluginSource(p.source, json.metadata?.pluginRoot, {
-                    pluginName: p.name,
-                    logService: this._logService,
-                    logPrefix: `[PluginMarketplaceService]`
-                });
-                if (!sourceDescriptor) {
-                    return [];
-                }
-                const source = sourceDescriptor.kind === PluginSourceKind.RelativePath ? sourceDescriptor.path : "";
-                return [{
-                    name: p.name,
-                    description: p.description ?? "",
-                    version: p.version ?? "",
-                    source,
-                    sourceDescriptor,
-                    marketplace: reference.displayLabel,
-                    marketplaceReference: reference,
-                    marketplaceType: def.type,
-                    readmeUri: getMarketplaceReadmeFileUri(repoDir, source)
-                }];
-            });
+            return this._parseMarketplacePlugins(json, reference, def.type, repoDir);
         }
         this._logService.debug(
             `[PluginMarketplaceService] No marketplace.json found in ${reference.rawValue}`
@@ -528,7 +554,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         return [];
     }
 };
-PluginMarketplaceService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IRequestService)), ( __param(2, IFileService)), ( __param(3, IAgentPluginRepositoryService)), ( __param(4, ILogService)), ( __param(5, IStorageService)), ( __param(6, IWorkspacePluginSettingsService)), ( __param(7, IWorkspaceTrustManagementService))], PluginMarketplaceService));
+PluginMarketplaceService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IRequestService)), ( __param(2, IEnvironmentService)), ( __param(3, IFileService)), ( __param(4, IAgentPluginRepositoryService)), ( __param(5, ILogService)), ( __param(6, IStorageService)), ( __param(7, IWorkspacePluginSettingsService)), ( __param(8, IWorkspaceTrustManagementService))], PluginMarketplaceService));
 function normalizeMarketplacePath(value) {
     let normalized = value.trim().replace(/\\/g, "/");
     normalized = normalized.replace(/^\.?\/+/, "").replace(/\/+$/g, "");
@@ -539,9 +565,6 @@ function resolvePluginSource(pluginRoot, source) {
     const normalizedSource = normalizeMarketplacePath(source);
     const repoRoot = URI.file("/");
     const pluginRootUri = normalizedRoot ? normalizePath(joinPath(repoRoot, normalizedRoot)) : repoRoot;
-    if (!normalizedSource) {
-        return normalizedRoot || undefined;
-    }
     if (normalizedRoot && (normalizedSource === normalizedRoot || normalizedSource.startsWith(`${normalizedRoot}/`))) {
         return normalizedSource;
     }

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

@@ -15,4 +15,5 @@ export declare class ChatPromptFilesExtensionPointHandler implements IWorkbenchC
 export interface IExtensionPromptFileResult {
     readonly uri: UriComponents;
     readonly type: PromptsType;
+    readonly extensionId: string;
 }

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(7248, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(7315, "Contributes {0} for chat prompts.", point)),
             type: "array",
             items: {
                 additionalProperties: false,
@@ -39,23 +39,23 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     path: {
                         description: point === ChatContributionPoint.chatSkills ? ( localize(
-                            7249,
+                            7316,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(7250, "Path to the file relative to the extension root.")),
+                        )) : ( localize(7317, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(7251, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(7252, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(7318, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(7319, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(7253, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(7254, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(7320, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(7321, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(7255, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(7322, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
                     }
                 }
@@ -106,7 +106,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7256,
+                            7323,
                             "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
                             contributionPoint
@@ -116,7 +116,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7257,
+                            7324,
                             "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -126,7 +126,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (raw.when && !ContextKeyExpr.deserialize(raw.when)) {
                         ext.collector.error(( localize(
-                            7258,
+                            7325,
                             "Extension '{0}' {1} entry '{2}' has an invalid when clause: '{3}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -141,7 +141,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     } catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            7259,
+                            7326,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -175,7 +175,8 @@ CommandsRegistry.registerCommand("_listExtensionPromptFiles", async accessor =>
         if (file.storage === PromptsStorage.extension) {
             result.push({
                 uri: file.uri.toJSON(),
-                type: file.type
+                type: file.type,
+                extensionId: file.extension.identifier.value
             });
         }
     }
@@ -201,7 +202,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7260, "Name")), ( localize(7261, "Description")), ( localize(7262, "Path"))];
+        const headers = [( localize(7327, "Name")), ( localize(7328, "Description")), ( localize(7329, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -216,7 +217,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(7263, "Chat Prompt Files")),
+    label: ( localize(7330, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -224,7 +225,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(7264, "Chat Instructions")),
+    label: ( localize(7331, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -232,7 +233,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(7265, "Chat Agents")),
+    label: ( localize(7332, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -240,7 +241,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(7266, "Chat Skills")),
+    label: ( localize(7333, "Chat Skills")),
     access: {
         canToggle: false
     },

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

@@ -76,7 +76,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
             modeAttr.range.startLineNumber,
             modeAttr.range.startColumn + modeAttr.key.length
         ));
-        result.push(this.createCodeAction(model, keyRange, ( localize(7310, "Rename to 'agent'")), [asWorkspaceTextEdit(model, {
+        result.push(this.createCodeAction(model, keyRange, ( localize(7377, "Rename to 'agent'")), [asWorkspaceTextEdit(model, {
             range: keyRange,
             text: "agent"
         })]));
@@ -93,7 +93,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                         copy: false
                     }
                 };
-                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(7311, "Migrate to custom agent file")), [edit]));
+                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(7378, "Migrate to custom agent file")), [edit]));
             }
         }
     }
@@ -140,7 +140,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                     };
                     edits.push(edit);
                     if (item.range.containsRange(range)) {
-                        result.push(this.createCodeAction(model, item.range, ( localize(7312, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
+                        result.push(this.createCodeAction(model, item.range, ( localize(7379, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
                     }
                 } else {
                     const newNamesArray = Array.from(newNames).sort((a, b) => a.localeCompare(b));
@@ -159,13 +159,13 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                     };
                     edits.push(edit);
                     if (item.range.containsRange(range)) {
-                        result.push(this.createCodeAction(model, item.range, ( localize(7313, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
+                        result.push(this.createCodeAction(model, item.range, ( localize(7380, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
                     }
                 }
             }
         }
         if (edits.length && result.length === 0 || edits.length > 1) {
-            result.push(this.createCodeAction(model, value.range, ( localize(7314, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
+            result.push(this.createCodeAction(model, value.range, ( localize(7381, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
         }
     }
 };