@codingame/monaco-vscode-chat-service-override 31.0.1 → 32.0.0

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

@@ -65,7 +65,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6489,
+                    6733,
                     "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.",
                     source
                 ))
@@ -76,7 +76,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6490,
+                    6734,
                     "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."
                 ))
             });
@@ -94,14 +94,14 @@ let PluginInstallService = class PluginInstallService {
         const reference = parseMarketplaceReference(source);
         if (!reference) {
             return localize(
-                6489,
+                6733,
                 "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.",
                 source
             );
         }
         if (reference.kind === MarketplaceReferenceKind.LocalFileUri) {
             return localize(
-                6490,
+                6734,
                 "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."
             );
         }
@@ -113,7 +113,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6489,
+                    6733,
                     "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.",
                     source
                 ))
@@ -123,7 +123,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6490,
+                    6734,
                     "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."
                 ))
             };
@@ -156,7 +156,7 @@ let PluginInstallService = class PluginInstallService {
         let repoDir;
         try {
             repoDir = await this._pluginRepositoryService.ensurePluginSource(tempPlugin, {
-                progressTitle: ( localize(6491, "Cloning plugin source '{0}'...", reference.displayLabel)),
+                progressTitle: ( localize(6735, "Cloning plugin source '{0}'...", reference.displayLabel)),
                 failureLabel: reference.displayLabel,
                 marketplaceType: MarketplaceType.OpenPlugin
             });
@@ -165,7 +165,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6492,
+                    6736,
                     "Failed to clone plugin source '{0}': {1}",
                     reference.displayLabel,
                     detail
@@ -176,16 +176,37 @@ let PluginInstallService = class PluginInstallService {
         if (!repoExists) {
             return {
                 success: false,
-                message: ( localize(6493, "Failed to clone plugin source '{0}'.", reference.displayLabel))
+                message: ( localize(6737, "Failed to clone plugin source '{0}'.", reference.displayLabel))
             };
         }
         const discoveredPlugins = await this._pluginMarketplaceService.readPluginsFromDirectory(repoDir, reference);
         if (discoveredPlugins.length === 0) {
+            const singlePlugin = await this._pluginMarketplaceService.readSinglePluginManifest(repoDir, reference);
+            if (singlePlugin) {
+                if (options?.plugin && options.plugin !== singlePlugin.name) {
+                    return {
+                        success: false,
+                        message: ( localize(
+                            6738,
+                            "Plugin '{0}' not found in '{1}'.",
+                            options.plugin,
+                            reference.displayLabel
+                        ))
+                    };
+                }
+                await this.installPlugin(singlePlugin);
+                return options?.plugin ? {
+                    success: true,
+                    matchedPlugin: singlePlugin
+                } : {
+                    success: true
+                };
+            }
             void this._pluginRepositoryService.cleanupPluginSource(tempPlugin);
             return {
                 success: false,
                 message: ( localize(
-                    6494,
+                    6739,
                     "No plugins found in '{0}'. This does not appear to be a valid plugin marketplace.",
                     reference.displayLabel
                 ))
@@ -197,7 +218,7 @@ let PluginInstallService = class PluginInstallService {
                 return {
                     success: false,
                     message: ( localize(
-                        6495,
+                        6738,
                         "Plugin '{0}' not found in '{1}'.",
                         options.plugin,
                         reference.displayLabel
@@ -224,7 +245,7 @@ let PluginInstallService = class PluginInstallService {
             plugin: p
         })));
         const selected = await this._quickInputService.pick(picks, {
-            placeHolder: ( localize(6496, "Select a plugin to install from '{0}'", reference.displayLabel)),
+            placeHolder: ( localize(6740, "Select a plugin to install from '{0}'", reference.displayLabel)),
             canPickMany: false
         });
         if (!selected) {
@@ -382,15 +403,15 @@ let PluginInstallService = class PluginInstallService {
         } else {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(6497, "Updating plugins..."))
+                title: ( localize(6741, "Updating plugins..."))
             }, doUpdate);
         }
         if (failedNames.length > 0) {
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(6498, "Failed to update: {0}", failedNames.join(", "))),
+                message: ( localize(6742, "Failed to update: {0}", failedNames.join(", "))),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(6499, "Show Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(6743, "Show Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -399,7 +420,7 @@ let PluginInstallService = class PluginInstallService {
             this._pluginMarketplaceService.clearUpdatesAvailable();
             this._notificationService.notify({
                 severity: Severity.Info,
-                message: ( localize(6500, "Updated plugins: {0}", updatedNames.join(", ")))
+                message: ( localize(6744, "Updated plugins: {0}", updatedNames.join(", ")))
             });
         } else if (!token.isCancellationRequested) {
             this._pluginMarketplaceService.clearUpdatesAvailable();
@@ -424,16 +445,16 @@ let PluginInstallService = class PluginInstallService {
         } = await this._dialogService.confirm({
             type: "question",
             message: ( localize(
-                6501,
+                6745,
                 "Trust Plugins from '{0}'?",
                 plugin.marketplaceReference.displayLabel
             )),
             detail: ( localize(
-                6502,
+                6746,
                 "Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
                 plugin.marketplaceReference.rawValue
             )),
-            primaryButton: ( localize(6503, "&&Trust")),
+            primaryButton: ( localize(6747, "&&Trust")),
             custom: {
                 icon: Codicon.shield
             }
@@ -447,7 +468,7 @@ let PluginInstallService = class PluginInstallService {
     async _installRelativePathPlugin(plugin) {
         try {
             await this._pluginRepositoryService.ensureRepository(plugin.marketplaceReference, {
-                progressTitle: ( localize(6504, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(6748, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -461,7 +482,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6505,
+                    6749,
                     "Plugin source directory '{0}' is invalid for repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -474,7 +495,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6506,
+                    6750,
                     "Plugin source directory '{0}' not found in repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -489,7 +510,7 @@ let PluginInstallService = class PluginInstallService {
         let pluginDir;
         try {
             pluginDir = await this._pluginRepositoryService.ensurePluginSource(plugin, {
-                progressTitle: ( localize(6504, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(6748, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -501,7 +522,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6507,
+                    6751,
                     "Plugin source '{0}' not found after cloning.",
                     repo.getLabel(plugin.sourceDescriptor)
                 ))

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

@@ -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(6508, "Cloning plugin source '{0}'...", label));
+        const progressTitle = options?.progressTitle ?? ( localize(6752, "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(6509, "Updating plugin '{0}'...", updateLabel)),
+                    title: ( localize(6753, "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(
-                        6510,
+                        6754,
                         "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(
-                    6511,
+                    6755,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
@@ -183,7 +183,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6512,
+                    6756,
                     "Failed to checkout plugin '{0}' to requested revision: {1}",
                     failureLabel,
                     err?.message ?? String(err)
@@ -329,7 +329,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
         if (!confirmed) {
             return undefined;
         }
-        const progressTitle = ( localize(6513, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
+        const progressTitle = ( localize(6757, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
         const {
             success,
             terminal
@@ -342,7 +342,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6514,
+                    6758,
                     "{0} package '{1}' was not found after installation.",
                     this._managerName,
                     this.getLabel(plugin.sourceDescriptor)
@@ -360,9 +360,9 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             return (new Promise(resolve => {
                 const n = this._notificationService.notify({
                     severity: Severity.Info,
-                    message: ( localize(6515, "Plugin '{0}' wants to run: {1}", pluginName, command)),
+                    message: ( localize(6759, "Plugin '{0}' wants to run: {1}", pluginName, command)),
                     actions: {
-                        primary: [( new Action("installPlugin", ( localize(6516, "Install")), undefined, true, async () => resolve(true)))]
+                        primary: [( new Action("installPlugin", ( localize(6760, "Install")), undefined, true, async () => resolve(true)))]
                     }
                 });
                 Event.once(n.onDidClose)(() => resolve(false));
@@ -372,9 +372,9 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6517, "Install Plugin '{0}'?", pluginName)),
-            detail: ( localize(6518, "This will run the following command in a terminal:\n\n{0}", command)),
-            primaryButton: ( localize(6519, "&&Install"))
+            message: ( localize(6761, "Install Plugin '{0}'?", pluginName)),
+            detail: ( localize(6762, "This will run the following command in a terminal:\n\n{0}", command)),
+            primaryButton: ( localize(6763, "&&Install"))
         });
         return confirmed;
     }
@@ -388,7 +388,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             }, async () => {
                 terminal = await this._terminalService.createTerminal({
                     config: {
-                        name: ( localize(6520, "Plugin Install")),
+                        name: ( localize(6764, "Plugin Install")),
                         forceShellIntegration: true,
                         isTransient: true,
                         isFeatureTerminal: true
@@ -400,7 +400,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
                 await terminal.runCommand(command, true);
                 const exitCode = await commandResultPromise;
                 if (exitCode !== 0) {
-                    throw ( new Error(( localize(6521, "Command exited with code {0}", exitCode))));
+                    throw ( new Error(( localize(6765, "Command exited with code {0}", exitCode))));
                 }
             });
             return {
@@ -412,7 +412,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6522,
+                    6766,
                     "Plugin installation command failed: {0}",
                     err?.message ?? String(err)
                 ))

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

@@ -83,13 +83,13 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6523, "Install Plugin from '{0}'?", ref.displayLabel)),
+            message: ( localize(6767, "Install Plugin from '{0}'?", ref.displayLabel)),
             detail: ( localize(
-                6524,
+                6768,
                 "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(6525, "&&Install")),
+            primaryButton: ( localize(6769, "&&Install")),
             custom: {
                 icon: Codicon.shield
             }
@@ -148,13 +148,13 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6526, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
+            message: ( localize(6770, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
             detail: ( localize(
-                6527,
+                6771,
                 "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(6528, "&&Add Marketplace")),
+            primaryButton: ( localize(6772, "&&Add Marketplace")),
             custom: {
                 icon: Codicon.shield
             }

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

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

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

@@ -14,15 +14,15 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { Target, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { Target, PromptsType, getSourceDescription } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { HOOKS_BY_TARGET, HOOK_METADATA } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { formatHookCommandLabel, getEffectiveCommandFieldKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { resolveCopilotCliHookType, getCopilotCliHookTypeName } from '../../common/promptSyntax/hookCopilotCliCompat.js';
-import { getHookSourceFormat, HookSourceFormat, buildNewHookEntry } from '../../common/promptSyntax/hookCompatibility.js';
-import { getClaudeHookTypeName, resolveClaudeHookType } from '../../common/promptSyntax/hookClaudeCompat.js';
+import { resolveCopilotCliHookType, getCopilotCliHookTypeName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCopilotCliCompat';
+import { getHookSourceFormat, HookSourceFormat, buildNewHookEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCompatibility';
+import { getClaudeHookTypeName, resolveClaudeHookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookClaudeCompat';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { findHookCommandSelection, parseAllHookFiles, findHookCommandInYaml } from './hookUtils.js';
@@ -74,7 +74,7 @@ async function addHookToFile(
             }
         } catch {
             notificationService.error(( localize(
-                6540,
+                6784,
                 "Failed to parse existing hooks file. Please fix the JSON syntax errors and try again."
             )));
             await editorService.openEditor({
@@ -157,7 +157,7 @@ async function addHookToFile(
                 range: ( new Range(1, 1, Number.MAX_SAFE_INTEGER, 1)),
                 text: jsonContent
             }))], {
-                label: ( localize(6541, "Add Hook"))
+                label: ( localize(6785, "Add Hook"))
             });
             const selection = findHookCommandSelection(jsonContent, keyToUse, newHookIndex, "command");
             await editorService.openEditor({
@@ -182,7 +182,7 @@ async function addHookToFile(
                 range: ( new Range(1, 1, Number.MAX_SAFE_INTEGER, 1)),
                 text: jsonContent
             }))], {
-                label: ( localize(6541, "Add Hook"))
+                label: ( localize(6785, "Add Hook"))
             });
         }
         const selection = findHookCommandSelection(jsonContent, keyToUse, newHookIndex, "command");
@@ -308,29 +308,29 @@ async function showConfigureHooksQuickPick(accessor, options) {
                         if (shared.length > 0) {
                             pickerItems.push({
                                 type: "separator",
-                                label: ( localize(6542, "Local/Copilot CLI Agents"))
+                                label: ( localize(6786, "Local/Copilot CLI Agents"))
                             });
                             pickerItems.push(...( shared.map(makeItem)));
                         }
                         if (vscodeOnly.length > 0) {
                             pickerItems.push({
                                 type: "separator",
-                                label: ( localize(6543, "Local Agents"))
+                                label: ( localize(6787, "Local Agents"))
                             });
                             pickerItems.push(...( vscodeOnly.map(makeItem)));
                         }
                         if (copilotOnly.length > 0) {
                             pickerItems.push({
                                 type: "separator",
-                                label: ( localize(6544, "Copilot CLI Agents"))
+                                label: ( localize(6788, "Copilot CLI Agents"))
                             });
                             pickerItems.push(...( copilotOnly.map(makeItem)));
                         }
                     }
                     picker.items = pickerItems;
                     picker.value = "";
-                    picker.placeholder = ( localize(6545, "Select a lifecycle event"));
-                    picker.title = ( localize(6546, "Hooks"));
+                    picker.placeholder = ( localize(6789, "Select a lifecycle event"));
+                    picker.title = ( localize(6790, "Hooks"));
                     picker.buttons = [];
                     const result = await awaitPick(picker, backButton);
                     if (!result || result === "back") {
@@ -348,14 +348,14 @@ async function showConfigureHooksQuickPick(accessor, options) {
                     const agentHooks = hooksOfType.filter(h => h.agentName);
                     const hookItems = [];
                     hookItems.push({
-                        label: `$(plus) ${( localize(6547, "Add new hook..."))}`,
+                        label: `$(plus) ${( localize(6791, "Add new hook..."))}`,
                         isAddNewHook: true,
                         alwaysShow: true
                     });
                     if (fileHooks.length > 0) {
                         hookItems.push({
                             type: "separator",
-                            label: ( localize(6548, "Existing Hooks"))
+                            label: ( localize(6792, "Existing Hooks"))
                         });
                         for (const entry of fileHooks) {
                             const description = labelService.getUriLabel(entry.fileUri, {
@@ -373,7 +373,7 @@ async function showConfigureHooksQuickPick(accessor, options) {
                         for (const agentName of agentNames) {
                             hookItems.push({
                                 type: "separator",
-                                label: ( localize(6549, "Agent: {0}", agentName))
+                                label: ( localize(6793, "Agent: {0}", agentName))
                             });
                             for (const entry of agentHooks.filter(h => h.agentName === agentName)) {
                                 const description = labelService.getUriLabel(entry.fileUri, {
@@ -392,7 +392,7 @@ async function showConfigureHooksQuickPick(accessor, options) {
                     } else {
                         picker.items = hookItems;
                         picker.value = "";
-                        picker.placeholder = ( localize(6550, "Select a hook to open or add a new one"));
+                        picker.placeholder = ( localize(6794, "Select a hook to open or add a new one"));
                         picker.title = selectedHookType.hookTypeMeta.label;
                         picker.buttons = [backButton];
                         const result = await awaitPick(picker, backButton);
@@ -449,14 +449,14 @@ async function showConfigureHooksQuickPick(accessor, options) {
                     const hookFiles = await promptsService.listPromptFilesForStorage(PromptsType.hook, PromptsStorage.local, CancellationToken.None);
                     const fileItems = [];
                     fileItems.push({
-                        label: `$(new-file) ${( localize(6551, "Create new hook config file..."))}`,
+                        label: `$(new-file) ${( localize(6795, "Create new hook config file..."))}`,
                         isCreateNewFile: true,
                         alwaysShow: true
                     });
                     if (hookFiles.length > 0) {
                         fileItems.push({
                             type: "separator",
-                            label: ( localize(6552, "Existing Hook Files"))
+                            label: ( localize(6796, "Existing Hook Files"))
                         });
                         for (const hookFile of hookFiles) {
                             const relativePath = labelService.getUriLabel(hookFile.uri, {
@@ -473,8 +473,8 @@ async function showConfigureHooksQuickPick(accessor, options) {
                     } else {
                         picker.items = fileItems;
                         picker.value = "";
-                        picker.placeholder = ( localize(6553, "Select a hook file or create a new one"));
-                        picker.title = ( localize(6554, "Add Hook"));
+                        picker.placeholder = ( localize(6797, "Select a hook file or create a new one"));
+                        picker.title = ( localize(6798, "Add Hook"));
                         picker.buttons = [backButton];
                         const result = await awaitPick(picker, backButton);
                         if (result === "back") {
@@ -505,23 +505,27 @@ async function showConfigureHooksQuickPick(accessor, options) {
             case Step.SelectFolder:
                 {
                     const allFolders = await promptsService.getSourceFolders(PromptsType.hook);
-                    const localFolders = allFolders.filter(f => f.storage === PromptsStorage.local);
-                    if (localFolders.length === 0) {
-                        notificationService.error(( localize(6555, "Please open a workspace folder to configure hooks.")));
+                    if (allFolders.length === 0) {
+                        notificationService.error(( localize(6799, "Please open a workspace folder to configure hooks.")));
                         return;
                     }
-                    selectedFolder = localFolders[0];
-                    if (localFolders.length > 1) {
-                        const folderItems = ( localFolders.map(folder => ({
-                            label: labelService.getUriLabel(folder.uri, {
-                                relative: true
-                            }),
-                            folder
-                        })));
+                    selectedFolder = allFolders[0];
+                    if (allFolders.length > 1) {
+                        const folderItems = ( allFolders.map((folder, index) => {
+                            const basePath = labelService.getUriLabel(folder.uri, {
+                                relative: folder.storage === PromptsStorage.local
+                            });
+                            const label = index === 0 ? ( localize(6800, "{0} (default)", basePath)) : basePath;
+                            return {
+                                label,
+                                description: folder.source ? getSourceDescription(folder.source) : undefined,
+                                folder
+                            };
+                        }));
                         picker.items = folderItems;
                         picker.value = "";
-                        picker.placeholder = ( localize(6556, "Select a location for the hook file"));
-                        picker.title = ( localize(6557, "Hook File Location"));
+                        picker.placeholder = ( localize(6801, "Select a location for the hook file"));
+                        picker.title = ( localize(6802, "Hook File Location"));
                         picker.buttons = [backButton];
                         const result = await awaitPick(picker, backButton);
                         if (result === "back") {
@@ -551,20 +555,20 @@ async function showConfigureHooksQuickPick(accessor, options) {
                         };
                         const inputDisposables = ( new DisposableStore());
                         const inputBox = inputDisposables.add(quickInputService.createInputBox());
-                        inputBox.prompt = ( localize(6558, "Enter hook file name"));
-                        inputBox.placeholder = ( localize(6559, "e.g., hooks, diagnostics, security"));
-                        inputBox.title = ( localize(6560, "Hook File Name"));
+                        inputBox.prompt = ( localize(6803, "Enter hook file name"));
+                        inputBox.placeholder = ( localize(6804, "e.g., hooks, diagnostics, security"));
+                        inputBox.title = ( localize(6805, "Hook File Name"));
                         inputBox.buttons = [backButton];
                         inputBox.ignoreFocusOut = true;
                         inputDisposables.add(inputBox.onDidAccept(async () => {
                             const value = inputBox.value;
                             if (!value || !value.trim()) {
-                                inputBox.validationMessage = ( localize(6561, "File name is required"));
+                                inputBox.validationMessage = ( localize(6806, "File name is required"));
                                 return;
                             }
                             const name = value.trim();
                             if (/[/\\:*?"<>|]/.test(name)) {
-                                inputBox.validationMessage = ( localize(6562, "File name contains invalid characters"));
+                                inputBox.validationMessage = ( localize(6807, "File name contains invalid characters"));
                                 return;
                             }
                             done(name);
@@ -651,8 +655,8 @@ class ManageHooksAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_HOOKS_ACTION_ID,
-            title: ( localize2(6563, "Configure Hooks...")),
-            shortTitle: ( localize2(6564, "Hooks")),
+            title: ( localize2(6808, "Configure Hooks...")),
+            shortTitle: ( localize2(6809, "Hooks")),
             icon: Codicon.zap,
             f1: true,
             precondition: ChatContextKeys.enabled,