harnery 0.8.0 → 0.10.0

package/dist/commands/relay.js

@@ -0,0 +1,143 @@
+import { MAX_FRAME_BYTES } from "../core/presence/relay-protocol.js";
+/**
+ * `relay serve`: the Bun self-host of the presence relay (ADR 0016 phase 2).
+ * Same wire protocol as the Cloudflare Durable Objects host in relay/worker/ —
+ * one in-memory room per opaque room id, warm-join cache, fan-out, rate
+ * limits. For teams who'd rather run their own box than use the public
+ * relay.harnery.com; point clients at it via `.harnery/config.jsonc` →
+ * `{ "presence": { "relay": "ws://host:port" } }`.
+ *
+ * Bun-only (Bun.serve WebSockets), like `harn tunnel` — fails fast with a
+ * clear message on a Bun-free host.
+ */
+const MAX_SOCKETS_PER_ROOM = 64;
+const RATE_BURST = 10;
+const RATE_REFILL_MS = 2000;
+const CACHE_TTL_MS = 15 * 60 * 1000;
+const ROOM_ID_RE = /^[0-9a-f]{32}$/;
+/** Start the relay server. Exported for in-process integration tests. */
+export function startRelayServer(port) {
+    if (typeof Bun === "undefined" || typeof Bun.serve !== "function") {
+        throw new Error("relay serve requires Bun (Bun.serve WebSockets)");
+    }
+    const rooms = new Map();
+    const roomOf = (roomId) => {
+        let r = rooms.get(roomId);
+        if (!r) {
+            r = { sockets: new Set(), cache: new Map() };
+            rooms.set(roomId, r);
+        }
+        return r;
+    };
+    const server = Bun.serve({
+        port,
+        fetch(req, srv) {
+            const url = new URL(req.url);
+            if (url.pathname === "/" || url.pathname === "/healthz") {
+                return Response.json({ ok: true, service: "harnery-presence-relay", v: 1 });
+            }
+            const m = /^\/v1\/room\/([0-9a-f]{32})$/.exec(url.pathname);
+            if (!m || !ROOM_ID_RE.test(m[1]))
+                return new Response("not found", { status: 404 });
+            const room = roomOf(m[1]);
+            if (room.sockets.size >= MAX_SOCKETS_PER_ROOM) {
+                return new Response("room full", { status: 429 });
+            }
+            const ok = srv.upgrade(req, {
+                data: { roomId: m[1], bucketTokens: RATE_BURST, bucketAt: Date.now() },
+            });
+            return ok ? undefined : new Response("expected websocket", { status: 426 });
+        },
+        websocket: {
+            open(ws) {
+                const room = roomOf(ws.data.roomId);
+                room.sockets.add(ws);
+                const now = Date.now();
+                for (const [sender, entry] of room.cache) {
+                    if (now - entry.at > CACHE_TTL_MS) {
+                        room.cache.delete(sender);
+                        continue;
+                    }
+                    ws.send(entry.raw);
+                }
+                ws.send(JSON.stringify({ t: "hello", peers: room.sockets.size }));
+            },
+            message(ws, message) {
+                if (typeof message !== "string" || message.length > MAX_FRAME_BYTES)
+                    return;
+                // Rate limit (token bucket per socket).
+                const d = ws.data;
+                const now = Date.now();
+                const refill = Math.floor((now - d.bucketAt) / RATE_REFILL_MS);
+                if (refill > 0) {
+                    d.bucketTokens = Math.min(RATE_BURST, d.bucketTokens + refill);
+                    d.bucketAt = now;
+                }
+                if (d.bucketTokens <= 0)
+                    return;
+                d.bucketTokens -= 1;
+                let frame;
+                try {
+                    frame = JSON.parse(message);
+                }
+                catch {
+                    return;
+                }
+                if (frame.t !== "pub" ||
+                    typeof frame.sender !== "string" ||
+                    !/^[0-9a-f]+$/.test(frame.sender) ||
+                    frame.sender.length > 64) {
+                    return;
+                }
+                const room = roomOf(d.roomId);
+                room.cache.set(frame.sender, { raw: message, at: now });
+                for (const peer of room.sockets) {
+                    if (peer === ws)
+                        continue;
+                    try {
+                        peer.send(message);
+                    }
+                    catch {
+                        /* dead socket */
+                    }
+                }
+            },
+            close(ws) {
+                const room = rooms.get(ws.data.roomId);
+                if (!room)
+                    return;
+                room.sockets.delete(ws);
+                if (room.sockets.size === 0 && room.cache.size === 0)
+                    rooms.delete(ws.data.roomId);
+            },
+        },
+    });
+    return {
+        port: server.port ?? port,
+        stop: () => server.stop(true),
+    };
+}
+export function registerRelayCommand(program, emit) {
+    const cmd = program
+        .command("relay")
+        .description("Self-host the presence relay (see also relay/worker/ for the Cloudflare host)");
+    cmd
+        .command("serve")
+        .description("Run the presence relay on this machine (Bun-only; same protocol as relay/worker/)")
+        .option("--port <n>", "Port to listen on", "8787")
+        .action((opts) => {
+        let server;
+        try {
+            server = startRelayServer(Number.parseInt(opts.port, 10));
+        }
+        catch (e) {
+            emit.error({
+                code: "relay_serve_failed",
+                message: e instanceof Error ? e.message : String(e),
+            });
+            process.exit(1);
+        }
+        emit.log(`presence relay listening on :${server.port} (ws path: /v1/room/<room-id>)`, "info");
+        // Foreground service: run until interrupted.
+    });
+}

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

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAgHnD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAuK7E"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAoHnD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAuK7E"}

