harnery 0.31.4 → 0.31.6

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

@@ -162,7 +162,10 @@ export declare function resolveOwnerByPidmap(root: string): {
  * `instance_id`, or null if there's no session-id env var or no live heartbeat
  * carries it. "Live" reuses the same 10-minute freshness window the singleton
  * fallback applies, so a stale heartbeat from a prior session of the same id
- * doesn't resolve.
+ * doesn't resolve. When legacy Cursor Glass state contains both the canonical
+ * bare id and its raw `bc-` alias, candidate order wins first; ties prefer a
+ * named heartbeat, then the newest heartbeat, with instance id as a stable
+ * final tie-breaker. Filesystem enumeration order never decides identity.
  *
  * Exported for unit testing with an injectable root.
  */

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

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

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

@@ -482,7 +482,10 @@ function shouldPreferSessionEnv() {
  * `instance_id`, or null if there's no session-id env var or no live heartbeat
  * carries it. "Live" reuses the same 10-minute freshness window the singleton
  * fallback applies, so a stale heartbeat from a prior session of the same id
- * doesn't resolve.
+ * doesn't resolve. When legacy Cursor Glass state contains both the canonical
+ * bare id and its raw `bc-` alias, candidate order wins first; ties prefer a
+ * named heartbeat, then the newest heartbeat, with instance id as a stable
+ * final tie-breaker. Filesystem enumeration order never decides identity.
  *
  * Exported for unit testing with an injectable root.
  */
@@ -502,24 +505,38 @@ export function resolveOwnerBySessionEnv(root) {
     catch {
         return null;
     }
+    const matches = [];
     for (const file of files) {
         if (!file.endsWith(".json"))
             continue;
         try {
             const parsed = JSON.parse(readFileSync(resolve(activeDir, file), "utf8"));
-            if (!parsed || !sessionIds.includes(parsed.session_id))
+            if (!parsed)
+                continue;
+            const sessionPreference = sessionIds.indexOf(parsed.session_id);
+            if (sessionPreference === -1)
                 continue;
             if (typeof parsed.instance_id !== "string")
                 continue;
             const ts = Date.parse(parsed.last_heartbeat);
-            if (Number.isFinite(ts) && ts >= cutoffMs)
-                return parsed.instance_id;
+            if (!Number.isFinite(ts) || ts < cutoffMs)
+                continue;
+            matches.push({
+                instanceId: parsed.instance_id,
+                sessionPreference,
+                hasName: typeof parsed.name === "string" && parsed.name.trim().length > 0,
+                lastHeartbeatMs: ts,
+            });
         }
         catch {
             // skip malformed
         }
     }
-    return null;
+    matches.sort((a, b) => a.sessionPreference - b.sessionPreference ||
+        Number(b.hasName) - Number(a.hasName) ||
+        b.lastHeartbeatMs - a.lastHeartbeatMs ||
+        a.instanceId.localeCompare(b.instanceId));
+    return matches[0]?.instanceId ?? null;
 }
 /**
  * Return the instance_id of the sole live agent in this coord root, or null

package/dist/core/agents/rules/stop-hook.d.ts

@@ -15,6 +15,12 @@
  * Pure-prose-turn exemption: when zero `tool.pre_use` events fire in
  * the current turn, rules 1/3 and 3/3 do not apply. Rule 2/3 still applies
  * as a user-visible mobile cue.
+ *
+ * Remediation continuity: an adapter whose Stop channel re-prompts by
+ * submitting a new user message (Cursor's `followup_message`) opens a fresh
+ * turn to repair the previous one. Such a turn inherits the window of the turn
+ * it repairs, so ritual events accumulate instead of alternating. See
+ * `resolveTurnStartMs`.
  */
 export type { VerdictResult } from "./verdict.js";
 import type { VerdictResult } from "./verdict.js";
@@ -43,6 +49,16 @@ export interface StopHookRequest {
      * event capture on: the child stays visible to peers and the coord layer. */
     workflow_child?: boolean;
 }
+/**
+ * Machine marker that opens a Stop-remediation message. Written by
+ * `hooks/adapter/output.ts` on the adapters whose Stop channel is a new user
+ * message, and read back here off `user_prompt.submit.data.prompt_text` to
+ * recognize a turn Harnery itself opened.
+ *
+ * Leading position is deliberate: `prompt_text` is clamped when recorded, so a
+ * trailing marker could be truncated away on a long reason.
+ */
+export declare const STOP_REMEDIATION_MARKER = "[harnery:stop-remediation";
 /**
  * Evaluate the Stop-hook verdict. Returns the first failing rule (or allow
  * when all three pass). Soft-fails open when the event stream isn't

package/dist/core/agents/rules/stop-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stop-hook.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/rules/stop-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAMH,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAclD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;4EACwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,yFAAyF;IACzF,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;;iFAM6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AA+BD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,aAAa,CAmHvF"}
+{"version":3,"file":"stop-hook.d.ts","sourceRoot":"","sources":["../../../../src/core/agents/rules/stop-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAclD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;4EACwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,yFAAyF;IACzF,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;;iFAM6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AA+BD;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,8BAA8B,CAAC;AAwEnE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,aAAa,CAqHvF"}

package/dist/core/agents/rules/stop-hook.js

@@ -15,6 +15,12 @@
  * Pure-prose-turn exemption: when zero `tool.pre_use` events fire in
  * the current turn, rules 1/3 and 3/3 do not apply. Rule 2/3 still applies
  * as a user-visible mobile cue.
+ *
+ * Remediation continuity: an adapter whose Stop channel re-prompts by
+ * submitting a new user message (Cursor's `followup_message`) opens a fresh
+ * turn to repair the previous one. Such a turn inherits the window of the turn
+ * it repairs, so ritual events accumulate instead of alternating. See
+ * `resolveTurnStartMs`.
  */
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
@@ -23,6 +29,80 @@ function ackSignalFor(adapter) {
     return adapter === "cursor" ? "status_checked" : "status_box_present";
 }
 const RECENT_EVENT_WINDOW_LINES = 5_000;
+/**
+ * Machine marker that opens a Stop-remediation message. Written by
+ * `hooks/adapter/output.ts` on the adapters whose Stop channel is a new user
+ * message, and read back here off `user_prompt.submit.data.prompt_text` to
+ * recognize a turn Harnery itself opened.
+ *
+ * Leading position is deliberate: `prompt_text` is clamped when recorded, so a
+ * trailing marker could be truncated away on a long reason.
+ */
+export const STOP_REMEDIATION_MARKER = "[harnery:stop-remediation";
+/**
+ * The pre-marker message shape, still recognized on purpose.
+ *
+ * A followup already sitting in the stream was written by whichever build was
+ * running when it fired. An agent whose session spans an upgrade would otherwise
+ * keep alternating until the first new-format followup appeared, which is the
+ * exact failure this change removes. Recognizing the older trailing form closes
+ * that rollout window at no cost: it only ever appears in a `prompt_text`
+ * because Harnery put it there.
+ */
+const STOP_REMEDIATION_LEGACY_MARKER = "[agent-hook stop]: rule=";
+/** How far back the remediation walk may travel. Adapters cap their own
+ * followup chains (Cursor's `loop_limit`), and each prompt can appear once per
+ * observing adapter, so this only guards a pathological stream. */
+const MAX_REMEDIATION_WALK_BACK = 16;
+function isStopRemediationPrompt(event) {
+    const text = event.data.prompt_text;
+    if (typeof text !== "string")
+        return false;
+    return text.includes(STOP_REMEDIATION_MARKER) || text.includes(STOP_REMEDIATION_LEGACY_MARKER);
+}
+/**
+ * Start of the window this Stop verdict judges.
+ *
+ * Normally the most recent `user_prompt.submit`. The exception is the
+ * remediation chain: Cursor does not continue a turn on Stop, it auto-submits
+ * our message as a new user turn (`followup_message`). Scoping the verdict to
+ * that new turn alone makes the ritual unsatisfiable in one pass, because
+ * remediation itself runs a tool, so the repair turn needs every rule again
+ * while the signal from the previous turn sits just outside the window. Running
+ * `set-task` then clears rule 3/3 and fails rule 1/3, running `status` clears
+ * 1/3 and fails 3/3, and the pair alternates until the adapter's loop cap.
+ *
+ * Anchoring the window at the last prompt Harnery did not author makes progress
+ * monotonic: each repair adds a signal and none are lost, so the chain ends.
+ * A genuine human prompt always anchors a fresh window, so this cannot be used
+ * to inherit ritual credit across real turns.
+ */
+function resolveTurnStartMs(ownerEvents, nowMs, fallbackMs) {
+    // Honor the cutoff: `now_ms` marks what is relevant yet, so a prompt after it
+    // cannot anchor this turn. In production the cutoff is the clock and nothing
+    // follows it, but a replay over recorded history passes a past cutoff, and an
+    // unclamped search would anchor on a later turn and hand back an empty window.
+    const prompts = ownerEvents.filter((e) => {
+        if (e.event_type !== "user_prompt.submit")
+            return false;
+        const t = Date.parse(e.ts);
+        return Number.isFinite(t) && t <= nowMs;
+    });
+    if (prompts.length === 0)
+        return fallbackMs;
+    let index = prompts.length - 1;
+    let hops = 0;
+    while (index > 0 && hops < MAX_REMEDIATION_WALK_BACK) {
+        const prompt = prompts[index];
+        if (!prompt || !isStopRemediationPrompt(prompt))
+            break;
+        index -= 1;
+        hops += 1;
+    }
+    const anchor = prompts[index];
+    const parsed = anchor ? Date.parse(anchor.ts) : Number.NaN;
+    return Number.isFinite(parsed) ? parsed : fallbackMs;
+}
 /**
  * Evaluate the Stop-hook verdict. Returns the first failing rule (or allow
  * when all three pass). Soft-fails open when the event stream isn't
@@ -81,17 +161,19 @@ export function evaluateStopHook(coordRoot, req) {
         };
     }
     // Turn window: from the most recent user_prompt.submit (this owner) up to
-    // either the explicit now_ms or the last event we see. Fall back to a
+    // either the explicit now_ms or the last event we see, walking back over any
+    // Harnery-authored Stop-remediation prompts so a repair turn is judged
+    // together with the turn it repairs (see `resolveTurnStartMs`). Fall back to a
     // 5-minute window when no user_prompt.submit is in scope (fresh wiring,
     // out-of-window prompt, etc.) so a stale stream doesn't silently pass.
     const nowMs = req.now_ms ?? Date.now();
-    const lastUserPrompt = [...ownerEvents]
-        .reverse()
-        .find((e) => e.event_type === "user_prompt.submit");
-    const startMs = lastUserPrompt ? Date.parse(lastUserPrompt.ts) : nowMs - 5 * 60 * 1000;
+    const startMs = req.turn_window
+        ? req.turn_window.start_ms
+        : resolveTurnStartMs(ownerEvents, nowMs, nowMs - 5 * 60 * 1000);
+    const endMs = req.turn_window ? req.turn_window.end_ms : nowMs;
     const inTurn = ownerEvents.filter((e) => {
         const t = Date.parse(e.ts);
-        return Number.isFinite(t) && t >= startMs && t <= nowMs;
+        return Number.isFinite(t) && t >= startMs && t <= endMs;
     });
     const toolPreUseInTurn = inTurn.some((e) => e.event_type === "tool.pre_use");
     const statusChecked = inTurn.some((e) => e.event_type === "state.status_checked");

package/dist/core/hooks/adapter/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/adapter/output.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhF,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAIpF;AAED,qFAAqF;AACrF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAI/D;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,CAAC,GAAG,CAAC,CAYjG"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/adapter/output.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhF,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAIpF;AAED,qFAAqF;AACrF,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAI/D;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,CAAC,GAAG,CAAC,CAuBjG"}

package/dist/core/hooks/adapter/output.js

@@ -17,6 +17,8 @@
  * Every helper writes to process.stdout + newline-terminates so callers can
  * fire-and-forget. Empty text → no-op (no JSON written).
  */
+import { STOP_REMEDIATION_MARKER } from "../../agents/rules/stop-hook.js";
+import { resolveBinName } from "../../config.js";
 /** Emit a context-injection (peer table, wiring check, council pending, …). */
 export function emitContext(adapter, event, text) {
     if (!text || text.length === 0)
@@ -56,12 +58,25 @@ export function emitDeny(adapter, reason) {
 export function emitStopBlock(adapter, verdict) {
     if (adapter === "codex")
         return 0;
-    const message = `${verdict.reason ?? "End-of-turn coordination ritual incomplete."}\n[agent-hook stop]: rule=${verdict.rule}`;
+    const reason = verdict.reason ?? "End-of-turn coordination ritual incomplete.";
     if (adapter === "cursor") {
+        // The marker leads the message so the Stop verdict can recognize the turn
+        // Cursor opens from it (`STOP_REMEDIATION_MARKER`), and so the operator can
+        // see in chat that the message came from Harnery rather than from them.
+        // Both commands are named because one message that repairs the whole ritual
+        // ends the chain in a single followup; the failing rule is context.
+        const bin = resolveBinName();
+        const message = [
+            `${STOP_REMEDIATION_MARKER} rule=${verdict.rule}]`,
+            reason,
+            `Repair the ritual in this turn: run \`${bin} agents set-task "<short focus>"\` and then \`${bin} agents status\` as your last tool call.`,
+        ].join("\n");
         process.stdout.write(`${JSON.stringify({ followup_message: message })}\n`);
         return 0;
     }
-    process.stderr.write(`${message}\n`);
+    // Claude Code continues the SAME turn on exit 2, so the single failing rule is
+    // both accurate and sufficient there. Left unchanged deliberately.
+    process.stderr.write(`${reason}\n[agent-hook stop]: rule=${verdict.rule}\n`);
     return 2;
 }
 function buildContextJson(adapter, event, text) {

package/dist/core/hooks/adapter/parse.d.ts

@@ -40,7 +40,7 @@ export interface ParsedPayload {
  * Parse the raw stdin payload string for any adapter. Returns null when JSON
  * parse fails (Cursor occasionally fires hooks with no payload).
  */
-export declare function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | null;
+export declare function parsePayload(raw: string, adapter: Adapter): ParsedPayload | null;
 /**
  * Pull the bash command string out of a Bash/Shell tool_input. Returns
  * undefined for non-shell tools.

package/dist/core/hooks/adapter/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/adapter/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CAkCjF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,EAAE,OAAO,GACjB,MAAM,GAAG,SAAS,CASpB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO7E;AAmBD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,GAChB;IAAE,UAAU,EAAE,mBAAmB,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiCjE;AAED,MAAM,MAAM,mBAAmB,GAC3B,eAAe,GACf,aAAa,GACb,oBAAoB,GACpB,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,uBAAuB,GACvB,4BAA4B,GAC5B,8BAA8B,CAAC"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/adapter/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CA+ChF;AAQD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,EAAE,OAAO,GACjB,MAAM,GAAG,SAAS,CASpB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO7E;AAmBD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,GAChB;IAAE,UAAU,EAAE,mBAAmB,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiCjE;AAED,MAAM,MAAM,mBAAmB,GAC3B,eAAe,GACf,aAAa,GACb,oBAAoB,GACpB,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,uBAAuB,GACvB,4BAA4B,GAC5B,8BAA8B,CAAC"}

package/dist/core/hooks/adapter/parse.js

@@ -13,7 +13,7 @@
  * Parse the raw stdin payload string for any adapter. Returns null when JSON
  * parse fails (Cursor occasionally fires hooks with no payload).
  */
-export function parsePayload(raw, _adapter) {
+export function parsePayload(raw, adapter) {
     if (!raw || raw.trim().length === 0)
         return null;
     let json;
@@ -23,13 +23,24 @@ export function parsePayload(raw, _adapter) {
     catch {
         return null;
     }
+    const sessionId = normalizeSessionId(adapter, pickStr(json, "session_id"));
+    const conversationId = normalizeSessionId(adapter, pickStr(json, "conversation_id"));
+    const parentSessionId = normalizeSessionId(adapter, pickStr(json, "parent_session_id"));
+    const normalizedRaw = adapter === "cursor"
+        ? {
+            ...json,
+            ...(sessionId ? { session_id: sessionId } : {}),
+            ...(conversationId ? { conversation_id: conversationId } : {}),
+            ...(parentSessionId ? { parent_session_id: parentSessionId } : {}),
+        }
+        : json;
     return {
         hook_event_name: pickStr(json, "hook_event_name"),
-        session_id: pickStr(json, "session_id"),
+        session_id: sessionId,
         agent_id: pickStr(json, "agent_id"),
         subagent_id: pickStr(json, "subagent_id"),
-        conversation_id: pickStr(json, "conversation_id"),
-        parent_session_id: pickStr(json, "parent_session_id"),
+        conversation_id: conversationId,
+        parent_session_id: parentSessionId,
         turn_id: pickStr(json, "turn_id"),
         parent_turn_id: pickStr(json, "parent_turn_id"),
         transcript_path: pickStr(json, "transcript_path"),
@@ -46,9 +57,15 @@ export function parsePayload(raw, _adapter) {
         clean_exit: pickBool(json, "clean_exit"),
         exit_status: pickStr(json, "exit_status"),
         reason: pickStr(json, "reason"),
-        raw: json,
+        raw: normalizedRaw,
     };
 }
+/** Cursor Glass prefixes conversation ids with `bc-`; coordination uses the bare id everywhere. */
+function normalizeSessionId(adapter, value) {
+    if (adapter !== "cursor" || !value?.startsWith("bc-") || value.length <= 3)
+        return value;
+    return value.slice(3);
+}
 /**
  * Pull the bash command string out of a Bash/Shell tool_input. Returns
  * undefined for non-shell tools.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harnery",
-  "version": "0.31.4",
+  "version": "0.31.6",
   "description": "Multi-agent coordination for AI coding agents - Claude Code, Cursor, and Codex.",
   "license": "MIT",
   "author": "Ryan Kelly",

package/src/core/agents/coord-client.ts

@@ -528,7 +528,10 @@ function shouldPreferSessionEnv(): boolean {
  * `instance_id`, or null if there's no session-id env var or no live heartbeat
  * carries it. "Live" reuses the same 10-minute freshness window the singleton
  * fallback applies, so a stale heartbeat from a prior session of the same id
- * doesn't resolve.
+ * doesn't resolve. When legacy Cursor Glass state contains both the canonical
+ * bare id and its raw `bc-` alias, candidate order wins first; ties prefer a
+ * named heartbeat, then the newest heartbeat, with instance id as a stable
+ * final tie-breaker. Filesystem enumeration order never decides identity.
  *
  * Exported for unit testing with an injectable root.
  */
@@ -546,19 +549,40 @@ export function resolveOwnerBySessionEnv(root: string): string | null {
   } catch {
     return null;
   }
+  const matches: Array<{
+    instanceId: string;
+    sessionPreference: number;
+    hasName: boolean;
+    lastHeartbeatMs: number;
+  }> = [];
   for (const file of files) {
     if (!file.endsWith(".json")) continue;
     try {
       const parsed = JSON.parse(readFileSync(resolve(activeDir, file), "utf8"));
-      if (!parsed || !sessionIds.includes(parsed.session_id)) continue;
+      if (!parsed) continue;
+      const sessionPreference = sessionIds.indexOf(parsed.session_id);
+      if (sessionPreference === -1) continue;
       if (typeof parsed.instance_id !== "string") continue;
       const ts = Date.parse(parsed.last_heartbeat);
-      if (Number.isFinite(ts) && ts >= cutoffMs) return parsed.instance_id;
+      if (!Number.isFinite(ts) || ts < cutoffMs) continue;
+      matches.push({
+        instanceId: parsed.instance_id,
+        sessionPreference,
+        hasName: typeof parsed.name === "string" && parsed.name.trim().length > 0,
+        lastHeartbeatMs: ts,
+      });
     } catch {
       // skip malformed
     }
   }
-  return null;
+  matches.sort(
+    (a, b) =>
+      a.sessionPreference - b.sessionPreference ||
+      Number(b.hasName) - Number(a.hasName) ||
+      b.lastHeartbeatMs - a.lastHeartbeatMs ||
+      a.instanceId.localeCompare(b.instanceId),
+  );
+  return matches[0]?.instanceId ?? null;
 }
 
 /**

package/src/core/agents/rules/stop-hook.ts

@@ -15,6 +15,12 @@
  * Pure-prose-turn exemption: when zero `tool.pre_use` events fire in
  * the current turn, rules 1/3 and 3/3 do not apply. Rule 2/3 still applies
  * as a user-visible mobile cue.
+ *
+ * Remediation continuity: an adapter whose Stop channel re-prompts by
+ * submitting a new user message (Cursor's `followup_message`) opens a fresh
+ * turn to repair the previous one. Such a turn inherits the window of the turn
+ * it repairs, so ritual events accumulate instead of alternating. See
+ * `resolveTurnStartMs`.
  */
 
 import { existsSync, readFileSync } from "node:fs";
@@ -89,6 +95,87 @@ function ackSignalFor(adapter?: string): AckSignal {
 
 const RECENT_EVENT_WINDOW_LINES = 5_000;
 
+/**
+ * Machine marker that opens a Stop-remediation message. Written by
+ * `hooks/adapter/output.ts` on the adapters whose Stop channel is a new user
+ * message, and read back here off `user_prompt.submit.data.prompt_text` to
+ * recognize a turn Harnery itself opened.
+ *
+ * Leading position is deliberate: `prompt_text` is clamped when recorded, so a
+ * trailing marker could be truncated away on a long reason.
+ */
+export const STOP_REMEDIATION_MARKER = "[harnery:stop-remediation";
+
+/**
+ * The pre-marker message shape, still recognized on purpose.
+ *
+ * A followup already sitting in the stream was written by whichever build was
+ * running when it fired. An agent whose session spans an upgrade would otherwise
+ * keep alternating until the first new-format followup appeared, which is the
+ * exact failure this change removes. Recognizing the older trailing form closes
+ * that rollout window at no cost: it only ever appears in a `prompt_text`
+ * because Harnery put it there.
+ */
+const STOP_REMEDIATION_LEGACY_MARKER = "[agent-hook stop]: rule=";
+
+/** How far back the remediation walk may travel. Adapters cap their own
+ * followup chains (Cursor's `loop_limit`), and each prompt can appear once per
+ * observing adapter, so this only guards a pathological stream. */
+const MAX_REMEDIATION_WALK_BACK = 16;
+
+function isStopRemediationPrompt(event: CanonicalEvent): boolean {
+  const text = event.data.prompt_text;
+  if (typeof text !== "string") return false;
+  return text.includes(STOP_REMEDIATION_MARKER) || text.includes(STOP_REMEDIATION_LEGACY_MARKER);
+}
+
+/**
+ * Start of the window this Stop verdict judges.
+ *
+ * Normally the most recent `user_prompt.submit`. The exception is the
+ * remediation chain: Cursor does not continue a turn on Stop, it auto-submits
+ * our message as a new user turn (`followup_message`). Scoping the verdict to
+ * that new turn alone makes the ritual unsatisfiable in one pass, because
+ * remediation itself runs a tool, so the repair turn needs every rule again
+ * while the signal from the previous turn sits just outside the window. Running
+ * `set-task` then clears rule 3/3 and fails rule 1/3, running `status` clears
+ * 1/3 and fails 3/3, and the pair alternates until the adapter's loop cap.
+ *
+ * Anchoring the window at the last prompt Harnery did not author makes progress
+ * monotonic: each repair adds a signal and none are lost, so the chain ends.
+ * A genuine human prompt always anchors a fresh window, so this cannot be used
+ * to inherit ritual credit across real turns.
+ */
+function resolveTurnStartMs(
+  ownerEvents: CanonicalEvent[],
+  nowMs: number,
+  fallbackMs: number,
+): number {
+  // Honor the cutoff: `now_ms` marks what is relevant yet, so a prompt after it
+  // cannot anchor this turn. In production the cutoff is the clock and nothing
+  // follows it, but a replay over recorded history passes a past cutoff, and an
+  // unclamped search would anchor on a later turn and hand back an empty window.
+  const prompts = ownerEvents.filter((e) => {
+    if (e.event_type !== "user_prompt.submit") return false;
+    const t = Date.parse(e.ts);
+    return Number.isFinite(t) && t <= nowMs;
+  });
+  if (prompts.length === 0) return fallbackMs;
+
+  let index = prompts.length - 1;
+  let hops = 0;
+  while (index > 0 && hops < MAX_REMEDIATION_WALK_BACK) {
+    const prompt = prompts[index];
+    if (!prompt || !isStopRemediationPrompt(prompt)) break;
+    index -= 1;
+    hops += 1;
+  }
+
+  const anchor = prompts[index];
+  const parsed = anchor ? Date.parse(anchor.ts) : Number.NaN;
+  return Number.isFinite(parsed) ? parsed : fallbackMs;
+}
+
 /**
  * Evaluate the Stop-hook verdict. Returns the first failing rule (or allow
  * when all three pass). Soft-fails open when the event stream isn't
@@ -151,18 +238,20 @@ export function evaluateStopHook(coordRoot: string, req: StopHookRequest): Verdi
   }
 
   // Turn window: from the most recent user_prompt.submit (this owner) up to
-  // either the explicit now_ms or the last event we see. Fall back to a
+  // either the explicit now_ms or the last event we see, walking back over any
+  // Harnery-authored Stop-remediation prompts so a repair turn is judged
+  // together with the turn it repairs (see `resolveTurnStartMs`). Fall back to a
   // 5-minute window when no user_prompt.submit is in scope (fresh wiring,
   // out-of-window prompt, etc.) so a stale stream doesn't silently pass.
   const nowMs = req.now_ms ?? Date.now();
-  const lastUserPrompt = [...ownerEvents]
-    .reverse()
-    .find((e) => e.event_type === "user_prompt.submit");
-  const startMs = lastUserPrompt ? Date.parse(lastUserPrompt.ts) : nowMs - 5 * 60 * 1000;
+  const startMs = req.turn_window
+    ? req.turn_window.start_ms
+    : resolveTurnStartMs(ownerEvents, nowMs, nowMs - 5 * 60 * 1000);
+  const endMs = req.turn_window ? req.turn_window.end_ms : nowMs;
 
   const inTurn = ownerEvents.filter((e) => {
     const t = Date.parse(e.ts);
-    return Number.isFinite(t) && t >= startMs && t <= nowMs;
+    return Number.isFinite(t) && t >= startMs && t <= endMs;
   });
 
   const toolPreUseInTurn = inTurn.some((e) => e.event_type === "tool.pre_use");

package/src/core/hooks/adapter/output.ts

@@ -18,6 +18,8 @@
  * fire-and-forget. Empty text → no-op (no JSON written).
  */
 
+import { STOP_REMEDIATION_MARKER } from "../../agents/rules/stop-hook.ts";
+import { resolveBinName } from "../../config.ts";
 import type { Adapter } from "../events/schema.ts";
 
 export type SystemEvent = "SessionStart" | "UserPromptSubmit" | "SubagentStart";
@@ -61,14 +63,25 @@ export function emitDeny(adapter: Adapter, reason: string): void {
 export function emitStopBlock(adapter: Adapter, verdict: { reason?: string; rule: string }): 0 | 2 {
   if (adapter === "codex") return 0;
 
-  const message = `${
-    verdict.reason ?? "End-of-turn coordination ritual incomplete."
-  }\n[agent-hook stop]: rule=${verdict.rule}`;
+  const reason = verdict.reason ?? "End-of-turn coordination ritual incomplete.";
   if (adapter === "cursor") {
+    // The marker leads the message so the Stop verdict can recognize the turn
+    // Cursor opens from it (`STOP_REMEDIATION_MARKER`), and so the operator can
+    // see in chat that the message came from Harnery rather than from them.
+    // Both commands are named because one message that repairs the whole ritual
+    // ends the chain in a single followup; the failing rule is context.
+    const bin = resolveBinName();
+    const message = [
+      `${STOP_REMEDIATION_MARKER} rule=${verdict.rule}]`,
+      reason,
+      `Repair the ritual in this turn: run \`${bin} agents set-task "<short focus>"\` and then \`${bin} agents status\` as your last tool call.`,
+    ].join("\n");
     process.stdout.write(`${JSON.stringify({ followup_message: message })}\n`);
     return 0;
   }
-  process.stderr.write(`${message}\n`);
+  // Claude Code continues the SAME turn on exit 2, so the single failing rule is
+  // both accurate and sufficient there. Left unchanged deliberately.
+  process.stderr.write(`${reason}\n[agent-hook stop]: rule=${verdict.rule}\n`);
   return 2;
 }
 

package/src/core/hooks/adapter/parse.ts

@@ -43,7 +43,7 @@ export interface ParsedPayload {
  * Parse the raw stdin payload string for any adapter. Returns null when JSON
  * parse fails (Cursor occasionally fires hooks with no payload).
  */
-export function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | null {
+export function parsePayload(raw: string, adapter: Adapter): ParsedPayload | null {
   if (!raw || raw.trim().length === 0) return null;
   let json: Record<string, unknown>;
   try {
@@ -52,13 +52,26 @@ export function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | nu
     return null;
   }
 
+  const sessionId = normalizeSessionId(adapter, pickStr(json, "session_id"));
+  const conversationId = normalizeSessionId(adapter, pickStr(json, "conversation_id"));
+  const parentSessionId = normalizeSessionId(adapter, pickStr(json, "parent_session_id"));
+  const normalizedRaw =
+    adapter === "cursor"
+      ? {
+          ...json,
+          ...(sessionId ? { session_id: sessionId } : {}),
+          ...(conversationId ? { conversation_id: conversationId } : {}),
+          ...(parentSessionId ? { parent_session_id: parentSessionId } : {}),
+        }
+      : json;
+
   return {
     hook_event_name: pickStr(json, "hook_event_name"),
-    session_id: pickStr(json, "session_id"),
+    session_id: sessionId,
     agent_id: pickStr(json, "agent_id"),
     subagent_id: pickStr(json, "subagent_id"),
-    conversation_id: pickStr(json, "conversation_id"),
-    parent_session_id: pickStr(json, "parent_session_id"),
+    conversation_id: conversationId,
+    parent_session_id: parentSessionId,
     turn_id: pickStr(json, "turn_id"),
     parent_turn_id: pickStr(json, "parent_turn_id"),
     transcript_path: pickStr(json, "transcript_path"),
@@ -75,10 +88,16 @@ export function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | nu
     clean_exit: pickBool(json, "clean_exit"),
     exit_status: pickStr(json, "exit_status"),
     reason: pickStr(json, "reason"),
-    raw: json,
+    raw: normalizedRaw,
   };
 }
 
+/** Cursor Glass prefixes conversation ids with `bc-`; coordination uses the bare id everywhere. */
+function normalizeSessionId(adapter: Adapter, value: string | undefined): string | undefined {
+  if (adapter !== "cursor" || !value?.startsWith("bc-") || value.length <= 3) return value;
+  return value.slice(3);
+}
+
 /**
  * Pull the bash command string out of a Bash/Shell tool_input. Returns
  * undefined for non-shell tools.