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

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

@@ -8,3 +8,11 @@ export declare function truncateToFirstLine(text: string): string;
  * Returns the secondary text shown for a customization item.
  */
 export declare function getCustomizationSecondaryText(description: string | undefined, filename: string, promptType: PromptsType): string;
+/**
+ * Extracts an extension ID from a file path if the path is inside an
+ * extension install directory (e.g. `~/.vscode/extensions/<id>-<version>/...`).
+ *
+ * Returns the extension ID (e.g. `github.copilot-chat`) or `undefined`
+ * if the path is not inside an extension directory.
+ */
+export declare function extractExtensionIdFromPath(uriPath: string): string | undefined;

package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidgetUtils.js

@@ -14,5 +14,15 @@ function getCustomizationSecondaryText(description, filename, promptType) {
     }
     return promptType === PromptsType.hook ? description : truncateToFirstLine(description);
 }
+function extractExtensionIdFromPath(uriPath) {
+    const segments = uriPath.split('/');
+    const extensionsIdx = segments.lastIndexOf('extensions');
+    if (extensionsIdx < 0 || extensionsIdx + 1 >= segments.length) {
+        return undefined;
+    }
+    const folderName = segments[extensionsIdx + 1];
+    const versionMatch = folderName.match(/^(.+)-\d+\./);
+    return versionMatch ? versionMatch[1] : undefined;
+}
 
-export { getCustomizationSecondaryText, truncateToFirstLine };
+export { extractExtensionIdFromPath, getCustomizationSecondaryText, truncateToFirstLine };

package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.js

@@ -1,13 +1,16 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { removeProperty, applyEdits } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonEdit';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isWindows, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { basename, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -20,26 +23,30 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { EditorExtensions, EditorsOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { CustomizationHarness } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService';
+import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 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 { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { AgentPluginItemKind } from '../agentPluginEditor/agentPluginItems.js';
-import { AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID, AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID, AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AICustomizationManagementItemMenuId, AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_ITEM_DISABLED_KEY, AICustomizationManagementCommands } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
+import { AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID, AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID, AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AICustomizationManagementItemMenuId, AI_CUSTOMIZATION_SUPPORTS_TROUBLESHOOT_KEY, AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_ITEM_DISABLED_KEY, AICustomizationManagementCommands } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
 import { AICustomizationManagementEditor } from './aiCustomizationManagementEditor.js';
 import { AICustomizationManagementEditorInput } from './aiCustomizationManagementEditorInput.js';
-import { BUILTIN_STORAGE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { BUILTIN_STORAGE, AICustomizationManagementSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(
     AICustomizationManagementEditor,
     AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID,
-    ( localize(5365, "Chat Customizations Editor"))
+    ( localize(5374, "Agent Customizations Editor"))
 ), [(
 new SyncDescriptor(AICustomizationManagementEditorInput))]);
 class AICustomizationManagementEditorInputSerializer {
@@ -91,12 +98,39 @@ function extractPluginUri(context) {
     }
     return URI.isUri(raw) ? raw : typeof raw === "string" ? ( URI.parse(raw)) : undefined;
 }
+function extractName(context) {
+    if (URI.isUri(context) || typeof context === "string") {
+        return undefined;
+    }
+    return typeof context.name === "string" ? context.name : undefined;
+}
+function extractItemId(context) {
+    if (URI.isUri(context) || typeof context === "string") {
+        return undefined;
+    }
+    return typeof context.itemId === "string" ? context.itemId : undefined;
+}
+function parseHookItemId(itemId) {
+    const hashIndex = itemId.lastIndexOf("#");
+    if (hashIndex < 0) {
+        return undefined;
+    }
+    const fragment = itemId.substring(hashIndex + 1);
+    const match = /^([^[]+)\[(\d+)\]$/.exec(fragment);
+    if (!match) {
+        return undefined;
+    }
+    return {
+        originalId: match[1],
+        index: parseInt(match[2], 10)
+    };
+}
 const OPEN_AI_CUSTOMIZATION_MGMT_FILE_ID = "aiCustomizationManagement.openFile";
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OPEN_AI_CUSTOMIZATION_MGMT_FILE_ID,
-            title: ( localize2(5366, "Open")),
+            title: ( localize2(5375, "Open")),
             icon: Codicon.goToFile
         });
     }
