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

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

@@ -0,0 +1,41 @@
+/**
+ * Storage keys used by ChatTipService for persisting tip state.
+ */
+export declare const ChatTipStorageKeys: {
+    /** IDs of tips that have been permanently dismissed by the user. */
+    DismissedTips: string;
+    /** The ID of the last tip that was shown, for round-robin selection. */
+    LastTipId: string;
+    /** Whether the user has ever modified the thinking phrases setting. */
+    ThinkingPhrasesEverModified: string;
+};
+/**
+ * Storage keys used by TipEligibilityTracker for tracking user signals.
+ */
+export declare const TipEligibilityStorageKeys: {
+    /** Command IDs that have been executed (for excludeWhenCommandsExecuted). */
+    ExecutedCommands: string;
+    /** Chat modes that have been used (for excludeWhenModesUsed). */
+    UsedModes: string;
+    /** Tool IDs that have been invoked (for excludeWhenToolsInvoked). */
+    InvokedTools: string;
+};
+/**
+ * Synthetic command IDs used to track user actions that don't have real commands.
+ * These are recorded when the user performs the action, allowing tips to be excluded
+ * via excludeWhenCommandsExecuted.
+ */
+export declare const TipTrackingCommands: {
+    /** Tracked when user attaches a file/folder reference with #. */
+    readonly AttachFilesReferenceUsed: "chat.tips.attachFiles.referenceUsed";
+    /** Tracked when user executes /init or /create-instructions. */
+    readonly CreateAgentInstructionsUsed: "chat.tips.createAgentInstructions.commandUsed";
+    /** Tracked when user executes /create-prompt. */
+    readonly CreatePromptUsed: "chat.tips.createPrompt.commandUsed";
+    /** Tracked when user executes /create-agent. */
+    readonly CreateAgentUsed: "chat.tips.createAgent.commandUsed";
+    /** Tracked when user executes /create-skill. */
+    readonly CreateSkillUsed: "chat.tips.createSkill.commandUsed";
+    /** Tracked when user executes /fork. */
+    readonly ForkConversationUsed: "chat.tips.forkConversation.commandUsed";
+};

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

@@ -0,0 +1,22 @@
+
+
+const ChatTipStorageKeys = {
+    DismissedTips: 'chat.tip.dismissed',
+    LastTipId: 'chat.tip.lastTipId',
+    ThinkingPhrasesEverModified: 'chat.tip.thinkingPhrasesEverModified',
+};
+const TipEligibilityStorageKeys = {
+    ExecutedCommands: 'chat.tips.executedCommands',
+    UsedModes: 'chat.tips.usedModes',
+    InvokedTools: 'chat.tips.invokedTools',
+};
+const TipTrackingCommands = {
+    AttachFilesReferenceUsed: 'chat.tips.attachFiles.referenceUsed',
+    CreateAgentInstructionsUsed: 'chat.tips.createAgentInstructions.commandUsed',
+    CreatePromptUsed: 'chat.tips.createPrompt.commandUsed',
+    CreateAgentUsed: 'chat.tips.createAgent.commandUsed',
+    CreateSkillUsed: 'chat.tips.createSkill.commandUsed',
+    ForkConversationUsed: 'chat.tips.forkConversation.commandUsed',
+};
+
+export { ChatTipStorageKeys, TipEligibilityStorageKeys, TipTrackingCommands };

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

@@ -1,6 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
@@ -14,12 +13,14 @@ export declare class ChatWindowNotifier extends Disposable implements IWorkbench
     private readonly _chatWidgetService;
     private readonly _hostService;
     private readonly _configurationService;
-    private readonly _commandService;
     static readonly ID = "workbench.contrib.chatWindowNotifier";
     private readonly _activeNotifications;
-    constructor(_chatService: IChatService, _chatWidgetService: IChatWidgetService, _hostService: IHostService, _configurationService: IConfigurationService, _commandService: ICommandService);
+    constructor(_chatService: IChatService, _chatWidgetService: IChatWidgetService, _hostService: IHostService, _configurationService: IConfigurationService);
     private _trackModel;
     private _notifyIfNeeded;
