gloomberb 0.11.0 → 0.11.2

package/src/components/layout/shell/ticker-link-menu.ts

@@ -0,0 +1,78 @@
+import { updatePaneInstance } from "../../../pane-settings";
+import { listVisibleTickerSourcePanes } from "../../../plugins/ticker-navigation";
+import { resolveTickerForPane, type AppState } from "../../../state/app/context";
+import {
+  TICKER_RESEARCH_PANE_ID,
+  type LayoutConfig,
+  type PaneInstanceConfig,
+} from "../../../types/config";
+import type { ContextMenuItem } from "../../../types/context-menu";
+import type { PaneDef } from "../../../types/plugin";
+import { getPaneDisplayTitle } from "../pane/title";
+
+/**
+ * Flat link controls for a Ticker Research pane: one entry per visible ticker source, plus an
+ * unlink entry that pins the pane on the symbol it currently shows.
+ */
+export function tickerLinkMenuItems({
+  instance,
+  layout,
+  panes,
+  state,
+  persistLayout,
+}: {
+  instance: PaneInstanceConfig;
+  layout: LayoutConfig;
+  panes: ReadonlyMap<string, PaneDef>;
+  state: Pick<AppState, "config" | "paneState">;
+  persistLayout: (nextLayout: LayoutConfig) => void;
+}): ContextMenuItem[] {
+  if (instance.paneId !== TICKER_RESEARCH_PANE_ID) return [];
+
+  const sourceInstanceId = instance.binding?.kind === "follow" ? instance.binding.sourceInstanceId : null;
+  const rebind = (binding: PaneInstanceConfig["binding"]) => {
+    persistLayout(updatePaneInstance(layout, instance.instanceId, (current) => ({ ...current, binding })));
+  };
+  const linkToSource = (nextSourceId: string) => {
+    persistLayout({
+      ...layout,
+      instances: layout.instances.map((current) => {
+        if (current.instanceId === instance.instanceId) {
+          return { ...current, binding: { kind: "follow" as const, sourceInstanceId: nextSourceId } };
+        }
+        if (
+          current.paneId !== TICKER_RESEARCH_PANE_ID
+          || current.binding?.kind !== "follow"
+          || current.binding.sourceInstanceId !== nextSourceId
+        ) return current;
+
+        const symbol = resolveTickerForPane(state as AppState, current.instanceId);
+        return { ...current, binding: symbol ? { kind: "fixed" as const, symbol } : { kind: "none" as const } };
+      }),
+    });
+  };
+
+  return listVisibleTickerSourcePanes(layout, panes).flatMap((source): ContextMenuItem[] => {
+    const paneDef = panes.get(source.paneId);
+    if (!paneDef) return [];
+    const title = getPaneDisplayTitle(state, source, paneDef, panes);
+
+    if (source.instanceId !== sourceInstanceId) {
+      return [{
+        id: `link:${source.instanceId}`,
+        label: `Link to ${title}`,
+        onSelect: () => linkToSource(source.instanceId),
+      }];
+    }
+
+    // Unlinking keeps the pane alive, so it only works once a symbol has resolved.
+    const symbol = resolveTickerForPane(state as AppState, instance.instanceId);
+    return symbol
+      ? [{
+        id: `unlink:${source.instanceId}`,
+        label: `Unlink from ${title}`,
+        onSelect: () => rebind({ kind: "fixed", symbol }),
+      }]
+      : [];
+  });
+}

package/src/components/layout/status-bar.test.tsx

@@ -1,9 +1,10 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { testRender } from "../../renderers/opentui/test-utils";
 import { AppContext, createInitialState } from "../../state/app/context";
-import { cloneLayout, createDefaultConfig, TICKER_RESEARCH_PANE_ID, type LayoutConfig } from "../../types/config";
+import { cloneLayout, createDefaultConfig, createPaneInstance, type LayoutConfig } from "../../types/config";
 import type { AppNotificationRequest } from "../../types/plugin";
 import { StatusBar } from "./status-bar";
+import { getDockedPaneIds } from "../../plugins/pane-manager";
 import { setSharedRegistryForTests } from "../../plugins/registry";
 import { act, useEffect, useState } from "react";
 import { TransientLayoutProvider, useTransientLayout } from "./transient-layout";
