@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -6,18 +6,17 @@ import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/v
 import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { ICustomAgent } 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 { ICustomizationItem, ICustomizationItemProvider, ICustomizationSourceFolder, IHarnessDescriptor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService";
+import { ICustomizationItem, ICustomizationItemProvider, ICustomizationSourceFolder } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService";
 /**
  * Adapts the rich promptsService model to the same provider-shaped items
  * contributed by external customization providers.
  */
 export declare class PromptsServiceCustomizationItemProvider implements ICustomizationItemProvider {
-    private readonly getActiveDescriptor;
     private readonly promptsService;
     private readonly workspaceService;
     private readonly productService;
     readonly onDidChange: Event<void>;
-    constructor(getActiveDescriptor: () => IHarnessDescriptor, promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, productService: IProductService);
+    constructor(promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, productService: IProductService);
     provideChatSessionCustomizations(_sessionResource: URI, token: CancellationToken): Promise<ICustomizationItem[]>;
     provideCustomAgents(sessionResource: URI, token: CancellationToken): Promise<readonly ICustomAgent[]>;
     provideSourceFolders(_sessionResource: URI, type: PromptsType, _token: CancellationToken): Promise<readonly ICustomizationSourceFolder[]>;
@@ -25,5 +24,4 @@ export declare class PromptsServiceCustomizationItemProvider implements ICustomi
     private fetchPromptServiceHooks;
     private fetchPromptServiceInstructions;
     private applyBuiltinGroupKeys;
-    private applyLocalFilters;
 }

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

@@ -4,14 +4,14 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { dirname, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { AICustomizationSources, BUILTIN_STORAGE, applySourceFilter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { AICustomizationSources, BUILTIN_STORAGE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
 import { HookType, HOOK_METADATA } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptsType, getSourceDescription } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { matchesSessionType, 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 '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
@@ -19,8 +19,7 @@ import { getFriendlyName, isChatExtensionItem } from './aiCustomizationItemSourc
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationItemProvider {
-    constructor(getActiveDescriptor, promptsService, workspaceService, productService) {
-        this.getActiveDescriptor = getActiveDescriptor;
+    constructor(promptsService, workspaceService, productService) {
         this.promptsService = promptsService;
         this.workspaceService = workspaceService;
         this.productService = productService;
@@ -52,7 +51,9 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
         const folders = await this.promptsService.getSourceFolders(type);
         return ( folders.map(folder => ({
             uri: folder.uri,
-            label: this.promptsService.getPromptLocationLabel(folder)
+            label: (folder.source !== undefined ? getSourceDescription(folder.source) : undefined) ?? this.promptsService.getPromptLocationLabel(folder),
+            source: folder.storage,
+            destinationGroupId: ( dirname(folder.uri).toString())
         })));
     }
     async provideCustomizations(promptType, token = CancellationToken.None) {
@@ -99,13 +100,10 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
                     });
                 }
             }
-            const uiIntegrations = this.workspaceService.getSkillUIIntegrations();
             const seenUris = ( new ResourceSet());
             for (const skill of skills || []) {
                 const skillName = skill.name || basename(dirname(skill.uri)) || basename(skill.uri);
                 seenUris.add(skill.uri);
-                const skillFolderName = basename(dirname(skill.uri));
-                const uiTooltip = uiIntegrations.get(skillFolderName);
                 items.push({
                     uri: skill.uri,
                     type: promptType,
@@ -113,8 +111,6 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
                     description: skill.description,
                     source: skill.storage,
                     enabled: true,
-                    badge: uiTooltip ? ( localize(6124, "UI Integration")) : undefined,
-                    badgeTooltip: uiTooltip,
                     extensionId: skill.extension?.identifier.value,
                     pluginUri: skill.pluginUri,
                     pluginLabel: skill.pluginLabel,
@@ -125,8 +121,6 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
                 for (const file of allSkillFiles) {
                     if (!( seenUris.has(file.uri)) && ( disabledUris.has(file.uri))) {
                         const disabledName = file.name || basename(dirname(file.uri)) || basename(file.uri);
-                        const disabledFolderName = basename(dirname(file.uri));
-                        const uiTooltip = uiIntegrations.get(disabledFolderName);
                         items.push({
                             uri: file.uri,
                             type: promptType,
@@ -134,8 +128,6 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
                             description: file.description,
                             source: file.storage,
                             enabled: false,
-                            badge: uiTooltip ? ( localize(6124, "UI Integration")) : undefined,
-                            badgeTooltip: uiTooltip,
                             extensionId: file.extension?.identifier.value,
                             pluginUri: file.pluginUri,
                             pluginLabel: file.pluginLabel,
@@ -174,7 +166,7 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
         } else {
             await this.fetchPromptServiceInstructions(items, extensionInfoByUri, disabledUris, promptType);
         }
-        return this.applyLocalFilters(this.applyBuiltinGroupKeys(items, extensionInfoByUri), promptType);
+        return this.applyBuiltinGroupKeys(items, extensionInfoByUri);
     }
     async fetchPromptServiceHooks(items, disabledUris, promptType) {
         const hookFiles = await this.promptsService.listPromptFiles(PromptsType.hook, CancellationToken.None);
@@ -209,7 +201,7 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
                         uri: agent.uri,
                         type: promptType,
                         name: hookMeta?.label ?? hookType,
-                        description: `${agent.name}: ${truncatedCmd || ( localize(6125, "(unset)"))}`,
+                        description: `${agent.name}: ${truncatedCmd || ( localize(7024, "(unset)"))}`,
                         source: agent.source.storage,
                         groupKey: "agents",
                         enabled: !( disabledUris.has(agent.uri)),
@@ -262,9 +254,9 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
             }
             const friendlyName = getFriendlyName(name);
             if (pattern !== undefined) {
-                const badge = pattern === "**" ? ( localize(6126, "always added")) : pattern;
-                const badgeTooltip = pattern === "**" ? ( localize(6127, "This instruction is automatically included in every interaction.")) : ( localize(
-                    6128,
+                const badge = pattern === "**" ? ( localize(7025, "always added")) : pattern;
+                const badgeTooltip = pattern === "**" ? ( localize(7026, "This instruction is automatically included in every interaction.")) : ( localize(
+                    7027,
                     "This instruction is automatically included when files matching '{0}' are in context.",
                     pattern
                 ));
@@ -319,13 +311,7 @@ let PromptsServiceCustomizationItemProvider = class PromptsServiceCustomizationI
             };
         }));
     }
-    applyLocalFilters(groupedItems, promptType) {
-        const descriptor = this.getActiveDescriptor();
-        const filter = descriptor.getStorageSourceFilter(promptType);
-        const items = applySourceFilter(groupedItems, filter);
-        return items;
-    }
 };
-PromptsServiceCustomizationItemProvider = ( __decorate([( __param(1, IPromptsService)), ( __param(2, IAICustomizationWorkspaceService)), ( __param(3, IProductService))], PromptsServiceCustomizationItemProvider));
+PromptsServiceCustomizationItemProvider = ( __decorate([( __param(0, IPromptsService)), ( __param(1, IAICustomizationWorkspaceService)), ( __param(2, IProductService))], PromptsServiceCustomizationItemProvider));
 
 export { PromptsServiceCustomizationItemProvider };

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

@@ -10,6 +10,7 @@ import { IExtension } from "@codingame/monaco-vscode-api/vscode/vs/workbench/con
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IAgentHostToolSetEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService.service";
+export declare function isToolsTreeKeyboardTarget(target: HTMLElement, row: HTMLElement): boolean;
 /**
  * Chat Customizations → Tools: a searchable, collapsible tree of tool sets and their member
  * tools. Enablement is read/written via {@link IAgentHostToolSetEnablementService}, scoped to
@@ -33,6 +34,7 @@ export declare class ToolsListWidget extends Disposable {
     private readonly _onDidSelectExtension;
     readonly onDidSelectExtension: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IExtension>;
     private readonly _rowStore;
+    private readonly _pendingSectionLayout;
     private readonly _searchQuery;
     private readonly _expanded;
     private readonly _delayedSearch;
@@ -41,7 +43,6 @@ export declare class ToolsListWidget extends Disposable {
     private _searchRow;
     private _treeContainer;
     private _treeScrollable;
-    private _browseButtonContainer;
     private _backButtonContainer;
     private _galleryContainer;
     private _galleryEmpty;
@@ -52,9 +53,9 @@ export declare class ToolsListWidget extends Disposable {
     private _galleryCts;
     private _lastHeight;
     private _lastWidth;
-    private _activeRowId;
-    private _rows;
-    private readonly _rowByElement;
+    private _sectionLists;
+    private _collapsedSections;
+    private readonly _sectionScrollPositions;
     /** Read-only tool sets injected for the current session type (e.g. the Copilot CLI built-ins). */
     private readonly _staticReadOnlySets;
     constructor(_sessionType: string, _toolsService: ILanguageModelToolsService, _enablementService: IAgentHostToolSetEnablementService, _contextViewService: IContextViewService, _contextMenuService: IContextMenuService, _dialogService: IDialogService, _openerService: IOpenerService, _instantiationService: IInstantiationService, _extensionsWorkbenchService: IExtensionsWorkbenchService, _extensionManifestPropertiesService: IExtensionManifestPropertiesService, _environmentService: IWorkbenchEnvironmentService);
@@ -82,35 +83,46 @@ export declare class ToolsListWidget extends Disposable {
     /** Re-emit the current item count. Called once at startup to seed the section badge. */
     fireItemCount(): void;
     private _render;
-    private _addRow;
-    private _renderToolSet;
-    private _renderTool;
+    private _renderToolSection;
+    /** Creates one virtualized `WorkbenchList` for a section, flattening its sets/tools into rows. */
+    private _createToolsSectionList;
+    /** Flattens a section's tool sets into rows, expanding each set's tools when the set is expanded. */
+    private _computeSectionEntries;
+    private _isRowExpanded;
+    private _entryRowId;
+    private _currentFocusedRowId;
+    /** Re-splices every section's rows in place (no DOM teardown) after an `_expanded` state change. */
+    private _refreshAllSectionEntries;
+    private _refreshSectionEntries;
+    /** Restore keyboard focus to a row by its stable id after a full re-render, falling back to the first row. */
+    private _restoreFocus;
+    private _layoutSectionLists;
+    private _scheduleSectionListLayout;
+    private _layoutSection;
+    private _onSectionKeyDown;
+    /**
+     * Space always toggles enablement (no-op for read-only rows). Enter toggles enablement too, except
+     * on a read-only *set* row, where it expands/collapses instead (a read-only tool row does nothing).
+     * This mirrors the original mouse-vs-keyboard asymmetry, where clicking the row body (not its
+     * checkbox) toggles expand/collapse but Space/Enter on a focused row toggle its checkbox.
+     */
+    private _onActivateKey;
+    /** Right arrow: expand a collapsed set, or move into its first tool row when already expanded. */
+    private _onExpandKey;
+    /** Left arrow: collapse an expanded set, or move a tool row up to its parent set. */
+    private _onCollapseKey;
+    private _focusEntryInSection;
+    /** Crosses into the adjacent section's first/last row when Up/Down hits the current section's edge. */
+    private _focusAdjacentSection;
+    private _focusFirstOverall;
+    private _focusLastOverall;
     /**
      * Subtitle for a tool-set row: the set's own `detail`, or for extension sets the extension's
      * description (falling back to a generic "contributed by" label).
      */
     private _resolveSetDetail;
-    /** Mirror a row's enablement onto its `treeitem` so assistive tech announces it while navigating. */
-    private _updateRowAriaChecked;
     private _toggleCollapsed;
     private _setExpanded;
-    private _isExpanded;
-    /** Rows the user can currently land on: all set rows plus tool rows inside expanded sets, in tree order. */
-    private _visibleRows;
-    /** Keep a single roving `tabIndex=0` on the given row so the tree is one tab stop. */
-    private _setRovingRow;
-    private _focusRow;
-    /** Resolve the row owning a focus/keyboard target by walking up to a known row element. */
-    private _rowFromTarget;
-    /** After a (re)render, restore the roving tabIndex to the previously active row, else the first row. */
-    private _initRovingTabIndex;
-    private _onTreeKeyDown;
-    private _focusRelative;
-    private _focusEdge;
-    /** Right arrow: expand a collapsed set, or move into its first child when already expanded. */
-    private _onExpandKey;
-    /** Left arrow: collapse an expanded set, or move a tool row up to its parent set. */
-    private _onCollapseKey;
     private _currentState;
     /** Resolve the installed, non-builtin extension backing an extension-provided tool set. */
     private _resolveExtensionForToolSet;