harnery 0.31.6 → 0.33.0

package/dist/commands/agents.js

@@ -18,7 +18,10 @@ import { homedir, tmpdir } from "node:os";
 import { basename, join, resolve } from "node:path";
 import { coordBinPath } from "../core/agents/coord-bin.js";
 import { readStreamTailBounded } from "../core/agents/events/consume.js";
+import { checkGitFinalization, formatGitFinalizationFailure, readSessionWriteClaims, } from "../core/agents/finalization.js";
 import { emitCanonical, monorepoRoot, normalizeAdapter, readHeartbeat, resolveOwner, resolveOwnerBySessionEnv, resolveOwnerWithSource, } from "../core/agents/index.js";
+import { buildLifecycleSuggestedName, buildSuggestedName, } from "../core/agents/state/heartbeat-writer.js";
+import { foldSessionState, } from "../core/agents/state/session-state.js";
 import { coordFreshnessSeconds, resolveBinName } from "../core/config.js";
 import { readRemoteMachines } from "../core/presence/index.js";
 import { registerContextCommand } from "./context.js";
@@ -99,6 +102,16 @@ function formatPlatformLabel(platform) {
         return "Codex";
     return "CC";
 }
+function activityOf(hb) {
+    return hb.activity ?? "unknown";
+}
+function taskStateOf(hb) {
+    return hb.task_state ?? "active";
+}
+function lifecycleLabel(hb) {
+    const state = taskStateOf(hb);
+    return state === "blocked" && hb.task_state_reason ? `${state}: ${hb.task_state_reason}` : state;
+}
 let emit;
 export function registerAgentsCommand(program, emitParam, programContext) {
     emit = emitParam;
@@ -126,6 +139,7 @@ export function registerAgentsCommand(program, emitParam, programContext) {
         .command("status")
         .description("End-of-turn status box (name + session age + files held + peer count)")
         .option("--json", "JSON output instead of the box")
+        .option("--end-turn", "Treat this as the turn's closing status: issue the box only when this session's held paths are committed and their repositories are pushed")
         .option("--session-id <id>", "Lookup heartbeat by session_id directly, bypassing the ppid walk. " +
         "Use this when calling from a hook (the hook's process tree may not lead back to Claude Code's session pid). " +
         "The Stop hook payload includes session_id; pass it through.")
@@ -181,6 +195,14 @@ export function registerAgentsCommand(program, emitParam, programContext) {
         .action((text, opts) => {
         runSetTask(text.join(" "), opts);
     });
+    cmd
+        .command("lifecycle <state>")
+        .description("Declare this session's task lifecycle: active, blocked, or done")
+        .option("--reason <text>", "Explain the lifecycle declaration")
+        .option("--session-id <id>", "Target the heartbeat with this session_id directly, bypassing the ppid walk.")
+        .action((state, opts) => {
+        runLifecycle(state, opts);
+    });
     cmd
         .command("release-claim <path>")
         .description("Drop a file claim from your heartbeat. Operator escape hatch when a " +
@@ -203,7 +225,7 @@ export function registerAgentsCommand(program, emitParam, programContext) {
         .command("wait <name>")
         .description(`Block until a peer agent releases files (their \`files_touched\` becomes empty, OR they exit). Pair with \`${resolveBinName()} agents ping\` to coordinate hand-offs.`)
         .option("--file <path>", "Wait only for these specific paths (repeatable)", collectPath, [])
-        .option("--timeout <dur>", "Give up after this duration; suffix s/m/h/d (e.g. 30s, 5m, 1h). Bare integer = minutes. Default 60m.", "60m")
+        .option("--timeout <dur>", "Give up after this duration; suffix s/m/h/d is required (e.g. 30s, 5m, 1h). Default 60m.", "60m")
         .option("--poll-secs <n>", "Poll interval in seconds (default 5)", "5")
         .option("--quiet", "Suppress progress lines")
         .option("--json", "JSON output (terminal status, only printed at exit)")
@@ -223,8 +245,8 @@ export function registerAgentsCommand(program, emitParam, programContext) {
     });
     cmd
         .command("health")
-        .description("One-screen coord-layer health rollup: heal events, schema validity, " +
-        "commit-guard activity, council activity, anomalies. Designed for " +
+        .description("One-screen coord-layer health rollup: heal events, council activity, " +
+        "zombie detection, and anomalies. Designed for " +
         "daily glance + dashboard ingestion. Reads .harnery/.")
         .option("--since <window>", "Window (Nh | Nd). Default: 24h.", "24h")
         .option("--json", "JSON envelope output")
@@ -236,7 +258,7 @@ export function registerAgentsCommand(program, emitParam, programContext) {
         .description("Adapter wiring probe: ppid chain, comm names, pid-map anchor, sample payload paths. " +
         "With --replay-samples, also replays every checked-in sample payload against the live " +
         "adapter in an isolated sandbox to catch adapter / payload-shape drift. " +
-        "Complements heal-events (drift telemetry). Id: claude_code | cursor.")
+        "Complements heal-events (drift telemetry). Id: claude-code | cursor.")
         .option("--json", "JSON envelope output")
         .option("--replay-samples", "Replay docs/api/<adapter>-hooks/samples/*.json against the live adapter in an isolated sandbox. " +
         "Exits non-zero if any sample crashes the adapter.")
@@ -359,6 +381,9 @@ function registerIdentityCommands(parent) {
         "the event ledger, and the heartbeat.")
         .option("--json", "JSON envelope output")
         .option("--session-id <id>", "Bind the heartbeat with this session_id directly, bypassing the ppid walk.")
+        .option("--force-ancestor", "Allow assuming a persona this session's fork lineage descends from " +
+        "(default: refused, because a fork's inherited transcript asserting that " +
+        "name is not a role handoff).")
         .action((target, opts) => {
         runIdentityAssume(target, opts);
     });
@@ -385,7 +410,9 @@ function runIdentityAssume(target, opts) {
         process.exit(1);
     }
     try {
-        const result = assumeIdentity(root, owner, target);
+        const result = assumeIdentity(root, owner, target, {
+            forceAncestor: opts.forceAncestor ?? false,
+        });
         emit.data({
             ...result,
             display_name: displayAgentName(result.name),
@@ -590,9 +617,15 @@ function runWhoami(opts) {
         last_tool: hb.last_tool ?? null,
         last_tool_target: hb.last_tool_target ?? null,
         task: hb.task ?? null,
+        activity: activityOf(hb),
+        activity_updated_at: hb.activity_updated_at ?? null,
+        activity_source: hb.activity_source ?? null,
+        task_state: taskStateOf(hb),
+        task_state_updated_at: hb.task_state_updated_at ?? null,
+        task_state_reason: hb.task_state_reason ?? null,
         turn_summary: hb.turn_summary ?? null,
         turn_summary_updated_at: hb.turn_summary_updated_at ?? null,
-        platform: hb.platform ?? "claude_code",
+        platform: hb.platform ?? "claude-code",
     };
     emit.data({ ...row, resolution_source: resolved.source, note: SUBAGENT_NOTE });
     if (process.stdout.isTTY && !opts.json) {
@@ -679,9 +712,15 @@ function runList(opts) {
                 last_tool: h.last_tool ?? null,
                 last_tool_target: h.last_tool_target ?? null,
                 task: h.task ?? null,
+                activity: activityOf(h),
+                activity_updated_at: h.activity_updated_at ?? null,
+                activity_source: h.activity_source ?? null,
+                task_state: taskStateOf(h),
+                task_state_updated_at: h.task_state_updated_at ?? null,
+                task_state_reason: h.task_state_reason ?? null,
                 turn_summary: h.turn_summary ?? null,
                 turn_summary_updated_at: h.turn_summary_updated_at ?? null,
-                platform: h.platform ?? "claude_code",
+                platform: h.platform ?? "claude-code",
             });
             continue;
         }
@@ -704,9 +743,15 @@ function runList(opts) {
             last_tool: h.last_tool ?? null,
             last_tool_target: h.last_tool_target ?? null,
             task: h.task ?? null,
+            activity: activityOf(h),
+            activity_updated_at: h.activity_updated_at ?? null,
+            activity_source: h.activity_source ?? null,
+            task_state: taskStateOf(h),
+            task_state_updated_at: h.task_state_updated_at ?? null,
+            task_state_reason: h.task_state_reason ?? null,
             turn_summary: h.turn_summary ?? null,
             turn_summary_updated_at: h.turn_summary_updated_at ?? null,
-            platform: h.platform ?? "claude_code",
+            platform: h.platform ?? "claude-code",
         });
     }
     // Guard missing started_at: a heartbeat seeded from a stray event can lack it
@@ -730,9 +775,15 @@ function runList(opts) {
                 last_tool: a.last_tool ?? null,
                 last_tool_target: null,
                 task: a.task ?? null,
+                activity: a.activity ?? "unknown",
+                activity_updated_at: null,
+                activity_source: null,
+                task_state: a.task_state ?? "active",
+                task_state_updated_at: null,
+                task_state_reason: a.task_state_reason ?? null,
                 turn_summary: a.turn_summary ?? null,
                 turn_summary_updated_at: null,
-                platform: a.platform ?? "claude_code",
+                platform: a.platform ?? "claude-code",
                 machine: rm.machine,
             });
         }
@@ -975,6 +1026,12 @@ async function runShow(name, opts) {
         age_secs: ageSecs,
         last_heartbeat_secs_ago: heartbeatAgeSecs,
         task: hb.task ?? null,
+        activity: activityOf(hb),
+        activity_updated_at: hb.activity_updated_at ?? null,
+        activity_source: hb.activity_source ?? null,
+        task_state: taskStateOf(hb),
+        task_state_updated_at: hb.task_state_updated_at ?? null,
+        task_state_reason: hb.task_state_reason ?? null,
         turn_summary: hb.turn_summary ?? null,
         turn_summary_updated_at: hb.turn_summary_updated_at ?? null,
         title: report?.title ?? null,
@@ -1002,6 +1059,8 @@ async function runShow(name, opts) {
     lines.push(`agent-${data.name}  ${subtitle}`);
     lines.push(`  session  ${formatAge(ageSecs)} old · kind=${data.kind} · session_id=${data.session_id.slice(0, 8)}…`);
     lines.push(`  last heartbeat: ${formatAge(heartbeatAgeSecs)} ago`);
+    lines.push(`  activity:       ${data.activity}`);
+    lines.push(`  lifecycle:      ${data.task_state}${data.task_state === "blocked" && data.task_state_reason ? `: ${data.task_state_reason}` : ""}`);
     if (data.last_tool) {
         const target = data.last_tool_target ? ` ${truncate(data.last_tool_target, 80)}` : "";
         lines.push(`  last activity:  ${data.last_tool}${target}`);
@@ -1168,15 +1227,17 @@ function runSetTask(task, opts) {
         });
         process.exit(1);
     }
-    // Snapshot BEFORE the mutation: a heartbeat that has never carried a task
-    // has no `task_updated_at` stamp (setTask always stamps it, even on a clear),
-    // so its absence is the "focus never declared this session" signal — i.e. the
-    // first set-task of the session. That's the natural moment to also hand the
-    // operator a session name built from the same declaration (one source of
-    // truth: the focus you declare names the session). Distinct from task===""
-    // (a deliberate clear), which carries a stamp and does NOT re-trigger.
+    // Snapshot BEFORE the mutation: the writer stamps `suggested_session_name`
+    // on the session's first NON-EMPTY declaration (one source of truth: the
+    // focus you declare names the session). A bare clear never consumes the
+    // naming window, and subagent/workflow kinds are never named — see
+    // heartbeat-writer.setTask. This call is the naming call exactly when the
+    // stamp appears across the mutation.
     const priorHb = readHeartbeat(myOwner);
-    const firstOfSession = !priorHb?.task_updated_at;
+    const normalizedTask = task.length > 0 ? task : undefined;
+    const lifecycleWarning = priorHb && (priorHb.task_state ?? "active") !== "active" && priorHb.task !== normalizedTask
+        ? `Task text changed while lifecycle is ${priorHb.task_state}; run \`${resolveBinName(root)} agents lifecycle active\` to reopen it explicitly.`
+        : null;
     // Heartbeat mutation goes through agent-coord (atomic temp+rename).
     const helper = agentCoordOrExit(root);
     const result = spawnSync(helper, ["set-task", myOwner, task], {
@@ -1191,38 +1252,172 @@ function runSetTask(task, opts) {
         process.exit(1);
     }
     const hb = readHeartbeat(myOwner);
+    // The naming call: the mutation just stamped `suggested_session_name` for
+    // the first time. `first_of_session: true` means exactly "this call produced
+    // the session name" — it is never true with a null name (an empty first
+    // declaration or a `--session-id` relay both keep the window open instead).
+    const suggestedName = !priorHb?.suggested_session_name && hb?.suggested_session_name
+        ? hb.suggested_session_name
+        : null;
+    const firstOfSession = suggestedName !== null;
     emitCanonical({
         type: "state.task_set",
         owner: myOwner,
         session: hb?.session_id ?? myOwner,
         adapter: normalizeAdapter(hb?.platform),
-        data: { task, cleared: !task || task.length === 0 },
+        data: {
+            task,
+            cleared: !task || task.length === 0,
+            first_of_session: firstOfSession,
+            suggested_session_name: suggestedName,
+        },
     });
-    // On the first focus declaration of a session, surface a suggested session
-    // name for the operator to set as their adapter tab title. Read the result
-    // (`suggested_session_name`) and reproduce it in a fenced code block so the
-    // UI's Copy button hands over the exact string. null on every later call.
-    const built = firstOfSession && !opts?.sessionId ? buildSuggestedName(hb?.name ?? "unknown", [task]) : null;
     emit.data({
         instance_id: myOwner,
         name: hb?.name ?? null,
         task: hb?.task ?? null,
         cleared: !task || task.length === 0,
         first_of_session: firstOfSession,
-        suggested_session_name: built?.suggestedName ?? null,
+        suggested_session_name: suggestedName,
+        ...(lifecycleWarning ? { warning: lifecycleWarning } : {}),
+        // Right-time instruction: the UserPromptSubmit nudge fires before the name
+        // exists; this result is the moment the model holds the string.
+        ...(suggestedName
+            ? {
+                note: "Reproduce suggested_session_name verbatim, by itself, in a fenced code block at the top of your reply — the operator copies it as the session/tab title.",
+            }
+            : {}),
     });
 }
-/**
- * Build the copy-pasteable session name from the coord identity + the agent's
- * description parts. Pure (no coord-state reads) so it's unit-testable; collapses
- * internal whitespace and trims. Returns null when the description is empty.
- */
-export function buildSuggestedName(agentName, descriptionParts) {
-    const description = descriptionParts.join(" ").replace(/\s+/g, " ").trim();
-    if (!description)
-        return null;
-    const name = agentName?.trim() || "unknown";
-    return { suggestedName: `Agent ${name} - ${description}`, description };
+function runLifecycle(rawState, opts) {
+    const state = rawState.trim().toLowerCase();
+    if (state !== "active" && state !== "blocked" && state !== "done") {
+        emit.error({
+            code: "invalid_lifecycle_state",
+            message: "lifecycle state must be one of: active, blocked, done",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    const root = monorepoRoot();
+    if (!root) {
+        emit.error({
+            code: "not_in_repo",
+            message: "not in an agent session; coord_root() returned null",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    if (!opts.sessionId)
+        ensureCursorSession(root);
+    const myOwner = opts.sessionId ?? resolveOwner();
+    if (!myOwner) {
+        emit.error({
+            code: "no_pidmap_entry",
+            message: "not in an agent session; ppid walk found no pid-map entry (pass --session-id to bypass)",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    const hb = readHeartbeat(myOwner);
+    if (!hb) {
+        emit.error({ code: "no_heartbeat", message: noHeartbeatMessage(myOwner) });
+        process.exitCode = 1;
+        return;
+    }
+    if (hb.kind === "subagent" || hb.kind === "transient" || hb.workflow_run_id) {
+        emit.error({
+            code: "lifecycle_not_human_facing",
+            message: "task lifecycle declarations are limited to human-facing sessions",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    const reason = opts.reason?.trim() || undefined;
+    if (state === "blocked" && !reason) {
+        emit.error({
+            code: "blocked_reason_required",
+            message: "lifecycle blocked requires --reason <text>",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    if (state === "done" && !hb.task) {
+        emit.error({
+            code: "task_required_for_done",
+            message: "declare a current task with agents set-task before marking it done",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    const priorState = hb.task_state ?? "active";
+    const priorReason = hb.task_state_reason || undefined;
+    if (priorState === state && priorReason === reason) {
+        emit.data({
+            instance_id: myOwner,
+            task_state: state,
+            reason: reason ?? null,
+            changed: false,
+            name_reminted: false,
+            git_finalization_checked: false,
+        });
+        return;
+    }
+    let finalization = null;
+    if (state === "done") {
+        const history = readSessionWriteClaims(root, hb.instance_id, hb.session_id ?? myOwner);
+        const touchedPaths = [...new Set([...(hb.files_touched ?? []), ...history.paths])];
+        finalization = checkGitFinalization(root, touchedPaths, {
+            claimHistoryComplete: history.complete,
+        });
+        if (!finalization.ok) {
+            emit.error({
+                code: "git_not_finalized",
+                message: formatGitFinalizationFailure(finalization, resolveBinName(root)).replace("the status box was not issued", "lifecycle was not changed"),
+            });
+            process.exitCode = 1;
+            return;
+        }
+    }
+    const suggestedName = buildLifecycleSuggestedName(hb.name ?? "unknown", hb.task, state);
+    const nameReminted = suggestedName !== null && suggestedName !== hb.suggested_session_name;
+    const emitted = emitCanonical({
+        type: "state.task_state",
+        owner: myOwner,
+        session: hb.session_id ?? myOwner,
+        adapter: normalizeAdapter(hb.platform),
+        data: {
+            state,
+            reason: reason ?? null,
+            prior_state: priorState,
+            name_reminted: nameReminted,
+            git_finalization_checked: finalization !== null,
+            ...(nameReminted ? { suggested_session_name: suggestedName } : {}),
+        },
+    });
+    if (!emitted) {
+        emit.error({
+            code: "lifecycle_event_failed",
+            message: "the lifecycle event could not be recorded; heartbeat state was left unchanged",
+        });
+        process.exitCode = 1;
+        return;
+    }
+    emit.data({
+        instance_id: myOwner,
+        task_state: state,
+        prior_state: priorState,
+        reason: reason ?? null,
+        changed: true,
+        name_reminted: nameReminted,
+        suggested_session_name: nameReminted ? suggestedName : null,
+        git_finalization_checked: finalization !== null,
+        ...(nameReminted
+            ? {
+                note: "Reproduce suggested_session_name verbatim, by itself, in a fenced code block at the top of your reply — the operator copies it as the session/tab title.",
+            }
+            : {}),
+    });
 }
 function runSuggestName(descriptionParts, opts) {
     const root = monorepoRoot();
@@ -1308,20 +1503,21 @@ function runStatus(opts) {
         });
         process.exit(1);
     }
-    // Stamp .last_status_at = NOW. The verdict path reads state.status_checked
-    // canonical events (emitted below), but the legacy heartbeat field is still
-    // populated for back-compat with consumers reading v1 directly. The stamp
-    // goes through agent-coord (atomic write).
-    try {
-        const helper = agentCoordOrExit(root);
-        spawnSync(helper, ["stamp-status-call", myOwner], {
-            encoding: "utf8",
-            timeout: 2000,
-            ...coordHelperOpts(root),
+    let finalization = null;
+    if (opts.endTurn) {
+        const history = readSessionWriteClaims(root, hb.instance_id, hb.session_id ?? myOwner);
+        const touchedPaths = [...new Set([...(hb.files_touched ?? []), ...history.paths])];
+        finalization = checkGitFinalization(root, touchedPaths, {
+            claimHistoryComplete: history.complete,
         });
-    }
-    catch {
-        /* non-fatal */
+        if (!finalization.ok) {
+            emit.error({
+                code: "git_not_finalized",
+                message: formatGitFinalizationFailure(finalization, resolveBinName(root)),
+            });
+            process.exitCode = 1;
+            return;
+        }
     }
     emitCanonical({
         type: "state.status_checked",
@@ -1330,6 +1526,7 @@ function runStatus(opts) {
         adapter: normalizeAdapter(hb.platform),
         data: {
             format: opts.json ? "json" : "box",
+            git_finalization_checked: opts.endTurn === true,
             agent_count: 0, // computed below, not yet available here; Phase 5 verdict reads owner-scope only
             included_self: true,
         },
@@ -1411,6 +1608,12 @@ function runStatus(opts) {
         instance_id: hb.instance_id,
         kind: normalizeKind(hb.kind),
         session_age_secs: ageSecs,
+        activity: activityOf(hb),
+        activity_updated_at: hb.activity_updated_at ?? null,
+        activity_source: hb.activity_source ?? null,
+        task_state: taskStateOf(hb),
+        task_state_updated_at: hb.task_state_updated_at ?? null,
+        task_state_reason: hb.task_state_reason ?? null,
         files_held: filesHeld,
         peers_live: livePeers.length,
         peers_stale: peersStale,
@@ -1424,6 +1627,9 @@ function runStatus(opts) {
             agents: m.agents.map((a) => ({
                 name: a.name || "unnamed",
                 task: a.task ?? null,
+                activity: a.activity ?? "unknown",
+                task_state: a.task_state ?? "active",
+                task_state_reason: a.task_state_reason ?? null,
                 files: a.files_touched?.length ?? 0,
             })),
         })),
@@ -1432,6 +1638,7 @@ function runStatus(opts) {
         context_window: ctxUsage?.window ?? null,
         timestamp_iso: new Date().toISOString(),
         timestamp_local: timeStr,
+        ...(finalization ? { finalization } : {}),
     };
     if (opts.json) {
         emit.config({ format: "json" });
@@ -1440,6 +1647,8 @@ function runStatus(opts) {
     }
     const rows = [
         ["session", formatAge(ageSecs)],
+        ["activity", activityOf(hb)],
+        ["lifecycle", lifecycleLabel(hb)],
         ["context", ctxStr],
         ["files", filesStr],
         ["peers", peersStr],
@@ -1794,16 +2003,15 @@ function readCanonicalEventsInWindow(root, cutoffMs) {
     }
     return out;
 }
-/** adapter ("claude-code") → legacy platform label ("claude_code") so the
- * existing formatPlatformLabel rendering keeps working unchanged. */
+/** Normalize adapter event data into the heartbeat platform value. */
 function adapterToPlatform(adapter) {
     if (adapter === "claude-code")
-        return "claude_code";
+        return "claude-code";
     if (adapter === "cursor")
         return "cursor";
     if (adapter === "codex")
         return "codex";
-    return "claude_code";
+    return "claude-code";
 }
 /** Project a canonical health.* event into the HealEvent shape the aggregators
  * already consume. Returns null for non-heal events. instance_id → display name
@@ -2123,6 +2331,12 @@ function traceLine(ev, allTools) {
         case "state.task_set":
             detail = d.cleared ? "(cleared)" : clip(s("task"));
             break;
+        case "state.task_state":
+            detail = `${s("prior_state") || "active"} → ${s("state") || "active"}${s("reason") ? ` · ${clip(s("reason"), 55)}` : ""}`;
+            break;
+        case "interaction.input_requested":
+            detail = s("request_kind") || s("tool_name") || "operator input requested";
+            break;
         case "state.status_checked":
             detail = "status box rendered";
             break;
@@ -2236,6 +2450,7 @@ function runTrace(name, opts) {
         }
     }
     const events = byId.get(resolvedId) ?? [];
+    const state = foldSessionState(events, { instance_id: resolvedId });
     const lines = events
         .map((ev) => traceLine(ev, !!opts.allTools))
         .filter((l) => l !== null)
@@ -2249,6 +2464,12 @@ function runTrace(name, opts) {
         instance_id: resolvedId,
         other_instances: candidateIds.filter((id) => id !== resolvedId),
         total_events: events.length,
+        activity: state.activity,
+        activity_updated_at: state.activity_updated_at ?? null,
+        activity_source: state.activity_source ?? null,
+        task_state: state.task_state,
+        task_state_updated_at: state.task_state_updated_at ?? null,
+        task_state_reason: state.task_state_reason ?? null,
         shown: shown.length,
         entries: shown,
     };
@@ -2259,6 +2480,7 @@ function runTrace(name, opts) {
     emit.data(result);
     const header = `Trace: agent-${displayName}  (${resolvedId.slice(0, 8)}…)  ${events.length} events${result.other_instances.length ? ` · ${result.other_instances.length} older instance(s) of this name` : ""}`;
     process.stdout.write(`${header}\n`); // lint-ok-emission: human trace view
+    process.stdout.write(`  activity=${state.activity} · lifecycle=${state.task_state}${state.task_state === "blocked" && state.task_state_reason ? `: ${state.task_state_reason}` : ""}\n`); // lint-ok-emission: human trace view
     if (shown.length === 0) {
         process.stdout.write("  (no events)\n"); // lint-ok-emission: human trace view
         return;
@@ -2292,18 +2514,7 @@ function runHealth(opts) {
     const councilsDir = resolve(root, ".harnery/councils");
     // Coordination telemetry reads from the canonical events.ndjson stream.
     // Heals come from health.*; council window-activity from council.*. The
-    // commit-guard + schema-invalid counters below have NO canonical equivalent
-    // yet. Their future home is the decision.* events (defined in schema.ts, not
-    // yet wired). Until then they report 0 (fields kept for output-shape
-    // compatibility).
     const heal = [];
-    const schemaInvalid = 0;
-    const schemaSamples = [];
-    const commitBlocked = 0;
-    const commitBypassed = 0;
-    const commitSuppressed = 0;
-    const editBlocked = 0;
-    const shellCandidates = 0;
     let councilAdvanced = 0;
     let councilClosed = 0;
     let councilArchived = 0;
@@ -2420,10 +2631,6 @@ function runHealth(opts) {
     }
     // Anomaly detection.
     const anomalies = [];
-    if (schemaInvalid > 0) {
-        const sampleList = schemaSamples.slice(0, 3).join(", ");
-        anomalies.push(`HEARTBEAT_SCHEMA_INVALID fired ${schemaInvalid}x; heartbeat shape failed validation${sampleList ? ` (samples: ${sampleList})` : ""}`);
-    }
     for (const { agent, count } of healTopAgents) {
         if (count >= 5) {
             anomalies.push(`${agent} self-healed ${count}x in ${opts.since}; possible idle-prune loop or PID instability`);
@@ -2477,14 +2684,6 @@ function runHealth(opts) {
             by_platform: healByPlatform,
             top_agents: healTopAgents,
         },
-        schema_invalid: { count: schemaInvalid, samples: schemaSamples },
-        commit_guards: {
-            blocked: commitBlocked,
-            bypassed: commitBypassed,
-            suppressed: commitSuppressed,
-            edit_blocked: editBlocked,
-            shell_candidates: shellCandidates,
-        },
         councils: {
             active: activeCouncils,
             archived_in_window: councilArchived,
@@ -2523,17 +2722,6 @@ function renderHealthBox(report) {
     }
     const topHealer = report.heal_events.top_agents[0];
     const topHealerStr = topHealer ? `${topHealer.agent} x${topHealer.count}` : "(none)";
-    const guardParts = [];
-    if (report.commit_guards.blocked > 0)
-        guardParts.push(`blocked ${report.commit_guards.blocked}`);
-    if (report.commit_guards.bypassed > 0)
-        guardParts.push(`bypassed ${report.commit_guards.bypassed}`);
-    if (report.commit_guards.suppressed > 0)
-        guardParts.push(`suppressed ${report.commit_guards.suppressed}`);
-    if (report.commit_guards.edit_blocked > 0)
-        guardParts.push(`edit-blocked ${report.commit_guards.edit_blocked}`);
-    if (report.commit_guards.shell_candidates > 0)
-        guardParts.push(`shell ${report.commit_guards.shell_candidates}`);
     const councilParts = [`${report.councils.active} active`];
     if (report.councils.advanced_in_window > 0)
         councilParts.push(`${report.councils.advanced_in_window} advanced`);
@@ -2566,8 +2754,6 @@ function renderHealthBox(report) {
                 ? "0"
                 : `${report.zombies.count} (${report.zombies.samples.join(", ")})`,
         ],
-        ["schema invalid", String(report.schema_invalid.count)],
-        ["commit guards", guardParts.length ? guardParts.join(", ") : "0"],
         ["councils", councilParts.join(", ")],
         ["anomalies", report.anomalies.length === 0 ? "(clean)" : `${report.anomalies.length} flagged`],
     ];
@@ -2585,10 +2771,10 @@ function runAdapterProbe(id, opts) {
     if (opts.json)
         emit.config({ format: "json" });
     const adapter = id.trim();
-    if (adapter !== "claude_code" && adapter !== "cursor") {
+    if (adapter !== "claude-code" && adapter !== "cursor") {
         emit.error({
             code: "bad_adapter",
-            message: "adapter id must be claude_code or cursor",
+            message: "adapter id must be claude-code or cursor",
         });
         process.exit(1);
     }
@@ -2784,7 +2970,7 @@ function replayAdapterSamples(adapter, root, relativeSampleDir, filter) {
         stopFailure: "stop-failure",
         StopFailure: "stop-failure",
     };
-    const adapterFlag = adapter === "claude_code" ? "claude-code" : adapter;
+    const adapterFlag = adapter;
     const sandbox = mkdtempSync(join(tmpdir(), "harn-adapter-probe-"));
     const results = [];
     try {
@@ -2909,15 +3095,15 @@ function extractEventAndPayload(parsed, filename) {
 function collectPath(value, prev) {
     return [...prev, value];
 }
-/** Parse "30", "30s", "5m", "1h", "2d" → ms. Bare integer defaults to minutes (back-compat). */
+/** Parse "30s", "5m", "1h", "2d" into milliseconds. */
 function parseDurationToMs(input) {
-    const match = input.trim().match(/^(\d+)([smhd]?)$/i);
+    const match = input.trim().match(/^(\d+)([smhd])$/i);
     if (!match)
         return null;
     const n = Number.parseInt(match[1], 10);
     if (!Number.isFinite(n) || n <= 0)
         return null;
-    const unit = (match[2] || "m").toLowerCase();
+    const unit = match[2].toLowerCase();
     const mult = { s: 1000, m: 60_000, h: 3_600_000, d: 86_400_000 };
     return n * mult[unit];
 }