@catalyst-cloud/cli 0.16.12 → 0.16.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.16.14
+
+Setup uses the updated macOS folder checks and verifies the required release image before starting work. Re-run setup to update this computer.
+
+## 0.16.13
+
+Setup on macOS now verifies private file access when Docker changes a folder’s displayed owner in either direction. Signed access verification remains required. Re-run setup to update this computer.
+
 ## 0.16.12
 
 Setup on macOS now handles changing folder ownership during the local storage check. Signed file-access verification remains required. Re-run setup to update this computer.

package/dist/onboard-next.js

@@ -427,13 +427,15 @@ export function onboardReasonText(step, context = {}) {
         const commands = nativeEgressInstallCommands();
         return "Native Linux needs a root-managed session egress producer before the runner can take work. Its elevated installation creates the isolated session network and private-range and host-isolation nftables rules. Review and authorize this separately; setup has not run it. It requires systemd, python3, Docker and nftables. " + (commands ? "Install the verified bundled artifacts, then run the same setup command:\n" + commands : "Setup could not verify its bundled artifacts. Reinstall the CLI before authorizing installation.");
     }
-    if (reason === "runner_images_unavailable") {
+    if (reason === "runner_images_unavailable" || reason === "runner_supervisor_image_unavailable") {
         const image = step.evidence?.image;
         const named = typeof image === "string" &&
             /^[a-z0-9][a-z0-9._:/-]{0,255}@sha256:[0-9a-f]{64}$/.test(image)
             ? ` ${image}`
             : "";
-        return `This machine does not have the Catalyst image${named}, and its pull did not complete. Check network access and run the same setup command to retry the anonymous pull.`;
+        return reason === "runner_supervisor_image_unavailable"
+            ? `Setup could not verify or download the supervisor image required by this CLI release${named}. It has not started new work. Check network access and run the same setup command again.`
+            : `This machine does not have the Catalyst image${named}, and its pull did not complete. Check network access and run the same setup command to retry the anonymous pull.`;
     }
     if (reason === "runner_org_key_missing") {
         const where = context.baseUrl

package/dist/onboard-runner.js

@@ -20,13 +20,13 @@ import { onboardStateRoot, } from "./onboard.js";
 /** The Compose project name the vendored file declares. */
 export const RUNNER_PROJECT = "catalyst-host";
 export const RUNNER_SESSION_NETWORK = "catalyst-session-v1";
-/** Qualified public images from main 72e4e20f86: host run 38073557244 and
- * runner run 38073557245; the unchanged watchdog retains its earlier reviewed pin.
+/** Supervisor from ee729b12 (Host images 38138827750); runner from
+ * 91a82214 (Runner image 38133282600). The watchdog retains its reviewed pin.
  * Explicit environment values override these pins; a saved runner image is preserved. */
 export const RUNNER_HOST_IMAGES = {
-    supervisor: "ghcr.io/coalesce-labs/catalyst-supervisor@sha256:5aa2e7ab67d85c837a81e272ee089c8438ae1ba5b886b05354515be4058d15f6",
+    supervisor: "ghcr.io/coalesce-labs/catalyst-supervisor@sha256:3331ebc4204ae3975a4efb2c870c941f9c0f5ab435735e91dc9977941c91e9a8",
     watchdog: "ghcr.io/coalesce-labs/catalyst-deadline-watchdog@sha256:a5999dbf229ac432b83c2ed3fe43fa251366baceb73af2f57590890a6a758f0d",
-    runner: "ghcr.io/coalesce-labs/catalyst-runner@sha256:dc83c11d357f1f5fa1ec55c669d02e9ff6f5ec9633a9bdc6fc15fbe7497f9655",
+    runner: "ghcr.io/coalesce-labs/catalyst-runner@sha256:9db2bf2c5580e2a1459fd076fa32c9af34456cc639ec3ab92b57b6ad98da67fb",
 };
 const IMAGE_REF = /^[a-z0-9][a-z0-9._:/-]{0,255}@sha256:[0-9a-f]{64}$/;
 const HOST_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]{0,62}$/;
@@ -267,15 +267,32 @@ export function dockerRunnerEngine(deps = {}) {
                             return "unverified";
                     }
                 }
