@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -2,9 +2,10 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { dirname, joinPath, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -35,7 +36,7 @@ function gitRevisionCacheSuffix(ref, sha) {
 function showGitOutputAction(commandService) {
     return (new Action(
         "showGitOutput",
-        localize(6248, "Show Git Output"),
+        localize(6398, "Show Git Output"),
         undefined,
         true,
         () => {
@@ -68,65 +69,81 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
         this._progressService = _progressService;
     }
     getCleanupTarget(cacheRoot, descriptor) {
+        return this._getRepoDir(cacheRoot, descriptor);
+    }
+    _getRepoDir(cacheRoot, descriptor) {
         return this.getInstallUri(cacheRoot, descriptor);
     }
     async ensure(cacheRoot, plugin, options) {
         const descriptor = plugin.sourceDescriptor;
-        const repoDir = this.getInstallUri(cacheRoot, descriptor);
+        const repoDir = this._getRepoDir(cacheRoot, descriptor);
         const repoExists = await this._fileService.exists(repoDir);
         const label = this._displayLabel(descriptor);
         if (repoExists) {
             await this._checkoutRevision(repoDir, descriptor, options?.failureLabel ?? label);
-            return repoDir;
+            return this.getInstallUri(cacheRoot, descriptor);
         }
-        const progressTitle = options?.progressTitle ?? ( localize(6249, "Cloning plugin source '{0}'...", label));
+        const progressTitle = options?.progressTitle ?? ( localize(6399, "Cloning plugin source '{0}'...", label));
         const failureLabel = options?.failureLabel ?? label;
         const ref = descriptor.ref;
         await this._cloneRepository(repoDir, this._cloneUrl(descriptor), progressTitle, failureLabel, ref);
         await this._checkoutRevision(repoDir, descriptor, failureLabel);
-        return repoDir;
+        return this.getInstallUri(cacheRoot, descriptor);
     }
     async update(cacheRoot, plugin, options) {
         const descriptor = plugin.sourceDescriptor;
-        const repoDir = this.getInstallUri(cacheRoot, descriptor);
+        const repoDir = this._getRepoDir(cacheRoot, descriptor);
         const repoExists = await this._fileService.exists(repoDir);
         if (!repoExists) {
             this._logService.warn(
                 `[${this.kind}] Cannot update plugin '${options?.pluginName ?? plugin.name}': source repository not cloned`
             );
-            return;
+            return false;
         }
         const updateLabel = options?.pluginName ?? plugin.name;
         const failureLabel = options?.failureLabel ?? updateLabel;
         try {
-            await this._progressService.withProgress({
-                location: ProgressLocation.Notification,
-                title: ( localize(6250, "Updating plugin '{0}'...", updateLabel)),
-                cancellable: false
-            }, async () => {
+            const doUpdate = async () => {
                 await this._commandService.executeCommand("git.openRepository", repoDir.fsPath);
                 const git = descriptor;
+                let changed;
                 if (git.sha) {
+                    const headBefore = await this._commandService.executeCommand("_git.revParse", repoDir.fsPath, "HEAD").catch(() => undefined);
                     await this._commandService.executeCommand("git.fetch", repoDir.fsPath);
+                    await this._checkoutRevision(repoDir, descriptor, failureLabel);
+                    const headAfter = await this._commandService.executeCommand("_git.revParse", repoDir.fsPath, "HEAD").catch(() => undefined);
+                    changed = headBefore !== headAfter;
                 } else {
-                    await this._commandService.executeCommand("_git.pull", repoDir.fsPath);
+                    changed = !!(await this._commandService.executeCommand("_git.pull", repoDir.fsPath));
+                    await this._checkoutRevision(repoDir, descriptor, failureLabel);
                 }
-                await this._checkoutRevision(repoDir, descriptor, failureLabel);
-            });
+                return changed;
+            };
+            if (options?.silent) {
+                return await doUpdate();
+            }
+            return await this._progressService.withProgress({
+                location: ProgressLocation.Notification,
+                title: ( localize(6400, "Updating plugin '{0}'...", updateLabel)),
+                cancellable: false
+            }, doUpdate);
         } catch (err) {
             this._logService.error(`[${this.kind}] Failed to update plugin source '${updateLabel}':`, err);
-            this._notificationService.notify({
-                severity: Severity.Error,
-                message: ( localize(
-                    6251,
-                    "Failed to update plugin '{0}': {1}",
-                    failureLabel,
-                    err?.message ?? String(err)
-                )),
-                actions: {
-                    primary: [showGitOutputAction(this._commandService)]
-                }
-            });
+            if (!options?.silent) {
+                this._notificationService.notify({
+                    severity: Severity.Error,
+                    message: ( localize(
+                        6401,
+                        "Failed to update plugin '{0}': {1}",
+                        failureLabel,
+                        err?.message ?? String(err)
+                    )),
+                    actions: {
+                        primary: [showGitOutputAction(this._commandService)]
+                    }
+                });
+            }
+            throw err;
         }
     }
     async _cloneRepository(repoDir, cloneUrl, progressTitle, failureLabel, ref) {
@@ -144,7 +161,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6252,
+                    6402,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
@@ -172,7 +189,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6253,
+                    6403,
                     "Failed to checkout plugin '{0}' to requested revision: {1}",
                     failureLabel,
                     err?.message ?? String(err)
@@ -212,6 +229,20 @@ class GitHubPluginSource extends AbstractGitPluginSource {
         this.kind = PluginSourceKind.GitHub;
     }
     getInstallUri(cacheRoot, descriptor) {
+        const repoDir = this._getRepoDir(cacheRoot, descriptor);
+        const gh = descriptor;
+        if (gh.path) {
+            const normalizedPath = gh.path.trim().replace(/^\.?\/+|\/+$/g, "");
+            if (normalizedPath) {
+                const target = joinPath(repoDir, normalizedPath);
+                if (isEqualOrParent(target, repoDir)) {
+                    return target;
+                }
+            }
+        }
+        return repoDir;
+    }
+    _getRepoDir(cacheRoot, descriptor) {
         const gh = descriptor;
         const [owner, repo] = gh.repo.split("/");
         return joinPath(
@@ -223,7 +254,8 @@ class GitHubPluginSource extends AbstractGitPluginSource {
         );
     }
     getLabel(descriptor) {
-        return descriptor.repo;
+        const gh = descriptor;
+        return gh.path ? `${gh.repo}/${gh.path}` : gh.repo;
     }
     _cloneUrl(descriptor) {
         return `https://github.com/${descriptor.repo}.git`;
@@ -294,16 +326,19 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
     async update(cacheRoot, plugin, _options) {
         const installDir = this._getCacheDir(cacheRoot, plugin.sourceDescriptor);
         const pluginDir = this.getInstallUri(cacheRoot, plugin.sourceDescriptor);
-        await this.runInstall(installDir, pluginDir, plugin);
+        await this.runInstall(installDir, pluginDir, plugin, {
+            silent: _options?.silent
+        });
+        return true;
     }
-    async runInstall(installDir, pluginDir, plugin) {
+    async runInstall(installDir, pluginDir, plugin, options) {
         const args = this._buildInstallArgs(installDir, plugin);
         const command = formatShellCommand(args);
-        const confirmed = await this._confirmTerminalCommand(plugin.name, command);
+        const confirmed = await this._confirmTerminalCommand(plugin.name, command, options?.silent);
         if (!confirmed) {
             return undefined;
         }
-        const progressTitle = ( localize(6254, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
+        const progressTitle = ( localize(6404, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
         const {
             success,
             terminal
@@ -316,7 +351,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6255,
+                    6405,
                     "{0} package '{1}' was not found after installation.",
                     this._managerName,
                     this.getLabel(plugin.sourceDescriptor)
@@ -329,14 +364,26 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             pluginDir
         };
     }
-    async _confirmTerminalCommand(pluginName, command) {
+    async _confirmTerminalCommand(pluginName, command, silent) {
+        if (silent) {
+            return (new Promise(resolve => {
+                const n = this._notificationService.notify({
+                    severity: Severity.Info,
+                    message: ( localize(6406, "Plugin '{0}' wants to run: {1}", pluginName, command)),
+                    actions: {
+                        primary: [( new Action("installPlugin", ( localize(6407, "Install")), undefined, true, async () => resolve(true)))]
+                    }
+                });
+                Event.once(n.onDidClose)(() => resolve(false));
+            }));
+        }
         const {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6256, "Install Plugin '{0}'?", pluginName)),
-            detail: ( localize(6257, "This will run the following command in a terminal:\n\n{0}", command)),
-            primaryButton: ( localize(6258, "&&Install"))
+            message: ( localize(6408, "Install Plugin '{0}'?", pluginName)),
+            detail: ( localize(6409, "This will run the following command in a terminal:\n\n{0}", command)),
+            primaryButton: ( localize(6410, "&&Install"))
         });
         return confirmed;
     }
@@ -350,7 +397,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             }, async () => {
                 terminal = await this._terminalService.createTerminal({
                     config: {
-                        name: ( localize(6259, "Plugin Install")),
+                        name: ( localize(6411, "Plugin Install")),
                         forceShellIntegration: true,
                         isTransient: true,
                         isFeatureTerminal: true
@@ -362,7 +409,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
                 await terminal.runCommand(command, true);
                 const exitCode = await commandResultPromise;
                 if (exitCode !== 0) {
-                    throw ( new Error(( localize(6260, "Command exited with code {0}", exitCode))));
+                    throw ( new Error(( localize(6412, "Command exited with code {0}", exitCode))));
                 }
             });
             return {
@@ -374,7 +421,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6261,
+                    6413,
                     "Plugin installation command failed: {0}",
                     err?.message ?? String(err)
                 ))

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

@@ -0,0 +1,35 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+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 { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IURLHandler } from "@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url";
+import { IURLService } from "@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
+/**
+ * Handles `vscode://chat-plugin/install?source=<base64>` and
+ * `vscode://chat-plugin/add-marketplace?ref=<base64>` URLs.
+ *
+ * The `source` / `ref` query parameter is a base64-encoded `owner/repo` or
+ * git clone URL. A confirmation dialog is always shown before any action.
+ */
+export declare class PluginUrlHandler extends Disposable implements IWorkbenchContribution, IURLHandler {
+    private readonly _pluginInstallService;
+    private readonly _dialogService;
+    private readonly _configurationService;
+    private readonly _hostService;
+    private readonly _logService;
+    static readonly ID = "workbench.contrib.pluginUrlHandler";
+    constructor(urlService: IURLService, _pluginInstallService: IPluginInstallService, _dialogService: IDialogService, _configurationService: IConfigurationService, _hostService: IHostService, _logService: ILogService);
+    handleURL(uri: URI): Promise<boolean>;
+    private _handleInstall;
+    private _handleAddMarketplace;
+    /**
+     * Reads a query parameter and attempts to parse it as a marketplace
+     * reference. Tries base64-decoding first, then falls back to the raw
+     * value so that plain-text `owner/repo` values also work in URLs.
+     */
+    private _decodeQueryParam;
+}

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

@@ -0,0 +1,146 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+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 { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { parseMarketplaceReference, MarketplaceReferenceKind, parseMarketplaceReferences } from '../common/plugins/marketplaceReference.js';
+import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
+import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+
+let PluginUrlHandler = class PluginUrlHandler extends Disposable {
+    static {
+        this.ID = "workbench.contrib.pluginUrlHandler";
+    }
+    constructor(
+        urlService,
+        _pluginInstallService,
+        _dialogService,
+        _configurationService,
+        _hostService,
+        _logService
+    ) {
+        super();
+        this._pluginInstallService = _pluginInstallService;
+        this._dialogService = _dialogService;
+        this._configurationService = _configurationService;
+        this._hostService = _hostService;
+        this._logService = _logService;
+        this._register(urlService.registerHandler(this));
+    }
+    async handleURL(uri) {
+        if (uri.authority !== "chat-plugin") {
+            return false;
+        }
+        switch (uri.path) {
+        case "/install":
+            return this._handleInstall(uri);
+        case "/add-marketplace":
+            return this._handleAddMarketplace(uri);
+        default:
+            return false;
+        }
+    }
+    async _handleInstall(uri) {
+        const source = this._decodeQueryParam(uri, "source");
+        if (!source) {
+            this._logService.warn("[PluginUrlHandler] Missing or invalid \"source\" query parameter");
+            return true;
+        }
+        const ref = parseMarketplaceReference(source);
+        if (!ref) {
+            this._logService.warn(`[PluginUrlHandler] Invalid plugin source: ${source}`);
+            return true;
+        }
+        if (ref.kind === MarketplaceReferenceKind.LocalFileUri) {
+            this._logService.warn("[PluginUrlHandler] Local file URIs are not supported for install");
+            return true;
+        }
+        await this._hostService.focus(mainWindow);
+        const {
+            confirmed
+        } = await this._dialogService.confirm({
+            type: "question",
+            message: ( localize(6414, "Install Plugin from '{0}'?", ref.displayLabel)),
+            detail: ( localize(
+                6415,
+                "An external application wants to install a plugin from this source. Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
+                ref.rawValue
+            )),
+            primaryButton: ( localize(6416, "&&Install")),
+            custom: {
+                icon: Codicon.shield
+            }
+        });
+        if (!confirmed) {
+            return true;
+        }
+        await this._pluginInstallService.installPluginFromSource(source);
+        return true;
+    }
+    async _handleAddMarketplace(uri) {
+        const refValue = this._decodeQueryParam(uri, "ref");
+        if (!refValue) {
+            this._logService.warn("[PluginUrlHandler] Missing or invalid \"ref\" query parameter");
+            return true;
+        }
+        const ref = parseMarketplaceReference(refValue);
+        if (!ref) {
+            this._logService.warn(`[PluginUrlHandler] Invalid marketplace reference: ${refValue}`);
+            return true;
+        }
+        await this._hostService.focus(mainWindow);
+        const {
+            confirmed
+        } = await this._dialogService.confirm({
+            type: "question",
+            message: ( localize(6417, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
+            detail: ( localize(
+                6418,
+                "An external application wants to add a plugin marketplace. Plugins from this marketplace will appear in the plugin catalog and can be installed.\n\nSource: {0}",
+                ref.rawValue
+            )),
+            primaryButton: ( localize(6419, "&&Add Marketplace")),
+            custom: {
+                icon: Codicon.shield
+            }
+        });
+        if (!confirmed) {
+            return true;
+        }
+        const existing = this._configurationService.getValue(ChatConfiguration.PluginMarketplaces) ?? [];
+        const existingRefs = parseMarketplaceReferences(existing);
+        if (!( existingRefs.some(e => e.canonicalId === ref.canonicalId))) {
+            await this._configurationService.updateValue(
+                ChatConfiguration.PluginMarketplaces,
+                [...existing, refValue],
+                ConfigurationTarget.USER
+            );
+        }
+        return true;
+    }
+    _decodeQueryParam(uri, key) {
+        const params = ( new URLSearchParams(uri.query));
+        const raw = params.get(key);
+        if (!raw) {
+            return undefined;
+        }
+        try {
+            const decoded = ( decodeBase64(raw).toString());
+            if (parseMarketplaceReference(decoded)) {
+                return decoded;
+            }
+        } catch {}
+        return raw;
+    }
+};
+PluginUrlHandler = ( __decorate([( __param(0, IURLService)), ( __param(1, IPluginInstallService)), ( __param(2, IDialogService)), ( __param(3, IConfigurationService)), ( __param(4, IHostService)), ( __param(5, ILogService))], PluginUrlHandler));
+
+export { PluginUrlHandler };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.js

@@ -17,7 +17,7 @@ class ConfigAgentActionImpl extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const pickers = instaService.createInstance(PromptFilePickers);
         const placeholder = ( localize(
-            6268,
+            6426,
             "Select the custom agents to open and configure visibility in the agent picker"
         ));
         const result = await pickers.selectPromptFile({
@@ -35,8 +35,8 @@ const PICKER_CONFIGURE_AGENTS_ACTION_ID = "workbench.action.chat.picker.customag
 function createPickerConfigureAgentsActionConfig(disabled) {
     const config = {
         id: disabled ? PICKER_CONFIGURE_AGENTS_ACTION_ID + ".disabled" : PICKER_CONFIGURE_AGENTS_ACTION_ID,
-        title: ( localize2(6269, "Configure Custom Agents...")),
-        tooltip: disabled ? ( localize(6270, "Managed by your organization")) : undefined,
+        title: ( localize2(6427, "Configure Custom Agents...")),
+        tooltip: disabled ? ( localize(6428, "Managed by your organization")) : undefined,
         icon: disabled ? Codicon.lock : undefined,
         category: CHAT_CATEGORY,
         f1: false,
@@ -62,8 +62,8 @@ const CONFIGURE_AGENTS_ACTION_ID = "workbench.action.chat.configure.customagents
 function createManageAgentsActionConfig(disabled) {
     const base = {
         id: disabled ? CONFIGURE_AGENTS_ACTION_ID + ".disabled" : CONFIGURE_AGENTS_ACTION_ID,
-        title: ( localize2(6271, "Configure Custom Agents...")),
-        shortTitle: ( localize(6272, "Custom Agents")),
+        title: ( localize2(6429, "Configure Custom Agents...")),
+        shortTitle: ( localize(6430, "Custom Agents")),
         icon: disabled ? Codicon.lock : Codicon.bookmark,
         f1: !disabled,
         precondition: disabled ? ( ContextKeyExpr.false()) : ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()))),
@@ -77,7 +77,7 @@ function createManageAgentsActionConfig(disabled) {
     };
     return disabled ? {
         ...base,
-        tooltip: ( localize(6270, "Managed by your organization"))
+        tooltip: ( localize(6428, "Managed by your organization"))
     } : base;
 }
 class ManageAgentsAction extends ConfigAgentActionImpl {