plugins: store installed plugins in storage rather than paths (#298352)

* plugins: store installed plugins in storage rather than paths

This simplifies some things and sets the groundwork for more special
things (like updating and disk cleanup) that we'll do with marketplace
plugins.

* fix

Author: connor4312

src/vs/workbench/contrib/chat/browser/agentPluginsView.ts

@@ -157,13 +157,12 @@ class UninstallPluginAction extends Action {
 
 	constructor(
 		private readonly plugin: IAgentPlugin,
-		@IPluginInstallService private readonly pluginInstallService: IPluginInstallService,
 	) {
 		super(UninstallPluginAction.ID, localize('uninstall', "Uninstall"));
 	}
 
 	override async run(): Promise<void> {
-		this.pluginInstallService.uninstallPlugin(this.plugin.uri);
+		this.plugin.remove();
 	}
 }
 

src/vs/workbench/contrib/chat/browser/chat.contribution.ts

@@ -143,7 +143,7 @@ import './widget/input/editor/chatInputEditorContrib.js';
 import './widget/input/editor/chatInputEditorHover.js';
 import { LanguageModelToolsConfirmationService } from './tools/languageModelToolsConfirmationService.js';
 import { LanguageModelToolsService, globalAutoApproveDescription } from './tools/languageModelToolsService.js';
-import { AgentPluginService, ConfiguredAgentPluginDiscovery } from '../common/plugins/agentPluginServiceImpl.js';
+import { AgentPluginService, ConfiguredAgentPluginDiscovery, MarketplaceAgentPluginDiscovery } from '../common/plugins/agentPluginServiceImpl.js';
 import { IAgentPluginRepositoryService } from '../common/plugins/agentPluginRepositoryService.js';
 import { IPluginInstallService } from '../common/plugins/pluginInstallService.js';
 import { IPluginMarketplaceService, PluginMarketplaceService } from '../common/plugins/pluginMarketplaceService.js';
@@ -1701,6 +1701,7 @@ registerAction2(ConfigureToolSets);
 registerEditorFeature(ChatPasteProvidersFeature);
 
 agentPluginDiscoveryRegistry.register(new SyncDescriptor(ConfiguredAgentPluginDiscovery));
+agentPluginDiscoveryRegistry.register(new SyncDescriptor(MarketplaceAgentPluginDiscovery));
 
 registerSingleton(IChatTransferService, ChatTransferService, InstantiationType.Delayed);
 registerSingleton(IChatService, ChatService, InstantiationType.Delayed);

src/vs/workbench/contrib/chat/browser/pluginInstallService.ts

@@ -5,20 +5,18 @@
 
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
-import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
-import { ChatConfiguration } from '../common/constants.js';
 import { IAgentPluginRepositoryService } from '../common/plugins/agentPluginRepositoryService.js';
 import { IPluginInstallService } from '../common/plugins/pluginInstallService.js';
-import { IMarketplacePlugin } from '../common/plugins/pluginMarketplaceService.js';
+import { IMarketplacePlugin, IPluginMarketplaceService } from '../common/plugins/pluginMarketplaceService.js';
 
 export class PluginInstallService implements IPluginInstallService {
 	declare readonly _serviceBrand: undefined;
 
 	constructor(
 		@IAgentPluginRepositoryService private readonly _pluginRepositoryService: IAgentPluginRepositoryService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IPluginMarketplaceService private readonly _pluginMarketplaceService: IPluginMarketplaceService,
 		@IFileService private readonly _fileService: IFileService,
 		@INotificationService private readonly _notificationService: INotificationService,
 	) { }
@@ -54,7 +52,7 @@ export class PluginInstallService implements IPluginInstallService {
 			return;
 		}
 
-		this._addPluginPath(pluginDir.fsPath);
+		this._pluginMarketplaceService.addInstalledPlugin(pluginDir, plugin);
 	}
 
 	async updatePlugin(plugin: IMarketplacePlugin): Promise<void> {
@@ -65,43 +63,7 @@ export class PluginInstallService implements IPluginInstallService {
 		});
 	}
 
-	async uninstallPlugin(pluginUri: URI): Promise<void> {
-		await this._removePluginPath(pluginUri.fsPath);
-	}
-
 	getPluginInstallUri(plugin: IMarketplacePlugin): URI {
 		return this._pluginRepositoryService.getPluginInstallUri(plugin);
 	}
-
-	/**
-	 * Adds the given file-system path to `chat.plugins.paths` in user-local config.
-	 */
-	private _addPluginPath(fsPath: string): void {
-		const current = this._configurationService.getValue<Record<string, boolean>>(ChatConfiguration.PluginPaths) ?? {};
-		if (Object.prototype.hasOwnProperty.call(current, fsPath)) {
-			return;
-		}
-		this._configurationService.updateValue(
-			ChatConfiguration.PluginPaths,
-			{ ...current, [fsPath]: true },
-			ConfigurationTarget.USER_LOCAL,
-		);
-	}
-
-	/**
-	 * Removes the given file-system path from `chat.plugins.paths` in user-local config.
-	 */
-	private _removePluginPath(fsPath: string) {
-		const current = this._configurationService.getValue<Record<string, boolean>>(ChatConfiguration.PluginPaths) ?? {};
-		if (!Object.prototype.hasOwnProperty.call(current, fsPath)) {
-			return;
-		}
-		const updated = { ...current };
-		delete updated[fsPath];
-		return this._configurationService.updateValue(
-			ChatConfiguration.PluginPaths,
-			updated,
-			ConfigurationTarget.USER_LOCAL,
-		);
-	}
 }

src/vs/workbench/contrib/chat/common/plugins/agentPluginService.ts

@@ -45,6 +45,8 @@ export interface IAgentPlugin {
 	readonly uri: URI;
 	readonly enabled: IObservable<boolean>;
 	setEnabled(enabled: boolean): void;
+	/** Removes this plugin from its discovery source (config or installed storage). */
+	remove(): void;
 	readonly hooks: IObservable<readonly IAgentPluginHook[]>;
 	readonly commands: IObservable<readonly IAgentPluginCommand[]>;
 	readonly skills: IObservable<readonly IAgentPluginSkill[]>;