package/dist/commands/sync.js

@@ -22,6 +22,7 @@ import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { syncJsoncConfig } from "../core/config.js";
 // What we sync. Anything matching one of these (relative to .harnery/) is
 // considered part of the sync set. Everything else stays local-only.
 const SYNC_PATHS = ["identities/", "scratch/archived/", "councils/"];
@@ -29,10 +30,14 @@ function configPath() {
     return path.join(os.homedir(), ".config", "harnery", "sync.json");
 }
 function loadConfig() {
+    // Precedence: env → .harnery/config.jsonc `sync` → ~/.config/harnery/sync.json.
     const envRemote = process.env.HARNERY_SYNC_REMOTE;
     const envPrefix = process.env.HARNERY_SYNC_PREFIX ?? "harnery";
     if (envRemote)
         return { remote: envRemote, prefix: envPrefix };
+    const jsonc = syncJsoncConfig();
+    if (jsonc)
+        return jsonc;
     const p = configPath();
     if (!existsSync(p))
         return null;

package/dist/commands/workflow.d.ts

@@ -0,0 +1,4 @@
+import type { Command } from "commander";
+import type { EmitContext } from "../commander.js";
+export declare function registerWorkflowCommand(program: Command, emit: EmitContext): void;
+//# sourceMappingURL=workflow.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/commands/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AA0BnD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CA+FjF"}

package/dist/commands/workflow.js

@@ -0,0 +1,82 @@
+import { workflowSubscriptionOnly } from "../core/config.js";
+import { createBuiltinHarnessRegistry } from "../core/harnesses/index.js";
+import { findCoordRoot } from "../core/hooks/resolve/coord-root.js";
+export function registerWorkflowCommand(program, emit) {
+    const registry = createBuiltinHarnessRegistry();
+    const harnesses = registry.ids();
+    const workflow = program
+        .command("workflow")
+        .description("Run bounded, schema-gated multi-subagent workflow scripts.");
+    workflow
+        .command("run <script>")
+        .description("Execute a workflow script (plain JS: `export default async ({agent, parallel, stage, log}) => …`). " +
+        "Subagents spawn as headless harness-CLI subprocesses, coordination-registered.")
+        .option("--max-agents <n>", "Total-agent ceiling for the run (default 50)")
+        .option("--concurrency <n>", "Concurrent-subagent cap (default 4)")
+        .option("--cwd <dir>", "Working directory children spawn in (default: coord root)")
+        .option("--harness <name>", `Default harness for agent() calls: ${harnesses.join(" | ")} (default claude-code); scripts can override per agent via opts.harness`)
+        .option("--resume-from <run-id>", "Reuse completed agent results from a prior run's journal; only changed/failed calls re-run")
+        .option("--subscription-only", "Guarantee subscription billing: scrub API-key vars from child envs; fail loud when a " +
+        "harness has no stored login (repo default via config.jsonc workflow.subscriptionOnly)")
+        .option("--allow-api-billing", "Permit an exported API key to override a stored subscription login (per-token billing); " +
+        "without this the engine refuses that silent-override state")
+        .option("--json", "Emit the full RunReport as JSON")
+        .action(async (script, opts) => {
+        const coordRoot = findCoordRoot();
+        if (!coordRoot) {
+            emit.error({
+                code: "no_coord_root",
+                message: "no .harnery/ coordination root found; run `init` first",
+            });
+            process.exit(1);
+        }
+        if (opts.harness && !registry.get(opts.harness)) {
+            emit.error({
+                code: "bad_harness",
+                message: `unknown harness "${opts.harness}" (expected: ${harnesses.join(" | ")})`,
+            });
+            process.exit(1);
+        }
+        // Flag beats config; the two flags contradict each other by design.
+        const subscriptionOnly = opts.subscriptionOnly || workflowSubscriptionOnly(coordRoot);
+        if (subscriptionOnly && opts.allowApiBilling) {
+            emit.error({
+                code: "billing_flags_conflict",
+                message: "--allow-api-billing contradicts subscription-only mode " +
+                    "(flag or config.jsonc workflow.subscriptionOnly); pick one",
+            });
+            process.exit(1);
+        }
+        try {
+            const { runWorkflow } = await import("../core/workflow/engine.js");
+            const report = await runWorkflow(script, {
+                coordRoot,
+                spawners: registry.spawners(),
+                defaultHarness: opts.harness,
+                resumeFrom: opts.resumeFrom,
+                subscriptionOnly,
+                allowApiBilling: opts.allowApiBilling,
+                maxAgents: opts.maxAgents ? Number.parseInt(opts.maxAgents, 10) : undefined,
+                concurrency: opts.concurrency ? Number.parseInt(opts.concurrency, 10) : undefined,
+                cwd: opts.cwd,
+            });
+            if (opts.json) {
+                emit.config({ format: "json" });
+                emit.data(report);
+                return;
+            }
+            const cachedPart = report.agentsCached > 0 ? ` (+${report.agentsCached} cached)` : "";
+            const billingPart = report.billing.length
+                ? `billing: ${report.billing.map((b) => `${b.harness}=${b.mode}`).join(", ")}\n`
+                : "";
+            emit.text(`run ${report.runId} (${report.name}) finished: ${report.agentsSpawned} agent(s)${cachedPart}, ` +
+                `$${report.costUsd.toFixed(4)}, ${Math.round(report.durationMs / 1000)}s\n${billingPart}` +
+                `journal: ${report.journalPath}\n` +
+                `result: ${typeof report.result === "string" ? report.result : JSON.stringify(report.result, null, 2)}\n`);
+        }
+        catch (err) {
+            emit.error({ code: "workflow_failed", message: err.message });
+            process.exit(1);
+        }
+    });
+}

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

@@ -18,6 +18,21 @@ export interface CanonicalEmitInput {
     parentSessionId?: string;
     parentTurnId?: string;
 }
+/**
+ * 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 declare function resolveEmitRoot(start?: string): string | null;
 export declare function emitCanonical(input: CanonicalEmitInput): void;
 /**
  * Normalize the heartbeat's `platform` field (which uses snake_case

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;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,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI,CA8B7D;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;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"}

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`);
@@ -427,11 +429,16 @@ async function handlePostCommit(root) {
     }
     const { groupUnclaim } = await import("./state/heartbeat-writer.js");
     // Session-group-wide unclaim. `owner` is the parent's session_id which is
-    // also the group key (parent + subagents share session_id).
+    // also the group key (parent + subagents share session_id). Each actual
+    // removal also emits a durable claim.release event — the projector rebuilds
+    // files_touched from the permanent Edit/Write events, so a file-only prune
+    // would resurrect on the next replay.
     if (req.owner && Array.isArray(req.prune)) {
         for (const path of req.prune) {
             try {
-                groupUnclaim(root, req.owner, path);
+                for (const hit of groupUnclaim(root, req.owner, path)) {
+                    await emitClaimRelease(root, hit.instance_id, hit, path, "commit");
+                }
             }
             catch {
                 /* best-effort */
@@ -453,7 +460,9 @@ async function handlePostCheckout(root, _rest) {
     if (req.owner && Array.isArray(req.removed)) {
         for (const path of req.removed) {
             try {
-                groupUnclaim(root, req.owner, path);
+                for (const hit of groupUnclaim(root, req.owner, path)) {
+                    await emitClaimRelease(root, hit.instance_id, hit, path, "checkout");
+                }
             }
             catch {
                 /* best-effort */
@@ -657,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/claim-conflict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claim-conflict.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/rules/claim-conflict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAQH,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAeF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,aAAa,CAoGjF"}
+{"version":3,"file":"claim-conflict.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/rules/claim-conflict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAeF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,aAAa,CAoGjF"}

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

@@ -16,6 +16,7 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { emit } from "../events/emit.js";
 const FRESHNESS_SECS = 600;
 /**
  * Evaluate a file-claim. Returns deny when another fresh peer claims the
@@ -267,13 +268,37 @@ function pruneClaimFromPeer(coordRoot, instanceId, relPath) {
     try {
         const body = JSON.parse(readFileSync(path, "utf8"));
         const files = body.files_touched ?? [];
-        const next = files.filter((p) => p !== relPath);
+        // Normalize both sides: files_touched can hold absolute-under-coordRoot
+        // entries (legacy projections) as well as canonical relative ones — an
+        // exact-string filter silently no-ops on the mixed-form case and the
+        // stale claim never heals.
+        const norm = (p) => p.startsWith(`${coordRoot}/`) ? p.slice(coordRoot.length + 1) : p;
+        const target = norm(relPath);
+        const next = files.filter((p) => norm(p) !== target);
         if (next.length === files.length)
             return;
         body.files_touched = next;
         const tmp = `${path}.tmp.${process.pid}`;
         writeFileSync(tmp, JSON.stringify(body, null, 2), "utf8");
         renameSync(tmp, path);
+        // Durable subtraction: the projector rebuilds files_touched from the
+        // permanent Edit/Write events, so a file-only prune resurrects on the
+        // next replay. Soft-fail — the heartbeat write already landed.
+        try {
+            const platform = body.platform;
+            emit(coordRoot, {
+                event_type: "claim.release",
+                instance_id: instanceId,
+                session_id: body.session_id ?? instanceId,
+                harness: platform === "cursor" ? "cursor" : platform === "codex" ? "codex" : "claude-code",
+                source: "agent-coord",
+                data: { path: target, reason: "heal" },
+                // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            });
+        }
+        catch {
+            /* soft-fail */
+        }
     }
     catch {
         /* silent */

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"}