@akagilnc/pi-workflow-roles 0.1.2152 → 0.1.2169

package/dist/public-cli/main.js

@@ -18714,7 +18714,7 @@ var init_typed_provider_http = __esm({
 });
 
 // src/public-cli/run-lifecycle.ts
-import { lstat as lstat2, open, readdir as readdir2, readFile as readFile8, unlink as unlink3, writeFile as writeFile4 } from "node:fs/promises";
+import { chmod, lstat as lstat2, open, readdir as readdir2, readFile as readFile8, unlink as unlink3, writeFile as writeFile4 } from "node:fs/promises";
 import { join as join10 } from "node:path";
 function isV1ResumableProvider(provider) {
   return V1_RESUMABLE_PROVIDERS.includes(provider);
@@ -18866,7 +18866,22 @@ async function isSessionPrincipalAvailable(sessionFile) {
     return false;
   }
 }
-async function acquireRunWriterLease(runDirectory) {
+function describeErrorIdentity(error) {
+  const candidate = error;
+  const name = typeof candidate?.name === "string" && candidate.name !== "" ? candidate.name : typeof error;
+  const code = typeof candidate?.code === "string" || typeof candidate?.code === "number" ? ` code=${String(candidate.code)}` : "";
+  const message = typeof candidate?.message === "string" && candidate.message !== "" ? `: ${candidate.message}` : "";
+  return `${name}${code}${message}`;
+}
+async function acquireRunWriterLease(runDirectory, onCleanupFailure) {
+  const reportCleanupFailure = (error) => {
+    try {
+      onCleanupFailure?.(
+        `writer lease lock cleanup failed (best-effort continue; stale lock resurfaces as lease-held on next acquire) at ${join10(runDirectory, WRITER_LOCK_FILE)}: ${describeErrorIdentity(error)}`
+      );
+    } catch {
+    }
+  };
   const lockPath = join10(runDirectory, WRITER_LOCK_FILE);
   try {
     const handle = await open(lockPath, "wx");
@@ -18885,7 +18900,20 @@ async function acquireRunWriterLease(runDirectory) {
         if (released) return;
         released = true;
         await handle.close().catch(() => void 0);
-        await unlink3(lockPath).catch(() => void 0);
+        try {
+          await unlink3(lockPath);
+        } catch (error) {
+          if (error.code === "EACCES") {
+            try {
+              await chmod(runDirectory, 493);
+              await unlink3(lockPath);
+            } catch (retryError) {
+              reportCleanupFailure(retryError);
+            }
+          } else {
+            reportCleanupFailure(error);
+          }
+        }
       }
     };
   } catch (error) {
@@ -18944,12 +18972,6 @@ async function loadResumableRunRecord(home, runId) {
   if (run === void 0) {
     throw new CliUsageError(`unknown role run id: ${runId}`);
   }
-  if (run.state === "terminal") {
-    throw new CliUsageError(`role run is already terminal: ${runId}`);
-  }
-  if (run.state !== "resumable" || run.resumable === void 0) {
-    throw new CliUsageError(`role run is not resumable: ${runId}`);
-  }
   if (!await isSessionPrincipalAvailable(run.sessionFile)) {
     throw new CliUsageError(
       `role run Pi session principal is unavailable: ${runId}`
@@ -19063,7 +19085,7 @@ async function loadResumableRunRecord(home, runId) {
   }
   return {
     run,
-    observation: run.resumable,
+    ...run.resumable === void 0 ? {} : { observation: run.resumable },
     admittedFields: {
       instruction,
       instructionEmpty,
@@ -19106,7 +19128,7 @@ async function loadResumableJudgeRun(home, runId) {
   return {
     admitted,
     run: loaded.run,
-    observation: loaded.observation
+    ...loaded.observation === void 0 ? {} : { observation: loaded.observation }
   };
 }
 async function loadResumableCoderRun(home, runId) {
@@ -19152,7 +19174,7 @@ async function loadResumableCoderRun(home, runId) {
   return {
     admitted,
     run: loaded.run,
-    observation: loaded.observation
+    ...loaded.observation === void 0 ? {} : { observation: loaded.observation }
   };
 }
 async function loadResumableFixerRun(home, runId) {
@@ -19201,7 +19223,7 @@ async function loadResumableFixerRun(home, runId) {
   return {
     admitted,
     run: loaded.run,
-    observation: loaded.observation
+    ...loaded.observation === void 0 ? {} : { observation: loaded.observation }
   };
 }
 async function loadResumableReviewerRun(home, runId) {
@@ -19236,7 +19258,7 @@ async function loadResumableReviewerRun(home, runId) {
   return {
     admitted,
     run: loaded.run,
-    observation: loaded.observation
+    ...loaded.observation === void 0 ? {} : { observation: loaded.observation }
   };
 }
 async function loadResumableMergerRun(home, runId) {
@@ -19282,7 +19304,7 @@ async function loadResumableMergerRun(home, runId) {
   return {
     admitted,
     run: loaded.run,
-    observation: loaded.observation
+    ...loaded.observation === void 0 ? {} : { observation: loaded.observation }
   };
 }
 async function peekRoleRunRole(home, runId) {
@@ -19291,7 +19313,7 @@ async function peekRoleRunRole(home, runId) {
   const run = await readRoleRunState(runDirectory);
   return run?.role;
 }
-var V1_RESUMABLE_PROVIDERS, RESUME_TRANSPORT_ENVELOPE, RUN_STATE_FILE, WRITER_LOCK_FILE, RunWriterLeaseHeldError;
+var V1_RESUMABLE_PROVIDERS, AUTO_RESUME_LIMIT, RESUME_TRANSPORT_ENVELOPE, RUN_STATE_FILE, WRITER_LOCK_FILE, RunWriterLeaseHeldError;
 var init_run_lifecycle = __esm({
   "src/public-cli/run-lifecycle.ts"() {
     "use strict";
@@ -19301,6 +19323,7 @@ var init_run_lifecycle = __esm({
     init_typed_provider_http();
     init_invocation();
     V1_RESUMABLE_PROVIDERS = ["openai-codex", "xai"];
+    AUTO_RESUME_LIMIT = 2;
     RESUME_TRANSPORT_ENVELOPE = "[ak-role:resume-continue]";
     RUN_STATE_FILE = "run-state.json";
     WRITER_LOCK_FILE = "writer.lock";
@@ -19314,6 +19337,176 @@ var init_run_lifecycle = __esm({
   }
 });
 
+// src/public-command-renderer.ts
+function renderPublicAkRoleCommand(target) {
+  if (!PUBLIC_CALLABLE_ROLES2.has(target.role)) return void 0;
+  const role = target.role;
+  if (target.phase === null || target.phase === void 0) {
+    return `ak-role ${role}`;
+  }
+  if (role === "coder" || role === "fixer") {
+    return `ak-role ${role} ${target.phase}`;
+  }
+  return `ak-role ${role}`;
+}
+var PUBLIC_CALLABLE_ROLES2;
+var init_public_command_renderer = __esm({
+  "src/public-command-renderer.ts"() {
+    "use strict";
+    init_packaged_role_registry();
+    PUBLIC_CALLABLE_ROLES2 = new Set(
+      PACKAGED_ROLE_REGISTRY.map((entry) => entry.role)
+    );
+  }
+});
+
+// src/public-cli/command-renderer.ts
+var init_command_renderer = __esm({
+  "src/public-cli/command-renderer.ts"() {
+    "use strict";
+    init_public_command_renderer();
+  }
+});
+
+// src/public-cli/terminal.ts
+function encodeTerminalField(value) {
+  return JSON.stringify(value);
+}
+function jsonSafeComplianceCandidate(value) {
+  return value === void 0 ? JSON_SAFE_UNDEFINED_ARGUMENT : value;
+}
+function isLawfulTypedTerminalOutcome(outcome) {
+  return outcome.kind === "accepted" || outcome.kind === "audit_escalation" || outcome.kind === "no_receipt";
+}
+function exitCodeForTerminalOutcome(outcome) {
+  return isLawfulTypedTerminalOutcome(outcome) ? 0 : 1;
+}
+function buildResidualIncompleteTerminalOutcome(input) {
+  return {
+    kind: "incomplete",
+    role: input.role,
+    status: "incomplete",
+    decision: "no-usable-result",
+    candidate: input.candidate,
+    diagnostic: input.diagnostic,
+    acceptedReceipt: false,
+    decisiveFacts: {
+      decision: "no-usable-result",
+      candidate: input.candidate,
+      diagnostic: input.diagnostic,
+      acceptedReceipt: false
+    }
+  };
+}
+function buildAuditIncompleteTerminalOutcome(input) {
+  const roleCandidate = jsonSafeComplianceCandidate(input.roleCandidate);
+  const audit = {
+    ...input.audit,
+    candidate: jsonSafeComplianceCandidate(input.audit.candidate)
+  };
+  return {
+    kind: "audit_incomplete",
+    role: input.role,
+    status: "audit-incomplete",
+    decision: "no-usable-decision",
+    roleCandidate,
+    audit,
+    acceptedReceipt: false,
+    decisiveFacts: {
+      decision: "no-usable-decision",
+      roleCandidate,
+      auditCandidate: audit.candidate,
+      auditObservation: audit.observation,
+      observationKind: audit.observation.kind,
+      observationType: audit.observation.kind === "non-object-arguments" ? audit.observation.type : audit.observation.kind === "object-status-unreadable" ? audit.observation.status : audit.observation.kind === "missing-subject" ? audit.observation.subject : audit.observation.kind,
+      acceptedReceipt: false
+    }
+  };
+}
+function redactExactRunId(text, runId) {
+  if (runId.length === 0) return text;
+  if (!text.includes(runId)) return text;
+  return text.split(runId).join(REDACTED_RUN_ID_TOKEN);
+}
+function recommendationNavigatorFact(input) {
+  void input.modelCommand;
+  const command = renderPublicAkRoleCommand(input.next);
+  if (command === void 0) {
+    return {
+      disposition: "unavailable",
+      source: "unknown",
+      reason: `recommended role is not a public callable seat: ${input.next.role}`
+    };
+  }
+  return {
+    disposition: "recommendation",
+    next: input.next,
+    reason: input.reason,
+    command,
+    ...input.route === void 0 ? {} : { route: input.route },
+    ...input.advisoryDiagnostic === void 0 ? {} : { advisoryDiagnostic: input.advisoryDiagnostic }
+  };
+}
+function formatTerminalResult(result2) {
+  const lines = [];
+  lines.push("role	outcome	status");
+  const outcomeStatus = result2.roleOutcome.kind === "failure" ? result2.roleOutcome.cause : result2.roleOutcome.status;
+  lines.push(
+    `${result2.roleOutcome.role}	${result2.roleOutcome.kind}	${encodeTerminalField(outcomeStatus)}`
+  );
+  if (result2.roleOutcome.kind === "failure") {
+    lines.push(
+      `diagnostic	${encodeTerminalField(result2.roleOutcome.diagnostic)}`
+    );
+  }
+  const facts = result2.roleOutcome.decisiveFacts;
+  for (const [key, value] of Object.entries(facts)) {
+    if (value === void 0) continue;
+    const rendered = typeof value === "string" ? value : JSON.stringify(value);
+    lines.push(`fact	${encodeTerminalField(key)}	${encodeTerminalField(rendered)}`);
+  }
+  lines.push(`navigator	${result2.navigator.disposition}`);
+  if (result2.navigator.advisoryDiagnostic !== void 0) {
+    lines.push(`navigator-advisory	${encodeTerminalField(result2.navigator.advisoryDiagnostic)}`);
+  }
+  if (result2.navigator.disposition === "recommendation") {
+    lines.push(
+      `next	${result2.navigator.next.role}	${result2.navigator.next.phase ?? "none"}`
+    );
+    lines.push(`reason	${encodeTerminalField(result2.navigator.reason)}`);
+    lines.push(`command	${encodeTerminalField(result2.navigator.command)}`);
+  } else if (result2.navigator.disposition === "unavailable") {
+    lines.push(
+      `unavailable	${result2.navigator.source}	${encodeTerminalField(result2.navigator.reason)}`
+    );
+  }
+  for (const artifact of result2.artifacts) {
+    lines.push(`artifact	${artifact.kind}	${encodeTerminalField(artifact.path)}`);
+  }
+  if (result2.resume !== void 0) {
+    lines.push(`resume	${encodeTerminalField(result2.resume.command)}`);
+  } else if (result2.runId !== void 0) {
+    lines.push(`run	${encodeTerminalField(result2.runId)}`);
+  }
+  if (result2.autoResumeCount !== void 0) {
+    lines.push(`autoResumeCount	${encodeTerminalField(String(result2.autoResumeCount))}`);
+  }
+  return `${lines.join("\n")}
+`;
+}
+var JSON_SAFE_UNDEFINED_ARGUMENT, REDACTED_RUN_ID_TOKEN;
+var init_terminal = __esm({
+  "src/public-cli/terminal.ts"() {
+    "use strict";
+    init_command_renderer();
+    JSON_SAFE_UNDEFINED_ARGUMENT = Object.freeze({
+      kind: "json-safe-sentinel",
+      type: "undefined"
+    });
+    REDACTED_RUN_ID_TOKEN = "[run-id]";
+  }
+});
+
 // src/auditor-soul.ts
 import { fileURLToPath } from "node:url";
 var AUDITOR_SOUL_ROLES, auditorSoulPaths;
@@ -19672,213 +19865,47 @@ function bindCurrentDurableTerminalToMarker(entries) {
       break;
     }
   }
-  let durableCount = 0;
-  for (let i = markerIndex + 1; i < windowEnd; i += 1) {
-    if (durableTerminalAt(entries, i) !== void 0) durableCount += 1;
-  }
-  if (durableCount !== 1) return { kind: "ambiguous" };
-  if (terminal.index <= markerIndex || terminal.index >= windowEnd) {
-    return { kind: "ambiguous" };
-  }
-  return {
-    kind: "bound",
-    terminal,
-    marker: { ...marker, index: markerIndex }
-  };
-}
-function isReceiptSettlementBindingClear(entries) {
-  return bindCurrentDurableTerminalToMarker(entries).kind !== "ambiguous";
-}
-var NAVIGATOR_INVOCATION_ENTRY, NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND, NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS, PACKAGED_ROLE_OUTPUT_TOOLS;
-var init_navigator_invocation_identity = __esm({
-  "src/navigator-invocation-identity.ts"() {
-    "use strict";
-    init_packaged_role_registry();
-    init_uuidv7();
-    init_work_subject_identity();
-    NAVIGATOR_INVOCATION_ENTRY = "ak-navigator-invocation";
-    NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND = "role_infrastructure_failure";
-    NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS = [
-      "kind",
-      "source",
-      "reasonCode"
-    ];
-    PACKAGED_ROLE_OUTPUT_TOOLS = new Map(
-      PACKAGED_ROLE_REGISTRY.map((entry) => [entry.outputTool, entry.role])
-    );
-  }
-});
-
-// src/public-command-renderer.ts
-function renderPublicAkRoleCommand(target) {
-  if (!PUBLIC_CALLABLE_ROLES2.has(target.role)) return void 0;
-  const role = target.role;
-  if (target.phase === null || target.phase === void 0) {
-    return `ak-role ${role}`;
-  }
-  if (role === "coder" || role === "fixer") {
-    return `ak-role ${role} ${target.phase}`;
-  }
-  return `ak-role ${role}`;
-}
-var PUBLIC_CALLABLE_ROLES2;
-var init_public_command_renderer = __esm({
-  "src/public-command-renderer.ts"() {
-    "use strict";
-    init_packaged_role_registry();
-    PUBLIC_CALLABLE_ROLES2 = new Set(
-      PACKAGED_ROLE_REGISTRY.map((entry) => entry.role)
-    );
-  }
-});
-
-// src/public-cli/command-renderer.ts
-var init_command_renderer = __esm({
-  "src/public-cli/command-renderer.ts"() {
-    "use strict";
-    init_public_command_renderer();
-  }
-});
-
-// src/public-cli/terminal.ts
-function encodeTerminalField(value) {
-  return JSON.stringify(value);
-}
-function jsonSafeComplianceCandidate(value) {
-  return value === void 0 ? JSON_SAFE_UNDEFINED_ARGUMENT : value;
-}
-function isLawfulTypedTerminalOutcome(outcome) {
-  return outcome.kind === "accepted" || outcome.kind === "audit_escalation" || outcome.kind === "no_receipt";
-}
-function exitCodeForTerminalOutcome(outcome) {
-  return isLawfulTypedTerminalOutcome(outcome) ? 0 : 1;
-}
-function buildResidualIncompleteTerminalOutcome(input) {
-  return {
-    kind: "incomplete",
-    role: input.role,
-    status: "incomplete",
-    decision: "no-usable-result",
-    candidate: input.candidate,
-    diagnostic: input.diagnostic,
-    acceptedReceipt: false,
-    decisiveFacts: {
-      decision: "no-usable-result",
-      candidate: input.candidate,
-      diagnostic: input.diagnostic,
-      acceptedReceipt: false
-    }
-  };
-}
-function buildAuditIncompleteTerminalOutcome(input) {
-  const roleCandidate = jsonSafeComplianceCandidate(input.roleCandidate);
-  const audit = {
-    ...input.audit,
-    candidate: jsonSafeComplianceCandidate(input.audit.candidate)
-  };
-  return {
-    kind: "audit_incomplete",
-    role: input.role,
-    status: "audit-incomplete",
-    decision: "no-usable-decision",
-    roleCandidate,
-    audit,
-    acceptedReceipt: false,
-    decisiveFacts: {
-      decision: "no-usable-decision",
-      roleCandidate,
-      auditCandidate: audit.candidate,
-      auditObservation: audit.observation,
-      observationKind: audit.observation.kind,
-      observationType: audit.observation.kind === "non-object-arguments" ? audit.observation.type : audit.observation.kind === "object-status-unreadable" ? audit.observation.status : audit.observation.kind === "missing-subject" ? audit.observation.subject : audit.observation.kind,
-      acceptedReceipt: false
-    }
-  };
-}
-function redactExactRunId(text, runId) {
-  if (runId.length === 0) return text;
-  if (!text.includes(runId)) return text;
-  return text.split(runId).join(REDACTED_RUN_ID_TOKEN);
-}
-function recommendationNavigatorFact(input) {
-  void input.modelCommand;
-  const command = renderPublicAkRoleCommand(input.next);
-  if (command === void 0) {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: `recommended role is not a public callable seat: ${input.next.role}`
-    };
-  }
-  return {
-    disposition: "recommendation",
-    next: input.next,
-    reason: input.reason,
-    command,
-    ...input.route === void 0 ? {} : { route: input.route },
-    ...input.advisoryDiagnostic === void 0 ? {} : { advisoryDiagnostic: input.advisoryDiagnostic }
-  };
-}
-function formatTerminalResult(result2) {
-  const lines = [];
-  lines.push("role	outcome	status");
-  const outcomeStatus = result2.roleOutcome.kind === "failure" ? result2.roleOutcome.cause : result2.roleOutcome.status;
-  lines.push(
-    `${result2.roleOutcome.role}	${result2.roleOutcome.kind}	${encodeTerminalField(outcomeStatus)}`
-  );
-  if (result2.roleOutcome.kind === "failure") {
-    lines.push(
-      `diagnostic	${encodeTerminalField(result2.roleOutcome.diagnostic)}`
-    );
-  }
-  const facts = result2.roleOutcome.decisiveFacts;
-  for (const [key, value] of Object.entries(facts)) {
-    if (value === void 0) continue;
-    const rendered = typeof value === "string" ? value : JSON.stringify(value);
-    lines.push(`fact	${encodeTerminalField(key)}	${encodeTerminalField(rendered)}`);
-  }
-  lines.push(`navigator	${result2.navigator.disposition}`);
-  if (result2.navigator.advisoryDiagnostic !== void 0) {
-    lines.push(`navigator-advisory	${encodeTerminalField(result2.navigator.advisoryDiagnostic)}`);
-  }
-  if (result2.navigator.disposition === "recommendation") {
-    lines.push(
-      `next	${result2.navigator.next.role}	${result2.navigator.next.phase ?? "none"}`
-    );
-    lines.push(`reason	${encodeTerminalField(result2.navigator.reason)}`);
-    lines.push(`command	${encodeTerminalField(result2.navigator.command)}`);
-  } else if (result2.navigator.disposition === "unavailable") {
-    lines.push(
-      `unavailable	${result2.navigator.source}	${encodeTerminalField(result2.navigator.reason)}`
-    );
-  }
-  for (const artifact of result2.artifacts) {
-    lines.push(`artifact	${artifact.kind}	${encodeTerminalField(artifact.path)}`);
+  let durableCount = 0;
+  for (let i = markerIndex + 1; i < windowEnd; i += 1) {
+    if (durableTerminalAt(entries, i) !== void 0) durableCount += 1;
   }
-  if (result2.resume !== void 0) {
-    lines.push(`resume	${encodeTerminalField(result2.resume.command)}`);
-  } else if (result2.runId !== void 0) {
-    lines.push(`run	${encodeTerminalField(result2.runId)}`);
+  if (durableCount !== 1) return { kind: "ambiguous" };
+  if (terminal.index <= markerIndex || terminal.index >= windowEnd) {
+    return { kind: "ambiguous" };
   }
-  return `${lines.join("\n")}
-`;
+  return {
+    kind: "bound",
+    terminal,
+    marker: { ...marker, index: markerIndex }
+  };
 }
-var JSON_SAFE_UNDEFINED_ARGUMENT, REDACTED_RUN_ID_TOKEN;
-var init_terminal = __esm({
-  "src/public-cli/terminal.ts"() {
+function isReceiptSettlementBindingClear(entries) {
+  return bindCurrentDurableTerminalToMarker(entries).kind !== "ambiguous";
+}
+var NAVIGATOR_INVOCATION_ENTRY, NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND, NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS, PACKAGED_ROLE_OUTPUT_TOOLS;
+var init_navigator_invocation_identity = __esm({
+  "src/navigator-invocation-identity.ts"() {
     "use strict";
-    init_command_renderer();
-    JSON_SAFE_UNDEFINED_ARGUMENT = Object.freeze({
-      kind: "json-safe-sentinel",
-      type: "undefined"
-    });
-    REDACTED_RUN_ID_TOKEN = "[run-id]";
+    init_packaged_role_registry();
+    init_uuidv7();
+    init_work_subject_identity();
+    NAVIGATOR_INVOCATION_ENTRY = "ak-navigator-invocation";
+    NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND = "role_infrastructure_failure";
+    NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS = [
+      "kind",
+      "source",
+      "reasonCode"
+    ];
+    PACKAGED_ROLE_OUTPUT_TOOLS = new Map(
+      PACKAGED_ROLE_REGISTRY.map((entry) => [entry.outputTool, entry.role])
+    );
   }
 });
 
 // src/public-cli/settlement.ts
 import { randomUUID } from "node:crypto";
-import { lstat as lstat3, mkdir as mkdir3, open as open2, readFile as readFile9, readdir as readdir3, writeFile as writeFile5 } from "node:fs/promises";
+import { constants as fsConstants } from "node:fs";
+import { appendFile, lstat as lstat3, mkdir as mkdir3, open as open2, readFile as readFile9, readdir as readdir3, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname6, join as join11 } from "node:path";
 function isChildDiagnosticFloodLine(line2) {
   if (/^at\s+/.test(line2)) return true;
@@ -20192,12 +20219,24 @@ async function readBoundAuditorKnownFailure(sessionFile) {
   }
   const parentId = parentEntries.find((entry) => entry.type === "session")?.id;
   if (parentId === void 0) return void 0;
+  const RESUME_ENVELOPE = RESUME_TRANSPORT_ENVELOPE;
+  const isResumeEnvelope = (msg) => {
+    if (!isRecord5(msg) || msg.role !== "user") return false;
+    const text = typeof msg.text === "string" ? msg.text : typeof msg.content === "string" ? msg.content : void 0;
+    if (text === RESUME_ENVELOPE) return true;
+    const content = msg.content;
+    if (Array.isArray(content)) {
+      return content.some((p) => isRecord5(p) && (p.text === RESUME_ENVELOPE || p.content === RESUME_ENVELOPE));
+    }
+    return false;
+  };
   let latestParentUserIndex = -1;
   for (let i = parentEntries.length - 1; i >= 0; i -= 1) {
-    if (parentEntries[i]?.type === "message" && parentEntries[i]?.message?.role === "user") {
-      latestParentUserIndex = i;
-      break;
-    }
+    const entry = parentEntries[i];
+    if (entry?.type !== "message" || entry.message?.role !== "user") continue;
+    if (isResumeEnvelope(entry.message)) continue;
+    latestParentUserIndex = i;
+    break;
   }
   const childDirectory = join11(dirname6(sessionFile), "auditor-roles");
   let names;
@@ -20207,6 +20246,7 @@ async function readBoundAuditorKnownFailure(sessionFile) {
     if (isMissingPathError2(error)) return void 0;
     throw sessionReadFailure(error, "failed to read bound auditor session directory");
   }
+  const validAuditorFiles = [];
   for (const file of names.filter((name) => name.endsWith(".jsonl")).sort().reverse()) {
     let entries;
     try {
@@ -20221,6 +20261,9 @@ async function readBoundAuditorKnownFailure(sessionFile) {
     const attemptEntryId = typeof bindingParent?.attemptEntryId === "string" ? bindingParent.attemptEntryId : void 0;
     const attemptEntryIndex = attemptEntryId === void 0 ? -1 : parentEntries.findIndex((entry) => entry.id === attemptEntryId);
     if (bindingParent?.sessionId !== parentId || bindingParent.sessionFile !== sessionFile || attemptEntryIndex < latestParentUserIndex) continue;
+    validAuditorFiles.push({ file, entries, ...attemptEntryId === void 0 ? {} : { attemptEntryId } });
+  }
+  for (const { entries, attemptEntryId } of validAuditorFiles) {
     const stop = extractSessionProviderStop(entries);
     if (stop === void 0) continue;
     for (let i = entries.length - 1; i >= 0; i -= 1) {
@@ -20240,6 +20283,10 @@ async function readBoundAuditorKnownFailure(sessionFile) {
         ...isRecord5(failure.details) ? { details: failure.details } : {}
       };
     }
+  }
+  for (const { entries } of validAuditorFiles) {
+    const stop = extractSessionProviderStop(entries);
+    if (stop === void 0) continue;
     const primary = knownFailureFromProviderStop(stop);
     return {
       ...primary,
@@ -20973,20 +21020,74 @@ async function ensureAuditEvidenceDirectory(runDirectory) {
   }
   return artifactsDir;
 }
+async function appendRunAttemptHistory(admitted, outcome) {
+  const entries = await readBoundSessionEntries(admitted.sessionFile);
+  let parentId = null;
+  let priorEntries = 0;
+  for (const entry of entries) {
+    if (typeof entry.id === "string" && entry.type !== "session") parentId = entry.id;
+    if (entry.type === "custom" && entry.customType === ATTEMPT_HISTORY_ENTRY_TYPE) {
+      priorEntries += 1;
+    }
+  }
+  const timestamp2 = (/* @__PURE__ */ new Date()).toISOString();
+  const line2 = `${JSON.stringify({
+    type: "custom",
+    customType: ATTEMPT_HISTORY_ENTRY_TYPE,
+    data: {
+      sequence: priorEntries + 1,
+      role: admitted.role,
+      runId: admitted.runId,
+      recordedAt: timestamp2,
+      outcome
+    },
+    id: randomUUID(),
+    parentId,
+    timestamp: timestamp2
+  })}
+`;
+  await appendFile(admitted.sessionFile, line2, "utf8");
+}
 async function publishComplianceAuditIncompleteEvidence(admitted, outcome) {
+  await appendRunAttemptHistory(admitted, outcome);
+  if (typeof fsConstants.O_NOFOLLOW !== "number" || typeof fsConstants.O_NONBLOCK !== "number") {
+    throw auditArtifactPublicationError(
+      "audit evidence publication requires O_NOFOLLOW|O_NONBLOCK open-flag support (anti-symlink/anti-planted protection must not be silently dropped); refusing to publish",
+      "ENOSYS"
+    );
+  }
   const artifactsDir = await ensureAuditEvidenceDirectory(admitted.runDirectory);
   const evidencePath = join11(artifactsDir, "audit-incomplete.json");
+  let existing;
   try {
-    const existing = await lstat3(evidencePath);
-    throw auditArtifactPublicationError(
-      existing.isSymbolicLink() ? "audit evidence destination is a symlink" : "audit evidence destination collision",
-      existing.isSymbolicLink() ? "ELOOP" : "EEXIST"
-    );
+    existing = await lstat3(evidencePath);
   } catch (error) {
     if (!isMissingPathError2(error)) throw error;
   }
-  const handle = await open2(evidencePath, "wx", 384);
+  if (existing?.isSymbolicLink()) {
+    throw auditArtifactPublicationError(
+      "audit evidence destination is a symlink",
+      "ELOOP"
+    );
+  }
+  if (existing && !existing.isFile()) {
+    throw auditArtifactPublicationError(
+      "audit evidence destination is not a regular file",
+      "EEXIST"
+    );
+  }
+  const handle = await open2(
+    evidencePath,
+    fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_TRUNC | fsConstants.O_NOFOLLOW | fsConstants.O_NONBLOCK,
+    384
+  );
   try {
+    if (!(await handle.stat()).isFile()) {
+      throw auditArtifactPublicationError(
+        "audit evidence destination is not a regular file",
+        "EEXIST"
+      );
+    }
     await handle.writeFile(`${JSON.stringify(outcome, null, 2)}
 `, "utf8");
     await handle.sync();
@@ -21239,6 +21340,7 @@ async function extractNavigatorFactFromAdmittedSession(admitted) {
   }
 }
 async function publishJudgeArtifacts(admitted, roleOutcome, sessionDirectory) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -21283,6 +21385,7 @@ async function publishJudgeArtifacts(admitted, roleOutcome, sessionDirectory) {
   ];
 }
 async function publishCoderArtifacts(admitted, roleOutcome, sessionDirectory, options = {}) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -21452,6 +21555,7 @@ function extractFixerMethodInvocations(entries, options) {
   return Object.freeze(observed);
 }
 async function publishFixerArtifacts(admitted, roleOutcome, sessionDirectory, options) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -21563,6 +21667,7 @@ async function settleLawfulFixerTerminalResult(admitted, options) {
   };
 }
 async function publishCollectorArtifacts(admitted, roleOutcome, sessionDirectory, options = {}) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -21682,6 +21787,7 @@ async function trySettleCollectorTerminalResult(admitted) {
   return settleLawfulCollectorTerminalResult(admitted);
 }
 async function publishDoctorArtifacts(admitted, roleOutcome, sessionDirectory, options = {}) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -21849,6 +21955,7 @@ function extractReviewerMethodInvocations(entries, options) {
   return Object.freeze(observed);
 }
 async function publishReviewerArtifacts(admitted, roleOutcome, sessionDirectory, options) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -22017,6 +22124,7 @@ function extractMergerMethodInvocations(entries, options) {
   return Object.freeze(observed);
 }
 async function publishMergerArtifacts(admitted, roleOutcome, sessionDirectory, options) {
+  await appendRunAttemptHistory(admitted, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
   const reportPath = join11(artifactsDir, "report.json");
   const evidencePath = join11(artifactsDir, "evidence.json");
@@ -22238,6 +22346,15 @@ async function publishFailureArtifacts(admitted, failure) {
     admitted.runDirectory
   );
   const priorIssues = baseAttempt === void 0 ? [] : [baseAttempt];
+  try {
+    await appendRunAttemptHistory(admitted, {
+      kind: "failure",
+      role: admitted.role,
+      ...failure
+    });
+  } catch (error) {
+    priorIssues.push(publicationAttemptFromError(admitted.sessionFile, error));
+  }
   const underArtifacts = baseDir === join11(admitted.runDirectory, "artifacts");
   const uniqueFallbackDirs = uniqueFailureFallbackDirs(
     admitted.runDirectory,
@@ -22434,7 +22551,7 @@ function presentFailureTerminal(terminal, io) {
     }));
   }
 }
-var CONCISE_DIAGNOSTIC_MAX_CHARS, COLLECTOR_INFRASTRUCTURE_TOOLS, COLLECTOR_INFRASTRUCTURE_FAILURE_SPEC, ENGINE_DETOUR_INFRASTRUCTURE_FAILURE_SPEC;
+var CONCISE_DIAGNOSTIC_MAX_CHARS, COLLECTOR_INFRASTRUCTURE_TOOLS, COLLECTOR_INFRASTRUCTURE_FAILURE_SPEC, ENGINE_DETOUR_INFRASTRUCTURE_FAILURE_SPEC, ATTEMPT_HISTORY_ENTRY_TYPE;
 var init_settlement = __esm({
   "src/public-cli/settlement.ts"() {
     "use strict";
@@ -22477,6 +22594,71 @@ var init_settlement = __esm({
       cause: "output",
       identityName: "EngineDetourInfrastructureError"
     };
+    ATTEMPT_HISTORY_ENTRY_TYPE = "ak_run_attempt_history";
+  }
+});
+
+// src/public-cli/auto-resume.ts
+function presentTerminal(terminal, io) {
+  if (terminal.roleOutcome.kind === "failure" || terminal.roleOutcome.kind === "no_receipt") {
+    presentFailureTerminal(terminal, io);
+  } else {
+    io.stdout(formatTerminalResult(terminal));
+  }
+}
+async function runWithAutoResumeLoop(options) {
+  let autoResumeAttempts = 0;
+  let isFirst = true;
+  let currentExtraArgs = options.buildInitialArgs();
+  while (true) {
+    let lease;
+    try {
+      lease = await acquireRunWriterLease(
+        options.admitted.runDirectory,
+        (diagnostic) => options.io.stderr(diagnostic)
+      );
+    } catch (error) {
+      if (error instanceof RunWriterLeaseHeldError) {
+        presentStructuralRejection(error, options.io);
+        return { exitCode: 2 };
+      }
+      throw error;
+    }
+    const result2 = await options.dispatch(currentExtraArgs, lease, isFirst, dummyIo);
+    const terminal = result2.terminal;
+    if (terminal !== void 0) {
+      terminal.autoResumeCount = autoResumeAttempts;
+    }
+    const lawful = terminal !== void 0 && isLawfulTypedTerminalOutcome(terminal.roleOutcome);
+    if (lawful) {
+      if (terminal !== void 0) {
+        options.io.stdout(formatTerminalResult(terminal));
+      }
+      return result2;
+    }
+    if (autoResumeAttempts >= AUTO_RESUME_LIMIT) {
+      if (terminal !== void 0) presentTerminal(terminal, options.io);
+      return result2;
+    }
+    if (!await isSessionPrincipalAvailable(options.admitted.sessionFile)) {
+      if (terminal !== void 0) presentTerminal(terminal, options.io);
+      return result2;
+    }
+    autoResumeAttempts++;
+    currentExtraArgs = options.buildResumeArgs();
+    isFirst = false;
+  }
+}
+var dummyIo;
+var init_auto_resume = __esm({
+  "src/public-cli/auto-resume.ts"() {
+    "use strict";
+    init_run_lifecycle();
+    init_terminal();
+    init_settlement();
+    dummyIo = { stdout: () => {
+    }, stderr: () => {
+    } };
   }
 });
 
@@ -22723,16 +22905,6 @@ async function runPublicCoder(argv, env, io, parseCoderArgv2) {
     throw error;
   }
   await markRunAdmitted(admitted);
-  let lease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
   let methodProvenance;
   if (admitted.phase === "apply") {
     try {
@@ -22742,7 +22914,6 @@ async function runPublicCoder(argv, env, io, parseCoderArgv2) {
       );
       methodProvenance = material.provenance;
     } catch (error) {
-      await lease.release();
       return await presentControlledFailure2(
         admitted,
         {
@@ -22756,23 +22927,32 @@ async function runPublicCoder(argv, env, io, parseCoderArgv2) {
       );
     }
   }
-  const extraArgs = buildCoderActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
-    ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
-  });
-  return await dispatchAdmittedCoder({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-    },
     io,
-    extraArgs,
-    lease,
-    ...methodProvenance === void 0 ? {} : { methodProvenance },
-    ...env.engine === void 0 ? {} : { effectiveEngine: env.engine }
+    buildInitialArgs: () => buildCoderActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    buildResumeArgs: () => buildCoderResumeActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) => dispatchAdmittedCoder({
+      admitted,
+      env: {
+        ...env,
+        ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+      },
+      io: attemptIo,
+      extraArgs,
+      lease,
+      ...methodProvenance === void 0 ? {} : { methodProvenance },
+      ...isFirst && env.engine !== void 0 ? { effectiveEngine: env.engine } : {}
+    })
   });
 }
 async function runPublicCoderResume(argv, env, io) {
@@ -22804,7 +22984,7 @@ async function runPublicCoderResume(argv, env, io) {
   const { admitted } = loaded;
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       io.stderr(formatCliDiagnostic(error.message));
@@ -22840,7 +23020,7 @@ async function runPublicCoderResume(argv, env, io) {
     ...env.model === void 0 ? {} : { model: env.model },
     ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
   });
-  return await dispatchAdmittedCoder({
+  const result2 = await dispatchAdmittedCoder({
     admitted,
     env: {
       ...env,
@@ -22851,6 +23031,10 @@ async function runPublicCoderResume(argv, env, io) {
     lease,
     ...methodProvenance === void 0 ? {} : { methodProvenance }
   });
+  if (result2.terminal !== void 0) {
+    result2.terminal.autoResumeCount = 0;
+  }
+  return result2;
 }
 var init_coder_run = __esm({
   "src/public-cli/coder-run.ts"() {
@@ -22864,6 +23048,7 @@ var init_coder_run = __esm({
     init_config2();
     init_public_run_credentials();
     init_run_lifecycle();
+    init_auto_resume();
     init_settlement();
   }
 });
@@ -23063,7 +23248,7 @@ async function runPublicCollector(argv, env, io, parseCollectorArgv2) {
   await markRunAdmitted(admitted);
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       presentStructuralRejection(error, io);
@@ -23298,7 +23483,7 @@ async function runPublicDoctor(argv, env, io, parseDoctorArgv2) {
   await markRunAdmitted(admitted);
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       presentStructuralRejection(error, io);
@@ -23611,21 +23796,10 @@ async function runPublicFixer(argv, env, io, parseFixerArgv2) {
     throw error;
   }
   await markRunAdmitted(admitted);
-  let lease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
   let methodMaterial;
   try {
     methodMaterial = await loadFixerMethodMaterial(env.packageRoot);
   } catch (error) {
-    await lease.release();
     return await presentControlledFailure5(
       admitted,
       {
@@ -23637,24 +23811,32 @@ async function runPublicFixer(argv, env, io, parseFixerArgv2) {
       io
     );
   }
-  const extraArgs = buildFixerActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
-    ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
-  });
-  return await dispatchAdmittedFixer({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-    },
     io,
-    extraArgs,
-    lease,
-    methodMaterial,
-    // #391: only initial Fixer dispatch records mechanical engine provenance.
-    ...env.engine === void 0 ? {} : { effectiveEngine: env.engine }
+    buildInitialArgs: () => buildFixerActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    buildResumeArgs: () => buildFixerResumeActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) => dispatchAdmittedFixer({
+      admitted,
+      env: {
+        ...env,
+        ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+      },
+      io: attemptIo,
+      extraArgs,
+      lease,
+      methodMaterial,
+      ...isFirst && env.engine !== void 0 ? { effectiveEngine: env.engine } : {}
+    })
   });
 }
 async function runPublicFixerResume(argv, env, io) {
@@ -23686,7 +23868,7 @@ async function runPublicFixerResume(argv, env, io) {
   const { admitted } = loaded;
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       io.stderr(formatCliDiagnostic(error.message));
@@ -23715,7 +23897,7 @@ async function runPublicFixerResume(argv, env, io) {
     ...env.model === void 0 ? {} : { model: env.model },
     ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
   });
-  return await dispatchAdmittedFixer({
+  const result2 = await dispatchAdmittedFixer({
     admitted,
     env: {
       ...env,
@@ -23726,6 +23908,8 @@ async function runPublicFixerResume(argv, env, io) {
     lease,
     methodMaterial
   });
+  if (result2.terminal !== void 0) result2.terminal.autoResumeCount = 0;
+  return result2;
 }
 var init_fixer_run = __esm({
   "src/public-cli/fixer-run.ts"() {
@@ -23739,6 +23923,7 @@ var init_fixer_run = __esm({
     init_config2();
     init_public_run_credentials();
     init_run_lifecycle();
+    init_auto_resume();
     init_settlement();
   }
 });
@@ -23990,33 +24175,30 @@ async function runPublicJudge(argv, env, io, parseJudgeArgv2) {
     throw error;
   }
   await markRunAdmitted(admitted);
-  let lease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
-  const extraArgs = buildJudgeActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
-    ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
-  });
-  return await dispatchAdmittedJudge({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-    },
     io,
-    extraArgs,
-    lease,
-    // #358: only initial Judge dispatch records mechanical engine provenance.
-    ...env.engine === void 0 ? {} : { effectiveEngine: env.engine }
+    buildInitialArgs: () => buildJudgeActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    buildResumeArgs: () => buildJudgeResumeActivationExtraArgs(admitted, {
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) => dispatchAdmittedJudge({
+      admitted,
+      env: {
+        ...env,
+        ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+      },
+      io: attemptIo,
+      extraArgs,
+      lease,
+      ...isFirst && env.engine !== void 0 ? { effectiveEngine: env.engine } : {}
+    })
   });
 }
 async function runPublicResume(argv, env, io) {
@@ -24048,7 +24230,7 @@ async function runPublicResume(argv, env, io) {
   const { admitted } = loaded;
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       io.stderr(formatCliDiagnostic(error.message));
@@ -24060,7 +24242,7 @@ async function runPublicResume(argv, env, io) {
     ...env.model === void 0 ? {} : { model: env.model },
     ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
   });
-  return await dispatchAdmittedJudge({
+  const result2 = await dispatchAdmittedJudge({
     admitted,
     env: {
       ...env,
@@ -24070,6 +24252,10 @@ async function runPublicResume(argv, env, io) {
     extraArgs,
     lease
   });
+  if (result2.terminal !== void 0) {
+    result2.terminal.autoResumeCount = 0;
+  }
+  return result2;
 }
 var init_judge_run = __esm({
   "src/public-cli/judge-run.ts"() {
@@ -24082,6 +24268,7 @@ var init_judge_run = __esm({
     init_config2();
     init_public_run_credentials();
     init_run_lifecycle();
+    init_auto_resume();
     init_settlement();
   }
 });
@@ -24419,21 +24606,10 @@ async function runPublicMerger(argv, env, io, parseMergerArgv2) {
     throw error;
   }
   await markRunAdmitted(admitted);
-  let lease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
   let methodMaterial;
   try {
     methodMaterial = await loadMergerMethodMaterial(env.packageRoot);
   } catch (error) {
-    await lease.release();
     return await presentControlledFailure7(
       admitted,
       {
@@ -24446,23 +24622,32 @@ async function runPublicMerger(argv, env, io, parseMergerArgv2) {
       io
     );
   }
-  const extraArgs = buildMergerActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
-    ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
-  });
-  return await dispatchAdmittedMerger({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-    },
     io,
-    extraArgs,
-    lease,
-    methodMaterial,
-    ...env.engine === void 0 ? {} : { effectiveEngine: env.engine }
+    buildInitialArgs: () => buildMergerActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    buildResumeArgs: () => buildMergerResumeActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) => dispatchAdmittedMerger({
+      admitted,
+      env: {
+        ...env,
+        ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+      },
+      io: attemptIo,
+      extraArgs,
+      lease,
+      methodMaterial,
+      ...isFirst && env.engine !== void 0 ? { effectiveEngine: env.engine } : {}
+    })
   });
 }
 async function runPublicMergerResume(argv, env, io) {
@@ -24494,7 +24679,7 @@ async function runPublicMergerResume(argv, env, io) {
   const { admitted } = loaded;
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       io.stderr(formatCliDiagnostic(error.message));
@@ -24524,7 +24709,7 @@ async function runPublicMergerResume(argv, env, io) {
     ...env.model === void 0 ? {} : { model: env.model },
     ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
   });
-  return await dispatchAdmittedMerger({
+  const result2 = await dispatchAdmittedMerger({
     admitted,
     env: {
       ...env,
@@ -24535,6 +24720,8 @@ async function runPublicMergerResume(argv, env, io) {
     lease,
     methodMaterial
   });
+  if (result2.terminal !== void 0) result2.terminal.autoResumeCount = 0;
+  return result2;
 }
 var init_merger_run = __esm({
   "src/public-cli/merger-run.ts"() {
@@ -24551,6 +24738,7 @@ var init_merger_run = __esm({
     init_config2();
     init_public_run_credentials();
     init_run_lifecycle();
+    init_auto_resume();
     init_settlement();
   }
 });
@@ -24835,21 +25023,10 @@ async function runPublicReviewer(argv, env, io, parseReviewerArgv2) {
     throw error;
   }
   await markRunAdmitted(admitted);
-  let lease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
   let methodMaterial;
   try {
     methodMaterial = await loadReviewerMethodMaterial(env.packageRoot);
   } catch (error) {
-    await lease.release();
     return await presentControlledFailure8(
       admitted,
       {
@@ -24861,24 +25038,32 @@ async function runPublicReviewer(argv, env, io, parseReviewerArgv2) {
       io
     );
   }
-  const extraArgs = buildReviewerActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
-    ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
-  });
-  return await dispatchAdmittedReviewer({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-    },
     io,
-    extraArgs,
-    lease,
-    methodMaterial,
-    // #378: only initial Reviewer dispatch records mechanical engine provenance.
-    ...env.engine === void 0 ? {} : { effectiveEngine: env.engine }
+    buildInitialArgs: () => buildReviewerActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    buildResumeArgs: () => buildReviewerResumeActivationExtraArgs(admitted, {
+      packageRoot: env.packageRoot,
+      ...env.model === void 0 ? {} : { model: env.model },
+      ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
+    }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) => dispatchAdmittedReviewer({
+      admitted,
+      env: {
+        ...env,
+        ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+      },
+      io: attemptIo,
+      extraArgs,
+      lease,
+      methodMaterial,
+      ...isFirst && env.engine !== void 0 ? { effectiveEngine: env.engine } : {}
+    })
   });
 }
 async function runPublicReviewerResume(argv, env, io) {
@@ -24910,7 +25095,7 @@ async function runPublicReviewerResume(argv, env, io) {
   const { admitted } = loaded;
   let lease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       io.stderr(formatCliDiagnostic(error.message));
@@ -24939,7 +25124,7 @@ async function runPublicReviewerResume(argv, env, io) {
     ...env.model === void 0 ? {} : { model: env.model },
     ...env.extraPiArgs === void 0 ? {} : { extraPiArgs: env.extraPiArgs }
   });
-  return await dispatchAdmittedReviewer({
+  const result2 = await dispatchAdmittedReviewer({
     admitted,
     env: {
       ...env,
@@ -24950,6 +25135,8 @@ async function runPublicReviewerResume(argv, env, io) {
     lease,
     methodMaterial
   });
+  if (result2.terminal !== void 0) result2.terminal.autoResumeCount = 0;
+  return result2;
 }
 var init_reviewer_run = __esm({
   "src/public-cli/reviewer-run.ts"() {
@@ -24963,6 +25150,7 @@ var init_reviewer_run = __esm({
     init_config2();
     init_public_run_credentials();
     init_run_lifecycle();
+    init_auto_resume();
     init_settlement();
   }
 });