@catalyst-cloud/cli 0.16.42 → 0.16.43

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.16.43
+
+`catalyst ask accept` now waits for an answer that has not reached Catalyst yet, instead of failing. If you accept an ask a few seconds after answering it, Catalyst may not have your answer comment yet. The command used to stop with a refusal, and the same command worked when you ran it again. Now it waits as long as Catalyst asks and tries again, for up to 30 seconds. If the answer still has not arrived, it says so and tells you when to run the same command again. A refusal that will not change on retry is reported at once, with its reason.
+
 ## 0.16.42
 
 A busy machine now takes a waiting release after one day. Before, a busy machine could keep putting off a release that cannot take over from running work in place. Now the next check asks Catalyst to send the machine no new work, waits for the running work to finish, then moves to the release and takes work again. `catalyst runner update --check` says when a machine is waiting like this, and `catalyst runner auto-update off` ends the wait. If the update cannot restore the machine's private thoughts storage, the machine keeps taking no new work, and `catalyst runner update` tells you what to do. This release also makes updates on Catalyst's own machines more reliable.

package/dist/ask.js

@@ -9,7 +9,7 @@ import { CliError, UsageError } from "./errors.js";
 import { apiClient } from "./transport.js";
 import { fetchAllPages } from "./pagination.js";
 import { fetchWorkflowStates, postAgent, resolveIssue } from "./write.js";
-export async function cmdAsk(args, ctx) {
+export async function cmdAsk(args, ctx, deps = {}) {
     const [sub, ...rest] = positionals(args);
     if (!sub)
         throw new UsageError("ask needs a subcommand: raise | accept | answer | proxy | disown | list");
@@ -33,7 +33,7 @@ export async function cmdAsk(args, ctx) {
         case "raise":
             return raise(args, ctx, doc, api);
         case "accept":
-            return accept(args, ctx, doc, api, rest);
+            return accept(args, ctx, doc, api, rest, deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms))));
         case "answer":
             return answerByProxy(args, ctx, doc, api, proxyBody);
         case "list":
@@ -128,20 +128,36 @@ function askGates(args, options, doc) {
     }
     return { repo, pr: pr.length === 1 ? pr[0] : pr, labels: labels.length ? labels : ["hold"], releasedBy: released };
 }
