@akagilnc/pi-workflow-roles 0.1.2152 → 0.1.2169

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.2152",
+  "version": "0.1.2169",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/src/public-cli/auto-resume.ts

@@ -0,0 +1,80 @@
+/**
+ * Single generic auto-resume loop for #416 (owner scope = single LLM call).
+ * Call-local retries, at most AUTO_RESUME_LIMIT times, in-place (same runId/session).
+ * Unifies presentation: intermediate attempts use dummyIo, only final Terminal is presented.
+ */
+import { AUTO_RESUME_LIMIT, isSessionPrincipalAvailable, acquireRunWriterLease, RunWriterLeaseHeldError, type RunWriterLease } from "./run-lifecycle.ts";
+import { isLawfulTypedTerminalOutcome, formatTerminalResult, type TerminalResult } from "./terminal.ts";
+import { presentFailureTerminal, presentStructuralRejection } from "./settlement.ts";
+import type { CliIo } from "./cli-io.ts";
+
+const dummyIo: CliIo = { stdout: () => {}, stderr: () => {} };
+
+function presentTerminal(terminal: TerminalResult, io: CliIo): void {
+  if (terminal.roleOutcome.kind === "failure" || terminal.roleOutcome.kind === "no_receipt") {
+    presentFailureTerminal(terminal, io);
+  } else {
+    io.stdout(formatTerminalResult(terminal));
+  }
+}
+
+export type AutoResumeDispatchResult = {
+  exitCode: number;
+  terminal?: TerminalResult;
+};
+
+export async function runWithAutoResumeLoop<T extends AutoResumeDispatchResult>(options: {
+  admitted: { sessionFile: string; runDirectory: string };
+  io: CliIo;
+  buildInitialArgs: () => string[];
+  buildResumeArgs: () => string[];
+  dispatch: (extraArgs: string[], lease: RunWriterLease, isFirst: boolean, attemptIo: CliIo) => Promise<T>;
+}): Promise<T> {
+  let autoResumeAttempts = 0;
+  let isFirst = true;
+  let currentExtraArgs = options.buildInitialArgs();
+
+  while (true) {
+    let lease: RunWriterLease;
+    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 } as T;
+      }
+      throw error;
+    }
+
+    const result = await options.dispatch(currentExtraArgs, lease, isFirst, dummyIo);
+
+    const terminal = (result as { terminal?: TerminalResult }).terminal;
+    if (terminal !== undefined) {
+      (terminal as { autoResumeCount?: number }).autoResumeCount = autoResumeAttempts;
+    }
+
+    const lawful = terminal !== undefined && isLawfulTypedTerminalOutcome(terminal.roleOutcome);
+    if (lawful) {
+      if (terminal !== undefined) {
+        // Present lawful terminal once to real io (dummy was used inside dispatch)
+        options.io.stdout(formatTerminalResult(terminal));
+      }
+      return result;
+    }
+
+    if (autoResumeAttempts >= AUTO_RESUME_LIMIT) {
+      if (terminal !== undefined) presentTerminal(terminal, options.io);
+      return result;
+    }
+    if (!(await isSessionPrincipalAvailable(options.admitted.sessionFile))) {
+      if (terminal !== undefined) presentTerminal(terminal, options.io);
+      return result;
+    }
+
+    autoResumeAttempts++;
+    currentExtraArgs = options.buildResumeArgs();
+    isFirst = false;
+  }
+}

package/src/public-cli/coder-run.ts

@@ -50,6 +50,7 @@ import {
   type RunWriterLease,
   type TypedProviderHttpObservation,
 } from "./run-lifecycle.ts";
