@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.js

@@ -29,6 +29,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { MenuId, MenuItemAction, SubmenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { InEditorZenModeContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { WorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { createActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
@@ -51,13 +52,16 @@ const TOGGLE_CHAT_ACTION_ID = "workbench.action.chat.toggle";
 const QUICK_OPEN_ACTION_ID = "workbench.action.quickOpenWithModes";
 const FILTER_STORAGE_KEY = "agentSessions.filterExcludes.agentsessionsviewerfiltersubmenu";
 const PREVIOUS_FILTER_STORAGE_KEY = "agentSessions.filterExcludes.previousUserFilter";
-function shouldForceHiddenAgentStatus(configurationService) {
+function shouldForceHiddenAgentStatus(configurationService, contextKeyService) {
+    if (contextKeyService.getContextKeyValue(InEditorZenModeContext.key) === true) {
+        return true;
+    }
     const aiFeaturesDisabled = configurationService.getValue(ChatConfiguration.AIDisabled) === true;
     const aiCustomizationsDisabled = configurationService.getValue("disableAICustomizations") === true || configurationService.getValue("workbench.disableAICustomizations") === true;
     return aiFeaturesDisabled && aiCustomizationsDisabled;
 }
-function getAgentStatusSettingMode(configurationService) {
-    if (shouldForceHiddenAgentStatus(configurationService)) {
+function getAgentStatusSettingMode(configurationService, contextKeyService) {
+    if (shouldForceHiddenAgentStatus(configurationService, contextKeyService)) {
         return "hidden";
     }
     const value = configurationService.getValue(ChatConfiguration.AgentStatusEnabled);
@@ -159,6 +163,12 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         )(() => {
             this._render();
         }));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(( new Set([InEditorZenModeContext.key])))) {
+                this._lastRenderState = undefined;
+                this._render();
+            }
+        }));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled) || e.affectsConfiguration(ChatConfiguration.UnifiedAgentsBar) || e.affectsConfiguration(ChatConfiguration.ChatViewSessionsEnabled) || e.affectsConfiguration(ChatConfiguration.AIDisabled) || e.affectsConfiguration("disableAICustomizations") || e.affectsConfiguration("workbench.disableAICustomizations")) {
                 this._lastRenderState = undefined;
@@ -186,7 +196,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         this._container = container;
         container.classList.add("agent-status-container");
         container.setAttribute("role", "toolbar");
-        container.setAttribute("aria-label", ( localize(5356, "Agent Status")));
+        container.setAttribute("aria-label", ( localize(5423, "Agent Status")));
         container.tabIndex = -1;
         this._render();
     }
@@ -231,7 +241,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
                 isFilteredToInProgress,
                 isFilteredToNeedsInput
             } = this._getCurrentFilterState();