-async function accept(args, ctx, doc, api, rest) {
+/** The most `ask accept` waits, in total, for an answer comment the cloud has not copied yet. */
+export const ASK_ACCEPT_RETRY_BUDGET_MS = 30_000;
+async function accept(args, ctx, doc, api, rest, sleep) {
     const askTicket = rest[0];
     const answer = flagString(args, "answer");
     const role = flagString(args, "role");
     if (!askTicket || !answer || !role)
         throw new UsageError("ask accept needs <askTicket> --answer <commentId> --role <role>");
     const ask = await resolveIssue(api, askTicket);
-    const result = await postAgent(api, doc, "ask-accept", {
-        askIssueId: ask.id,
-        answerCommentId: answer,
-        acceptedByRole: role,
-    });
-    ctx.stdout(args.json ? JSON.stringify(result) : `ask ${ask.identifier}: answer ${answer} recorded by ${role}`);
-    return 0;
+    const body = { askIssueId: ask.id, answerCommentId: answer, acceptedByRole: role };
+    // An answer posted seconds ago may not have reached the cloud yet. The cloud refuses that one case
+    // as retryable and says how long to wait; every other refusal is final and is not retried.
+    let waited = 0;
+    for (;;) {
+        const result = await postAgent(api, doc, "ask-accept", body, { accept: [409] });
+        if (result.outcome !== "refused") {
+            ctx.stdout(args.json ? JSON.stringify(result) : `ask ${ask.identifier}: answer ${answer} recorded by ${role}`);
+            return 0;
+        }
+        const waitMs = Math.max(1, result.retryAfterSeconds ?? 10) * 1000;
+        if (result.retryable === true && waited + waitMs <= ASK_ACCEPT_RETRY_BUDGET_MS) {
+            await sleep(waitMs);
+            waited += waitMs;
+            continue;
+        }
+        const reason = result.reason ?? "refused";
+        throw new CliError(result.retryable === true
+            ? `ask ${ask.identifier}: answer ${answer} has not reached the cloud yet (${reason}) after ${waited / 1000}s of retries; run the same command again in ${result.retryAfterSeconds ?? 10}s`
+            : `ask ${ask.identifier}: accept refused (${reason})`, result.retryable === true ? "ask-accept-retry" : "ask-accept-refused", 2, 409);
+    }
 }
 /** The cloud's bounds on an answer by proxy, checked here first so a refusal never costs a write. */
 const QUOTE_MAX = 4000;

package/dist/cli.js

@@ -531,7 +531,7 @@ export async function main(argv, ctx = defaultCtx(), deps = {}) {
             case "write":
                 return await cmdWrite(args, ctx, deps.write);
             case "ask":
-                return await cmdAsk(args, ctx);
+                return await cmdAsk(args, ctx, { sleep: deps.sleep });
             case "ready":
                 return await cmdReady(args, ctx, {
                     skillNames: CUSTOMER_SKILLS,

package/dist/runner-update-fleet.js

@@ -1,9 +1,10 @@
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, unlinkSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
+import { readManifest } from "./config.js";
 import { dockerRunnerEngine, prepareRunnerImages, spawnDocker } from "./onboard-runner.js";
 import { defaultRun } from "./runner-auto-update.js";
-import { decideRelease, DESIRED_RELEASE_SCRIPT, HOST_ID, isRecord, readReleaseState, releaseLock, takeLock, writePrivateAtomic, writeReleaseState, } from "./runner-update.js";
+import { decideRelease, DESIRED_RELEASE_SCRIPT, HOST_ID, isRecord, readReleaseState, releaseLock, takeLock, updateReport, writePrivateAtomic, writeReleaseState, } from "./runner-update.js";
 // `catalyst runner update --fleet <dir>`: the same approved release, applied to a multi-team
 // supervisor fleet (CTC-6530). One supervisor container serves several scopes from a Compose file
 // written as JSON (`compose.json`), under one operator enrollment, and every host credential on the
@@ -391,7 +392,7 @@ async function update(engine, options, now) {
     const project = isRecord(compose) && typeof compose.name === "string" ? compose.name : "";
     if (!isRecord(compose) || current === null || !/^[a-z0-9][a-z0-9_-]*$/.test(project))
         return done("failed", "fleet_compose_unrecognized", { exitCode: 1 });
-    const read = await engine.desiredRelease(dir, compose, signal);
+    const read = await engine.desiredRelease(dir, compose, signal, options.check ? undefined : updateReport(state, readManifest().version));
     const decision = decideRelease(state.generation, read);
     if (decision.action === "retain")
         return decision.reason === "not_newer"
@@ -764,8 +765,8 @@ export function dockerFleetUpdateEngine(deps = {}) {
     const compose = (dir, project, file = join(dir, FLEET_COMPOSE_FILE)) => ["compose", "--project-name", project, "--file", file];
     return {
         // Not `compose run`: that would mount the Docker socket and every scope's state. This container
-        // gets the credential alone, read-only, and the two variables the script reads.
-        async desiredRelease(_dir, file, signal) {
+        // gets the credential alone, read-only, the script's configuration and an optional update report.
+        async desiredRelease(_dir, file, signal, report) {
             const service = isRecord(file.services) && isRecord(file.services.supervisor) ? file.services.supervisor : null;
             const environment = service && isRecord(service.environment) ? service.environment : null;
             const credential = environment?.CATALYST_HOST_CREDENTIAL_FILE;
@@ -776,9 +777,10 @@ export function dockerFleetUpdateEngine(deps = {}) {
             if (!mount)
                 return { kind: "no_credential" };
             const user = typeof service.user === "string" && /^[0-9]+(:[0-9]+)?$/.test(service.user) ? ["--user", service.user] : [];
+            const reportEnv = report ? ["--env", `CATALYST_UPDATE_REPORT=${report}`] : [];
             const read = await docker(["run", "--rm", "--network", "bridge", "--read-only", "--tmpfs", "/tmp", "--cap-drop", "ALL",
                 "--security-opt", "no-new-privileges", ...user, "--mount", mount,
-                "--env", `CATALYST_HOST_CREDENTIAL_FILE=${credential}`, "--env", `CATALYST_MIRROR_URL=${mirror}`,
+                "--env", `CATALYST_HOST_CREDENTIAL_FILE=${credential}`, "--env", `CATALYST_MIRROR_URL=${mirror}`, ...reportEnv,
                 "--entrypoint", "bun", service.image, "-e", DESIRED_RELEASE_SCRIPT], { signal, timeoutMs: 120_000 });
             if (read.code !== 0)
                 return { kind: "no_credential" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalyst-cloud/cli",
-  "version": "0.16.42",
+  "version": "0.16.43",
   "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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — 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.42 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.43 — written in this repository for customer accounts -->
 
 # What's happening