@@ -111,7 +145,7 @@ registerAction2(class extends Action2 {
             codeEditor.updateOptions({
                 readOnly: true,
                 readOnlyMessage: ( new MarkdownString(( localize(
-                    5367,
+                    5376,
                     "This file is provided by a plugin or extension and cannot be edited."
                 ))))
             });
@@ -123,7 +157,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: RUN_PROMPT_MGMT_ID,
-            title: ( localize2(5368, "Run Prompt")),
+            title: ( localize2(5377, "Run Prompt")),
             icon: Codicon.play
         });
     }
@@ -132,7 +166,36 @@ registerAction2(class extends Action2 {
         await commandService.executeCommand("workbench.action.chat.run.prompt.current", extractURI(context));
     }
 });
-const REVEAL_IN_OS_LABEL = isWindows ? ( localize2(5369, "Reveal in File Explorer")) : isMacintosh ? ( localize2(5370, "Reveal in Finder")) : ( localize2(5371, "Open Containing Folder"));
+const TROUBLESHOOT_AI_CUSTOMIZATION_ID = "aiCustomizationManagement.troubleshoot";
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: TROUBLESHOOT_AI_CUSTOMIZATION_ID,
+            title: ( localize2(5378, "Troubleshoot")),
+            icon: Codicon.bug
+        });
+    }
+    async run(accessor, context) {
+        const commandService = accessor.get(ICommandService);
+        const editorService = accessor.get(IEditorService);
+        const rawName = extractName(context);
+        const displayName = rawName?.replace(/\.md$/i, "");
+        const query = displayName ? `/troubleshoot ${displayName}` : "/troubleshoot";
+        const customizationEditors = editorService.getEditors(EditorsOrder.SEQUENTIAL).filter((
+            {
+                editor
+            }
+        ) => editor instanceof AICustomizationManagementEditorInput);
+        if (customizationEditors.length) {
+            await editorService.closeEditors(customizationEditors);
+        }
+        await commandService.executeCommand("workbench.action.chat.open", {
+            query,
+            isPartialQuery: false
+        });
+    }
+});
+const REVEAL_IN_OS_LABEL = isWindows ? ( localize2(5379, "Reveal in File Explorer")) : isMacintosh ? ( localize2(5380, "Reveal in Finder")) : ( localize2(5381, "Open Containing Folder"));
 const REVEAL_AI_CUSTOMIZATION_IN_OS_ID = "aiCustomizationManagement.revealInOS";
 registerAction2(class extends Action2 {
     constructor() {
@@ -153,29 +216,34 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DELETE_AI_CUSTOMIZATION_ID,
-            title: ( localize2(5372, "Delete")),
+            title: ( localize2(5382, "Delete")),
             icon: Codicon.trash
         });
     }
     async run(accessor, context) {
         const fileService = accessor.get(IFileService);
         const dialogService = accessor.get(IDialogService);
+        const telemetryService = accessor.get(ITelemetryService);
+        const workspaceService = accessor.get(IAICustomizationWorkspaceService);
+        const editorService = accessor.get(IEditorService);
         const uri = extractURI(context);
         const storage = extractStorage(context);
         const promptType = extractPromptType(context);
+        const itemId = extractItemId(context);
         const isSkill = promptType === PromptsType.skill;
+        const isHook = promptType === PromptsType.hook;
         const fileName = isSkill ? basename(dirname(uri)) : basename(uri);
         if (storage === PromptsStorage.plugin) {
             const agentPluginService = accessor.get(IAgentPluginService);
             const plugin = agentPluginService.plugins.get().find(p => isEqualOrParent(uri, p.uri));
             if (plugin) {
                 const result = await dialogService.confirm({
-                    message: ( localize(5373, "This item is provided by the plugin '{0}'", plugin.label)),
+                    message: ( localize(5383, "This item is provided by the plugin '{0}'", plugin.label)),
                     detail: ( localize(
-                        5374,
+                        5384,
                         "Individual components from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"
                     )),
-                    primaryButton: ( localize(5375, "Uninstall Plugin")),
+                    primaryButton: ( localize(5385, "Uninstall Plugin")),
                     type: "question"
                 });
                 if (result.confirmed) {
@@ -185,31 +253,58 @@ registerAction2(class extends Action2 {
             return;
         }
         if (storage === PromptsStorage.extension || storage === BUILTIN_STORAGE) {
-            await dialogService.info(( localize(5376, "Cannot Delete Extension File")), ( localize(
-                5377,
+            await dialogService.info(( localize(5386, "Cannot Delete Extension File")), ( localize(
+                5387,
                 "Files provided by extensions cannot be deleted. You can disable the extension if you no longer want to use this customization."
             )));
             return;
         }
+        const hookInfo = isHook && itemId ? parseHookItemId(itemId) : undefined;
+        const hookName = typeof context !== "string" && !URI.isUri(context) ? context.name : undefined;
         const message = isSkill ? ( localize(
-            5378,
+            5388,
             "Are you sure you want to delete skill '{0}' and its folder?",
             fileName
-        )) : ( localize(5379, "Are you sure you want to delete '{0}'?", fileName));
+        )) : hookInfo && hookName ? ( localize(5389, "Are you sure you want to delete the '{0}' hook?", hookName)) : ( localize(5390, "Are you sure you want to delete '{0}'?", fileName));
         const confirmation = await dialogService.confirm({
             message,
-            detail: ( localize(5380, "This action cannot be undone.")),
-            primaryButton: ( localize(5372, "Delete")),
+            detail: ( localize(5391, "This action cannot be undone.")),
+            primaryButton: ( localize(5382, "Delete")),
             type: "warning"
         });
         if (confirmation.confirmed) {
             try {
-                const telemetryService = accessor.get(ITelemetryService);
                 telemetryService.publicLog2("chatCustomizationEditor.deleteItem", {
                     promptType: promptType ?? "",
                     storage: storage ?? ""
                 });
             } catch {}
+            if (hookInfo) {
+                try {
+                    const content = await fileService.readFile(uri);
+                    const text = ( content.value.toString());
+                    const edits = removeProperty(text, ["hooks", hookInfo.originalId, hookInfo.index], {
+                        tabSize: 1,
+                        insertSpaces: false
+                    });
+                    if (edits.length > 0) {
+                        const updated = applyEdits(text, edits);
+                        await fileService.writeFile(uri, VSBuffer.fromString(updated));
+                        if (storage === PromptsStorage.local) {
+                            const projectRoot = workspaceService.getActiveProjectRoot();
+                            if (projectRoot) {
+                                await workspaceService.commitFiles(projectRoot, [uri]);
+                            }
+                        }
+                    }
+                } catch {
+                    await dialogService.error(( localize(
+                        5392,
+                        "Unable to delete this hook entry because the file contents have changed."
+                    )), ( localize(5393, "Refresh the view and try again.")));
+                }
+                return;
+            }
             const deleteTarget = isSkill ? dirname(uri) : uri;
             const useTrash = fileService.hasCapability(deleteTarget, FileSystemProviderCapabilities.Trash);
             await fileService.del(deleteTarget, {
@@ -217,12 +312,15 @@ registerAction2(class extends Action2 {
                 recursive: isSkill
             });
             if (storage === PromptsStorage.local) {
-                const workspaceService = accessor.get(IAICustomizationWorkspaceService);
                 const projectRoot = workspaceService.getActiveProjectRoot();
                 if (projectRoot) {
                     await workspaceService.deleteFiles(projectRoot, [deleteTarget]);
                 }
             }
+            const activeEditor = editorService.activeEditorPane;
+            if (activeEditor instanceof AICustomizationManagementEditor) {
+                activeEditor.refreshList();
+            }
         }
     }
 });
@@ -231,7 +329,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: COPY_AI_CUSTOMIZATION_PATH_ID,
-            title: ( localize2(5381, "Copy Path")),
+            title: ( localize2(5394, "Copy Path")),
             icon: Codicon.clippy
         });
     }
@@ -247,7 +345,7 @@ const WHEN_ITEM_IS_PLUGIN = ( ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_STORAG
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: COPY_AI_CUSTOMIZATION_PATH_ID,
-        title: ( localize(5381, "Copy Path")),
+        title: ( localize(5394, "Copy Path")),
         icon: Codicon.clippy
     },
     group: "inline",
@@ -256,17 +354,27 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: DELETE_AI_CUSTOMIZATION_ID,
-        title: ( localize(5372, "Delete")),
+        title: ( localize(5382, "Delete")),
         icon: Codicon.trash
     },
     group: "inline",
     order: 10,
     when: WHEN_ITEM_IS_DELETABLE
 });
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+    command: {
+        id: TROUBLESHOOT_AI_CUSTOMIZATION_ID,
+        title: ( localize(5395, "Troubleshoot")),
+        icon: Codicon.bug
+    },
+    group: "inline",
+    order: 2,
+    when: ( ContextKeyExpr.equals(AI_CUSTOMIZATION_SUPPORTS_TROUBLESHOOT_KEY, true))
+});
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: OPEN_AI_CUSTOMIZATION_MGMT_FILE_ID,
-        title: ( localize(5366, "Open"))
+        title: ( localize(5375, "Open"))
     },
     group: "1_open",
     order: 1
