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

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css

@@ -65,13 +65,24 @@
 	border-color: var(--vscode-commandCenter-activeBorder, transparent);
 }
 
-.agent-status-pill.chat-input-mode {
+/* Compact mode: pill hover is handled by individual sections, not the whole pill */
+.agent-status-pill.compact-mode {
+	padding: 0;
+	gap: 0;
+	background-color: transparent;
+}
+
+.agent-status-pill.compact-mode:hover {
+	background-color: transparent;
+	border-color: var(--vscode-commandCenter-border, transparent);
+}
+
+.agent-status-pill.chat-input-mode:not(.compact-mode) {
 	cursor: pointer;
 }
 
-.agent-status-pill.chat-input-mode:focus {
-	outline: 1px solid var(--vscode-focusBorder);
-	outline-offset: -1px;
+.agent-status-pill.chat-input-mode .agent-status-input-area {
+	cursor: pointer;
 }
 
 .agent-status-pill.session-mode,
@@ -95,13 +106,53 @@
 	color: var(--vscode-commandCenter-activeForeground);
 }
 
-/* Label */
+/* Label - styled as placeholder text */
 .agent-status-label {
 	flex: 1;
 	text-align: center;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	opacity: 0.6;
+}
+
+/* Compact mode: left-aligned label, no icon */
+.agent-status-pill.compact-mode .agent-status-label {
+	text-align: left;
+}
+
+/* Compact mode: inline status sections inside the pill */
+.agent-status-pill.compact-mode .agent-status-badge-section {
+	flex-shrink: 0;
+}
+
+/* Input hover target - only this area triggers hover, not badge sections */
+.agent-status-pill .agent-status-input-area {
+	display: flex;
+	align-items: center;
+	flex: 1;
+	min-width: 0;
+	overflow: hidden;
+	cursor: pointer;
+	gap: 6px;
+	border-radius: 5px 0 0 5px;
+	height: 100%;
+	padding: 0 10px;
+	background-color: var(--vscode-agentStatusIndicator-background);
+}
+
+/* When preceded by a toolbar/separator, remove left border-radius */
+.agent-status-line-separator + .agent-status-input-area {
+	border-radius: 0;
+}
+
+.agent-status-pill .agent-status-input-area:hover {
+	background-color: var(--vscode-commandCenter-activeBackground);
+}
+
+.agent-status-pill .agent-status-input-area:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
 }
 
 .agent-status-label.has-progress {
@@ -203,6 +254,9 @@
 	display: flex;
 	align-items: center;
 	-webkit-app-region: no-drag;
+	height: 100%;
+	background-color: var(--vscode-agentStatusIndicator-background);
+	border-radius: 5px 0 0 5px;
 }
 
 .agent-status-separator {
@@ -212,6 +266,16 @@
 	align-items: center;
 }
 
+/* Vertical line separator used inside the pill in compact+debug mode */
+.agent-status-line-separator {
+	width: 1px;
+	align-self: stretch;
+	margin: 4px 0;
+	background-color: var(--vscode-commandCenter-border, rgba(128, 128, 128, 0.35));
+	flex-shrink: 0;
+	pointer-events: none;
+}
+
 /* Status Badge */
 .agent-status-badge {
 	display: flex;
@@ -235,6 +299,7 @@
 	height: 100%;
 	position: relative;
 	cursor: pointer;
+	background-color: var(--vscode-agentStatusIndicator-background);
 }
 
 .agent-status-badge-section:first-child { border-radius: 5px 0 0 5px; }
@@ -281,7 +346,8 @@
 }
 
 /* Separator between sections */
