@catalyst-cloud/cli 0.15.2 → 0.15.4

package/dist/onboard-ui.js

@@ -1,36 +1,19 @@
 import { COMPUTER_CHECKS, standalonePlan, standalonePlanNotes, pendingContinuation, } from "./onboard-standalone-copy.js";
 import { trackedPrompt } from "./setup-prompt-frame.js";
 import { createOnboardInterrupts } from "./onboard-interrupts.js";
-import { setupStepView, CONNECTION_REPAIR_REASONS, setupFinalScreen, setupBrowserInstruction, SETUP_NUMBERS, } from "./setup-onboard-copy.js";
+import { setupStepView, CONNECTION_REPAIR_REASONS, setupFinalScreen, setupBrowserInstruction, setupCommandWords as say, setupWaitsOnAdmin, TIMED_OUT_REASONS, setupPartHeading, setupPartProgress, setupTrackerRows, SETUP_PART_NUMBERS, SETUP_PART_OF, SETUP_PARTS, } from "./setup-onboard-copy.js";
 import { createOnboardProgress, } from "./onboard-progress.js";
 import { CREATE_TEAM_CHOICE, suggestTeamKey, teamKeyProblem, teamNameProblem, } from "./onboard-team-create.js";
-import { ONBOARD_STEPS, ONBOARD_TITLES, stepSatisfied, onboardIdentityLines, onboardNextActions, onboardReadyForWork, onboardStepAction, } from "./onboard.js";
+import { FIRST_TICKET_SAMPLE, FIRST_TICKET_SKIP, } from "./onboard-first-ticket.js";
+import { ONBOARD_STEPS, ONBOARD_TITLES, stepSatisfied, onboardHeaderIdentity, onboardIdentityLines, onboardNextActions, onboardReadyForWork, onboardStepAction, } from "./onboard.js";
 import { onboardStepDetail, onboardReasonText } from "./onboard-next.js";
+import { CONNECT_PAGE_PATH } from "./onboard-checklist.js";
 export function shouldUseOnboardUi(args, stdoutTty) {
     return (stdoutTty &&
         !args.json &&
         args.flags.yes !== true &&
         args.flags["dry-run"] !== true);
 }
-export const STEP_NUMBERS = {
-    signin: 4,
-    housekeeping: 5,
-    "linear.workspace": 6,
-    "linear.personal": 7,
-    "linear.team": 8,
-    "linear.adopt": 9,
-    "linear.automations": 10,
-    "github.install": 11,
-    "github.personal": 12,
-    "github.repos": 13,
-    projects: 13,
-    accounts: 14,
-    capacity: 15,
-    runner: 15,
-    settings: 16,
-    values: 16,
-    "first-ticket": 17,
-};
 export function createClackOnboardUi(prompts, streams, deps = {}) {
     const abort = new AbortController();
     const options = { ...streams, signal: abort.signal };
@@ -52,6 +35,20 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
     const renderer = deps.renderer;
     const interactive = deps.interactive !== false;
     let group;
+    // CTC-4680: the part whose steps are on screen, the journal and plan the tracker reads, and
+    // whether boundaries draw the tracker (not on a check-again pass).
+    let part;
+    // The part of the last step that ended in this run, shown or not: a boundary is a move past it.
+    let ranPart;
+    let journalSeen;
+    let planned = {};
+    let rechecking = false;
+    let shownPlan;
+    // CTC-4680: steps whose wait was on the Connect accounts page. That page does not expire, so a
+    // wait that ran out is setup giving up, and the way back is the same page.
+    const connectWaits = new Map();
+    const onConnectPage = (step) => connectWaits.has(step.id) && TIMED_OUT_REASONS.has(step.reason ?? "");
+    const outcome = (step, view) => onConnectPage(step) ? "setup stopped waiting" : view.outcome;
     let browserOpened = true;
     let questionOpen = false;
     let signinShown = false;
@@ -81,6 +78,45 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                     ].includes(id))) &&
             !(id === "signin" && signinShown));
     const title = (id) => setupStepView({ id, state: "running" }).title;