-            const statusMode = getAgentStatusSettingMode(this.configurationService);
+            const statusMode = getAgentStatusSettingMode(this.configurationService, this.contextKeyService);
             const unifiedAgentsBarEnabled = this.configurationService.getValue(ChatConfiguration.UnifiedAgentsBar) === true;
             const viewSessionsEnabled = this.configurationService.getValue(ChatConfiguration.ChatViewSessionsEnabled) !== false;
             const stateKey = JSON.stringify({
@@ -368,7 +378,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         }
         const inputArea = $("div.agent-status-input-area");
         inputArea.setAttribute("role", "button");
-        inputArea.setAttribute("aria-label", ( localize(5357, "Open Quick Access")));
+        inputArea.setAttribute("aria-label", ( localize(5424, "Open Quick Access")));
         inputArea.tabIndex = 0;
         this._rovingElements.push(inputArea);
         pill.appendChild(inputArea);
@@ -390,7 +400,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         const hoverDelegate = getDefaultHoverDelegate("mouse");
         disposables.add(this.hoverService.setupManagedHover(hoverDelegate, inputArea, () => {
             const kbForTooltip = this.keybindingService.lookupKeybinding(UNIFIED_QUICK_ACCESS_ACTION_ID)?.getLabel();
-            return kbForTooltip ? ( localize(5358, "Open Quick Access ({0})", kbForTooltip)) : ( localize(5359, "Open Quick Access"));
+            return kbForTooltip ? ( localize(5425, "Open Quick Access ({0})", kbForTooltip)) : ( localize(5426, "Open Quick Access"));
         }));
         disposables.add(addDisposableListener(inputArea, EventType.CLICK, e => {
             e.preventDefault();
@@ -435,13 +445,13 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         this._renderSearchButton(disposables, pill);
         const titleLabel = $("span.agent-status-title");
         const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
-        titleLabel.textContent = sessionInfo?.title ?? ( localize(5360, "Agent Session Projection"));
+        titleLabel.textContent = sessionInfo?.title ?? ( localize(5427, "Agent Session Projection"));
         pill.appendChild(titleLabel);
         this._renderEscapeButton(disposables, pill);
         const hoverDelegate = getDefaultHoverDelegate("mouse");
         disposables.add(this.hoverService.setupManagedHover(hoverDelegate, pill, () => {
             const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
-            return sessionInfo ? ( localize(5361, "Agent Session Projection: {0}", sessionInfo.title)) : ( localize(5360, "Agent Session Projection"));
+            return sessionInfo ? ( localize(5428, "Agent Session Projection: {0}", sessionInfo.title)) : ( localize(5427, "Agent Session Projection"));
         }));
         const exitHandler = e => {
             e.preventDefault();
@@ -465,13 +475,13 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         this._container.appendChild(pill);
         const titleLabel = $("span.agent-status-title");
         const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
-        titleLabel.textContent = sessionInfo?.title ?? ( localize(5362, "Review Changes"));
+        titleLabel.textContent = sessionInfo?.title ?? ( localize(5429, "Review Changes"));
         pill.appendChild(titleLabel);
         this._renderEnterButton(disposables, pill);
         const hoverDelegate = getDefaultHoverDelegate("mouse");
         disposables.add(this.hoverService.setupManagedHover(hoverDelegate, pill, () => {
             const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
-            return sessionInfo ? ( localize(5363, "Review changes from: {0}", sessionInfo.title)) : ( localize(5364, "Review agent session changes"));
+            return sessionInfo ? ( localize(5430, "Review changes from: {0}", sessionInfo.title)) : ( localize(5431, "Review agent session changes"));
         }));
         const enterHandler = e => {
             e.preventDefault();
@@ -543,13 +553,13 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         const searchButton = $("span.agent-status-search");
         reset(searchButton, renderIcon(Codicon.searchSparkle));
         searchButton.setAttribute("role", "button");
-        searchButton.setAttribute("aria-label", ( localize(5365, "Open Quick Open")));
+        searchButton.setAttribute("aria-label", ( localize(5432, "Open Quick Open")));
         searchButton.tabIndex = 0;
         this._rovingElements.push(searchButton);
         container.appendChild(searchButton);
         const hoverDelegate = getDefaultHoverDelegate("mouse");
         const searchKb = this.keybindingService.lookupKeybinding(QUICK_OPEN_ACTION_ID)?.getLabel();
-        const searchTooltip = searchKb ? ( localize(5366, "Go to File ({0})", searchKb)) : ( localize(5367, "Go to File"));
+        const searchTooltip = searchKb ? ( localize(5433, "Go to File ({0})", searchKb)) : ( localize(5434, "Go to File"));
         disposables.add(
             this.hoverService.setupManagedHover(hoverDelegate, searchButton, searchTooltip)
         );
@@ -593,7 +603,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
             shouldForwardArgs: true
         }).map(([, actions]) => actions)));
         const primaryActionId = TOGGLE_CHAT_ACTION_ID;
-        const primaryActionTitle = ( localize(5368, "Toggle Chat"));
+        const primaryActionTitle = ( localize(5435, "Toggle Chat"));
         const primaryActionIcon = Codicon.chatSparkle;
         const primaryAction = this.instantiationService.createInstance(MenuItemAction, {
             id: primaryActionId,
@@ -602,7 +612,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         }, undefined, undefined, undefined, undefined);
         const dropdownAction = toAction({
             id: "agentStatus.sparkle.dropdown",
-            label: ( localize(5369, "More Actions")),
+            label: ( localize(5436, "More Actions")),
             run() {}
         });
         const sparkleDropdown = this.instantiationService.createInstance(
@@ -679,7 +689,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
                     this._openSessionsWithFilter("unread");
                 }
             }));
