@catalyst-cloud/cli 0.15.1 → 0.15.3

package/dist/onboard-ui.js

@@ -1,9 +1,10 @@
 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, 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 { FIRST_TICKET_SAMPLE, FIRST_TICKET_SKIP, } from "./onboard-first-ticket.js";
 import { ONBOARD_STEPS, ONBOARD_TITLES, stepSatisfied, onboardIdentityLines, onboardNextActions, onboardReadyForWork, onboardStepAction, } from "./onboard.js";
 import { onboardStepDetail, onboardReasonText } from "./onboard-next.js";
 export function shouldUseOnboardUi(args, stdoutTty) {
@@ -12,25 +13,6 @@ export function shouldUseOnboardUi(args, stdoutTty) {
         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 +34,15 @@ 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;
     let browserOpened = true;
     let questionOpen = false;
     let signinShown = false;
@@ -81,6 +72,41 @@ 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);
+        const left = progress[previous].total - progress[previous].done;
+        renderer.heading(left
+            ? `Part ${previous} has ${left === 1 ? "1 step" : `${left} steps`} left. Setup carries on with part ${next}.`
+            : `Part ${previous} done. ${SETUP_PARTS[previous].done}`);
+        renderer.tracker(setupTrackerRows(progress, { next }));
+        planPart(renderer, next, journalSeen);
+        renderer.blank();
+    };
     const stop = () => {
         if (active) {
             if (renderer)
@@ -103,14 +129,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 +152,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             }
             if (currentStep === "capacity")
                 return;
-            renderer.detail(text);
+            renderer.detail(say(text));
             return;
         }
         stop();
@@ -136,9 +164,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 +175,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 +183,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");
@@ -202,14 +230,15 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
         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);
+            renderer.line(say(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}`));
+            screen.actions.forEach((action, i) => renderer.item(`${i + 1}. `, say(action.text)));
             if (screen.more)
                 renderer.line(`and ${screen.more} more after these`);
-            const continuation = pendingContinuation(journal);
+            const continuation = pendingContinuation(journal, new Set(screen.actions.map((action) => action.id)));
             if (continuation)
                 renderer.line(continuation);
         }
@@ -227,6 +256,8 @@ 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));
@@ -235,32 +266,46 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             stop();
             if (!introduced) {
                 if (renderer)
-                    renderer.intro("Catalyst setup");
+                    renderer.brand("setup", deps.version);
                 else
                     prompts.intro("Catalyst setup", { output: streams.output });
                 introduced = true;
             }
             if (identity !== undefined)
                 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 +527,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)
@@ -508,13 +583,44 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
             }
             return answer === "yes";
         },
+        async retryTimedOut(id) {
+            if (abort.signal.aborted)
+                return false;
+            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), "the link timed out", "ask");
+                active = true;
+                questionOpen = true;
+            }
+            else {
+                stop();
+                prompts.log.message(`${title(id)}: the link timed out.`, {
+                    output: streams.output,
+                });
+            }
+            const answer = await select({
+                ...options,
+                message: "Ready to try again?",
+                initialValue: "again",
+                options: [
+                    { value: "again", label: "Yes, give me a new link" },
+                    { value: "stop", label: "Stop here. Run catalyst setup later to carry on." },
+                ],
+            });
+            if (prompts.isCancel(answer) || answer !== "again") {
+                abort.abort();
+                return false;
+            }
+            return true;
+        },
         stagedSigninEnd(state, cause) {
             if (!renderer)
                 return false;
             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"
@@ -526,11 +632,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;
         },
@@ -548,29 +654,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;
             }
@@ -592,6 +686,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);
@@ -622,20 +719,18 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                 if ((step.id === "github.repos" || step.id === "settings") &&
                     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";
-                }
+                if (hidden(step.id))
+                    enterPart(step.id);
                 renderer.step(view.mark, view.number, view.title, view.outcome);
                 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."
@@ -663,6 +758,16 @@ 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 ||
@@ -691,7 +796,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;
         },
@@ -707,8 +813,8 @@ 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) {
@@ -721,7 +827,7 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
                     renderer.line("Your progress is saved.");
                 }
                 summaryShown = false;
-                renderer.outro(screen.next);
+                renderer.outro(say(screen.next));
                 return;
             }
             stop();
@@ -745,10 +851,12 @@ 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) {
+            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)
@@ -760,11 +868,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));
@@ -847,6 +953,8 @@ export function createClackOnboardUi(prompts, streams, deps = {}) {
         delete ui.chooseFirstRepository;
         delete ui.reviewSettings;
         delete ui.chooseRunner;
+        delete ui.chooseFirstTicket;
+        delete ui.retryTimedOut;
         delete ui.confirmWorkflowAdoption;
     }
     return ui;

package/dist/onboard-values.js

@@ -0,0 +1,47 @@
+import { loadConfig } from "./config.js";
+import { loadContract } from "./contract.js";
+import { selectedOnboardTeam } from "./onboard-existing.js";
+import { valuesFacts } from "./ready-copy.js";
+const waiting = (reason, evidence) => ({
+    state: "waiting",
+    reason,
+    ...(evidence ? { evidence } : {}),
+});
+/** The selected team's `required_values` readiness check decides this step. It passes when the
+ * selected repositories declare no required value, or every one has a value. Nothing here reads,
+ * imports or prints a value: a missing one is named, with the page where it is set. A stale, absent
+ * or unknown check waits, so the step never claims values it could not see. */
+export function onboardValuesAdapter() {
+    return {
+        check: async (ctx, journal, signal) => {
+            const cfg = loadConfig(ctx.home);
+            const teamId = selectedOnboardTeam(journal);
+            if (!cfg || !teamId)
+                return waiting("required_values_unverified");
+            let loaded;
+            try {
+                loaded = await loadContract(ctx, cfg, { refresh: true, signal });
+            }
+            catch {
+                return waiting(signal?.aborted ? "interrupted" : "required_values_unverified");
+            }
+            if (loaded.source === "cache")
+                return waiting("required_values_unverified");
+            const readiness = loaded.doc.teams.find((team) => team.id === teamId)?.readiness;
+            const fresh = readiness?.checkedAt != null &&
+                readiness.expiresAt != null &&
+                readiness.expiresAt > ctx.now().getTime();
+            const check = fresh
+                ? readiness.checks.find((row) => row.id === "required_values")
+                : undefined;
+            if (check?.state === "pass")
+                return { state: "done", evidence: { team: teamId } };
+            if (check?.state !== "fail")
+                return waiting("required_values_unverified");
+            return waiting("required_values_missing", {
+                team: teamId,
+                requiredValues: JSON.stringify(valuesFacts(check)),
+            });
+        },
+    };
+}