@drisp/cli 0.5.28 → 0.6.0

package/dist/{chunk-2QV7YSX6.js → chunk-QVRTU2MM.js}

@@ -884,6 +884,19 @@ import fs5 from "fs";
 import os3 from "os";
 import path4 from "path";
 var EMPTY_CONFIG = { plugins: [], additionalDirectories: [] };
+var STALE_CONFIG_KEYS = ["channels"];
+var warnedStaleKeys = /* @__PURE__ */ new Set();
+function warnStaleKeys(configPath, raw) {
+  for (const key of STALE_CONFIG_KEYS) {
+    if (!(key in raw)) continue;
+    const dedupeKey = `${configPath}\0${key}`;
+    if (warnedStaleKeys.has(dedupeKey)) continue;
+    warnedStaleKeys.add(dedupeKey);
+    console.error(
+      `Warning: ignoring unsupported config key "${key}" in ${configPath} (channels were removed; delete the key to silence this)`
+    );
+  }
+}
 function projectConfigPath(projectDir) {
   return path4.join(projectDir, ".athena", "config.json");
 }
@@ -929,6 +942,12 @@ function readConfigFile(configPath, baseDir) {
     return EMPTY_CONFIG;
   }
   const raw = JSON.parse(fs5.readFileSync(configPath, "utf-8"));
