gloomberb 0.7.2 → 0.7.4

package/src/components/command-bar/command-bar.tsx

@@ -2,8 +2,7 @@ import { Box, Input, ScrollBox, Text, Textarea, useUiCapabilities } from "../../
 import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import type { RefObject } from "react";
 import { TextAttributes, type InputRenderable, type ScrollBoxRenderable, type TextareaRenderable } from "../../ui";
-import { useNativeRenderer } from "../../ui";
-import { useViewport } from "../../react/input";
+import { useShortcut, useViewport } from "../../react/input";
 import { Button, NumberField, Spinner, TextField } from "../ui";
 import { NativeSelect, openNativeSelect, type NativeSelectElement } from "../ui/native-select";
 import { ToggleList } from "../toggle-list";
@@ -19,21 +18,25 @@ import {
   commandBarSelectedText,
   commandBarSubtleText,
   commandBarText,
+  blendHex,
+  colors,
   getCurrentThemeId,
   previewTheme,
 } from "../../theme/colors";
 import {
   getFocusedCollectionId,
+  syncConfigActiveLayoutState,
   useAppDispatch,
   useAppSelector,
   useFocusedTicker,
   type AppState,
 } from "../../state/app-context";
+import { scheduleConfigSave } from "../../state/config-save-scheduler";
 import { fuzzyFilter } from "../../utils/fuzzy-search";
 import { commands, matchPrefix, type Command } from "./command-registry";
 import { useThemeColors } from "../../theme/theme-context";
 import { ThemePicker, type ThemePickerHandle } from "./theme-picker";
-import { exportConfig, importConfig, resetAllData, saveConfig } from "../../data/config-store";
+import { exportConfig, importConfig, resetAllData } from "../../data/config-store";
 import type { DataProvider } from "../../types/data-provider";
 import type { TickerRepository } from "../../data/ticker-repository";
 import type { PluginRegistry } from "../../plugins/registry";
@@ -185,6 +188,37 @@ const NATIVE_COMMAND_BAR_PADDING_X_PX = 14;
 const NATIVE_COMMAND_BAR_PADDING_Y_PX = 14;
 const QUICK_LOOK_TICKER_SEARCH_OPTIONS = { includeOptionContracts: false } as const;
 
