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

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/media/agentPluginEditor.css

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.agent-plugin-editor {
+	& .marketplace-link {
+		color: var(--vscode-textLink-foreground);
+		text-decoration: none;
+		cursor: pointer;
+
+		&:hover {
+			text-decoration: underline;
+			color: var(--vscode-textLink-activeForeground);
+		}
+	}
+
+	& > .body > .content > .details {
+		display: flex;
+		height: 100%;
+
+		&.narrow {
+			flex-direction: column;
+		}
+
+		& > .content-container {
+			flex: 1;
+			min-width: 0;
+			height: 100%;
+		}
+	}
+}

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.d.ts

@@ -2,13 +2,15 @@ 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";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService";
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
-import { IMarketplacePlugin, IMarketplaceReference, MarketplaceType } from "../common/plugins/pluginMarketplaceService.js";
+import { IMarketplacePlugin, IMarketplaceReference, IPluginSourceDescriptor, MarketplaceType, PluginSourceKind } from "../common/plugins/pluginMarketplaceService.js";
+import { IPluginSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginSource";
 export declare class AgentPluginRepositoryService implements IAgentPluginRepositoryService {
     private readonly _commandService;
     private readonly _fileService;
@@ -19,7 +21,9 @@ export declare class AgentPluginRepositoryService implements IAgentPluginReposit
     readonly _serviceBrand: undefined;
     private readonly _cacheRoot;
     private readonly _marketplaceIndex;
-    constructor(_commandService: ICommandService, environmentService: IEnvironmentService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService, _storageService: IStorageService);
+    private readonly _pluginSources;
+    constructor(_commandService: ICommandService, environmentService: IEnvironmentService, _fileService: IFileService, instantiationService: IInstantiationService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService, _storageService: IStorageService);
+    getPluginSource(kind: PluginSourceKind): IPluginSource;
     getRepositoryUri(marketplace: IMarketplaceReference, marketplaceType?: MarketplaceType): URI;
     getPluginInstallUri(plugin: IMarketplacePlugin): URI;
     ensureRepository(marketplace: IMarketplaceReference, options?: IEnsureRepositoryOptions): Promise<URI>;
@@ -30,4 +34,15 @@ export declare class AgentPluginRepositoryService implements IAgentPluginReposit
     private _saveMarketplaceIndex;
     private _cloneRepository;
     private _getPluginDir;
+    getPluginSourceInstallUri(sourceDescriptor: IPluginSourceDescriptor): URI;
+    ensurePluginSource(plugin: IMarketplacePlugin, options?: IEnsureRepositoryOptions): Promise<URI>;
+    updatePluginSource(plugin: IMarketplacePlugin, options?: IPullRepositoryOptions): Promise<void>;
+    cleanupPluginSource(plugin: IMarketplacePlugin): Promise<void>;
+    /**
+     * Walk from {@link child}'s parent toward {@link _cacheRoot}, removing
+     * each directory that is empty. Stops as soon as a non-empty directory
+     * is found or the cache root is reached. Only operates on descendants
+     * of the cache root — returns immediately for paths outside it.
+     */
+    private _pruneEmptyParents;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.js

@@ -3,11 +3,12 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { joinPath, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { joinPath, dirname, isEqualOrParent, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
@@ -15,7 +16,8 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { MarketplaceReferenceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { PluginSourceKind, MarketplaceReferenceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { RelativePathPluginSource, GitHubPluginSource, GitUrlPluginSource, NpmPluginSource, PipPluginSource } from './pluginSources.js';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 const MARKETPLACE_INDEX_STORAGE_KEY = "chat.plugins.marketplaces.index.v1";
@@ -24,6 +26,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         _commandService,
         environmentService,
         _fileService,
+        instantiationService,
         _logService,
         _notificationService,
         _progressService,
@@ -37,6 +40,20 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         this._storageService = _storageService;
         this._marketplaceIndex = ( new Lazy(() => this._loadMarketplaceIndex()));
         this._cacheRoot = joinPath(environmentService.cacheHome, "agentPlugins");
+        this._pluginSources = ( new Map([[PluginSourceKind.RelativePath, ( new RelativePathPluginSource())], [
+            PluginSourceKind.GitHub,
+            instantiationService.createInstance(GitHubPluginSource)
+        ], [
+            PluginSourceKind.GitUrl,
+            instantiationService.createInstance(GitUrlPluginSource)
+        ], [PluginSourceKind.Npm, instantiationService.createInstance(NpmPluginSource)], [PluginSourceKind.Pip, instantiationService.createInstance(PipPluginSource)]]));
+    }
+    getPluginSource(kind) {
+        const repo = this._pluginSources.get(kind);
+        if (!repo) {
+            throw ( new Error(`No source repository registered for kind '${kind}'`));
+        }
+        return repo;
     }
     getRepositoryUri(marketplace, marketplaceType) {
         if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri && marketplace.localRepositoryUri) {
@@ -62,7 +79,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
             throw ( new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`));
         }
-        const progressTitle = options?.progressTitle ?? ( localize(5000, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
+        const progressTitle = options?.progressTitle ?? ( localize(5019, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
         const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
         await this._cloneRepository(repoDir, marketplace.cloneUrl, progressTitle, failureLabel);
         this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
@@ -81,7 +98,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         try {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(5001, "Updating plugin '{0}'...", updateLabel)),
+                title: ( localize(5020, "Updating plugin '{0}'...", updateLabel)),
                 cancellable: false
             }, async () => {
                 await this._commandService.executeCommand("_git.pull", repoDir.fsPath);
@@ -94,13 +111,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5002,
+                    5021,
                     "Failed to update plugin '{0}': {1}",
                     options?.failureLabel ?? updateLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5003, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5022, "Show Git Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -161,7 +178,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             StorageTarget.MACHINE
         );
     }
-    async _cloneRepository(repoDir, cloneUrl, progressTitle, failureLabel) {
+    async _cloneRepository(repoDir, cloneUrl, progressTitle, failureLabel, ref) {
         try {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
@@ -169,20 +186,20 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
                 cancellable: false
             }, async () => {
                 await this._fileService.createFolder(dirname(repoDir));
-                await this._commandService.executeCommand("_git.cloneRepository", cloneUrl, dirname(repoDir).fsPath);
+                await this._commandService.executeCommand("_git.cloneRepository", cloneUrl, repoDir.fsPath, ref);
             });
         } catch (err) {
             this._logService.error(`[AgentPluginRepositoryService] Failed to clone ${cloneUrl}:`, err);
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5004,
+                    5023,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5003, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5022, "Show Git Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -198,7 +215,68 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         }
         return pluginDir;
     }
+    getPluginSourceInstallUri(sourceDescriptor) {
+        return this.getPluginSource(sourceDescriptor.kind).getInstallUri(this._cacheRoot, sourceDescriptor);
+    }
+    async ensurePluginSource(plugin, options) {
+        const repo = this.getPluginSource(plugin.sourceDescriptor.kind);
+        if (plugin.sourceDescriptor.kind === PluginSourceKind.RelativePath) {
+            return this.ensureRepository(plugin.marketplaceReference, options);
+        }
+        return repo.ensure(this._cacheRoot, plugin, options);
+    }
+    async updatePluginSource(plugin, options) {
+        const repo = this.getPluginSource(plugin.sourceDescriptor.kind);
+        if (plugin.sourceDescriptor.kind === PluginSourceKind.RelativePath) {
+            return this.pullRepository(plugin.marketplaceReference, options);
+        }
+        return repo.update(this._cacheRoot, plugin, options);
+    }
+    async cleanupPluginSource(plugin) {
+        const repo = this.getPluginSource(plugin.sourceDescriptor.kind);
+        const cleanupDir = repo.getCleanupTarget(this._cacheRoot, plugin.sourceDescriptor);
+        if (!cleanupDir) {
+            return;
+        }
+        try {
+            const exists = await this._fileService.exists(cleanupDir);
+            if (exists) {
+                await this._fileService.del(cleanupDir, {
+                    recursive: true
+                });
+                this._logService.info(`[${plugin.sourceDescriptor.kind}] Removed plugin cache: ${( cleanupDir.toString())}`);
+            }
+        } catch (err) {
+            this._logService.warn(
+                `[${plugin.sourceDescriptor.kind}] Failed to remove plugin cache '${( cleanupDir.toString())}':`,
+                err
+            );
+        }
+        try {
+            await this._pruneEmptyParents(cleanupDir);
+        } catch (err) {
+            this._logService.warn(`[${plugin.sourceDescriptor.kind}] Failed to cleanup plugin source:`, err);
+        }
+    }
+    async _pruneEmptyParents(child) {
+        if (!isEqualOrParent(child, this._cacheRoot)) {
+            return;
+        }
+        let current = dirname(child);
+        while (isEqualOrParent(current, this._cacheRoot) && !isEqual(current, this._cacheRoot)) {
+            try {
+                const stat = await this._fileService.resolve(current);
+                if (stat.children && stat.children.length > 0) {
+                    break;
+                }
+                await this._fileService.del(current);
+            } catch {
+                break;
+            }
+            current = dirname(current);
+        }
+    }
 };
-AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IEnvironmentService)), ( __param(2, IFileService)), ( __param(3, ILogService)), ( __param(4, INotificationService)), ( __param(5, IProgressService)), ( __param(6, IStorageService))], AgentPluginRepositoryService));
+AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IProgressService)), ( __param(7, IStorageService))], AgentPluginRepositoryService));
 
 export { AgentPluginRepositoryService };

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.d.ts

@@ -1,6 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IPagedModel } from "@codingame/monaco-vscode-api/vscode/vs/base/common/paging";
-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 { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
@@ -14,36 +13,14 @@ import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { IViewletViewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewsViewlet";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { AbstractExtensionsListView } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsViews";
-import { IAgentPlugin } from "../common/plugins/agentPluginService.js";
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
 import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
-import { IMarketplaceReference, MarketplaceType } from "../common/plugins/pluginMarketplaceService.js";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
+import { IAgentPluginItem } from "./agentPluginEditor/agentPluginItems.js";
 export declare const HasInstalledAgentPluginsContext: RawContextKey<boolean>;
 export declare const InstalledAgentPluginsViewId = "workbench.views.agentPlugins.installed";
-declare enum AgentPluginItemKind {
-    Installed = "installed",
-    Marketplace = "marketplace"
-}
-interface IInstalledPluginItem {
-    readonly kind: AgentPluginItemKind.Installed;
-    readonly name: string;
-    readonly description: string;
-    readonly marketplace?: string;
-    readonly plugin: IAgentPlugin;
-}
-interface IMarketplacePluginItem {
-    readonly kind: AgentPluginItemKind.Marketplace;
-    readonly name: string;
-    readonly description: string;
-    readonly source: string;
-    readonly marketplace: string;
-    readonly marketplaceReference: IMarketplaceReference;
-    readonly marketplaceType: MarketplaceType;
-    readonly readmeUri?: URI;
-}
-type IAgentPluginItem = IInstalledPluginItem | IMarketplacePluginItem;
 interface IAgentPluginsListViewOptions {
     installedOnly?: boolean;
 }
@@ -53,6 +30,7 @@ export declare class AgentPluginsListView extends AbstractExtensionsListView<IAg
     private readonly pluginMarketplaceService;
     private readonly pluginInstallService;
     private readonly labelService;
+    private readonly editorService;
     private readonly actionStore;
     private readonly queryCts;
     private list;
@@ -60,7 +38,7 @@ export declare class AgentPluginsListView extends AbstractExtensionsListView<IAg
     private currentQuery;
     private readonly refreshOnPluginsChangedScheduler;
     private bodyTemplate;
-    constructor(listOptions: IAgentPluginsListViewOptions, options: IViewletViewOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, themeService: IThemeService, hoverService: IHoverService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, agentPluginService: IAgentPluginService, pluginMarketplaceService: IPluginMarketplaceService, pluginInstallService: IPluginInstallService, labelService: ILabelService);
+    constructor(listOptions: IAgentPluginsListViewOptions, options: IViewletViewOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, themeService: IThemeService, hoverService: IHoverService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, agentPluginService: IAgentPluginService, pluginMarketplaceService: IPluginMarketplaceService, pluginInstallService: IPluginInstallService, labelService: ILabelService, editorService: IEditorService);
     protected renderBody(container: HTMLElement): void;
     private onContextMenu;
     private getContextMenuActions;