+    private _confirmAllow;
+    private _getNotificationBody;
+    private _getPendingTerminalCommand;
     private _isQuestionCarouselPending;
     private _sanitizeOSToastText;
     private _clearNotification;

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

@@ -7,32 +7,25 @@ import { Disposable, DisposableResourceMap, toDisposable } from '@codingame/mona
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { FocusMode } from '@codingame/monaco-vscode-api/vscode/vs/platform/native/common/native';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
 import { ChatConfiguration, ChatNotificationMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { AcceptToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { autorunIterableDelta, autorunDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
     static {
         this.ID = "workbench.contrib.chatWindowNotifier";
     }
-    constructor(
-        _chatService,
-        _chatWidgetService,
-        _hostService,
-        _configurationService,
-        _commandService
-    ) {
+    constructor(_chatService, _chatWidgetService, _hostService, _configurationService) {
         super();
         this._chatService = _chatService;
         this._chatWidgetService = _chatWidgetService;
         this._hostService = _hostService;
         this._configurationService = _configurationService;
-        this._commandService = _commandService;
         this._activeNotifications = this._register(( new DisposableResourceMap()));
         const modelTrackers = this._register(( new DisposableResourceMap()));
         this._register(
@@ -84,34 +77,75 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
                 mode: FocusMode.Notify
             });
         }
-        const notificationTitle = info.title ? ( localize(6162, "Chat: {0}", info.title)) : ( localize(6163, "Untitled Chat"));
+        const notificationTitle = info.title ? ( localize(6233, "Session: {0}", info.title)) : ( localize(6234, "Untitled Session"));
         const cts = ( new CancellationTokenSource());
         this._activeNotifications.set(sessionResource, toDisposable(() => cts.dispose(true)));
         const isQuestionCarousel = this._isQuestionCarouselPending(sessionResource);
         try {
-            const actionLabel = isQuestionCarousel ? ( localize(6164, "Open Chat")) : ( localize(6165, "Allow"));
-            const body = info.detail ? this._sanitizeOSToastText(info.detail) : isQuestionCarousel ? ( localize(6166, "Questions need your input.")) : ( localize(6167, "Approval needed to continue."));
+            const actionLabel = isQuestionCarousel ? ( localize(6235, "Open Session")) : ( localize(6236, "Allow"));
             const result = await this._hostService.showToast({
                 title: this._sanitizeOSToastText(notificationTitle),
-                body,
+                body: this._getNotificationBody(sessionResource, info, isQuestionCarousel),
                 actions: [actionLabel]
             }, cts.token);
+            if (result.actionIndex === 0 && !isQuestionCarousel && this._confirmAllow(sessionResource)) {
+                return;
+            }
             if (result.clicked || typeof result.actionIndex === "number") {
                 await this._hostService.focus(targetWindow, {
                     mode: FocusMode.Force
                 });
                 const widget = await this._chatWidgetService.openSession(sessionResource);
                 widget?.focusInput();
-                if (result.actionIndex === 0 && !isQuestionCarousel) {
-                    await this._commandService.executeCommand(AcceptToolConfirmationActionId, {
-                        sessionResource
-                    });
-                }
             }
         } finally {
             this._clearNotification(sessionResource);
         }
     }
+    _confirmAllow(sessionResource) {
+        const model = this._chatService.getSession(sessionResource);
+        const lastResponse = model?.lastRequest?.response;
+        if (!lastResponse) {
+            return false;
+        }
+        for (const part of lastResponse.response.value) {
+            const state = part.kind === "toolInvocation" ? part.state.get() : undefined;
+            if (state?.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state?.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                state.confirm({
+                    type: ToolConfirmKind.UserAction
+                });
+                return true;
+            }
+        }
+        return false;
+    }
+    _getNotificationBody(sessionResource, info, isQuestionCarousel) {
+        if (isQuestionCarousel) {
+            return localize(6237, "Questions need your input.");
+        }
+        const terminalCommand = this._getPendingTerminalCommand(sessionResource);
+        if (terminalCommand) {
+            return this._sanitizeOSToastText(terminalCommand);
+        }
+        if (info.detail) {
+            return this._sanitizeOSToastText(info.detail);
+        }
+        return localize(6238, "Approval needed to continue.");
+    }
+    _getPendingTerminalCommand(sessionResource) {
+        const model = this._chatService.getSession(sessionResource);
+        const lastResponse = model?.lastRequest?.response;
+        if (!lastResponse?.response?.value) {
+            return undefined;
+        }
+        for (const part of lastResponse.response.value) {
+            if (part.kind === "toolInvocation" && part.toolSpecificData?.kind === "terminal") {
+                const terminalData = migrateLegacyTerminalToolSpecificData(part.toolSpecificData);
+                return terminalData.commandLine.forDisplay ?? terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+            }
+        }
+        return undefined;
+    }
     _isQuestionCarouselPending(sessionResource) {
         const model = this._chatService.getSession(sessionResource);
         const lastResponse = model?.lastRequest?.response;
@@ -127,6 +161,6 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
         this._activeNotifications.deleteAndDispose(sessionResource);
     }
 };
-ChatWindowNotifier = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatWidgetService)), ( __param(2, IHostService)), ( __param(3, IConfigurationService)), ( __param(4, ICommandService))], ChatWindowNotifier));
+ChatWindowNotifier = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatWidgetService)), ( __param(2, IHostService)), ( __param(3, IConfigurationService))], ChatWindowNotifier));
 
 export { ChatWindowNotifier };

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