+  warnStaleKeys(configPath, raw);
+  if (raw.permissionGraceMs !== void 0 && (typeof raw.permissionGraceMs !== "number" || !Number.isFinite(raw.permissionGraceMs) || raw.permissionGraceMs < 0)) {
+    throw new Error(
+      `Invalid config: "${configPath}" field "permissionGraceMs" must be a non-negative number of milliseconds`
+    );
+  }
   if ("workflowMarketplaceSource" in raw) {
     throw new Error(
       `Invalid config: "${configPath}" uses deprecated "workflowMarketplaceSource"; use "workflowMarketplaceSources"`
@@ -946,11 +965,6 @@ function readConfigFile(configPath, baseDir) {
       `Invalid config: "${configPath}" field "harness" must be one of claude-code, openai-codex, opencode`
     );
   }
-  if (raw.channels !== void 0 && (!Array.isArray(raw.channels) || !raw.channels.every((c) => typeof c === "string"))) {
-    throw new Error(
-      `Invalid config: "${configPath}" field "channels" must be an array of strings`
-    );
-  }
   const plugins = (raw.plugins ?? []).map((p) => {
     if (isMarketplaceRef(p)) return p;
     return path4.isAbsolute(p) ? p : path4.resolve(baseDir, p);
@@ -971,7 +985,7 @@ function readConfigFile(configPath, baseDir) {
     telemetry: raw.telemetry,
     telemetryDiagnostics: raw.telemetryDiagnostics,
     deviceId: raw.deviceId,
-    channels: raw.channels,
+    permissionGraceMs: raw.permissionGraceMs,
     // Personal capabilities are stored opaque. In particular skill `path`
     // is NOT relative-resolved against baseDir (R1) — Issue 3 resolves it
     // to an absolute path at install time.
@@ -1007,7 +1021,8 @@ function writeConfigFile(configDir, configPath, updates, deleteKeys) {
 var GLOBAL_CONFIG_LEGACY_KEYS = [
   "workflow",
   "mcpServerOptions",
-  "workflowMarketplaceSource"
+  "workflowMarketplaceSource",
+  ...STALE_CONFIG_KEYS
 ];
 function writeGlobalConfig(updates) {
   const homeDir = os3.homedir();
@@ -1037,6 +1052,7 @@ var DEFAULT_MAX_TURN_TOKEN_COUNT = 13e4;
 var DEFAULT_NUDGE_CAP = 3;
 var DEFAULT_RETRY_CAP = 3;
 var DEFAULT_RETRY_BACKOFF_MS = 1e4;
+var DEFAULT_PERMISSION_GRACE_MS = 6e4;
 function pluginSpecRef(spec) {
   return typeof spec === "string" ? spec : spec.ref;
 }
@@ -1138,7 +1154,7 @@ import fs7 from "fs";
 import os4 from "os";
 import path6 from "path";
 
-// src/core/workflows/trackerReader.ts
+// src/core/workflows/journalReader.ts
 import fs6 from "fs";
 import path5 from "path";
 
@@ -1152,22 +1168,49 @@ function substituteVariables(text, ctx) {
     result = result.replaceAll("{sessionId}", ctx.sessionId);
     result = result.replaceAll("<session_id>", ctx.sessionId);
   }
-  if (ctx.trackerPath !== void 0) {
-    result = result.replaceAll("{trackerPath}", ctx.trackerPath);
+  if (ctx.journalPath !== void 0) {
+    result = result.replaceAll("{journalPath}", ctx.journalPath);
+    result = result.replaceAll("{trackerPath}", ctx.journalPath);
   }
   return result;
 }
 
-// src/core/workflows/trackerReader.ts
+// src/core/workflows/journalReader.ts
+var DEPRECATION_REMOVAL_RELEASE = "0.7.0";
 var DEFAULT_COMPLETION_MARKER = "<!-- WORKFLOW_COMPLETE -->";
-var DEFAULT_BLOCKED_MARKER = "<!-- WORKFLOW_BLOCKED";
-var DEFAULT_TRACKER_PATH = ".athena/{sessionId}/tracker.md";
-var TRACKER_SKELETON_MARKER = "<!-- TRACKER_SKELETON -->";
-var DEFAULT_TRACKER_TOKEN_BOUND = 8e3;
-var DEFAULT_CONTINUE_PROMPT = "Continue the task. Read the tracker at {trackerPath} for current progress. If the work is complete or blocked, the terminal marker must be the final non-empty line of the tracker; do not write any prose after it.";
-function readTracker(trackerPath) {
+var DEFAULT_NEEDS_HUMAN_MARKER = "<!-- NEEDS_HUMAN";
+var LEGACY_BLOCKED_MARKER = "<!-- WORKFLOW_BLOCKED";
+var DEFAULT_JOURNAL_PATH = ".athena/{sessionId}/journal.md";
+var LEGACY_JOURNAL_FILENAME = "tracker.md";
+var JOURNAL_SKELETON_MARKER = "<!-- JOURNAL_SKELETON -->";
+var LEGACY_TRACKER_SKELETON_MARKER = "<!-- TRACKER_SKELETON -->";
+var DEFAULT_JOURNAL_TOKEN_BOUND = 8e3;
+var DEFAULT_CONTINUE_PROMPT = "Continue the task. Read the journal at {journalPath} for current progress. If the work is complete or you need a human, the terminal marker must be the final non-empty line of the journal; do not write any prose after it.";
+function loopNeedsHumanMarker(markers) {
+  return markers.needsHumanMarker ?? markers.blockedMarker ?? DEFAULT_NEEDS_HUMAN_MARKER;
+}
+function loopJournalPath(loop) {
+  return loop.journalPath ?? loop.trackerPath ?? DEFAULT_JOURNAL_PATH;
+}
+function needsHumanMarkersFor(markers) {
+  return [
+    .../* @__PURE__ */ new Set([
+      loopNeedsHumanMarker(markers),
+      DEFAULT_NEEDS_HUMAN_MARKER,
+      LEGACY_BLOCKED_MARKER
+    ])
+  ];
+}
+function hasSkeletonMarker(content) {
+  return content.includes(JOURNAL_SKELETON_MARKER) || content.includes(LEGACY_TRACKER_SKELETON_MARKER);
+}
+function buildMarkerDeprecation(deprecatedMarker) {
+  const name = deprecatedMarker.replace(/^<!--\s*/, "").replace(/:?$/, "");
+  return `${name} is deprecated and is removed in ${DEPRECATION_REMOVAL_RELEASE}; declare NEEDS_HUMAN: <reason> as the journal's final non-empty line instead.`;
+}
+function readJournal(journalPath) {
   try {
-    return fs6.readFileSync(trackerPath, "utf-8");
+    return fs6.readFileSync(journalPath, "utf-8");
   } catch {
     return "";
   }
@@ -1175,78 +1218,99 @@ function readTracker(trackerPath) {
 function getNonEmptyLines(content) {
   return content.trimEnd().split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
 }
-function isBlockedLine(line, blockedMarker) {
-  return line === `${blockedMarker} -->` || line.startsWith(`${blockedMarker}:`);
+function isNeedsHumanLine(line, marker) {
+  return line === `${marker} -->` || line.startsWith(`${marker}:`);
+}
+function matchNeedsHumanMarker(line, markers) {
+  return markers.find((marker) => isNeedsHumanLine(line, marker));
 }
-function isTerminalMarkerLine(line, completionMarker, blockedMarker) {
-  return line === completionMarker || isBlockedLine(line, blockedMarker);
+function isTerminalMarkerLine(line, completionMarker, needsHumanMarkers) {
+  return line === completionMarker || matchNeedsHumanMarker(line, needsHumanMarkers) !== void 0;
 }
-function getMisplacedTerminalMarker(lines, completionMarker, blockedMarker) {
+function getMisplacedTerminalMarker(lines, completionMarker, needsHumanMarkers) {
   if (lines.length < 2) return void 0;
   const terminalLine = lines.at(-1);
-  if (terminalLine && isTerminalMarkerLine(terminalLine, completionMarker, blockedMarker)) {
+  if (terminalLine && isTerminalMarkerLine(terminalLine, completionMarker, needsHumanMarkers)) {
     return void 0;
   }
-  return lines.slice(0, -1).find((line) => isTerminalMarkerLine(line, completionMarker, blockedMarker));
+  return lines.slice(0, -1).find(
+    (line) => isTerminalMarkerLine(line, completionMarker, needsHumanMarkers)
+  );
 }
-function extractBlockedReason(line, blockedMarker) {
-  if (!line.startsWith(blockedMarker)) return void 0;
-  const afterMarker = line.slice(blockedMarker.length);
+function extractNeedsHumanReason(line, marker) {
+  if (!line.startsWith(marker)) return void 0;
+  const afterMarker = line.slice(marker.length);
   const match = afterMarker.match(/^:\s*(.+?)(?:\s*-->|$)/);
   return match?.[1]?.trim();
 }
-function parseTrackerState(content, markers = {}) {
+function parseJournalState(content, markers = {}) {
   const completionMarker = markers.completionMarker ?? DEFAULT_COMPLETION_MARKER;
-  const blockedMarker = markers.blockedMarker ?? DEFAULT_BLOCKED_MARKER;
+  const needsHumanMarkers = needsHumanMarkersFor(markers);
   const lines = getNonEmptyLines(content);
   const terminalLine = lines.at(-1);
   const completed = terminalLine === completionMarker;
-  const blocked = terminalLine !== void 0 && isBlockedLine(terminalLine, blockedMarker);
-  const blockedReason = blocked && terminalLine ? extractBlockedReason(terminalLine, blockedMarker) : void 0;
+  const matchedMarker = terminalLine !== void 0 ? matchNeedsHumanMarker(terminalLine, needsHumanMarkers) : void 0;
+  const needsHuman = matchedMarker !== void 0;
+  const needsHumanReason = matchedMarker && terminalLine ? extractNeedsHumanReason(terminalLine, matchedMarker) : void 0;
   return {
     completed,
-    blocked,
-    blockedReason,
+    needsHuman,
+    needsHumanReason,
     misplacedTerminalMarker: getMisplacedTerminalMarker(
       lines,
       completionMarker,
-      blockedMarker
+      needsHumanMarkers
     ),
-    skeletonNotReplaced: content.includes(TRACKER_SKELETON_MARKER)
+    skeletonNotReplaced: hasSkeletonMarker(content),
+    ...matchedMarker === LEGACY_BLOCKED_MARKER ? { deprecatedMarker: LEGACY_BLOCKED_MARKER } : {}
   };
 }
 function demoteTerminalMarkers(content, markers = {}) {
   const completionMarker = markers.completionMarker ?? DEFAULT_COMPLETION_MARKER;
-  const blockedMarker = markers.blockedMarker ?? DEFAULT_BLOCKED_MARKER;
+  const needsHumanMarkers = needsHumanMarkersFor(markers);
   return content.split("\n").map((line) => {
     const trimmed = line.trim();
     if (trimmed === completionMarker) return "> _Prior Run ended: complete._";
-    if (isBlockedLine(trimmed, blockedMarker)) {
-      const reason = extractBlockedReason(trimmed, blockedMarker);
-      return reason ? `> _Prior Run ended: needed attention \u2014 ${reason}._` : "> _Prior Run ended: needed attention._";
+    const matched = matchNeedsHumanMarker(trimmed, needsHumanMarkers);
+    if (matched) {
+      const reason = extractNeedsHumanReason(trimmed, matched);
+      return reason ? `> _Prior Run ended: needed a human \u2014 ${reason}._` : "> _Prior Run ended: needed a human._";
     }
     return line;
   }).join("\n");
 }
+function insertAboveTerminalMarker(content, entry, markers = {}) {
+  const completionMarker = markers.completionMarker ?? DEFAULT_COMPLETION_MARKER;
+  const needsHumanMarkers = needsHumanMarkersFor(markers);
+  const trimmed = content.trimEnd();
+  const lastBreak = trimmed.lastIndexOf("\n");
+  const lastLine = trimmed.slice(lastBreak + 1).trim();
+  if (!isTerminalMarkerLine(lastLine, completionMarker, needsHumanMarkers)) {
+    return content + entry;
+  }
+  const above = lastBreak === -1 ? "" : trimmed.slice(0, lastBreak);
+  const markerLine = trimmed.slice(lastBreak + 1);
+  return `${above.trimEnd()}${entry.replace(/\n*$/, "\n")}
+${markerLine}
+`;
+}
 function buildContinuePrompt(loop) {
   const template = loop.continuePrompt ?? DEFAULT_CONTINUE_PROMPT;
-  return substituteVariables(template, {
-    trackerPath: loop.trackerPath ?? DEFAULT_TRACKER_PATH
-  });
+  return substituteVariables(template, { journalPath: loopJournalPath(loop) });
 }
 function buildNudgePrompt(loop, opts) {
   const completionMarker = loop.completionMarker ?? DEFAULT_COMPLETION_MARKER;
-  const blockedMarker = loop.blockedMarker ?? DEFAULT_BLOCKED_MARKER;
-  const trackerPath = loop.trackerPath ?? DEFAULT_TRACKER_PATH;
-  const bootstrapPreamble = opts?.skeletonNotReplaced ? `You stopped without writing the tracker at ${trackerPath} \u2014 it still contains the runner's skeleton. If you were asking the human a question, do not ask it in chat: write it to the tracker and declare ${blockedMarker}: <your question> --> as the final non-empty line. Otherwise replace the skeleton with the real plan and continue. ` : `You stopped without declaring how this workflow ended. If work remains, continue it now. `;
-  return bootstrapPreamble + `If everything is done and verified, write ${completionMarker} as the final non-empty line of the tracker at ${trackerPath}. If you cannot proceed without a human, write ${blockedMarker}: <reason> --> there instead. Do not stop again without either finishing the work or declaring one of these markers.`;
+  const needsHumanMarker = loopNeedsHumanMarker(loop);
+  const journalPath = loopJournalPath(loop);
+  const bootstrapPreamble = opts?.skeletonNotReplaced ? `You stopped without writing the journal at ${journalPath} \u2014 it still contains the runner's skeleton. If you were asking the human a question, do not ask it in chat: write it to the journal and declare ${needsHumanMarker}: <your question> --> as the final non-empty line. Otherwise replace the skeleton with the real plan and continue. ` : `You stopped without declaring how this workflow ended. If work remains, continue it now. `;
+  return bootstrapPreamble + `If everything is done and verified, write ${completionMarker} as the final non-empty line of the journal at ${journalPath}. If you cannot proceed without a human, write ${needsHumanMarker}: <reason> --> there instead. Do not stop again without either finishing the work or declaring one of these markers.`;
 }
 function estimateTokenCount(content) {
   return Math.ceil(content.length / 4);
 }
-function buildTrackerSizeNudgeSuffix(trackerPath) {
-  const where = trackerPath ?? "the tracker";
-  return ` Separately: ${where} has crossed the ~8,000-token shedding backstop (ADR 0015 \xA73). Before continuing, cut the completed phases of the still-open unit out of the tracker and paste them verbatim into that unit's record under units/<slug>.md, leaving a pointer row behind \u2014 this is a nudge, not a requirement, so continue the work either way.`;
+function buildJournalSizeNudgeSuffix(journalPath) {
+  const where = journalPath ?? "the journal";
+  return ` Separately: ${where} has crossed the ~8,000-token shedding backstop (ADR 0015 \xA73). Before continuing, cut the completed phases of the still-open unit out of the journal and paste them verbatim into that unit's record under units/<slug>.md, leaving a pointer row behind \u2014 this is a nudge, not a requirement, so continue the work either way.`;
 }
 var UNITS_HEADING_RE = /^##\s+Units\s*$/;
 function splitTableRow(line) {
@@ -1284,6 +1348,55 @@ function parseUnitTable(content) {
   }
   return rows;
 }
+function normaliseRecordPath(recordPath) {
+  return recordPath.replace(/\\/g, "/").replace(/^\.\//, "");
+}
+var LEVEL_TWO_HEADING_RE = /^##\s+(.+?)\s*$/;
+function levelTwoHeadings(content) {
+  const headings = /* @__PURE__ */ new Map();
+  for (const line of content.split("\n")) {
+    const match = LEVEL_TWO_HEADING_RE.exec(line.trim());
+    if (match) {
+      const heading = `## ${match[1]}`;
+      const key = heading.toLowerCase();
+      if (!headings.has(key)) headings.set(key, heading);
+    }
+  }
+  return headings;
+}
+function checkShedIntegrity(journalContent, records) {
+  const rows = parseUnitTable(journalContent);
+  if (!rows) return null;
+  const pointed = new Set(rows.map((row) => normaliseRecordPath(row.recordPath)));
+  const journalHeadings = levelTwoHeadings(journalContent);
+  const orphanRecords = [];
+  const sharedHeadings = [];
+  for (const record of records) {
+    const recordPath = normaliseRecordPath(record.recordPath);
+    if (!pointed.has(recordPath)) orphanRecords.push(recordPath);
+    for (const [key, heading] of levelTwoHeadings(record.content)) {
+      if (journalHeadings.has(key)) {
+        sharedHeadings.push({
+          heading: journalHeadings.get(key) ?? heading,
+          recordPath
+        });
+      }
+    }
+  }
+  if (orphanRecords.length === 0 && sharedHeadings.length === 0) return null;
+  return { orphanRecords, sharedHeadings };
+}
+function buildShedIntegrityNudgeSuffix(gaps) {
+  const findings = [
+    ...gaps.orphanRecords.map(
+      (recordPath) => `unit record ${recordPath} has no row in the journal's ## Units table`
+    ),
+    ...gaps.sharedHeadings.map(
+      (shared) => `heading "${shared.heading}" appears in both the journal and ${shared.recordPath}`
+    )
+  ];
+  return ` Separately: the Dossier shows a half-executed shed \u2014 ${findings.join("; ")}. Finish the shed: cut the section out of the journal, paste it verbatim into the record, and leave a pointer row in the ## Units table \u2014 this is a nudge, not a requirement, so continue the work either way.`;
+}
 var FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n|$)/;
 function parseUnitRecordFrontmatter(content) {
   const match = FRONTMATTER_RE.exec(content);
@@ -1294,12 +1407,12 @@ function parseUnitRecordFrontmatter(content) {
   if (raw !== "open" && raw !== "closed") return null;
   return { status: raw };
 }
-function projectTrackerTasks(trackerAbsPath) {
-  const content = readTracker(trackerAbsPath);
+function projectJournalTasks(journalAbsPath) {
+  const content = readJournal(journalAbsPath);
   if (!content) return null;
   const rows = parseUnitTable(content);
   if (!rows) return null;
-  const baseDir = path5.dirname(trackerAbsPath);
+  const baseDir = path5.dirname(journalAbsPath);
   const tasks = [];
   for (const row of rows) {
     const recordAbsPath = path5.resolve(baseDir, row.recordPath);
@@ -1325,22 +1438,22 @@ function projectTrackerTasks(trackerAbsPath) {
 }
 
 // src/core/workflows/builtins/index.ts
-var DEFAULT_BLOCKED_CLOSED_MARKER = `${DEFAULT_BLOCKED_MARKER} -->`;
-var DEFAULT_BLOCKED_REASON_MARKER = `${DEFAULT_BLOCKED_MARKER}: reason -->`;
-var SYSTEM_PROMPT = `You are working on a long-horizon task managed by Athena. A tracker file is used to persist progress across sessions.
+var DEFAULT_NEEDS_HUMAN_CLOSED_MARKER = `${DEFAULT_NEEDS_HUMAN_MARKER} -->`;
+var DEFAULT_NEEDS_HUMAN_REASON_MARKER = `${DEFAULT_NEEDS_HUMAN_MARKER}: reason -->`;
+var SYSTEM_PROMPT = `You are working on a long-horizon task managed by Athena. A journal file is used to persist progress across sessions.
 
-## Tracker File
+## Journal File
 
-At the start of each session, read the tracker file if it exists. It contains the task plan, completed steps, and current status from prior sessions.
+At the start of each session, read the journal file if it exists. It contains the task plan, completed steps, and current status from prior sessions.
 
-If no tracker file exists, create one by:
+If no journal file exists, create one by:
 1. Analyzing the user's request to understand the full scope
 2. Breaking the task into concrete, actionable steps
-3. Writing the plan to the tracker file
+3. Writing the plan to the journal file
 
-### Tracker Format
+### Journal Format
 
-Use this markdown format for the tracker:
+Use this markdown format for the journal:
 
 \`\`\`
 # Task: <one-line summary>
@@ -1358,9 +1471,9 @@ Use this markdown format for the tracker:
 <any important context, decisions, or blockers discovered along the way>
 \`\`\`
 
-### Updating the Tracker
+### Updating the Journal
 
-After completing meaningful work, update the tracker:
+After completing meaningful work, update the journal:
 - Check off completed steps
 - Update the current status section
 - Add any important notes or decisions
@@ -1368,18 +1481,18 @@ After completing meaningful work, update the tracker:
 ### Completion
 
 When all steps are complete:
-1. Update the tracker with all steps checked off
+1. Update the journal with all steps checked off
 2. Put any final summary or outcome notes above the terminal marker
-3. Add \`${DEFAULT_COMPLETION_MARKER}\` as the final non-empty line of the tracker file
-4. Do not write any tracker content after the terminal marker
+3. Add \`${DEFAULT_COMPLETION_MARKER}\` as the final non-empty line of the journal file
+4. Do not write any journal content after the terminal marker
 
-### Blocked
+### Needs a human
 
-If you are blocked and cannot make further progress:
-1. Document what is blocking you in the Notes section
+If you cannot proceed without a person \u2014 a question only they can answer, or an external blocker only they can clear:
+1. Document what you need from them in the Notes section
 2. Explain what needs to happen to unblock the task whenever possible above the terminal marker
-3. Add \`${DEFAULT_BLOCKED_CLOSED_MARKER}\` or \`${DEFAULT_BLOCKED_REASON_MARKER}\` as the final non-empty line of the tracker file
-4. Do not write any tracker content after the terminal marker
+3. Add \`${DEFAULT_NEEDS_HUMAN_CLOSED_MARKER}\` or \`${DEFAULT_NEEDS_HUMAN_REASON_MARKER}\` as the final non-empty line of the journal file
+4. Do not write any journal content after the terminal marker
 `;
 function ensureSystemPromptFile() {
   const dir = path6.join(
@@ -1407,7 +1520,7 @@ function resolveBuiltinWorkflow(name) {
     loop: {
       enabled: true,
       completionMarker: DEFAULT_COMPLETION_MARKER,
-      blockedMarker: DEFAULT_BLOCKED_MARKER,
+      needsHumanMarker: DEFAULT_NEEDS_HUMAN_MARKER,
       maxIterations: 20
     },
     plugins: [],
@@ -1501,9 +1614,12 @@ function writeWorkflowSourceMetadata(workflowDir, metadata) {
 }
 
 // src/core/workflows/registry.ts
-function registryDir() {
+function workflowRegistryDir() {
   return path8.join(os5.homedir(), ".config", "athena", "workflows");
 }
+function registryDir() {
+  return workflowRegistryDir();
+}
 function ensurePathWithinRoot(rootDir, targetPath, label) {
   const relative = path8.relative(rootDir, targetPath);
   if (relative === "" || !relative.startsWith("..") && !path8.isAbsolute(relative)) {
@@ -1558,6 +1674,13 @@ function resolveWorkflow(name) {
       `Invalid workflow.json: "examplePrompts" must be an array of strings`
     );
   }
+  if (raw["askRules"] !== void 0 && (!Array.isArray(raw["askRules"]) || !raw["askRules"].every(
+    (e) => typeof e === "string" && e.trim().length > 0
+  ))) {
+    throw new Error(
+      `Invalid workflow.json: "askRules" must be an array of non-empty tool-name patterns`
+    );
+  }
   if (typeof raw["workflowFile"] !== "string" || raw["workflowFile"].length === 0) {
     throw new Error(
       'Invalid workflow.json: "workflowFile" is required and must point to the workflow instructions file'
@@ -1790,10 +1913,11 @@ function compileWorkflowPlan(input) {
 
 // src/core/workflows/sessionPlan.ts
 import fs10 from "fs";
+import crypto from "crypto";
 import path9 from "path";
 
 // src/core/workflows/stateMachine.md
-var stateMachine_default = "# Turn Protocol\n\nYou run inside a managed workflow loop. **Run until the work is done.** The Dossier \u2014 `.athena/<session_id>/` \u2014 is your durable memory; `tracker.md` is your index into it: read it, work, write it as you go. Your conversation context usually survives between stops \u2014 the runner resumes your session rather than restarting it \u2014 but never rely on that: the runner may kill a long Turn, your session may be replaced at a context bound, the process may die mid-task. Anything not in the Dossier can be lost.\n\nTwo kinds of Turn exist, and you should know which you are in:\n\n- **A fresh Turn** \u2014 the first Turn of the run, or the Turn right after a Handover (the runner's context reset). You start with no memory of prior work; the tracker (and, after a Handover, the Handoff file) is all you have.\n- **A resumed Turn** \u2014 the runner continued your existing session with a new instruction (a corrective nudge, a retry after a transient failure, or a human's reply). Your context is intact; act on the new instruction and keep going.\n\n## First action, in a fresh Turn\n\n1. Read the tracker at the configured path (default: `.athena/<session_id>/tracker.md`). The runner provides the session ID \u2014 do not invent one.\n2. If the tracker contains `<!-- TRACKER_SKELETON -->` \u2192 this is Turn 1, run [**Orient**](#orient-turn-1).\n3. Otherwise \u2192 this is a continuation, run [**Execute**](#execute-continuation) from where the tracker says, not from the start of the flow.\n4. If the runner's prompt names a Handoff file, read it too \u2014 it's mandatory alongside the tracker: it carries the in-flight context the tracker never checkpointed. Before any domain work, fold whatever in it is still durable into the tracker (or the open unit's record, if it's been shed) \u2014 the Handoff is a one-time relay, not a permanent Dossier file, so anything worth keeping has to land in `tracker.md`/`units/<slug>.md` now or it is lost once the Handoff falls off the chain. Then read whatever the tracker's fifth question names (see [Tracker contract](#tracker-contract)) \u2014 that, the tracker, and any named Handoff file are your complete required reading. Do not redo completed work or re-litigate decisions any of them record.\n\nReading first prevents two failure modes that waste whole Turns: redoing work already done, or contradicting decisions a prior Turn made.\n\nIn a resumed Turn, your context is already loaded \u2014 skim the tracker only if you have any doubt it still matches reality, then continue.\n\n## Tracker contract\n\nThe tracker must always answer five questions:\n\n1. What are we trying to accomplish?\n2. What has been done?\n3. What's left?\n4. What should the next Turn do first?\n5. What else, beyond this file, must the next Turn read to have full context?\n\nA fresh Turn has no other context. If something isn't here or in a file question 5 names, it doesn't exist. Section headings may vary by workflow, but these five answers must be explicit and easy to find. Question 5 is the tracker's pointer into the rest of the Dossier (see [The Dossier](#the-dossier)): on a single-file Run its honest answer is \"nothing else\"; once anything has been shed, it names exactly which files, so a fresh Turn's opening read stays small even when the Dossier has grown.\n\n### Terminal markers\n\nDefault markers (workflows may override \u2014 use the markers configured for the active workflow):\n\n- `<!-- WORKFLOW_COMPLETE -->` \u2014 all work done and verified\n- `<!-- WORKFLOW_BLOCKED -->` or `<!-- WORKFLOW_BLOCKED: reason -->` \u2014 you need a human: a question only they can answer, or an external blocker only they can clear\n\nRules:\n\n- Only the last non-empty line of the tracker is authoritative. Marker-like text in notes, examples, or quoted instructions earlier in the file is ignored.\n- When you write a terminal marker, it must be the final non-empty line of the tracker. Put every summary, status note, and next-step sentence before the marker. Never append prose after it.\n- The runner trusts markers unconditionally. A premature `WORKFLOW_COMPLETE` ends the run with no automatic recovery \u2014 write it only when its criteria are fully met.\n- Include a concrete reason after `WORKFLOW_BLOCKED:` whenever possible \u2014 it is what the human sees when deciding how to answer you. Put the full question there.\n\n## The Dossier\n\n`.athena/<session_id>/` is the Dossier: the tracker plus everywhere it can shed cold detail once shedding earns its keep.\n\n```\ntracker.md       state: index, open loops, next action, terminal marker\nunits/<slug>.md   journal: contract, problem, design + rationale, build state, gate evidence\norientation.md    cross-unit knowledge, revised in place\nhandoff/NNN.md    episodic distillation, written at a Handover (chain, newest is mandatory reading)\n```\n\n**On most Runs the Dossier never grows past `tracker.md` itself** \u2014 one file, no ceremony, no extra directories, nothing below this line to act on. Nothing here changes how a short, single-unit Run works.\n\nA **unit** is a bounded piece of the plan that reaches its own closed state while the Run keeps going \u2014 one issue in a multi-issue epic, one phase of a larger goal. A Run with only one unit never closes a unit while another stays open, so it can never trip the first shed trigger below.\n\n### When to shed\n\nTwo triggers, both structural. A single-unit Run can only ever reach the second, and only once that unit has outgrown the bound:\n\n- **A unit closes while another is still open.** Cut that unit's whole detail out of the tracker now, before starting the next one.\n- **The tracker crosses ~8,000 tokens** (roughly 32,000 characters \u2014 a token is about 4 characters at this codebase's measured rate). This is a backstop for one long single unit, not a target to design toward \u2014 shed the completed phases of the still-open unit.\n\n### How to shed\n\nShedding is three positive acts on one whole named `##` section \u2014 never a summary, never a partial move:\n\n1. **Cut** the section, verbatim, out of `tracker.md`.\n2. **Paste** it, verbatim, into `units/<slug>.md` (create the file on that unit's first shed).\n3. **Pointer** \u2014 leave one index row in the tracker's unit table with a relative path to where the detail went.\n\nContent is demoted, never deleted. If you find yourself rewording or condensing while moving text, stop \u2014 that is not shedding, that is exactly where fidelity leaks.\n\n### The unit table\n\nThe tracker's unit table is the index the runner reads to keep the CLI's own task list in sync with your plan \u2014 it is parsed by tooling, so its shape is fixed, not free-form prose. Keep it under a `## Units` heading, as a GFM table with exactly two columns:\n\n```\n## Units\n\n| Unit                  | Record                     |\n| ---------------------- | --------------------------- |\n| Add the size nudge     | units/size-nudge.md         |\n| Wire up task projection | units/task-projection.md   |\n```\n\n- **Unit** \u2014 a short human-readable label for the unit (what step 3 of [How to shed](#how-to-shed) points at).\n- **Record** \u2014 the path to that unit's `units/<slug>.md`, relative to the tracker's own directory.\n\nOne row per unit that has been shed; units still fully inline in the tracker (never shed) don't need a row. A row whose Record file is missing, unreadable, or malformed is simply skipped by the runner \u2014 never guessed at, never a failure (see the next section). Malformed rows in an otherwise-fine table don't invalidate the rest of the table.\n\nEach `units/<slug>.md` record opens with a small YAML frontmatter block the runner reads to know the unit's state:\n\n```\n---\nstatus: open\ngates: []\n---\n\n<the shed section content, verbatim>\n```\n\n- `status` \u2014 `open` or `closed`, exactly (case-insensitive). Any other value, or a missing `status` key, means the runner treats the whole record as unparseable for projection purposes \u2014 it still exists as your durable journal, it just doesn't surface in the task list.\n- `gates` \u2014 reserved for future gate-evidence tracking; not read by anything yet. Leave it present but empty, or omit it \u2014 either is fine today.\n\nThis frontmatter is the only structured part of a unit record; everything after the closing `---` is free-form prose exactly like the rest of the Dossier.\n\n### Parsing is best-effort, never a gate\n\nThe unit table and unit-record frontmatter exist so the runner can mirror your plan into the harness's own task list (see [Task UI projection](#task-ui-projection)) and, separately, so it can nudge you when the tracker grows past its size backstop. Both are conveniences layered on top of the Dossier, not requirements on it:\n\n- A missing table, an extra column, a typo'd status, a unit record that fails to parse \u2014 none of it fails your Turn, and none of it is worth stopping to fix for the runner's sake. The runner silently skips whatever it can't parse and, at most, folds a size nudge into your next prompt.\n- Never restructure the tracker or a unit record just to make automated parsing happy at the expense of the content itself. If the table and the prose disagree, the prose (what you actually did) is the truth.\n\n### orientation.md\n\nKnowledge that spans more than one unit lives here, revised in place instead of appended to \u2014 the one Dossier surface you edit rather than move things into. Two sections with different rules:\n\n- **Established** \u2014 decisions. Never decay; only explicitly superseded (\"we chose X over Y because Z \u2014 superseded 2026-09-03: \u2026\").\n- **Observed** \u2014 facts carrying a `file.ts:123`-style anchor. Revalidate the anchor before relying on it; code moves.\n\nA correction is an edit to the existing entry, not a new capitalized warning stacked on top of stale text.\n\n## Run until done; declare when blocked\n\nThe loop's contract with you:\n\n- **Do not stop early.** There is no checkpoint budget and no reason to end a Turn \"to be safe\" \u2014 context refresh is the runner's job, not yours. When your context approaches its bound the runner performs a **Handover**: your conversation is distilled into a Handoff file and a fresh session picks up seamlessly from it plus the tracker. You will not see this happen; just keep the tracker current so nothing is lost.\n- **Stopping without a marker is a mistake**, not a signal. The runner reads it as a premature stop and resumes you with a corrective prompt; repeated markerless stops without tracker progress escalate to a human. Never stop as a way of asking \"should I continue?\" \u2014 the answer is always to continue or to declare.\n- **Need a human? Declare it.** Write `WORKFLOW_BLOCKED: <your question or blocker>` as the tracker's final non-empty line and end. The run suspends until a human replies; their reply resumes your session with the answer. This is the only correct way to wait for a person \u2014 an interactive question asked into an unattended run cannot be answered.\n- Transient infrastructure failures are not yours to manage: the runner retries them by resuming your session. Just make sure the tracker reflects reality before risky operations.\n\n## Phases\n\n### Orient (Turn 1)\n\n1. **Replace the skeleton immediately**, before any domain work. Even a three-line tracker (goal + \"orienting\") protects you if the Turn dies during setup.\n2. Identify and load the applicable workflow skills before doing domain work. If a workflow, plugin, or local skill table names a relevant skill, read it fully and follow it. Do not assume you already know the workflow's conventions, tool sequence, quality gates, or implementation details.\n3. Use a dedicated git worktree for repository-changing work. If you are not already inside a task-specific worktree, create or enter one before editing files, record its branch/path in the tracker, and continue there. Skip this only when the workflow explicitly forbids it or the task is read-only.\n4. Run the workflow's orientation steps exactly as written. These vary by domain \u2014 a test-writing workflow explores the product in a browser; a migration workflow audits the schema. The workflow defines what orientation means. Do not skip, reorder, reinterpret, or replace workflow steps with a generic approach unless the workflow explicitly allows it or the tracker records a concrete blocker that makes the written step impossible.\n5. Refine the tracker into a granular plan. Each task a concrete, verifiable unit of work, including verification steps (running checks, reviewing output) \u2014 not just implementation. Vague tasks (\"write tests\") cannot be meaningfully resumed by a future Turn that has no idea what they mean here.\n6. Record concrete observations \u2014 what you actually saw, not what you assumed. Wrong assumptions burn entire future Turns on rework.\n7. **Single-Turn requests still go through this phase.** If the entire request is satisfied quickly, write a minimal tracker (what was asked, what was done, the outcome) and append `<!-- WORKFLOW_COMPLETE -->`. Leaving the skeleton in place gets you nudged \u2014 the runner cannot trust work it can't read from the tracker \u2014 and repeated stops with an untouched skeleton escalate to a human.\n\n### Execute (continuation)\n\n- Work from where the tracker says, in the workflow's prescribed sequence, and keep going until the work is done or a declared blocker stops you.\n- Be strict with workflow steps. Before starting each unit, identify the next required workflow step from the workflow document and tracker, follow it as written, and record completion or blockers against that step. Do not substitute your own process, collapse separate gates into one, or advance past an unchecked step.\n- Be strict with skills. Before each new activity, check the workflow, plugin metadata, local skill table, and tracker for relevant skills. Load the appropriate skill first, read it completely, and follow its instructions. If no skill applies, record that explicitly in the tracker before proceeding. Skills carry the implementation detail (scaffolding steps, locator rules, anti-patterns, code templates) that this protocol intentionally doesn't repeat.\n- Keep repository work inside the recorded git worktree. If a continuation starts outside the recorded worktree, enter it before editing. If no worktree is recorded and edits are still required, create or enter one before proceeding.\n- Delegate heavy exploration or generation to subagents via the Task tool. Pass file paths, conventions, and concrete output expectations; tell them which skill to load. Respect the workflow's **delegation constraints** \u2014 some operations must run in the main agent because their output is proof, or because the main agent needs to interpret results in context.\n- Run quality gates in order. Do not skip \u2014 they exist because skipping cascades into rework. On a failing verdict, address the issues and re-run before proceeding. Respect the workflow's **retry limits**: repeated failure usually signals a deeper issue another retry won't fix.\n\n### End\n\nYou end the run only by declaring:\n\n1. Tracker reflects all progress, discoveries, and blockers.\n2. Tracker says clearly what a fresh Turn would need to do first (a Handover can happen at any time).\n3. If all work is verified: append the completion marker as the final non-empty line.\n4. If a human is needed to proceed: append the blocked marker as the final non-empty line, with the question or blocker spelled out as the reason.\n\n## When to write the tracker\n\nWrite on **concrete triggers**, not on a vague sense of \"meaningful progress.\" The right cadence sits between every-tool-call (noisy log, wastes tokens) and end-of-run (everything lost if you die mid-task). This matters more, not less, now that Turns run long: the tracker (plus the Handoff file at a Handover) is what carries a killed or reset session.\n\n- **Discrete unit done** \u2014 file written, fix applied, test run, gate passed. Reflect the new reality before starting the next unit. If another unit is still open, this is also a shed trigger (see [The Dossier](#the-dossier)): cut this unit's detail into `units/<slug>.md` before you start the next one.\n- **Insight learned** \u2014 API quirk, config field that turned out to matter, dead end ruled out, decision between two approaches. Insights are tracker-worthy even when no code changed; rediscovering them costs a future Turn a full re-exploration. The tracker is a knowledge ledger, not just a task log. Insight that spans more than one unit belongs in `orientation.md`, not the tracker.\n- **About to do something risky or long-running** \u2014 subagent dispatch, long build, flaky external call, large refactor. Write _first_, then act. If the operation kills your Turn, only what's on disk survives.\n- **Plan changed** \u2014 task resequenced, new task surfaced, planned task no longer needed. Stale plans poison continuation Turns.\n- **The tracker crosses the ~8,000-token backstop** \u2014 shed the completed phases of the still-open unit into its `units/<slug>.md` record now, mid-unit; don't wait for it to close.\n- **You haven't written in a while** \u2014 if you can't remember the last update, you've gone too long. A short defensive update (\"doing X, last completed Y, next is Z\") beats nothing.\n\nEach update covers: what changed (work or knowledge), what's now next, and any caveat a future Turn needs. Don't transcribe tool calls \u2014 the tracker is a contract with your future self, not a replay log.\n\nThe cost of one extra tracker update is a few tokens. The cost of dying without one is rework. Bias toward writing.\n\n## Task UI projection\n\nThe tracker is the durable source of truth. Your harness's task tools are a session-scoped UI projection of the same plan, shown to the user in their CLI widget. They do not survive process exit.\n\n{{TASK_TOOL_INSTRUCTIONS}}\n\n- **Turn 1, after orientation:** project the tracker's task plan into the task tools.\n- **In a fresh continuation (e.g. after a Handover):** recreate the projection from the tracker; do not assume task IDs from prior sessions still exist.\n- **During work:** update both \u2014 the task tools for immediate UI feedback, the tracker for persistence \u2014 in the same working phase.\n\nSeparately, the runner independently re-derives a task list from the tracker's [unit table](#the-unit-table) and each unit record's frontmatter after every Turn, and mirrors it into the CLI's own task display. This is a backstop, not a substitute for the above \u2014 it only ever reaches `open`/`closed`, so keep calling the task tools yourself for anything finer-grained. It never blocks or fails a Turn: an unparseable table or record just means that Turn's mirror is skipped, exactly as described in [Parsing is best-effort, never a gate](#parsing-is-best-effort-never-a-gate).\n\n## Quick reference\n\n- [ ] Fresh Turn: read the tracker (and any named Handoff file) before doing anything else\n- [ ] Replace the skeleton immediately, even for single-Turn requests\n- [ ] Run until the work is done \u2014 do not stop at checkpoints, and never stop as a way of asking permission to continue\n- [ ] Need a human? Declare it: `WORKFLOW_BLOCKED: <question>` as the final non-empty line, then end\n- [ ] Update the tracker on concrete triggers \u2014 unit done, insight learned, risky op pending, plan changed\n- [ ] Shed a unit's detail into `units/<slug>.md` the moment it closes while another stays open, or the tracker crosses ~8,000 tokens \u2014 cut, paste, pointer, never summarize\n- [ ] Keep the unit table and each shed record's `status: open|closed` frontmatter current \u2014 the runner mirrors them into the task list and skips silently on any parse miss\n- [ ] After a Handover: fold the Handoff's durable content into the tracker or open unit record before any domain work\n- [ ] Project the tracker plan into task tools at session start; keep both in sync as work lands\n- [ ] Follow the workflow steps as written; do not skip, reorder, or substitute your own process\n- [ ] Load the appropriate skill before each activity; do not rely on assumed knowledge\n- [ ] Use and record a dedicated git worktree for repository-changing work\n- [ ] Run quality gates in order; respect delegation constraints and retry limits\n- [ ] Write the completion marker only when all work is verified, and make it the final non-empty line\n";
+var stateMachine_default = "# Turn Protocol\n\nYou run inside a managed workflow loop. **Run until the work is done.** The Dossier \u2014 `.athena/<session_id>/` \u2014 is your durable memory; `journal.md` is your index into it: read it, work, write it as you go. Your conversation context usually survives between stops \u2014 the runner resumes your session rather than restarting it \u2014 but never rely on that: the runner may kill a long Turn, your session may be replaced at a context bound, the process may die mid-task. Anything not in the Dossier can be lost.\n\nTwo kinds of Turn exist, and you should know which you are in:\n\n- **A fresh Turn** \u2014 the first Turn of the run, or the Turn right after a Handover (the runner's context reset). You start with no memory of prior work; the Journal checkpoint is your saved state.\n- **A resumed Turn** \u2014 the runner continued your existing session with a new instruction (a corrective nudge, a retry after a transient failure, a human's reply, or a human steer). Your context is intact; act on the new instruction and keep going.\n\nEither kind of Turn may open with a **human steer**: a block delimited by `=== HUMAN STEER \u2026 ===` and `=== END HUMAN STEER ===`, carrying instructions a human sent into the run while it was in progress (several are numbered in arrival order). Read it before you plan. Where it conflicts with the journal's planned next action, the steer wins; note what it changed in the journal and continue. The runner has already recorded the steer itself in the journal, with its origin and the Turn it reached.\n\n## First action, in a fresh Turn\n\n1. If the seed prompt contains a validated **Restart contract**, execute its next action using the objective, constraints, changes, open questions and references it carries. Read additional Journal and Unit Record sections selectively when needed. Do not read the whole Journal as an opening ritual.\n2. Otherwise read the journal at the configured path (default: `.athena/<session_id>/journal.md`). The runner provides the session ID \u2014 do not invent one.\n3. If it contains `<!-- JOURNAL_SKELETON -->`, run [**Orient**](#orient-turn-1). Otherwise run [**Execute**](#execute-continuation) from its saved next action.\n\nUpdate durable state only when it changes; never append checkpoint-processed notes. The Runner may suspend if the restart contract cannot fit its context allowance.\n\nIn a resumed Turn, your context is already loaded \u2014 skim the journal only if you have any doubt it still matches reality, then continue.\n\n## Journal contract\n\nThe journal must always answer five questions:\n\n1. What are we trying to accomplish?\n2. What has been done?\n3. What's left?\n4. What should the next Turn do first?\n5. What else, beyond this file, must the next Turn read to have full context?\n\nA fresh Turn has no other context. If something isn't here or in a file question 5 names, it doesn't exist. Section headings may vary by workflow, but these five answers must be explicit and easy to find. Question 5 is the journal's pointer into the rest of the Dossier (see [The Dossier](#the-dossier)): on a single-file Run its honest answer is \"nothing else\"; once anything has been shed, it names exactly which files, so a fresh Turn's opening read stays small even when the Dossier has grown.\n\n### Terminal markers\n\nDefault markers (workflows may override \u2014 use the markers configured for the active workflow):\n\n- `<!-- WORKFLOW_COMPLETE -->` \u2014 all work done and verified\n- `<!-- NEEDS_HUMAN -->` or `<!-- NEEDS_HUMAN: reason -->` \u2014 you need a human: a question only they can answer, or an external blocker only they can clear\n\nRules:\n\n- Only the last non-empty line of the journal is authoritative. Marker-like text in notes, examples, or quoted instructions earlier in the file is ignored.\n- When you write a terminal marker, it must be the final non-empty line of the journal. Put every summary, status note, and next-step sentence before the marker. Never append prose after it.\n- The runner trusts markers unconditionally. A premature `WORKFLOW_COMPLETE` ends the run with no automatic recovery \u2014 write it only when its criteria are fully met.\n- Include a concrete reason after `NEEDS_HUMAN:` whenever possible \u2014 it is what the human sees when deciding how to answer you. Put the full question there.\n\n### Step block\n\nWhen the workflow has named steps \u2014 phases, gates, stages, whatever the workflow document calls them \u2014 keep one Turn Protocol block in the journal naming the step you are on, revised in place as you move:\n\n```\n<!-- TURN_PROTOCOL\nstep: Build\nstep_index: 3\nstep_total: 5\n-->\n```\n\n`step` is the step's name as the workflow writes it. `step_index` and `step_total` are optional, 1-based, and `step_index` never exceeds `step_total`. The runner reads the block after every Turn and shows the step in the feed as the run's progress; it never changes what you do. Leave the block out when the workflow has no named steps. A block the runner cannot read is ignored with a warning \u2014 it never fails a Turn.\n\n## The Dossier\n\n`.athena/<session_id>/` is the Dossier: the journal plus everywhere it can shed cold detail once shedding earns its keep.\n\n```\njournal.md       state: index, open loops, next action, terminal marker\nunits/<slug>.md   record: contract, problem, design + rationale, build state, gate evidence\norientation.md    cross-unit knowledge, revised in place\n```\n\n**On most Runs the Dossier never grows past `journal.md` itself** \u2014 one file, no ceremony, no extra directories, nothing below this line to act on. Nothing here changes how a short, single-unit Run works.\n\nA **unit** is a bounded piece of the plan that reaches its own closed state while the Run keeps going \u2014 one issue in a multi-issue epic, one phase of a larger goal. A Run with only one unit never closes a unit while another stays open, so it can never trip the first shed trigger below.\n\n### When to shed\n\nTwo triggers, both structural. A single-unit Run can only ever reach the second, and only once that unit has outgrown the bound:\n\n- **A unit closes while another is still open.** Cut that unit's whole detail out of the journal now, before starting the next one.\n- **The journal crosses ~8,000 tokens** (roughly 32,000 characters \u2014 a token is about 4 characters at this codebase's measured rate). This is a backstop for one long single unit, not a target to design toward \u2014 shed the completed phases of the still-open unit.\n\n### How to shed\n\nShedding is three positive acts on one whole named `##` section \u2014 never a summary, never a partial move:\n\n1. **Cut** the section, verbatim, out of `journal.md`.\n2. **Paste** it, verbatim, into `units/<slug>.md` (create the file on that unit's first shed).\n3. **Pointer** \u2014 leave one index row in the journal's unit table with a relative path to where the detail went.\n\nContent is demoted, never deleted. If you find yourself rewording or condensing while moving text, stop \u2014 that is not shedding, that is exactly where fidelity leaks.\n\n### The unit table\n\nThe journal's unit table is the index the runner reads to keep the CLI's own task list in sync with your plan \u2014 it is parsed by tooling, so its shape is fixed, not free-form prose. Keep it under a `## Units` heading, as a GFM table with exactly two columns:\n\n```\n## Units\n\n| Unit                  | Record                     |\n| ---------------------- | --------------------------- |\n| Add the size nudge     | units/size-nudge.md         |\n| Wire up task projection | units/task-projection.md   |\n```\n\n- **Unit** \u2014 a short human-readable label for the unit (what step 3 of [How to shed](#how-to-shed) points at).\n- **Record** \u2014 the path to that unit's `units/<slug>.md`, relative to the journal's own directory.\n\nOne row per unit that has been shed; units still fully inline in the journal (never shed) don't need a row. A row whose Record file is missing, unreadable, or malformed is simply skipped by the runner \u2014 never guessed at, never a failure (see the next section). Malformed rows in an otherwise-fine table don't invalidate the rest of the table.\n\nEach `units/<slug>.md` record opens with a small YAML frontmatter block the runner reads to know the unit's state:\n\n```\n---\nstatus: open\ngates: []\n---\n\n<the shed section content, verbatim>\n```\n\n- `status` \u2014 `open` or `closed`, exactly (case-insensitive). Any other value, or a missing `status` key, means the runner treats the whole record as unparseable for projection purposes \u2014 it still exists as your durable journal, it just doesn't surface in the task list.\n- `gates` \u2014 reserved for future gate-evidence tracking; not read by anything yet. Leave it present but empty, or omit it \u2014 either is fine today.\n\nThis frontmatter is the only structured part of a unit record; everything after the closing `---` is free-form prose exactly like the rest of the Dossier.\n\n### Parsing is best-effort, never a gate\n\nThe unit table and unit-record frontmatter exist so the runner can mirror your plan into the harness's own task list (see [Task UI projection](#task-ui-projection)) and, separately, so it can nudge you when the journal grows past its size backstop. Both are conveniences layered on top of the Dossier, not requirements on it:\n\n- A missing table, an extra column, a typo'd status, a unit record that fails to parse \u2014 none of it fails your Turn, and none of it is worth stopping to fix for the runner's sake. The runner silently skips whatever it can't parse and, at most, folds a nudge into your next prompt: a size nudge when the journal is over its backstop, or a shed-integrity nudge when a shed was left half done \u2014 a `units/*.md` record with no row in the `## Units` table, or a `##` heading present in both the journal and a record. Finish the shed (cut, paste, pointer) and carry on.\n- Never restructure the journal or a unit record just to make automated parsing happy at the expense of the content itself. If the table and the prose disagree, the prose (what you actually did) is the truth.\n\n### orientation.md\n\nKnowledge that spans more than one unit lives here, revised in place instead of appended to \u2014 the one Dossier surface you edit rather than move things into. Two sections with different rules:\n\n- **Established** \u2014 decisions. Never decay; only explicitly superseded (\"we chose X over Y because Z \u2014 superseded 2026-09-03: \u2026\").\n- **Observed** \u2014 facts carrying a `file.ts:123`-style anchor. Revalidate the anchor before relying on it; code moves.\n\nA correction is an edit to the existing entry, not a new capitalized warning stacked on top of stale text.\n\n## Run until done; declare when you need a human\n\nThe loop's contract with you:\n\n- **Do not stop early.** There is no checkpoint budget and no reason to end a Turn \"to be safe\" \u2014 context refresh is the runner's job, not yours. When your context approaches its bound the runner performs a **Handover**: a fresh session resumes from the bounded `## Restart` section in your Journal; missing or stale state pauses the Run. You will not see this happen; just keep the journal current so nothing is lost.\n- **Stopping without a marker is a mistake**, not a signal. The runner reads it as a premature stop and resumes you with a corrective prompt; repeated markerless stops without journal progress escalate to a human. Never stop as a way of asking \"should I continue?\" \u2014 the answer is always to continue or to declare.\n- **Need a human? Declare it.** Write `NEEDS_HUMAN: <your question or blocker>` as the journal's final non-empty line and end. The run suspends until a human replies; their reply resumes your session with the answer. This is the only correct way to wait for a person \u2014 an interactive question asked into an unattended run cannot be answered.\n- Transient infrastructure failures are not yours to manage: the runner retries them by resuming your session. Just make sure the journal reflects reality before risky operations.\n\n## Phases\n\n### Orient (Turn 1)\n\n1. **Replace the skeleton immediately**, before any domain work. Even a three-line journal (goal + \"orienting\") protects you if the Turn dies during setup.\n2. Identify and load the applicable workflow skills before doing domain work. If a workflow, plugin, or local skill table names a relevant skill, read it fully and follow it. Do not assume you already know the workflow's conventions, tool sequence, quality gates, or implementation details.\n3. Use a dedicated git worktree for repository-changing work. If you are not already inside a task-specific worktree, create or enter one before editing files, record its branch/path in the journal, and continue there. Skip this only when the workflow explicitly forbids it or the task is read-only.\n4. Run the workflow's orientation steps exactly as written. These vary by domain \u2014 a test-writing workflow explores the product in a browser; a migration workflow audits the schema. The workflow defines what orientation means. Do not skip, reorder, reinterpret, or replace workflow steps with a generic approach unless the workflow explicitly allows it or the journal records a concrete blocker that makes the written step impossible.\n5. Refine the journal into a granular plan. Each task a concrete, verifiable unit of work, including verification steps (running checks, reviewing output) \u2014 not just implementation. Vague tasks (\"write tests\") cannot be meaningfully resumed by a future Turn that has no idea what they mean here.\n6. Record concrete observations \u2014 what you actually saw, not what you assumed. Wrong assumptions burn entire future Turns on rework.\n7. **Single-Turn requests still go through this phase.** If the entire request is satisfied quickly, write a minimal journal (what was asked, what was done, the outcome) and append `<!-- WORKFLOW_COMPLETE -->`. Leaving the skeleton in place gets you nudged \u2014 the runner cannot trust work it can't read from the journal \u2014 and repeated stops with an untouched skeleton escalate to a human.\n\n### Execute (continuation)\n\n- Work from where the journal says, in the workflow's prescribed sequence, and keep going until the work is done or a declared blocker stops you.\n- Be strict with workflow steps. Before starting each unit, identify the next required workflow step from the workflow document and journal, follow it as written, and record completion or blockers against that step. Do not substitute your own process, collapse separate gates into one, or advance past an unchecked step.\n- Be strict with skills. Before each new activity, check the workflow, plugin metadata, local skill table, and journal for relevant skills. Load the appropriate skill first, read it completely, and follow its instructions. If no skill applies, record that explicitly in the journal before proceeding. Skills carry the implementation detail (scaffolding steps, locator rules, anti-patterns, code templates) that this protocol intentionally doesn't repeat.\n- Keep repository work inside the recorded git worktree. If a continuation starts outside the recorded worktree, enter it before editing. If no worktree is recorded and edits are still required, create or enter one before proceeding.\n- Delegate heavy exploration or generation to subagents via the Task tool. Pass file paths, conventions, and concrete output expectations; tell them which skill to load. Respect the workflow's **delegation constraints** \u2014 some operations must run in the main agent because their output is proof, or because the main agent needs to interpret results in context.\n- Run quality gates in order. Do not skip \u2014 they exist because skipping cascades into rework. On a failing verdict, address the issues and re-run before proceeding. Respect the workflow's **retry limits**: repeated failure usually signals a deeper issue another retry won't fix.\n\n### End\n\nYou end the run only by declaring:\n\n1. Journal reflects all progress, discoveries, and blockers.\n2. Journal says clearly what a fresh Turn would need to do first (a Handover can happen at any time).\n3. If all work is verified: append the completion marker as the final non-empty line.\n4. If a human is needed to proceed: append the needs-human marker as the final non-empty line, with the question or blocker spelled out as the reason.\n\n## When to write the journal\n\nWrite on **concrete triggers**, not on a vague sense of \"meaningful progress.\" The right cadence sits between every-tool-call (noisy log, wastes tokens) and end-of-run (everything lost if you die mid-task). This matters more, not less, now that Turns run long: the Journal checkpoint is what carries a killed or reset session.\n\n- **Discrete unit done** \u2014 file written, fix applied, test run, gate passed. Reflect the new reality before starting the next unit. If another unit is still open, this is also a shed trigger (see [The Dossier](#the-dossier)): cut this unit's detail into `units/<slug>.md` before you start the next one.\n- **Insight learned** \u2014 API quirk, config field that turned out to matter, dead end ruled out, decision between two approaches. Insights are journal-worthy even when no code changed; rediscovering them costs a future Turn a full re-exploration. The journal is a knowledge ledger, not just a task log. Insight that spans more than one unit belongs in `orientation.md`, not the journal.\n- **About to do something risky or long-running** \u2014 subagent dispatch, long build, flaky external call, large refactor. Write _first_, then act. If the operation kills your Turn, only what's on disk survives.\n- **Plan changed** \u2014 task resequenced, new task surfaced, planned task no longer needed. Stale plans poison continuation Turns.\n- **The journal crosses the ~8,000-token backstop** \u2014 shed the completed phases of the still-open unit into its `units/<slug>.md` record now, mid-unit; don't wait for it to close.\n- **You haven't written in a while** \u2014 if you can't remember the last update, you've gone too long. A short defensive update (\"doing X, last completed Y, next is Z\") beats nothing.\n\nEach update covers: what changed (work or knowledge), what's now next, and any caveat a future Turn needs. Don't transcribe tool calls \u2014 the journal is a contract with your future self, not a replay log.\n\nThe cost of one extra journal update is a few tokens. The cost of dying without one is rework. Bias toward writing.\n\n## Task UI projection\n\nThe journal is the durable source of truth. Your harness's task tools are a session-scoped UI projection of the same plan, shown to the user in their CLI widget. They do not survive process exit.\n\n{{TASK_TOOL_INSTRUCTIONS}}\n\n- **Turn 1, after orientation:** project the journal's task plan into the task tools.\n- **In a fresh continuation (e.g. after a Handover):** recreate the projection from the journal; do not assume task IDs from prior sessions still exist.\n- **During work:** update both \u2014 the task tools for immediate UI feedback, the journal for persistence \u2014 in the same working phase.\n\nSeparately, the runner independently re-derives a task list from the journal's [unit table](#the-unit-table) and each unit record's frontmatter after every Turn, and mirrors it into the CLI's own task display. This is a backstop, not a substitute for the above \u2014 it only ever reaches `open`/`closed`, so keep calling the task tools yourself for anything finer-grained. It never blocks or fails a Turn: an unparseable table or record just means that Turn's mirror is skipped, exactly as described in [Parsing is best-effort, never a gate](#parsing-is-best-effort-never-a-gate).\n\n## Quick reference\n\nOn a Handover, use the validated **Restart contract** in the seed prompt: objective, next action, essential constraints, changes, open questions and evidence references. Read additional Journal and Unit Record sections selectively when the next action needs them. Update durable state only when it changes; never append checkpoint-processed notes. The Runner may suspend if the restart contract cannot fit its context allowance.\n\n- [ ] Replace the skeleton immediately, even for single-Turn requests\n- [ ] Run until the work is done \u2014 do not stop at checkpoints, and never stop as a way of asking permission to continue\n- [ ] Need a human? Declare it: `NEEDS_HUMAN: <question>` as the final non-empty line, then end\n- [ ] Update the journal on concrete triggers \u2014 unit done, insight learned, risky op pending, plan changed\n- [ ] Shed a unit's detail into `units/<slug>.md` the moment it closes while another stays open, or the journal crosses ~8,000 tokens \u2014 cut, paste, pointer, never summarize\n- [ ] Keep the unit table and each shed record's `status: open|closed` frontmatter current \u2014 the runner mirrors them into the task list and skips silently on any parse miss\n      On a Handover, use the validated **Restart contract** in the seed prompt: objective, next action, essential constraints, changes, open questions and evidence references. Read additional Journal and Unit Record sections selectively when the next action needs them. Update durable state only when it changes; never append checkpoint-processed notes. The Runner may suspend if the restart contract cannot fit its context allowance.\n- [ ] Project the journal plan into task tools at session start; keep both in sync as work lands\n- [ ] Follow the workflow steps as written; do not skip, reorder, or substitute your own process\n- [ ] Workflow has named steps? Keep the `TURN_PROTOCOL` step block in the journal naming the one you are on\n- [ ] Load the appropriate skill before each activity; do not rely on assumed knowledge\n- [ ] Use and record a dedicated git worktree for repository-changing work\n- [ ] Run quality gates in order; respect delegation constraints and retry limits\n- [ ] Write the completion marker only when all work is verified, and make it the final non-empty line\n\n## Restart checkpoint\n\nMaintain one `## Restart` section in the Journal during normal work, using the\nRun id and token bound supplied by the Runner. Include `Run: <runId>` and these\nnonempty fields: Objective, Next action, Constraints, Changes, Open questions,\nReferences. Use `none` when appropriate. Preserve essential constraints; point to\nevidence instead of copying cold history. Update after orientation and concrete\nmilestones, before large reads or risky operations. Write atomically. At the\ncontext boundary the Runner restarts directly from this section, or pauses if it\nis missing, invalid or already consumed. Continue normal work; do not request a\nseparate summarization Turn.\n";
 
 // src/core/workflows/stateMachine.ts
 function buildTaskToolInstructions(harness) {
@@ -1801,23 +1925,23 @@ function buildTaskToolInstructions(harness) {
     case "openai-codex":
       return `Use the \`update_plan\` tool to create and maintain the task list shown to the user for the full harness session.
 
-- As soon as orientation yields a credible plan, create a detailed task list from the tracker; each item should be a concrete, verifiable unit of work, not a vague phase
-- At the start of every fresh harness session, recreate the full task list from the tracker before resuming execution
+- As soon as orientation yields a credible plan, create a detailed task list from the journal; each item should be a concrete, verifiable unit of work, not a vague phase
+- At the start of every fresh harness session, recreate the full task list from the journal before resuming execution
 - Do not carry forward prior session task IDs or assume prior session plan items still exist in the tool
-- Keep the task list accurate throughout the session: when scope, ordering, status, or completion changes, update \`update_plan\` immediately in the same working phase as the tracker
-- Keep task state consistent and non-stale: reconcile the task list against the tracker before moving on, and before ending the session
-- Maintain exactly one \`in_progress\` task unless the tracker explicitly records parallel active work`;
+- Keep the task list accurate throughout the session: when scope, ordering, status, or completion changes, update \`update_plan\` immediately in the same working phase as the journal
+- Keep task state consistent and non-stale: reconcile the task list against the journal before moving on, and before ending the session
+- Maintain exactly one \`in_progress\` task unless the journal explicitly records parallel active work`;
     case "claude-code":
     case "opencode":
     default:
       return `Use \`TaskCreate\` and \`TaskUpdate\` to create and maintain the task list shown to the user for the full harness session.
 
-- As soon as orientation yields a credible plan, create a detailed task list from the tracker; each item should be a concrete, verifiable unit of work, not a vague phase
-- At the start of every fresh harness session, recreate the full task list from the tracker instead of trying to resume prior session task IDs
+- As soon as orientation yields a credible plan, create a detailed task list from the journal; each item should be a concrete, verifiable unit of work, not a vague phase
+- At the start of every fresh harness session, recreate the full task list from the journal instead of trying to resume prior session task IDs
 - Do not refer to task IDs created in earlier sessions; they are session-scoped UI artifacts, not durable workflow state
-- Keep the task list accurate throughout the session: when scope, ordering, status, or completion changes, update the task list in the same working phase as the tracker
-- Keep task state consistent and non-stale: reconcile the task list against the tracker before moving on, and before ending the session
-- Maintain exactly one active task unless the tracker explicitly records parallel active work`;
+- Keep the task list accurate throughout the session: when scope, ordering, status, or completion changes, update the task list in the same working phase as the journal
+- Keep task state consistent and non-stale: reconcile the task list against the journal before moving on, and before ending the session
+- Maintain exactly one active task unless the journal explicitly records parallel active work`;
   }
 }
 function buildStateMachineContent(harness = "claude-code") {
@@ -1829,7 +1953,7 @@ function buildStateMachineContent(harness = "claude-code") {
 var STATE_MACHINE_CONTENT = buildStateMachineContent();
 
 // src/core/workflows/sessionPlan.ts
-function readWorkflowOverride(projectDir, workflow, sessionId, trackerPath, harness = "claude-code") {
+function readWorkflowOverride(projectDir, workflow, sessionId, journalPath, harness = "claude-code") {
   if (!workflow?.workflowFile) {
     return { workflowOverride: void 0, warnings: [] };
   }
@@ -1848,11 +1972,24 @@ function readWorkflowOverride(projectDir, workflow, sessionId, trackerPath, harn
   let composed = workflow.loop?.enabled ? buildStateMachineContent(harness) + "\n\n" + workflowContent : workflowContent;
   composed = substituteVariables(composed, {
     sessionId,
-    trackerPath: trackerPath ?? void 0
+    journalPath: journalPath ?? void 0
   });
-  const workflowDir = path9.dirname(resolvedPath);
-  const composedPath = path9.join(workflowDir, ".composed-system-prompt.md");
-  fs10.writeFileSync(composedPath, composed, "utf-8");
+  const assetDir = path9.join(projectDir, ".athena", "execution-assets");
+  fs10.mkdirSync(assetDir, { recursive: true, mode: 448 });
+  const digest = crypto.createHash("sha256").update(composed).digest("hex");
+  const composedPath = path9.join(assetDir, `${digest}.md`);
+  if (!fs10.existsSync(composedPath)) {
+    const temporary = path9.join(
+      assetDir,
+      `${digest}.${crypto.randomUUID()}.tmp`
+    );
+    try {
+      fs10.writeFileSync(temporary, composed, { encoding: "utf-8", mode: 384 });
+      fs10.renameSync(temporary, composedPath);
+    } finally {
+      if (fs10.existsSync(temporary)) fs10.unlinkSync(temporary);
+    }
+  }
   return {
     workflowOverride: {
       appendSystemPromptFile: composedPath,
@@ -1869,17 +2006,33 @@ function mergeOverrides(base, workflowOverride) {
     ...workflowOverride
   };
 }
-function resolveTrackerPath(input) {
+function resolveJournalPath(input) {
   const loop = input.workflow?.loop;
   if (!loop?.enabled) {
     return null;
   }
-  const rawPath = loop.trackerPath ?? DEFAULT_TRACKER_PATH;
+  const rawPath = loopJournalPath(loop);
   if (!input.sessionId && rawPath.includes("{sessionId}")) {
     return null;
   }
   const promptPath = input.sessionId ? rawPath.replaceAll("{sessionId}", input.sessionId) : rawPath;
   const absolutePath = path9.isAbsolute(promptPath) ? promptPath : path9.resolve(input.projectDir, promptPath);
+  const usesDefaultPath = loop.journalPath === void 0 && loop.trackerPath === void 0;
+  if (usesDefaultPath && !fs10.existsSync(absolutePath)) {
+    const legacyAbsolutePath = path9.join(
+      path9.dirname(absolutePath),
+      LEGACY_JOURNAL_FILENAME
+    );
+    if (fs10.existsSync(legacyAbsolutePath)) {
+      return {
+        absolutePath: legacyAbsolutePath,
+        promptPath: path9.posix.join(
+          path9.posix.dirname(promptPath),
+          LEGACY_JOURNAL_FILENAME
+        )
+      };
+    }
+  }
   return {
     absolutePath,
     promptPath
@@ -1887,17 +2040,17 @@ function resolveTrackerPath(input) {
 }
 function createWorkflowRunState(input) {
   const { projectDir, sessionId, workflow, harness } = input;
-  const trackerResolved = resolveTrackerPath({ projectDir, sessionId, workflow });
+  const journalResolved = resolveJournalPath({ projectDir, sessionId, workflow });
   const { workflowOverride, warnings } = readWorkflowOverride(
     projectDir,
     workflow,
     sessionId,
-    trackerResolved?.promptPath,
+    journalResolved?.promptPath,
     harness
   );
   return {
     workflow,
-    trackerPathForPrompt: trackerResolved?.promptPath,
+    journalPathForPrompt: journalResolved?.promptPath,
     workflowOverride,
     warnings
   };
@@ -1908,7 +2061,7 @@ function prepareWorkflowTurn(state, input) {
   const isContinuation = workflow?.loop?.enabled === true && iteration > 1;
   const prompt = isContinuation ? buildContinuePrompt({
     ...workflow.loop,
-    trackerPath: state.trackerPathForPrompt ?? workflow.loop?.trackerPath
+    journalPath: state.journalPathForPrompt ?? workflow.loop?.journalPath
   }) : workflow ? applyPromptTemplate(workflow.promptTemplate, input.prompt) : input.prompt;
   return {
     prompt,
@@ -1920,54 +2073,310 @@ function prepareWorkflowTurn(state, input) {
   };
 }
 
-// src/core/workflows/useWorkflowSessionController.ts
-import { useCallback, useEffect, useRef, useState } from "react";
-
 // src/core/workflows/workflowRunner.ts
-import crypto2 from "crypto";
+import crypto3 from "crypto";
 import fs12 from "fs";
 import path10 from "path";
 
 // src/core/workflows/terminalOutcome.ts
 import fs11 from "fs";
-var MISSING_TRACKER_MESSAGE = "the tracker file went missing during the run \u2014 the workflow can no longer verify progress";
-var MISPLACED_TERMINAL_MARKER_MESSAGE = "terminal workflow marker is not the final non-empty line of the tracker; move all summary text above the marker";
+var MISSING_JOURNAL_MESSAGE = "the journal file went missing during the run \u2014 the workflow can no longer verify progress";
+var MISPLACED_TERMINAL_MARKER_MESSAGE = "terminal workflow marker is not the final non-empty line of the journal; move all summary text above the marker";
 function resolveTurnOutcome(input) {
-  const { trackerPath, loop, iteration } = input;
-  if (!fs11.existsSync(trackerPath)) {
+  const { journalPath, loop } = input;
+  if (!fs11.existsSync(journalPath)) {
     return {
       kind: "stop",
       status: "failed",
-      stopReason: MISSING_TRACKER_MESSAGE
+      stopReason: MISSING_JOURNAL_MESSAGE
     };
   }
-  const tracker = parseTrackerState(readTracker(trackerPath), loop);
-  if (tracker.misplacedTerminalMarker) {
+  const journal = parseJournalState(readJournal(journalPath), loop);
+  if (journal.misplacedTerminalMarker) {
     return {
       kind: "stop",
       status: "failed",
       stopReason: MISPLACED_TERMINAL_MARKER_MESSAGE
     };
   }
-  if (tracker.completed) {
+  if (journal.completed) {
     return { kind: "stop", status: "completed" };
   }
-  if (tracker.blocked) {
+  if (journal.needsHuman) {
     return {
       kind: "suspend",
       status: "awaiting_attention",
-      stopReason: tracker.blockedReason ? `agent declared WORKFLOW_BLOCKED: ${tracker.blockedReason}` : "agent declared WORKFLOW_BLOCKED"
+      stopReason: journal.needsHumanReason ? `agent declared NEEDS_HUMAN: ${journal.needsHumanReason}` : "agent declared NEEDS_HUMAN",
+      ...journal.deprecatedMarker ? { deprecation: buildMarkerDeprecation(journal.deprecatedMarker) } : {}
     };
   }
-  if (iteration >= loop.maxIterations) {
+  return { kind: "continue" };
+}
+
+// src/core/workflows/continuationPolicy.ts
+var DEFAULT_RESTART_TOKENS = 2e3;
+var DEFAULT_WORKING_TOKENS = 8e3;
+function resourceInterruption(stop) {
+  const names = {
+    tokens: "token budget",
+    iterations: "iteration ceiling",
+    context: "restart context allowance",
+    restart: "restart checkpoint"
+  };
+  return {
+    kind: "cap_exhausted",
+    cap: stop.cause === "iterations" ? "iterations" : stop.cause === "tokens" ? "tokens" : "handover",
+    limit: stop.limit,
+    message: `${names[stop.cause]} reached: ${stop.limit}; used ${stop.used}${stop.detail ? ` \u2014 ${stop.detail}` : ""}`,
+    resource: stop
+  };
+}
+function admitContinuation(input) {
+  const { loop } = input;
+  if (!loop?.enabled) return null;
+  const base = { fresh: false, checkpointPath: input.checkpointPath };
+  if (loop.maxRunTokens !== void 0 && (input.tokens ?? 0) >= loop.maxRunTokens)
     return {
-      kind: "suspend",
-      status: "awaiting_attention",
-      stopReason: `iteration ceiling reached: ${loop.maxIterations} iteration${loop.maxIterations === 1 ? "" : "s"} (maxIterations) used without a terminal marker`
+      ...base,
+      cause: "tokens",
+      limit: loop.maxRunTokens,
+      used: input.tokens ?? 0
     };
+  if (input.iteration > loop.maxIterations)
+    return {
+      ...base,
+      cause: "iterations",
+      limit: loop.maxIterations,
+      used: input.iteration - 1
+    };
+  if (input.context) {
+    const { opening, required, ceiling, source } = input.context;
+    const used = opening + required + DEFAULT_WORKING_TOKENS;
+    if (used > ceiling)
+      return {
+        ...base,
+        cause: "context",
+        fresh: true,
+        limit: ceiling,
+        used,
+        detail: `opening ${opening} + checkpoint ${required} + ${DEFAULT_WORKING_TOKENS} working tokens; ${source}; reduce startup context or increase its allowance`
+      };
   }
-  return { kind: "continue" };
+  return null;
+}
+
+// src/core/workflows/restartContract.ts
+var fields = [
+  "Objective",
+  "Next action",
+  "Constraints",
+  "Changes",
+  "Open questions",
+  "References"
+];
+function readRestartContract(content, limit = DEFAULT_RESTART_TOKENS, expectedRunId) {
+  if ((content.match(/^## Restart[ \t]*$/gm) ?? []).length !== 1) return null;
+  const match = /^## Restart\s*\n([\s\S]*?)(?=^## |$(?![\s\S]))/m.exec(content);
+  if (!match) return null;
+  const text = match[1].trim();
+  if (!fields.every((field) => new RegExp(`^${field}:[ 	]*\\S`, "m").test(text)))
+    return null;
+  if (expectedRunId && !text.split("\n").some((line) => line.trim() === `Run: ${expectedRunId}`))
+    return null;
+  const tokens = estimateTokenCount(text);
+  return tokens <= limit ? { text, tokens } : null;
+}
+function restartInstructions(journalPath, runId, limit = DEFAULT_RESTART_TOKENS) {
+  return `Maintain one ## Restart section in the Journal at ${journalPath} during this Workflow Run. Include Run: ${runId}, followed by these nonempty fields: ${fields.join(", ")}. Use none where appropriate. Update it after orientation and each meaningful work checkpoint, before large reads or risky operations; keep it within ${limit} estimated tokens. Preserve essential constraints and reference supporting evidence. Write changes atomically so interruption cannot leave a partial checkpoint. The Runner may replace your Agent Session at its context bound using only this section. Do not stop to request a Handover; continue working and declare the normal terminal marker when done.`;
 }
+function seedFromRestart(contract, checkpointPath, journalPath) {
+  return `Continue this Workflow Run from its validated restart contract:
+
+${contract.text}
+
+The checkpoint is in ${checkpointPath}${journalPath ? `; the Journal is at ${journalPath}` : ""}. Read additional sections selectively when the next action requires them. Update durable state only when it changes. Do not append checkpoint-processed notes or repeat completed work. Essential constraints above remain in force.`;
+}
+
+// src/core/workflows/turnProtocolBlock.ts
+var BLOCK_OPEN = /^\s*<!--\s*TURN_PROTOCOL\s*$/;
+var BLOCK_CLOSE = /^\s*-->\s*$/;
+var TRAILING_CLOSE = /\s*-->\s*$/;
+var KEY_VALUE = /^([A-Za-z_][A-Za-z0-9_]*)\s*:\s*(.*)$/;
+function parseTurnProtocolBlock(content) {
+  const lines = content.split("\n");
+  let last = null;
+  let open = null;
+  for (const raw of lines) {
+    const line = raw.replace(/\r$/, "");
+    if (open === null) {
+      if (BLOCK_OPEN.test(line)) open = [];
+      continue;
+    }
+    if (BLOCK_CLOSE.test(line)) {
+      last = open;
+      open = null;
+      continue;
+    }
+    if (TRAILING_CLOSE.test(line)) {
+      open.push(line.replace(TRAILING_CLOSE, ""));
+      last = open;
+      open = null;
+      continue;
+    }
+    open.push(line);
+  }
+  if (open !== null) {
+    return {
+      kind: "malformed",
+      reason: "the TURN_PROTOCOL block is never closed with -->"
+    };
+  }
+  if (last === null) return { kind: "missing" };
+  return parseBlockLines(last);
+}
+function parseBlockLines(lines) {
+  const fields2 = /* @__PURE__ */ new Map();
+  for (const line of lines) {
+    const match = KEY_VALUE.exec(line.trim());
+    if (!match) continue;
+    fields2.set(match[1], match[2].trim());
+  }
+  const name = fields2.get("step");
+  if (name === void 0) {
+    return { kind: "malformed", reason: "the block has no `step:` line" };
+  }
+  if (name.length === 0) {
+    return { kind: "malformed", reason: "the `step:` line names no step" };
+  }
+  const index = parsePositiveInt(fields2.get("step_index"));
+  if (index.kind === "invalid") {
+    return {
+      kind: "malformed",
+      reason: `\`step_index\` must be a positive integer, got "${index.raw}"`
+    };
+  }
+  const total = parsePositiveInt(fields2.get("step_total"));
+  if (total.kind === "invalid") {
+    return {
+      kind: "malformed",
+      reason: `\`step_total\` must be a positive integer, got "${total.raw}"`
+    };
+  }
+  if (index.kind === "value" && total.kind === "value" && index.value > total.value) {
+    return {
+      kind: "malformed",
+      reason: `\`step_index\` (${index.value}) is past \`step_total\` (${total.value})`
+    };
+  }
+  return {
+    kind: "ok",
+    step: {
+      name,
+      ...index.kind === "value" ? { index: index.value } : {},
+      ...total.kind === "value" ? { total: total.value } : {}
+    }
+  };
+}
+function parsePositiveInt(raw) {
+  if (raw === void 0 || raw.length === 0) return { kind: "absent" };
+  if (!/^\d+$/.test(raw)) return { kind: "invalid", raw };
+  const value = Number(raw);
+  if (!Number.isSafeInteger(value) || value < 1) return { kind: "invalid", raw };
+  return { kind: "value", value };
+}
+function sameStep(a, b) {
+  return a.name === b.name && a.index === b.index;
+}
+function createPhaseTracker() {
+  let lastStep = null;
+  let lastMalformedReason = null;
+  return {
+    observe(journalContent) {
+      const parsed = parseTurnProtocolBlock(journalContent);
+      if (parsed.kind === "missing") {
+        lastMalformedReason = null;
+        return { kind: "no_block" };
+      }
+      if (parsed.kind === "malformed") {
+        const warning = parsed.reason === lastMalformedReason ? null : `ignoring the journal's TURN_PROTOCOL block: ${parsed.reason}`;
+        lastMalformedReason = parsed.reason;
+        return { kind: "malformed", reason: parsed.reason, warning };
+      }
+      lastMalformedReason = null;
+      if (lastStep && sameStep(lastStep, parsed.step)) {
+        lastStep = parsed.step;
+        return { kind: "same_step" };
+      }
+      lastStep = parsed.step;
+      return { kind: "new_step", step: parsed.step };
+    }
+  };
+}
+
+// src/core/workflows/steer.ts
+var STEER_BLOCK_OPEN = "=== HUMAN STEER";
+var STEER_BLOCK_END = "=== END HUMAN STEER ===";
+function steerHeading(steer, index, total) {
+  const position = total > 1 ? `${index + 1} of ${total}, ` : "";
+  return `${STEER_BLOCK_OPEN} (${position}via ${steer.origin}, received ${new Date(
+    steer.receivedAt
+  ).toISOString()}) ===`;
+}
+function buildSteerBlock(steers) {
+  const entries = steers.map(
+    (steer, index) => `${steerHeading(steer, index, steers.length)}
+${steer.text.trim()}`
+  );
+  const noun = steers.length > 1 ? "steers" : "steer";
+  return `${entries.join("\n")}
+${STEER_BLOCK_END}
+
+A human steered this run. Read the ${noun} above before you plan: where it conflicts with the journal's planned next action, the steer wins. Apply it, note it in the journal, and continue the workflow.`;
+}
+function prependSteerBlock(prompt, steers) {
+  if (steers.length === 0) return prompt;
+  return `${buildSteerBlock(steers)}
+
+---
+
+${prompt}`;
+}
+function formatSteerJournalEntry(steer, iteration) {
+  const quoted = steer.text.trim().split("\n").map((line) => `> ${line}`).join("\n");
+  return `
+
+---
+
+## Human steer (via ${steer.origin})
+
+_Received ${new Date(steer.receivedAt).toISOString()}; delivered into Turn ${iteration}._
+
+${quoted}
+`;
+}
+function createSteerQueue() {
+  const buffered = [];
+  let listener = null;
+  return {
+    push(steer) {
+      if (listener) {
+        listener(steer);
+        return;
+      }
+      buffered.push(steer);
+    },
+    subscribe(next) {
+      listener = next;
+      for (const steer of buffered.splice(0)) next(steer);
+      return () => {
+        if (listener === next) listener = null;
+      };
+    }
+  };
+}
+
+// src/core/workflows/runMachine.ts
+import crypto2 from "crypto";
 
 // src/core/runtime/failureTaxonomy.ts
 var RULES = [
@@ -2018,19 +2427,56 @@ function classifyTurnFailure(input) {
 }
 
 // src/core/workflows/runMachine.ts
-import crypto from "crypto";
-function hashTrackerContent(content) {
-  return crypto.createHash("sha256").update(content).digest("hex");
+function formatGrace(ms) {
+  return ms >= 1e3 ? `${Math.round(ms / 1e3)}s` : `${ms}ms`;
+}
+function describeDeferral(permission) {
+  return permission.graceMs > 0 ? ` unanswered within the grace window (${formatGrace(permission.graceMs)}); deferred` : " deferred immediately (no hub attached to answer)";
 }
-function buildHandoverSeedPrompt(handoffPath, trackerPath) {
-  return `A Handover occurred: the previous agent session reached its context bound and was distilled into a Handoff file. Read the Handoff file at ${handoffPath}` + (trackerPath ? ` and the tracker at ${trackerPath}` : "") + `. Before any domain work: fold whatever durable content the Handoff file records into the tracker` + (trackerPath ? ` at ${trackerPath}` : "") + ` and the open unit's record (ADR 0015 \xA78) \u2014 that fold-in is itself the tracker's next edit. Only once it is written should you continue the work from exactly where it stands. Do not redo completed work, and do not re-litigate decisions the Handoff file records.`;
+function protocolInterruptionFor(interruption) {
+  if (interruption.kind === "question" || !interruption.permission) return null;
+  return {
+    kind: "question",
+    message: describeInterruption(interruption),
+    requestId: interruption.permission.requestId,
+    question: `${interruption.toolName}: ${interruption.permission.inputSummary}`
+  };
 }
-function buildWakePrompt(reply, trackerPath) {
+function describeInterruption(interruption) {
+  switch (interruption.kind) {
+    case "ask_rule":
+      if (interruption.permission) {
+        return `ask rule "${interruption.rule}" fired on ${interruption.toolName}${describeDeferral(interruption.permission)}: ${interruption.permission.inputSummary} \u2014 wake with --answer=allow|deny`;
+      }
+      return `ask rule "${interruption.rule}" fired on ${interruption.toolName} \u2014 needs a human`;
+    case "question":
+      return interruption.question ? `agent asked a question with no human attached to answer: ${interruption.question}` : "agent asked a question with no human attached to answer";
+    case "unclaimed_permission":
+      if (interruption.permission) {
+        return `permission request (${interruption.toolName})${describeDeferral(interruption.permission)}: ${interruption.permission.inputSummary} \u2014 wake with --answer=allow|deny, or rerun with --isolation autonomous`;
+      }
+      return `agent requested sandbox approval (${interruption.toolName}) with no human attached to answer \u2014 rerun with --isolation autonomous, or wake with guidance`;
+  }
+}
+function hashJournalContent(content) {
+  return crypto2.createHash("sha256").update(content).digest("hex");
+}
+function withCumulativeTokens(memory, cumulativeTokens) {
+  return cumulativeTokens === null ? memory : { ...memory, cumulativeTokens };
+}
+function buildWakePrompt(reply, journalPath, parkedInterruption) {
   return `This workflow run was suspended awaiting a human; it is now resumed. The human replied:
 
 ${reply}
 
-` + (trackerPath ? `Read the tracker at ${trackerPath} for the task and its current state, apply the reply, and continue the workflow. ` : `Apply the reply and continue the workflow. `) + `Keep the tracker current as you work \u2014 if it still contains the runner's skeleton, replace it while orienting \u2014 and end by declaring a terminal marker as usual.`;
+` + buildReplayGuidance(parkedInterruption) + (journalPath ? `Consult the relevant Journal sections at ${journalPath} as needed, apply the reply, and continue the workflow. ` : `Apply the reply and continue the workflow. `) + `Keep the journal current as you work \u2014 if it still contains the runner's skeleton, replace it while orienting \u2014 and end by declaring a terminal marker as usual.`;
+}
+function buildReplayGuidance(parked) {
+  if (!parked || parked.kind !== "question" || !parked.requestId) return "";
+  const call = parked.question ?? "the same call";
+  return `Before your previous Turn ended, your request \`${call}\` (request ${parked.requestId}) was deferred because nobody answered it in time. Re-issue that exact call now, with the same input: if an answer was stored while this run was parked it is applied automatically, otherwise the request is held again for a human. Do not work around the deferred call or substitute a different one.
+
+`;
 }
 function buildFailureDetail(event) {
   const parts = [];
@@ -2046,29 +2492,34 @@ function buildFailureDetail(event) {
   }
   return parts.join(": ") || "Turn failed";
 }
-function createInitialRun(cfg, opts) {
-  if (opts.waking && opts.resumedMemory) {
-    return {
-      phase: {
-        kind: "awaiting_attention",
-        stopReason: opts.awaitingAttentionStopReason ?? ""
-      },
-      memory: opts.resumedMemory
-    };
-  }
+function initialRun(cfg, opts) {
+  const initialSteers = opts.initialSteers ?? [];
   if (opts.resumedMemory) {
-    return {
-      phase: {
-        kind: "backing_off",
-        ms: 0,
-        resume: {
-          kind: "turn",
-          prompt: opts.resumedMemory.lastStopPrompt,
-          continuation: opts.resumedMemory.lastStopContinuation
-        }
-      },
-      memory: opts.resumedMemory
+    const memory = initialSteers.length === 0 ? opts.resumedMemory : {
+      ...opts.resumedMemory,
+      pendingSteers: [
+        ...opts.resumedMemory.pendingSteers,
+        ...initialSteers
+      ]
+    };
+    if (opts.waking) {
+      const phase3 = {
+        kind: "awaiting_attention",
+        stopReason: opts.awaitingAttentionStopReason ?? "",
+        ...opts.parkedInterruption ? { interruption: opts.parkedInterruption } : {}
+      };
+      return { phase: phase3, memory, actions: kickoffActionsFor(phase3) };
+    }
+    const phase2 = {
+      kind: "backing_off",
+      ms: 0,
+      resume: {
+        kind: "turn",
+        prompt: opts.resumedMemory.lastStopPrompt,
+        continuation: opts.resumedMemory.lastStopContinuation
+      }
     };
+    return { phase: phase2, memory, actions: kickoffActionsFor(phase2) };
   }
   const continuation = opts.initialContinuation ?? { mode: "fresh" };
   const iteration = 1;
@@ -2077,55 +2528,193 @@ function createInitialRun(cfg, opts) {
     iteration,
     configOverride: void 0
   });
-  const prompt = opts.waking ? buildWakePrompt(cfg.initialPrompt, cfg.trackerPromptPath) : prepared.prompt;
+  const prompt = opts.waking ? buildWakePrompt(
+    cfg.initialPrompt,
+    cfg.journalPromptPath,
+    opts.parkedInterruption
+  ) : prepared.prompt;
+  const phase = {
+    kind: "turn_in_flight",
+    prompt,
+    continuation,
+    configOverride: prepared.configOverride
+  };
   return {
-    phase: {
-      kind: "turn_in_flight",
-      prompt,
-      continuation,
-      configOverride: prepared.configOverride
-    },
+    phase,
     memory: {
       iteration,
       nudgeStreak: 0,
       retryStreak: 0,
-      lastTrackerHash: null,
+      lastJournalHash: null,
       lastStopPrompt: prompt,
       lastStopContinuation: continuation,
-      lastHandoffSizeBytes: null
-    }
+      pendingSteers: initialSteers,
+      parkedAfterHandover: false,
+      lastBoundedTurn: null,
+      cumulativeTokens: null
+    },
+    actions: kickoffActionsFor(phase)
+  };
+}
+function kickoffActionsFor(phase) {
+  switch (phase.kind) {
+    case "turn_in_flight":
+      return [
+        {
+          type: "start_turn",
+          prompt: phase.prompt,
+          continuation: phase.continuation,
+          configOverride: phase.configOverride
+        }
+      ];
+    case "backing_off":
+      return [{ type: "wait", ms: phase.ms }];
+    case "awaiting_attention":
+    case "completed":
+    case "failed":
+    case "cancelled":
+      return [];
+  }
+}
+function deliverPendingSteers(result) {
+  const steers = result.memory.pendingSteers;
+  if (steers.length === 0 || result.phase.kind !== "turn_in_flight") {
+    return result;
+  }
+  const startIndex = result.actions.findIndex((a) => a.type === "start_turn");
+  if (startIndex === -1) return result;
+  const start = result.actions[startIndex];
+  const prompt = prependSteerBlock(start.prompt, steers);
+  const actions = [
+    ...result.actions.slice(0, startIndex),
+    {
+      type: "steers_delivered",
+      steers,
+      iteration: result.memory.iteration
+    },
+    { ...start, prompt },
+    ...result.actions.slice(startIndex + 1)
+  ];
+  return {
+    phase: { ...result.phase, prompt },
+    memory: { ...result.memory, lastStopPrompt: prompt, pendingSteers: [] },
+    actions
   };
 }
-function handleTurnInFlight(phase, memory, event, cfg) {
+function handleSteer(phase, memory, steer) {
+  return {
+    phase,
+    memory: { ...memory, pendingSteers: [...memory.pendingSteers, steer] },
+    actions: [{ type: "persist" }]
+  };
+}
+function handleTurnInFlight(phase, incoming, event, cfg) {
   if (event.cancelled) {
-    return { phase: { kind: "cancelled" }, memory, actions: [{ type: "persist" }] };
+    return {
+      phase: { kind: "cancelled" },
+      memory: incoming,
+      actions: [{ type: "persist" }]
+    };
   }
+  const memory = {
+    ...withCumulativeTokens(incoming, event.cumulativeTokens),
+    ...event.checkpoint ? { checkpoint: event.checkpoint } : {}
+  };
   if (event.handoverRequestHandle !== null) {
+    const checkpoint = event.checkpoint;
+    const hash = checkpoint ? hashJournalContent(checkpoint.contract.text) : null;
+    const boundedMemory = {
+      ...memory,
+      ...checkpoint ? { checkpoint } : {},
+      parkedAfterHandover: true,
+      contextKey: cfg.contextKey,
+      lastBoundedTurn: {
+        openingContextTokens: event.openingContextTokens,
+        openingRestartTokens: incoming.activeRestartTokens ?? 0,
+        lastContextTokens: event.lastContextTokens,
+        toolCalls: event.toolCalls
+      },
+      lastJournalHash: hashJournalContent(event.journalContent)
+    };
+    if (!checkpoint || hash === memory.lastRestartHash) {
+      return parkResource(
+        boundedMemory,
+        {
+          cause: "restart",
+          limit: cfg.loop?.maxRestartTokens ?? 2e3,
+          used: checkpoint?.contract.tokens ?? 0,
+          fresh: true,
+          detail: checkpoint ? "Restart checkpoint has already been consumed; update it before continuing" : "Missing, invalid, oversized or wrong-run Restart checkpoint",
+          checkpointPath: boundedMemory.checkpoint?.path
+        },
+        [{ type: "notify_iteration_complete" }]
+      );
+    }
+    const prompt = seedFromRestart(checkpoint.contract, checkpoint.path);
+    const continuation2 = { mode: "fresh" };
+    const iteration = memory.iteration + 1;
+    const prepared2 = prepareWorkflowTurn(cfg.workflowState, {
+      prompt: cfg.initialPrompt,
+      iteration,
+      configOverride: void 0
+    });
     return {
       phase: {
-        kind: "handing_over",
-        handle: event.handoverRequestHandle,
-        // Reuse this Turn's own prepared configOverride (the same object
-        // the primary `start_turn` action used) rather than recomputing —
-        // matches workflowRunner.ts's original `prepared.configOverride`
-        // reuse at the fork call site exactly. Stored on the phase too
-        // (not just the action) so a transient-retry (§8) can re-issue the
-        // fork with the same override.
-        configOverride: phase.configOverride
+        kind: "turn_in_flight",
+        prompt,
+        continuation: continuation2,
+        configOverride: prepared2.configOverride
+      },
+      memory: {
+        ...boundedMemory,
+        iteration,
+        lastRestartHash: hash,
+        lastStopPrompt: prompt,
+        lastStopContinuation: continuation2,
+        parkedAfterHandover: false
       },
-      memory,
       actions: [
+        { type: "persist" },
         {
-          type: "start_fork_turn",
-          handle: event.handoverRequestHandle,
-          configOverride: phase.configOverride
+          type: "notify_handover_completed",
+          completion: {
+            iteration: memory.iteration,
+            checkpointPath: checkpoint.path,
+            checkpointTokens: checkpoint.contract.tokens
+          }
+        },
+        { type: "notify_iteration_complete" },
+        {
+          type: "start_turn",
+          restartTokens: checkpoint.contract.tokens,
+          prompt,
+          continuation: continuation2,
+          configOverride: prepared2.configOverride
         }
       ]
     };
   }
-  if (event.suspension) {
+  if (event.interruption) {
+    const deferred = protocolInterruptionFor(event.interruption);
+    if (deferred) {
+      return {
+        phase: {
+          kind: "awaiting_attention",
+          stopReason: deferred.message,
+          interruption: deferred
+        },
+        memory,
+        actions: [
+          { type: "record_interruption", interruption: deferred },
+          { type: "persist" }
+        ]
+      };
+    }
     return {
-      phase: { kind: "awaiting_attention", stopReason: event.suspension.reason },
+      phase: {
+        kind: "awaiting_attention",
+        stopReason: describeInterruption(event.interruption)
+      },
       memory,
       actions: [{ type: "persist" }]
     };
@@ -2238,23 +2827,29 @@ function handleTurnInFlight(phase, memory, event, cfg) {
       kind: "awaiting_attention",
       stopReason: outcome.stopReason ?? "stopped"
     };
+    const deprecation = outcome.kind === "suspend" ? outcome.deprecation : void 0;
     return {
       phase: nextPhase,
       memory: memoryAfterSuccess,
-      actions: [{ type: "persist" }]
+      actions: [
+        ...deprecation ? [{ type: "warn", message: deprecation }] : [],
+        { type: "persist" }
+      ]
     };
   }
-  const trackerHash = hashTrackerContent(event.trackerContent);
+  const journalHash = hashJournalContent(event.journalContent);
   let nudgeStreak = memoryAfterSuccess.nudgeStreak;
-  if (trackerHash !== memoryAfterSuccess.lastTrackerHash) {
+  if (journalHash !== memoryAfterSuccess.lastJournalHash) {
     nudgeStreak = 0;
   }
   const memoryWithHash = {
     ...memoryAfterSuccess,
-    lastTrackerHash: trackerHash,
+    lastJournalHash: journalHash,
     nudgeStreak
   };
-  const sizeNudgeSuffix = estimateTokenCount(event.trackerContent) > DEFAULT_TRACKER_TOKEN_BOUND ? buildTrackerSizeNudgeSuffix(cfg.trackerPromptPath) : "";
+  const sizeNudgeSuffix = (estimateTokenCount(event.journalContent) > DEFAULT_JOURNAL_TOKEN_BOUND ? buildJournalSizeNudgeSuffix(cfg.journalPromptPath) : "") + // Shed-integrity nudge (ADR 0018 §7): a half-executed shed is named
+  // the Turn after it happens, on the same terms as the size nudge.
+  (event.shedIntegrity ? buildShedIntegrityNudgeSuffix(event.shedIntegrity) : "");
   if (event.adapterSessionId) {
     const nextNudgeStreak = nudgeStreak + 1;
     const nudgeCap = loop.nudgeCap ?? DEFAULT_NUDGE_CAP;
@@ -2262,18 +2857,16 @@ function handleTurnInFlight(phase, memory, event, cfg) {
       return {
         phase: {
           kind: "awaiting_attention",
-          stopReason: `nudge cap reached: ${nudgeCap} nudge${nudgeCap === 1 ? "" : "s"} (nudgeCap) without tracker progress or a terminal marker`
+          stopReason: `nudge cap reached: ${nudgeCap} nudge${nudgeCap === 1 ? "" : "s"} (nudgeCap) without journal progress or a terminal marker`
         },
         memory: { ...memoryWithHash, nudgeStreak: nextNudgeStreak },
         actions: [{ type: "persist" }]
       };
     }
     const promptOverride = buildNudgePrompt(
-      { ...loop, trackerPath: cfg.trackerPromptPath ?? loop.trackerPath },
+      { ...loop, journalPath: cfg.journalPromptPath ?? loop.journalPath },
       {
-        skeletonNotReplaced: event.trackerContent.includes(
-          TRACKER_SKELETON_MARKER
-        )
+        skeletonNotReplaced: hasSkeletonMarker(event.journalContent)
       }
     ) + sizeNudgeSuffix;
     const nextIteration2 = memoryWithHash.iteration + 1;
@@ -2349,24 +2942,6 @@ function handleBackingOff(phase, memory, event, cfg) {
   if (event.cancelled) {
     return { phase: { kind: "cancelled" }, memory, actions: [{ type: "persist" }] };
   }
-  if (phase.resume.kind === "fork") {
-    return {
-      phase: {
-        kind: "handing_over",
-        handle: phase.resume.handle,
-        configOverride: phase.resume.configOverride,
-        retried: true
-      },
-      memory,
-      actions: [
-        {
-          type: "start_fork_turn",
-          handle: phase.resume.handle,
-          configOverride: phase.resume.configOverride
-        }
-      ]
-    };
-  }
   const continuation = event.adapterSessionId ? { mode: "resume", handle: event.adapterSessionId } : phase.resume.continuation;
   const prompt = continuation.mode === "fresh" ? phase.resume.prompt : cfg.loop ? buildContinuePrompt(cfg.loop) : "Continue.";
   const prepared = prepareWorkflowTurn(cfg.workflowState, {
@@ -2397,98 +2972,33 @@ function handleBackingOff(phase, memory, event, cfg) {
     ]
   };
 }
-function handleHandingOver(phase, memory, event, cfg) {
-  if (event.cancelled) {
-    return { phase: { kind: "cancelled" }, memory, actions: [{ type: "persist" }] };
-  }
+function handleAwaitingAttention(phase, memory, event, cfg) {
+  if (event.checkpoint) memory = { ...memory, checkpoint: event.checkpoint };
   const nextIteration = memory.iteration + 1;
-  if (event.ok) {
-    const continuation2 = { mode: "fresh" };
-    const seedPrompt = buildHandoverSeedPrompt(
-      event.handoffPath,
-      cfg.trackerAbsPath ?? void 0
-    );
-    const prepared2 = prepareWorkflowTurn(cfg.workflowState, {
-      prompt: cfg.initialPrompt,
-      iteration: nextIteration,
-      configOverride: void 0
+  const wakesFresh = memory.parkedAfterHandover || phase.interruption?.kind === "cap_exhausted" && phase.interruption.resource?.fresh === true;
+  if (wakesFresh && memory.checkpoint && !readRestartContract(
+    `## Restart
+${memory.checkpoint.contract.text}`,
+    cfg.loop?.maxRestartTokens,
+    cfg.runId
+  )) {
+    return parkResource(memory, {
+      cause: "restart",
+      limit: cfg.loop?.maxRestartTokens ?? 2e3,
+      used: estimateTokenCount(memory.checkpoint.contract.text),
+      fresh: true,
+      detail: "Retained Restart checkpoint does not satisfy the current contract limit or Run identity",
+      checkpointPath: memory.checkpoint.path
     });
-    return {
-      phase: {
-        kind: "turn_in_flight",
-        prompt: seedPrompt,
-        continuation: continuation2,
-        configOverride: prepared2.configOverride
-      },
-      memory: {
-        ...memory,
-        iteration: nextIteration,
-        lastStopPrompt: seedPrompt,
-        lastStopContinuation: continuation2,
-        lastHandoffSizeBytes: event.handoffSizeBytes
-      },
-      actions: [
-        { type: "purge_handoffs" },
-        { type: "persist" },
-        {
-          type: "start_turn",
-          prompt: seedPrompt,
-          continuation: continuation2,
-          configOverride: prepared2.configOverride
-        }
-      ]
-    };
-  }
-  if (event.transient && !phase.retried) {
-    const ms = cfg.loop?.retryBackoffMs ?? DEFAULT_RETRY_BACKOFF_MS;
-    return {
-      phase: {
-        kind: "backing_off",
-        ms,
-        resume: {
-          kind: "fork",
-          handle: phase.handle,
-          configOverride: phase.configOverride
-        }
-      },
-      memory,
-      actions: [{ type: "wait", ms }]
-    };
   }
-  const continuation = { mode: "resume", handle: phase.handle };
-  const prepared = prepareWorkflowTurn(cfg.workflowState, {
-    prompt: cfg.initialPrompt,
-    iteration: nextIteration,
-    configOverride: void 0
-  });
-  return {
-    phase: {
-      kind: "turn_in_flight",
-      prompt: prepared.prompt,
-      continuation,
-      configOverride: prepared.configOverride
-    },
-    memory: {
-      ...memory,
-      iteration: nextIteration,
-      lastStopPrompt: prepared.prompt,
-      lastStopContinuation: continuation
-    },
-    actions: [
-      { type: "degrade_handover", handle: phase.handle },
-      { type: "persist" },
-      {
-        type: "start_turn",
-        prompt: prepared.prompt,
-        continuation,
-        configOverride: prepared.configOverride
-      }
-    ]
-  };
-}
-function handleAwaitingAttention(memory, event, cfg) {
-  const nextIteration = memory.iteration + 1;
-  const prompt = buildWakePrompt(cfg.initialPrompt, cfg.trackerPromptPath);
+  const continuation = wakesFresh ? { mode: "fresh" } : event.continuation;
+  const prompt = wakesFresh && memory.checkpoint ? `The human replied: ${cfg.initialPrompt}
+
+${seedFromRestart(memory.checkpoint.contract, memory.checkpoint.path, cfg.journalPromptPath)}` : buildWakePrompt(
+    cfg.initialPrompt,
+    cfg.journalPromptPath,
+    phase.interruption
+  );
   const prepared = prepareWorkflowTurn(cfg.workflowState, {
     prompt: cfg.initialPrompt,
     iteration: nextIteration,
@@ -2498,29 +3008,34 @@ function handleAwaitingAttention(memory, event, cfg) {
     phase: {
       kind: "turn_in_flight",
       prompt,
-      continuation: event.continuation,
+      continuation,
       configOverride: prepared.configOverride
     },
     memory: {
       ...memory,
       iteration: nextIteration,
       lastStopPrompt: prompt,
-      lastStopContinuation: event.continuation
+      lastStopContinuation: continuation,
+      parkedAfterHandover: false,
+      lastRestartHash: wakesFresh && memory.checkpoint ? hashJournalContent(memory.checkpoint.contract.text) : memory.lastRestartHash
     },
     actions: [
       { type: "persist" },
       {
         type: "start_turn",
+        restartTokens: wakesFresh ? memory.checkpoint?.contract.tokens : void 0,
         prompt,
-        continuation: event.continuation,
+        continuation,
         configOverride: prepared.configOverride
       }
     ]
   };
 }
-function step(phase, memory, event, cfg) {
+function transition(phase, memory, event, cfg) {
   switch (phase.kind) {
     case "turn_in_flight": {
+      if (event.type === "steer")
+        return handleSteer(phase, memory, event.steer);
       if (event.type !== "turn_finished") {
         throw new Error(
           `runMachine: phase 'turn_in_flight' received unexpected event '${event.type}'`
@@ -2529,6 +3044,8 @@ function step(phase, memory, event, cfg) {
       return handleTurnInFlight(phase, memory, event, cfg);
     }
     case "backing_off": {
+      if (event.type === "steer")
+        return handleSteer(phase, memory, event.steer);
       if (event.type !== "backoff_elapsed") {
         throw new Error(
           `runMachine: phase 'backing_off' received unexpected event '${event.type}'`
@@ -2536,21 +3053,13 @@ function step(phase, memory, event, cfg) {
       }
       return handleBackingOff(phase, memory, event, cfg);
     }
-    case "handing_over": {
-      if (event.type !== "fork_finished") {
-        throw new Error(
-          `runMachine: phase 'handing_over' received unexpected event '${event.type}'`
-        );
-      }
-      return handleHandingOver(phase, memory, event, cfg);
-    }
     case "awaiting_attention": {
       if (event.type !== "woken") {
         throw new Error(
           `runMachine: phase 'awaiting_attention' received unexpected event '${event.type}'`
         );
       }
-      return handleAwaitingAttention(memory, event, cfg);
+      return handleAwaitingAttention(phase, memory, event, cfg);
     }
     case "completed":
     case "failed":
@@ -2567,6 +3076,85 @@ function step(phase, memory, event, cfg) {
     }
   }
 }
+function admitResult(result, previous, cfg) {
+  const action = result.actions.find(
+    (a) => a.type === "start_turn" || a.type === "wait"
+  );
+  if (!action) return result;
+  const memory = result.memory;
+  const bounded = memory.contextKey === cfg.contextKey ? memory.lastBoundedTurn : null;
+  const fresh = action.type === "start_turn" && action.continuation.mode === "fresh";
+  const context = bounded?.openingContextTokens != null && bounded.lastContextTokens != null ? {
+    opening: bounded.openingContextTokens,
+    ceiling: bounded.lastContextTokens,
+    required: Math.max(
+      0,
+      (memory.checkpoint?.contract.tokens ?? 0) - (bounded.openingRestartTokens ?? 0)
+    ),
+    source: "conservative last API occupancy, not a measured compaction threshold"
+  } : void 0;
+  const stop = admitContinuation({
+    loop: cfg.loop,
+    iteration: memory.iteration,
+    tokens: memory.cumulativeTokens,
+    checkpointPath: memory.checkpoint?.path,
+    context: fresh ? context : void 0
+  });
+  if (!stop)
+    return deliverPendingSteers(
+      fresh ? {
+        ...result,
+        memory: { ...memory, activeRestartTokens: action.restartTokens ?? 0 }
+      } : result
+    );
+  return parkResource(
+    {
+      ...memory,
+      iteration: previous?.iteration ?? memory.iteration,
+      lastRestartHash: previous?.lastRestartHash,
+      lastStopPrompt: previous?.lastStopPrompt ?? memory.lastStopPrompt,
+      lastStopContinuation: previous?.lastStopContinuation ?? memory.lastStopContinuation,
+      pendingSteers: previous?.pendingSteers ?? memory.pendingSteers
+    },
+    {
+      ...stop,
+      fresh: stop.fresh || !!memory.checkpoint || memory.parkedAfterHandover
+    },
+    result.actions.filter(
+      (a) => a.type === "notify_handover_completed" || a.type === "notify_iteration_complete"
+    )
+  );
+}
+function parkResource(memory, stop, notifications = []) {
+  const interruption = resourceInterruption(stop);
+  return {
+    phase: {
+      kind: "awaiting_attention",
+      stopReason: interruption.message,
+      interruption
+    },
+    memory: { ...memory, parkedAfterHandover: stop.fresh },
+    actions: [
+      { type: "record_interruption", interruption },
+      { type: "persist" },
+      ...notifications
+    ]
+  };
+}
+function createInitialRun(cfg, opts) {
+  return admitResult(initialRun(cfg, opts), opts.resumedMemory, cfg);
+}
+function step(phase, memory, event, cfg) {
+  if (event.type === "resource_exhausted")
+    return parkResource(
+      {
+        ...memory,
+        cumulativeTokens: event.cumulativeTokens
+      },
+      { ...event.stop, checkpointPath: memory.checkpoint?.path }
+    );
+  return admitResult(transition(phase, memory, event, cfg), memory, cfg);
+}
 function serializeRunMemory(memory) {
   return JSON.stringify(memory);
 }
@@ -2580,12 +3168,47 @@ function deserializeRunMemory(json) {
   }
   if (!parsed || typeof parsed !== "object") return null;
   const candidate = parsed;
+  if (!("lastJournalHash" in candidate) && "lastTrackerHash" in candidate) {
+    candidate.lastJournalHash = candidate.lastTrackerHash;
+    delete candidate.lastTrackerHash;
+  }
   const continuation = candidate.lastStopContinuation;
-  if (typeof candidate.iteration !== "number" || typeof candidate.nudgeStreak !== "number" || typeof candidate.retryStreak !== "number" || candidate.lastTrackerHash !== null && typeof candidate.lastTrackerHash !== "string" || typeof candidate.lastStopPrompt !== "string" || !continuation || typeof continuation.mode !== "string") {
+  if (!("pendingSteers" in candidate)) candidate.pendingSteers = [];
+  if (typeof candidate.parkedAfterHandover !== "boolean") {
+    candidate.parkedAfterHandover = false;
+  }
+  if (!isBoundedTurn(candidate.lastBoundedTurn)) {
+    candidate.lastBoundedTurn = null;
+  }
+  if (candidate.checkpoint !== void 0) {
+    const checkpoint = candidate.checkpoint;
+    if (!checkpoint || typeof checkpoint.path !== "string" || !checkpoint.contract || typeof checkpoint.contract.text !== "string" || typeof checkpoint.contract.tokens !== "number" || !Number.isFinite(checkpoint.contract.tokens) || checkpoint.contract.tokens < 0)
+      delete candidate.checkpoint;
+  }
+  if (typeof candidate.lastRestartHash !== "string")
+    delete candidate.lastRestartHash;
+  if (typeof candidate.cumulativeTokens !== "number" || !Number.isFinite(candidate.cumulativeTokens) || candidate.cumulativeTokens < 0)
+    candidate.cumulativeTokens = null;
+  if (typeof candidate.iteration !== "number" || typeof candidate.nudgeStreak !== "number" || typeof candidate.retryStreak !== "number" || candidate.lastJournalHash !== null && typeof candidate.lastJournalHash !== "string" || typeof candidate.lastStopPrompt !== "string" || !continuation || typeof continuation.mode !== "string" || !Array.isArray(candidate.pendingSteers) || !candidate.pendingSteers.every(isQueuedSteer)) {
     return null;
   }
   return candidate;
 }
+function wakesFreshAfterHandover(runMemoryJson) {
+  return deserializeRunMemory(runMemoryJson)?.parkedAfterHandover === true;
+}
+function isBoundedTurn(value) {
+  if (!value || typeof value !== "object") return false;
+  const turn = value;
+  return ["openingContextTokens", "lastContextTokens", "toolCalls"].every(
+    (key) => turn[key] === null || typeof turn[key] === "number"
+  );
+}
+function isQueuedSteer(value) {
+  if (!value || typeof value !== "object") return false;
+  const steer = value;
+  return typeof steer.text === "string" && (steer.origin === "hub" || steer.origin === "local") && typeof steer.receivedAt === "number";
+}
 
 // src/core/workflows/workflowRunner.ts
 var NULL_TOKENS = {
@@ -2597,17 +3220,17 @@ var NULL_TOKENS = {
   contextSize: null,
   contextWindowSize: null
 };
-var TRACKER_SKELETON_TEMPLATE = `${TRACKER_SKELETON_MARKER}
-# Workflow Tracker
+var JOURNAL_SKELETON_TEMPLATE = `${JOURNAL_SKELETON_MARKER}
+# Workflow Journal
 
 **Session**: {sessionId}
-**Tracker**: {trackerPath}
+**Journal**: {journalPath}
 **Goal**: {input}
 
 ---
 
-> This tracker was created by the runner. Update it as you work.
-> See the Turn Protocol for tracker conventions.
+> This journal was created by the runner. Update it as you work.
+> See the Turn Protocol for journal conventions.
 
 ## Status
 
@@ -2621,10 +3244,10 @@ _To be created during orientation._
 
 _No progress yet._
 `;
-function openRunSection(trackerPath, opts) {
+function openRunSection(journalPath, opts) {
   let existing;
   try {
-    existing = fs12.readFileSync(trackerPath, "utf-8");
+    existing = fs12.readFileSync(journalPath, "utf-8");
   } catch {
     return;
   }
@@ -2641,13 +3264,59 @@ _Sections above belong to earlier Workflow Runs in this Athena Session._
 `;
   try {
     fs12.writeFileSync(
-      trackerPath,
+      journalPath,
       demoteTerminalMarkers(existing.trimEnd(), opts.markers) + banner,
       "utf-8"
     );
   } catch {
   }
 }
+function recordSteersInJournal(journalPath, steers, iteration, markers) {
+  let existing;
+  try {
+    existing = fs12.readFileSync(journalPath, "utf-8");
+  } catch {
+    return;
+  }
+  const entries = steers.map((steer) => formatSteerJournalEntry(steer, iteration)).join("");
+  try {
+    fs12.writeFileSync(
+      journalPath,
+      insertAboveTerminalMarker(existing, entries, markers),
+      "utf-8"
+    );
+  } catch {
+  }
+}
+function appendInterruptionNote(journalPath, interruption) {
+  const lines = [
+    "",
+    "",
+    "---",
+    "",
+    "## Needs human (runner note)",
+    "",
+    interruption.message,
+    ""
+  ];
+  if (interruption.kind === "question") {
+    if (interruption.question) lines.push(`- call: ${interruption.question}`);
+    if (interruption.requestId)
+      lines.push(`- request: ${interruption.requestId}`);
+    lines.push(
+      "",
+      "_Written by the runner: the request above was deferred and this run is parked until a human answers it. On continue the agent re-issues the call; a stored answer is replayed into it without asking again._"
+    );
+  } else {
+    lines.push(
+      "_Written by the runner: this run is parked until a human replies._"
+    );
+  }
+  try {
+    fs12.appendFileSync(journalPath, lines.join("\n") + "\n", "utf-8");
+  } catch {
+  }
+}
 function mergeTokens(base, next) {
   const input = (base.input ?? 0) + (next.input ?? 0);
   const output = (base.output ?? 0) + (next.output ?? 0);
@@ -2670,9 +3339,6 @@ function mergeTokens(base, next) {
     contextWindowSize: next.contextWindowSize ?? base.contextWindowSize
   };
 }
-function buildHandoffInvocationPrompt(handoffPath) {
-  return `Invoke the handoff skill to write a Handoff file to ${handoffPath}. Do nothing else: no code changes, no tracker updates \u2014 only the Handoff file.`;
-}
 async function delayWithCancel(ms, isCancelled) {
   const slice = 250;
   for (let waited = 0; waited < ms && !isCancelled(); waited += slice) {
@@ -2681,36 +3347,30 @@ async function delayWithCancel(ms, isCancelled) {
     );
   }
 }
-var HANDOFF_DIR_NAME = "handoff";
-var HANDOFF_RETAIN = 2;
-function listHandoffSeqs(dir) {
+function readUnitRecords(journalAbsPath) {
+  const unitsDir = path10.join(path10.dirname(journalAbsPath), "units");
+  let names;
   try {
-    return fs12.readdirSync(dir).map((name) => /^(\d{3})\.md$/.exec(name)?.[1]).filter((seq) => seq !== void 0).map(Number).sort((a, b) => a - b);
+    names = fs12.readdirSync(unitsDir).filter((name) => name.endsWith(".md"));
   } catch {
     return [];
   }
-}
-function handoffPathFor(dir, seq) {
-  return path10.join(dir, `${String(seq).padStart(3, "0")}.md`);
-}
-function nextHandoffPath(dir) {
-  const next = (listHandoffSeqs(dir).at(-1) ?? 0) + 1;
-  fs12.mkdirSync(dir, { recursive: true });
-  return handoffPathFor(dir, next);
-}
-function purgeHandoffs(dir, keep) {
-  const seqs = listHandoffSeqs(dir);
-  for (const seq of seqs.slice(0, Math.max(0, seqs.length - keep))) {
+  const records = [];
+  for (const name of names.sort()) {
     try {
-      fs12.rmSync(handoffPathFor(dir, seq), { force: true });
+      records.push({
+        recordPath: `units/${name}`,
+        content: fs12.readFileSync(path10.join(unitsDir, name), "utf-8")
+      });
     } catch {
     }
   }
+  return records;
 }
-function defaultCreateTracker(trackerPath, content) {
-  fs12.mkdirSync(path10.dirname(trackerPath), { recursive: true });
+function defaultCreateJournal(journalPath, content) {
+  fs12.mkdirSync(path10.dirname(journalPath), { recursive: true });
   try {
-    fs12.writeFileSync(trackerPath, content, { encoding: "utf-8", flag: "wx" });
+    fs12.writeFileSync(journalPath, content, { encoding: "utf-8", flag: "wx" });
   } catch (e) {
     if (e.code !== "EEXIST") throw e;
   }
@@ -2731,19 +3391,25 @@ function terminalPhaseToStatus(phase) {
   }
 }
 function createWorkflowRunner(input) {
-  const runId = input.resumeRunId ?? crypto2.randomUUID();
+  const runId = input.resumeRunId ?? crypto3.randomUUID();
   let cancelled = false;
   let status = "running";
-  let cumulativeTokens = { ...NULL_TOKENS };
+  let cumulativeTokens = {
+    ...input.resumedRunMemory?.usage ?? NULL_TOKENS,
+    total: input.resumedRunMemory?.cumulativeTokens ?? null
+  };
   let stopReason;
+  let interruption;
   let memory;
-  const trackerResolved = resolveTrackerPath({
+  const preStartSteers = [];
+  let applySteer = null;
+  const journalResolved = resolveJournalPath({
     projectDir: input.projectDir,
     sessionId: input.sessionId,
     workflow: input.workflow
   });
-  const trackerAbsPath = trackerResolved?.absolutePath ?? null;
-  const trackerPromptPath = trackerResolved?.promptPath;
+  const journalAbsPath = journalResolved?.absolutePath ?? null;
+  const journalPromptPath = journalResolved?.promptPath;
   function snapshot() {
     const adapterSessionId = input.currentAdapterSessionId?.() ?? void 0;
     return {
@@ -2754,50 +3420,67 @@ function createWorkflowRunner(input) {
       maxIterations: input.workflow?.loop?.maxIterations ?? 1,
       status,
       stopReason,
-      trackerPath: trackerPromptPath,
+      journalPath: journalPromptPath,
       ...adapterSessionId ? { adapterSessionId } : {},
-      ...memory ? { runMemoryJson: serializeRunMemory(memory) } : {}
+      ...memory ? { runMemoryJson: serializeRunMemory(memory) } : {},
+      ...interruption ? { interruption } : {}
     };
   }
+  let persistenceFailure;
+  const hasPersistenceFailure = () => persistenceFailure !== void 0;
   function persist() {
+    if (persistenceFailure) throw persistenceFailure;
     try {
       input.persistRunState(snapshot());
-    } catch {
+    } catch (cause) {
+      persistenceFailure = new Error(
+        "Workflow state could not be saved; continuation is unsafe.",
+        { cause }
+      );
+      cancelled = true;
+      input.abortCurrentTurn?.();
+      throw persistenceFailure;
     }
   }
-  function handoffDirFor() {
-    return path10.join(
-      trackerAbsPath ? path10.dirname(trackerAbsPath) : path10.resolve(
-        input.projectDir,
-        ".athena",
-        input.sessionId || "session"
-      ),
-      HANDOFF_DIR_NAME
-    );
+  const phaseTracker = createPhaseTracker();
+  function observePhase(journalContent, turn) {
+    const observation = phaseTracker.observe(journalContent);
+    if (observation.kind === "new_step") {
+      const { name, index, total } = observation.step;
+      input.onPhaseChange?.({
+        runId,
+        turn,
+        step: name,
+        ...index !== void 0 ? { stepIndex: index } : {},
+        ...total !== void 0 ? { stepTotal: total } : {}
+      });
+    } else if (observation.kind === "malformed" && observation.warning) {
+      input.onWarning?.(observation.warning);
+    }
   }
   const result = (async () => {
     await Promise.resolve();
-    if (trackerAbsPath && input.workflow?.loop?.enabled) {
-      const content = substituteVariables(TRACKER_SKELETON_TEMPLATE, {
+    if (journalAbsPath && input.workflow?.loop?.enabled) {
+      const content = substituteVariables(JOURNAL_SKELETON_TEMPLATE, {
         sessionId: input.sessionId,
-        trackerPath: trackerPromptPath,
+        journalPath: journalPromptPath,
         input: input.prompt
       });
-      const write = input.createTracker ?? defaultCreateTracker;
-      const trackerExisted = fs12.existsSync(trackerAbsPath);
-      write(trackerAbsPath, content);
-      if (trackerExisted && !input.resumeRunId) {
-        openRunSection(trackerAbsPath, {
+      const write = input.createJournal ?? defaultCreateJournal;
+      const journalExisted = fs12.existsSync(journalAbsPath);
+      write(journalAbsPath, content);
+      if (journalExisted && !input.resumeRunId) {
+        openRunSection(journalAbsPath, {
           runId,
           goal: input.prompt,
           markers: {
             completionMarker: input.workflow.loop.completionMarker,
+            needsHumanMarker: input.workflow.loop.needsHumanMarker,
             blockedMarker: input.workflow.loop.blockedMarker
           }
         });
       }
     }
-    persist();
     const workflowState = createWorkflowRunState({
       projectDir: input.projectDir,
       sessionId: input.sessionId,
@@ -2806,26 +3489,168 @@ function createWorkflowRunner(input) {
     });
     const loop = input.workflow?.loop;
     const cfg = {
+      runId,
+      contextKey: crypto3.randomUUID(),
       workflowState,
       initialPrompt: input.prompt,
       loop,
-      trackerAbsPath,
-      trackerPromptPath
+      journalAbsPath,
+      journalPromptPath
     };
     const initial = createInitialRun(cfg, {
       initialContinuation: input.initialContinuation,
       waking: !!(input.resumeRunId && loop?.enabled),
       resumedMemory: input.resumedRunMemory,
+      initialSteers: preStartSteers.splice(0),
+      parkedInterruption: input.parkedInterruption,
       awaitingAttentionStopReason: input.resumedStopReason
     });
     let phase = initial.phase;
     memory = initial.memory;
+    persist();
+    applySteer = (steer) => {
+      if (persistenceFailure) return false;
+      if (isTerminalPhase(phase)) return false;
+      const stepResult = step(phase, memory, { type: "steer", steer }, cfg);
+      phase = stepResult.phase;
+      memory = stepResult.memory;
+      try {
+        runSideEffects(stepResult.actions);
+      } catch (error) {
+        if (!hasPersistenceFailure()) throw error;
+        return false;
+      }
+      return true;
+    };
+    async function executeOperation(turn) {
+      const baseline = { ...cumulativeTokens };
+      const startTokens = memory.cumulativeTokens ?? 0;
+      let operationTokens = 0;
+      let finished = false;
+      let openingChecked = false;
+      let stopped = null;
+      const isStopped = () => stopped !== null;
+      let resolveStop;
+      const stopPromise = new Promise((resolve) => {
+        resolveStop = resolve;
+      });
+      function finalStop(event) {
+        const total = memory.cumulativeTokens ?? startTokens;
+        return {
+          ...event,
+          cumulativeTokens: total,
+          stop: {
+            ...event.stop,
+            ...event.stop.cause === "tokens" ? { used: total } : {}
+          }
+        };
+      }
+      function stop(reason) {
+        if (finished || stopped || cancelled) return;
+        stopped = reason;
+        const checkpoint = journalAbsPath ? checkpointFromJournal(readJournal(journalAbsPath)) : null;
+        if (checkpoint) memory = { ...memory, checkpoint };
+        input.abortCurrentTurn?.();
+        resolveStop({
+          type: "resource_exhausted",
+          stop: reason,
+          cumulativeTokens: memory.cumulativeTokens ?? startTokens
+        });
+      }
+      function observe(usage, enforce = true) {
+        if (finished) return;
+        if (usage.total !== null && Number.isFinite(usage.total) && usage.total >= 0) {
+          operationTokens = Math.max(operationTokens, usage.total);
+          memory = {
+            ...memory,
+            cumulativeTokens: startTokens + operationTokens
+          };
+          cumulativeTokens = {
+            ...mergeTokens(baseline, usage),
+            total: memory.cumulativeTokens
+          };
+          memory = { ...memory, usage: cumulativeTokens };
+          persist();
+        }
+        if (!enforce || stopped) return;
+        const limit = admitContinuation({
+          loop,
+          iteration: memory.iteration,
+          tokens: memory.cumulativeTokens
+        });
+        if (limit) {
+          stop(limit);
+          return;
+        }
+        if (!openingChecked && turn.continuation.mode === "fresh" && usage.openingContextSize != null) {
+          openingChecked = true;
+          const previous = memory.contextKey === cfg.contextKey ? memory.lastBoundedTurn : null;
+          const required = memory.checkpoint ? 0 : estimateTokenCount(
+            journalAbsPath ? readJournal(journalAbsPath) : ""
+          );
+          const decision = admitContinuation({
+            loop,
+            iteration: memory.iteration,
+            tokens: memory.cumulativeTokens,
+            context: {
+              opening: usage.openingContextSize,
+              required,
+              ceiling: previous?.lastContextTokens ?? loop?.maxTurnTokenCount ?? DEFAULT_MAX_TURN_TOKEN_COUNT,
+              source: previous ? "conservative prior API occupancy" : "configured ceiling estimate; actual compaction point unknown"
+            }
+          });
+          if (decision) stop(decision);
+        }
+      }
+      try {
+        const operation = input.startTurn({
+          ...turn,
+          onUsage: (usage) => {
+            if (persistenceFailure) return;
+            try {
+              observe(usage);
+            } catch (error) {
+              if (!hasPersistenceFailure()) throw error;
+            }
+          }
+        });
+        const result2 = await Promise.race([operation, stopPromise]);
+        if (persistenceFailure) throw persistenceFailure;
+        if ("type" in result2) {
+          let timer;
+          try {
+            const final = await Promise.race([
+              operation.catch(() => null),
+              new Promise((resolve) => {
+                timer = setTimeout(() => resolve(null), 6e3);
+              })
+            ]);
+            if (final) observe(final.tokens, false);
+          } finally {
+            if (timer) clearTimeout(timer);
+          }
+          return finalStop(result2);
+        }
+        observe(result2.tokens, false);
+        if (isStopped()) return finalStop(await stopPromise);
+        return result2;
+      } finally {
+        finished = true;
+      }
+    }
     async function performStartTurn(prompt, continuation, configOverride) {
-      const turnResult = await input.startTurn({
-        prompt,
+      const turnResult = await executeOperation({
+        prompt: loop?.enabled && journalAbsPath && (continuation.mode === "fresh" || memory.iteration === 1) ? prompt + "\n\n" + restartInstructions(journalAbsPath, runId, loop.maxRestartTokens) : prompt,
         continuation,
-        configOverride
+        configOverride,
+        iteration: memory.iteration
       });
+      if ("type" in turnResult) return turnResult;
+      const measured = {
+        openingContextTokens: turnResult.tokens.openingContextSize ?? null,
+        lastContextTokens: turnResult.tokens.contextSize,
+        toolCalls: input.currentTurnToolCalls?.() ?? null
+      };
       if (cancelled) {
         return {
           type: "turn_finished",
@@ -2835,15 +3660,19 @@ function createWorkflowRunner(input) {
           streamMessage: null,
           transportBroken: false,
           handoverRequestHandle: null,
-          suspension: null,
+          interruption: null,
           adapterSessionId: null,
           outcome: null,
-          trackerContent: ""
+          journalContent: "",
+          ...measured,
+          shedIntegrity: null,
+          cumulativeTokens: null
         };
       }
-      cumulativeTokens = mergeTokens(cumulativeTokens, turnResult.tokens);
+      const runTotal = cumulativeTokens.total;
       const handoverRequest = input.handover?.takeRequest() ?? null;
       if (handoverRequest) {
+        const journalContent2 = loop?.enabled && journalAbsPath ? readJournal(journalAbsPath) : "";
         return {
           type: "turn_finished",
           cancelled: false,
@@ -2852,14 +3681,18 @@ function createWorkflowRunner(input) {
           streamMessage: null,
           transportBroken: false,
           handoverRequestHandle: handoverRequest.handle,
-          suspension: null,
+          interruption: null,
           adapterSessionId: null,
           outcome: null,
-          trackerContent: ""
+          journalContent: journalContent2,
+          checkpoint: journalAbsPath ? checkpointFromJournal(journalContent2) : null,
+          ...measured,
+          shedIntegrity: observeShedIntegrity(journalContent2),
+          cumulativeTokens: runTotal
         };
       }
-      const suspension = input.checkSuspension?.() ?? null;
-      if (suspension) {
+      const interruption2 = input.checkInterruption?.() ?? null;
+      if (interruption2) {
         return {
           type: "turn_finished",
           cancelled: false,
@@ -2868,10 +3701,13 @@ function createWorkflowRunner(input) {
           streamMessage: null,
           transportBroken: false,
           handoverRequestHandle: null,
-          suspension,
+          interruption: interruption2,
           adapterSessionId: null,
           outcome: null,
-          trackerContent: ""
+          journalContent: "",
+          ...measured,
+          shedIntegrity: null,
+          cumulativeTokens: runTotal
         };
       }
       const adapterSessionId = input.currentAdapterSessionId?.() ?? null;
@@ -2889,23 +3725,27 @@ function createWorkflowRunner(input) {
           streamMessage: turnResult.streamMessage,
           transportBroken: false,
           handoverRequestHandle: null,
-          suspension: null,
+          interruption: null,
           adapterSessionId,
           outcome: null,
-          trackerContent: ""
+          journalContent: "",
+          ...measured,
+          shedIntegrity: null,
+          cumulativeTokens: runTotal
         };
       }
       const transport = turnResult.diagnostics?.transport;
       const transportBroken = !!(transport && transport.streamToolUses > 0 && transport.preToolUseEvents === 0);
-      let trackerContent = "";
+      let journalContent = "";
       let outcome = null;
-      if (!transportBroken && loop?.enabled && trackerAbsPath) {
-        trackerContent = readTracker(trackerAbsPath);
+      if (!transportBroken && loop?.enabled && journalAbsPath) {
+        journalContent = readJournal(journalAbsPath);
         outcome = resolveTurnOutcome({
-          trackerPath: trackerAbsPath,
+          journalPath: journalAbsPath,
           loop,
           iteration: memory.iteration
         });
+        observePhase(journalContent, memory.iteration);
       }
       return {
         type: "turn_finished",
@@ -2915,57 +3755,34 @@ function createWorkflowRunner(input) {
         streamMessage: turnResult.streamMessage,
         transportBroken,
         handoverRequestHandle: null,
-        suspension: null,
+        interruption: null,
         adapterSessionId,
         outcome,
-        trackerContent
+        journalContent,
+        checkpoint: checkpointFromJournal(journalContent),
+        ...measured,
+        shedIntegrity: journalContent === "" ? null : observeShedIntegrity(journalContent),
+        cumulativeTokens: runTotal
       };
     }
-    async function performForkTurn(handle, configOverride) {
-      const handoffDir = handoffDirFor();
-      const handoffAbsPath = nextHandoffPath(handoffDir);
-      input.handover?.onForkStateChange?.(true);
-      let forkOk = false;
-      let transient = false;
+    function observeShedIntegrity(journalContent) {
+      if (!journalAbsPath || !loop?.enabled) return null;
       try {
-        const forkResult = await input.startTurn({
-          prompt: buildHandoffInvocationPrompt(handoffAbsPath),
-          continuation: { mode: "resume", handle },
-          configOverride: { ...configOverride, forkSession: true }
-        });
-        cumulativeTokens = mergeTokens(cumulativeTokens, forkResult.tokens);
-        forkOk = !forkResult.error && (forkResult.exitCode === null || forkResult.exitCode === 0) && fs12.existsSync(handoffAbsPath);
-        if (!forkOk) {
-          transient = classifyTurnFailure({
-            errorMessage: forkResult.error?.message,
-            lastStderr: forkResult.stderrTail ?? forkResult.lastStderr,
-            lastMessage: forkResult.streamMessage
-          }).kind === "transient";
-        }
-      } catch (e) {
-        forkOk = false;
-        transient = classifyTurnFailure({
-          errorMessage: e instanceof Error ? e.message : String(e)
-        }).kind === "transient";
-      } finally {
-        input.handover?.onForkStateChange?.(false);
-      }
-      let handoffSizeBytes = null;
-      if (forkOk) {
-        try {
-          handoffSizeBytes = fs12.statSync(handoffAbsPath).size;
-        } catch {
-          handoffSizeBytes = null;
-        }
+        return checkShedIntegrity(
+          journalContent,
+          readUnitRecords(journalAbsPath)
+        );
+      } catch {
+        return null;
       }
-      return {
-        type: "fork_finished",
-        ok: forkOk,
-        cancelled,
-        handoffPath: handoffAbsPath,
-        handoffSizeBytes,
-        transient
-      };
+    }
+    function checkpointFromJournal(content) {
+      const contract = readRestartContract(
+        content,
+        loop?.maxRestartTokens,
+        runId
+      );
+      return contract && journalAbsPath ? { path: journalAbsPath, contract } : null;
     }
     async function performWait(ms) {
       await delayWithCancel(ms, () => cancelled);
@@ -2980,9 +3797,9 @@ function createWorkflowRunner(input) {
       return { type: "backoff_elapsed", cancelled: false, adapterSessionId };
     }
     function isKickoffAction(action) {
-      return action.type === "start_turn" || action.type === "start_fork_turn" || action.type === "wait";
+      return action.type === "start_turn" || action.type === "wait";
     }
-    async function runActions(actions) {
+    function runSideEffects(actions) {
       let kickoff = null;
       for (const action of actions) {
         if (isKickoffAction(action)) {
@@ -2992,25 +3809,58 @@ function createWorkflowRunner(input) {
         switch (action.type) {
           case "persist":
             persist();
-            if (trackerAbsPath && input.projectTasks) {
+            if (journalAbsPath && input.projectTasks) {
               try {
-                const tasks = projectTrackerTasks(trackerAbsPath);
+                const tasks = projectJournalTasks(journalAbsPath);
                 if (tasks) input.projectTasks(tasks);
               } catch {
               }
             }
             break;
+          case "warn":
+            input.onWarning?.(action.message);
+            break;
           case "notify_iteration_complete":
-            input.onIterationComplete?.(snapshot());
+            input.onIterationComplete?.(snapshot(), cumulativeTokens);
             break;
-          case "purge_handoffs":
-            purgeHandoffs(handoffDirFor(), HANDOFF_RETAIN);
+          case "notify_handover_completed":
+            input.onHandoverCompleted?.({
+              ...action.completion,
+              tokens: cumulativeTokens
+            });
             break;
-          case "degrade_handover":
-            input.handover?.onDegraded?.(action.handle);
+          case "steers_delivered":
+            if (journalAbsPath && loop?.enabled) {
+              recordSteersInJournal(
+                journalAbsPath,
+                action.steers,
+                action.iteration,
+                {
+                  completionMarker: loop.completionMarker,
+                  needsHumanMarker: loop.needsHumanMarker,
+                  blockedMarker: loop.blockedMarker
+                }
+              );
+            }
+            input.onSteerDelivered?.(
+              action.steers.map((steer) => ({
+                ...steer,
+                iteration: action.iteration
+              }))
+            );
+            break;
+          case "record_interruption":
+            interruption = action.interruption;
+            if (journalAbsPath && !(action.interruption.kind === "cap_exhausted" && action.interruption.resource)) {
+              appendInterruptionNote(journalAbsPath, action.interruption);
+            }
             break;
         }
       }
+      return kickoff;
+    }
+    async function runActions(actions) {
+      const kickoff = runSideEffects(actions);
       if (!kickoff) return null;
       switch (kickoff.type) {
         case "start_turn":
@@ -3019,37 +3869,29 @@ function createWorkflowRunner(input) {
             kickoff.continuation,
             kickoff.configOverride
           );
-        case "start_fork_turn":
-          return performForkTurn(kickoff.handle, kickoff.configOverride);
         case "wait":
           return performWait(kickoff.ms);
         default:
           return null;
       }
     }
-    let bootstrapActions;
-    if (phase.kind === "awaiting_attention") {
+    let bootstrapActions = initial.actions;
+    if (phase.kind === "awaiting_attention" && input.resumeRunId && initial.actions.length === 0) {
       const wokenEvent = {
         type: "woken",
-        continuation: input.initialContinuation ?? { mode: "fresh" }
+        continuation: input.initialContinuation ?? { mode: "fresh" },
+        // Prefer a repaired current-run checkpoint when waking.
+        checkpoint: journalAbsPath ? checkpointFromJournal(readJournal(journalAbsPath)) : null
       };
       const stepResult = step(phase, memory, wokenEvent, cfg);
       phase = stepResult.phase;
       memory = stepResult.memory;
       bootstrapActions = stepResult.actions;
-    } else if (phase.kind === "turn_in_flight") {
-      bootstrapActions = [
-        {
-          type: "start_turn",
-          prompt: phase.prompt,
-          continuation: phase.continuation,
-          configOverride: phase.configOverride
-        }
-      ];
-    } else if (phase.kind === "backing_off") {
-      bootstrapActions = [{ type: "wait", ms: phase.ms }];
-    } else {
-      bootstrapActions = [];
+    }
+    if (isTerminalPhase(phase)) {
+      const terminal = terminalPhaseToStatus(phase);
+      status = terminal.status;
+      stopReason = terminal.stopReason;
     }
     let pendingEvent = await runActions(bootstrapActions);
     while (pendingEvent) {
@@ -3070,9 +3912,19 @@ function createWorkflowRunner(input) {
       status,
       iterations: memory.iteration,
       stopReason,
+      ...interruption ? { interruption } : {},
       tokens: cumulativeTokens
     };
-  })();
+  })().catch((error) => {
+    if (!persistenceFailure) throw error;
+    return {
+      runId,
+      status: "failed",
+      iterations: memory?.iteration ?? 0,
+      stopReason: persistenceFailure.message,
+      tokens: cumulativeTokens
+    };
+  });
   return {
     runId,
     result,
@@ -3082,109 +3934,11 @@ function createWorkflowRunner(input) {
     kill() {
       cancelled = true;
       input.abortCurrentTurn?.();
-    }
-  };
-}
-
-// src/core/workflows/useWorkflowSessionController.ts
-function useWorkflowSessionController(base, input) {
-  const [isRunning, setIsRunning] = useState(false);
-  const runnerRef = useRef(null);
-  const activeRunIdRef = useRef(null);
-  const cancelCurrentRun = useCallback(async () => {
-    const runner = runnerRef.current;
-    if (runner) {
-      runner.kill();
-      await runner.result.catch(() => {
-      });
-      runnerRef.current = null;
-      activeRunIdRef.current = null;
-    }
-  }, []);
-  const interrupt = useCallback(() => {
-    const runner = runnerRef.current;
-    if (runner) {
-      runner.kill();
-      runnerRef.current = null;
-      activeRunIdRef.current = null;
-    } else {
-      void base.kill().catch(() => {
-      });
-    }
-    setIsRunning(false);
-  }, [base]);
-  const kill = useCallback(async () => {
-    if (runnerRef.current) {
-      await cancelCurrentRun();
-    } else {
-      await base.kill();
-    }
-    setIsRunning(false);
-  }, [base, cancelCurrentRun]);
-  const spawn = useCallback(
-    async (prompt, continuation, _configOverride) => {
-      await cancelCurrentRun();
-      setIsRunning(true);
-      const handle = createWorkflowRunner({
-        sessionId: input.sessionId ?? "",
-        projectDir: input.projectDir,
-        harness: input.harness,
-        workflow: input.workflow,
-        prompt,
-        initialContinuation: continuation,
-        startTurn: (turnInput) => base.startTurn(
-          turnInput.prompt,
-          turnInput.continuation,
-          turnInput.configOverride
-        ),
-        persistRunState: input.persistRunState ?? (() => {
-        }),
-        abortCurrentTurn: () => void base.kill().catch(() => {
-        })
-      });
-      runnerRef.current = handle;
-      activeRunIdRef.current = handle.runId;
-      try {
-        const runResult = await handle.result;
-        return {
-          exitCode: runResult.status === "failed" ? 1 : 0,
-          error: runResult.status === "failed" ? new Error(runResult.stopReason ?? "Run failed") : null,
-          tokens: runResult.tokens,
-          streamMessage: null
-        };
-      } finally {
-        if (runnerRef.current === handle) {
-          runnerRef.current = null;
-          activeRunIdRef.current = null;
-          setIsRunning(false);
-        }
-      }
     },
-    [
-      base,
-      cancelCurrentRun,
-      input.projectDir,
-      input.sessionId,
-      input.harness,
-      input.workflow,
-      input.persistRunState
-    ]
-  );
-  useEffect(() => {
-    return () => {
-      runnerRef.current?.kill();
-      runnerRef.current = null;
-      activeRunIdRef.current = null;
-    };
-  }, []);
-  return {
-    ...base,
-    startTurn: spawn,
-    isRunning,
-    interrupt,
-    kill,
-    get activeRunId() {
-      return activeRunIdRef.current;
+    steer(steer) {
+      if (applySteer) return applySteer(steer);
+      preStartSteers.push(steer);
+      return true;
     }
   };
 }
@@ -3216,9 +3970,11 @@ function collectMcpServersWithOptions(pluginDirs) {
 
 export {
   DEFAULT_MAX_TURN_TOKEN_COUNT,
+  DEFAULT_PERMISSION_GRACE_MS,
+  createSteerQueue,
   deserializeRunMemory,
+  wakesFreshAfterHandover,
   createWorkflowRunner,
-  useWorkflowSessionController,
   isMarketplaceRef,
   findMarketplaceRepoDir,
   resolveWorkflowMarketplaceSource,
@@ -3239,6 +3995,8 @@ export {
   installWorkflowPlugins,
   resolveWorkflowPlugins,
   listBuiltinWorkflows,
+  readWorkflowSourceMetadata,
+  workflowRegistryDir,
   resolveWorkflow,
   installWorkflowFromSource,
   updateWorkflow,
@@ -3248,4 +4006,4 @@ export {
   compileWorkflowPlan,
   collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-2QV7YSX6.js.map
+//# sourceMappingURL=chunk-QVRTU2MM.js.map