-                return { dir, hostName, baseUrl: normalizeBaseUrl(baseUrl) };
+                return { dir, hostName, baseUrl: normalizeBaseUrl(baseUrl), supervisorImage: config.Image };
             }
             catch {
                 return "unverified";
             }
         },
         async imageArch(ref, signal) {
-            const read = await docker(["image", "inspect", "--format", "{{.Architecture}}", ref], { signal });
-            return read.code === 0 ? read.stdout.trim() || null : null;
+            if (!IMAGE_REF.test(ref))
+                return null;
+            const read = await docker(["image", "inspect", ref], { signal });
+            if (read.code !== 0)
+                return null;
+            try {
+                const rows = JSON.parse(read.stdout);
+                if (!Array.isArray(rows) || rows.length !== 1)
+                    return null;
+                const row = object(rows[0]);
+                if (typeof row?.Id !== "string" || !/^sha256:[0-9a-f]{64}$/.test(row.Id) ||
+                    row.Os !== "linux" || typeof row.Architecture !== "string" || !row.Architecture ||
+                    !Array.isArray(row.RepoDigests) || !row.RepoDigests.includes(ref))
+                    return null;
+                return row.Architecture;
+            }
+            catch {
+                return null;
+            }
         },
         async pull(ref, signal) {
             const host = await endpoint(signal);
@@ -711,7 +728,8 @@ export function onboardRunnerAdapter(input = {}) {
         if (!info.vm && !(await engine.nativeEgressStatus?.(ctx.now().getTime(), signal)))
             return waiting("runner_native_egress_setup_required", selected);
         return { account, baseUrl: normalizeBaseUrl(cfg.baseUrl), teamKey, teamId, cloud, dir, info, images,
-            ...(installation && installation !== "missing" ? { installedName: installation.hostName } : {}) };
+            ...(installation && installation !== "missing" ? { installedName: installation.hostName,
+                installedSupervisorImage: installation.supervisorImage } : {}) };
     }
     async function desiredEnv(p, ctx, joinToken) {
         const saved = readEnvFile(join(p.dir, ".env")) ?? {};
@@ -852,8 +870,9 @@ export function onboardRunnerAdapter(input = {}) {
             catch {
                 /* A missing or unreadable compose needs an explicitly authorized repair. */
             }
-            const changed = !saved || !composeMatches || Object.entries(want).some(([key, value]) => saved[key] !== value);
-            const hostEvidence = { ...selected, hostName: name };
+            const changed = !saved || !composeMatches || Object.entries(want).some(([key, value]) => saved[key] !== value) ||
+                (p.installedSupervisorImage !== undefined && p.installedSupervisorImage !== p.images.supervisor);
+            const hostEvidence = { ...selected, hostName: name, supervisorImage: p.images.supervisor };
             const pending = () => mayAct ? { state: "pending" } : waiting("runner_needs_runner_flag", hostEvidence);
             if (!running || changed)
                 return afterAct ? waiting("runner_compose_not_running", hostEvidence) : pending();
@@ -983,7 +1002,9 @@ export function onboardRunnerAdapter(input = {}) {
             };
             const imagesRefused = await prepareRunnerImages(engine, Object.values(p.images), p.info.arch, signal);
             if (imagesRefused)
-                return waiting(imagesRefused.reason, { ...selected, ...(imagesRefused.image ? { image: imagesRefused.image } : {}) });
+                return waiting(imagesRefused.reason === "runner_images_unavailable" && imagesRefused.image === p.images.supervisor
+                    ? "runner_supervisor_image_unavailable" : imagesRefused.reason, { ...selected, supervisorImage: p.images.supervisor,
+                    ...(imagesRefused.image ? { image: imagesRefused.image } : {}) });
             if (p.info.vm) {
                 const capability = await engine.vmCapabilities(p.dir, p.images.supervisor, p.baseUrl, signal);
                 if (capability !== "ready")

package/dist/onboard.js

@@ -300,6 +300,7 @@ function normalizeStep(value, fallbackAt) {
         "teamKey",
         "selected",
         "hostName",
+        "supervisorImage",
         "hostId",
         "capacity",
         "failing",

package/package.json

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

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": "92fa4b3299eacc1e0fea27bbb018cc133655c09cfc3c3a9f480e5bd1794dcdef",
+    "packages/host-isolation/src/darwin-thoughts-custody.ts": "8165e058f6bed990fe35ce30685db0f4634746c3b22d51f81a9c77cd9745735f",
     "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": "7f76d5432d5cdbfa8c5d01138d6541668904bd641b9396429e6daad6942972dc",
+  "verifierSha256": "322b838917b9f7e1d9b7d9705a75143697ca093553bf0dcca7e7f5d4a88bbdc0",
   "verifierDeclarationsSha256": "624428ced2eb18b045b761b49e20b7f52c0fc6c3132689571103ece7b4a1083f"
 }

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

@@ -514,14 +514,22 @@ function ancestors(paths, allowMissing = false) {
   }
   return Array.from(observed, ([path, stat]) => ({ path, stat }));
 }
-function checkAncestors(expected) {
+function checkAncestors(expected, projection) {
   for (const ancestor of expected) {
     const current = fs.lstatSync(ancestor.path, { bigint: true });
     if (!current.isDirectory() || current.isSymbolicLink() || !sameDirectoryAuthority(current, ancestor.stat)) {
+      if (projection?.paths.has(ancestor.path) && current.isDirectory() && !current.isSymbolicLink() && isBootstrapGuestOwnerProjection(ancestor.stat, current, projection.staged)) {
+        projection.authenticateIfPresent();
+        ancestor.stat = current;
+        continue;
+      }
       throw failure("ancestor_identity");
     }
   }
 }
+function isBootstrapGuestOwnerProjection(before, current, stagedFile) {
+  return isInitialGuestOwnerProjection(before, current, stagedFile) || before.dev === current.dev && before.ino === current.ino && before.mode === current.mode && before.uid === 10001n && before.gid === 10001n && current.uid === 0n && current.gid === 0n && process.getuid?.() === 10001 && process.geteuid?.() === 10001 && process.getgid?.() === 10001 && stagedFile.uid === 10001n && stagedFile.gid === 10001n;
+}
 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;
 }
@@ -538,7 +546,7 @@ function receiveStagingChannel(path, before, stagedFile, observedAncestors) {
   channel.stat = current;
   return current;
 }
-function receiveWaitingResponseChannel(path, before, stagedFile, observedAncestors, responsePath, bootstrapRoots) {
+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);
@@ -555,8 +563,9 @@ function receiveWaitingResponseChannel(path, before, stagedFile, observedAncesto
       });
     }
     const changed = projections.filter((projection) => !sameDirectoryAuthority(projection.before, projection.current));
