@catalyst-cloud/cli 0.15.2 → 0.15.3

package/dist/setup-onboard-copy.js

@@ -1,5 +1,6 @@
 import { ONBOARD_DEPENDENCIES, ONBOARD_STEPS, ONBOARD_TITLES, } from "./onboard.js";
-import { onboardReasonText } from "./onboard-next.js";
+import { dispatchStageName, onboardReasonText } from "./onboard-next.js";
+/** The step numbers `--json` reports. People read SETUP_PART_NUMBERS instead (CTC-4680). */
 export const SETUP_NUMBERS = {
     machine: 1,
     cli: 1,
@@ -23,13 +24,94 @@ export const SETUP_NUMBERS = {
     values: 16,
     "first-ticket": 17,
 };
+/** CTC-4680: setup runs in three parts. The times are estimates until setup logs give medians. */
+export const SETUP_PARTS = {
+    1: {
+        title: "This computer",
+        estimate: "about 2 min",
+        summary: "skills and sign-in",
+        done: "This computer is set up.",
+    },
+    2: {
+        title: "Linear and GitHub",
+        estimate: "about 10 min",
+        summary: "approvals in your browser",
+        done: "Linear and GitHub are connected.",
+    },
+    3: {
+        title: "Ready for work",
+        estimate: "about 5 min",
+        summary: "a first ticket",
+        done: "Catalyst is ready for work.",
+    },
+};
+export const SETUP_PART_OF = {
+    machine: 1,
+    cli: 1,
+    skills: 1,
+    legacy: 1,
+    signin: 1,
+    daemon: 1,
+    housekeeping: 1,
+    "linear.workspace": 2,
+    "linear.personal": 2,
+    "linear.team": 2,
+    "linear.adopt": 2,
+    "linear.automations": 2,
+    "github.install": 2,
+    "github.personal": 2,
+    "github.repos": 3,
+    projects: 3,
+    accounts: 3,
+    capacity: 3,
+    runner: 3,
+    settings: 3,
+    values: 3,
+    "first-ticket": 3,
+    ready: 3,
+};
+/** What a person reads: each part restarts at 1, in the order setup runs the steps. Steps that
+ *  share a row (the computer checks, repositories and projects) share a number. */
+export const SETUP_PART_NUMBERS = {
+    machine: 1,
+    cli: 1,
+    skills: 1,
+    legacy: 1,
+    signin: 2,
+    housekeeping: 3,
+    "linear.workspace": 1,
+    "linear.personal": 2,
+    "linear.team": 3,
+    "linear.adopt": 4,
+    "linear.automations": 5,
+    "github.install": 6,
+    "github.personal": 7,
+    "github.repos": 1,
+    projects: 1,
+    accounts: 2,
+    capacity: 3,
+    runner: 4,
+    settings: 5,
+    values: 6,
+    "first-ticket": 7,
+};
+/** CTC-4680: people type `catalyst setup`; `catalyst onboard` stays its alias. What setup draws
+ *  names setup. `--json` and headless output keep their own words. */
+export function setupCommandWords(text) {
+    return text.replace(/\bcatalyst onboard\b/g, "catalyst setup");
+}
+/** "Part 1 of 3 · This computer", with a colon where the output is plain. */
+export function setupPartHeading(part, unicode) {
+    return `Part ${part} of 3${unicode ? " ·" : ":"} ${SETUP_PARTS[part].title}`;
+}
 const TITLES = {
     "linear.adopt": "Set up the team's workflow",
     "linear.automations": "Check Linear's PR automations",
     projects: "Choose repositories",
-    accounts: "Add a coding account",
+    accounts: "Add an AI account",
+    housekeeping: "Daily update",
     capacity: "Check runners",
-    values: "Review repository settings",
+    values: "Check repository values",
 };
 const OPTIONAL = new Set([
     "local_sync_not_selected",
@@ -83,18 +165,23 @@ function succeeded(step) {
         case "projects":
             return "repositories are now Catalyst projects";
         case "accounts":
-            return `${value(step, "provider") === "claude" ? "Claude" : value(step, "provider") === "codex" ? "Codex" : "a coding account"} can take work`;
+            return `${value(step, "provider") === "claude" ? "Claude" : value(step, "provider") === "codex" ? "Codex" : "an AI account"} can take work`;
+        case "housekeeping":
+            return "scheduled, runs daily";
         case "capacity":
             return typeof step.evidence?.remainingUnits === "number"
                 ? `${step.evidence.remainingUnits} runner slots available`
                 : "runners can take work";
         case "settings":
-        case "values":
             return "settings reviewed";
-        case "first-ticket":
-            return value(step, "ticketKey")
-                ? `${value(step, "ticketKey")} started`
+        case "values":
+            return "values set";
+        case "first-ticket": {
+            const key = value(step, "ticket") ?? value(step, "ticketKey");
+            return key
+                ? `${key} moved to ${dispatchStageName(step.evidence?.stage)}. Catalyst picks it up next.`
                 : "first ticket started";
+        }
         case "daemon":
             return "local sync is running";
         case "runner":
@@ -114,6 +201,12 @@ function unfinished(step) {
         return "could not verify the connection's permissions";
     if (step.reason === "housekeeping_service_unverified")
         return "no scheduler here. catalyst says when an update is out";
+    if (step.reason === "housekeeping_off_chosen")
+        return "skipped, as you chose";
+    if (step.reason === "housekeeping_no_scheduler")
+        return "can't run on this computer";
+    if (step.id === "housekeeping")
+        return "not scheduled; the install command turns it on";
     if (step.reason === "local_sync_not_selected")
         return "off, reads come from the cloud";
     if (step.reason === "runner_docker_missing")
@@ -122,7 +215,7 @@ function unfinished(step) {
         return "an admin handles this step";
     if (step.reason === "automation_management_unavailable")
         return "could not read them; checked again before work starts";
-    if (step.reason === "interrupted")
+    if (step.reason === "interrupted" || step.reason === "first_ticket_skipped")
         return "skipped for now";
     if (TIMED_OUT_REASONS.has(step.reason ?? ""))
         return "the link timed out";
@@ -134,7 +227,7 @@ function unfinished(step) {
         case "github.install":
             return "not installed yet";
         case "accounts":
-            return "no coding account ready yet";
+            return "no AI account ready yet";
         case "linear.workspace":
         case "linear.personal":
         case "github.personal":
@@ -144,8 +237,13 @@ function unfinished(step) {
         case "capacity":
             return "no runner can take work yet";
         case "settings":
-        case "values":
             return "optional; not reviewed yet";
+        case "values":
+            return step.reason === "required_values_missing"
+                ? "a value is missing"
+                : "not checked yet";
+        case "first-ticket":
+            return "no ticket chosen yet";
         default:
             return step.state === "skipped" ? "not chosen" : "not done yet";
     }
@@ -166,31 +264,118 @@ export function setupStepView(step, journal, required = false) {
                     : "act";
     let outcome = step.state === "done" ? succeeded(step) : unfinished(step);
     if (mark === "later") {
-        const numbers = [
-            ...new Set((ONBOARD_DEPENDENCIES[step.id] ?? [])
-                .filter((id) => {
+        const waitsOn = step.reason === "github_install_pending"
+            ? ["github.install"]
+            : (ONBOARD_DEPENDENCIES[step.id] ?? []).filter((id) => {
                 const s = journal?.steps.find((s) => s.id === id);
                 return s?.state !== "done" && s?.state !== "skipped";
-            })
-                .map((id) => SETUP_NUMBERS[id])
-                .filter((n) => n !== undefined)),
-        ];
-        if (step.reason === "github_install_pending")
-            numbers.splice(0, numbers.length, SETUP_NUMBERS["github.install"]);
+            });
+        // Numbers restart in each part: this part's steps come bare, then each other part once.
+        const byPart = new Map();
+        for (const id of waitsOn) {
+            const n = SETUP_PART_NUMBERS[id];
+            if (n === undefined)
+                continue;
+            const p = SETUP_PART_OF[id];
+            const list = byPart.get(p) ?? [];
+            if (!list.includes(n))
+                byPart.set(p, [...list, n]);
+        }
+        const own = SETUP_PART_OF[step.id];
+        const steps = (ns) => {
+            const sorted = [...ns].sort((x, y) => x - y);
+            const last = sorted.pop();
+            return sorted.length
+                ? `steps ${sorted.join(", ")} and ${last}`
+                : `step ${last}`;
+        };
+        const groups = [...byPart]
+            .sort(([x], [y]) => (x === own ? -1 : y === own ? 1 : x - y))
+            .map(([p, ns]) => (p === own ? steps(ns) : `${steps(ns)} of part ${p}`));
         outcome =
             step.state === "pending" && !step.reason
                 ? "not checked yet"
-                : numbers.length
-                    ? `after ${numbers.length === 1 ? "step" : "steps"} ${numbers.join(" and ")}`
+                : groups.length
+                    ? `after ${groups.length > 1 ? `${groups.slice(0, -1).join(", ")}, and ${groups.at(-1)}` : groups[0]}`
                     : "after an earlier step";
     }
     return {
-        number: SETUP_NUMBERS[step.id] ?? 0,
+        number: SETUP_PART_NUMBERS[step.id] ?? 0,
         title: TITLES[step.id] ?? ONBOARD_TITLES[step.id],
         mark,
         outcome,
     };
 }
+/** How far each part has got, by its numbered rows. A row is done when every step in it is done
+ *  or skipped, and needs someone when any of its steps does. */
+export function setupPartProgress(journal, scope) {
+    const progress = {
+        1: { total: 0, done: 0, needs: 0, failed: 0 },
+        2: { total: 0, done: 0, needs: 0, failed: 0 },
+        3: { total: 0, done: 0, needs: 0, failed: 0 },
+    };
+    const rows = new Map();
+    for (const id of ONBOARD_STEPS) {
+        const number = SETUP_PART_NUMBERS[id];
+        if (number === undefined || (scope && !scope.includes(id)))
+            continue;
+        const step = journal.steps.find((s) => s.id === id) ?? {
+            id,
+            state: "pending",
+        };
+        const key = `${SETUP_PART_OF[id]}:${number}`;
+        rows.set(key, [...(rows.get(key) ?? []), setupStepView(step, journal).mark]);
+    }
+    for (const [key, marks] of rows) {
+        const part = progress[Number(key.split(":")[0])];
+        part.total++;
+        if (marks.every((m) => m === "done" || m === "skip"))
+            part.done++;
+        else if (marks.some((m) => m === "act" || m === "fail")) {
+            part.needs++;
+            if (marks.includes("fail"))
+                part.failed++;
+        }
+    }
+    return progress;
+}
+/**
+ * The tracker's rows: on the first screen (`plan`, the part about to start), at a boundary
+ * (`next`, the part about to start), or at the end. A part with no rows in this run is left out.
+ */
+export function setupTrackerRows(progress, moment) {
+    const steps = (n) => `${n} ${n === 1 ? "step" : "steps"}`;
+    return [1, 2, 3]
+        .filter((p) => progress[p].total > 0)
+        .map((p) => {
+        const { title, estimate, summary } = SETUP_PARTS[p];
+        const got = progress[p];
+        const row = (mark, note) => ({
+            mark,
+            number: p,
+            title,
+            note,
+        });
+        if (typeof moment === "object" && "plan" in moment)
+            return row(p === moment.plan ? "now" : "later", `${estimate} · ${summary}`);
+        const finished = got.done === got.total;
+        const needsMark = got.failed ? "fail" : "act";
+        if (typeof moment === "object") {
+            if (p === moment.next)
+                return row("now", `next · ${estimate}`);
+            if (p > moment.next)
+                return row("later", estimate);
+            return finished
+                ? row("done", "done")
+                : row(needsMark, `${steps(got.total - got.done)} not finished`);
+        }
+        if (finished)
+            return row("done", "");
+        if (got.needs)
+            return row(needsMark, `${steps(got.needs)} ${got.needs === 1 ? "needs" : "need"} someone`);
+        return row("later", `${got.done} of ${steps(got.total)} done`);
+    });
+}
 function page(base, path) {
     try {
         const url = new URL(path, base);
@@ -206,7 +391,8 @@ function page(base, path) {
 }
 function action(step, base, journal) {
     if (CONNECTION_REPAIR_REASONS.has(step.reason ?? "") ||
-        step.reason === "github_installation_approval_pending")
+        step.reason === "github_installation_approval_pending" ||
+        step.reason === "member_scope")
         return onboardReasonText(step, { baseUrl: base, journal });
     const link = (path, verb) => {
         const url = page(base, path);
@@ -229,7 +415,9 @@ function action(step, base, journal) {
         case "github.personal":
             return link("/settings/connected-accounts?connect=github", "connect your GitHub account");
         case "accounts":
-            return link("/settings/coding-accounts", "add a coding account");
+            return step.reason === "ai_account_not_usable"
+                ? onboardReasonText(step, { baseUrl: base, journal })
+                : link("/settings/coding-accounts", "add an AI account");
         case "linear.adopt": {
             const team = journal?.steps.find((row) => row.id === "linear.team" && row.state === "done");
             const key = team && value(team, "teamKey");
@@ -245,24 +433,30 @@ function action(step, base, journal) {
                 ? onboardReasonText(step, { baseUrl: base, journal })
                 : "Run catalyst onboard --runner to check whether this computer can take work.";
         case "settings":
-        case "values":
             return "Open your repository checkout and review its settings.";
+        case "values":
+            return onboardReasonText({ ...step, reason: step.reason ?? "required_values_unverified" }, { baseUrl: base, journal });
         case "linear.team":
             return "Choose a Linear team when setup checks again.";
         case "github.repos":
         case "projects":
             return "Choose repositories when setup checks again.";
         case "first-ticket":
-            return "Choose a first ticket when setup checks again.";
+            return onboardReasonText({ ...step, reason: step.reason ?? "first_ticket_choice_required" }, { baseUrl: base, journal });
         default:
             return "Try this step again when setup checks again.";
     }
 }
 export function setupFinalScreen(journal, base, paused = false, required = new Set()) {
+    // A member's run skips admin steps; readiness names the ones an admin has not finished yet.
+    const readyStep = journal.steps.find((step) => step.id === "ready");
+    const adminLeft = new Set(readyStep?.reason === "admin_setup_pending" && typeof readyStep.evidence?.admin === "string"
+        ? readyStep.evidence.admin.split(",")
+        : []);
     const roots = journal.steps
         .filter((step) => {
         const m = setupStepView(step, journal, required.has(step.id)).mark;
-        return ((m === "act" || m === "fail") &&
+        return ((m === "act" || m === "fail" || adminLeft.has(step.id)) &&
             (ONBOARD_DEPENDENCIES[step.id] ?? []).every((id) => {
                 const parent = journal.steps.find((s) => s.id === id);
                 return parent?.state === "done" || parent?.state === "skipped";
@@ -270,7 +464,7 @@ export function setupFinalScreen(journal, base, paused = false, required = new S
     })
         .filter((step) => step.id !== "ready")
         .sort((a, b) => ONBOARD_STEPS.indexOf(a.id) - ONBOARD_STEPS.indexOf(b.id));
-    const folded = (id) => id === "projects" ? "github.repos" : id === "values" ? "settings" : id;
+    const folded = (id) => id === "projects" ? "github.repos" : id;
     const unique = roots.filter((step, i) => roots.findIndex((s) => folded(s.id) === folded(step.id)) === i);
     const actions = unique
         .slice(0, 5)
@@ -297,16 +491,17 @@ export function setupFinalScreen(journal, base, paused = false, required = new S
                 : journal.exit === 0
                     ? "Ready for work"
                     : "Not ready for work yet";
-    const ticket = journal.steps.find((s) => s.id === "first-ticket" && s.state === "done");
-    const key = ticket && value(ticket, "ticketKey");
+    const firstTicket = journal.steps.find((s) => s.id === "first-ticket");
+    const ticket = firstTicket?.state === "done" ? firstTicket : undefined;
+    const key = ticket && (value(ticket, "ticket") ?? value(ticket, "ticketKey"));
     const savedTicketUrl = ticket && (value(ticket, "url") ?? value(ticket, "ticketUrl"));
     const ticketUrl = savedTicketUrl && page(base, savedTicketUrl);
     const next = paused
         ? "Next: run catalyst onboard to continue."
-        : key && ticketUrl
-            ? `Next: open ${ticketUrl} and follow ${key}.`
+        : key
+            ? `Follow ${ticketUrl ?? key} in Linear; Catalyst comments there as each phase finishes.`
             : heading === "Setup complete"
-                ? "Next: move a ticket to Todo in Linear."
+                ? `Next: move a ticket to ${dispatchStageName(firstTicket?.evidence?.stage)} in Linear.`
                 : journal.exit === 0 && actions[0]
                     ? `Next: ${actions[0].text[0].toLowerCase() + actions[0].text.slice(1)}`
                     : actions.length === 1
@@ -317,7 +512,9 @@ export function setupFinalScreen(journal, base, paused = false, required = new S
                                 ? "Next: run catalyst onboard after you finish 1 to " +
                                     actions.length +
                                     "."
-                                : "Next: run catalyst onboard to check again.";
+                                : readyStep?.reason === "member_team_required"
+                                    ? "Next: run catalyst onboard --team <KEY> to check again."
+                                    : "Next: run catalyst onboard to check again.";
     return {
         heading,
         readinessCause,
@@ -351,8 +548,8 @@ export function setupBrowserInstruction(id, base, opened = false) {
         ],
         accounts: [
             "/settings/coding-accounts",
-            "add the token with your Claude email",
-            "Add a coding account",
+            "add an API key",
+            "Add an API key",
         ],
     };
     const words = copy[id];
@@ -363,9 +560,6 @@ export function setupBrowserInstruction(id, base, opened = false) {
             ? `Opened your browser. ${words[2]} there.`
             : `Open this link and ${words[1]}:`,
         url: page(base, words[0]),
-        preparation: id === "accounts"
-            ? "In another terminal, run claude setup-token."
-            : undefined,
     };
 }
 /** JSON facts use the same reachable actions as the terminal, while retaining the existing journal. */
@@ -412,7 +606,9 @@ export function onboardJsonView(journal, base, paused = false, options = {}) {
             // CTC-4680: refused by the person's Catalyst role, not by GitHub, so a workspace admin acts.
             step.reason === "github_installation_admin_required" ||
             step.reason?.endsWith("_identity_unverified") ||
-            (action.id === "accounts" && role !== "owner" && role !== "admin");
+            ((action.id === "accounts" || action.id === "values") &&
+                role !== "owner" &&
+                role !== "admin");
         const url = action.text
             .match(/https?:\/\/[^\s<>]+/)?.[0]
             ?.replace(/[.,;:!?]+$/, "");

package/dist/setup-render.js

@@ -60,6 +60,7 @@ const ASCII_MARKS = {
     later: "[later]",
     run: "[..]",
     ask: "[?]",
+    now: "[next]",
 };
 const UNICODE_MARKS = {
     done: ["✓", "green"],
@@ -69,7 +70,34 @@ const UNICODE_MARKS = {
     later: ["·", "gray"],
     run: ["◐", "cyan"],
     ask: ["◆", "cyan"],
+    now: ["◆", "cyan"],
 };
+/** CTC-4680: the Pixel Nucleus core, copper on a dark terminal and rust on a light one
+ *  (catalyst-cloud docs/brand-mark.md), with the nearest 256- and 16-colour background. */
+const CORE = {
+    dark: { rgb: "210;142;99", x256: 173, x16: 43 },
+    light: { rgb: "169;81;47", x256: 130, x16: 41 },
+};
+/**
+ * The mark's 4×4 grid in two terminal lines, each cell 2 columns by half a line. The ring is a
+ * glyph in the terminal's own foreground colour; the core is a background colour, so no
+ * foreground is ever set and the C reads on light and dark terminals alike. The second line
+ * reverses video so the core's half block takes the copper and its other half the ring.
+ */
+export function pixelNucleusLines(env) {
+    // COLORFGBG is "fg;bg" (rxvt, Konsole, iTerm2); 7 and 15 are the light backgrounds.
+    const light = ["7", "15"].includes((env.COLORFGBG ?? "").split(";").at(-1) ?? "");
+    const core = light ? CORE.light : CORE.dark;
+    const bg = /^(truecolor|24bit)$/i.test(env.COLORTERM ?? "")
+        ? `48;2;${core.rgb}`
+        : /256/.test(env.TERM ?? "")
+            ? `48;5;${core.x256}`
+            : String(core.x16);
+    return [
+        `▄▄\u001b[${bg}m▀▀▀▀\u001b[49m▀▀`,
+        `▀▀\u001b[7;${bg}m▀▀▀▀\u001b[27;49m▄▄`,
+    ];
+}
 export function createSetupRenderer(stream, env) {
     let traits = terminalTraits(stream, env);
     const style = (format, text) => traits.color ? styleText(format, text, { validateStream: false }) : text;
@@ -85,12 +113,14 @@ export function createSetupRenderer(stream, env) {
     const visible = (text) => text
         .replace(/\u001b\]8;;[^\u001b]*\u001b\\/g, "")
         .replace(/\u001b\[[0-9;]*m/g, "");
-    const rail = traits.unicode ? "│" : "";
-    // CTC-4680: details sit 4 columns in (under the rail in Unicode), not under the step title at 6 or
-    // 11, so the eye doesn't travel across a small screen to read them.
-    const titleCol = 4;
-    const outcomeCol = traits.unicode ? 38 : 43;
-    const prefix = (col) => rail + " ".repeat(col - rail.length);
+    // CTC-4680 (round 2): headings and prose at column 2, step rows at 4, and their details 4 more,
+    // at 8, so the eye doesn't travel across a small screen to read them. No rail: the same columns
+    // on a terminal and in a pipe.
+    const textCol = 2;
+    const rowCol = 4;
+    const titleCol = rowCol + 4;
+    const outcomeCol = rowCol + (traits.unicode ? 38 : 43);
+    const prefix = (col) => " ".repeat(col);
     const mark = (kind) => {
         if (!traits.unicode)
             return ASCII_MARKS[kind];
@@ -111,9 +141,7 @@ export function createSetupRenderer(stream, env) {
             .map((line) => {
             const plain = visible(line);
             const indent = /^https?:\/\/\S+$/.test(plain) && stringWidth(plain) > width - col
-                ? traits.unicode
-                    ? 3
-                    : 0
+                ? textCol
                 : col;
             return prefix(indent) + line;
         });
@@ -122,13 +150,13 @@ export function createSetupRenderer(stream, env) {
         refresh();
         const lead = plan
             ? traits.unicode
-                ? "│"
+                ? " "
                 : "       "
             : traits.unicode
                 ? mark(kind)
                 : mark(kind).padEnd(7);
         const titleWidth = stringWidth(visible(title));
-        const label = `${lead}${traits.unicode ? "  " : " "}${String(number || "").padStart(2)} ${title}`;
+        const label = `${prefix(rowCol)}${lead}${traits.unicode ? "  " : " "}${String(number || "").padStart(2)} ${title}`;
         if (!outcome)
             return [label];
         if (width < 80 || titleWidth > 30)
@@ -214,6 +242,7 @@ export function createSetupRenderer(stream, env) {
         clear();
         abandon();
     };
+    let branded = false;
     const r = {
         get traits() {
             refresh();
@@ -221,11 +250,31 @@ export function createSetupRenderer(stream, env) {
         },
         intro(title) {
             refresh();
-            ordinary([traits.unicode ? `┌  ${style("bold", title)}` : title]);
+            ordinary([prefix(textCol) + style("bold", title)]);
+        },
+        brand(program, version) {
+            if (branded)
+                return;
+            branded = true;
+            refresh();
+            if (!traits.color || traits.columns < 50) {
+                ordinary([
+                    `${prefix(textCol)}Catalyst Cloud ${program}${version ? ` ${version}` : ""}`,
+                ]);
+                return;
+            }
+            const [one, two] = pixelNucleusLines(env);
+            ordinary([
+                `${prefix(textCol)}${one}  ${style("bold", "Catalyst Cloud")}`,
+                `${prefix(textCol)}${two}  ${style("dim", `${program}${version ? ` · ${version}` : ""}`)}`,
+            ]);
+        },
+        tracker(parts) {
+            ordinary(parts.flatMap((p) => stepRows(p.mark, p.number, p.title, p.note)));
         },
         outro(text) {
             abandon();
-            write(traits.unicode ? [`│`, `└  ${text}`] : ["", text]);
+            write(["", prefix(textCol) + text]);
         },
         plan(number, title, text) {
             ordinary(stepRows("run", number, title, text, true));
@@ -318,14 +367,22 @@ export function createSetupRenderer(stream, env) {
         },
         heading(text) {
             abandon();
-            write(traits.unicode ? ["│", `├─ ${style("bold", text)}`] : ["", text]);
+            write(["", prefix(textCol) + style("bold", text)]);
         },
         line(text) {
-            ordinary(rows(text, traits.unicode ? 3 : 0));
+            ordinary(rows(text, textCol));
+        },
+        item(label, text) {
+            const col = textCol + stringWidth(label);
+            const lines = rows(text, col);
+            const hang = prefix(col);
+            ordinary(lines[0].startsWith(hang)
+                ? [prefix(textCol) + label + lines[0].slice(col), ...lines.slice(1)]
+                : [prefix(textCol) + label.trimEnd(), ...lines]);
         },
         blank() {
             refresh();
-            ordinary([rail]);
+            ordinary([""]);
         },
         link(url) {
             return traits.links

package/dist/setup.js

@@ -19,6 +19,7 @@ import { Readable, Writable } from "node:stream";
 import { VERB_USAGE } from "./args.js";
 import { plainSetupLine, SetupEventStream, } from "./setup-events.js";
 import { createSetupRenderer, } from "./setup-render.js";
+import { setupPartHeading } from "./setup-onboard-copy.js";
 const MACHINE_TITLES = {
     1: "Install the catalyst command",
     2: "Add the Catalyst skills",
@@ -107,7 +108,7 @@ function planRenderer(r) {
         },
         more(text) {
             if (!hidden)
-                r.line(`       ${text}`);
+                r.line(`      ${text}`);
         },
         close() {
             open = false;
@@ -238,7 +239,9 @@ async function runEngine(engine, args, flags, ctx, deps) {
                 }
                 if (!deps.onboard ||
                     !["What’s left", "What\'s left"].includes(event.text))
-                    r.heading(event.text === "Setting up" ? "This computer" : event.text);
+                    r.heading(event.text === "Setting up"
+                        ? setupPartHeading(1, r.traits.unicode)
+                        : event.text);
                 return;
             case "plan":
                 plan.plan(event.number, event.title, event.text);
@@ -399,7 +402,7 @@ async function runEngine(engine, args, flags, ctx, deps) {
                 return await deps.onboard(r, flags);
             }
             catch {
-                errors.line("catalyst setup: onboarding could not finish. Run catalyst onboard to try again.");
+                errors.line("catalyst setup: onboarding could not finish. Run catalyst setup to try again.");
                 if (flags.json)
                     deps.writeJson(`${JSON.stringify({ schema: "catalyst-install-last-run/1", state: "failed", exitCode: 10, steps: [] })}\n`);
                 return 10;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalyst-cloud/cli",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Set up Catalyst Cloud, check your tickets and manage your account from the command line.",
   "license": "MIT",
   "type": "module",

package/skills/catalyst-github/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Catalyst's GitHub: show a ticket's pull request with its checks, reviews and review threads, say whether it is mergeable under this repository's policy, and explain what a PR accumulates as the ticket moves (the branch, the draft, the rewrite, the force-pushes, the labels, the queue). Use when someone asks "show me the PR", "what are the checks saying", "why hasn't it merged", "what does the queue need", "what does that label mean", or wants the branch and merge conventions Catalyst follows.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.15.2 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.15.3 — written in this repository for customer accounts -->
 
 # Catalyst's GitHub
 

package/skills/catalyst-linear/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Catalyst's view of Linear on the customer's own cloud account. Reads a ticket with its comments, relations, labels, linked pull requests and agent sessions inline, from the cloud API by default, with local replica reads available as an explicit opt-in, always naming the source; searches tickets, PRs, projects and initiatives; writes comments, card moves, labels and new tickets through the account's agent proxy as the app actor, with every route, stage id, label id and marker read from the account's contract. Knows what a ticket accumulates as Catalyst works it (phase-outcome comments, the document per phase, the agent session, the labels, the single blocks relation, the bookkeeping marker, the eyes acknowledgement). Use when a person says "show me the ticket", "what did Catalyst write on it", "comment on it", "move it", "label it" or "file a ticket". Not for raising a decision for a human (what-needs-me) and not for pull requests (catalyst-github).
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.15.2 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.15.3 — written in this repository for customer accounts -->
 
 # Catalyst Linear