gloomberb 0.7.5 → 0.8.1

package/src/components/onboarding/onboarding-wizard.tsx

@@ -1,22 +1,28 @@
-import { AsciiText, Box, Span, Strong, Text, Underline, useUiHost } from "../../ui";
-import { useState, useCallback, useEffect, useRef, useMemo, type RefObject } from "react";
-import { useShortcut, useViewport } from "../../react/input";
-import { TextAttributes } from "../../ui";
-import { type InputRenderable } from "../../ui";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Box, Text, type InputRenderable } from "../../ui";
+import { useViewport } from "../../react/input";
 import { colors, applyTheme } from "../../theme/colors";
-import { themes, getThemeIds } from "../../theme/themes";
-import { saveConfig } from "../../data/config-store";
+import { getThemeIds } from "../../theme/themes";
 import type { AppConfig } from "../../types/config";
 import type { PluginRegistry } from "../../plugins/registry";
-import { resolveBrokerConfigFields, type BrokerAdapter, type BrokerConfigField } from "../../types/broker";
-import { buildBrokerProfileConfig, validateBrokerProfileValues } from "../../brokers/profile-form";
-import { createBrokerInstanceId } from "../../utils/broker-instances";
-import { isBackNavigationKey, isPlainEscape } from "../../utils/back-navigation";
-import { isPlainKey } from "../../utils/keyboard";
-import { detectShortcutPlatform, formatPrimaryShortcut, getShortcutDisplayMode } from "../../utils/shortcut-labels";
-import { syncBrokerInstance } from "../../brokers/sync-broker-instance";
-import { debugLog } from "../../utils/debug-log";
-import { TextField, ExternalLink, ListView, type ListViewItem } from "../ui";
+import { resolveBrokerConfigFields, type BrokerConfigField } from "../../types/broker";
+import type { ListViewItem } from "../ui";
+import {
+  PortfolioStep,
+  ReadyStep,
+  ShortcutsStep,
+  ThemeStep,
+  WelcomeStep,
+  type PortfolioSub,
+} from "./onboarding-steps";
+import { finishOnboarding, summarizeOnboardingError, useOnboardingBrokerSync } from "./wizard-broker-sync";
+import { useOnboardingKeyboard } from "./wizard-keyboard";
+import {
+  getConnectableBrokerOptions,
+  ONBOARDING_STEPS,
+  type BrokerOption,
+  type OnboardingStep,
+} from "./wizard-model";
 
 interface OnboardingWizardProps {
   config: AppConfig;
@@ -24,106 +30,30 @@ interface OnboardingWizardProps {
   onComplete: (config: AppConfig) => void | Promise<void>;
 }
 
-type Step = "welcome" | "theme" | "portfolio" | "shortcuts" | "ready";
-const STEPS: Step[] = ["welcome", "theme", "portfolio", "shortcuts", "ready"];
-
-// Sub-steps within the portfolio step
-type PortfolioSub = "choose" | "manual-name" | "broker-setup" | "broker-fields" | "broker-sync";
-
-interface BrokerOption {
-  id: string;
-  name: string;
-  adapter: BrokerAdapter;
-}
-
-const LOGO_TEXT = "Gloomberb";
-
-const PASSWORD_MASK_CHAR = "*";
-const onboardingLog = debugLog.createLogger("onboarding");
-
-interface BrokerSyncSummary {
-  portfolioId: string | null;
-  positionsImported: number;
-}
-
-function summarizeError(error: unknown): string {
-  if (error instanceof Error && error.message.trim()) {
-    return error.message.trim();
-  }
-  return "Unable to finish onboarding.";
-}
-
-function focusPortfolioListCollection(config: AppConfig, collectionId: string): AppConfig {
-  const nextInstances = config.layout.instances.map((instance) => {
-    if (instance.paneId !== "portfolio-list") {
-      return instance;
-    }
-
-    const visibleCollectionIds = Array.isArray(instance.settings?.visibleCollectionIds)
-      ? instance.settings.visibleCollectionIds.filter((value): value is string => typeof value === "string")
-      : [];
-
-    return {
-      ...instance,
-      params: {
-        ...instance.params,
-        collectionId,
-      },
-      settings: {
-        ...instance.settings,
-        visibleCollectionIds: [collectionId, ...visibleCollectionIds.filter((value) => value !== collectionId)],
-      },
-    };
-  });
-
-  return {
-    ...config,
-    layout: {
-      ...config.layout,
-      instances: nextInstances,
-    },
-  };
-}
-
 export function OnboardingWizard({ config, pluginRegistry, onComplete }: OnboardingWizardProps) {
   const { width: termWidth, height: termHeight } = useViewport();
-  const [step, setStep] = useState<Step>("welcome");
+  const [step, setStep] = useState<OnboardingStep>("welcome");
   const [themeIdx, setThemeIdx] = useState(0);
-
-  // Portfolio state
   const [portfolioSub, setPortfolioSub] = useState<PortfolioSub>("choose");
   const [portfolioOptionIdx, setPortfolioOptionIdx] = useState(0);
   const [portfolioName, setPortfolioName] = useState("Main Portfolio");
-  // Broker credentials: brokerId -> { field_key -> value }
   const [brokerValues, setBrokerValues] = useState<Record<string, Record<string, string>>>({});
   const [selectedBrokerId, setSelectedBrokerId] = useState<string | null>(null);
   const [brokerFieldIdx, setBrokerFieldIdx] = useState(0);
   const [brokerSelectIdx, setBrokerSelectIdx] = useState(0);
   const [editingField, setEditingField] = useState(false);
-  const [isBrokerSyncing, setIsBrokerSyncing] = useState(false);
-  const [brokerSyncError, setBrokerSyncError] = useState<string | null>(null);
-  const [brokerSyncedConfig, setBrokerSyncedConfig] = useState<AppConfig | null>(null);
-  const [brokerSyncSummary, setBrokerSyncSummary] = useState<BrokerSyncSummary | null>(null);
   const [isFinishing, setIsFinishing] = useState(false);
   const [finishError, setFinishError] = useState<string | null>(null);
 
   const inputRef = useRef<InputRenderable>(null);
-  const brokerSyncAttemptRef = useRef(0);
   const themeIds = getThemeIds();
-  const stepIdx = STEPS.indexOf(step);
+  const stepIdx = ONBOARDING_STEPS.indexOf(step);
 
-  // Discover connectable brokers from plugin registry (those with config fields)
-  const brokerOptions = useMemo((): BrokerOption[] => {
-    const options: BrokerOption[] = [];
-    for (const [id, adapter] of pluginRegistry.brokers) {
-      if (adapter.configSchema.length > 0) {
-        options.push({ id, name: adapter.name, adapter });
-      }
-    }
-    return options;
-  }, [pluginRegistry.brokers]);
+  const brokerOptions = useMemo(
+    (): BrokerOption[] => getConnectableBrokerOptions(pluginRegistry.brokers),
+    [pluginRegistry.brokers],
+  );
 
-  // Build the list of choices for the portfolio step: manual + all connectable brokers
   const portfolioChoices = useMemo<ListViewItem[]>(() => {
     const choices: ListViewItem[] = [
       { id: "manual", label: "Create Manual Portfolio", description: "Add tickers and positions by hand" },
@@ -138,21 +68,18 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
     return choices;
   }, [brokerOptions]);
 
-  // Get the currently selected broker's required fields
   const activeBrokerFields = useMemo((): BrokerConfigField[] => {
     if (!selectedBrokerId) return [];
-    const broker = brokerOptions.find((b) => b.id === selectedBrokerId);
+    const broker = brokerOptions.find((option) => option.id === selectedBrokerId);
     return broker
       ? resolveBrokerConfigFields(broker.adapter, brokerValues[selectedBrokerId] ?? {}).filter((field) => field.required)
       : [];
   }, [selectedBrokerId, brokerOptions, brokerValues]);
 
-  // Apply theme preview synchronously so colors are correct for this render
   if (step === "theme") {
     applyTheme(themeIds[themeIdx]!);
   }
 
-  // Focus input when entering editing mode
   useEffect(() => {
     if (editingField) {
       setTimeout(() => inputRef.current?.focus(), 10);
@@ -175,130 +102,39 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
   }, [finishError, step]);
 
   const nextStep = useCallback(() => {
-    const idx = STEPS.indexOf(step);
-    if (idx < STEPS.length - 1) {
+    const idx = ONBOARDING_STEPS.indexOf(step);
+    if (idx < ONBOARDING_STEPS.length - 1) {
       setEditingField(false);
-      setStep(STEPS[idx + 1]!);
+      setStep(ONBOARDING_STEPS[idx + 1]!);
     }
   }, [step]);
 
   const prevStep = useCallback(() => {
-    const idx = STEPS.indexOf(step);
+    const idx = ONBOARDING_STEPS.indexOf(step);
     if (idx > 0) {
-      setStep(STEPS[idx - 1]!);
+      setStep(ONBOARDING_STEPS[idx - 1]!);
     }
   }, [step]);
 
-  const resetBrokerSync = useCallback(() => {
-    brokerSyncAttemptRef.current += 1;
-    setIsBrokerSyncing(false);
-    setBrokerSyncError(null);
-    setBrokerSyncedConfig(null);
-    setBrokerSyncSummary(null);
-  }, []);
-
-  const buildDraftBrokerConfig = useCallback((brokerValueOverrides?: Record<string, string>) => {
-    const selectedValues = selectedBrokerId ? (brokerValueOverrides ?? brokerValues[selectedBrokerId]) : null;
-    if (!selectedBrokerId || selectedBrokerId === "manual" || !selectedValues) {
-      throw new Error("Broker setup is incomplete.");
-    }
-
-    const brokerOption = brokerOptions.find((option) => option.id === selectedBrokerId);
-    const adapter = brokerOption?.adapter;
-    if (!adapter) throw new Error(`Unknown broker "${selectedBrokerId}".`);
-    const validationError = validateBrokerProfileValues(adapter, selectedValues);
-    if (validationError) throw new Error(validationError);
-
-    const label = brokerOption?.name || selectedBrokerId;
-    const brokerConfig = buildBrokerProfileConfig(adapter, selectedValues);
-    const instanceId = createBrokerInstanceId(
-      selectedBrokerId,
-      label,
-      config.brokerInstances.map((instance) => instance.id),
-    );
-
-    return {
-      instanceId,
-      config: {
-        ...config,
-        brokerInstances: [
-          ...config.brokerInstances,
-          {
-            id: instanceId,
-            brokerType: selectedBrokerId,
-            label,
-            connectionMode: typeof brokerConfig.connectionMode === "string" ? brokerConfig.connectionMode : undefined,
-            config: brokerConfig,
-            enabled: true,
-          },
-        ],
-      } satisfies AppConfig,
-    };
-  }, [brokerOptions, brokerValues, config, selectedBrokerId]);
-
-  const syncSelectedBroker = useCallback(async (brokerValueOverrides?: Record<string, string>) => {
-    const attemptId = brokerSyncAttemptRef.current + 1;
-    brokerSyncAttemptRef.current = attemptId;
-    setEditingField(false);
-    setPortfolioSub("broker-sync");
-    setIsBrokerSyncing(true);
-    setBrokerSyncError(null);
-    setBrokerSyncedConfig(null);
-    setBrokerSyncSummary(null);
-
-    try {
-      const { config: draftConfig, instanceId } = buildDraftBrokerConfig(brokerValueOverrides);
-      onboardingLog.info("Syncing broker during onboarding", { instanceId, brokerId: selectedBrokerId });
-      const result = await syncBrokerInstance({
-        config: draftConfig,
-        instanceId,
-        brokers: pluginRegistry.brokers,
-        tickerRepository: pluginRegistry.tickerRepository,
-        resources: pluginRegistry.persistence.resources,
-        persistResolvedBrokerConfig: true,
-      });
-      if (brokerSyncAttemptRef.current !== attemptId) {
-        return;
-      }
-
-      const portfolioId = result.portfolioIds[0] ?? null;
-      const nextConfig = portfolioId
-        ? focusPortfolioListCollection(result.config, portfolioId)
-        : result.config;
-      setBrokerSyncedConfig(nextConfig);
-      setBrokerSyncSummary({
-        portfolioId,
-        positionsImported: result.positions.length,
-      });
-      setBrokerSyncError(null);
-      setIsBrokerSyncing(false);
-      setPortfolioSub("broker-fields");
-      onboardingLog.info("Broker onboarding sync completed", {
-        instanceId,
-        portfolioId,
-        positionsImported: result.positions.length,
-      });
-      nextStep();
-    } catch (error) {
-      if (brokerSyncAttemptRef.current !== attemptId) {
-        return;
-      }
-
-      onboardingLog.error("Broker onboarding sync failed", { error: summarizeError(error), brokerId: selectedBrokerId });
-      setBrokerSyncError(summarizeError(error));
-      setIsBrokerSyncing(false);
-      setPortfolioSub("broker-sync");
-    }
-  }, [
-    buildDraftBrokerConfig,
-    nextStep,
-    pluginRegistry.brokers,
-    pluginRegistry.persistence.resources,
-    pluginRegistry.tickerRepository,
+  const {
+    isBrokerSyncing,
+    brokerSyncError,
+    brokerSyncedConfig,
+    brokerSyncSummary,
+    resetBrokerSync,
+    syncSelectedBroker,
+  } = useOnboardingBrokerSync({
+    config,
+    brokerOptions,
+    brokerValues,
     selectedBrokerId,
-  ]);
+    pluginRegistry,
+    nextStep,
+    setEditingField,
+    setPortfolioSub,
+  });
 
-  const finish = useCallback(async () => {
+  const finish = useCallback(() => {
     if (isFinishing) {
       return;
     }
@@ -307,31 +143,21 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
     const selectedTheme = themeIds[themeIdx]!;
     applyTheme(selectedTheme);
 
-    const isBroker = selectedBrokerId && selectedBrokerId !== "manual";
+    const isBroker = Boolean(selectedBrokerId && selectedBrokerId !== "manual");
     const baseConfig = isBroker ? brokerSyncedConfig : config;
 
     setIsFinishing(true);
-    try {
-      if (isBroker && !baseConfig) {
-        throw new Error("Connect and sync the broker before finishing onboarding.");
-      }
-
-      const updatedConfig: AppConfig = {
-        ...(baseConfig ?? config),
-        theme: selectedTheme,
-        portfolios: isBroker
-          ? (baseConfig ?? config).portfolios
-          : [{ id: "main", name: portfolioName || "Main Portfolio", currency: "USD" }],
-        disabledPlugins: [],
-        onboardingComplete: true,
-      };
-
-      await saveConfig(updatedConfig);
-      await Promise.resolve(onComplete(updatedConfig));
-    } catch (error) {
-      setFinishError(summarizeError(error));
+    void finishOnboarding({
+      config,
+      baseConfig,
+      isBroker,
+      selectedTheme,
+      portfolioName,
+      onComplete,
+    }).catch((error) => {
+      setFinishError(summarizeOnboardingError(error));
       setIsFinishing(false);
-    }
+    });
   }, [
     brokerSyncedConfig,
     config,
@@ -343,7 +169,6 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
     themeIdx,
   ]);
 
-  // Helper to update a broker field value
   const setBrokerFieldValue = useCallback((brokerId: string, key: string, value: string) => {
     resetBrokerSync();
     setBrokerValues((prev) => ({
@@ -352,219 +177,49 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
     }));
   }, [resetBrokerSync]);
 
-  useShortcut((event) => {
-    if (isFinishing) {
-      return;
-    }
-
-    // --- Input field handling ---
-    if (editingField) {
-      if (event.name === "return") {
-        setEditingField(false);
-        if (portfolioSub === "manual-name") {
-          nextStep();
-        } else if (portfolioSub === "broker-fields" && selectedBrokerId) {
-          const currentField = activeBrokerFields[brokerFieldIdx];
-          if (!currentField) {
-            void syncSelectedBroker();
-            return;
-          }
-          const rawValue = brokerValues[selectedBrokerId]?.[currentField.key] ?? "";
-          const currentValue = rawValue.trim() || currentField.defaultValue || "";
-          if (currentValue) {
-            const nextValues = {
-              ...(brokerValues[selectedBrokerId] ?? {}),
-              [currentField.key]: currentValue,
-            };
-            if (!rawValue.trim() && currentField.defaultValue) {
-              setBrokerFieldValue(selectedBrokerId, currentField.key, currentField.defaultValue);
-            }
-            // Move to next field, or advance to next step if all fields done
-            if (brokerFieldIdx < activeBrokerFields.length - 1) {
-              const nextIndex = brokerFieldIdx + 1;
-              const nextField = activeBrokerFields[nextIndex];
-              setBrokerFieldIdx(nextIndex);
-              setEditingField(nextField?.type !== "select");
-            } else {
-              void syncSelectedBroker(nextValues);
-            }
-          }
-        }
-      } else if (isPlainEscape(event)) {
-        setEditingField(false);
-        if (portfolioSub === "broker-fields") {
-          setPortfolioSub("broker-setup");
-        } else {
-          setPortfolioSub("choose");
-          setBrokerFieldIdx(0);
-        }
-      }
-      return; // Let input handle other keys
-    }
-
-    // --- Global nav ---
-    if (event.name === "return" || event.name === "enter") {
-      if (step === "ready") {
-        void finish();
-        return;
-      }
-      if (step === "portfolio") {
-        if (portfolioSub === "choose") {
-          const choice = portfolioChoices[portfolioOptionIdx]!;
-          if (choice.id === "manual") {
-            resetBrokerSync();
-            setSelectedBrokerId(null);
-            setPortfolioSub("manual-name");
-            setEditingField(true);
-          } else {
-            resetBrokerSync();
-            setSelectedBrokerId(choice.id);
-            setBrokerFieldIdx(0);
-            setPortfolioSub("broker-fields");
-            const broker = brokerOptions.find((option) => option.id === choice.id);
-            const initialField = broker
-              ? resolveBrokerConfigFields(broker.adapter, brokerValues[choice.id] ?? {}).filter((field) => field.required)[0]
-              : null;
-            setEditingField(initialField?.type !== "select");
-          }
-          return;
-        }
-        if (portfolioSub === "broker-setup" && selectedBrokerId) {
-          setPortfolioSub("broker-fields");
-          const currentField = activeBrokerFields[brokerFieldIdx];
-          setEditingField(currentField?.type !== "select");
-          return;
-        }
-        if (portfolioSub === "broker-fields" && selectedBrokerId) {
-          const currentField = activeBrokerFields[brokerFieldIdx];
-          if (!currentField) {
-            void syncSelectedBroker();
-            return;
-          }
-          if (currentField.type === "select") {
-            const option = currentField.options?.[brokerSelectIdx];
-            if (!option) return;
-            setBrokerFieldValue(selectedBrokerId, currentField.key, option.value);
-            const nextValues = {
-              ...(brokerValues[selectedBrokerId] ?? {}),
-              [currentField.key]: option.value,
-            };
-            const broker = brokerOptions.find((entry) => entry.id === selectedBrokerId);
-            const fields = broker
-              ? resolveBrokerConfigFields(broker.adapter, nextValues).filter((field) => field.required)
-              : activeBrokerFields;
-            if (brokerFieldIdx < fields.length - 1) {
-              const nextIndex = brokerFieldIdx + 1;
-              const nextField = fields[nextIndex];
-              setBrokerFieldIdx(nextIndex);
-              // Show setup guide after connection mode is selected
-              if (currentField.key === "connectionMode") {
-                setPortfolioSub("broker-setup");
-              } else {
-                setEditingField(nextField?.type !== "select");
-              }
-            } else {
-              void syncSelectedBroker(nextValues);
-            }
-            return;
-          }
-          if (!editingField) {
-            setEditingField(true);
-            return;
-          }
-        }
-        if (portfolioSub === "broker-sync") {
-          if (!isBrokerSyncing && brokerSyncError) {
-            void syncSelectedBroker();
-          }
-          return;
-        }
-      }
-      nextStep();
-    } else if (isBackNavigationKey(event)) {
-      if (step === "portfolio" && portfolioSub === "broker-sync") {
-        resetBrokerSync();
-        setPortfolioSub("broker-fields");
-        return;
-      }
-      if (step === "portfolio" && portfolioSub === "broker-fields") {
-        setPortfolioSub("broker-setup");
-        return;
-      }
-      if (step === "portfolio" && portfolioSub === "broker-setup") {
-        setPortfolioSub("broker-fields");
-        setBrokerFieldIdx(0);
-        return;
-      }
-      if (step === "portfolio" && portfolioSub !== "choose") {
-        setPortfolioSub("choose");
-        setBrokerFieldIdx(0);
-        return;
-      }
-      prevStep();
-    } else if (event.name === "left") {
-      if (step === "portfolio" && portfolioSub === "broker-sync") {
-        resetBrokerSync();
-        setPortfolioSub("broker-fields");
-        return;
-      }
-      if (step === "portfolio" && portfolioSub === "broker-fields") {
-        setPortfolioSub("broker-setup");
-        return;
-      }
-      if (step === "portfolio" && portfolioSub === "broker-setup") {
-        setPortfolioSub("broker-fields");
-        setBrokerFieldIdx(0);
-        return;
-      }
-      if (step === "portfolio" && portfolioSub !== "choose") {
-        setPortfolioSub("choose");
-        setBrokerFieldIdx(0);
-        return;
-      }
-      prevStep();
-    } else if (event.name === "right") {
-      nextStep();
-    }
-
-    // --- Step-specific controls ---
-    if (step === "theme") {
-      if (isPlainKey(event, "up", "k")) {
-        setThemeIdx((i) => Math.max(0, i - 1));
-      } else if (isPlainKey(event, "down", "j")) {
-        setThemeIdx((i) => Math.min(themeIds.length - 1, i + 1));
-      }
-    } else if (step === "portfolio" && portfolioSub === "choose") {
-      if (isPlainKey(event, "up", "k")) {
-        setPortfolioOptionIdx((i) => Math.max(0, i - 1));
-      } else if (isPlainKey(event, "down", "j")) {
-        setPortfolioOptionIdx((i) => Math.min(portfolioChoices.length - 1, i + 1));
-      }
-    } else if (step === "portfolio" && portfolioSub === "broker-fields" && selectedBrokerId) {
-      const currentField = activeBrokerFields[brokerFieldIdx];
-      if (currentField?.type === "select") {
-        const optionCount = currentField.options?.length ?? 0;
-        if (isPlainKey(event, "up", "k")) {
-          setBrokerSelectIdx((index) => Math.max(0, index - 1));
-        } else if (isPlainKey(event, "down", "j")) {
-          setBrokerSelectIdx((index) => Math.min(optionCount - 1, index + 1));
-        }
-      }
-    }
+  useOnboardingKeyboard({
+    step,
+    portfolioSub,
+    setPortfolioSub,
+    themeIds,
+    setThemeIdx,
+    portfolioChoices,
+    portfolioOptionIdx,
+    setPortfolioOptionIdx,
+    brokerOptions,
+    brokerValues,
+    selectedBrokerId,
+    setSelectedBrokerId,
+    activeBrokerFields,
+    brokerFieldIdx,
+    setBrokerFieldIdx,
+    brokerSelectIdx,
+    setBrokerSelectIdx,
+    editingField,
+    setEditingField,
+    isBrokerSyncing,
+    brokerSyncError,
+    isFinishing,
+    nextStep,
+    prevStep,
+    finish,
+    resetBrokerSync,
+    setBrokerFieldValue,
+    syncSelectedBroker,
   });
 
   const contentWidth = Math.min(60, termWidth - 4);
   const contentLeft = Math.floor((termWidth - contentWidth) / 2);
   const contentTop = Math.max(1, Math.floor((termHeight - 24) / 2));
-
-  // Progress bar
-  const progressDots = STEPS.map((s, i) => {
-    if (i < stepIdx) return "\u2501";
-    if (i === stepIdx) return "\u25cf";
+  const progressDots = ONBOARDING_STEPS.map((_, index) => {
+    if (index < stepIdx) return "\u2501";
+    if (index === stepIdx) return "\u25cf";
     return "\u00b7";
   }).join(" ");
+  const connectedBrokerName = selectedBrokerId
+    ? brokerOptions.find((broker) => broker.id === selectedBrokerId)?.name
+    : null;
 
-  // Bottom hint text
   let hintText = "enter ->";
   if (step === "ready") {
     hintText = "enter to launch";
@@ -575,11 +230,6 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
     hintText = "launching...";
   }
 
-  // Determine what the ready step should show
-  const connectedBrokerName = selectedBrokerId
-    ? brokerOptions.find((b) => b.id === selectedBrokerId)?.name
-    : null;
-
   return (
     <Box
       position="absolute"
@@ -632,7 +282,6 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
           />
         )}
 
-        {/* Bottom: progress + nav hints */}
         <Box height={1} />
         <Box height={1} flexDirection="row" width={contentWidth}>
           <Box flexGrow={1}>
@@ -649,590 +298,3 @@ export function OnboardingWizard({ config, pluginRegistry, onComplete }: Onboard
     </Box>
   );
 }
-
-// --- Step Components ---
-
-function WelcomeStep() {
-  return (
-    <Box flexDirection="column" paddingX={2}>
-      <Box height={1} />
-      <AsciiText text={LOGO_TEXT} font="wordmark" color={colors.textBright} />
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.textDim}>{"The open terminal for modern finance."}</Text>
-      </Box>
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.textMuted}>{"Let's set things up (~30s)."}</Text>
-      </Box>
-      <Box height={2} />
-
-    </Box>
-  );
-}
-
-function ThemeStep({ themeIds, selectedIdx, height }: { themeIds: string[]; selectedIdx: number; height: number }) {
-  const maxVisible = Math.min(themeIds.length, Math.max(6, height - 12));
-  const halfWindow = Math.floor(maxVisible / 2);
-  let windowStart = Math.max(0, Math.min(selectedIdx - halfWindow, themeIds.length - maxVisible));
-  if (windowStart < 0) windowStart = 0;
-  const windowEnd = Math.min(themeIds.length, windowStart + maxVisible);
-
-  return (
-    <Box flexDirection="column" paddingX={2}>
-      <Box height={1}>
-        <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{"Theme"}</Text>
-      </Box>
-      <Box height={1} />
-      <Box height={1} flexDirection="row">
-        <Text fg={colors.textDim}>{"Change it later from the command bar with "}</Text>
-        <Text fg={colors.text} attributes={TextAttributes.BOLD}>{"TH"}</Text>
-      </Box>
-      <Box height={1} />
-      <Box height={1}>
-        <Text fg={colors.positive}>{" \u2588\u2588 "}</Text>
-        <Text fg={colors.negative}>{" \u2588\u2588 "}</Text>
-        <Text fg={colors.text}>{" \u2588\u2588 "}</Text>
-        <Text fg={colors.textBright}>{" \u2588\u2588 "}</Text>
-        <Text fg={colors.borderFocused}>{" \u2588\u2588 "}</Text>
-        <Text fg={colors.textDim}>{" \u2588\u2588 "}</Text>
-      </Box>
-      <Box height={1} />
-
-      {windowStart > 0 && (
-        <Box height={1}>
-          <Text fg={colors.textMuted}>{"\u2191 more"}</Text>
-        </Box>
-      )}
-
-      {themeIds.slice(windowStart, windowEnd).map((id, i) => {
-        const theme = themes[id]!;
-        const globalIdx = windowStart + i;
-        const isSel = globalIdx === selectedIdx;
-        return (
-          <Box key={id} height={1} backgroundColor={isSel ? colors.selected : colors.bg}>
-            <Text fg={isSel ? colors.selectedText : colors.textDim}>
-              {isSel ? "\u25b8 " : "  "}
-            </Text>
-            <Text fg={isSel ? colors.text : colors.textDim} attributes={isSel ? TextAttributes.BOLD : 0}>
-              {theme.name}
-            </Text>
-          </Box>
-        );
-      })}
-
-      {windowEnd < themeIds.length && (
-        <Box height={1}>
-          <Text fg={colors.textMuted}>{"\u2193 more"}</Text>
-        </Box>
-      )}
-
-      <Box height={1} />
-      <Box height={1}>
-        <Text fg={colors.textMuted}>{"Use \u2191\u2193 to browse"}</Text>
-      </Box>
-    </Box>
-  );
-}
-
-function PortfolioStep({
-  sub,
-  choices,
-  optionIdx,
-  onOptionSelect,
-  portfolioName,
-  onNameChange,
-  selectedBrokerId,
-  brokerFields,
-  brokerFieldIdx,
-  brokerSelectIdx,
-  brokerValues,
-  onBrokerFieldChange,
-  editing,
-  inputRef,
-  brokerSyncing,
-  brokerSyncError,
-}: {
-  sub: PortfolioSub;
-  choices: ListViewItem[];
-  optionIdx: number;
-  onOptionSelect: (idx: number) => void;
-  portfolioName: string;
-  onNameChange: (n: string) => void;
-  selectedBrokerId: string | null;
-  brokerFields: BrokerConfigField[];
-  brokerFieldIdx: number;
-  brokerSelectIdx: number;
-  brokerValues: Record<string, Record<string, string>>;
-  onBrokerFieldChange: (brokerId: string, key: string, value: string) => void;
-  editing: boolean;
-  inputRef: RefObject<InputRenderable | null>;
-  brokerSyncing: boolean;
-  brokerSyncError: string | null;
-}) {
-  if (sub === "choose") {
-    return (
-      <Box flexDirection="column" paddingX={2}>
-        <Box height={1}>
-          <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{"Set up a portfolio"}</Text>
-        </Box>
-        <Box height={1} />
-        <Box height={1}>
-          <Text fg={colors.textDim}>{"How would you like to get started?"}</Text>
-        </Box>
-        <Box height={2} />
-
-        <ListView
-          items={choices}
-          selectedIndex={optionIdx}
-          onSelect={onOptionSelect}
-          showSelectedDescription
-        />
-
-        <Box height={1} />
-        <Box height={1}>
-          <Text fg={colors.textDim}>{"Edits later from the command bar."}</Text>
-        </Box>
-        <Box height={1} />
-        <Box height={1}>
-          <Text fg={colors.textMuted}>{"Use \u2191\u2193 to choose"}</Text>
-        </Box>
-      </Box>
-    );
-  }
-
-  if (sub === "manual-name") {
-    return (
-      <Box flexDirection="column" paddingX={2}>
-        <Box height={1}>
-          <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{"Name your portfolio"}</Text>
-        </Box>
-        <Box height={1} />
-        <Box height={1}>
-          <Text fg={colors.textDim}>{"Create watchlists later."}</Text>
-        </Box>
-        <Box height={2} />
-        <Box height={1}>
-          <Text fg={colors.text}>{"Portfolio name:"}</Text>
-        </Box>
-        <Box height={1}>
-          {editing ? (
-            <TextField
-              inputRef={inputRef}
-              value={portfolioName}
-              placeholder="Main Portfolio"
-              focused
-              backgroundColor={colors.panel}
-              textColor={colors.text}
-              placeholderColor={colors.textDim}
-              onChange={onNameChange}
-              onSubmit={() => {}}
-            />
-          ) : (
-            <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>
-              {`> ${portfolioName}`}
-            </Text>
-          )}
-        </Box>
-        <Box height={2} />
-        <Box height={1} flexDirection="row">
-          <Text fg={colors.textDim}>{"After setup, use the command bar ("}</Text>
-          <Text fg={colors.text}>{"Ctrl+P"}</Text>
-          <Text fg={colors.textDim}>{") and"}</Text>
-        </Box>
-        <Box height={1} flexDirection="row">
-          <Text fg={colors.textDim}>{"type "}</Text>
-          <Text fg={colors.text} attributes={TextAttributes.BOLD}>{"DES AAPL"}</Text>
-          <Text fg={colors.textDim}>{" to open security details for a stock or ETF."}</Text>
-        </Box>
-      </Box>
-    );
-  }
-
-  if (sub === "broker-setup" && selectedBrokerId) {
-    const brokerLabel = choices.find((c) => c.id === selectedBrokerId)?.label.replace("Connect ", "") ?? selectedBrokerId;
-    const connectionMode = brokerValues[selectedBrokerId]?.connectionMode;
-    const isGateway = connectionMode === "gateway";
-
-    return (
-      <Box flexDirection="column" paddingX={2}>
-        <Box height={1}>
-          <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>
-            {`Setup Guide — ${brokerLabel}`}
-          </Text>
-        </Box>
-        <Box height={1} />
-
-        {selectedBrokerId === "ibkr" && !isGateway && (
-          <>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"You'll need 2 things from IBKR Account Management:"}</Text>
-            </Box>
-            <Box height={2} />
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"1. Go to "}<Underline><Span fg={colors.text}>{"Reports > Flex Queries"}</Span></Underline></Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"2. Create a Flex Query that includes positions data"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"3. Note the "}<Strong><Span fg={colors.text}>{"Query ID"}</Span></Strong>{" (numeric)"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"4. Under "}<Underline><Span fg={colors.text}>{"Reports > Settings"}</Span></Underline>{", generate a "}<Strong><Span fg={colors.text}>{"Flex Web Service Token"}</Span></Strong></Text>
-            </Box>
-            <Box height={2} />
-            <ExternalLink url="https://www.ibkrguides.com/orgportal/performanceandstatements/flex.htm" />
-          </>
-        )}
-
-        {selectedBrokerId === "ibkr" && isGateway && (
-          <>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"You'll need IB Gateway or TWS running locally:"}</Text>
-            </Box>
-            <Box height={2} />
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"1. Download and install "}<Strong><Span fg={colors.text}>{"IB Gateway"}</Span></Strong>{" (or use TWS)"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"2. Log in with your IBKR credentials"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"3. In "}<Underline><Span fg={colors.text}>{"Configuration > API > Settings"}</Span></Underline>{":"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"   Enable \"ActiveX and Socket Clients\""}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"   Gloomberb can auto-detect local API ports (4001, 4002, 7496, 7497)"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"   Use Manual setup only if you need a custom host or exact socket port"}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"4. Keep it running while using Gloomberb"}</Text>
-            </Box>
-            <Box height={2} />
-            <ExternalLink url="https://www.interactivebrokers.com/en/trading/ibgateway-stable.php" />
-          </>
-        )}
-
-        {selectedBrokerId !== "ibkr" && (
-          <>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{`You'll need your ${brokerLabel} API credentials.`}</Text>
-            </Box>
-            <Box height={1}>
-              <Text fg={colors.textDim}>{"Check your broker's documentation for setup instructions."}</Text>
-            </Box>
-          </>
-        )}
-
-        <Box height={2} />
-
-      </Box>
-    );
-  }
-
-  if (sub === "broker-sync" && selectedBrokerId) {
-    const brokerLabel = choices.find((choice) => choice.id === selectedBrokerId)?.label.replace("Connect ", "") ?? selectedBrokerId;
-    return (
-      <Box flexDirection="column" paddingX={2}>
-        <Box height={1}>
-          <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{`Connect ${brokerLabel}`}</Text>
-        </Box>
-        <Box height={1} />
-        <Box height={1}>
-          <Text fg={brokerSyncing ? colors.text : colors.negative}>
-            {brokerSyncing
-              ? `Connecting to ${brokerLabel} and importing accounts and positions...`
-              : brokerSyncError || `Unable to sync ${brokerLabel}.`}
-          </Text>
-        </Box>
-        <Box height={2} />
-        <Box height={1}>
-          <Text fg={colors.textDim}>
-            {brokerSyncing
-              ? "This happens now so your portfolio is ready before onboarding finishes."
-              : "Press Enter to retry, or Backspace to edit the broker settings."}
-          </Text>
-        </Box>
-      </Box>
-    );
-  }
-
-  // broker-fields: dynamically render fields from the broker's configSchema
-  if (!selectedBrokerId) return null;
-  const values = brokerValues[selectedBrokerId] ?? {};
-
-  return (
-    <Box flexDirection="column" paddingX={2}>
-      <Box height={1}>
-        <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>
-          {"Connect "}{choices.find((c) => c.id === selectedBrokerId)?.label.replace("Connect ", "") ?? selectedBrokerId}
-        </Text>
-      </Box>
-      <Box height={1} />
-
-      {/* Show completed fields */}
-      {brokerFields.map((field, i) => {
-        if (i > brokerFieldIdx) return null;
-        const val = values[field.key] ?? "";
-        const isActive = i === brokerFieldIdx;
-
-        if (!isActive && val) {
-          const selectedLabel = field.type === "select"
-            ? field.options?.find((option) => option.value === val)?.label ?? val
-            : field.type === "password" ? PASSWORD_MASK_CHAR.repeat(val.length) : val;
-          return (
-            <Box key={field.key} height={1}>
-              <Text fg={colors.positive}>{"\u2713 "}</Text>
-              <Text fg={colors.text}>{`${field.label}: ${selectedLabel}`}</Text>
-            </Box>
-          );
-        }
-
-        if (isActive) {
-          const activeSelectValue = field.options?.[brokerSelectIdx]?.value ?? values[field.key] ?? "";
-          const effectiveValue = val || field.defaultValue || "";
-          return (
-            <Box key={field.key} flexDirection="column">
-              {i > 0 && <Box height={1} />}
-              <Box height={1}>
-                <Text fg={colors.text} attributes={TextAttributes.BOLD}>
-                  {`Step ${i + 1}: `}
-                </Text>
-                <Text fg={colors.text}>{field.label}</Text>
-              </Box>
-              <Box height={1}>
-                {field.type !== "select" && (editing ? (
-                  <TextField
-                    inputRef={inputRef}
-                    value={val}
-                    type={field.type === "password" ? "password" : "text"}
-                    placeholder={field.placeholder || `Enter ${field.label.toLowerCase()}`}
-                    focused
-                    backgroundColor={colors.panel}
-                    textColor={colors.text}
-                    placeholderColor={colors.textDim}
-                    onChange={(nextValue) => onBrokerFieldChange(selectedBrokerId, field.key, nextValue)}
-                    onSubmit={() => {}}
-                  />
-                ) : (
-                  <Text fg={effectiveValue ? colors.positive : colors.textMuted}>
-                    {effectiveValue
-                      ? `\u2713 ${field.label}: ${field.type === "password" ? PASSWORD_MASK_CHAR.repeat(effectiveValue.length) : effectiveValue}`
-                      : "Press enter to type..."}
-                  </Text>
-                ))}
-              </Box>
-              {field.type !== "select" && !val && field.defaultValue && (
-                <Box height={1}>
-                  <Text fg={colors.textMuted}>{`Press enter to use ${field.defaultValue}`}</Text>
-                </Box>
-              )}
-              {field.type === "select" && (
-                <Box flexDirection="column">
-                  {(field.options ?? []).map((option, optionIdx) => {
-                    const selected = optionIdx === brokerSelectIdx;
-                    return (
-                      <Box key={option.value} flexDirection="column" backgroundColor={selected ? colors.selected : colors.bg}>
-                        <Box height={1}>
-                          <Text fg={selected ? colors.selectedText : colors.textDim}>{selected ? "\u25b8 " : "  "}</Text>
-                          <Text
-                            fg={selected ? colors.text : colors.textDim}
-                            attributes={selected ? TextAttributes.BOLD : 0}
-                          >
-                            {option.label}
-                          </Text>
-                        </Box>
-                        {option.description && (
-                          <Box height={1}>
-                            <Text fg={colors.textMuted}>{`  ${option.description}`}</Text>
-                          </Box>
-                        )}
-                      </Box>
-                    );
-                  })}
-                </Box>
-              )}
-              {field.type === "select" && (
-                <Box height={1}>
-                  <Text fg={colors.textMuted}>
-                    {activeSelectValue ? `Selected: ${field.options?.find((option) => option.value === activeSelectValue)?.label ?? activeSelectValue}` : "Use \u2191\u2193 to choose"}
-                  </Text>
-                </Box>
-              )}
-            </Box>
-          );
-        }
-
-        return null;
-      })}
-
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.textDim}>{"Credentials are saved locally."}</Text>
-      </Box>
-      <Box height={1} />
-      <Box height={1}>
-        <Text fg={colors.textMuted}>
-          {`Field ${brokerFieldIdx + 1} of ${brokerFields.length}`}
-        </Text>
-      </Box>
-    </Box>
-  );
-}
-
-function ShortcutsStep({ pluginRegistry }: { pluginRegistry: PluginRegistry }) {
-  const uiHost = useUiHost();
-  const shortcutPlatform = detectShortcutPlatform();
-  const shortcutDisplayMode = getShortcutDisplayMode(uiHost.kind);
-  const platformShortcut = (keys: string | readonly string[]) => formatPrimaryShortcut(keys, shortcutPlatform, shortcutDisplayMode);
-  const keyboardShortcuts = [
-    { key: "Ctrl+P / `", desc: "Open the command bar" },
-    { key: "Tab", desc: "Switch between panels" },
-    { key: platformShortcut("W"), desc: "Close the focused pane" },
-    { key: platformShortcut(["Shift", "D"]), desc: "Dock or float the focused pane" },
-    { key: "q", desc: "Quit" },
-  ];
-
-  const commandPrefixes = useMemo(() => {
-    const builtIn = [
-      { key: "DES AAPL", desc: "Open security details" },
-      { key: "TH", desc: "Switch theme" },
-      { key: "PL", desc: "Toggle plugins" },
-      { key: "PS", desc: "Edit the current window settings" },
-      { key: "HELP", desc: "Open the help window" },
-    ];
-
-    const builtInKeys = new Set(builtIn.map((b) => b.key.split(" ")[0]));
-    const pluginPrefixes: { key: string; desc: string }[] = [];
-
-    for (const [, template] of pluginRegistry.paneTemplates) {
-      if (!template.shortcut) continue;
-      if (builtInKeys.has(template.shortcut.prefix)) continue;
-      const label = template.shortcut.argPlaceholder
-        ? `${template.shortcut.prefix} <${template.shortcut.argPlaceholder}>`
-        : template.shortcut.prefix;
-      pluginPrefixes.push({ key: label, desc: template.label });
-    }
-
-    pluginPrefixes.sort((a, b) => a.key.localeCompare(b.key));
-    return [...builtIn, ...pluginPrefixes];
-  }, [pluginRegistry]);
-
-  const COL = 20;
-
-  return (
-    <Box flexDirection="column" paddingX={2}>
-      <Box height={1}>
-        <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{"After launch shortcuts"}</Text>
-      </Box>
-      <Box height={1} />
-
-      {keyboardShortcuts.map((s) => (
-        <Box key={s.key} height={1} flexDirection="row">
-          <Text fg={colors.text} attributes={TextAttributes.BOLD}>{s.key.padEnd(COL)}</Text>
-          <Text fg={colors.textDim}>{s.desc}</Text>
-        </Box>
-      ))}
-
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{"Command-bar prefixes"}</Text>
-      </Box>
-      <Box height={1} />
-      <Box height={1}>
-        <Text fg={colors.textDim}>{"Type these in the command bar ("}<Span fg={colors.text}><Strong>{"Ctrl+P"}</Strong></Span>{" or "}<Span fg={colors.text}><Strong>{"`"}</Strong></Span>{"):"}</Text>
-      </Box>
-      <Box height={1} />
-
-      {commandPrefixes.map((s) => (
-        <Box key={s.key} height={1} flexDirection="row">
-          <Text fg={colors.text} attributes={TextAttributes.BOLD}>{s.key.padEnd(COL)}</Text>
-          <Text fg={colors.textDim}>{s.desc}</Text>
-        </Box>
-      ))}
-
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.textDim}>{"Everything is searchable, just type what you want."}</Text>
-      </Box>
-    </Box>
-  );
-}
-
-function ReadyStep({
-  brokerName,
-  portfolioName,
-  brokerSyncSummary,
-  isFinishing,
-  error,
-}: {
-  brokerName: string | null;
-  portfolioName: string;
-  brokerSyncSummary: BrokerSyncSummary | null;
-  isFinishing: boolean;
-  error: string | null;
-}) {
-  const positionsImported = brokerSyncSummary?.positionsImported ?? 0;
-  const positionLabel = positionsImported === 1 ? "position" : "positions";
-
-  return (
-    <Box flexDirection="column" paddingX={2}>
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>{"You're all set"}</Text>
-      </Box>
-      <Box height={2} />
-      <Box height={1}>
-        <Text fg={colors.positive} attributes={TextAttributes.BOLD}>{"\u2713"}</Text>
-        <Text fg={colors.text}>{" Theme configured"}</Text>
-      </Box>
-      <Box height={1}>
-        <Text fg={colors.positive} attributes={TextAttributes.BOLD}>{"\u2713"}</Text>
-        <Text fg={colors.text}>
-          {brokerName
-            ? ` ${brokerName} connected. Imported ${positionsImported} ${positionLabel}`
-            : ` Portfolio "${portfolioName}" created`}
-        </Text>
-      </Box>
-      <Box height={1}>
-        <Text fg={colors.positive} attributes={TextAttributes.BOLD}>{"\u2713"}</Text>
-        <Text fg={colors.text}>{" Plugins enabled"}</Text>
-      </Box>
-      <Box height={2} />
-      {brokerName ? (
-        <Box height={1}>
-          <Text fg={isFinishing ? colors.text : colors.textDim}>
-            {isFinishing
-              ? "Launching Gloomberb..."
-              : positionsImported > 0
-              ? "Your broker portfolio is ready and will open directly after launch."
-              : "Broker sync finished. If you expected holdings, check the selected account or connection mode."}
-          </Text>
-        </Box>
-      ) : (
-        <Box height={1}>
-          <Text fg={colors.textDim}>{"Search for broker names in the command bar to connect."}</Text>
-        </Box>
-      )}
-      {error && (
-        <>
-          <Box height={1} />
-          <Box height={2}>
-            <Text fg={colors.negative}>{error}</Text>
-          </Box>
-        </>
-      )}
-      <Box height={2} />
-      <Box height={1} flexDirection="row">
-        <Text fg={colors.textDim}>{"Data stored in "}</Text>
-        <Text fg={colors.text}>{"~/gloomberb/"}</Text>
-      </Box>
-      <Box height={1} />
-    </Box>
-  );
-}