@@ -274,13 +382,22 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: RUN_PROMPT_MGMT_ID,
-        title: ( localize(5368, "Run Prompt")),
+        title: ( localize(5377, "Run Prompt")),
         icon: Codicon.play
     },
     group: "2_run",
     order: 1,
     when: ( ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_TYPE_KEY, PromptsType.prompt))
 });
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+    command: {
+        id: TROUBLESHOOT_AI_CUSTOMIZATION_ID,
+        title: ( localize(5396, "Troubleshoot"))
+    },
+    group: "2_run",
+    order: 2,
+    when: ( ContextKeyExpr.equals(AI_CUSTOMIZATION_SUPPORTS_TROUBLESHOOT_KEY, true))
+});
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: REVEAL_AI_CUSTOMIZATION_IN_OS_ID,
@@ -293,7 +410,7 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: DELETE_AI_CUSTOMIZATION_ID,
-        title: ( localize(5372, "Delete"))
+        title: ( localize(5382, "Delete"))
     },
     group: "4_modify",
     order: 1,
@@ -304,7 +421,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID,
-            title: ( localize2(5375, "Uninstall Plugin")),
+            title: ( localize2(5385, "Uninstall Plugin")),
             icon: Codicon.trash
         });
     }
@@ -317,12 +434,12 @@ registerAction2(class extends Action2 {
             return;
         }
         const result = await dialogService.confirm({
-            message: ( localize(5382, "This item is provided by the plugin '{0}'", plugin.label)),
+            message: ( localize(5397, "This item is provided by the plugin '{0}'", plugin.label)),
             detail: ( localize(
-                5383,
+                5398,
                 "Individual components from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"
             )),
-            primaryButton: ( localize(5384, "Uninstall Plugin")),
+            primaryButton: ( localize(5399, "Uninstall Plugin")),
             type: "question"
         });
         if (result.confirmed) {
@@ -333,7 +450,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID,
-        title: ( localize(5375, "Uninstall Plugin")),
+        title: ( localize(5385, "Uninstall Plugin")),
         icon: Codicon.trash
     },
     group: "inline",
@@ -343,7 +460,7 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID,
-        title: ( localize(5375, "Uninstall Plugin"))
+        title: ( localize(5385, "Uninstall Plugin"))
     },
     group: "4_modify",
     order: 1,