-            const unreadTooltip = unreadSessions.length === 1 ? ( localize(5370, "{0} unread session", unreadSessions.length)) : ( localize(5371, "{0} unread sessions", unreadSessions.length));
+            const unreadTooltip = unreadSessions.length === 1 ? ( localize(5437, "{0} unread session", unreadSessions.length)) : ( localize(5438, "{0} unread sessions", unreadSessions.length));
             disposables.add(
                 this.hoverService.setupManagedHover(hoverDelegate, unreadSection, unreadTooltip)
             );
@@ -712,7 +722,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
                     this._openSessionsWithFilter("needsInput");
                 }
             }));
-            const needsInputTooltip = attentionNeededSessions.length === 1 ? ( localize(5372, "{0} session needs input", attentionNeededSessions.length)) : ( localize(5373, "{0} sessions need input", attentionNeededSessions.length));
+            const needsInputTooltip = attentionNeededSessions.length === 1 ? ( localize(5439, "{0} session needs input", attentionNeededSessions.length)) : ( localize(5440, "{0} sessions need input", attentionNeededSessions.length));
             disposables.add(
                 this.hoverService.setupManagedHover(hoverDelegate, needsInputSection, needsInputTooltip)
             );
@@ -746,7 +756,7 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
                     this._openSessionsWithFilter("inProgress");
                 }
             }));
-            const activeTooltip = inProgressOnly.length === 1 ? ( localize(5374, "{0} session in progress", inProgressOnly.length)) : ( localize(5375, "{0} sessions in progress", inProgressOnly.length));
+            const activeTooltip = inProgressOnly.length === 1 ? ( localize(5441, "{0} session in progress", inProgressOnly.length)) : ( localize(5442, "{0} sessions in progress", inProgressOnly.length));
             disposables.add(
                 this.hoverService.setupManagedHover(hoverDelegate, activeSection, activeTooltip)
             );
@@ -925,13 +935,13 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
         const escButton = $("span.agent-status-esc-button");
         escButton.textContent = "Esc";
         escButton.setAttribute("role", "button");
