@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.1

package/vscode/src/vs/workbench/contrib/chat/common/model/objectMutationLog.js

@@ -38,7 +38,7 @@ function value(comparator) {
         extract: from => {
             let value = from;
             if (!!value && typeof value === "object") {
-                value = JSON.parse(JSON.stringify(value));
+                value = deepCloneWithFallback(value);
             }
             return value;
         },
@@ -118,6 +118,9 @@ function stringifyEntryWithFallback(entry) {
         );
     }
 }
+function deepCloneWithFallback(value) {
+    return JSON.parse(stringifyEntryWithFallback(value));
+}
 function makeTruncatingReplacer(maxStringChars, maxTotalChars) {
     let total = 0;
     return (_key, val) => {
@@ -443,4 +446,4 @@ class ObjectMutationLog {
     }
 }
 
-export { ObjectMutationLog, PERSIST_ENTRY_MAX_STRING_CHARS, PERSIST_ENTRY_MAX_TOTAL_CHARS, array, key, makeTruncatingReplacer, object, stringifyEntryWithFallback, t, v, value };
+export { ObjectMutationLog, PERSIST_ENTRY_MAX_STRING_CHARS, PERSIST_ENTRY_MAX_TOTAL_CHARS, array, deepCloneWithFallback, key, makeTruncatingReplacer, object, stringifyEntryWithFallback, t, v, value };

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

@@ -0,0 +1,15 @@
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { AgentPluginDiscoveryPriority, IAgentPlugin } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService";
+import { CollisionEnablementModel, IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
+export interface IDiscoveredAgentPlugins {
+    readonly plugins: readonly IAgentPlugin[];
+    readonly priority: AgentPluginDiscoveryPriority;
+    readonly order: number;
+}
+export declare class AgentPluginCollisionEnablementModel extends CollisionEnablementModel {
+    constructor(base: IEnablementModel, collisionGroups: IObservable<ReadonlyMap<string, readonly string[]>>);
+}
+export declare function getSortedAgentPlugins(discoveries: readonly IDiscoveredAgentPlugins[]): readonly IAgentPlugin[];
+export declare function getCanonicalAgentPluginCollisionGroups(discoveries: readonly IDiscoveredAgentPlugins[], isBlocked?: (plugin: IAgentPlugin) => boolean): ReadonlyMap<string, readonly string[]>;
+export declare function isAgentPluginBlockedByPolicy(plugin: IAgentPlugin, enabledPluginsPolicy: Record<string, boolean> | undefined): boolean;
+export declare function getAgentPluginPolicyId(plugin: IAgentPlugin): string | undefined;

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

@@ -0,0 +1,177 @@
+
+import { PluginSourceKind } from './pluginMarketplaceService.js';
+import { CollisionEnablementModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
+
+const COPILOT_CLI_INSTALL_PATH_FRAGMENT = "/.copilot/installed-plugins/";
+class AgentPluginCollisionEnablementModel extends CollisionEnablementModel {
+    constructor(base, collisionGroups) {
+        super(base, collisionGroups);
+    }
+}
+function getSortedAgentPlugins(discoveries) {
+    return ( getUniqueAgentPluginCandidates(discoveries).map(candidate => candidate.plugin)).sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
+}
+function getCanonicalAgentPluginCollisionGroups(discoveries, isBlocked) {
+    const candidates = getUniqueAgentPluginCandidates(discoveries);
+    const byCanonicalKey = ( new Map());
+    for (const candidate of candidates) {
+        if (isBlocked?.(candidate.plugin)) {
+            continue;
+        }
+        let group = byCanonicalKey.get(candidate.canonicalKey);
+        if (!group) {
+            group = [];
+            byCanonicalKey.set(candidate.canonicalKey, group);
+        }
+        group.push(( candidate.plugin.uri.toString()));
+    }
+    const groups = ( new Map());
+    for (const group of ( byCanonicalKey.values())) {
+        if (group.length < 2) {
+            continue;
+        }
+        for (const key of group) {
+            groups.set(key, group);
+        }
+    }
+    return groups;
+}
+function isAgentPluginBlockedByPolicy(plugin, enabledPluginsPolicy) {
+    const pluginId = getAgentPluginPolicyId(plugin);
+    if (enabledPluginsPolicy && ( Object.keys(enabledPluginsPolicy)).length > 0) {
+        return pluginId !== undefined && enabledPluginsPolicy[pluginId] !== true;
+    }
+    return false;
+}
+function getAgentPluginPolicyId(plugin) {
+    const identity = getPolicyIdentity(plugin);
+    return identity ? `${identity.name}@${identity.marketplace}` : undefined;
+}
+function getAgentPluginCandidates(discoveries) {
+    const candidates = [];
+    for (const discovery of discoveries) {
+        for (let pluginOrder = 0; pluginOrder < discovery.plugins.length; pluginOrder++) {
+            const plugin = discovery.plugins[pluginOrder];
+            candidates.push({
+                plugin,
+                priority: discovery.priority,
+                order: discovery.order,
+                pluginOrder,
+                canonicalKey: getCanonicalPluginIdentity(plugin)
+            });
+        }
+    }
+    return candidates.sort(
+        (a, b) => a.priority - b.priority || a.order - b.order || a.pluginOrder - b.pluginOrder || ( a.plugin.uri.toString()).localeCompare(( b.plugin.uri.toString()))
+    );
+}
+function getUniqueAgentPluginCandidates(discoveries) {
+    const unique = [];
+    const seen = ( new Set());
+    for (const candidate of getAgentPluginCandidates(discoveries)) {
+        const key = ( candidate.plugin.uri.toString());
+        if (( seen.has(key))) {
+            continue;
+        }
+        seen.add(key);
+        unique.push(candidate);
+    }
+    return unique;
+}
+function getCanonicalPluginIdentity(plugin) {
+    return getMarketplaceCanonicalIdentity(plugin.fromMarketplace) ?? getCopilotCliInstallCanonicalIdentity(plugin) ?? `uri:${( plugin.uri.toString())}`;
+}
+function getMarketplaceCanonicalIdentity(plugin) {
+    if (!plugin) {
+        return undefined;
+    }
+    const normalizedName = normalizePluginIdentitySegment(plugin.name);
+    const source = plugin.sourceDescriptor;
+    switch (source.kind) {
+    case PluginSourceKind.RelativePath:
+        {
+            if (plugin.marketplaceReference.githubRepo) {
+                return `github:${plugin.marketplaceReference.githubRepo.toLowerCase()}|${normalizedName}`;
+            }
+            return `marketplace:${plugin.marketplaceReference.canonicalId}|${normalizedName}`;
+        }
+    case PluginSourceKind.GitHub:
+        {
+            const github = source;
+            return `github:${github.repo.toLowerCase()}|${normalizedName}`;
+        }
+    case PluginSourceKind.GitUrl:
+        {
+            const git = source;
+            return `git:${git.url.toLowerCase()}|${normalizedName}`;
+        }
+    case PluginSourceKind.Npm:
+        {
+            const npm = source;
+            return `npm:${npm.package.toLowerCase()}|${normalizedName}`;
+        }
+    case PluginSourceKind.Pip:
+        {
+            const pip = source;
+            return `pip:${pip.package.toLowerCase()}|${normalizedName}`;
+        }
+    }
+}
+function getCopilotCliInstallCanonicalIdentity(plugin) {
+    if (plugin.uri.scheme !== "file") {
+        return undefined;
+    }
+    const idx = plugin.uri.path.indexOf(COPILOT_CLI_INSTALL_PATH_FRAGMENT);
+    if (idx === -1) {
+        return undefined;
+    }
+    const segments = plugin.uri.path.slice(idx + COPILOT_CLI_INSTALL_PATH_FRAGMENT.length).split("/").filter(s => s.length > 0);
+    if (segments.length !== 2) {
+        return undefined;
+    }
+    const [bucket, installName] = segments;
+    const normalizedName = normalizePluginIdentitySegment(plugin.label || installName);
+    if (bucket !== "_direct") {
+        return `copilot-cli-marketplace:${normalizePluginIdentitySegment(bucket)}|${normalizedName}`;
+    }
+    const match = /^(?<owner>.+)--(?<repo>.+)--(?<plugin>.+)$/.exec(installName);
+    const groups = match?.groups;
+    if (!groups) {
+        return undefined;
+    }
+    return `github:${groups.owner.toLowerCase()}/${groups.repo.toLowerCase()}|${normalizePluginIdentitySegment(groups.plugin)}`;
+}
+function normalizePluginIdentitySegment(value) {
+    return value.trim().toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9_.:-]/g, "-").replace(/-+/g, "-").replace(/^[-:.]+|[-:.]+$/g, "");
+}
+function getPolicyIdentity(plugin) {
+    const m = plugin.fromMarketplace;
+    if (m) {
+        return {
+            name: m.name,
+            marketplace: m.marketplace,
+            marketplaceReference: m.marketplaceReference
+        };
+    }
+    if (plugin.uri.scheme !== "file") {
+        return undefined;
+    }
+    const idx = plugin.uri.path.indexOf(COPILOT_CLI_INSTALL_PATH_FRAGMENT);
+    if (idx === -1) {
+        return undefined;
+    }
+    const segments = plugin.uri.path.slice(idx + COPILOT_CLI_INSTALL_PATH_FRAGMENT.length).split("/").filter(s => s.length > 0);
+    if (segments.length !== 2) {
+        return undefined;
+    }
+    const [marketplace, name] = segments;
+    if (marketplace === "_direct") {
+        return undefined;
+    }
+    return {
+        name,
+        marketplace
+    };
+}
+
+export { AgentPluginCollisionEnablementModel, getAgentPluginPolicyId, getCanonicalAgentPluginCollisionGroups, getSortedAgentPlugins, isAgentPluginBlockedByPolicy };

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

@@ -22,23 +22,7 @@ export declare class AgentPluginService extends Disposable implements IAgentPlug
     readonly _serviceBrand: undefined;
     readonly plugins: IObservable<readonly IAgentPlugin[]>;
     readonly enablementModel: IEnablementModel;
-    constructor(instantiationService: IInstantiationService, configurationService: IConfigurationService, storageService: IStorageService, pluginMarketplaceService: IPluginMarketplaceService, logService: ILogService);
-    /**
-     * Determines whether a plugin is blocked by enterprise policy:
-     * - If `chat.plugins.enabledPlugins` (policy-managed via `ChatEnabledPlugins`)
-     *   is set, only plugins whose ID appears with value `true` are allowed.
-     * - If `chat.plugins.strictMarketplaces` is on, only plugins from a
-     *   marketplace listed in `chat.plugins.extraMarketplaces` are allowed.
-     *
-     * Plugins without a marketplace provenance (e.g. user-configured filesystem
-     * paths from `chat.pluginLocations`) are never blocked — they are user-side
-     * concerns outside the enterprise enforcement boundary. Copilot-CLI-installed
-     * plugins under `~/.copilot/installed-plugins/<marketplace>/<plugin>/` are
-     * gated using their install-path identity even when they lack rich
-     * marketplace metadata.
-     */
-    private _isBlockedByPolicy;
-    private _dedupeAndSort;
+    constructor(instantiationService: IInstantiationService, configurationService: IConfigurationService, storageService: IStorageService, logService: ILogService);
 }
 /**
  * Describes a single discovered plugin source, before the shared
@@ -67,7 +51,7 @@ export declare abstract class AbstractAgentPluginDiscovery extends Disposable im
     protected readonly _workspaceContextService: IWorkspaceContextService;
     private readonly _pluginEntries;
     private readonly _plugins;
-    readonly plugins: IObservable<readonly IAgentPlugin[]>;
+    readonly plugins: IObservable<readonly IAgentPlugin[] | undefined>;
     private _discoverVersion;
     protected _enablementModel: IEnablementModel;
     constructor(_fileService: IFileService, _pathService: IPathService, _logService: ILogService, _workspaceContextService: IWorkspaceContextService);

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

@@ -6,7 +6,6 @@ import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ite
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { untildify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 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';
@@ -36,17 +35,16 @@ import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 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 { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
+import { getCanonicalAgentPluginCollisionGroups, isAgentPluginBlockedByPolicy, AgentPluginCollisionEnablementModel, getSortedAgentPlugins, getAgentPluginPolicyId } from './agentPluginEnablement.js';
 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';
-import { parseMarketplaceReferences, readConfiguredMarketplaces } from './marketplaceReference.js';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 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';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
 import { observableSignal } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignal';
-import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 function toAgentPluginHooks(groups) {
@@ -64,154 +62,97 @@ function resolveWorkspaceRoot(pluginUri, workspaceContextService) {
     return folder?.uri;
 }
 let AgentPluginService = class AgentPluginService extends Disposable {
-    constructor(
-        instantiationService,
-        configurationService,
-        storageService,
-        pluginMarketplaceService,
-        logService
-    ) {
+    constructor(instantiationService, configurationService, storageService, logService) {
         super();
-        this.enablementModel = this._register(( new EnablementModel("agentPlugins.enablement", storageService)));
+        const baseEnablementModel = this._register(( new EnablementModel("agentPlugins.enablement", storageService)));
         const pluginsEnabled = observableConfigValue(ChatConfiguration.PluginsEnabled, true, configurationService);
         const discoveries = [];
-        for (const descriptor of agentPluginDiscoveryRegistry.getAll()) {
-            const discovery = instantiationService.createInstance(descriptor);
+        for (const registration of agentPluginDiscoveryRegistry.getAll()) {
+            const discovery = instantiationService.createInstance(registration.descriptor);
             this._register(discovery);
-            discoveries.push(discovery);
-            discovery.start(this.enablementModel);
+            discoveries.push({
+                discovery,
+                priority: registration.priority,
+                order: registration.order
+            });
         }
         const enabledPluginsPolicy = observableFromEvent(this, Event.filter(
             configurationService.onDidChangeConfiguration,
             e => e.affectsConfiguration(ChatConfiguration.EnabledPlugins)
         ), () => configurationService.inspect(ChatConfiguration.EnabledPlugins).policyValue);
-        const strictMarketplaces = observableConfigValue(ChatConfiguration.StrictMarketplaces, false, configurationService);
-        const extraMarketplacesChanged = observableSignalFromEvent("extraMarketplaces", Event.filter(
-            configurationService.onDidChangeConfiguration,
-            e => e.affectsConfiguration(ChatConfiguration.ExtraMarketplaces)
-        ));
+        const collisionGroups = derived(reader => {
+            if (!pluginsEnabled.read(reader)) {
+                return ( new Map());
+            }
+            const discoveredPlugins = readDiscoveredAgentPlugins(discoveries, reader);
+            if (!discoveredPlugins) {
+                return ( new Map());
+            }
+            const policy = enabledPluginsPolicy.read(reader);
+            return getCanonicalAgentPluginCollisionGroups(discoveredPlugins, plugin => isAgentPluginBlockedByPolicy(plugin, policy));
+        });
+        this.enablementModel = ( new AgentPluginCollisionEnablementModel(baseEnablementModel, collisionGroups));
+        for (const {
+            discovery
+        } of discoveries) {
+            discovery.start(this.enablementModel);
+        }
         this.plugins = derived(read => {
             if (!pluginsEnabled.read(read)) {
                 return [];
             }
-            return this._dedupeAndSort(discoveries.flatMap(d => d.plugins.read(read)));
+            const discoveredPlugins = readDiscoveredAgentPlugins(discoveries, read);
+            if (!discoveredPlugins) {
+                return [];
+            }
+            return getSortedAgentPlugins(discoveredPlugins);
         });
         this._register(autorun(reader => {
             const plugins = this.plugins.read(reader);
             const policy = enabledPluginsPolicy.read(reader);
-            const strict = strictMarketplaces.read(reader);
-            extraMarketplacesChanged.read(reader);
-            const trustedExtras = strict ? parseMarketplaceReferences(readConfiguredMarketplaces(configurationService).extraValues) : [];
             transaction(tx => {
                 for (const plugin of plugins) {
-                    setPolicyBlocked(plugin, this._isBlockedByPolicy(
-                        plugin,
-                        policy,
-                        strict,
-                        trustedExtras,
-                        pluginMarketplaceService,
-                        logService
-                    ), tx);
+                    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`
+                        );
+                    }
                 }
             });
         }));
     }
-    _isBlockedByPolicy(
-        plugin,
-        enabledPluginsPolicy,
-        strictMarketplaces,
-        trustedExtras,
-        pluginMarketplaceService,
-        logService
-    ) {
-        const identity = getPolicyIdentity(plugin);
-        if (!identity) {
-            return false;
-        }
-        const pluginId = `${identity.name}@${identity.marketplace}`;
-        if (enabledPluginsPolicy && ( Object.keys(enabledPluginsPolicy)).length > 0) {
-            if (enabledPluginsPolicy[pluginId] !== true) {
-                logService.debug(
-                    `[AgentPluginService] Plugin '${pluginId}' blocked — not enabled by ChatEnabledPlugins policy`
-                );
-                return true;
-            }
-        }
-        if (strictMarketplaces) {
-            const trusted = identity.marketplaceReference ? pluginMarketplaceService.isMarketplaceTrusted(identity.marketplaceReference) : isCliBucketTrusted(identity.marketplace, trustedExtras);
-            if (!trusted) {
-                logService.debug(
-                    `[AgentPluginService] Plugin '${pluginId}' blocked — marketplace not trusted under strict mode`
-                );
-                return true;
-            }
-        }
-        return false;
-    }
-    _dedupeAndSort(plugins) {
-        const unique = [];
-        const seen = ( new ResourceSet());
-        for (const plugin of plugins) {
-            if (( seen.has(plugin.uri))) {
-                continue;
-            }
-            seen.add(plugin.uri);
-            unique.push(plugin);
+};
+AgentPluginService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IConfigurationService)), ( __param(2, IStorageService)), ( __param(3, ILogService))], AgentPluginService));
+function readDiscoveredAgentPlugins(discoveries, reader) {
+    const result = [];
+    for (const {
+        discovery,
+        priority,
+        order
+    } of discoveries) {
+        const plugins = discovery.plugins.read(reader);
+        if (!plugins) {
+            return undefined;
         }
-        unique.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
-        return unique;
+        result.push({
+            plugins,
+            priority,
+            order
+        });
     }
-};
-AgentPluginService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IConfigurationService)), ( __param(2, IStorageService)), ( __param(3, IPluginMarketplaceService)), ( __param(4, ILogService))], AgentPluginService));
+    return result;
+}
 function setPolicyBlocked(plugin, blocked, tx) {
     const obs = plugin.policyBlocked;
     if (obs && typeof obs.set === "function") {
+        if (obs.get() === blocked) {
+            return false;
+        }
         obs.set(blocked, tx);
+        return true;
     }
-}
-const COPILOT_CLI_INSTALL_PATH_FRAGMENT = "/.copilot/installed-plugins/";
-function getPolicyIdentity(plugin) {
-    const m = plugin.fromMarketplace;
-    if (m) {
-        return {
-            name: m.name,
-            marketplace: m.marketplace,
-            marketplaceReference: m.marketplaceReference
-        };
-    }
-    if (plugin.uri.scheme !== "file") {
-        return undefined;
-    }
-    const idx = plugin.uri.path.indexOf(COPILOT_CLI_INSTALL_PATH_FRAGMENT);
-    if (idx === -1) {
-        return undefined;
-    }
-    const segments = plugin.uri.path.slice(idx + COPILOT_CLI_INSTALL_PATH_FRAGMENT.length).split("/").filter(s => s.length > 0);
-    if (segments.length !== 2) {
-        return undefined;
-    }
-    const [marketplace, name] = segments;
-    if (marketplace === "_direct") {
-        return undefined;
-    }
-    return {
-        name,
-        marketplace
-    };
-}
-function isCliBucketTrusted(bucket, trustedExtras) {
-    return ( trustedExtras.some(ref => {
-        if (ref.githubRepo && ref.githubRepo.split("/").pop() === bucket) {
-            return true;
-        }
-        if (ref.displayLabel === bucket || ref.displayLabel.endsWith(`/${bucket}`)) {
-            return true;
-        }
-        if (ref.canonicalId.endsWith(`/${bucket}`) || ref.canonicalId.endsWith(`/${bucket}.git`)) {
-            return true;
-        }
-        return false;
-    }));
+    return false;
 }
 class AbstractAgentPluginDiscovery extends Disposable {
     constructor(_fileService, _pathService, _logService, _workspaceContextService) {
@@ -221,7 +162,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
         this._logService = _logService;
         this._workspaceContextService = _workspaceContextService;
         this._pluginEntries = ( new Map());
-        this._plugins = observableValue("discoveredAgentPlugins", []);
+        this._plugins = observableValue("discoveredAgentPlugins", undefined);
         this.plugins = this._plugins;
         this._discoverVersion = 0;
     }
@@ -335,7 +276,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
             "hooks",
             paths => this._readHooksFromPaths(uri, paths, format),
             async section => {
-                const userHome = (await this._pathService.userHome()).fsPath;
+                const userHome = await this._pathService.userHome();
                 const workspaceRoot = resolveWorkspaceRoot(uri, this._workspaceContextService);
                 return toAgentPluginHooks(format.parseHooks(manifestUri, section, uri, workspaceRoot, userHome));
             },
@@ -388,7 +329,7 @@ class AbstractAgentPluginDiscovery extends Disposable {
         return undefined;
     }
     async _readHooksFromPaths(pluginUri, paths, format) {
-        const userHome = (await this._pathService.userHome()).fsPath;
+        const userHome = await this._pathService.userHome();
         const workspaceRoot = resolveWorkspaceRoot(pluginUri, this._workspaceContextService);
         for (const hookPath of paths) {
             const json = await this._readJsonFile(hookPath);
@@ -794,13 +735,13 @@ let CopilotCliAgentPluginDiscovery = class CopilotCliAgentPluginDiscovery extend
         const {
             confirmed
         } = await this._dialogService.confirm({
-            message: ( localize(7981, "This plugin was installed by the Copilot CLI. Remove it from disk?")),
+            message: ( localize(8587, "This plugin was installed by the Copilot CLI. Remove it from disk?")),
             detail: ( localize(
-                7982,
+                8588,
                 "The plugin directory '{0}' will be moved to the trash. You can reinstall it later via the Copilot CLI.",
                 resource.fsPath
             )),
-            primaryButton: ( localize(7983, "Remove"))
+            primaryButton: ( localize(8589, "Remove"))
         });
         if (!confirmed) {
             return;
@@ -820,7 +761,7 @@ CopilotCliAgentPluginDiscovery = ( __decorate([( __param(0, IFileService)), ( __
 const epPlugins = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatPlugins",
     jsonSchema: {
-        description: ( localize(7984, "Contributes agent plugins for chat.")),
+        description: ( localize(8590, "Contributes agent plugins for chat.")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -834,13 +775,13 @@ const epPlugins = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 path: {
                     description: ( localize(
-                        7985,
+                        8591,
                         "Path to the agent plugin root directory relative to the extension root."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(7986, "(Optional) A condition which must be true to enable this plugin.")),
+                    description: ( localize(8592, "(Optional) A condition which must be true to enable this plugin.")),
                     type: "string"
                 }
             }
@@ -877,7 +818,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7987,
+                            8593,
                             "Extension '{0}' cannot register a chatPlugins entry without a path.",
                             ext.description.identifier.value
                         )));
@@ -886,7 +827,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                     const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7988,
+                            8594,
                             "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.",
                             ext.description.identifier.value,
                             raw.path
@@ -898,7 +839,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                         whenExpr = ContextKeyExpr.deserialize(raw.when);
                         if (!whenExpr) {
                             ext.collector.error(( localize(
-                                7989,
+                                8595,
                                 "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.",
                                 ext.description.identifier.value,
                                 raw.path,
@@ -922,6 +863,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             this._rebuildWhenKeys();
             scheduler.schedule();
         });
+        scheduler.schedule();
     }
     _rebuildWhenKeys() {
         this._whenKeys.clear();
@@ -969,7 +911,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                7990,
+                8596,
                 "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?",
                 extensionId
             ))
@@ -1002,7 +944,7 @@ class ChatPluginsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7991, "Path")), ( localize(7992, "When"))];
+        const headers = [( localize(8597, "Path")), ( localize(8598, "When"))];
         const rows = ( contributions.map(d => [d.path, d.when ?? "-"]));
         return {
             data: {
@@ -1015,7 +957,7 @@ class ChatPluginsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatPlugins",
-    label: ( localize(7993, "Chat Plugins")),
+    label: ( localize(8599, "Chat Plugins")),
     access: {
         canToggle: false
     },

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

@@ -1,6 +1,6 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IExtraKnownMarketplaceEntry } from "@codingame/monaco-vscode-api/vscode/vs/base/common/managedSettings";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+export { extraKnownMarketplacesToConfigDict } from "@codingame/monaco-vscode-api/vscode/vs/base/common/managedSettings";
 export declare enum MarketplaceReferenceKind {
     GitHubShorthand = "githubShorthand",
     GitUri = "gitUri",
@@ -33,21 +33,6 @@ export interface IConfiguredMarketplaces {
     readonly extraValues: readonly unknown[];
     readonly effectiveValues: readonly unknown[];
 }
-/**
- * Converts the {@link IExtraKnownMarketplaceEntry} array delivered by the
- * `ChatExtraMarketplaces` policy into the `{ [name]: url-or-shorthand }` dict
- * stored on the `chat.plugins.extraMarketplaces` setting.
- *
- * The dict shape is what the Settings Editor's ComplexObject renderer can
- * display inline as key/value rows. {@link readConfiguredMarketplaces} reverses
- * this conversion so {@link parseMarketplaceReferences} keeps producing
- * `displayLabel = name` (required for `enabledPlugins["plugin@<name>"]` keys).
- *
- * Plain-string entries (allowed by the policy schema but unnamed) are stored
- * with the value used as both key and value so they survive the round-trip
- * intact.
- */
-export declare function extraKnownMarketplacesToConfigDict(entries: readonly (string | IExtraKnownMarketplaceEntry)[] | undefined): Record<string, string> | undefined;
 export declare function readConfiguredMarketplaces(configurationService: IConfigurationService): IConfiguredMarketplaces;
 export declare function parseMarketplaceReferences(values: readonly unknown[]): IMarketplaceReference[];
 /**