@bli-cockpit/cli 0.2.65 → 0.2.66

package/dist/commands/public-root.js

@@ -15,7 +15,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.65");
+    writeLine(io?.stdout ?? process.stdout, "0.2.66");
     return 0;
   }
 

package/dist/commands/status.js

@@ -8,6 +8,11 @@
  * pastes into Slack when something looks wrong. The `--json` payload is the
  * machine contract and is byte-for-byte unchanged — `status-json-shape.test.ts`
  * holds it to that.
+ *
+ * Two branches, one machine: a folder holding several repos prints a row each,
+ * a single repo prints the full block, and BOTH carry the setup receipt
+ * (BLI-3789) — it says whether this HOST is connected, which does not change
+ * with the folder you are standing in.
  */
 import { readdir, stat } from "node:fs/promises";
 import os from "node:os";
@@ -24,6 +29,18 @@ import { getCollectorRuntimePaths, inspectLocalCollectorStatus, readLocalCollect
 import { normalizeCollectionRoots } from "../root-normalization.js";
 export async function runStatus(command, io) {
     const backfillCursor = await inspectBackfillCursor(command.homeDir);
+    // BLI-3731: "is this machine actually connected?" belongs beside "is it
+    // collecting?", and it is read back off the host rather than remembered.
+    // Refreshing here also keeps the heartbeat's cache warm without the 15-minute
+    // tick paying for the probe.
+    //
+    // BLI-3789: read it BEFORE the branch below, not after. The receipt is a fact
+    // about the MACHINE, so it cannot depend on whether the folder you happen to
+    // stand in holds one repo or six — and the multi-repo branch, which every
+    // agent machine takes, used to return before the receipt was ever built.
+    const setupReceipt = await refreshSetupReceipt(io, {
+        ...(command.homeDir ? { homeDir: command.homeDir } : {}),
+    });
     const worktrees = await discoverCommandWorktrees(command.repoRoot, { maxDepth: command.maxDepth, maxRepos: command.maxRepos, homeDir: command.homeDir }, io);
     if (worktrees.length > 1) {
         const statuses = await Promise.all(worktrees.map(async (worktree) => ({
@@ -34,7 +51,17 @@ export async function runStatus(command, io) {
             head_sha: worktree.head_sha,
         })));
         if (command.json) {
-            writeLine(io.stdout, JSON.stringify({ mode: "multi_repo", statuses, backfill_cursor: backfillCursor }, null, 2));
+            writeLine(io.stdout, JSON.stringify({
+                mode: "multi_repo",
+                statuses,
+                backfill_cursor: backfillCursor,
+                // Beside `backfill_cursor`, and for the same reason: both are facts
+                // about this machine, so both sit at the top of the payload rather
+                // than once per repo row. Null means this run could not read the
+                // host — `refreshSetupReceipt` named the reason on stderr — never
+                // "this machine is not connected".
+                setup_receipt: setupReceipt?.receipt ?? null,
+            }, null, 2));
             return 0;
         }
         writeLine(io.stdout, "Tower status — every repo below this folder");
@@ -42,16 +69,10 @@ export async function runStatus(command, io) {
         for (const status of statuses) {
             writeLine(io.stdout, `- ${status.repo_label ?? status.repo}/${status.worktree_label ?? "worktree"} · ${status.branch} · head:${shortSha(status.head_sha)} · ${status.upload_state}`);
         }
+        writeConnectedBlock(io, setupReceipt);
         return 0;
     }
     const status = await inspectLocalCollectorStatus(command);
-    // BLI-3731: "is this machine actually connected?" belongs beside "is it
-    // collecting?", and it is read back off the host rather than remembered.
-    // Refreshing here also keeps the heartbeat's cache warm without the 15-minute
-    // tick paying for the probe.
-    const setupReceipt = await refreshSetupReceipt(io, {
-        ...(command.homeDir ? { homeDir: command.homeDir } : {}),
-    });
     if (command.json) {
         writeLine(io.stdout, JSON.stringify({
             ...status,
@@ -88,13 +109,22 @@ export async function runStatus(command, io) {
     writeLine(io.stdout, `Stuck files: ${stuckEvidenceLine(status)}`);
     for (const detail of status.details)
         writeLine(io.stdout, `- ${detail}`);
+    writeConnectedBlock(io, setupReceipt);
+    return 0;
+}
+/**
+ * The receipt block, in the words `cockpit doctor` prints, from the one reader
+ * (BLI-3789). Both branches of `status` call this: a person standing in a
+ * parent folder is asking about the same machine as a person standing in one
+ * repo, and only one of them used to be told.
+ */
+function writeConnectedBlock(io, setupReceipt) {
     writeLine(io.stdout, "Connected:");
     for (const line of setupReceipt
         ? setupReceiptBlock(setupReceipt, { indent: "  " })
         : ["  unknown — run `cockpit doctor` to read this machine."]) {
         writeLine(io.stdout, line);
     }
-    return 0;
 }
 /**
  * Done, still working, or never started — and when it is still working, how

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.65",
+  "version": "0.2.66",
   "private": false,
   "type": "module",
   "bin": {