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

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

@@ -9,6 +9,8 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IAgentPlugin, IAgentPluginDiscovery } from "./agentPluginService.js";
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
+import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
+import { IMarketplacePlugin } from "./pluginMarketplaceService.js";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
 /**
  * Replaces `${CLAUDE_PLUGIN_ROOT}` in a shell command string with the
@@ -29,35 +31,44 @@ export declare class AgentPluginService extends Disposable implements IAgentPlug
     setPluginEnabled(pluginUri: URI, enabled: boolean): void;
     private _dedupeAndSort;
 }
-export declare class ConfiguredAgentPluginDiscovery extends Disposable implements IAgentPluginDiscovery {
-    private readonly _configurationService;
-    private readonly _fileService;
-    private readonly _pluginMarketplaceService;
-    private readonly _workspaceContextService;
-    private readonly _pathService;
-    private readonly _logService;
-    private readonly _instantiationService;
-    private readonly _pluginPathsConfig;
+/**
+ * Describes a single discovered plugin source, before the shared
+ * infrastructure builds the full {@link IAgentPlugin} from it.
+ */
+interface IPluginSource {
+    readonly uri: URI;
+    readonly enabled: boolean;
+    readonly fromMarketplace: IMarketplacePlugin | undefined;
+    /** Called when setEnabled is invoked on the plugin */
+    setEnabled(value: boolean): void;
+    /** Called when remove is invoked on the plugin */
+    remove(): void;
+}
+/**
+ * Shared base class for plugin discovery implementations. Contains the common
+ * logic for reading plugin contents (commands, skills, agents, hooks, MCP server
+ * definitions) from the filesystem and watching for live updates.
+ *
+ * Subclasses implement {@link _discoverPluginSources} to determine *which*
+ * plugins exist, while this class handles the rest.
+ */
+export declare abstract class AbstractAgentPluginDiscovery extends Disposable implements IAgentPluginDiscovery {
+    protected readonly _fileService: IFileService;
+    protected readonly _pathService: IPathService;
+    protected readonly _logService: ILogService;
+    protected readonly _instantiationService: IInstantiationService;
     private readonly _pluginEntries;
     private readonly _plugins;
     readonly plugins: IObservable<readonly IAgentPlugin[]>;
-    private _discoverVersion;
-    constructor(_configurationService: IConfigurationService, _fileService: IFileService, _pluginMarketplaceService: IPluginMarketplaceService, _workspaceContextService: IWorkspaceContextService, _pathService: IPathService, _logService: ILogService, _instantiationService: IInstantiationService);
-    start(): void;
-    private _refreshPlugins;
-    private _discoverPlugins;
-    /**
-     * Resolves a plugin path to one or more resource URIs. Absolute paths are
-     * used directly; relative paths are resolved against each workspace folder.
-     */
-    private _resolvePluginPath;
-    /**
-     * Updates the enabled state of a plugin path in the configuration,
-     * writing to the most specific config target where the key is defined.
-     */
-    private _updatePluginPathEnabled;
+    protected _discoverVersion: number;
+    constructor(_fileService: IFileService, _pathService: IPathService, _logService: ILogService, _instantiationService: IInstantiationService);
+    abstract start(): void;
+    protected _refreshPlugins(): Promise<void>;
+    /** Subclasses return plugin sources to discover. */
+    protected abstract _discoverPluginSources(): Promise<readonly IPluginSource[]>;
+    private _discoverAndBuildPlugins;
     private _detectPluginFormatAdapter;
-    private _pathExists;
+    protected _pathExists(resource: URI): Promise<boolean>;
     private _toPlugin;
     private _readMcpDefinitions;
     private _readInlinePluginJsonMcpDefinitions;
@@ -71,3 +82,38 @@ export declare class ConfiguredAgentPluginDiscovery extends Disposable implement
     private _disposePluginEntriesExcept;
     dispose(): void;
 }