@@ -13,8 +13,8 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 function createDefaultModelArrays() {
     return {
         modelIds: [""],
-        modelLabels: [( localize(6168, "Auto (Vendor Default)"))],
-        modelDescriptions: [( localize(6169, "Use the vendor's default model"))]
+        modelLabels: [( localize(6239, "Auto (Vendor Default)"))],
+        modelDescriptions: [( localize(6240, "Use the vendor's default model"))]
     };
 }
 let DefaultModelContribution = class DefaultModelContribution extends Disposable {
@@ -46,8 +46,8 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
             modelLabels.length = 0;
             modelDescriptions.length = 0;
             modelIds.push("");
-            modelLabels.push(( localize(6168, "Auto (Vendor Default)")));
-            modelDescriptions.push(( localize(6169, "Use the vendor's default model")));
+            modelLabels.push(( localize(6239, "Auto (Vendor Default)")));
+            modelDescriptions.push(( localize(6240, "Use the vendor's default model")));
             const models = [];
             const allModelIds = this._languageModelsService.getLanguageModelIds();
             for (const modelId of allModelIds) {

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

@@ -1,27 +1,26 @@
 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 { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 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 { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
 import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
 import { IMarketplacePlugin } from "../common/plugins/pluginMarketplaceService.js";
+import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
 export declare class PluginInstallService implements IPluginInstallService {
     private readonly _pluginRepositoryService;
-    private readonly _configurationService;
+    private readonly _pluginMarketplaceService;
     private readonly _fileService;
     private readonly _notificationService;
+    private readonly _dialogService;
+    private readonly _logService;
     readonly _serviceBrand: undefined;
-    constructor(_pluginRepositoryService: IAgentPluginRepositoryService, _configurationService: IConfigurationService, _fileService: IFileService, _notificationService: INotificationService);
+    constructor(_pluginRepositoryService: IAgentPluginRepositoryService, _pluginMarketplaceService: IPluginMarketplaceService, _fileService: IFileService, _notificationService: INotificationService, _dialogService: IDialogService, _logService: ILogService);
     installPlugin(plugin: IMarketplacePlugin): Promise<void>;
     updatePlugin(plugin: IMarketplacePlugin): Promise<void>;
-    uninstallPlugin(pluginUri: URI): Promise<void>;
     getPluginInstallUri(plugin: IMarketplacePlugin): URI;
-    /**
-     * Adds the given file-system path to `chat.plugins.paths` in user-local config.
-     */
-    private _addPluginPath;
-    /**
-     * Removes the given file-system path from `chat.plugins.paths` in user-local config.
-     */
-    private _removePluginPath;
+    private _ensureMarketplaceTrusted;
+    private _installRelativePathPlugin;
+    private _installGitPlugin;
+    private _installPackagePlugin;
 }

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

@@ -1,31 +1,96 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 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 '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
+import { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 let PluginInstallService = class PluginInstallService {
     constructor(
         _pluginRepositoryService,
-        _configurationService,
+        _pluginMarketplaceService,
         _fileService,
-        _notificationService
+        _notificationService,
+        _dialogService,
+        _logService
     ) {
         this._pluginRepositoryService = _pluginRepositoryService;
-        this._configurationService = _configurationService;
+        this._pluginMarketplaceService = _pluginMarketplaceService;
         this._fileService = _fileService;
         this._notificationService = _notificationService;
+        this._dialogService = _dialogService;
+        this._logService = _logService;
     }
     async installPlugin(plugin) {
+        if (!(await this._ensureMarketplaceTrusted(plugin))) {
+            return;
+        }
+        const kind = plugin.sourceDescriptor.kind;
+        if (kind === PluginSourceKind.RelativePath) {
+            return this._installRelativePathPlugin(plugin);
+        }
+        if (kind === PluginSourceKind.Npm || kind === PluginSourceKind.Pip) {
+            return this._installPackagePlugin(plugin);
+        }
+        return this._installGitPlugin(plugin);
+    }
+    async updatePlugin(plugin) {
+        const kind = plugin.sourceDescriptor.kind;
+        if (kind === PluginSourceKind.Npm || kind === PluginSourceKind.Pip) {
+            return this._installPackagePlugin(plugin);
+        }
+        return this._pluginRepositoryService.updatePluginSource(plugin, {
+            pluginName: plugin.name,
+            failureLabel: plugin.name,
+            marketplaceType: plugin.marketplaceType
+        });
+    }
+    getPluginInstallUri(plugin) {
+        if (plugin.sourceDescriptor.kind === PluginSourceKind.RelativePath) {
+            return this._pluginRepositoryService.getPluginInstallUri(plugin);
+        }
+        return this._pluginRepositoryService.getPluginSourceInstallUri(plugin.sourceDescriptor);
+    }
+    async _ensureMarketplaceTrusted(plugin) {
+        if (this._pluginMarketplaceService.isMarketplaceTrusted(plugin.marketplaceReference)) {
+            return true;
+        }
+        const {
+            confirmed
+        } = await this._dialogService.confirm({
+            type: "question",
+            message: ( localize(
+                6241,
+                "Trust Plugins from '{0}'?",
+                plugin.marketplaceReference.displayLabel
+            )),
+            detail: ( localize(
+                6242,
+                "Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
+                plugin.marketplaceReference.rawValue
+            )),
+            primaryButton: ( localize(6243, "&&Trust")),
+            custom: {
+                icon: Codicon.shield
+            }
+        });
+        if (!confirmed) {
+            return false;
+        }
+        this._pluginMarketplaceService.trustMarketplace(plugin.marketplaceReference);
+        return true;
+    }
+    async _installRelativePathPlugin(plugin) {
         try {
             await this._pluginRepositoryService.ensureRepository(plugin.marketplaceReference, {
-                progressTitle: ( localize(6170, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(6244, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -39,7 +104,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6171,
+                    6245,
                     "Plugin source directory '{0}' is invalid for repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -52,7 +117,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6172,
+                    6246,
                     "Plugin source directory '{0}' not found in repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -60,43 +125,51 @@ let PluginInstallService = class PluginInstallService {
             });
             return;
         }
-        this._addPluginPath(pluginDir.fsPath);
+        this._pluginMarketplaceService.addInstalledPlugin(pluginDir, plugin);
     }
-    async updatePlugin(plugin) {
-        return this._pluginRepositoryService.pullRepository(plugin.marketplaceReference, {
-            pluginName: plugin.name,
-            failureLabel: plugin.name,
-            marketplaceType: plugin.marketplaceType
-        });
-    }
-    async uninstallPlugin(pluginUri) {
-        await this._removePluginPath(pluginUri.fsPath);
-    }
-    getPluginInstallUri(plugin) {
-        return this._pluginRepositoryService.getPluginInstallUri(plugin);
-    }
-    _addPluginPath(fsPath) {
-        const current = this._configurationService.getValue(ChatConfiguration.PluginPaths) ?? {};
-        if (Object.prototype.hasOwnProperty.call(current, fsPath)) {
+    async _installGitPlugin(plugin) {
+        const repo = this._pluginRepositoryService.getPluginSource(plugin.sourceDescriptor.kind);
+        let pluginDir;
+        try {
+            pluginDir = await this._pluginRepositoryService.ensurePluginSource(plugin, {
+                progressTitle: ( localize(6244, "Installing plugin '{0}'...", plugin.name)),
+                failureLabel: plugin.name,
+                marketplaceType: plugin.marketplaceType
+            });
+        } catch {
             return;
         }
-        this._configurationService.updateValue(ChatConfiguration.PluginPaths, {
-            ...current,
-            [fsPath]: true
-        }, ConfigurationTarget.USER_LOCAL);
+        const pluginExists = await this._fileService.exists(pluginDir);
+        if (!pluginExists) {
+            this._notificationService.notify({
+                severity: Severity.Error,
+                message: ( localize(
+                    6247,
+                    "Plugin source '{0}' not found after cloning.",
+                    repo.getLabel(plugin.sourceDescriptor)
+                ))
+            });
+            return;
+        }
+        this._pluginMarketplaceService.addInstalledPlugin(pluginDir, plugin);
     }
-    _removePluginPath(fsPath) {
-        const current = this._configurationService.getValue(ChatConfiguration.PluginPaths) ?? {};
-        if (!Object.prototype.hasOwnProperty.call(current, fsPath)) {
+    async _installPackagePlugin(plugin) {
+        const repo = this._pluginRepositoryService.getPluginSource(plugin.sourceDescriptor.kind);
+        if (!repo.runInstall) {
+            this._logService.error(
+                `[PluginInstallService] Expected package repository for kind '${plugin.sourceDescriptor.kind}'`
+            );
+            return;
+        }
+        const installDir = await this._pluginRepositoryService.ensurePluginSource(plugin);
+        const pluginDir = this._pluginRepositoryService.getPluginSourceInstallUri(plugin.sourceDescriptor);
+        const result = await repo.runInstall(installDir, pluginDir, plugin);
+        if (!result) {
             return;
         }
-        const updated = {
-            ...current
-        };
-        delete updated[fsPath];
-        return this._configurationService.updateValue(ChatConfiguration.PluginPaths, updated, ConfigurationTarget.USER_LOCAL);
+        this._pluginMarketplaceService.addInstalledPlugin(result.pluginDir, plugin);
     }
 };
-PluginInstallService = ( __decorate([( __param(0, IAgentPluginRepositoryService)), ( __param(1, IConfigurationService)), ( __param(2, IFileService)), ( __param(3, INotificationService))], PluginInstallService));
+PluginInstallService = ( __decorate([( __param(0, IAgentPluginRepositoryService)), ( __param(1, IPluginMarketplaceService)), ( __param(2, IFileService)), ( __param(3, INotificationService)), ( __param(4, IDialogService)), ( __param(5, ILogService))], PluginInstallService));
 
 export { PluginInstallService };

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

@@ -0,0 +1,99 @@
+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 { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+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 { 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 { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService";
+import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "../common/plugins/pluginMarketplaceService.js";
+import { IPluginSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginSource";
+declare abstract class AbstractGitPluginSource implements IPluginSource {
+    protected readonly _commandService: ICommandService;
+    protected readonly _fileService: IFileService;
+    protected readonly _logService: ILogService;
+    protected readonly _notificationService: INotificationService;
+    protected readonly _progressService: IProgressService;
+    abstract readonly kind: PluginSourceKind;
+    constructor(_commandService: ICommandService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService);
+    abstract getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    abstract getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected abstract _cloneUrl(descriptor: IPluginSourceDescriptor): string;
+    protected abstract _displayLabel(descriptor: IPluginSourceDescriptor): string;
+    getCleanupTarget(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI | undefined;
+    ensure(cacheRoot: URI, plugin: IMarketplacePlugin, options?: IEnsureRepositoryOptions): Promise<URI>;
+    update(cacheRoot: URI, plugin: IMarketplacePlugin, options?: IPullRepositoryOptions): Promise<void>;
+    private _cloneRepository;
+    private _checkoutRevision;
+}
+export declare class RelativePathPluginSource implements IPluginSource {
+    readonly kind = PluginSourceKind.RelativePath;
+    getInstallUri(_cacheRoot: URI, _descriptor: IPluginSourceDescriptor): URI;
+    ensure(_cacheRoot: URI, _plugin: IMarketplacePlugin, _options?: IEnsureRepositoryOptions): Promise<URI>;
+    update(_cacheRoot: URI, _plugin: IMarketplacePlugin, _options?: IPullRepositoryOptions): Promise<void>;
+    getCleanupTarget(_cacheRoot: URI, _descriptor: IPluginSourceDescriptor): URI | undefined;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+}
+export declare class GitHubPluginSource extends AbstractGitPluginSource {
+    readonly kind = PluginSourceKind.GitHub;
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _cloneUrl(descriptor: IPluginSourceDescriptor): string;
+    protected _displayLabel(descriptor: IPluginSourceDescriptor): string;
+}
+export declare class GitUrlPluginSource extends AbstractGitPluginSource {
+    readonly kind = PluginSourceKind.GitUrl;
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _cloneUrl(descriptor: IPluginSourceDescriptor): string;
+    protected _displayLabel(descriptor: IPluginSourceDescriptor): string;
+    private _gitUrlCacheSegments;
+}
+export declare abstract class AbstractPackagePluginSource implements IPluginSource {
+    protected readonly _dialogService: IDialogService;
+    protected readonly _fileService: IFileService;
+    protected readonly _logService: ILogService;
+    protected readonly _notificationService: INotificationService;
+    protected readonly _progressService: IProgressService;
+    protected readonly _terminalService: ITerminalService;
+    abstract readonly kind: PluginSourceKind;
+    constructor(_dialogService: IDialogService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService, _terminalService: ITerminalService);
+    abstract getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    abstract getLabel(descriptor: IPluginSourceDescriptor): string;
+    getCleanupTarget(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI | undefined;
+    /**
+     * Return the parent directory (prefix / target) where the package
+     * manager installs into. This is above the actual plugin content dir.
+     */
+    protected abstract _getCacheDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    /** Build the terminal command args for install. */
+    protected abstract _buildInstallArgs(installDir: URI, plugin: IMarketplacePlugin): string[];
+    /** Human-readable package manager name for messages. */
+    protected abstract get _managerName(): string;
+    ensure(cacheRoot: URI, plugin: IMarketplacePlugin, _options?: IEnsureRepositoryOptions): Promise<URI>;
+    update(cacheRoot: URI, plugin: IMarketplacePlugin, _options?: IPullRepositoryOptions): Promise<void>;
+    runInstall(installDir: URI, pluginDir: URI, plugin: IMarketplacePlugin): Promise<{
+        pluginDir: URI;
+    } | undefined>;
+    private _confirmTerminalCommand;
+    private _runTerminalCommand;
+    private _waitForTerminalCommandCompletion;
+}
+export declare class NpmPluginSource extends AbstractPackagePluginSource {
+    readonly kind = PluginSourceKind.Npm;
+    protected readonly _managerName = "npm";
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _getCacheDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    protected _buildInstallArgs(installDir: URI, plugin: IMarketplacePlugin): string[];
+}
+export declare class PipPluginSource extends AbstractPackagePluginSource {
+    readonly kind = PluginSourceKind.Pip;
+    protected readonly _managerName = "pip";
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _getCacheDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    protected _buildInstallArgs(installDir: URI, plugin: IMarketplacePlugin): string[];
+}
+export {};