@codingame/monaco-vscode-chat-service-override 37.0.0 → 37.2.0

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

@@ -36,9 +36,9 @@ import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { EnablementModel, ContributionEnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { AUTOMATION_BLUEPRINT_FILE_SUFFIX, parseAutomationBlueprint } from '../automations/automationBlueprint.js';
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
-import { getCanonicalAgentPluginCollisionGroups, isAgentPluginBlockedByPolicy, AgentPluginCollisionEnablementModel, getSortedAgentPlugins, getAgentPluginPolicyId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginEnablement';
+import { getCanonicalAgentPluginCollisionGroups, isAgentPluginBlockedByPolicy, AgentPluginCollisionEnablementModel, getSortedAgentPlugins, getAgentPluginPolicyId } from './agentPluginEnablement.js';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
-import { agentPluginDiscoveryRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService';
+import { agentPluginDiscoveryRegistry } from './agentPluginService.js';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -822,15 +822,15 @@ let CopilotCliAgentPluginDiscovery = class CopilotCliAgentPluginDiscovery extend
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                10304,
+                10499,
                 "This plugin was installed by the Copilot CLI. Remove it from disk?"
             )),
             detail: ( localize(
-                10305,
+                10500,
                 "The plugin directory '{0}' will be moved to the trash. You can reinstall it later via the Copilot CLI.",
                 resource.fsPath
             )),
-            primaryButton: ( localize(10306, "Remove"))
+            primaryButton: ( localize(10501, "Remove"))
         });
         if (!confirmed) {
             return false;
@@ -852,7 +852,7 @@ CopilotCliAgentPluginDiscovery = ( __decorate([( __param(0, IFileService)), ( __
 const epPlugins = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatPlugins",
     jsonSchema: {
-        description: ( localize(10307, "Contributes agent plugins for chat.")),
+        description: ( localize(10502, "Contributes agent plugins for chat.")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -866,13 +866,13 @@ const epPlugins = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 path: {
                     description: ( localize(
-                        10308,
+                        10503,
                         "Path to the agent plugin root directory relative to the extension root."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(10309, "(Optional) A condition which must be true to enable this plugin.")),
+                    description: ( localize(10504, "(Optional) A condition which must be true to enable this plugin.")),
                     type: "string"
                 }
             }
@@ -909,7 +909,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            10310,
+                            10505,
                             "Extension '{0}' cannot register a chatPlugins entry without a path.",
                             ext.description.identifier.value
                         )));
@@ -918,7 +918,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                     const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            10311,
+                            10506,
                             "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.",
                             ext.description.identifier.value,
                             raw.path
@@ -930,7 +930,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
                         whenExpr = ContextKeyExpr.deserialize(raw.when);
                         if (!whenExpr) {
                             ext.collector.error(( localize(
-                                10312,
+                                10507,
                                 "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.",
                                 ext.description.identifier.value,
                                 raw.path,
@@ -1002,7 +1002,7 @@ let ExtensionAgentPluginDiscovery = class ExtensionAgentPluginDiscovery extends
             confirmed
         } = await this._dialogService.confirm({
             message: ( localize(
-                10313,
+                10508,
                 "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?",
                 extensionId
             ))
@@ -1037,7 +1037,7 @@ class ChatPluginsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(10314, "Path")), ( localize(10315, "When"))];
+        const headers = [( localize(10509, "Path")), ( localize(10510, "When"))];
         const rows = ( contributions.map(d => [d.path, d.when ?? "-"]));
         return {
             data: {
@@ -1050,7 +1050,7 @@ class ChatPluginsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatPlugins",
-    label: ( localize(10316, "Chat Plugins")),
+    label: ( localize(10511, "Chat Plugins")),
     access: {
         canToggle: false
     },

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

@@ -0,0 +1,67 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+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 { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+/**
+ * In-memory representation of an installed plugin entry.
+ */
+export interface IStoredInstalledPlugin {
+    readonly pluginUri: URI;
+    readonly marketplace: string;
+    readonly name?: string;
+}
+/**
+ * An observable store for installed agent plugins that is backed by a
+ * `installed.json` file within the agent-plugins directory. This makes
+ * the installed-plugin manifest discoverable by external tools (CLIs,
+ * other editors, etc.) without depending on VS Code internals.
+ *
+ * The on-disk format stores only the plugin URI (as a string), marketplace
+ * identifier, and plugin name. Full plugin metadata (description, source
+ * descriptor, etc.) is read from marketplace data by the discovery layer -
+ * keeping a single source of truth.
+ *
+ * On construction the store:
+ * 1. Attempts to read `installed.json` from the agent-plugins directory.
+ * 2. If no file exists, migrates data from the legacy {@link StorageService}
+ *    key (`chat.plugins.installed.v1`), rebasing plugin URIs from the old
+ *    cache directory to the new agent-plugins directory.
+ * 3. Sets up a correlated file watcher so that external edits to
+ *    `installed.json` are picked up automatically.
+ *
+ * Write operations update the in-memory observable synchronously and
+ * schedule a debounced file write so that rapid successive mutations
+ * (e.g. batch enables) are coalesced into a single I/O operation.
+ */
+export declare class FileBackedInstalledPluginsStore extends Disposable {
+    private readonly _agentPluginsHome;
+    private readonly _oldCacheRoot;
+    private readonly _fileService;
+    private readonly _logService;
+    private readonly _storageService;
+    private readonly _installed;
+    private readonly _fileUri;
+    private readonly _writeDelayer;
+    private _suppressFileWatch;
+    private _initialized;
+    readonly value: IObservable<readonly IStoredInstalledPlugin[]>;
+    constructor(_agentPluginsHome: URI, _oldCacheRoot: URI | undefined, _fileService: IFileService, _logService: ILogService, _storageService: IStorageService);
+    get(): readonly IStoredInstalledPlugin[];
+    set(newValue: readonly IStoredInstalledPlugin[], tx: ITransaction | undefined): void;
+    private _initialize;
+    private _readFromFile;
+    private _scheduleWrite;
+    private _writeToFile;
+    private _setupFileWatcher;
+    private _onFileChanged;
+    private _setValue;
+    private _migrateFromStorage;
+    /**
+     * If the plugin URI was under the old cache root, rebase it to the
+     * new agent-plugins directory. Otherwise, return `undefined` to keep
+     * the original.
+     */
+    private _rebasePluginUri;
+}

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

@@ -0,0 +1,195 @@
+
+import { ThrottledDelayer, RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { joinPath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+
+const INSTALLED_JSON_FILENAME = "installed.json";
+const INSTALLED_JSON_VERSION = 1;
+const LEGACY_INSTALLED_PLUGINS_STORAGE_KEY = "chat.plugins.installed.v1";
+const LEGACY_MARKETPLACE_INDEX_STORAGE_KEY = "chat.plugins.marketplaces.index.v1";
+class FileBackedInstalledPluginsStore extends Disposable {
+    constructor(
+        _agentPluginsHome,
+        _oldCacheRoot,
+        _fileService,
+        _logService,
+        _storageService
+    ) {
+        super();
+        this._agentPluginsHome = _agentPluginsHome;
+        this._oldCacheRoot = _oldCacheRoot;
+        this._fileService = _fileService;
+        this._logService = _logService;
+        this._storageService = _storageService;
+        this._installed = observableValue("file/installed.json", []);
+        this._suppressFileWatch = false;
+        this._initialized = false;
+        this.value = this._installed;
+        this._fileUri = joinPath(_agentPluginsHome, INSTALLED_JSON_FILENAME);
+        this._writeDelayer = this._register(( new ThrottledDelayer(100)));
+        void this._initialize();
+    }
+    get() {
+        return this._installed.get();
+    }
+    set(newValue, tx) {
+        this._setValue(newValue, tx, true);
+    }
+    async _initialize() {
+        try {
+            const read = await this._readFromFile();
+            if (read !== undefined) {
+                this._setValue(read, undefined, false);
+            } else {
+                await this._migrateFromStorage();
+            }
+        } catch (error) {
+            this._logService.error("[FileBackedInstalledPluginsStore] Initialization failed", error);
+        }
+        this._initialized = true;
+        this._setupFileWatcher();
+    }
+    async _readFromFile() {
+        try {
+            const exists = await this._fileService.exists(this._fileUri);
+            if (!exists) {
+                return undefined;
+            }
+            const content = await this._fileService.readFile(this._fileUri);
+            const json = JSON.parse(( content.value.toString()));
+            if (!json || !Array.isArray(json.installed)) {
+                this._logService.warn(
+                    "[FileBackedInstalledPluginsStore] installed.json has unexpected format, ignoring"
+                );
+                return undefined;
+            }
+            return ( json.installed.filter(
+                entry => typeof entry.pluginUri === "string" && typeof entry.marketplace === "string"
+            ).map(entry => ({
+                pluginUri: ( URI.parse(entry.pluginUri)),
+                marketplace: entry.marketplace,
+                name: typeof entry.name === "string" ? entry.name : undefined
+            })));
+        } catch {
+            return undefined;
+        }
+    }
+    _scheduleWrite() {
+        void this._writeDelayer.trigger(async () => {
+            await this._writeToFile();
+        });
+    }
+    async _writeToFile() {
+        const entries = ( this.get().map(e => ({
+            pluginUri: ( e.pluginUri.toString()),
+            marketplace: e.marketplace,
+            ...(e.name ? {
+                name: e.name
+            } : {})
+        })));
+        const data = {
+            version: INSTALLED_JSON_VERSION,
+            installed: entries
+        };
+        try {
+            this._suppressFileWatch = true;
+            const content = JSON.stringify(data, undefined, "\t");
+            await this._fileService.createFolder(this._agentPluginsHome);
+            await this._fileService.writeFile(this._fileUri, VSBuffer.fromString(content));
+            return true;
+        } catch (error) {
+            this._logService.error("[FileBackedInstalledPluginsStore] Failed to write installed.json", error);
+            return false;
+        } finally {
+            this._suppressFileWatch = false;
+        }
+    }
+    _setupFileWatcher() {
+        if (typeof this._fileService.createWatcher !== "function") {
+            return;
+        }
+        const dir = this._agentPluginsHome;
+        const watcher = this._fileService.createWatcher(dir, {
+            recursive: false,
+            excludes: []
+        });
+        this._register(watcher);
+        const scheduler = this._register(( new RunOnceScheduler(() => this._onFileChanged(), 100)));
+        this._register(watcher.onDidChange(e => {
+            if (!this._suppressFileWatch && e.affects(this._fileUri)) {
+                scheduler.schedule();
+            }
+        }));
+    }
+    async _onFileChanged() {
+        const read = await this._readFromFile();
+        if (read !== undefined) {
+            this._suppressFileWatch = true;
+            try {
+                this._setValue(read, undefined, false);
+            } finally {
+                this._suppressFileWatch = false;
+            }
+        }
+    }
+    _setValue(newValue, tx, scheduleWrite) {
+        this._installed.set(newValue, tx);
+        if (scheduleWrite && this._initialized && !this._suppressFileWatch) {
+            this._scheduleWrite();
+        }
+    }
+    async _migrateFromStorage() {
+        const raw = this._storageService.get(LEGACY_INSTALLED_PLUGINS_STORAGE_KEY, StorageScope.APPLICATION);
+        if (!raw) {
+            return;
+        }
+        try {
+            const parsed = JSON.parse(raw);
+            if (!Array.isArray(parsed) || parsed.length === 0) {
+                return;
+            }
+            const migrated = ( revive(parsed).map(entry => {
+                const uri = URI.revive(entry.pluginUri);
+                const rebased = this._rebasePluginUri(uri);
+                return {
+                    pluginUri: rebased ?? uri,
+                    marketplace: entry.plugin?.marketplaceReference?.rawValue ?? "",
+                    name: entry.plugin?.name
+                };
+            })).filter(e => !!e.marketplace);
+            this._logService.info(
+                `[FileBackedInstalledPluginsStore] Migrating ${migrated.length} plugin(s) from storage to installed.json`
+            );
+            this._setValue(migrated, undefined, false);
+            const didPersist = await this._writeToFile();
+            if (!didPersist) {
+                return;
+            }
+            this._storageService.remove(LEGACY_INSTALLED_PLUGINS_STORAGE_KEY, StorageScope.APPLICATION);
+            this._storageService.remove(LEGACY_MARKETPLACE_INDEX_STORAGE_KEY, StorageScope.APPLICATION);
+        } catch (error) {
+            this._logService.error("[FileBackedInstalledPluginsStore] Migration from storage failed", error);
+        }
+    }
+    _rebasePluginUri(uri) {
+        if (!this._oldCacheRoot) {
+            return undefined;
+        }
+        const oldRoot = this._oldCacheRoot;
+        if (!isEqual(uri, oldRoot) && uri.scheme === oldRoot.scheme && uri.path.startsWith(oldRoot.path + "/")) {
+            const relativePart = uri.path.substring(oldRoot.path.length);
+            return uri.with({
+                path: this._agentPluginsHome.path + relativePart
+            });
+        }
+        return undefined;
+    }
+}
+
+export { FileBackedInstalledPluginsStore };

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

@@ -0,0 +1,67 @@
+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";
+export { extraKnownMarketplacesToConfigDict } from "@codingame/monaco-vscode-api/vscode/vs/base/common/managedSettings";
+export declare enum MarketplaceReferenceKind {
+    GitHubShorthand = "githubShorthand",
+    GitUri = "gitUri",
+    LocalFileUri = "localFileUri"
+}
+export interface IMarketplaceReference {
+    readonly rawValue: string;
+    readonly displayLabel: string;
+    readonly cloneUrl: string;
+    readonly canonicalId: string;
+    readonly cacheSegments: readonly string[];
+    readonly kind: MarketplaceReferenceKind;
+    readonly ref?: string;
+    readonly githubRepo?: string;
+    readonly localRepositoryUri?: URI;
+    readonly autoUpdate?: boolean;
+}
+/**
+ * The two configuration layers behind plugin marketplaces:
+ * - `userValues` — what's stored at {@link ChatConfiguration.PluginMarketplaces}
+ *   (default + user). Writable by the user.
+ * - `extraValues` — what's delivered via the `ChatExtraMarketplaces` enterprise
+ *   policy into {@link ChatConfiguration.ExtraMarketplaces}. Read-only.
+ *
+ * Entries may be strings (`<owner>/<repo>` or git URIs) or, in the policy case,
+ * {@link IExtraMarketplaceObjectEntry} objects — both shapes flow through
+ * {@link parseMarketplaceReferences}.
+ */
+export interface IConfiguredMarketplaces {
+    readonly userValues: readonly unknown[];
+    readonly extraValues: readonly unknown[];
+    readonly effectiveValues: readonly unknown[];
+}
+export declare function readConfiguredMarketplaces(configurationService: IConfigurationService): IConfiguredMarketplaces;
+export declare function parseMarketplaceReferences(values: readonly unknown[]): IMarketplaceReference[];
+/**
+ * Object-form marketplace entry shape, as delivered via the enterprise
+ * `managed_settings` policy or `.github/copilot/settings.json` workspace
+ * file. `name` (when present) is used as the marketplace's `displayLabel`
+ * so that `enabledPlugins["plugin@name"]` keys match consistently.
+ *
+ * Both the nested form (`source: { source, repo|url }`) and the flat form
+ * (`source: 'github', repo: ...`) are accepted.
+ */
+export interface IExtraMarketplaceObjectEntry {
+    readonly name?: string;
+    readonly source?: string | {
+        readonly source?: string;
+        readonly repo?: string;
+        readonly url?: string;
+        readonly ref?: string;
+    };
+    readonly repo?: string;
+    readonly url?: string;
+    readonly ref?: string;
+    readonly autoUpdate?: boolean;
+}
+export declare function parseMarketplaceObjectEntry(entry: IExtraMarketplaceObjectEntry): IMarketplaceReference | undefined;
+/**
+ * Merges two sets of marketplace references, deduplicating by canonical ID.
+ * The first set takes precedence when IDs collide.
+ */
+export declare function deduplicateMarketplaceReferences(primary: readonly IMarketplaceReference[], secondary: readonly IMarketplaceReference[]): IMarketplaceReference[];
+export declare function parseMarketplaceReference(value: string): IMarketplaceReference | undefined;