harnery 0.43.0 → 0.45.0

package/dist/lib/guarded-remove.js

@@ -1,20 +1,43 @@
 import { spawnSync } from "node:child_process";
 import { lstatSync, readdirSync, readlinkSync, realpathSync, rmSync } from "node:fs";
 import { homedir } from "node:os";
-import { basename, dirname, isAbsolute, parse, relative, resolve, sep } from "node:path";
+import { basename, dirname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
 const protectedNames = new Set([".git", ".harnery", ".credentials", ".ssh", ".gnupg"]);
 const MAX_ENTRIES = 10_000;
+const MAX_OWNED_ARTIFACT_ENTRIES = 100_000;
 /** Permanent removal is deliberately limited to inspected, untracked local outputs. */
 export function guardedRemove(paths, options, checkClaims = () => { }) {
     const cwd = realpathSync(process.cwd());
     const root = checkedPath(options.root, new Set(), true);
-    const allowed = allowedProtected(options.allowProtected ?? [], root, options.liveRoots ?? []);
+    if (options.cleanClone) {
+        if (!options.recursive)
+            throw new Error("Clean clone removal requires --recursive");
+        if (options.allowProtected?.length)
+            throw new Error("Clean clone removal cannot be combined with --allow-protected");
+        if (!options.assertOwnedArtifact)
+            throw new Error("Clean clone removal requires one current caller-owned managed artifact");
+        options.assertOwnedArtifact(root);
+    }
+    const entryLimit = options.entryLimit ?? MAX_ENTRIES;
+    if (!Number.isSafeInteger(entryLimit) ||
+        entryLimit < 1 ||
+        entryLimit > MAX_OWNED_ARTIFACT_ENTRIES)
+        throw new Error(`The entry limit must be an integer from 1 to ${MAX_OWNED_ARTIFACT_ENTRIES}`);
+    const assertEntryLimitAuthority = () => {
+        if (entryLimit <= MAX_ENTRIES)
+            return;
+        if (!options.assertOwnedArtifact)
+            throw new Error("An entry limit above 10000 requires one current caller-owned managed artifact");
+        options.assertOwnedArtifact(root);
+    };
+    const allowed = allowedProtected(options.allowProtected ?? [], root, options.liveRoots ?? [], options.assertOwnedArtifact);
     const rootStat = lstatSync(root);
     const rootFingerprint = fingerprint(rootStat);
     if (!rootStat.isDirectory())
         throw new Error("--root must be a directory");
     if (root === parse(root).root || root === realpathSync(homedir()))
         throw new Error("--root cannot be a filesystem root or home directory");
+    assertEntryLimitAuthority();
     if (paths.length === 0 || paths.length > 100)
         throw new Error("Supply 1-100 explicit targets");
     const targets = paths.map((path) => checkedPath(path, allowed));
@@ -22,6 +45,7 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
     const removedProtected = new Set();
     const links = [];
     const gitDirs = new Set();
+    const cleanClones = new Set();
     let bytes = 0;
     const devices = new Set();
     for (const target of targets) {
@@ -64,6 +88,10 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
         if (stat.isDirectory() && !options.recursive)
             throw new Error(`Directory removal requires --recursive: ${target}`);
         const device = stat.dev;
+        if (options.cleanClone) {
+            assertCleanClone(target);
+            cleanClones.add(target);
+        }
         devices.add(device);
         const pending = [target];
         while (pending.length) {
@@ -72,6 +100,12 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
             if (basename(path) === ARTIFACT_RECORD && insideArtifactWorkspace(path, null))
                 throw new Error(`An artifact's record is managed by the artifact commands: ${path}`);
             if (protectedNames.has(basename(path).toLowerCase())) {
+                if (options.cleanClone && basename(path) === ".git") {
+                    const clone = dirname(path);
+                    assertCleanClone(clone);
+                    cleanClones.add(clone);
+                    allowed.add(path);
+                }
                 if (!allowed.has(path))
                     throw new Error(protectedMessage(path));
                 removedProtected.add(path);
@@ -82,16 +116,16 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
                 // were already refused if they were links, in checkedPath.)
                 if (path === target)
                     throw new Error(`Path contains a symlink: ${path}`);
-                if (snapshots.size >= MAX_ENTRIES)
-                    throw new Error(`Removal exceeds the ${MAX_ENTRIES}-entry limit; use the owning cleanup command`);
+                if (snapshots.size >= entryLimit)
+                    throw new Error(`Removal exceeds the ${entryLimit}-entry limit; use the owning cleanup command`);
                 snapshots.set(path, fingerprint(info));
                 links.push({ path, target: readlinkSync(path) });
                 continue;
             }
             if (info.dev !== device || (!info.isDirectory() && !info.isFile()))
                 throw new Error(`Mount boundary or special file cannot be removed: ${path}`);
-            if (snapshots.size >= MAX_ENTRIES)
-                throw new Error(`Removal exceeds the ${MAX_ENTRIES}-entry limit; use the owning cleanup command`);
+            if (snapshots.size >= entryLimit)
+                throw new Error(`Removal exceeds the ${entryLimit}-entry limit; use the owning cleanup command`);
             snapshots.set(path, fingerprint(info));
             if (info.isFile())
                 bytes += info.size;
@@ -126,6 +160,7 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
         root,
         targets,
         entries: snapshots.size,
+        entry_limit: entryLimit,
         bytes,
         protected: [...removedProtected].sort(),
         links,
@@ -137,12 +172,19 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
     if (checkedPath(options.root, new Set(), true) !== root ||
         fingerprint(lstatSync(root)) !== rootFingerprint)
         throw new Error("Allowed root changed during inspection");
+    assertEntryLimitAuthority();
+    if (options.cleanClone)
+        options.assertOwnedArtifact(root);
+    // Ownership may have been released or changed while the contents were inspected.
+    allowedProtected(options.allowProtected ?? [], root, options.liveRoots ?? [], options.assertOwnedArtifact);
     for (const target of targets) {
         checkedPath(target, allowed);
         assertUntracked(target);
     }
     for (const dir of gitDirs)
         assertNoUnpushedHistory(dir);
+    for (const clone of cleanClones)
+        assertCleanClone(clone);
     checkClaims(targets);
     for (const [path, previous] of snapshots) {
         if (fingerprint(lstatSync(path)) !== previous)
@@ -152,6 +194,44 @@ export function guardedRemove(paths, options, checkClaims = () => { }) {
         rmSync(target, { recursive: Boolean(options.recursive), force: false });
     return { ...report, applied: true };
 }
+/** A disposable clone must not be the only copy of work or a registered worktree. */
+function assertCleanClone(clone) {
+    const metadata = join(clone, ".git");
+    const stat = lstatSync(metadata);
+    if (!stat.isDirectory() || stat.isSymbolicLink())
+        throw new Error(`Clean clone removal requires a standalone .git directory: ${clone}`);
+    const git = (args) => {
+        const result = spawnSync("git", ["-c", "core.fsmonitor=false", "-C", clone, ...args], {
+            encoding: "utf8",
+            timeout: 10_000,
+            maxBuffer: 4 * 1024 * 1024,
+            env: {
+                ...process.env,
+                LC_ALL: "C",
+                GIT_DIR: undefined,
+                GIT_COMMON_DIR: undefined,
+                GIT_WORK_TREE: undefined,
+                GIT_INDEX_FILE: undefined,
+                GIT_OPTIONAL_LOCKS: "0",
+            },
+        });
+        if (result.error || result.status !== 0)
+            throw new Error(`Cannot verify clean clone ${clone}: git ${args[0]} failed`);
+        return result.stdout;
+    };
+    if (realpathSync(git(["rev-parse", "--show-toplevel"]).trim()) !== clone ||
+        realpathSync(resolve(clone, git(["rev-parse", "--git-common-dir"]).trim())) !== metadata)
+        throw new Error(`Clean clone removal refuses shared repository metadata: ${clone}`);
+    const worktrees = git(["worktree", "list", "--porcelain", "-z"])
+        .split("\0")
+        .filter((entry) => entry.startsWith("worktree "));
+    if (worktrees.length !== 1 || worktrees[0] !== `worktree ${clone}`)
+        throw new Error(`Clean clone removal refuses registered or linked worktrees: ${clone}`);
+    if (git(["status", "--porcelain=v1", "--untracked-files=all"]).trim())
+        throw new Error(`Clean clone has uncommitted or untracked work: ${clone}`);
+    if (git(["rev-list", "--max-count=1", "HEAD", "--all", "--reflog", "--not", "--remotes"]).trim())
+        throw new Error(`Clean clone has HEAD, ref or reflog commits not on any remote: ${clone}`);
+}
 /** The metadata file the artifact commands keep in each artifact workspace. */
 const ARTIFACT_RECORD = ".harnery-artifact.json";
 /**
@@ -188,9 +268,9 @@ function insideAllowed(path, allowed) {
  * protected path strictly inside the root, reached without symlinks, and
  * never the Git metadata or Harnery state of a live workspace root.
  */
-function allowedProtected(paths, root, liveRoots) {
+function allowedProtected(paths, root, liveRoots, assertOwnedArtifact) {
     const allowed = new Set();
-    const live = liveRoots.map((dir) => resolve(dir));
+    const live = liveRoots.map((dir) => realpathSync(dir));
     for (const input of paths) {
         if (!input?.trim() || /[\0\r\n*?[\]$]/.test(input))
             throw new Error("Use a nonempty explicit --allow-protected path without wildcards");
@@ -213,11 +293,25 @@ function allowedProtected(paths, root, liveRoots) {
         if (!named && !(info.isDirectory() && isRepositoryMetadata(path)))
             throw new Error(`--allow-protected must name a protected path itself: ${path}`);
         for (const dir of live) {
-            const own = [".git", ".harnery"].map((name) => resolve(dir, name));
-            if (path === dir ||
-                strictlyInside(path, dir) ||
-                own.some((state) => path === state || strictlyInside(state, path)))
+            if (path === dir || strictlyInside(path, dir))
                 throw new Error(`The live workspace's own state cannot be allowed: ${path}`);
+            for (const name of [".git", ".harnery"]) {
+                const state = resolve(dir, name);
+                if (path !== state && !strictlyInside(state, path))
+                    continue;
+                // Only an explicitly named copied state directory inside one owned
+                // artifact may cross the outer live-state ancestor. Other live roots
+                // (including a checkout inside that artifact) still veto the path.
+                if (name === ".harnery" &&
+                    basename(path) === ".harnery" &&
+                    info.isDirectory() &&
+                    dirname(root) === resolve(state, "artifacts") &&
+                    assertOwnedArtifact) {
+                    assertOwnedArtifact(root);
+                    continue;
+                }
+                throw new Error(`The live workspace's own state cannot be allowed: ${path}`);
+            }
         }
         allowed.add(realpathSync(path));
     }

package/dist/lib/identities/assume.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assume.d.ts","sourceRoot":"","sources":["../../../src/lib/identities/assume.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA0BH,MAAM,MAAM,uBAAuB,GAC/B,eAAe,GACf,iBAAiB,GACjB,sBAAsB,GACtB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,mBAAmB,CAAC;AAExB,qBAAa,mBAAoB,SAAQ,KAAK;aAE1B,IAAI,EAAE,uBAAuB;gBAA7B,IAAI,EAAE,uBAAuB,EAC7C,OAAO,EAAE,MAAM;CAKlB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,+DAA+D;IAC/D,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAOD;+EAC+E;AAC/E,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAa,EAClB,mBAAmB,GAAE,WAAW,CAAC,MAAM,CAAa,GACnD,gBAAgB,GAAG,IAAI,CA6BzB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAyCT;AAuED,gEAAgE;AAChE,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,oBAAoB,CAyHtB"}
+{"version":3,"file":"assume.d.ts","sourceRoot":"","sources":["../../../src/lib/identities/assume.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA0BH,MAAM,MAAM,uBAAuB,GAC/B,eAAe,GACf,iBAAiB,GACjB,sBAAsB,GACtB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,mBAAmB,CAAC;AAExB,qBAAa,mBAAoB,SAAQ,KAAK;aAE1B,IAAI,EAAE,uBAAuB;gBAA7B,IAAI,EAAE,uBAAuB,EAC7C,OAAO,EAAE,MAAM;CAKlB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,+DAA+D;IAC/D,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAOD;+EAC+E;AAC/E,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAa,EAClB,mBAAmB,GAAE,WAAW,CAAC,MAAM,CAAa,GACnD,gBAAgB,GAAG,IAAI,CA6BzB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CA6CT;AAuED,gEAAgE;AAChE,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GACjC,oBAAoB,CAyHtB"}

package/dist/lib/identities/assume.js

@@ -85,6 +85,7 @@ export function reclaimAbandonedLocalConflict(coordRoot, conflict) {
     let sessionId = conflict.instance_id;
     let ageSecs;
     const liveRow = readLiveCoordinationRow(coordRoot, conflict.instance_id);
+    let expectedGenerationId = liveRow?.v3_generation_id ?? null;
     if (liveRow) {
         adapter = adapterOf(liveRow.platform);
         sessionId = liveRow.session_id || conflict.instance_id;
@@ -99,8 +100,10 @@ export function reclaimAbandonedLocalConflict(coordRoot, conflict) {
             // It is required to join the exact producer state when recording the sweep.
             adapter = adapterOf(hb.platform);
             sessionId = hb.session_id || conflict.instance_id;
+            expectedGenerationId = hb.v3_generation_id ?? null;
         }
         catch {
+            expectedGenerationId = null;
             /* content unreadable — still reclaim the file */
         }
         try {
@@ -116,6 +119,7 @@ export function reclaimAbandonedLocalConflict(coordRoot, conflict) {
         owner: conflict.instance_id,
         nativeSessionId: sessionId,
         adapter,
+        expectedGenerationId,
         observation: "stale_heartbeat",
         ageMs: Math.max(0, (ageSecs ?? 0) * 1_000),
     });

package/dist/lib/tunnel/state.d.ts

@@ -32,10 +32,12 @@ export interface TunnelState {
     provider: TunnelProvider;
     url: string;
     gate_pid: number;
+    gate_start_token?: string;
+    cloudflared_start_token?: string;
+    registration_id?: string;
+    provider_state?: "pending" | "ready";
     /** Present for Cloudflare quick tunnels; absent for Tailscale Serve/Funnel. */
     cloudflared_pid?: number;
-    /** Optional provider-side process when a provider owns one. */
-    provider_pid?: number;
     started_at: string;
     target: string;
     vhost: string;
@@ -57,9 +59,14 @@ export declare function clearState(name?: string, root?: string): void;
  */
 export declare function listStates(root?: string): TunnelState[];
 export declare function isProcessAlive(pid: number): boolean;
-export type ProcessAliveCheck = (pid: number) => boolean;
-/** True when both the local gate and its provider-side process are live. */
-export declare function isTunnelStateLive(state: TunnelState, processAlive?: ProcessAliveCheck): boolean;
+export type TunnelReadiness = "ready" | "dead" | "unknown";
+export type TunnelProcessObservation = "same" | "absent" | "different" | "unknown";
+export interface TunnelReadinessVerifier {
+    observeProcess(pid: number, originalToken: string): TunnelProcessObservation;
+    withRegistration(state: TunnelState, inspect: () => TunnelReadiness): TunnelReadiness;
+}
+/** Classify saved original witnesses under the verifier's registration custody. */
+export declare function tunnelReadiness(state: TunnelState, verifier: TunnelReadinessVerifier): TunnelReadiness;
 export declare function tunnelTargetPort(state: TunnelState): number | null;
 /**
  * Newest live tunnel that serves `vhost` on the requested local web port.
@@ -72,7 +79,7 @@ export declare function tunnelTargetPort(state: TunnelState): number | null;
  * link 400s. Matching the vhost too keeps the returned tunnel the one that
  * actually serves the caller's origin.
  */
-export declare function findLiveTunnelForOrigin(port: number, vhost: string, root?: string, processAlive?: ProcessAliveCheck): TunnelState | null;
+export declare function findLiveTunnelForOrigin(port: number, vhost: string, root: string, verifier: TunnelReadinessVerifier): TunnelState | null;
 /** True when the tunnel's path scope forwards every one of `paths`. */
 export declare function tunnelServesPaths(state: TunnelState, paths: readonly string[]): boolean;
 /**

package/dist/lib/tunnel/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../src/lib/tunnel/state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../src/lib/tunnel/state.ts"],"names":[],"mappings":"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"}

package/dist/lib/tunnel/state.js

@@ -1,7 +1,8 @@
 // Tunnel config + state persistence + provider helpers. Commands default to
 // <cwd>/.cache/tunnel/; gitignored, so the allowlist is per-machine.
 import { spawnSync } from "node:child_process";
-import { accessSync, chmodSync, constants, existsSync, mkdirSync, readdirSync, readFileSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { accessSync, chmodSync, constants, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
 import { homedir } from "node:os";
 import { delimiter, join, resolve } from "node:path";
 import { isPathAllowed } from "./path-scope.js";
@@ -104,7 +105,17 @@ export function readState(name = DEFAULT_INSTANCE, root = process.cwd()) {
     }
 }
 export function writeState(state, root = process.cwd()) {
-    writeFileSync(cachePath(stateFile(state.name), root), JSON.stringify(state, null, 2));
+    const path = cachePath(stateFile(state.name), root);
+    const temporary = `${path}.${randomUUID()}.tmp`;
+    try {
+        writeFileSync(temporary, JSON.stringify(state, null, 2), { flag: "wx", mode: 0o600 });
+        renameSync(temporary, path);
+    }
+    catch (error) {
+        if (existsSync(temporary))
+            unlinkSync(temporary);
+        throw error;
+    }
 }
 export function clearState(name = DEFAULT_INSTANCE, root = process.cwd()) {
     const p = cachePath(stateFile(name), root);
@@ -139,14 +150,49 @@ export function isProcessAlive(pid) {
         return false;
     }
 }
-/** True when both the local gate and its provider-side process are live. */
-export function isTunnelStateLive(state, processAlive = isProcessAlive) {
-    if (!processAlive(state.gate_pid))
-        return false;
-    if (state.provider === "tailscale")
-        return true;
-    const providerPid = state.cloudflared_pid ?? state.provider_pid;
-    return typeof providerPid === "number" && processAlive(providerPid);
+/** Classify saved original witnesses under the verifier's registration custody. */
+export function tunnelReadiness(state, verifier) {
+    if (!state ||
+        typeof state !== "object" ||
+        Object.hasOwn(state, "provider_pid") ||
+        Object.hasOwn(state, "provider_start_token") ||
+        typeof state.registration_id !== "string" ||
+        !state.registration_id ||
+        !Number.isSafeInteger(state.gate_pid) ||
+        state.gate_pid < 1 ||
+        typeof state.gate_start_token !== "string" ||
+        !state.gate_start_token)
+        return "unknown";
+    const targets = [{ pid: state.gate_pid, token: state.gate_start_token }];
+    if (state.provider === "tailscale") {
+        if (state.provider_state !== "ready" ||
+            state.cloudflared_pid !== undefined ||
+            state.cloudflared_start_token !== undefined)
+            return "unknown";
+    }
+    else if (state.provider === "cloudflare") {
+        if (!Number.isSafeInteger(state.cloudflared_pid) ||
+            state.cloudflared_pid < 1 ||
+            typeof state.cloudflared_start_token !== "string" ||
+            !state.cloudflared_start_token)
+            return "unknown";
+        targets.push({ pid: state.cloudflared_pid, token: state.cloudflared_start_token });
+    }
+    else
+        return "unknown";
+    try {
+        return verifier.withRegistration(state, () => {
+            const observed = targets.map(({ pid, token }) => verifier.observeProcess(pid, token));
+            if (observed.every((value) => value === "absent"))
+                return "dead";
+            if (observed.every((value) => value === "same"))
+                return "ready";
+            return "unknown";
+        });
+    }
+    catch {
+        return "unknown";
+    }
 }
 export function tunnelTargetPort(state) {
     const value = /^[a-z][a-z\d+.-]*:\/\//i.test(state.target)
@@ -173,10 +219,10 @@ export function tunnelTargetPort(state) {
  * link 400s. Matching the vhost too keeps the returned tunnel the one that
  * actually serves the caller's origin.
  */
-export function findLiveTunnelForOrigin(port, vhost, root = process.cwd(), processAlive = isProcessAlive) {
+export function findLiveTunnelForOrigin(port, vhost, root, verifier) {
     return (listStates(root).find((state) => tunnelTargetPort(state) === port &&
         state.vhost === vhost &&
-        isTunnelStateLive(state, processAlive)) ?? null);
+        tunnelReadiness(state, verifier) === "ready") ?? null);
 }
 /** True when the tunnel's path scope forwards every one of `paths`. */
 export function tunnelServesPaths(state, paths) {

package/dist/lib/zip/index.d.ts

@@ -0,0 +1,41 @@
+export interface ZipLimits {
+    archiveBytes: number;
+    entryBytes: number;
+    totalBytes: number;
+    entries: number;
+}
+export declare const DEFAULT_ZIP_LIMITS: Readonly<ZipLimits>;
+export interface ZipEntryInfo {
+    name: string;
+    size: number;
+    compressedSize: number;
+    directory: boolean;
+    crc32: number;
+}
+export type ZipSource = string | Uint8Array;
+export interface ReadOptions {
+    limits?: Partial<ZipLimits>;
+}
+export declare function listZip(source: ZipSource, options?: ReadOptions): ZipEntryInfo[];
+export declare function readZipEntries(source: ZipSource, keep?: (name: string) => boolean, options?: ReadOptions): Map<string, Uint8Array>;
+export declare function readZipEntry(source: ZipSource, name: string, options?: ReadOptions): Uint8Array | undefined;
+export declare function readZipText(source: ZipSource, name: string, options?: ReadOptions): string | undefined;
+/** Portable names exclude traversal, device names, streams and ambiguous aliases. */
+export declare function safeEntryPath(root: string, name: string): string;
+export interface ExtractOptions extends ReadOptions {
+    overwrite?: boolean;
+    filter?: (name: string) => boolean;
+}
+/** Preflight all selected names, collisions and existing filesystem paths before writing. */
+export declare function extractZip(source: ZipSource, dest: string, options?: ExtractOptions): string[];
+export interface CreateOptions extends ReadOptions {
+    base?: string;
+    level?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    overwrite?: boolean;
+}
+export declare function buildZip(inputs: readonly string[], options?: CreateOptions): {
+    bytes: Uint8Array;
+    entries: string[];
+};
+export declare function createZip(archive: string, inputs: readonly string[], options?: CreateOptions): string[];
+//# sourceMappingURL=index.d.ts.map

package/dist/lib/zip/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/zip/index.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAKjD,CAAC;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AACD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,UAAU,CAAC;AAC5C,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;CAC7B;AA+JD,wBAAgB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,GAAE,WAAgB,GAAG,YAAY,EAAE,CAKpF;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,SAAS,EACjB,IAAI,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAoB,EAC5C,OAAO,GAAE,WAAgB,GACxB,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAoBzB;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,GACxB,UAAU,GAAG,SAAS,CAExB;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,GACxB,MAAM,GAAG,SAAS,CAGpB;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAyBhE;AAsFD,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC;AAED,6FAA6F;AAC7F,wBAAgB,UAAU,CACxB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,cAAmB,GAC3B,MAAM,EAAE,CAsCV;AAED,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,QAAQ,CACtB,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,OAAO,GAAE,aAAkB,GAC1B;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CA8C1C;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,OAAO,GAAE,aAAkB,GAC1B,MAAM,EAAE,CAQV"}