@catalyst-cloud/cli 0.16.7 → 0.16.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.16.8
+
+Setup can resume an update stopped by a local storage check. Failed access checks keep the earlier settings and report which check stopped setup.
+
 ## 0.16.7
 
 Setup can update an existing installation that still runs its saved, older image version. Headless setup names which key input Catalyst rejected and shows how to try a saved personal login when one is available. Installer checks leave existing skill files in place until the installer updates them.

package/dist/onboard-runner-custody.js

@@ -7,7 +7,34 @@ import { fileURLToPath } from "node:url";
 import { canonicalDarwinThoughtsJson, parseDarwinThoughtsAuthority, parseDarwinThoughtsRequest, verifyDarwinThoughtsCustodyResponse, } from "../vendor/self-host/darwin-thoughts-custody/verifier.mjs";
 const LABEL = "dev.catalystcloud.runner.darwin-thoughts-custody";
 const vendor = resolve(dirname(fileURLToPath(import.meta.url)), "../vendor/self-host/darwin-thoughts-custody");
-function fail(reason) { throw Error("darwin_thoughts_custody_install:" + reason); }
+class CustodyInstallError extends Error {
+    reason;
+    constructor(reason) {
+        super("darwin_thoughts_custody_install:" + reason);
+        this.reason = reason;
+        this.name = "CustodyInstallError";
+    }
+}
+/** Only our fixed installer errors may reach output; never forward command stderr or causes. */
+export function darwinThoughtsInstallRefusal(error) {
+    return error instanceof CustodyInstallError ? error.reason : undefined;
+}
+/** Unknown exception text can contain credentials. Keep its class, and explicitly redact it. */
+export function darwinThoughtsInstallException(error) {
+    const known = error instanceof CustodyInstallError;
+    const classes = new Set(["Error", "TypeError", "RangeError", "SyntaxError", "AbortError", "CustodyInstallError"]);
+    return { custodyErrorClass: error instanceof Error && classes.has(error.name) ? error.name : "Error",
+        custodyErrorMessage: known ? error.message : "Unclassified local storage exception; message withheld to protect credentials.",
+        custodyErrorMessageRedacted: !known };
+}
+function fail(reason) { throw new CustodyInstallError(reason); }
+const VERIFIER_REFUSALS = new Set([
+    "ancestor", "ancestor_identity", "bootstrap_directory", "bootstrap_owner", "bootstrap_path",
+    "channel_identity", "cleanup", "deadline", "directory", "engine_identity", "exchange",
+    "file_owner", "git_descriptor", "git_path", "invalid", "noncanonical_json", "nonce_collision",
+    "path", "producer_refused", "signature", "size", "substituted_file", "substituted_request",
+    "unsafe_directory", "unsafe_file",
+]);
 function path(value) {
     if (!isAbsolute(value) || normalize(value) !== value || value.includes("\0") ||
         value.endsWith("/") || value === "/")
@@ -594,8 +621,10 @@ async function actualBootstrap(input) {
             fail("bootstrap_cleanup_unproved");
         id = receiveIdentity(await docker(["inspect", name]), id);
         const started = await docker(["start", "--attach", id]);
-        if (started.code !== 0)
-            fail("bootstrap_proof_refused");
+        if (started.code !== 0) {
+            const reported = /darwin_thoughts_custody:([a-z_]+)(?![a-z_])/.exec(started.stderr)?.[1];
+            fail("bootstrap_proof_refused" + (reported && VERIFIER_REFUSALS.has(reported) ? ":" + reported : ""));
+        }
         const value = JSON.parse(started.stdout);
         if (typeof value.bytes !== "string" || value.bytes.length > 21848 ||
             Buffer.from(value.bytes, "base64").toString("base64") !== value.bytes)

package/dist/onboard-runner-telemetry.js

@@ -0,0 +1,80 @@
+import { hostname } from "node:os";
+import { loadConfig, normalizeBaseUrl } from "./config.js";
+import { ownedFetch } from "./owned-fetch.js";
+/** One failure event, using the existing personal login and the tenant-stamping ingest route.
+ * The short-lived export token stays in memory. Export failure never erases the setup refusal. */
+export async function emitCustodyFailure(ctx, journal, details, parent) {
+    const cfg = loadConfig(ctx.home);
+    if (!cfg?.user || cfg.account !== (journal.account ?? journal.tenant) ||
+        cfg.user.id !== journal.membershipId || !journal.baseUrl ||
+        normalizeBaseUrl(cfg.baseUrl) !== normalizeBaseUrl(journal.baseUrl))
+        return false;
+    const expiry = cfg.auth ? Date.parse(cfg.auth.expiresAt) - ctx.now().getTime() : 0;
+    const bearer = cfg.key || (cfg.auth && expiry > 30_000 ? cfg.auth.accessToken : undefined);
+    if (!bearer || parent?.aborted)
+        return false;
+    const deadline = new AbortController();
+    const timer = setTimeout(() => deadline.abort(), 5000);
+    const signal = parent ? AbortSignal.any([parent, deadline.signal]) : deadline.signal;
+    const owner = ownedFetch(ctx.fetch, signal, { maxBodyBytes: 4096 });
+    let delivered = false;
+    try {
+        const origin = normalizeBaseUrl(cfg.baseUrl);
+        const minted = await owner.fetch(`${origin}/api/v1/telemetry/token`, {
+            method: "POST", redirect: "error", signal,
+            headers: { authorization: `Bearer ${bearer}`, "content-type": "application/json" },
+            body: JSON.stringify({ ttlSeconds: 60 }),
+        });
+        if (minted.status !== 200)
+            return false;
+        const token = await minted.json();
+        if (!token || typeof token !== "object" || !("token" in token) ||
+            typeof token.token !== "string" || !/^ctc_tel_[A-Za-z0-9._~-]{1,2048}$/.test(token.token) ||
+            !("account" in token) || token.account !== cfg.account ||
+            !("scope" in token) || token.scope !== "telemetry:write" ||
+            !("endpoint" in token) || token.endpoint !== `${origin}/api/v1/telemetry`)
+            return false;
+        const current = loadConfig(ctx.home);
+        if (!current?.user || current.account !== cfg.account || current.user.id !== cfg.user.id ||
+            normalizeBaseUrl(current.baseUrl) !== origin)
+            return false;
+        const attribute = (key, value) => ({ key,
+            value: typeof value === "boolean" ? { boolValue: value } : { stringValue: value } });
+        const attributes = [
+            attribute("catalyst.onboarding.run_id", journal.runId),
+            attribute("catalyst.onboarding.step", "runner"),
+            attribute("catalyst.onboarding.custody.failure_case", details.custodyFailureCase),
+            ...Object.entries(details).filter(([key]) => key !== "custodyFailureCase").map(([key, value]) => attribute(key, value)),
+        ];
+        const response = await owner.fetch(`${origin}/api/v1/telemetry/v1/logs`, {
+            method: "POST", redirect: "error", signal,
+            headers: { authorization: `Bearer ${token.token}`, "content-type": "application/json" },
+            body: JSON.stringify({ resourceLogs: [{ resource: { attributes: [
+                                attribute("service.name", "catalyst-cloud.cli"), attribute("host.name", hostname()),
+                            ] }, scopeLogs: [{ scope: { name: "catalyst-cloud.cli.onboarding", version: journal.cli },
+                                logRecords: [{ timeUnixNano: String(BigInt(ctx.now().getTime()) * 1000000n),
+                                        severityNumber: 17, severityText: "ERROR", eventName: "onboarding.runner.custody.refused",
+                                        body: { stringValue: "Setup could not verify local storage." }, attributes }] }] }] }),
+        });
+        const text = await response.text();
+        const acknowledgement = text ? JSON.parse(text) : {};
+        if (response.ok && acknowledgement && typeof acknowledgement === "object" && !Array.isArray(acknowledgement)) {
+            const partial = "partialSuccess" in acknowledgement ? acknowledgement.partialSuccess : undefined;
+            delivered = partial === undefined || !!partial && typeof partial === "object" && !Array.isArray(partial) &&
+                (!("rejectedLogRecords" in partial) || partial.rejectedLogRecords === 0 || partial.rejectedLogRecords === "0");
+        }
+    }
+    catch {
+        delivered = false;
+    }
+    finally {
+        clearTimeout(timer);
+        try {
+            await owner.settle();
+        }
+        catch {
+            delivered = false;
+        }
+    }
+    return delivered;
+}

package/dist/onboard-runner.js

@@ -8,7 +8,8 @@ import { runnerAdmission, issueRunnerOrgKey, verifyRunnerRoutes } from "./onboar
 import { verifyOnboardRoutes } from "./onboard-capabilities.js";
 import { liveTeamKey, onboardTeamAdmission } from "./onboard-capacity.js";
 import { runnerVmCapabilities } from "./onboard-runner-probes.js";
-import { installDarwinThoughtsCustody } from "./onboard-runner-custody.js";
+import { darwinThoughtsInstallException, darwinThoughtsInstallRefusal, installDarwinThoughtsCustody } from "./onboard-runner-custody.js";
+import { emitCustodyFailure } from "./onboard-runner-telemetry.js";
 import { canonicalDarwinThoughtsJson, parseDarwinThoughtsAuthority } from "../vendor/self-host/darwin-thoughts-custody/verifier.mjs";
 import { readExistingOnboardJson, readOnboardTeamInventory, selectedOnboardTeam, } from "./onboard-existing.js";
 import { onboardStateRoot, } from "./onboard.js";
@@ -242,12 +243,14 @@ export function dockerRunnerEngine(deps = {}) {
                 const baseUrl = origins[0].slice("CATALYST_MIRROR_URL=".length);
                 if (!HOST_NAME.test(hostName))
                     return "unverified";
-                // A running older pin is still ours only when the self-owned Compose environment
-                // names that exact pinned image and the same runtime identity. Setup can then move it
-                // to the desired pin after the normal enrollment and custody checks.
+                // The saved intent is either this exact old pin or the exact requested replacement.
+                // The latter resumes an upgrade stopped after persisting intent but before activation.
+                // Both paths require an immutable runtime pin from the same repository and identity.
                 if (config.Image !== supervisorImage &&
                     (!saved || !IMAGE_REF.test(saved.CATALYST_SUPERVISOR_IMAGE ?? "") ||
-                        config.Image !== saved.CATALYST_SUPERVISOR_IMAGE ||
+                        typeof config.Image !== "string" || !IMAGE_REF.test(config.Image) ||
+                        (config.Image !== saved.CATALYST_SUPERVISOR_IMAGE && saved.CATALYST_SUPERVISOR_IMAGE !== supervisorImage) ||
+                        config.Image.split("@sha256:")[0] !== supervisorImage.split("@sha256:")[0] ||
                         saved.CATALYST_SUPERVISOR_IMAGE.split("@sha256:")[0] !== supervisorImage.split("@sha256:")[0] ||
                         saved.CATALYST_HOST_NAME !== hostName ||
                         normalizeBaseUrl(saved.CATALYST_MIRROR_URL ?? "") !== normalizeBaseUrl(baseUrl)))
@@ -708,6 +711,15 @@ export function onboardRunnerAdapter(input = {}) {
         ...want,
         ...Object.fromEntries(Object.entries(saved ?? {}).filter(([key]) => !(key in want))),
     });
+    async function refuseCustody(ctx, journal, failureCase, message, details = {}, signal) {
+        if (signal?.aborted)
+            return waiting("interrupted", selected);
+        input.message?.(message);
+        const evidence = { custodyFailureCase: failureCase, ...details };
+        const delivered = await emitCustodyFailure(ctx, journal, evidence, signal);
+        return waiting("runner_thoughts_custody_unavailable", { ...selected, ...evidence,
+            custodyTelemetry: delivered ? "sent" : "unavailable" });
+    }
     async function listHosts(ctx, p, signal) {
         const read = await readExistingOnboardJson(ctx, `${ENROLLMENTS}?account=${encodeURIComponent(p.account)}`, signal);
         return "reason" in read ? null : parseHosts(read.body);
@@ -934,8 +946,6 @@ export function onboardRunnerAdapter(input = {}) {
                     return false;
                 }
             };
-            if (!writeEnv(want))
-                return { state: "failed", reason: "runner_directory_unavailable", evidence: selected };
             for (const ref of Object.values(p.images)) {
                 if (!(await engine.imageArch(ref, signal)) && !p.info.vm) {
                     await engine.pull(ref, signal);
@@ -950,11 +960,13 @@ export function onboardRunnerAdapter(input = {}) {
                 const capability = await engine.vmCapabilities(p.dir, p.images.supervisor, p.baseUrl, signal);
                 if (capability !== "ready")
                     return waiting(capability, selected);
+                if (!engine.nativeThoughtsCustody)
+                    return refuseCustody(ctx, journal, "capability_missing", "Setup could not verify local storage: this engine has no native storage-check capability.", {}, signal);
+                let custodyReturned = false;
                 try {
-                    if (!engine.nativeThoughtsCustody)
-                        return waiting("runner_thoughts_custody_unavailable", selected);
                     const result = await engine.nativeThoughtsCustody({ dir: p.dir,
                         supervisorImage: p.images.supervisor, runnerImage: p.images.runner }, signal);
+                    custodyReturned = true;
                     if (signal?.aborted)
                         return waiting("interrupted", selected);
                     const values = {
@@ -962,19 +974,23 @@ export function onboardRunnerAdapter(input = {}) {
                         CATALYST_THOUGHTS_CUSTODY_REQUESTS_DIR: result.requestsRoot,
                         CATALYST_THOUGHTS_CUSTODY_RESPONSES_DIR: result.responsesRoot,
                     };
-                    if (persistedCustody(p.dir, values) !== "installed" ||
-                        canonicalDarwinThoughtsJson(result.authority) !== result.envAuthority)
-                        return waiting("runner_thoughts_custody_unavailable", selected);
+                    const custodyResultInstalled = persistedCustody(p.dir, values) === "installed";
+                    const custodyAuthorityMatched = canonicalDarwinThoughtsJson(result.authority) === result.envAuthority;
+                    if (!custodyResultInstalled || !custodyAuthorityMatched)
+                        return refuseCustody(ctx, journal, "result_unverified", "Setup could not verify local storage: the returned installation or authority did not match.", { custodyResultInstalled, custodyAuthorityMatched }, signal);
                     writePrivate(join(p.dir, "compose.darwin-thoughts.yaml"), readFileSync(join(packageRoot(), "vendor", "self-host", "compose.darwin-thoughts.yaml"), "utf8"));
                     receivedCustody = { dir: p.dir, result };
                     want = (await desiredEnv(p, ctx));
-                    if (!writeEnv(want))
-                        return { state: "failed", reason: "runner_directory_unavailable", evidence: selected };
                 }
-                catch {
-                    return waiting(signal?.aborted ? "interrupted" : "runner_thoughts_custody_unavailable", selected);
+                catch (error) {
+                    const custodyReason = darwinThoughtsInstallRefusal(error);
+                    const failureCase = custodyReturned ? "result_unverified" : "call_threw";
+                    const details = { ...darwinThoughtsInstallException(error), ...(custodyReason ? { custodyReason } : {}) };
+                    return refuseCustody(ctx, journal, failureCase, `Setup could not verify local storage: ${custodyReturned ? "recording the result failed" : "the native check threw"} (${details.custodyErrorClass}: ${details.custodyErrorMessage}).`, details, signal);
                 }
             }
+            if (!writeEnv(want))
+                return { state: "failed", reason: "runner_directory_unavailable", evidence: selected };
             const network = await engine.network(RUNNER_SESSION_NETWORK, signal);
             if (network === "misshaped")
                 return waiting("runner_session_network_misshaped", selected);

package/dist/onboard.js

@@ -315,6 +315,14 @@ function normalizeStep(value, fallbackAt) {
         "actor",
         // CTC-4716: which AI accounts the workspace may add, so the step's text offers only those.
         "aiAccountKinds",
+        "custodyFailureCase",
+        "custodyErrorClass",
+        "custodyErrorMessage",
+        "custodyErrorMessageRedacted",
+        "custodyReason",
+        "custodyResultInstalled",
+        "custodyAuthorityMatched",
+        "custodyTelemetry",
     ]) {
         const item = evidence?.[key];
         if (item === null ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalyst-cloud/cli",
-  "version": "0.16.7",
+  "version": "0.16.8",
   "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.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — 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.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # Catalyst Linear
 

package/skills/catalyst-onboard/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Set up Catalyst Cloud and say whether setup is working. Walks a person from nothing to their first ticket running, one step at a time: the coding account, the project, the integrations and connected accounts, each repository's settings file, then one real ticket moving. Also logs this machine in, reads the readiness verdict with who can fix each failure, and checks the optional local replica. Use when someone says "set me up", "onboard me", "I just signed up", "get me started", "what do I do first", "log me in", "which account is this machine on", "am I set up", "what is missing", "why does nothing happen" or "is the replica running", when a login expired, or when a skill script exits 2 saying this machine is not connected. Does every step a key can do through the catalyst CLI, hands over the exact page for the steps only a browser can do, and never claims a step it did not watch succeed.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # Onboard me
 

package/skills/run-this-project/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Own one Catalyst Cloud project end to end until it closes. Use when the person says "run this project for me", "own this until it ships", "keep this moving", or hands you a project id or a set of tickets to drive. Subscribes to the account's event stream for the scope through the catalyst CLI, reacts to each change in the same turn, makes tickets ready and moves them to dispatch, parks what should stop, chases stalls, escalates inward, and keeps one status summary current. Writes to Linear as the app actor; never polls.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # Run this project
 

package/skills/unstick/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Get a stuck Catalyst Cloud ticket moving again. Use when the person asks "why is this parked and can you release it?", "unpark this", "get things flowing again", "the outage is over, retry what failed", or hands you a ticket that is not moving. Reads why nothing runs and what holds the ticket through the catalyst CLI, decides whether the recorded cause is fixed, previews the release, releases every governor holding the ticket the right way (or one failure class across a team), and raises an ask only for what a person has to do. Never releases a cause it cannot show changed without saying so.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # Unstick
 

package/skills/what-needs-me/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   The human's decision inbox on Catalyst Cloud, and the one way an agent raises a decision on their behalf. Use when the person asks "what needs me?", "what am I blocking?", or when active work is gated on a choice only they can make. Lists open asks ranked by how much open work each one holds, files an ask through the cloud's ask route with the account's own template, and records the answer so the held work releases. Never answers as the human, never duplicates an open ask.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # What needs me
 

package/skills/what-this-repo-needs/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   What environment variable names does this repository need, and where does each one come from? Scans the repository offline (no login, no network) and lists the names in three groups (build/test, deploy-only, bindings), each with where it was found, what uses it, and where a local value would come from. Never reads a value or prints one. Also checks the environment variable table in `.catalyst/catalyst.toml` offline. Use when someone asks "what does catalyst.env.json mean", "what env vars does this repo need", "why does the container need this", or before reviewing or writing the declaration.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # What this repository needs
 

package/skills/whats-happening/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Use for "what's happening?", "what machines do we have?", "how much capacity do we have?", "where are we?", "why is that stuck?", "what closed?", "what's next?", "how does this work?", "why did it do that?", "how does it prioritise?" and "what does this setting do, where is it set?" in Catalyst Cloud, or asks for something to be done rather than known. Reads the contract via catalyst CLI. Read-only: route work/decisions, never answer as the human.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.7 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.8 — written in this repository for customer accounts -->
 
 # What's happening