@catalyst-cloud/cli 0.15.2 → 0.15.3

package/dist/onboard.js

@@ -10,7 +10,7 @@ import { onboardJsonView, TIMED_OUT_REASONS } from "./setup-onboard-copy.js";
 import { standalonePlan, standalonePlanNotes, } from "./onboard-standalone-copy.js";
 import { CliError, UsageError } from "./errors.js";
 import { onboardFileSnapshot } from "./onboard-file-snapshot.js";
-import { onboardReasonText, onboardTeamKey, savedOnboardBaseUrl, } from "./onboard-next.js";
+import { dispatchStageName, onboardReasonText, onboardTeamKey, savedOnboardBaseUrl, } from "./onboard-next.js";
 import { parseBootstrapPlan, bootstrapPlanHash, bootstrapPlanLines, } from "./onboard-bootstrap.js";
 export const ONBOARD_STEPS = [
     "machine",
@@ -37,6 +37,14 @@ export const ONBOARD_STEPS = [
     "first-ticket",
     "ready",
 ];
+function dailyUpdateChoice(value) {
+    const row = object(value);
+    if (row?.state === "on" || row?.state === "off")
+        return { state: row.state };
+    if (row?.state === "skipped" && row.reason === "no_scheduler")
+        return { state: "skipped", reason: "no_scheduler" };
+    return undefined;
+}
 export function onboardIdentityLines(identity) {
     if (!identity)
         return [
@@ -104,7 +112,8 @@ export const ONBOARD_DEPENDENCIES = {
     projects: ["linear.team", "github.repos"],
     accounts: ["signin"],
     settings: ["projects"],
-    values: ["settings"],
+    // The cloud's required-values check reads the registered repositories, not a local checkout.
+    values: ["projects"],
     capacity: ["projects"],
     // The join token names the selected team's pool.
     runner: ["linear.team"],
@@ -127,7 +136,7 @@ const ADMIN_STEPS = new Set([
     "github.repos",
     "projects",
     "settings",
-    "values",
+    // `values` is not here: its check only reads, so a member's run finds missing values too.
     "capacity",
     "runner",
     "first-ticket",
@@ -147,9 +156,9 @@ export const ONBOARD_TITLES = {
     "github.personal": "Connect your GitHub account",
     "github.repos": "Choose repositories",
     projects: "Register your projects",
-    accounts: "Check coding accounts",
+    accounts: "Check AI accounts",
     settings: "Review repository settings",
-    values: "Import selected local values",
+    values: "Check the repository's values",
     capacity: "Check runner capacity",
     runner: "Run Catalyst's work on this machine",
     daemon: "Check optional local sync",
@@ -251,6 +260,10 @@ function normalizeStep(value, fallbackAt) {
         "repository",
         "installation",
         "ticket",
+        // The team's dispatch stage name, as the contract gave it.
+        "stage",
+        // Admin-owned step ids a member's run found unfinished.
+        "admin",
         "cursor",
         "lag",
         "heartbeatAgeMs",
@@ -288,6 +301,8 @@ function normalizeStep(value, fallbackAt) {
         "org",
         "url",
         "actor",
+        // CTC-4716: which AI accounts the workspace may add, so the step's text offers only those.
+        "aiAccountKinds",
     ]) {
         const item = evidence?.[key];
         if (item === null ||
@@ -323,6 +338,7 @@ export function readOnboardJournal(path, cliVersion = "0.13.1", now = new Date()
         : typeof value.exitCode === "number"
             ? value.exitCode
             : null;
+    const dailyUpdate = dailyUpdateChoice(value.dailyUpdate);
     return {
         schema: 1,
         runId: typeof value.runId === "string" ? value.runId : randomUUID(),
@@ -354,6 +370,7 @@ export function readOnboardJournal(path, cliVersion = "0.13.1", now = new Date()
         ...(typeof value.localSync === "boolean"
             ? { localSync: value.localSync }
             : {}),
+        ...(dailyUpdate ? { dailyUpdate } : {}),
         operations: Object.fromEntries(Object.entries(object(value.operations) ?? {}).filter(([key, v]) => ONBOARD_STEPS.includes(key) &&
             typeof v === "string" &&
             /^[a-zA-Z0-9_.:-]{1,160}$/.test(v))),
@@ -573,7 +590,8 @@ function printPlan(ctx, journal, identity, options) {
         for (const line of onboardIdentityLines(identity))
             ctx.stdout(line);
     let group;
-    for (const row of standalonePlan(journal, options?.scope, options?.runner)) {
+    // Beside --json and headless output: the numbers JSON actions carry (CTC-4680).
+    for (const row of standalonePlan(journal, options?.scope, options?.runner, "json")) {
         if (row.group !== group) {
             ctx.stdout("");
             ctx.stdout(row.group);
@@ -629,14 +647,28 @@ export function stepSatisfied(step) {
     return (step?.state === "done" ||
         (step?.state === "skipped" &&
             (step.id === "legacy" ||
+                // Optional: a computer without the daily update still runs work.
+                step.id === "housekeeping" ||
                 step.reason === "member_scope" ||
                 (step.id === "daemon" && step.reason === "local_sync_not_selected") ||
                 (step.id === "runner" && step.reason === "runner_not_selected") ||
+                (step.id === "first-ticket" && step.reason === "first_ticket_skipped") ||
                 (step.id === "linear.automations" &&
                     step.reason === "automation_management_unavailable"))));
 }
+/** Optional work this computer or checkout cannot do. Work runs without it, so its wait never holds
+ * a complete setup. */
+const OPTIONAL_WAITS = new Set([
+    "settings_checkout_unverified",
+    "settings_approval_unverified",
+]);
+/** Satisfied, or an optional wait. What a complete setup needs of every step. */
+export function stepSettled(step) {
+    return (stepSatisfied(step) ||
+        (step?.state === "waiting" && OPTIONAL_WAITS.has(step.reason ?? "")));
+}
 /** Steps whose wait does not hold a full run's exit code: work runs without them. A failure still
- * fails the run, and the receipt's `complete` still needs them satisfied. Never used for gating. */
+ * fails the run, and the receipt's `complete` still needs them settled. Never used for gating. */
 export const ONBOARD_DEFERRED_STEPS = new Set([
     "settings",
     "values",
@@ -677,8 +709,11 @@ export function onboardNextActions(journal, baseUrl, only) {
         .filter((step) => (!only || step.id === only) && !stepSatisfied(step))
         .sort((a, b) => ONBOARD_STEPS.indexOf(a.id) - ONBOARD_STEPS.indexOf(b.id))
         .map((step) => `${ONBOARD_TITLES[step.id]}: ${onboardStepAction(journal, step, baseUrl)}`);
-    if (["projects", "accounts", "linear.adopt", "capacity"].every((id) => journalStep(journal, id)?.state === "done"))
-        lines.push(`Move a ticket in ${onboardTeamKey(journal) ?? "<TEAM KEY>"} to Todo; \`catalyst explain <ticket>\` says why it is or is not starting.`);
+    // A waiting first ticket already says to move a ticket, in its own line.
+    const firstTicket = journalStep(journal, "first-ticket");
+    if (["projects", "accounts", "linear.adopt", "capacity"].every((id) => journalStep(journal, id)?.state === "done") &&
+        firstTicket?.state !== "waiting")
+        lines.push(`Move a ticket in ${onboardTeamKey(journal) ?? "<TEAM KEY>"} to ${dispatchStageName(firstTicket?.evidence?.stage)}; \`catalyst explain <ticket>\` says why it is or is not starting.`);
     return lines;
 }
 function requireMatchingIdentity(journal, identity) {
@@ -727,9 +762,10 @@ export async function cmdOnboard(args, ctx, deps = {}, cliVersion = "0.13.1") {
     const only = typeof args.flags.only === "string"
         ? args.flags.only
         : undefined;
+    // A member's values check reads the selected team, so without --team it waits on the same skip.
     const memberScopeSkips = (id) => ADMIN_STEPS.has(id) ||
-        (id === "linear.team" &&
-            only !== "linear.team" &&
+        ((id === "linear.team" || id === "values") &&
+            only !== id &&
             typeof args.flags.team !== "string");
     const resume = typeof args.flags["resume-from"] === "string"
         ? args.flags["resume-from"]
@@ -1069,7 +1105,7 @@ export async function cmdOnboard(args, ctx, deps = {}, cliVersion = "0.13.1") {
         journal.complete =
             !only &&
                 code === 0 &&
-                ONBOARD_STEPS.every((id) => stepSatisfied(journalStep(journal, id)));
+                ONBOARD_STEPS.every((id) => stepSettled(journalStep(journal, id)));
         writeOnboardJournal(statePath, journal);
         if (args.json)
             ctx.stdout(JSON.stringify(journal));
@@ -1442,7 +1478,7 @@ export async function cmdOnboard(args, ctx, deps = {}, cliVersion = "0.13.1") {
             journal.complete =
                 !only &&
                     code === 0 &&
-                    ONBOARD_STEPS.every((id) => stepSatisfied(journalStep(journal, id)));
+                    ONBOARD_STEPS.every((id) => stepSettled(journalStep(journal, id)));
             const unfinished = journal.steps.filter((step) => !stepSatisfied(step));
             if (!only &&
                 !refused &&

package/dist/ready-copy.js

@@ -65,6 +65,93 @@ function slotList(slots) {
 function origin(baseUrl) {
     return baseUrl.replace(/\/+$/, "");
 }
+const NAME = /^[A-Za-z_][A-Za-z0-9_]{0,127}$/;
+const REPOSITORY = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,99}\/[A-Za-z0-9][A-Za-z0-9_.-]{0,99}$/;
+const identifiers = (value) => Array.isArray(value)
+    ? value.filter((name) => typeof name === "string" && NAME.test(name))
+    : [];
+const unresolvedFacts = (value) => Array.isArray(value)
+    ? value.flatMap((row) => typeof row?.name === "string" && NAME.test(row.name) && identifiers(row.references).length
+        ? [{ name: row.name, references: identifiers(row.references) }]
+        : [])
+    : [];
+/** The declared names a failing check carries, kept in the receipt for the fix line: which variables
+ * need a value, which refer to a secret with no value, and the same for the team's other
+ * repositories. Identifiers and repository names only. */
+export function valuesFacts(value) {
+    const row = (value ?? {});
+    return {
+        names: identifiers(row.names),
+        unresolved: unresolvedFacts(row.unresolved),
+        repos: Array.isArray(row.repos)
+            ? row.repos.flatMap((note) => typeof note?.repo === "string" && REPOSITORY.test(note.repo)
+                ? [{ repo: note.repo, names: identifiers(note.names), unresolved: unresolvedFacts(note.unresolved) }]
+                : [])
+            : [],
+    };
+}
+/** Where the named variables get their values. Names only: nothing here reads or prints a value. */
+function setValuesFix(baseUrl, names) {
+    return baseUrl
+        ? `set ${names.join(", ")} on the repository's Environment page: open ${origin(baseUrl)}/settings/projects, then the project, then the repository`
+        : `set ${names.join(", ")} on the repository's Environment page in Catalyst's project settings`;
+}
+function nameList(v) {
+    return Array.isArray(v)
+        ? v.filter((n) => typeof n === "string" && n.length > 0)
+        : [];
+}
+/** Entries whose name and references are both present; anything malformed is dropped, not guessed. */
+function unresolvedList(v) {
+    if (!Array.isArray(v))
+        return [];
+    return v.flatMap((u) => {
+        if (typeof u !== "object" || u === null)
+            return [];
+        const { name, references } = u;
+        const refs = nameList(references);
+        return typeof name === "string" && name.length > 0 && refs.length > 0
+            ? [{ name, references: refs }]
+            : [];
+    });
+}
+function unresolvedLine(u) {
+    const which = u.references.length === 1 ? "which has" : "which have";
+    return `${u.name} refers to ${u.references.join(", ")}, ${which} no value, so Catalyst can't start work there`;
+}
+/** A team check's fix line. A check that carries `names` (CTC-3561: `required_values`, contract
+ *  1.24.0) names them and where to set them. CTC-3606: it also names each `unresolved` variable and
+ *  the reference with no value, and each other repository's missing names from `repos[]`. `unresolved`
+ *  is a subset of `names` (the variable exists; its reference does not), so those are not told to be
+ *  "set". Every field is optional so an older cloud still works. Everything printed is a declared
+ *  identifier or a repository name, never a value, and nothing here reads a value. Any other check
+ *  keeps the generic line. Shared with setup's values step, which has no web address when the
+ *  saved login has none. */
+export function valuesFix(base, c) {
+    const unresolved = unresolvedList(c.unresolved);
+    const unresolvedNames = new Set(unresolved.map((u) => u.name));
+    const names = nameList(c.names).filter((n) => !unresolvedNames.has(n));
+    const parts = [];
+    if (names.length > 0)
+        parts.push(setValuesFix(base, names));
+    for (const u of unresolved)
+        parts.push(unresolvedLine(u));
+    for (const note of Array.isArray(c.repos) ? c.repos : []) {
+        if (typeof note !== "object" ||
+            note === null ||
+            typeof note.repo !== "string" ||
+            note.repo.length === 0)
+            continue;
+        const repoUnresolved = unresolvedList(note.unresolved);
+        const skip = new Set(repoUnresolved.map((u) => u.name));
+        const missing = nameList(note.names).filter((n) => !skip.has(n));
+        if (missing.length > 0)
+            parts.push(`${note.repo} is missing ${missing.join(", ")}`);
+        for (const u of repoUnresolved)
+            parts.push(`in ${note.repo}, ${unresolvedLine(u)}`);
+    }
+    return parts.length === 0 ? null : parts.join(". ");
+}
 /** The team's own page in Catalyst settings, optionally one of its sub-pages (`map`, `adopt`). */
 export function teamPage(baseUrl, key, sub) {
     return `${origin(baseUrl)}/settings/linear-teams/${encodeURIComponent(key)}${sub ? `/${sub}` : ""}`;

package/dist/ready.js

@@ -15,7 +15,7 @@ import { FIRST_STAMPED_VERSION } from "./skill-shape.js";
 import { installedBundleVersion } from "./skills.js";
 import { onboardingReadyReport, observeCloudOnboarding, } from "./onboard-ready.js";
 import { selectedOnboardTeam } from "./onboard-existing.js";
-import { dispatchGateCopy, teamCheckCopy, teamPage, whoFixes } from "./ready-copy.js";
+import { dispatchGateCopy, teamCheckCopy, teamPage, valuesFix, whoFixes } from "./ready-copy.js";
 import { onboardStatePath, readOnboardJournal } from "./onboard.js";
 export { semverOlder };
 /** `ready`'s own wording for the replica. It never recommends adopting the replica — until the
@@ -112,62 +112,6 @@ export function catalystCommandCheck(env, platform = process.platform) {
             "Keep using catalyst-skills on this machine, or put the npm global bin directory ahead of that one on PATH.",
     };
 }
-function nameList(v) {
-    return Array.isArray(v)
-        ? v.filter((n) => typeof n === "string" && n.length > 0)
-        : [];
-}
-/** Entries whose name and references are both present; anything malformed is dropped, not guessed. */
-function unresolvedList(v) {
-    if (!Array.isArray(v))
-        return [];
-    return v.flatMap((u) => {
-        if (typeof u !== "object" || u === null)
-            return [];
-        const { name, references } = u;
-        const refs = nameList(references);
-        return typeof name === "string" && name.length > 0 && refs.length > 0
-            ? [{ name, references: refs }]
-            : [];
-    });
-}
-function unresolvedLine(u) {
-    const which = u.references.length === 1 ? "which has" : "which have";
-    return `${u.name} refers to ${u.references.join(", ")}, ${which} no value, so Catalyst can't start work there`;
-}
-/** A team check's fix line. A check that carries `names` (CTC-3561: `required_values`, contract
- *  1.24.0) names them and where to set them. CTC-3606: it also names each `unresolved` variable and
- *  the reference with no value, and each other repository's missing names from `repos[]`. `unresolved`
- *  is a subset of `names` (the variable exists; its reference does not), so those are not told to be
- *  "set". Every field is optional so an older cloud still works. Everything printed is a declared
- *  identifier or a repository name, never a value, and nothing here reads a value. Any other check
- *  keeps the generic line. */
-function valuesFix(base, c) {
-    const unresolved = unresolvedList(c.unresolved);
-    const unresolvedNames = new Set(unresolved.map((u) => u.name));
-    const names = nameList(c.names).filter((n) => !unresolvedNames.has(n));
-    const parts = [];
-    if (names.length > 0) {
-        parts.push(`set ${names.join(", ")} on the repository's Environment page: open ${base}/settings/projects, then the project, then the repository`);
-    }
-    for (const u of unresolved)
-        parts.push(unresolvedLine(u));
-    for (const note of Array.isArray(c.repos) ? c.repos : []) {
-        if (typeof note !== "object" ||
-            note === null ||
-            typeof note.repo !== "string" ||
-            note.repo.length === 0)
-            continue;
-        const repoUnresolved = unresolvedList(note.unresolved);
-        const skip = new Set(repoUnresolved.map((u) => u.name));
-        const missing = nameList(note.names).filter((n) => !skip.has(n));
-        if (missing.length > 0)
-            parts.push(`${note.repo} is missing ${missing.join(", ")}`);
-        for (const u of repoUnresolved)
-            parts.push(`in ${note.repo}, ${unresolvedLine(u)}`);
-    }
-    return parts.length === 0 ? null : parts.join(". ");
-}
 export async function readyReport(ctx, deps) {
     const checks = [];
     const facts = deps.runtime ?? detectRuntime();