@catalyst-cloud/cli 0.16.28 → 0.16.30

package/dist/runner.js

@@ -8,6 +8,7 @@ import { loadConfig } from "./config.js";
 import { CliError, UsageError } from "./errors.js";
 import { onboardStateRoot } from "./onboard.js";
 import { dockerRunnerEngine, RUNNER_PROJECT, RUNNER_SESSION_NETWORK } from "./onboard-runner.js";
+import { HOST_DISK_LABEL, hostDiskAgentOutput } from "./onboard-runner-disk.js";
 import { EGRESS_ARTIFACTS, NATIVE_EGRESS_DIR } from "./onboard-runner-egress.js";
 import { stdinIsTty } from "./prompt.js";
 import { apiClient } from "./transport.js";
@@ -23,7 +24,7 @@ const COMPOSE_VOLUMES = ["supervisor-state", "host-credential"].map(v => `${RUNN
 const COMPOSE_FILES = ["compose.yaml", "compose.darwin-thoughts.yaml"];
 /** Files setup writes into the runner directory. The work folders are listed separately. */
 const SETUP_FILES = [...COMPOSE_FILES, ".env", "key-request.json"];
-const SETUP_DIRS = ["session-egress", "host-disk"];
+const SETUP_DIRS = ["session-egress", "host-disk", "host-disk-sampler"];
 /** Repository checkouts, the thoughts checkout and their locks: kept unless the owner says so. */
 const WORK_DIRS = ["slots", "thoughts", "locks"];
 const DARWIN_SIBLINGS = ["darwin-thoughts-custody", "darwin-thoughts-requests", "darwin-thoughts-responses"];
@@ -68,6 +69,20 @@ const exists = (path) => { try {
 catch {
     return false;
 } };
+/** Setup's disk sampler publishes into this runner's own host-disk bind; a same-label agent that
+ * writes elsewhere is its operator's, as setup treats it (CTC-5929). */
+function samplerIsSetups(text, runnerDir) {
+    const output = hostDiskAgentOutput(text);
+    if (!output || !runnerDir || basename(output) !== "space.json")
+        return false;
+    const real = (path) => { try {
+        return realpathSync(path);
+    }
+    catch {
+        return path;
+    } };
+    return real(dirname(output)) === real(join(runnerDir, "host-disk"));
+}
 /** The onboarding engine's reads, through this command's own runner. */
 function dockerEnvRun(run) {
     return (args, options) => run("docker", args, { input: options.input, timeoutMs: options.timeoutMs });
@@ -512,7 +527,9 @@ async function uninstall(args, ctx, deps, inst) {
     for (const agent of darwinAgents) {
         let ours = false;
         try {
-            ours = owned(agent.plist, uid, "file") && readFileSync(agent.plist, "utf8").includes(`<string>${agent.label}</string>`);
+            const text = readFileSync(agent.plist, "utf8");
+            ours = owned(agent.plist, uid, "file") && text.includes(`<string>${agent.label}</string>`) &&
+                (agent.label !== HOST_DISK_LABEL || samplerIsSetups(text, runnerDir));
         }
         catch { /* unreadable */ }
         if (!ours) {

package/dist/setup-onboard-copy.js

@@ -1,4 +1,4 @@
-import { dependencySettled, ONBOARD_DEPENDENCIES, ONBOARD_STEPS, ONBOARD_TITLES, } from "./onboard.js";
+import { dependencySettled, stepSatisfied, ONBOARD_DEPENDENCIES, ONBOARD_STEPS, ONBOARD_TITLES, } from "./onboard.js";
 import { dispatchStageName, onboardReasonText } from "./onboard-next.js";
 /** The step numbers `--json` reports. People read SETUP_PART_NUMBERS instead (CTC-4680). */
 export const SETUP_NUMBERS = {
@@ -385,6 +385,9 @@ moment = "end") {
             {
                 // A member's own skip (no --team) is theirs to finish, so it is never counted done.
                 mark: memberOwnSkip(step) ? "act" : setupStepView(step, journal).mark,
+                // CTC-5932: a skipped step finishes its row only when it was skipped by choice. A skipped
+                // connection is still owed, so a part never reads "done" over it.
+                settled: step.state !== "skipped" || stepSatisfied(step),
                 working: step.state !== "done" && CLOUD_WORK.has(step.reason ?? ""),
                 kind: setupWaitsOnAdmin(step, journal)
                     ? "admin"
@@ -400,7 +403,8 @@ moment = "end") {
         const part = progress[Number(key.split(":")[0])];
         part.total++;
         const own = steps.filter((s) => s.kind === "own");
-        if (own.length === steps.length && own.every((s) => s.mark === "done" || s.mark === "skip"))
+        if (own.length === steps.length &&
+            own.every((s) => s.mark === "done" || (s.mark === "skip" && s.settled)))
             part.done++;
         else if (own.some((s) => s.mark === "act" || s.mark === "fail")) {
             part.needs++;
@@ -416,6 +420,41 @@ moment = "end") {
     }
     return progress;
 }
+/** The connections part 2 makes, each approved by a person in a browser. */
+const BROWSER_CONNECTIONS = [
+    "linear.workspace",
+    "linear.personal",
+    "github.install",
+    "github.personal",
+];
+/**
+ * CTC-5932: what a run that could not ask anyone left out, said plainly, with the command that
+ * resumes it. Empty when nothing was left out. A runner chosen or declined by flag is the person's
+ * choice and is not repeated back.
+ */
+export function unattendedSkipLines(journal, options = {}) {
+    const inScope = (id) => !options.scope || options.scope.includes(id);
+    const step = (id) => journal.steps.find((s) => s.id === id);
+    const lines = [];
+    const runner = step("runner");
+    if (options.runner === undefined &&
+        inScope("runner") &&
+        runner?.state === "skipped" &&
+        runner.reason === "runner_not_selected")
+        lines.push("Setup ran without questions, so it chose no runner: this computer will not run tickets.", "To add one, run in a terminal: catalyst setup --runner");
+    const open = BROWSER_CONNECTIONS.filter((id) => inScope(id) && step(id)?.state !== "done");
+    // Name only the providers still open, so a re-run with Linear connected never calls it skipped.
+    const providers = [
+        ...(open.some((id) => id.startsWith("linear.")) ? ["Linear"] : []),
+        ...(open.some((id) => id.startsWith("github.")) ? ["GitHub"] : []),
+    ];
+    const both = providers.length > 1;
+    if (open.length)
+        lines.push(`${providers.join(" and ")} ${both ? "were" : "was"} skipped, because ${both ? "they need" : "it needs"} you in a browser. Not connected: ${open
+            .map((id) => TITLES[id] ?? ONBOARD_TITLES[id])
+            .join(", ")}.`, `To connect ${both ? "them" : "it"}, run in a terminal: catalyst setup`);
+    return lines;
+}
 /**
  * The tracker's rows: on the first screen (`plan`, the part about to start), at a boundary
  * (`next`, the part about to start), or at the end. A part with no rows in this run is left out.

package/dist/watch/consumer.js

@@ -112,6 +112,7 @@ export function createLiveEventsClient(sdk, opts) {
         baseUrl: opts.baseUrl,
         accountId: opts.accountId,
         auth: opts.auth,
+        connectParams: () => opts.cliVersion ? { cli_version: opts.cliVersion } : undefined,
         reseed: reseedHead,
         getCursor: () => state?.cursor ?? null,
         onChange: (frame) => {

package/dist/watch.js

@@ -4,7 +4,7 @@
 // an issue reference to its project through GET /api/v1/issues/:ref, cached in memory.
 import { spawn } from "node:child_process";
 import { flagList, flagString } from "./args.js";
-import { apiBase, requireConfig, watchCursorPathFor } from "./config.js";
+import { apiBase, requireConfig, readManifest, watchCursorPathFor } from "./config.js";
 import { loadContract } from "./contract.js";
 import { CliError, UsageError } from "./errors.js";
 import { apiClient } from "./transport.js";
@@ -136,6 +136,7 @@ export async function runWatch(ctx, cfg, opts, deps = {}) {
         return createLiveEventsClient(sdk, {
             baseUrl: apiBase(cfg),
             accountId: cfg.account,
+            cliVersion: readManifest().version,
             auth: authStrategyFor(ctx, cfg),
             getToken: () => bearerFor(ctx, cfg),
             cursorFile: opts.cursorFile ?? watchCursorPathFor(ctx.home),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalyst-cloud/cli",
-  "version": "0.16.28",
+  "version": "0.16.30",
   "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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — 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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — 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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — written in this repository for customer accounts -->
 
 # Onboard me
 

package/skills/catalyst-onboard/references/reading-ready.md

@@ -64,6 +64,7 @@ Each failing line prints its own fix.
 | `cliRelease` | the CLI is not behind the newest release; a note |
 | `skillsRelease` | the skill files are not behind the newest bundle; "could not run" means the registry was unreachable |
 | `sdk` | the SDK loads, so the replica and the watch are available; reads work through the API meanwhile |
+| `runner:disk` | when this machine runs Catalyst's work, the disk Docker uses has a fresh measurement with at least 25 GiB free (`CATALYST_HOST_FREE_FLOOR_GIB` changes the amount), so it can take work. A failing line says how much is free or why there is no measurement, with its fix, usually `catalyst setup --runner`; on a Mac that command also starts the LaunchAgent that measures the disk. A note means `ready` could not verify the installation to read it. Absent when this machine does not run Catalyst's work |
 | `replica` | the optional replica is fresh; a note (`references/local-sync.md`) |
 
 ## Setting up one team at a time

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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — written in this repository for customer accounts -->
 
 # Run this project
 

package/skills/run-this-project/references/stalls-and-escalation.md

@@ -24,7 +24,7 @@ Quote a reason the table does not know as the explainer spelled it.
 
 ## Shared causes are one note
 
-When several tickets are offered and nothing takes them, or the explainer names a routing, slot, provider or image condition, the cause is shared (coding-account headroom, a provider outage, a paused repository, a bad runner image). Write one summary line naming the condition and the tickets it holds. `catalyst accounts` reads coding-account status; enrolling or pausing one is the settings page.
+When several tickets are offered and nothing takes them, or the explainer names a routing, slot, provider or image condition, the cause is shared (coding-account headroom, a provider outage, a paused repository, a bad runner image). Write one summary line naming the condition and the tickets it holds. For a paused repository, `catalyst repo status` says who paused it, when and why; put that in the line, and leave resuming (`catalyst repo resume <owner/name>`) to a workspace owner or admin. `catalyst accounts` reads coding-account status; enrolling or pausing one is the settings page.
 
 ## Escalate inward
 

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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — 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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — 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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — 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.28 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.30 — written in this repository for customer accounts -->
 
 # What's happening
 

package/skills/whats-happening/references/what-runs-next.md

@@ -2,7 +2,7 @@
 
 Queues update within seconds. Dispatch sorts by priority, created time, identifier; mid-ladder tickets precede them by phases completed. Order never grants eligibility.
 
-An operator sets the repository concurrency cap, default 20, displayed in settings. Pause means zero, preserving the cap. Teams share capacity, including comment-wake.
+An operator sets the repository concurrency cap, default 20, displayed in settings. Pause means zero, preserving the cap. Any member reads which repositories are paused, by whom, when and why with `catalyst repo status`; a workspace owner or admin pauses one with `catalyst repo pause <owner/name> --reason <why>` and resumes it with `catalyst repo resume <owner/name>`. Teams share capacity, including comment-wake.
 
 WIP limits starts per project, one Linear team across repositories: project setting, operator's account value, then 12; zero prevents starts. Members read `catalyst project wip-limit get --team <KEY>`; owners/admins use `set <n>` or set default. Only first phases are held; later phases continue. Count live tickets past dispatch or granted a first phase, including waits/blocks/parks; exclude never-started, backlog and local-lane. Idle at the limit means started tickets wait; use unstick, catalyst-github or what-needs-me.
 

package/skills/whats-happening/references/why-is-it-stuck.md

@@ -25,7 +25,7 @@ Automatic waits, where no one acts: `retry_backoff`, `lease_held`, `intake_lease
 | `waiting_on` | the person, with their own login: unrepairable PR merge gate; read merge-wait comment for hold/review owed, using catalyst-github |
 | `externally_claimed` | the person, with their own login: outside worker owns it; worker/person removes local-lane label |
 | `environment_check_required` / `environment_check_failed` / `environment_check_expired` / `environment_check_hash_mismatch` | absent/failed/aged/changed environment check; a workspace owner or admin, in settings, runs or fixes it |
-| `repo_paused` | an operator resumes repository |
+| `repo_paused` | the repository is paused; `catalyst repo status` says by whom, when and why; a workspace owner or admin, in settings or with `catalyst repo resume <owner/name>`, resumes it |
 | `scope_overlap` | the person, with their own login: declared files overlap running work; choose order or wait |
 | `human_owned_pr` | the person, with their own login: only its human owner closes, merges or hands it over; release refused |
 | `review_not_converging` | the person, with their own login: read findings through catalyst-github, comment; release refused |

package/vendor/self-host/darwin-thoughts-custody/manifest.json

@@ -4,7 +4,7 @@
   "inputs": {
     "packages/host-isolation/src/darwin-thoughts-producer.ts": "038fb63d8121fb1665ec31869f45604aedd96dd7d9b15a415d578fea9a0ad507",
     "packages/protocol/src/darwin-thoughts-custody.ts": "3515efc22b0a3cfb512ff1acaf649c6eafb978b894c724fabb01c325aea51075",
-    "packages/host-isolation/src/darwin-thoughts-custody.ts": "8165e058f6bed990fe35ce30685db0f4634746c3b22d51f81a9c77cd9745735f",
+    "packages/host-isolation/src/darwin-thoughts-custody.ts": "305e5ddfa3786f6db6b55b9e62b07e28370fb59bf0cd3660011321225dfcba7e",
     "deploy/self-host/darwin-thoughts-custody/producer-entry.ts": "27c8ff591c8dc4d1a4c65dd154157df5191ead1fb0af673bfd7099d5226d37bc",
     "deploy/self-host/darwin-thoughts-custody/verifier-entry.ts": "80bc1e72943e43bc33d76ba205bd79751f58ca34d622e35f7e50e3b661f65464",
     "deploy/self-host/darwin-thoughts-custody/generate.ts": "bfe1bef175fa8243be0558e1ddee6ddbcfbd622922e3a5df850e8621f18e7b26",
@@ -13,6 +13,6 @@
     "deploy/self-host/darwin-thoughts-custody/service.plist.in": "66e9a2c175d2500b1f7130e7c04a5ed07f22bc7425661777f514fa3f2a816496"
   },
   "artifactSha256": "0e0f1bbdac23813e8ee57b6eb4ae3dfd24c3f1c51ebe0c3d119a1448734ea05e",
-  "verifierSha256": "322b838917b9f7e1d9b7d9705a75143697ca093553bf0dcca7e7f5d4a88bbdc0",
+  "verifierSha256": "0229509c107ec7a509a7bdbb7fa19d21f06a3f9075e53f4890f6d316d518518b",
   "verifierDeclarationsSha256": "624428ced2eb18b045b761b49e20b7f52c0fc6c3132689571103ece7b4a1083f"
 }

