@tokenoftrust/cli 1.4.0-rc.2 → 1.4.0-rc.21

package/src/commands/dev.mjs

@@ -138,7 +138,7 @@ export async function run(argv, ctx) {
     console.error(
       fail(
         "nothing to run — you're not inside a tenant checkout",
-        "tot checkout <tenant> --clone <dir>   (then `cd` in and re-run), pass --workspace <dir>, or try `tot dev --sample`",
+        "tot clone <tenant>   (then `cd` in and re-run), pass --workspace <dir>, or try `tot dev --sample`",
       ),
     );
     return 2;
@@ -194,7 +194,7 @@ async function runNativePublic(workspace, args, ctx) {
   const cfg = readWorkspaceConfig(workspace);
   if (!cfg) {
     throw new CliError(`${workspace} isn't a tenant checkout (no readable .tot/config.json)`, {
-      next: "tot checkout <tenant> --clone <dir>   (produces a runnable checkout)",
+      next: "tot clone <tenant>   (produces a runnable checkout)",
       exitCode: 2,
     });
   }
@@ -280,7 +280,7 @@ async function runNative(workspace, args, ctx) {
   const cfg = readWorkspaceConfig(workspace);
   if (!cfg) {
     throw new CliError(`${workspace} isn't a tenant checkout (no readable .tot/config.json)`, {
-      next: "tot checkout <tenant> --clone <dir>   (produces a runnable checkout)",
+      next: "tot clone <tenant>   (produces a runnable checkout)",
       exitCode: 2,
     });
   }
@@ -409,7 +409,7 @@ export function printSampleBanner({ url }, mode = "sample") {
  * Exported so sample/tests can drive the selection directly.
  * @param {ReturnType<typeof parseArgs>} args
  * @param {{ client?: any }} [opts] an already-authenticated MCP client (entitled path)
- * @returns {Promise<{kind:"public"|"entitled",version:string,url:string,strip:number,cacheKey:string}>}
+ * @returns {Promise<{kind:string,version:string,url:string,strip:number,cacheKey:string,integrity:string|null}>}
  */
 export async function resolveRendererSource(args, { client } = {}) {
   if (args.sample) return resolvePublicRendererSource(args);
@@ -576,6 +576,11 @@ function compareStableAsc(a, b) {
  * override with `--renderer-version` / TOT_RUNNER_VERSION. Package/registry
  * overridable via env for testing.
  */
+/**
+ * @param {any} args
+ * @param {NodeJS.ProcessEnv} [env]
+ * @param {{ declaredVersion?: string|null }} [opts]
+ */
 export async function resolvePublicRendererSource(args, env = process.env, { declaredVersion = null } = {}) {
   const pkg = env.TOT_RUNNER_PACKAGE || PUBLIC_RUNNER_PACKAGE;
   const registry = (env.TOT_NPM_REGISTRY || DEFAULT_NPM_REGISTRY).replace(/\/$/, "");
@@ -615,9 +620,19 @@ export async function resolvePublicRendererSource(args, env = process.env, { dec
         `(or pin with --renderer-version to silence).`,
     );
   }
-  const tarball = meta?.versions?.[version]?.dist?.tarball;
-  if (!tarball) throw new Error(`no published ${pkg}@${version} on npm`);
-  return { kind: "public", version, url: tarball, strip: 1, cacheKey: `public-${version}` };
+  const dist = meta?.versions?.[version]?.dist;
+  if (!dist?.tarball) throw new Error(`no published ${pkg}@${version} on npm`);
+  // `integrity` is the artifact's CONTENT identity (npm dist.integrity, else the
+  // legacy shasum) — installRunnerTarball verifies the downloaded bytes against
+  // it and records it so a same-version corrected republish busts the cache.
+  return {
+    kind: "public",
+    version,
+    url: dist.tarball,
+    strip: 1,
+    cacheKey: `public-${version}`,
+    integrity: dist.integrity || dist.shasum || null,
+  };
 }
 
 /**
@@ -625,6 +640,7 @@ export async function resolvePublicRendererSource(args, env = process.env, { dec
  * developer entitlement (same gate as the Docker pull token). Reuses an
  * already-authenticated `client` when provided (C1/F3), else establishes its own.
  */
+/** @param {any} args @param {{ client?: any }} [opts] */
 export async function resolveEntitledRendererSource(args, { client: providedClient } = {}) {
   const baseUrl = args.mcp || process.env.MCP_BASE_URL || process.env.TOT_MCP_URL || DEFAULT_MCP_URL;
   const client = providedClient || createMcpClient(baseUrl);
@@ -637,7 +653,17 @@ export async function resolveEntitledRendererSource(args, { client: providedClie
   if (!res?.url || !res?.version) {
     throw new Error(res?.error || "no renderer-artifact URL returned");
   }
-  return { kind: "entitled", version: res.version, url: res.url, strip: 0, cacheKey: res.version };
+  // Opportunistic content identity: recorded/verified when the MCP declares one
+  // (integrity/sha256); a server that doesn't is simply unverified (null), never
+  // an error — the cache then busts on version changes only, as before.
+  return {
+    kind: "entitled",
+    version: res.version,
+    url: res.url,
+    strip: 0,
+    cacheKey: res.version,
+    integrity: res.integrity || res.sha256 || null,
+  };
 }
 
 /**
@@ -654,6 +680,8 @@ export async function resolveEntitledRendererSource(args, { client: providedClie
  * instead of paying for a second client.initialize()+establishSession() — same
  * pattern as ensureRegistryLogin's `providedClient`). `tot dev` standalone
  * omits it and this establishes its own, as before.
+ * @param {any} args
+ * @param {{ client?: any }} [opts]
  * @returns {Promise<string>} the cached, installed runner tree's root directory.
  */
 export async function ensureRendererArtifact(args, { client: providedClient } = {}) {
@@ -676,7 +704,12 @@ export async function ensureRendererArtifact(args, { client: providedClient } =
 
   try {
     const runnerDir = await installRunnerTarball(
-      { source: credential.url, version: credential.version, isUrl: true },
+      {
+        source: credential.url,
+        version: credential.version,
+        isUrl: true,
+        integrity: credential.integrity || credential.sha256 || null,
+      },
       { log: (m) => console.error(m) },
     );
     setRunnerVersion(credential.version); // telemetry: stamp the entitled runner version, like ensureSampleRenderer
@@ -700,6 +733,66 @@ export function pinnedPublicCacheDir(cacheRoot, version) {
   return existsSync(join(dir, ".tot-cache-complete")) ? dir : null;
 }
 
+/**
+ * List the installed package dirs that could carry a platform-native binary,
+ * normalised so a scoped package reads as `@scope+name` (mirroring pnpm's virtual
+ * store naming) regardless of the on-disk layout. Prefers the pnpm virtual store
+ * (`node_modules/.pnpm/*`); falls back to a shallow `node_modules` scan (one level
+ * into `@scope/`) for an npm/flat install. Best-effort — returns [] on any error.
+ */
+function collectNativePackageDirs(runnerDir) {
+  const pnpmDir = join(runnerDir, "node_modules", ".pnpm");
+  if (existsSync(pnpmDir)) return readdirSync(pnpmDir);
+  const nm = join(runnerDir, "node_modules");
+  if (!existsSync(nm)) return [];
+  const names = [];
+  for (const e of readdirSync(nm, { withFileTypes: true })) {
+    if (e.name.startsWith("@") && e.isDirectory()) {
+      for (const s of readdirSync(join(nm, e.name))) names.push(`${e.name}+${s}`);
+    } else {
+      names.push(e.name);
+    }
+  }
+  return names;
+}
+
+/**
+ * True unless the installed renderer is POISONED for this host's CPU arch — the
+ * "the dev server didn't come up" root cause. Platform-native binding packages
+ * are named `<family>-<os>-<cpu>[-<abi>]` (e.g. `@esbuild/darwin-arm64`,
+ * `lightningcss-linux-x64-gnu`, `@rollup/rollup-win32-x64-msvc`). npm's optional-
+ * deps bug (npm/cli#4828) can materialise a DIFFERENT arch's variant than the host
+ * needs (e.g. darwin-x64 on an arm64 Mac) — pnpm gets it right. We flag the tree
+ * as poisoned exactly when a family ships a binding for our OS but NOT our OS+CPU,
+ * which is the precise shape of the `Cannot find native binding` boot crash. A
+ * family with no variant for our OS at all is a cross-platform optional dep that's
+ * correctly absent, so it never trips the check. Never throws; on any probe error
+ * it returns true (trust the cache) so a health probe can't itself break `tot dev`.
+ *
+ * `platform`/`arch` are injectable so this is testable off the host's real arch.
+ */
+export function rendererCacheHealthy(runnerDir, { platform = process.platform, arch = process.arch } = {}) {
+  try {
+    const re = /^(.*?)[-+](darwin|linux|win32|freebsd|android|openharmony)-([a-z0-9]+)/;
+    const families = new Map(); // family -> Set("<os>-<cpu>")
+    for (const name of collectNativePackageDirs(runnerDir)) {
+      const m = name.match(re);
+      if (!m) continue;
+      const [, family, os, cpu] = m;
+      if (!families.has(family)) families.set(family, new Set());
+      families.get(family).add(`${os}-${cpu}`);
+    }
+    const want = `${platform}-${arch}`;
+    for (const variants of families.values()) {
+      const hasOurOs = [...variants].some((v) => v.startsWith(`${platform}-`));
+      if (hasOurOs && !variants.has(want)) return false; // wrong-arch binary present, ours missing
+    }
+    return true;
+  } catch {
+    return true;
+  }
+}
+
 /**
  * Delete every OTHER public-runner cache dir (`public-*` except `keepVersion`)
  * once we've resolved the version this CLI pins to — so a pre-alignment dir
@@ -769,11 +862,11 @@ export function probeRunnerVersion(runnerDir, { timeoutMs = 4000 } = {}) {
  * @returns {Promise<string>} the runner tree's root directory (has scripts/tot-dev.mjs).
  */
 export async function ensureSampleRenderer(args, ctx, { env = process.env, cacheRoot = RENDERER_CACHE_ROOT } = {}) {
-  const src = resolveLocalRendererSource({
+  const src = /** @type {any} */ (resolveLocalRendererSource({
     env,
     mode: ctx?.mode,
     repoRoot: ctx?.repoRoot,
-  });
+  }));
 
   if (src.kind === "dir") {
     if (!existsSync(join(src.dir, "scripts", "tot-dev.mjs"))) {
@@ -791,7 +884,7 @@ export async function ensureSampleRenderer(args, ctx, { env = process.env, cache
     console.error(`~ renderer: ${src.why}`);
     return installRunnerTarball(
       { source: src.source, version: sourceVersionKey(src.source), isUrl: src.isUrl },
-      { log: (m) => console.error(m) },
+      { log: (m) => console.error(m), cacheRoot },
     );
   }
 
@@ -802,29 +895,51 @@ export async function ensureSampleRenderer(args, ctx, { env = process.env, cache
   const declared = declaredRunnerVersion(args.workspace || ctx?.workspacePath);
   const wantVersion = declared || CLI_VERSION;
 
-  // Fully-offline fast path: when the WANTED version (declared, else lockstep) is
-  // already cached, reuse it without touching npm — honouring "don't hit npm when
-  // the RIGHT version is already cached" without ever reusing a version the
-  // resolution wouldn't choose. Safe because `public-<version>` only exists if a
-  // prior run fetched exactly that version. Skipped when an explicit pin is set
-  // (that must go through resolution).
+  // Offline-safe fast path: when the WANTED version (declared, else lockstep) is
+  // already cached, reuse it — honouring "don't hit npm when the RIGHT version is
+  // already cached" without ever reusing a version the resolution wouldn't choose.
+  // Safe because `public-<version>` only exists if a prior run fetched exactly
+  // that version. Skipped when an explicit pin is set (that must go through
+  // resolution). One refinement over fully-offline: a QUICK, soft-fail registry
+  // probe (publishedRunnerIntegrity) revalidates the cached CONTENT identity when
+  // npm is reachable, so a corrected republish under the same version string is
+  // picked up automatically; offline/slow/unanswerable → trust the cache exactly
+  // as before (the probe can never block or fail the run).
   if (!explicitPin) {
     const exact = pinnedPublicCacheDir(cacheRoot, wantVersion);
     if (exact) {
       // Trust-but-verify: a `public-<version>` dir SHOULD be a current runner,
       // but if it can't report its own version it predates the --version surface
       // (a corrupt/half-migrated cache) — force a fresh fetch rather than run a
-      // runner we can't identify. When it DOES answer, reuse it (fully offline-safe).
-      if (probeRunnerVersion(exact)) {
+      // runner we can't identify. It must ALSO carry native bindings for THIS
+      // host's arch (rendererCacheHealthy) — a cache poisoned with the wrong-arch
+      // bindings (npm/cli#4828) would otherwise be reused forever and crash astro
+      // at boot with the swallowed "dev server didn't come up". When both hold,
+      // reuse it (offline-safe).
+      if (probeRunnerVersion(exact) && rendererCacheHealthy(exact)) {
+        const published = await publishedRunnerIntegrity(env, wantVersion);
+        const recorded = readCacheMarker(exact)?.integrity || null;
+        if (!published || !recorded || published === recorded) {
+          console.error(
+            `~ renderer: cached public runner ${wantVersion} (${declared ? "declared by this store" : "matches this CLI"})`,
+          );
+          setRunnerVersion(wantVersion);
+          prunePublicRunnerCache(cacheRoot, wantVersion);
+          return exact;
+        }
+        // Same version string, different published contents — a corrected
+        // republish. Fall through to resolution + a fresh install (which also
+        // verifies the new bytes against the new integrity).
+        console.error(`~ renderer: ${wantVersion} was republished with different contents — refetching the corrected artifact`);
+        prunePublicRunnerCache(cacheRoot, null); // drop ALL public-* — none matches what npm now publishes
+      } else {
         console.error(
-          `~ renderer: cached public runner ${wantVersion} (${declared ? "declared by this store" : "matches this CLI"})`,
+          rendererCacheHealthy(exact)
+            ? `~ renderer: cached runner at ${exact} can't report a version — refetching (forced upgrade)`
+            : `~ renderer: cached runner at ${exact} is missing native bindings for ${process.platform}-${process.arch} — refetching`,
         );
-        setRunnerVersion(wantVersion);
-        prunePublicRunnerCache(cacheRoot, wantVersion);
-        return exact;
+        prunePublicRunnerCache(cacheRoot, null); // drop ALL public-* — none is trustworthy
       }
-      console.error(`~ renderer: cached runner at ${exact} can't report a version — refetching (forced upgrade)`);
-      prunePublicRunnerCache(cacheRoot, null); // drop ALL public-* — none is trustworthy
     }
   }
 
@@ -855,8 +970,8 @@ export async function ensureSampleRenderer(args, ctx, { env = process.env, cache
   // The store preview engine (public npm ${PUBLIC_RUNNER_PACKAGE}@${pub.version}) — kept
   // out of the user's way; the setup spinner below is the visible progress.
   const dir = await installRunnerTarball(
-    { source: pub.url, version: pub.cacheKey, isUrl: true, strip: pub.strip },
-    { log: (m) => console.error(m) },
+    { source: pub.url, version: pub.cacheKey, isUrl: true, strip: pub.strip, integrity: pub.integrity },
+    { log: (m) => console.error(m), cacheRoot },
   );
   setRunnerVersion(pub.version); // telemetry: the runner version running this session
   // The pinned version is now installed under public-<version> — drop any other
@@ -881,69 +996,269 @@ function sourceVersionKey(source) {
  * authenticated (ensureRendererArtifact) and zero-login (ensureSampleRenderer)
  * paths so they cache identically.
  *
- * @param {{ source: string, version: string, isUrl?: boolean }} spec
- * @param {{ log?: (m: string) => void }} [opts]
+ * Cache-poisoning invariants (the 2026-08-18 first-run hardening):
+ *   • promote-on-success only — the install runs in a per-attempt staging dir and
+ *     is renamed into the canonical slot ONLY after it fully succeeds, so a failed
+ *     install can never become the cached artifact a later run resumes from.
+ *   • the completion marker is a manifest carrying the source's CONTENT identity
+ *     (`integrity`), so a corrected republish under the SAME version string is a
+ *     cache miss (rebuild), not a stale hit — no manual `rm -rf` ever required.
+ *   • a failed attempt auto-cleans and retries ONCE from a clean slate before
+ *     surfacing the error (transient blips heal themselves); deterministic
+ *     failures (`e.permanent`) skip the retry and fail loud immediately.
+ *
+ * @param {{ source: string, version: string, isUrl?: boolean, strip?: number, integrity?: string|null }} spec
+ *   `integrity` is the source artifact's content identity when the resolver knows
+ *   it (npm `dist.integrity`/`dist.shasum`); used to verify the downloaded bytes
+ *   and to bust a cached entry whose recorded identity no longer matches.
+ * @param {{ log?: (m: string) => void, cacheRoot?: string }} [opts]
  * @returns {Promise<string>} the cached, installed runner tree's root directory.
  */
-export async function installRunnerTarball({ source, version, isUrl = true, strip = 0 }, { log = (m) => console.error(m) } = {}) {
-  const runnerDir = join(RENDERER_CACHE_ROOT, version);
-  const marker = join(runnerDir, ".tot-cache-complete");
-  if (existsSync(marker)) return runnerDir; // already downloaded + installed
+export async function installRunnerTarball(
+  { source, version, isUrl = true, strip = 0, integrity = null },
+  { log = (m) => console.error(m), cacheRoot = RENDERER_CACHE_ROOT } = {},
+) {
+  const runnerDir = join(cacheRoot, version);
+  // Staging dirs from DEAD runs (crashed/killed installs) must not leak disk
+  // forever — reap them here, the one funnel every install path goes through.
+  sweepStaleStagingDirs(cacheRoot);
+
+  const localSource = isUrl ? null : resolveLocalTarball(source);
+  // The EXPECTED content identity of the source artifact. A local tarball with no
+  // caller-provided integrity is cheap to hash on every run, so a same-path
+  // republish (new contents, same file name) busts the cache too.
+  const expected = integrity || (isUrl ? null : fileIntegrity(localSource));
+
+  const cached = readCacheMarker(runnerDir);
+  if (cached) {
+    if (!rendererCacheHealthy(runnerDir)) {
+      // A cache poisoned with the wrong-arch binaries (npm/cli#4828 — e.g.
+      // darwin-x64 on an arm64 Mac) is otherwise trusted forever, and astro
+      // crashes at boot with `Cannot find native binding`, swallowed as "the dev
+      // server didn't come up". Fall through and rebuild from the source below.
+      log(`~ store preview engine cache is missing native bindings for ${process.platform}-${process.arch} — rebuilding it…`);
+    } else if (expected && cached.integrity && expected !== cached.integrity) {
+      // CONTENT-HASH BUST: same version string, different artifact contents — a
+      // corrected republish. The cached entry is stale by identity, not by label;
+      // rebuild from the corrected source instead of serving the stale cache.
+      log(`~ the preview engine's ${version} artifact changed upstream (same version, new contents) — rebuilding…`);
+    } else {
+      return runnerDir; // already downloaded + installed (and contents still match)
+    }
+  }
 
   // First run only — set the expectation so the one-time cost doesn't read as a
   // hang: this downloads + installs the renderer once, then every later run of
   // this version is a no-network cache hit.
   log(`~ first run: setting up your store preview (~a minute, one-time — cached after this)…`);
-  const localSource = isUrl ? null : resolveLocalTarball(source);
-  const archivePath = isUrl ? join(tmpdir(), `tot-renderer-${process.pid}-${Date.now()}.tar.gz`) : localSource;
-  try {
-    if (isUrl) {
-      // The fetch itself is otherwise silent (no per-byte output) and can run
-      // tens of seconds on a cold cache — tick a spinner so it never looks hung.
-      const spin = startProgress("downloading the store preview engine…");
+  // AUTO-CLEAN-AND-RETRY-ONCE: a transient failure (network blip mid-download, a
+  // registry hiccup mid-install) heals itself with one clean re-attempt instead
+  // of stopping a first run at an error only `rm -rf` folklore could clear.
+  // Bounded to one retry so a genuinely-broken source still fails loudly.
+  for (let attempt = 1; ; attempt++) {
+    const archivePath = /** @type {string} */ (isUrl ? join(tmpdir(), `tot-renderer-${process.pid}-${attempt}.tar.gz`) : localSource);
+    const stagingDir = `${runnerDir}.staging-${process.pid}`;
+    try {
+      if (isUrl) {
+        // The fetch itself is otherwise silent (no per-byte output) and can run
+        // tens of seconds on a cold cache — tick a spinner so it never looks hung.
+        const spin = startProgress("downloading the store preview engine…");
+        try {
+          await downloadFile(source, archivePath);
+        } finally {
+          spin.stop();
+        }
+      }
+      if (!existsSync(archivePath)) {
+        throw new Error(`renderer tarball not found: ${archivePath}`);
+      }
+      // Refuse to install bytes that don't match the source's declared identity —
+      // a truncated/corrupted download would otherwise be cached as if complete.
+      // (Transient by nature, so the retry above gets a fresh download.)
+      if (expected && !tarballMatchesIntegrity(archivePath, expected)) {
+        throw new Error(`the downloaded preview-engine tarball failed its integrity check (expected ${expected})`);
+      }
+      // The identity recorded in the completion manifest below — what future runs
+      // compare against to detect a same-version republish. Hash the actual bytes
+      // when the resolver couldn't tell us (e.g. the entitled signed-URL path).
+      const contentId = expected || fileIntegrity(archivePath);
+      rmSync(stagingDir, { recursive: true, force: true });
+      mkdirSync(stagingDir, { recursive: true });
+      extractTarball(archivePath, stagingDir, { strip });
+      // Pin the runner install to PUBLIC npm. The moat-free runner has only public
+      // deps, but the HOST's global ~/.npmrc may point `registry` at a private
+      // mirror (an internal proxy that 502s, or one an invited developer can't
+      // reach) — an invited dev's machine config must never decide where the
+      // runner's public deps come from. A project-level .npmrc wins over the user's.
+      writeFileSync(join(stagingDir, ".npmrc"), "registry=https://registry.npmjs.org/\n");
+      // The install is the long, noisy step — tick a spinner while its output goes
+      // to a log, so the terminal shows one clean line instead of the pnpm firehose.
+      // corepack setup logs to the SAME file so its failures aren't invisible (they
+      // were the silent cause of "couldn't set up the store preview engine").
+      const installLog = join(cacheRoot, `${version}.install.log`);
+      ensureCorepackPnpm(stagingDir, { logPath: installLog });
+      const installSpin = startProgress("installing the store preview engine…", {
+        stages: [{ afterMs: 20000, text: "still setting up the preview engine (first run only)…" }],
+      });
       try {
-        await downloadFile(source, archivePath);
+        await runPnpmInstall(stagingDir, { logPath: installLog });
       } finally {
-        spin.stop();
+        installSpin.stop();
       }
+      // Atomic-ish: only rename into the final, discoverable path once install
+      // succeeded, so a crashed/interrupted run never leaves a half-built cache
+      // entry that a later `tot dev` would treat as ready.
+      rmSync(runnerDir, { recursive: true, force: true });
+      renameSync(stagingDir, runnerDir);
+      // Fence a fresh install against npm/cli#4828: if the installer left the wrong
+      // arch's native bindings (or none) for this host, DON'T stamp the completion
+      // marker — an unmarked tree is never reused, so the next run reinstalls cleanly
+      // instead of caching the poison and crashing astro at boot. Fail loud + actionable
+      // rather than swallow it as "the dev server didn't come up". Permanent: the
+      // same installer on the same host would just produce the same result, so the
+      // auto-retry is skipped.
+      if (!rendererCacheHealthy(runnerDir)) {
+        await emitObstacle("renderer-native-bindings-missing");
+        const err = new CliError(
+          `the store preview engine installed but is missing its native components for ${process.platform}-${process.arch}`,
+          {
+            next: "install pnpm (`npm i -g pnpm`, or `corepack enable`) and re-run `tot start` — pnpm installs the platform-native bits npm can skip (npm/cli#4828)",
+            exitCode: 2,
+          },
+        );
+        /** @type {any} */ (err).permanent = true;
+        throw err;
+      }
+      writeCacheMarker(runnerDir, { version, integrity: contentId });
+      return runnerDir;
+    } catch (e) {
+      // A failed attempt must never survive on disk — not as staging debris, and
+      // (by promote-on-success) it never reached the canonical slot at all.
+      rmSync(stagingDir, { recursive: true, force: true });
+      if (e?.permanent === true || attempt >= 2) throw e;
+      log(`~ that didn't work (${String(e?.message || e).split("\n")[0]}) — retrying once from a clean slate…`);
+    } finally {
+      if (isUrl) rmSync(archivePath, { force: true });
     }
-    if (!existsSync(archivePath)) {
-      throw new Error(`renderer tarball not found: ${archivePath}`);
-    }
-    const stagingDir = `${runnerDir}.staging-${process.pid}`;
-    rmSync(stagingDir, { recursive: true, force: true });
-    mkdirSync(stagingDir, { recursive: true });
-    extractTarball(archivePath, stagingDir, { strip });
-    // Pin the runner install to PUBLIC npm. The moat-free runner has only public
-    // deps, but the HOST's global ~/.npmrc may point `registry` at a private
-    // mirror (an internal proxy that 502s, or one an invited developer can't
-    // reach) — an invited dev's machine config must never decide where the
-    // runner's public deps come from. A project-level .npmrc wins over the user's.
-    writeFileSync(join(stagingDir, ".npmrc"), "registry=https://registry.npmjs.org/\n");
-    // The install is the long, noisy step — tick a spinner while its output goes
-    // to a log, so the terminal shows one clean line instead of the pnpm firehose.
-    // corepack setup logs to the SAME file so its failures aren't invisible (they
-    // were the silent cause of "couldn't set up the store preview engine").
-    const installLog = join(RENDERER_CACHE_ROOT, `${version}.install.log`);
-    ensureCorepackPnpm(stagingDir, { logPath: installLog });
-    const installSpin = startProgress("installing the store preview engine…", {
-      stages: [{ afterMs: 20000, text: "still setting up the preview engine (first run only)…" }],
-    });
+  }
+}
+
+/**
+ * Read a cache entry's completion marker (`.tot-cache-complete`). Returns the
+ * manifest object (at least `{ integrity: string|null }`), or null when the
+ * marker is absent — i.e. the entry is incomplete/partial and must be treated
+ * as if it didn't exist. A legacy pre-manifest marker (a bare timestamp string)
+ * reads as complete-with-unknown-identity, so existing healthy caches survive
+ * the upgrade without a forced rebuild.
+ */
+export function readCacheMarker(dir) {
+  try {
+    const raw = readFileSync(join(dir, ".tot-cache-complete"), "utf8");
     try {
-      await runPnpmInstall(stagingDir, { logPath: installLog });
-    } finally {
-      installSpin.stop();
+      const m = JSON.parse(raw);
+      if (m && typeof m === "object") return { integrity: null, ...m };
+    } catch {
+      /* legacy timestamp-string marker */
     }
-    // Atomic-ish: only rename into the final, discoverable path once install
-    // succeeded, so a crashed/interrupted run never leaves a half-built cache
-    // entry that a later `tot dev` would treat as ready.
-    rmSync(runnerDir, { recursive: true, force: true });
-    renameSync(stagingDir, runnerDir);
-    writeFileSync(marker, new Date().toISOString());
-  } finally {
-    if (isUrl) rmSync(archivePath, { force: true });
+    return { integrity: null };
+  } catch {
+    return null; // no marker → never treat the entry as installed
+  }
+}
+
+/** Stamp a cache entry complete: version + source content identity + when. */
+function writeCacheMarker(dir, { version, integrity }) {
+  writeFileSync(
+    join(dir, ".tot-cache-complete"),
+    JSON.stringify({ version, integrity: integrity || null, completedAt: new Date().toISOString() }) + "\n",
+  );
+}
+
+/** sha512 SRI (`sha512-<base64>`, npm's `dist.integrity` format) of a file; null when unreadable. */
+function fileIntegrity(path) {
+  try {
+    return `sha512-${createHash("sha512").update(readFileSync(path)).digest("base64")}`;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Do the tarball's bytes match `expected` — an SRI string (`sha512-<b64>`, npm's
+ * `dist.integrity`) or npm's legacy `dist.shasum` (bare 40-hex sha1)? Unknown
+ * formats and probe errors return true: this check exists to catch corrupted
+ * bytes, never to block an install on a format we can't verify.
+ */
+export function tarballMatchesIntegrity(archivePath, expected) {
+  try {
+    const want = String(expected).trim();
+    const sri = /^(sha512|sha384|sha256|sha1)-([A-Za-z0-9+/=]+)$/.exec(want);
+    if (sri) {
+      return createHash(sri[1]).update(readFileSync(archivePath)).digest("base64") === sri[2];
+    }
+    if (/^[0-9a-f]{40}$/i.test(want)) {
+      return createHash("sha1").update(readFileSync(archivePath)).digest("hex") === want.toLowerCase();
+    }
+    return true;
+  } catch {
+    return true;
+  }
+}
+
+/**
+ * Reap `<entry>.staging-<pid>` dirs left by DEAD processes — failed/killed
+ * installs used to accumulate one orphaned staging tree per attempt, leaking
+ * disk forever. A staging dir whose pid is still alive belongs to a concurrent
+ * `tot dev` mid-install and is left alone. Best-effort: never throws, and never
+ * touches this process's own staging dir (created fresh after this sweep).
+ */
+export function sweepStaleStagingDirs(cacheRoot, { pidAlive = processAlive } = {}) {
+  try {
+    if (!cacheRoot || !existsSync(cacheRoot)) return;
+    for (const name of readdirSync(cacheRoot)) {
+      const m = /\.staging-(\d+)$/.exec(name);
+      if (!m) continue;
+      const pid = Number(m[1]);
+      if (pid === process.pid || pidAlive(pid)) continue;
+      rmSync(join(cacheRoot, name), { recursive: true, force: true });
+    }
+  } catch {
+    /* best-effort cache hygiene */
+  }
+}
+
+/** Is a pid a live process? (signal 0 probe; EPERM = alive but not ours.) */
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e?.code === "EPERM";
+  }
+}
+
+/**
+ * The registry-declared content identity (`dist.integrity`, else `dist.shasum`)
+ * of the public runner at `version` — or null when npm can't answer QUICKLY
+ * (offline, slow, 4xx/5xx, malformed). Used by ensureSampleRenderer's cached
+ * fast path to detect a same-version republish without ever making the network
+ * a hard dependency: null means "can't verify right now — trust the cache",
+ * preserving the offline-reuse behavior exactly.
+ */
+export async function publishedRunnerIntegrity(env, version, { timeoutMs = 2000, fetchFn = fetch } = {}) {
+  try {
+    const pkg = env.TOT_RUNNER_PACKAGE || PUBLIC_RUNNER_PACKAGE;
+    const registry = (env.TOT_NPM_REGISTRY || DEFAULT_NPM_REGISTRY).replace(/\/$/, "");
+    const res = await fetchFn(`${registry}/${pkg.replace("/", "%2f")}`, {
+      headers: { accept: "application/json" },
+      signal: AbortSignal.timeout(timeoutMs),
+    });
+    if (!res.ok) return null;
+    const dist = (await res.json())?.versions?.[version]?.dist;
+    return dist?.integrity || dist?.shasum || null;
+  } catch {
+    return null;
   }
-  return runnerDir;
 }
 
 /** Strip an optional file:// prefix from a local tarball path and resolve it absolute. */
@@ -963,7 +1278,7 @@ async function downloadFile(url, destPath) {
   if (!res.ok || !res.body) {
     throw new Error(`download failed: HTTP ${res.status} ${res.statusText}`);
   }
-  await pipeline(Readable.fromWeb(res.body), createWriteStream(destPath));
+  await pipeline(Readable.fromWeb(/** @type {any} */ (res.body)), createWriteStream(destPath));
 }
 
 /**
@@ -1012,7 +1327,8 @@ export function ensureCorepackPnpm(runnerDir, { logPath, spawnFn = spawnSync } =
     for (const args of [["enable"], ["prepare", pm, "--activate"]]) {
       const r = spawnFn("corepack", args, { stdio: ["ignore", fd ?? "ignore", fd ?? "ignore"] });
       if (fd !== null && (r.error || r.status !== 0)) {
-        writeSync(fd, `[tot] corepack ${args.join(" ")} → ${r.error?.code || r.error?.message || `exit ${r.status}`}\n`);
+        const rerr = /** @type {any} */ (r.error);
+        writeSync(fd, `[tot] corepack ${args.join(" ")} → ${rerr?.code || rerr?.message || `exit ${r.status}`}\n`);
       }
     }
   } finally {
@@ -1056,24 +1372,32 @@ function spawnAsyncResult(cmd, args, opts = {}) {
   });
 }
 
+/**
+ * @param {string} runnerDir
+ * @param {{ logPath?: string, spawnFn?: (cmd: string, args: string[], opts?: any) => any }} [opts]
+ */
 export async function runPnpmInstall(runnerDir, { logPath, spawnFn = spawnAsyncResult } = {}) {
   const fd = logPath ? openSync(logPath, "a") : null;
   const installArgs = ["install", "--config.dangerouslyAllowAllBuilds=true"];
-  // npm FIRST: it ships with EVERY Node (including 25+, where corepack is no
-  // longer bundled), so it's the launcher with zero machine-specific setup —
-  // no global pnpm, no corepack shim dance. The runner tree is built to be
-  // npm-installable (build-runner.mjs rewrites `workspace:*` → "*" and emits an
-  // npm `workspaces` field; verified end-to-end with both installers). pnpm and
-  // the corepack-pinned pnpm remain as fallbacks for hosts with a broken npm.
+  // pnpm FIRST: the renderer tree is a bundle of native optional deps (rolldown,
+  // esbuild, sharp, @rollup, lightningcss, @tailwindcss/oxide, @astrojs/compiler,
+  // workerd), and npm's optional-deps bug (npm/cli#4828) routinely installs the
+  // WRONG arch's binary or none — poisoning the cache so astro crashes at boot with
+  // `Cannot find native binding`. pnpm resolves per-platform optional bindings
+  // correctly (proven end-to-end). ensureCorepackPnpm() ran just above, so on the
+  // Node floor (22.12, which bundles corepack) pnpm is available; `corepack pnpm`
+  // is the shim path if a bare `pnpm` isn't on PATH. npm stays LAST as the escape
+  // hatch for hosts with neither pnpm nor corepack — where rendererCacheHealthy()
+  // then fences a poisoned result rather than shipping a broken cache silently.
   // If a launcher isn't installed at all (ENOENT) we move on; a launcher that
   // RAN but whose install failed is the real error and stops the loop.
   // REQUIRES a runner >= 1.3.4-rc.2 — older runner tarballs still carry
   // `workspace:*` deps npm rejects (harmless here: pickRunnerVersion pins the
   // runner to this CLI's version, so this CLI never installs those).
   const attempts = [
-    { cmd: "npm", args: ["install", "--no-audit", "--no-fund"] },
     { cmd: "pnpm", args: installArgs },
     { cmd: "corepack", args: ["pnpm", ...installArgs] },
+    { cmd: "npm", args: ["install", "--no-audit", "--no-fund"] },
   ];
   try {
     for (const { cmd, args } of attempts) {
@@ -1089,28 +1413,33 @@ export async function runPnpmInstall(runnerDir, { logPath, spawnFn = spawnAsyncR
         stdio: ["ignore", fd ?? "ignore", fd ?? "ignore"],
       });
       if (r.status === 0) return; // installed
-      if (r.error?.code === "ENOENT") {
+      if (/** @type {any} */ (r.error)?.code === "ENOENT") {
         // This launcher isn't on the machine — record it and try the next one.
         if (fd !== null) writeSync(fd, `[tot] ${cmd} not found (ENOENT) — trying the next launcher\n`);
         continue;
       }
       // The launcher ran; the install itself failed. That's the actionable error.
+      // (installRunnerTarball auto-retries this ONCE from a clean slate before it
+      // reaches the user — so by the time this surfaces, it failed twice.)
       await emitObstacle("install-failed");
       throw new CliError(
         `couldn't set up the store preview engine${pnpmFailureHint(logPath)}` +
           (logPath ? `\n     details: ${logPath}` : ""),
-        { next: "check the details log above, then re-run `tot start` (it resumes from the cache)" },
+        { next: "check the details log above, then re-run `tot start` (it retries from a clean slate — no cache to clear)" },
       );
     }
     // Every launcher ENOENT'd → there's no pnpm on this machine and corepack
     // couldn't provide one (corepack isn't bundled on Node 25+). npm ships with
     // every Node, so `npm i -g pnpm` is the escape hatch that always exists.
+    // Permanent: retrying can't conjure a launcher — skip the clean-slate retry.
     await emitObstacle("pnpm-missing");
-    throw new CliError(
+    const err = new CliError(
       "couldn't set up the store preview engine — pnpm isn't available on this machine" +
         (logPath ? `\n     details: ${logPath}` : ""),
       { next: "install pnpm with `npm i -g pnpm` (or `corepack enable`), then re-run `tot start`" },
     );
+    /** @type {any} */ (err).permanent = true;
+    throw err;
   } finally {
     if (fd !== null) closeSync(fd);
   }
@@ -1125,6 +1454,20 @@ function pnpmFailureHint(logPath) {
   if (!logPath) return " — is pnpm/corepack available on this host?";
   try {
     const tail = readFileSync(logPath, "utf8").slice(-8000);
+    // A 404 means the registry answered — a specific package/version doesn't
+    // exist there. Since installs now run from a clean slate every attempt
+    // (promote-on-success + auto-retry), this is a BROKEN RUNNER RELEASE (it
+    // references an unpublished package), not the user's cache — no `rm -rf`
+    // will help. Check this BEFORE the generic ERR_PNPM_FETCH match, since
+    // pnpm's 404 error text also contains "ERR_PNPM_FETCH".
+    const missing404 = tail.match(/ERR_PNPM_FETCH_404[^\n]*GET\s+(\S+)/i);
+    if (missing404) {
+      return (
+        ` — the preview engine references a package that isn't published (${missing404[1]});` +
+        " that's a broken preview-engine release, not your machine — try again later or pin a" +
+        " known-good version with --renderer-version"
+      );
+    }
     if (/npm\.tokenoftrust\.com|ERR_PNPM_FETCH|502|ECONNREFUSED|ETIMEDOUT|ENOTFOUND/i.test(tail)) {
       return " — the Token of Trust package registry looks unreachable right now; check your connection and retry";
     }
@@ -1140,6 +1483,10 @@ function pnpmFailureHint(logPath) {
  * fs-watch HMR. Returns a handle shaped like spawnDevContainer's, so run()'s
  * auto-open-browser logic works unchanged for either runtime. Exported (and
  * `stdio` overridable) so `tot start` can pipe the logs instead of inheriting.
+ * @param {string} runnerDir
+ * @param {string} workspace
+ * @param {string} port
+ * @param {{ stdio?: any, env?: Record<string, any> }} [opts]
  */
 export function spawnNativeDev(runnerDir, workspace, port, { stdio = "inherit", env = {} } = {}) {
   const script = join(runnerDir, "scripts", "tot-dev.mjs");
@@ -1160,7 +1507,7 @@ export function spawnNativeDev(runnerDir, workspace, port, { stdio = "inherit",
     [script, "--workspace", workspace, "--port", port],
     { cwd: runnerDir, stdio: stdioArr, env: mergedEnv },
   );
-  const handle = { child, exited: false, done: null };
+  const handle = { child, exited: false, done: /** @type {any} */ (null) };
   handle.done = new Promise((resolvePromise) => {
     child.on("exit", (code) => {
       handle.exited = true;
@@ -1240,7 +1587,7 @@ export function buildContainerPlan(workspace, args, _ctx) {
   const cfg = readWorkspaceConfig(workspace);
   if (!cfg) {
     throw new CliError(`${workspace} isn't a tenant checkout (no readable .tot/config.json)`, {
-      next: "tot checkout <tenant> --clone <dir>   (produces a runnable checkout)",
+      next: "tot clone <tenant>   (produces a runnable checkout)",
       exitCode: 2,
     });
   }
@@ -1315,9 +1662,9 @@ export async function spawnDevContainer(plan, args, { stdio = "inherit" } = {})
 
   const stdioArr =
     stdio === "piped" ? ["ignore", "pipe", "pipe"] : ["inherit", "inherit", "inherit"];
-  const child = spawn("docker", plan.dockerArgs, { stdio: stdioArr });
+  const child = spawn("docker", plan.dockerArgs, { stdio: /** @type {any} */ (stdioArr) });
 
-  const handle = { child, exited: false, done: null };
+  const handle = { child, exited: false, done: /** @type {any} */ (null) };
   handle.done = new Promise((resolvePromise) => {
     child.on("exit", (code) => {
       handle.exited = true;
@@ -1357,6 +1704,7 @@ export function isPrivateRegistryImage(image) {
  * its own session and overlaps this with the checkout clone instead of paying
  * for a second client.initialize()+establishSession() serially afterward).
  * `tot dev` standalone omits it and this establishes its own, as before.
+ * @param {string} image @param {any} args @param {{ client?: any }} [opts]
  */
 export async function ensureRegistryLogin(image, args, { client: providedClient } = {}) {
   const registry = String(image).split("/")[0];