+import { runWithAutoResumeLoop } from "./auto-resume.ts";
 import {
   classifyPostAdmissionFailure,
   exitCodeForTerminalOutcome,
@@ -446,17 +447,7 @@ export async function runPublicCoder(
   }
 
   await markRunAdmitted(admitted);
-
-  let lease: RunWriterLease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
+  // #416 scope = single LLM call: call-local retry counter, no persistence.
 
   let methodProvenance: PackagedMethodSkillProvenance | undefined;
   if (admitted.phase === "apply") {
@@ -467,7 +458,6 @@ export async function runPublicCoder(
       );
       methodProvenance = material.provenance;
     } catch (error) {
-      await lease.release();
       return await presentControlledFailure(
         admitted,
         {
@@ -482,24 +472,35 @@ export async function runPublicCoder(
     }
   }
 
-  const extraArgs = buildCoderActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...(env.model === undefined ? {} : { model: env.model }),
-    ...(env.engine === undefined ? {} : { engine: env.engine }),
-    ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
-  });
-
-  return await dispatchAdmittedCoder({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
-    },
     io,
-    extraArgs,
-    lease,
-    ...(methodProvenance === undefined ? {} : { methodProvenance }),
-    ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
+    buildInitialArgs: () =>
+      buildCoderActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.engine === undefined ? {} : { engine: env.engine }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    buildResumeArgs: () =>
+      buildCoderResumeActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) =>
+      dispatchAdmittedCoder({
+        admitted,
+        env: {
+          ...env,
+          ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+        },
+        io: attemptIo,
+        extraArgs,
+        lease,
+        ...(methodProvenance === undefined ? {} : { methodProvenance }),
+        ...(isFirst && env.engine !== undefined ? { effectiveEngine: env.engine } : {}),
+      }),
   });
 }
 
@@ -547,7 +548,7 @@ export async function runPublicCoderResume(
 
   let lease: RunWriterLease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       // Concurrent resume: reject without second writer or dispatch.
@@ -587,7 +588,7 @@ export async function runPublicCoderResume(
     ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
   });
 
