@akagilnc/pi-workflow-roles 0.1.4259 → 0.1.4274

package/dist/public-cli/main.js

@@ -15177,9 +15177,6 @@ function seatModelOnly(seat) {
   if (seat?.provider === void 0 || seat.model === void 0) return void 0;
   return seat.thinking === void 0 ? { provider: seat.provider, model: seat.model } : { provider: seat.provider, model: seat.model, thinking: seat.thinking };
 }
-function publicStartupCandidates(seat) {
-  return STARTUP_CANDIDATES[seat];
-}
 function listHelpCapabilities() {
   const support = PUBLIC_CLI_SUPPORT_COMMANDS.map((name) => ({
     kind: "support",
@@ -15212,7 +15209,7 @@ function isPublicConfigurableSeat(value) {
 function isPublicCliSupportCommand(value) {
   return PUBLIC_CLI_SUPPORT_COMMANDS.includes(value);
 }
-var INTERNAL_ROLE_ENTRYPOINT_RELATIVE, PUBLIC_CALLABLE_ROLES, PUBLIC_CONFIGURABLE_SEATS, PUBLIC_CLI_SUPPORT_COMMANDS, STARTUP_CANDIDATES, PUBLIC_DETERMINISTIC_COMMANDS;
+var INTERNAL_ROLE_ENTRYPOINT_RELATIVE, PUBLIC_CALLABLE_ROLES, PUBLIC_CONFIGURABLE_SEATS, PUBLIC_CLI_SUPPORT_COMMANDS, PUBLIC_DETERMINISTIC_COMMANDS;
 var init_registry2 = __esm({
   "src/public-cli/registry.ts"() {
     "use strict";
@@ -15231,59 +15228,6 @@ var init_registry2 = __esm({
       "resume",
       "new"
     ];
-    STARTUP_CANDIDATES = {
-      judge: [
-        { provider: "openai-codex", model: "gpt-5.6-sol", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      countersign: [
-        { provider: "openai-codex", model: "gpt-5.6-sol", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      "gleaner-left": [
-        { provider: "openai-codex", model: "gpt-5.6-sol", thinking: "medium" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      reviewer: [
-        { provider: "openai-codex", model: "gpt-5.6-sol", thinking: "medium" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      coder: [
-        { provider: "openai-codex", model: "gpt-5.6-luna", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      fixer: [
-        { provider: "openai-codex", model: "gpt-5.6-luna", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      collector: [
-        { provider: "openai-codex", model: "gpt-5.6-luna", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      doctor: [
-        { provider: "openai-codex", model: "gpt-5.6-luna", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      merger: [
-        { provider: "openai-codex", model: "gpt-5.6-luna", thinking: "high" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      // #620: subordinate officers inherit gatekeeper; no package startup model.
-      notary: [],
-      // #453/#620/#639: gatekeeper callable but no package startup model — caller
-      // configures it or inherits on the province path.
-      gatekeeper: [],
-      inspector: [],
-      navigator: [
-        { provider: "openai-codex", model: "gpt-5.6-luna", thinking: "medium" },
-        { provider: "xai", model: "grok-4.5", thinking: "high" }
-      ],
-      // #675: auditor public seat — no package startup; caller configures.
-      auditor: [],
-      // #708 `diarist-seat-default`: owner-set initial value; changed in the seat
-      // table like any other seat. No engine axis, package-default host.
-      diarist: [{ provider: "xai", model: "grok-4.5", thinking: "medium" }]
-    };
     PUBLIC_DETERMINISTIC_COMMANDS = ["analyst"];
   }
 });
@@ -15439,11 +15383,13 @@ __export(config_exports, {
   loadCredentialProviders: () => loadCredentialProviders,
   loadPublicCliConfig: () => loadPublicCliConfig,
   missingPublicProviderCredential: () => missingPublicProviderCredential,
+  missingResolvedSeatModelMessage: () => missingResolvedSeatModelMessage,
   parseAutoResumeLimit: () => parseAutoResumeLimit,
   parseModelSpec: () => parseModelSpec,
   providerConfigured: () => providerConfigured,
   publicCliConfigPath: () => publicCliConfigPath,
   resolveEffectiveSeat: () => resolveEffectiveSeat,
+  resolvedSeatWithModel: () => resolvedSeatWithModel,
   savePublicCliConfig: () => savePublicCliConfig,
   setAutoResumeLimit: () => setAutoResumeLimit,
   setPersistentSeatConfig: () => setPersistentSeatConfig,
@@ -15794,13 +15740,16 @@ function missingPublicProviderCredential(provider, credentials) {
   if (provider !== "openai-codex" && provider !== "xai") return false;
   return !providerConfigured(credentials, provider);
 }
-function pickStartupCandidate(seat, credentials) {
-  for (const candidate of publicStartupCandidates(seat)) {
-    if (providerConfigured(credentials, candidate.provider)) {
-      return { ...candidate };
-    }
+function resolvedSeatWithModel(seat) {
+  if (seat.selection === void 0) return void 0;
+  return seat;
+}
+function missingResolvedSeatModelMessage(seat, remediation = "config") {
+  const configSet = `ak-role config set ${seat} <provider/model[:thinking]>`;
+  if (remediation === "invocation-or-config") {
+    return `seat ${seat} has no model configured; set with --model <provider/model[:thinking]> or ${configSet}`;
   }
-  return void 0;
+  return `seat ${seat} has no model configured; set with ${configSet}`;
 }
 function attachHostAxis(seat, config, invocation) {
   if (invocation?.host !== void 0) return { ...seat, host: invocation.host, hostSource: "invocation" };
@@ -15843,7 +15792,7 @@ function attachEngineAxis(seat, config, invocation) {
     engineSource: "unconfigured"
   };
 }
-function resolveBaseSeat(config, seat, credentials) {
+function resolveBaseSeat(config, seat) {
   if (seat === "notary" || seat === "inspector") {
     const resolved = resolveConfiguredProvinceOfficer(config, seat);
     return {
@@ -15862,22 +15811,14 @@ function resolveBaseSeat(config, seat, credentials) {
       engineSource: "unconfigured"
     };
   }
-  const startup = pickStartupCandidate(seat, credentials);
-  if (startup !== void 0) {
-    return {
-      seat,
-      source: "startup",
-      selection: startup,
-      engineSource: "unconfigured"
-    };
-  }
   return { seat, source: "unconfigured", engineSource: "unconfigured" };
 }
 function resolveEffectiveSeat(config, seat, credentials, invocation) {
   const hasModelInvocation = invocation !== void 0 && (invocation.model !== void 0 || invocation.thinking !== void 0);
+  void credentials;
   let modelSeat;
   if (!hasModelInvocation || invocation === void 0) {
-    modelSeat = resolveBaseSeat(config, seat, credentials);
+    modelSeat = resolveBaseSeat(config, seat);
   } else if (invocation.model !== void 0) {
     const spec = invocation.model.includes(":") || invocation.thinking === void 0 ? invocation.model : `${invocation.model}:${invocation.thinking}`;
     modelSeat = {
@@ -15887,7 +15828,7 @@ function resolveEffectiveSeat(config, seat, credentials, invocation) {
       engineSource: "unconfigured"
     };
   } else {
-    const base = resolveBaseSeat(config, seat, credentials);
+    const base = resolveBaseSeat(config, seat);
     if (base.selection === void 0 || invocation.thinking === void 0) {
       modelSeat = {
         seat,
@@ -16131,6 +16072,10 @@ var init_host_providers = __esm({
 });
 
 // src/public-cli/cli-errors.ts
+var cli_errors_exports = {};
+__export(cli_errors_exports, {
+  CliUsageError: () => CliUsageError
+});
 var CliUsageError;
 var init_cli_errors = __esm({
   "src/public-cli/cli-errors.ts"() {
@@ -24923,6 +24868,86 @@ var init_terminal = __esm({
 });
 
 // src/public-cli/settlement.ts
+var settlement_exports = {};
+__export(settlement_exports, {
+  ATTEMPT_HISTORY_ENTRY_TYPE: () => ATTEMPT_HISTORY_ENTRY_TYPE,
+  NAVIGATOR_POST_ROLE_GRACE_MS: () => NAVIGATOR_POST_ROLE_GRACE_MS,
+  appendRunAttemptHistory: () => appendRunAttemptHistory,
+  attachRecordedSubmissions: () => attachRecordedSubmissions,
+  attemptProducedFreshSubmission: () => attemptProducedFreshSubmission,
+  classifyPostAdmissionFailure: () => classifyPostAdmissionFailure,
+  conciseChildDiagnostic: () => conciseChildDiagnostic,
+  controlledFailureInputFromResolution: () => controlledFailureInputFromResolution,
+  exitCodeForTerminalOutcome: () => exitCodeForTerminalOutcome,
+  explicitInternalKnownFailureClassificationInput: () => explicitInternalKnownFailureClassificationInput,
+  extractCollectorInfrastructureFailure: () => extractCollectorInfrastructureFailure,
+  extractEngineDetourInfrastructureFailure: () => extractEngineDetourInfrastructureFailure,
+  extractFixerMethodInvocations: () => extractFixerMethodInvocations,
+  extractGateFactFromSessionDirectory: () => extractGateFactFromSessionDirectory,
+  extractMergerMethodInvocations: () => extractMergerMethodInvocations,
+  extractNavigatorFact: () => extractNavigatorFact,
+  extractReviewerMethodInvocations: () => extractReviewerMethodInvocations,
+  extractSessionProviderStop: () => extractSessionProviderStop,
+  formatCliDiagnostic: () => formatCliDiagnostic,
+  formatErrorCauseDetail: () => formatErrorCauseDetail,
+  formatFailureStderrDiagnostic: () => formatFailureStderrDiagnostic,
+  formatTerminalResult: () => formatTerminalResult,
+  inspectJudgeSession: () => inspectJudgeSession,
+  isLawfulTypedTerminalOutcome: () => isLawfulTypedTerminalOutcome,
+  presentControlledFailure: () => presentControlledFailure,
+  presentFailureTerminal: () => presentFailureTerminal,
+  presentStructuralRejection: () => presentStructuralRejection,
+  projectTerminalGateFact: () => projectTerminalGateFact,
+  projectThrownFailureLeaf: () => projectThrownFailureLeaf,
+  publishCoderArtifacts: () => publishCoderArtifacts,
+  publishCollectorArtifacts: () => publishCollectorArtifacts,
+  publishDoctorArtifacts: () => publishDoctorArtifacts,
+  publishFailureArtifacts: () => publishFailureArtifacts,
+  publishFixerArtifacts: () => publishFixerArtifacts,
+  publishJudgeArtifacts: () => publishJudgeArtifacts,
+  publishMergerArtifacts: () => publishMergerArtifacts,
+  publishReviewerArtifacts: () => publishReviewerArtifacts,
+  raceNavigatorGrace: () => raceNavigatorGrace,
+  readBoundAuditorKnownFailure: () => readBoundAuditorKnownFailure,
+  readBoundEvidenceChildKnownFailure: () => readBoundEvidenceChildKnownFailure,
+  readCollectorInfrastructureFailure: () => readCollectorInfrastructureFailure,
+  readEngineDetourInfrastructureFailure: () => readEngineDetourInfrastructureFailure,
+  readLawfulJudgeRoleOutcome: () => readLawfulJudgeRoleOutcome,
+  readSessionProviderStop: () => readSessionProviderStop,
+  recordedSubmissionPayloads: () => recordedSubmissionPayloads,
+  resolveAuditedRunnerFailureResolution: () => resolveAuditedRunnerFailureResolution,
+  resolveAuditedRunnerKnownFailure: () => resolveAuditedRunnerKnownFailure,
+  resolveControlledFailureResumeObservation: () => resolveControlledFailureResumeObservation,
+  settleCoderTerminalResult: () => settleCoderTerminalResult,
+  settleCollectorTerminalResult: () => settleCollectorTerminalResult,
+  settleCountersignTerminalResult: () => settleCountersignTerminalResult,
+  settleDoctorTerminalResult: () => settleDoctorTerminalResult,
+  settleFailureTerminalResult: () => settleFailureTerminalResult,
+  settleFixerTerminalResult: () => settleFixerTerminalResult,
+  settleGleanerLeftTerminalResult: () => settleGleanerLeftTerminalResult,
+  settleHostEndedNoReceipt: () => settleHostEndedNoReceipt,
+  settleJudgeFailureTerminalResult: () => settleJudgeFailureTerminalResult,
+  settleJudgeTerminalResult: () => settleJudgeTerminalResult,
+  settleMergerTerminalResult: () => settleMergerTerminalResult,
+  settleNotaryTerminalResult: () => settleNotaryTerminalResult,
+  settleReviewerTerminalResult: () => settleReviewerTerminalResult,
+  trySettleAuditorTerminalResult: () => trySettleAuditorTerminalResult,
+  trySettleCoderTerminalResult: () => trySettleCoderTerminalResult,
+  trySettleCollectorTerminalResult: () => trySettleCollectorTerminalResult,
+  trySettleCountersignTerminalResult: () => trySettleCountersignTerminalResult,
+  trySettleDiaristTerminalResult: () => trySettleDiaristTerminalResult,
+  trySettleDoctorTerminalResult: () => trySettleDoctorTerminalResult,
+  trySettleFixerTerminalResult: () => trySettleFixerTerminalResult,
+  trySettleGatekeeperTerminalResult: () => trySettleGatekeeperTerminalResult,
+  trySettleGleanerLeftTerminalResult: () => trySettleGleanerLeftTerminalResult,
+  trySettleInspectorTerminalResult: () => trySettleInspectorTerminalResult,
+  trySettleJudgeTerminalResult: () => trySettleJudgeTerminalResult,
+  trySettleMergerTerminalResult: () => trySettleMergerTerminalResult,
+  trySettleNavigatorTerminalResult: () => trySettleNavigatorTerminalResult,
+  trySettleNotaryTerminalResult: () => trySettleNotaryTerminalResult,
+  trySettleReviewerTerminalResult: () => trySettleReviewerTerminalResult,
+  withSubmissions: () => withSubmissions
+});
 import { randomUUID as randomUUID5 } from "node:crypto";
 import { appendFile as appendFile2, readFile as readFile17, readdir as readdir7, writeFile as writeFile7 } from "node:fs/promises";
 import { dirname as dirname14, join as join26 } from "node:path";
@@ -25549,6 +25574,11 @@ function providerStopFallbackFromAuditorVolumes(volumes) {
   }
   return void 0;
 }
+async function readBoundAuditorKnownFailure(sessionFile) {
+  const volumes = await loadBoundAuditorVolumes(sessionFile);
+  if (volumes === void 0) return void 0;
+  return complianceFailureFromAuditorVolumes(volumes) ?? providerStopFallbackFromAuditorVolumes(volumes);
+}
 async function readBoundAuditorComplianceFailure(sessionFile) {
   const volumes = await loadBoundAuditorVolumes(sessionFile);
   if (volumes === void 0) return void 0;
@@ -25702,6 +25732,9 @@ async function resolveAuditedRunnerFailureResolution(input) {
     typedHttp
   );
 }
+async function resolveAuditedRunnerKnownFailure(input) {
+  return (await resolveAuditedRunnerFailureResolution(input)).knownFailure;
+}
 async function resolveControlledFailureResumeObservation(input) {
   if (input.typedHttpObservationSettled === true) {
     const observation = input.typedHttpObservation;
@@ -25805,6 +25838,12 @@ async function readInfrastructureToolFailure(sessionFile, spec, options = {}) {
     return void 0;
   }
 }
+function extractCollectorInfrastructureFailure(entries) {
+  return extractInfrastructureToolFailure(
+    entries,
+    COLLECTOR_INFRASTRUCTURE_FAILURE_SPEC
+  );
+}
 async function readCollectorInfrastructureFailure(sessionFile) {
   return readInfrastructureToolFailure(
     sessionFile,
@@ -25814,6 +25853,12 @@ async function readCollectorInfrastructureFailure(sessionFile) {
     { currentAttemptOnly: true }
   );
 }
+function extractEngineDetourInfrastructureFailure(entries) {
+  return extractInfrastructureToolFailure(
+    entries,
+    ENGINE_DETOUR_INFRASTRUCTURE_FAILURE_SPEC
+  );
+}
 async function readEngineDetourInfrastructureFailure(sessionFile) {
   return readInfrastructureToolFailure(
     sessionFile,
@@ -26229,6 +26274,15 @@ async function settleLawfulJudgeTerminalResult(admitted, authority, scope) {
     detourGateContext(admitted, scope)
   );
 }
+async function settleJudgeTerminalResult(admitted, authority, scope) {
+  const settled = await settleLawfulJudgeTerminalResult(admitted, authority, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Judge Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleJudgeTerminalResult(admitted, authority, scope) {
   return settleLawfulJudgeTerminalResult(admitted, authority, scope);
 }
@@ -26258,6 +26312,15 @@ async function settleLawfulCoderTerminalResult(admitted, authority, options = {}
     detourGateContext(admitted, scope)
   );
 }
+async function settleCoderTerminalResult(admitted, authority, options = {}, scope) {
+  const settled = await settleLawfulCoderTerminalResult(admitted, authority, options, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Coder Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 function sessionMessageText(message) {
   if (message === void 0) return "";
   if (typeof message.content === "string") return message.content;
@@ -26375,6 +26438,15 @@ async function settleLawfulFixerTerminalResult(admitted, authority, options, sco
     detourGateContext(admitted, scope)
   );
 }
+async function settleFixerTerminalResult(admitted, authority, options, scope) {
+  const settled = await settleLawfulFixerTerminalResult(admitted, authority, options, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Fixer Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function publishCollectorArtifacts(admitted, roleOutcome, coordinates) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
@@ -26474,6 +26546,15 @@ async function settleLawfulCollectorTerminalResult(admitted, authority, scope) {
     scope
   );
 }
+async function settleCollectorTerminalResult(admitted, authority, scope) {
+  const settled = await settleLawfulCollectorTerminalResult(admitted, authority, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Collector Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleCollectorTerminalResult(admitted, authority, scope) {
   return settleLawfulCollectorTerminalResult(admitted, authority, scope);
 }
@@ -26593,6 +26674,15 @@ async function settleLawfulDoctorTerminalResult(admitted, authority, scope) {
     detourGateContext(admitted, scope)
   );
 }
+async function settleDoctorTerminalResult(admitted, authority, scope) {
+  const settled = await settleLawfulDoctorTerminalResult(admitted, authority, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Doctor Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleDoctorTerminalResult(admitted, authority, scope) {
   return settleLawfulDoctorTerminalResult(admitted, authority, scope);
 }
@@ -26676,6 +26766,15 @@ async function settleLawfulNotaryTerminalResult(admitted, authority, scope) {
     toolName: NOTARY_OUTPUT_TOOL_NAME
   }, scope);
 }
+async function settleNotaryTerminalResult(admitted, authority, scope) {
+  const settled = await settleLawfulNotaryTerminalResult(admitted, authority, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Notary Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleNotaryTerminalResult(admitted, authority, scope) {
   return settleLawfulNotaryTerminalResult(admitted, authority, scope);
 }
@@ -26685,6 +26784,15 @@ async function settleLawfulCountersignTerminalResult(admitted, authority, scope)
     toolName: COUNTERSIGN_OUTPUT_TOOL_NAME
   }, scope);
 }
+async function settleCountersignTerminalResult(admitted, authority, scope) {
+  const settled = await settleLawfulCountersignTerminalResult(admitted, authority, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Countersign Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleCountersignTerminalResult(admitted, authority, scope) {
   return settleLawfulCountersignTerminalResult(admitted, authority, scope);
 }
@@ -26694,6 +26802,15 @@ async function settleLawfulGleanerLeftTerminalResult(admitted, authority, scope)
     toolName: GLEANER_LEFT_OUTPUT_TOOL_NAME
   }, scope);
 }
+async function settleGleanerLeftTerminalResult(admitted, authority, scope) {
+  const settled = await settleLawfulGleanerLeftTerminalResult(admitted, authority, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Gleaner-Left Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleGleanerLeftTerminalResult(admitted, authority, scope) {
   return settleLawfulGleanerLeftTerminalResult(admitted, authority, scope);
 }
@@ -26851,6 +26968,15 @@ async function settleLawfulReviewerTerminalResult(admitted, authority, options,
     detourGateContext(admitted, scope)
   );
 }
+async function settleReviewerTerminalResult(admitted, authority, options, scope) {
+  const settled = await settleLawfulReviewerTerminalResult(admitted, authority, options, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Reviewer Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleReviewerTerminalResult(admitted, authority, options, scope) {
   return settleLawfulReviewerTerminalResult(admitted, authority, options, scope);
 }
@@ -26977,6 +27103,15 @@ async function settleLawfulMergerTerminalResult(admitted, authority, options, sc
     scope
   );
 }
+async function settleMergerTerminalResult(admitted, authority, options, scope) {
+  const settled = await settleLawfulMergerTerminalResult(admitted, authority, options, scope);
+  if (settled === void 0) {
+    throw new Error(
+      "Merger Role run completed without a lawful typed terminal result"
+    );
+  }
+  return settled;
+}
 async function trySettleMergerTerminalResult(admitted, authority, options, scope) {
   return settleLawfulMergerTerminalResult(admitted, authority, options, scope);
 }
@@ -27228,6 +27363,9 @@ async function settleFailureTerminalResult(admitted, failure, authority, options
     detourGateContext(admitted, options)
   );
 }
+async function settleJudgeFailureTerminalResult(admitted, failure, authority, options = {}) {
+  return settleFailureTerminalResult(admitted, failure, authority, options);
+}
 function presentFailureTerminal(terminal, io) {
   if (terminal.roleOutcome.kind !== "failure" && terminal.roleOutcome.kind !== "no_receipt") {
     throw new TypeError("presentFailureTerminal requires a failure or no-receipt role outcome");
@@ -27248,7 +27386,41 @@ function presentFailureTerminal(terminal, io) {
     }));
   }
 }
-var COLLECTOR_INFRASTRUCTURE_TOOLS, COLLECTOR_INFRASTRUCTURE_FAILURE_SPEC, ENGINE_DETOUR_INFRASTRUCTURE_FAILURE_SPEC, ATTEMPT_HISTORY_ENTRY_TYPE;
+function defaultNavigatorGraceSleep() {
+  let timer;
+  const sleep2 = ((ms) => new Promise((resolve10) => {
+    timer = setTimeout(() => {
+      timer = void 0;
+      resolve10();
+    }, ms);
+  }));
+  sleep2.cancel = () => {
+    if (timer !== void 0) {
+      clearTimeout(timer);
+      timer = void 0;
+    }
+  };
+  return sleep2;
+}
+function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep2 = defaultNavigatorGraceSleep()) {
+  return new Promise((resolve10, reject) => {
+    let settled = false;
+    const finish = (action) => {
+      if (settled) return;
+      settled = true;
+      sleep2.cancel?.();
+      action();
+    };
+    void work.then(
+      (value) => finish(() => resolve10({ status: "done", value })),
+      (error) => finish(() => reject(error))
+    );
+    void sleep2(graceMs).then(() => {
+      finish(() => resolve10({ status: "timeout" }));
+    });
+  });
+}
+var NAVIGATOR_POST_ROLE_GRACE_MS, 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";
@@ -27287,6 +27459,7 @@ var init_settlement = __esm({
     init_role_run_placement();
     init_invocation();
     init_terminal();
+    NAVIGATOR_POST_ROLE_GRACE_MS = 1e4;
     COLLECTOR_INFRASTRUCTURE_TOOLS = /* @__PURE__ */ new Set([
       COLLECTOR_OBSERVE_TOOL,
       COLLECTOR_READ_TOOL,
@@ -30276,11 +30449,17 @@ function hostSelectionFailureFromUnknown(error) {
   const failure = error.failure;
   return failure;
 }
-async function createSummonEnv(options) {
-  const [{ piDurablePrincipalAuthority: piDurablePrincipalAuthority2 }, { appendPiSessionCustomEntry: appendPiSessionCustomEntry2 }, { resolveRoleTurnHost: resolveRoleTurnHost2 }] = await Promise.all([
+async function createSummonEnv(options, afterHost) {
+  const [
+    { piDurablePrincipalAuthority: piDurablePrincipalAuthority2 },
+    { appendPiSessionCustomEntry: appendPiSessionCustomEntry2 },
+    { resolveRoleTurnHost: resolveRoleTurnHost2 },
+    { missingResolvedSeatModelMessage: missingResolvedSeatModelMessage2, resolvedSeatWithModel: resolvedSeatWithModel2 }
+  ] = await Promise.all([
     Promise.resolve().then(() => (init_durable_principal(), durable_principal_exports)),
     Promise.resolve().then(() => (init_role_turn_host(), role_turn_host_exports)),
-    Promise.resolve().then(() => (init_role_turn_host_resolution(), role_turn_host_resolution_exports))
+    Promise.resolve().then(() => (init_role_turn_host_resolution(), role_turn_host_resolution_exports)),
+    Promise.resolve().then(() => (init_config2(), config_exports))
   ]);
   const principalAuthority = piDurablePrincipalAuthority2;
   const roleTurnHost = resolveRoleTurnHost2(
@@ -30292,26 +30471,37 @@ async function createSummonEnv(options) {
     },
     { role: options.role, seat: options.seat, principalAuthority }
   );
-  const hostName = options.seat.host ?? "pi";
+  afterHost?.();
+  const seatWithModel = resolvedSeatWithModel2(options.seat);
+  if (seatWithModel === void 0) {
+    return {
+      ok: false,
+      missingModelMessage: missingResolvedSeatModelMessage2(options.role)
+    };
+  }
+  const hostName = seatWithModel.host ?? "pi";
   const { loadHostProvidersTable: loadHostProvidersTable2, projectHostFacingProvider: projectHostFacingProvider2 } = await Promise.resolve().then(() => (init_host_providers(), host_providers_exports));
-  const hostFacingSelection = options.seat.selection === void 0 ? void 0 : projectHostFacingProvider2(
-    options.seat.selection,
+  const hostFacingSelection = projectHostFacingProvider2(
+    seatWithModel.selection,
     hostName,
     loadHostProvidersTable2(options.home),
     options.home
   );
   return {
-    home: options.home,
-    principalAuthority,
-    agentDir: options.agentDir,
-    sessionAppender: appendPiSessionCustomEntry2,
-    packageRoot: options.packageRoot,
-    roleTurnHost,
-    cwd: options.cwd,
-    credentials: options.credentials,
-    ...hostFacingSelection === void 0 ? {} : { model: hostFacingSelection },
-    ...projectSeatEngine(options.seat),
-    ...projectSeatHost(options.seat)
+    ok: true,
+    env: {
+      home: options.home,
+      principalAuthority,
+      agentDir: options.agentDir,
+      sessionAppender: appendPiSessionCustomEntry2,
+      packageRoot: options.packageRoot,
+      roleTurnHost,
+      cwd: options.cwd,
+      credentials: options.credentials,
+      ...hostFacingSelection === void 0 ? {} : { model: hostFacingSelection },
+      ...projectSeatEngine(seatWithModel),
+      ...projectSeatHost(seatWithModel)
+    }
   };
 }
 async function summonPublicRole(options) {
@@ -30326,46 +30516,72 @@ async function summonPublicRole(options) {
   const credentials = options.credentials ?? await loadCredentialProviders2(agentDir);
   const config = await loadPublicCliConfig2(home);
   const seat = resolveEffectiveSeat2(config, options.role, credentials);
-  let summonEnv;
-  try {
-    summonEnv = await createSummonEnv({
-      role: options.role,
-      home,
-      agentDir,
-      cwd: options.cwd,
-      packageRoot: packageRoot2,
-      credentials,
-      seat,
-      ...options.extraPiArgs === void 0 ? {} : { extraPiArgs: options.extraPiArgs },
-      ...options.roleTurnHost === void 0 ? {} : { roleTurnHost: options.roleTurnHost },
-      ...options.hostAdapters === void 0 ? {} : { hostAdapters: options.hostAdapters }
-    });
-  } catch (error) {
-    const failure = hostSelectionFailureFromUnknown(error);
-    if (failure !== void 0) {
-      const { formatHostSelectionFailure: formatHostSelectionFailure2 } = await Promise.resolve().then(() => (init_role_turn_host_resolution(), role_turn_host_resolution_exports));
-      return { exitCode: 1, stderr: formatHostSelectionFailure2(failure) };
-    }
-    throw error;
-  }
-  const env = {
-    ...summonEnv,
-    // Station child role run (#840): omit automatic navigator attendance.
-    stationChild: true,
-    // Host config passthrough only — same face as public CLI (#422 / #675).
-    ...config.autoResumeLimit === void 0 ? {} : { autoResumeLimit: config.autoResumeLimit },
-    // Parent cancellation reaches the nested activation's own turn dispatch.
-    ...options.signal === void 0 ? {} : { signal: options.signal },
-    // #753: reask rides the existing notary same-ticket resume summons.instruction.
-    ...options.reviewReask === void 0 ? {} : { reviewReask: options.reviewReask },
-    // #879: verbatim submission body on officer dialogue content channel.
-    ...options.gateReviewInstruction === void 0 ? {} : { gateReviewInstruction: options.gateReviewInstruction },
-    ...options.boundTicketNumber === void 0 ? {} : { boundTicketNumber: options.boundTicketNumber },
-    // createRunId is the only remaining env overlay — host is seat-selected above.
-    ...options.createRunId === void 0 ? {} : { createRunId: options.createRunId }
-  };
   const captured = options.io === void 0 ? createCapturingIo() : void 0;
   const io = options.io ?? captured.io;
+  const summonEnvInput = {
+    role: options.role,
+    home,
+    agentDir,
+    cwd: options.cwd,
+    packageRoot: packageRoot2,
+    credentials,
+    seat,
+    ...options.extraPiArgs === void 0 ? {} : { extraPiArgs: options.extraPiArgs },
+    ...options.roleTurnHost === void 0 ? {} : { roleTurnHost: options.roleTurnHost },
+    ...options.hostAdapters === void 0 ? {} : { hostAdapters: options.hostAdapters }
+  };
+  async function prepareSummonEnv(afterHost) {
+    try {
+      const built = await createSummonEnv(summonEnvInput, afterHost);
+      if (!built.ok) {
+        return { ok: false, exitCode: 1, stderr: built.missingModelMessage };
+      }
+      return {
+        ok: true,
+        env: {
+          ...built.env,
+          stationChild: true,
+          ...config.autoResumeLimit === void 0 ? {} : { autoResumeLimit: config.autoResumeLimit },
+          ...options.signal === void 0 ? {} : { signal: options.signal },
+          ...options.reviewReask === void 0 ? {} : { reviewReask: options.reviewReask },
+          ...options.gateReviewInstruction === void 0 ? {} : { gateReviewInstruction: options.gateReviewInstruction },
+          ...options.boundTicketNumber === void 0 ? {} : { boundTicketNumber: options.boundTicketNumber },
+          ...options.createRunId === void 0 ? {} : { createRunId: options.createRunId }
+        }
+      };
+    } catch (error) {
+      const failure = hostSelectionFailureFromUnknown(error);
+      if (failure !== void 0) {
+        const { formatHostSelectionFailure: formatHostSelectionFailure2 } = await Promise.resolve().then(() => (init_role_turn_host_resolution(), role_turn_host_resolution_exports));
+        return { ok: false, exitCode: 1, stderr: formatHostSelectionFailure2(failure) };
+      }
+      const { CliUsageError: CliUsageError2 } = await Promise.resolve().then(() => (init_cli_errors(), cli_errors_exports));
+      if (error instanceof CliUsageError2) {
+        const { presentStructuralRejection: presentStructuralRejection2 } = await Promise.resolve().then(() => (init_settlement(), settlement_exports));
+        presentStructuralRejection2(error, io);
+        return { ok: false, exitCode: 2 };
+      }
+      throw error;
+    }
+  }
+  function projectPrepareFailure(prepared) {
+    const parts = [prepared.stderr, captured?.stderrText()].filter(
+      (s) => typeof s === "string" && s !== ""
+    );
+    const stderr2 = parts.length === 0 ? void 0 : parts.join("");
+    return {
+      exitCode: prepared.exitCode,
+      ...stderr2 === void 0 ? {} : { stderr: stderr2 }
+    };
+  }
+  async function runPrepared(parse, run) {
+    let parsedArgv;
+    const prepared = await prepareSummonEnv(() => {
+      parsedArgv = parse(options.argv);
+    });
+    if (!prepared.ok) return { fail: projectPrepareFailure(prepared) };
+    return { ok: await run(prepared.env, () => parsedArgv) };
+  }
   let result2;
   switch (options.role) {
     case "notary": {
@@ -30373,7 +30589,9 @@ async function summonPublicRole(options) {
         Promise.resolve().then(() => (init_notary_run(), notary_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
-      result2 = await runPublicNotary2(options.argv, env, io, parseNotaryArgv2);
+      const stepped = await runPrepared(parseNotaryArgv2, (env, once) => runPublicNotary2(options.argv, env, io, once));
+      if ("fail" in stepped) return stepped.fail;
+      result2 = stepped.ok;
       break;
     }
     case "inspector": {
@@ -30381,49 +30599,23 @@ async function summonPublicRole(options) {
         Promise.resolve().then(() => (init_inspector_run(), inspector_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
-      result2 = await runPublicInspector2(options.argv, env, io, parseInspectorArgv2);
-      break;
-    }
-    case "auditor": {
-      const [{ runPublicInstructionSeat: runPublicInstructionSeat2 }, { parseAuditorArgv: parseAuditorArgv2 }] = await Promise.all([
-        Promise.resolve().then(() => (init_instruction_seat_run(), instruction_seat_run_exports)),
-        Promise.resolve().then(() => (init_invocation(), invocation_exports))
-      ]);
-      result2 = await runPublicInstructionSeat2(
-        options.argv,
-        env,
-        io,
-        "auditor",
-        parseAuditorArgv2
-      );
-      break;
-    }
-    case "navigator": {
-      const [{ runPublicInstructionSeat: runPublicInstructionSeat2 }, { parseNavigatorArgv: parseNavigatorArgv2 }] = await Promise.all([
-        Promise.resolve().then(() => (init_instruction_seat_run(), instruction_seat_run_exports)),
-        Promise.resolve().then(() => (init_invocation(), invocation_exports))
-      ]);
-      result2 = await runPublicInstructionSeat2(
-        options.argv,
-        env,
-        io,
-        "navigator",
-        parseNavigatorArgv2
-      );
+      const stepped = await runPrepared(parseInspectorArgv2, (env, once) => runPublicInspector2(options.argv, env, io, once));
+      if ("fail" in stepped) return stepped.fail;
+      result2 = stepped.ok;
       break;
     }
+    case "auditor":
+    case "navigator":
     case "gatekeeper": {
-      const [{ runPublicInstructionSeat: runPublicInstructionSeat2 }, { parseGatekeeperArgv: parseGatekeeperArgv2 }] = await Promise.all([
+      const seat2 = options.role;
+      const [{ runPublicInstructionSeat: runPublicInstructionSeat2 }, invocation] = await Promise.all([
         Promise.resolve().then(() => (init_instruction_seat_run(), instruction_seat_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
-      result2 = await runPublicInstructionSeat2(
-        options.argv,
-        env,
-        io,
-        "gatekeeper",
-        parseGatekeeperArgv2
-      );
+      const parse = seat2 === "auditor" ? invocation.parseAuditorArgv : seat2 === "navigator" ? invocation.parseNavigatorArgv : invocation.parseGatekeeperArgv;
+      const stepped = await runPrepared(parse, (env, once) => runPublicInstructionSeat2(options.argv, env, io, seat2, once));
+      if ("fail" in stepped) return stepped.fail;
+      result2 = stepped.ok;
       break;
     }
     case "judge": {
@@ -30431,7 +30623,9 @@ async function summonPublicRole(options) {
         Promise.resolve().then(() => (init_judge_run(), judge_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
-      result2 = await runPublicJudge2(options.argv, env, io, parseJudgeArgv2);
+      const stepped = await runPrepared(parseJudgeArgv2, (env, once) => runPublicJudge2(options.argv, env, io, once));
+      if ("fail" in stepped) return stepped.fail;
+      result2 = stepped.ok;
       break;
     }
     case "doctor": {
@@ -30439,7 +30633,9 @@ async function summonPublicRole(options) {
         Promise.resolve().then(() => (init_doctor_run(), doctor_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
-      result2 = await runPublicDoctor2(options.argv, env, io, parseDoctorArgv2);
+      const stepped = await runPrepared(parseDoctorArgv2, (env, once) => runPublicDoctor2(options.argv, env, io, once));
+      if ("fail" in stepped) return stepped.fail;
+      result2 = stepped.ok;
       break;
     }
     case "diarist": {
@@ -30447,7 +30643,9 @@ async function summonPublicRole(options) {
         Promise.resolve().then(() => (init_diarist_run(), diarist_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
-      result2 = await runPublicDiarist2(options.argv, env, io, parseDiaristArgv2);
+      const stepped = await runPrepared(parseDiaristArgv2, (env, once) => runPublicDiarist2(options.argv, env, io, once));
+      if ("fail" in stepped) return stepped.fail;
+      result2 = stepped.ok;
       break;
     }
   }
@@ -33657,7 +33855,7 @@ function takePublicGlobalFlag(argv, index, options) {
   }
   return void 0;
 }
-function createRoleEnvironment(env, options) {
+function createRoleEnvironment(env, options, afterHost) {
   const role = options.role;
   const extraPiArgs = role === "coder" ? env.coderExtraPiArgs : role === "fixer" ? env.fixerExtraPiArgs : role === "reviewer" ? env.reviewerExtraPiArgs : role === "merger" ? env.mergerExtraPiArgs : role === "judge" ? env.judgeExtraPiArgs : role === "collector" ? env.collectorExtraPiArgs : role === "doctor" ? env.doctorExtraPiArgs : role === "notary" ? env.notaryExtraPiArgs : void 0;
   const timeoutMs = role === "coder" ? env.coderTimeoutMs : role === "fixer" ? env.fixerTimeoutMs : role === "reviewer" ? env.reviewerTimeoutMs : role === "merger" ? env.mergerTimeoutMs : role === "judge" ? env.judgeTimeoutMs : role === "collector" ? env.collectorTimeoutMs : role === "doctor" ? env.doctorTimeoutMs : role === "notary" ? env.notaryTimeoutMs : void 0;
@@ -33675,9 +33873,16 @@ function createRoleEnvironment(env, options) {
     role,
     seat: options.seat
   });
-  const hostFacingSelection = options.seat.selection === void 0 ? void 0 : projectHostFacingProvider(
-    options.seat.selection,
-    options.seat.host,
+  afterHost?.();
+  const seatWithModel = resolvedSeatWithModel(options.seat);
+  if (seatWithModel === void 0) {
+    throw new CliUsageError(
+      missingResolvedSeatModelMessage(options.seat.seat, "invocation-or-config")
+    );
+  }
+  const hostFacingSelection = projectHostFacingProvider(
+    seatWithModel.selection,
+    seatWithModel.host,
     loadHostProvidersTable(options.home),
     options.home
   );
@@ -33701,6 +33906,34 @@ function createRoleEnvironment(env, options) {
     ...env.freshSummons === true ? { freshSummons: true } : {}
   };
 }
+async function dispatchPublicRoleCommand(env, home, io, parsed, role, parse, run) {
+  const agentDir = resolveAgentDir(env, home);
+  const cwd = env.cwd ?? process.cwd();
+  const config = await loadAndValidateConfig(home, env.packageRoot);
+  const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
+  const seat = resolveEffectiveSeat(
+    config,
+    role,
+    credentials,
+    invocationFromParsed(parsed)
+  );
+  let parsedRoleArgv;
+  const result2 = await run(
+    parsed.args,
+    createRoleEnvironment(
+      env,
+      { role, home, agentDir, cwd, credentials, seat, config },
+      () => {
+        parsedRoleArgv = parse(parsed.args);
+      }
+    ),
+    () => parsedRoleArgv
+  );
+  return {
+    exitCode: result2.exitCode,
+    ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
+  };
+}
 function cliResultFromRoleRun(result2) {
   return {
     exitCode: result2.exitCode,
@@ -33938,6 +34171,7 @@ function renderHelp() {
     "Persistent engine (callable roles): ak-role config set-engine <seat> <name> [model] | unset-engine <seat> | set-engine-model <seat> <model> | unset-engine-model <seat>",
     "Persistent host (callable roles): ak-role config set-host <seat> <name> | unset-host <seat>",
     "Host providers: ~/.ak-roles/host-providers.json (owner-edited; table > unique host directory > fail)",
+    "Model resolution: --model \u2192 persistent seat \u2192 officer inherit (#620); still none \u2192 error (#178)",
     "Host resolution: --host \u2192 persistent seat host \u2192 pi (resume uses the same order; #617)",
     "Resume flag position: --model/--thinking/--host/--engine go before <runId> (before `resume` or between `resume` and <runId>); the one argv after <runId> is always the opaque message, never a flag (#471)",
     "Effective seats: ak-role roles"
@@ -34339,291 +34573,148 @@ async function runAkRole(argv, env) {
       throw new CliUsageError(`unhandled support command: ${parsed.command}`);
     }
     if (parsed.command === "judge") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "judge",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicJudge(
-        parsed.args,
-        createRoleEnvironment(env, { role: "judge", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.judge.parse
+        parsed,
+        "judge",
+        PUBLIC_ROLE_ARGV.judge.parse,
+        (args, roleEnv, once) => runPublicJudge(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "countersign") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "countersign",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicCountersign(
-        parsed.args,
-        createRoleEnvironment(env, { role: "countersign", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.countersign.parse
+        parsed,
+        "countersign",
+        PUBLIC_ROLE_ARGV.countersign.parse,
+        (args, roleEnv, once) => runPublicCountersign(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "gleaner-left") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "gleaner-left",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicGleanerLeft(
-        parsed.args,
-        createRoleEnvironment(env, { role: "gleaner-left", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV["gleaner-left"].parse
+        parsed,
+        "gleaner-left",
+        PUBLIC_ROLE_ARGV["gleaner-left"].parse,
+        (args, roleEnv, once) => runPublicGleanerLeft(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "diarist") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "diarist",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicDiarist(
-        parsed.args,
-        createRoleEnvironment(env, { role: "diarist", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.diarist.parse
+        parsed,
+        "diarist",
+        PUBLIC_ROLE_ARGV.diarist.parse,
+        (args, roleEnv, once) => runPublicDiarist(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "coder") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "coder",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicCoder(
-        parsed.args,
-        createRoleEnvironment(env, { role: "coder", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.coder.parse
+        parsed,
+        "coder",
+        PUBLIC_ROLE_ARGV.coder.parse,
+        (args, roleEnv, once) => runPublicCoder(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "fixer") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "fixer",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicFixer(
-        parsed.args,
-        createRoleEnvironment(env, { role: "fixer", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.fixer.parse
+        parsed,
+        "fixer",
+        PUBLIC_ROLE_ARGV.fixer.parse,
+        (args, roleEnv, once) => runPublicFixer(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "collector") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "collector",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicCollector(
-        parsed.args,
-        createRoleEnvironment(env, { role: "collector", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.collector.parse
+        parsed,
+        "collector",
+        PUBLIC_ROLE_ARGV.collector.parse,
+        (args, roleEnv, once) => runPublicCollector(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "reviewer") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "reviewer",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicReviewer(
-        parsed.args,
-        createRoleEnvironment(env, { role: "reviewer", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.reviewer.parse
+        parsed,
+        "reviewer",
+        PUBLIC_ROLE_ARGV.reviewer.parse,
+        (args, roleEnv, once) => runPublicReviewer(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "doctor") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "doctor",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicDoctor(
-        parsed.args,
-        createRoleEnvironment(env, { role: "doctor", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.doctor.parse
+        parsed,
+        "doctor",
+        PUBLIC_ROLE_ARGV.doctor.parse,
+        (args, roleEnv, once) => runPublicDoctor(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "notary") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "notary",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicNotary(
-        parsed.args,
-        createRoleEnvironment(env, { role: "notary", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.notary.parse
+        parsed,
+        "notary",
+        PUBLIC_ROLE_ARGV.notary.parse,
+        (args, roleEnv, once) => runPublicNotary(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "inspector") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "inspector",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicInspector(
-        parsed.args,
-        createRoleEnvironment(env, { role: "inspector", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.inspector.parse
+        parsed,
+        "inspector",
+        PUBLIC_ROLE_ARGV.inspector.parse,
+        (args, roleEnv, once) => runPublicInspector(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "merger") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        "merger",
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicMerger(
-        parsed.args,
-        createRoleEnvironment(env, { role: "merger", home, agentDir, cwd, credentials, seat, config }),
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        PUBLIC_ROLE_ARGV.merger.parse
+        parsed,
+        "merger",
+        PUBLIC_ROLE_ARGV.merger.parse,
+        (args, roleEnv, once) => runPublicMerger(args, roleEnv, io, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "gatekeeper" || parsed.command === "navigator" || parsed.command === "auditor") {
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
-      const seat = resolveEffectiveSeat(
-        config,
-        parsed.command,
-        credentials,
-        invocationFromParsed(parsed)
-      );
-      const result2 = await runPublicInstructionSeat(
-        parsed.args,
-        createRoleEnvironment(env, { role: parsed.command, home, agentDir, cwd, credentials, seat, config }),
+      const seat = parsed.command;
+      return await dispatchPublicRoleCommand(
+        env,
+        home,
         io,
-        parsed.command,
-        PUBLIC_ROLE_ARGV[parsed.command].parse
+        parsed,
+        seat,
+        PUBLIC_ROLE_ARGV[seat].parse,
+        (args, roleEnv, once) => runPublicInstructionSeat(args, roleEnv, io, seat, once)
       );
-      return {
-        exitCode: result2.exitCode,
-        ...result2.terminal === void 0 ? {} : { terminal: result2.terminal }
-      };
     }
     if (parsed.command === "analyst") {
       const result2 = await runPublicAnalyst(