harnery 0.34.1 → 0.36.0

package/dist/core/hooks/cli.js

@@ -16,36 +16,40 @@
  * `.harnery/debug/agent-hook.errors.ndjson` for audit but never break the
  * adapter flow.
  */
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { coordEnv } from "../../lib/env.js";
 import { buildInstructionBundle } from "../../lib/instructions/bundle.js";
 import { coordBinPath } from "../agents/coord-bin.js";
+import { resolveCoordRoot } from "../agents/coord-client.js";
 import { classifyWriteClaimFinalization, formatWriteClaimFinalizationDenial, } from "../agents/finalization.js";
+import { restoreLiveCoordinationStateAfterEpochV3 } from "../agents/live-authority-v3.js";
 import { evaluateStopHook, STOP_REMEDIATION_MARKER } from "../agents/rules/stop-hook.js";
-import { assistantTextStartsWithSessionNameBlock, isSessionNameRemediationCommand, sessionNameDisplayInstruction, sessionNameDisplayPending, toolResponseMintedSessionName, } from "../agents/session-name-display.js";
-import { stampSessionNameSeen } from "../agents/state/heartbeat-writer.js";
+import { assistantTextStartsWithSessionNameBlock, isSessionNameRemediationCommand, sessionNameDisplayInstruction, sessionNameDisplayPending, sessionNameDisplayRecoveryInstruction, toolResponseMintedSessionName, } from "../agents/session-name-display.js";
+import { readHeartbeat, stampSessionNameSeen } from "../agents/state/heartbeat-writer.js";
 import { readLiveCoordinationRow } from "../agents/state/live-coordination-view.js";
+import { ensureLiveCoordinationHeartbeat } from "../agents/state/live-coordination-writer.js";
 import { writePidmapRow } from "../agents/state/pidmap.js";
 import { agentsRequireGitFinalization, resolveBinName } from "../config.js";
 import { checkpointContext, completeContextRecovery, extractContextSample, markContextCompactionCompleted, prepareContextRecovery, readContextState, recordContextSample, } from "../context/index.js";
 import { tryWriteLiveDisplayV3 } from "../events/v3/live-feed.js";
-import { recordLiveHookSignalV3, resolveLiveEventLedgerRouteV3, } from "../events/v3/live-routing.js";
+import { liveHookSignalDefersDrainV3, reconcileLivePendingRuntimeContextV3, recordLiveDelegatedChildSessionV3, recordLiveHookSignalV3, resolveLiveEventLedgerRouteV3, } from "../events/v3/live-routing.js";
 import { captureSpanClockV3 } from "../events/v3/span-state.js";
-import { fetchPresence } from "../presence/index.js";
+import { ensureRelayDaemon, fetchPresence, publishPresence } from "../presence/index.js";
+import { closeProcessLoggers, legacyLogFields, processLogger } from "../storage/logger.js";
 import { stableScopeId } from "../workflow/scope-id.js";
 import { detectAdapter, shouldSkipHookAdapter } from "./adapter/detect.js";
 import { extractBashCommand, extractToolDescription, normalizeEventName, parsePayload, } from "./adapter/parse.js";
+import { discoverCodexSessionTranscript } from "./adapter/runtime-telemetry.js";
 import { codexWslFileLinkTelemetry, inspectCodexWslBridge, isWslUncPath, renderCodexWslFileLinkContext, } from "./codex-wsl-bridge.js";
 import { captureImages, detectPresence, imageJanitor, journalArchive, journalJanitor, journalRecoveryCue, playSound, recordImageArtifactsV3, resetSoundCounters, runSessionSyncExtension, soundForEvent, } from "./effects/index.js";
 import { toolInputHash, toolTargetHash } from "./events/input-hash.js";
 import { canonicalize } from "./guard-path.js";
 import { adapterPidFromEnv, parsePsChainLine, selectAnchorPid } from "./resolve/anchor.js";
-import { findCoordRoot } from "./resolve/coord-root.js";
 import { extractIntentComment, resolveIntent } from "./resolve/intent.js";
 import { resolveOwner } from "./resolve/owner.js";
-import { inspectSessionNameDisplayImmediately, scanAssistantTextIncludes, scanSessionNameDisplayedImmediately, scanStatusBoxPresent, scanTranscriptModel, } from "./resolve/transcript.js";
+import { inspectSessionNameDisplayImmediately, scanAssistantStatusBoxPresent, scanSessionNameDisplayedImmediately, scanStatusBoxPresent, scanTranscriptRuntime, } from "./resolve/transcript.js";
 import { sessionNamePresence } from "./session-name-presence.js";
 import { unsafeCrossShellReason } from "./unsafe-cross-shell.js";
 function parseArgv(argv) {
@@ -67,6 +71,10 @@ function parseArgv(argv) {
     }
     return out;
 }