+export declare class ConfiguredAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+    private readonly _configurationService;
+    private readonly _pluginMarketplaceService;
+    private readonly _workspaceContextService;
+    private readonly _pluginLocationsConfig;
+    constructor(_configurationService: IConfigurationService, fileService: IFileService, _pluginMarketplaceService: IPluginMarketplaceService, _workspaceContextService: IWorkspaceContextService, pathService: IPathService, logService: ILogService, instantiationService: IInstantiationService);
+    start(): void;
+    protected _discoverPluginSources(): Promise<readonly IPluginSource[]>;
+    private _getUserHome;
+    /**
+     * Resolves a plugin path to one or more resource URIs. Supports:
+     * - Absolute paths (used directly)
+     * - Tilde paths (expanded to user home directory)
+     * - Relative paths (resolved against each workspace folder)
+     */
+    private _resolvePluginPath;
+    /**
+     * Updates the enabled state of a plugin path in the configuration,
+     * writing to the most specific config target where the key is defined.
+     */
+    private _updatePluginPathEnabled;
+    /**
+     * Removes a plugin path from `chat.pluginLocations` in the most specific
+     * config target where the key is defined.
+     */
+    private _removePluginPath;
+}
+export declare class MarketplaceAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+    private readonly _pluginMarketplaceService;
+    private readonly _pluginRepositoryService;
+    constructor(_pluginMarketplaceService: IPluginMarketplaceService, _pluginRepositoryService: IAgentPluginRepositoryService, fileService: IFileService, pathService: IPathService, logService: ILogService, instantiationService: IInstantiationService);
+    start(): void;
+    protected _discoverPluginSources(): Promise<readonly IPluginSource[]>;
+}
+export {};

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 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 { cloneAndChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
@@ -23,9 +24,10 @@ import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { parseClaudeHooks } from '../promptSyntax/hookClaudeCompat.js';
 import { parseCopilotHooks } from '../promptSyntax/hookCompatibility.js';
 import { agentPluginDiscoveryRegistry } from './agentPluginService.js';
+import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 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 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 const COMMAND_FILE_SUFFIX = ".md";
@@ -181,21 +183,10 @@ let AgentPluginService = class AgentPluginService extends Disposable {
     }
 };
 AgentPluginService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IConfigurationService))], AgentPluginService));
