harnery 0.30.0 → 0.31.1

package/dist/commands/checkpoint.d.ts

@@ -0,0 +1,12 @@
+import type { Command } from "commander";
+import type { EmitContext, HarneryProgramContext } from "../commander.js";
+/**
+ * `harn checkpoint`: durable context continuity across compaction.
+ *
+ * A checkpoint captures enough of the current work that a fresh generation of
+ * the same session can resume it after the adapter compacts or restarts.
+ * `create` writes a capsule, `show` prints the latest one, `status` reports the
+ * phase, generation, and whatever context telemetry the adapter supplied.
+ */
+export declare function registerCheckpointCommand(program: Command, emit: EmitContext, context?: HarneryProgramContext): void;
+//# sourceMappingURL=checkpoint.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../src/commands/checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAU1E;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,IAAI,CA2HN"}

package/dist/commands/checkpoint.js

@@ -0,0 +1,162 @@
+import { monorepoRoot, readHeartbeat, resolveOwner } from "../core/agents/index.js";
+import { checkpointContext, readContextState, readLatestCapsule, } from "../core/context/index.js";
+/**
+ * `harn checkpoint`: durable context continuity across compaction.
+ *
+ * A checkpoint captures enough of the current work that a fresh generation of
+ * the same session can resume it after the adapter compacts or restarts.
+ * `create` writes a capsule, `show` prints the latest one, `status` reports the
+ * phase, generation, and whatever context telemetry the adapter supplied.
+ */
+export function registerCheckpointCommand(program, emit, context) {
+    const command = program
+        .command("checkpoint")
+        .description("Durable context-continuity capsules: create one, show the latest, or report continuity phase.")
+        .option("--json", "Structured JSON output");
+    command
+        .command("status")
+        .description("Show context-continuity phase, generation, and latest telemetry")
+        .option("--session <id>", "Session id (defaults to the current agent heartbeat)")
+        .option("--instance <id>", "Agent instance id (defaults to the current owner)")
+        .option("--json", "Structured JSON output")
+        .action((opts) => {
+        try {
+            const json = opts.json || Boolean(command.opts().json);
+            const identity = resolveContinuityIdentity(context, opts);
+            const state = readContextState(identity.coordRoot, identity.sessionId);
+            if (json) {
+                emit.config({ format: "json" });
+                emit.data({ state, identity });
+                return;
+            }
+            if (!state) {
+                emit.text(`No context continuity state for session ${identity.sessionId}.\n`);
+                return;
+            }
+            const sample = state.latest_context;
+            const usage = sample
+                ? `${sample.used_tokens ?? "?"}/${sample.window_tokens ?? "?"} tokens${sample.used_percent === undefined ? "" : ` (${sample.used_percent}%)`}`
+                : "not reported by adapter";
+            emit.text(`${[
+                `Session:    ${state.session_id}`,
+                `Phase:      ${state.phase}`,
+                `Generation: ${state.generation}`,
+                `Telemetry:  ${usage}`,
+                `Capsule:    ${state.latest_capsule ?? "none"}`,
+                state.degraded_reason ? `Degraded:   ${state.degraded_reason}` : "",
+            ]
+                .filter(Boolean)
+                .join("\n")}\n`);
+        }
+        catch (err) {
+            emitCommandError(emit, "checkpoint_status_failed", err);
+        }
+    });
+    command
+        .command("create")
+        .description("Create a durable context-continuity capsule for the current work")
+        .option("--session <id>", "Session id (defaults to the current agent heartbeat)")
+        .option("--instance <id>", "Agent instance id (defaults to the current owner)")
+        .option("--adapter <id>", "claude-code, codex, or cursor (inferred from heartbeat)")
+        .option("--reason <reason>", "manual, pressure, pre_compact, or session_end", "manual")
+        .option("--note <text>", "Short continuation note for the recovered agent")
+        .option("--json", "Structured JSON output")
+        .action((opts) => {
+        try {
+            const json = opts.json || Boolean(command.opts().json);
+            const reason = parseCheckpointReason(opts.reason);
+            const identity = resolveContinuityIdentity(context, opts);
+            if (!identity.adapter) {
+                throw new Error("could not infer the adapter; pass --adapter claude-code|codex|cursor");
+            }
+            const result = checkpointContext(identity.coordRoot, {
+                sessionId: identity.sessionId,
+                instanceId: identity.instanceId,
+                adapter: identity.adapter,
+                cwd: context?.repoRoot ?? process.cwd(),
+                reason,
+                continuationNote: opts.note,
+            });
+            const output = {
+                capsule_id: result.capsule.capsule_id,
+                generation: result.capsule.generation,
+                path: result.state.latest_capsule,
+                phase: result.state.phase,
+                reused: result.reused,
+            };
+            if (json) {
+                emit.config({ format: "json" });
+                emit.data(output);
+                return;
+            }
+            emit.text(`Checkpointed context generation ${output.generation}: ${output.path ?? result.path}\n`);
+        }
+        catch (err) {
+            emitCommandError(emit, "checkpoint_create_failed", err);
+        }
+    });
+    command
+        .command("show")
+        .description("Show the latest durable context-continuity capsule")
+        .option("--session <id>", "Session id (defaults to the current agent heartbeat)")
+        .option("--instance <id>", "Agent instance id (defaults to the current owner)")
+        .option("--json", "Structured JSON output")
+        .action((opts) => {
+        try {
+            const json = opts.json || Boolean(command.opts().json);
+            const identity = resolveContinuityIdentity(context, opts);
+            const capsule = readLatestCapsule(identity.coordRoot, identity.sessionId);
+            if (!capsule) {
+                throw new Error(`no context capsule exists for session ${identity.sessionId}`);
+            }
+            if (json)
+                emit.config({ format: "json" });
+            emit.data(capsule);
+        }
+        catch (err) {
+            emitCommandError(emit, "checkpoint_show_failed", err);
+        }
+    });
+}
+function resolveContinuityIdentity(context, opts) {
+    const coordRoot = context?.resolveCoordRoot?.() ?? context?.repoRoot ?? monorepoRoot();
+    if (!coordRoot)
+        throw new Error("could not resolve a project containing .harnery/");
+    const instanceId = opts.instance ?? resolveOwner();
+    if (!instanceId) {
+        throw new Error("could not resolve the current agent; pass --instance and --session");
+    }
+    const heartbeat = readHeartbeat(instanceId);
+    const sessionId = opts.session ?? heartbeat?.session_id ?? instanceId;
+    const adapter = opts.adapter
+        ? parseAdapter(opts.adapter)
+        : adapterFromPlatform(heartbeat?.platform);
+    return { coordRoot, instanceId, sessionId, adapter };
+}
+function adapterFromPlatform(platform) {
+    if (platform === "claude_code" || platform === "claude-code")
+        return "claude-code";
+    if (platform === "cursor")
+        return "cursor";
+    if (platform === "codex")
+        return "codex";
+    return null;
+}
+function parseAdapter(value) {
+    if (value === "claude-code" || value === "codex" || value === "cursor")
+        return value;
+    throw new Error(`invalid adapter "${value}"; expected claude-code, codex, or cursor`);
+}
+function parseCheckpointReason(value) {
+    if (value === "manual" ||
+        value === "pressure" ||
+        value === "pre_compact" ||
+        value === "session_end") {
+        return value;
+    }
+    throw new Error(`invalid reason "${value}"; expected manual, pressure, pre_compact, or session_end`);
+}
+function emitCommandError(emit, code, err) {
+    emit.error({ code, message: err instanceof Error ? err.message : String(err) });
+    emit.setExitCode(1);
+}

