harnery 0.29.0 → 0.31.0

package/dist/core/hooks/resolve/intent.js

@@ -17,7 +17,7 @@ import { join } from "node:path";
  */
 export function resolveIntent(opts) {
     const stampPath = join(opts.coordRoot, ".harnery", `.last-intent.${opts.instanceId}`);
-    // 1. Fresh from the command itself (most reliable, cross-harness).
+    // 1. Fresh from the command itself (most reliable, cross-adapter).
     if (opts.commandIntentComment) {
         const cleaned = clamp(opts.commandIntentComment);
         if (cleaned) {

package/dist/core/hooks/resolve/owner.d.ts

@@ -3,7 +3,7 @@
  *
  * Precedence:
  *
- *   1. `HARNERY_AGENT_COORD_OWNER` env var. Set by harness adapters when they know
+ *   1. `HARNERY_AGENT_COORD_OWNER` env var. Set by adapter adapters when they know
  *      the owner identity at spawn time (Codex's apply_patch tool path uses
  *      this).
  *   2. Hook payload fields, in order: `agent_id` → `subagent_id` →

package/dist/core/hooks/resolve/owner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"owner.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/resolve/owner.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,KAAK,GAAG,SAAS,GAAG,aAAa,GAAG,iBAAiB,CAAA;CAAE,GAAG,IAAI,CA+ChG;AA2BD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ7E;AAED,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUxF;AAED,2DAA2D;AAC3D,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBnF"}
+{"version":3,"file":"owner.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/resolve/owner.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,KAAK,GAAG,SAAS,GAAG,aAAa,GAAG,iBAAiB,CAAA;CAAE,GAAG,IAAI,CAoDhG;AA2BD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ7E;AAED,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUxF;AAED,2DAA2D;AAC3D,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBnF"}

package/dist/core/hooks/resolve/owner.js

@@ -2,12 +2,13 @@ import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { coordEnv } from "../../../lib/env.js";
+import { checkPidToken } from "../../agents/state/proc-start.js";
 /**
  * Resolve the canonical `instance_id` for the current hook invocation.
  *
  * Precedence:
  *
- *   1. `HARNERY_AGENT_COORD_OWNER` env var. Set by harness adapters when they know
+ *   1. `HARNERY_AGENT_COORD_OWNER` env var. Set by adapter adapters when they know
  *      the owner identity at spawn time (Codex's apply_patch tool path uses
  *      this).
  *   2. Hook payload fields, in order: `agent_id` → `subagent_id` →
@@ -34,7 +35,7 @@ export function resolveOwner(opts) {
         }
     }
     // Pid-map ancestor walk. Start at own pid (the bash wrapper's bun child),
-    // walk up through ppids. The pid-map is stamped keyed by the harness PID, so
+    // walk up through ppids. The pid-map is stamped keyed by the adapter PID, so
     // we'll usually find it 1-3 hops up.
     const pidmap = join(opts.coordRoot, ".harnery", "pid-map");
     if (existsSync(pidmap)) {
@@ -45,9 +46,14 @@ export function resolveOwner(opts) {
             if (existsSync(file)) {
                 try {
                     const row = readFileSync(file, "utf8").trim();
-                    // Row shape: "<instance_id>" or "<instance_id>\t<platform>"
-                    const owner = row.split("\t")[0];
-                    if (owner && owner.length > 0) {
+                    // Row shape: "<instance_id>", "<instance_id>\t<platform>", or
+                    // "<instance_id>\t<platform>\t<start_token>".
+                    const [owner, , startToken] = row.split("\t");
+                    // A row whose start token disagrees with the process now holding this
+                    // pid is about a different, earlier process. Believing it hands this
+                    // session another agent's identity, so walk past it.
+                    const recycled = checkPidToken(pid, startToken || undefined) === "mismatch";
+                    if (owner && owner.length > 0 && !recycled) {
                         return {
                             instance_id: owner,
                             source: hops === 0 ? "pidmap-self" : "pidmap-ancestor",

package/dist/core/{scratch → journal}/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * Agent scratchpad: per-agent markdown journal at `.harnery/scratch/<instance_id>.md`.
+ * Agent journal: per-agent markdown journal at `.harnery/journal/<instance_id>.md`.
  *
  * Rules:
  *   - Single writer (the agent itself, via this lib). Peers read but never write.
@@ -7,59 +7,59 @@
  *   - Strict entry-header format: `## <Chicago datetime> · <category>`. The
  *     linter enforces this so format violations are impossible at the write path.
  *   - 50 KB hard cap; auto-prunes oldest entries when exceeded.
- *   - SessionEnd hook archives to `.harnery/scratch/archived/<instance_id>-<ts>.md`;
+ *   - SessionEnd hook archives to `.harnery/journal/archived/<instance_id>-<ts>.md`;
  *     SessionStart janitor deletes archives older than 7 days + surfaces the
  *     most-recent archive as a recovery cue.
  */
-export declare const SCRATCH_CATEGORIES: readonly ["note", "plan", "decision", "blocker", "question", "done", "handoff"];
-export type ScratchCategory = (typeof SCRATCH_CATEGORIES)[number];
-export declare const MAX_SCRATCH_BYTES: number;
-export declare const WARN_SCRATCH_BYTES: number;
+export declare const JOURNAL_CATEGORIES: readonly ["note", "plan", "decision", "blocker", "question", "done", "handoff"];
+export type JournalCategory = (typeof JOURNAL_CATEGORIES)[number];
+export declare const MAX_JOURNAL_BYTES: number;
+export declare const WARN_JOURNAL_BYTES: number;
 export declare const ARCHIVE_RETENTION_DAYS = 7;
 /** Entry-header regex: `## 2026-05-15 1:48 AM CDT · note` */
 export declare const ENTRY_HEADER_RE: RegExp;
-/** First line of every scratchpad file: this prefix followed by the agent name. */
-export declare const SCRATCHPAD_HEADER_PREFIX = "# Scratchpad: agent-";
-export interface ScratchEntry {
+/** First line of every journal file: this prefix followed by the agent name. */
+export declare const JOURNAL_HEADER_PREFIX = "# Journal: agent-";
+export interface JournalEntry {
     ts_iso: string;
     ts_display: string;
-    category: ScratchCategory;
+    category: JournalCategory;
     body: string;
 }
-export interface ScratchHeader {
+export interface JournalHeader {
     name: string;
     session_id: string;
     machine: string;
     started: string;
     last_updated: string;
 }
-export interface ScratchDoc {
+export interface JournalDoc {
     path: string;
-    header: ScratchHeader;
-    entries: ScratchEntry[];
+    header: JournalHeader;
+    entries: JournalEntry[];
     bytes: number;
 }
-export declare function scratchDir(): string;
+export declare function journalDir(): string;
 export declare function archiveDir(): string;
-export declare function scratchPath(instanceId: string): string;
+export declare function journalPath(instanceId: string): string;
 /** Format `Date` as `2026-05-15 1:48 AM CDT`, what we write into the file. */
 export declare function formatChicago(d?: Date): string;
-/** Parse a scratchpad file (or empty content) into a structured doc. */
-export declare function parseScratch(path: string, content: string): ScratchDoc;
+/** Parse a journal file (or empty content) into a structured doc. */
+export declare function parseJournal(path: string, content: string): JournalDoc;
 /** Serialize a parsed doc back to markdown. */
-export declare function serializeScratch(doc: ScratchDoc): string;
+export declare function serializeJournal(doc: JournalDoc): string;
 export interface LintIssue {
     line: number;
     message: string;
 }
-export declare function lintScratch(content: string, byteCap?: number): LintIssue[];
-export declare function appendEntry(instanceId: string, category: ScratchCategory, body: string): ScratchDoc;
+export declare function lintJournal(content: string, byteCap?: number): LintIssue[];
+export declare function appendEntry(instanceId: string, category: JournalCategory, body: string): JournalDoc;
 /** Move `<owner>.md` → `archived/<owner>-<ts>.md`. No-op if missing. Returns archive path (or null). */
-export declare function archiveScratch(instanceId: string): string | null;
+export declare function archiveJournal(instanceId: string): string | null;
 /** Delete archives older than `days`. Returns number deleted. */
 export declare function pruneArchives(days?: number): number;
-/** Sweep `.harnery/scratch/<owner>.md` files whose corresponding heartbeat is gone. */
-export declare function sweepOrphanScratchpads(): string[];
+/** Sweep `.harnery/journal/<owner>.md` files whose corresponding heartbeat is gone. */
+export declare function sweepOrphanJournals(): string[];
 /** List archive files sorted by mtime descending. */
 export declare function listArchives(): {
     path: string;
@@ -68,7 +68,7 @@ export declare function listArchives(): {
     bytes: number;
 }[];
 export declare function currentOwnerOrThrow(): string;
-export declare function loadScratch(instanceId: string): ScratchDoc | null;
+export declare function loadJournal(instanceId: string): JournalDoc | null;
 /** Resolve an agent name → instance_id by walking active heartbeats (case-insensitive). */
 export declare function resolveOwnerByName(name: string): string | null;
 //# sourceMappingURL=index.d.ts.map

package/dist/core/{scratch → journal}/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/scratch/index.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;GAYG;AAEH,eAAO,MAAM,kBAAkB,iFAQrB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAC3C,eAAO,MAAM,kBAAkB,QAAY,CAAC;AAC5C,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,6DAA6D;AAC7D,eAAO,MAAM,eAAe,QACyF,CAAC;AAEtH,mFAAmF;AACnF,eAAO,MAAM,wBAAwB,yBAAyB,CAAC;AAE/D,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAID,wBAAgB,UAAU,IAAI,MAAM,CAMnC;AAED,wBAAgB,UAAU,IAAI,MAAM,CAInC;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGtD;AAeD,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,CAAC,GAAE,IAAiB,GAAG,MAAM,CAW1D;AAID,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,CAwEtE;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAkBxD;AAmBD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,SAAoB,GAAG,SAAS,EAAE,CA2DrF;AAID,wBAAgB,WAAW,CACzB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,UAAU,CAgEZ;AAID,wGAAwG;AACxG,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQhE;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,IAAI,SAAyB,GAAG,MAAM,CAkBnE;AAED,uFAAuF;AACvF,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAajD;AAED,qDAAqD;AACrD,wBAAgB,YAAY,IAAI;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,EAAE,CAWF;AAID,wBAAgB,mBAAmB,IAAI,MAAM,CAM5C;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAIjE;AAED,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAoB9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/journal/index.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;GAYG;AAEH,eAAO,MAAM,kBAAkB,iFAQrB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAC3C,eAAO,MAAM,kBAAkB,QAAY,CAAC;AAC5C,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,6DAA6D;AAC7D,eAAO,MAAM,eAAe,QACyF,CAAC;AAEtH,gFAAgF;AAChF,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAID,wBAAgB,UAAU,IAAI,MAAM,CAMnC;AAED,wBAAgB,UAAU,IAAI,MAAM,CAInC;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGtD;AAeD,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,CAAC,GAAE,IAAiB,GAAG,MAAM,CAW1D;AAID,qEAAqE;AACrE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,CAwEtE;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAkBxD;AAmBD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,SAAoB,GAAG,SAAS,EAAE,CA2DrF;AAID,wBAAgB,WAAW,CACzB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,UAAU,CAgEZ;AAID,wGAAwG;AACxG,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQhE;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,IAAI,SAAyB,GAAG,MAAM,CAkBnE;AAED,uFAAuF;AACvF,wBAAgB,mBAAmB,IAAI,MAAM,EAAE,CAa9C;AAED,qDAAqD;AACrD,wBAAgB,YAAY,IAAI;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,EAAE,CAWF;AAID,wBAAgB,mBAAmB,IAAI,MAAM,CAM5C;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAIjE;AAED,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAoB9D"}

package/dist/core/{scratch → journal}/index.js

@@ -3,7 +3,7 @@ import { dirname, resolve } from "node:path";
 import { resolveMachineLabel } from "../../lib/machine.js";
 import { assertSafeInstanceId, monorepoRoot, readHeartbeat, resolveContainedFile, resolveOwner, } from "../agents/index.js";
 /**
- * Agent scratchpad: per-agent markdown journal at `.harnery/scratch/<instance_id>.md`.
+ * Agent journal: per-agent markdown journal at `.harnery/journal/<instance_id>.md`.
  *
  * Rules:
  *   - Single writer (the agent itself, via this lib). Peers read but never write.
@@ -11,11 +11,11 @@ import { assertSafeInstanceId, monorepoRoot, readHeartbeat, resolveContainedFile
  *   - Strict entry-header format: `## <Chicago datetime> · <category>`. The
  *     linter enforces this so format violations are impossible at the write path.
  *   - 50 KB hard cap; auto-prunes oldest entries when exceeded.
- *   - SessionEnd hook archives to `.harnery/scratch/archived/<instance_id>-<ts>.md`;
+ *   - SessionEnd hook archives to `.harnery/journal/archived/<instance_id>-<ts>.md`;
  *     SessionStart janitor deletes archives older than 7 days + surfaces the
  *     most-recent archive as a recovery cue.
  */
-export const SCRATCH_CATEGORIES = [
+export const JOURNAL_CATEGORIES = [
     "note",
     "plan",
     "decision",
@@ -24,30 +24,30 @@ export const SCRATCH_CATEGORIES = [
     "done",
     "handoff",
 ];
-export const MAX_SCRATCH_BYTES = 50 * 1024;
-export const WARN_SCRATCH_BYTES = 40 * 1024;
+export const MAX_JOURNAL_BYTES = 50 * 1024;
+export const WARN_JOURNAL_BYTES = 40 * 1024;
 export const ARCHIVE_RETENTION_DAYS = 7;
 /** Entry-header regex: `## 2026-05-15 1:48 AM CDT · note` */
 export const ENTRY_HEADER_RE = /^## (\d{4}-\d{2}-\d{2}) (\d{1,2}):(\d{2}) (AM|PM) (CDT|CST) · (note|plan|decision|blocker|question|done|handoff)$/;
-/** First line of every scratchpad file: this prefix followed by the agent name. */
-export const SCRATCHPAD_HEADER_PREFIX = "# Scratchpad: agent-";
+/** First line of every journal file: this prefix followed by the agent name. */
+export const JOURNAL_HEADER_PREFIX = "# Journal: agent-";
 // ─── Paths ────────────────────────────────────────────────────────────────
-export function scratchDir() {
+export function journalDir() {
     const root = monorepoRoot();
     if (!root)
         throw new Error("Not in a coord-aware repo (coord_root() returned null).");
-    const dir = resolve(root, ".harnery", "scratch");
+    const dir = resolve(root, ".harnery", "journal");
     mkdirSync(dir, { recursive: true });
     return dir;
 }
 export function archiveDir() {
-    const dir = resolve(scratchDir(), "archived");
+    const dir = resolve(journalDir(), "archived");
     mkdirSync(dir, { recursive: true });
     return dir;
 }
-export function scratchPath(instanceId) {
+export function journalPath(instanceId) {
     assertSafeInstanceId(instanceId);
-    return resolveContainedFile(scratchDir(), `${instanceId}.md`);
+    return resolveContainedFile(journalDir(), `${instanceId}.md`);
 }
 // ─── Chicago time formatting ──────────────────────────────────────────────
 const CHICAGO_FORMATTER = new Intl.DateTimeFormat("en-US", {
@@ -74,8 +74,8 @@ export function formatChicago(d = new Date()) {
     return `${year}-${month}-${day} ${hour}:${minute} ${dayPeriod} ${tz}`;
 }
 // ─── Parse / serialize ────────────────────────────────────────────────────
-/** Parse a scratchpad file (or empty content) into a structured doc. */
-export function parseScratch(path, content) {
+/** Parse a journal file (or empty content) into a structured doc. */
+export function parseJournal(path, content) {
     const lines = content.split("\n");
     const header = {
         name: "unknown",
@@ -87,8 +87,8 @@ export function parseScratch(path, content) {
     const entries = [];
     let i = 0;
     // ── header ──
-    if (lines[i]?.startsWith(SCRATCHPAD_HEADER_PREFIX)) {
-        header.name = lines[i].replace(SCRATCHPAD_HEADER_PREFIX, "").trim();
+    if (lines[i]?.startsWith(JOURNAL_HEADER_PREFIX)) {
+        header.name = lines[i].replace(JOURNAL_HEADER_PREFIX, "").trim();
         i++;
     }
     for (; i < lines.length; i++) {
@@ -146,9 +146,9 @@ export function parseScratch(path, content) {
     return { path, header, entries, bytes: Buffer.byteLength(content, "utf8") };
 }
 /** Serialize a parsed doc back to markdown. */
-export function serializeScratch(doc) {
+export function serializeJournal(doc) {
     const lines = [];
-    lines.push(`${SCRATCHPAD_HEADER_PREFIX}${doc.header.name}`);
+    lines.push(`${JOURNAL_HEADER_PREFIX}${doc.header.name}`);
     if (doc.header.session_id)
         lines.push(`session_id: ${doc.header.session_id}`);
     if (doc.header.machine)
@@ -179,12 +179,12 @@ function chicagoToIso(date, hourStr, minute, period, tz) {
     const hh = String(hour).padStart(2, "0");
     return `${date}T${hh}:${minute}:00${offset}`;
 }
-export function lintScratch(content, byteCap = MAX_SCRATCH_BYTES) {
+export function lintJournal(content, byteCap = MAX_JOURNAL_BYTES) {
     const issues = [];
     const lines = content.split("\n");
     // Frontmatter checks
-    if (!lines[0]?.startsWith(SCRATCHPAD_HEADER_PREFIX)) {
-        issues.push({ line: 1, message: `missing '${SCRATCHPAD_HEADER_PREFIX}<name>' header` });
+    if (!lines[0]?.startsWith(JOURNAL_HEADER_PREFIX)) {
+        issues.push({ line: 1, message: `missing '${JOURNAL_HEADER_PREFIX}<name>' header` });
     }
     for (const required of ["session_id:", "machine:", "started:"]) {
         if (!lines.slice(0, 10).some((l) => l.startsWith(required))) {
@@ -239,14 +239,14 @@ export function lintScratch(content, byteCap = MAX_SCRATCH_BYTES) {
 // ─── Append + prune ───────────────────────────────────────────────────────
 export function appendEntry(instanceId, category, body) {
     const hb = readHeartbeat(instanceId);
-    const path = scratchPath(instanceId);
+    const path = journalPath(instanceId);
     let doc;
     if (existsSync(path)) {
-        doc = parseScratch(path, readFileSync(path, "utf8"));
+        doc = parseJournal(path, readFileSync(path, "utf8"));
     }
     else {
         // Seed `started` from the heartbeat's session start so cross-agent writes
-        // (`harn agents ping`) don't stamp the peer's scratchpad with our wall-clock.
+        // (`harn agents ping`) don't stamp the peer's journal with our wall-clock.
         const startedSeed = hb?.started_at ? formatChicago(new Date(hb.started_at)) : formatChicago();
         doc = {
             path,
@@ -274,22 +274,22 @@ export function appendEntry(instanceId, category, body) {
         doc.header.name = hb?.name ?? doc.header.name;
     }
     // Prune from the tail until under cap.
-    let serialized = serializeScratch(doc);
+    let serialized = serializeJournal(doc);
     let pruned = 0;
-    while (Buffer.byteLength(serialized, "utf8") > MAX_SCRATCH_BYTES && doc.entries.length > 1) {
+    while (Buffer.byteLength(serialized, "utf8") > MAX_JOURNAL_BYTES && doc.entries.length > 1) {
         doc.entries.pop();
         pruned++;
-        serialized = serializeScratch(doc);
+        serialized = serializeJournal(doc);
     }
     if (pruned > 0) {
         const pruneEntry = {
             ts_iso: new Date().toISOString(),
             ts_display: formatChicago(),
             category: "note",
-            body: `(auto-pruned ${pruned} oldest entries to stay under ${MAX_SCRATCH_BYTES}-byte cap)`,
+            body: `(auto-pruned ${pruned} oldest entries to stay under ${MAX_JOURNAL_BYTES}-byte cap)`,
         };
         doc.entries.unshift(pruneEntry);
-        serialized = serializeScratch(doc);
+        serialized = serializeJournal(doc);
     }
     doc.bytes = Buffer.byteLength(serialized, "utf8");
     // Atomic write
@@ -301,9 +301,9 @@ export function appendEntry(instanceId, category, body) {
 }
 // ─── Archive lifecycle ────────────────────────────────────────────────────
 /** Move `<owner>.md` → `archived/<owner>-<ts>.md`. No-op if missing. Returns archive path (or null). */
-export function archiveScratch(instanceId) {
+export function archiveJournal(instanceId) {
     assertSafeInstanceId(instanceId);
-    const src = scratchPath(instanceId);
+    const src = journalPath(instanceId);
     if (!existsSync(src))
         return null;
     const ts = new Date().toISOString().replace(/[:.]/g, "-");
@@ -333,9 +333,9 @@ export function pruneArchives(days = ARCHIVE_RETENTION_DAYS) {
     }
     return deleted;
 }
-/** Sweep `.harnery/scratch/<owner>.md` files whose corresponding heartbeat is gone. */
-export function sweepOrphanScratchpads() {
-    const dir = scratchDir();
+/** Sweep `.harnery/journal/<owner>.md` files whose corresponding heartbeat is gone. */
+export function sweepOrphanJournals() {
+    const dir = journalDir();
     const archived = [];
     for (const f of readdirSync(dir)) {
         if (!f.endsWith(".md"))
@@ -343,7 +343,7 @@ export function sweepOrphanScratchpads() {
         const instanceId = f.replace(/\.md$/, "");
         const hb = readHeartbeat(instanceId);
         if (!hb) {
-            const dest = archiveScratch(instanceId);
+            const dest = archiveJournal(instanceId);
             if (dest)
                 archived.push(dest);
         }
@@ -372,11 +372,11 @@ export function currentOwnerOrThrow() {
     }
     return owner;
 }
-export function loadScratch(instanceId) {
-    const path = scratchPath(instanceId);
+export function loadJournal(instanceId) {
+    const path = journalPath(instanceId);
     if (!existsSync(path))
         return null;
-    return parseScratch(path, readFileSync(path, "utf8"));
+    return parseJournal(path, readFileSync(path, "utf8"));
 }
 /** Resolve an agent name → instance_id by walking active heartbeats (case-insensitive). */
 export function resolveOwnerByName(name) {

package/dist/core/policy/evaluate.d.ts

@@ -8,7 +8,7 @@ export declare function normalizePolicy(input: PolicySpec, options?: {
 }): Readonly<NormalizedPolicy>;
 export declare function policyDigest(policy: NormalizedPolicy): string;
 export declare function evaluatePolicy(policy: Readonly<NormalizedPolicy>, rawRequest: PolicyRequest): PolicyEvaluation;
-/** Bound and normalize the receipt-safe subset before it reaches a journal or proof. */
+/** Bound and normalize the receipt-safe subset before it reaches a transcript or proof. */
 export declare function summarizePolicyRequest(input: PolicyRequest): PolicyRequestSummary;
 export type { PolicyIsolation };
 //# sourceMappingURL=evaluate.d.ts.map

package/dist/core/policy/evaluate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../../src/core/policy/evaluate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,oBAAoB,EAEpB,UAAU,EAEX,MAAM,YAAY,CAAC;AAqBpB,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEhB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;CAKhD;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACjC,QAAQ,CAAC,gBAAgB,CAAC,CAwB5B;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAE7D;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAClC,UAAU,EAAE,aAAa,GACxB,gBAAgB,CA8FlB;AAED,wFAAwF;AACxF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CA8BjF;AAyGD,YAAY,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../../src/core/policy/evaluate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,oBAAoB,EAEpB,UAAU,EAEX,MAAM,YAAY,CAAC;AAqBpB,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEhB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;CAKhD;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACjC,QAAQ,CAAC,gBAAgB,CAAC,CAwB5B;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAE7D;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAClC,UAAU,EAAE,aAAa,GACxB,gBAAgB,CA8FlB;AAED,2FAA2F;AAC3F,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CA8BjF;AAyGD,YAAY,EAAE,eAAe,EAAE,CAAC"}

package/dist/core/policy/evaluate.js

@@ -11,7 +11,7 @@ const POLICY_FIELDS = new Set([
     "name",
     "max_cost_usd",
     "unknown_cost",
-    "allowed_harnesses",
+    "allowed_adapters",
     "allowed_models",
     "allowed_paths",
     "network",
@@ -43,7 +43,7 @@ export function normalizePolicy(input, options = {}) {
         name: boundedString(input.name ?? "workflow policy", "policy name", MAX_NAME),
         max_cost_usd: optionalMoney(input.max_cost_usd, "max_cost_usd"),
         unknown_cost: enumValue(input.unknown_cost ?? "deny", ["ask", "deny"], "unknown_cost"),
-        allowed_harnesses: optionalStringList(input.allowed_harnesses, "allowed_harnesses"),
+        allowed_adapters: optionalStringList(input.allowed_adapters, "allowed_adapters"),
         allowed_models: optionalStringList(input.allowed_models, "allowed_models"),
         allowed_paths: optionalPathList(input.allowed_paths, baseDir),
         network: enumValue(input.network ?? "deny", VERDICTS, "network"),
@@ -61,9 +61,9 @@ export function evaluatePolicy(policy, rawRequest) {
     const add = (code, verdict, reason) => {
         rules.push({ code, verdict, reason });
     };
-    if (policy.allowed_harnesses && request.phase === "dispatch") {
-        if (!request.harness || !policy.allowed_harnesses.includes(request.harness)) {
-            add("harness_not_allowed", "deny", `harness ${JSON.stringify(request.harness ?? "unknown")} is not allowed`);
+    if (policy.allowed_adapters && request.phase === "dispatch") {
+        if (!request.adapter || !policy.allowed_adapters.includes(request.adapter)) {
+            add("adapter_not_allowed", "deny", `adapter ${JSON.stringify(request.adapter ?? "unknown")} is not allowed`);
         }
     }
     if (policy.allowed_models && request.phase === "dispatch") {
@@ -114,7 +114,7 @@ export function evaluatePolicy(policy, rawRequest) {
         rules,
     };
 }
-/** Bound and normalize the receipt-safe subset before it reaches a journal or proof. */
+/** Bound and normalize the receipt-safe subset before it reaches a transcript or proof. */
 export function summarizePolicyRequest(input) {
     if (!isRecord(input))
         throw new Error("policy request must be an object");
@@ -125,7 +125,7 @@ export function summarizePolicyRequest(input) {
         phase,
         action: boundedString(input.action, "policy action", MAX_FIELD),
         path: optionalBounded(input.path, "policy path"),
-        harness: optionalBounded(input.harness, "policy harness"),
+        adapter: optionalBounded(input.adapter, "policy adapter"),
         model: optionalBounded(input.model, "policy model"),
         effort: optionalBounded(input.effort, "policy effort"),
         max_attempts: optionalWholeNumber(input.max_attempts, "policy max_attempts", 1),

package/dist/core/policy/types.d.ts

@@ -10,7 +10,7 @@ export interface PolicySpec {
     max_cost_usd?: number;
     /** Applied when a cost ceiling exists but the host cannot price a dispatch. */
     unknown_cost?: Exclude<PolicyVerdict, "allow">;
-    allowed_harnesses?: readonly string[];
+    allowed_adapters?: readonly string[];
     allowed_models?: readonly string[];
     /** Absolute paths, or paths relative to the policy file. */
     allowed_paths?: readonly string[];
@@ -24,7 +24,7 @@ export interface NormalizedPolicy {
     name: string;
     max_cost_usd?: number;
     unknown_cost: Exclude<PolicyVerdict, "allow">;
-    allowed_harnesses?: readonly string[];
+    allowed_adapters?: readonly string[];
     allowed_models?: readonly string[];
     allowed_paths?: readonly string[];
     network: PolicyVerdict;
@@ -35,7 +35,7 @@ export interface PolicyRequest {
     phase: PolicyPhase;
     action: string;
     path?: string;
-    harness?: string;
+    adapter?: string;
     model?: string;
     effort?: string;
     max_attempts?: number;

package/dist/core/policy/types.d.ts.map

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

package/dist/core/work/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/core/work/runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EAGV,MAAM,sBAAsB,CAAC;AAiB9B,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,IAAI,CACV,UAAU,EACV,WAAW,GAAG,OAAO,GAAG,aAAa,GAAG,YAAY,GAAG,aAAa,GAAG,gBAAgB,CACxF,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CA4F7E"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/core/work/runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,UAAU,EACV,SAAS,EAGV,MAAM,sBAAsB,CAAC;AAiB9B,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,IAAI,CACV,UAAU,EACV,WAAW,GAAG,OAAO,GAAG,aAAa,GAAG,YAAY,GAAG,aAAa,GAAG,gBAAgB,CACxF,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAgG7E"}

package/dist/core/work/runner.js

@@ -37,7 +37,11 @@ export async function runWorkItem(input) {
         if (!(record.projection.state === "ready" || record.projection.state === "blocked")) {
             throw new Error(`work item ${input.workId} cannot run from state ${record.projection.state}`);
         }
-        if (record.projection.attempts_used >= record.intent.max_attempts) {
+        // Budget is spent by CHARGED attempts (ADR 0046); uncharged environment or
+        // upstream attempts don't count against it. The attempt NUMBER still comes
+        // from attempts_used so the history stays a gapless 1..N and the validator
+        // is satisfied.
+        if (record.projection.charged_attempts >= record.intent.max_attempts) {
             throw new Error(`work item ${input.workId} exhausted its ${record.intent.max_attempts} attempts`);
         }
         const attempt = record.projection.attempts_used + 1;
@@ -97,7 +101,12 @@ export async function runWorkItem(input) {
     }
 }
 function priorContext(coordRoot, prior) {
-    if (!prior.proof_path) {
+    // An uncharged attempt (ADR 0046) produced no information about the work, so
+    // it is presented to the retry the same way a lost attempt is — carrying no
+    // proof-derived cause. Reporting its 5xx/circuit-open text as a
+    // "workflow_error" would tell the model "your code errored" for something that
+    // never ran the work.
+    if (prior.uncharged || !prior.proof_path) {
         return {
             run_id: prior.run_id,
             causes: ["lost"],

package/dist/core/work/state.d.ts

@@ -15,6 +15,12 @@ export interface WorkIntent {
         sha256: string;
     };
     max_attempts: number;
+    /** Ceiling on CONSECUTIVE uncharged attempts (ADR 0046), separate from
+     * max_attempts. An upstream outage produces uncharged attempt after uncharged
+     * attempt; without a bound it would retry forever. At the bound the item stops
+     * and reports it is blocked on an outside service. Optional for back-compat:
+     * an intent written before ADR 0046 has none and falls back to the default. */
+    max_uncharged_attempts?: number;
     source?: {
         kind: "human" | "workflow" | "external";
         ref?: string;
@@ -59,10 +65,17 @@ export interface WorkAttempt {
     run_id: string;
     started_at: string;
     trigger?: WorkAttemptTrigger;
-    status: "running" | "parked" | "succeeded" | "failed" | "lost" | "journal_unreadable";
+    status: "running" | "parked" | "succeeded" | "failed" | "lost" | "transcript_unreadable";
     approval_id?: string;
     proof_path?: string;
-    journal_error?: string;
+    transcript_error?: string;
+    /** Why this failed attempt was uninformative about the work (ADR 0046), read
+     * from the proof's run.class. Absent ⇒ the attempt is charged, exactly as
+     * before ADR 0046 (which is also how a proof without a class reads). */
+    uncharged?: "environment" | "upstream" | "decision";
+    /** Docket id this attempt stopped on, when uncharged is "decision" and the
+     * script named one. Lets the projection point at the question itself. */
+    blocked_on?: string;
 }
 export interface WorkProjection {
     id: string;
@@ -72,11 +85,22 @@ export interface WorkProjection {
     next_action: WorkNextAction;
     unresolved_dependencies: string[];
     attempts: WorkAttempt[];
+    /** Every attempt started, charged or not. Drives the next attempt number and
+     * history ordering, so it counts uncharged attempts too. */
     attempts_used: number;
+    /** Attempts that were informative about the work (ADR 0046). This — not
+     * attempts_used — is what max_attempts budgets, so an uncharged environment or
+     * upstream attempt does not consume the retry budget. */
+    charged_attempts: number;
     attempts_remaining: number;
     latest_run_id?: string;
     approval_id?: string;
     proof_path?: string;
+    /** Set when this item stopped because a human must rule. The value is the
+     * docket id when the script named one, else the empty string — present either
+     * way, so a reader can distinguish "waiting on a person" from every other
+     * terminal block without parsing the reason prose. */
+    blocked_on_decision?: string;
     updated_at: string;
 }
 export interface WorkRecord {
@@ -92,6 +116,7 @@ export interface CreateWorkItemInput {
     acceptance?: string[];
     dependencies?: string[];
     maxAttempts?: number;
+    maxUnchargedAttempts?: number;
     source?: WorkIntent["source"];
     id?: string;
     actor?: string;
@@ -135,7 +160,7 @@ export declare function readWorkItemIgnoringLease(coordRoot: string, workId: str
 export declare function assertWorkflowUnchanged(intent: WorkIntent): void;
 /** @internal Runner seam; not a separate persistence contract. */
 export declare function acquireWorkLease(coordRoot: string, workId: string): () => void;
-/** @internal Work journal mutation seam. */
+/** @internal Work transcript mutation seam. */
 export declare function acquireWorkEventLease(coordRoot: string, workId: string): () => void;
 /** @internal Runner seam; not a separate persistence contract. */
 export declare function boundedActor(value?: string, fallback?: string): string;

package/dist/core/work/state.d.ts.map

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