@@ -354,7 +471,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SHOW_PLUGIN_AI_CUSTOMIZATION_ID,
-            title: ( localize2(5385, "Show Plugin"))
+            title: ( localize2(5400, "Show Plugin"))
         });
     }
     async run(accessor, context) {
@@ -387,7 +504,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: SHOW_PLUGIN_AI_CUSTOMIZATION_ID,
-        title: ( localize(5385, "Show Plugin"))
+        title: ( localize(5400, "Show Plugin"))
     },
     group: "1_open",
     order: 2,
@@ -398,7 +515,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
-            title: ( localize2(5386, "Disable")),
+            title: ( localize2(5401, "Disable")),
             icon: Codicon.eyeClosed
         });
     }
@@ -419,7 +536,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
-            title: ( localize2(5387, "Enable")),
+            title: ( localize2(5402, "Enable")),
             icon: Codicon.eye
         });
     }
@@ -438,7 +555,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
-        title: ( localize(5386, "Disable"))
+        title: ( localize(5401, "Disable"))
     },
     group: "5_toggle",
     order: 1,
@@ -447,7 +564,7 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
-        title: ( localize(5387, "Enable"))
+        title: ( localize(5402, "Enable"))
     },
     group: "5_toggle",
     order: 1,
@@ -456,7 +573,7 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
-        title: ( localize(5386, "Disable")),
+        title: ( localize(5401, "Disable")),
         icon: Codicon.eyeClosed
     },
     group: "inline",
