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

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 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, isEqual, isEqualOrParent, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -19,13 +20,14 @@ import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 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 { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
-import { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { PluginSourceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
 import { IPluginGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service';
 import { RelativePathPluginSource, GitHubPluginSource, GitUrlPluginSource, NpmPluginSource, PipPluginSource } from './pluginSources.js';
-import { MarketplaceReferenceKind } from '../common/plugins/marketplaceReference.js';
+import { MarketplaceReferenceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 const MARKETPLACE_INDEX_STORAGE_KEY = "chat.plugins.marketplaces.index.v1";
+const SHA_REF_PATTERN = /^[0-9a-f]{40}$/i;
 let AgentPluginRepositoryService = class AgentPluginRepositoryService {
     constructor(
         _commandService,
@@ -100,25 +102,52 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         return this._cloneSequencer.queue(repoDir.fsPath, async () => {
             const repoExists = await this._fileService.exists(repoDir);
             if (repoExists) {
-                this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
+                const refreshedAt = this._isRefreshDue(marketplace, options) ? await this._refreshRepository(repoDir, marketplace, options?.token) : undefined;
+                this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType, refreshedAt);
                 return repoDir;
             }
             if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
                 throw ( new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`));
             }
-            const progressTitle = options?.progressTitle ?? ( localize(5466, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
+            const progressTitle = options?.progressTitle ?? ( localize(5907, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
             const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
             await this._cloneRepository(
                 repoDir,
                 marketplace.cloneUrl,
                 progressTitle,
                 failureLabel,
-                marketplace.ref
+                marketplace.ref,
+                options?.token
             );
-            this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
+            this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType, Date.now());
             return repoDir;
         });
     }
+    _isRefreshDue(marketplace, options) {
+        const refreshIfOlderThanMs = options?.refreshIfOlderThanMs;
+        if (refreshIfOlderThanMs === undefined || options?.token?.isCancellationRequested) {
+            return false;
+        }
+        if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri || SHA_REF_PATTERN.test(marketplace.ref ?? "")) {
+            return false;
+        }
+        const lastRefreshedAt = this._marketplaceIndex.value.get(marketplace.canonicalId)?.lastRefreshedAt;
+        return lastRefreshedAt === undefined || Date.now() - lastRefreshedAt >= refreshIfOlderThanMs;
+    }
+    async _refreshRepository(repoDir, marketplace, token) {
+        try {
+            await this._pluginGit.pull(repoDir, token);
+        } catch (err) {
+            if (isCancellationError(err)) {
+                return undefined;
+            }
+            this._logService.debug(
+                `[AgentPluginRepositoryService] Failed to refresh ${marketplace.displayLabel}:`,
+                err
+            );
+        }
+        return token?.isCancellationRequested ? undefined : Date.now();
+    }
     async pullRepository(marketplace, options) {
         const repoDir = this.getRepositoryUri(marketplace, options?.marketplaceType);
         const repoExists = await this._fileService.exists(repoDir);
@@ -130,34 +159,24 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         }
         const updateLabel = options?.pluginName ?? marketplace.displayLabel;
         try {
-            if (options?.silent) {
-                return await this._pluginGit.pull(repoDir);
-            }
-            const cts = ( new CancellationTokenSource());
-            try {
-                return await this._progressService.withProgress({
-                    location: ProgressLocation.Notification,
-                    title: ( localize(5467, "Updating plugin '{0}'...", updateLabel)),
-                    cancellable: true
-                }, () => this._pluginGit.pull(repoDir, cts.token), () => cts.dispose(true));
-            } finally {
-                cts.dispose();
-            }
+            const changed = options?.silent ? await this._pluginGit.pull(repoDir) : await this._pullWithProgress(repoDir, updateLabel);
+            this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType, Date.now());
+            return changed;
         } catch (err) {
             this._logService.error(
                 `[AgentPluginRepositoryService] Failed to update ${marketplace.displayLabel}:`,
                 err
             );
             if (!options?.silent) {
-                const primaryActions = [( new Action("showGitOutput", ( localize(5468, "Show Git Output")), undefined, true, () => this._commandService.executeCommand("git.showOutput")))];
+                const primaryActions = [( new Action("showGitOutput", ( localize(5908, "Show Git Output")), undefined, true, () => this._commandService.executeCommand("git.showOutput")))];
                 const failureLabel = options?.failureLabel ?? updateLabel;
                 if (marketplace.kind !== MarketplaceReferenceKind.LocalFileUri) {
-                    primaryActions.push(( new Action("purgeAndRecloneMarketplace", ( localize(5469, "Purge Marketplace Cache and Reclone")), undefined, true, () => this._purgeAndRecloneMarketplace(marketplace, options?.marketplaceType, failureLabel))));
+                    primaryActions.push(( new Action("purgeAndRecloneMarketplace", ( localize(5909, "Purge Marketplace Cache and Reclone")), undefined, true, () => this._purgeAndRecloneMarketplace(marketplace, options?.marketplaceType, failureLabel))));
                 }
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        5470,
+                        5910,
                         "Failed to update plugin '{0}': {1}",
                         failureLabel,
                         err?.message ?? String(err)
@@ -170,6 +189,18 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             throw err;
         }
     }
+    async _pullWithProgress(repoDir, updateLabel) {
+        const cts = ( new CancellationTokenSource());
+        try {
+            return await this._progressService.withProgress({
+                location: ProgressLocation.Notification,
+                title: ( localize(5911, "Updating plugin '{0}'...", updateLabel)),
+                cancellable: true
+            }, () => this._pluginGit.pull(repoDir, cts.token), () => cts.dispose(true));
+        } finally {
+            cts.dispose();
+        }
+    }
     async _purgeAndRecloneMarketplace(marketplace, marketplaceType, label) {
         if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
             return;
@@ -178,7 +209,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         try {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(5471, "Purging plugin marketplace '{0}'...", marketplace.displayLabel)),
+                title: ( localize(5912, "Purging plugin marketplace '{0}'...", marketplace.displayLabel)),
                 cancellable: false
             }, async () => {
                 const exists = await this._fileService.exists(repoDir);
@@ -190,12 +221,12 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
                 }
                 await this.ensureRepository(marketplace, {
                     marketplaceType,
-                    progressTitle: ( localize(5472, "Recloning plugin marketplace '{0}'...", marketplace.displayLabel)),
+                    progressTitle: ( localize(5913, "Recloning plugin marketplace '{0}'...", marketplace.displayLabel)),
                     failureLabel: label
                 });
             });
             this._notificationService.info(( localize(
-                5473,
+                5914,
                 "Recloned plugin marketplace '{0}'. Try updating plugins again.",
                 marketplace.displayLabel
             )));
@@ -203,13 +234,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5474,
+                    5915,
                     "Failed to purge plugin marketplace '{0}': {1}",
                     marketplace.displayLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5468, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5908, "Show Git Output")), undefined, true, () => {
                         return this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -232,22 +263,25 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             }
             result.set(canonicalId, {
                 repositoryUri: entry.repositoryUri,
-                marketplaceType: entry.marketplaceType
+                marketplaceType: entry.marketplaceType,
+                lastRefreshedAt: entry.lastRefreshedAt
             });
         }
         return result;
     }
-    _updateMarketplaceIndex(marketplace, repositoryUri, marketplaceType) {
+    _updateMarketplaceIndex(marketplace, repositoryUri, marketplaceType, lastRefreshedAt) {
         if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
             return;
         }
         const previous = this._marketplaceIndex.value.get(marketplace.canonicalId);
-        if (previous && ( previous.repositoryUri.toString()) === ( repositoryUri.toString()) && previous.marketplaceType === marketplaceType) {
+        const updatedLastRefreshedAt = lastRefreshedAt ?? previous?.lastRefreshedAt;
+        if (previous && ( previous.repositoryUri.toString()) === ( repositoryUri.toString()) && previous.marketplaceType === marketplaceType && previous.lastRefreshedAt === updatedLastRefreshedAt) {
             return;
         }
         this._marketplaceIndex.value.set(marketplace.canonicalId, {
             repositoryUri,
-            marketplaceType
+            marketplaceType,
+            lastRefreshedAt: updatedLastRefreshedAt
         });
         this._saveMarketplaceIndex();
     }
@@ -256,7 +290,8 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         for (const [canonicalId, entry] of this._marketplaceIndex.value) {
             serialized[canonicalId] = JSON.parse(JSON.stringify({
                 repositoryUri: entry.repositoryUri,
-                marketplaceType: entry.marketplaceType
+                marketplaceType: entry.marketplaceType,
+                lastRefreshedAt: entry.lastRefreshedAt
             }));
         }
         if (( Object.keys(serialized)).length === 0) {
@@ -270,8 +305,9 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             StorageTarget.MACHINE
         );
     }
-    async _cloneRepository(repoDir, cloneUrl, progressTitle, failureLabel, ref) {
+    async _cloneRepository(repoDir, cloneUrl, progressTitle, failureLabel, ref, token) {
         const cts = ( new CancellationTokenSource());
+        const tokenListener = token?.onCancellationRequested(() => cts.cancel());
         try {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
@@ -283,22 +319,25 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             }, () => cts.dispose(true));
         } catch (err) {
             this._logService.error(`[AgentPluginRepositoryService] Failed to clone ${cloneUrl}:`, err);
-            this._notificationService.notify({
-                severity: Severity.Error,
-                message: ( localize(
-                    5475,
-                    "Failed to install plugin '{0}': {1}",
-                    failureLabel,
-                    err?.message ?? String(err)
-                )),
-                actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5468, "Show Git Output")), undefined, true, () => {
-                        this._commandService.executeCommand("git.showOutput");
-                    }))]
-                }
-            });
+            if (!isCancellationError(err)) {
+                this._notificationService.notify({
+                    severity: Severity.Error,
+                    message: ( localize(
+                        5916,
+                        "Failed to install plugin '{0}': {1}",
+                        failureLabel,
+                        err?.message ?? String(err)
+                    )),
+                    actions: {
+                        primary: [( new Action("showGitOutput", ( localize(5908, "Show Git Output")), undefined, true, () => {
+                            this._commandService.executeCommand("git.showOutput");
+                        }))]
+                    }
+                });
+            }
             throw err;
         } finally {
+            tokenListener?.dispose();
             cts.dispose();
         }
     }

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

@@ -1,12 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { getDomNodePagePosition, append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { Action, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { getErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { disposeIfDisposable, DisposableStore, MutableDisposable, isDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -25,12 +26,16 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { WorkbenchPagedList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
+import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { getLocationBasedViewColors } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
+import { getWorkbenchMenuMotionContextMenuOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/actions/menuMotion';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { VIEW_CONTAINER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensions.contribution';
 import { manageExtensionIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
@@ -41,12 +46,12 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
-import { hasSourceChanged } from '../common/plugins/pluginMarketplaceService.js';
+import { hasSourceChanged } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
 import { AgentPluginItemKind } from './agentPluginEditor/agentPluginItems.js';
-import { InstallPluginAction, getInstalledPluginContextMenuActions, OpenPluginReadmeAction } from './agentPluginActions.js';
-import { InstalledAgentPluginsViewId, HasInstalledAgentPluginsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { InstallPluginAction, getInstalledPluginContextMenuActions, OpenPluginReadmeAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentPluginActions';
+import { InstalledAgentPluginsViewId, RefreshAgentPluginMarketplacesCommandId, HasInstalledAgentPluginsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
@@ -71,6 +76,7 @@ function marketplacePluginToItem(plugin) {
         kind: AgentPluginItemKind.Marketplace,
         name: plugin.name,
         description: plugin.description,
+        version: plugin.version,
         source: plugin.source,
         sourceDescriptor: plugin.sourceDescriptor,
         marketplace: plugin.marketplace,
@@ -92,7 +98,7 @@ let UpdatePluginAction = class UpdatePluginAction extends Action {
         pluginInstallService,
         pluginMarketplaceService
     ) {
-        super(UpdatePluginAction_1.ID, ( localize(5476, "Update")), "extension-action label prominent install");
+        super(UpdatePluginAction_1.ID, ( localize(5917, "Update")), "extension-action label prominent install");
         this.plugin = plugin;
         this.liveMarketplacePlugin = liveMarketplacePlugin;
         this.pluginInstallService = pluginInstallService;
@@ -120,7 +126,7 @@ let ManagePluginAction = class ManagePluginAction extends Action {
         this.getActionGroups = getActionGroups;
         this.instantiationService = instantiationService;
         this._actionViewItem = null;
-        this.tooltip = ( localize(5477, "Manage"));
+        this.tooltip = ( localize(5918, "Manage"));
     }
     createActionViewItem(options) {
         this._actionViewItem = this.instantiationService.createInstance(DropDownActionViewItem, this, options);
@@ -148,16 +154,8 @@ let DropDownActionViewItem = class DropDownActionViewItem extends ActionViewItem
         if (actions.length > 0) {
             actions.pop();
         }
-        const {
-            left,
-            top,
-            height
-        } = getDomNodePagePosition(this.element);
         this.contextMenuService.showContextMenu({
-            getAnchor: () => ({
-                x: left,
-                y: top + height + 10
-            }),
+            ...getWorkbenchMenuMotionContextMenuOptions(this.element),
             getActions: () => actions,
             onHide: () => disposeIfDisposable(actions)
         });
@@ -357,7 +355,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
                         return item?.name ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(5478, "Agent Plugins");
+                        return localize(5919, "Agent Plugins");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles
@@ -463,7 +461,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
                 const expectedUri = this.pluginInstallService.getPluginInstallUri({
                     name: m.name,
                     description: m.description,
-                    version: "",
+                    version: m.version ?? "",
                     source: m.source,
                     sourceDescriptor: m.sourceDescriptor,
                     marketplace: m.marketplace,
@@ -532,7 +530,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
             this.bodyTemplate.pluginsList.classList.toggle("hidden", count === 0);
             this.bodyTemplate.messageContainer.classList.toggle("hidden", count > 0);
             if (count === 0 && this.isBodyVisible()) {
-                this.bodyTemplate.messageBox.textContent = ( localize(5479, "No agent plugins found."));
+                this.bodyTemplate.messageBox.textContent = ( localize(5920, "No agent plugins found."));
             }
         }
     }
@@ -542,8 +540,8 @@ class AgentPluginsBrowseCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.browse",
-            title: ( localize2(5480, "Agent Plugins")),
-            tooltip: ( localize2(5481, "Browse Agent Plugins")),
+            title: ( localize2(5921, "Agent Plugins")),
+            tooltip: ( localize2(5922, "Browse Agent Plugins")),
             icon: Codicon.search,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: [{
@@ -562,34 +560,51 @@ class AgentPluginsBrowseCommand extends Action2 {
         accessor.get(IExtensionsWorkbenchService).openSearch("@agentPlugins ");
     }
 }
-class CheckForPluginUpdatesCommand extends Action2 {
+class RefreshPluginMarketplacesCommand extends Action2 {
     constructor() {
         super({
-            id: "workbench.agentPlugins.checkForUpdates",
-            title: ( localize2(5482, "Update Plugins")),
-            category: ( localize2(5483, "Chat")),
+            id: RefreshAgentPluginMarketplacesCommandId,
+            title: ( localize2(5923, "Refresh Plugin Marketplaces")),
+            category: ( localize2(5924, "Chat")),
+            icon: Codicon.refresh,
             precondition: ChatContextKeys.enabled,
             f1: true
         });
     }
     async run(accessor) {
-        await accessor.get(IPluginInstallService).updateAllPlugins({}, CancellationToken.None);
-    }
-}
-class ForceUpdatePluginsCommand extends Action2 {
-    constructor() {
-        super({
-            id: "workbench.agentPlugins.forceUpdate",
-            title: ( localize2(5484, "Update Plugins (Force)")),
-            category: ( localize2(5483, "Chat")),
-            precondition: ChatContextKeys.enabled,
-            f1: true
-        });
-    }
-    async run(accessor) {
-        await accessor.get(IPluginInstallService).updateAllPlugins({
-            force: true
-        }, CancellationToken.None);
+        const marketplaceService = accessor.get(IPluginMarketplaceService);
+        const notificationService = accessor.get(INotificationService);
+        const progressService = accessor.get(IProgressService);
+        const cts = ( new CancellationTokenSource());
+        const failedLabels = [];
+        try {
+            await progressService.withProgress({
+                location: ProgressLocation.Notification,
+                title: ( localize(5925, "Refreshing plugin marketplaces...")),
+                cancellable: true
+            }, () => marketplaceService.fetchMarketplacePlugins(cts.token, undefined, {
+                refresh: true,
+                onMarketplaceError: reference => failedLabels.push(reference.displayLabel)
+            }), () => cts.dispose(true));
+            if (cts.token.isCancellationRequested) {
+                return;
+            }
+            if (failedLabels.length > 0) {
+                notificationService.warn(( localize(
+                    5926,
+                    "Refreshed plugin marketplaces, but {0} could not be read: {1}",
+                    failedLabels.length,
+                    failedLabels.join(", ")
+                )));
+            } else {
+                notificationService.info(( localize(5927, "Plugin marketplaces refreshed.")));
+            }
+        } catch (error) {
+            notificationService.error(( localize(5928, "Failed to refresh plugin marketplaces: {0}", getErrorMessage(error))));
+            throw error;
+        } finally {
+            cts.dispose();
+        }
     }
 }
 let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends Disposable {
@@ -603,11 +618,10 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             hasInstalledKey.set(agentPluginService.plugins.read(reader).length > 0);
         }));
         registerAction2(AgentPluginsBrowseCommand);
-        registerAction2(CheckForPluginUpdatesCommand);
-        registerAction2(ForceUpdatePluginsCommand);
+        registerAction2(RefreshPluginMarketplacesCommand);
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledAgentPluginsViewId,
-            name: ( localize2(5485, "Agent Plugins - Installed")),
+            name: ( localize2(5929, "Agent Plugins - Installed")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{
                 installedOnly: true
             }])),
@@ -617,7 +631,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             canToggleVisibility: true
         }, {
             id: "workbench.views.agentPlugins.default.marketplace",
-            name: ( localize2(5486, "Agent Plugins")),
+            name: ( localize2(5930, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledAgentPluginsContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()))),
             weight: 30,
@@ -626,7 +640,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             hideByDefault: true
         }, {
             id: "workbench.views.agentPlugins.marketplace",
-            name: ( localize2(5486, "Agent Plugins")),
+            name: ( localize2(5930, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(SearchAgentPluginsContext, ( ChatContextKeys.Setup.hidden.negate())))
         }], VIEW_CONTAINER);

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.d.ts

@@ -1,42 +1,61 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { type IExtUri } from "@codingame/monaco-vscode-api/vscode/vs/base/common/resources";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import type { AgentCustomization, SessionActiveClient, ToolDefinition } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
+import type { ClientPluginCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import type { SessionActiveClient, ToolDefinition } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
-import type { ClientPluginCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
-import { ICustomizationSyncProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService";
-import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
-import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import type { ICustomizationSyncProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
-import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
-import { IConfigurationResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service";
 import { IAgentHostToolSetEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService.service";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IAgentHostMcpServerSupportScope } from "./agentHostMcpServerSupportScope.js";
+import { type ISyncedCustomizationOrigin } from "./syncedCustomizationBundler.js";
 import { IAgentHostActiveClientService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service";
-/** The exposed `syncProvider` is the same instance the service uses to resolve customizations; the contribution wires it into its harness so opt-out toggles propagate. */
-export interface IAgentRegistration extends IDisposable {
-    readonly syncProvider: ICustomizationSyncProvider;
+/** Identity a published customization set is resolved against. Refcounted; disposed by each holder. */
+export interface IAgentCustomizationScope extends IDisposable {
+    readonly customizations: IObservable<readonly ClientPluginCustomization[]>;
+    readonly customAgents: IObservable<readonly AgentCustomization[]>;
+    /** Tools available to this scope's active client. */
+    readonly tools: IObservable<readonly ToolDefinition[]>;
+    /** Composed active-client view for this scope. */
+    activeClient(clientId: string): IObservable<SessionActiveClient>;
+    /**
+     * `false` until the initial customization resolution completes. Publishing an
+     * unresolved scope would transiently wipe the host's customization state.
+     */
+    readonly isResolved: IObservable<boolean>;
+    /** Resolves once the scope's initial customization resolution has completed. */
+    whenResolved(): Promise<void>;
 }
 export declare class AgentHostActiveClientService extends Disposable implements IAgentHostActiveClientService {
     private readonly _toolsService;
-    private readonly _promptsService;
-    private readonly _agentPluginService;
     private readonly _storageService;
     private readonly _instantiationService;
-    private readonly _fileService;
-    private readonly _mcpService;
-    private readonly _configurationResolverService;
     private readonly _toolSetEnablementService;
+    private readonly _uriIdentityService;
     readonly _serviceBrand: undefined;
-    private readonly _customizationsByType;
     private readonly _allToolsObs;
     private readonly _allToolSetsObs;
-    /** Cached per-`sessionType` advertised-tools observable, so callers (e.g. autoruns) reuse one stable derived. */
+    private readonly _semanticSearchEnabled;
     private readonly _clientToolsByType;
-    constructor(_toolsService: ILanguageModelToolsService, _promptsService: IPromptsService, _agentPluginService: IAgentPluginService, _storageService: IStorageService, _instantiationService: IInstantiationService, _fileService: IFileService, _mcpService: IMcpService, _configurationResolverService: IConfigurationResolverService, _toolSetEnablementService: IAgentHostToolSetEnablementService);
-    registerForAgent(sessionType: string): IAgentRegistration;
-    private _setCustomizations;
-    getActiveClient(sessionType: string, clientId: string): SessionActiveClient;
-    getCustomizations(sessionType: string): IObservable<readonly ClientPluginCustomization[]>;
-    getClientTools(sessionType: string): IObservable<readonly ToolDefinition[]>;
+    private readonly _scopes;
+    private readonly _mcpServerSupportScopes;
+    private readonly _syncProviders;
+    private _isDisposed;
+    constructor(_toolsService: ILanguageModelToolsService, _storageService: IStorageService, _instantiationService: IInstantiationService, _toolSetEnablementService: IAgentHostToolSetEnablementService, _uriIdentityService: IUriIdentityService, configurationService: IConfigurationService);
+    acquireScope(sessionType: string, roots: readonly URI[]): IAgentCustomizationScope;
+    acquireMcpServerSupportScope(sessionType: string, roots: readonly URI[] | undefined): IAgentHostMcpServerSupportScope | undefined;
+    getSyncProvider(sessionType: string): ICustomizationSyncProvider;
+    getOrigin(syncedUri: URI): ISyncedCustomizationOrigin | undefined;
+    areScopeRootsEqual(first: readonly URI[] | undefined, second: readonly URI[]): boolean;
+    isBundledMcpServer(pluginUri: string, serverName: string): boolean;
+    private _getClientTools;
+    dispose(): void;
+    private _removeScope;
+    private _removeMcpServerSupportScope;
 }
+/** Returns whether two working-directory sets describe the same customization scope. */
+export declare function areCustomizationScopeRootsEqual(first: readonly URI[] | undefined, second: readonly URI[], extUri: IExtUri): boolean;