harnery 0.31.0 → 0.31.2

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

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/commands/agents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAeH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA0E1E;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,CAErF;AAgCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,EACtB,cAAc,CAAC,EAAE,qBAAqB,GACrC,IAAI,CA+PN;AAyJD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAyO7D;AAwqBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EAAE,GACzB;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKvD"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/commands/agents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAeH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA2E1E;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,CAErF;AAsED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,EACtB,cAAc,CAAC,EAAE,qBAAqB,GACrC,IAAI,CA+PN;AAyJD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAyO7D;AA2sBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EAAE,GACzB;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKvD"}

package/dist/commands/agents.js

@@ -16,6 +16,7 @@ import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { basename, join, resolve } from "node:path";
+import { coordBinPath } from "../core/agents/coord-bin.js";
 import { readStreamTailBounded } from "../core/agents/events/consume.js";
 import { emitCanonical, monorepoRoot, normalizeAdapter, readHeartbeat, resolveOwner, resolveOwnerBySessionEnv, resolveOwnerWithSource, } from "../core/agents/index.js";
 import { coordFreshnessSeconds, resolveBinName } from "../core/config.js";
@@ -56,6 +57,41 @@ const SUBAGENT_NOTE = "Bash identity is process-level in v1; if you're running i
 export function coordHelperOpts(root) {
     return { cwd: root, env: { ...process.env, HARNERY_COORD_ROOT_OVERRIDE: root } };
 }