-        escButton.setAttribute("aria-label", ( localize(5376, "Exit Agent Session Projection")));
+        escButton.setAttribute("aria-label", ( localize(5443, "Exit Agent Session Projection")));
         escButton.tabIndex = 0;
         this._rovingElements.push(escButton);
         parent.appendChild(escButton);
         const hoverDelegate = getDefaultHoverDelegate("mouse");
         disposables.add(
-            this.hoverService.setupManagedHover(hoverDelegate, escButton, ( localize(5377, "Exit Agent Session Projection (Escape)")))
+            this.hoverService.setupManagedHover(hoverDelegate, escButton, ( localize(5444, "Exit Agent Session Projection (Escape)")))
         );
         disposables.add(addDisposableListener(escButton, EventType.MOUSE_DOWN, e => {
             e.preventDefault();
@@ -954,14 +964,14 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
     _renderEnterButton(disposables, parent) {
         const enterButton = $("span.agent-status-enter-button");
         const keybinding = this.keybindingService.lookupKeybinding(EnterAgentSessionProjectionAction.ID);
-        enterButton.textContent = keybinding?.getLabel() ?? ( localize(5378, "Review"));
+        enterButton.textContent = keybinding?.getLabel() ?? ( localize(5445, "Review"));
         enterButton.setAttribute("role", "button");
-        enterButton.setAttribute("aria-label", ( localize(5379, "Enter Agent Session Projection")));
+        enterButton.setAttribute("aria-label", ( localize(5446, "Enter Agent Session Projection")));
         enterButton.tabIndex = 0;
         this._rovingElements.push(enterButton);
         parent.appendChild(enterButton);
         const hoverDelegate = getDefaultHoverDelegate("mouse");
-        const hoverText = keybinding ? ( localize(5380, "Review Changes ({0})", keybinding.getLabel())) : ( localize(5381, "Review Changes"));
+        const hoverText = keybinding ? ( localize(5447, "Review Changes ({0})", keybinding.getLabel())) : ( localize(5448, "Review Changes"));
         disposables.add(this.hoverService.setupManagedHover(hoverDelegate, enterButton, hoverText));
         const enterProjection = e => {
             e.preventDefault();
@@ -1019,13 +1029,13 @@ let AgentTitleBarStatusWidget = class AgentTitleBarStatusWidget extends BaseActi
             label = this._windowTitle.fileName ?? "";
         }
         if (!label) {
-            label = ( localize(5382, "Search"));
+            label = ( localize(5449, "Search"));
         }
         if (prefix) {
-            label = ( localize(5383, "{0} {1}", prefix, label));
+            label = ( localize(5450, "{0} {1}", prefix, label));
         }
         if (suffix) {
-            label = ( localize(5384, "{0} {1}", label, suffix));
+            label = ( localize(5451, "{0} {1}", label, suffix));
         }
         return label.replaceAll(/\r\n|\r|\n/g, "⏎");
     }
@@ -1058,7 +1068,7 @@ let AgentTitleBarStatusRendering = class AgentTitleBarStatusRendering extends Di
         let chatEnabled = !!chatEnabledKey;
         const updateClass = () => {
             const commandCenterEnabled = configurationService.getValue(LayoutSettings.COMMAND_CENTER) === true;
-            const statusMode = getAgentStatusSettingMode(configurationService);
+            const statusMode = getAgentStatusSettingMode(configurationService, contextKeyService);
             const enabled = commandCenterEnabled && chatEnabled && statusMode !== "hidden";
             const enhanced = enabled && statusMode === "compact";
             mainWindow.document.body.classList.toggle("agent-status-enabled", enabled);
@@ -1071,7 +1081,7 @@ let AgentTitleBarStatusRendering = class AgentTitleBarStatusRendering extends Di
             }
         }));
         this._register(contextKeyService.onDidChangeContext(e => {
-            if (e.affectsSome(( new Set(["chatIsEnabled"])))) {
+            if (e.affectsSome(( new Set(["chatIsEnabled", InEditorZenModeContext.key])))) {
                 chatEnabled = !!contextKeyService.getContextKeyValue("chatIsEnabled");
                 updateClass();
             }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccess.js

@@ -26,22 +26,22 @@ registerCss(unifiedQuickAccess);
 const SEND_TO_AGENT_ID = "unified-quick-access-send-to-agent";
 const DEFAULT_UNIFIED_QUICK_ACCESS_TABS = [{
     id: "agentSessions",
-    label: ( localize(5385, "Sessions")),
+    label: ( localize(5452, "Sessions")),
     prefix: "agent ",
-    placeholder: ( localize(5386, "Search sessions or type a message...")),
-    tooltip: ( localize(5387, "Search sessions or send a message to agent"))
+    placeholder: ( localize(5453, "Search sessions or type a message...")),
+    tooltip: ( localize(5454, "Search sessions or send a message to agent"))
 }, {
     id: "commands",
-    label: ( localize(5388, "Commands")),
+    label: ( localize(5455, "Commands")),
     prefix: ">",
-    placeholder: ( localize(5389, "Search commands...")),
-    tooltip: ( localize(5390, "Run commands"))
+    placeholder: ( localize(5456, "Search commands...")),
+    tooltip: ( localize(5457, "Run commands"))
 }, {
     id: "files",
-    label: ( localize(5391, "Files")),
+    label: ( localize(5458, "Files")),
     prefix: "",
-    placeholder: ( localize(5392, "Search files...")),
-    tooltip: ( localize(5393, "Go to files"))
+    placeholder: ( localize(5459, "Search files...")),
+    tooltip: ( localize(5460, "Go to files"))
 }];
 let UnifiedQuickAccess = class UnifiedQuickAccess extends Disposable {
     constructor(
@@ -232,14 +232,14 @@ let UnifiedQuickAccess = class UnifiedQuickAccess extends Disposable {
         }
         const hasInput = value.trim().length > 0;
         if (hasInput) {
-            this._sendButtonLabel.textContent = ( localize(5394, "Send"));
-            this._sendButtonHover?.update(( localize(5395, "Send message to new agent session")));
+            this._sendButtonLabel.textContent = ( localize(5461, "Send"));
+            this._sendButtonHover?.update(( localize(5462, "Send message to new agent session")));
             this._sendButtonIcon.style.display = "";
         } else {
             const openChatKeybinding = this.keybindingService.lookupKeybinding(CHAT_OPEN_ACTION_ID);
             const openChatLabel = openChatKeybinding?.getLabel() ?? "";
-            this._sendButtonLabel.textContent = ( localize(5396, "Open Chat"));
-            const tooltip = openChatLabel ? ( localize(5397, "Open chat ({0})", openChatLabel)) : ( localize(5398, "Open chat"));
+            this._sendButtonLabel.textContent = ( localize(5463, "Open Chat"));
+            const tooltip = openChatLabel ? ( localize(5464, "Open chat ({0})", openChatLabel)) : ( localize(5465, "Open chat"));
             this._sendButtonHover?.update(tooltip);
             this._sendButtonIcon.style.display = "none";
         }
@@ -307,10 +307,10 @@ let UnifiedQuickAccess = class UnifiedQuickAccess extends Disposable {
         }
         const sendItem = {
             id: SEND_TO_AGENT_ID,
-            label: `$(send) ${( localize(5399, "Send to agent"))}`,
+            label: `$(send) ${( localize(5466, "Send to agent"))}`,
             description: fullInput,
             alwaysShow: true,
-            ariaLabel: ( localize(5400, "Send message to agent: {0}", fullInput))
+            ariaLabel: ( localize(5467, "Send message to agent: {0}", fullInput))
         };
         const currentItems = picker.items.filter(item => item.id !== SEND_TO_AGENT_ID);
         const isSessionsTab = this._currentTab?.id === "agentSessions";
@@ -399,7 +399,7 @@ let UnifiedQuickAccess = class UnifiedQuickAccess extends Disposable {
         if (tab.isSendTab) {
             picker.busy = false;
             picker.items = [{
-                label: ( localize(5401, "Press Enter or click Send to create a new agent session")),
+                label: ( localize(5468, "Press Enter or click Send to create a new agent session")),
                 alwaysShow: true
             }];
             return;
@@ -424,7 +424,7 @@ let UnifiedQuickAccess = class UnifiedQuickAccess extends Disposable {
         } else {
             picker.busy = false;
             picker.items = [{
-                label: ( localize(5402, "No provider available for this tab")),
+                label: ( localize(5469, "No provider available for this tab")),
                 alwaysShow: true
             }];
         }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccessActions.js

@@ -22,7 +22,7 @@ class ShowUnifiedQuickAccessAction extends Action2 {
     constructor() {
         super({
             id: ShowUnifiedQuickAccessAction.ID,
-            title: ( localize2(5403, "Show Agent Quick Access")),
+            title: ( localize2(5470, "Show Agent Quick Access")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`))))
         });
@@ -40,7 +40,7 @@ class ShowAgentSessionsQuickAccessAction extends Action2 {
     constructor() {
         super({
             id: ShowAgentSessionsQuickAccessAction.ID,
-            title: ( localize2(5404, "Show Agent Sessions")),
+            title: ( localize2(5471, "Show Agent Sessions")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`))))
         });
@@ -58,7 +58,7 @@ class ShowCommandsQuickAccessAction extends Action2 {
     constructor() {
         super({
             id: ShowCommandsQuickAccessAction.ID,
-            title: ( localize2(5405, "Show Commands (Unified)")),
+            title: ( localize2(5472, "Show Commands (Unified)")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`))))
         });
@@ -76,7 +76,7 @@ class ShowFilesQuickAccessAction extends Action2 {
     constructor() {
         super({
             id: ShowFilesQuickAccessAction.ID,
-            title: ( localize2(5406, "Show Files (Unified)")),
+            title: ( localize2(5473, "Show Files (Unified)")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`))))
         });

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

@@ -1,17 +1,17 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
-import { type AICustomizationPromptsStorage, AICustomizationManagementSection } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement";
-import { ICustomizationItemProvider, IHarnessDescriptor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService";
+import { type AICustomizationSource, AICustomizationManagementSection } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement";
 import { ICustomizationHarnessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service";
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
+import { IAICustomizationItemSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemSource";
 /**
  * Snapshot of the list widget's internal state, passed in to avoid coupling.
  */
 export interface IDebugWidgetState {
     readonly allItems: readonly {
         readonly name?: string;
-        readonly storage?: AICustomizationPromptsStorage;
+        readonly source?: AICustomizationSource;
         readonly groupKey?: string;
         readonly syncable?: boolean;
         readonly pluginUri?: URI;
@@ -32,4 +32,4 @@ export interface IDebugWidgetState {
  *   3. Widget state — normalized items and display entries after grouping
  *   4. Source folders — where files are discovered from
  */
-export declare function generateCustomizationDebugReport(section: AICustomizationManagementSection, promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, widgetState: IDebugWidgetState, activeDescriptor?: IHarnessDescriptor, promptsServiceItemProvider?: ICustomizationItemProvider, harnessService?: ICustomizationHarnessService, agentPluginService?: IAgentPluginService): Promise<string>;
+export declare function generateCustomizationDebugReport(section: AICustomizationManagementSection, promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, widgetState: IDebugWidgetState, itemSource: IAICustomizationItemSource, harnessService: ICustomizationHarnessService, agentPluginService: IAgentPluginService): Promise<string>;

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

@@ -2,7 +2,7 @@
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { applyStorageSourceFilter, BUILTIN_STORAGE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { applyStorageSourceFilter, AICustomizationSources } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { sectionToPromptType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
 
 async function generateCustomizationDebugReport(
@@ -10,8 +10,7 @@ async function generateCustomizationDebugReport(
     promptsService,
     workspaceService,
     widgetState,
-    activeDescriptor,
-    promptsServiceItemProvider,
+    itemSource,
     harnessService,
     agentPluginService
 ) {
@@ -27,6 +26,7 @@ async function generateCustomizationDebugReport(
     );
     lines.push(`Sections: [${workspaceService.managementSections.join(", ")}]`);
     lines.push(`Filter sources: [${filter.sources.join(", ")}]`);
+    const activeDescriptor = harnessService.getActiveDescriptor();
     if (activeDescriptor) {
         lines.push("");
         lines.push("--- Active Harness ---");
@@ -56,21 +56,13 @@ async function generateCustomizationDebugReport(
         lines.push(`Filter includedUserFileRoots: (all)`);
     }
     lines.push("");
-    const extensionProvider = activeDescriptor?.itemProvider;
-    const effectiveProvider = extensionProvider ?? promptsServiceItemProvider;
-    if (effectiveProvider) {
-        let providerLabel;
-        if (extensionProvider) {
-            providerLabel = "Extension Provider";
-        } else {
-            providerLabel = "PromptsService Adapter (fallback — no extension provider registered)";
-        }
-        await appendProviderData(lines, effectiveProvider, promptType, providerLabel);
+    const extensionProvider = activeDescriptor.itemProvider;
+    if (extensionProvider) {
+        const providerLabel = "Extension Provider";
+        await appendProviderData(lines, itemSource, promptType, providerLabel);
     } else {
         lines.push("--- Stage 1: No provider available ---");
         lines.push("");
-    }
-    if (!extensionProvider) {
         await appendRawServiceData(lines, promptsService, promptType);
         await appendFilteredData(lines, promptsService, promptType, filter);
     }
@@ -96,15 +88,16 @@ async function getPromptFilesByStorage(promptsService, promptType) {
         extensionFiles
     };
 }
-async function appendProviderData(lines, provider, promptType, label) {
+async function appendProviderData(lines, itemSource, promptType, label) {
     lines.push(`--- Stage 1: Provider Output (${label}) ---`);
-    const allItems = await provider.provideChatSessionCustomizations(CancellationToken.None);
-    if (!allItems) {
-        lines.push("  Provider returned undefined");
-        lines.push("");
-        return;
+    const allItems = await itemSource.fetchProviderItems();
+    if (allItems.length === 0) {
+        lines.push(
+            `  Total items from provider: 0 (or provider returned undefined and the item source normalized it to an empty array)`
+        );
+    } else {
+        lines.push(`  Total items from provider: ${allItems.length}`);
     }
-    lines.push(`  Total items from provider: ${allItems.length}`);
     const byType = ( new Map());
     for (const item of allItems) {
         const existing = byType.get(item.type) ?? [];
@@ -119,9 +112,7 @@ async function appendProviderData(lines, provider, promptType, label) {
             if (item.description) {
                 lines.push(`      desc: ${item.description}`);
             }
-            if (item.storage) {
-                lines.push(`      storage: ${item.storage}`);
-            }
+            lines.push(`      source: ${item.source}`);
             if (item.groupKey) {
                 lines.push(`      groupKey: ${item.groupKey}`);
             }
@@ -228,26 +219,26 @@ function appendWidgetState(lines, state) {
     lines.push("--- Stage 3: Widget State (loadItems → filterItems) ---");
     lines.push(`  allItems (after loadItems): ${state.allItems.length}`);
     lines.push(
-        `    local:     ${state.allItems.filter(i => i.storage === PromptsStorage.local).length}`
+        `    local:     ${state.allItems.filter(i => i.source === AICustomizationSources.local).length}`
     );
     lines.push(
-        `    user:      ${state.allItems.filter(i => i.storage === PromptsStorage.user).length}`
+        `    user:      ${state.allItems.filter(i => i.source === AICustomizationSources.user).length}`
     );
     lines.push(
-        `    extension: ${state.allItems.filter(i => i.storage === PromptsStorage.extension).length}`
+        `    extension: ${state.allItems.filter(i => i.source === AICustomizationSources.extension).length}`
     );
     lines.push(
-        `    plugin:    ${state.allItems.filter(i => i.storage === PromptsStorage.plugin).length}`
+        `    plugin:    ${state.allItems.filter(i => i.source === AICustomizationSources.plugin).length}`
     );
     lines.push(
-        `    built-in:  ${state.allItems.filter(i => i.storage === BUILTIN_STORAGE).length}`
+        `    built-in:  ${state.allItems.filter(i => i.source === AICustomizationSources.builtin).length}`
     );
     const syncableCount = state.allItems.filter(i => i.syncable).length;
     if (syncableCount > 0) {
         lines.push(`    syncable:  ${syncableCount}`);
     }
     for (const item of state.allItems) {
-        const flags = [`storage=${item.storage ?? "?"}`, `groupKey=${item.groupKey ?? "(none)"}`];
+        const flags = [`storage=${item.source ?? "?"}`, `groupKey=${item.groupKey ?? "(none)"}`];
         if (item.syncable) {
             flags.push("syncable");
         }

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

@@ -1,5 +1,5 @@
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
-import { type AICustomizationPromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService";
+import { type AICustomizationSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService";
 /**
  * Icon for the AI Customization view container (sidebar).
  */
@@ -59,4 +59,4 @@ export declare const mcpServerIcon: ThemeIcon;
 /**
  * Returns the icon for a given storage type.
  */
-export declare function storageToIcon(storage: AICustomizationPromptsStorage): ThemeIcon;
+export declare function sourceToIcon(source: AICustomizationSource): ThemeIcon;

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

@@ -2,22 +2,21 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 
-registerIcon("ai-customization-view-icon", Codicon.sparkle, ( localize(5407, "Icon for the Agent Customization view.")));
-const agentIcon = registerIcon("ai-customization-agent", Codicon.agent, ( localize(5408, "Icon for custom agents.")));
-const skillIcon = registerIcon("ai-customization-skill", Codicon.lightbulb, ( localize(5409, "Icon for skills.")));
-const instructionsIcon = registerIcon("ai-customization-instructions", Codicon.book, ( localize(5410, "Icon for instruction files.")));
-const promptIcon = registerIcon("ai-customization-prompt", Codicon.bookmark, ( localize(5411, "Icon for prompt files.")));
-const hookIcon = registerIcon("ai-customization-hook", Codicon.zap, ( localize(5412, "Icon for hooks.")));
-registerIcon("ai-customization-add", Codicon.add, ( localize(5413, "Icon for adding new items.")));
-registerIcon("ai-customization-run", Codicon.play, ( localize(5414, "Icon for running a prompt or agent.")));
-const workspaceIcon = registerIcon("ai-customization-workspace", Codicon.folder, ( localize(5415, "Icon for workspace items.")));
-const userIcon = registerIcon("ai-customization-user", Codicon.account, ( localize(5416, "Icon for user items.")));
-const extensionIcon = registerIcon("ai-customization-extension", Codicon.extensions, ( localize(5417, "Icon for extension-contributed items.")));
-const pluginIcon = registerIcon("ai-customization-plugin", Codicon.plug, ( localize(5418, "Icon for plugin-contributed items.")));
-const builtinIcon = registerIcon("ai-customization-builtin", Codicon.starFull, ( localize(5419, "Icon for built-in items.")));
-const mcpServerIcon = registerIcon("ai-customization-mcp-server", Codicon.server, ( localize(5420, "Icon for MCP servers.")));
+registerIcon("ai-customization-view-icon", Codicon.sparkle, ( localize(5474, "Icon for the Agent Customization view.")));
+const agentIcon = registerIcon("ai-customization-agent", Codicon.agent, ( localize(5475, "Icon for custom agents.")));
+const skillIcon = registerIcon("ai-customization-skill", Codicon.lightbulb, ( localize(5476, "Icon for skills.")));
+const instructionsIcon = registerIcon("ai-customization-instructions", Codicon.book, ( localize(5477, "Icon for instruction files.")));
+const promptIcon = registerIcon("ai-customization-prompt", Codicon.bookmark, ( localize(5478, "Icon for prompt files.")));
+const hookIcon = registerIcon("ai-customization-hook", Codicon.zap, ( localize(5479, "Icon for hooks.")));
+registerIcon("ai-customization-add", Codicon.add, ( localize(5480, "Icon for adding new items.")));
+registerIcon("ai-customization-run", Codicon.play, ( localize(5481, "Icon for running a prompt or agent.")));
+const workspaceIcon = registerIcon("ai-customization-workspace", Codicon.folder, ( localize(5482, "Icon for workspace items.")));
+const userIcon = registerIcon("ai-customization-user", Codicon.account, ( localize(5483, "Icon for user items.")));
+const extensionIcon = registerIcon("ai-customization-extension", Codicon.extensions, ( localize(5484, "Icon for extension-contributed items.")));
+const pluginIcon = registerIcon("ai-customization-plugin", Codicon.plug, ( localize(5485, "Icon for plugin-contributed items.")));
+const builtinIcon = registerIcon("ai-customization-builtin", Codicon.starFull, ( localize(5486, "Icon for built-in items.")));
+const mcpServerIcon = registerIcon("ai-customization-mcp-server", Codicon.server, ( localize(5487, "Icon for MCP servers.")));
 
 export { agentIcon, builtinIcon, extensionIcon, hookIcon, instructionsIcon, mcpServerIcon, pluginIcon, promptIcon, skillIcon, userIcon, workspaceIcon };

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

@@ -6,7 +6,6 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
-import { ICustomizationItemProvider } 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 { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
@@ -45,6 +44,8 @@ export declare class AICustomizationItemsModel extends Disposable implements IAI
      * present in `availableHarnesses`.
      */
     private readonly sourceCache;
+    private pendingRefetchSource;
+    private readonly refetchObservedScheduler;
     private readonly perSection;
     private readonly perSectionCount;
     private readonly fetchSeq;
@@ -66,12 +67,11 @@ export declare class AICustomizationItemsModel extends Disposable implements IAI
     getCount(section: ItemsModelSection): IObservable<number>;
     getPluginCount(): IObservable<number>;
     getActiveItemSource(): IAICustomizationItemSource;
-    getPromptsServiceItemProvider(): ICustomizationItemProvider;
     whenSectionLoaded(section: ItemsModelSection): Promise<void>;
     private markObserved;
     private markPluginCountObserved;
     private getOrCreateSource;
-    private pruneSourceCache;
+    private scheduleRefetchObserved;
     private refetchObserved;
     private refetchSection;
     private refetchPluginCount;

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

@@ -1,5 +1,5 @@
 
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -10,6 +10,10 @@ import { AICustomizationManagementSection } from '@codingame/monaco-vscode-api/v
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
@@ -17,15 +21,17 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCompatibility';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import './aiCustomizationIcons.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 
 const ITEMS_MODEL_SECTIONS = [
     AICustomizationManagementSection.Agents,