gloomberb 0.3.7 → 0.4.0

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

@@ -18,11 +18,12 @@ import {
 import { getFocusedCollectionId, useAppState, useFocusedTicker } from "../../state/app-context";
 import { fuzzyFilter } from "../../utils/fuzzy-search";
 import { commands, getThemeOptions, matchPrefix, type Command } from "./command-registry";
-import { applyTheme, getCurrentThemeId } from "../../theme/colors";
+import { applyTheme } from "../../theme/colors";
 import { exportConfig, importConfig, resetAllData, saveConfig } from "../../data/config-store";
 import type { DataProvider } from "../../types/data-provider";
 import type { TickerRepository } from "../../data/ticker-repository";
 import type { PluginRegistry } from "../../plugins/registry";
+import type { TickerRecord } from "../../types/ticker";
 import type {
   CommandDef,
   PaneSettingField,
@@ -68,6 +69,7 @@ import {
   type TickerSearchCandidate,
 } from "../../utils/ticker-search";
 import { debugLog } from "../../utils/debug-log";
+import { isPlainBackspace } from "../../utils/back-navigation";
 import type {
   CommandBarFieldOption,
   CommandBarFieldValue,
@@ -78,11 +80,13 @@ import type {
   CommandBarWorkflowRoute,
 } from "./workflow-types";
 import { parseRootShortcutIntent } from "./root-shortcuts";
+import { getPaneTemplateDisplayLabel } from "./pane-template-display";
 import {
   applyCollectionMembershipChange,
   getCollectionTargetOptions,
   resolvePreferredCollectionTarget,
   resolveTickerInput,
+  resolveTickerInputOrThrow,
   resolveTickerListInput,
 } from "./workflow-ops";
 import {
@@ -112,6 +116,19 @@ import {
   summarizeWorkflowFieldValue,
   toggleSelectedValue,
 } from "./helpers";
+import {
+  buildAddToPortfolioWorkflow,
+  buildSetPortfolioPositionWorkflow,
+} from "../../plugins/builtin/portfolio-list/command-bar";
+import {
+  addTickerToPortfolio,
+  createManualPortfolio as createManualPortfolioConfig,
+  deleteManualPortfolio,
+  isManualPortfolio,
+  removeTickerFromPortfolio,
+  resolveManualPositionCurrency,
+  setManualPortfolioPosition,
+} from "../../plugins/builtin/portfolio-list/mutations";
 
 interface CommandBarProps {
   dataProvider: DataProvider;
@@ -433,7 +450,7 @@ export function CommandBar({
       query: initialQuery,
       selectedIdx: 0,
       hoveredIdx: null,
-      themeBaseId: screen === "themes" ? getCurrentThemeId() : undefined,
+      themeBaseId: screen === "themes" ? stateRef.current.config.theme : undefined,
       payload,
     });
   }, [pushRoute]);
@@ -590,6 +607,39 @@ export function CommandBar({
     return next;
   }, []);
 
+  const openAddToPortfolioWorkflow = useCallback((
+    ticker: TickerRecord,
+    preferredPortfolioId?: string | null,
+  ) => {
+    const defaultAvgCost = stateRef.current.financials.get(ticker.metadata.ticker)?.quote?.price ?? null;
+    const workflow = buildAddToPortfolioWorkflow(stateRef.current.config, {
+      preferredPortfolioId,
+      ticker,
+      defaultAvgCost,
+    });
+    if (!workflow) {
+      pluginRegistry.showToastFn("Create a manual portfolio first.", { type: "info" });
+      return;
+    }
+
+    openWorkflowRoute({
+      kind: "workflow",
+      workflowId: "builtin:add-portfolio",
+      title: `Add ${ticker.metadata.ticker} to Portfolio`,
+      subtitle: "Choose a portfolio and optionally record the manual position now.",
+      fields: workflow.fields,
+      values: workflow.values,
+      activeFieldId: getFirstVisibleFieldId(workflow.fields, workflow.values),
+      submitLabel: "Add to Portfolio",
+      cancelLabel: "Back",
+      pendingLabel: workflow.pendingLabel,
+      pending: false,
+      error: null,
+      successBehavior: "close",
+      payload: { kind: "builtin", actionId: "add-portfolio" },
+    });
+  }, [openWorkflowRoute, pluginRegistry]);
+
   const connectBrokerProfile = useCallback(async (
     brokerId: string,
     values: WorkflowStringValues,
@@ -625,25 +675,15 @@ export function CommandBar({
 
   const createManualPortfolio = useCallback(async (name: string) => {
     const currentState = stateRef.current;
-    const trimmedName = name.trim();
-    if (!trimmedName) {
-      throw new Error("Portfolio name is required.");
-    }
-
-    const id = slugifyName(trimmedName, "portfolio");
-    const newPortfolio = {
-      id,
-      name: trimmedName,
-      currency: currentState.config.baseCurrency || "USD",
-    };
-    const nextConfig = {
-      ...currentState.config,
-      portfolios: [...currentState.config.portfolios, newPortfolio],
-    };
+    const { config: nextConfig, portfolio } = createManualPortfolioConfig(
+      currentState.config,
+      name,
+      currentState.config.baseCurrency,
+    );
     dispatch({ type: "SET_CONFIG", config: nextConfig });
-    setActiveCollection(id);
+    setActiveCollection(portfolio.id);
     await saveConfig(nextConfig);
-    pluginRegistry.showToastFn(`Created portfolio "${trimmedName}".`, { type: "success" });
+    pluginRegistry.showToastFn(`Created portfolio "${portfolio.name}".`, { type: "success" });
   }, [dispatch, pluginRegistry, setActiveCollection]);
 
   const createWatchlist = useCallback(async (name: string) => {
@@ -691,11 +731,21 @@ export function CommandBar({
     if (!portfolio) {
       throw new Error("Portfolio not found.");
     }
+    if (!isManualPortfolio(portfolio)) {
+      throw new Error("Broker-managed portfolios cannot be deleted here.");
+    }
 
-    const nextConfig = {
-      ...currentState.config,
-      portfolios: currentState.config.portfolios.filter((entry) => entry.id !== portfolioId),
-    };
+    const result = deleteManualPortfolio(
+      currentState.config,
+      [...currentState.tickers.values()],
+      portfolioId,
+    );
+    for (const ticker of result.tickers) {
+      await tickerRepository.saveTicker(ticker);
+      dispatch({ type: "UPDATE_TICKER", ticker });
+    }
+
+    const nextConfig = result.config;
     dispatch({ type: "SET_CONFIG", config: nextConfig });
     if (activeCollectionId === portfolioId) {
       const fallback = nextConfig.portfolios[0]?.id || nextConfig.watchlists[0]?.id || "";
@@ -703,7 +753,87 @@ export function CommandBar({
     }
     await saveConfig(nextConfig);
     pluginRegistry.showToastFn(`Deleted "${portfolio.name}".`, { type: "success" });
-  }, [activeCollectionId, dispatch, pluginRegistry, setActiveCollection]);
+  }, [activeCollectionId, dispatch, pluginRegistry, setActiveCollection, tickerRepository]);
+
+  const setPortfolioPositionFromWorkflow = useCallback(async (values: Record<string, CommandBarFieldValue>) => {
+    const currentState = stateRef.current;
+    const portfolioId = coerceFieldString(values.portfolioId).trim();
+    const portfolio = currentState.config.portfolios.find((entry) => entry.id === portfolioId);
+    if (!portfolio || !isManualPortfolio(portfolio)) {
+      throw new Error("Choose a manual portfolio.");
+    }
+
+    const shares = Number(coerceFieldString(values.shares));
+    if (!Number.isFinite(shares) || shares <= 0) {
+      throw new Error("Shares must be greater than 0.");
+    }
+
+    const avgCost = Number(coerceFieldString(values.avgCost));
+    if (!Number.isFinite(avgCost)) {
+      throw new Error("Avg Cost must be a valid number.");
+    }
+
+    const resolvedTicker = await resolveTickerInputOrThrow(
+      coerceFieldString(values.ticker),
+      activeTickerSymbol,
+      activeCollectionId,
+      {
+        dataProvider,
+        tickerRepository,
+        pluginRegistry,
+        dispatch,
+        getState: () => stateRef.current,
+      },
+    );
+
+    const currency = resolveManualPositionCurrency(
+      coerceFieldString(values.currency),
+      resolvedTicker.ticker,
+      portfolio,
+      currentState.config.baseCurrency,
+    );
+
+    const result = setManualPortfolioPosition(resolvedTicker.ticker, portfolio.id, {
+      shares,
+      avgCost,
+      currency,
+    });
+    await tickerRepository.saveTicker(result.ticker);
+    dispatch({ type: "UPDATE_TICKER", ticker: result.ticker });
+    pluginRegistry.showToastFn(`Set position for ${result.ticker.metadata.ticker} in "${portfolio.name}".`, { type: "success" });
+  }, [activeCollectionId, activeTickerSymbol, dataProvider, dispatch, pluginRegistry, tickerRepository]);
+
+  const addTickerMembershipFromWorkflow = useCallback(async (values: Record<string, CommandBarFieldValue>) => {
+    const currentState = stateRef.current;
+    const portfolioId = coerceFieldString(values.portfolioId).trim();
+    const portfolio = currentState.config.portfolios.find((entry) => entry.id === portfolioId);
+    if (!portfolio || !isManualPortfolio(portfolio)) {
+      throw new Error("Choose a manual portfolio.");
+    }
+
+    const resolvedTicker = await resolveTickerInputOrThrow(
+      coerceFieldString(values.ticker),
+      activeTickerSymbol,
+      activeCollectionId,
+      {
+        dataProvider,
+        tickerRepository,
+        pluginRegistry,
+        dispatch,
+        getState: () => stateRef.current,
+      },
+    );
+
+    const result = addTickerToPortfolio(resolvedTicker.ticker, portfolio.id);
+    if (result.changed) {
+      await tickerRepository.saveTicker(result.ticker);
+      dispatch({ type: "UPDATE_TICKER", ticker: result.ticker });
+      pluginRegistry.showToastFn(`Added ${result.ticker.metadata.ticker} to "${portfolio.name}".`, { type: "success" });
+      return;
+    }
+
+    pluginRegistry.showToastFn(`${result.ticker.metadata.ticker} is already in "${portfolio.name}".`, { type: "info" });
+  }, [activeCollectionId, activeTickerSymbol, dataProvider, dispatch, pluginRegistry, tickerRepository]);
 
   const disconnectBrokerInstance = useCallback(async (instanceId: string) => {
     const instance = stateRef.current.config.brokerInstances.find((entry) => entry.id === instanceId);
@@ -783,6 +913,33 @@ export function CommandBar({
         openWorkflowRoute(workflow);
         return;
       }
+      case "set-portfolio-position": {
+        const workflow = buildSetPortfolioPositionWorkflow(state.config, {
+          activeCollectionId,
+          activeTicker: activeTickerData,
+        });
+        if (!workflow) {
+          pluginRegistry.showToastFn("Create a manual portfolio first.", { type: "info" });
+          return;
+        }
+        openWorkflowRoute({
+          kind: "workflow",
+          workflowId: "builtin:set-portfolio-position",
+          title: "Set Portfolio Position",
+          subtitle: "Create or update a manual position without leaving the command bar.",
+          fields: workflow.fields,
+          values: workflow.values,
+          activeFieldId: getFirstVisibleFieldId(workflow.fields, workflow.values),
+          submitLabel: "Save Position",
+          cancelLabel: "Back",
+          pendingLabel: workflow.pendingLabel,
+          pending: false,
+          error: null,
+          successBehavior: "close",
+          payload: { kind: "builtin", actionId },
+        });
+        return;
+      }
       case "add-broker-account": {
         const workflow = buildBrokerWorkflow(
           "brokerType",
@@ -801,7 +958,7 @@ export function CommandBar({
       default:
         return;
     }
-  }, [buildBrokerWorkflow, openWorkflowRoute, pluginRegistry, state.config.activeLayoutIndex, state.config.layouts]);
+  }, [activeCollectionId, activeTickerData, buildBrokerWorkflow, openWorkflowRoute, pluginRegistry, state.config]);
 
   const openPickerRoute = useCallback((
     route: CommandBarRoute,
@@ -912,6 +1069,55 @@ export function CommandBar({
       return;
     }
 
+    if (kind === "portfolio" && action === "add") {
+      const manualPortfolios = stateForCommand.config.portfolios.filter(isManualPortfolio);
+      if (manualPortfolios.length === 0) {
+        pluginRegistry.showToastFn("Create a manual portfolio first.", { type: "info" });
+        return;
+      }
+
+      const preferredTargetId = explicitTargetId
+        ?? (activeCollectionId && manualPortfolios.some((portfolio) => portfolio.id === activeCollectionId)
+          ? activeCollectionId
+          : manualPortfolios.length === 1
+            ? manualPortfolios[0]!.id
+            : null);
+
+      if (!preferredTargetId) {
+        const options = manualPortfolios.map((portfolio) => {
+          const isMember = resolvedTicker.ticker.metadata.portfolios.includes(portfolio.id);
+          const description = isMember
+            ? `Update position in "${portfolio.name}"`
+            : `Add to "${portfolio.name}"`;
+          return {
+            id: portfolio.id,
+            label: portfolio.name,
+            detail: description,
+            description,
+          };
+        });
+        openPickerRoute({
+          kind: "picker",
+          pickerId: "collection-target",
+          title: `Add ${resolvedTicker.symbol} to Portfolio`,
+          query: "",
+          selectedIdx: 0,
+          hoveredIdx: null,
+          options,
+          payload: {
+            commandId,
+            kind,
+            action,
+            symbol: resolvedTicker.symbol,
+          },
+        });
+        return;
+      }
+
+      openAddToPortfolioWorkflow(resolvedTicker.ticker, preferredTargetId);
+      return;
+    }
+
     const targetId = explicitTargetId
       ?? resolvePreferredCollectionTarget(
         stateForCommand,
@@ -956,13 +1162,32 @@ export function CommandBar({
       return;
     }
 
-    const { changed } = await applyCollectionMembershipChange(
-      resolvedTicker.ticker,
-      kind,
-      action,
-      targetId,
-      deps,
-    );
+    let changed = false;
+    if (kind === "watchlist") {
+      ({ changed } = await applyCollectionMembershipChange(
+        resolvedTicker.ticker,
+        kind,
+        action,
+        targetId,
+        deps,
+      ));
+    } else {
+      const portfolio = stateForCommand.config.portfolios.find((entry) => entry.id === targetId);
+      if (!portfolio || !isManualPortfolio(portfolio)) {
+        pluginRegistry.showToastFn("Choose a manual portfolio.", { type: "error" });
+        return;
+      }
+
+      const result = action === "add"
+        ? addTickerToPortfolio(resolvedTicker.ticker, targetId)
+        : removeTickerFromPortfolio(resolvedTicker.ticker, targetId);
+
+      changed = result.changed;
+      if (result.changed) {
+        await deps.tickerRepository.saveTicker(result.ticker);
+        deps.dispatch({ type: "UPDATE_TICKER", ticker: result.ticker });
+      }
+    }
     const targetName = (kind === "watchlist"
       ? stateForCommand.config.watchlists.find((entry) => entry.id === targetId)?.name
       : stateForCommand.config.portfolios.find((entry) => entry.id === targetId)?.name) || targetId;
@@ -985,6 +1210,7 @@ export function CommandBar({
     activeTickerSymbol,
     buildSharedWorkflowDeps,
     closeAll,
+    openAddToPortfolioWorkflow,
     openModeRoute,
     openPickerRoute,
     pluginRegistry,
@@ -1234,6 +1460,18 @@ export function CommandBar({
               await connectBrokerProfile(brokerId, values);
               break;
             }
+            case "add-portfolio": {
+              const shares = coerceFieldString(route.values.shares).trim();
+              if (!shares) {
+                await addTickerMembershipFromWorkflow(route.values);
+              } else {
+                await setPortfolioPositionFromWorkflow(route.values);
+              }
+              break;
+            }
+            case "set-portfolio-position":
+              await setPortfolioPositionFromWorkflow(route.values);
+              break;
             default:
               break;
           }
@@ -1329,6 +1567,8 @@ export function CommandBar({
     extractBrokerWorkflowValues,
     getWorkflowFieldStringValue,
     pluginRegistry,
+    addTickerMembershipFromWorkflow,
+    setPortfolioPositionFromWorkflow,
     state.config.activeLayoutIndex,
     syncActiveWorkflowTextarea,
     updateTopRoute,
@@ -1375,6 +1615,7 @@ export function CommandBar({
   }, []);
 
   const openPaneTemplateWorkflow = useCallback((template: PaneTemplateDef, options?: { arg?: string }) => {
+    const displayLabel = getPaneTemplateDisplayLabel(template);
     const normalized = template.wizard && template.wizard.length > 0
       ? normalizeWizardFields(template.wizard)
       : { fields: [] as CommandBarWorkflowField[], description: [] as string[], initialValues: {} as Record<string, CommandBarFieldValue> };
@@ -1395,7 +1636,7 @@ export function CommandBar({
     openWorkflowRoute({
       kind: "workflow",
       workflowId: `pane-template:${template.id}`,
-      title: template.label,
+      title: displayLabel,
       subtitle: template.description,
       description: normalized.description,
       fields,
@@ -1403,7 +1644,7 @@ export function CommandBar({
       activeFieldId: getFirstVisibleFieldId(fields, values),
       submitLabel: "Create Pane",
       cancelLabel: "Back",
-      pendingLabel: normalized.pendingLabel ?? `Creating ${template.label.toLowerCase()}…`,
+      pendingLabel: normalized.pendingLabel ?? `Creating ${displayLabel.toLowerCase()}…`,
       successLabel: normalized.successLabel,
       pending: false,
       error: null,
@@ -1426,8 +1667,9 @@ export function CommandBar({
       await pluginRegistry.createPaneFromTemplateAsyncFn(template.id, createOptions);
       closeAll({ revertThemePreview: false });
     } catch (error) {
+      const displayLabel = getPaneTemplateDisplayLabel(template);
       pluginRegistry.showToastFn(
-        error instanceof Error ? error.message : `Could not create ${template.label.toLowerCase()}.`,
+        error instanceof Error ? error.message : `Could not create ${displayLabel.toLowerCase()}.`,
         { type: "error" },
       );
     }
@@ -1701,13 +1943,12 @@ export function CommandBar({
   ): ResultItem => {
     const pluginId = pluginRegistry.getPaneTemplatePluginId(template.id);
     const pluginName = pluginId ? pluginRegistry.allPlugins.get(pluginId)?.name : null;
-    const paneDef = pluginRegistry.panes.get(template.paneId);
+    const displayLabel = getPaneTemplateDisplayLabel(template);
     const shortcutLabel = template.shortcut
       ? [template.shortcut.prefix, template.shortcut.argPlaceholder && `<${template.shortcut.argPlaceholder}>`]
         .filter(Boolean)
         .join(" ")
       : null;
-    const placementLabel = paneDef?.defaultMode === "floating" ? "float" : "dock";
     const arg = options?.createOptions?.arg;
 
     const action = () => {
@@ -1724,12 +1965,12 @@ export function CommandBar({
 
     return {
       id: `pane-template:${template.id}:${arg || ""}`,
-      label: template.label,
+      label: displayLabel,
       detail: shortcutLabel ? `${template.description} · ${shortcutLabel}` : template.description,
       category: options?.category ?? (pluginName ? `${pluginName} Panes` : "New Panes"),
       kind: "action",
-      right: options?.showShortcut ? (template.shortcut?.prefix || placementLabel) : placementLabel,
-      searchText: `${template.paneId} ${template.keywords?.join(" ") || ""} ${shortcutLabel || ""} ${pluginName || ""}`,
+      right: options?.showShortcut ? template.shortcut?.prefix : undefined,
+      searchText: `${displayLabel} ${template.label} ${template.paneId} ${template.keywords?.join(" ") || ""} ${shortcutLabel || ""} ${pluginName || ""}`,
       action,
     };
   }, [openPaneTemplateDirect, openPaneTemplateWorkflow, pluginRegistry, runPaneTemplateShortcut, shouldOpenTemplateConfig]);
@@ -1863,11 +2104,17 @@ export function CommandBar({
       case "add-broker-account":
       case "new-portfolio":
       case "new-watchlist":
+      case "set-portfolio-position":
       case "disconnect-broker-account":
       case "delete-watchlist":
       case "delete-portfolio":
       case "reset-all-data":
-        if (command.id === "add-broker-account" || command.id === "new-portfolio" || command.id === "new-watchlist") {
+        if (
+          command.id === "add-broker-account"
+          || command.id === "new-portfolio"
+          || command.id === "new-watchlist"
+          || command.id === "set-portfolio-position"
+        ) {
           openBuiltInWorkflow(command.id);
           return;
         }
@@ -1914,7 +2161,7 @@ export function CommandBar({
           return;
         }
         if (command.id === "delete-portfolio") {
-          const deletable = state.config.portfolios.filter((portfolio) => !portfolio.brokerId && !portfolio.brokerInstanceId);
+          const deletable = state.config.portfolios.filter(isManualPortfolio);
           const options = deletable.map((portfolio) => ({
             id: portfolio.id,
             label: portfolio.name,
@@ -2160,6 +2407,7 @@ export function CommandBar({
 
     const isWatchlistTab = state.config.watchlists.some((entry) => entry.id === activeCollectionId);
     const isPortfolioTab = state.config.portfolios.some((entry) => entry.id === activeCollectionId);
+    const manualPortfolios = state.config.portfolios.filter(isManualPortfolio);
     const tickerData = activeTickerData;
     const focusedPaneHasSettings = !!state.focusedPaneId && pluginRegistry.hasPaneSettings(state.focusedPaneId);
 
@@ -2167,8 +2415,8 @@ export function CommandBar({
       ? activeCollectionId
       : state.config.watchlists[0]?.id ?? null;
     const targetPortfolioId = isPortfolioTab
-      ? activeCollectionId
-      : state.config.portfolios.find((entry) => !entry.brokerId)?.id ?? null;
+      ? manualPortfolios.find((entry) => entry.id === activeCollectionId)?.id ?? null
+      : manualPortfolios[0]?.id ?? null;
 
     function shouldShow(command: Command): boolean {
       switch (command.id) {
@@ -2177,16 +2425,18 @@ export function CommandBar({
         case "remove-watchlist":
           return !!tickerData && tickerData.metadata.watchlists.length > 0;
         case "add-portfolio":
-          return !!tickerData && !!targetPortfolioId && !tickerData.metadata.portfolios.includes(targetPortfolioId);
+          return !!tickerData && manualPortfolios.length > 0;
         case "remove-portfolio":
           return !!tickerData && tickerData.metadata.portfolios.some((id) =>
-            state.config.portfolios.some((entry) => entry.id === id && !entry.brokerId));
+            state.config.portfolios.some((entry) => entry.id === id && isManualPortfolio(entry)));
+        case "set-portfolio-position":
+          return manualPortfolios.length > 0;
         case "disconnect-broker-account":
           return state.config.brokerInstances.length > 0;
         case "delete-watchlist":
           return state.config.watchlists.length > 0;
         case "delete-portfolio":
-          return state.config.portfolios.some((entry) => !entry.brokerId && !entry.brokerInstanceId);
+          return manualPortfolios.length > 0;
         case "pane-settings":
           return focusedPaneHasSettings;
         default:
@@ -2204,6 +2454,8 @@ export function CommandBar({
           return activeTickerSymbol ? `Add ${activeTickerSymbol} to Portfolio` : command.label;
         case "remove-portfolio":
           return activeTickerSymbol ? `Remove ${activeTickerSymbol} from Portfolio` : command.label;
+        case "set-portfolio-position":
+          return activeTickerSymbol ? `Set Position for ${activeTickerSymbol}` : command.label;
         default:
           return command.label;
       }
@@ -2227,10 +2479,14 @@ export function CommandBar({
         }
         case "remove-portfolio": {
           const names = tickerData?.metadata.portfolios
-            .map((id) => state.config.portfolios.find((entry) => entry.id === id && !entry.brokerId)?.name)
+            .map((id) => state.config.portfolios.find((entry) => entry.id === id && isManualPortfolio(entry))?.name)
             .filter(Boolean);
           return names?.length ? `from "${names.join(", ")}"` : command.description;
         }
+        case "set-portfolio-position": {
+          const name = state.config.portfolios.find((entry) => entry.id === targetPortfolioId)?.name;
+          return name ? `in "${name}"` : command.description;
+        }
         case "check-for-updates":
           if (state.updateCheckInProgress) return "Checking GitHub releases now";
           if (state.updateAvailable) return `Latest available: v${state.updateAvailable.version}`;
@@ -2241,6 +2497,15 @@ export function CommandBar({
       }
     }
 
+    function smartSearchText(command: Command): string {
+      switch (command.id) {
+        case "set-portfolio-position":
+          return "edit position update position modify position manual position portfolio position";
+        default:
+          return "";
+      }
+    }
+
     function commandToItem(command: Command): ResultItem | null {
       if (!shouldShow(command)) return null;
       return {
@@ -2250,6 +2515,7 @@ export function CommandBar({
         category: command.category,
         kind: "command",
         right: command.prefix || undefined,
+        searchText: smartSearchText(command),
         disabled: command.id === "check-for-updates" && (state.updateCheckInProgress || !!state.updateProgress),
         action: () => runDirectCommand(command, ""),
       };
@@ -2291,13 +2557,19 @@ export function CommandBar({
         const displayTicker = normalizeTickerInput(activeTickerSymbol, rootShortcutIntent.argText);
         const displayName = kind === "watchlist" ? "Watchlist" : "Portfolio";
         const localTicker = displayTicker ? state.tickers.get(displayTicker) ?? null : null;
-        const preferredTargetId = resolvePreferredCollectionTarget(
-          state,
-          kind,
-          activeCollectionId,
-          action,
-          localTicker,
-        );
+        const preferredTargetId = commandId === "add-portfolio"
+          ? (activeCollectionId && manualPortfolios.some((portfolio) => portfolio.id === activeCollectionId)
+            ? activeCollectionId
+            : manualPortfolios.length === 1
+              ? manualPortfolios[0]!.id
+              : null)
+          : resolvePreferredCollectionTarget(
+            state,
+            kind,
+            activeCollectionId,
+            action,
+            localTicker,
+          );
         const preferredTargetName = preferredTargetId
           ? (kind === "watchlist"
             ? state.config.watchlists.find((entry) => entry.id === preferredTargetId)?.name
@@ -2872,22 +3144,22 @@ export function CommandBar({
         const symbol = normalizeTickerInput(activeTickerSymbol, rootShortcutIntent.argText);
         if (symbol) {
           return rootShortcutIntent.kind === "inferred-complete"
-            ? `Shortcut: ${rootShortcutIntent.template.label} for ${symbol} · Tab to accept`
-            : `Shortcut: ${rootShortcutIntent.template.label} for ${symbol}`;
+            ? `Shortcut: ${rootShortcutIntent.label} for ${symbol} · Tab to accept`
+            : `Shortcut: ${rootShortcutIntent.label} for ${symbol}`;
         }
-        return `Shortcut: ${rootShortcutIntent.template.label} · Enter to choose ticker`;
+        return `Shortcut: ${rootShortcutIntent.label} · Enter to choose ticker`;
       }
       if (argKind === "ticker-list") {
         if (rootShortcutIntent.argText) {
-          return `Shortcut: ${rootShortcutIntent.template.label} · ${rootShortcutIntent.argText}`;
+          return `Shortcut: ${rootShortcutIntent.label} · ${rootShortcutIntent.argText}`;
         }
         const inferred = normalizeTickerInput(activeTickerSymbol, undefined);
         if (inferred) {
-          return `Shortcut: ${rootShortcutIntent.template.label} · inferred ${inferred} · Tab to accept`;
+          return `Shortcut: ${rootShortcutIntent.label} · inferred ${inferred} · Tab to accept`;
         }
-        return `Shortcut: ${rootShortcutIntent.template.label} · Enter tickers to compare`;
+        return `Shortcut: ${rootShortcutIntent.label} · Enter tickers to compare`;
       }
-      return `Shortcut: ${rootShortcutIntent.template.label}`;
+      return `Shortcut: ${rootShortcutIntent.label}`;
     }
 
     if (rootShortcutIntent.command.id === "search-ticker") {
@@ -3617,6 +3889,7 @@ export function CommandBar({
   visibleListStateRef.current = routeListState;
 
   useEffect(() => {
+    if (!state.commandBarOpen) return;
     if (!routeListState) return;
     const selected = currentRoute?.kind === "mode" && currentRoute.screen === "themes"
       ? routeListState.results[currentRoute.selectedIdx]
@@ -3628,7 +3901,7 @@ export function CommandBar({
       applyTheme(selected.themeId);
       dispatch({ type: "SET_THEME", theme: selected.themeId });
     }
-  }, [currentRoute, dispatch, rootModeInfo.kind, rootSelectedIdx, routeListState, state.config.theme]);
+  }, [currentRoute, dispatch, rootModeInfo.kind, rootSelectedIdx, routeListState, state.commandBarOpen, state.config.theme]);
 
   useEffect(() => {
     if (currentRoute?.kind !== "workflow") return;
@@ -4080,6 +4353,7 @@ export function CommandBar({
         name: string;
         sequence?: string;
         ctrl?: boolean;
+        option?: boolean;
         meta?: boolean;
         shift?: boolean;
         stopPropagation: () => void;
@@ -4089,6 +4363,7 @@ export function CommandBar({
         name: string;
         sequence?: string;
         ctrl?: boolean;
+        option?: boolean;
         meta?: boolean;
         shift?: boolean;
         stopPropagation: () => void;
@@ -4099,6 +4374,7 @@ export function CommandBar({
       name: string;
       sequence?: string;
       ctrl?: boolean;
+      option?: boolean;
       meta?: boolean;
       shift?: boolean;
       stopPropagation: () => void;
@@ -4112,6 +4388,12 @@ export function CommandBar({
       }
 
       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();
@@ -4126,6 +4408,20 @@ export function CommandBar({
         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 (currentRoute?.kind === "workflow") {
         const visibleFields = getVisibleWorkflowFields(currentRoute.fields, currentRoute.values);
         const activeField = visibleFields.find((field) => field.id === currentRoute.activeFieldId) ?? visibleFields[0];