@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -15,7 +15,7 @@ import { IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
 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 { IMarketplacePlugin } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
 export { shellQuotePluginRootInCommand, resolveMcpServersMap, convertBareEnvVarsToVsCodeSyntax } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentPlugins/common/pluginParsers";
 export declare class AgentPluginService extends Disposable implements IAgentPluginService {
@@ -34,7 +34,7 @@ interface IPluginSource {
     /** Repository root that serves as the boundary for component path resolution. */
     readonly repositoryUri?: URI;
     /** Called when remove is invoked on the plugin; absent for policy-managed plugins */
-    remove?(): void;
+    remove?(): Promise<boolean>;
 }
 /**
  * Shared base class for plugin discovery implementations. Contains the common
@@ -60,21 +60,16 @@ export declare abstract class AbstractAgentPluginDiscovery extends Disposable im
     /** Subclasses return plugin sources to discover. */
     protected abstract _discoverPluginSources(): Promise<readonly IPluginSource[]>;
     private _discoverAndBuildPlugins;
+    private _isCurrentRefresh;
     protected _pathExists(resource: URI): Promise<boolean>;
     private _toPlugin;
-    private _readManifest;
+    private _readAutomations;
     /**
      * Reads hook definitions from a list of resolved paths (JSON files).
      * Each path is tried in order; the first one that contains valid hook
      * JSON is used.
      */
     private _readHooksFromPaths;
-    /**
-     * Reads MCP server definitions from a list of resolved paths (JSON files).
-     * Definitions from all files are merged; the first definition for a given
-     * server name wins.
-     */
-    private _readMcpDefinitionsFromPaths;
     private _readJsonFile;
     /**
      * Scans directories for rule/instruction files (`.mdc`, `.md`,

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

@@ -9,7 +9,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import { joinPath, basename, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { joinPath, isEqual, basename, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -27,15 +27,16 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { detectPluginFormat, parseComponentPathConfig, resolveComponentDirs, readMarkdownComponents, readSkills, parseMcpServerDefinitionMap } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentPlugins/common/pluginParsers';
+import { detectPluginFormat, readPluginManifest, getPluginManifestComponent, resolvePluginComponentDirs, readMarkdownComponents, readPluginSkills, readPluginMcpServers, parseMcpServerDefinitionMap } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentPlugins/common/pluginParsers';
 export { convertBareEnvVarsToVsCodeSyntax, resolveMcpServersMap, shellQuotePluginRootInCommand } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentPlugins/common/pluginParsers';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { EnablementModel, ContributionEnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
+import { AUTOMATION_BLUEPRINT_FILE_SUFFIX, parseAutomationBlueprint } from '../automations/automationBlueprint.js';
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
-import { getCanonicalAgentPluginCollisionGroups, isAgentPluginBlockedByPolicy, AgentPluginCollisionEnablementModel, getSortedAgentPlugins, getAgentPluginPolicyId } from './agentPluginEnablement.js';
+import { getCanonicalAgentPluginCollisionGroups, isAgentPluginBlockedByPolicy, AgentPluginCollisionEnablementModel, getSortedAgentPlugins, getAgentPluginPolicyId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginEnablement';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 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';
@@ -115,7 +116,7 @@ let AgentPluginService = class AgentPluginService extends Disposable {
                     const blocked = isAgentPluginBlockedByPolicy(plugin, policy);
                     if (setPolicyBlocked(plugin, blocked, tx) && blocked) {
                         logService.debug(
-                            `[AgentPluginService] Plugin '${getAgentPluginPolicyId(plugin) ?? ( plugin.uri.toString())}' blocked — not enabled by ChatEnabledPlugins policy`
+                            `[AgentPluginService] Plugin '${getAgentPluginPolicyId(plugin) ?? ( plugin.uri.toString())}' blocked — disabled by ChatEnabledPlugins policy`
                         );
                     }
                 }
@@ -168,34 +169,53 @@ class AbstractAgentPluginDiscovery extends Disposable {
     }
     async _refreshPlugins() {
         const version = ++this._discoverVersion;
-        const plugins = await this._discoverAndBuildPlugins();
-        if (version !== this._discoverVersion || this._store.isDisposed) {
+        const plugins = await this._discoverAndBuildPlugins(version);
+        if (!this._isCurrentRefresh(version)) {
             return;
         }
         this._plugins.set(plugins, undefined);
     }
-    async _discoverAndBuildPlugins() {
+    async _discoverAndBuildPlugins(version) {
         const sources = await this._discoverPluginSources();
+        if (!this._isCurrentRefresh(version)) {
+            return [];
+        }
         const plugins = [];
         const seenPluginUris = ( new Set());
+        const attemptedPluginUris = ( new Set());
         for (const source of sources) {
             const key = ( source.uri.toString());
-            if (!( seenPluginUris.has(key))) {
-                seenPluginUris.add(key);
-                const format = await detectPluginFormat(source.uri, this._fileService);
-                plugins.push(await this._toPlugin(
-                    source.uri,
-                    format,
-                    source.fromMarketplace,
-                    source.repositoryUri,
-                    source.remove
-                ));
-            }
-        }
-        this._disposePluginEntriesExcept(seenPluginUris);
+            if (!( attemptedPluginUris.has(key))) {
+                attemptedPluginUris.add(key);
+                try {
+                    const format = await detectPluginFormat(source.uri, this._fileService);
+                    if (!this._isCurrentRefresh(version)) {
+                        return [];
+                    }
+                    const plugin = await this._toPlugin(
+                        source.uri,
+                        format,
+                        source.fromMarketplace,
+                        source.repositoryUri,
+                        source.remove,
+                        version
+                    );
+                    seenPluginUris.add(key);
+                    plugins.push(plugin);
+                } catch (error) {
+                    this._logService.warn(`[AgentPluginDiscovery] Rejected plugin '${( source.uri.toString())}': ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+        }
+        if (this._isCurrentRefresh(version)) {
+            this._disposePluginEntriesExcept(seenPluginUris);
+        }
         plugins.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
         return plugins;
     }
+    _isCurrentRefresh(version) {
+        return version === this._discoverVersion && !this._store.isDisposed;
+    }
     async _pathExists(resource) {
         try {
             await this._fileService.resolve(resource);
@@ -204,14 +224,18 @@ class AbstractAgentPluginDiscovery extends Disposable {
             return false;
         }
     }
-    async _toPlugin(uri, format, fromMarketplace, repositoryUri, removeCallback) {
+    async _toPlugin(uri, format, fromMarketplace, repositoryUri, removeCallback, version) {
         const key = ( uri.toString());
         const existing = this._pluginEntries.get(key);
         if (existing) {
+            if (!this._isCurrentRefresh(version)) {
+                return existing.plugin;
+            }
             if (existing.format.format !== format.format) {
                 existing.store.dispose();
                 this._pluginEntries.delete(key);
             } else {
+                existing.plugin.remove = removeCallback;
                 return existing.plugin;
             }
         }
@@ -220,13 +244,26 @@ class AbstractAgentPluginDiscovery extends Disposable {
         const enablement = derived(
             r => policyBlocked.read(r) ? ContributionEnablementState.DisabledProfile : this._enablementModel.readEnabled(key, r)
         );
-        const initialManifest = await this._readManifest(uri, format);
+        const initialManifest = await readPluginManifest(uri, format, this._fileService);
         const manifest = observableValue("agentPluginManifest", initialManifest);
+        const pluginVersion = derived(reader => {
+            const manifestVersion = manifest.read(reader)?.version;
+            if (typeof manifestVersion === "string" && manifestVersion.trim()) {
+                return manifestVersion.trim();
+            }
+            return fromMarketplace?.version || undefined;
+        }).recomputeInitiallyAndOnChange(store);
         const observeComponent = (prop, doRead, tryReadEmbedded, defaultPath = prop) => {
             const secondObs = derivedOpts({
                 equalsFn: equals
-            }, reader => manifest.read(reader)?.[prop]);
+            }, reader => getPluginManifestComponent(format, prop, manifest.read(reader)));
             const wrapped = derived(reader => {
+                if (format.requiresManifest && !manifest.read(reader)) {
+                    return {
+                        kind: "dirs",
+                        dirs: []
+                    };
+                }
                 const section = secondObs.read(reader);
                 if (tryReadEmbedded) {
                     if (section && typeof section === "object" && !Array.isArray(section) && !(hasKey(section, {
@@ -238,8 +275,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
                         };
                     }
                 }
-                const paths = parseComponentPathConfig(section);
-                const dirs = resolveComponentDirs(uri, defaultPath, paths, repositoryUri);
+                const dirs = resolvePluginComponentDirs(uri, format, prop, defaultPath, section, repositoryUri);
                 for (const d of dirs) {
                     const watcher = this._fileService.createWatcher(d, {
                         recursive: false,
@@ -269,9 +305,10 @@ class AbstractAgentPluginDiscovery extends Disposable {
         };
         const manifestUri = joinPath(uri, format.manifestPath);
         const commands = observeComponent("commands", d => readMarkdownComponents(d, this._fileService));
-        const skills = observeComponent("skills", d => readSkills(uri, d, this._fileService));
+        const skills = observeComponent("skills", d => readPluginSkills(uri, d, format, this._fileService));
         const agents = observeComponent("agents", d => readMarkdownComponents(d, this._fileService));
         const instructions = observeComponent("rules", d => this._readRules(d));
+        const automations = observeComponent("automations", d => this._readAutomations(d));
         const hooks = observeComponent(
             "hooks",
             paths => this._readHooksFromPaths(uri, paths, format),
@@ -284,25 +321,55 @@ class AbstractAgentPluginDiscovery extends Disposable {
         );
         const mcpServerDefinitions = observeComponent(
             "mcpServers",
-            paths => this._readMcpDefinitionsFromPaths(paths, uri.fsPath, format),
+            paths => readPluginMcpServers(uri, paths, format, this._fileService),
             async section => parseMcpServerDefinitionMap(manifestUri, {
                 mcpServers: section
-            }, uri.fsPath, format),
+            }, uri, format),
             ".mcp.json"
         );
         const readManifest = async () => {
-            manifest.set(await this._readManifest(uri, format), undefined);
+            try {
+                const latestFormat = await detectPluginFormat(uri, this._fileService);
+                if (latestFormat.format !== format.format) {
+                    await this._refreshPlugins();
+                    return;
+                }
+                manifest.set(await readPluginManifest(uri, format, this._fileService), undefined);
+            } catch (error) {
+                manifest.set(undefined, undefined);
+                this._logService.warn(`[AgentPluginDiscovery] Rejected updated plugin '${( uri.toString())}': ${error instanceof Error ? error.message : String(error)}`);
+            }
         };
-        const manifestWatcher = this._fileService.createWatcher(manifestUri, {
+        const agentManifestUri = joinPath(uri, "plugin.json");
+        const rootWatcher = this._fileService.createWatcher(uri, {
             recursive: false,
             excludes: []
         });
-        store.add(manifestWatcher);
-        store.add(manifestWatcher.onDidChange(() => readManifest()));
+        store.add(rootWatcher);
+        store.add(rootWatcher.onDidChange(change => {
+            if (change.affects(agentManifestUri)) {
+                void readManifest();
+            }
+        }));
+        store.add(this._fileService.onDidRunOperation(event => {
+            if (isEqual(event.resource, agentManifestUri)) {
+                void readManifest();
+            }
+        }));
+        if (!isEqual(manifestUri, agentManifestUri)) {
+            const manifestWatcher = this._fileService.createWatcher(manifestUri, {
+                recursive: false,
+                excludes: []
+            });
+            store.add(manifestWatcher);
+            store.add(manifestWatcher.onDidChange(() => readManifest()));
+        }
         const manifestName = typeof initialManifest?.name === "string" && initialManifest.name.trim() ? initialManifest.name.trim() : undefined;
         const plugin = {
             uri,
+            format: format.format,
             label: fromMarketplace?.name ?? manifestName ?? basename(uri),
+            version: pluginVersion,
             enablement,
             policyBlocked,
             remove: removeCallback,
@@ -312,21 +379,50 @@ class AbstractAgentPluginDiscovery extends Disposable {
             agents,
             instructions,
             mcpServerDefinitions,
+            automations,
             fromMarketplace
         };
-        this._pluginEntries.set(key, {
-            store,
-            plugin,
-            format
-        });
+        if (this._isCurrentRefresh(version)) {
+            this._pluginEntries.set(key, {
+                store,
+                plugin,
+                format
+            });
+        } else {
+            store.dispose();
+        }
         return plugin;
     }
-    async _readManifest(pluginUri, format) {
-        const json = await this._readJsonFile(joinPath(pluginUri, format.manifestPath));
-        if (json && typeof json === "object" && !Array.isArray(json)) {
-            return json;
+    async _readAutomations(dirs) {
+        const resources = await readMarkdownComponents(dirs, this._fileService);
+        const automations = [];
+        const ids = ( new Set());
+        for (const resource of resources) {
+            if (!resource.uri.path.toLowerCase().endsWith(AUTOMATION_BLUEPRINT_FILE_SUFFIX)) {
+                continue;
+            }
+            try {
+                const content = await this._fileService.readFile(resource.uri);
+                const blueprint = parseAutomationBlueprint(( content.value.toString()));
+                if (( ids.has(blueprint.id))) {
+                    this._logService.warn(
+                        `[AgentPluginDiscovery] Ignored duplicate Automation blueprint id '${blueprint.id}' in '${( resource.uri.toString())}'.`
+                    );
+                    continue;
+                }
+                ids.add(blueprint.id);
+                automations.push({
+                    uri: resource.uri,
+                    blueprint
+                });
+            } catch (error) {
+                this._logService.warn(
+                    `[AgentPluginDiscovery] Failed to read Automation blueprint '${( resource.uri.toString())}': ${error instanceof Error ? error.message : String(error)}`
+                );
+            }
         }
-        return undefined;
+        automations.sort((a, b) => a.blueprint.name.localeCompare(b.blueprint.name));
+        return automations;
     }
     async _readHooksFromPaths(pluginUri, paths, format) {
         const userHome = await this._pathService.userHome();
@@ -343,18 +439,6 @@ class AbstractAgentPluginDiscovery extends Disposable {
         }
         return [];
     }
-    async _readMcpDefinitionsFromPaths(paths, pluginFsPath, format) {
-        const merged = ( new Map());
-        for (const mcpPath of paths) {
-            const json = await this._readJsonFile(mcpPath);
-            for (const def of parseMcpServerDefinitionMap(mcpPath, json, pluginFsPath, format)) {
-                if (!( merged.has(def.name))) {
-                    merged.set(def.name, def);
-                }
-            }
-        }
-        return [...( merged.values())].sort((a, b) => a.name.localeCompare(b.name));
-    }
     async _readJsonFile(uri) {
         try {
             const fileContents = await this._fileService.readFile(uri);
@@ -528,7 +612,7 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
         const [, plugin, marketplace] = idMatch;
         return URI.file(`${userHome}/.copilot/installed-plugins/${marketplace}/${plugin}`);
     }
-    _removePluginPath(configKey) {
+    async _removePluginPath(configKey) {
         const inspected = this._configurationService.inspect(ChatConfiguration.PluginLocations);
         const targets = [
             ConfigurationTarget.WORKSPACE_FOLDER,
@@ -545,10 +629,11 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
                     ...mapping
                 };
                 delete updated[configKey];
-                this._configurationService.updateValue(ChatConfiguration.PluginLocations, updated, target);
-                return;
+                await this._configurationService.updateValue(ChatConfiguration.PluginLocations, updated, target);
+                return true;
             }
         }
+        return false;
     }
 };
 ConfiguredAgentPluginDiscovery = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IPluginMarketplaceService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IPathService)), ( __param(5, ILogService))], ConfiguredAgentPluginDiscovery));
@@ -598,7 +683,7 @@ let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery exte
                 uri: stat.resource,
                 fromMarketplace: entry.plugin,
                 repositoryUri,
-                remove: () => {
+                remove: async () => {
                     this._enablementModel.remove(( stat.resource.toString()));
                     this._pluginMarketplaceService.removeInstalledPlugin(entry.pluginUri);
                     const remaining = this._pluginMarketplaceService.installedPlugins.get();
@@ -608,6 +693,7 @@ let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery exte
                             error
                         );
                     });
+                    return true;
                 }
             });
         }
@@ -735,16 +821,19 @@ let CopilotCliAgentPluginDiscovery = class CopilotCliAgentPluginDiscovery extend
         const {
             confirmed
         } = await this._dialogService.confirm({
-            message: ( localize(8587, "This plugin was installed by the Copilot CLI. Remove it from disk?")),
+            message: ( localize(
+                10304,
+                "This plugin was installed by the Copilot CLI. Remove it from disk?"
+            )),
             detail: ( localize(
-                8588,
+                10305,
                 "The plugin directory '{0}' will be moved to the trash. You can reinstall it later via the Copilot CLI.",
                 resource.fsPath
             )),
-            primaryButton: ( localize(8589, "Remove"))
+            primaryButton: ( localize(10306, "Remove"))
         });
         if (!confirmed) {
-            return;
+            return false;
         }
         try {
             await this._fileService.del(resource, {
@@ -752,8 +841,10 @@ let CopilotCliAgentPluginDiscovery = class CopilotCliAgentPluginDiscovery extend
                 useTrash: true
             });
             this._enablementModel.remove(( resource.toString()));
+            return true;
         } catch (error) {
             this._logService.error("[CopilotCliAgentPluginDiscovery] Failed to remove plugin", error);
+            throw error;
         }
     }
 };
@@ -761,7 +852,7 @@ CopilotCliAgentPluginDiscovery = ( __decorate([( __param(0, IFileService)), ( __
 const epPlugins = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatPlugins",
     jsonSchema: {
-        description: ( localize(8590, "Contributes agent plugins for chat.")),
+        description: ( localize(10307, "Contributes agent plugins for chat.")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -775,13 +866,13 @@ const epPlugins = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 path: {
                     description: ( localize(
-                        8591,
+                        10308,
                         "Path to the agent plugin root directory relative to the extension root."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(8592, "(Optional) A condition which must be true to enable this plugin.")),
+                    description: ( localize(10309, "(Optional) A condition which must be true to enable this plugin.")),
                     type: "string"
                 }
             }
@@ -818,7 +909,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            8593,
+                            10310,
                             "Extension '{0}' cannot register a chatPlugins entry without a path.",
                             ext.description.identifier.value
                         )));
@@ -827,7 +918,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                     const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            8594,
+                            10311,
                             "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.",
                             ext.description.identifier.value,
                             raw.path
@@ -839,7 +930,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                         whenExpr = ContextKeyExpr.deserialize(raw.when);
                         if (!whenExpr) {
                             ext.collector.error(( localize(
-                                8595,
+                                10312,
                                 "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.",
                                 ext.description.identifier.value,
                                 raw.path,
@@ -911,14 +1002,16 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                8596,
+                10313,
                 "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?",
                 extensionId
             ))
         });
         if (confirmed) {
             await this._commandService.executeCommand("workbench.extensions.uninstallExtension", extensionId);
+            return true;
         }
+        return false;
     }
 };
 ExtensionAgentPluginDiscovery = ( __decorate([( __param(0, ICommandService)), ( __param(1, IContextKeyService)), ( __param(2, IDialogService)), ( __param(3, IFileService)), ( __param(4, IPathService)), ( __param(5, ILogService)), ( __param(6, IWorkspaceContextService))], ExtensionAgentPluginDiscovery));
@@ -944,7 +1037,7 @@ class ChatPluginsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(8597, "Path")), ( localize(8598, "When"))];
+        const headers = [( localize(10314, "Path")), ( localize(10315, "When"))];
         const rows = ( contributions.map(d => [d.path, d.when ?? "-"]));
         return {
             data: {
@@ -957,7 +1050,7 @@ class ChatPluginsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatPlugins",
-    label: ( localize(8599, "Chat Plugins")),
+    label: ( localize(10316, "Chat Plugins")),
     access: {
         canToggle: false
     },

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

@@ -3,7 +3,7 @@ import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 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 { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IMarketplaceReference } from "./marketplaceReference.js";
+import { IMarketplaceReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference";
 import { IWorkspacePluginSettingsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.service";
 /**
  * Minimal representation of a marketplace entry from `extraKnownMarketplaces`.

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

@@ -9,7 +9,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { CLAUDE_CONFIG_FOLDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { parseMarketplaceObjectEntry } from './marketplaceReference.js';
+import { parseMarketplaceObjectEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 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';