@@ -466,7 +583,7 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
     command: {
         id: ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
-        title: ( localize(5387, "Enable")),
+        title: ( localize(5402, "Enable")),
         icon: Codicon.eye
     },
     group: "inline",
@@ -486,15 +603,26 @@ class AICustomizationManagementActionsContribution extends Disposable {
             constructor() {
                 super({
                     id: AICustomizationManagementCommands.OpenEditor,
-                    title: ( localize2(5388, "Open Customizations (Preview)")),
-                    shortTitle: ( localize2(5389, "Customizations (Preview)")),
+                    title: ( localize2(5403, "Open Customizations")),
+                    shortTitle: ( localize2(5404, "Customizations")),
                     category: CHAT_CATEGORY,
-                    precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`)))),
+                    precondition: ChatContextKeys.enabled,
                     f1: true
                 });
             }
             async run(accessor, section) {
                 const editorService = accessor.get(IEditorService);
+                const chatWidgetService = accessor.get(IChatWidgetService);
+                const harnessService = accessor.get(ICustomizationHarnessService);
+                const sessionResource = chatWidgetService.lastFocusedWidget?.viewModel?.sessionResource;
+                if (sessionResource) {
+                    const sessionType = getChatSessionType(sessionResource);
+                    const harnessId = sessionType === localChatSessionType ? CustomizationHarness.VSCode : sessionType;
+                    const available = harnessService.availableHarnesses.get();
+                    if (( available.some(h => h.id === harnessId))) {
+                        harnessService.setActiveHarness(harnessId);
+                    }
+                }
                 const input = AICustomizationManagementEditorInput.getOrCreate();
                 const pane = await editorService.openEditor(input, {
                     pinned: true
@@ -504,6 +632,56 @@ class AICustomizationManagementActionsContribution extends Disposable {
                 }
             }
         }));
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: AICustomizationManagementCommands.OpenMarketplace,
+                    title: ( localize2(5405, "Open Marketplace")),
+                    category: CHAT_CATEGORY,
+                    precondition: ChatContextKeys.enabled
+                });
+            }
+            async run(accessor, section) {
+                const editorService = accessor.get(IEditorService);
+                const input = AICustomizationManagementEditorInput.getOrCreate();
+                const pane = await editorService.openEditor(input, {
+                    pinned: true
+                });
+                if (pane instanceof AICustomizationManagementEditor) {
+                    const targetSection = section ?? AICustomizationManagementSection.McpServers;
+                    pane.selectSectionById(targetSection, {
+                        showMarketplace: true
+                    });
+                }
+            }
+        }));
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: AICustomizationManagementCommands.GenerateDebugReport,
+                    title: ( localize2(5406, "Generate Customization Debug Report")),
+                    category: Categories.Developer,
+                    precondition: ChatContextKeys.enabled,
+                    f1: true
+                });
+            }
+            async run(accessor) {
+                const editorService = accessor.get(IEditorService);
+                const input = AICustomizationManagementEditorInput.getOrCreate();
+                const pane = await editorService.openEditor(input, {
+                    pinned: true
+                });
+                if (!(pane instanceof AICustomizationManagementEditor)) {
+                    return;
+                }
+                const report = await pane.generateDebugReport();
+                await editorService.openEditor({
+                    resource: undefined,
+                    contents: report,
+                    languageId: "plaintext"
+                });
+            }
+        }));
     }
 }
 registerWorkbenchContribution2(