package/vendor/self-host/darwin-thoughts-custody/verifier.mjs

@@ -457,7 +457,57 @@ function cleanPath(path) {
       throw failure("directory");
   }
 }
-function directory(path, privateChannel = false) {
+var DARWIN_THOUGHTS_UNSAFE_DIRECTORY_SUBCHECKS = [
+  "not_directory",
+  "authority_changed",
+  "special_bits",
+  "group_other_write",
+  "owner_rwx",
+  "private_bits",
+  "private_owner",
+  "bootstrap_other_bits"
+];
+var BOOTSTRAP_LEVELS = [
+  ["thoughts_root", "thoughts_tenant", "thoughts_owner", "thoughts_repository"],
+  ["locks_root", "locks_tenant"],
+  ["requests_root", "requests_tenant", "requests_owner", "requests_repository"],
+  ["responses_root", "responses_tenant", "responses_owner", "responses_repository"]
+];
+var DARWIN_THOUGHTS_DIRECTORY_ROLES = [
+  "requests_channel",
+  "responses_channel",
+  "checkout",
+  "lock",
+  "git",
+  "thoughts_root_wait",
+  "locks_root_wait",
+  ...BOOTSTRAP_LEVELS.flat()
+];
+function bootstrapRole(index, level) {
+  const role = BOOTSTRAP_LEVELS[index]?.[level];
+  if (!role)
+    throw failure("bootstrap_path");
+  return role;
+}
+function unsafeDirectory(role, subcheck) {
+  if (!DARWIN_THOUGHTS_DIRECTORY_ROLES.includes(role) || !DARWIN_THOUGHTS_UNSAFE_DIRECTORY_SUBCHECKS.includes(subcheck))
+    return failure("unsafe_directory");
+  return failure(`unsafe_directory:${role}:${subcheck}`);
+}
+function darwinThoughtsUnsafeDirectorySubcheck(stat, privateChannel) {
+  if ((stat.mode & 0o7000n) !== 0n)
+    return "special_bits";
+  if ((stat.mode & 0o022n) !== 0n)
+    return "group_other_write";
+  if ((stat.mode & 0o700n) !== 0o700n)
+    return "owner_rwx";
+  if (privateChannel && (stat.mode & 0o077n) !== 0n)
+    return "private_bits";
+  if (privateChannel && stat.uid !== 0n && stat.uid !== 10001n)
+    return "private_owner";
+  return;
+}
+function directory(path, role, privateChannel = false) {
   return guarded(() => {
     cleanPath(path);
     const named = fs.lstatSync(path, { bigint: true });
@@ -465,17 +515,21 @@ function directory(path, privateChannel = false) {
     try {
       const opened = fs.fstatSync(fd, { bigint: true });
       const after = fs.lstatSync(path, { bigint: true });
-      if (!opened.isDirectory() || !sameDirectoryAuthority(named, opened) || !sameDirectoryAuthority(opened, after) || (opened.mode & 0o7022n) !== 0n || (opened.mode & 0o700n) !== 0o700n || privateChannel && ((opened.mode & 0o077n) !== 0n || opened.uid !== 0n && opened.uid !== 10001n)) {
-        throw failure("unsafe_directory");
-      }
+      if (!opened.isDirectory())
+        throw unsafeDirectory(role, "not_directory");
+      if (!sameDirectoryAuthority(named, opened) || !sameDirectoryAuthority(opened, after))
+        throw unsafeDirectory(role, "authority_changed");
+      const subcheck = darwinThoughtsUnsafeDirectorySubcheck(opened, privateChannel);
+      if (subcheck)
+        throw unsafeDirectory(role, subcheck);
       return opened;
     } finally {
       fs.closeSync(fd);
     }
   });
 }
-function currentIdentity(path, logicalPath) {
-  const stat = directory(path);
+function currentIdentity(path, logicalPath, role) {
+  const stat = directory(path, role);
   return {
     path: logicalPath,
     device: stat.dev.toString(),
@@ -534,7 +588,7 @@ function isInitialGuestOwnerProjection(before, current, stagedFile) {
   return before.dev === current.dev && before.ino === current.ino && before.mode === current.mode && before.uid === 0n && before.gid === 0n && current.uid === 10001n && current.gid === 10001n && process.getuid?.() === 10001 && process.geteuid?.() === 10001 && process.getgid?.() === 10001 && stagedFile.uid === 10001n && stagedFile.gid === 10001n;
 }
 function receiveStagingChannel(path, before, stagedFile, observedAncestors) {
-  const current = directory(path, true);
+  const current = directory(path, "requests_channel", true);
   if (sameDirectoryAuthority(before, current))
     return current;
   if (!isInitialGuestOwnerProjection(before, current, stagedFile))
@@ -549,16 +603,20 @@ function receiveStagingChannel(path, before, stagedFile, observedAncestors) {
 function receiveWaitingResponseChannel(path, before, stagedFile, observedAncestors, responsePath, bootstrapRoots, authenticatePresentResponse, bootstrapProjection) {
   const maxPasses = bootstrapRoots ? 4 : 2;
   for (let pass = 0;pass < maxPasses; pass += 1) {
-    const current = directory(path, true);
-    const projections = [{ path, before, current, privateChannel: true }];
-    for (const root of bootstrapRoots ? [bootstrapRoots.thoughtsRoot, bootstrapRoots.locksRoot] : []) {
+    const current = directory(path, "responses_channel", true);
+    const projections = [{ path, role: "responses_channel", before, current, privateChannel: true }];
+    for (const [root, role] of bootstrapRoots ? [
+      [bootstrapRoots.thoughtsRoot, "thoughts_root_wait"],
+      [bootstrapRoots.locksRoot, "locks_root_wait"]
+    ] : []) {
       const captured = observedAncestors.find((ancestor) => ancestor.path === root);
       if (!captured)
         throw failure("ancestor_identity");
       projections.push({
         path: root,
+        role,
         before: captured.stat,
-        current: directory(root),
+        current: directory(root, role),
         privateChannel: false
       });
     }
@@ -589,7 +647,7 @@ function receiveWaitingResponseChannel(path, before, stagedFile, observedAncesto
     checkAncestors(observedAncestors.filter((ancestor) => !projections.some((projection) => projection.path === ancestor.path)), bootstrapProjection);
     let resample = false;
     for (const projection of projections) {
-      const next = directory(projection.path, projection.privateChannel);
+      const next = directory(projection.path, projection.role, projection.privateChannel);
       if (sameDirectoryAuthority(projection.current, next))
         continue;
       if (!receiveProjection(projection.current, next, stagedFile))
@@ -660,9 +718,10 @@ function checkBootstrapDirectories(paths, allowMissing) {
       throw failure("bootstrap_path");
     let current = root;
     const components = ["", ...leaf.slice(root.length + 1).split("/")];
-    for (const component of components) {
+    for (const [level, component] of components.entries()) {
       if (component)
         current = join(current, component);
+      const role = bootstrapRole(index, level);
       try {
         fs.lstatSync(current);
       } catch (error) {
@@ -670,11 +729,11 @@ function checkBootstrapDirectories(paths, allowMissing) {
           break;
         throw failure("bootstrap_directory", error);
       }
-      const stat = directory(current, index >= 2);
+      const stat = directory(current, role, index >= 2);
       if (stat.uid !== 0n && stat.uid !== 10001n)
         throw failure("bootstrap_owner");
       if ((stat.mode & 0o007n) !== 0n)
-        throw failure("unsafe_directory");
+        throw unsafeDirectory(role, "bootstrap_other_bits");
     }
   }
 }
@@ -695,21 +754,21 @@ async function exchange(options, bootstrap) {
     issuedAtMs,
     expiresAtMs: options.deadlineMs
   }));
-  let requests = directory(options.requestDir, true);
-  let responses = directory(options.responseDir, true);
+  let requests = directory(options.requestDir, "requests_channel", true);
+  let responses = directory(options.responseDir, "responses_channel", true);
   const creationPaths = bootstrap ? bootstrapPaths(authority, options.tenant, options.repository) : [];
   if (bootstrap)
     checkBootstrapDirectories(creationPaths, true);
   else {
-    currentIdentity(options.checkoutPath, targets.checkoutSource);
-    currentIdentity(options.lockPath, targets.lockSource);
+    currentIdentity(options.checkoutPath, targets.checkoutSource, "checkout");
+    currentIdentity(options.lockPath, targets.lockSource, "lock");
   }
   const gitPath = join(options.checkoutPath, ".git");
   if (options.gitPath !== undefined && options.gitPath !== gitPath)
     throw failure("git_path");
   const initialGitPresent = options.gitPath !== undefined || gitPresent(gitPath);
   if (initialGitPresent)
-    currentIdentity(gitPath, join(targets.checkoutSource, ".git"));
+    currentIdentity(gitPath, join(targets.checkoutSource, ".git"), "git");
   const aliasAncestors = guarded(() => ancestors([
     options.requestDir,
     options.responseDir,
@@ -745,11 +804,11 @@ async function exchange(options, bootstrap) {
       authority,
       request,
       nowMs: now(),
-      engineCheckout: currentIdentity(options.checkoutPath, targets.checkoutSource),
-      engineLock: currentIdentity(options.lockPath, targets.lockSource)
+      engineCheckout: currentIdentity(options.checkoutPath, targets.checkoutSource, "checkout"),
+      engineLock: currentIdentity(options.lockPath, targets.lockSource, "lock")
     };
     if (gitPresent(gitPath))
-      expectation.engineGit = currentIdentity(gitPath, join(targets.checkoutSource, ".git"));
+      expectation.engineGit = currentIdentity(gitPath, join(targets.checkoutSource, ".git"), "git");
     verifyDarwinThoughtsCustodyResponse(bytes, expectation);
   };
   const projection = () => {
@@ -789,7 +848,7 @@ async function exchange(options, bootstrap) {
     }
     requests = receiveStagingChannel(options.requestDir, requests, owned, aliasAncestors);
     checkAncestors(aliasAncestors);
-    if (!sameDirectoryAuthority(requests, directory(options.requestDir, true)))
+    if (!sameDirectoryAuthority(requests, directory(options.requestDir, "requests_channel", true)))
       throw failure("channel_identity");
     try {
       fs.lstatSync(finalPath);
@@ -814,11 +873,11 @@ async function exchange(options, bootstrap) {
           throw failure("ancestor_identity");
         requests = receivedRequest.stat;
       }
-      for (const [path, expected] of [
-        [options.requestDir, requests],
-        [options.responseDir, responses]
+      for (const [path, role, expected] of [
+        [options.requestDir, "requests_channel", requests],
+        [options.responseDir, "responses_channel", responses]
       ]) {
-        const current = directory(path, true);
+        const current = directory(path, role, true);
         if (!sameDirectoryAuthority(current, expected))
           throw failure("channel_identity");
       }
@@ -841,11 +900,11 @@ async function exchange(options, bootstrap) {
           authority,
           request,
           nowMs: 0,
-          engineCheckout: currentIdentity(options.checkoutPath, targets.checkoutSource),
-          engineLock: currentIdentity(options.lockPath, targets.lockSource)
+          engineCheckout: currentIdentity(options.checkoutPath, targets.checkoutSource, "checkout"),
+          engineLock: currentIdentity(options.lockPath, targets.lockSource, "lock")
         };
         if (receivedGitPresent)
-          expectation.engineGit = currentIdentity(gitPath, join(targets.checkoutSource, ".git"));
+          expectation.engineGit = currentIdentity(gitPath, join(targets.checkoutSource, ".git"), "git");
         checkAncestors(aliasAncestors, projection());
         checkAncestors(receivedGitAncestors, projection());
         expectation.nowMs = now();

package/vendor/self-host/host-disk-sample.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+"""Publish native filesystem headroom for a supervisor inside a VM."""
+import argparse
+import json
+import os
+from pathlib import Path
+import sys
+import tempfile
+import time
+
+
+def publish(path: Path, output: Path) -> dict:
+    filesystem = os.statvfs(path)
+    sample = {
+        "schemaVersion": 1,
+        "path": str(path.resolve(strict=True)),
+        "observedAtMs": time.time_ns() // 1_000_000,
+        "availableBytes": filesystem.f_bavail * filesystem.f_frsize,
+        "totalBytes": filesystem.f_blocks * filesystem.f_frsize,
+    }
+    output.parent.mkdir(parents=True, exist_ok=True)
+    temporary = None
+    try:
+        with tempfile.NamedTemporaryFile(mode="w", dir=output.parent, delete=False) as stream:
+            temporary = Path(stream.name)
+            json.dump(sample, stream)
+            stream.write("\n")
+            stream.flush()
+            os.fsync(stream.fileno())
+            os.fchmod(stream.fileno(), 0o644)
+        os.replace(temporary, output)
+        temporary = None
+    finally:
+        if temporary is not None:
+            temporary.unlink(missing_ok=True)
+    return sample
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--path", required=True, type=Path, help="Native filesystem backing the VM disk")
+    parser.add_argument("--output", required=True, type=Path, help="Sample in a read-only supervisor bind")
+    parser.add_argument("--interval", type=float, help="Publish every INTERVAL seconds until stopped")
+    args = parser.parse_args()
+    if args.interval is None:
+        publish(args.path, args.output)
+        sys.exit(0)
+    if args.interval <= 0:
+        parser.error("--interval must be positive")
+    # launchd keeps this loop alive instead of firing a timer: an agent bootstrapped over SSH can
+    # leave every StartInterval launch pended (CTC-5929), and the supervisor then refuses all work.
+    while True:
+        try:
+            publish(args.path, args.output)
+        except OSError as error:
+            print(f"host-disk sample failed: {error}", file=sys.stderr, flush=True)
+        time.sleep(args.interval)

package/vendor/self-host/launchd/dev.catalystcloud.host-disk.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key><string>dev.catalystcloud.host-disk</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>__PYTHON__</string>
+    <string>__SCRIPT__</string>
+    <string>--path</string><string>__PATH__</string>
+    <string>--output</string><string>__OUTPUT__</string>
+    <string>--interval</string><string>10</string>
+  </array>
+  <key>RunAtLoad</key><true/>
+  <key>KeepAlive</key><true/>
+  <key>ThrottleInterval</key><integer>10</integer>
+</dict>
+</plist>