package/dist/commands/context.d.ts

@@ -1,11 +1,11 @@
 import type { Command } from "commander";
 import type { EmitContext, HarneryProgramContext } from "../commander.js";
 /**
- * `harn context`: one-shot orientation snapshot.
+ * `harn agents context`: one-shot orientation snapshot.
  *
  * Aggregates self / time / repo / commits / submodules / peers (default) plus
  * opt-in services. Useful at session start, post-compaction, or before
  * dispatching subagents. Fail-open per section.
  */
-export declare function registerContextCommand(program: Command, emit: EmitContext, context?: HarneryProgramContext): void;
+export declare function registerContextCommand(parent: Command, emit: EmitContext, context?: HarneryProgramContext): void;
 //# sourceMappingURL=context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/commands/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAiB1E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,IAAI,CAqKN"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/commands/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAS1E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,IAAI,CAiDN"}

package/dist/commands/context.js

@@ -1,15 +1,13 @@
-import { monorepoRoot, readHeartbeat, resolveOwner } from "../core/agents/index.js";
-import { checkpointContext, readContextState, readLatestCapsule, } from "../core/context/index.js";
 import { buildContext, DEFAULT_SECTIONS, OPT_IN_SECTIONS, } from "../lib/context/index.js";
 /**
- * `harn context`: one-shot orientation snapshot.
+ * `harn agents context`: one-shot orientation snapshot.
  *
  * Aggregates self / time / repo / commits / submodules / peers (default) plus
  * opt-in services. Useful at session start, post-compaction, or before
  * dispatching subagents. Fail-open per section.
  */