+    const number = (id) => SETUP_PART_NUMBERS[id] ?? 0;
+    /** A part's heading, then its plan rows, numbered from 1. */
+    const planPart = (r, p, journal) => {
+        r.heading(setupPartHeading(p, r.traits.unicode));
+        for (const row of standalonePlan(journal, planned.scope, planned.runner))
+            if (row.part === p)
+                r.plan(row.number, row.title, row.detail);
+    };
+    /** Starting a step in another part: its heading, and when this run has moved past a part, the
+     *  tracker again with the new part's plan. After the install engine, part 1's checks run unshown,
+     *  so setup opens on the part 1 boundary. */
+    const enterPart = (id) => {
+        if (!renderer)
+            return;
+        const next = SETUP_PART_OF[id];
+        if (next === part)
+            return;
+        const previous = ranPart;
+        part = next;
+        if (previous === undefined ||
+            next <= previous ||
+            rechecking ||
+            !journalSeen) {
+            renderer.heading(setupPartHeading(next, renderer.traits.unicode));
+            return;
+        }
+        const progress = setupPartProgress(journalSeen, planned.scope, "run");
+        const got = progress[previous];
+        const left = got.total - got.done;
+        // Mid-run nothing yet says whether an owner or admin has done their part, so this is neutral.
+        renderer.heading(!left
+            ? `Part ${previous} done. ${SETUP_PARTS[previous].done}`
+            : left === got.admin + got.aside
+                ? `The rest of part ${previous} is for an owner or admin of your Catalyst workspace.`
+                : `Part ${previous} has ${left === 1 ? "1 step" : `${left} steps`} left. Setup carries on with part ${next}.`);
+        renderer.tracker(setupTrackerRows(progress, { next }));
+        planPart(renderer, next, journalSeen);
+        renderer.blank();
+    };
     const stop = () => {
         if (active) {
             if (renderer)
@@ -103,14 +139,16 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             }
             signinShown = true;
             if (reveal) {
-                group = "This computer";
-                renderer.heading(group);
-                renderer.begin(4, title("signin"), "signing in…");
+                enterPart("signin");
+                renderer.begin(number("signin"), title("signin"), "signing in…");
                 active = true;
             }
         }
         if (hidden(currentStep))
             return;
+        // The sign-in's own wait line: the frame already shows the countdown and how to stop.
+        if (renderer && /^Waiting for you to approve…/.test(text))
+            return;
         if (renderer &&
             currentStep === "linear.adopt" &&
             text.endsWith("already has every state and label"))
@@ -124,7 +162,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             }
             if (currentStep === "capacity")
                 return;
-            renderer.detail(text);
+            renderer.detail(say(text));
             return;
         }
         stop();
@@ -136,9 +174,9 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             if (hidden(currentStep))
                 return;
             if (renderer && currentStep)
-                renderer.begin(SETUP_NUMBERS[currentStep] ?? 0, title(currentStep), text === ONBOARD_TITLES[currentStep] ? "checking…" : text);
+                renderer.begin(number(currentStep), title(currentStep), text === ONBOARD_TITLES[currentStep] ? "checking…" : text);
             else if (renderer)
-                renderer.line(text);
+                renderer.line(say(text));
             else
                 spin.start(text);
             active = true;