-.agent-status-badge-section + .agent-status-badge-section::before {
+.agent-status-badge-section + .agent-status-badge-section::before,
+.agent-status-input-area + .agent-status-badge-section::before {
 	content: '';
 	position: absolute;
 	left: 0;
@@ -317,10 +383,16 @@
 }
 
 .agent-status-badge-section.sparkle .action-container {
-	padding: 0 4px;
+	padding: 0 5px;
 	border-radius: 5px 0 0 5px;
 }
 
+/* In compact mode, no left radius on sparkle - it sits flush next to other sections */
+.agent-status-pill.compact-mode .agent-status-badge-section.sparkle .action-container {
+	border-radius: 0;
+	padding: 0 5px 0 6px;
+}
+
 .agent-status-badge-section.sparkle .dropdown-action-container {
 	width: 18px;
 	padding: 0;

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(5196, "Sessions")),
+    label: ( localize(5238, "Sessions")),
     prefix: "agent ",
-    placeholder: ( localize(5197, "Search sessions or type a message...")),
-    tooltip: ( localize(5198, "Search sessions or send a message to agent"))
+    placeholder: ( localize(5239, "Search sessions or type a message...")),
+    tooltip: ( localize(5240, "Search sessions or send a message to agent"))
 }, {
     id: "commands",
-    label: ( localize(5199, "Commands")),
+    label: ( localize(5241, "Commands")),
     prefix: ">",
-    placeholder: ( localize(5200, "Search commands...")),
-    tooltip: ( localize(5201, "Run commands"))
+    placeholder: ( localize(5242, "Search commands...")),
+    tooltip: ( localize(5243, "Run commands"))
 }, {
     id: "files",
-    label: ( localize(5202, "Files")),
+    label: ( localize(5244, "Files")),
     prefix: "",
-    placeholder: ( localize(5203, "Search files...")),
-    tooltip: ( localize(5204, "Go to files"))
+    placeholder: ( localize(5245, "Search files...")),
+    tooltip: ( localize(5246, "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(5205, "Send"));
-            this._sendButtonHover?.update(( localize(5206, "Send message to new agent session")));
+            this._sendButtonLabel.textContent = ( localize(5247, "Send"));
+            this._sendButtonHover?.update(( localize(5248, "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(5207, "Open Chat"));
-            const tooltip = openChatLabel ? ( localize(5208, "Open chat ({0})", openChatLabel)) : ( localize(5209, "Open chat"));
+            this._sendButtonLabel.textContent = ( localize(5249, "Open Chat"));
+            const tooltip = openChatLabel ? ( localize(5250, "Open chat ({0})", openChatLabel)) : ( localize(5251, "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(5210, "Send to agent"))}`,
+            label: `$(send) ${( localize(5252, "Send to agent"))}`,
             description: fullInput,
             alwaysShow: true,
-            ariaLabel: ( localize(5211, "Send message to agent: {0}", fullInput))
+            ariaLabel: ( localize(5253, "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(5212, "Press Enter or click Send to create a new agent session")),
+                label: ( localize(5254, "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(5213, "No provider available for this tab")),
+                label: ( localize(5255, "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(5214, "Show Agent Quick Access")),
+            title: ( localize2(5256, "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(5215, "Show Agent Sessions")),
+            title: ( localize2(5257, "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(5216, "Show Commands (Unified)")),
+            title: ( localize2(5258, "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(5217, "Show Files (Unified)")),
+            title: ( localize2(5259, "Show Files (Unified)")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`))))
         });

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

@@ -1,11 +1,11 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
-import { IChatSessionItem, IChatSessionItemController } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare class LocalAgentsSessionsController extends Disposable implements IChatSessionItemController, IWorkbenchContribution {
     private readonly chatService;
     private readonly chatSessionsService;
@@ -14,13 +14,14 @@ export declare class LocalAgentsSessionsController extends Disposable implements
     readonly chatSessionType = "local";
     private readonly _onDidChange;
     readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    readonly _onDidChangeChatSessionItems: Emitter<void>;
-    readonly onDidChangeChatSessionItems: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    readonly _onDidChangeChatSessionItems: Emitter<IChatSessionItemsDelta>;
+    readonly onDidChangeChatSessionItems: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IChatSessionItemsDelta>;
     constructor(chatService: IChatService, chatSessionsService: IChatSessionsService, logService: ILogService);
     private _items;
     get items(): readonly IChatSessionItem[];
     refresh(token: CancellationToken): Promise<void>;
     private registerListeners;
+    private getItem;
     private provideChatSessionItems;
     private getHistoryItems;
     private toChatSessionItem;

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

@@ -7,12 +7,13 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { convertLegacyChatSessionTiming, ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { localChatSessionType, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 let LocalAgentsSessionsController = class LocalAgentsSessionsController extends Disposable {
     static {
@@ -41,21 +42,32 @@ let LocalAgentsSessionsController = class LocalAgentsSessionsController extends
         this._items = await this.provideChatSessionItems(token);
     }
     registerListeners() {
-        const refreshItems = async () => {
-            this._onDidChangeChatSessionItems.fire();
-            await this.refresh(CancellationToken.None);
-            this._onDidChangeChatSessionItems.fire();
-        };
         this._register(
-            this.chatSessionsService.registerChatModelChangeListeners(this.chatService, Schemas.vscodeLocalChatSession, refreshItems)
+            this.chatService.registerChatModelChangeListeners(Schemas.vscodeLocalChatSession, async sessionResource => {
+                if (getChatSessionType(sessionResource) !== this.chatSessionType) {
+                    return;
+                }
+                await this.refresh(CancellationToken.None);
+                const item = this.getItem(sessionResource);
+                if (item) {
+                    this._onDidChangeChatSessionItems.fire({
+                        addedOrUpdated: [item]
+                    });
+                }
+            })
         );
         this._register(this.chatService.onDidDisposeSession(e => {
-            const session = e.sessionResource.filter(resource => getChatSessionType(resource) === this.chatSessionType);
-            if (session.length > 0) {
-                refreshItems();
+            const removedSessionResources = e.sessionResource.filter(resource => getChatSessionType(resource) === this.chatSessionType);
+            if (removedSessionResources.length) {
+                this._onDidChangeChatSessionItems.fire({
+                    removed: removedSessionResources
+                });
             }
         }));
     }
+    getItem(sessionResource) {
+        return this._items.find(item => isEqual(item.resource, sessionResource));
+    }
     async provideChatSessionItems(token) {
         const sessions = [];
         const sessionsByResource = ( new ResourceSet());

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

@@ -1,7 +1,7 @@
 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 { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
-import { AICustomizationManagementSection } from "./aiCustomizationManagement.js";
+import { AICustomizationManagementSection } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement";
 /**
  * Snapshot of the list widget's internal state, passed in to avoid coupling.
  */

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

@@ -2,8 +2,8 @@
 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 { AICustomizationManagementSection, applyStorageSourceFilter } from '../../common/aiCustomizationWorkspaceService.js';
-import './aiCustomizationManagement.js';
+import { AICustomizationManagementSection, applyStorageSourceFilter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
 
 function sectionToPromptType(section) {
     switch (section) {

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

@@ -46,6 +46,10 @@ export declare const extensionIcon: import("@codingame/monaco-vscode-api/vscode/
  * Icon for plugin storage.
  */
 export declare const pluginIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
+/**
+ * Icon for built-in storage.
+ */
+export declare const builtinIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
 /**
  * Icon for MCP servers.
  */

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

@@ -3,18 +3,19 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 
-registerIcon("ai-customization-view-icon", Codicon.sparkle, ( localize(5218, "Icon for the Chat Customization view.")));
-const agentIcon = registerIcon("ai-customization-agent", Codicon.agent, ( localize(5219, "Icon for custom agents.")));
-const skillIcon = registerIcon("ai-customization-skill", Codicon.lightbulb, ( localize(5220, "Icon for skills.")));
-const instructionsIcon = registerIcon("ai-customization-instructions", Codicon.book, ( localize(5221, "Icon for instruction files.")));
-const promptIcon = registerIcon("ai-customization-prompt", Codicon.bookmark, ( localize(5222, "Icon for prompt files.")));
-const hookIcon = registerIcon("ai-customization-hook", Codicon.zap, ( localize(5223, "Icon for hooks.")));
-registerIcon("ai-customization-add", Codicon.add, ( localize(5224, "Icon for adding new items.")));
-registerIcon("ai-customization-run", Codicon.play, ( localize(5225, "Icon for running a prompt or agent.")));
-const workspaceIcon = registerIcon("ai-customization-workspace", Codicon.folder, ( localize(5226, "Icon for workspace items.")));
-const userIcon = registerIcon("ai-customization-user", Codicon.account, ( localize(5227, "Icon for user items.")));
-const extensionIcon = registerIcon("ai-customization-extension", Codicon.extensions, ( localize(5228, "Icon for extension-contributed items.")));
-const pluginIcon = registerIcon("ai-customization-plugin", Codicon.plug, ( localize(5229, "Icon for plugin-contributed items.")));
-registerIcon("ai-customization-mcp-server", Codicon.server, ( localize(5230, "Icon for MCP servers.")));
+registerIcon("ai-customization-view-icon", Codicon.sparkle, ( localize(5260, "Icon for the Chat Customization view.")));
+const agentIcon = registerIcon("ai-customization-agent", Codicon.agent, ( localize(5261, "Icon for custom agents.")));
+const skillIcon = registerIcon("ai-customization-skill", Codicon.lightbulb, ( localize(5262, "Icon for skills.")));
+const instructionsIcon = registerIcon("ai-customization-instructions", Codicon.book, ( localize(5263, "Icon for instruction files.")));
+const promptIcon = registerIcon("ai-customization-prompt", Codicon.bookmark, ( localize(5264, "Icon for prompt files.")));
+const hookIcon = registerIcon("ai-customization-hook", Codicon.zap, ( localize(5265, "Icon for hooks.")));
+registerIcon("ai-customization-add", Codicon.add, ( localize(5266, "Icon for adding new items.")));
+registerIcon("ai-customization-run", Codicon.play, ( localize(5267, "Icon for running a prompt or agent.")));
+const workspaceIcon = registerIcon("ai-customization-workspace", Codicon.folder, ( localize(5268, "Icon for workspace items.")));
+const userIcon = registerIcon("ai-customization-user", Codicon.account, ( localize(5269, "Icon for user items.")));
+const extensionIcon = registerIcon("ai-customization-extension", Codicon.extensions, ( localize(5270, "Icon for extension-contributed items.")));
+const pluginIcon = registerIcon("ai-customization-plugin", Codicon.plug, ( localize(5271, "Icon for plugin-contributed items.")));
+const builtinIcon = registerIcon("ai-customization-builtin", Codicon.starFull, ( localize(5272, "Icon for built-in items.")));
+const mcpServerIcon = registerIcon("ai-customization-mcp-server", Codicon.server, ( localize(5273, "Icon for MCP servers.")));
 
-export { agentIcon, extensionIcon, hookIcon, instructionsIcon, pluginIcon, promptIcon, skillIcon, userIcon, workspaceIcon };
+export { agentIcon, builtinIcon, extensionIcon, hookIcon, instructionsIcon, mcpServerIcon, pluginIcon, promptIcon, skillIcon, userIcon, workspaceIcon };

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

@@ -1,11 +1,13 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 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 { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
-import { AICustomizationManagementSection } from "./aiCustomizationManagement.js";
+import { AICustomizationManagementSection } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement";
+import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IMatch } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
@@ -19,6 +21,11 @@ import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 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 { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { ICustomizationHarnessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+export { truncateToFirstLine } from "./aiCustomizationListWidgetUtils.js";
 /**
  * Represents an AI customization item in the list.
  */
@@ -30,11 +37,29 @@ export interface IAICustomizationListItem {
     readonly description?: string;
     readonly storage: PromptsStorage;
     readonly promptType: PromptsType;
+    readonly disabled: boolean;
     /** When set, overrides `storage` for display grouping purposes. */
     readonly groupKey?: string;
+    /** URI of the parent plugin, when this item comes from an installed plugin. */
+    readonly pluginUri?: URI;
+    /** When set, overrides the formatted name for display. */
+    readonly displayName?: string;
+    /** When set, shows a small inline badge next to the item name. */
+    readonly badge?: string;
+    /** Tooltip shown when hovering the badge. */
+    readonly badgeTooltip?: string;
+    /** When set, overrides the default prompt-type icon. */
+    readonly typeIcon?: ThemeIcon;
     nameMatches?: IMatch[];
     descriptionMatches?: IMatch[];
 }
+/**
+ * Formats a name for display: strips a trailing .md extension, converts dashes/underscores
+ * to spaces and applies title case.
+ * Note: callers that pass IMatch highlight ranges must compute those ranges against the
+ * formatted string (not the raw input), since .md stripping changes string length.
+ */
+export declare function formatDisplayName(name: string): string;
 /**
  * Maps section ID to prompt type.
  */
@@ -57,6 +82,11 @@ export declare class AICustomizationListWidget extends Disposable {
     private readonly hoverService;
     private readonly fileService;
     private readonly pathService;
+    private readonly telemetryService;
+    private readonly harnessService;
+    private readonly agentPluginService;
+    private readonly commandService;
+    private readonly productService;
     readonly element: HTMLElement;
     private sectionHeader;
     private sectionDescription;
@@ -89,9 +119,10 @@ export declare class AICustomizationListWidget extends Disposable {
     private readonly _onDidRequestCreateManual;
     readonly onDidRequestCreateManual: Event<{
         type: PromptsType;
-        target: "workspace" | "user";
+        target: "workspace" | "user" | "workspace-root";
+        rootFileName?: string;
     }>;
-    constructor(instantiationService: IInstantiationService, promptsService: IPromptsService, contextViewService: IContextViewService, openerService: IOpenerService, contextMenuService: IContextMenuService, menuService: IMenuService, contextKeyService: IContextKeyService, workspaceContextService: IWorkspaceContextService, labelService: ILabelService, workspaceService: IAICustomizationWorkspaceService, clipboardService: IClipboardService, hoverService: IHoverService, fileService: IFileService, pathService: IPathService);
+    constructor(instantiationService: IInstantiationService, promptsService: IPromptsService, contextViewService: IContextViewService, openerService: IOpenerService, contextMenuService: IContextMenuService, menuService: IMenuService, contextKeyService: IContextKeyService, workspaceContextService: IWorkspaceContextService, labelService: ILabelService, workspaceService: IAICustomizationWorkspaceService, clipboardService: IClipboardService, hoverService: IHoverService, fileService: IFileService, pathService: IPathService, telemetryService: ITelemetryService, harnessService: ICustomizationHarnessService, agentPluginService: IAgentPluginService, commandService: ICommandService, productService: IProductService);
     private create;
     /**
      * Handles context menu for list items.
@@ -106,11 +137,18 @@ export declare class AICustomizationListWidget extends Disposable {
      */
     private updateSectionHeader;
     /**
-     * Updates the add button label based on the current section.
+     * Updates the add button by building a unified action list.
+     * The first action becomes the primary button; the rest go in the dropdown.
      */
     private updateAddButton;
     /**
-     * Gets the dropdown actions for the add button.
+     * Builds an ordered list of create actions for the current section.
+     * The first entry is the primary button; remaining entries are dropdown items.
+     */
+    private buildCreateActions;
+    /**
+     * Gets the dropdown actions for the add button (consumed by ButtonWithDropdown).
+     * Returns all actions except the primary (first) from buildCreateActions.
      */
     private getDropdownActions;
     /**
@@ -133,6 +171,44 @@ export declare class AICustomizationListWidget extends Disposable {
      * Loads items for the current section.
      */
     private loadItems;
+    /**
+     * Computes the item count for a given section without updating the display.
+     * Uses the same loading and filtering logic as `loadItems` for consistency.
+     */
+    computeItemCountForSection(section: AICustomizationManagementSection): Promise<number>;
+    /**
+     * Returns true if the given extension identifier matches the default
+     * chat extension (e.g. GitHub Copilot Chat). Used to group items from
+     * the chat extension under "Built-in" instead of "Extensions", similar
+     * to how MCP categorizes built-in servers.
+     */
+    private isChatExtensionItem;
+    /**
+     * Resolves the display group key for an extension-storage item.
+     * Items from the default chat extension are re-grouped under "Built-in";
+     * all other extension items keep their original storage as group key.
+     *
+     * Returns `undefined` when no override is needed (the item will fall back
+     * to its `storage` value for grouping).
+     *
+     * This is the single point where extension → group mapping is decided,
+     * making it easy to add dynamic filter layers in the future.
+     */
+    private resolveExtensionGroupKey;
+    /**
+     * Post-processes items to assign groupKey overrides for extension-sourced
+     * items. Applies the built-in grouping consistently across all item types.
+     *
+     * Items that already have an explicit groupKey (e.g. instruction categories,
+     * agent hooks) are left untouched — groupKey overrides are only applied to
+     * items whose current groupKey is `undefined`.
+     */
+    private applyBuiltinGroupKeys;
+    /**
+     * Fetches and filters items for a given section.
+     * Shared between `loadItems` (active section) and `computeItemCountForSection` (any section).
+     */
+    private fetchItemsForSection;
     /**
      * Derives a friendly name from a filename by removing extension suffixes.
      */
@@ -147,6 +223,10 @@ export declare class AICustomizationListWidget extends Disposable {
     private toggleGroup;
     private updateEmptyState;
     private getSectionIcon;
+    /**
+     * Finds the plugin URI for an item URI by checking the known plugins.
+     */
+    private findPluginUri;
     private getEmptyStateInfo;
     /**
      * Sets the search query programmatically.