@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -3,13 +3,16 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as aiCustomizationManagement from './media/aiCustomizationManagement.css';
 import { $ as $$1, append, Dimension, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { SplitView, Sizing } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -21,7 +24,7 @@ import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { basename, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { basename, isEqualOrParent, isEqual, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { registerColor } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
@@ -38,39 +41,49 @@ import { PANEL_BORDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { AICustomizationListWidget } from './aiCustomizationListWidget.js';
 import { McpListWidget } from './mcpListWidget.js';
 import { PluginListWidget } from './pluginListWidget.js';
-import { AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION, AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY, AI_CUSTOMIZATION_MANAGEMENT_SIDEBAR_WIDTH_KEY, SIDEBAR_DEFAULT_WIDTH, SIDEBAR_MAX_WIDTH, SIDEBAR_MIN_WIDTH, CONTENT_MIN_WIDTH } from './aiCustomizationManagement.js';
+import { AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION, AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY, AI_CUSTOMIZATION_MANAGEMENT_SIDEBAR_WIDTH_KEY, SIDEBAR_DEFAULT_WIDTH, SIDEBAR_MAX_WIDTH, SIDEBAR_MIN_WIDTH, CONTENT_MIN_WIDTH } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
 import { pluginIcon, hookIcon, promptIcon, instructionsIcon, skillIcon, agentIcon } from './aiCustomizationIcons.js';
 import { ChatModelsWidget } from '../chatManagement/chatModelsWidget.js';
 import { PromptsType, Target } 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 { AGENT_MD_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { NEW_SKILL_COMMAND_ID, NEW_AGENT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_PROMPT_COMMAND_ID } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions';
 import { showConfigureHooksQuickPick } from '../promptSyntax/hookActions.js';
 import { resolveWorkspaceTargetDirectory, resolveUserTargetDirectory } from './customizationCreatorService.js';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
 import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { getSimpleEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
-import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { McpServerEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerEditorInput';
 import { McpServerEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerEditor';
 import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { AgentPluginEditor } from '../agentPluginEditor/agentPluginEditor.js';
 import { AgentPluginEditorInput } from '../agentPluginEditor/agentPluginEditorInput.js';
-import { AICustomizationManagementSection } from '../../common/aiCustomizationWorkspaceService.js';
-import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
+import { CustomizationHarness, matchesWorkspaceSubpath } 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 { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { AICustomizationManagementSection, BUILTIN_STORAGE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 
 var AICustomizationManagementEditor_1;
 registerCss(aiCustomizationManagement);
 const $ = $$1;
 const aiCustomizationManagementSashBorder = registerColor("aiCustomizationManagement.sashBorder", PANEL_BORDER, ( localize(
-    5294,
+    5361,
     "The color of the Chat Customization Management editor splitview sash border."
 )));
 class SectionItemDelegate {
@@ -89,16 +102,25 @@ class SectionItemRenderer {
         container.classList.add("section-list-item");
         const icon = append(container, $(".section-icon"));
         const label = append(container, $(".section-label"));
+        const count = append(container, $(".section-count"));
         return {
             container,
             icon,
-            label
+            label,
+            count
         };
     }
     renderElement(element, index, templateData) {
         templateData.icon.className = "section-icon";
         templateData.icon.classList.add(...ThemeIcon.asClassNameArray(element.icon));
         templateData.label.textContent = element.label;
+        if (element.count > 0) {
+            templateData.count.textContent = String(element.count);
+            templateData.count.style.display = "";
+        } else {
+            templateData.count.textContent = "";
+            templateData.count.style.display = "none";
+        }
     }
     disposeTemplate() {}
 }
@@ -123,9 +145,14 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         textModelService,
         configurationService,
         workingCopyService,
-        textFileService,
         fileDialogService,
-        hoverService
+        hoverService,
+        modelService,
+        quickInputService,
+        contextMenuService,
+        fileService,
+        notificationService,
+        harnessService
     ) {
         super(
             AICustomizationManagementEditor_1.ID,
@@ -143,16 +170,25 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         this.textModelService = textModelService;
         this.configurationService = configurationService;
         this.workingCopyService = workingCopyService;
-        this.textFileService = textFileService;
         this.fileDialogService = fileDialogService;
         this.hoverService = hoverService;
+        this.modelService = modelService;
+        this.quickInputService = quickInputService;
+        this.contextMenuService = contextMenuService;
+        this.fileService = fileService;
+        this.notificationService = notificationService;
+        this.harnessService = harnessService;
+        this.editorActionButtonInProgress = false;
         this.editorModelChangeDisposables = this._register(( new DisposableStore()));
+        this.builtinEditingSessions = ( new Map());
         this.viewMode = "list";
         this.mcpDetailDisposables = this._register(( new DisposableStore()));
         this.pluginDetailDisposables = this._register(( new DisposableStore()));
         this.sections = [];
+        this.allSections = [];
         this.selectedSection = AICustomizationManagementSection.Agents;
         this.editorDisposables = this._register(( new DisposableStore()));
+        this.promptsSectionCountScheduler = this._register(( new RunOnceScheduler(() => this._doRefreshAllPromptsSectionCounts(), 100)));
         this._editorContentChanged = false;
         this.inEditorContextKey = CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR.bindTo(contextKeyService);
         this.sectionContextKey = CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION.bindTo(contextKeyService);
@@ -166,49 +202,52 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.currentModelRef?.dispose();
             this.currentModelRef = undefined;
         }));
+        this._register(toDisposable(() => this.disposeBuiltinEditingSessions()));
         const sectionInfo = {
             [AICustomizationManagementSection.Agents]: {
-                label: ( localize(5295, "Agents")),
+                label: ( localize(5362, "Agents")),
                 icon: agentIcon
             },
             [AICustomizationManagementSection.Skills]: {
-                label: ( localize(5296, "Skills")),
+                label: ( localize(5363, "Skills")),
                 icon: skillIcon
             },
             [AICustomizationManagementSection.Instructions]: {
-                label: ( localize(5297, "Instructions")),
+                label: ( localize(5364, "Instructions")),
                 icon: instructionsIcon
             },
             [AICustomizationManagementSection.Prompts]: {
-                label: ( localize(5298, "Prompts")),
+                label: ( localize(5365, "Prompts")),
                 icon: promptIcon
             },
             [AICustomizationManagementSection.Hooks]: {
-                label: ( localize(5299, "Hooks")),
+                label: ( localize(5366, "Hooks")),
                 icon: hookIcon
             },
             [AICustomizationManagementSection.McpServers]: {
-                label: ( localize(5300, "MCP Servers")),
+                label: ( localize(5367, "MCP Servers")),
                 icon: Codicon.server
             },
             [AICustomizationManagementSection.Plugins]: {
-                label: ( localize(5301, "Plugins")),
+                label: ( localize(5368, "Plugins")),
                 icon: pluginIcon
             },
             [AICustomizationManagementSection.Models]: {
-                label: ( localize(5302, "Models")),
+                label: ( localize(5369, "Models")),
                 icon: Codicon.vm
             }
         };
         for (const id of this.workspaceService.managementSections) {
             const info = sectionInfo[id];
             if (info) {
-                this.sections.push({
+                this.allSections.push({
                     id,
-                    ...info
+                    ...info,
+                    count: 0
                 });
             }
         }
+        this.rebuildVisibleSections();
         const savedSection = this.storageService.get(AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY, StorageScope.PROFILE);
         if (savedSection && ( this.sections.some(s => s.id === savedSection))) {
             this.selectedSection = savedSection;
@@ -298,8 +337,36 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.splitView.resizeView(1, totalWidth - SIDEBAR_DEFAULT_WIDTH);
         }));
     }
+    get isHarnessSelectorEnabled() {
+        return this.configurationService.getValue(ChatConfiguration.ChatCustomizationHarnessSelectorEnabled) !== false;
+    }
+    rebuildVisibleSections() {
+        let hidden;
+        if (this.isHarnessSelectorEnabled) {
+            const activeId = this.harnessService.activeHarness.get();
+            const descriptor = this.harnessService.availableHarnesses.get().find(h => h.id === activeId);
+            hidden = ( new Set(descriptor?.hiddenSections ?? []));
+        } else {
+            hidden = ( new Set());
+        }
+        this.sections.length = 0;
+        for (const s of this.allSections) {
+            if (!( hidden.has(s.id))) {
+                this.sections.push(s);
+            }
+        }
+        if (this.sectionsList) {
+            this.sectionsList.splice(0, this.sectionsList.length, this.sections);
+        }
+        if (!( this.sections.some(s => s.id === this.selectedSection)) && this.sections.length > 0) {
+            this.selectSection(this.sections[0].id);
+        } else {
+            this.ensureSectionsListReflectsActiveSection();
+        }
+    }
     createSidebar() {
         const sidebarContent = append(this.sidebarContainer, $(".sidebar-content"));
+        this.createHarnessDropdown(sidebarContent);
         const sectionsListContainer = append(sidebarContent, $(".sidebar-sections-list"));
         this.sectionsList = this.editorDisposables.add(this.instantiationService.createInstance(
             WorkbenchList,
@@ -313,7 +380,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
                 horizontalScrolling: false,
                 accessibilityProvider: {
                     getAriaLabel: item => item.label,
-                    getWidgetAriaLabel: () => ( localize(5303, "Chat Customization Sections"))
+                    getWidgetAriaLabel: () => ( localize(5370, "Chat Customization Sections"))
                 },
                 openOnSingleClick: true,
                 identityProvider: {
@@ -322,28 +389,100 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             }
         ));
         this.sectionsList.splice(0, this.sectionsList.length, this.sections);
-        const selectedIndex = this.sections.findIndex(s => s.id === this.selectedSection);
-        if (selectedIndex >= 0) {
-            this.sectionsList.setSelection([selectedIndex]);
-        }
+        this.ensureSectionsListReflectsActiveSection();
         this.editorDisposables.add(this.sectionsList.onDidChangeSelection(e => {
-            if (e.elements.length > 0) {
-                this.selectSection(e.elements[0].id);
+            if (e.elements.length === 0) {
+                this.ensureSectionsListReflectsActiveSection();
+                return;
+            }
+            this.selectSection(e.elements[0].id);
+        }));
+        this.editorDisposables.add(autorun(reader => {
+            const available = this.harnessService.availableHarnesses.read(reader);
+            const activeId = this.harnessService.activeHarness.read(reader);
+            if (!( available.some(h => h.id === activeId)) && available.length > 0) {
+                this.harnessService.setActiveHarness(available[0].id);
+                return;
+            }
+            this.rebuildVisibleSections();
+            this.updateHarnessDropdown();
+            this.refreshAllPromptsSectionCounts();
+        }));
+        if (!this.isHarnessSelectorEnabled) {
+            this.harnessService.setActiveHarness(CustomizationHarness.VSCode);
+        }
+        this.editorDisposables.add(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ChatConfiguration.ChatCustomizationHarnessSelectorEnabled)) {
+                if (!this.isHarnessSelectorEnabled) {
+                    this.harnessService.setActiveHarness(CustomizationHarness.VSCode);
+                }
             }
         }));
         if (this.workspaceService.isSessionsWindow) {
             this.createFolderPicker(sidebarContent);
         }
     }
+    createHarnessDropdown(sidebarContent) {
+        if (!this.isHarnessSelectorEnabled) {
+            return;
+        }
+        const container = this.harnessDropdownContainer = append(sidebarContent, $(".sidebar-harness-dropdown"));
+        this.harnessDropdownButton = append(container, $("button.harness-dropdown-button"));
+        this.harnessDropdownButton.setAttribute("aria-label", ( localize(5371, "Select customization target")));
+        this.harnessDropdownButton.setAttribute("aria-haspopup", "listbox");
+        this.harnessDropdownIcon = append(this.harnessDropdownButton, $("span.harness-dropdown-icon"));
+        this.harnessDropdownLabel = append(this.harnessDropdownButton, $("span.harness-dropdown-label"));
+        append(
+            this.harnessDropdownButton,
+            $("span.harness-dropdown-chevron.codicon.codicon-chevron-down")
+        );
+        this.updateHarnessDropdown();
+        this.editorDisposables.add(addDisposableListener(this.harnessDropdownButton, "click", () => {
+            this.showHarnessMenu();
+        }));
+    }
+    updateHarnessDropdown() {
+        if (!this.harnessDropdownContainer || !this.harnessDropdownIcon || !this.harnessDropdownLabel) {
+            return;
+        }
+        const harnesses = this.harnessService.availableHarnesses.get();
+        this.harnessDropdownContainer.style.display = harnesses.length <= 1 ? "none" : "";
+        const activeId = this.harnessService.activeHarness.get();
+        const descriptor = harnesses.find(h => h.id === activeId);
+        if (descriptor) {
+            this.harnessDropdownIcon.className = "harness-dropdown-icon";
+            this.harnessDropdownIcon.classList.add(...ThemeIcon.asClassNameArray(descriptor.icon));
+            this.harnessDropdownLabel.textContent = descriptor.label;
+        }
+    }
+    showHarnessMenu() {
+        if (!this.harnessDropdownButton) {
+            return;
+        }
+        const harnesses = this.harnessService.availableHarnesses.get();
+        const activeId = this.harnessService.activeHarness.get();
+        const actions = ( harnesses.map(h => {
+            const action = ( new Action(h.id, h.label, ThemeIcon.asClassName(h.icon), true, () => {
+                this.harnessService.setActiveHarness(h.id);
+            }));
+            action.checked = h.id === activeId;
+            return action;
+        }));
+        this.contextMenuService.showContextMenu({
+            getAnchor: () => this.harnessDropdownButton,
+            getActions: () => actions,
+            getCheckedActionsRepresentation: () => "radio"
+        });
+    }
     createFolderPicker(sidebarContent) {
         const footer = this.folderPickerContainer = append(sidebarContent, $(".sidebar-folder-picker"));
         const button = append(footer, $("button.folder-picker-button"));
-        button.setAttribute("aria-label", ( localize(5304, "Browse folder")));
+        button.setAttribute("aria-label", ( localize(5372, "Browse folder")));
         const folderIcon = append(button, $(`.codicon.codicon-${Codicon.folder.id}`));
         folderIcon.classList.add("folder-picker-icon");
         this.folderPickerLabel = append(button, $("span.folder-picker-label"));
         this.folderPickerClearButton = append(footer, $("button.folder-picker-clear"));
-        this.folderPickerClearButton.setAttribute("aria-label", ( localize(5305, "Reset to session folder")));
+        this.folderPickerClearButton.setAttribute("aria-label", ( localize(5373, "Reset to session folder")));
         append(this.folderPickerClearButton, $(`.codicon.codicon-${Codicon.close.id}`));
         this.editorDisposables.add(addDisposableListener(button, "click", () => {
             this.browseForFolder();
@@ -365,7 +504,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
     }
     updateFolderPickerLabel(root, hasOverride) {
         if (this.folderPickerLabel) {
-            this.folderPickerLabel.textContent = root ? basename(root) : ( localize(5306, "No folder"));
+            this.folderPickerLabel.textContent = root ? basename(root) : ( localize(5374, "No folder"));
         }
         if (this.folderPickerClearButton) {
             this.folderPickerClearButton.style.display = hasOverride ? "" : "none";
@@ -376,7 +515,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             canSelectFolders: true,
             canSelectFiles: false,
             canSelectMany: false,
-            title: ( localize(5307, "Select Folder to Explore")),
+            title: ( localize(5375, "Select Folder to Explore")),
             defaultUri: this.workspaceService.getActiveProjectRoot()
         });
         if (result?.[0]) {
@@ -389,9 +528,21 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         this.listWidget = this.editorDisposables.add(this.instantiationService.createInstance(AICustomizationListWidget));
         this.promptsContentContainer.appendChild(this.listWidget.element);
         this.editorDisposables.add(this.listWidget.onDidSelectItem(item => {
+            this.telemetryService.publicLog2("chatCustomizationEditor.itemSelected", {
+                section: this.selectedSection,
+                promptType: item.promptType,
+                storage: item.storage
+            });
             const isWorkspaceFile = item.storage === PromptsStorage.local;
-            const isReadOnly = item.storage === PromptsStorage.extension || item.storage === PromptsStorage.plugin;
-            this.showEmbeddedEditor(item.uri, item.name, isWorkspaceFile, isReadOnly);
+            const isReadOnly = item.storage === PromptsStorage.extension || item.storage === PromptsStorage.plugin || item.storage === BUILTIN_STORAGE;
+            this.showEmbeddedEditor(
+                item.uri,
+                item.name,
+                item.promptType,
+                item.storage,
+                isWorkspaceFile,
+                isReadOnly
+            );
         }));
         this.editorDisposables.add(this.listWidget.onDidRequestCreate(promptType => {
             this.createNewItemWithAI(promptType);
@@ -399,10 +550,11 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         this.editorDisposables.add(this.listWidget.onDidRequestCreateManual((
             {
                 type,
-                target
+                target,
+                rootFileName
             }
         ) => {
-            this.createNewItemManual(type, target);
+            this.createNewItemManual(type, target, rootFileName);
         }));
         const hasSections = ( new Set(this.workspaceService.managementSections));
         if (( hasSections.has(AICustomizationManagementSection.Models))) {
@@ -412,11 +564,11 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.modelsFooterElement = append(this.modelsContentContainer, $(".section-footer"));
             const modelsDescription = append(this.modelsFooterElement, $("p.section-footer-description"));
             modelsDescription.textContent = ( localize(
-                5308,
+                5376,
                 "Browse and manage language models from different providers. Select models for use in chat, code completion, and other AI features."
             ));
             const modelsLink = append(this.modelsFooterElement, $("a.section-footer-link"));
-            modelsLink.textContent = ( localize(5309, "Learn more about language models"));
+            modelsLink.textContent = ( localize(5377, "Learn more about language models"));
             modelsLink.href = "https://code.visualstudio.com/docs/copilot/customization/language-models";
             this.editorDisposables.add(addDisposableListener(modelsLink, "click", e => {
                 e.preventDefault();
@@ -432,6 +584,9 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.editorDisposables.add(this.mcpListWidget.onDidSelectServer(server => {
                 this.showEmbeddedMcpDetail(server);
             }));
+            this.editorDisposables.add(this.mcpListWidget.onDidRequestShowPlugin(item => {
+                this.showPluginDetail(item);
+            }));
         }
         if (( hasSections.has(AICustomizationManagementSection.Plugins))) {
             this.pluginContentContainer = append(contentInner, $(".plugin-content-container"));
@@ -440,12 +595,49 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.pluginDetailContainer = append(contentInner, $(".plugin-detail-container"));
             this.createEmbeddedPluginDetail();
             this.editorDisposables.add(this.pluginListWidget.onDidSelectPlugin(item => {
+                this.pluginDetailReturnSection = undefined;
                 this.showEmbeddedPluginDetail(item);
             }));
         }
         this.editorContentContainer = append(contentInner, $(".editor-content-container"));
         this.createEmbeddedEditor();
         this.updateContentVisibility();
+        this.editorDisposables.add(this.listWidget.onDidChangeItemCount(count => {
+            if (this.isPromptsSection(this.selectedSection)) {
+                this.updateSectionCount(this.selectedSection, count);
+            }
+        }));
+        if (this.mcpListWidget) {
+            this.editorDisposables.add(this.mcpListWidget.onDidChangeItemCount(count => {
+                this.updateSectionCount(AICustomizationManagementSection.McpServers, count);
+            }));
+            this.mcpListWidget.fireItemCount();
+        }
+        if (this.pluginListWidget) {
+            this.editorDisposables.add(this.pluginListWidget.onDidChangeItemCount(count => {
+                this.updateSectionCount(AICustomizationManagementSection.Plugins, count);
+            }));
+            this.pluginListWidget.fireItemCount();
+        }
+        if (this.modelsWidget) {
+            this.editorDisposables.add(this.modelsWidget.onDidChangeItemCount(count => {
+                this.updateSectionCount(AICustomizationManagementSection.Models, count);
+            }));
+            this.modelsWidget.fireItemCount();
+        }
+        this.editorDisposables.add(
+            this.promptsService.onDidChangeCustomAgents(() => this.refreshAllPromptsSectionCounts())
+        );
+        this.editorDisposables.add(
+            this.promptsService.onDidChangeSkills(() => this.refreshAllPromptsSectionCounts())
+        );
+        this.editorDisposables.add(
+            this.promptsService.onDidChangeInstructions(() => this.refreshAllPromptsSectionCounts())
+        );
+        this.editorDisposables.add(
+            this.promptsService.onDidChangeSlashCommands(() => this.refreshAllPromptsSectionCounts())
+        );
+        this.refreshAllPromptsSectionCounts();
         if (this.isPromptsSection(this.selectedSection)) {
             void this.listWidget.setSection(this.selectedSection);
         }
@@ -453,10 +645,35 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
     isPromptsSection(section) {
         return section === AICustomizationManagementSection.Agents || section === AICustomizationManagementSection.Skills || section === AICustomizationManagementSection.Instructions || section === AICustomizationManagementSection.Prompts || section === AICustomizationManagementSection.Hooks;
     }
+    updateSectionCount(sectionId, count) {
+        const section = this.sections.find(s => s.id === sectionId);
+        if (!section || section.count === count) {
+            return;
+        }
+        section.count = count;
+        this.sectionsList.splice(0, this.sectionsList.length, this.sections);
+        this.ensureSectionsListReflectsActiveSection();
+    }
+    refreshAllPromptsSectionCounts() {
+        this.promptsSectionCountScheduler.schedule();
+    }
+    _doRefreshAllPromptsSectionCounts() {
+        for (const section of this.sections) {
+            if (this.isPromptsSection(section.id)) {
+                this.listWidget.computeItemCountForSection(section.id).then(count => {
+                    this.updateSectionCount(section.id, count);
+                }, onUnexpectedError);
+            }
+        }
+    }
     selectSection(section) {
         if (this.selectedSection === section) {
+            this.ensureSectionsListReflectsActiveSection(section);
             return;
         }
+        this.telemetryService.publicLog2("chatCustomizationEditor.sectionChanged", {
+            section
+        });
         if (this.viewMode === "editor") {
             this.goBackToList();
         }
@@ -478,6 +695,24 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         if (this.isPromptsSection(section)) {
             void this.listWidget.setSection(section);
         }
+        this.ensureSectionsListReflectsActiveSection(section);
+    }
+    ensureSectionsListReflectsActiveSection(section = this.selectedSection) {
+        if (!this.sectionsList) {
+            return;
+        }
+        const index = this.sections.findIndex(s => s.id === section);
+        if (index < 0) {
+            return;
+        }
+        const selection = this.sectionsList.getSelection();
+        if (selection.length !== 1 || selection[0] !== index) {
+            this.sectionsList.setSelection([index]);
+        }
+        const focus = this.sectionsList.getFocus();
+        if (focus.length !== 1 || focus[0] !== index) {
+            this.sectionsList.setFocus([index]);
+        }
     }
     updateContentVisibility() {
         const isEditorMode = this.viewMode === "editor";
@@ -488,7 +723,9 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         const isModelsSection = this.selectedSection === AICustomizationManagementSection.Models;
         const isMcpSection = this.selectedSection === AICustomizationManagementSection.McpServers;
         const isPluginsSection = this.selectedSection === AICustomizationManagementSection.Plugins;
-        this.promptsContentContainer.style.display = !isEditorMode && !isDetailMode && isPromptsSection ? "" : "none";
+        if (this.promptsContentContainer) {
+            this.promptsContentContainer.style.display = !isEditorMode && !isDetailMode && isPromptsSection ? "" : "none";
+        }
         if (this.modelsContentContainer) {
             this.modelsContentContainer.style.display = !isEditorMode && !isDetailMode && isModelsSection ? "" : "none";
         }
@@ -515,17 +752,46 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         }
     }
     async createNewItemWithAI(type) {
+        this.telemetryService.publicLog2("chatCustomizationEditor.createItem", {
+            section: this.selectedSection,
+            promptType: type,
+            creationMode: "ai",
+            target: "workspace"
+        });
         if (this.input) {
             this.group.closeEditor(this.input);
         }
         await this.workspaceService.generateCustomization(type);
     }
-    async createNewItemManual(type, target) {
+    async createNewItemManual(type, target, rootFileName) {
+        this.telemetryService.publicLog2("chatCustomizationEditor.createItem", {
+            section: this.selectedSection,
+            promptType: type,
+            creationMode: "manual",
+            target: target === "workspace-root" ? "workspace" : target
+        });
+        if (target === "workspace-root") {
+            const projectRoot = this.workspaceService.getActiveProjectRoot();
+            if (!projectRoot) {
+                return;
+            }
+            const override = this.harnessService.getActiveDescriptor().sectionOverrides?.get(this.selectedSection);
+            const fileName = rootFileName ?? override?.rootFile ?? AGENT_MD_FILENAME;
+            const fileUri = URI.joinPath(projectRoot, fileName);
+            if (await this.fileService.exists(fileUri)) {
+                await this.showEmbeddedEditor(fileUri, fileName, PromptsType.instructions, PromptsStorage.local, true);
+            } else {
+                await this.fileService.createFile(fileUri);
+                await this.showEmbeddedEditor(fileUri, fileName, PromptsType.instructions, PromptsStorage.local, true);
+            }
+            void this.listWidget.refresh();
+            return;
+        }
         if (type === PromptsType.hook) {
             if (this.workspaceService.isSessionsWindow) {
                 await this.instantiationService.invokeFunction(showConfigureHooksQuickPick, {
                     openEditor: async resource => {
-                        await this.showEmbeddedEditor(resource, basename(resource), true);
+                        await this.showEmbeddedEditor(resource, basename(resource), PromptsType.hook, PromptsStorage.local, true);
                         return;
                     },
                     target: Target.GitHubCopilot
@@ -533,20 +799,31 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             } else {
                 await this.instantiationService.invokeFunction(showConfigureHooksQuickPick, {
                     openEditor: async resource => {
-                        await this.showEmbeddedEditor(resource, basename(resource), true);
+                        await this.showEmbeddedEditor(resource, basename(resource), PromptsType.hook, PromptsStorage.local, true);
                         return;
                     }
                 });
             }
             return;
         }
-        const targetDir = target === "workspace" ? resolveWorkspaceTargetDirectory(this.workspaceService, type) : await resolveUserTargetDirectory(this.promptsService, type);
+        const targetDir = await this.resolveTargetDirectoryWithPicker(type, target);
+        if (targetDir === null) {
+            return;
+        }
+        const override = this.harnessService.getActiveDescriptor().sectionOverrides?.get(this.selectedSection);
         const options = {
             targetFolder: targetDir,
             targetStorage: target === "user" ? PromptsStorage.user : PromptsStorage.local,
+            fileExtension: override?.fileExtension,
             openFile: async uri => {
                 const isWorkspace = target === "workspace";
-                await this.showEmbeddedEditor(uri, basename(uri), isWorkspace);
+                await this.showEmbeddedEditor(
+                    uri,
+                    basename(uri),
+                    type,
+                    target === "user" ? PromptsStorage.user : PromptsStorage.local,
+                    isWorkspace
+                );
                 return this.embeddedEditor;
             }
         };
@@ -570,6 +847,55 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         await this.commandService.executeCommand(commandId, options);
         void this.listWidget.refresh();
     }
+    async resolveTargetDirectoryWithPicker(type, target) {
+        const allFolders = await this.promptsService.getSourceFolders(type);
+        const projectRoot = this.workspaceService.getActiveProjectRoot();
+        const descriptor = this.harnessService.getActiveDescriptor();
+        const subpaths = descriptor.workspaceSubpaths;
+        let matchingFolders;
+        if (target === "workspace") {
+            matchingFolders = projectRoot ? allFolders.filter(f => {
+                if (!isEqualOrParent(f.uri, projectRoot)) {
+                    return false;
+                }
+                if (subpaths) {
+                    return matchesWorkspaceSubpath(f.uri.path, subpaths);
+                }
+                return true;
+            }) : [];
+        } else {
+            matchingFolders = projectRoot ? allFolders.filter(f => !isEqualOrParent(f.uri, projectRoot)) : allFolders;
+            const filter = this.harnessService.getStorageSourceFilter(type);
+            if (filter.includedUserFileRoots) {
+                const roots = filter.includedUserFileRoots;
+                matchingFolders = matchingFolders.filter(f => ( roots.some(root => isEqualOrParent(f.uri, root))));
+            }
+        }
+        const seen = ( new Set());
+        matchingFolders = matchingFolders.filter(f => {
+            const key = ( f.uri.toString());
+            if (( seen.has(key))) {
+                return false;
+            }
+            seen.add(key);
+            return true;
+        });
+        if (matchingFolders.length === 0) {
+            return undefined;
+        }
+        if (matchingFolders.length === 1) {
+            return matchingFolders[0].uri;
+        }
+        const items = ( matchingFolders.map(folder => ({
+            label: this.promptsService.getPromptLocationLabel(folder),
+            description: folder.uri.fsPath,
+            uri: folder.uri
+        })));
+        const picked = await this.quickInputService.pick(items, {
+            placeHolder: ( localize(5378, "Select a directory for the new customization file"))
+        });
+        return picked?.uri ?? null;
+    }
     updateStyles() {
         const borderColor = this.theme.getColor(aiCustomizationManagementSashBorder);
         if (borderColor) {
@@ -582,6 +908,9 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         this.workspaceService.clearOverrideProjectRoot();
         this.inEditorContextKey.set(true);
         this.sectionContextKey.set(this.selectedSection);
+        this.telemetryService.publicLog2("chatCustomizationEditor.opened", {
+            section: this.selectedSection
+        });
         await super.setInput(input, options, context, token);
         if (this.dimension) {
             this.layout(this.dimension);
@@ -599,6 +928,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.goBackFromPluginDetail();
         }
         this.workspaceService.clearOverrideProjectRoot();
+        this.disposeBuiltinEditingSessions();
         super.clearInput();
     }
     layout(dimension) {
@@ -648,8 +978,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             if (this.isPromptsSection(sectionId)) {
                 void this.listWidget.setSection(sectionId);
             }
-            this.sectionsList.setFocus([index]);
-            this.sectionsList.setSelection([index]);
+            this.ensureSectionsListReflectsActiveSection(sectionId);
         }
     }
     refreshList() {
@@ -663,12 +992,18 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             return;
         }
         const editorHeader = append(this.editorContentContainer, $(".editor-header"));
-        const backButton = append(editorHeader, $("button.editor-back-button"));
-        backButton.setAttribute("aria-label", ( localize(5310, "Back to list")));
-        const backIcon = append(backButton, $(`.codicon.codicon-${Codicon.arrowLeft.id}`));
-        backIcon.setAttribute("aria-hidden", "true");
-        this.editorDisposables.add(addDisposableListener(backButton, "click", () => {
-            this.goBackToList();
+        this.editorActionButton = append(editorHeader, $("button.editor-back-button"));
+        this.editorActionButton.setAttribute("aria-label", ( localize(5379, "Back to list")));
+        this.editorActionButtonIcon = append(
+            this.editorActionButton,
+            $(`.codicon.codicon-${Codicon.arrowLeft.id}.editor-action-button-icon`)
+        );
+        this.editorActionButtonIcon.setAttribute("aria-hidden", "true");
+        this.editorDisposables.add(addDisposableListener(this.editorActionButton, "click", () => {
+            void this.handleEditorActionButton().catch(error => {
+                console.error("Failed to handle editor back action:", error);
+                this.notificationService.error(( localize(5380, "Failed to finish the prompt action.")));
+            });
         }));
         const itemInfo = append(editorHeader, $(".editor-item-info"));
         this.editorItemNameElement = append(itemInfo, $(".editor-item-name"));
@@ -703,16 +1038,50 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             })
         );
     }
-    async showEmbeddedEditor(uri, displayName, isWorkspaceFile = false, isReadOnly = false) {
+    async showEmbeddedEditor(
+        uri,
+        displayName,
+        promptType,
+        storage,
+        isWorkspaceFile = false,
+        isReadOnly = false
+    ) {
         this.currentModelRef?.dispose();
         this.currentModelRef = undefined;
+        this.editorModelChangeDisposables.clear();
         this.currentEditingUri = uri;
         this.currentEditingProjectRoot = isWorkspaceFile ? this.workspaceService.getActiveProjectRoot() : undefined;
+        this.currentEditingStorage = storage;
+        this.currentEditingPromptType = promptType;
         this.viewMode = "editor";
         this.editorItemNameElement.textContent = displayName;
         this.editorItemPathElement.textContent = basename(uri);
+        this._editorContentChanged = false;
+        this.resetEditorSaveIndicator();
+        this.updateEditorActionButton();
         this.updateContentVisibility();
         try {
+            if (storage === BUILTIN_STORAGE && (promptType === PromptsType.prompt || promptType === PromptsType.skill)) {
+                const session = await this.getOrCreateBuiltinEditingSession(uri);
+                if (!isEqual(this.currentEditingUri, uri)) {
+                    return;
+                }
+                this.embeddedEditor.setModel(session.model);
+                this.embeddedEditor.updateOptions({
+                    readOnly: false
+                });
+                this._editorContentChanged = session.model.getValue() !== session.originalContent;
+                this.updateEditorActionButton();
+                if (this.dimension) {
+                    this.layout(this.dimension);
+                }
+                this.embeddedEditor.focus();
+                this.editorModelChangeDisposables.add(session.model.onDidChangeContent(() => {
+                    this._editorContentChanged = session.model.getValue() !== session.originalContent;
+                    this.updateEditorActionButton();
+                }));
+                return;
+            }
             const ref = await this.textModelService.createModelReference(uri);
             if (!isEqual(this.currentEditingUri, uri)) {
                 ref.dispose();
@@ -727,30 +1096,17 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
                 this.layout(this.dimension);
             }
             this.embeddedEditor.focus();
-            this.editorModelChangeDisposables.clear();
-            this._editorContentChanged = false;
-            const saveDelayer = this.editorModelChangeDisposables.add(( new Delayer(500)));
+            this._editorContentChanged = this.workingCopyService.isDirty(uri);
             this.editorModelChangeDisposables.add(ref.object.textEditorModel.onDidChangeContent(() => {
                 this._editorContentChanged = true;
-                this.editorSaveIndicator.className = "editor-save-indicator visible";
-                this.editorSaveIndicator.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), "codicon-modifier-spin");
-                this.editorSaveIndicator.title = ( localize(5311, "Saving..."));
-                saveDelayer.trigger(async () => {
-                    try {
-                        await this.textFileService.save(uri);
-                    } catch (error) {
-                        console.error("Failed to save AI customization file:", error);
-                        this.editorSaveIndicator.className = "editor-save-indicator visible error";
-                        this.editorSaveIndicator.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
-                        this.editorSaveIndicator.title = ( localize(5312, "Save Failed"));
-                    }
-                });
+                this.resetEditorSaveIndicator();
             }));
             this.editorModelChangeDisposables.add(this.workingCopyService.onDidSave(e => {
                 if (isEqual(e.workingCopy.resource, uri)) {
+                    this._editorContentChanged = this.workingCopyService.isDirty(uri);
                     this.editorSaveIndicator.className = "editor-save-indicator visible saved";
                     this.editorSaveIndicator.classList.add(...ThemeIcon.asClassNameArray(Codicon.check));
-                    this.editorSaveIndicator.title = ( localize(5313, "Saved"));
+                    this.editorSaveIndicator.title = ( localize(5381, "Saved"));
                 }
             }));
         } catch (error) {
@@ -762,17 +1118,27 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
     }
     goBackToList() {
         const fileUri = this.currentEditingUri;
-        const projectRoot = this.currentEditingProjectRoot;
-        if (fileUri && projectRoot && this._editorContentChanged) {
-            this.workspaceService.commitFiles(projectRoot, [fileUri]);
+        const backgroundSaveRequest = this.createExistingCustomizationSaveRequest();
+        if (backgroundSaveRequest) {
+            this.telemetryService.publicLog2("chatCustomizationEditor.saveItem", {
+                promptType: this.currentEditingPromptType ?? "",
+                storage: String(this.currentEditingStorage ?? ""),
+                saveTarget: "existing"
+            });
+        }
+        if (fileUri && this.currentEditingStorage === BUILTIN_STORAGE) {
+            this.disposeBuiltinEditingSession(fileUri);
         }
         this.currentModelRef?.dispose();
         this.currentModelRef = undefined;
         this.currentEditingUri = undefined;
         this.currentEditingProjectRoot = undefined;
+        this.currentEditingStorage = undefined;
+        this.currentEditingPromptType = undefined;
+        this._editorContentChanged = false;
         this.editorModelChangeDisposables.clear();
-        this.editorSaveIndicator.className = "editor-save-indicator";
-        this.editorSaveIndicator.title = "";
+        this.resetEditorSaveIndicator();
+        this.updateEditorActionButton();
         this.embeddedEditor?.setModel(null);
         this.viewMode = "list";
         this.updateContentVisibility();
@@ -781,6 +1147,196 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.layout(this.dimension);
         }
         this.listWidget?.focusSearch();
+        if (backgroundSaveRequest) {
+            const saveRequest = backgroundSaveRequest;
+            void this.saveExistingCustomization(saveRequest).catch(error => {
+                console.error("Failed to save customization changes on exit:", error);
+                this.notificationService.warn(( localize(5382, "Could not save changes to {0}.", basename(saveRequest.fileUri))));
+            });
+        }
+    }
+    async getOrCreateBuiltinEditingSession(uri) {
+        const key = ( uri.toString());
+        const existing = this.builtinEditingSessions.get(key);
+        if (existing && !existing.model.isDisposed()) {
+            return existing;
+        }
+        const ref = await this.textModelService.createModelReference(uri);
+        try {
+            const session = {
+                model: this.modelService.createModel(
+                    createTextBufferFactoryFromSnapshot(ref.object.textEditorModel.createSnapshot()),
+                    {
+                        languageId: ref.object.textEditorModel.getLanguageId(),
+                        onDidChange: Event.None
+                    },
+                    ( URI.from({
+                        scheme: "ai-customization-builtin",
+                        path: uri.path,
+                        query: generateUuid()
+                    })),
+                    false
+                ),
+                originalContent: ref.object.textEditorModel.getValue()
+            };
+            this.builtinEditingSessions.set(key, session);
+            return session;
+        } finally {
+            ref.dispose();
+        }
+    }
+    createBuiltinPromptSaveRequest(target) {
+        const sourceUri = this.currentEditingUri;
+        const promptType = this.currentEditingPromptType;
+        if (!sourceUri || this.currentEditingStorage !== BUILTIN_STORAGE || (promptType !== PromptsType.prompt && promptType !== PromptsType.skill) || !target.folder || target.target === "cancel") {
+            return;
+        }
+        const session = this.builtinEditingSessions.get(( sourceUri.toString()));
+        if (!session || !this._editorContentChanged) {
+            return;
+        }
+        return {
+            target: target.target,
+            folder: target.folder,
+            sourceUri,
+            content: session.model.getValue(),
+            promptType,
+            projectRoot: target.target === "workspace" ? this.workspaceService.getActiveProjectRoot() : undefined
+        };
+    }
+    createExistingCustomizationSaveRequest() {
+        if (!this._editorContentChanged || this.currentEditingStorage === BUILTIN_STORAGE || !this.currentEditingUri) {
+            return undefined;
+        }
+        const model = this.currentModelRef?.object.textEditorModel;
+        if (!model) {
+            return undefined;
+        }
+        return {
+            fileUri: this.currentEditingUri,
+            content: model.getValue(),
+            projectRoot: this.currentEditingProjectRoot
+        };
+    }
+    async saveBuiltinPromptCopy(request) {
+        let targetUri;
+        if (request.promptType === PromptsType.skill) {
+            const skillFolderName = basename(dirname(request.sourceUri));
+            targetUri = URI.joinPath(request.folder, skillFolderName, basename(request.sourceUri));
+        } else {
+            targetUri = URI.joinPath(request.folder, basename(request.sourceUri));
+        }
+        await this.fileService.createFolder(dirname(targetUri));
+        await this.fileService.writeFile(targetUri, VSBuffer.fromString(request.content));
+        if (request.target === "workspace" && request.projectRoot) {
+            await this.workspaceService.commitFiles(request.projectRoot, [targetUri]);
+        }
+    }
+    async saveExistingCustomization(request) {
+        await this.fileService.writeFile(request.fileUri, VSBuffer.fromString(request.content));
+        if (request.projectRoot) {
+            await this.workspaceService.commitFiles(request.projectRoot, [request.fileUri]);
+        }
+    }
+    async pickBuiltinPromptSaveTarget() {
+        const items = [];
+        const promptType = this.currentEditingPromptType ?? PromptsType.prompt;
+        const workspaceFolder = resolveWorkspaceTargetDirectory(this.workspaceService, promptType);
+        if (workspaceFolder) {
+            items.push({
+                label: ( localize(5383, "Workspace")),
+                description: workspaceFolder.fsPath,
+                target: "workspace",
+                folder: workspaceFolder
+            });
+        }
+        const userFolder = await resolveUserTargetDirectory(this.promptsService, promptType);
+        if (userFolder) {
+            items.push({
+                label: ( localize(5384, "User")),
+                description: userFolder.fsPath,
+                target: "user",
+                folder: userFolder
+            });
+        }
+        items.push({
+            label: ( localize(5385, "Cancel")),
+            target: "cancel"
+        });
+        return this.quickInputService.pick(items, {
+            canPickMany: false,
+            placeHolder: ( localize(5386, "Select Workspace, User, or Cancel")),
+            matchOnDescription: true
+        });
+    }
+    async handleEditorActionButton() {
+        if (this.editorActionButtonInProgress) {
+            return;
+        }
+        this.editorActionButtonInProgress = true;
+        this.updateEditorActionButton();
+        let backgroundSaveRequest;
+        try {
+            if (this.shouldShowBuiltinSaveAction()) {
+                const selection = await this.pickBuiltinPromptSaveTarget();
+                if (!selection || selection.target === "cancel") {
+                    return;
+                }
+                backgroundSaveRequest = this.createBuiltinPromptSaveRequest(selection);
+                if (backgroundSaveRequest) {
+                    this.telemetryService.publicLog2("chatCustomizationEditor.saveItem", {
+                        promptType: this.currentEditingPromptType ?? "",
+                        storage: String(this.currentEditingStorage ?? ""),
+                        saveTarget: selection.target
+                    });
+                }
+            }
+            this.goBackToList();
+            if (backgroundSaveRequest) {
+                const saveRequest = backgroundSaveRequest;
+                void this.saveBuiltinPromptCopy(saveRequest).then(() => {
+                    void this.listWidget?.refresh();
+                }, error => {
+                    console.error("Failed to save built-in override:", error);
+                    this.notificationService.warn(saveRequest.target === "workspace" ? ( localize(5387, "Could not save the override to the workspace.")) : ( localize(5388, "Could not save the override to your user folder.")));
+                });
+            }
+        } finally {
+            this.editorActionButtonInProgress = false;
+            this.updateEditorActionButton();
+        }
+    }
+    updateEditorActionButton() {
+        if (!this.editorActionButton || !this.editorActionButtonIcon) {
+            return;
+        }
+        const shouldShowBuiltinSaveAction = this.shouldShowBuiltinSaveAction();
+        this.editorActionButtonIcon.className = `codicon codicon-${shouldShowBuiltinSaveAction ? Codicon.save.id : Codicon.arrowLeft.id} editor-action-button-icon`;
+        this.editorActionButton.disabled = this.editorActionButtonInProgress;
+        this.editorActionButton.setAttribute("aria-label", shouldShowBuiltinSaveAction ? ( localize(5389, "Save override")) : ( localize(5379, "Back to list")));
+        this.editorActionButton.title = shouldShowBuiltinSaveAction ? ( localize(5390, "Save override (choose Workspace, User, or Cancel)")) : ( localize(5379, "Back to list"));
+    }
+    shouldShowBuiltinSaveAction() {
+        return this._editorContentChanged && this.currentEditingStorage === BUILTIN_STORAGE && (this.currentEditingPromptType === PromptsType.prompt || this.currentEditingPromptType === PromptsType.skill);
+    }
+    resetEditorSaveIndicator() {
+        this.editorSaveIndicator.className = "editor-save-indicator";
+        this.editorSaveIndicator.title = "";
+    }
+    disposeBuiltinEditingSessions() {
+        for (const session of ( this.builtinEditingSessions.values())) {
+            session.model.dispose();
+        }
+        this.builtinEditingSessions.clear();
+    }
+    disposeBuiltinEditingSession(uri) {
+        const key = ( uri.toString());
+        const session = this.builtinEditingSessions.get(key);
+        if (!session) {
+            return;
+        }
+        session.model.dispose();
+        this.builtinEditingSessions.delete(key);
     }
     createEmbeddedMcpDetail() {
         if (!this.mcpDetailContainer) {
@@ -788,7 +1344,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         }
         const detailHeader = append(this.mcpDetailContainer, $(".editor-header"));
         const backButton = append(detailHeader, $("button.editor-back-button"));
-        backButton.setAttribute("aria-label", ( localize(5314, "Back to MCP servers")));
+        backButton.setAttribute("aria-label", ( localize(5391, "Back to MCP servers")));
         const backIconEl = append(backButton, $(`.codicon.codicon-${Codicon.arrowLeft.id}`));
         backIconEl.setAttribute("aria-hidden", "true");
         this.editorDisposables.add(addDisposableListener(backButton, "click", () => {
@@ -833,7 +1389,7 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
         }
         const detailHeader = append(this.pluginDetailContainer, $(".editor-header"));
         const backButton = append(detailHeader, $("button.editor-back-button"));
-        backButton.setAttribute("aria-label", ( localize(5315, "Back to plugins")));
+        backButton.setAttribute("aria-label", ( localize(5392, "Back to plugins")));
         const backIconEl = append(backButton, $(`.codicon.codicon-${Codicon.arrowLeft.id}`));
         backIconEl.setAttribute("aria-hidden", "true");
         this.editorDisposables.add(addDisposableListener(backButton, "click", () => {
@@ -862,17 +1418,31 @@ let AICustomizationManagementEditor = class AICustomizationManagementEditor exte
             this.layout(this.dimension);
         }
     }
+    async showPluginDetail(item) {
+        if (this.selectedSection !== AICustomizationManagementSection.Plugins) {
+            this.pluginDetailReturnSection = this.selectedSection;
+        }
+        await this.showEmbeddedPluginDetail(item);
+    }
     goBackFromPluginDetail() {
         this.pluginDetailDisposables.clear();
         this.embeddedPluginEditor?.clearInput();
-        this.viewMode = "list";
-        this.updateContentVisibility();
+        const returnSection = this.pluginDetailReturnSection;
+        this.pluginDetailReturnSection = undefined;
+        if (returnSection) {
+            this.viewMode = "list";
+            this.updateContentVisibility();
+            this.selectSection(returnSection);
+        } else {
+            this.viewMode = "list";
+            this.updateContentVisibility();
+            this.pluginListWidget?.focusSearch();
+        }
         if (this.dimension) {
             this.layout(this.dimension);
         }
-        this.pluginListWidget?.focusSearch();
     }
 };
-AICustomizationManagementEditor = AICustomizationManagementEditor_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IStorageService)), ( __param(4, IInstantiationService)), ( __param(5, IContextKeyService)), ( __param(6, IOpenerService)), ( __param(7, ICommandService)), ( __param(8, IAICustomizationWorkspaceService)), ( __param(9, IPromptsService)), ( __param(10, ITextModelService)), ( __param(11, IConfigurationService)), ( __param(12, IWorkingCopyService)), ( __param(13, ITextFileService)), ( __param(14, IFileDialogService)), ( __param(15, IHoverService))], AICustomizationManagementEditor));
+AICustomizationManagementEditor = AICustomizationManagementEditor_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IStorageService)), ( __param(4, IInstantiationService)), ( __param(5, IContextKeyService)), ( __param(6, IOpenerService)), ( __param(7, ICommandService)), ( __param(8, IAICustomizationWorkspaceService)), ( __param(9, IPromptsService)), ( __param(10, ITextModelService)), ( __param(11, IConfigurationService)), ( __param(12, IWorkingCopyService)), ( __param(13, IFileDialogService)), ( __param(14, IHoverService)), ( __param(15, IModelService)), ( __param(16, IQuickInputService)), ( __param(17, IContextMenuService)), ( __param(18, IFileService)), ( __param(19, INotificationService)), ( __param(20, ICustomizationHarnessService))], AICustomizationManagementEditor));
 
 export { AICustomizationManagementEditor, aiCustomizationManagementSashBorder };