+    const receiveProjection = bootstrapRoots ? isBootstrapGuestOwnerProjection : isInitialGuestOwnerProjection;
     for (const projection of changed) {
-      if (!isInitialGuestOwnerProjection(projection.before, projection.current, stagedFile))
+      if (!receiveProjection(projection.before, projection.current, stagedFile))
         throw failure("ancestor_identity");
       const captured = observedAncestors.find((ancestor) => ancestor.path === projection.path);
       if (!captured || !sameDirectoryAuthority(captured.stat, projection.before))
@@ -565,6 +574,10 @@ function receiveWaitingResponseChannel(path, before, stagedFile, observedAncesto
     const requireAbsentResponse = () => {
       try {
         fs.lstatSync(responsePath);
+        if (bootstrapRoots && authenticatePresentResponse) {
+          authenticatePresentResponse();
+          return;
+        }
         throw failure("ancestor_identity");
       } catch (error) {
         if (!isMissing(error))
@@ -573,13 +586,13 @@ function receiveWaitingResponseChannel(path, before, stagedFile, observedAncesto
     };
     if (changed.length > 0)
       requireAbsentResponse();
-    checkAncestors(observedAncestors.filter((ancestor) => !projections.some((projection) => projection.path === ancestor.path)));
+    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);
       if (sameDirectoryAuthority(projection.current, next))
         continue;
-      if (!isInitialGuestOwnerProjection(projection.current, next, stagedFile))
+      if (!receiveProjection(projection.current, next, stagedFile))
         throw failure("ancestor_identity");
       resample = true;
     }
@@ -709,6 +722,54 @@ async function exchange(options, bootstrap) {
   const stagingPath = join(options.requestDir, `.${request.nonce}.tmp`);
   const responsePath = join(options.responseDir, `${request.nonce}.json`);
   let owned;
+  const projectedPaths = new Set;
+  for (const [root, leaf] of creationPaths) {
+    if (!root || !leaf)
+      throw failure("bootstrap_path");
+    let path = root;
+    projectedPaths.add(path);
+    for (const component of leaf.slice(root.length + 1).split("/")) {
+      path = join(path, component);
+      projectedPaths.add(path);
+    }
+  }
+  const bootstrapResponseOwner = () => {
+    const stat = fs.lstatSync(responsePath, { bigint: true });
+    if (!(stat.uid === 0n && stat.gid === 0n || stat.uid === 10001n && stat.gid === 10001n) || process.getuid?.() !== 10001 || process.geteuid?.() !== 10001 || process.getgid?.() !== 10001 || owned?.uid !== 10001n || owned.gid !== 10001n)
+      throw failure("file_owner");
+    return { uid: Number(stat.uid), gid: Number(stat.gid) };
+  };
+  const authenticatePresentResponse = () => {
+    const bytes = readDarwinThoughtsCustodyFile(responsePath, bootstrapResponseOwner());
+    const expectation = {
+      authority,
+      request,
+      nowMs: now(),
+      engineCheckout: currentIdentity(options.checkoutPath, targets.checkoutSource),
+      engineLock: currentIdentity(options.lockPath, targets.lockSource)
+    };
+    if (gitPresent(gitPath))
+      expectation.engineGit = currentIdentity(gitPath, join(targets.checkoutSource, ".git"));
+    verifyDarwinThoughtsCustodyResponse(bytes, expectation);
+  };
+  const projection = () => {
+    if (!bootstrap || !owned)
+      return;
+    return {
+      paths: projectedPaths,
+      staged: owned,
+      authenticateIfPresent() {
+        try {
+          fs.lstatSync(responsePath);
+        } catch (error) {
+          if (isMissing(error))
+            return;
+          throw error;
+        }
+        authenticatePresentResponse();
+      }
+    };
+  };
   let published = false;
   try {
     const fd = guarded(() => fs.openSync(stagingPath, fs.constants.O_WRONLY | fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK, 384));
@@ -745,8 +806,14 @@ async function exchange(options, bootstrap) {
       if (!Number.isSafeInteger(nowMs) || nowMs < previousNow || nowMs >= options.deadlineMs)
         throw failure("deadline");
       previousNow = nowMs;
-      responses = receiveWaitingResponseChannel(options.responseDir, responses, owned, aliasAncestors, responsePath, bootstrap ? authority : undefined);
-      checkAncestors(aliasAncestors);
+      responses = receiveWaitingResponseChannel(options.responseDir, responses, owned, aliasAncestors, responsePath, bootstrap ? authority : undefined, bootstrap ? authenticatePresentResponse : undefined, projection());
+      checkAncestors(aliasAncestors, projection());
+      if (bootstrap) {
+        const receivedRequest = aliasAncestors.find((ancestor) => ancestor.path === options.requestDir);
+        if (!receivedRequest)
+          throw failure("ancestor_identity");
+        requests = receivedRequest.stat;
+      }
       for (const [path, expected] of [
         [options.requestDir, requests],
         [options.responseDir, responses]
@@ -769,10 +836,7 @@ async function exchange(options, bootstrap) {
         const receivedAncestors = bootstrap ? guarded(() => ancestors(creationPaths.map((paths) => paths[1]))) : [];
         const receivedGitPresent = options.gitPath !== undefined || gitPresent(gitPath);
         const receivedGitAncestors = receivedGitPresent ? guarded(() => ancestors([gitPath])) : [];
-        const bytes = readDarwinThoughtsCustodyFile(responsePath, {
-          uid: Number(responses.uid),
-          gid: Number(responses.gid)
-        });
+        const bytes = readDarwinThoughtsCustodyFile(responsePath, bootstrap && process.getuid?.() === 10001 && process.geteuid?.() === 10001 && process.getgid?.() === 10001 && owned.uid === 10001n && owned.gid === 10001n ? bootstrapResponseOwner() : { uid: Number(responses.uid), gid: Number(responses.gid) });
         const expectation = {
           authority,
           request,
@@ -782,16 +846,16 @@ async function exchange(options, bootstrap) {
         };
         if (receivedGitPresent)
           expectation.engineGit = currentIdentity(gitPath, join(targets.checkoutSource, ".git"));
-        checkAncestors(aliasAncestors);
-        checkAncestors(receivedGitAncestors);
+        checkAncestors(aliasAncestors, projection());
+        checkAncestors(receivedGitAncestors, projection());
         expectation.nowMs = now();
         if (!Number.isSafeInteger(expectation.nowMs) || expectation.nowMs < previousNow || expectation.nowMs >= options.deadlineMs)
           throw failure("deadline");
         const proof = verifyDarwinThoughtsCustodyResponse(bytes, expectation);
-        checkAncestors(receivedGitAncestors);
+        checkAncestors(receivedGitAncestors, projection());
         if (bootstrap) {
-          checkAncestors(receivedAncestors);
-          checkAncestors(aliasAncestors);
+          checkAncestors(receivedAncestors, projection());
+          checkAncestors(aliasAncestors, projection());
           checkBootstrapDirectories(creationPaths, false);
         }
         const finalNow = now();

package/vendor/self-host/provenance.json

@@ -1,16 +1,16 @@
 {
   "repository": "coalesce-labs/catalyst-cloud",
-  "commit": "339e61950f46ffeaa112761aa9798a76757bfcd7",
+  "commit": "ee729b12ea821310c48de7bbc753a59d60cc45d6",
   "sha256": {
     "deploy/self-host/compose.yaml": "0ffb7671c7ea49d8490d6e97093ada0afcb31da3b00092a8768150b090cca0bc",
     "deploy/self-host/compose.darwin-thoughts.yaml": "6269d66d6f487175ab8560d0648e65c8a0eccb86f69a8dc24daf41d8ae1dcf02",
     "deploy/self-host/darwin-thoughts-custody/producer.mjs": "0e0f1bbdac23813e8ee57b6eb4ae3dfd24c3f1c51ebe0c3d119a1448734ea05e",
-    "deploy/self-host/darwin-thoughts-custody/verifier.mjs": "7f76d5432d5cdbfa8c5d01138d6541668904bd641b9396429e6daad6942972dc",
+    "deploy/self-host/darwin-thoughts-custody/verifier.mjs": "322b838917b9f7e1d9b7d9705a75143697ca093553bf0dcca7e7f5d4a88bbdc0",
     "deploy/self-host/darwin-thoughts-custody/verifier.d.mts": "624428ced2eb18b045b761b49e20b7f52c0fc6c3132689571103ece7b4a1083f",
     "deploy/self-host/darwin-thoughts-custody/watchdog.mjs": "6b5c7204aacd296c85a216d4f1b3adbe2084024fe37200ec1d24dfc2dec2e12d",
     "deploy/self-host/darwin-thoughts-custody/watchdog-deadline.mjs": "a642e6d8968f56f635056d3b258e5c4ad186c638a273c26b4528e85b7d2a6346",
     "deploy/self-host/darwin-thoughts-custody/service.plist.in": "66e9a2c175d2500b1f7130e7c04a5ed07f22bc7425661777f514fa3f2a816496",
-    "deploy/self-host/darwin-thoughts-custody/manifest.json": "bf52c69e393b242b2055ac14dea59f3c91ec77ba2a0acbecc61ce37260c1cb91",
+    "deploy/self-host/darwin-thoughts-custody/manifest.json": "b2525e457dcd82326a71a873df95f6845d8d3231bf2afc20119a6034ddb98852",
     "deploy/self-host/linux-session-egress/session-egress.py": "a20cedfa1e883127ec461e4b7f9588d379fe1633b8244ecd703c81f589d3f142",
     "deploy/self-host/linux-session-egress/catalyst-session-egress.service": "703c150ab23ec87aea47cfc394f63e061b66c4b8c1454a88a9be879c161ce2a5",
     "deploy/self-host/linux-session-egress/catalyst-session-egress-attest.service": "94fa75ea0616f6a1172fc20ca637a5727c36456357e4a977d5bdd65f2fad2e8d",