-  return await dispatchAdmittedCoder({
+  const result = await dispatchAdmittedCoder({
     admitted,
     env: {
       ...env,
@@ -598,6 +599,10 @@ export async function runPublicCoderResume(
     lease,
     ...(methodProvenance === undefined ? {} : { methodProvenance }),
   });
+  if (result.terminal !== undefined) {
+    (result.terminal as { autoResumeCount?: number }).autoResumeCount = 0;
+  }
+  return result;
 }
 
 // Re-export for tests that assert typed credential failure channel shape.

package/src/public-cli/collector-run.ts

@@ -355,7 +355,7 @@ export async function runPublicCollector(
 
   let lease: RunWriterLease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       presentStructuralRejection(error, io);

package/src/public-cli/doctor-run.ts

@@ -334,7 +334,7 @@ export async function runPublicDoctor(
 
   let lease: RunWriterLease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       presentStructuralRejection(error, io);

package/src/public-cli/fixer-run.ts

@@ -52,6 +52,7 @@ import {
   type RunWriterLease,
   type TypedProviderHttpObservation,
 } from "./run-lifecycle.ts";
+import { runWithAutoResumeLoop } from "./auto-resume.ts";
 import {
   classifyPostAdmissionFailure,
   exitCodeForTerminalOutcome,
@@ -474,22 +475,10 @@ export async function runPublicFixer(
 
   await markRunAdmitted(admitted);
 
-  let lease: RunWriterLease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
-
   let methodMaterial: PackagedMethodSkillMaterial;
   try {
     methodMaterial = await loadFixerMethodMaterial(env.packageRoot);
   } catch (error) {
-    await lease.release();
     return await presentControlledFailure(
       admitted,
       {
@@ -502,25 +491,35 @@ export async function runPublicFixer(
     );
   }
 
-  const extraArgs = buildFixerActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...(env.model === undefined ? {} : { model: env.model }),
-    ...(env.engine === undefined ? {} : { engine: env.engine }),
-    ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
-  });
-
-  return await dispatchAdmittedFixer({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
-    },
     io,
-    extraArgs,
-    lease,
-    methodMaterial,
-    // #391: only initial Fixer dispatch records mechanical engine provenance.
-    ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
+    buildInitialArgs: () =>
+      buildFixerActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.engine === undefined ? {} : { engine: env.engine }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    buildResumeArgs: () =>
+      buildFixerResumeActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) =>
+      dispatchAdmittedFixer({
+        admitted,
+        env: {
+          ...env,
+          ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+        },
+        io: attemptIo,
+        extraArgs,
+        lease,
+        methodMaterial,
+        ...(isFirst && env.engine !== undefined ? { effectiveEngine: env.engine } : {}),
+      }),
   });
 }
 
@@ -568,7 +567,7 @@ export async function runPublicFixerResume(
 
   let lease: RunWriterLease;
   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));
@@ -600,7 +599,7 @@ export async function runPublicFixerResume(
     ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
   });
 
-  return await dispatchAdmittedFixer({
+  const result = await dispatchAdmittedFixer({
     admitted,
     env: {
       ...env,
@@ -611,6 +610,8 @@ export async function runPublicFixerResume(
     lease,
     methodMaterial,
   });
+  if (result.terminal !== undefined) (result.terminal as { autoResumeCount?: number }).autoResumeCount = 0;
+  return result;
 }
 
 // Re-export for tests that assert typed credential failure channel shape.

package/src/public-cli/judge-run.ts

@@ -45,6 +45,7 @@ import {
   RunWriterLeaseHeldError,
   type RunWriterLease,
 } from "./run-lifecycle.ts";
+import { runWithAutoResumeLoop } from "./auto-resume.ts";
 import {
   classifyPostAdmissionFailure,
   exitCodeForTerminalOutcome,
@@ -459,35 +460,33 @@ export async function runPublicJudge(
 
   await markRunAdmitted(admitted);
 
-  let lease: RunWriterLease;
-  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 === undefined ? {} : { model: env.model }),
-    ...(env.engine === undefined ? {} : { engine: env.engine }),
-    ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
-  });
-
-  return await dispatchAdmittedJudge({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
-    },
     io,
-    extraArgs,
-    lease,
-    // #358: only initial Judge dispatch records mechanical engine provenance.
-    ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
+    buildInitialArgs: () =>
+      buildJudgeActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.engine === undefined ? {} : { engine: env.engine }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    buildResumeArgs: () =>
+      buildJudgeResumeActivationExtraArgs(admitted, {
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) =>
+      dispatchAdmittedJudge({
+        admitted,
+        env: {
+          ...env,
+          ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+        },
+        io: attemptIo,
+        extraArgs,
+        lease,
+        ...(isFirst && env.engine !== undefined ? { effectiveEngine: env.engine } : {}),
+      }),
   });
 }
 
@@ -537,7 +536,7 @@ export async function runPublicResume(
 
   let lease: RunWriterLease;
   try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
+    lease = await acquireRunWriterLease(admitted.runDirectory, (diagnostic) => io.stderr(diagnostic));
   } catch (error) {
     if (error instanceof RunWriterLeaseHeldError) {
       // Concurrent resume: reject without second writer or dispatch.
@@ -552,7 +551,7 @@ export async function runPublicResume(
     ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
   });
 
-  return await dispatchAdmittedJudge({
+  const result = await dispatchAdmittedJudge({
     admitted,
     env: {
       ...env,
@@ -562,4 +561,9 @@ export async function runPublicResume(
     extraArgs,
     lease,
   });
+  // Manual resume: distinct scope from per-call auto retry; just expose observation.
+  if (result.terminal !== undefined) {
+    (result.terminal as { autoResumeCount?: number }).autoResumeCount = 0;
+  }
+  return result;
 }

package/src/public-cli/merger-run.ts

@@ -55,6 +55,7 @@ import {
   type RunWriterLease,
   type TypedProviderHttpObservation,
 } from "./run-lifecycle.ts";
+import { runWithAutoResumeLoop } from "./auto-resume.ts";
 import {
   classifyPostAdmissionFailure,
   exitCodeForTerminalOutcome,
@@ -554,22 +555,10 @@ export async function runPublicMerger(
 
   await markRunAdmitted(admitted);
 
-  let lease: RunWriterLease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
-
   let methodMaterial: PackagedMethodSkillMaterial;
   try {
     methodMaterial = await loadMergerMethodMaterial(env.packageRoot);
   } catch (error) {
-    await lease.release();
     return await presentControlledFailure(
       admitted,
       {
@@ -583,24 +572,35 @@ export async function runPublicMerger(
     );
   }
 
-  const extraArgs = buildMergerActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...(env.model === undefined ? {} : { model: env.model }),
-    ...(env.engine === undefined ? {} : { engine: env.engine }),
-    ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
-  });
-
-  return await dispatchAdmittedMerger({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
-    },
     io,
-    extraArgs,
-    lease,
-    methodMaterial,
-    ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
+    buildInitialArgs: () =>
+      buildMergerActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.engine === undefined ? {} : { engine: env.engine }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    buildResumeArgs: () =>
+      buildMergerResumeActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) =>
+      dispatchAdmittedMerger({
+        admitted,
+        env: {
+          ...env,
+          ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+        },
+        io: attemptIo,
+        extraArgs,
+        lease,
+        methodMaterial,
+        ...(isFirst && env.engine !== undefined ? { effectiveEngine: env.engine } : {}),
+      }),
   });
 }
 
@@ -648,7 +648,7 @@ export async function runPublicMergerResume(
 
   let lease: RunWriterLease;
   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));
@@ -681,7 +681,7 @@ export async function runPublicMergerResume(
     ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
   });
 
-  return await dispatchAdmittedMerger({
+  const result = await dispatchAdmittedMerger({
     admitted,
     env: {
       ...env,
@@ -692,6 +692,8 @@ export async function runPublicMergerResume(
     lease,
     methodMaterial,
   });
+  if (result.terminal !== undefined) (result.terminal as { autoResumeCount?: number }).autoResumeCount = 0;
+  return result;
 }
 
 export type { ExplicitInternalKnownFailure, PackagedMethodSkillProvenance };

package/src/public-cli/reviewer-run.ts

@@ -53,6 +53,7 @@ import {
   type RunWriterLease,
   type TypedProviderHttpObservation,
 } from "./run-lifecycle.ts";
+import { runWithAutoResumeLoop } from "./auto-resume.ts";
 import {
   classifyPostAdmissionFailure,
   exitCodeForTerminalOutcome,
@@ -494,22 +495,10 @@ export async function runPublicReviewer(
 
   await markRunAdmitted(admitted);
 
-  let lease: RunWriterLease;
-  try {
-    lease = await acquireRunWriterLease(admitted.runDirectory);
-  } catch (error) {
-    if (error instanceof RunWriterLeaseHeldError) {
-      presentStructuralRejection(error, io);
-      return { exitCode: 2 };
-    }
-    throw error;
-  }
-
   let methodMaterial: PackagedMethodSkillMaterial;
   try {
     methodMaterial = await loadReviewerMethodMaterial(env.packageRoot);
   } catch (error) {
-    await lease.release();
     return await presentControlledFailure(
       admitted,
       {
@@ -522,25 +511,35 @@ export async function runPublicReviewer(
     );
   }
 
-  const extraArgs = buildReviewerActivationExtraArgs(admitted, {
-    packageRoot: env.packageRoot,
-    ...(env.model === undefined ? {} : { model: env.model }),
-    ...(env.engine === undefined ? {} : { engine: env.engine }),
-    ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
-  });
-
-  return await dispatchAdmittedReviewer({
+  return runWithAutoResumeLoop({
     admitted,
-    env: {
-      ...env,
-      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
-    },
     io,
-    extraArgs,
-    lease,
-    methodMaterial,
-    // #378: only initial Reviewer dispatch records mechanical engine provenance.
-    ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
+    buildInitialArgs: () =>
+      buildReviewerActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.engine === undefined ? {} : { engine: env.engine }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    buildResumeArgs: () =>
+      buildReviewerResumeActivationExtraArgs(admitted, {
+        packageRoot: env.packageRoot,
+        ...(env.model === undefined ? {} : { model: env.model }),
+        ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
+      }),
+    dispatch: (extraArgs, lease, isFirst, attemptIo) =>
+      dispatchAdmittedReviewer({
+        admitted,
+        env: {
+          ...env,
+          ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+        },
+        io: attemptIo,
+        extraArgs,
+        lease,
+        methodMaterial,
+        ...(isFirst && env.engine !== undefined ? { effectiveEngine: env.engine } : {}),
+      }),
   });
 }
 
@@ -588,7 +587,7 @@ export async function runPublicReviewerResume(
 
   let lease: RunWriterLease;
   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));
@@ -620,7 +619,7 @@ export async function runPublicReviewerResume(
     ...(env.extraPiArgs === undefined ? {} : { extraPiArgs: env.extraPiArgs }),
   });
 
-  return await dispatchAdmittedReviewer({
+  const result = await dispatchAdmittedReviewer({
     admitted,
     env: {
       ...env,
@@ -631,6 +630,8 @@ export async function runPublicReviewerResume(
     lease,
     methodMaterial,
   });
+  if (result.terminal !== undefined) (result.terminal as { autoResumeCount?: number }).autoResumeCount = 0;
+  return result;
 }
 
 export type { ExplicitInternalKnownFailure, PackagedMethodSkillProvenance };