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

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

@@ -2,35 +2,22 @@
 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 { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 
-registerIcon("ai-customization-view-icon", Codicon.sparkle, ( localize(5297, "Icon for the Agent Customization view.")));
-const agentIcon = registerIcon("ai-customization-agent", Codicon.agent, ( localize(5298, "Icon for custom agents.")));
-const skillIcon = registerIcon("ai-customization-skill", Codicon.lightbulb, ( localize(5299, "Icon for skills.")));
-const instructionsIcon = registerIcon("ai-customization-instructions", Codicon.book, ( localize(5300, "Icon for instruction files.")));
-const promptIcon = registerIcon("ai-customization-prompt", Codicon.bookmark, ( localize(5301, "Icon for prompt files.")));
-const hookIcon = registerIcon("ai-customization-hook", Codicon.zap, ( localize(5302, "Icon for hooks.")));
-registerIcon("ai-customization-add", Codicon.add, ( localize(5303, "Icon for adding new items.")));
-registerIcon("ai-customization-run", Codicon.play, ( localize(5304, "Icon for running a prompt or agent.")));
-const workspaceIcon = registerIcon("ai-customization-workspace", Codicon.folder, ( localize(5305, "Icon for workspace items.")));
-const userIcon = registerIcon("ai-customization-user", Codicon.account, ( localize(5306, "Icon for user items.")));
-const extensionIcon = registerIcon("ai-customization-extension", Codicon.extensions, ( localize(5307, "Icon for extension-contributed items.")));
-const pluginIcon = registerIcon("ai-customization-plugin", Codicon.plug, ( localize(5308, "Icon for plugin-contributed items.")));
-const builtinIcon = registerIcon("ai-customization-builtin", Codicon.starFull, ( localize(5309, "Icon for built-in items.")));
-const mcpServerIcon = registerIcon("ai-customization-mcp-server", Codicon.server, ( localize(5310, "Icon for MCP servers.")));
-function storageToIcon(storage) {
-    switch (storage) {
-    case PromptsStorage.local:
-        return workspaceIcon;
-    case PromptsStorage.user:
-        return userIcon;
-    case PromptsStorage.extension:
-        return extensionIcon;
-    case PromptsStorage.plugin:
-        return pluginIcon;
-    default:
-        return instructionsIcon;
-    }
-}
+registerIcon("ai-customization-view-icon", Codicon.sparkle, ( localize(5352, "Icon for the Agent Customization view.")));
+const agentIcon = registerIcon("ai-customization-agent", Codicon.agent, ( localize(5353, "Icon for custom agents.")));
+const skillIcon = registerIcon("ai-customization-skill", Codicon.lightbulb, ( localize(5354, "Icon for skills.")));
+const instructionsIcon = registerIcon("ai-customization-instructions", Codicon.book, ( localize(5355, "Icon for instruction files.")));
+const promptIcon = registerIcon("ai-customization-prompt", Codicon.bookmark, ( localize(5356, "Icon for prompt files.")));
+const hookIcon = registerIcon("ai-customization-hook", Codicon.zap, ( localize(5357, "Icon for hooks.")));
+registerIcon("ai-customization-add", Codicon.add, ( localize(5358, "Icon for adding new items.")));
+registerIcon("ai-customization-run", Codicon.play, ( localize(5359, "Icon for running a prompt or agent.")));
+const workspaceIcon = registerIcon("ai-customization-workspace", Codicon.folder, ( localize(5360, "Icon for workspace items.")));
+const userIcon = registerIcon("ai-customization-user", Codicon.account, ( localize(5361, "Icon for user items.")));
+const extensionIcon = registerIcon("ai-customization-extension", Codicon.extensions, ( localize(5362, "Icon for extension-contributed items.")));
+const pluginIcon = registerIcon("ai-customization-plugin", Codicon.plug, ( localize(5363, "Icon for plugin-contributed items.")));
+const builtinIcon = registerIcon("ai-customization-builtin", Codicon.starFull, ( localize(5364, "Icon for built-in items.")));
+const mcpServerIcon = registerIcon("ai-customization-mcp-server", Codicon.server, ( localize(5365, "Icon for MCP servers.")));
 
-export { agentIcon, builtinIcon, extensionIcon, hookIcon, instructionsIcon, mcpServerIcon, pluginIcon, promptIcon, skillIcon, storageToIcon, userIcon, workspaceIcon };
+export { agentIcon, builtinIcon, extensionIcon, hookIcon, instructionsIcon, mcpServerIcon, pluginIcon, promptIcon, skillIcon, userIcon, workspaceIcon };

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

@@ -0,0 +1,78 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+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";
+import { IAICustomizationItemSource, IAICustomizationListItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemSource";
+import { IAICustomizationItemsModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemsModel.service";
+/**
+ * The set of sections whose items are sourced from the customization
+ * harness pipeline (extension-contributed providers, sync providers,
+ * and the prompts-service fallback). McpServers / Models have their
+ * own dedicated services and are not modeled here. Plugins keep a
+ * dedicated count observable because remote harnesses can contribute
+ * plugin rows through the same provider pipeline.
+ */
+export declare const ITEMS_MODEL_SECTIONS: readonly [
+    "agents",
+    "skills",
+    "instructions",
+    "prompts",
+    "hooks"
+];
+export type ItemsModelSection = typeof ITEMS_MODEL_SECTIONS[number];
+export declare class AICustomizationItemsModel extends Disposable implements IAICustomizationItemsModel {
+    private readonly harnessService;
+    private readonly promptsService;
+    private readonly workspaceService;
+    private readonly agentPluginService;
+    private readonly fileService;
+    private readonly pathService;
+    readonly _serviceBrand: undefined;
+    private readonly itemNormalizer;
+    private readonly promptsServiceItemProvider;
+    /**
+     * Cached source per active descriptor. Keyed by descriptor reference (not id) so that
+     * an external harness re-registering under the same id (e.g. extension reload) gets a
+     * fresh source bound to the new provider. Pruned when its descriptor is no longer
+     * present in `availableHarnesses`.
+     */
+    private readonly sourceCache;
+    private readonly perSection;
+    private readonly perSectionCount;
+    private readonly fetchSeq;
+    /** Promise of the most recent fetch per section (resolves regardless of stale-discard). */
+    private readonly perSectionPending;
+    private readonly remotePluginNames;
+    private readonly pluginCount;
+    private pluginCountObserved;
+    private pluginFetchSeq;
+    /**
+     * Sections that have been observed at least once. The model only fetches on
+     * demand: first `getItems`/`getCount` for a section triggers an initial fetch,
+     * and subsequent harness/source/workspace change events refetch only sections
+     * that have already been read. This avoids 5x provider enumeration on startup.
+     */
+    private readonly observedSections;
+    constructor(harnessService: ICustomizationHarnessService, promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, workspaceContextService: IWorkspaceContextService, labelService: ILabelService, agentPluginService: IAgentPluginService, productService: IProductService, fileService: IFileService, pathService: IPathService);
+    getItems(section: ItemsModelSection): IObservable<readonly IAICustomizationListItem[]>;
+    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 refetchObserved;
+    private refetchSection;
+    private refetchPluginCount;
+}

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

@@ -0,0 +1,38 @@
+
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+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';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { AICustomizationManagementSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+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/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';
+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/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';
+
+const ITEMS_MODEL_SECTIONS = [
+    AICustomizationManagementSection.Agents,
+    AICustomizationManagementSection.Skills,
+    AICustomizationManagementSection.Instructions,
+    AICustomizationManagementSection.Prompts,
+    AICustomizationManagementSection.Hooks
+];
+
+export { ITEMS_MODEL_SECTIONS };

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

@@ -10,18 +10,16 @@ import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 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 { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
 import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.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 { 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";
-import { IAICustomizationListItem } from "./aiCustomizationItemSource.js";
+import { IAICustomizationListItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemSource";
+import { IAICustomizationItemsModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemsModel.service";
 export { truncateToFirstLine } from "./aiCustomizationListWidgetUtils.js";
 /**
  * Formats a name for display by stripping a trailing .md extension.
@@ -30,9 +28,10 @@ export { truncateToFirstLine } from "./aiCustomizationListWidgetUtils.js";
  */
 export declare function formatDisplayName(name: string): string;
 /**
- * Maps section ID to prompt type.
+ * Returns the ARIA status announcement string for a given section, item
+ * count, and whether a search filter is active. Exported for testing.
  */
-export declare function sectionToPromptType(section: AICustomizationManagementSection): PromptsType;
+export declare function getCountAnnouncement(section: AICustomizationManagementSection, count: number, isFiltering: boolean): string;
 /**
  * Widget that displays a searchable list of AI customization items.
  */
@@ -44,18 +43,16 @@ export declare class AICustomizationListWidget extends Disposable {
     private readonly contextMenuService;
     private readonly menuService;
     private readonly contextKeyService;
-    private readonly workspaceContextService;
     private readonly labelService;
     private readonly workspaceService;
     private readonly clipboardService;
     private readonly hoverService;
     private readonly fileService;
-    private readonly pathService;
     private readonly telemetryService;
     private readonly harnessService;
-    private readonly agentPluginService;
     private readonly commandService;
-    private readonly productService;
+    private readonly itemsModel;
+    private readonly agentPluginService;
     readonly element: HTMLElement;
     private sectionHeader;
     private sectionDescription;
@@ -77,12 +74,13 @@ export declare class AICustomizationListWidget extends Disposable {
     private displayEntries;
     private searchQuery;
     private readonly collapsedGroups;
+    private _layoutDeferred;
     private readonly dropdownActionDisposables;
-    private _loadItemsSeq;
+    /** Monotonically increasing counter; guards the post-load announcement against stale calls. */
+    private _sectionLoadId;
     private readonly delayedFilter;
-    private readonly itemNormalizer;
-    private readonly promptsServiceItemProvider;
-    private cachedItemSource;
+    /** Subscription to the items model for the current section; refreshed on setSection. */
+    private readonly currentSectionSubscription;
     private readonly _onDidSelectItem;
     readonly onDidSelectItem: Event<IAICustomizationListItem>;
     private readonly _onDidChangeItemCount;
@@ -95,7 +93,7 @@ export declare class AICustomizationListWidget extends Disposable {
         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, telemetryService: ITelemetryService, harnessService: ICustomizationHarnessService, agentPluginService: IAgentPluginService, commandService: ICommandService, productService: IProductService);
+    constructor(instantiationService: IInstantiationService, promptsService: IPromptsService, contextViewService: IContextViewService, openerService: IOpenerService, contextMenuService: IContextMenuService, menuService: IMenuService, contextKeyService: IContextKeyService, labelService: ILabelService, workspaceService: IAICustomizationWorkspaceService, clipboardService: IClipboardService, hoverService: IHoverService, fileService: IFileService, telemetryService: ITelemetryService, harnessService: ICustomizationHarnessService, commandService: ICommandService, itemsModel: IAICustomizationItemsModel, agentPluginService: IAgentPluginService);
     private create;
     /**
      * Handles context menu for list items.
@@ -106,7 +104,10 @@ export declare class AICustomizationListWidget extends Disposable {
      */
     prependToSearchRow(element: HTMLElement): void;
     /**
-     * Sets the current section and loads items for that section.
+     * Sets the current section and binds the list to the model's per-section
+     * observable. Returns once the initial fetch for the section has resolved
+     * so that callers (e.g. tests/fixtures) can rely on rendered output
+     * reflecting at least one fetch.
      */
     setSection(section: AICustomizationManagementSection): Promise<void>;
     /**
@@ -141,31 +142,29 @@ export declare class AICustomizationListWidget extends Disposable {
      */
     private getTypeLabel;
     /**
-     * Refreshes the current section's items.
+     * Announces the current number of items (after search filtering) to
+     * screen readers via an aria status message. Called when the section
+     * is loaded and after the search filter changes so assistive technology
+     * users hear the count, including "no results".
      */
-    refresh(): Promise<void>;
+    private announceItemCount;
     /**
-     * Loads items for the current section.
-     * Uses a sequence counter so that stale results from concurrent
-     * calls (e.g. overlapping autorun refreshes) are discarded.
+     * Refreshes the current section's items.
+     *
+     * Item discovery is owned by `IAICustomizationItemsModel`. This method
+     * pulls the current value from the model and re-renders. Callers do not
+     * need to invoke this in response to data change events — the per-section
+     * autorun bound in `setSection` already does that.
      */
-    private loadItems;
+    refresh(): void;
+    private applyItemsFromModel;
     /**
      * 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>;
-    /**
-     * Fetches and filters items for a given section.
-     * Delegates to the item source selected by the active harness.
-     */
-    private fetchItemsForSection;
-    /**
-     * Returns the rich, browser-internal item source for a harness descriptor.
-     * The source is cached per descriptor id and reused across fetch and
-     * subscription calls to avoid redundant event composition.
+     * Reads from the items model so the count is consistent with what the
+     * editor and sidebar render. Returns 0 for sections not modeled here
+     * (McpServers / Plugins / Models — those have their own services).
      */
-    private getItemSource;
+    computeItemCountForSection(section: AICustomizationManagementSection): number;
     /**
      * Filters items based on the current search query and builds grouped display entries.
      */
@@ -184,8 +183,7 @@ export declare class AICustomizationListWidget extends Disposable {
     private commitDisplayEntries;
     /**
      * Groups normalized list items for display.
-     * When a syncProvider is present, shows remote items + local sync items.
-     * Otherwise, groups items by normalized storage/groupKey.
+     * Groups items by normalized storage/groupKey.
      */
     private groupMatchedItems;
     /**