@catalyst-cloud/cli 0.15.1 → 0.15.3

package/dist/onboard-standalone-copy.js

@@ -1,60 +1,36 @@
-import { setupStepView, SETUP_NUMBERS } from "./setup-onboard-copy.js";
+import { setupPartHeading, setupStepView, SETUP_NUMBERS, SETUP_PART_NUMBERS, SETUP_PART_OF, } from "./setup-onboard-copy.js";
 export const COMPUTER_CHECKS = ["machine", "cli", "skills", "legacy"];
 const PLAN = [
     ["On this computer", "signin", "you approve once in your browser"],
-    [
-        "On this computer",
-        "housekeeping",
-        "schedule the daily update, where supported",
-    ],
-    [
-        "In Linear and GitHub",
-        "linear.workspace",
-        "an admin connects the workspace",
-    ],
-    [
-        "In Linear and GitHub",
-        "linear.personal",
-        "you connect your own Linear account",
-    ],
+    ["On this computer", "housekeeping", "schedule the daily update"],
+    ["In Linear and GitHub", "linear.workspace", "an admin connects the workspace"],
+    ["In Linear and GitHub", "linear.personal", "you connect your own Linear account"],
     ["In Linear and GitHub", "linear.team", "you choose the team"],
-    [
-        "In Linear and GitHub",
-        "linear.adopt",
-        "review any states and labels to add",
-    ],
-    [
-        "In Linear and GitHub",
-        "linear.automations",
-        "check how pull requests change issue states",
-    ],
-    [
-        "In Linear and GitHub",
-        "github.install",
-        "an admin chooses access on GitHub",
-    ],
-    [
-        "In Linear and GitHub",
-        "github.personal",
-        "you connect your own GitHub account",
-    ],
-    [
-        "In Linear and GitHub",
-        "github.repos",
-        "you choose where Catalyst can work",
-    ],
-    ["Work", "accounts", "check a coding account"],
+    ["In Linear and GitHub", "linear.adopt", "review any states and labels to add"],
+    ["In Linear and GitHub", "linear.automations", "check how pull requests change issue states"],
+    ["In Linear and GitHub", "github.install", "an admin chooses access on GitHub"],
+    ["In Linear and GitHub", "github.personal", "you connect your own GitHub account"],
+    ["In Linear and GitHub", "github.repos", "you choose where Catalyst can work"],
+    ["Work", "accounts", "check an AI account"],
     ["Work", "capacity", "check which runners can take work"],
     ["Work", "settings", "you review settings before saving them"],
+    ["Work", "values", "check every value the repositories need has one"],
     ["Work", "first-ticket", "you choose a ticket to start"],
 ];