-export function registerContextCommand(program, emit, context) {
-    const command = program
+export function registerContextCommand(parent, emit, context) {
+    parent
         .command("context")
         .description(`One-shot orientation snapshot: self, repo, submodules, peers, recent commits. Default sections: ${DEFAULT_SECTIONS.join(" / ")}. Opt-in: ${OPT_IN_SECTIONS.join(" / ")}.`)
         .option("--section <name>", `Limit to specific sections (comma-list or repeated; valid: ${[...DEFAULT_SECTIONS, ...OPT_IN_SECTIONS].join(", ")})`, collectSections, [])
@@ -39,152 +37,6 @@ export function registerContextCommand(program, emit, context) {
             process.exit(1);
         }
     });
-    command
-        .command("status")
-        .description("Show context-continuity phase, generation, and latest telemetry")
-        .option("--session <id>", "Session id (defaults to the current agent heartbeat)")
-        .option("--instance <id>", "Agent instance id (defaults to the current owner)")
-        .option("--json", "Structured JSON output")
-        .action((opts) => {
-        try {
-            const json = opts.json || Boolean(command.opts().json);
-            const identity = resolveContinuityIdentity(context, opts);
-            const state = readContextState(identity.coordRoot, identity.sessionId);
-            if (json) {
-                emit.config({ format: "json" });
-                emit.data({ state, identity });
-                return;
-            }
-            if (!state) {
-                emit.text(`No context continuity state for session ${identity.sessionId}.\n`);
-                return;
-            }
-            const sample = state.latest_context;
-            const usage = sample
-                ? `${sample.used_tokens ?? "?"}/${sample.window_tokens ?? "?"} tokens${sample.used_percent === undefined ? "" : ` (${sample.used_percent}%)`}`
-                : "not reported by harness";
-            emit.text(`${[
-                `Session:    ${state.session_id}`,
-                `Phase:      ${state.phase}`,
-                `Generation: ${state.generation}`,
-                `Telemetry:  ${usage}`,
-                `Capsule:    ${state.latest_capsule ?? "none"}`,
-                state.degraded_reason ? `Degraded:   ${state.degraded_reason}` : "",
-            ]
-                .filter(Boolean)
-                .join("\n")}\n`);
-        }
-        catch (err) {
-            emitCommandError(emit, "context_status_failed", err);
-        }
-    });
-    command
-        .command("checkpoint")
-        .description("Create a durable context-continuity capsule for the current work")
-        .option("--session <id>", "Session id (defaults to the current agent heartbeat)")
-        .option("--instance <id>", "Agent instance id (defaults to the current owner)")
-        .option("--harness <id>", "claude-code, codex, or cursor (inferred from heartbeat)")
-        .option("--reason <reason>", "manual, pressure, pre_compact, or session_end", "manual")
-        .option("--note <text>", "Short continuation note for the recovered agent")
-        .option("--json", "Structured JSON output")
-        .action((opts) => {
-        try {
-            const json = opts.json || Boolean(command.opts().json);
-            const reason = parseCheckpointReason(opts.reason);
-            const identity = resolveContinuityIdentity(context, opts);
-            if (!identity.harness) {
-                throw new Error("could not infer the harness; pass --harness claude-code|codex|cursor");
-            }
-            const result = checkpointContext(identity.coordRoot, {
-                sessionId: identity.sessionId,
-                instanceId: identity.instanceId,
-                harness: identity.harness,
-                cwd: context?.repoRoot ?? process.cwd(),
-                reason,
-                continuationNote: opts.note,
-            });
-            const output = {
-                capsule_id: result.capsule.capsule_id,
-                generation: result.capsule.generation,
-                path: result.state.latest_capsule,
-                phase: result.state.phase,
-                reused: result.reused,
-            };
-            if (json) {
-                emit.config({ format: "json" });
-                emit.data(output);
-                return;
-            }
-            emit.text(`Checkpointed context generation ${output.generation}: ${output.path ?? result.path}\n`);
-        }
-        catch (err) {
-            emitCommandError(emit, "context_checkpoint_failed", err);
-        }
-    });
-    command
-        .command("show")
-        .description("Show the latest durable context-continuity capsule")
-        .option("--session <id>", "Session id (defaults to the current agent heartbeat)")
-        .option("--instance <id>", "Agent instance id (defaults to the current owner)")
-        .option("--json", "Structured JSON output")
-        .action((opts) => {
-        try {
-            const json = opts.json || Boolean(command.opts().json);
-            const identity = resolveContinuityIdentity(context, opts);
-            const capsule = readLatestCapsule(identity.coordRoot, identity.sessionId);
-            if (!capsule) {
-                throw new Error(`no context capsule exists for session ${identity.sessionId}`);
-            }
-            if (json)
-                emit.config({ format: "json" });
-            emit.data(capsule);
-        }
-        catch (err) {
-            emitCommandError(emit, "context_show_failed", err);
-        }
-    });
-}
-function resolveContinuityIdentity(context, opts) {
-    const coordRoot = context?.resolveCoordRoot?.() ?? context?.repoRoot ?? monorepoRoot();
-    if (!coordRoot)
-        throw new Error("could not resolve a project containing .harnery/");
-    const instanceId = opts.instance ?? resolveOwner();
-    if (!instanceId) {
-        throw new Error("could not resolve the current agent; pass --instance and --session");
-    }
-    const heartbeat = readHeartbeat(instanceId);
-    const sessionId = opts.session ?? heartbeat?.session_id ?? instanceId;
-    const harness = opts.harness
-        ? parseHarness(opts.harness)
-        : harnessFromPlatform(heartbeat?.platform);
-    return { coordRoot, instanceId, sessionId, harness };
-}
-function harnessFromPlatform(platform) {
-    if (platform === "claude_code" || platform === "claude-code")
-        return "claude-code";
-    if (platform === "cursor")
-        return "cursor";
-    if (platform === "codex")
-        return "codex";
-    return null;
-}
-function parseHarness(value) {
-    if (value === "claude-code" || value === "codex" || value === "cursor")
-        return value;
-    throw new Error(`invalid harness "${value}"; expected claude-code, codex, or cursor`);
-}
-function parseCheckpointReason(value) {
-    if (value === "manual" ||
-        value === "pressure" ||
-        value === "pre_compact" ||
-        value === "session_end") {
-        return value;
-    }
-    throw new Error(`invalid reason "${value}"; expected manual, pressure, pre_compact, or session_end`);
-}
-function emitCommandError(emit, code, err) {
-    emit.error({ code, message: err instanceof Error ? err.message : String(err) });
-    emit.setExitCode(1);
 }
 function collectSections(value, prev) {
     const all = [...DEFAULT_SECTIONS, ...OPT_IN_SECTIONS];

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

@@ -1 +1 @@
-{"version":3,"file":"decision.d.ts","sourceRoot":"","sources":["../../src/commands/decision.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AA6CnD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,GAAG,IAAI,CAgStF"}
+{"version":3,"file":"decision.d.ts","sourceRoot":"","sources":["../../src/commands/decision.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AA6CnD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,GAAG,IAAI,CAsTtF"}

package/dist/commands/decision.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from "node:fs";
-import { emitCanonical, monorepoRoot, normalizeHarness, readHeartbeat, resolveOwner, } from "../core/agents/index.js";
+import { emitCanonical, monorepoRoot, normalizeAdapter, readHeartbeat, resolveOwner, } from "../core/agents/index.js";
 import { resolveBinName } from "../core/config.js";
 import { archiveDecision, claimDecision, DECISION_STAKES, fileDecision, isStakes, isStatus, isTier, isVerdict, listDecisions, reopenDecision, resolveDecision, reviewDecision, searchDecisions, showDecision, supersedeDecision, triageDecision, wontfixDecision, } from "../lib/decision/index.js";
 /**
@@ -72,23 +72,39 @@ export function registerDecisionCommand(program, emitParam) {
         .option("--stakes <small|medium|high>", "Filter by stakes")
         .option("--open", "Only non-terminal decisions (the live queue)")
         .option("--archived", "Include archived (graduated/terminal) decisions")
+        .option("--waiting", "Only what a human still has to rule on: tier 2, unresolved. Oldest-first within stakes.")
         .action((opts) => {
         const coordRoot = coordRootOrExit();
         const status = opts.status ? parseStatus(opts.status) : undefined;
         const tier = opts.tier !== undefined ? parseTier(opts.tier) : undefined;
         const stakes = opts.stakes ? parseStakes(opts.stakes) : undefined;
-        const rows = listDecisions(coordRoot, {
+        if (opts.waiting && tier !== undefined && tier !== 2) {
+            return fail("bad_request", "--waiting is tier 2 by definition; drop --tier or pass --tier 2");
+        }
+        let rows = listDecisions(coordRoot, {
             status,
-            tier,
+            tier: opts.waiting ? 2 : tier,
             stakes,
-            openOnly: opts.open,
-            includeArchived: opts.archived,
+            // --waiting implies the live queue: an archived or resolved decision is
+            // not waiting on anyone.
+            openOnly: opts.open || opts.waiting,
+            includeArchived: opts.waiting ? false : opts.archived,
         }).map(summarize);
+        if (opts.waiting) {
+            rows = rows.filter((r) => !r.resolved).sort(byStakesThenAge);
+        }
         emit.data({
             rows,
             meta: {
                 total: rows.length,
-                filter: { status, tier, stakes, open: !!opts.open, archived: !!opts.archived },
+                filter: {
+                    status,
+                    tier: opts.waiting ? 2 : tier,
+                    stakes,
+                    open: !!(opts.open || opts.waiting),
+                    archived: opts.waiting ? false : !!opts.archived,
+                    waiting: !!opts.waiting,
+                },
             },
         });
     });
@@ -319,6 +335,14 @@ function collect(value, previous) {
     return previous.concat([value]);
 }
 /** Compact row for list/search output — the full manifest is available via `show`. */
+const WAITING_STAKES_RANK = { high: 3, medium: 2, small: 1 };
+/** Highest stakes first, longest-open breaking ties. Stakes leads because it is
+ * the filer's own triage signal; age breaks ties so a question nobody has
+ * answered in three weeks does not sit behind an equally-weighted fresh one. */
+function byStakesThenAge(a, b) {
+    const rank = (WAITING_STAKES_RANK[String(b.stakes)] ?? 1) - (WAITING_STAKES_RANK[String(a.stakes)] ?? 1);
+    return rank !== 0 ? rank : String(a.filed_at ?? "").localeCompare(String(b.filed_at ?? ""));
+}
 function summarize(m) {
     return {
         decision_id: m.decision_id,
@@ -348,7 +372,7 @@ function emitDecisionEvent(type, data) {
         type,
         owner,
         session: hb?.session_id ?? owner,
-        harness: normalizeHarness(hb?.platform),
+        adapter: normalizeAdapter(hb?.platform),
         data,
     });
 }

package/dist/commands/deinit.d.ts

@@ -2,11 +2,11 @@
  * `harn deinit`: reverse what `harn init` wired into a project.
  *
  * `init` makes two kinds of change outside the harnery package:
- *   1. Merges `agent-hook` entries into the harness settings file
+ *   1. Merges `agent-hook` entries into the adapter settings file
  *      (Claude Code `.claude/settings.json`, Cursor `.cursor/hooks.json`, or
  *      Codex `.codex/hooks.json`).
  *   2. Creates the `.harnery/` coord root (runtime state: events, councils,
- *      identities, scratch) and stamps the host bin name into
+ *      identities, journal) and stamps the host bin name into
  *      `.harnery/config.jsonc`.
  *
  * `deinit` undoes (1) by default: it removes only harnery's hook entries from

package/dist/commands/deinit.js

@@ -2,11 +2,11 @@
  * `harn deinit`: reverse what `harn init` wired into a project.
  *
  * `init` makes two kinds of change outside the harnery package:
- *   1. Merges `agent-hook` entries into the harness settings file
+ *   1. Merges `agent-hook` entries into the adapter settings file
  *      (Claude Code `.claude/settings.json`, Cursor `.cursor/hooks.json`, or
  *      Codex `.codex/hooks.json`).
  *   2. Creates the `.harnery/` coord root (runtime state: events, councils,
- *      identities, scratch) and stamps the host bin name into
+ *      identities, journal) and stamps the host bin name into
  *      `.harnery/config.jsonc`.
  *
  * `deinit` undoes (1) by default: it removes only harnery's hook entries from
@@ -30,7 +30,7 @@ import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { relative, resolve } from "node:path";
 import { createInterface } from "node:readline";
 import { DEFAULT_BIN_NAME } from "../core/config.js";
-import { HARNESS_SPECS } from "../core/hooks/harness/events.js";
+import { ADAPTER_SPECS } from "../core/hooks/adapter/events.js";
 import { removeInstructions } from "../lib/instructions/apply.js";
 import { unwireHooks } from "./init.js";
 export function registerDeinitCommand(program, emit, binName) {
@@ -41,19 +41,19 @@ export function registerDeinitCommand(program, emit, binName) {
     const standalone = !binName || binName === DEFAULT_BIN_NAME;
     program
         .command("deinit")
-        .description("Reverse `harn init`: remove harnery's hook entries from the harness " +
+        .description("Reverse `harn init`: remove harnery's hook entries from the adapter " +
         "settings file (keeps any others). Pass --purge-state to also delete the " +
         ".harnery/ coord root (on a terminal it asks first). Idempotent; use " +
         "--dry-run to preview.")
-        .option("--harness <id>", "claude-code | cursor | codex", "claude-code")
+        .option("--adapter <id>", "claude-code | cursor | codex", "claude-code")
         .option("--dry-run", "Show what would change without writing")
         .option("--project-root <path>", "Project root (default: git toplevel, else cwd)")
         .option("--purge-state", "Also delete the .harnery/ coord root (runtime state, destructive)")
         .action(async (opts) => {
-        const harness = opts.harness;
-        const spec = HARNESS_SPECS[harness];
+        const adapter = opts.adapter;
+        const spec = ADAPTER_SPECS[adapter];
         if (!spec) {
-            emit.text(`Unknown harness '${opts.harness}'. Expected: claude-code | cursor | codex.`);
+            emit.text(`Unknown adapter '${opts.adapter}'. Expected: claude-code | cursor | codex.`);
             emit.setExitCode(1);
             return;
         }
@@ -73,7 +73,7 @@ export function registerDeinitCommand(program, emit, binName) {
         })) {
             purgeState = await confirmDeleteState(coordDir);
         }
-        // ── 1. unwire harness hooks ────────────────────────────────────────────
+        // ── 1. unwire adapter hooks ────────────────────────────────────────────
         const settingsPath = resolve(projectRoot, spec.settingsFile);
         if (!existsSync(settingsPath)) {
             actions.push(`· ${rel(projectRoot, settingsPath)} doesn't exist; no hooks to remove`);
@@ -93,7 +93,7 @@ export function registerDeinitCommand(program, emit, binName) {
             if (removed === 0) {
                 actions.push(`· no harnery hooks found in ${rel(projectRoot, settingsPath)}`);
             }
-            else if (harnessOnly(settings)) {
+            else if (adapterOnly(settings)) {
                 // Nothing left but what init itself put there (no hooks, at most a
                 // version key), so remove the file rather than leave an empty shell.
                 if (dryRun) {
@@ -115,7 +115,7 @@ export function registerDeinitCommand(program, emit, binName) {
             }
         }
         // ── 1b. agent-facing instructions block + skills ───────────────────────
-        const removed = removeInstructions(projectRoot, { harness, dryRun });
+        const removed = removeInstructions(projectRoot, { adapter, dryRun });
         actions.push(...removed.actions, ...removed.warnings.map((w) => `! ${w}`));
         // ── 2. coord root (opt-in; destructive) ────────────────────────────────
         if (purgeState) {
@@ -123,7 +123,7 @@ export function registerDeinitCommand(program, emit, binName) {
                 actions.push("· .harnery/ doesn't exist; nothing to purge");
             }
             else if (dryRun) {
-                actions.push("+ would delete .harnery/ and all coord state (events, councils, scratch)");
+                actions.push("+ would delete .harnery/ and all coord state (events, councils, journal)");
             }
             else {
                 rmSync(coordDir, { recursive: true, force: true });
@@ -160,7 +160,7 @@ export function engineRemovalHint() {
 /** Mirror scripts/teardown.sh's wording: explain what .harnery/ holds, then ask. */
 function confirmDeleteState(coordDir) {
     process.stdout.write("\nharnery saved this project's coordination history in .harnery/\n" +
-        "(its event log, councils, agent identities, and scratchpads):\n" +
+        "(its event log, councils, agent identities, and journals):\n" +
         `    ${coordDir}\n` +
         "Unwiring leaves that in place. Deleting it can't be undone.\n");
     return confirm("Delete this project's harnery history too? [y/N]");
@@ -176,7 +176,7 @@ function confirm(question) {
     });
 }
 /** True when an unwired settings object holds nothing but (optionally) `version`. */
-function harnessOnly(settings) {
+function adapterOnly(settings) {
     const keys = Object.keys(settings);
     return keys.length === 0 || (keys.length === 1 && keys[0] === "version");
 }
@@ -184,7 +184,7 @@ function render(projectRoot, dryRun, actions, hint) {
     const head = dryRun ? "harn deinit (dry run): no changes written" : "harn deinit";
     const tail = dryRun
         ? "\nRe-run without --dry-run to apply."
-        : "\nDone. harnery hooks are unwired; restart your harness session to drop them.";
+        : "\nDone. harnery hooks are unwired; restart your adapter session to drop them.";
     const hintBlock = hint ? `\n\n${hint}` : "";
     return `${head}\n  root: ${projectRoot}\n${actions.map((a) => `  ${a}`).join("\n")}${tail}${hintBlock}`;
 }