+function normalizeCommandTickerSearchText(value: string): string {
+  return value.trim().toUpperCase().replace(/[^A-Z0-9]+/g, "");
+}
+
+function isLikelyPlainTickerSearch(query: string): boolean {
+  const trimmed = query.trim();
+  if (!trimmed || /\s/.test(trimmed)) return false;
+  if (!/^[A-Za-z0-9.^=\-/]+$/.test(trimmed)) return false;
+
+  const compact = normalizeCommandTickerSearchText(trimmed);
+  if (compact.length < 2) return false;
+  if (compact.length <= 6) return true;
+  return /[.^=\-/]/.test(trimmed) && compact.length <= 10;
+}
+
+function isExactTickerResultMatch(item: ResultItem, query: string): boolean {
+  if (item.kind !== "ticker" && item.kind !== "search") return false;
+  const normalizedQuery = normalizeCommandTickerSearchText(query);
+  if (!normalizedQuery) return false;
+  return normalizeCommandTickerSearchText(item.label) === normalizedQuery;
+}
+
+function getPaneTemplateArgKind(template: PaneTemplateDef): string | undefined {
+  return template.shortcut?.argKind ?? template.shortcut?.argPlaceholder;
+}
+
+function canPromptForPaneTemplateArg(template: PaneTemplateDef): boolean {
+  const argKind = getPaneTemplateArgKind(template);
+  return argKind === "ticker" || argKind === "ticker-list" || argKind === "tickers";
+}
+
 function getDefaultConfigBackupPath(): string {
   const home = typeof process !== "undefined" ? process.env.HOME : undefined;
   return `${home || "~"}/gloomberb-config-backup.json`;
@@ -563,9 +597,10 @@ const CommandBarListBody = memo(function CommandBarListBody({
 
         const isSelected = row.globalIdx === visibleListState.selectedIdx;
         const isHovered = row.globalIdx === visibleListState.hoveredIdx && !isSelected;
+        const itemRowKey = `item:${row.globalIdx}:${row.item.id}:${row.item.category}:${row.item.label}:${row.item.right || ""}`;
         return (
           <CommandBarListItemRow
-            key={row.item.id}
+            key={itemRowKey}
             item={row.item}
             globalIdx={row.globalIdx}
             isSelected={isSelected}
@@ -618,6 +653,7 @@ export function CommandBar({
   const tickers = useAppSelector((state) => state.tickers);
   const financials = useAppSelector((state) => state.financials);
   const focusedPaneId = useAppSelector((state) => state.focusedPaneId);
+  const activePanel = useAppSelector((state) => state.activePanel);
   const layoutHistory = useAppSelector((state) => state.layoutHistory);
   const recentTickers = useAppSelector((state) => state.recentTickers);
   const commandBarOpen = useAppSelector((state) => state.commandBarOpen);
@@ -633,6 +669,7 @@ export function CommandBar({
     tickers,
     financials,
     focusedPaneId,
+    activePanel,
     layoutHistory,
     recentTickers,
     commandBarOpen,
@@ -643,6 +680,7 @@ export function CommandBar({
     updateCheckInProgress,
     updateNotice,
   }) as AppState, [
+    activePanel,
     commandBarLaunchRequest,
     commandBarOpen,
     commandBarQuery,
@@ -660,8 +698,16 @@ export function CommandBar({
   ]);
   const stateRef = useRef(state);
   stateRef.current = state;
+  const persistConfig = useCallback((nextConfig: AppState["config"]) => {
+    const currentState = stateRef.current;
+    scheduleConfigSave(syncConfigActiveLayoutState(
+      nextConfig,
+      currentState.paneState,
+      currentState.focusedPaneId,
+      currentState.activePanel,
+    ));
+  }, []);
   const { symbol: activeTickerSymbol, ticker: activeTickerData, financials: activeFinancials } = useFocusedTicker();
-  const renderer = useNativeRenderer();
   const { width: termWidth, height: termHeight } = useViewport();
   const { nativePaneChrome, cellWidthPx = 8, cellHeightPx = 18 } = useUiCapabilities();
   const availableCommands = useMemo(
@@ -833,20 +879,16 @@ export function CommandBar({
           : instance
       )),
     };
-    const nextConfig = {
-      ...currentState.config,
-      layout: nextLayout,
-      layouts: currentState.config.layouts.map((savedLayout, index) => (
-        index === currentState.config.activeLayoutIndex ? { ...savedLayout, layout: nextLayout } : savedLayout
-      )),
-    };
     dispatch({ type: "UPDATE_LAYOUT", layout: nextLayout });
-    void saveConfig(nextConfig);
     dispatch({ type: "FOCUS_PANE", paneId: targetPane.instanceId });
   }, [dispatch]);
 
-  const openFixedTickerPane = useCallback((symbol: string) => {
-    pluginRegistry.pinTicker(symbol, { floating: true, paneType: "ticker-detail" });
+  const openFixedTickerPane = useCallback((symbol: string, options?: { forceNewPane?: boolean }) => {
+    pluginRegistry.pinTicker(symbol, {
+      floating: true,
+      paneType: "ticker-detail",
+      forceNewPane: options?.forceNewPane,
+    });
   }, [pluginRegistry]);
 
   const commitTheme = useCallback((themeId: string) => {
@@ -872,7 +914,7 @@ export function CommandBar({
       ? findPaneInstance(currentState.config.layout, currentState.focusedPaneId)
       : null;
     if (options?.forceNewPane) {
-      openFixedTickerPane(symbol);
+      openFixedTickerPane(symbol, { forceNewPane: true });
       return;
     }
 
@@ -1165,9 +1207,9 @@ export function CommandBar({
     );
     dispatch({ type: "SET_CONFIG", config: nextConfig });
     setActiveCollection(portfolio.id);
-    await saveConfig(nextConfig);
+    persistConfig(nextConfig);
     notify(`Created portfolio "${portfolio.name}".`, { type: "success" });
-  }, [dispatch, notify, setActiveCollection]);
+  }, [dispatch, notify, persistConfig, setActiveCollection]);
 
   const createWatchlist = useCallback(async (name: string) => {
     const currentState = stateRef.current;
@@ -1184,9 +1226,9 @@ export function CommandBar({
     };
     dispatch({ type: "SET_CONFIG", config: nextConfig });
     setActiveCollection(id);
-    await saveConfig(nextConfig);
+    persistConfig(nextConfig);
     notify(`Created watchlist "${trimmedName}".`, { type: "success" });
-  }, [dispatch, notify, setActiveCollection]);
+  }, [dispatch, notify, persistConfig, setActiveCollection]);
 
   const deleteWatchlist = useCallback(async (watchlistId: string) => {
     const currentState = stateRef.current;
@@ -1204,9 +1246,9 @@ export function CommandBar({
       const fallback = nextConfig.portfolios[0]?.id || nextConfig.watchlists[0]?.id || "";
       if (fallback) setActiveCollection(fallback);
     }
-    await saveConfig(nextConfig);
+    persistConfig(nextConfig);
     notify(`Deleted "${watchlist.name}".`, { type: "success" });
-  }, [activeCollectionId, dispatch, notify, setActiveCollection]);
+  }, [activeCollectionId, dispatch, notify, persistConfig, setActiveCollection]);
 
   const deletePortfolio = useCallback(async (portfolioId: string) => {
     const currentState = stateRef.current;
@@ -1234,9 +1276,9 @@ export function CommandBar({
       const fallback = nextConfig.portfolios[0]?.id || nextConfig.watchlists[0]?.id || "";
       if (fallback) setActiveCollection(fallback);
     }
-    await saveConfig(nextConfig);
+    persistConfig(nextConfig);
     notify(`Deleted "${portfolio.name}".`, { type: "success" });
-  }, [activeCollectionId, dispatch, notify, setActiveCollection, tickerRepository]);
+  }, [activeCollectionId, dispatch, notify, persistConfig, setActiveCollection, tickerRepository]);
 
   const setPortfolioPositionFromWorkflow = useCallback(async (values: Record<string, CommandBarFieldValue>) => {
     const currentState = stateRef.current;
@@ -1499,6 +1541,7 @@ export function CommandBar({
       const enabled = !disabledPlugins.includes(plugin.id);
       const toggleAction = () => {
         dispatch({ type: "TOGGLE_PLUGIN", pluginId: plugin.id });
+        const currentState = stateRef.current;
         const nextDisabled = enabled
           ? [...disabledPlugins, plugin.id]
           : disabledPlugins.filter((entry) => entry !== plugin.id);
@@ -1507,7 +1550,7 @@ export function CommandBar({
             pluginRegistry.hidePane(paneId);
           }
         }
-        void saveConfig({ ...state.config, disabledPlugins: nextDisabled });
+        persistConfig({ ...currentState.config, disabledPlugins: nextDisabled });
       };
       return {
         id: `plugin:${plugin.id}`,
@@ -1520,7 +1563,7 @@ export function CommandBar({
         action: toggleAction,
       };
     });
-  }, [dispatch, pluginRegistry, state.config]);
+  }, [dispatch, persistConfig, pluginRegistry, state.config]);
 
   const buildLayoutItems = useCallback((
     query: string,
@@ -2164,6 +2207,94 @@ export function CommandBar({
     }
   }, []);
 
+  const activatePaneSettingField = useCallback((
+    paneId: string,
+    field: PaneSettingField,
+    currentValue: unknown,
+    options?: { keepRouteOpen?: boolean },
+  ) => {
+    const normalized = normalizePaneSettingField(paneId, field, currentValue);
+    if (normalized.mode === "toggle") {
+      if (options?.keepRouteOpen) {
+        updateTopRoute((route) => route.kind === "pane-settings"
+          ? { ...route, pendingFieldKey: field.key, error: null }
+          : route);
+      }
+      void pluginRegistry.applyPaneSettingValueFn(paneId, field, !normalized.value)
+        .then(() => {
+          if (options?.keepRouteOpen) {
+            updateTopRoute((route) => route.kind === "pane-settings"
+              ? { ...route, pendingFieldKey: null, error: null }
+              : route);
+          } else {
+            closeAll({ revertThemePreview: false });
+          }
+        })
+        .catch((error) => {
+          if (options?.keepRouteOpen) {
+            updateTopRoute((route) => route.kind === "pane-settings"
+              ? {
+                ...route,
+                pendingFieldKey: null,
+                error: error instanceof Error ? error.message : "Could not apply that setting.",
+              }
+              : route);
+            return;
+          }
+          notify(error instanceof Error ? error.message : "Could not apply that setting.", { type: "error" });
+        });
+      return;
+    }
+    if (normalized.mode === "workflow" && normalized.route) {
+      openWorkflowRoute(normalized.route);
+      return;
+    }
+    if (normalized.mode === "picker") {
+      openPickerRoute(normalized.route);
+    }
+  }, [
+    closeAll,
+    normalizePaneSettingField,
+    notify,
+    openPickerRoute,
+    openWorkflowRoute,
+    pluginRegistry,
+    updateTopRoute,
+  ]);
+
+  const buildPaneSettingItems = useCallback((
+    paneId: string | null,
+    query: string,
+    options?: { keepRouteOpen?: boolean },
+  ): ResultItem[] => {
+    if (!paneId) return [];
+    const descriptor = pluginRegistry.resolvePaneSettings(paneId);
+    if (!descriptor) return [];
+
+    const category = descriptor.settingsDef.title || "Pane Settings";
+    const paneLabel = descriptor.pane.title || descriptor.paneDef.name || descriptor.pane.paneId;
+    const items = descriptor.settingsDef.fields.map((field): ResultItem => {
+      const currentValue = descriptor.context.settings[field.key];
+      return {
+        id: `pane-setting:${field.key}`,
+        label: field.label,
+        detail: summarizePaneSettingValue(field, currentValue),
+        category,
+        kind: "action",
+        right: field.type,
+        searchText: `${category} ${paneLabel} ${field.label} ${field.description || ""} ${field.type}`,
+        action: () => activatePaneSettingField(descriptor.paneId, field, currentValue, options),
+      };
+    });
+
+    return query
+      ? fuzzyFilter(items, query, (item) => `${item.label} ${item.detail} ${item.right || ""} ${item.searchText || ""}`)
+      : items;
+  }, [
+    activatePaneSettingField,
+    pluginRegistry,
+  ]);
+
   function readWorkflowTextareaValue(fieldId: string, fallback = ""): string {
     const ref = getInputRef(workflowInputRefs.current, fieldId).current;
     const nextValue = (ref as TextareaRenderable | null)?.editBuffer?.getText?.();
@@ -2446,7 +2577,7 @@ export function CommandBar({
       const argPlaceholder = template.shortcut?.argPlaceholder;
       return template.wizard.some((step) => step.type === "textarea" || step.key !== argPlaceholder);
     }
-    if (template.shortcut?.argPlaceholder === "ticker" || template.shortcut?.argPlaceholder === "tickers") {
+    if (canPromptForPaneTemplateArg(template)) {
       return !arg?.trim();
     }
     return false;
@@ -2632,6 +2763,57 @@ export function CommandBar({
       }]
   ), [mapTickerSearchCandidateToResultItem]);
 
+  const mergeTickerSearchResultItems = useCallback((
+    query: string,
+    preferredItems: ResultItem[],
+    fallbackItems: ResultItem[],
+  ): ResultItem[] => {
+    const merged: ResultItem[] = [];
+    const seen = new Set<string>();
+    const addItem = (item: ResultItem) => {
+      if (item.kind === "info") return;
+      const key = `${item.label.trim().toUpperCase()}:${(item.right || "").trim().toUpperCase()}`;
+      if (seen.has(key)) return;
+      seen.add(key);
+      merged.push(item);
+    };
+    preferredItems.forEach(addItem);
+    fallbackItems.forEach(addItem);
+    if (merged.length === 0) return fallbackItems;
+
+    return rankTickerSearchItems(merged, query)
+      .map((item) => isExactTickerResultMatch(item, query) && item.category !== "Saved"
+        ? { ...item, category: "Exact Match" }
+        : item);
+  }, []);
+
+  const mergePlainRootTickerResults = useCallback((
+    query: string,
+    providerItems: ResultItem[],
+    rootItems: ResultItem[],
+  ): ResultItem[] => {
+    const merged: ResultItem[] = [];
+    const seen = new Set<string>();
+    const addItem = (item: ResultItem, options?: { skipInfo?: boolean }) => {
+      if (options?.skipInfo && item.kind === "info") return;
+      const key = (item.kind === "ticker" || item.kind === "search")
+        ? `${item.kind}:${item.label.trim().toUpperCase()}:${(item.right || "").trim().toUpperCase()}`
+        : `${item.kind}:${item.id}`;
+      if (seen.has(key)) return;
+      seen.add(key);
+      merged.push(item);
+    };
+
+    providerItems
+      .filter((item) => item.category === "Exact Match" || isExactTickerResultMatch(item, query))
+      .forEach((item) => addItem(item, { skipInfo: true }));
+    rootItems.forEach((item) => addItem(item));
+    providerItems
+      .filter((item) => item.category !== "Exact Match" && !isExactTickerResultMatch(item, query))
+      .forEach((item) => addItem(item, { skipInfo: true }));
+    return merged.length > 0 ? merged : rootItems;
+  }, []);
+
   const buildTickerSearchCacheKey = useCallback((
     query: string,
     brokerId?: string | null,
@@ -2718,7 +2900,10 @@ export function CommandBar({
     activeCollectionId,
   }), [activeCollectionId, activeTickerSymbol, state.config, state.focusedPaneId]);
 
-  const getAvailablePaneTemplates = useCallback((options?: PaneTemplateCreateOptions): PaneTemplateDef[] => {
+  const getAvailablePaneTemplates = useCallback((
+    options?: PaneTemplateCreateOptions,
+    availability?: { includePromptableTickerTemplates?: boolean },
+  ): PaneTemplateDef[] => {
     const disabledPlugins = new Set(state.config.disabledPlugins || []);
     const context = getPaneTemplateContext();
     return [...pluginRegistry.paneTemplates.values()]
@@ -2727,7 +2912,12 @@ export function CommandBar({
         if (pluginId && disabledPlugins.has(pluginId)) return false;
         if (!template.canCreate) return true;
         try {
-          return template.canCreate(context, options);
+          const canCreate = template.canCreate(context, options);
+          if (canCreate) return true;
+          return !!availability?.includePromptableTickerTemplates
+            && !options?.arg
+            && !context.activeTicker
+            && canPromptForPaneTemplateArg(template);
         } catch (error) {
           commandBarLog.error("Pane template canCreate failed", {
             templateId: template.id,
@@ -2751,13 +2941,13 @@ export function CommandBar({
       const prefix = template.shortcut?.prefix?.toUpperCase();
       if (!prefix) return false;
       const arg = trimmed.slice(prefix.length).trim();
-      const argKind = template.shortcut?.argKind ?? template.shortcut?.argPlaceholder;
+      const argKind = getPaneTemplateArgKind(template);
       if (upper !== prefix && (!argKind || !upper.startsWith(`${prefix} `))) return false;
       if (!template.canCreate) return true;
       try {
         const canCreate = template.canCreate(context, arg ? { arg } : undefined);
         if (canCreate) return true;
-        if (!arg && !context.activeTicker && (argKind === "ticker" || argKind === "ticker-list")) {
+        if (!arg && !context.activeTicker && canPromptForPaneTemplateArg(template)) {
           return true;
         }
         return false;
@@ -2837,8 +3027,11 @@ export function CommandBar({
   const paneShortcutItems = useCallback((options?: {
     filterQuery?: string;
     createOptions?: PaneTemplateCreateOptions;
+    includePromptableTickerTemplates?: boolean;
   }): ResultItem[] => {
-    const items = getAvailablePaneTemplates(options?.createOptions)
+    const items = getAvailablePaneTemplates(options?.createOptions, {
+      includePromptableTickerTemplates: options?.includePromptableTickerTemplates,
+    })
       .filter((template) => template.shortcut)
       .map((template) => createPaneTemplateItem(template, {
         category: "Panes",
@@ -3128,7 +3321,7 @@ export function CommandBar({
           },
         };
         dispatch({ type: "SET_CONFIG", config: nextConfig });
-        void saveConfig(nextConfig);
+        persistConfig(nextConfig);
         closeAll({ revertThemePreview: false });
         return;
       }
@@ -3217,6 +3410,7 @@ export function CommandBar({
 
   useEffect(() => {
     if (tickerSearchRouteQuery == null) {
+      searchRequestIdRef.current += 1;
       setTickerSearchPending(false);
       setTickerSearchResults([]);
       if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
@@ -3225,6 +3419,7 @@ export function CommandBar({
 
     const searchQuery = tickerSearchRouteQuery.trim();
     if (!searchQuery) {
+      searchRequestIdRef.current += 1;
       setTickerSearchPending(false);
       setTickerSearchResults([]);
       if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
@@ -3239,7 +3434,7 @@ export function CommandBar({
       activePortfolio?.brokerInstanceId,
     );
     setTickerSearchResults(cachedCandidates
-      ? buildTickerSearchResultItems(cachedCandidates, searchQuery)
+      ? mergeTickerSearchResultItems(searchQuery, localItems, buildTickerSearchResultItems(cachedCandidates, searchQuery))
       : localItems);
     const requestId = ++searchRequestIdRef.current;
     const searchDelay = skipTickerSearchDebounceRef.current ? 0 : 200;
@@ -3266,7 +3461,11 @@ export function CommandBar({
           activePortfolio?.brokerId,
           activePortfolio?.brokerInstanceId,
         );
-        setTickerSearchResults(buildTickerSearchResultItems(combined, searchQuery));
+        setTickerSearchResults(mergeTickerSearchResultItems(
+          searchQuery,
+          localTickerSearchResultItems(searchQuery, { limit: 6 }),
+          buildTickerSearchResultItems(combined, searchQuery),
+        ));
       } catch {
         if (requestId !== searchRequestIdRef.current) return;
         const nextItems: ResultItem[] = [{
@@ -3295,6 +3494,7 @@ export function CommandBar({
     buildTickerSearchResultItems,
     localTickerSearchResultItems,
     mapTickerSearchCandidateToResultItem,
+    mergeTickerSearchResultItems,
     readTickerSearchCache,
     tickerSearchRouteQuery,
     writeTickerSearchCache,
@@ -3559,8 +3759,8 @@ export function CommandBar({
           label: "Type a ticker symbol",
           detail: "Open security details after resolving a ticker",
           category: "Search",
-          kind: "info",
-          action: () => {},
+          kind: "command",
+          action: () => openModeRoute("ticker-search", ""),
         });
       } else if (match.arg) {
         items.push(...localTickerSearchResultItems(match.arg, { limit: 6 }));
@@ -3610,7 +3810,9 @@ export function CommandBar({
       const allItems = [
         ...tickerItems,
         ...commandItems,
-        ...paneShortcutItems(),
+        ...buildLayoutItems("", { confirmDangerousActions: true }),
+        ...buildPaneSettingItems(state.focusedPaneId, rootQuery),
+        ...paneShortcutItems({ includePromptableTickerTemplates: true }),
         ...nonShortcutPaneTemplateItems(),
         ...tickerActionItems(),
         ...pluginCommandItems(),
@@ -3625,6 +3827,7 @@ export function CommandBar({
     activeTickerSymbol,
     availableCommands,
     buildLayoutItems,
+    buildPaneSettingItems,
     buildPluginItems,
     createQuickLookLocalTickerCandidates,
     createPluginCommandItem,
@@ -3644,6 +3847,18 @@ export function CommandBar({
     tickerActionItems,
   ]);
 
+  const rootPlainTickerSearchArg = useMemo(() => {
+    if (activeMatch || rootShortcutIntent.kind !== "none" || !isLikelyPlainTickerSearch(rootQuery)) return null;
+    const normalizedQuery = normalizeCommandTickerSearchText(rootQuery);
+    const hasExactNonTickerResult = rootResultModel.items.some((item) => (
+      item.kind !== "ticker"
+      && item.kind !== "search"
+      && normalizeCommandTickerSearchText(item.label) === normalizedQuery
+    ));
+    return hasExactNonTickerResult ? null : rootQuery.trim();
+  }, [activeMatch, rootQuery, rootResultModel.items, rootShortcutIntent.kind]);
+  const rootTickerSearchArg = rootSecurityDescriptionArg ?? rootPlainTickerSearchArg;
+
   useEffect(() => {
     if (currentRoute) return;
 
@@ -3668,6 +3883,7 @@ export function CommandBar({
 
   useEffect(() => {
     if (currentRoute) {
+      rootSearchRequestIdRef.current += 1;
       setRootSearching(false);
       setRootProviderResults(null);
       setRootProviderResultsQuery(null);
@@ -3676,7 +3892,8 @@ export function CommandBar({
       return;
     }
 
-    if (!rootSecurityDescriptionArg) {
+    if (!rootTickerSearchArg) {
+      rootSearchRequestIdRef.current += 1;
       setRootSearching(false);
       setRootProviderResults(null);
       setRootProviderResultsQuery(null);
@@ -3685,7 +3902,7 @@ export function CommandBar({
       return;
     }
 
-    const searchQuery = rootSecurityDescriptionArg;
+    const searchQuery = rootTickerSearchArg;
     if (rootSearchTimerRef.current) clearTimeout(rootSearchTimerRef.current);
     if (rootLastSearchedQueryRef.current === searchQuery) {
       return;
@@ -3699,7 +3916,10 @@ export function CommandBar({
       activeSearchPortfolio?.brokerId,
       activeSearchPortfolio?.brokerInstanceId,
     );
-    setRootProviderResults(cachedCandidates ? buildTickerSearchResultItems(cachedCandidates, searchQuery) : null);
+    const localItems = localTickerSearchResultItems(searchQuery, { limit: 6 });
+    setRootProviderResults(cachedCandidates
+      ? mergeTickerSearchResultItems(searchQuery, localItems, buildTickerSearchResultItems(cachedCandidates, searchQuery))
+      : null);
     setRootProviderResultsQuery(cachedCandidates ? searchQuery : null);
 
     const requestId = ++rootSearchRequestIdRef.current;
@@ -3723,7 +3943,11 @@ export function CommandBar({
           activeSearchPortfolio?.brokerId,
           activeSearchPortfolio?.brokerInstanceId,
         );
-        setRootProviderResults(buildTickerSearchResultItems(combined, searchQuery));
+        setRootProviderResults(mergeTickerSearchResultItems(
+          searchQuery,
+          localTickerSearchResultItems(searchQuery, { limit: 6 }),
+          buildTickerSearchResultItems(combined, searchQuery),
+        ));
         setRootProviderResultsQuery(searchQuery);
       } catch {
         if (requestId !== rootSearchRequestIdRef.current) return;
@@ -3751,20 +3975,50 @@ export function CommandBar({
     buildTickerSearchResultItems,
     currentRoute,
     dataProvider,
+    localTickerSearchResultItems,
+    mergeTickerSearchResultItems,
     readTickerSearchCache,
-    rootSecurityDescriptionArg,
+    rootTickerSearchArg,
     state.config.portfolios,
     state.tickers,
     writeTickerSearchCache,
   ]);
 
   const rootResults = useMemo(() => {
-    if (rootSecurityDescriptionArg && rootProviderResultsQuery === rootSecurityDescriptionArg && rootProviderResults) {
+    if (rootTickerSearchArg && rootProviderResultsQuery === rootTickerSearchArg && rootProviderResults) {
+      if (rootPlainTickerSearchArg) {
+        return mergePlainRootTickerResults(rootPlainTickerSearchArg, rootProviderResults, rootResultModel.items);
+      }
       return rootProviderResults;
     }
     return rootResultModel.items;
-  }, [rootProviderResults, rootProviderResultsQuery, rootResultModel.items, rootSecurityDescriptionArg]);
-  const orderedRootResults = useMemo(() => orderListResults(rootResults), [rootResults]);
+  }, [
+    mergePlainRootTickerResults,
+    rootPlainTickerSearchArg,
+    rootProviderResults,
+    rootProviderResultsQuery,
+    rootResultModel.items,
+    rootTickerSearchArg,
+  ]);
+  const rootSectionOrder = rootPlainTickerSearchArg ? "app-first" : "default";
+  const orderedRootResults = useMemo(
+    () => orderListResults(rootResults, { sectionOrder: rootSectionOrder }),
+    [rootResults, rootSectionOrder],
+  );
+  const activeRootProviderResultsKey = useMemo(() => {
+    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]);
+
+  useEffect(() => {
+    if (!activeRootProviderResultsKey) return;
+    setRootSelectedIdx(0);
+    setRootHoveredIdx(null);
+    nativeListScrollRef.current?.scrollTo(0);
+  }, [activeRootProviderResultsKey]);
 
   const rootGhostCompletion = !currentRoute && rootShortcutIntent.kind === "inferred-complete"
     ? rootShortcutIntent.completionQuery
@@ -3776,7 +4030,7 @@ export function CommandBar({
     if (currentRoute || rootShortcutIntent.kind === "none") return null;
 
     if (rootShortcutIntent.source === "pane-template") {
-      const argKind = rootShortcutIntent.template.shortcut?.argKind ?? rootShortcutIntent.template.shortcut?.argPlaceholder;
+      const argKind = getPaneTemplateArgKind(rootShortcutIntent.template);
       if (argKind === "ticker") {
         const symbol = normalizeTickerInput(activeTickerSymbol, rootShortcutIntent.argText);
         if (symbol) {
@@ -3792,9 +4046,9 @@ export function CommandBar({
         }
         const inferred = normalizeTickerInput(activeTickerSymbol, undefined);
         if (inferred) {
-          return `Shortcut: ${rootShortcutIntent.label} · inferred ${inferred} · Tab to accept`;
+          return `Shortcut: ${rootShortcutIntent.label} for ${inferred} · Tab to accept`;
         }
-        return `Shortcut: ${rootShortcutIntent.label} · Enter tickers to compare`;
+        return `Shortcut: ${rootShortcutIntent.label} · Enter tickers`;
       }
       return `Shortcut: ${rootShortcutIntent.label}`;
     }
@@ -3809,8 +4063,8 @@ export function CommandBar({
       const symbol = normalizeTickerInput(activeTickerSymbol, rootShortcutIntent.argText);
       if (symbol) {
         return rootShortcutIntent.kind === "inferred-complete"
-          ? `Shortcut: DES ${symbol} · Tab to accept`
-          : `Shortcut: DES ${symbol}`;
+          ? `Shortcut: ${rootShortcutIntent.prefix} ${symbol} · Tab to accept`
+          : `Shortcut: ${rootShortcutIntent.prefix} ${symbol}`;
       }
       return "Shortcut: Description";
     }
@@ -3865,7 +4119,7 @@ export function CommandBar({
       return true;
     }
     if (intent.source === "pane-template") {
-      const argKind = intent.template.shortcut?.argKind ?? intent.template.shortcut?.argPlaceholder;
+      const argKind = getPaneTemplateArgKind(intent.template);
       if (argKind === "ticker") {
         openModeRoute("ticker-search", intent.argText, {
           action: "pane-template",
@@ -3959,7 +4213,7 @@ export function CommandBar({
       }
       return {
         id: `security-description:${match.arg}`,
-        label: `DES ${match.arg.toUpperCase()}`,
+        label: `${match.prefix} ${match.arg.toUpperCase()}`,
         detail: "Open security details or resolve the ticker",
         category: "Search",
         kind: "command",
@@ -4066,6 +4320,7 @@ export function CommandBar({
         emptyDetail: emptyState.detail,
         footerLeft: getScreenFooterLeft(null),
         footerRight: getScreenFooterRight(null),
+        sectionOrder: rootSectionOrder,
       };
     }
 
@@ -4162,21 +4417,7 @@ export function CommandBar({
     if (currentRoute.kind === "pane-settings") {
       const descriptor = pluginRegistry.resolvePaneSettings(currentRoute.paneId);
       if (!descriptor) return null;
-      const items = descriptor.settingsDef.fields.map((field) => {
-        const currentValue = descriptor.context.settings[field.key];
-        return {
-          id: `pane-setting:${field.key}`,
-          label: field.label,
-          detail: summarizePaneSettingValue(field, currentValue),
-          category: descriptor.settingsDef.title || "Pane Settings",
-          kind: "action" as const,
-          right: field.type,
-          action: () => {},
-        };
-      });
-      const filtered = currentRoute.query
-        ? fuzzyFilter(items, currentRoute.query, (item) => `${item.label} ${item.detail} ${item.right || ""}`)
-        : items;
+      const filtered = buildPaneSettingItems(currentRoute.paneId, currentRoute.query, { keepRouteOpen: true });
       return {
         kind: "pane-settings",
         title: descriptor.settingsDef.title || "Pane Settings",
@@ -4201,6 +4442,7 @@ export function CommandBar({
     activeTickerData,
     activeTickerSymbol,
     buildLayoutItems,
+    buildPaneSettingItems,
     buildPluginItems,
     closeAll,
     createPaneTemplateItem,
@@ -4226,6 +4468,7 @@ export function CommandBar({
     rootModeInfo.kind,
     rootQuery,
     orderedRootResults,
+    rootSectionOrder,
     rootSearching,
     rootSelectedIdx,
     rootShortcutIntent,
@@ -4648,40 +4891,7 @@ export function CommandBar({
     }
 
     if (currentRoute?.kind === "pane-settings") {
-      const descriptor = pluginRegistry.resolvePaneSettings(currentRoute.paneId);
-      if (!descriptor) return;
-      const selectedField = descriptor.settingsDef.fields.find((field) => `pane-setting:${field.key}` === selected.id);
-      if (!selectedField) return;
-      const currentValue = descriptor.context.settings[selectedField.key];
-      const normalized = normalizePaneSettingField(currentRoute.paneId, selectedField, currentValue);
-      if (normalized.mode === "toggle") {
-        updateTopRoute((route) => route.kind === "pane-settings"
-          ? { ...route, pendingFieldKey: selectedField.key, error: null }
-          : route);
-        void pluginRegistry.applyPaneSettingValueFn(currentRoute.paneId, selectedField, !normalized.value)
-          .then(() => {
-            updateTopRoute((route) => route.kind === "pane-settings"
-              ? { ...route, pendingFieldKey: null, error: null }
-              : route);
-          })
-          .catch((error) => {
-            updateTopRoute((route) => route.kind === "pane-settings"
-              ? {
-                ...route,
-                pendingFieldKey: null,
-                error: error instanceof Error ? error.message : "Could not apply that setting.",
-              }
-              : route);
-          });
-        return;
-      }
-      if (normalized.mode === "workflow" && normalized.route) {
-        openWorkflowRoute(normalized.route);
-        return;
-      }
-      if (normalized.mode === "picker") {
-        openPickerRoute(normalized.route);
-      }
+      void selected.action();
       return;
     }
 
@@ -4689,10 +4899,7 @@ export function CommandBar({
   }, [
     closeAll,
     currentRoute,
-    normalizePaneSettingField,
     openInlineConfirm,
-    openPickerRoute,
-    openWorkflowRoute,
     persistLayoutChange,
     pluginRegistry,
     resolveImmediateRootSelection,
@@ -4842,343 +5049,277 @@ export function CommandBar({
     }
   }, [currentRoute, pluginRegistry, updateTopRoute, updateWorkflowValue]);
 
-  useEffect(() => {
-    const keyInput = renderer.keyInput as typeof renderer.keyInput & {
-      onInternal?: (event: "keypress", handler: (event: {
-        name: string;
-        sequence?: string;
-        ctrl?: boolean;
-        option?: boolean;
-        meta?: boolean;
-        shift?: boolean;
-        stopPropagation: () => void;
-        preventDefault: () => void;
-      }) => void) => void;
-      offInternal?: (event: "keypress", handler: (event: {
-        name: string;
-        sequence?: string;
-        ctrl?: boolean;
-        option?: boolean;
-        meta?: boolean;
-        shift?: boolean;
-        stopPropagation: () => void;
-        preventDefault: () => void;
-      }) => void) => void;
-    };
-    if (!keyInput) return undefined;
-    const handleKeyPress = (event: {
-      name: string;
-      sequence?: string;
-      ctrl?: boolean;
-      option?: boolean;
-      meta?: boolean;
-      shift?: boolean;
-      stopPropagation: () => void;
-      preventDefault: () => void;
-    }) => {
-      if (event.name === "escape" || event.name === "`") {
+  useShortcut((event) => {
+    if (event.name === "escape" || event.name === "`") {
+      event.stopPropagation();
+      event.preventDefault();
+      dismissCommandBar();
+      return;
+    }
+
+    if (currentRoute?.kind === "confirm") {
+      if (isPlainBackspace(event)) {
         event.stopPropagation();
         event.preventDefault();
-        dismissCommandBar();
+        popRoute();
         return;
       }
-
-      if (currentRoute?.kind === "confirm") {
-        if (isPlainBackspace(event)) {
-          event.stopPropagation();
-          event.preventDefault();
-          popRoute();
-          return;
-        }
-        if (event.name === "return" || event.name === "enter" || event.name === "y") {
-          event.stopPropagation();
-          event.preventDefault();
-          void confirmCurrentRoute();
-          return;
-        }
-        if (event.name === "n") {
-          event.stopPropagation();
-          event.preventDefault();
-          popRoute();
-        }
+      if (event.name === "return" || event.name === "enter" || event.name === "y") {
+        event.stopPropagation();
+        event.preventDefault();
+        void confirmCurrentRoute();
         return;
       }
-
-      if (
-        currentRoute
-        && (currentRoute.kind === "mode"
-          || currentRoute.kind === "picker"
-          || currentRoute.kind === "pane-settings")
-        && isPlainBackspace(event)
-        && currentRoute.query.length === 0
-      ) {
+      if (event.name === "n") {
         event.stopPropagation();
         event.preventDefault();
         popRoute();
-        return;
       }
+      return;
+    }
 
-      if (currentRoute?.kind === "workflow") {
-        const visibleFields = getVisibleWorkflowFields(currentRoute.fields, currentRoute.values);
-        const activeField = visibleFields.find((field) => field.id === currentRoute.activeFieldId) ?? visibleFields[0];
-        const activeTextarea = activeField?.type === "textarea";
-
-        if (isPlainBackspace(event)) {
-          const activeValue = activeField
-            ? getWorkflowFieldStringValue(activeField, currentRoute.values[activeField.id])
-            : "";
-          if (!activeField || !isWorkflowTextField(activeField) || activeValue.length === 0) {
-            event.stopPropagation();
-            event.preventDefault();
-            popRoute();
-            return;
-          }
-        }
-
-        if (event.name === "tab") {
-          event.stopPropagation();
-          event.preventDefault();
-          moveWorkflowFocus(event.shift ? -1 : 1);
-          return;
-        }
-
-        if (activeTextarea && event.ctrl && event.name === "s") {
-          event.stopPropagation();
-          event.preventDefault();
-          void submitWorkflowRoute(currentRoute);
-          return;
-        }
+    if (
+      currentRoute
+      && (currentRoute.kind === "mode"
+        || currentRoute.kind === "picker"
+        || currentRoute.kind === "pane-settings")
+      && isPlainBackspace(event)
+      && currentRoute.query.length === 0
+    ) {
+      event.stopPropagation();
+      event.preventDefault();
+      popRoute();
+      return;
+    }
 
-        if (activeTextarea && (event.name === "up" || event.name === "down" || (event.ctrl && (event.name === "p" || event.name === "n")))) {
-          return;
-        }
+    if (currentRoute?.kind === "workflow") {
+      const visibleFields = getVisibleWorkflowFields(currentRoute.fields, currentRoute.values);
+      const activeField = visibleFields.find((field) => field.id === currentRoute.activeFieldId) ?? visibleFields[0];
+      const activeTextarea = activeField?.type === "textarea";
 
-        if (event.name === "up" || (event.ctrl && event.name === "p")) {
+      if (isPlainBackspace(event)) {
+        const activeValue = activeField
+          ? getWorkflowFieldStringValue(activeField, currentRoute.values[activeField.id])
+          : "";
+        if (!activeField || !isWorkflowTextField(activeField) || activeValue.length === 0) {
           event.stopPropagation();
           event.preventDefault();
-          moveWorkflowFocus(-1);
+          popRoute();
           return;
         }
+      }
 
-        if (event.name === "down" || (event.ctrl && event.name === "n")) {
-          event.stopPropagation();
-          event.preventDefault();
-          moveWorkflowFocus(1);
-          return;
-        }
+      if (event.name === "tab") {
+        event.stopPropagation();
+        event.preventDefault();
+        moveWorkflowFocus(event.shift ? -1 : 1);
+        return;
+      }
 
-        if (event.name === "space" && activeField?.type === "toggle") {
-          event.stopPropagation();
-          event.preventDefault();
-          updateWorkflowValue(activeField.id, !coerceFieldBoolean(currentRoute.values[activeField.id]));
-          return;
-        }
+      if (activeTextarea && event.ctrl && event.name === "s") {
+        event.stopPropagation();
+        event.preventDefault();
+        void submitWorkflowRoute(currentRoute);
+        return;
+      }
 
-        if (
-          event.name === "return"
-          || event.name === "enter"
-          || (nativePaneChrome && event.name === "space" && activeField?.type === "select")
-        ) {
-          if (!activeField) return;
-          if (activeField.type === "select" || activeField.type === "multi-select" || activeField.type === "ordered-multi-select" || activeField.type === "toggle") {
-            event.stopPropagation();
-            event.preventDefault();
-            if (nativePaneChrome && activeField.type === "select") {
-              openNativeSelect(workflowNativeSelectRefs.current.get(activeField.id));
-              return;
-            }
-            openWorkflowFieldPicker(currentRoute, activeField);
-            return;
-          }
-        }
+      if (activeTextarea && (event.name === "up" || event.name === "down" || (event.ctrl && (event.name === "p" || event.name === "n")))) {
+        return;
+      }
 
+      if (event.name === "up" || (event.ctrl && event.name === "p")) {
+        event.stopPropagation();
+        event.preventDefault();
+        moveWorkflowFocus(-1);
         return;
       }
 
-      if (currentRoute?.kind === "picker") {
-        if (event.name === "up" || (event.ctrl && event.name === "p")) {
-          event.stopPropagation();
-          event.preventDefault();
-          moveListSelection(-1);
-          return;
-        }
-        if (event.name === "down" || (event.ctrl && event.name === "n")) {
-          event.stopPropagation();
-          event.preventDefault();
-          moveListSelection(1);
-          return;
-        }
-        if (currentRoute.pickerId === "field-multi-select" && (event.name === "space" || event.sequence === " ")) {
-          event.stopPropagation();
-          event.preventDefault();
-          const listState = visibleListStateRef.current;
-          const selected = listState?.results[listState.selectedIdx];
-          if (!selected) return;
-          handleMultiSelectToggle(selected.id);
-          return;
-        }
-        if (currentRoute.pickerId === "field-multi-select" && event.name === "[") {
-          event.stopPropagation();
-          event.preventDefault();
-          handleMultiSelectMove("up");
-          return;
-        }
-        if (currentRoute.pickerId === "field-multi-select" && event.name === "]") {
-          event.stopPropagation();
-          event.preventDefault();
-          handleMultiSelectMove("down");
-          return;
-        }
-        if (event.name === "return" || event.name === "enter") {
-          event.stopPropagation();
-          event.preventDefault();
-          if (currentRoute.pickerId === "field-multi-select") {
-            commitMultiSelectPicker();
-            return;
-          }
-          activateListSelection();
-        }
+      if (event.name === "down" || (event.ctrl && event.name === "n")) {
+        event.stopPropagation();
+        event.preventDefault();
+        moveWorkflowFocus(1);
         return;
       }
 
-      if (currentRoute?.kind === "pane-settings") {
-        if (event.name === "up" || (event.ctrl && event.name === "p")) {
-          event.stopPropagation();
-          event.preventDefault();
-          moveListSelection(-1);
-          return;
-        }
-        if (event.name === "down" || (event.ctrl && event.name === "n")) {
-          event.stopPropagation();
-          event.preventDefault();
-          moveListSelection(1);
-          return;
-        }
-        if (event.name === "return" || event.name === "enter" || event.name === "space") {
-          event.stopPropagation();
-          event.preventDefault();
-          activateListSelection();
-        }
+      if (event.name === "space" && activeField?.type === "toggle") {
+        event.stopPropagation();
+        event.preventDefault();
+        updateWorkflowValue(activeField.id, !coerceFieldBoolean(currentRoute.values[activeField.id]));
         return;
       }
 
-      if (themePickerActive) {
-        if (event.name === "up" || (event.ctrl && event.name === "p")) {
-          event.stopPropagation();
-          event.preventDefault();
-          themePickerRef.current?.move(-1);
-          return;
-        }
-        if (event.name === "down" || (event.ctrl && event.name === "n")) {
-          event.stopPropagation();
-          event.preventDefault();
-          themePickerRef.current?.move(1);
-          return;
-        }
-        if (event.name === "return" || event.name === "enter") {
+      if (
+        event.name === "return"
+        || event.name === "enter"
+        || (nativePaneChrome && event.name === "space" && activeField?.type === "select")
+      ) {
+        if (!activeField) return;
+        if (activeField.type === "select" || activeField.type === "multi-select" || activeField.type === "ordered-multi-select" || activeField.type === "toggle") {
           event.stopPropagation();
           event.preventDefault();
-          themePickerRef.current?.commit();
+          if (nativePaneChrome && activeField.type === "select") {
+            openNativeSelect(workflowNativeSelectRefs.current.get(activeField.id));
+            return;
+          }
+          openWorkflowFieldPicker(currentRoute, activeField);
           return;
         }
       }
 
-      const activeListState = visibleListStateRef.current;
-      if (!activeListState) return;
+      return;
+    }
 
-      if (!currentRoute && event.name === "tab") {
-        if (acceptRootShortcutTab()) {
-          event.stopPropagation();
-          event.preventDefault();
-          return;
-        }
+    if (currentRoute?.kind === "picker") {
+      if (event.name === "up" || (event.ctrl && event.name === "p")) {
+        event.stopPropagation();
+        event.preventDefault();
+        moveListSelection(-1);
+        return;
       }
-
       if (event.name === "down" || (event.ctrl && event.name === "n")) {
         event.stopPropagation();
         event.preventDefault();
         moveListSelection(1);
         return;
       }
+      if (currentRoute.pickerId === "field-multi-select" && (event.name === "space" || event.sequence === " ")) {
+        event.stopPropagation();
+        event.preventDefault();
+        const listState = visibleListStateRef.current;
+        const selected = listState?.results[listState.selectedIdx];
+        if (!selected) return;
+        handleMultiSelectToggle(selected.id);
+        return;
+      }
+      if (currentRoute.pickerId === "field-multi-select" && event.name === "[") {
+        event.stopPropagation();
+        event.preventDefault();
+        handleMultiSelectMove("up");
+        return;
+      }
+      if (currentRoute.pickerId === "field-multi-select" && event.name === "]") {
+        event.stopPropagation();
+        event.preventDefault();
+        handleMultiSelectMove("down");
+        return;
+      }
+      if (event.name === "return" || event.name === "enter") {
+        event.stopPropagation();
+        event.preventDefault();
+        if (currentRoute.pickerId === "field-multi-select") {
+          commitMultiSelectPicker();
+          return;
+        }
+        activateListSelection();
+      }
+      return;
+    }
 
+    if (currentRoute?.kind === "pane-settings") {
       if (event.name === "up" || (event.ctrl && event.name === "p")) {
         event.stopPropagation();
         event.preventDefault();
         moveListSelection(-1);
         return;
       }
-
-      if ((event.meta && (event.name === "backspace" || event.name === "delete")) || (event.ctrl && event.name === "u")) {
+      if (event.name === "down" || (event.ctrl && event.name === "n")) {
         event.stopPropagation();
         event.preventDefault();
-        setActiveListQuery("");
+        moveListSelection(1);
         return;
       }
+      if (event.name === "return" || event.name === "enter" || event.name === "space") {
+        event.stopPropagation();
+        event.preventDefault();
+        activateListSelection();
+      }
+      return;
+    }
 
-      if ((event.ctrl && event.name === "w") || (event.meta && (event.name === "h" || event.name === "u"))) {
+    if (themePickerActive) {
+      if (event.name === "up" || (event.ctrl && event.name === "p")) {
         event.stopPropagation();
         event.preventDefault();
-        const trimmed = activeListState.query.replace(/\s+$/, "");
-        const nextQuery = trimmed.replace(/[^\s]+$/, "").replace(/\s+$/, "");
-        setActiveListQuery(nextQuery);
+        themePickerRef.current?.move(-1);
         return;
       }
-
-      const pluginToggleMode = (currentRoute?.kind === "mode" && currentRoute.screen === "plugins")
-        || (!currentRoute && rootModeInfo.kind === "plugins");
-      if (pluginToggleMode && event.name === "space") {
+      if (event.name === "down" || (event.ctrl && event.name === "n")) {
         event.stopPropagation();
         event.preventDefault();
-        const selected = activeListState.results[activeListState.selectedIdx];
-        if (selected?.pluginToggle) {
-          void selected.pluginToggle();
-        }
+        themePickerRef.current?.move(1);
         return;
       }
-
       if (event.name === "return" || event.name === "enter") {
         event.stopPropagation();
         event.preventDefault();
-        if (event.shift) {
-          activateListSelection({ secondary: true });
-          return;
-        }
-        activateListSelection();
+        themePickerRef.current?.commit();
+        return;
       }
-    };
+    }
 
-    if (keyInput.onInternal) {
-      keyInput.onInternal("keypress", handleKeyPress);
-    } else {
-      keyInput.on("keypress", handleKeyPress);
+    const activeListState = visibleListStateRef.current;
+    if (!activeListState) return;
+
+    if (!currentRoute && event.name === "tab") {
+      if (acceptRootShortcutTab()) {
+        event.stopPropagation();
+        event.preventDefault();
+        return;
+      }
     }
-    return () => {
-      if (keyInput.offInternal) {
-        keyInput.offInternal("keypress", handleKeyPress);
-      } else {
-        keyInput.off("keypress", handleKeyPress);
+
+    if (event.name === "down" || (event.ctrl && event.name === "n")) {
+      event.stopPropagation();
+      event.preventDefault();
+      moveListSelection(1);
+      return;
+    }
+
+    if (event.name === "up" || (event.ctrl && event.name === "p")) {
+      event.stopPropagation();
+      event.preventDefault();
+      moveListSelection(-1);
+      return;
+    }
+
+    if ((event.meta && (event.name === "backspace" || event.name === "delete")) || (event.ctrl && event.name === "u")) {
+      event.stopPropagation();
+      event.preventDefault();
+      setActiveListQuery("");
+      return;
+    }
+
+    if ((event.ctrl && event.name === "w") || (event.meta && (event.name === "h" || event.name === "u"))) {
+      event.stopPropagation();
+      event.preventDefault();
+      const trimmed = activeListState.query.replace(/\s+$/, "");
+      const nextQuery = trimmed.replace(/[^\s]+$/, "").replace(/\s+$/, "");
+      setActiveListQuery(nextQuery);
+      return;
+    }
+
+    const pluginToggleMode = (currentRoute?.kind === "mode" && currentRoute.screen === "plugins")
+      || (!currentRoute && rootModeInfo.kind === "plugins");
+    if (pluginToggleMode && event.name === "space") {
+      event.stopPropagation();
+      event.preventDefault();
+      const selected = activeListState.results[activeListState.selectedIdx];
+      if (selected?.pluginToggle) {
+        void selected.pluginToggle();
       }
-    };
-  }, [
-    activateListSelection,
-    acceptRootShortcutTab,
-    commitMultiSelectPicker,
-    confirmCurrentRoute,
-    currentRoute,
-    dismissCommandBar,
-    handleMultiSelectMove,
-    handleMultiSelectToggle,
-    moveListSelection,
-    moveWorkflowFocus,
-    nativePaneChrome,
-    openWorkflowFieldPicker,
-    popRoute,
-    renderer,
-    rootModeInfo.kind,
-    setActiveListQuery,
-    themePickerActive,
-    updateWorkflowValue,
-  ]);
+      return;
+    }
+
+    if (event.name === "return" || event.name === "enter") {
+      event.stopPropagation();
+      event.preventDefault();
+      if (event.shift) {
+        activateListSelection({ secondary: true });
+        return;
+      }
+      activateListSelection();
+    }
+  }, { phase: "before" });
 
   const barWidth = nativePaneChrome
     ? Math.max(46, Math.min(78, termWidth - 10, Math.floor(termWidth * 0.64)))
@@ -5221,8 +5362,18 @@ export function CommandBar({
       Math.max(7, estimateWorkflowBodyRows(currentRoute)),
     )
     : baseBodyHeight;
-  const bodyHeight = currentRoute?.kind === "workflow" ? workflowBodyHeight : baseBodyHeight;
-  const listBodyHeight = baseBodyHeight;
+  const shouldUseCompactListHeight = nativePaneChrome
+    && visibleListState != null
+    && !themePickerActive
+    && !showCustomMultiSelectPicker;
+  const listBodyHeight = shouldUseCompactListHeight
+    ? Math.min(baseBodyHeight, Math.max(1, nativeListRows.length))
+    : baseBodyHeight;
+  const bodyHeight = currentRoute?.kind === "workflow"
+    ? workflowBodyHeight
+    : shouldUseCompactListHeight
+      ? listBodyHeight
+      : baseBodyHeight;
   const nativePanelPaddingColumns = nativePaneChrome
     ? Math.ceil((NATIVE_COMMAND_BAR_PADDING_X_PX * 2) / Math.max(1, cellWidthPx))
     : 0;
@@ -5233,7 +5384,7 @@ export function CommandBar({
     || currentRoute?.kind === "confirm"
     || showCustomMultiSelectPicker)
     ? 1
-    : 3;
+    : currentRoute ? 3 : 2;
   const barHeight = nativePaneChrome
     ? bodyHeight + nativeBodyChromeRows + nativePanelPaddingRows
     : bodyHeight + 7;
@@ -5578,7 +5729,7 @@ export function CommandBar({
         data-gloom-role="command-bar-panel"
         style={nativePaneChrome ? {
           borderRadius: 8,
-          boxShadow: "0 14px 32px rgba(0,0,0,0.18)",
+          boxShadow: `0 14px 32px ${blendHex(commandBarBg(), colors.bg, 0.18)}`,
           overflow: "hidden",
           padding: `${NATIVE_COMMAND_BAR_PADDING_Y_PX}px ${NATIVE_COMMAND_BAR_PADDING_X_PX}px`,
         } : undefined}
@@ -5669,15 +5820,15 @@ export function CommandBar({
               paletteText={paletteText}
               panelBg={panelBg}
               onPreview={applyThemePreview}
-              onCommit={(themeId) => {
-                const nextConfig = {
-                  ...stateRef.current.config,
-                  theme: themeId,
-                };
-                commitTheme(themeId);
-                void saveConfig(nextConfig);
-                closeAll({ revertThemePreview: false });
-              }}
+	              onCommit={(themeId) => {
+	                const nextConfig = {
+	                  ...stateRef.current.config,
+	                  theme: themeId,
+	                };
+	                commitTheme(themeId);
+	                persistConfig(nextConfig);
+	                closeAll({ revertThemePreview: false });
+	              }}
             />
           )}