-export function standalonePlan(journal, scope, runnerSelected = false) {
+/**
+ * The plan's rows. `parts` is what the terminal draws: part headings, numbers restarting in each
+ * part. `json` is the plain-text plan an agent reads beside `--json` (dry run, --json on stderr,
+ * headless): the older groups and the numbers JSON `actions[].number` reports (CTC-4680).
+ */
+export function standalonePlan(journal, scope, runnerSelected = false, numbering = "parts") {
+    const json = numbering === "json";
     const includes = (id) => !scope || scope.includes(id);
     const steps = new Map(journal.steps.map((step) => [step.id, step]));
     const rows = [];
     if (COMPUTER_CHECKS.some((id) => includes(id)))
         rows.push({
-            group: "On this computer",
+            group: json ? "On this computer" : setupPartHeading(1, false),
+            part: 1,
             number: 1,
             title: "Check this computer",
             detail: includes("legacy")
@@ -62,9 +38,31 @@ export function standalonePlan(journal, scope, runnerSelected = false) {
                 : "check the selected machine requirements",
         });
     for (const [group, id, detail] of PLAN) {
+        // The terminal gives this computer's runner its own row after "Check runners". The plain-text
+        // plan keeps it folded into that row, under the number JSON reports for both.
+        if (!json && id === "capacity") {
+            const row = (step, text) => rows.push({
+                group: setupPartHeading(3, false),
+                part: 3,
+                number: SETUP_PART_NUMBERS[step],
+                title: setupStepView({ id: step, state: "pending" }).title,
+                detail: steps.get(step)?.state === "done" ? `check again; ${text}` : text,
+            });
+            if (includes("capacity"))
+                row("capacity", detail);
+            if (includes("runner"))
+                row("runner", runnerSelected
+                    ? "start a Catalyst runner here with Docker"
+                    : "optional; this computer takes work only if you choose it");
+            continue;
+        }
+        // The terminal gives repository values their own row; the plain-text plan keeps them folded
+        // into the settings row, under the number JSON reports for both.
+        if (json && id === "values")
+            continue;
         if (!includes(id) &&
             !(id === "capacity" && includes("runner")) &&
-            !(id === "settings" && includes("values")))
+            !(json && id === "settings" && includes("values")))
             continue;
         const reviewedDetail = id === "capacity" && includes("runner") && runnerSelected
             ? "start a Catalyst runner here with Docker"
@@ -72,8 +70,9 @@ export function standalonePlan(journal, scope, runnerSelected = false) {
                 ? "review the optional runner on this machine; start only if selected"
                 : detail;
         rows.push({
-            group,
-            number: SETUP_NUMBERS[id],
+            group: json ? group : setupPartHeading(SETUP_PART_OF[id], false),
+            part: SETUP_PART_OF[id],
+            number: (json ? SETUP_NUMBERS : SETUP_PART_NUMBERS)[id],
             title: setupStepView({ id, state: "pending" }).title,
             detail: steps.get(id)?.state === "done"
                 ? `check again; ${reviewedDetail}`
@@ -82,29 +81,37 @@ export function standalonePlan(journal, scope, runnerSelected = false) {
     }
     return rows;
 }
-export function pendingContinuation(journal) {
-    const unfinished = (...ids) => ids.some((id) => {
-        const step = journal.steps.find((step) => step.id === id);
-        return (step &&
-            step.state !== "done" &&
-            setupStepView(step, journal).mark !== "skip");
-    });
-    const next = [];
-    if (unfinished("github.repos", "projects"))
-        next.push("chooses repositories");
-    if (unfinished("accounts"))
-        next.push("checks a coding account");
-    if (unfinished("capacity", "runner"))
-        next.push("checks runners");
-    if (unfinished("settings", "values"))
-        next.push("reviews repository settings");
-    if (unfinished("first-ticket"))
-        next.push("starts a first ticket");
+/** What setup does next on its own, in the order it runs: steps not finished and not already listed
+ *  as something a person must do (`listed`). A step setup never reached because it paused is here. */
+const CONTINUES = [
+    [["linear.workspace"], "connects your Linear workspace"],
+    [["linear.personal"], "connects your Linear account"],
+    [["linear.team"], "chooses a Linear team"],
+    [["linear.adopt"], "sets up the team's workflow"],
+    [["linear.automations"], "checks Linear's pull request automations"],
+    [["github.install"], "installs Catalyst on GitHub"],
+    [["github.personal"], "connects your GitHub account"],
+    [["github.repos", "projects"], "chooses repositories"],
+    [["accounts"], "checks an AI account"],
+    [["capacity", "runner"], "checks runners"],
+    [["settings"], "reviews repository settings"],
+    [["values"], "checks repository values"],
+    [["first-ticket"], "starts a first ticket"],
+];
+export function pendingContinuation(journal, listed = new Set()) {
+    const unfinished = (ids) => !ids.some((id) => listed.has(id)) &&
+        ids.some((id) => {
+            const step = journal.steps.find((step) => step.id === id);
+            return (step &&
+                step.state !== "done" &&
+                setupStepView(step, journal).mark !== "skip");
+        });
+    const next = CONTINUES.filter(([ids]) => unfinished(ids)).map(([, words]) => words);
     if (!next.length)
         return null;
     const last = next.pop();
     return `Then setup ${next.length ? `${next.join(", ")} and ` : ""}${last}.`;
 }
 export function standalonePlanNotes(localSync) {
-    return `${localSync ? "Local sync is selected." : "Local sync stays off, so Catalyst reads from the cloud."} Checking a coding account sends Claude one short request, which counts toward its usage. Completed steps are checked again before work starts. Codex credentials are not refreshed. Your code, git settings and other skills stay as they are.`;
+    return `${localSync ? "Local sync is selected." : "Local sync stays off, so Catalyst reads from the cloud."} Setup reads your AI accounts without sending them a request. Completed steps are checked again before work starts. Your code, git settings and other skills stay as they are.`;
 }