+function extraArg(extra, name) {
+    const index = extra.indexOf(name);
+    return index >= 0 ? extra[index + 1] : undefined;
+}
 async function readStdin() {
     if (process.stdin.isTTY)
         return "";
@@ -92,6 +100,15 @@ function childEnv(coordRoot) {
     return { ...process.env, HARNERY_COORD_ROOT_OVERRIDE: coordRoot };
 }
 function appendDebug(coordRoot, entry) {
+    if (coordEnv("SHARED_LOGS") !== "0") {
+        try {
+            processLogger(coordRoot, "agent-hook").debug("agent_hook.diagnostic", legacyLogFields(entry));
+            return;
+        }
+        catch {
+            /* fall through to the rollback writer */
+        }
+    }
     const path = join(coordRoot, ".harnery", "debug", "agent-hook.ndjson");
     try {
         mkdirSync(dirname(path), { recursive: true });
@@ -104,6 +121,15 @@ function appendDebug(coordRoot, entry) {
 function logError(coordRoot, err, context) {
     if (!coordRoot)
         return;
+    if (coordEnv("SHARED_LOGS") !== "0") {
+        try {
+            processLogger(coordRoot, "agent-hook").error("agent_hook.error", legacyLogFields(context), err);
+            return;
+        }
+        catch {
+            /* fall through to the rollback writer */
+        }
+    }
     const path = join(coordRoot, ".harnery", "debug", "agent-hook.errors.ndjson");
     try {
         mkdirSync(dirname(path), { recursive: true });
@@ -221,7 +247,7 @@ function buildEventData(eventType, ctx) {
                 // Claude Code's SessionStart payload omits `model` (Codex + Cursor
                 // supply it). Fall back to the transcript, populated on `resume`, and
                 // backfilled later by `turn.completed` for a fresh startup session.
-                model: p?.model ?? scanTranscriptModel(p?.transcript_path),
+                model: p?.model ?? scanTranscriptRuntime(p?.transcript_path)?.model,
                 pid: adapterPid,
                 source: p?.source,
                 platform: adapterPlatform,
@@ -282,7 +308,7 @@ function buildEventData(eventType, ctx) {
                 // Backfill the model for adapters that omit it at session.started
                 // (Claude Code). The transcript is populated with assistant turns by
                 // Stop-hook time, so this resolves even for fresh `startup` sessions.
-                model: p?.model ?? scanTranscriptModel(p?.transcript_path),
+                model: p?.model ?? scanTranscriptRuntime(p?.transcript_path)?.model,
                 // Phase 2: tool_call_count + text_length aren't cheaply available
                 // from the Stop payload alone (they'd require a transcript scan that
                 // races with the JSONL flush). Emit `-1` / `0` sentinels and let
@@ -296,22 +322,25 @@ function buildEventData(eventType, ctx) {
                 // the verdict now sees because agent-hook emits this turn.completed itself
                 // (the previous path passed those via the no-history fail-open).
                 status_box_present: scanStatusBoxPresent(p?.transcript_path) || lastAssistantMessage.includes("┌─ agent-"),
-                // Shadow measurement for the rule-2/3 detector: the loose scan above
+                // Assistant-text evidence for the rule-2/3 detector: the loose scan above
                 // matches the box prefix ANYWHERE in the transcript tail, including
                 // the tool_result row the status command itself writes, so it can
                 // report a paste that never happened. The strict variant counts
                 // assistant text only (same window, same scanner as the session-name
-                // detection). Telemetry-only: the Stop verdict still reads
-                // status_box_present. Once the divergence rate between the two fields
-                // is known, the gate either flips to strict or the rule gets
-                // reconsidered; either way this field decides it with data.
-                status_box_present_strict: scanAssistantTextIncludes(p?.transcript_path, "┌─ agent-") ||
-                    lastAssistantMessage.includes("┌─ agent-"),
+                // detection). The Stop verdict enforces this field; the loose field is
+                // retained as diagnostic telemetry for the measured detector divergence.
+                status_box_present_strict: scanAssistantStatusBoxPresent(p?.transcript_path, lastAssistantMessage),
                 // Whether the session's suggested name is satisfied as of this turn,
                 // and which name that refers to. Reported on every stop while a name
                 // exists (the stop-hook.session_name verdict reads it per turn); the
                 // transcript scan itself stops once the name has been sighted.
-                ...sessionNamePresence(ctx.coordRoot, ctx.instanceId, (name) => scanSessionNameDisplayedImmediately(p?.transcript_path, name, assistantTextStartsWithSessionNameBlock)),
+                ...sessionNamePresence(ctx.coordRoot, ctx.instanceId, (name) => scanSessionNameDisplayedImmediately(
+                // Codex stops carry no transcript_path; discover the rollout by
+                // session id so the naming ritual can verify and stamp there too.
+                p?.transcript_path ??
+                    (ctx.adapter === "codex"
+                        ? discoverCodexSessionTranscript(p?.session_id ?? ctx.instanceId)
+                        : undefined), name, assistantTextStartsWithSessionNameBlock)),
                 ...(fileLinkTelemetry ?? {}),
                 stop_hook_active: p?.stop_hook_active,
             };
@@ -321,7 +350,8 @@ function buildEventData(eventType, ctx) {
             // Subagents inherit parent's name via the resolve-name session_id path
             // (agent-coord/state/names.ts → kind=transient). Use the call ID as the
             // instance_id input; assignName falls through to transient.
-            const assigned = assignNameViaAgentCoord(ctx.coordRoot, ctx.instanceId, "subagent");
+            const childInstanceId = subagentCallId ?? ctx.instanceId;
+            const assigned = assignNameViaAgentCoord(ctx.coordRoot, childInstanceId, "subagent");
             return {
                 agent_type: p?.raw.agent_type ??
                     p?.raw.subagent_type ??
@@ -329,7 +359,7 @@ function buildEventData(eventType, ctx) {
                 prompt_summary: p?.raw.prompt_summary,
                 name: assigned?.name,
                 kind: "subagent",
-                agent_id: ctx.instanceId,
+                agent_id: childInstanceId,
                 subagent_call_id: subagentCallId,
                 parent_session_id: p?.parent_session_id,
             };
@@ -448,7 +478,7 @@ async function main() {
     // `--adapter cursor` dispatch of the same payload carries the session.
     if (shouldSkipHookAdapter(adapter, raw)) {
         if (coordEnv("AGENT_COORD_OFF") !== "1") {
-            const coordRoot = findCoordRoot(process.cwd());
+            const coordRoot = resolveCoordRoot(process.cwd());
             if (coordRoot) {
                 appendDebug(coordRoot, {
                     ts: new Date().toISOString(),
@@ -472,17 +502,24 @@ async function main() {
     if (adapter === "claude-code" && eventName) {
         const s = soundForEvent(eventName);
         if (s) {
-            const repoRoot = findCoordRoot(process.cwd());
+            const repoRoot = resolveCoordRoot(process.cwd());
             if (repoRoot) {
                 let sid = "";
+                let stopContinuation = false;
                 try {
                     const j = JSON.parse(raw);
                     sid = j.session_id ?? j.conversation_id ?? "";
+                    // A stop with stop_hook_active is a remediation continuation of a
+                    // turn that already chimed; replaying the sound on every bounce
+                    // turns a blocked-stop loop into a repeating alarm.
+                    stopContinuation = eventName === "stop" && j.stop_hook_active === true;
                 }
                 catch {
                     // non-JSON payload: play unkeyed (rate-limit just won't dedup)
                 }
-                playSound(repoRoot, s.sound, sid, s.maxPlays);
+                if (!stopContinuation) {
+                    playSound(repoRoot, s.sound, sid, s.maxPlays);
+                }
             }
         }
     }
@@ -492,9 +529,12 @@ async function main() {
     // bypass during incident triage.
     if (coordEnv("AGENT_COORD_OFF") === "1")
         return 0;
-    const coordRoot = findCoordRoot(process.cwd());
+    const coordRoot = resolveCoordRoot(process.cwd());
     if (!coordRoot)
         return 0;
+    if (eventName === "runtime-context-retry") {
+        return runRuntimeContextRetryWorker(coordRoot, adapter, extra);
+    }
     const ledgerRoute = resolveLiveEventLedgerRouteV3(coordRoot);
     // Always log a breadcrumb, useful when an event_type maps to null or owner
     // resolution fails. Stays cheap (one append) and self-prunes via repo log
@@ -513,6 +553,30 @@ async function main() {
         appendDebug(coordRoot, { ...debugBase, skipped: "missing-event-or-adapter" });
         return 0;
     }
+    // Cursor's preToolUse `agent_message` is only the current narration before
+    // that tool. It is not a transcript and therefore cannot prove that an
+    // earlier assistant response omitted the required session-name block.
+    // afterAgentResponse is the one native boundary that carries the completed
+    // assistant text, so stamp a positive sighting here without retaining or
+    // emitting the response body into V3.
+    if (adapter === "cursor" && eventName === "after-agent-response") {
+        const payload = parsePayload(raw, adapter);
+        const owner = resolveOwner({ payload: payload?.raw ?? null, coordRoot });
+        if (!owner) {
+            appendDebug(coordRoot, { ...debugBase, skipped: "no-owner-resolved" });
+            return 0;
+        }
+        const name = sessionNameDisplayPending(readLiveCoordinationRow(coordRoot, owner.instance_id));
+        const text = typeof payload?.raw.text === "string" ? payload.raw.text : "";
+        if (name && assistantTextStartsWithSessionNameBlock(text, name)) {
+            stampSessionNameSeen(coordRoot, owner.instance_id, name);
+            appendDebug(coordRoot, { ...debugBase, effect: "session-name-display-stamped" });
+        }
+        else {
+            appendDebug(coordRoot, { ...debugBase, skipped: "no-session-name-sighting" });
+        }
+        return 0;
+    }
     const norm = normalizeEventName(eventName);
     if (!norm) {
         appendDebug(coordRoot, { ...debugBase, skipped: "non-canonical-event" });
@@ -532,6 +596,7 @@ async function main() {
         return 0;
     }
     const sessionId = payload?.session_id ?? payload?.conversation_id ?? owner.instance_id;
+    const priorCoordination = readHeartbeat(coordRoot, owner.instance_id);
     const data = buildEventData(norm.event_type, {
         coordRoot,
         payload,
@@ -571,6 +636,7 @@ async function main() {
             logError(coordRoot, err, { phase: "image-capture" });
         }
     }
+    const deferV3Drain = liveHookSignalDefersDrainV3(eventName, coordEnv("EXPERIMENT_DEFER_V3_DRAIN"));
     const v3Result = recordLiveHookSignalV3({
         coordRoot,
         route: ledgerRoute,
@@ -593,16 +659,60 @@ async function main() {
         monotonic_ns: hookClock.monotonic_ns,
         ...(stopRemediation ? { stop_remediation: true } : {}),
         ...(turnRitual ? { turn_ritual: turnRitual } : {}),
-        ...(coordEnv("EXPERIMENT_DEFER_V3_DRAIN") === "1" ? { defer_drain: true } : {}),
+        ...(deferV3Drain ? { defer_drain: true } : {}),
     });
+    const recordedGenerationId = v3Result && "event" in v3Result && "generation_id" in v3Result.event.scope
+        ? v3Result.event.scope.generation_id
+        : undefined;
+    if (v3Result?.state === "recorded" || v3Result?.state === "already_started") {
+        try {
+            restoreLiveCoordinationStateAfterEpochV3({
+                coordRoot,
+                owner: owner.instance_id,
+                nativeSessionId: sessionId,
+                adapter,
+                prior: priorCoordination,
+                currentGenerationId: recordedGenerationId,
+            });
+        }
+        catch (error) {
+            logError(coordRoot, error, { phase: "epoch-coordination-restore" });
+        }
+    }
     const v3EventId = v3Result && "event" in v3Result
         ? v3Result.event.event_id
         : v3Result && "event_id" in v3Result
             ? v3Result.event_id
             : undefined;
+    if (norm.event_type === "agent.started" &&
+        payload &&
+        v3Result?.state === "recorded" &&
+        v3Result.event.event_type === "agent.started") {
+        try {
+            const childResult = recordLiveDelegatedChildSessionV3({
+                coordRoot,
+                route: ledgerRoute,
+                parentEvent: v3Result.event,
+                payload,
+                adapter,
+                ...(adapter === "codex" && isWslUncPath(payload.cwd)
+                    ? { bridge: "codex-wsl" }
+                    : {}),
+                monotonic_ns: hookClock.monotonic_ns,
+            });
+            const nativeChild = payload.subagent_id ?? payload.agent_id;
+            if (nativeChild &&
+                (childResult.state === "recorded" || childResult.state === "already_started")) {
+                ensureLiveCoordinationHeartbeat(coordRoot, nativeChild, sessionId, adapter, payload.model);
+            }
+        }
+        catch (err) {
+            logError(coordRoot, err, { phase: "subagent-child-session-start" });
+        }
+    }
     if (v3Result?.state === "recorded" && capturedImages.length > 0) {
         try {
-            recordImageArtifactsV3(coordRoot, v3Result.event, capturedImages);
+            recordImageArtifactsV3(coordRoot, v3Result.event, capturedImages, ledgerRoute.genesis_id);
         }
         catch (err) {
             logError(coordRoot, err, { phase: "image-artifact-observation" });
@@ -693,6 +803,35 @@ async function main() {
         if (adapter === "claude-code")
             journalJanitor(coordRoot);
         imageJanitor(coordRoot);
+        // Session start is the only caller of the artifact janitor and the storage
+        // maintenance pass, so both load here instead of on every tool call.
+        const { autoCleanArtifacts } = await import("../artifacts/index.js");
+        const { createAutomaticMaintenanceComposition, runAutomaticMaintenancePass } = await import("../storage/maintenance-providers.js");
+        // Effect: throttled daily sweep of expired artifact workspaces (guarded,
+        // managed-expired only; see autoCleanArtifacts). Best-effort like every
+        // janitor here: a failure logs and never blocks session start.
+        try {
+            autoCleanArtifacts(coordRoot);
+        }
+        catch (err) {
+            logError(coordRoot, err, { phase: "artifact-auto-clean" });
+        }
+        // Plan one bounded, claim-first global slice from cached pressure only.
+        // Existing owner janitors above remain the only active executors until
+        // each provider receives a separate production activation.
+        try {
+            await runAutomaticMaintenancePass(createAutomaticMaintenanceComposition(coordRoot, {
+                journal: () => {
+                    if (adapter === "claude-code")
+                        journalJanitor(coordRoot);
+                },
+                images: () => imageJanitor(coordRoot),
+                artifacts: () => autoCleanArtifacts(coordRoot),
+            }));
+        }
+        catch (err) {
+            logError(coordRoot, err, { phase: "storage-maintenance-auto" });
+        }
         let recovery = null;
         if (payload?.source === "compact") {
             try {
@@ -719,10 +858,13 @@ async function main() {
         catch (err) {
             logError(coordRoot, err, { phase: "session-start-systemMessage" });
         }
-        // Pull advisory cross-machine presence. V3 never publishes from the
-        // disposable heartbeat cache.
+        // Cross-machine presence is derived from the authority-safe V3 projection,
+        // not the disposable heartbeat cache. Announce this session, pull peers,
+        // and keep the optional live relay connected.
         try {
+            publishPresence(coordRoot);
             fetchPresence(coordRoot);
+            ensureRelayDaemon(coordRoot);
         }
         catch (err) {
             logError(coordRoot, err, { phase: "session-start-presence" });
@@ -743,12 +885,21 @@ async function main() {
             journalArchive(coordRoot, owner.instance_id);
             runSessionSyncExtension(coordRoot, true);
         }
+        // Publish the post-cleanup V3 projection so remote machines see this
+        // session disappear without waiting for the stale window.
+        try {
+            publishPresence(coordRoot);
+        }
+        catch (err) {
+            logError(coordRoot, err, { phase: "session-end-presence" });
+        }
     }
-    // Phase 8: SubagentStart: sync-project to create the subagent heartbeat,
-    // log the lifecycle event, and emit a context message announcing the
-    // subagent (claude-code + cursor; codex doesn't fan out subagents today).
+    // Phase 8: SubagentStart: the child generation was opened above from the
+    // native delegation identity. Refresh its disposable projection, log the
+    // lifecycle event, and emit a context message announcing the subagent.
     if (norm.event_type === "agent.started") {
         try {
+            const childInstanceId = data.agent_id ?? owner.instance_id;
             const agentCoordBin = coordBinPath("agent-coord", coordRoot) ?? "";
             if (existsSync(agentCoordBin)) {
                 spawnSync(agentCoordBin, ["project"], {
@@ -758,12 +909,12 @@ async function main() {
                 });
                 spawnSync(agentCoordBin, [
                     "log",
-                    `SUBAGENT_START  agent_type=${data.agent_type ?? "unknown"} agent_id=${owner.instance_id.slice(0, 8)} platform=${adapterPlatform(adapter)}`,
+                    `SUBAGENT_START  agent_type=${data.agent_type ?? "unknown"} agent_id=${childInstanceId.slice(0, 8)} platform=${adapterPlatform(adapter)}`,
                     "--instance",
-                    owner.instance_id,
+                    childInstanceId,
                 ], { encoding: "utf8", timeout: 2000, env: childEnv(coordRoot) });
             }
-            emitSubagentStartContext(coordRoot, owner.instance_id, sessionId, data, adapter);
+            emitSubagentStartContext(coordRoot, childInstanceId, sessionId, data, adapter);
         }
         catch (err) {
             logError(coordRoot, err, { phase: "subagent-start-project" });
@@ -772,16 +923,19 @@ async function main() {
     // Phase 8: SubagentStop: delete subagent heartbeat + log.
     if (norm.event_type === "agent.completed") {
         try {
-            cleanupSessionEnd(coordRoot, owner.instance_id, data.reason ?? "unknown");
+            const childInstanceId = payload?.subagent_id ?? payload?.agent_id ?? owner.instance_id;
+            cleanupSessionEnd(coordRoot, childInstanceId, data.reason ?? "unknown");
             const agentCoordBin = coordBinPath("agent-coord", coordRoot) ?? "";
             if (existsSync(agentCoordBin)) {
                 spawnSync(agentCoordBin, [
                     "log",
-                    `SUBAGENT_STOP   agent_id=${owner.instance_id.slice(0, 8)} platform=${adapterPlatform(adapter)}`,
+                    `SUBAGENT_STOP   agent_id=${childInstanceId.slice(0, 8)} platform=${adapterPlatform(adapter)}`,
                     "--instance",
-                    owner.instance_id,
+                    childInstanceId,
                 ], { encoding: "utf8", timeout: 2000, env: childEnv(coordRoot) });
             }
+            const { reconcileSessionFinalizationV3 } = await import("../agents/session-finalizer-v3.js");
+            reconcileSessionFinalizationV3(coordRoot, { archive_observations: [] });
         }
         catch (err) {
             logError(coordRoot, err, { phase: "subagent-stop-cleanup" });
@@ -841,6 +995,16 @@ async function main() {
         if (adapter === "claude-code") {
             runSessionSyncExtension(coordRoot, false);
         }
+        // Publish after the canonical turn event has landed so the blob carries
+        // current task, activity, and claim state. Re-ensure the relay here because
+        // its daemon intentionally exits when a machine has no live sessions.
+        try {
+            publishPresence(coordRoot);
+            ensureRelayDaemon(coordRoot);
+        }
+        catch (err) {
+            logError(coordRoot, err, { phase: "stop-presence" });
+        }
         // Stop verdict (V3 ritual + task/status gate). Direct in-process call: the
         // rule lives in Harnery. agent-hook already emitted this turn.completed
         // with privacy-safe ritual observations, so the evidence is in the stream.
@@ -849,16 +1013,41 @@ async function main() {
             instance_id: owner.instance_id,
             session_id: sessionId,
             adapter,
+            stop_hook_active: payload?.stop_hook_active === true,
+            status_box_present_strict: data.status_box_present_strict === true,
             bypass: coordEnv("AGENT_COORD_BYPASS_STOP") === "1",
             workflow_child: coordEnv("WORKFLOW_CHILD") === "1",
         });
         if (!verdict.allow) {
-            // Adapter-aware enforcement channel: Claude Code honors exit-2 + stderr
-            // as a turn block; Cursor ignores exit codes and re-prompts only via a
-            // `followup_message` it auto-submits. Codex returned observe-only above.
-            // emitStopBlock writes the right shape and returns the exit code to use.
-            const { emitStopBlock } = await import("./adapter/output.js");
-            return emitStopBlock(adapter, verdict, coordRoot);
+            // Backstop for sessions whose evidence can never land (e.g. a headless
+            // child whose status command resolves to a different owner): after
+            // `cap` consecutive blocked stops in one cycle, allow the stop instead
+            // of bouncing the model forever. Cycle boundaries come from the
+            // adapter's continuation flag, so adapters without one are unaffected.
+            const { recordRemediationBlock } = await import("./remediation-cap.js");
+            const remediation = recordRemediationBlock(sessionId, payload?.stop_hook_active === true);
+            if (remediation.exceeded) {
+                appendDebug(coordRoot, {
+                    ...debugBase,
+                    skipped: "stop-remediation-cap-exhausted",
+                    blocked_rule: verdict.rule,
+                    blocked_count: remediation.count,
+                    session_id: sessionId,
+                    remediation_cycle_anchor: verdict.remediation_cycle_anchor,
+                });
+            }
+            else {
+                // Adapter-aware enforcement channel: Claude Code honors exit-2 + stderr
+                // as a turn block; Cursor ignores exit codes and re-prompts only via a
+                // `followup_message` it auto-submits. Codex returned observe-only above.
+                // emitStopBlock writes the right shape and returns the exit code to use.
+                const { emitStopBlock } = await import("./adapter/output.js");
+                return emitStopBlock(adapter, verdict, coordRoot);
+            }
+        }
+        else {
+            const { clearRemediationCount } = await import("./remediation-cap.js");
+            clearRemediationCount(sessionId);
         }
         // An explicit end requested from inside this turn cannot be authoritative
         // until the adapter has committed turn.completed above. Reconcile only
@@ -873,6 +1062,8 @@ async function main() {
         catch (err) {
             logError(coordRoot, err, { phase: "stop-explicit-session-finalization" });
         }
+        if (adapter === "codex")
+            scheduleCodexRuntimeContextRetry(coordRoot, sessionId);
     }
     // Phase 7: PreToolUse: heartbeat + pid-map self-heal on every tool call.
     // Adapter-agnostic: both writes have the same shape regardless of who fired.
@@ -900,10 +1091,13 @@ async function main() {
         // runs before a name exists; every later tool waits until the exact block
         // is the first assistant text after the mint result. Cursor supplies
         // agent_message directly; Claude Code and Codex are resolved from their
-        // JSONL transcripts. Later commentary must not erase an already-correct
-        // display, and an unreadable transcript must not deadlock every tool.
+        // JSONL transcripts. Cursor's current narration can provide positive
+        // evidence, but cannot disprove an earlier response; afterAgentResponse
+        // stamps that durable sighting. Later commentary must not erase an
+        // already-correct display, and unavailable evidence must not deadlock
+        // every tool.
         try {
-            const displayAllowed = await enforcePendingSessionNameDisplay(coordRoot, owner.instance_id, adapter, payload);
+            const displayAllowed = await enforcePendingSessionNameDisplay(coordRoot, owner.instance_id, adapter, payload, generationBoundHeartbeat(readHeartbeat(coordRoot, owner.instance_id), recordedGenerationId));
             if (!displayAllowed)
                 return 0;
         }
@@ -973,33 +1167,84 @@ async function main() {
     }
     return 0;
 }
-async function enforcePendingSessionNameDisplay(coordRoot, instanceId, adapter, payload) {
-    const name = sessionNameDisplayPending(readLiveCoordinationRow(coordRoot, instanceId));
+function scheduleCodexRuntimeContextRetry(coordRoot, nativeSessionId) {
+    const modulePath = process.argv[1];
+    if (!modulePath)
+        return;
+    try {
+        const child = spawn(process.execPath, [modulePath, "runtime-context-retry", "--adapter", "codex", "--session-id", nativeSessionId], {
+            cwd: coordRoot,
+            detached: true,
+            stdio: "ignore",
+            env: childEnv(coordRoot),
+        });
+        child.unref();
+    }
+    catch (err) {
+        logError(coordRoot, err, { phase: "runtime-context-retry-spawn" });
+    }
+}
+async function runRuntimeContextRetryWorker(coordRoot, adapter, extra) {
+    const nativeSessionId = extraArg(extra, "--session-id");
+    if (adapter !== "codex" || !nativeSessionId)
+        return 0;
+    for (const [index, delayMs] of [400, 1_000].entries()) {
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+        const route = resolveLiveEventLedgerRouteV3(coordRoot);
+        if (route.state !== "v3")
+            return 0;
+        const result = reconcileLivePendingRuntimeContextV3({
+            coordRoot,
+            route,
+            nativeSessionId,
+            finalAttempt: index === 1,
+        });
+        if (result.state !== "pending" && result.state !== "busy")
+            return 0;
+    }
+    return 0;
+}
+async function enforcePendingSessionNameDisplay(coordRoot, instanceId, adapter, payload, coordination) {
+    const name = sessionNameDisplayPending(coordination);
     if (!name)
         return true;
     const command = extractBashCommand(payload?.tool_name, payload?.tool_input);
     if (isSessionNameRemediationCommand(command, resolveBinName(coordRoot)))
         return true;
-    const inspection = payload?.agent_message !== undefined
+    const inspection = adapter === "cursor" && payload?.agent_message !== undefined
         ? {
             state: assistantTextStartsWithSessionNameBlock(payload.agent_message, name)
                 ? "present"
-                : "absent",
-        }
-        : inspectSessionNameDisplayImmediately(payload?.transcript_path, name, assistantTextStartsWithSessionNameBlock);
+                : "unavailable",
+        }
+        : inspectSessionNameDisplayImmediately(
+        // Codex hook payloads omit transcript_path on every event, which
+        // left this inspection permanently unavailable and the latch never
+        // stamped. Discover the rollout by session id; the scan only runs
+        // while a name is pending, so the latch closes after one success.
+        payload?.transcript_path ??
+            (adapter === "codex"
+                ? discoverCodexSessionTranscript(payload?.session_id ?? instanceId)
+                : undefined), name, assistantTextStartsWithSessionNameBlock);
     if (inspection.state === "present") {
         stampSessionNameSeen(coordRoot, instanceId, name);
         return true;
     }
     if (inspection.state === "unavailable") {
-        const { emitContext } = await import("./adapter/output.js");
-        emitContext(adapter, "PreToolUse", "Harnery could not verify the pending session-name display because the adapter transcript is unavailable or not flushed yet. This tool is allowed so the session cannot deadlock; display the requested block before later work. Verification remains pending.");
+        // PostToolUse already delivered the exact block for this mint. An
+        // unavailable transcript cannot become evidence, and repeating a generic
+        // reminder on every tool creates an unbounded Codex loop. Keep the latch
+        // honestly pending and fail open without another instruction. A later
+        // readable transcript can still verify it.
         return true;
     }
     const { emitDeny } = await import("./adapter/output.js");
-    emitDeny(adapter, sessionNameDisplayInstruction(name));
+    emitDeny(adapter, sessionNameDisplayRecoveryInstruction(name, resolveBinName(coordRoot)));
     return false;
 }
+function generationBoundHeartbeat(heartbeat, generationId) {
+    return generationId && heartbeat?.v3_generation_id === generationId ? heartbeat : null;
+}
 async function runPreToolUseGuard(coordRoot, instanceId, sessionId, data, adapter) {
     const toolName = data.tool_name ?? "";
     const rawTargets = collectGuardTargets(toolName, data);
@@ -1322,17 +1567,25 @@ async function emitUserPromptSubmitSystemMessage(coordRoot, instanceId, sessionI
         // Every human-facing adapter gets the first-session naming reminder from
         // the shared hook path. Cursor + Codex additionally get ongoing set-task
         // staleness nudges; Claude Code enforces those via its Stop transcript.
+        // Codex also gets the optional project-owned prompt reminder. Claude Code
+        // already has native output-style reminders, so duplicating it would add
+        // noise. Cursor's current beforeSubmitPrompt output can allow or block but
+        // cannot inject model context; an Always Apply rule is its durable carrier.
+        // Only the boolean route travels through argv, never the host's text.
+        if (adapter === "codex")
+            args.push("--host-prompt-reminder");
         // Codex gets a fresh status-footer reminder on every prompt. Its Stop hook
         // stays observe-only, so missing the footer never replaces the answer.
-        // Claude Code + Cursor (the Stop-ENFORCING adapters) get a fresh per-turn
-        // ritual reminder: satisfying the contract up front is far cheaper than
-        // the bounce-and-retry the Stop hook otherwise forces.
+        // Claude Code gets a fresh per-turn ritual reminder: satisfying the
+        // contract up front is far cheaper than the bounce-and-retry the Stop hook
+        // otherwise forces. Cursor's beforeSubmitPrompt cannot inject context, so
+        // its Stop follow-up remains the supported enforcement channel.
         args.push("--session-name-nudge");
         if (adapter === "cursor" || adapter === "codex")
             args.push("--task-nudge");
         if (adapter === "codex")
             args.push("--status-footer-nudge");
-        if (adapter === "claude-code" || adapter === "cursor")
+        if (adapter === "claude-code")
             args.push("--turn-ritual-nudge", adapter);
         const result = spawnSync(agentCoordBin, args, { encoding: "utf8", timeout: 3000 });
         if (result.status === 0 && result.stdout)
@@ -1468,11 +1721,15 @@ function completeRecoveryInjection(coordRoot, instanceId, sessionId, recovery) {
     void recovery;
 }
 main()
-    .then((code) => process.exit(code))
-    .catch((err) => {
-    logError(findCoordRoot(process.cwd()), err, {
+    .then(async (code) => {
+    await closeProcessLoggers();
+    process.exit(code);
+})
+    .catch(async (err) => {
+    logError(resolveCoordRoot(process.cwd()), err, {
         argv: process.argv.slice(2),
         pid: process.pid,
     });
+    await closeProcessLoggers();
     process.exit(0);
 });