harnery 0.42.0 → 0.43.0

package/dist/commands/web-fetch.js

@@ -14,9 +14,11 @@ import { fileURLToPath } from "node:url";
  * harnery repo at the *matching version tag* into a cache dir and install the
  * web app's deps. Subsequent runs reuse the cache.
  *
- * The only thing `web/` pulls from `src/` is `harnery/core/journal` (a single,
- * dependency-free module), so the install is `web/` deps only: no root install,
- * no Playwright browser download.
+ * `web/` imports readers from `src/`, and `web/next.config.ts` resolves the
+ * root `playwright` package, so the install covers the repository root and
+ * then `web/`. Installing the `playwright` package downloads no browsers.
+ * Installing `web/` alone left `harn web up` failing with
+ * `Cannot find module 'playwright/package.json'`.
  */
 const DEFAULT_REPO_URL = "https://github.com/ryanjkelly/harnery.git";
 /** harnery's own package root: src/commands/ -> ../.. ; valid in both src/ and dist/. */
@@ -46,8 +48,8 @@ function webCacheRoot(ref) {
     return path.join(base, "harnery", "web", safeRef);
 }
 /** bun if available (preferred), else npm. Both support `<runner> install` and `<runner> run <script>`. */
-export function webRunner() {
-    const r = spawnSync("bun", ["--version"], { stdio: "ignore" });
+export function webRunner(spawn = spawnSync) {
+    const r = spawn("bun", ["--version"], { stdio: "ignore" });
     return r.status === 0 ? "bun" : "npm";
 }
 /**
@@ -55,13 +57,14 @@ export function webRunner() {
  * its path, fetching (clone + install) on first use. Returns null on failure
  * (after emitting an actionable error).
  */
-export function lazyFetchWebRoot(emit) {
+export function lazyFetchWebRoot(emit, spawn = spawnSync) {
     const { version, repoUrl } = readPkg();
     const ref = resolveRef(version);
     const cacheRoot = webCacheRoot(ref);
     const webDir = path.join(cacheRoot, "web");
-    // node_modules in the cached web/ is the "fetched + installed" marker.
-    if (existsSync(path.join(webDir, "node_modules"))) {
+    // node_modules in both the cached root and web/ is the "fetched + installed" marker.
+    if (existsSync(path.join(cacheRoot, "node_modules")) &&
+        existsSync(path.join(webDir, "node_modules"))) {
         emit.log(`harn web · using cached dashboard (${ref})`, "info");
         return webDir;
     }
@@ -71,7 +74,7 @@ export function lazyFetchWebRoot(emit) {
     if (existsSync(cacheRoot))
         rmSync(cacheRoot, { recursive: true, force: true });
     mkdirSync(path.dirname(cacheRoot), { recursive: true });
-    const clone = spawnSync("git", ["clone", "--depth", "1", "--branch", ref, repoUrl, cacheRoot], {
+    const clone = spawn("git", ["clone", "--depth", "1", "--branch", ref, repoUrl, cacheRoot], {
         stdio: "inherit",
     });
     if (clone.status !== 0) {
@@ -84,16 +87,19 @@ export function lazyFetchWebRoot(emit) {
         });
         return null;
     }
-    const runner = webRunner();
-    emit.log(`harn web · installing dashboard deps (${runner} install in web/)`, "info");
-    const install = spawnSync(runner, ["install"], { cwd: webDir, stdio: "inherit" });
-    if (install.status !== 0) {
-        emit.error({
-            code: "web_fetch_failed",
-            message: `${runner} install in ${webDir} failed (status ${install.status})`,
-            hint: `Try manually: cd ${webDir} && ${runner} install`,
-        });
-        return null;
+    const runner = webRunner(spawn);
+    for (const dir of [cacheRoot, webDir]) {
+        const where = dir === webDir ? "web/" : "the harnery root";
+        emit.log(`harn web · installing dashboard deps (${runner} install in ${where})`, "info");
+        const install = spawn(runner, ["install"], { cwd: dir, stdio: "inherit" });
+        if (install.status !== 0) {
+            emit.error({
+                code: "web_fetch_failed",
+                message: `${runner} install in ${dir} failed (status ${install.status})`,
+                hint: `Try manually: cd ${dir} && ${runner} install`,
+            });
+            return null;
+        }
     }
     emit.log(`harn web · dashboard ready (cached at ${webDir})`, "info");
     return webDir;

package/dist/commands/web.d.ts

@@ -19,7 +19,13 @@ export declare function resolveMaxOldSpaceMb(flag?: string): number;
  * wins without clobbering flags the caller set (source maps, inspector, …).
  */
 export declare function nodeOptionsWithHeapCap(mb: number): string | undefined;
-/** Preload the request diagnostics hook without replacing Next's HTTP server. */
+/**
+ * Preload the dashboard's server hooks (keep-alive and request diagnostics)
+ * without replacing Next's HTTP server. NODE_OPTIONS reaches the child that
+ * `next dev` forks, but Next re-parses every `--import` into one value, so
+ * this names the single combined preload; a second, different `--import`
+ * would collapse into an unloadable path (web/server-preload.mjs).
+ */
 export declare function nodeOptionsWithWebDiagnostics(webDir: string, mb: number): string;
 export declare function webPerformanceLogDestination(coordRoot: string, env?: Readonly<Record<string, string | undefined>>): string;
 /**

package/dist/commands/web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/commands/web.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AA8CnD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKrE;AAED,iFAAiF;AACjF,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,CAQR;AAmDD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAevE;AAsBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CA2N5E"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/commands/web.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AA8CnD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKrE;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,CAQR;AAmDD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAevE;AAsBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CA2N5E"}

package/dist/commands/web.js

@@ -71,12 +71,18 @@ export function nodeOptionsWithHeapCap(mb) {
         return inherited;
     return `${inherited} --max-old-space-size=${mb}`.trim();
 }
-/** Preload the request diagnostics hook without replacing Next's HTTP server. */
+/**
+ * Preload the dashboard's server hooks (keep-alive and request diagnostics)
+ * without replacing Next's HTTP server. NODE_OPTIONS reaches the child that
+ * `next dev` forks, but Next re-parses every `--import` into one value, so
+ * this names the single combined preload; a second, different `--import`
+ * would collapse into an unloadable path (web/server-preload.mjs).
+ */
 export function nodeOptionsWithWebDiagnostics(webDir, mb) {
     const inherited = nodeOptionsWithHeapCap(mb) ?? "";
-    if (inherited.includes("server-performance.mjs"))
+    if (inherited.includes("server-preload.mjs"))
         return inherited;
-    const preload = pathToFileURL(path.join(webDir, "server-performance.mjs")).href;
+    const preload = pathToFileURL(path.join(webDir, "server-preload.mjs")).href;
     return `${inherited} --import=${preload}`.trim();
 }
 export function webPerformanceLogDestination(coordRoot, env = process.env) {

package/dist/core/agents/render/prompt-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-context.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/render/prompt-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAgDH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;8EAC0E;IAC1E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;kFAC8E;IAC9E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;kFAC8E;IAC9E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;uEACmE;IACnE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;wBAIoB;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAkFnE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA6CtF"}
+{"version":3,"file":"prompt-context.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/render/prompt-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAiDH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;8EAC0E;IAC1E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;kFAC8E;IAC9E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;kFAC8E;IAC9E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;uEACmE;IACnE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;wBAIoB;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAkFnE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA6CtF"}

package/dist/core/agents/render/prompt-context.js

@@ -43,6 +43,7 @@ import { drainMailbox, formatMailboxDelivery } from "../mailbox.js";
 import { sessionNameDisplayBlock, sessionNameDisplayPending } from "../session-name-display.js";
 import { heartbeatPath } from "../state/heartbeat-reader.js";
 import { readLiveCoordinationRow, readLiveCoordinationRows, } from "../state/live-coordination-view.js";
+import { forkRelationLabels } from "../state/names.js";
 import { formatPendingCouncils, recordDeliveredMessages } from "./session-context.js";
 /**
  * Build the combined UserPromptSubmit additionalContext string. Returns "" when
@@ -337,7 +338,7 @@ function computePeerTableIfChanged(coordRoot, selfInstanceId, selfSessionIdFallb
     if (oldHash && oldHash === newHash)
         return "";
     // Render peer table via the same formatter used at SessionStart.
-    const local = formatPeerTable(peers, mySessionId);
+    const local = formatPeerTable(peers, mySessionId, forkRelationLabels(coordRoot, selfInstanceId, new Set(peers.map((p) => p.instance_id ?? ""))));
     const remoteTable = formatRemoteTable(remote);
     const table = [local, remoteTable].filter(Boolean).join("\n\n");
     if (!table)
@@ -458,7 +459,7 @@ function writeHashFile(path, value) {
  * intentionally co-located here so the prompt-context renderer is self-contained
  * (no cross-file imports of formatting internals). If both renderers diverge,
  * pull the shared bits into a small util module. */
-function formatPeerTable(peers, mySessionId) {
+function formatPeerTable(peers, mySessionId, relations = new Map()) {
     if (peers.length === 0)
         return "";
     const nowSec = Math.floor(Date.now() / 1000);
@@ -474,9 +475,13 @@ function formatPeerTable(peers, mySessionId) {
         .map((p) => {
         const folded = fold[p.instance_id ?? ""] ?? [];
         const display = Array.from(new Set([...(p.files_touched ?? []), ...folded])).sort();
-        return { ...p, display_files: display };
+        const relation = relations.get(p.instance_id ?? "");
+        return { ...p, display_files: display, ...(relation ? { relation } : {}) };
     });
-    const blocking = rows.filter((p) => p.session_id !== mySessionId).sort(byStartedAt);
+    // Related sessions sort first so a fork parent never hides in "+N more".
+    const blocking = rows
+        .filter((p) => p.session_id !== mySessionId)
+        .sort((a, b) => Number(!!b.relation) - Number(!!a.relation) || byStartedAt(a, b));
     const group = rows.filter((p) => p.session_id === mySessionId).sort(byStartedAt);
     const out = [];
     const blk = renderSubtable(blocking, "Other agent groups active (their files block you):", nowSec);
@@ -508,7 +513,8 @@ function formatRow(r, nowSec) {
     // Prefer a short instance_id over a bare "unknown" so an incomplete row is
     // still identifiable.
     const label = r.name ?? (r.instance_id ? r.instance_id.slice(0, 8) : "unknown");
-    return `  - agent-${label}${taskPart}   (${statePart}, ${ageFrom}, ${filesPart})`;
+    const relation = r.relation ? ` [${r.relation}]` : "";
+    return `  - agent-${label}${relation}${taskPart}   (${statePart}, ${ageFrom}, ${filesPart})`;
 }
 function formatState(r) {
     const activity = r.activity ?? "unknown";

package/dist/core/agents/render/session-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-context.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/render/session-context.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAyC,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM1E,OAAO,EAAuC,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAoB3F,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;+BAC2B;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAyF7D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,gBAAgB,EAAE,GACpC,IAAI,CAUN;AAkID;;;;;;;;;;;;;GAaG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBvD;AA0DD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAiDlF;AAED;;;GAGG;AACH,eAAO,MAAM,uBAAuB,iBAAW,CAAC"}
+{"version":3,"file":"session-context.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/render/session-context.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAyC,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM1E,OAAO,EAAuC,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAoB3F,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;+BAC2B;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAiG7D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,gBAAgB,EAAE,GACpC,IAAI,CAUN;AA6LD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBvD;AA0DD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAiDlF;AAED;;;GAGG;AACH,eAAO,MAAM,uBAAuB,iBAAW,CAAC"}

package/dist/core/agents/render/session-context.js

@@ -15,7 +15,7 @@ import { appendEntry } from "../../journal/index.js";
 import { readRemoteMachines } from "../../presence/index.js";
 import { drainMailbox, formatMailboxDelivery } from "../mailbox.js";
 import { readLiveCoordinationRows } from "../state/live-coordination-view.js";
-import { readForkParent } from "../state/names.js";
+import { forkRelationLabels, readForkState } from "../state/names.js";
 /**
  * Build the combined SessionStart systemMessage. Returns the additionalContext
  * string (or "" if there's nothing to say).
@@ -25,7 +25,13 @@ export function renderSessionContext(opts) {
     const messages = [];
     // 1. Self-name line + peer table (folded if peers present)
     const peers = readActivePeers(coordRoot, instanceId);
-    const localTable = formatPeerTable(peers, sessionId);
+    const forkState = readForkState(coordRoot, instanceId);
+    const forkParent = forkState?.parent ?? null;
+    const parentRow = forkParent
+        ? peers.find((peer) => peer.instance_id === forkParent.instance_id)
+        : undefined;
+    const relations = forkRelationLabels(coordRoot, instanceId, new Set(peers.map((peer) => peer.instance_id ?? "")));
+    const localTable = formatPeerTable(peers, sessionId, relations);
     // Cross-machine presence (ADR 0016): sessions on other machines (advisory).
     const peerTable = [localTable, formatRemoteMachines(coordRoot)].filter(Boolean).join("\n\n");
     if (agentName) {
@@ -35,13 +41,11 @@ export function renderSessionContext(opts) {
         // asserts the parent's name, claims, and task. When recorded fork lineage
         // (.name-history forked_from) names the parent, say so specifically — the
         // fork is about to read a transcript full of that exact name. Otherwise
-        // fall back to the generic clause, which needs no fork detection.
-        const forkParent = readForkParent(coordRoot, instanceId);
-        const authority = forkParent?.name
-            ? `This conversation was branched from agent-${forkParent.name}'s session: earlier context showing agent-${forkParent.name}'s name, task, or file claims belongs to the pre-fork session, not to you.`
-            : forkParent
-                ? `This conversation was branched from another session (${forkParent.instance_id}); any agent name in earlier context belongs to that session, not to you.`
-                : "Any different agent name in earlier context was inherited from another session; this one is authoritative.";
+        // fall back to the generic clause, which needs no fork detection. A live
+        // parent is the dangerous case (2026-10-07: a fork read its running
+        // parent as its own earlier self and offered to close it), so the notice
+        // names what the parent is doing and forbids ending it.
+        const authority = forkAuthorityClause(forkParent, forkState?.fork === true, parentRow);
         const selfLine = `You are agent-${agentName}${suffix}. ${authority}`;
         messages.push(peerTable ? `${selfLine}\n\n${peerTable}` : selfLine);
     }
@@ -151,13 +155,48 @@ function formatRemoteMachines(coordRoot) {
 function readActivePeers(coordRoot, selfInstanceId) {
     return readLiveCoordinationRows(coordRoot).filter((heartbeat) => heartbeat.instance_id && heartbeat.instance_id !== selfInstanceId);
 }
+const DO_NOT_END = "Do not end, release, or finalize that session unless the operator explicitly tells you to.";
+function forkAuthorityClause(parent, fork, parentRow) {
+    if (parent?.name && parentRow) {
+        const files = parentRow.files_touched ?? [];
+        const task = parentRow.task ? ` on "${parentRow.task.slice(0, 80)}"` : "";
+        const holds = files.length > 0
+            ? ` and holds ${files.length} file${files.length === 1 ? "" : "s"} (${fmtFileList(files)})`
+            : "";
+        const owned = files.length > 0
+            ? parentRow.task
+                ? "That name, task, and those files"
+                : "That name and those files"
+            : parentRow.task
+                ? "That name and task"
+                : "That name";
+        return (`This conversation was forked from agent-${parent.name}, which is still running as a separate session${task}${holds}. ` +
+            `${owned} belong${owned === "That name" ? "s" : ""} to agent-${parent.name}, not to you. ${DO_NOT_END}`);
+    }
+    if (parent?.name) {
+        return `This conversation was branched from agent-${parent.name}'s session: earlier context showing agent-${parent.name}'s name, task, or file claims belongs to the pre-fork session, not to you.`;
+    }
+    if (parent) {
+        return `This conversation was branched from another session (${parent.instance_id}); any agent name in earlier context belongs to that session, not to you.`;
+    }
+    if (fork) {
+        return `This conversation was forked from another session, which may still be running. Any agent name, task, or file claim in earlier context belongs to that session, not to you. ${DO_NOT_END}`;
+    }
+    return "Any different agent name in earlier context was inherited from another session; this one is authoritative.";
+}
+function fmtFileList(files) {
+    const sorted = [...files].sort();
+    return sorted.length <= 3
+        ? sorted.join(", ")
+        : `${sorted.slice(0, 3).join(", ")}, +${sorted.length - 3} more`;
+}
 /**
  * Renders the peer table as
  * two subsections: "Other agent groups active" (blocking) and "Your group"
  * (subagents/siblings, no mutual block). Folds transient subagents' files
  * into their parent session.
  */
-function formatPeerTable(peers, mySessionId) {
+function formatPeerTable(peers, mySessionId, relations = new Map()) {
     if (peers.length === 0)
         return "";
     const nowSec = Math.floor(Date.now() / 1000);
@@ -174,9 +213,13 @@ function formatPeerTable(peers, mySessionId) {
         .map((p) => {
         const folded = fold[p.instance_id ?? ""] ?? [];
         const display = Array.from(new Set([...(p.files_touched ?? []), ...folded])).sort();
-        return { ...p, display_files: display };
+        const relation = relations.get(p.instance_id ?? "");
+        return { ...p, display_files: display, ...(relation ? { relation } : {}) };
     });
-    const blocking = rows.filter((p) => p.session_id !== mySessionId).sort(byStartedAt);
+    // Related sessions sort first so the parent never hides in "+N more".
+    const blocking = rows
+        .filter((p) => p.session_id !== mySessionId)
+        .sort((a, b) => Number(!!b.relation) - Number(!!a.relation) || byStartedAt(a, b));
     const group = rows.filter((p) => p.session_id === mySessionId).sort(byStartedAt);
     const sections = [];
     const blockingSection = renderSubtable(blocking, "Other agent groups active (their files block you):", nowSec);
@@ -204,7 +247,8 @@ function formatRow(r, nowSec) {
     const reason = lifecycle === "blocked" && r.task_state_reason ? `: ${r.task_state_reason.slice(0, 80)}` : "";
     const ageFrom = fmtAge(nowSec - parseIsoSec(r.started_at));
     const filesPart = fmtFiles(r.display_files);
-    return `  - agent-${r.name ?? "unknown"}${taskPart}   (activity=${activity}, lifecycle=${lifecycle}${reason}, ${ageFrom}, ${filesPart})`;
+    const relation = r.relation ? ` [${r.relation}]` : "";
+    return `  - agent-${r.name ?? "unknown"}${relation}${taskPart}   (activity=${activity}, lifecycle=${lifecycle}${reason}, ${ageFrom}, ${filesPart})`;
 }
 function fmtFiles(files) {
     if (files.length === 0)

package/dist/core/agents/state/names.d.ts

@@ -43,13 +43,20 @@ export interface NameHistoryRow {
     ts: string;
     /** Durable persona UUID. Present after `agents identity assume`. */
     agent_id?: string;
-    /** Audit marker distinguishing an explicit role adoption from pool assignment. */
-    source?: "pool" | "identity.assume";
+    /** Audit marker distinguishing an explicit role adoption from pool assignment,
+     * and a lineage row appended after the name was already assigned. */
+    source?: "pool" | "identity.assume" | "fork.detected";
     previous_name?: string;
     /** Instance this session was forked/branched from (recorded fork lineage).
      * Stamped only on the row that first assigns this instance, when the adapter
      * layer detected or supplied a parent conversation. */
     forked_from?: string;
+    /** The adapter declared or inherited-history proved this instance is a fork,
+     * even when its parent could not be resolved yet. */
+    fork?: true;
+    /** Fork detection has run against this instance's transcript; the tool-path
+     * heal skips instances carrying it so the scan runs once per instance. */
+    fork_checked?: true;
 }
 /**
  * Resolve (name, kind) for an existing owner without consuming a counter
@@ -112,10 +119,43 @@ export declare function readLiveNames(coordRoot: string, opts: {
 export declare function assignName(coordRoot: string, instanceId: string, kind: NameKind, opts: {
     freshnessSecs: number;
     forkedFrom?: string;
+    fork?: boolean;
+    forkChecked?: boolean;
     nowMs?: number;
 }): string;
+export interface ForkState {
+    /** True when the instance is a recorded fork, parent known or not. */
+    fork: boolean;
+    /** Detection already ran for this instance. */
+    checked: boolean;
+    parent: {
+        instance_id: string;
+        name: string | null;
+    } | null;
+}
+/** Recorded fork state for <instanceId>, or null when it has no history row. */
+export declare function readForkState(coordRoot: string, instanceId: string): ForkState | null;
+/**
+ * Record fork detection that ran after the instance was already named (the
+ * tool-path heal). Appends a copy of the latest identity row, so the name,
+ * kind, and persona are unchanged, plus `fork_checked` and any lineage found.
+ * A no-op for an instance with no history row or one already checked.
+ */
+export declare function recordForkDetection(coordRoot: string, instanceId: string, detection: {
+    fork: boolean;
+    forkedFrom?: string;
+}): boolean;
+/**
+ * Peer labels for recorded fork relations, keyed by instance id: this
+ * session's fork parent and its direct forks. `liveIds` marks which of them
+ * are running, so a fork can tell its live parent from its own earlier self.
+ */
+export declare function forkRelationLabels(coordRoot: string, instanceId: string, liveIds: Set<string>): Map<string, string>;
+/** Instance ids recorded as direct forks of <instanceId>. */
+export declare function readForkChildren(coordRoot: string, instanceId: string): Set<string>;
 /** One step of recorded fork lineage: the latest row for <instanceId> that
- * carries `forked_from` (latest-row-wins, matching resolveName). */
+ * carries `forked_from`. Later rows without lineage (an identity assumption)
+ * do not erase it: a session never stops being a fork. */
 export declare function readForkParent(coordRoot: string, instanceId: string): {
     instance_id: string;
     name: string | null;

package/dist/core/agents/state/names.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/names.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAYH,qBAAqB;AACrB,eAAO,MAAM,WAAW,85EA+Qd,CAAC;AAMX,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAE/E,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,oEAAoE;IACpE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;2DAEuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAsCD;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA4B5D;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACrE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,QAAoB,GACzB,oBAAoB,CAoBtB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9C,GAAG,CAAC,MAAM,CAAC,CA4Bb;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACnE,MAAM,CA4CR;AAED;oEACoE;AACpE,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAUrD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,KAAK,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAYrD"}
+{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/names.ts"],"names":[],"mappings":"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"}

package/dist/core/agents/state/names.js

@@ -496,19 +496,103 @@ export function assignName(coordRoot, instanceId, kind, opts) {
         kind,
         source: "pool",
         ...(forkedFrom && forkedFrom !== instanceId ? { forked_from: forkedFrom } : {}),
+        ...(opts.fork || (forkedFrom && forkedFrom !== instanceId) ? { fork: true } : {}),
+        ...(opts.forkChecked ? { fork_checked: true } : {}),
         ts: new Date().toISOString().replace(/\.\d{3}Z$/, "Z"),
     });
     return name;
 }
+/** Recorded fork state for <instanceId>, or null when it has no history row. */
+export function readForkState(coordRoot, instanceId) {
+    const history = readHistory(coordRoot);
+    let seen = false;
+    let fork = false;
+    let checked = false;
+    let parentId;
+    for (const row of history) {
+        if (row.instance_id !== instanceId)
+            continue;
+        seen = true;
+        if (row.fork || row.forked_from)
+            fork = true;
+        if (row.fork_checked)
+            checked = true;
+        if (row.forked_from && row.forked_from !== instanceId)
+            parentId = row.forked_from;
+    }
+    if (!seen)
+        return null;
+    const parent = parentId
+        ? { instance_id: parentId, name: resolveName(coordRoot, parentId)?.name ?? null }
+        : null;
+    return { fork, checked, parent };
+}
+/**
+ * Record fork detection that ran after the instance was already named (the
+ * tool-path heal). Appends a copy of the latest identity row, so the name,
+ * kind, and persona are unchanged, plus `fork_checked` and any lineage found.
+ * A no-op for an instance with no history row or one already checked.
+ */
+export function recordForkDetection(coordRoot, instanceId, detection) {
+    const history = readHistory(coordRoot);
+    let latest;
+    for (const row of history) {
+        if (row.instance_id !== instanceId)
+            continue;
+        if (row.fork_checked)
+            return false;
+        latest = row;
+    }
+    if (!latest)
+        return false;
+    const forkedFrom = detection.forkedFrom && detection.forkedFrom !== instanceId ? detection.forkedFrom : undefined;
+    appendHistory(coordRoot, {
+        instance_id: instanceId,
+        name: latest.name,
+        kind: latest.kind,
+        ...(latest.agent_id ? { agent_id: latest.agent_id } : {}),
+        source: "fork.detected",
+        ...(forkedFrom ? { forked_from: forkedFrom } : {}),
+        ...(detection.fork || forkedFrom || latest.fork ? { fork: true } : {}),
+        fork_checked: true,
+        ts: new Date().toISOString().replace(/\.\d{3}Z$/, "Z"),
+    });
+    return true;
+}
+/**
+ * Peer labels for recorded fork relations, keyed by instance id: this
+ * session's fork parent and its direct forks. `liveIds` marks which of them
+ * are running, so a fork can tell its live parent from its own earlier self.
+ */
+export function forkRelationLabels(coordRoot, instanceId, liveIds) {
+    const out = new Map();
+    const parent = readForkParent(coordRoot, instanceId);
+    if (parent) {
+        out.set(parent.instance_id, liveIds.has(parent.instance_id) ? "your fork parent, live" : "your fork parent");
+    }
+    for (const child of readForkChildren(coordRoot, instanceId))
+        out.set(child, "your fork");
+    return out;
+}
+/** Instance ids recorded as direct forks of <instanceId>. */
+export function readForkChildren(coordRoot, instanceId) {
+    const out = new Set();
+    for (const row of readHistory(coordRoot)) {
+        if (row.forked_from === instanceId && row.instance_id !== instanceId)
+            out.add(row.instance_id);
+    }
+    return out;
+}
 /** One step of recorded fork lineage: the latest row for <instanceId> that
- * carries `forked_from` (latest-row-wins, matching resolveName). */
+ * carries `forked_from`. Later rows without lineage (an identity assumption)
+ * do not erase it: a session never stops being a fork. */
 export function readForkParent(coordRoot, instanceId) {
     const history = readHistory(coordRoot);
     for (let i = history.length - 1; i >= 0; i--) {
         const row = history[i];
-        if (row.instance_id !== instanceId)
+        if (row.instance_id !== instanceId || !row.forked_from)
             continue;
-        if (!row.forked_from)
+        if (row.forked_from === instanceId)
             return null;
         const parent = resolveName(coordRoot, row.forked_from);
         return { instance_id: row.forked_from, name: parent?.name ?? null };

package/dist/core/events/v3/support-storage/pack-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pack-reader.d.ts","sourceRoot":"","sources":["../../../../../src/core/events/v3/support-storage/pack-reader.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,0BAA0B,EAC/B,KAAK,wBAAwB,EAI9B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,+BACf,SAAQ,IAAI,CAAC,wBAAwB,EAAE,gBAAgB,CAAC;IACxD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,0BAA0B,CAAC;IACrC,OAAO,EAAE,+BAA+B,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,0BAA0B,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAUD,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC,0BAA0B,CAAC,CAarC;AAED,4FAA4F;AAC5F,wBAAuB,+BAA+B,CACpD,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,cAAc,CAAC,+BAA+B,CAAC,CAGjD;AA2GD,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC,2BAA2B,CAAC,CAWtC;AAED,yFAAyF;AACzF,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC,0BAA0B,CAAC,CAarC;AAED,0FAA0F;AAC1F,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BhE"}
+{"version":3,"file":"pack-reader.d.ts","sourceRoot":"","sources":["../../../../../src/core/events/v3/support-storage/pack-reader.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,KAAK,0BAA0B,EAC/B,KAAK,wBAAwB,EAI9B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,+BACf,SAAQ,IAAI,CAAC,wBAAwB,EAAE,gBAAgB,CAAC;IACxD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,0BAA0B,CAAC;IACrC,OAAO,EAAE,+BAA+B,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,0BAA0B,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAUD,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC,0BAA0B,CAAC,CAarC;AAED,4FAA4F;AAC5F,wBAAuB,+BAA+B,CACpD,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,cAAc,CAAC,+BAA+B,CAAC,CAGjD;AAoGD,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC,2BAA2B,CAAC,CAWtC;AAED,yFAAyF;AACzF,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC,0BAA0B,CAAC,CAarC;AAED,0FAA0F;AAC1F,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,MAAM,GAAE,wBAA6B,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BhE"}

package/dist/core/events/v3/support-storage/pack-reader.js

@@ -1,7 +1,9 @@
 import { createHash } from "node:crypto";
-import { constants, createReadStream } from "node:fs";
+import { constants } from "node:fs";
 import { lstat, mkdir, open, realpath, rm, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, relative, resolve } from "node:path";
+import { Readable } from "node:stream";
+import { finished } from "node:stream/promises";
 import { StringDecoder } from "node:string_decoder";
 import { createGunzip, createInflateRaw } from "node:zlib";
 import { stateDirMode, stateFileMode } from "../../../storage/modes.js";
@@ -44,18 +46,12 @@ async function* streamEventV3SupportPackRecordsForManifest(manifestPath, manifes
             throw new Error("event_v3_support_payload_length_mismatch");
         if (payloadStat.size > bounded.max_payload_bytes)
             throw new Error("event_v3_support_payload_too_large");
-        if ((await hashHandle(payloadPath, payloadHandle)) !== manifest.payload.digest) {
+        if ((await hashHandle(payloadHandle)) !== manifest.payload.digest) {
             throw new Error("event_v3_support_payload_digest_mismatch");
         }
         limits.fault?.("after_payload_digest", payloadPath);
-        await assertCanonicalSingleGzipMember(payloadPath, payloadHandle, payloadStat.size, bounded.max_decompressed_bytes);
+        await assertCanonicalSingleGzipMember(payloadHandle, payloadStat.size, bounded.max_decompressed_bytes);
         const gunzip = createGunzip();
-        const source = createReadStream(payloadPath, {
-            fd: payloadHandle.fd,
-            autoClose: false,
-            start: 0,
-        });
-        source.pipe(gunzip);
         const decoder = new StringDecoder("utf8");
         let pending = "";
         let decompressedBytes = 0;
@@ -64,7 +60,7 @@ async function* streamEventV3SupportPackRecordsForManifest(manifestPath, manifes
         let priorPath;
         const entries = [];
         const seen = new Set();
-        for await (const current of gunzip) {
+        for await (const current of decompressHandle(payloadHandle, 0, gunzip)) {
             const chunk = current;
             decompressedBytes += chunk.length;
             if (decompressedBytes > bounded.max_decompressed_bytes) {
@@ -176,20 +172,51 @@ export async function unpackEventV3SupportPack(manifestPath, destination, limits
         throw error;
     }
 }
-async function hashHandle(path, handle) {
+async function hashHandle(handle) {
     const hash = createHash("sha256");
-    const stream = createReadStream(path, { fd: handle.fd, autoClose: false, start: 0 });
-    for await (const current of stream)
+    for await (const current of handleChunks(handle, 0))
         hash.update(current);
     return `sha256:${hash.digest("hex")}`;
 }
+async function* handleChunks(handle, position) {
+    while (true) {
+        const buffer = Buffer.alloc(64 * 1024);
+        const { bytesRead } = await handle.read(buffer, 0, buffer.length, position);
+        if (bytesRead === 0)
+            return;
+        position += bytesRead;
+        yield buffer.subarray(0, bytesRead);
+    }
+}
+async function* decompressHandle(handle, start, decoder) {
+    const source = Readable.from(handleChunks(handle, start));
+    // Observe failures immediately, then settle source reads before the caller
+    // can close and reuse the verified handle, including on early rejection.
+    const completed = finished(source, { cleanup: true }).then(() => undefined, (error) => error);
+    source.once("error", (error) => decoder.destroy(error));
+    source.pipe(decoder);
+    try {
+        for await (const chunk of decoder)
+            yield chunk;
+        source.unpipe(decoder);
+        source.resume();
+        const error = await completed;
+        if (error)
+            throw error;
+    }
+    finally {
+        source.destroy();
+        decoder.destroy();
+        await completed;
+    }
+}
 async function realDirectory(path) {
     const stat = await lstat(path);
     if (!stat.isDirectory() || stat.isSymbolicLink())
         throw new Error("event_v3_support_pack_root_invalid");
     return realpath(path);
 }
-async function assertCanonicalSingleGzipMember(path, handle, payloadBytes, maximumDecompressedBytes) {
+async function assertCanonicalSingleGzipMember(handle, payloadBytes, maximumDecompressedBytes) {
     if (payloadBytes < 18)
         throw new Error("event_v3_support_gzip_truncated");
     const header = Buffer.alloc(10);
@@ -203,9 +230,8 @@ async function assertCanonicalSingleGzipMember(path, handle, payloadBytes, maxim
         throw new Error("event_v3_support_gzip_header_noncanonical");
     }
     const inflate = createInflateRaw();
-    createReadStream(path, { fd: handle.fd, autoClose: false, start: 10 }).pipe(inflate);
     let decompressed = 0;
-    for await (const current of inflate) {
+    for await (const current of decompressHandle(handle, 10, inflate)) {
         decompressed += current.length;
         if (decompressed > maximumDecompressedBytes) {
             inflate.destroy();