+/**
+ * Resolve the bundled `agent-coord` helper, or exit with an error that names the
+ * problem. Every heartbeat mutation goes through that binary, so a caller who
+ * cannot find it has nothing useful to do — but it has to SAY so, because the
+ * alternative was spawning a path that did not exist and then crashing on the
+ * result (see `spawnFailureMessage`).
+ */
+function agentCoordOrExit(root) {
+    const binary = coordBinPath("agent-coord", root);
+    if (!binary) {
+        emit.error({
+            code: "coord_helper_missing",
+            message: `agent-coord helper not found for coord root ${root}; reinstall or rebuild harnery`,
+        });
+        process.exit(1);
+    }
+    return binary;
+}
+/**
+ * Describe a failed `spawnSync` without assuming it ran.
+ *
+ * When the binary cannot be executed at all (ENOENT, EACCES) node reports
+ * `status: null` AND `stderr: null`, so the obvious `result.stderr.trim()`
+ * threw "null is not an object" — replacing a legible "helper not found" with a
+ * crash that pointed at the wrong layer entirely. `error` carries the real
+ * cause on that path, so prefer it.
+ */
+function spawnFailureMessage(result, what) {
+    if (result.error)
+        return `${what}: ${result.error.message}`;
+    const stderr = result.stderr?.trim();
+    if (stderr)
+        return stderr;
+    return result.status === null ? `${what}: did not run` : `${what} exited ${result.status}`;
+}
 function formatPlatformLabel(platform) {
     if (platform === "cursor")
         return "Cursor";
@@ -537,7 +573,7 @@ function runWhoami(opts) {
     if (!hb) {
         emit.error({
             code: "no_heartbeat",
-            message: `pid-map resolved owner=${myOwner.slice(0, 8)} but no heartbeat exists`,
+            message: noHeartbeatMessage(myOwner),
         });
         process.exit(1);
     }
@@ -721,6 +757,42 @@ function normalizeKind(kind) {
         return "unknown";
     return kind;
 }
+/**
+ * The `no_heartbeat` diagnostic, quoting the owner id in FULL.
+ *
+ * This id is actionable: the reader's next move is `agents heal --kind
+ * heartbeat --owner <id>`, and heartbeats are keyed by the whole
+ * `instance_id` (`.harnery/active/<instance_id>.json`). An abbreviated id
+ * here reads as complete, so it gets copy-pasted into `--owner` and mints a
+ * heartbeat at a filename no reader resolves — an orphan that leaves the
+ * session looking unhealable. Abbreviate ids for display elsewhere, never in
+ * a message whose whole purpose is to hand the reader an id to pass back.
+ */
+function noHeartbeatMessage(owner) {
+    return `resolved owner=${owner} but no heartbeat exists at .harnery/active/${owner}.json`;
+}
+/**
+ * The instance_id of a live heartbeat that `prefix` strictly prefixes, or null.
+ *
+ * Used to recognize an abbreviated id handed back by a reader when the caller
+ * supplied no canonical id of their own. Ambiguity is treated as "no answer":
+ * two live sessions sharing the prefix means we cannot name the one intended,
+ * and refusing with the wrong id in the message would be worse than the orphan.
+ */
+function liveIdWithPrefix(root, prefix) {
+    const activeDir = resolve(root, ".harnery", "active");
+    if (!existsSync(activeDir))
+        return null;
+    const matches = new Set();
+    for (const file of readdirSync(activeDir)) {
+        if (!file.endsWith(".json"))
+            continue;
+        const id = file.slice(0, -".json".length);
+        if (id !== prefix && id.startsWith(prefix))
+            matches.add(id);
+    }
+    return matches.size === 1 ? matches.values().next().value : null;
+}
 async function runWatch(pollMs) {
     const root = monorepoRoot();
     if (!root) {
@@ -1012,8 +1084,8 @@ function ensureCursorSession(root) {
     const sessionId = cursorEnvSessionId();
     if (!sessionId)
         return;
-    const agentHook = resolve(root, "harnery", "bin", "agent-hook");
-    if (!existsSync(agentHook))
+    const agentHook = coordBinPath("agent-hook", root);
+    if (!agentHook)
         return;
     const payload = JSON.stringify({
         conversation_id: sessionId,
@@ -1060,7 +1132,7 @@ function runReleaseClaim(path) {
     let canonical = path;
     if (path.startsWith(`${root}/`))
         canonical = path.slice(root.length + 1);
-    const helper = resolve(root, "harnery", "bin", "agent-coord");
+    const helper = agentCoordOrExit(root);
     const result = spawnSync(helper, ["release-claim", myOwner, canonical], {
         encoding: "utf8",
         ...coordHelperOpts(root),
@@ -1068,7 +1140,7 @@ function runReleaseClaim(path) {
     if (result.status !== 0) {
         emit.error({
             code: "release_claim_failed",
-            message: result.stderr.trim() || `agent-coord exited ${result.status}`,
+            message: spawnFailureMessage(result, "agent-coord"),
         });
         process.exit(1);
     }
@@ -1106,7 +1178,7 @@ function runSetTask(task, opts) {
     const priorHb = readHeartbeat(myOwner);
     const firstOfSession = !priorHb?.task_updated_at;
     // Heartbeat mutation goes through agent-coord (atomic temp+rename).
-    const helper = resolve(root, "harnery", "bin", "agent-coord");
+    const helper = agentCoordOrExit(root);
     const result = spawnSync(helper, ["set-task", myOwner, task], {
         encoding: "utf8",
         ...coordHelperOpts(root),
@@ -1114,7 +1186,7 @@ function runSetTask(task, opts) {
     if (result.status !== 0) {
         emit.error({
             code: "set_task_failed",
-            message: result.stderr.trim() || `agent-coord exited ${result.status}`,
+            message: spawnFailureMessage(result, "agent-coord"),
         });
         process.exit(1);
     }
@@ -1232,7 +1304,7 @@ function runStatus(opts) {
     if (!hb) {
         emit.error({
             code: "no_heartbeat",
-            message: `pid-map resolved owner=${myOwner.slice(0, 8)} but no heartbeat exists`,
+            message: noHeartbeatMessage(myOwner),
         });
         process.exit(1);
     }
@@ -1241,7 +1313,7 @@ function runStatus(opts) {
     // populated for back-compat with consumers reading v1 directly. The stamp
     // goes through agent-coord (atomic write).
     try {
-        const helper = resolve(root, "harnery", "bin", "agent-coord");
+        const helper = agentCoordOrExit(root);
         spawnSync(helper, ["stamp-status-call", myOwner], {
             encoding: "utf8",
             timeout: 2000,
@@ -3025,6 +3097,41 @@ function runHeal(opts) {
         process.exit(1);
     }
     const action = kind === "pidmap" ? "heal-pidmap" : kind === "heartbeat" ? "heal-heartbeat" : "kill-heartbeat";
+    // Refuse to mint a heartbeat at a TRUNCATED owner id.
+    //
+    // Heartbeats are keyed by the whole instance_id, so healing at an
+    // abbreviated id writes `.harnery/active/<prefix>.json` while every reader
+    // (`status`, `set-task`, `whoami`) resolves `<instance_id>.json`. The heal
+    // reports success, the session stays broken, and an orphan file is left
+    // behind that the singleton fallback can then mis-resolve other callers to.
+    //
+    // A distinct instance_id (subagent, workflow child) is never a prefix of its
+    // own session_id, so a strict prefix is unambiguously an abbreviated id
+    // rather than a legitimately different owner. Only guard the create path: an
+    // existing heartbeat at `owner` means the id is real, whatever its shape.
+    //
+    // Two sources for the canonical id, because the reported failure arrives
+    // without `--session-id`: someone copies a truncated id out of a diagnostic
+    // and passes it as `--owner` alone. Comparing against `--session-id` alone
+    // therefore misses the exact path that produced the orphan; a live heartbeat
+    // whose instance_id this id is a prefix of settles it just as well, and is
+    // present in precisely the case that matters (the session the reader was
+    // trying to heal is registered, just not under the abbreviated name).
+    if (kind === "heartbeat" && !readHeartbeat(owner)) {
+        const canonical = opts.sessionId && opts.sessionId.trim() !== owner && opts.sessionId.trim().startsWith(owner)
+            ? opts.sessionId.trim()
+            : liveIdWithPrefix(root, owner);
+        if (canonical) {
+            const source = opts.sessionId?.trim() === canonical ? "--session-id" : "a live heartbeat";
+            emit.error({
+                code: "truncated_owner",
+                message: `--owner ${owner} is a prefix of ${canonical} (${source}), and no heartbeat exists ` +
+                    `at .harnery/active/${owner}.json. Healing here would create a heartbeat no reader ` +
+                    `resolves. Re-run with --owner ${canonical}.`,
+            });
+            process.exit(1);
+        }
+    }
     // Build positional args. agent-coord's arg layout:
     //   heal-pidmap <instance_id> [<pid>]
     //   heal-heartbeat <instance_id> [<session_id>]
@@ -3035,8 +3142,8 @@ function runHeal(opts) {
     if (kind === "heartbeat" && opts.sessionId)
         helperArgs.push(opts.sessionId);
     // heal-pidmap / heal-heartbeat / kill-heartbeat are handled by the
-    // agent-coord binary at harnery/bin/agent-coord.
-    const helper = `${root}/harnery/bin/agent-coord`;
+    // bundled agent-coord binary.
+    const helper = agentCoordOrExit(root);
     const proc = spawnSync(helper, helperArgs, {
         encoding: "utf8",
         ...coordHelperOpts(root),
@@ -3044,7 +3151,7 @@ function runHeal(opts) {
     if (proc.status !== 0) {
         emit.error({
             code: "heal_failed",
-            message: proc.stderr?.trim() || `agent-coord ${action} exited non-zero`,
+            message: spawnFailureMessage(proc, `agent-coord ${action}`),
         });
         process.exit(1);
     }
@@ -3079,7 +3186,10 @@ function runHeal(opts) {
         ],
         meta: {
             kind,
-            helper: "harnery/bin/agent-coord",
+            // The path actually spawned, not a guess at the layout: the helper is
+            // resolved from harnery's own package location, which differs between a
+            // submodule, an installed dependency, and a standalone checkout.
+            helper,
         },
     });
     if (!opts.json) {
@@ -3793,7 +3903,7 @@ function runCouncilContribute(id, opts) {
         if (!myHb?.name) {
             emit.error({
                 code: "no_self_name",
-                message: `resolved owner ${myOwner.slice(0, 8)} has no name on heartbeat (pass --as <member> to override)`,
+                message: `resolved owner ${myOwner} has no name on heartbeat (pass --as <member> to override)`,
             });
             process.exit(1);
         }

package/dist/commands/grep.d.ts

@@ -60,7 +60,7 @@ type DecodeMode = "content" | "count" | "filesOnly" | "plainLines";
  * chunk-boundary tests. Record shapes (both engines, pinned by the parity
  * suite):
  *   content:    <path>NUL<line>:<text>LF
- *   count:      <path>NUL<count>LF
+ *   count:      <path>NUL<count>LF   (BSD grep ignores --null here: <path>:<count>LF)
  *   filesOnly:  <path>NUL            (NUL is the record terminator)
  *   plainLines: <path>LF             (files mode: rg --files / find)
  *

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

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

package/dist/commands/grep.js

@@ -546,7 +546,7 @@ function buildFindArgs(pattern, paths, opts, extraExcludeDirs) {
  * chunk-boundary tests. Record shapes (both engines, pinned by the parity
  * suite):
  *   content:    <path>NUL<line>:<text>LF
- *   count:      <path>NUL<count>LF
+ *   count:      <path>NUL<count>LF   (BSD grep ignores --null here: <path>:<count>LF)
  *   filesOnly:  <path>NUL            (NUL is the record terminator)
  *   plainLines: <path>LF             (files mode: rg --files / find)
  *
@@ -610,8 +610,25 @@ export class NulDecoder {
             return { file: normalizeFile(path), line: 0, text: "" };
         }
         const nul = record.indexOf(0);
-        if (nul < 0)
+        if (nul < 0) {
+            // BSD grep honours --null for content and -l records but IGNORES it under
+            // -c, emitting `<path>:<count>` where GNU grep emits `<path>NUL<count>`.
+            // Without this fallback every count row is dropped as unframed chatter, so
+            // `grep -c` returns nothing on a host whose only engine is BSD grep. The
+            // count is always a terminal run of digits, so a greedy match on the LAST
+            // colon recovers the path even when the path itself contains colons.
+            if (this.mode === "count") {
+                const bsd = /^(.*):(\d+)$/.exec(record.toString("utf8"));
+                if (!bsd)
+                    return null;
+                return {
+                    file: normalizeFile(bsd[1]),
+                    line: Number.parseInt(bsd[2], 10),
+                    text: "",
+                };
+            }
             return null; // not a NUL-framed record (stray engine chatter)
+        }
         const file = normalizeFile(record.subarray(0, nul).toString("utf8"));
         const rest = record.subarray(nul + 1).toString("utf8");
         if (this.mode === "count") {

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/commands/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAa1E,OAAO,EAYL,KAAK,WAAW,EAGjB,MAAM,wBAAwB,CAAC;AAgrBhC;;;;;;;;;;GAUG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAsE7F;AAgND,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,EACtB,YAAY,CAAC,EAAE,qBAAqB,GACnC,IAAI,CA4EN"}
+{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/commands/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAa1E,OAAO,EAYL,KAAK,WAAW,EAGjB,MAAM,wBAAwB,CAAC;AA+rBhC;;;;;;;;;;GAUG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAsE7F;AAgND,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,EACtB,YAAY,CAAC,EAAE,qBAAqB,GACnC,IAAI,CA4EN"}

package/dist/commands/tunnel.js

@@ -146,12 +146,28 @@ function sweepStrays(gatePort, alreadyKilled) {
     return (killByPattern(`gate\\.ts.*--port ${gatePort}( |$)`, alreadyKilled) +
         killByPattern(`--url http://localhost:${gatePort}( |$)`, alreadyKilled));
 }
-/** Ports currently bound by a LISTEN socket (best-effort via `ss`). */
+/**
+ * Ports currently bound by a LISTEN socket (best-effort, platform-dependent).
+ *
+ * `ss` (iproute2) is Linux-only. Without the lsof fallback this returns an empty
+ * set on macOS/BSD. That does not fail loudly. It reports every port as free, so
+ * `allocateGatePort` can hand out an occupied port and the reload port-release
+ * check becomes inert.
+ */
 function listeningPorts() {
     const ports = new Set();
-    const r = spawnSync("ss", ["-tlnH"], { encoding: "utf-8" });
-    if (r.status === 0 && typeof r.stdout === "string") {
-        for (const m of r.stdout.matchAll(/:(\d+)\s/g))
+    const ss = spawnSync("ss", ["-tlnH"], { encoding: "utf-8" });
+    if (ss.status === 0 && typeof ss.stdout === "string") {
+        for (const m of ss.stdout.matchAll(/:(\d+)\s/g))
+            ports.add(Number(m[1]));
+        return ports;
+    }
+    // Rows look like: `bun 123 user 4u IPv4 0x… 0t0 TCP 127.0.0.1:58055 (LISTEN)`.
+    // Status can be nonzero while stdout still holds usable rows (lsof reports a
+    // failure when any single process is unreadable), so judge it on the output.
+    const lsof = spawnSync("lsof", ["-nP", "-iTCP", "-sTCP:LISTEN"], { encoding: "utf-8" });
+    if (typeof lsof.stdout === "string") {
+        for (const m of lsof.stdout.matchAll(/:(\d+) \(LISTEN\)$/gm))
             ports.add(Number(m[1]));
     }
     return ports;

package/dist/core/agents/canonical-emit.d.ts

@@ -21,16 +21,11 @@ export interface CanonicalEmitInput {
 /**
  * Resolve the coord root for a canonical emit.
  *
- * Order: explicit `HARNERY_COORD_ROOT_OVERRIDE` → git-superproject-aware
- * `monorepoRoot()` (must actually carry `.harnery/`) → cwd walk (non-git
- * hosts). The git-aware step is load-bearing: a shell cd'd into a nested
- * directory that carries its own `.harnery/` (e.g. an embedded harnery
- * checkout) made the old cwd-walk resolve the NESTED root, from which
- * `<root>/harnery/bin/agent-coord` doesn't exist — so `agents status` /
- * `set-task` emits silently vanished and the Stop-hook's rule 1/3
- * (`state.status_checked` in-turn) blocked turns that had done the ritual.
- * Same bug class as the coordHelperOpts root-pin fix; this closes the
- * emitCanonical instance of it.
+ * Delegates to `resolveCoordRoot()`, the single resolution the hooks and the
+ * CLI's reads also use. An emit resolved any other way is an emit the Stop hook
+ * cannot see: the hook reads `state.status_checked` from the stream under ITS
+ * root, so a divergent emit root blocks rule 1/3 on a turn that did run
+ * `agents status`, and no sequence of CLI commands can satisfy it.
  */
 export declare function resolveEmitRoot(start?: string): string | null;
 export declare function emitCanonical(input: CanonicalEmitInput): void;

package/dist/core/agents/canonical-emit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canonical-emit.d.ts","sourceRoot":"","sources":["../../../src/core/agents/canonical-emit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,KAAK,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAW5E;AAID,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAsC7D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,OAAO,CAIjG"}
+{"version":3,"file":"canonical-emit.d.ts","sourceRoot":"","sources":["../../../src/core/agents/canonical-emit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAE5E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAsC7D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,OAAO,CAIjG"}

package/dist/core/agents/canonical-emit.js

@@ -9,44 +9,26 @@
  * latency budget per call.
  */
 import { spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { monorepoRoot } from "./coord-client.js";
+import { coordBinPath } from "./coord-bin.js";
+import { resolveCoordRoot } from "./coord-client.js";
 /**
  * Resolve the coord root for a canonical emit.
  *
- * Order: explicit `HARNERY_COORD_ROOT_OVERRIDE` → git-superproject-aware
- * `monorepoRoot()` (must actually carry `.harnery/`) → cwd walk (non-git
- * hosts). The git-aware step is load-bearing: a shell cd'd into a nested
- * directory that carries its own `.harnery/` (e.g. an embedded harnery
- * checkout) made the old cwd-walk resolve the NESTED root, from which
- * `<root>/harnery/bin/agent-coord` doesn't exist — so `agents status` /
- * `set-task` emits silently vanished and the Stop-hook's rule 1/3
- * (`state.status_checked` in-turn) blocked turns that had done the ritual.
- * Same bug class as the coordHelperOpts root-pin fix; this closes the
- * emitCanonical instance of it.
+ * Delegates to `resolveCoordRoot()`, the single resolution the hooks and the
+ * CLI's reads also use. An emit resolved any other way is an emit the Stop hook
+ * cannot see: the hook reads `state.status_checked` from the stream under ITS
+ * root, so a divergent emit root blocks rule 1/3 on a turn that did run
+ * `agents status`, and no sequence of CLI commands can satisfy it.
  */
 export function resolveEmitRoot(start = process.cwd()) {
-    const override = process.env.HARNERY_COORD_ROOT_OVERRIDE;
-    if (override)
-        return override;
-    // Memoized per start-dir: the session-tee middleware resolves once per
-    // emitted event, and monorepoRoot() spawns git — cache so a streaming
-    // command doesn't pay 1-3 subprocess spawns per output line.
-    if (cachedRoot && cachedRoot.start === start)
-        return cachedRoot.root;
-    const gitRoot = monorepoRoot();
-    const root = gitRoot && existsSync(join(gitRoot, ".harnery")) ? gitRoot : findRepoRoot(start);
-    cachedRoot = { start, root };
-    return root;
+    return resolveCoordRoot(start);
 }
-let cachedRoot;
 export function emitCanonical(input) {
     const root = resolveEmitRoot();
     if (!root)
         return;
-    const binary = resolve(root, "harnery", "bin", "agent-coord");
-    if (!existsSync(binary))
+    const binary = coordBinPath("agent-coord", root);
+    if (!binary)
         return;
     try {
         const args = [
@@ -97,14 +79,3 @@ export function normalizeAdapter(platform) {
         return "codex";
     return "claude-code";
 }
-function findRepoRoot(start) {
-    let dir = resolve(start);
-    while (true) {
-        if (existsSync(join(dir, ".harnery")))
-            return dir;
-        const parent = dirname(dir);
-        if (parent === dir)
-            return null;
-        dir = parent;
-    }
-}

package/dist/core/agents/coord-bin.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Locate harnery's own bundled coordination binaries (`agent-coord`,
+ * `agent-hook`, `harn`).
+ *
+ * Every coord-helper spawn used to build its path as
+ * `<coordRoot>/harnery/bin/<name>`, which only exists in one host layout: a
+ * superproject carrying harnery as a submodule at `harnery/`. That assumption
+ * was load-bearing in the worst way — because the path missed whenever the
+ * resolved root was anything else, root resolution itself was bent toward the
+ * git superproject to keep the spawns working, which is what split the CLI's
+ * root from the hook's and blocked end-of-turn rule 1/3. The same missing path
+ * also surfaced as a crash rather than an error: `spawnSync` on a nonexistent
+ * binary reports `status: null` and `stderr: null`, so a caller checking
+ * `status !== 0` then reading `stderr.trim()` threw "null is not an object".
+ *
+ * The binaries ship inside the harnery package, so the package is what knows
+ * where they are. Resolution walks up from this module to the package root,
+ * which covers every install shape: `src/` under Bun, `dist/` on Node, and
+ * `node_modules/harnery/`. The layout-specific paths remain as fallbacks so a
+ * host whose harnery copy is not the one executing (a vendored tree, a shim)
+ * still resolves.
+ */
+export type CoordBinName = "agent-coord" | "agent-hook" | "harn";
+/**
+ * Absolute path to one of harnery's bundled binaries, or null when no candidate
+ * exists on disk. Callers must handle null — a missing helper is a real state
+ * (a partially installed package) and silently spawning a nonexistent path is
+ * what produced the null-deref crash above.
+ */
+export declare function coordBinPath(name: CoordBinName, coordRoot?: string | null): string | null;
+/** Candidate paths for `name`, in resolution order. Exported for tests. */
+export declare function coordBinCandidates(name: CoordBinName, coordRoot?: string | null): string[];
+//# sourceMappingURL=coord-bin.d.ts.map

package/dist/core/agents/coord-bin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coord-bin.d.ts","sourceRoot":"","sources":["../../../src/core/agents/coord-bin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAOH,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,YAAY,GAAG,MAAM,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAKzF;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,EAAE,CAuB1F"}

package/dist/core/agents/coord-bin.js

@@ -0,0 +1,89 @@
+/**
+ * Locate harnery's own bundled coordination binaries (`agent-coord`,
+ * `agent-hook`, `harn`).
+ *
+ * Every coord-helper spawn used to build its path as
+ * `<coordRoot>/harnery/bin/<name>`, which only exists in one host layout: a
+ * superproject carrying harnery as a submodule at `harnery/`. That assumption
+ * was load-bearing in the worst way — because the path missed whenever the
+ * resolved root was anything else, root resolution itself was bent toward the
+ * git superproject to keep the spawns working, which is what split the CLI's
+ * root from the hook's and blocked end-of-turn rule 1/3. The same missing path
+ * also surfaced as a crash rather than an error: `spawnSync` on a nonexistent
+ * binary reports `status: null` and `stderr: null`, so a caller checking
+ * `status !== 0` then reading `stderr.trim()` threw "null is not an object".
+ *
+ * The binaries ship inside the harnery package, so the package is what knows
+ * where they are. Resolution walks up from this module to the package root,
+ * which covers every install shape: `src/` under Bun, `dist/` on Node, and
+ * `node_modules/harnery/`. The layout-specific paths remain as fallbacks so a
+ * host whose harnery copy is not the one executing (a vendored tree, a shim)
+ * still resolves.
+ */
+import { existsSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { coordEnv } from "../../lib/env.js";
+/**
+ * Absolute path to one of harnery's bundled binaries, or null when no candidate
+ * exists on disk. Callers must handle null — a missing helper is a real state
+ * (a partially installed package) and silently spawning a nonexistent path is
+ * what produced the null-deref crash above.
+ */
+export function coordBinPath(name, coordRoot) {
+    for (const candidate of coordBinCandidates(name, coordRoot)) {
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return null;
+}
+/** Candidate paths for `name`, in resolution order. Exported for tests. */
+export function coordBinCandidates(name, coordRoot) {
+    const candidates = [];
+    const push = (value) => {
+        if (value && !candidates.includes(value))
+            candidates.push(value);
+    };
+    // Explicit pin, for a host that relocates the binaries.
+    const pinned = coordEnv("BIN_DIR");
+    if (pinned)
+        push(join(pinned, name));
+    // The package this code is executing from.
+    const pkgRoot = packageRoot(name);
+    if (pkgRoot)
+        push(join(pkgRoot, "bin", name));
+    if (coordRoot) {
+        // Host layouts, in decreasing specificity: harnery as a submodule, as an
+        // installed dependency, or the coord root being harnery's own checkout.
+        push(resolve(coordRoot, "harnery", "bin", name));
+        push(resolve(coordRoot, "node_modules", "harnery", "bin", name));
+        push(resolve(coordRoot, "bin", name));
+    }
+    return candidates;
+}
+/**
+ * Walk up from this module to the directory holding `bin/<name>`.
+ *
+ * The walk keys on the binary itself rather than on `package.json`, because
+ * both `src/core/agents/` and the built `dist/core/agents/` sit under the same
+ * package root and only the binary's presence proves we found the right level.
+ */
+function packageRoot(name) {
+    let dir;
+    try {
+        dir = dirname(fileURLToPath(import.meta.url));
+    }
+    catch {
+        // No import.meta (a CJS transpile); the coordRoot fallbacks still apply.
+        return null;
+    }
+    for (let hop = 0; hop < 8; hop++) {
+        if (existsSync(join(dir, "bin", name)))
+            return dir;
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}