@@ -147,7 +185,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
     const question = () => {
         if (renderer && currentStep && !questionOpen) {
             stop();
-            renderer.begin(SETUP_NUMBERS[currentStep] ?? 0, title(currentStep), "", "ask");
+            renderer.begin(number(currentStep), title(currentStep), "", "ask");
             active = true;
             questionOpen = true;
         }
@@ -155,7 +193,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
     const select = async (opts, ownFrame = false) => {
         if (!renderer)
             return prompts.select(opts);
-        const detached = ownFrame || !currentStep;
+        const detached = ownFrame || (!currentStep && !questionOpen);
         if (detached) {
             stop();
             renderer.begin(0, "Your choice", "", "ask");
@@ -193,23 +231,90 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
         return result.answer;
     };
     let summaryShown = false;
-    const summary = (journal) => {
+    /**
+     * The end screen's actions, split by who acts: the person's own, and an owner's or admin's
+     * (CTC-4680). A step paused with Ctrl-C is not an action: the last line says how to carry on.
+     */
+    const sortActions = (journal) => {
         const screen = setupFinalScreen(journal, deps.baseUrl?.(), abort.signal.aborted);
+        const step = (id) => journal.steps.find((s) => s.id === id) ?? { id, state: "pending" };
+        const text = (action) => {
+            const row = step(action.id);
+            if (!onConnectPage(row))
+                return say(action.text);
+            const kinds = row.evidence?.aiAccountKinds;
+            // #277's rule: subscription wording only for a workspace the cloud enables for it.
+            const what = action.id === "accounts"
+                ? typeof kinds === "string" && kinds.split(",").includes("subscription")
+                    ? "add an API key or connect a subscription"
+                    : "add an API key"
+                : action.id === "github.install"
+                    ? "install Catalyst on GitHub"
+                    : `finish "${title(action.id)}" there`;
+            return `Open ${connectWaits.get(action.id)} and ${what}.`;
+        };
+        const live = screen.actions.filter((action) => step(action.id).reason !== "interrupted");
+        const theirs = live.filter((action) => setupWaitsOnAdmin(step(action.id), journal));
+        const mine = live.filter((action) => !theirs.includes(action));
+        // Steps only an owner or admin can do, less any already listed as their task above.
+        const skipped = journal.steps.filter((s) => s.reason === "member_scope" &&
+            setupWaitsOnAdmin(s, journal) &&
+            SETUP_PART_NUMBERS[s.id] !== undefined &&
+            s.id !== "projects" &&
+            !theirs.some((action) => action.id === s.id));
+        const waiting = theirs.length > 0 || skipped.length > 0;
+        const own = mine.length;
+        const next = screen.paused ||
+            !/^Next: run catalyst onboard after you finish/.test(screen.next)
+            ? say(screen.next)
+            : own
+                ? `Next: run catalyst setup after you finish ${own === 1 ? "1" : own === 2 ? "1 and 2" : `1 to ${own}`}.`
+                : waiting
+                    ? "Next: run catalyst setup once they have."
+                    : "Next: run catalyst setup to check again.";
+        return { screen, mine, theirs, skipped, waiting, next, text, live };
+    };
+    const summary = (journal) => {
+        const sorted = sortActions(journal);
+        const { screen, mine, theirs, skipped } = sorted;
         if (!renderer)
-            return screen;
+            return sorted;
         renderer.suspendLive();
         active = false;
         renderer.heading(screen.heading);
         if (screen.paused)
             renderer.line("Your progress is saved.");
+        renderer.tracker(setupTrackerRows(setupPartProgress(journal, planned.scope), "end"));
         if (screen.readinessCause)
-            renderer.line(screen.readinessCause);
-        if (screen.actions.length) {
-            renderer.line(`${screen.actions.length} ${screen.actions.length === 1 ? "thing needs" : "things need"} you:`);
-            screen.actions.forEach((action, i) => renderer.line(`${i + 1}. ${action.text}`));
+            renderer.line(say(screen.readinessCause));
+        if (mine.length) {
+            renderer.line(`${mine.length} ${mine.length === 1 ? "thing needs" : "things need"} you:`);
+            mine.forEach((action, i) => renderer.item(`${i + 1}. `, sorted.text(action)));
             if (screen.more)
                 renderer.line(`and ${screen.more} more after these`);
-            const continuation = pendingContinuation(journal);
+        }
+        if (sorted.waiting) {
+            renderer.line("Waiting on an owner or admin of your Catalyst workspace:");
+            for (const action of theirs)
+                renderer.item("· ", sorted.text(action));
+            if (skipped.length) {
+                renderer.item("· ", `Steps only they can do: ${skipped.map((s) => title(s.id)).join(", ")}.`);
+                const base = deps.baseUrl?.();
+                const integrations = base
+                    ? new URL("/settings/connections", base).href
+                    : undefined;
+                if (integrations && !theirs.some((a) => a.text.includes(integrations)))
+                    renderer.item("· ", `They start at ${integrations}, the Integrations page.`);
+            }
+        }
+        // A step skipped with Ctrl-C is no action, but it is still to come: the line below names it.
+        if (screen.actions.length || skipped.length) {
+            const continuation = pendingContinuation(journal, 
+            // A step paused with Ctrl-C is still to come, so it stays in this line.
+            new Set([
+                ...sorted.live.map((action) => action.id),
+                ...skipped.map((s) => s.id),
+            ]));
             if (continuation)
                 renderer.line(continuation);
         }
@@ -217,7 +322,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             renderer.line("Catalyst is ready to work on your team's tickets.");
         if (deps.logPath?.())
             renderer.line(`Full log: ${deps.logPath()}`);
-        return screen;
+        return sorted;
     };
     const ui = {
         signal: abort.signal,
@@ -227,40 +332,58 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
         interactive,
         handlesSignals: true,
         plan(journal, identity, planOptions) {
+            planned = { scope: planOptions?.scope, runner: planOptions?.runner };
+            journalSeen = journal;
             if (deps.consentGiven)
                 return;
             machineScope = (planOptions?.scope ?? ONBOARD_STEPS).filter((id) => COMPUTER_CHECKS.some((check) => check === id));
             machineChecks.clear();
             machineBlocked = false;
             stop();
+            // Signed in already, the header carries who and where, so the lines below would repeat it.
+            let identityShown = false;
             if (!introduced) {
                 if (renderer)
-                    renderer.intro("Catalyst setup");
+                    identityShown = renderer.brand("setup", deps.version, identity ? onboardHeaderIdentity(identity) : undefined);
                 else
                     prompts.intro("Catalyst setup", { output: streams.output });
                 introduced = true;
             }
-            if (identity !== undefined)
+            if (identity !== undefined && !identityShown)
                 for (const line of onboardIdentityLines(identity))
-                    message(line);
+                    if (renderer)
+                        renderer.line(line);
+                    else
+                        message(line);
+            // After sign-in the plan is asked about again. When it is the plan already on screen, the
+            // person sees who they are now and the question, not the header, tracker and plan twice.
+            const planKey = JSON.stringify([
+                planned.scope,
+                planned.runner,
+                planOptions?.localSync ?? journal.localSync === true,
+            ]);
+            if (renderer && planKey === shownPlan)
+                return;
+            shownPlan = planKey;
             if (renderer) {
-                renderer.heading("The plan");
-                let planGroup;
-                for (const row of standalonePlan(journal, planOptions?.scope, planOptions?.runner)) {
-                    if (row.group !== planGroup) {
-                        renderer.blank();
-                        renderer.line(renderer.bold(row.group));
-                        planGroup = row.group;
-                    }
-                    renderer.plan(row.number, row.title, row.detail);
-                }
+                // CTC-4680: what setup does and the three parts first, then only the first part's steps.
+                // Each later part lists its own steps when it starts.
+                const first = standalonePlan(journal, planned.scope, planned.runner)[0]?.part ?? 1;
+                renderer.blank();
+                renderer.line("Setup gets Catalyst working on your team's Linear tickets. It has three parts.");
+                renderer.tracker(setupTrackerRows(setupPartProgress(journal, planned.scope), {
+                    plan: first,
+                }));
+                planPart(renderer, first, journal);
+                // Its steps follow under this heading; the first one does not print it again.
+                part = first;
                 renderer.line(standalonePlanNotes(planOptions?.localSync ?? journal.localSync === true));
                 return;
             }
             const steps = new Map(journal.steps.map((step) => [step.id, step]));
             message(ONBOARD_STEPS.map((id) => `· ${ONBOARD_TITLES[id]}${steps.get(id)?.state === "done" ? " (recheck)" : ""}`).join("\n"));
             message("Use cloud reads by default. Local sync is optional for SQL or sustained local reads.");
-            message("Setup may check one stored Claude account using a one-token provider request. This may use Claude quota. It does not refresh Codex credentials.");
+            message("Setup reads your AI accounts without sending them a request.");
         },
         async confirmPlan(localSync, signin = "unavailable") {
             if (deps.consentGiven || !interactive)
@@ -482,6 +605,36 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             }
             return typeof answer === "string" ? answer : null;
         },
+        async chooseFirstTicket(tickets, { teamKey, stage }) {
+            stop();
+            if (abort.signal.aborted)
+                return null;
+            const answer = await select({
+                ...options,
+                message: `Which ticket should Catalyst start first? It moves to ${stage} in ${teamKey}.`,
+                initialValue: tickets[0]?.identifier ?? FIRST_TICKET_SAMPLE,
+                options: [
+                    ...tickets.map((ticket) => ({
+                        value: ticket.identifier,
+                        label: `${ticket.identifier} ${ticket.title}`,
+                        ...(ticket.estimate !== null
+                            ? { hint: `estimate ${ticket.estimate}` }
+                            : {}),
+                    })),
+                    {
+                        value: FIRST_TICKET_SAMPLE,
+                        label: "Create a sample ticket",
+                        hint: "documents how to run the tests; changes only CONTRIBUTING.md",
+                    },
+                    { value: FIRST_TICKET_SKIP, label: "Skip for now" },
+                ],
+            });
+            if (prompts.isCancel(answer)) {
+                abort.abort();
+                return null;
+            }
+            return typeof answer === "string" ? answer : null;
+        },
         async chooseRunner() {
             stop();
             if (abort.signal.aborted)
@@ -511,28 +664,35 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
         async retryTimedOut(id) {
             if (abort.signal.aborted)
                 return false;
-            if (renderer && active) {
-                // The wait frame is still live: its status and a last line say why it ended.
-                renderer.update("the link timed out");
-                renderer.detail("The link timed out.");
-            }
-            else if (renderer) {
-                renderer.begin(SETUP_NUMBERS[id] ?? 0, title(id), "the link timed out");
-                renderer.detail("The link timed out.");
+            // The Connect accounts page does not expire: setup stopped waiting, and can wait again.
+            const page = connectWaits.has(id);
+            const why = page
+                ? "Setup stopped waiting for the Connect accounts page."
+                : "The link timed out.";
+            if (renderer) {
+                // The question draws under this row, so the reason stays on screen while it is asked.
+                stop();
+                renderer.begin(number(id), title(id), page ? "setup stopped waiting" : "the link timed out", "ask");
+                if (page)
+                    renderer.detail(why);
                 active = true;
+                questionOpen = true;
             }
             else {
                 stop();
-                prompts.log.message(`${title(id)}: the link timed out.`, {
+                prompts.log.message(`${title(id)}: ${why}`, {
                     output: streams.output,
                 });
             }
             const answer = await select({
                 ...options,
-                message: "Ready to try again?",
+                message: page ? "Keep waiting?" : "Ready to try again?",
                 initialValue: "again",
                 options: [
-                    { value: "again", label: "Yes, give me a new link" },
+                    {
+                        value: "again",
+                        label: page ? "Yes, keep waiting" : "Yes, give me a new link",
+                    },
                     { value: "stop", label: "Stop here. Run catalyst setup later to carry on." },
                 ],
             });
@@ -548,7 +708,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             if (state === "done")
                 stagedSigninApproved = true;
             if (currentStep === "signin" && signinShown)
-                renderer.step(state === "done" ? "done" : state === "failed" ? "fail" : "act", 4, title("signin"), state === "done"
+                renderer.step(state === "done" ? "done" : state === "failed" ? "fail" : "act", number("signin"), title("signin"), state === "done"
                     ? "approved"
                     : state === "failed"
                         ? "could not verify this account"
@@ -560,11 +720,11 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             signinShown = false;
             if (state !== "done") {
                 if (cause)
-                    renderer.line(cause.charAt(0).toUpperCase() + cause.slice(1));
+                    renderer.line(say(cause.charAt(0).toUpperCase() + cause.slice(1)));
                 renderer.heading(abort.signal.aborted ? "Setup paused" : "Setup is not ready yet");
                 if (!cause?.includes("Your saved connection was not changed."))
                     renderer.line("Your saved connection was not changed.");
-                renderer.outro("Next: run catalyst onboard to sign in again.");
+                renderer.outro("Next: run catalyst setup to sign in again.");
             }
             return true;
         },
@@ -582,29 +742,17 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                     if (!machineScope.length)
                         return;
                     if (machineChecks.size === 0 && !machineBlocked) {
-                        renderer.heading("This computer");
-                        group = "This computer";
-                        renderer.begin(1, "This computer", "checking…");
+                        enterPart(id);
+                        renderer.begin(number(id), "This computer", "checking…");
                         active = true;
                     }
                     return;
                 }
                 if (hidden(id))
                     return;
-                if (id === "projects" || id === "values")
+                if (id === "projects")
                     return;
-                const next = !deps.consentGiven &&
-                    ["signin", "daemon", "housekeeping", "ready"].includes(id)
-                    ? "This computer"
-                    : id.startsWith("linear.")
-                        ? "Linear"
-                        : id.startsWith("github.")
-                            ? "GitHub"
-                            : "Work";
-                if (next !== group) {
-                    renderer.heading(next);
-                    group = next;
-                }
+                enterPart(id);
                 start(ONBOARD_TITLES[id]);
                 return;
             }
@@ -626,6 +774,9 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             start(ONBOARD_TITLES[id]);
         },
         stepEnd(step, journal) {
+            if (journal)
+                journalSeen = journal;
+            ranPart = SETUP_PART_OF[step.id];
             if (renderer) {
                 if (standaloneComputer(step.id)) {
                     machineChecks.set(step.id, step);
@@ -653,23 +804,21 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                 }
                 if (step.id === "ready" || (hidden(step.id) && step.state !== "failed"))
                     return;
-                if ((step.id === "github.repos" || step.id === "settings") &&
+                if (step.id === "github.repos" &&
                     step.state === "done")
                     return;
-                if ((step.id === "projects" || step.id === "values") &&
-                    journal?.steps.find((s) => s.id === (step.id === "projects" ? "github.repos" : "settings"))?.state !== "done")
+                if (step.id === "projects" &&
+                    journal?.steps.find((s) => s.id === "github.repos")?.state !== "done")
                     return;
                 const view = setupStepView(step, journal);
-                if (hidden(step.id)) {
-                    renderer.heading("This computer");
-                    group = "This computer";
-                }
-                renderer.step(view.mark, view.number, view.title, view.outcome);
+                if (hidden(step.id))
+                    enterPart(step.id);
+                renderer.step(view.mark, view.number, view.title, outcome(step, view));
                 const granted = deps.verbose ? onboardStepDetail(step) : undefined;
                 if (granted)
                     renderer.detail(granted);
                 if (deps.verbose && CONNECTION_REPAIR_REASONS.has(step.reason ?? ""))
-                    renderer.detail(onboardReasonText(step, { baseUrl: deps.baseUrl?.(), journal }));
+                    renderer.detail(say(onboardReasonText(step, { baseUrl: deps.baseUrl?.(), journal })));
                 if (view.mark === "fail")
                     renderer.detail(deps.logPath?.()
                         ? "Check the full log for the cause, then try this step again."
@@ -697,11 +846,21 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                 prompts.log.message(granted, { output: streams.output });
         },
         message,
+        note(text) {
+            if (hidden(currentStep))
+                return;
+            if (renderer)
+                renderer.detail(text);
+            else {
+                stop();
+                prompts.log.message(text, { output: streams.output });
+            }
+        },
         async checkAgain(journal) {
             if (!renderer ||
                 !interactive ||
                 abort.signal.aborted ||
-                !setupFinalScreen(journal, deps.baseUrl?.()).actions.length)
+                !sortActions(journal).mine.length)
                 return false;
             active = false;
             summary(journal);
@@ -725,7 +884,8 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             machineScope = COMPUTER_CHECKS.filter((id) => !stepSatisfied(journal.steps.find((step) => step.id === id)));
             machineChecks.clear();
             machineBlocked = false;
-            group = undefined;
+            part = undefined;
+            rechecking = true;
             renderer.heading("Checking again");
             return true;
         },
@@ -741,21 +901,20 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                     renderer.line(`${ONBOARD_TITLES[only]} finished. Onboarding still has other steps.`);
                 else
                     for (const action of onboardNextActions(journal, deps.baseUrl?.(), only))
-                        renderer.line(action);
-                renderer.outro("Next: run catalyst onboard");
+                        renderer.line(say(action));
+                renderer.outro("Next: run catalyst setup");
                 return;
             }
             if (renderer) {
                 active = false;
-                const screen = summaryShown
-                    ? setupFinalScreen(journal, deps.baseUrl?.(), abort.signal.aborted)
-                    : summary(journal);
+                const sorted = summaryShown ? sortActions(journal) : summary(journal);
+                const { screen } = sorted;
                 if (summaryShown && screen.paused) {
                     renderer.heading(screen.heading);
                     renderer.line("Your progress is saved.");
                 }
                 summaryShown = false;
-                renderer.outro(screen.next);
+                renderer.outro(sorted.next);
                 return;
             }
             stop();
@@ -779,10 +938,25 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                 text = `${ONBOARD_TITLES[only]} finished. Onboarding still has other steps.\nresume: catalyst onboard`;
             prompts.outro(text, { output: streams.output });
         },
-        async wait(text, run) {
-            const browser = currentStep &&
-                renderer &&
-                setupBrowserInstruction(currentStep, deps.baseUrl?.(), currentStep !== "accounts" && browserOpened);
+        async wait(text, run, page) {
+            if (currentStep && page) {
+                let path = "";
+                try {
+                    path = new URL(page.url).pathname;
+                }
+                catch {
+                    // Not a URL, so not the Connect accounts page.
+                }
+                if (path === CONNECT_PAGE_PATH)
+                    connectWaits.set(currentStep, page.url);
+                else
+                    connectWaits.delete(currentStep);
+            }
+            const browser = currentStep && renderer && page
+                ? page
+                : currentStep &&
+                    renderer &&
+                    setupBrowserInstruction(currentStep, deps.baseUrl?.(), currentStep !== "accounts" && browserOpened);
             const signinWait = Boolean(renderer && currentStep === "signin" && signinShown);
             const seconds = signinWait
                 ? Math.ceil((deps.signinTimeoutMs ?? 600000) / 1000)
@@ -794,11 +968,9 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             };
             if (renderer && browser && currentStep) {
                 stop();
-                renderer.begin(SETUP_NUMBERS[currentStep] ?? 0, title(currentStep), renderer.traits.unicode
+                renderer.begin(number(currentStep), title(currentStep), renderer.traits.unicode
                     ? status()
                     : "waiting for you, up to 10 minutes");
-                if (browser.preparation)
-                    renderer.detail(browser.preparation);
                 renderer.action(browser.instruction);
                 if (browser.url)
                     renderer.detail(renderer.link(browser.url));
@@ -881,6 +1053,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
         delete ui.chooseFirstRepository;
         delete ui.reviewSettings;
         delete ui.chooseRunner;
+        delete ui.chooseFirstTicket;
         delete ui.retryTimedOut;
         delete ui.confirmWorkflowAdoption;
     }