@@ -185,34 +186,35 @@ describe("StatusBar", () => {
     expect(actions).toContainEqual({ type: "REORDER_LAYOUT", fromIndex: 0, toIndex: 2 });
   });
 
-  test("shows a gridlock tip after a corner snap and runs gridlock on click", async () => {
-    const config = createDefaultConfig("/tmp/gloomberb-test");
-    const floatingLayout = cloneLayout(config.layout);
-    floatingLayout.dockRoot = { kind: "pane", instanceId: "portfolio-list:main" };
-    floatingLayout.floating = [{ instanceId: "ticker-detail:main", x: 8, y: 2, width: 36, height: 12 }];
-
+  test("offers to tidy three floating windows and tiles them on click", async () => {
+    const config = createDefaultConfig("/tmp/gloomberb-tidy-test");
+    const floatingLayout: LayoutConfig = {
+      dockRoot: null,
+      instances: Array.from({ length: 3 }, (_, index) => createPaneInstance("chat", { instanceId: `chat-${index}` })),
+      floating: Array.from({ length: 3 }, (_, index) => ({
+        instanceId: `chat-${index}`,
+        x: index * 40,
+        y: 0,
+        width: 40,
+        height: 20,
+        zIndex: 50 + index,
+      })),
+      detached: [],
+    };
     const state = {
       ...createInitialState({
         ...config,
         layout: floatingLayout,
-        layouts: [
-          { name: "Default", layout: cloneLayout(floatingLayout) },
-          { name: "Research", layout: cloneLayout(floatingLayout) },
-        ],
+        layouts: [{ name: "Default", layout: cloneLayout(floatingLayout) }],
       }),
       statusBarVisible: true,
-      gridlockTipVisible: true,
     };
-
     const actions: Array<{ type: string }> = [];
-    let updatedLayout = null as ReturnType<typeof cloneLayout> | null;
+    let updatedLayout: LayoutConfig | null = null;
     const notifications: AppNotificationRequest[] = [];
 
     setSharedRegistryForTests({
-      panes: new Map([
-        ["portfolio-list", {}],
-        [TICKER_RESEARCH_PANE_ID, {}],
-      ]),
+      panes: new Map([["chat", { name: "Chat" }]]),
       getLayoutFn: () => state.config.layout,
       getTermSizeFn: () => ({ width: 120, height: 40 }),
       updateLayoutFn: (layout: LayoutConfig) => { updatedLayout = layout; },
@@ -228,76 +230,75 @@ describe("StatusBar", () => {
     );
 
     await testSetup.renderOnce();
-
     const frame = testSetup.captureCharFrame();
-    expect(frame).toContain("Snapped a window?");
-    expect(frame).toContain("Gridlock All");
-
-    const buttonX = frame.split("\n")[0]?.indexOf("Gridlock All") ?? -1;
+    const buttonX = frame.split("\n")[0]?.indexOf("Tidy Windows") ?? -1;
     expect(buttonX).toBeGreaterThanOrEqual(0);
 
     await testSetup.mockMouse.click(buttonX + 1, 0);
     await testSetup.renderOnce();
 
     expect(updatedLayout?.floating).toHaveLength(0);
-    expect(notifications).toHaveLength(1);
     expect(notifications[0]).toMatchObject({
-      body: "Retiled all panes",
+      body: "Windows tidied",
       type: "success",
       action: { label: "Revert" },
     });
-    expect(actions).toContainEqual({ type: "DISMISS_GRIDLOCK_TIP" });
-
     notifications[0]!.action!.onClick();
     expect(actions).toContainEqual({ type: "UNDO_LAYOUT" });
   });
 
-  test("auto-dismisses the gridlock tip after its timeout", async () => {
-    const config = createDefaultConfig("/tmp/gloomberb-test");
+  test("tidies covered windows instead of leaving them floating", async () => {
+    const config = createDefaultConfig("/tmp/gloomberb-covered-test");
+    const floatingLayout: LayoutConfig = {
+      dockRoot: null,
+      instances: Array.from({ length: 3 }, (_, index) => createPaneInstance("chat", { instanceId: `chat-${index}` })),
+      floating: Array.from({ length: 3 }, (_, index) => ({
+        instanceId: `chat-${index}`,
+        x: 10,
+        y: 4,
+        width: 50,
+        height: 20,
+        zIndex: 50 + index,
+      })),
+      detached: [],
+    };
     const state = {
-      ...createInitialState(config),
+      ...createInitialState({
+        ...config,
+        layout: floatingLayout,
+        layouts: [{ name: "Default", layout: cloneLayout(floatingLayout) }],
+      }),
       statusBarVisible: true,
-      gridlockTipVisible: true,
-      gridlockTipSequence: 1,
     };
-    const actions: Array<{ type: string }> = [];
-    const timers: Array<{ callback: (() => void) | null; delay: number | undefined }> = [];
-    const originalSetTimeout = globalThis.setTimeout;
-    const originalClearTimeout = globalThis.clearTimeout;
-
-    globalThis.setTimeout = ((callback: Parameters<typeof setTimeout>[0], delay?: number) => {
-      timers.push({ callback: typeof callback === "function" ? callback : null, delay });
-      return 1 as unknown as ReturnType<typeof setTimeout>;
-    }) as typeof setTimeout;
-    globalThis.clearTimeout = (() => {}) as typeof clearTimeout;
+    let updatedLayout: LayoutConfig | null = null;
+    const notifications: AppNotificationRequest[] = [];
 
     setSharedRegistryForTests({
-      panes: new Map(),
+      panes: new Map([["chat", { name: "Chat" }]]),
       getLayoutFn: () => state.config.layout,
       getTermSizeFn: () => ({ width: 120, height: 40 }),
-      updateLayoutFn: () => {},
-      notify: () => {},
+      updateLayoutFn: (layout: LayoutConfig) => { updatedLayout = layout; },
+      notify: (notification: AppNotificationRequest) => { notifications.push(notification); },
       Slot: () => null,
     } as any);
 
-    try {
-      testSetup = await testRender(
-        <AppContext value={{ state, dispatch: (action) => actions.push(action as { type: string }) }}>
-          <StatusBar />
-        </AppContext>,
-        { width: 120, height: 1 },
-      );
+    testSetup = await testRender(
+      <AppContext value={{ state, dispatch: () => {} }}>
+        <StatusBar />
+      </AppContext>,
+      { width: 120, height: 1 },
+    );
 
-      await testSetup.renderOnce();
+    await testSetup.renderOnce();
+    const frame = testSetup.captureCharFrame();
+    const tidyX = frame.split("\n")[0]?.indexOf("Tidy Windows") ?? -1;
+    expect(tidyX).toBeGreaterThanOrEqual(0);
 
-      const gridlockTimer = timers.find((entry) => entry.delay === 60_000);
-      expect(gridlockTimer?.callback).toBeDefined();
-      gridlockTimer?.callback?.();
+    await testSetup.mockMouse.click(tidyX + 1, 0);
+    await testSetup.renderOnce();
 
-      expect(actions).toContainEqual({ type: "DISMISS_GRIDLOCK_TIP" });
-    } finally {
-      globalThis.setTimeout = originalSetTimeout;
-      globalThis.clearTimeout = originalClearTimeout;
-    }
+    expect(updatedLayout?.floating).toHaveLength(0);
+    expect(getDockedPaneIds(updatedLayout!)).toHaveLength(3);
+    expect(notifications[0]?.body).toBe("Windows tidied");
   });
 });

package/src/components/layout/status-bar.tsx

@@ -1,28 +1,29 @@
 import { Box, Span, Text, TextAttributes, contextMenuDivider, useContextMenu, useUiCapabilities } from "../../ui";
 import { useDialog, type PromptContext } from "../../ui/dialog";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { blendHex, hoverBg } from "../../theme/colors";
 import { t, tf } from "../../i18n";
 import { useThemeColors } from "../../theme/theme-context";
 import { useAppDispatch, useAppSelector } from "../../state/app/context";
 import {
   selectActiveLayoutIndex,
-  selectGridlockTipSequence,
-  selectGridlockTipVisible,
+  selectLayout,
   selectSavedLayouts,
   selectStatusBarVisible,
 } from "../../state/selectors-ui";
 import { getSharedRegistry } from "../../plugins/registry";
-import { gridlockAllPanes } from "../../plugins/pane-manager";
+import {
+  gridlockAllPanes,
+  shouldShowTidyWindows,
+} from "../../plugins/pane-manager";
 import { notifyGridlockComplete } from "../../plugins/gridlock-notification";
 import { PluginSlot } from "../../react/plugins/plugin-slot";
 import type { ContextMenuItem } from "../../types/context-menu";
-import { Tabs } from "../ui/tabs";
+import type { LayoutConfig } from "../../types/config";
 import { ConfirmDialog } from "../ui/confirm-dialog";
+import { Tabs } from "../ui/tabs";
 import { useTransientLayout } from "./transient-layout";
 
-const GRIDLOCK_TIP_DURATION_MS = 60_000;
-
 type StatusBarEvent = { stopPropagation?: () => void; preventDefault?: () => void };
 type HoveredControl = string | null;
 type SetHoveredControl = (updater: (current: HoveredControl) => HoveredControl) => void;
@@ -37,10 +38,9 @@ type LayoutTabItem = {
 type StatusBarViewProps = {
   activeLayoutIdx: number;
   activeLayoutValue: string;
-  dismissGridlockTip: (event?: StatusBarEvent) => void;
-  handleGridlockTip: (event?: StatusBarEvent) => void;
   handleLayoutReorder: (fromValue: string, toValue: string) => void;
   handleLayoutSelect: (value: string) => void;
+  handleTidyWindows: (event?: StatusBarEvent) => void;
   hasMultipleLayouts: boolean;
   hoveredControl: HoveredControl;
   layoutTabItems: LayoutTabItem[];
@@ -48,7 +48,7 @@ type StatusBarViewProps = {
   openCommandBar: (event?: StatusBarEvent) => void;
   openLayoutContextMenu: (index: number, event: any) => void | Promise<unknown>;
   setHoveredControl: SetHoveredControl;
-  showGridlockTip: boolean;
+  showTidyWindows: boolean;
 };
 
 function truncate(text: string, width: number): string {
@@ -67,13 +67,14 @@ export function StatusBar() {
   const layouts = useAppSelector(selectSavedLayouts);
   const activeLayoutIdx = useAppSelector(selectActiveLayoutIndex);
   const statusBarVisible = useAppSelector(selectStatusBarVisible);
-  const gridlockTipVisible = useAppSelector(selectGridlockTipVisible);
-  const gridlockTipSequence = useAppSelector(selectGridlockTipSequence);
+  const layout = useAppSelector(selectLayout);
   const { transientLayout } = useTransientLayout();
   const [hoveredControl, setHoveredControl] = useState<string | null>(null);
 
   const hasMultipleLayouts = layouts.length > 1 || !!transientLayout;
-  const showGridlockTip = gridlockTipVisible && !!registry;
+  const showTidyWindows = useMemo(() => shouldShowTidyWindows(layout), [layout])
+    && !transientLayout?.active
+    && !!registry;
   const savedLayoutTabs = layouts.map((layout, index) => ({
     label: `^${index + 1} ${truncate(layout.name, 14)}`,
     value: String(index),
@@ -122,34 +123,24 @@ export function StatusBar() {
     dispatch({ type: "REORDER_LAYOUT", fromIndex, toIndex });
   };
 
-  useEffect(() => {
-    if (!gridlockTipVisible) return;
-    const timer = setTimeout(() => {
-      dispatch({ type: "DISMISS_GRIDLOCK_TIP" });
-    }, GRIDLOCK_TIP_DURATION_MS);
-    return () => clearTimeout(timer);
-  }, [dispatch, gridlockTipSequence, gridlockTipVisible]);
-
-  const handleGridlockTip = (event?: StatusBarEvent) => {
+  const handleTidyWindows = (event?: StatusBarEvent) => {
     event?.preventDefault?.();
     event?.stopPropagation?.();
     if (!registry) return;
+
+    const currentLayout = registry.getLayoutFn();
     const { width, height } = registry.getTermSizeFn();
-    registry.updateLayoutFn(gridlockAllPanes(
-      registry.getLayoutFn(),
+    const nextLayout = gridlockAllPanes(
+      currentLayout,
       { x: 0, y: 0, width, height },
       registry.panes,
-    ));
+    );
+    if (nextLayout === currentLayout) return;
+
+    registry.updateLayoutFn(nextLayout);
     notifyGridlockComplete(registry.notify.bind(registry), () => {
       dispatch({ type: "UNDO_LAYOUT" });
     });
-    dispatch({ type: "DISMISS_GRIDLOCK_TIP" });
-  };
-
-  const dismissGridlockTip = (event?: StatusBarEvent) => {
-    event?.preventDefault?.();
-    event?.stopPropagation?.();
-    dispatch({ type: "DISMISS_GRIDLOCK_TIP" });
   };
 
   const openCommandBar = (event?: StatusBarEvent) => {
@@ -226,10 +217,15 @@ export function StatusBar() {
         onSelect: () => requestDeleteLayout(index),
       },
       contextMenuDivider("layout:actions-divider"),
+      {
+        id: "layout:gallery",
+        label: "Browse Layouts...",
+        onSelect: () => registry?.showPane("layout-marketplace"),
+      },
       {
         id: "layout:actions",
         label: "Layout Actions...",
-        onSelect: () => registry?.openCommandBar("LAY "),
+        onSelect: () => registry?.openCommandBar("LMA "),
       },
     );
 
@@ -270,10 +266,9 @@ export function StatusBar() {
   const viewProps: StatusBarViewProps = {
     activeLayoutIdx,
     activeLayoutValue,
-    dismissGridlockTip,
-    handleGridlockTip,
     handleLayoutReorder,
     handleLayoutSelect,
+    handleTidyWindows,
     hasMultipleLayouts,
     hoveredControl,
     layoutTabItems,
@@ -281,7 +276,7 @@ export function StatusBar() {
     openCommandBar,
     openLayoutContextMenu,
     setHoveredControl,
-    showGridlockTip,
+    showTidyWindows,
   };
 
   if (nativePaneChrome) {
@@ -294,7 +289,7 @@ export function StatusBar() {
 function NativeStatusBar({
   activeLayoutIdx,
   openLayoutContextMenu,
-  showGridlockTip,
+  showTidyWindows,
   ...props
 }: StatusBarViewProps) {
   const colors = useThemeColors();
@@ -315,7 +310,7 @@ function NativeStatusBar({
       }}
     >
       <StatusBarLayoutControl nativePaneChrome {...props} />
-      {showGridlockTip && <NativeGridlockTip {...props} />}
+      {showTidyWindows && <NativeTidyWindows {...props} />}
       <StatusBarWidgets />
     </Box>
   );
@@ -324,7 +319,7 @@ function NativeStatusBar({
 function TerminalStatusBar({
   activeLayoutIdx,
   openLayoutContextMenu,
-  showGridlockTip,
+  showTidyWindows,
   ...props
 }: StatusBarViewProps) {
   const colors = useThemeColors();
@@ -340,7 +335,7 @@ function TerminalStatusBar({
       }}
     >
       <StatusBarLayoutControl nativePaneChrome={false} {...props} />
-      {showGridlockTip && <TerminalGridlockTip {...props} />}
+      {showTidyWindows && <TerminalTidyWindows {...props} />}
       <StatusBarWidgets />
     </Box>
   );
@@ -422,62 +417,45 @@ function CommandBarHint({
   );
 }
 
-function NativeGridlockTip({
-  dismissGridlockTip,
-  handleGridlockTip,
+function NativeTidyWindows({
+  handleTidyWindows,
   hoveredControl,
   setHoveredControl,
-}: Pick<StatusBarViewProps, "dismissGridlockTip" | "handleGridlockTip" | "hoveredControl" | "setHoveredControl">) {
+}: Pick<StatusBarViewProps, "handleTidyWindows" | "hoveredControl" | "setHoveredControl">) {
   const colors = useThemeColors();
+  const hovered = hoveredControl === "tidy-windows";
   return (
-    <Box paddingLeft={2} flexShrink={0} flexDirection="row" alignItems="center" gap={1}>
-      <Text fg={colors.textDim}>{t("Snapped a window?")}</Text>
+    <Box paddingLeft={2} flexShrink={0} flexDirection="row" alignItems="center">
       <Text
-        fg={hoveredControl === "gridlock-tip" ? colors.textBright : colors.borderFocused}
+        fg={hovered ? colors.textBright : colors.borderFocused}
         attributes={TextAttributes.BOLD}
-        onMouseOver={() => setHoveredControl((current) => (current === "gridlock-tip" ? current : "gridlock-tip"))}
-        onMouseDown={handleGridlockTip}
-        data-gloom-interactive="true"
-      >
-        {t("Gridlock All")}
-      </Text>
-      <Text
-        fg={hoveredControl === "gridlock-tip-dismiss" ? colors.text : colors.textDim}
-        onMouseOver={() => setHoveredControl((current) => (current === "gridlock-tip-dismiss" ? current : "gridlock-tip-dismiss"))}
-        onMouseDown={dismissGridlockTip}
+        title={t("Tidy Windows")}
+        onMouseOver={() => setHoveredControl((current) => (current === "tidy-windows" ? current : "tidy-windows"))}
+        onMouseDown={handleTidyWindows}
         data-gloom-interactive="true"
       >
-        {t("Dismiss")}
+        {t("Tidy Windows")}
       </Text>
     </Box>
   );
 }
 
-function TerminalGridlockTip({
-  dismissGridlockTip,
-  handleGridlockTip,
+function TerminalTidyWindows({
+  handleTidyWindows,
   hoveredControl,
   setHoveredControl,
-}: Pick<StatusBarViewProps, "dismissGridlockTip" | "handleGridlockTip" | "hoveredControl" | "setHoveredControl">) {
+}: Pick<StatusBarViewProps, "handleTidyWindows" | "hoveredControl" | "setHoveredControl">) {
   const colors = useThemeColors();
+  const hovered = hoveredControl === "tidy-windows";
   return (
     <Box paddingLeft={1} flexShrink={0} flexDirection="row">
-      <Text fg={colors.textDim}>{t("Snapped a window?")}</Text>
-      <Box width={1} />
       <Box
-        backgroundColor={hoveredControl === "gridlock-tip" ? hoverBg(colors) : colors.header}
-        onMouseOver={() => setHoveredControl((current) => (current === "gridlock-tip" ? current : "gridlock-tip"))}
-        onMouseDown={handleGridlockTip}
+        backgroundColor={hovered ? hoverBg(colors) : colors.header}
+        onMouseOver={() => setHoveredControl((current) => (current === "tidy-windows" ? current : "tidy-windows"))}
+        onMouseDown={handleTidyWindows}
       >
-        <Text fg={colors.headerText}> {t("Gridlock All")} </Text>
+        <Text fg={colors.headerText}> {t("Tidy Windows")} </Text>
       </Box>
-      <Text
-        fg={hoveredControl === "gridlock-tip-dismiss" ? colors.text : colors.textDim}
-        onMouseOver={() => setHoveredControl((current) => (current === "gridlock-tip-dismiss" ? current : "gridlock-tip-dismiss"))}
-        onMouseDown={dismissGridlockTip}
-      >
-        {" x"}
-      </Text>
     </Box>
   );
 }

package/src/components/onboarding/account-step/form-panel.tsx

@@ -3,7 +3,7 @@ import { Box, Text, TextAttributes, useUiHost, type InputRenderable } from "../.
 import { colors } from "../../../theme/colors";
 import { t } from "../../../i18n";
 import { TextField } from "../../ui";
-import type { AccountMode, AccountSubmitError } from "./model";
+import type { AccountMode, AccountSubmitError } from "../../../plugins/builtin/cloud/auth-model";
 
 function TuiFieldRow({
   label,
@@ -103,7 +103,8 @@ export function AccountFormPanel({
           label={t("Email")}
           inputRef={onEmail ? inputRef : undefined}
           value={email}
-          type="text"
+          type="email"
+          autoComplete="email"
           placeholder="email@example.com"
           focused={onEmail && editing && !submitting}
           backgroundColor={colors.panel}
@@ -118,6 +119,7 @@ export function AccountFormPanel({
           inputRef={!onEmail ? inputRef : undefined}
           value={password}
           type="password"
+          autoComplete={mode === "signup" ? "new-password" : "current-password"}
           placeholder={mode === "signup" ? t("At least 8 characters") : t("Your password")}
           focused={!onEmail && editing && !submitting}
           backgroundColor={colors.panel}

package/src/components/onboarding/account-step/index.tsx

@@ -4,7 +4,7 @@ import { AccountChooserPanel } from "./chooser-panel";
 import { AccountFormPanel } from "./form-panel";
 import { AccountQrPanel } from "./qr-panel";
 import { AccountSignedInPanel } from "./signed-in-panel";
-import type { AccountOutcome, AccountSub, AccountSubmitError } from "./model";
+import type { AccountOutcome, AccountSub, AccountSubmitError } from "../../../plugins/builtin/cloud/auth-model";
 
 export interface AccountStepProps {
   sub: AccountSub;

package/src/components/onboarding/account-step/signed-in-panel.tsx

@@ -1,7 +1,7 @@
 import { Box, Text, TextAttributes, useUiHost } from "../../../ui";
 import { colors } from "../../../theme/colors";
 import { t, tf } from "../../../i18n";
-import type { AccountOutcome } from "./model";
+import type { AccountOutcome } from "../../../plugins/builtin/cloud/auth-model";
 
 export function AccountSignedInPanel({ outcome }: { outcome: AccountOutcome | null }) {
   const email = outcome?.email ?? "";

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

@@ -21,7 +21,7 @@ import type { TickerRecord } from "../../types/ticker";
 import { EventBus } from "../../plugins/event-bus";
 import type { PluginRegistry } from "../../plugins/registry";
 import type { BrokerAdapter, BrokerPosition } from "../../types/broker";
-import { ACCOUNT_CHOICE_IDS } from "./account-step/model";
+import { ACCOUNT_CHOICE_IDS } from "../../plugins/builtin/cloud/auth-model";
 import { OnboardingWizard } from "./onboarding-wizard";
 
 let testSetup: Awaited<ReturnType<typeof testRender>> | undefined;
@@ -595,6 +595,49 @@ describe("OnboardingWizard", () => {
     expect(capturedConfig?.onboardingProgress?.stage).toBe("account");
   });
 
+  test("loads the current Cloud price on the Pro step", async () => {
+    tempDataDir = await mkdtemp(join(tmpdir(), "gloomberb-onboarding-pro-price-"));
+    const getCloudPricing = apiClient.getCloudPricing;
+    let resolvePricing!: (pricing: Awaited<ReturnType<typeof apiClient.getCloudPricing>>) => void;
+    apiClient.getCloudPricing = () => new Promise((resolve) => {
+      resolvePricing = resolve;
+    });
+
+    try {
+      const pluginRegistry = createPluginRegistry();
+      const config = {
+        ...createDefaultConfig(tempDataDir),
+        onboardingProgress: {
+          version: 1 as const,
+          stage: "upgrade" as const,
+          accountStatus: "signed-in" as const,
+        },
+      };
+      testSetup = await testRender(
+        <WizardHarness config={config} pluginRegistry={pluginRegistry} />,
+        { width: 100, height: 30 },
+      );
+      await testSetup.renderOnce();
+      await act(async () => {
+        resolvePricing({
+          currency: "usd",
+          trialDays: 7,
+          founding: true,
+          monthly: { amount: 3900, anchorAmount: 4900 },
+          yearly: { amount: 39000, anchorAmount: 49000 },
+        });
+        await Bun.sleep(0);
+        await testSetup!.renderOnce();
+      });
+
+      const frame = testSetup.captureCharFrame();
+      expect(frame).toContain("$49/mo");
+      expect(frame).not.toContain("$29/mo");
+    } finally {
+      apiClient.getCloudPricing = getCloudPricing;
+    }
+  });
+
   test("Not now skips Pro and moves directly to ready", async () => {
     tempDataDir = await mkdtemp(join(tmpdir(), "gloomberb-onboarding-cloud-skip-"));
     const pluginRegistry = createPluginRegistry();