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

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

@@ -20,9 +20,9 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { PluginSourceKind, MarketplaceType, hasSourceChanged } from '../common/plugins/pluginMarketplaceService.js';
+import { PluginSourceKind, MarketplaceType, 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 { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '../common/plugins/marketplaceReference.js';
+import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } 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';
 
 let PluginInstallService = class PluginInstallService {
@@ -71,7 +71,7 @@ let PluginInstallService = class PluginInstallService {
             return undefined;
         }
         return localize(
-            7436,
+            8682,
             "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo), a git clone URL, or a local folder path.",
             source
         );
@@ -88,7 +88,7 @@ let PluginInstallService = class PluginInstallService {
         return {
             success: false,
             message: ( localize(
-                7436,
+                8682,
                 "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo), a git clone URL, or a local folder path.",
                 source
             ))
@@ -120,7 +120,7 @@ let PluginInstallService = class PluginInstallService {
         let repoDir;
         try {
             repoDir = await this._pluginRepositoryService.ensurePluginSource(tempPlugin, {
-                progressTitle: ( localize(7437, "Cloning plugin source '{0}'...", reference.displayLabel)),
+                progressTitle: ( localize(8683, "Cloning plugin source '{0}'...", reference.displayLabel)),
                 failureLabel: reference.displayLabel,
                 marketplaceType: MarketplaceType.OpenPlugin
             });
@@ -129,7 +129,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    7438,
+                    8684,
                     "Failed to clone plugin source '{0}': {1}",
                     reference.displayLabel,
                     detail
@@ -140,7 +140,7 @@ let PluginInstallService = class PluginInstallService {
         if (!repoExists) {
             return {
                 success: false,
-                message: ( localize(7439, "Failed to clone plugin source '{0}'.", reference.displayLabel))
+                message: ( localize(8685, "Failed to clone plugin source '{0}'.", reference.displayLabel))
             };
         }
         const discoveredPlugins = await this._pluginMarketplaceService.readPluginsFromDirectory(repoDir, reference);
@@ -151,7 +151,7 @@ let PluginInstallService = class PluginInstallService {
                     return {
                         success: false,
                         message: ( localize(
-                            7440,
+                            8686,
                             "Plugin '{0}' not found in '{1}'.",
                             options.plugin,
                             reference.displayLabel
@@ -170,7 +170,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    7441,
+                    8687,
                     "No plugins found in '{0}'. This does not appear to be a valid plugin marketplace.",
                     reference.displayLabel
                 ))
@@ -184,7 +184,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    7436,
+                    8682,
                     "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo), a git clone URL, or a local folder path.",
                     reference.rawValue
                 ))
@@ -198,7 +198,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    7442,
+                    8688,
                     "The folder '{0}' does not exist or is not a directory.",
                     repoDir.fsPath
                 ))
@@ -235,7 +235,7 @@ let PluginInstallService = class PluginInstallService {
         return {
             success: false,
             message: ( localize(
-                7443,
+                8689,
                 "No plugin or marketplace found in '{0}'. This folder does not contain a plugin or marketplace manifest.",
                 repoDir.fsPath
             ))
@@ -248,7 +248,7 @@ let PluginInstallService = class PluginInstallService {
                 return {
                     success: false,
                     message: ( localize(
-                        7440,
+                        8686,
                         "Plugin '{0}' not found in '{1}'.",
                         options.plugin,
                         reference.displayLabel
@@ -275,7 +275,7 @@ let PluginInstallService = class PluginInstallService {
             plugin: p
         })));
         const selected = await this._quickInputService.pick(picks, {
-            placeHolder: ( localize(7444, "Select a plugin to install from '{0}'", reference.displayLabel)),
+            placeHolder: ( localize(8690, "Select a plugin to install from '{0}'", reference.displayLabel)),
             canPickMany: false
         });
         if (!selected) {
@@ -354,6 +354,17 @@ let PluginInstallService = class PluginInstallService {
         };
     }
     async updatePlugin(plugin, silent) {
+        if (this._pluginMarketplaceService.isStrictMarketplacePolicyActive() && !this._pluginMarketplaceService.isMarketplaceTrusted(plugin.marketplaceReference)) {
+            this._notificationService.notify({
+                severity: Severity.Warning,
+                message: ( localize(
+                    8691,
+                    "Updates from '{0}' are blocked by your organization's policy.",
+                    plugin.marketplaceReference.displayLabel
+                ))
+            });
+            return false;
+        }
         const kind = plugin.sourceDescriptor.kind;
         if (kind === PluginSourceKind.Npm || kind === PluginSourceKind.Pip) {
             return this._installPackagePlugin(plugin, silent);
@@ -365,7 +376,8 @@ let PluginInstallService = class PluginInstallService {
         });
     }
     async updateAllPlugins(options, token) {
-        const installed = this._pluginMarketplaceService.installedPlugins.get();
+        const allInstalled = this._pluginMarketplaceService.installedPlugins.get();
+        const installed = allInstalled.filter(entry => (!options.marketplaceIds || ( options.marketplaceIds.has(entry.plugin.marketplaceReference.canonicalId))) && (!options.automatic || this._pluginMarketplaceService.isMarketplaceAutoUpdateEnabled(entry.plugin.marketplaceReference)));
         if (installed.length === 0) {
             return {
                 updatedNames: [],
@@ -384,6 +396,10 @@ let PluginInstallService = class PluginInstallService {
                     continue;
                 }
                 seenMarketplaces.add(ref.canonicalId);
+                if (this._pluginMarketplaceService.isStrictMarketplacePolicyActive() && !this._pluginMarketplaceService.isMarketplaceTrusted(ref)) {
+                    failedNames.push(ref.displayLabel);
+                    continue;
+                }
                 gitTasks.push((async () => {
                     if (token.isCancellationRequested) {
                         return;
@@ -408,7 +424,8 @@ let PluginInstallService = class PluginInstallService {
                 })());
             }
             await Promise.all(gitTasks);
-            const marketplacePlugins = await this._pluginMarketplaceService.fetchMarketplacePlugins(token);
+            const marketplaceIds = ( new Set(( installed.map(entry => entry.plugin.marketplaceReference.canonicalId))));
+            const marketplacePlugins = await this._pluginMarketplaceService.fetchMarketplacePlugins(token, marketplaceIds);
             const marketplaceByKey = ( new Map());
             for (const mp of marketplacePlugins) {
                 marketplaceByKey.set(`${mp.marketplaceReference.canonicalId}::${mp.name}`, mp);
@@ -486,27 +503,31 @@ let PluginInstallService = class PluginInstallService {
         } else {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(7445, "Updating plugins..."))
+                title: ( localize(8692, "Updating plugins..."))
             }, doUpdate);
         }
         if (failedNames.length > 0) {
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(7446, "Failed to update: {0}", failedNames.join(", "))),
+                message: ( localize(8693, "Failed to update: {0}", failedNames.join(", "))),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(7447, "Show Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(8694, "Show Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
             });
         } else if (updatedNames.length > 0) {
-            this._pluginMarketplaceService.clearUpdatesAvailable();
+            if (!options.automatic) {
+                this._pluginMarketplaceService.clearUpdatesAvailable(options.marketplaceIds);
+            }
             this._notificationService.notify({
                 severity: Severity.Info,
-                message: ( localize(7448, "Updated plugins: {0}", updatedNames.join(", ")))
+                message: ( localize(8695, "Updated plugins: {0}", updatedNames.join(", ")))
             });
         } else if (!token.isCancellationRequested) {
-            this._pluginMarketplaceService.clearUpdatesAvailable();
+            if (!options.automatic) {
+                this._pluginMarketplaceService.clearUpdatesAvailable(options.marketplaceIds);
+            }
         }
         return {
             updatedNames,
@@ -524,12 +545,12 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Warning,
                 message: ( localize(
-                    7449,
+                    8696,
                     "Plugins from '{0}' are blocked by your organization's policy.",
                     plugin.marketplaceReference.displayLabel
                 )),
                 actions: {
-                    primary: [( new Action("chat.plugins.viewMarketplacePolicy", ( localize(7450, "View Policy Settings")), undefined, true, () => {
+                    primary: [( new Action("chat.plugins.viewMarketplacePolicy", ( localize(8697, "View Policy Settings")), undefined, true, () => {
                         return this._commandService.executeCommand("workbench.action.openSettings", ChatConfiguration.StrictMarketplaces);
                     }))]
                 }
@@ -541,16 +562,16 @@ let PluginInstallService = class PluginInstallService {
         } = await this._dialogService.confirm({
             type: "question",
             message: ( localize(
-                7451,
+                8698,
                 "Trust Plugins from '{0}'?",
                 plugin.marketplaceReference.displayLabel
             )),
             detail: ( localize(
-                7452,
+                8699,
                 "Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
                 plugin.marketplaceReference.rawValue
             )),
-            primaryButton: ( localize(7453, "&&Trust")),
+            primaryButton: ( localize(8700, "&&Trust")),
             custom: {
                 icon: Codicon.shield
             }
@@ -564,7 +585,7 @@ let PluginInstallService = class PluginInstallService {
     async _installRelativePathPlugin(plugin) {
         try {
             await this._pluginRepositoryService.ensureRepository(plugin.marketplaceReference, {
-                progressTitle: ( localize(7454, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(8701, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -578,7 +599,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7455,
+                    8702,
                     "Plugin source directory '{0}' is invalid for repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -591,7 +612,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7456,
+                    8703,
                     "Plugin source directory '{0}' not found in repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -606,7 +627,7 @@ let PluginInstallService = class PluginInstallService {
         let pluginDir;
         try {
             pluginDir = await this._pluginRepositoryService.ensurePluginSource(plugin, {
-                progressTitle: ( localize(7454, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(8701, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -618,7 +639,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7457,
+                    8704,
                     "Plugin source '{0}' not found after cloning.",
                     repo.getLabel(plugin.sourceDescriptor)
                 ))

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

@@ -7,7 +7,7 @@ import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService";
-import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "../common/plugins/pluginMarketplaceService.js";
+import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
 import { IPluginSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginSource";
 import { IPluginGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service";
 declare abstract class AbstractGitPluginSource implements IPluginSource {

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

@@ -19,7 +19,7 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.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 Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
@@ -76,7 +76,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             await this._checkoutRevision(repoDir, descriptor, options?.failureLabel ?? label);
             return this.getInstallUri(cacheRoot, descriptor);
         }
-        const progressTitle = options?.progressTitle ?? ( localize(7458, "Cloning plugin source '{0}'...", label));
+        const progressTitle = options?.progressTitle ?? ( localize(8705, "Cloning plugin source '{0}'...", label));
         const failureLabel = options?.failureLabel ?? label;
         const ref = descriptor.ref;
         await this._cloneRepository(repoDir, this._cloneUrl(descriptor), progressTitle, failureLabel, ref);
@@ -118,7 +118,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             try {
                 return await this._progressService.withProgress({
                     location: ProgressLocation.Notification,
-                    title: ( localize(7459, "Updating plugin '{0}'...", updateLabel)),
+                    title: ( localize(8706, "Updating plugin '{0}'...", updateLabel)),
                     cancellable: true
                 }, () => doUpdate(cts), () => cts.dispose(true));
             } finally {
@@ -130,7 +130,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        7460,
+                        8707,
                         "Failed to update plugin '{0}': {1}",
                         failureLabel,
                         err?.message ?? String(err)
@@ -156,7 +156,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7461,
+                    8708,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
@@ -174,7 +174,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
         }
         try {
             if (git.sha) {
-                await this._pluginGit.checkout(repoDir, git.sha, true, token);
+                await this._pluginGit.checkoutCommit(repoDir, git.sha, token);
                 return;
             }
             await this._pluginGit.checkout(repoDir, git.ref, undefined, token);
@@ -183,7 +183,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7462,
+                    8709,
                     "Failed to checkout plugin '{0}' to requested revision: {1}",
                     failureLabel,
                     err?.message ?? String(err)
@@ -344,7 +344,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
         if (!confirmed) {
             return undefined;
         }
-        const progressTitle = ( localize(7463, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
+        const progressTitle = ( localize(8710, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
         const {
             success,
             terminal
@@ -357,7 +357,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7464,
+                    8711,
                     "{0} package '{1}' was not found after installation.",
                     this._managerName,
                     this.getLabel(plugin.sourceDescriptor)
@@ -375,9 +375,9 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             return (new Promise(resolve => {
                 const n = this._notificationService.notify({
                     severity: Severity.Info,
-                    message: ( localize(7465, "Plugin '{0}' wants to run: {1}", pluginName, command)),
+                    message: ( localize(8712, "Plugin '{0}' wants to run: {1}", pluginName, command)),
                     actions: {
-                        primary: [( new Action("installPlugin", ( localize(7466, "Install")), undefined, true, async () => resolve(true)))]
+                        primary: [( new Action("installPlugin", ( localize(8713, "Install")), undefined, true, async () => resolve(true)))]
                     }
                 });
                 Event.once(n.onDidClose)(() => resolve(false));
@@ -387,9 +387,9 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(7467, "Install Plugin '{0}'?", pluginName)),
-            detail: ( localize(7468, "This will run the following command in a terminal:\n\n{0}", command)),
-            primaryButton: ( localize(7469, "&&Install"))
+            message: ( localize(8714, "Install Plugin '{0}'?", pluginName)),
+            detail: ( localize(8715, "This will run the following command in a terminal:\n\n{0}", command)),
+            primaryButton: ( localize(8716, "&&Install"))
         });
         return confirmed;
     }
@@ -403,7 +403,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             }, async () => {
                 terminal = await this._terminalService.createTerminal({
                     config: {
-                        name: ( localize(7470, "Plugin Install")),
+                        name: ( localize(8717, "Plugin Install")),
                         forceShellIntegration: true,
                         isTransient: true,
                         isFeatureTerminal: true
@@ -415,7 +415,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
                 await terminal.runCommand(command, true);
                 const exitCode = await commandResultPromise;
                 if (exitCode !== 0) {
-                    throw ( new Error(( localize(7471, "Command exited with code {0}", exitCode))));
+                    throw ( new Error(( localize(8718, "Command exited with code {0}", exitCode))));
                 }
             });
             return {
@@ -427,7 +427,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    7472,
+                    8719,
                     "Plugin installation command failed: {0}",
                     err?.message ?? String(err)
                 ))

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

@@ -19,7 +19,7 @@ import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode
 import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
 import { AgentPluginItemKind } from './agentPluginEditor/agentPluginItems.js';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '../common/plugins/marketplaceReference.js';
+import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
@@ -85,13 +85,13 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: pluginName ? ( localize(7473, "Install Plugin '{0}' from '{1}'?", pluginName, ref.displayLabel)) : ( localize(7474, "Install Plugin from '{0}'?", ref.displayLabel)),
+            message: pluginName ? ( localize(8720, "Install Plugin '{0}' from '{1}'?", pluginName, ref.displayLabel)) : ( localize(8721, "Install Plugin from '{0}'?", ref.displayLabel)),
             detail: ( localize(
-                7475,
+                8722,
                 "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(7476, "&&Install")),
+            primaryButton: ( localize(8723, "&&Install")),
             custom: {
                 icon: Codicon.shield
             }
@@ -132,6 +132,7 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             kind: AgentPluginItemKind.Marketplace,
             name: plugin.name,
             description: plugin.description,
+            version: plugin.version,
             source: plugin.source,
             sourceDescriptor: plugin.sourceDescriptor,
             marketplace: plugin.marketplace,
@@ -159,13 +160,13 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(7477, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
+            message: ( localize(8724, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
             detail: ( localize(
-                7478,
+                8725,
                 "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(7479, "&&Add Marketplace")),
+            primaryButton: ( localize(8726, "&&Add Marketplace")),
             custom: {
                 icon: Codicon.shield
             }

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

@@ -1,4 +1,4 @@
 /**
- * Helper to register all the `Run Current Prompt` actions.
+ * Helper to register all the `Configure Custom Agents` actions.
  */
 export declare function registerAgentActions(): void;

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

@@ -1,100 +1,58 @@
 
-import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { PromptFilePickers } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { AICustomizationManagementCommands, AICustomizationManagementSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 
 class ConfigAgentActionImpl extends Action2 {
     async run(accessor) {
-        const instaService = accessor.get(IInstantiationService);
-        const openerService = accessor.get(IOpenerService);
-        const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(
-            7486,
-            "Select the custom agents to open and configure visibility in the agent picker"
-        ));
-        const result = await pickers.selectPromptFile({
-            placeholder,
-            type: PromptsType.agent,
-            optionEdit: false,
-            optionVisibility: true
-        });
-        if (result !== undefined) {
-            await openerService.open(result.promptFile);
-        }
-    }
-}
-const PICKER_CONFIGURE_AGENTS_ACTION_ID = "workbench.action.chat.picker.customagents";
-function createPickerConfigureAgentsActionConfig(disabled) {
-    const config = {
-        id: disabled ? PICKER_CONFIGURE_AGENTS_ACTION_ID + ".disabled" : PICKER_CONFIGURE_AGENTS_ACTION_ID,
-        title: ( localize2(7487, "Configure Custom Agents...")),
-        tooltip: disabled ? ( localize(7488, "Managed by your organization")) : undefined,
-        icon: disabled ? Codicon.lock : undefined,
-        category: CHAT_CATEGORY,
-        f1: false,
-        precondition: disabled ? ( ContextKeyExpr.false()) : ( ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()),
-        menu: {
-            id: MenuId.ChatModePicker,
-            when: disabled ? ChatContextKeys.Modes.agentModeDisabledByPolicy : ( ChatContextKeys.Modes.agentModeDisabledByPolicy.negate())
-        }
-    };
-    return config;
-}
-class PickerConfigAgentAction extends ConfigAgentActionImpl {
-    constructor() {
-        super(createPickerConfigureAgentsActionConfig(false));
-    }
-}
-class PickerConfigAgentActionDisabled extends ConfigAgentActionImpl {
-    constructor() {
-        super(createPickerConfigureAgentsActionConfig(true));
+        await accessor.get(ICommandService).executeCommand(
+            AICustomizationManagementCommands.OpenEditor,
+            AICustomizationManagementSection.Agents
+        );
     }
 }
 const CONFIGURE_AGENTS_ACTION_ID = "workbench.action.chat.configure.customagents";
-function createManageAgentsActionConfig(disabled) {
+function createConfigureAgentsActionConfig(disabled) {
+    const agentModeDisabledByPolicy = ChatContextKeys.Modes.agentModeDisabledByPolicy;
     const base = {
         id: disabled ? CONFIGURE_AGENTS_ACTION_ID + ".disabled" : CONFIGURE_AGENTS_ACTION_ID,
-        title: ( localize2(7489, "Configure Custom Agents...")),
-        shortTitle: ( localize(7490, "Custom Agents")),
-        icon: disabled ? Codicon.lock : Codicon.bookmark,
-        f1: !disabled,
-        precondition: disabled ? ( ContextKeyExpr.false()) : ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()))),
+        title: ( localize2(8733, "Configure Custom Agents...")),
         category: CHAT_CATEGORY,
-        menu: [{
-            id: CHAT_CONFIG_MENU_ID,
-            when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)), disabled ? ChatContextKeys.Modes.agentModeDisabledByPolicy : ( ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()))),
-            order: 10,
-            group: "0_level"
-        }]
+        f1: !disabled,
+        precondition: disabled ? ( ContextKeyExpr.false()) : ( ContextKeyExpr.and(ChatContextKeys.enabled, ( agentModeDisabledByPolicy.negate()))),
+        menu: {
+            id: MenuId.ChatModePicker,
+            when: ( ContextKeyExpr.and(
+                ChatContextKeys.enabled,
+                disabled ? agentModeDisabledByPolicy : ( agentModeDisabledByPolicy.negate())
+            ))
+        }
     };
     return disabled ? {
         ...base,
-        tooltip: ( localize(7488, "Managed by your organization"))
+        icon: Codicon.lock,
+        tooltip: ( localize(8734, "Managed by your organization"))
     } : base;
 }
-class ManageAgentsAction extends ConfigAgentActionImpl {
+class ConfigureAgentsAction extends ConfigAgentActionImpl {
     constructor() {
-        super(createManageAgentsActionConfig(false));
+        super(createConfigureAgentsActionConfig(false));
     }
 }
-class ManageAgentsActionDisabled extends ConfigAgentActionImpl {
+class ConfigureAgentsActionDisabled extends ConfigAgentActionImpl {
     constructor() {
-        super(createManageAgentsActionConfig(true));
+        super(createConfigureAgentsActionConfig(true));
     }
 }
 function registerAgentActions() {
-    registerAction2(ManageAgentsAction);
-    registerAction2(ManageAgentsActionDisabled);
-    registerAction2(PickerConfigAgentAction);
-    registerAction2(PickerConfigAgentActionDisabled);
+    registerAction2(ConfigureAgentsAction);
+    registerAction2(ConfigureAgentsActionDisabled);
 }
 
 export { registerAgentActions };

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

@@ -1,5 +1,6 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
 import { Target } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { ITextEditorSelection } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
 /**
@@ -16,6 +17,8 @@ export interface IHookQuickPickOptions {
     readonly onHookFileCreated?: (uri: URI) => void;
     /** Filter the displayed hook types to those supported by the given target. */
     readonly target?: Target;
+    /** Restrict hook files and creation destinations to one storage scope. */
+    readonly preferredStorage?: PromptsStorage;
 }
 /**
  * Shows the Configure Hooks quick pick UI, allowing the user to view,