harnery 0.9.0 → 0.11.0

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

@@ -11,8 +11,38 @@
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
+import { monorepoRoot } 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.
+ */
+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;
+}
+let cachedRoot;
 export function emitCanonical(input) {
-    const root = findRepoRoot();
+    const root = resolveEmitRoot();
     if (!root)
         return;
     const binary = resolve(root, "harnery", "bin", "agent-coord");
@@ -38,11 +68,19 @@ export function emitCanonical(input) {
             args.push("--parent-session-id", input.parentSessionId);
         if (input.parentTurnId)
             args.push("--parent-turn-id", input.parentTurnId);
-        spawnSync(binary, args, {
+        // Pin cwd + HARNERY_COORD_ROOT_OVERRIDE so the child writes to the SAME
+        // stream we resolved, regardless of where the caller's shell is cd'd.
+        const result = spawnSync(binary, args, {
             encoding: "utf8",
             stdio: "ignore",
             timeout: 3000,
+            cwd: root,
+            env: { ...process.env, HARNERY_COORD_ROOT_OVERRIDE: root },
         });
+        if (result.error || result.status !== 0) {
+            const why = result.error ? result.error.message : `exit ${result.status}`;
+            process.stderr.write(`emitCanonical: ${input.type} emit failed (${why})\n`); // lint-ok-emission: soft-fail diagnostic promised by the module doc; silent drops cost blocked turns
+        }
     }
     catch {
         /* never break the caller */
@@ -59,7 +97,7 @@ export function normalizeHarness(platform) {
         return "codex";
     return "claude-code";
 }
-function findRepoRoot(start = process.cwd()) {
+function findRepoRoot(start) {
     let dir = resolve(start);
     while (true) {
         if (existsSync(join(dir, ".harnery")))

package/dist/core/agents/cli.js

@@ -188,7 +188,9 @@ async function handleStateAction(root, action, rest) {
             const task = args.join(" ");
             const hb = writer.setTask(root, owner, task);
             if (!hb) {
-                process.stderr.write(`agent-coord set-task: no heartbeat at .harnery/active/${owner}.json\n`);
+                // Name the RESOLVED root: when a nested .harnery/ shadows the real
+                // coordination home, the full path is what makes that diagnosable.
+                process.stderr.write(`agent-coord set-task: no heartbeat at ${root}/.harnery/active/${owner}.json\n`);
                 return 1;
             }
             process.stdout.write(`${JSON.stringify({ instance_id: owner, task: hb.task ?? null, cleared: !task })}\n`);
@@ -664,7 +666,7 @@ async function handleResolveName(root, rest) {
         process.stdout.write(`${JSON.stringify({ instance_id: owner, name: null, kind: null })}\n`);
         return 0;
     }
-    process.stdout.write(`${JSON.stringify({ instance_id: owner, name: resolved.name, kind: resolved.kind })}\n`);
+    process.stdout.write(`${JSON.stringify({ instance_id: owner, name: resolved.name, kind: resolved.kind, agent_id: resolved.agent_id ?? null })}\n`);
     return 0;
 }
 async function handleEmitEvent(root, rest) {

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;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAgCH,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;iDAC6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAqBnE"}
+{"version":3,"file":"prompt-context.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/render/prompt-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAiCH,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;iDAC6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAqBnE"}

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

@@ -26,6 +26,7 @@ import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync, } from "node:fs";
 import { join } from "node:path";
 import { coordEnv } from "../../../lib/env.js";
+import { readRemoteMachines } from "../../presence/index.js";
 import { formatPendingCouncils } from "./session-context.js";
 /**
  * Build the combined UserPromptSubmit additionalContext string. Returns "" when
@@ -132,7 +133,10 @@ function computePeerTableIfChanged(coordRoot, selfInstanceId, selfSessionIdFallb
             continue;
         peers.push(hb);
     }
-    if (peers.length === 0)
+    // Cross-machine presence (ADR 0016): sessions on other machines, from the
+    // locally-fetched presence refs. Advisory (no claim blocking in v1).
+    const remote = readRemoteMachinesSafe(coordRoot);
+    if (peers.length === 0 && remote.length === 0)
         return "";
     // Build hash basis: sorted-by-instance_id projection of semantically-relevant fields.
     const basis = peers
@@ -146,19 +150,56 @@ function computePeerTableIfChanged(coordRoot, selfInstanceId, selfSessionIdFallb
         platform: p.platform ?? null,
     }))
         .sort((a, b) => (a.instance_id ?? "").localeCompare(b.instance_id ?? ""));
-    const newHash = sha256Hex16(JSON.stringify(basis));
+    // Remote basis: machine + per-agent identity/task/files (published_at is
+    // excluded — a keepalive re-publish alone shouldn't re-emit the table).
+    const remoteBasis = remote.map((m) => ({
+        machine: m.machine,
+        agents: m.agents.map((a) => ({
+            instance_id: a.instance_id,
+            name: a.name ?? null,
+            task: a.task ?? null,
+            files_touched: Array.from(a.files_touched ?? []).sort(),
+        })),
+    }));
+    const newHash = sha256Hex16(JSON.stringify({ local: basis, remote: remoteBasis }));
     const hashFile = join(coordRoot, ".harnery", `.last-peer-hash.${selfInstanceId}`);
     const oldHash = safeRead(hashFile);
     if (oldHash && oldHash === newHash)
         return "";
     // Render peer table via the same formatter used at SessionStart.
-    const table = formatPeerTable(peers, mySessionId);
+    const local = formatPeerTable(peers, mySessionId);
+    const remoteTable = formatRemoteTable(remote);
+    const table = [local, remoteTable].filter(Boolean).join("\n\n");
     if (!table)
         return "";
     // Persist hash atomically (temp + rename, same convention as other coord writes).
     writeHashFile(hashFile, newHash);
     return table;
 }
+/** readRemoteMachines with a local failure guard (rendering must never throw). */
+function readRemoteMachinesSafe(coordRoot) {
+    try {
+        return readRemoteMachines(coordRoot);
+    }
+    catch {
+        return [];
+    }
+}
+/** Render sessions on other machines (presence transport) as a subtable. */
+function formatRemoteTable(remote) {
+    if (remote.length === 0)
+        return "";
+    const nowSec = Math.floor(Date.now() / 1000);
+    const lines = [];
+    for (const m of remote) {
+        for (const a of m.agents.slice(0, 10)) {
+            lines.push(formatRow({ ...a, display_files: Array.from(a.files_touched ?? []).sort() }, nowSec).replace(/^ {2}- (agent-[^ ]+)/, `  - $1 @${m.machine}`));
+        }
+    }
+    if (lines.length === 0)
+        return "";
+    return `Sessions on other machines (advisory, via presence refs):\n${lines.join("\n")}`;
+}
 function computeCouncilPendingIfChanged(coordRoot, selfInstanceId, agentName) {
     const councilsDir = join(coordRoot, ".harnery", "councils");
     if (!existsSync(councilsDir))

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;AAoB1E,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,CA+D7D;AAwHD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBvD;AAwDD;;;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;AAqB1E,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,CAiE7D;AA+ID;;;;;;;;;;;;;GAaG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBvD;AAwDD;;;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

@@ -11,6 +11,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { resolveBinName, resolveHooksSetupHint } from "../../config.js";
 import { harneryVersion, loadHarnessWiring } from "../../hooks/harness/wiring.js";
+import { readRemoteMachines } from "../../presence/index.js";
 /**
  * Build the combined SessionStart systemMessage. Returns the additionalContext
  * string (or "" if there's nothing to say).
@@ -20,7 +21,9 @@ export function renderSessionContext(opts) {
     const messages = [];
     // 1. Self-name line + peer table (folded if peers present)
     const peers = readActivePeers(coordRoot, instanceId);
-    const peerTable = formatPeerTable(peers, sessionId);
+    const localTable = formatPeerTable(peers, sessionId);
+    // Cross-machine presence (ADR 0016): sessions on other machines (advisory).
+    const peerTable = [localTable, formatRemoteMachines(coordRoot)].filter(Boolean).join("\n\n");
     if (agentName) {
         const suffix = platformLabel ? ` (${platformLabel})` : "";
         const selfLine = `You are agent-${agentName}${suffix}.`;
@@ -72,6 +75,28 @@ export function renderSessionContext(opts) {
     }
     return messages.join("\n\n");
 }
+/** One-line-per-agent view of sessions on other machines (presence refs). */
+function formatRemoteMachines(coordRoot) {
+    try {
+        const remote = readRemoteMachines(coordRoot);
+        if (remote.length === 0)
+            return "";
+        const lines = [];
+        for (const m of remote) {
+            for (const a of m.agents.slice(0, 10)) {
+                const task = a.task ? ` "${a.task.slice(0, 60)}"` : "";
+                const files = a.files_touched?.length
+                    ? `holds: ${a.files_touched.slice(0, 3).join(", ")}${a.files_touched.length > 3 ? `, +${a.files_touched.length - 3} more` : ""}`
+                    : "nothing held";
+                lines.push(`  - agent-${a.name ?? a.instance_id.slice(0, 8)} @${m.machine}${task} (${files})`);
+            }
+        }
+        return `Sessions on other machines (advisory, via presence refs):\n${lines.join("\n")}`;
+    }
+    catch {
+        return "";
+    }
+}
 /** Read all peer heartbeats from .harnery/active/, excluding self. */
 function readActivePeers(coordRoot, selfInstanceId) {
     const out = [];

package/dist/core/agents/rules/commit-conflict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-conflict.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/rules/commit-conflict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAiBH,UAAU,QAAQ;IAChB,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;wEACoE;IACpE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,qFAAqF;IACrF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,8DAA8D;IAC9D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,mBAAmB,CAsGhG"}
+{"version":3,"file":"commit-conflict.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/rules/commit-conflict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAgBH,UAAU,QAAQ;IAChB,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;wEACoE;IACpE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,qFAAqF;IACrF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,8DAA8D;IAC9D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,mBAAmB,CAsGhG"}

package/dist/core/agents/rules/commit-conflict.js

@@ -22,8 +22,8 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { coordEnv } from "../../../lib/env.js";
-const DEFAULT_FRESHNESS_SECS = 600;
+import { coordFreshnessSeconds } from "../../config.js";
+import { instanceHasLivePid } from "../state/pidmap.js";
 export function evaluateCommit(coordRoot, req) {
     if (req.staged_paths.length === 0) {
         return {
@@ -36,7 +36,7 @@ export function evaluateCommit(coordRoot, req) {
         };
     }
     const peers = readActivePeers(coordRoot);
-    const cutoffMs = Date.now() - freshnessSecs() * 1000;
+    const cutoffMs = Date.now() - coordFreshnessSeconds(coordRoot) * 1000;
     const stagedSet = new Set(req.staged_paths);
     const gitlinkSet = new Set(req.staged_gitlinks ?? []);
     const conflicts = [];
@@ -166,33 +166,7 @@ function isHolderSelfAttributed(coordRoot, holderId, stagedSet, peers) {
     return true;
 }
 function holderHasLiveForeignPid(coordRoot, holderId) {
-    const dir = join(coordRoot, ".harnery", "pid-map");
-    if (!existsSync(dir))
-        return false;
-    for (const f of readdirSync(dir)) {
-        let row = "";
-        try {
-            row = readFileSync(join(dir, f), "utf8").trim();
-        }
-        catch {
-            continue;
-        }
-        const owner = row.split("\t")[0]?.trim() ?? "";
-        if (owner !== holderId)
-            continue;
-        // Process still alive?
-        const pid = Number.parseInt(f, 10);
-        if (!Number.isFinite(pid))
-            continue;
-        try {
-            process.kill(pid, 0); // signal 0 = liveness probe
-            return true; // live foreign pid found
-        }
-        catch {
-            // ESRCH (no such process): pid-map entry is stale, skip
-        }
-    }
-    return false;
+    return instanceHasLivePid(coordRoot, holderId);
 }
 function isPathCleanInHead(coordRoot, relPath) {
     // Path is tracked + diff-clean against HEAD = "already committed, holder
@@ -230,13 +204,6 @@ function readActivePeers(coordRoot) {
     }
     return out;
 }
-function freshnessSecs() {
-    const raw = coordEnv("AGENT_FRESHNESS");
-    if (!raw)
-        return DEFAULT_FRESHNESS_SECS;
-    const n = Number.parseInt(raw, 10);
-    return Number.isFinite(n) && n > 0 ? n : DEFAULT_FRESHNESS_SECS;
-}
 function shortName(peer) {
     if (peer.name && peer.name.length > 0)
         return `agent-${peer.name}`;

package/dist/core/agents/session-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-events.d.ts","sourceRoot":"","sources":["../../../src/core/agents/session-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AASH;;iFAEiF;AACjF,MAAM,MAAM,gBAAgB,GACxB,eAAe,GACf,QAAQ,GACR,aAAa,GACb,aAAa,GACb,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,cAAc,GACd,aAAa,GACb,WAAW,CAAC;AAEhB;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAwB1C;AAED,6EAA6E;AAC7E,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA8BjE;AAsGD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,IAAI,CAEN;AAED,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,SAAO,GAAG,MAAM,CAGxD"}
+{"version":3,"file":"session-events.d.ts","sourceRoot":"","sources":["../../../src/core/agents/session-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AASH;;iFAEiF;AACjF,MAAM,MAAM,gBAAgB,GACxB,eAAe,GACf,QAAQ,GACR,aAAa,GACb,aAAa,GACb,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,cAAc,GACd,aAAa,GACb,WAAW,CAAC;AAEhB;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAa1C;AAED,6EAA6E;AAC7E,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiBjE;AAsGD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,IAAI,CAEN;AAED,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,SAAO,GAAG,MAAM,CAGxD"}

package/dist/core/agents/session-events.js

@@ -8,10 +8,10 @@
  * middleware callers need no edits.
  */
 import { randomBytes } from "node:crypto";
-import { existsSync, readFileSync, statSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 // Kept dependency-light: vendored verbatim into a downstream consumer, so no coordEnv import.
-import { normalizeHarness } from "./canonical-emit.js";
+import { normalizeHarness, resolveEmitRoot } from "./canonical-emit.js";
 import { emit } from "./events/emit.js";
 /**
  * Resolved path of the ndjson sidecar file. Lives inside `.harnery/` so a
@@ -22,27 +22,15 @@ export function sessionEventsPath() {
     const explicit = process.env.HARNERY_OUTPUT_SESSION_EVENTS;
     if (explicit)
         return explicit;
-    // Walk up looking for an EXISTING .harnery/ directory; only match dirs
-    // (submodule .git is a file/gitlink, and CLAUDE.md / AGENTS.md can
-    // proliferate per-subdirectory in many monorepos, so neither is a safe
-    // anchor). Don't reintroduce CLAUDE.md / .git as anchors, which creates
+    // Superproject-aware root resolution (git first, cwd walk fallback) via
+    // resolveEmitRoot. A plain cwd walk here mis-anchored to a NESTED
+    // `.harnery/` when the shell sat inside a submodule carrying its own
+    // (e.g. an embedded harnery checkout), silently splitting the event
+    // stream. Don't reintroduce CLAUDE.md / .git as anchors, which creates
     // stray .harnery/ dirs under submodule subtrees.
-    let dir = process.cwd();
-    for (let i = 0; i < 10; i++) {
-        const candidate = resolve(dir, ".harnery");
-        try {
-            if (existsSync(candidate) && statSync(candidate).isDirectory()) {
-                return resolve(candidate, "session-events.ndjson");
-            }
-        }
-        catch {
-            /* keep walking */
-        }
-        const parent = dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
+    const root = resolveEmitRoot();
+    if (root)
+        return resolve(root, ".harnery", "session-events.ndjson");
     return resolve(process.env.HOME || "/tmp", ".harnery", "session-events.ndjson");
 }
 /** Random 8-char hex id for grouping output lines under a single command. */
@@ -60,28 +48,13 @@ export function newCmdId() {
 export function readLastIntent(instanceId) {
     if (!instanceId)
         return null;
-    // Walk up from cwd looking for .harnery/, same resolution as
-    // sessionEventsPath() (only match existing directories).
-    let dir = process.cwd();
-    let agentsDir = null;
-    for (let i = 0; i < 10; i++) {
-        const candidate = resolve(dir, ".harnery");
-        try {
-            if (existsSync(candidate) && statSync(candidate).isDirectory()) {
-                agentsDir = candidate;
-                break;
-            }
-        }
-        catch {
-            /* keep walking */
-        }
-        const parent = dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    if (!agentsDir)
+    // Same superproject-aware root resolution as sessionEventsPath(): the
+    // intent stamp is written by the PreToolUse hook into the SUPERPROJECT's
+    // .harnery/, so a nested-`.harnery/` cwd must not redirect the read.
+    const root = resolveEmitRoot();
+    if (!root)
         return null;
+    const agentsDir = resolve(root, ".harnery");
     const intentPath = resolve(agentsDir, `.last-intent.${instanceId}`);
     if (!existsSync(intentPath))
         return null;

package/dist/core/agents/state/heartbeat-projector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeat-projector.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/heartbeat-projector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+EAA+E;IAC/E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,oCAAoC;IACpC,OAAO,EAAE;QACP,cAAc,EAAE,CAAC,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;CACH;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,cAAc,EAAE,GAChC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;CAAE,CAoD9D;AAgXD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE3E"}
+{"version":3,"file":"heartbeat-projector.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/heartbeat-projector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+EAA+E;IAC/E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,oCAAoC;IACpC,OAAO,EAAE;QACP,cAAc,EAAE,CAAC,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;CACH;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,cAAc,EAAE,GAChC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;CAAE,CAoD9D;AAyXD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE3E"}

package/dist/core/agents/state/heartbeat-projector.js

@@ -92,8 +92,8 @@ function seed(ev, coordRoot) {
         if (resolved) {
             hb.name = resolved.name;
             hb.kind = resolved.kind;
-            if (resolved.kind === "subagent")
-                hb.agent_id = ev.instance_id;
+            hb.agent_id =
+                resolved.agent_id ?? (resolved.kind === "subagent" ? ev.instance_id : undefined);
         }
     }
     catch {
@@ -239,6 +239,15 @@ function apply(hb, ev, coordRoot) {
         case "state.status_checked":
             hb.last_status_at = ev.ts;
             break;
+        case "identity.assumed": {
+            const name = pickStr(d, "name");
+            const agentId = pickStr(d, "agent_id");
+            if (name)
+                hb.name = name;
+            if (agentId)
+                hb.agent_id = agentId;
+            break;
+        }
         case "state.presence_change": {
             const to = pickStr(d, "to");
             if (to === "mobile" || to === "office")

package/dist/core/agents/state/heartbeat-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeat-writer.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/heartbeat-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA6DH,MAAM,WAAW,SAAS;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAiBD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAQrF;AAeD,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAS7F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAKxF;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,SAAS,GAAG,IAAI,CAMlB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACX,SAAS,GAAG,IAAI,CAYlB;AAED,uEAAuE;AACvE,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,EAAE,CAsChG;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAS5E;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAuBnF;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,GACf,SAAS,GAAG,IAAI,CAqDlB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,SAAS,GAAG,IAAI,CAOlB"}
+{"version":3,"file":"heartbeat-writer.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/heartbeat-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA6DH,MAAM,WAAW,SAAS;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAiBD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAQrF;AAeD,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAS7F;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAKxF;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,SAAS,GAAG,IAAI,CAMlB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GACX,SAAS,GAAG,IAAI,CAYlB;AAED,uEAAuE;AACvE,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,EAAE,CAsChG;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAS5E;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAuBnF;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,GACf,SAAS,GAAG,IAAI,CAsDlB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,SAAS,GAAG,IAAI,CAOlB"}

package/dist/core/agents/state/heartbeat-writer.js

@@ -245,9 +245,9 @@ export function healHeartbeat(coordRoot, instanceId, sessionId, model, harness)
         if (resolved) {
             name = resolved.name;
             kind = resolved.kind;
-            // subagent kind: agent_id == instance_id. Else (session/transient): no id stamp.
-            if (resolved.kind === "subagent")
-                agentId = instanceId;
+            // An explicitly assumed session carries its durable persona UUID in
+            // name-history. Native subagents continue to use instance_id.
+            agentId = resolved.agent_id ?? (resolved.kind === "subagent" ? instanceId : "");
         }
     }
     catch {

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

@@ -8,14 +8,30 @@
  * Durable persistence: `.harnery/.name-history` (JSONL, one row per assignment)
  * + `.harnery/.name-counter` (current counter, atomic temp+rename).
  *
- * Recreation rule (mirrors v1):
- *   1. Own instance_id in name-history → (original name, original kind)
- *   2. session_id in name-history (owner != session) → (parent's name, "transient")
+ * Recreation rule:
+ *   1. Own instance_id in name-history → latest (name, kind, agent_id)
+ *   2. session_id in name-history (owner != session) → latest parent's
+ *      (name, agent_id) with kind="transient"
+ *
+ * Multiple rows for one instance are intentional. `identity assume` appends a
+ * new binding instead of rewriting history; readers therefore resolve from the
+ * end of the file. Older one-row histories retain their original behavior.
  *   3. Else: new assignment, consume a counter slot.
  */
 /** All 260 names. */
 export declare const COORD_NAMES: readonly ["Anna", "Bob", "Carlos", "Dalia", "Erika", "Fred", "Gemma", "Hank", "Imelda", "Jerry", "Kirk", "Lee", "Milton", "Nate", "Oscar", "Patty", "Quentin", "Rafael", "Sara", "Tony", "Ulrik", "Valerie", "Whitney", "Xander", "Yara", "Zara", "Adelaide", "Bertha", "Carmen", "Dorian", "Edna", "Francine", "Greta", "Helene", "Ines", "Joyce", "Karen", "Lorenzo", "Mindy", "Nadine", "Odette", "Paulette", "Quinn", "Rebekah", "Sean", "Tammy", "Ursula", "Vinson", "Wallace", "Xanthe", "Yusuf", "Zoe", "Alex", "Beatrice", "Cyrus", "Delia", "Ernesto", "Florence", "Gordon", "Hester", "Isaias", "Jenna", "Klaus", "Larry", "Maxine", "Nicholas", "Otto", "Peter", "Quill", "Renee", "Stella", "Theresa", "Umberto", "Virgil", "Willow", "Xavier", "Yolanda", "Zane", "Anita", "Bruno", "Cora", "Damon", "Edith", "Felix", "Gloria", "Holly", "Iris", "Jasper", "Kaia", "Linda", "Marco", "Nora", "Olive", "Petra", "Querida", "Roman", "Sebastian", "Tobias", "Una", "Vera", "Walter", "Xena", "Yusra", "Zelda", "Aaron", "Bonnie", "Caleb", "Daphne", "Elias", "Fiona", "Galileo", "Hugo", "Ian", "Jude", "Knox", "Leo", "Maya", "Nash", "Owen", "Paxton", "Quetzal", "Rosa", "Sage", "Talia", "Uri", "Vincent", "Wesley", "Ximena", "Yvette", "Zephyr", "Astrid", "Beau", "Celeste", "Dexter", "Ezra", "Fitz", "Genevieve", "Hadley", "Imogen", "Joaquin", "Kira", "Lila", "Mason", "Nila", "Olga", "Pearl", "Quincy", "Royce", "Sterling", "Trent", "Ulysses", "Violet", "Wynne", "Xerxes", "Yael", "Zinnia", "Amelia", "Bianca", "Cody", "Dahlia", "Esme", "Fern", "Greer", "Harriet", "Ivan", "Juno", "Kendrick", "Luther", "Margot", "Nigel", "Orion", "Phillip", "Quenby", "Reagan", "Sienna", "Tessa", "Uma", "Vesper", "Watson", "Xiomara", "Yuri", "Zoltan", "Andre", "Boris", "Cassidy", "Davis", "Evander", "Forrest", "Gibson", "Henry", "Irene", "Justus", "Kasper", "Lainey", "Miles", "Naomi", "Ophelia", "Phoebe", "Quark", "Rylie", "Saul", "Truman", "Ulrich", "Voss", "Winifred", "Xuxa", "Yvonne", "Zia", "Aria", "Brenda", "Crispin", "Dolores", "Estelle", "Felicity", "Goldie", "Hazel", "Ira", "Jovi", "Kestrel", "Lyric", "Mavis", "Nico", "Otis", "Percy", "Querubin", "Rhett", "Scout", "Tatum", "Unity", "Vivian", "Wyatt", "Xan", "Yancy", "Zev", "Atticus", "Barnaby", "Calliope", "Drake", "Eustace", "Foster", "Granger", "Hollis", "Indira", "Jericho", "Kaleb", "Logan", "Magnus", "Noor", "Oakley", "Posy", "Quito", "Rosalind", "Sloane", "Theron", "Upton", "Vance", "Wendell", "Xola", "Yann", "Zora"];
 export type NameKind = "session" | "subagent" | "transient";
+export interface NameHistoryRow {
+    instance_id: string;
+    name: string;
+    kind: NameKind;
+    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";
+    previous_name?: string;
+}
 /**
  * Resolve (name, kind) for an existing owner without consuming a counter
  * slot. Returns null if no history match found.
@@ -26,7 +42,26 @@ export type NameKind = "session" | "subagent" | "transient";
 export declare function resolveName(coordRoot: string, instanceId: string, sessionId?: string): {
     name: string;
     kind: NameKind;
+    agent_id?: string;
 } | null;
+export interface NameAssumptionResult {
+    changed: boolean;
+    previous: {
+        name: string;
+        kind: NameKind;
+        agent_id?: string;
+    } | null;
+    current: {
+        name: string;
+        kind: NameKind;
+        agent_id: string;
+    };
+}
+/**
+ * Append an explicit instance → durable-persona binding. Latest-row-wins makes
+ * this auditable and retry-safe without mutating prior assignment history.
+ */
+export declare function recordNameAssumption(coordRoot: string, instanceId: string, name: string, agentId: string, kind?: NameKind): NameAssumptionResult;
 /**
  * Assign a name to <instanceId> with the given <kind>. Counter-consuming when
  * the owner is new. Idempotent: returns existing name on resume.

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;;;;;;;;;;;;;;GAcG;AAKH,qBAAqB;AACrB,eAAO,MAAM,WAAW,y5EA+Qd,CAAC;AAMX,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;AA6C5D;;;;;;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,CAAA;CAAE,GAAG,IAAI,CAkBzC;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,CAqBxF"}
+{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/state/names.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,qBAAqB;AACrB,eAAO,MAAM,WAAW,y5EA+Qd,CAAC;AAMX,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;AAE5D,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;CACxB;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;;;GAGG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,CAsBxF"}

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

@@ -8,9 +8,14 @@
  * Durable persistence: `.harnery/.name-history` (JSONL, one row per assignment)
  * + `.harnery/.name-counter` (current counter, atomic temp+rename).
  *
- * Recreation rule (mirrors v1):
- *   1. Own instance_id in name-history → (original name, original kind)
- *   2. session_id in name-history (owner != session) → (parent's name, "transient")
+ * Recreation rule:
+ *   1. Own instance_id in name-history → latest (name, kind, agent_id)
+ *   2. session_id in name-history (owner != session) → latest parent's
+ *      (name, agent_id) with kind="transient"
+ *
+ * Multiple rows for one instance are intentional. `identity assume` appends a
+ * new binding instead of rewriting history; readers therefore resolve from the
+ * end of the file. Older one-row histories retain their original behavior.
  *   3. Else: new assignment, consume a counter slot.
  */
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -333,20 +338,53 @@ function appendHistory(coordRoot, row) {
  */
 export function resolveName(coordRoot, instanceId, sessionId) {
     const history = readHistory(coordRoot);
-    for (const row of history) {
+    for (let i = history.length - 1; i >= 0; i--) {
+        const row = history[i];
         if (row.instance_id === instanceId) {
-            return { name: row.name, kind: row.kind };
+            return {
+                name: row.name,
+                kind: row.kind,
+                ...(row.agent_id ? { agent_id: row.agent_id } : {}),
+            };
         }
     }
     if (sessionId && sessionId !== instanceId) {
-        for (const row of history) {
+        for (let i = history.length - 1; i >= 0; i--) {
+            const row = history[i];
             if (row.instance_id === sessionId) {
-                return { name: row.name, kind: "transient" };
+                return {
+                    name: row.name,
+                    kind: "transient",
+                    ...(row.agent_id ? { agent_id: row.agent_id } : {}),
+                };
             }
         }
     }
     return null;
 }
+/**
+ * Append an explicit instance → durable-persona binding. Latest-row-wins makes
+ * this auditable and retry-safe without mutating prior assignment history.
+ */
+export function recordNameAssumption(coordRoot, instanceId, name, agentId, kind = "session") {
+    const previous = resolveName(coordRoot, instanceId);
+    const current = { name, kind, agent_id: agentId };
+    if (previous?.name === current.name &&
+        previous.kind === current.kind &&
+        previous.agent_id === current.agent_id) {
+        return { changed: false, previous, current };
+    }
+    appendHistory(coordRoot, {
+        instance_id: instanceId,
+        name,
+        kind,
+        agent_id: agentId,
+        source: "identity.assume",
+        previous_name: previous?.name,
+        ts: new Date().toISOString().replace(/\.\d{3}Z$/, "Z"),
+    });
+    return { changed: true, previous, current };
+}
 /**
  * Assign a name to <instanceId> with the given <kind>. Counter-consuming when
  * the owner is new. Idempotent: returns existing name on resume.
@@ -370,6 +408,7 @@ export function assignName(coordRoot, instanceId, kind) {
         instance_id: instanceId,
         name,
         kind,
+        source: "pool",
         ts: new Date().toISOString().replace(/\.\d{3}Z$/, "Z"),
     });
     return name;

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

@@ -1,5 +1,5 @@
 /**
- * Pid-map writer.
+ * Pid-map writer + liveness helpers.
  *
  * Per-harness pid-map at `.harnery/pid-map/<pid>` containing
  * `<instance_id>\t<platform>`. `harn agents whoami` walks ppid up 20 hops looking
@@ -8,4 +8,8 @@
  * Atomic temp+rename. Idempotent: re-writing the same row is a no-op.
  */
 export declare function writePidmapRow(coordRoot: string, pid: number, instanceId: string, platform: string): void;
+/** True when any pid-map row for `instanceId` still belongs to a live process. */
+export declare function instanceHasLivePid(coordRoot: string, instanceId: string): boolean;
+/** Drop every pid-map row owned by `instanceId`. Returns how many files were removed. */
+export declare function removePidmapRowsForInstance(coordRoot: string, instanceId: string): number;
 //# sourceMappingURL=pidmap.d.ts.map