@gloom-sh/terminal 0.19.1 → 0.19.3

package/src/components/onboarding/first-run-workspace.ts

@@ -8,6 +8,8 @@ import {
   type SavedLayout,
 } from "../../types/config";
 import type { TickerMetadata, TickerRecord } from "../../types/ticker";
+import { MAX_DESK_PICKS, type DeskKey } from "../../layout/desk-keys";
+import { DESKS, isDeskKey } from "../../layout/desks";
 
 /**
  * The watchlist a first run lands with: the two index ETFs and the names most
@@ -211,13 +213,88 @@ export function buildFirstRunLayout({
   };
 }
 
-/** Replaces the Home layout with the first-run workspace and makes it active. */
-export function applyFirstRunLayout(config: AppConfig, home: SavedLayout): AppConfig {
-  const layouts = config.layouts.length > 0 ? [home, ...config.layouts.slice(1)] : [home];
+/**
+ * The ids of the layouts onboarding makes. Running it again finds its own
+ * layouts by these and replaces them, so it never adds a copy; a layout
+ * without one is the user's.
+ */
+const ONBOARDING_HOME_LAYOUT_ID = "onboarding:home";
+const ONBOARDING_LAYOUT_ID_PREFIX = "onboarding:";
+const ONBOARDING_DESK_LAYOUT_ID_PREFIX = `${ONBOARDING_LAYOUT_ID_PREFIX}desk:`;
+
+export function onboardingDeskLayoutId(desk: DeskKey): string {
+  return `${ONBOARDING_DESK_LAYOUT_ID_PREFIX}${desk}`;
+}
+
+function isOnboardingLayout(layout: SavedLayout): boolean {
+  return layout.id?.startsWith(ONBOARDING_LAYOUT_ID_PREFIX) === true;
+}
+
+/**
+ * Takes back the layouts setup made before it tagged them, so a run from
+ * Settings rebuilds them in place instead of copying them. Such a profile
+ * has setup's Home first and its desks right after it, under the desks'
+ * names. A first layout not called Home is the user's, and so is
+ * everything after the desks.
+ */
+function adoptUntaggedSetupLayouts(config: AppConfig): AppConfig {
+  const [first, ...rest] = config.layouts;
+  if (!first || first.name !== "Home" || config.layouts.some(isOnboardingLayout)) return config;
+  const desks: SavedLayout[] = [];
+  for (const layout of rest) {
+    const key = DESKS.find((desk) => desk.name === layout.name)?.key;
+    if (!key || desks.length >= MAX_DESK_PICKS || desks.some((desk) => desk.id === onboardingDeskLayoutId(key))) break;
+    desks.push({ ...layout, id: onboardingDeskLayoutId(key) });
+  }
+  return {
+    ...config,
+    layouts: [{ ...first, id: ONBOARDING_HOME_LAYOUT_ID }, ...desks, ...rest.slice(desks.length)],
+  };
+}
+
+/** The desks setup made that are still tabs, in tab order: what a run from Settings starts with ticked. */
+export function setupDeskPicks(config: AppConfig): DeskKey[] {
+  const picks: DeskKey[] = [];
+  for (const layout of adoptUntaggedSetupLayouts(config).layouts) {
+    const key = layout.id?.startsWith(ONBOARDING_DESK_LAYOUT_ID_PREFIX)
+      ? layout.id.slice(ONBOARDING_DESK_LAYOUT_ID_PREFIX.length)
+      : null;
+    if (isDeskKey(key) && !picks.includes(key)) picks.push(key);
+  }
+  return picks.slice(0, MAX_DESK_PICKS);
+}
+
+/**
+ * Puts the first-run workspace in place and makes Home active: Home, then a
+ * tab per picked desk. The layouts an earlier run made are replaced where
+ * they stood, and a desk not picked this time goes with them; a first run
+ * replaces the stock Home it starts with. Every other layout is the user's
+ * and keeps its place and content. A run from Settings (`rerun`) also
+ * rebuilds what setup made before it tagged its layouts, and with none of
+ * setup's left it puts Home first, replacing nothing.
+ */
+export function applyFirstRunLayout(
+  config: AppConfig,
+  home: SavedLayout,
+  desks: ReadonlyArray<SavedLayout & { id: string }> = [],
+  { rerun = false }: { rerun?: boolean } = {},
+): AppConfig {
+  const { layouts: current } = rerun ? adoptUntaggedSetupLayouts(config) : config;
+  const earlier = current.findIndex(isOnboardingLayout);
+  const users = current.filter((layout) => !isOnboardingLayout(layout));
+  // Everything before the first layout onboarding made is the user's, so its index holds.
+  const at = earlier >= 0 ? earlier : 0;
+  const kept = earlier >= 0 || rerun ? users : users.slice(1);
+  const layouts = [
+    ...kept.slice(0, at),
+    { ...home, id: ONBOARDING_HOME_LAYOUT_ID },
+    ...desks,
+    ...kept.slice(at),
+  ];
   return {
     ...config,
     layouts,
     layout: home.layout,
-    activeLayoutIndex: 0,
+    activeLayoutIndex: at,
   };
 }

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

@@ -219,7 +219,8 @@ export function OnboardingCoach({
       </Box>
       <Box height={1} />
       <Box flexGrow={1} minHeight={0}>{children}</Box>
-      <Box height={1} flexDirection="row" gap={1}>{actions}</Box>
+      {/* As OnboardingActions: a button that does not fit beside the one before it wraps under it. */}
+      <Box flexDirection="row" flexWrap="wrap" alignItems="center" columnGap={1} flexShrink={0}>{actions}</Box>
     </Box>
   );
 }
@@ -358,7 +359,8 @@ export function OnboardingHeader({
   }
 
   // Progress, not navigation: three segments, the current one lit, the ones
-  // behind it filled. A filled segment is still a way back.
+  // behind it filled. A filled segment is a way back unless the wizard marks
+  // it unavailable: a step done for good stays filled and is not offered again.
   const activeIndex = sections.findIndex((section) => section.id === active);
   return (
     <Box flexDirection="row" alignItems="flex-start" justifyContent="space-between" minWidth={0}>

package/src/components/onboarding/onboarding-keyboard.ts

@@ -58,7 +58,7 @@ export function useOnboardingKeyboard({
   submitAccountField, backPortfolio, continuePortfolio, setPortfolioOptionIdx, activeBrokerFields,
   brokerFieldIdx, setBrokerSelectIdx, brokerChoices, openBrokerGuide, chosenDesks, finishDesks,
   setDeskCursor, deskCursor, setChosenDesks, continueAccount, skipSetup, primaryUpgradeAction,
-  setBillingInterval, keybindings, dialogOpen, commandBarOpen, saveProgressInBackground,
+  setBillingInterval, keybindings, dialogOpen, commandBarOpen, saveProgressInBackground, goBack,
 }: {
   stage: OnboardingStage;
   progress: OnboardingProgress;
@@ -102,6 +102,8 @@ export function useOnboardingKeyboard({
   dialogOpen: boolean;
   commandBarOpen: boolean;
   saveProgressInBackground: (patch: Partial<OnboardingProgress> & Pick<OnboardingProgress, "stage">, baseConfig?: AppConfig | undefined) => void;
+  /** Back on the card: to the step the user came from. */
+  goBack: () => void;
 }) {
   const activeSection: OnboardingSectionId = stage === "portfolio" || stage === "desks"
     ? "portfolio"
@@ -128,7 +130,8 @@ export function useOnboardingKeyboard({
 
     const handled = ((): boolean => {
       if (isPlainKey(event, "f10")) {
-        if (stage === "portfolio" || stage === "desks" || isBrokerCommitting) return true;
+        // The first run needs a holding; a run from Settings can be left as it was.
+        if (isBrokerCommitting || ((stage === "portfolio" || stage === "desks") && !progress.rerun)) return true;
         if (stage === "upgrade" && !planAccess.hasProAccess) continueFree();
         else void finish(true);
         return true;
@@ -234,7 +237,7 @@ export function useOnboardingKeyboard({
           continueAccount();
         } else if (escape) {
           if (account.accountSub === "qr" || account.accountSub === "login") account.returnToAccountForm();
-          else goToSection("portfolio");
+          else goBack();
         } else if (letter(BROWSER_SIGN_IN_KEY) && accountForm) {
           account.beginQrSignIn();
         } else if (letter(SKIP_SETUP_KEY)) {
@@ -251,7 +254,7 @@ export function useOnboardingKeyboard({
         if (enter) {
           primaryUpgradeAction();
         } else if (escape) {
-          goToSection("cloud");
+          goBack();
         } else if (!planAccess.hasProAccess && letter(KEEP_FREE_KEY)) {
           continueFree();
         } else if (!planAccess.hasProAccess && (isPlainKey(event, "left") || letter("h"))) {
@@ -266,7 +269,7 @@ export function useOnboardingKeyboard({
 
       if (stage === "ready") {
         if (enter) void finish();
-        else if (escape) goToSection(progress.accountStatus === "signed-in" ? "pro" : "cloud");
+        else if (escape) goBack();
         else return false;
         return true;
       }

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

@@ -20,7 +20,7 @@ import { t, tf } from "../../i18n";
 import { useAppLanguage } from "../../i18n/react";
 import type { PluginRegistry } from "../../plugins/registry";
 import { formatCloudPrice, monthsFreeYearly } from "../../account/billing";
-import { proStepCopy, proStepRealtimeTitle } from "../../account/upgrade-dialog";
+import { proStepCopy } from "../../account/upgrade-dialog";
 import { Button, SegmentedControl, terminalButtonColumns } from "../ui";
 import { AccountStep, PortfolioStep } from "./onboarding-steps";
 import {
@@ -41,7 +41,7 @@ import { useOnboardingAccount } from "./wizard-account";
 import { useOnboardingBrokerSync } from "./wizard-broker-sync";
 import { useOnboardingPositions } from "./wizard-positions";
 import { DesksStep, toggleDeskChoice } from "./desks-step";
-import { getOnboardingProgress } from "./wizard-model";
+import { getOnboardingProgress, isOnboardingWorkspaceBuilt, previousOnboardingStage } from "./wizard-model";
 import {
   useOnboardingKeyboard,
   SKIP_SETUP_KEY,
@@ -86,7 +86,22 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
   const config = useAppSelector((state) => state.config);
   const progress = getOnboardingProgress(config);
   const stage = progress.stage;
+  const workspaceBuilt = isOnboardingWorkspaceBuilt(progress);
+  /** Opened again from Settings: any step can be left, and the first-run funnel is not told. */
+  const rerun = progress.rerun === true;
   const researchOpenedRef = useRef<string | null>(null);
+  /** The stages the user came through, oldest first, for Back to retrace. */
+  const visitedRef = useRef<OnboardingStage[]>([]);
+  const shownStageRef = useRef(stage);
+  const backTargetRef = useRef<OnboardingStage | null>(null);
+  useEffect(() => {
+    const left = shownStageRef.current;
+    if (left === stage) return;
+    shownStageRef.current = stage;
+    const back = backTargetRef.current === stage;
+    backTargetRef.current = null;
+    if (!back) visitedRef.current = [...visitedRef.current, left];
+  }, [stage]);
   const [editingField, setEditingField] = useState(false);
   /** The added position the keyboard acts on once no field is being typed in. */
   const [positionCursorSymbol, setPositionCursorSymbol] = useState<string | null>(null);
@@ -109,7 +124,7 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
   // bar, so an unread inbox never stalls the first session.
   const account = useOnboardingAccount({
     nextStep: () => {
-      recordResearchActivity("onboarding_signed_in");
+      if (!rerun) recordResearchActivity("onboarding_signed_in");
       saveProgressInBackground({ stage: "upgrade", accountStatus: "signed-in" });
     },
     setEditingField,
@@ -127,12 +142,12 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
 
   useEffect(() => {
     const activity = STAGE_ACTIVITY[stage];
-    if (activity) recordResearchActivity(activity);
-  }, [stage]);
+    if (activity && !rerun) recordResearchActivity(activity);
+  }, [rerun, stage]);
 
   useEffect(() => {
-    if (stage === "portfolio" && positionCount > 0) recordResearchActivity("onboarding_position_added");
-  }, [positionCount, stage]);
+    if (stage === "portfolio" && positionCount > 0 && !rerun) recordResearchActivity("onboarding_position_added");
+  }, [positionCount, rerun, stage]);
 
   // The portfolio step opens straight into the ticker field.
   useEffect(() => {
@@ -197,8 +212,8 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
   useEffect(() => {
     if (stage !== "research" || !progress.tickerSymbol || researchOpenedRef.current === progress.tickerSymbol) return;
     researchOpenedRef.current = progress.tickerSymbol;
-    recordResearchActivity("ticker_saved");
-  }, [stage, progress.tickerSymbol]);
+    if (!rerun) recordResearchActivity("ticker_saved");
+  }, [rerun, stage, progress.tickerSymbol]);
   const movePositionCursor = useCallback((delta: number) => {
     if (positionCursorIndex < 0) return;
     const next = Math.max(0, Math.min(positionCount - 1, positionCursorIndex + delta));
@@ -239,16 +254,17 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
     : null;
   const helpFocused = focusedInstance?.paneId === "help";
   const {
-    offer, pricing, billingInterval, setBillingInterval, planAccess, primaryUpgradeAction, continueFree, personalTickers,
+    offer, pricing, billingInterval, setBillingInterval, planAccess, primaryUpgradeAction, continueFree,
   } = useOnboardingUpgrade({
     stage, progress, saveProgressInBackground, persistProgress,
-    shown: !helpFocused && !dialogOpen && !commandBarOpen,
   });
 
   const goToSection = useCallback((section: OnboardingSectionId) => {
     if (finishingRef.current || isBrokerCommitting) return;
     setEditingField(false);
     if (section === "portfolio") {
+      // Done for good once the workspace is built: picking it again would build it twice.
+      if (workspaceBuilt) return;
       setPortfolioSub("positions");
       saveProgressInBackground({ stage: "portfolio" });
       return;
@@ -260,10 +276,22 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
     if (planAccess.signedIn) {
       saveProgressInBackground({ stage: "upgrade", accountStatus: "signed-in" });
     }
-  }, [isBrokerCommitting, planAccess.signedIn, saveProgressInBackground]);
+  }, [isBrokerCommitting, planAccess.signedIn, saveProgressInBackground, workspaceBuilt]);
+
+  /** Back and Esc: to the step the user came from, never one that is done for good. */
+  const goBack = useCallback(() => {
+    if (finishingRef.current || isBrokerCommitting) return;
+    const back = previousOnboardingStage(progress, visitedRef.current, { pro: planAccess.hasProAccess });
+    if (!back) return;
+    visitedRef.current = back.visited;
+    backTargetRef.current = back.stage;
+    setEditingField(false);
+    if (back.stage === "portfolio") setPortfolioSub("positions");
+    saveProgressInBackground({ stage: back.stage });
+  }, [isBrokerCommitting, planAccess.hasProAccess, progress, saveProgressInBackground]);
 
   const sectionAvailability: Partial<Record<OnboardingSectionId, boolean>> = {
-    portfolio: !isBrokerCommitting,
+    portfolio: !isBrokerCommitting && !workspaceBuilt,
     // The workspace is built when the desks are picked, so that step comes first.
     cloud: !isBrokerCommitting && stage !== "desks" && (stage === "account" || stage === "upgrade" || stage === "ready" || !!progress.tickerSymbol),
     pro: !isBrokerCommitting && planAccess.signedIn && (
@@ -282,7 +310,7 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
     submitAccountField, backPortfolio, continuePortfolio, setPortfolioOptionIdx, activeBrokerFields,
     brokerFieldIdx, setBrokerSelectIdx, brokerChoices, openBrokerGuide, chosenDesks, finishDesks,
     setDeskCursor, deskCursor, setChosenDesks, continueAccount, skipSetup, primaryUpgradeAction,
-    setBillingInterval, keybindings, dialogOpen, commandBarOpen, saveProgressInBackground,
+    setBillingInterval, keybindings, dialogOpen, commandBarOpen, saveProgressInBackground, goBack,
   });
 
   return {
@@ -295,7 +323,7 @@ function useOnboardingWizard({ pluginRegistry, importBrokerPositions, onComplete
     openBrokerConnect, continueFromPositions, backPortfolio, continuePortfolio, chosenDesks, deskCursor,
     setDeskCursor, setChosenDesks, buildingDesks, finishDesks, account, viewportWidth, viewportHeight, continueAccount,
     offer, planAccess, pricing, billingInterval, setBillingInterval, continueFree, primaryUpgradeAction,
-    personalTickers,
+    goBack, rerun,
   };
 }
 
@@ -310,7 +338,7 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
     openBrokerConnect, continueFromPositions, backPortfolio, continuePortfolio, chosenDesks, deskCursor,
     setDeskCursor, setChosenDesks, buildingDesks, finishDesks, account, viewportWidth, viewportHeight, continueAccount,
     offer, planAccess, pricing, billingInterval, setBillingInterval, continueFree, primaryUpgradeAction,
-    personalTickers,
+    goBack, rerun,
   } = useOnboardingWizard(props);
 
   if (helpFocused) {
@@ -322,12 +350,15 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
     return <OnboardingCoach step={t("YOUR WORKSPACE")}
       title={tf("Built around {ticker}", { ticker })}
       actions={<>
-        {/* The card has no room for both keys: like a toast, the dismiss key
-            is in the desktop tooltip. F10 also dismisses it. */}
+        {/* Each button shows its key, as Connect shows Alt+Enter; in the
+            terminal the second wraps under the first. The desktop card has no
+            room for both: like a toast, its dismiss key is in the tooltip.
+            F10 also dismisses it. */}
         <OnboardingButton
           label="Keep exploring"
           variant="ghost"
-          title={notificationDismissShortcut ? `${t("Keep exploring")} (${notificationDismissShortcut})` : undefined}
+          shortcut={!desktop && notificationDismissShortcut ? notificationDismissShortcut : undefined}
+          title={desktop && notificationDismissShortcut ? `${t("Keep exploring")} (${notificationDismissShortcut})` : undefined}
           onPress={() => { void finish(); }}
         />
         <OnboardingButton
@@ -384,7 +415,8 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
           onDismiss={skipSetup}
           dismissing={isFinishing}
           dismissDisabled={isBrokerCommitting}
-          showDismiss={false}
+          // The first run needs a holding; a run from Settings can be left as it was.
+          showDismiss={rerun}
         />
         <OnboardingTitle
           step={desktop ? undefined : t("PORTFOLIO")}
@@ -464,12 +496,14 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
           onNavigate={goToSection}
           onDismiss={skipSetup}
           dismissing={isFinishing}
-          showDismiss={false}
+          dismissDisabled={buildingDesks}
+          showDismiss={rerun}
         />
         <OnboardingTitle
           step={desktop ? undefined : t("DESKS")}
-          title={t("What do you trade?")}
-          description={t("Each one adds a ready-made desk as a tab.")}
+          title={t("What do you trade most?")}
+          // A line of its own: the picks guide the workspace, they do not limit it.
+          description={`${t("Pick up to 3; each adds a ready-made tab.")}\n${t("Everything else is one search away.")}`}
         />
         {/* Not allowed to shrink: on a short window the card scrolls instead of the list running under the buttons. */}
         <DesksStep
@@ -591,7 +625,7 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
           <OnboardingButton
             label="Back"
             variant="ghost"
-            onPress={account.accountSub === "qr" || account.accountSub === "login" ? account.returnToAccountForm : () => goToSection("portfolio")}
+            onPress={account.accountSub === "qr" || account.accountSub === "login" ? account.returnToAccountForm : goBack}
           />
           {account.accountSub !== "qr" ? (
             <OnboardingButton
@@ -618,7 +652,7 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
       : proCopy.note;
     // Ranked: the data itself first, then what reads it.
     const features = [
-      { title: proStepRealtimeTitle(personalTickers), description: t("Free is 15 minutes behind on quotes and 12 hours on news.") },
+      { title: t("Real-time market data"), description: t("Free is 15 minutes behind on quotes and 12 hours on news.") },
       { title: t("MCP server"), description: t("Claude Code, Codex or Cursor call Gloom's research tools.") },
       { title: t("Ask Gloom"), description: t("Answers cite filings, calls and news.") },
       { title: t("Earnings calls"), description: t("Transcripts, summaries, guidance and scores.") },
@@ -731,7 +765,7 @@ export function OnboardingWizard(props: OnboardingWizardProps) {
         <OnboardingButton
           label="Back"
           variant="ghost"
-          onPress={() => goToSection(progress.accountStatus === "signed-in" ? "pro" : "cloud")}
+          onPress={goBack}
         />
         <OnboardingButton
           label={isFinishing ? "Opening workspace..." : "Start exploring"}

package/src/components/onboarding/portfolio-step/positions-panel.tsx

@@ -7,6 +7,8 @@ import { formatMarketPrice } from "../../../market-data/market/format";
 import { getRegularSessionDisplay } from "../../../market-data/market/status";
 import { formatPercentRaw } from "../../../utils/format";
 import { Button, NumberField, TextField } from "../../ui";
+import { DelayedMark } from "../../ui/delayed-mark";
+import { useFreeQuoteDelay } from "../../../api-client/plan-access";
 import { ONBOARDING_DESKTOP } from "../onboarding-frame";
 import {
   POSITION_FIELDS,
@@ -31,7 +33,7 @@ const FIELD_LABELS: Record<PositionFieldId, string> = {
 const FIELD_PLACEHOLDERS: Record<Exclude<PositionFieldId, "currency">, string> = {
   ticker: "e.g. AAPL",
   shares: "optional",
-  avgCost: "current price",
+  avgCost: "last price",
 };
 
 /** A field's label; the size counts contracts once the symbol is a future. */
@@ -47,6 +49,8 @@ function fieldPlaceholder(field: PositionFieldId, state: OnboardingPositionsStat
 /** Company name and last price for the symbol being typed, or why it will not resolve. */
 function PreviewLine({ preview, error }: Pick<OnboardingPositionsState, "preview" | "error">) {
   const colors = useThemeColors();
+  // Signed out or free, the price is the delayed one, and says so.
+  const delay = useFreeQuoteDelay(preview.status === "ready" ? preview.quote : null);
   if (error) return <Text fg={colors.negative} wrapText>{error}</Text>;
   if (preview.status === "idle") return null;
   if (preview.status === "checking") {
@@ -58,11 +62,12 @@ function PreviewLine({ preview, error }: Pick<OnboardingPositionsState, "preview
   const price = headline?.price;
   const change = headline?.changePercent;
   return (
-    <Box flexDirection="row" minWidth={0} overflow="hidden">
+    <Box flexDirection="row" alignItems="center" minWidth={0} overflow="hidden">
       <Text fg={colors.text} attributes={TextAttributes.BOLD}>{preview.symbol}</Text>
       {preview.name ? <Text fg={colors.textDim}>{`  ${preview.name}`}</Text> : null}
       {price != null ? <Text fg={colors.text}>{`  ${formatMarketPrice(price, { maxWidth: 12 })}`}</Text> : null}
       {change != null ? <Text fg={shownPriceColor(change, 2, colors)}>{` ${formatPercentRaw(change)}`}</Text> : null}
+      {price != null && delay != null ? <Box flexShrink={0} paddingLeft={1}><DelayedMark minutes={delay} /></Box> : null}
       {preview.duplicate ? <Text fg={colors.textMuted}>{t("  already added")}</Text> : null}
     </Box>
   );

package/src/components/onboarding/run-setup-again.ts

@@ -0,0 +1,24 @@
+import { useCallback } from "react";
+import { useAppDispatch, useAppStateRef } from "../../state/app/context";
+import { saveConfigImmediately } from "../../state/config-save-scheduler";
+import type { OnboardingProgress } from "../../types/config";
+
+/**
+ * Settings' Run Setup Again: setup from its first step, on what the user has.
+ * The holdings are the portfolio's own, and the desks setup made start
+ * ticked; finishing rebuilds setup's layouts in place and leaves the user's
+ * alone. `open` shows the wizard once the progress is saved; without it
+ * (a host that cannot run setup) there is nothing to run.
+ */
+export function useRunSetupAgain(open: (() => void) | undefined): (() => Promise<void>) | undefined {
+  const dispatch = useAppDispatch();
+  const stateRef = useAppStateRef();
+  const run = useCallback(async () => {
+    if (!open) return;
+    const progress: OnboardingProgress = { version: 1, stage: "portfolio", rerun: true };
+    await saveConfigImmediately({ ...stateRef.current.config, onboardingComplete: false, onboardingProgress: progress });
+    dispatch({ type: "SET_ONBOARDING_STATE", complete: false, progress });
+    open();
+  }, [dispatch, open, stateRef]);
+  return open ? run : undefined;
+}

package/src/components/onboarding/use-onboarding-progress.ts

@@ -10,7 +10,13 @@ import type { PluginRegistry } from "../../plugins/registry";
 import { resolvePlanAccess } from "../../api-client/plan-access";
 import type { PortfolioSub } from "./onboarding-steps";
 import type { useOnboardingPositions } from "./wizard-positions";
-import { applyFirstRunLayout, buildFirstRunLayout, planFirstRunWatchlist } from "./first-run-workspace";
+import {
+  applyFirstRunLayout,
+  buildFirstRunLayout,
+  onboardingDeskLayoutId,
+  planFirstRunWatchlist,
+  setupDeskPicks,
+} from "./first-run-workspace";
 import { buildDesk, getDesk, isDeskKey, isDeskStock, pickDeskCompany, type DeskKey } from "../../layout/desks";
 import { debugLog } from "../../utils/debug-log";
 import {
@@ -92,15 +98,18 @@ export function useOnboardingWorkspace({
   selectedBrokerId: string | null;
   setPortfolioSub: Dispatch<SetStateAction<PortfolioSub>>;
 }) {
-  const [chosenDesks, setChosenDesks] = useState<DeskKey[]>([]);
+  // Run again, it starts with the desks it made ticked.
+  const [chosenDesks, setChosenDesks] = useState<DeskKey[]>(() => setupDeskPicks(stateRef.current.config));
   const [deskCursor, setDeskCursor] = useState(0);
   const [buildingDesks, setBuildingDesks] = useState(false);
   const buildingDesksRef = useRef(false);
 
   /**
    * Seeds the watchlist and swaps Home for the first-run workspace built
-   * around `symbol`, with the picked desks as tabs right after it. The config
-   * comes back for the caller to persist with its own progress patch.
+   * around `symbol`, with the picked desks as tabs right after it. Run again,
+   * it replaces the layouts it made before instead of adding copies, and
+   * from Settings it leaves an existing watchlist alone. The config comes
+   * back for the caller to persist with its own progress patch.
    */
   const buildFirstRunWorkspace = useCallback(async (
     baseConfig: AppConfig,
@@ -109,12 +118,17 @@ export function useOnboardingWorkspace({
     desks: readonly DeskKey[],
   ): Promise<AppConfig> => {
     let config = baseConfig;
+    const rerun = getOnboardingProgress(baseConfig).rerun === true;
     let watchlistId = config.watchlists[0]?.id;
+    // A run from Settings leaves a watchlist the user has as it is.
+    const seedWatchlist = !rerun || !watchlistId;
     if (!watchlistId) {
       watchlistId = "watchlist";
       config = { ...config, watchlists: [{ id: watchlistId, name: "Watchlist" }] };
     }
-    const plan = planFirstRunWatchlist(stateRef.current.tickers, watchlistId, portfolioId);
+    const plan = seedWatchlist
+      ? planFirstRunWatchlist(stateRef.current.tickers, watchlistId, portfolioId)
+      : { create: [], update: [] };
     for (const metadata of plan.create) {
       try {
         const ticker = await pluginRegistry.tickerRepository.createTicker(metadata);
@@ -138,7 +152,7 @@ export function useOnboardingWorkspace({
       watchlistId,
       hasPane: (paneId) => pluginRegistry.panes?.has(paneId) ?? false,
     });
-    const workspace = applyFirstRunLayout(config, home);
+    const workspace = applyFirstRunLayout(config, home, [], { rerun });
     if (desks.length === 0) return workspace;
     const { tickers, financials } = stateRef.current;
     const held = [...tickers.values()]
@@ -150,13 +164,15 @@ export function useOnboardingWorkspace({
     const pro = resolvePlanAccess(apiClient.getCurrentUser()).hasProAccess;
     // A desk that fails to build is left out; it never holds up the first run.
     const deskTabs = await Promise.all(desks.map((key) => (
-      buildDesk(getDesk(key), { catalog: pluginRegistry, config: workspace, company, pro }).catch((error) => {
-        onboardingLog.error("Desk build failed", { desk: key, error: String(error) });
-        return null;
-      })
+      buildDesk(getDesk(key), { catalog: pluginRegistry, config: workspace, company, pro }).then(
+        (tab) => (tab ? { ...tab, id: onboardingDeskLayoutId(key) } : null),
+        (error) => {
+          onboardingLog.error("Desk build failed", { desk: key, error: String(error) });
+          return null;
+        },
+      )
     )));
-    const tabs = deskTabs.filter((tab) => tab !== null);
-    return { ...workspace, layouts: [workspace.layouts[0]!, ...tabs, ...workspace.layouts.slice(1)] };
+    return applyFirstRunLayout(config, home, deskTabs.filter((tab) => tab !== null), { rerun });
   }, [dispatch, pluginRegistry, stateRef]);
 
   const commitWorkspaceProgress = useCallback(async (
@@ -187,7 +203,7 @@ export function useOnboardingWorkspace({
   }, [positions, saveProgressInBackground]);
 
   /**
-   * Leaves "What do you trade?": builds the workspace with the picked desks as
+   * Leaves "What do you trade most?": builds the workspace with the picked desks as
    * tabs (none when skipped, which is today's workspace) and moves on.
    */
   const finishDesks = useCallback((desks: readonly DeskKey[]) => {
@@ -270,7 +286,8 @@ export function useOnboardingCompletion({
     setPersistenceError(null);
     try {
       await progressSaveQueueRef.current.catch(() => {});
-      const desks = getOnboardingProgress(stateRef.current.config).desks?.filter(isDeskKey);
+      const { desks: picked, rerun } = getOnboardingProgress(stateRef.current.config);
+      const desks = picked?.filter(isDeskKey);
       const nextConfig: AppConfig = {
         ...stateRef.current.config,
         onboardingComplete: true,
@@ -282,7 +299,8 @@ export function useOnboardingCompletion({
         complete: true,
         progress: undefined,
       });
-      recordResearchActivity(skipped ? "onboarding_skipped" : "onboarding_completed", undefined, undefined, { desks });
+      // The funnel counts first runs; a run from Settings is not one.
+      if (!rerun) recordResearchActivity(skipped ? "onboarding_skipped" : "onboarding_completed", undefined, undefined, { desks });
       await Promise.resolve(onComplete(nextConfig));
     } catch (error) {
       setPersistenceError(error instanceof Error ? error.message : String(error));

package/src/components/onboarding/use-onboarding-upgrade.ts

@@ -6,14 +6,12 @@ import { chatController } from "../../plugins/builtin/chat/controller";
 import type { CloudBillingInterval } from "../../account/billing";
 import { loadUpgradeOffer, type UpgradeOffer } from "../../account/upgrade-dialog";
 import { useCloudUpgradeAction } from "../../plugins/builtin/shared/cloud-upgrade";
-import { useUpgradePersonalization } from "../../account/upgrade-personalization";
 import { usePlanAccess } from "../../api-client/plan-access";
 
 export function useOnboardingUpgrade({
-  stage, progress, saveProgressInBackground, persistProgress, shown,
+  stage, progress, saveProgressInBackground, persistProgress,
 }: {
   stage: OnboardingStage;
-  shown: boolean;
   progress: OnboardingProgress;
   saveProgressInBackground: (patch: Partial<OnboardingProgress> & Pick<OnboardingProgress, "stage">, baseConfig?: AppConfig | undefined) => void;
   persistProgress: (patch: Partial<OnboardingProgress> & Pick<OnboardingProgress, "stage">, baseConfig?: AppConfig | undefined) => Promise<AppConfig>;
@@ -25,8 +23,6 @@ export function useOnboardingUpgrade({
   const appActive = useAppActive();
   const planAccess = usePlanAccess();
   const openUpgrade = useCloudUpgradeAction("onboarding-pro");
-  // The step lists the features from its first frame, so that is when it is shown.
-  const personalTickers = useUpgradePersonalization("onboarding-pro", shown && stage === "upgrade");
   // The price and whether this account still has its trial, asked again for
   // whichever account reaches the step.
   const accountId = planAccess.signedIn ? apiClient.getCurrentUser()?.id ?? null : null;
@@ -82,6 +78,6 @@ export function useOnboardingUpgrade({
   }, [progress.accountStatus, saveProgressInBackground]);
 
   return {
-    offer, pricing, billingInterval, setBillingInterval, planAccess, primaryUpgradeAction, continueFree, personalTickers,
+    offer, pricing, billingInterval, setBillingInterval, planAccess, primaryUpgradeAction, continueFree,
   };
 }