-let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extends Disposable {
-    constructor(
-        _configurationService,
-        _fileService,
-        _pluginMarketplaceService,
-        _workspaceContextService,
-        _pathService,
-        _logService,
-        _instantiationService
-    ) {
+class AbstractAgentPluginDiscovery extends Disposable {
+    constructor(_fileService, _pathService, _logService, _instantiationService) {
         super();
-        this._configurationService = _configurationService;
         this._fileService = _fileService;
-        this._pluginMarketplaceService = _pluginMarketplaceService;
-        this._workspaceContextService = _workspaceContextService;
         this._pathService = _pathService;
         this._logService = _logService;
         this._instantiationService = _instantiationService;
@@ -203,94 +194,38 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
         this._plugins = observableValue("discoveredAgentPlugins", []);
         this.plugins = this._plugins;
         this._discoverVersion = 0;
-        this._pluginPathsConfig = observableConfigValue(ChatConfiguration.PluginPaths, {}, _configurationService);
-    }
-    start() {
-        const scheduler = this._register(( new RunOnceScheduler(() => this._refreshPlugins(), 0)));
-        this._register(autorun(reader => {
-            this._pluginPathsConfig.read(reader);
-            scheduler.schedule();
-        }));
-        scheduler.schedule();
     }
     async _refreshPlugins() {
         const version = ++this._discoverVersion;
-        const plugins = await this._discoverPlugins();
+        const plugins = await this._discoverAndBuildPlugins();
         if (version !== this._discoverVersion || this._store.isDisposed) {
             return;
         }
         this._plugins.set(plugins, undefined);
     }
-    async _discoverPlugins() {
+    async _discoverAndBuildPlugins() {
+        const sources = await this._discoverPluginSources();
         const plugins = [];
         const seenPluginUris = ( new Set());
-        const config = this._pluginPathsConfig.get();
-        for (const [path, enabled] of Object.entries(config)) {
-            if (!path.trim()) {
-                continue;
-            }
-            const resources = this._resolvePluginPath(path.trim());
-            for (const resource of resources) {
-                let stat;
-                try {
-                    stat = await this._fileService.resolve(resource);
-                } catch {
-                    this._logService.debug(
-                        `[ConfiguredAgentPluginDiscovery] Could not resolve plugin path: ${( resource.toString())}`
-                    );
-                    continue;
-                }
-                if (!stat.isDirectory) {
-                    this._logService.debug(
-                        `[ConfiguredAgentPluginDiscovery] Plugin path is not a directory: ${( resource.toString())}`
-                    );
-                    continue;
-                }
-                const key = ( stat.resource.toString());
-                if (!( seenPluginUris.has(key))) {
-                    const adapter = await this._detectPluginFormatAdapter(stat.resource);
-                    const fromMarketplace = await this._pluginMarketplaceService.getMarketplacePluginMetadata(stat.resource);
-                    seenPluginUris.add(key);
-                    plugins.push(this._toPlugin(stat.resource, path, enabled, adapter, fromMarketplace));
-                }
+        for (const source of sources) {
+            const key = ( source.uri.toString());
+            if (!( seenPluginUris.has(key))) {
+                seenPluginUris.add(key);
+                const adapter = await this._detectPluginFormatAdapter(source.uri);
+                plugins.push(this._toPlugin(
+                    source.uri,
+                    source.enabled,
+                    adapter,
+                    source.fromMarketplace,
+                    value => source.setEnabled(value),
+                    () => source.remove()
+                ));
             }
         }
         this._disposePluginEntriesExcept(seenPluginUris);
         plugins.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
         return plugins;
     }
-    _resolvePluginPath(path) {
-        if (win32.isAbsolute(path) || posix.isAbsolute(path)) {
-            return [URI.file(path)];
-        }
-        return ( this._workspaceContextService.getWorkspace().folders.map(folder => joinPath(folder.uri, path)));
-    }
-    _updatePluginPathEnabled(configKey, value) {
-        const inspected = this._configurationService.inspect(ChatConfiguration.PluginPaths);
-        const targets = [
-            ConfigurationTarget.WORKSPACE_FOLDER,
-            ConfigurationTarget.WORKSPACE,
-            ConfigurationTarget.USER_LOCAL,
-            ConfigurationTarget.USER_REMOTE,
-            ConfigurationTarget.USER,
-            ConfigurationTarget.APPLICATION
-        ];
-        for (const target of targets) {
-            const mapping = getConfigValueInTarget(inspected, target);
-            if (mapping && Object.prototype.hasOwnProperty.call(mapping, configKey)) {
-                this._configurationService.updateValue(ChatConfiguration.PluginPaths, {
-                    ...mapping,
-                    [configKey]: value
-                }, target);
-                return;
-            }
-        }
-        const current = getConfigValueInTarget(inspected, ConfigurationTarget.USER_LOCAL) ?? {};
-        this._configurationService.updateValue(ChatConfiguration.PluginPaths, {
-            ...current,
-            [configKey]: value
-        }, ConfigurationTarget.USER_LOCAL);
-    }
     async _detectPluginFormatAdapter(pluginUri) {
         const isInClaudeDirectory = pluginUri.path.split("/").includes(".claude");
         if (isInClaudeDirectory || (await this._pathExists(joinPath(pluginUri, ".claude-plugin", "plugin.json")))) {
@@ -306,7 +241,14 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
             return false;
         }
     }
-    _toPlugin(uri, configKey, initialEnabled, adapter, fromMarketplace) {
+    _toPlugin(
+        uri,
+        initialEnabled,
+        adapter,
+        fromMarketplace,
+        setEnabledCallback,
+        removeCallback
+    ) {
         const key = ( uri.toString());
         const existing = this._pluginEntries.get(key);
         if (existing) {
@@ -372,10 +314,10 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
         mcpScheduler.schedule();
         const plugin = {
             uri,
+            label: fromMarketplace?.name ?? basename(uri),
             enabled,
-            setEnabled: value => {
-                this._updatePluginPathEnabled(configKey, value);
-            },
+            setEnabled: setEnabledCallback,
+            remove: removeCallback,
             hooks,
             commands,
             skills,
@@ -616,7 +558,191 @@ let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extend
         this._disposePluginEntriesExcept(( new Set()));
         super.dispose();
     }
+}
+let ConfiguredAgentPluginDiscovery = class ConfiguredAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+    constructor(
+        _configurationService,
+        fileService,
+        _pluginMarketplaceService,
+        _workspaceContextService,
+        pathService,
+        logService,
+        instantiationService
+    ) {
+        super(fileService, pathService, logService, instantiationService);
+        this._configurationService = _configurationService;
+        this._pluginMarketplaceService = _pluginMarketplaceService;
+        this._workspaceContextService = _workspaceContextService;
+        this._pluginLocationsConfig = observableConfigValue(ChatConfiguration.PluginLocations, {}, _configurationService);
+    }
+    start() {
+        const scheduler = this._register(( new RunOnceScheduler(() => this._refreshPlugins(), 0)));
+        this._register(autorun(reader => {
+            this._pluginLocationsConfig.read(reader);
+            scheduler.schedule();
+        }));
+        scheduler.schedule();
+    }
+    async _discoverPluginSources() {
+        const sources = [];
+        const config = this._pluginLocationsConfig.get();
+        const userHome = await this._getUserHome();
+        for (const [path, enabled] of Object.entries(config)) {
+            if (!path.trim()) {
+                continue;
+            }
+            const resources = this._resolvePluginPath(path.trim(), userHome);
+            for (const resource of resources) {
+                let stat;
+                try {
+                    stat = await this._fileService.resolve(resource);
+                } catch {
+                    this._logService.debug(
+                        `[ConfiguredAgentPluginDiscovery] Could not resolve plugin path: ${( resource.toString())}`
+                    );
+                    continue;
+                }
+                if (!stat.isDirectory) {
+                    this._logService.debug(
+                        `[ConfiguredAgentPluginDiscovery] Plugin path is not a directory: ${( resource.toString())}`
+                    );
+                    continue;
+                }
+                const fromMarketplace = this._pluginMarketplaceService.getMarketplacePluginMetadata(stat.resource);
+                const configKey = path;
+                sources.push({
+                    uri: stat.resource,
+                    enabled,
+                    fromMarketplace,
+                    setEnabled: value => this._updatePluginPathEnabled(configKey, value),
+                    remove: () => this._removePluginPath(configKey)
+                });
+            }
+        }
+        return sources;
+    }
+    async _getUserHome() {
+        const userHome = await this._pathService.userHome();
+        return userHome.scheme === "file" ? userHome.fsPath : userHome.path;
+    }
+    _resolvePluginPath(path, userHome) {
+        if (path.startsWith("~")) {
+            path = untildify(path, userHome);
+        }
+        if (win32.isAbsolute(path) || posix.isAbsolute(path)) {
+            return [URI.file(path)];
+        }
+        return ( this._workspaceContextService.getWorkspace().folders.map(folder => joinPath(folder.uri, path)));
+    }
+    _updatePluginPathEnabled(configKey, value) {
+        const inspected = this._configurationService.inspect(ChatConfiguration.PluginLocations);
+        const targets = [
+            ConfigurationTarget.WORKSPACE_FOLDER,
+            ConfigurationTarget.WORKSPACE,
+            ConfigurationTarget.USER_LOCAL,
+            ConfigurationTarget.USER_REMOTE,
+            ConfigurationTarget.USER,
+            ConfigurationTarget.APPLICATION
+        ];
+        for (const target of targets) {
+            const mapping = getConfigValueInTarget(inspected, target);
+            if (mapping && Object.prototype.hasOwnProperty.call(mapping, configKey)) {
+                this._configurationService.updateValue(ChatConfiguration.PluginLocations, {
+                    ...mapping,
+                    [configKey]: value
+                }, target);
+                return;
+            }
+        }
+        const current = getConfigValueInTarget(inspected, ConfigurationTarget.USER_LOCAL) ?? {};
+        this._configurationService.updateValue(ChatConfiguration.PluginLocations, {
+            ...current,
+            [configKey]: value
+        }, ConfigurationTarget.USER_LOCAL);
+    }
+    _removePluginPath(configKey) {
+        const inspected = this._configurationService.inspect(ChatConfiguration.PluginLocations);
+        const targets = [
+            ConfigurationTarget.WORKSPACE_FOLDER,
+            ConfigurationTarget.WORKSPACE,
+            ConfigurationTarget.USER_LOCAL,
+            ConfigurationTarget.USER_REMOTE,
+            ConfigurationTarget.USER,
+            ConfigurationTarget.APPLICATION
+        ];
+        for (const target of targets) {
+            const mapping = getConfigValueInTarget(inspected, target);
+            if (mapping && Object.prototype.hasOwnProperty.call(mapping, configKey)) {
+                const updated = {
+                    ...mapping
+                };
+                delete updated[configKey];
+                this._configurationService.updateValue(ChatConfiguration.PluginLocations, updated, target);
+                return;
+            }
+        }
+    }
 };
 ConfiguredAgentPluginDiscovery = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IPluginMarketplaceService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IPathService)), ( __param(5, ILogService)), ( __param(6, IInstantiationService))], ConfiguredAgentPluginDiscovery));
+let MarketplaceAgentPluginDiscovery = class MarketplaceAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+    constructor(
+        _pluginMarketplaceService,
+        _pluginRepositoryService,
+        fileService,
+        pathService,
+        logService,
+        instantiationService
+    ) {
+        super(fileService, pathService, logService, instantiationService);
+        this._pluginMarketplaceService = _pluginMarketplaceService;
+        this._pluginRepositoryService = _pluginRepositoryService;
+    }
+    start() {
+        const scheduler = this._register(( new RunOnceScheduler(() => this._refreshPlugins(), 0)));
+        this._register(autorun(reader => {
+            this._pluginMarketplaceService.installedPlugins.read(reader);
+            scheduler.schedule();
+        }));
+        scheduler.schedule();
+    }
+    async _discoverPluginSources() {
+        const installed = this._pluginMarketplaceService.installedPlugins.get();
+        const sources = [];
+        for (const entry of installed) {
+            let stat;
+            try {
+                stat = await this._fileService.resolve(entry.pluginUri);
+            } catch {
+                this._logService.debug(
+                    `[MarketplaceAgentPluginDiscovery] Could not resolve installed plugin: ${( entry.pluginUri.toString())}`
+                );
+                continue;
+            }
+            if (!stat.isDirectory) {
+                this._logService.debug(
+                    `[MarketplaceAgentPluginDiscovery] Installed plugin path is not a directory: ${( entry.pluginUri.toString())}`
+                );
+                continue;
+            }
+            sources.push({
+                uri: stat.resource,
+                enabled: entry.enabled,
+                fromMarketplace: entry.plugin,
+                setEnabled: value => this._pluginMarketplaceService.setInstalledPluginEnabled(entry.pluginUri, value),
+                remove: () => {
+                    this._pluginMarketplaceService.removeInstalledPlugin(entry.pluginUri);
+                    this._pluginRepositoryService.cleanupPluginSource(entry.plugin).catch(error => {
+                        this._logService.error(
+                            "[MarketplaceAgentPluginDiscovery] Failed to clean up plugin source",
+                            error
+                        );
+                    });
+                }
+            });
+        }
+        return sources;
+    }
+};
+MarketplaceAgentPluginDiscovery = ( __decorate([( __param(0, IPluginMarketplaceService)), ( __param(1, IAgentPluginRepositoryService)), ( __param(2, IFileService)), ( __param(3, IPathService)), ( __param(4, ILogService)), ( __param(5, IInstantiationService))], MarketplaceAgentPluginDiscovery));
 
-export { AgentPluginService, ConfiguredAgentPluginDiscovery, shellQuotePluginRootInCommand };
+export { AbstractAgentPluginDiscovery, AgentPluginService, ConfiguredAgentPluginDiscovery, MarketplaceAgentPluginDiscovery, shellQuotePluginRootInCommand };

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

@@ -1,5 +1,7 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { 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 { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -27,12 +29,52 @@ export interface IMarketplaceReference {
     readonly githubRepo?: string;
     readonly localRepositoryUri?: URI;
 }
+export declare enum PluginSourceKind {
+    RelativePath = "relativePath",
+    GitHub = "github",
+    GitUrl = "url",
+    Npm = "npm",
+    Pip = "pip"
+}
+export interface IRelativePathPluginSource {
+    readonly kind: PluginSourceKind.RelativePath;
+    /** Resolved relative path within the marketplace repository. */
+    readonly path: string;
+}
+export interface IGitHubPluginSource {
+    readonly kind: PluginSourceKind.GitHub;
+    readonly repo: string;
+    readonly ref?: string;
+    readonly sha?: string;
+}
+export interface IGitUrlPluginSource {
+    readonly kind: PluginSourceKind.GitUrl;
+    /** Full git repository URL (must end with .git). */
+    readonly url: string;
+    readonly ref?: string;
+    readonly sha?: string;
+}
+export interface INpmPluginSource {
+    readonly kind: PluginSourceKind.Npm;
+    readonly package: string;
+    readonly version?: string;
+    readonly registry?: string;
+}
+export interface IPipPluginSource {
+    readonly kind: PluginSourceKind.Pip;
+    readonly package: string;
+    readonly version?: string;
+    readonly registry?: string;
+}
+export type IPluginSourceDescriptor = IRelativePathPluginSource | IGitHubPluginSource | IGitUrlPluginSource | INpmPluginSource | IPipPluginSource;
 export interface IMarketplacePlugin {
     readonly name: string;
     readonly description: string;
     readonly version: string;
-    /** Subdirectory within the repository where the plugin lives. */
+    /** Subdirectory within the repository where the plugin lives (for relative-path sources). */
     readonly source: string;
+    /** Structured source descriptor indicating how the plugin should be fetched/installed. */
+    readonly sourceDescriptor: IPluginSourceDescriptor;
     /** Marketplace label shown in UI and plugin provenance. */
     readonly marketplace: string;
     /** Canonical reference for clone/update/install location resolution. */
@@ -41,7 +83,23 @@ export interface IMarketplacePlugin {
     readonly marketplaceType: MarketplaceType;
     readonly readmeUri?: URI;
 }
-export declare class PluginMarketplaceService implements IPluginMarketplaceService {
+/** Raw JSON shape of a remote plugin source object in marketplace.json. */
+interface IJsonPluginSource {
+    readonly source: string;
+    readonly repo?: string;
+    readonly url?: string;
+    readonly package?: string;
+    readonly ref?: string;
+    readonly sha?: string;
+    readonly version?: string;
+    readonly registry?: string;
+}
+export interface IMarketplaceInstalledPlugin {
+    readonly pluginUri: URI;
+    readonly plugin: IMarketplacePlugin;
+    readonly enabled: boolean;
+}
+export declare class PluginMarketplaceService extends Disposable implements IPluginMarketplaceService {
     private readonly _configurationService;
     private readonly _requestService;
     private readonly _fileService;
@@ -50,15 +108,39 @@ export declare class PluginMarketplaceService implements IPluginMarketplaceServi
     private readonly _storageService;
     readonly _serviceBrand: undefined;
     private readonly _gitHubMarketplaceCache;
+    private readonly _installedPluginsStore;
+    private readonly _trustedMarketplacesStore;
     readonly onDidChangeMarketplaces: Event<void>;
+    readonly installedPlugins: IObservable<readonly IMarketplaceInstalledPlugin[]>;
     constructor(_configurationService: IConfigurationService, _requestService: IRequestService, _fileService: IFileService, _pluginRepositoryService: IAgentPluginRepositoryService, _logService: ILogService, _storageService: IStorageService);
     fetchMarketplacePlugins(token: CancellationToken): Promise<IMarketplacePlugin[]>;
     private _fetchFromGitHubRepo;
     private _getCachedGitHubMarketplacePlugins;
     private _loadPersistedGitHubMarketplaceCache;
     private _savePersistedGitHubMarketplaceCache;
-    getMarketplacePluginMetadata(pluginUri: URI): Promise<IMarketplacePlugin | undefined>;
+    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;
+    trustMarketplace(ref: IMarketplaceReference): void;
     private _fetchFromClonedRepo;
 }
 export declare function parseMarketplaceReferences(values: readonly unknown[]): IMarketplaceReference[];
 export declare function parseMarketplaceReference(value: string): IMarketplaceReference | undefined;
+/**
+ * Parse a raw `source` field from marketplace.json into a structured
+ * {@link IPluginSourceDescriptor}. Accepts either a relative-path string
+ * or a JSON object with a `source` discriminant indicating the kind.
+ */
+export declare function parsePluginSource(rawSource: string | IJsonPluginSource | undefined, pluginRoot: string | undefined, logContext: {
+    pluginName: string;
+    logService: ILogService;
+    logPrefix: string;
+}): IPluginSourceDescriptor | undefined;
+/**
+ * Returns a human-readable label for a plugin source descriptor,
+ * suitable for error messages and UI display.
+ */
+export declare function getPluginSourceLabel(descriptor: IPluginSourceDescriptor): string;
+export {};