gloomberb 0.11.2 → 0.12.0

package/src/components/command-bar/panel/state.ts

@@ -1,12 +1,15 @@
-import { useEffect, useMemo, type Dispatch, type SetStateAction } from "react";
+import { useEffect, useMemo, useRef, type Dispatch, type SetStateAction } from "react";
 import {
   buildListRows,
   buildNativeListRows,
+  getListRowsHeight,
+  resolveSelectedScrollLine,
   type ListScreenState,
 } from "../list/model";
 import {
   resolveCommandBarPanelLayout,
 } from "./layout";
+import { matchThemeOptions } from "../theme-picker";
 import type { CommandBarRoute } from "../workflow/types";
 
 type RefLike<T> = { current: T };
@@ -16,12 +19,15 @@ interface UseCommandBarPanelStateOptions {
   cellWidthPx: number;
   currentRoute: CommandBarRoute | null;
   nativePaneChrome: boolean;
+  nativeWindowChrome?: boolean;
+  rootShortcutFeedback: string | null;
   routeListState: ListScreenState | null;
   setRootSelectedIdx: Dispatch<SetStateAction<number>>;
   showCustomMultiSelectPicker: boolean;
   termHeight: number;
   termWidth: number;
   themePickerActive: boolean;
+  themePickerFilter: string;
   titleBarOverlay: boolean | undefined;
   updateTopRoute: (updater: (route: CommandBarRoute) => CommandBarRoute) => void;
   visibleListStateRef: RefLike<ListScreenState | null>;
@@ -32,12 +38,15 @@ export function useCommandBarPanelState({
   cellWidthPx,
   currentRoute,
   nativePaneChrome,
+  nativeWindowChrome,
+  rootShortcutFeedback,
   routeListState,
   setRootSelectedIdx,
   showCustomMultiSelectPicker,
   termHeight,
   termWidth,
   themePickerActive,
+  themePickerFilter,
   titleBarOverlay,
   updateTopRoute,
   visibleListStateRef,
@@ -84,41 +93,67 @@ export function useCommandBarPanelState({
   );
   const listRowIndexByGlobalIndex = useMemo(() => {
     const indexByGlobalIndex = new Map<number, number>();
-    listRows.forEach((row, index) => {
+    nativeListRows.forEach((row, index) => {
       if (row.kind === "item") {
         indexByGlobalIndex.set(row.globalIdx, index);
       }
     });
     return indexByGlobalIndex;
-  }, [listRows]);
+  }, [nativeListRows]);
+
+  const hasRootFeedback = visibleListState?.kind === "root" && rootShortcutFeedback !== null;
+  // One row per matching theme, or the one row the empty message occupies.
+  const themePickerRowCount = useMemo(
+    () => (themePickerActive ? Math.max(1, matchThemeOptions(themePickerFilter).length) : 0),
+    [themePickerActive, themePickerFilter],
+  );
   const panelLayout = useMemo(() => resolveCommandBarPanelLayout({
     cellHeightPx,
     cellWidthPx,
     currentRoute,
+    hasRootFeedback,
     hasVisibleListState,
-    nativeListRowCount: nativeListRows.length,
+    nativeListRowCount: getListRowsHeight(nativeListRows),
     nativePaneChrome,
+    nativeWindowChrome,
     showCustomMultiSelectPicker,
     termHeight,
     termWidth,
     themePickerActive,
+    themePickerRowCount,
     titleBarOverlay,
   }), [
     cellHeightPx,
     cellWidthPx,
     currentRoute,
+    hasRootFeedback,
     hasVisibleListState,
-    nativeListRows.length,
+    nativeListRows,
     nativePaneChrome,
+    nativeWindowChrome,
     showCustomMultiSelectPicker,
     termHeight,
     termWidth,
     themePickerActive,
+    themePickerRowCount,
     titleBarOverlay,
   ]);
   const selectedListRowIndex = visibleListState
     ? listRowIndexByGlobalIndex.get(visibleListState.selectedIdx) ?? -1
     : -1;
+  const selectedIdx = visibleListState?.selectedIdx ?? 0;
+  const selectionMoveRef = useRef({ selectedIdx, movedDown: false });
+  if (selectionMoveRef.current.selectedIdx !== selectedIdx) {
+    selectionMoveRef.current = {
+      selectedIdx,
+      movedDown: selectedIdx > selectionMoveRef.current.selectedIdx,
+    };
+  }
+  const selectedScrollLineIndex = resolveSelectedScrollLine(
+    nativeListRows,
+    selectedListRowIndex,
+    selectionMoveRef.current.movedDown,
+  );
   const bodySlotKey = showCustomMultiSelectPicker
     ? "picker:field-multi-select"
     : themePickerActive
@@ -129,10 +164,9 @@ export function useCommandBarPanelState({
 
   return {
     bodySlotKey,
-    listRows,
     nativeListRows,
     panelLayout,
-    selectedScrollRowIndex: selectedListRowIndex,
+    selectedScrollRowIndex: selectedScrollLineIndex,
     visibleListState,
   };
 }

package/src/components/command-bar/panel/types.ts

@@ -36,6 +36,8 @@ export interface CommandBarPanelProps {
   contentPadding: number;
   currentRoute: CommandBarRoute | null;
   getWorkflowInputRef: (fieldId: string) => RefObject<InputRenderable | TextareaRenderable | null>;
+  /** The sheet height already reserves the chrome row, so the body must render it whenever this is set. */
+  hasChromeRow: boolean;
   labelWidth: number;
   listBodyHeight: number;
   nativeListRows: CommandBarListRow[];
@@ -65,8 +67,12 @@ export interface CommandBarPanelProps {
   panelBounds: LayoutBounds;
   queryDisplayWidth: number;
   rootGhostSuffix: string | null;
-  rootQueryLength: number;
   rootShortcutFeedback: string | null;
+  /**
+   * Line the scroll box has to reach for the selected row to be fully visible,
+   * or -1 when nothing is selected. Rows are not all one line tall, so this is a
+   * line offset rather than a row index.
+   */
   selectedScrollRowIndex: number;
   termHeight: number;
   termWidth: number;

package/src/components/command-bar/routes/root/provider-search.ts

@@ -9,12 +9,13 @@ import {
   QUICK_LOOK_TICKER_SEARCH_OPTIONS,
 } from "../ticker-search/results";
 import { orderListResults, type ResultItem } from "../../list/model";
-import type { CommandBarSectionOrder } from "../../view-model";
+import type { CommandBarCategoryPriorities, CommandBarSectionOrder } from "../../view-model";
 import type { CommandBarRoute } from "../../workflow/types";
 
 export function useRootProviderSearch(options: {
   activeCollectionId: string | null;
   buildTickerSearchResultItems: (candidates: TickerSearchCandidate[], query: string) => ResultItem[];
+  categoryPriorities?: CommandBarCategoryPriorities;
   currentRoute: CommandBarRoute | null;
   dataProvider: DataProvider;
   localTickerSearchResultItems: (query?: string, options?: { category?: string; limit?: number }) => ResultItem[];
@@ -43,6 +44,7 @@ export function useRootProviderSearch(options: {
   const {
     activeCollectionId,
     buildTickerSearchResultItems,
+    categoryPriorities,
     currentRoute,
     dataProvider,
     localTickerSearchResultItems,
@@ -83,10 +85,13 @@ export function useRootProviderSearch(options: {
     }
 
     const searchQuery = rootTickerSearchArg;
-    if (rootSearchTimerRef.current) clearTimeout(rootSearchTimerRef.current);
+    // A re-run for the same query (a quote refresh changed `tickers`, say) must
+    // leave the pending debounce alone, or the search is lost and the spinner
+    // never clears. Only a new query cancels it.
     if (rootLastSearchedQueryRef.current === searchQuery) {
       return;
     }
+    if (rootSearchTimerRef.current) clearTimeout(rootSearchTimerRef.current);
 
     rootLastSearchedQueryRef.current = searchQuery;
     setRootSearching(true);
@@ -105,15 +110,30 @@ export function useRootProviderSearch(options: {
     const requestId = ++rootSearchRequestIdRef.current;
     rootSearchTimerRef.current = setTimeout(async () => {
       try {
+        const publish = (candidates: TickerSearchCandidate[]) => {
+          setRootProviderResults(mergeTickerSearchResultItems(
+            searchQuery,
+            buildTickerSearchResultItems(candidates, searchQuery),
+            localTickerSearchResultItems(searchQuery, { limit: 6 }),
+          ));
+          setRootProviderResultsQuery(searchQuery);
+        };
         const combined = await searchTickerCandidates({
           query: searchQuery,
           tickers,
           dataProvider,
           searchContext: {
             preferBroker: true,
+            interactive: true,
             brokerId: activeSearchPortfolio?.brokerId,
             brokerInstanceId: activeSearchPortfolio?.brokerInstanceId,
           },
+          // A broker that answers after the cloud upgrades the rows in place
+          // rather than being dropped because the list was already drawn.
+          onPartial: (candidates) => {
+            if (requestId !== rootSearchRequestIdRef.current) return;
+            publish(candidates);
+          },
           ...QUICK_LOOK_TICKER_SEARCH_OPTIONS,
         });
         if (requestId !== rootSearchRequestIdRef.current) return;
@@ -123,12 +143,7 @@ export function useRootProviderSearch(options: {
           activeSearchPortfolio?.brokerId,
           activeSearchPortfolio?.brokerInstanceId,
         );
-        setRootProviderResults(mergeTickerSearchResultItems(
-          searchQuery,
-          buildTickerSearchResultItems(combined, searchQuery),
-          localTickerSearchResultItems(searchQuery, { limit: 6 }),
-        ));
-        setRootProviderResultsQuery(searchQuery);
+        publish(combined);
       } catch {
         if (requestId !== rootSearchRequestIdRef.current) return;
         setRootProviderResults([{
@@ -146,10 +161,6 @@ export function useRootProviderSearch(options: {
         }
       }
     }, 200);
-
-    return () => {
-      if (rootSearchTimerRef.current) clearTimeout(rootSearchTimerRef.current);
-    };
   }, [
     activeCollectionId,
     buildTickerSearchResultItems,
@@ -163,6 +174,10 @@ export function useRootProviderSearch(options: {
     writeTickerSearchCache,
   ]);
 
+  useEffect(() => () => {
+    if (rootSearchTimerRef.current) clearTimeout(rootSearchTimerRef.current);
+  }, []);
+
   const rootResults = useMemo(() => {
     if (rootTickerSearchArg && rootProviderResultsQuery === rootTickerSearchArg && rootProviderResults) {
       if (rootPlainTickerSearchArg) {
@@ -184,16 +199,20 @@ export function useRootProviderSearch(options: {
       ? "ranked"
       : "default";
   const orderedRootResults = useMemo(
-    () => orderListResults(rootResults, { sectionOrder: rootSectionOrder }),
-    [rootResults, rootSectionOrder],
+    () => orderListResults(rootResults, { sectionOrder: rootSectionOrder, categoryPriorities }),
+    [categoryPriorities, rootResults, rootSectionOrder],
   );
+  // Only the DES route replaces the list wholesale and so wants the selection
+  // reset when the answer lands; a plain query's instruments append below the
+  // local matches, and the row the user is on must stay put.
   const activeRootProviderResultsKey = useMemo(() => {
+    if (rootPlainTickerSearchArg) return null;
     if (!rootTickerSearchArg || rootProviderResultsQuery !== rootTickerSearchArg || !rootProviderResults) return null;
     return [
       rootTickerSearchArg,
       ...rootProviderResults.map((item) => `${item.id}:${item.category}:${item.label}:${item.right || ""}`),
     ].join("\n");
-  }, [rootProviderResults, rootProviderResultsQuery, rootTickerSearchArg]);
+  }, [rootPlainTickerSearchArg, rootProviderResults, rootProviderResultsQuery, rootTickerSearchArg]);
 
   return {
     activeRootProviderResultsKey,

package/src/components/command-bar/routes/root/results.test.ts

@@ -0,0 +1,161 @@
+import { describe, expect, test } from "bun:test";
+import type { PaneTemplateDef } from "../../../../types/plugin";
+import { orderListResults, type ResultItem } from "../../list/model";
+import { buildRootResultModel, type RootResultModelOptions } from "./results";
+
+function rootOptions(overrides: Partial<RootResultModelOptions>): RootResultModelOptions {
+  const empty = () => [] as ResultItem[];
+  return {
+    activeCollectionId: null,
+    activeTickerData: null,
+    activeTickerSymbol: null,
+    assist: null,
+    availableCommands: [],
+    buildLayoutItems: empty,
+    buildPaneSettingItems: empty,
+    buildWindowModeItems: empty,
+    createPaneTemplateItem: () => ({
+      id: "template",
+      label: "Template",
+      detail: "",
+      category: "Panes",
+      kind: "action",
+      action: () => {},
+    }),
+    createPluginCommandItem: () => ({
+      id: "plugin-command",
+      label: "Plugin Command",
+      detail: "",
+      category: "Commands",
+      kind: "command",
+      action: () => {},
+    }),
+    currentRoute: null,
+    executeCollectionCommand: () => {},
+    getAvailablePaneShortcutTemplates: () => [],
+    hasPaneSettings: () => false,
+    localTickerSearchResultItems: empty,
+    nonShortcutPaneTemplateItems: empty,
+    openModeRoute: () => {},
+    paneShortcutItems: empty,
+    pluginCommandItems: empty,
+    pluginCommandResultItems: empty,
+    rootQuery: "",
+    rootShortcutIntent: { kind: "none" },
+    runDirectCommand: () => {},
+    runSecurityDescriptionShortcut: () => {},
+    state: {
+      config: { watchlists: [], portfolios: [] },
+      focusedPaneId: null,
+    } as unknown as RootResultModelOptions["state"],
+    tickerActionItems: empty,
+    ...overrides,
+  };
+}
+
+const paneRow: ResultItem = {
+  id: "pane-template:margin-monitor",
+  label: "Margin Monitor",
+  detail: "Track account margin",
+  category: "Panes",
+  kind: "action",
+  action: () => {},
+};
+
+const documentRow: ResultItem = {
+  id: "search-provider:research-search:documents:hit-1",
+  label: "Q3 earnings call",
+  detail: "CALL",
+  category: "Documents",
+  kind: "action",
+  lines: [{ segments: [{ text: "margin pressure", emphasis: "match" }] }],
+  action: () => {},
+};
+
+describe("provider rows in the root result model", () => {
+  test("land after the local matches instead of displacing them", () => {
+    const { items } = buildRootResultModel(rootOptions({
+      rootQuery: "margin",
+      paneShortcutItems: () => [paneRow],
+      providerResultItems: [documentRow],
+    }));
+
+    expect(orderListResults(items).map((item) => item.id)).toEqual([paneRow.id, documentRow.id]);
+  });
+
+  test("leave the local matches alone when a provider contributes nothing", () => {
+    const { items } = buildRootResultModel(rootOptions({
+      rootQuery: "margin",
+      paneShortcutItems: () => [paneRow],
+      providerResultItems: [],
+    }));
+
+    expect(items.map((item) => item.id)).toEqual([paneRow.id]);
+  });
+
+  test("stay out of the way once a prefix claims the query", () => {
+    const { items } = buildRootResultModel(rootOptions({
+      rootQuery: "SEC AAPL",
+      providerResultItems: [documentRow],
+      rootShortcutIntent: {
+        kind: "complete",
+        source: "pane-template",
+        prefix: "SEC",
+        label: "SEC",
+        description: "",
+        argKind: "ticker",
+        argText: "AAPL",
+        completionQuery: null,
+        template: { id: "sec-pane" } as unknown as PaneTemplateDef,
+      },
+    }));
+
+    expect(items.map((item) => item.id)).not.toContain(documentRow.id);
+  });
+});
+
+describe("assist rows in the root result model", () => {
+  const assist = {
+    enabled: true,
+    auto: true,
+    state: { status: "idle" as const },
+    onAsk: () => {},
+    onSignUp: () => {},
+    onRunCandidate: () => {},
+  };
+
+  test("lead the list ahead of provider rows and keep the Thinking placeholder", () => {
+    const { items } = buildRootResultModel(rootOptions({
+      rootQuery: "margin",
+      assist,
+      paneShortcutItems: () => [paneRow],
+      providerResultItems: [documentRow],
+    }));
+
+    expect(orderListResults(items, { categoryPriorities: new Map([["Documents", 200]]) }).map((item) => item.id))
+      .toEqual(["assist:pending", paneRow.id, documentRow.id]);
+  });
+
+  test("the local matcher no longer drags in panes whose keywords scatter the letters", () => {
+    const optionsRow: ResultItem = {
+      id: "pane-template:options-calculator",
+      label: "Options Calculator",
+      detail: "Price options with the Black-Scholes model and view the Greeks",
+      searchText: "options greeks implied volatility derivatives pricing",
+      category: "Panes",
+      kind: "action",
+      action: () => {},
+    };
+    const { items } = buildRootResultModel(rootOptions({
+      rootQuery: "nvidia",
+      paneShortcutItems: () => [optionsRow],
+    }));
+    expect(items).toEqual([]);
+
+    const { items: abbreviated } = buildRootResultModel(rootOptions({
+      rootQuery: "opt calc",
+      paneShortcutItems: () => [optionsRow],
+    }));
+    expect(abbreviated.map((item) => item.id)).toEqual([optionsRow.id]);
+  });
+});

package/src/components/command-bar/routes/root/results.ts

@@ -22,13 +22,6 @@ import { buildRootShortcutItem } from "./shortcut-items";
 
 type RootShortcutIntent = ReturnType<typeof parseRootShortcutIntent>;
 
-/** The ART plugin command claims the prefix, so article rows must still be shown. */
-export function isArticleLookupShortcut(intent: RootShortcutIntent): boolean {
-  return intent.kind !== "none"
-    && intent.source === "plugin-command"
-    && intent.command.id === "open-news-article";
-}
-
 interface PaneTemplateItemOptions {
   category?: string;
   createOptions?: PaneTemplateCreateOptions;
@@ -56,7 +49,6 @@ export interface RootResultModelOptions {
   availableCommands: Command[];
   buildLayoutItems: (query: string, options?: { confirmDangerousActions?: boolean }) => ResultItem[];
   buildPaneSettingItems: (paneId: string | null, query: string) => ResultItem[];
-  buildPluginItems: (query: string) => ResultItem[];
   buildWindowModeItems: (arg: string) => ResultItem[];
   createPaneTemplateItem: (template: PaneTemplateDef, options?: PaneTemplateItemOptions) => ResultItem;
   createPluginCommandItem: (command: CommandDef, options?: { shortcutArg?: string }) => ResultItem;
@@ -69,13 +61,18 @@ export interface RootResultModelOptions {
   hasPaneSettings: (paneId: string) => boolean;
   localTickerSearchResultItems: (query?: string, options?: { category?: string; limit?: number }) => ResultItem[];
   nonShortcutPaneTemplateItems: (filterQuery?: string) => ResultItem[];
-  openModeRoute: (screen: "ticker-search" | "plugins" | "layout", initialQuery?: string) => void;
+  openModeRoute: (screen: "ticker-search" | "layout", initialQuery?: string) => void;
   paneShortcutItems: (options?: PaneShortcutItemsOptions) => ResultItem[];
   pluginCommandItems: () => ResultItem[];
   pluginCommandResultItems: (command: CommandDef, shortcutArg: string) => ResultItem[];
   rootQuery: string;
   rootShortcutIntent: RootShortcutIntent;
-  articleResultItems?: ResultItem[];
+  /**
+   * Rows from plugin search providers, already ordered by provider priority.
+   * Appended after the local matches so a late answer never moves the row the
+   * user is aiming at, and only ever adds to what the bar already resolved.
+   */
+  providerResultItems?: ResultItem[];
   runDirectCommand: (command: Command, arg: string) => void;
   runSecurityDescriptionShortcut: (query?: string) => void | Promise<void>;
   state: AppState;
@@ -109,7 +106,6 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
     availableCommands,
     buildLayoutItems,
     buildPaneSettingItems,
-    buildPluginItems,
     buildWindowModeItems,
     createPaneTemplateItem,
     createPluginCommandItem,
@@ -125,7 +121,7 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
     pluginCommandResultItems,
     rootQuery,
     rootShortcutIntent,
-    articleResultItems = [],
+    providerResultItems = [],
     runDirectCommand,
     runSecurityDescriptionShortcut,
     state,
@@ -181,14 +177,8 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
     && rootShortcutIntent.source === "plugin-command"
     && shortcutItem
   ) {
-    if (isArticleLookupShortcut(rootShortcutIntent)) {
-      items.push(shortcutItem);
-    } else {
-      const dynamicItems = pluginCommandResultItems(rootShortcutIntent.command, rootShortcutIntent.argText);
-      items.push(...(dynamicItems.length > 0 ? dynamicItems : [shortcutItem]));
-    }
-  } else if (match && match.command.id === "plugins") {
-    items.push(...buildPluginItems(match.arg));
+    const dynamicItems = pluginCommandResultItems(rootShortcutIntent.command, rootShortcutIntent.argText);
+    items.push(...(dynamicItems.length > 0 ? dynamicItems : [shortcutItem]));
   } else if (match && match.command.id === "layout") {
     items.push(...buildLayoutItems(match.arg, { confirmDangerousActions: true }));
   } else if (match && match.command.id === "window-mode") {
@@ -240,23 +230,35 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
       ...tickerActionItems(),
       ...pluginCommandItems(),
     ];
-    const matchedItems = fuzzyFilter(allItems, rootQuery, (item) => `${item.label} ${item.searchText || ""} ${item.detail} ${item.right || ""}`);
+    const matchedItems = fuzzyFilter(
+      allItems,
+      rootQuery,
+      (item) => `${item.label} ${item.searchText || ""} ${item.detail} ${item.right || ""}`,
+      (item) => item.label,
+    );
     items.push(...matchedItems);
   }
 
-  if (rootShortcutIntent.kind === "none" || isArticleLookupShortcut(rootShortcutIntent)) {
-    items.push(...articleResultItems);
+  const shortcutClaimedQuery = rootShortcutIntent.kind !== "none";
+  // Counted before the provider rows: they arrive whenever the network answers,
+  // and an assist offer must not appear and vanish as they land.
+  const matchCount = items.length;
+  // A resolved prefix means the user is speaking the command language, so
+  // free-text providers stay out of the way.
+  if (!shortcutClaimedQuery) {
+    items.push(...providerResultItems);
   }
 
-  // Built from the local matches, then moved above them: the AI answers the
-  // question the user typed, so it leads the list. Rows landing here renumber
-  // everything below, which the root selection effect absorbs by identity.
+  // Built from the local matches, then placed above them: the AI turns the
+  // typed sentence into commands, so its answer leads the list. Its Thinking
+  // placeholder holds the rows from the start, and the root selection effect
+  // follows rows by identity when the answer renumbers what sits below.
   const assistItems = assist
     && isAssistSectionVisible(
       assist,
       rootQuery,
-      items.length,
-      rootShortcutIntent.kind !== "none" && !isArticleLookupShortcut(rootShortcutIntent),
+      matchCount,
+      shortcutClaimedQuery,
     )
     ? buildAssistResultItems({ ...assist, query: rootQuery })
     : [];