@codingame/monaco-vscode-chat-service-override 29.1.0 → 30.0.0

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

@@ -4,10 +4,10 @@ import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actio
 import { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { joinPath, dirname, isEqualOrParent, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { joinPath, isEqual, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -42,7 +42,15 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         this._storageService = _storageService;
         this._marketplaceIndex = ( new Lazy(() => this._loadMarketplaceIndex()));
         this._cloneSequencer = ( new SequencerByKey());
-        this._cacheRoot = joinPath(environmentService.cacheHome, "agentPlugins");
+        this.agentPluginsHome = environmentService.agentPluginsHome;
+        const legacyCacheRoot = joinPath(environmentService.cacheHome, "agentPlugins");
+        const oldCacheRoot = environmentService.cacheHome.scheme === "file" ? legacyCacheRoot : this.agentPluginsHome;
+        this._cacheRoot = this.agentPluginsHome;
+        if (!isEqual(oldCacheRoot, this.agentPluginsHome)) {
+            this._migrationDone = this._migrateDirectory(oldCacheRoot);
+        } else {
+            this._migrationDone = Promise.resolve();
+        }
         this._pluginSources = ( new Map([[PluginSourceKind.RelativePath, ( new RelativePathPluginSource())], [
             PluginSourceKind.GitHub,
             instantiationService.createInstance(GitHubPluginSource)
@@ -73,6 +81,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         return this._getPluginDir(repoDir, plugin.source);
     }
     async ensureRepository(marketplace, options) {
+        await this._migrationDone;
         const repoDir = this.getRepositoryUri(marketplace, options?.marketplaceType);
         return this._cloneSequencer.queue(repoDir.fsPath, async () => {
             const repoExists = await this._fileService.exists(repoDir);
@@ -83,7 +92,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
                 throw ( new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`));
             }
-            const progressTitle = options?.progressTitle ?? ( localize(5063, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
+            const progressTitle = options?.progressTitle ?? ( localize(5085, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
             const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
             await this._cloneRepository(repoDir, marketplace.cloneUrl, progressTitle, failureLabel);
             this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
@@ -109,7 +118,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             }
             return await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(5064, "Updating plugin '{0}'...", updateLabel)),
+                title: ( localize(5086, "Updating plugin '{0}'...", updateLabel)),
                 cancellable: false
             }, doPull);
         } catch (err) {
@@ -121,13 +130,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        5065,
+                        5087,
                         "Failed to update plugin '{0}': {1}",
                         options?.failureLabel ?? updateLabel,
                         err?.message ?? String(err)
                     )),
                     actions: {
-                        primary: [( new Action("showGitOutput", ( localize(5066, "Show Git Output")), undefined, true, () => {
+                        primary: [( new Action("showGitOutput", ( localize(5088, "Show Git Output")), undefined, true, () => {
                             this._commandService.executeCommand("git.showOutput");
                         }))]
                     }
@@ -205,13 +214,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5067,
+                    5089,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5066, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5088, "Show Git Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -231,6 +240,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         return this.getPluginSource(sourceDescriptor.kind).getInstallUri(this._cacheRoot, sourceDescriptor);
     }
     async ensurePluginSource(plugin, options) {
+        await this._migrationDone;
         const repo = this.getPluginSource(plugin.sourceDescriptor.kind);
         if (plugin.sourceDescriptor.kind === PluginSourceKind.RelativePath) {
             return this.ensureRepository(plugin.marketplaceReference, options);
@@ -319,7 +329,30 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             current = dirname(current);
         }
     }
+    async _migrateDirectory(oldCacheRoot) {
+        try {
+            const oldExists = await this._fileService.exists(oldCacheRoot);
+            if (!oldExists) {
+                return;
+            }
+            const newExists = await this._fileService.exists(this.agentPluginsHome);
+            if (newExists) {
+                this._logService.info(
+                    "[AgentPluginRepositoryService] Both old and new agent-plugins directories exist; skipping directory migration"
+                );
+                return;
+            }
+            this._logService.info(
+                `[AgentPluginRepositoryService] Migrating agent plugins from ${( oldCacheRoot.toString())} to ${( this.agentPluginsHome.toString())}`
+            );
+            await this._fileService.move(oldCacheRoot, this.agentPluginsHome, false);
+            this._storageService.remove(MARKETPLACE_INDEX_STORAGE_KEY, StorageScope.APPLICATION);
+            this._marketplaceIndex.value.clear();
+        } catch (error) {
+            this._logService.error("[AgentPluginRepositoryService] Directory migration failed", error);
+        }
+    }
 };
-AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IProgressService)), ( __param(7, IStorageService))], AgentPluginRepositoryService));
+AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IWorkbenchEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IProgressService)), ( __param(7, IStorageService))], AgentPluginRepositoryService));
 
 export { AgentPluginRepositoryService };

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

@@ -93,7 +93,7 @@ let UpdatePluginAction = class UpdatePluginAction extends Action {
         pluginInstallService,
         pluginMarketplaceService
     ) {
-        super(UpdatePluginAction_1.ID, ( localize(5068, "Update")), "extension-action label prominent install");
+        super(UpdatePluginAction_1.ID, ( localize(5090, "Update")), "extension-action label prominent install");
         this.plugin = plugin;
         this.liveMarketplacePlugin = liveMarketplacePlugin;
         this.pluginInstallService = pluginInstallService;
@@ -121,7 +121,7 @@ let ManagePluginAction = class ManagePluginAction extends Action {
         this.getActionGroups = getActionGroups;
         this.instantiationService = instantiationService;
         this._actionViewItem = null;
-        this.tooltip = ( localize(5069, "Manage"));
+        this.tooltip = ( localize(5091, "Manage"));
     }
     createActionViewItem(options) {
         this._actionViewItem = this.instantiationService.createInstance(DropDownActionViewItem, this, options);
@@ -358,7 +358,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
                         return item?.name ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(5070, "Agent Plugins");
+                        return localize(5092, "Agent Plugins");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles
@@ -533,7 +533,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(5071, "No agent plugins found."));
+                this.bodyTemplate.messageBox.textContent = ( localize(5093, "No agent plugins found."));
             }
         }
     }
@@ -543,8 +543,8 @@ class AgentPluginsBrowseCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.browse",
-            title: ( localize2(5072, "Agent Plugins")),
-            tooltip: ( localize2(5073, "Browse Agent Plugins")),
+            title: ( localize2(5094, "Agent Plugins")),
+            tooltip: ( localize2(5095, "Browse Agent Plugins")),
             icon: Codicon.search,
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
             menu: [{
@@ -567,8 +567,8 @@ class CheckForPluginUpdatesCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.checkForUpdates",
-            title: ( localize2(5074, "Update Plugins")),
-            category: ( localize2(5075, "Chat")),
+            title: ( localize2(5096, "Update Plugins")),
+            category: ( localize2(5097, "Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });
@@ -581,8 +581,8 @@ class ForceUpdatePluginsCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.forceUpdate",
-            title: ( localize2(5076, "Update Plugins (Force)")),
-            category: ( localize2(5075, "Chat")),
+            title: ( localize2(5098, "Update Plugins (Force)")),
+            category: ( localize2(5097, "Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });
@@ -608,7 +608,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
         registerAction2(ForceUpdatePluginsCommand);
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledAgentPluginsViewId,
-            name: ( localize2(5077, "Agent Plugins - Installed")),
+            name: ( localize2(5099, "Agent Plugins - Installed")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{
                 installedOnly: true
             }])),
@@ -618,7 +618,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             canToggleVisibility: true
         }, {
             id: "workbench.views.agentPlugins.default.marketplace",
-            name: ( localize2(5078, "Agent Plugins")),
+            name: ( localize2(5100, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledAgentPluginsContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()))),
             weight: 30,
@@ -627,7 +627,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             hideByDefault: true
         }, {
             id: "workbench.views.agentPlugins.marketplace",
-            name: ( localize2(5078, "Agent Plugins")),
+            name: ( localize2(5100, "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/agentSessions.contribution.js

@@ -46,7 +46,7 @@ registerAction2(SetAgentSessionsOrientationStackedAction);
 registerAction2(SetAgentSessionsOrientationSideBySideAction);
 MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
     submenu: MenuId.AgentSessionsViewerFilterSubMenu,
-    title: ( localize2(5086, "Filter Agent Sessions")),
+    title: ( localize2(5108, "Filter Agent Sessions")),
     group: "navigation",
     order: 3,
     icon: Codicon.filter
@@ -116,9 +116,9 @@ MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     prefix: AGENT_SESSIONS_QUICK_ACCESS_PREFIX,
     contextKey: "inAgentSessionsPicker",
     when: ChatContextKeys.enabled,
-    placeholder: ( localize(5087, "Search agent sessions by name")),
+    placeholder: ( localize(5109, "Search agent sessions by name")),
     helpEntries: [{
-        description: ( localize(5088, "Show All Agent Sessions")),
+        description: ( localize(5110, "Show All Agent Sessions")),
         commandId: "workbench.action.chat.history"
     }]
 });