@akagilnc/pi-workflow-roles 0.1.4243 → 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"() {
@@ -16849,6 +16794,10 @@ ${paths.join("\n")}`
       };
       if (request.courtAttemptId === void 0) delete env.AK_ROLE_COURT_ATTEMPT;
       else env.AK_ROLE_COURT_ATTEMPT = request.courtAttemptId;
+      if (request.invocationScopeId === void 0) delete env.AK_ROLE_INVOCATION_SCOPE;
+      else env.AK_ROLE_INVOCATION_SCOPE = request.invocationScopeId;
+      if (request.host === void 0 || request.host.trim() === "") delete env.AK_ROLE_HOST;
+      else env.AK_ROLE_HOST = request.host.trim();
       applyEngineChildEnv(env, request.engine);
       if (typeof process.env.AK_ROLE_AUDITOR_SOURCE_RUN === "string" && process.env.AK_ROLE_AUDITOR_SOURCE_RUN.trim() !== "") {
         env.AK_ROLE_AUDITOR_SOURCE_RUN = process.env.AK_ROLE_AUDITOR_SOURCE_RUN;
@@ -23719,10 +23668,10 @@ function pairGateRounds(volumes) {
   return rounds.sort((a, b) => a.officerStartedAt.localeCompare(b.officerStartedAt)).map((round, index) => ({ ...round, roundIndex: index + 1 }));
 }
 async function resolveOfficerSessionFromPointerFile(pointerPath) {
-  const { readFile: readFile25 } = await import("node:fs/promises");
+  const { readFile: readFile24 } = await import("node:fs/promises");
   let raw;
   try {
-    raw = JSON.parse(await readFile25(pointerPath, "utf8"));
+    raw = JSON.parse(await readFile24(pointerPath, "utf8"));
   } catch (error) {
     throw new Error(
       `direct officer run pointer unreadable in ${pointerPath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -24484,6 +24433,154 @@ var init_collector_ledger = __esm({
   }
 });
 
+// src/engine-detour-usage.ts
+import { randomUUID as randomUUID4 } from "node:crypto";
+import { readFileSync as readFileSync3 } from "node:fs";
+import { dirname as dirname13, join as join25 } from "node:path";
+function isRecord8(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function callFactFromSitianPayload(payload, pointer) {
+  if (!isRecord8(payload)) return void 0;
+  if (payload.tool !== ENGINE_DETOUR_TOOL_NAME) return void 0;
+  if (typeof payload.toolCallId !== "string" || payload.toolCallId.length === 0) {
+    return void 0;
+  }
+  if (typeof payload.durationMs !== "number" || !Number.isFinite(payload.durationMs)) {
+    return void 0;
+  }
+  return {
+    toolCallId: payload.toolCallId,
+    durationMs: payload.durationMs,
+    ...typeof payload.code === "number" ? { code: payload.code } : {},
+    ...typeof payload.stdoutByteLength === "number" ? { stdoutByteLength: payload.stdoutByteLength } : {},
+    recordPointer: pointer
+  };
+}
+function invocationScopeIdOfRecord(record4) {
+  if (isRecord8(record4.subject)) {
+    const fromSubject = record4.subject.invocationScopeId;
+    if (typeof fromSubject === "string" && fromSubject.length > 0) return fromSubject;
+  }
+  if (isRecord8(record4.payload)) {
+    const fromPayload = record4.payload.invocationScopeId;
+    if (typeof fromPayload === "string" && fromPayload.length > 0) return fromPayload;
+  }
+  return void 0;
+}
+async function readEngineDetourToolUsage(input) {
+  if (!input.engineMounted) return void 0;
+  const { recordFile } = resolveSitianRecordPath({
+    level: "event",
+    kind: ENGINE_DETOUR_CALL_KIND,
+    sessionParent: input.sessionParent,
+    ...input.home === void 0 ? {} : { home: input.home },
+    ...input.cwd === void 0 ? {} : { cwd: input.cwd }
+  });
+  const { records } = await readSitianRecords(recordFile);
+  const calls = [];
+  for (const record4 of records) {
+    if (record4.kind !== ENGINE_DETOUR_CALL_KIND) continue;
+    const boundScope = invocationScopeIdOfRecord(record4);
+    if (input.invocationScopeId !== void 0 && input.invocationScopeId.length > 0) {
+      if (boundScope !== input.invocationScopeId) continue;
+    } else if (boundScope !== void 0) {
+      continue;
+    }
+    const pointer = {
+      identity: record4.identity,
+      recordFile,
+      kind: record4.kind,
+      level: record4.level
+    };
+    const fact = callFactFromSitianPayload(record4.payload, pointer);
+    if (fact === void 0) continue;
+    calls.push(fact);
+  }
+  return { callCount: calls.length, calls };
+}
+function projectEngineDetourToolUsageForPublicTerminal(usage, options) {
+  if (options.discloseRecordFile) return usage;
+  return {
+    callCount: usage.callCount,
+    calls: usage.calls.map((call) => ({
+      toolCallId: call.toolCallId,
+      durationMs: call.durationMs,
+      ...call.code === void 0 ? {} : { code: call.code },
+      ...call.stdoutByteLength === void 0 ? {} : { stdoutByteLength: call.stdoutByteLength },
+      recordPointer: {
+        identity: call.recordPointer.identity,
+        kind: call.recordPointer.kind,
+        level: call.recordPointer.level,
+        recordFile: ENGINE_DETOUR_CALL_RECORD_FILE_RELATIVE
+      }
+    }))
+  };
+}
+function readInvocationRecord(runDirectory) {
+  try {
+    const raw = JSON.parse(
+      readFileSync3(join25(runDirectory, "invocation.json"), "utf8")
+    );
+    return isRecord8(raw) ? raw : void 0;
+  } catch (error) {
+    if (error?.code === "ENOENT") return void 0;
+    throw error;
+  }
+}
+async function readInvocationEngineMounted(runDirectory) {
+  const raw = readInvocationRecord(runDirectory);
+  if (raw === void 0) return false;
+  return typeof raw.engine === "string" && raw.engine.trim() !== "";
+}
+function readInvocationSelectedHost(runDirectory) {
+  const raw = readInvocationRecord(runDirectory);
+  if (raw === void 0) return void 0;
+  return typeof raw.host === "string" && raw.host.trim() !== "" ? raw.host.trim() : void 0;
+}
+function withEngineDetourToolUsageFact(outcome, usage) {
+  if (usage === void 0) return outcome;
+  const prior = isRecord8(outcome.decisiveFacts) ? outcome.decisiveFacts : {};
+  return {
+    ...outcome,
+    decisiveFacts: {
+      ...prior,
+      [ENGINE_DETOUR_TOOL_USAGE_FACT_KEY]: usage
+    }
+  };
+}
+function runDirectoryFromSessionDirectory(sessionDirectory) {
+  return dirname13(sessionDirectory);
+}
+function sessionFileFromSessionDirectory(sessionDirectory) {
+  return join25(sessionDirectory, "session.jsonl");
+}
+function mintEngineDetourInvocationScope(input) {
+  const engine = input.effectiveEngine?.trim();
+  if (engine === void 0 || engine.length === 0) return void 0;
+  return randomUUID4();
+}
+function withEngineDetourInvocationScope(request, invocationScopeId) {
+  if (invocationScopeId === void 0 || invocationScopeId.length === 0) {
+    return request;
+  }
+  if (typeof request.invocationScopeId === "string" && request.invocationScopeId.length > 0) {
+    return request;
+  }
+  return { ...request, invocationScopeId };
+}
+var ENGINE_DETOUR_CALL_KIND, ENGINE_DETOUR_TOOL_USAGE_FACT_KEY, ENGINE_DETOUR_CALL_RECORD_FILE_RELATIVE;
+var init_engine_detour_usage = __esm({
+  "src/engine-detour-usage.ts"() {
+    "use strict";
+    init_engine_detour();
+    init_sitian_facade();
+    ENGINE_DETOUR_CALL_KIND = "engine-detour-call";
+    ENGINE_DETOUR_TOOL_USAGE_FACT_KEY = "engineDetourToolUsage";
+    ENGINE_DETOUR_CALL_RECORD_FILE_RELATIVE = `session/${ENGINE_DETOUR_CALL_KIND}/records.jsonl`;
+  }
+});
+
 // src/work-subject-identity.ts
 var init_work_subject_identity = __esm({
   "src/work-subject-identity.ts"() {
@@ -24591,11 +24688,11 @@ var init_navigator_invocation_identity = __esm({
 });
 
 // src/receipt-delivery-policy.ts
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function parseNoReceiptLifecycleFacts(input) {
-  if (!isRecord8(input) || typeof input.terminalToolCalled !== "boolean" || input.deliveryTurns !== RECEIPT_DELIVERY_TURN_LIMIT || input.sessionCompletion !== "settled-without-accepted-receipt" || input.acceptedReceipt !== false || typeof input.runPointer !== "string" || input.runPointer.trim() === "" || typeof input.attemptPointer !== "string" || input.attemptPointer.trim() === "" || !Array.isArray(input.rejectedReceipts) || !input.rejectedReceipts.every((item) => isRecord8(item) && typeof item.reason === "string")) {
+  if (!isRecord9(input) || typeof input.terminalToolCalled !== "boolean" || input.deliveryTurns !== RECEIPT_DELIVERY_TURN_LIMIT || input.sessionCompletion !== "settled-without-accepted-receipt" || input.acceptedReceipt !== false || typeof input.runPointer !== "string" || input.runPointer.trim() === "" || typeof input.attemptPointer !== "string" || input.attemptPointer.trim() === "" || !Array.isArray(input.rejectedReceipts) || !input.rejectedReceipts.every((item) => isRecord9(item) && typeof item.reason === "string")) {
     throw new TypeError("malformed no-receipt lifecycle facts");
   }
   return {
@@ -24771,16 +24868,96 @@ var init_terminal = __esm({
 });
 
 // src/public-cli/settlement.ts
-import { randomUUID as randomUUID4 } from "node:crypto";
+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 dirname13, join as join25 } from "node:path";
+import { dirname as dirname14, join as join26 } from "node:path";
 function sealedLedgerHome(admitted) {
   return homeFromRunDirectory(admitted.runDirectory);
 }
 function ledgerReadScope(admitted, scope) {
   return {
     home: sealedLedgerHome(admitted),
-    sessionParent: join25(admitted.runDirectory, "session", "session.jsonl"),
+    sessionParent: join26(admitted.runDirectory, "session", "session.jsonl"),
     ...scope?.courtAttemptId === void 0 || scope.courtAttemptId.length === 0 ? {} : { attemptId: scope.courtAttemptId }
   };
 }
@@ -24843,7 +25020,7 @@ async function attachRecordedSubmissions(admitted, terminal, scope) {
     await recordedSubmissionPayloads(admitted, void 0)
   );
 }
-async function settleHostEndedNoReceipt(admitted, authority) {
+async function settleHostEndedNoReceipt(admitted, authority, scope) {
   const facts = noReceiptLifecycleFacts({
     terminalToolCalled: false,
     rejectedReceipts: [],
@@ -24865,7 +25042,8 @@ async function settleHostEndedNoReceipt(admitted, authority) {
       artifacts: [],
       runId: admitted.runId
     },
-    coordinates.sessionDirectory
+    coordinates.sessionDirectory,
+    detourGateContext(admitted, scope)
   );
 }
 async function closedLedgerOutcome(admitted, role, scope) {
@@ -25208,12 +25386,12 @@ async function readSitianRetainedAuditorProviderStop(sessionFile) {
       kind: "auditor",
       sessionParent: sessionFile,
       // Path is driven by sessionParent when under ledger home; cwd is a fallback only.
-      cwd: dirname13(sessionFile)
+      cwd: dirname14(sessionFile)
     });
     const { records } = await readSitianRecords(recordFile);
     for (let i = records.length - 1; i >= 0; i -= 1) {
       const payload = records[i]?.payload;
-      if (!isRecord9(payload) || !isRecord9(payload.response)) continue;
+      if (!isRecord10(payload) || !isRecord10(payload.response)) continue;
       if (typeof payload.type === "string") continue;
       const stop = sessionProviderStopFromAssistant(payload.response);
       if (stop !== void 0) return stop;
@@ -25234,7 +25412,7 @@ async function readSessionProviderStop(sessionFile) {
   }
 }
 async function readBoundEvidenceChildKnownFailure(sessionFile) {
-  const childDirectory = join25(dirname13(sessionFile), "evidence-children");
+  const childDirectory = join26(dirname14(sessionFile), "evidence-children");
   let names;
   try {
     names = await readdir7(childDirectory);
@@ -25245,12 +25423,12 @@ async function readBoundEvidenceChildKnownFailure(sessionFile) {
   for (const file of names.filter((name) => name.endsWith(".jsonl")).sort().reverse()) {
     let entries;
     try {
-      entries = await readBoundSessionEntries(join25(childDirectory, file));
+      entries = await readBoundSessionEntries(join26(childDirectory, file));
     } catch (error) {
       throw sessionReadFailure(error, "failed to read discovered evidence-child session");
     }
     const header = entries.find((entry) => entry.type === "session");
-    if (!isRecord9(header) || header.parentSession !== sessionFile) continue;
+    if (!isRecord10(header) || header.parentSession !== sessionFile) continue;
     const stop = extractSessionProviderStop(entries);
     if (stop === void 0) continue;
     const primary = knownFailureFromProviderStop(stop);
@@ -25283,12 +25461,12 @@ async function loadBoundAuditorVolumes(sessionFile) {
     return body.startsWith("\u672C\u6B21\u914D\u7F6E\u7684\u52B3\u52A1\u5F15\u64CE\u53CA\u5176\u624B\u518C\uFF1A") || body.startsWith("- engine:");
   };
   const isResumeEnvelope = (msg) => {
-    if (!isRecord9(msg) || msg.role !== "user") return false;
+    if (!isRecord10(msg) || msg.role !== "user") return false;
     const text = typeof msg.text === "string" ? msg.text : typeof msg.content === "string" ? msg.content : void 0;
     if (isResumeEnvelopeBytes(text)) return true;
     const content = msg.content;
     if (Array.isArray(content)) {
-      return content.some((p) => isRecord9(p) && (isResumeEnvelopeBytes(p.text) || isResumeEnvelopeBytes(p.content)));
+      return content.some((p) => isRecord10(p) && (isResumeEnvelopeBytes(p.text) || isResumeEnvelopeBytes(p.content)));
     }
     return false;
   };
@@ -25300,7 +25478,7 @@ async function loadBoundAuditorVolumes(sessionFile) {
     latestParentUserIndex = i;
     break;
   }
-  const childDirectories = [join25(dirname13(sessionFile), "auditor-roles")];
+  const childDirectories = [join26(dirname14(sessionFile), "auditor-roles")];
   const valid = [];
   let sawAnyDirectory = false;
   for (const childDirectory of childDirectories) {
@@ -25315,12 +25493,12 @@ async function loadBoundAuditorVolumes(sessionFile) {
     for (const file of names.filter((name) => name.endsWith(".jsonl")).sort().reverse()) {
       let entries;
       try {
-        entries = await readBoundSessionEntries(join25(childDirectory, file));
+        entries = await readBoundSessionEntries(join26(childDirectory, file));
       } catch (error) {
         throw sessionReadFailure(error, "failed to read discovered auditor session");
       }
       const header = entries.find((entry) => entry.type === "session");
-      if (!isRecord9(header)) continue;
+      if (!isRecord10(header)) continue;
       const bindingIndexes = [];
       for (let i = 0; i < entries.length; i += 1) {
         const entry = entries[i];
@@ -25334,7 +25512,7 @@ async function loadBoundAuditorVolumes(sessionFile) {
         end: idx + 1 < bindingIndexes.length ? bindingIndexes[idx + 1] : entries.length
       })) : [{ entry: void 0, start: 0, end: entries.length }];
       for (const { entry: bindingEntry, start, end } of bindingPasses) {
-        const bindingParent = bindingEntry !== void 0 && isRecord9(bindingEntry.data) && isRecord9(bindingEntry.data.parent) ? bindingEntry.data.parent : void 0;
+        const bindingParent = bindingEntry !== void 0 && isRecord10(bindingEntry.data) && isRecord10(bindingEntry.data.parent) ? bindingEntry.data.parent : void 0;
         const attemptEntryId = typeof bindingParent?.attemptEntryId === "string" ? bindingParent.attemptEntryId : void 0;
         const attemptEntryIndex = attemptEntryId === void 0 ? -1 : parentEntries.findIndex((entry) => entry.id === attemptEntryId);
         const boundSessionFile = typeof bindingParent?.sessionFile === "string" ? bindingParent.sessionFile : typeof header.parentSession === "string" ? header.parentSession : void 0;
@@ -25361,12 +25539,12 @@ function complianceFailureFromAuditorVolumes(volumes) {
     if (stop === void 0) continue;
     for (let i = entries.length - 1; i >= 0; i -= 1) {
       const entry = entries[i];
-      if (entry?.type !== "custom" || entry.customType !== AUDITOR_COMPLIANCE_FAILURE_ENTRY_TYPE || !isRecord9(entry.data)) continue;
-      const parent = isRecord9(entry.data.parent) ? entry.data.parent : void 0;
-      const failure = isRecord9(entry.data.failure) ? entry.data.failure : void 0;
+      if (entry?.type !== "custom" || entry.customType !== AUDITOR_COMPLIANCE_FAILURE_ENTRY_TYPE || !isRecord10(entry.data)) continue;
+      const parent = isRecord10(entry.data.parent) ? entry.data.parent : void 0;
+      const failure = isRecord10(entry.data.failure) ? entry.data.failure : void 0;
       if (parent?.sessionId !== parentId || parent.sessionFile !== sessionFile || parent.attemptEntryId !== attemptEntryId) continue;
       if (failure === void 0) continue;
-      const identity = isRecord9(failure.identity) ? failure.identity : void 0;
+      const identity = isRecord10(failure.identity) ? failure.identity : void 0;
       const typedCause = failure.cause === "provider" || failure.cause === "activation" || failure.cause === "session" || failure.cause === "output" || failure.cause === "timeout" ? failure.cause : void 0;
       return {
         ...typedCause === void 0 ? {} : { cause: typedCause },
@@ -25375,7 +25553,7 @@ function complianceFailureFromAuditorVolumes(volumes) {
           ...typeof identity.code === "string" || typeof identity.code === "number" ? { code: identity.code } : {}
         } },
         ...typeof failure.diagnostic === "string" ? { diagnostic: failure.diagnostic } : {},
-        ...isRecord9(failure.details) ? { details: failure.details } : {}
+        ...isRecord10(failure.details) ? { details: failure.details } : {}
       };
     }
   }
@@ -25396,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;
@@ -25422,9 +25605,9 @@ function typedFailedTerminatingToolKnownFailure(entries) {
     if (classification.kind !== "infrastructure") continue;
     if (typeof message.toolCallId !== "string" || typeof message.toolName !== "string") continue;
     if (boundRoleToolCallForResult(attemptEntries, i, message, message.toolName) === void 0) continue;
-    const textPart = Array.isArray(message.content) ? message.content.find((part) => isRecord9(part) && part.type === "text" && typeof part.text === "string") : void 0;
-    const diagnostic = isRecord9(textPart) ? textPart.text : void 0;
-    const details = isRecord9(message.details) ? message.details : classification.fact;
+    const textPart = Array.isArray(message.content) ? message.content.find((part) => isRecord10(part) && part.type === "text" && typeof part.text === "string") : void 0;
+    const diagnostic = isRecord10(textPart) ? textPart.text : void 0;
+    const details = isRecord10(message.details) ? message.details : classification.fact;
     return {
       cause: "activation",
       identity: { name: message.toolName, code: message.toolCallId },
@@ -25549,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;
@@ -25582,7 +25768,7 @@ function controlledFailureInputFromResolution(resolution) {
     } : {}
   };
 }
-function isRecord9(value) {
+function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function toolResultText(message) {
@@ -25607,7 +25793,7 @@ function extractCollectorTargetBindRejection(entries) {
     const diagnostic = toolResultText(message);
     if (diagnostic.length === 0) return void 0;
     const details = message.details;
-    const code = isRecord9(details) && typeof details.code === "string" && details.code.trim() !== "" ? details.code : void 0;
+    const code = isRecord10(details) && typeof details.code === "string" && details.code.trim() !== "" ? details.code : void 0;
     return code === void 0 ? { diagnostic } : { diagnostic, code };
   }
   return void 0;
@@ -25652,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,
@@ -25661,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,
@@ -25677,7 +25875,7 @@ function boundRoleToolCallForResult(entries, resultIndex, message, outputToolNam
     const candidateMessage = entries[index]?.message;
     if (candidateMessage?.role === "assistant" && Array.isArray(candidateMessage.content)) {
       for (const part of candidateMessage.content) {
-        if (!isRecord9(part) || part.type !== "toolCall" || part.id !== callId) {
+        if (!isRecord10(part) || part.type !== "toolCall" || part.id !== callId) {
           continue;
         }
         if (part.name !== outputToolName) return void 0;
@@ -25714,7 +25912,7 @@ async function appendRunAttemptHistory(source, outcome) {
     type: "custom",
     customType: ATTEMPT_HISTORY_ENTRY_TYPE,
     data: attemptData,
-    id: randomUUID4(),
+    id: randomUUID5(),
     parentId,
     timestamp: timestamp2
   })}
@@ -25749,7 +25947,7 @@ function parseNavigatorAttendanceDetails(details) {
   const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string" ? { advisoryDiagnostic: details.routePlaybookReadFailure } : {};
   if (disposition === "recommendation") {
     const next = details.next;
-    if (!isRecord9(next) || typeof next.role !== "string") {
+    if (!isRecord10(next) || typeof next.role !== "string") {
       return {
         disposition: "unavailable",
         source: "unknown",
@@ -25757,7 +25955,7 @@ function parseNavigatorAttendanceDetails(details) {
       };
     }
     const reason = typeof details.reason === "string" ? details.reason : "";
-    const route = Array.isArray(details.route) ? details.route.filter(isRecord9).map((target) => ({
+    const route = Array.isArray(details.route) ? details.route.filter(isRecord10).map((target) => ({
       role: String(target.role),
       phase: navigatorPhaseValue(target.phase)
     })) : void 0;
@@ -25820,18 +26018,50 @@ function projectTerminalGateFact(rounds) {
   };
 }
 async function extractGateFactFromSessionDirectory(sessionDirectory, options = {}) {
-  const directories = [join25(sessionDirectory, "auditor-roles")];
-  const parentSessionFile = options.parentSessionFile ?? join25(sessionDirectory, "session.jsonl");
+  const directories = [join26(sessionDirectory, "auditor-roles")];
+  const parentSessionFile = options.parentSessionFile ?? join26(sessionDirectory, "session.jsonl");
   const rounds = await readAnalystGateCyclesFromAuditorRoles(directories, {
     parentSessionFile
   });
   return projectTerminalGateFact(rounds);
 }
+async function attachEngineDetourToolUsage(base, sessionDirectory, gateContext = {}) {
+  const runDirectory = typeof gateContext.runDirectory === "string" && gateContext.runDirectory.length > 0 ? gateContext.runDirectory : runDirectoryFromSessionDirectory(sessionDirectory);
+  const engineMounted = await readInvocationEngineMounted(runDirectory);
+  if (!engineMounted) return base;
+  const invocationScopeId = typeof gateContext.invocationScopeId === "string" && gateContext.invocationScopeId.length > 0 ? gateContext.invocationScopeId : void 0;
+  const sessionFile = sessionFileFromSessionDirectory(sessionDirectory);
+  const usage = await readEngineDetourToolUsage({
+    sessionParent: sessionFile,
+    engineMounted: true,
+    ...invocationScopeId === void 0 ? {} : { invocationScopeId },
+    cwd: runDirectory
+  });
+  const projected = usage === void 0 ? void 0 : projectEngineDetourToolUsageForPublicTerminal(usage, {
+    // Resumable Terminal: run ID only in resume.command — relative openable path.
+    discloseRecordFile: base.resume === void 0
+  });
+  return {
+    ...base,
+    roleOutcome: withEngineDetourToolUsageFact(base.roleOutcome, projected)
+  };
+}
+function detourGateContext(admitted, scope) {
+  return {
+    runDirectory: admitted.runDirectory,
+    ...scope?.courtAttemptId === void 0 || scope.courtAttemptId.length === 0 ? {} : { courtAttemptId: scope.courtAttemptId },
+    ...scope?.invocationScopeId === void 0 || scope.invocationScopeId.length === 0 ? {} : { invocationScopeId: scope.invocationScopeId }
+  };
+}
 async function withOptionalGateProjection(base, sessionDirectory, gateContext = {}) {
   const secondaryEvidence = base.roleOutcome.kind === "failure" ? base.roleOutcome.decisiveFacts.secondaryEvidence : void 0;
-  if (isRecord9(secondaryEvidence) && secondaryEvidence.kind === "role_infrastructure_failure" && (secondaryEvidence.stage === "gatekeeper" || secondaryEvidence.stage === "inspector" || secondaryEvidence.stage === "notary")) return base;
-  const gate = await extractGateFactFromSessionDirectory(sessionDirectory, gateContext);
-  return gate === void 0 ? base : { ...base, gate };
+  const skipGate = isRecord10(secondaryEvidence) && secondaryEvidence.kind === "role_infrastructure_failure" && (secondaryEvidence.stage === "gatekeeper" || secondaryEvidence.stage === "inspector" || secondaryEvidence.stage === "notary");
+  let next = base;
+  if (!skipGate) {
+    const gate = await extractGateFactFromSessionDirectory(sessionDirectory, gateContext);
+    if (gate !== void 0) next = { ...base, gate };
+  }
+  return attachEngineDetourToolUsage(next, sessionDirectory, gateContext);
 }
 function extractNavigatorFact(entries) {
   const terminal = findLatestDurablePackagedRoleTerminal(entries);
@@ -25869,7 +26099,7 @@ function extractNavigatorFact(entries) {
     const entry = entries[i];
     if (entry?.type === "custom_message" && entry.customType === "ak-navigator-attendance") {
       const details = entry.message?.details ?? entry.details;
-      if (!isRecord9(details)) {
+      if (!isRecord10(details)) {
         return {
           disposition: "unavailable",
           source: "unknown",
@@ -25919,8 +26149,8 @@ async function extractNavigatorFactFromAdmittedSession(sessionFile) {
 async function publishJudgeArtifacts(admitted, roleOutcome, coordinates) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -25964,8 +26194,8 @@ async function publishJudgeArtifacts(admitted, roleOutcome, coordinates) {
 async function publishCoderArtifacts(admitted, roleOutcome, coordinates, options = {}) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -26040,9 +26270,19 @@ async function settleLawfulJudgeTerminalResult(admitted, authority, scope) {
       artifacts,
       runId: admitted.runId
     },
-    coordinates.sessionDirectory
+    coordinates.sessionDirectory,
+    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);
 }
@@ -26068,9 +26308,19 @@ async function settleLawfulCoderTerminalResult(admitted, authority, options = {}
       artifacts,
       runId: admitted.runId
     },
-    coordinates.sessionDirectory
+    coordinates.sessionDirectory,
+    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;
@@ -26102,8 +26352,8 @@ function extractFixerMethodInvocations(entries, options) {
 async function publishFixerArtifacts(admitted, roleOutcome, coordinates, options) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -26184,14 +26434,24 @@ async function settleLawfulFixerTerminalResult(admitted, authority, options, sco
       artifacts,
       runId: admitted.runId
     },
-    sessionDirectory
+    sessionDirectory,
+    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);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -26249,12 +26509,17 @@ async function settleLawfulCollectorTerminalResult(admitted, authority, scope) {
       const residual = boundErroredToolCandidate(entries, index, message, COLLECTOR_WAIT_TOOL);
       if (residual === void 0) continue;
       const candidate = residual.candidate;
-      const details = isRecord9(candidate) ? candidate : { candidate };
-      const failed = await settleFailureTerminalResult(admitted, {
-        cause: "output",
-        diagnostic: residual.diagnostic,
-        details
-      }, authority);
+      const details = isRecord10(candidate) ? candidate : { candidate };
+      const failed = await settleFailureTerminalResult(
+        admitted,
+        {
+          cause: "output",
+          diagnostic: residual.diagnostic,
+          details
+        },
+        authority,
+        scope ?? {}
+      );
       return attachRecordedSubmissions(admitted, failed, scope);
     }
     return void 0;
@@ -26275,11 +26540,21 @@ async function settleLawfulCollectorTerminalResult(admitted, authority, scope) {
         artifacts,
         runId: admitted.runId
       },
-      sessionDirectory
+      sessionDirectory,
+      detourGateContext(admitted, 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);
 }
@@ -26289,7 +26564,7 @@ function extractDoctorCandidateCostFact(entries) {
     const entry = entries[i];
     if (entry?.type === "custom" && entry.customType === DOCTOR_CANDIDATE_ENTRY_TYPE) {
       const data = entry.data;
-      return isRecord9(data) ? data.cost : void 0;
+      return isRecord10(data) ? data.cost : void 0;
     }
   }
   return void 0;
@@ -26300,7 +26575,7 @@ function extractDoctorCandidateAuditNoReceiptFact(entries) {
     const entry = entries[i];
     if (entry?.type === "custom" && entry.customType === DOCTOR_CANDIDATE_ENTRY_TYPE) {
       const data = entry.data;
-      return isRecord9(data) ? data.auditNoReceipt : void 0;
+      return isRecord10(data) ? data.auditNoReceipt : void 0;
     }
   }
   return void 0;
@@ -26308,8 +26583,8 @@ function extractDoctorCandidateAuditNoReceiptFact(entries) {
 async function publishDoctorArtifacts(admitted, roleOutcome, coordinates, options = {}) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -26371,7 +26646,8 @@ async function settleLawfulDoctorTerminalResult(admitted, authority, scope) {
         artifacts: artifacts2,
         runId: admitted.runId
       },
-      sessionDirectory
+      sessionDirectory,
+      detourGateContext(admitted, scope)
     );
   }
   const roleOutcome = sealed;
@@ -26394,9 +26670,19 @@ async function settleLawfulDoctorTerminalResult(admitted, authority, scope) {
       artifacts,
       runId: admitted.runId
     },
-    sessionDirectory
+    sessionDirectory,
+    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);
 }
@@ -26425,12 +26711,17 @@ async function settleLawfulSeatAcceptedTerminalResult(admitted, authority, spec,
       spec.toolName
     );
     if (residual !== void 0) {
-      const details = isRecord9(residual.candidate) ? residual.candidate : { candidate: residual.candidate };
-      const failed = await settleFailureTerminalResult(admitted, {
-        cause: "output",
-        diagnostic: residual.diagnostic,
-        details
-      }, authority);
+      const details = isRecord10(residual.candidate) ? residual.candidate : { candidate: residual.candidate };
+      const failed = await settleFailureTerminalResult(
+        admitted,
+        {
+          cause: "output",
+          diagnostic: residual.diagnostic,
+          details
+        },
+        authority,
+        scope ?? {}
+      );
       return withSubmissions(failed, submissions);
     }
   }
@@ -26445,7 +26736,8 @@ async function settleLawfulSeatAcceptedTerminalResult(admitted, authority, spec,
           artifacts: [],
           runId: admitted.runId
         },
-        sessionDirectory
+        sessionDirectory,
+        detourGateContext(admitted, scope)
       ),
       submissions
     );
@@ -26460,7 +26752,8 @@ async function settleLawfulSeatAcceptedTerminalResult(admitted, authority, spec,
           artifacts: [],
           runId: admitted.runId
         },
-        sessionDirectory
+        sessionDirectory,
+        detourGateContext(admitted, scope)
       ),
       submissions
     );
@@ -26473,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);
 }
@@ -26482,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);
 }
@@ -26491,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);
 }
@@ -26564,8 +26884,8 @@ function extractReviewerMethodInvocations(entries, options) {
 async function publishReviewerArtifacts(admitted, roleOutcome, coordinates, options) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -26644,9 +26964,19 @@ async function settleLawfulReviewerTerminalResult(admitted, authority, options,
       artifacts,
       runId: admitted.runId
     },
-    sessionDirectory
+    sessionDirectory,
+    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);
 }
@@ -26669,8 +26999,8 @@ function extractMergerMethodInvocations(entries, options) {
 async function publishMergerArtifacts(admitted, roleOutcome, coordinates, options) {
   await appendRunAttemptHistory({ role: admitted.role, runId: admitted.runId, sessionFile: coordinates.sessionFile }, roleOutcome);
   const artifactsDir = await ensureRunArtifactsDir(admitted.runDirectory);
-  const reportPath = join25(artifactsDir, "report.json");
-  const evidencePath = join25(artifactsDir, "evidence.json");
+  const reportPath = join26(artifactsDir, "report.json");
+  const evidencePath = join26(artifactsDir, "evidence.json");
   await writeFile7(
     reportPath,
     `${JSON.stringify(
@@ -26729,12 +27059,17 @@ async function settleLawfulMergerTerminalResult(admitted, authority, options, sc
       const residual = boundErroredToolCandidate(entries, index, message, MERGER_OUTPUT_TOOL_NAME);
       if (residual === void 0) continue;
       const candidate = residual.candidate;
-      const details = isRecord9(candidate) ? candidate : { candidate };
-      const failed = await settleFailureTerminalResult(admitted, {
-        cause: "output",
-        diagnostic: residual.diagnostic,
-        details
-      }, authority);
+      const details = isRecord10(candidate) ? candidate : { candidate };
+      const failed = await settleFailureTerminalResult(
+        admitted,
+        {
+          cause: "output",
+          diagnostic: residual.diagnostic,
+          details
+        },
+        authority,
+        scope ?? {}
+      );
       return attachRecordedSubmissions(admitted, failed, scope);
     }
     return void 0;
@@ -26762,11 +27097,21 @@ async function settleLawfulMergerTerminalResult(admitted, authority, options, sc
         artifacts,
         runId: admitted.runId
       },
-      sessionDirectory
+      sessionDirectory,
+      detourGateContext(admitted, scope)
     ),
     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);
 }
@@ -26789,7 +27134,7 @@ function publicationAttemptFromError(path, error) {
 }
 function uniqueFailureFallbackDirs(runDirectory, baseDir) {
   const dirs = [];
-  for (const dir of [baseDir, runDirectory, dirname13(runDirectory)]) {
+  for (const dir of [baseDir, runDirectory, dirname14(runDirectory)]) {
     if (!dirs.includes(dir)) dirs.push(dir);
   }
   return dirs;
@@ -26811,7 +27156,7 @@ async function writeFailureJsonRetainingCause(preferredCandidates, uniqueFallbac
   const candidates = [
     ...preferredCandidates,
     // One unique name per fallback dir — collisions on fixed names cannot exhaust this.
-    ...uniqueFallbackDirs.map((dir) => join25(dir, `${stem}.${randomUUID4()}.json`))
+    ...uniqueFallbackDirs.map((dir) => join26(dir, `${stem}.${randomUUID5()}.json`))
   ];
   for (let i = 0; i < candidates.length; i += 1) {
     const path = candidates[i];
@@ -26862,20 +27207,20 @@ async function publishFailureArtifacts(admitted, failure, authority) {
     baseDir
   );
   const errorCandidates = underArtifacts ? [
-    join25(baseDir, "error.json"),
-    join25(baseDir, "error.settlement.json"),
-    join25(admitted.runDirectory, "error.settlement.json")
+    join26(baseDir, "error.json"),
+    join26(baseDir, "error.settlement.json"),
+    join26(admitted.runDirectory, "error.settlement.json")
   ] : [
-    join25(baseDir, "error.settlement.json"),
-    join25(baseDir, "error.json")
+    join26(baseDir, "error.settlement.json"),
+    join26(baseDir, "error.json")
   ];
   const evidenceCandidates = underArtifacts ? [
-    join25(baseDir, "evidence.json"),
-    join25(baseDir, "evidence.settlement.json"),
-    join25(admitted.runDirectory, "evidence.settlement.json")
+    join26(baseDir, "evidence.json"),
+    join26(baseDir, "evidence.settlement.json"),
+    join26(admitted.runDirectory, "evidence.settlement.json")
   ] : [
-    join25(baseDir, "evidence.settlement.json"),
-    join25(baseDir, "evidence.json")
+    join26(baseDir, "evidence.settlement.json"),
+    join26(baseDir, "evidence.json")
   ];
   const errorPayloadBase = {
     kind: "error",
@@ -26957,7 +27302,8 @@ async function settleFailureTerminalResult(admitted, failure, authority, options
                 artifacts: [],
                 runId: admitted.runId
               },
-              sessionDirectory
+              sessionDirectory,
+              detourGateContext(admitted, options)
             );
           }
         } catch {
@@ -26995,7 +27341,8 @@ async function settleFailureTerminalResult(admitted, failure, authority, options
         artifacts: [],
         resume: options.resume
       },
-      sessionDirectory
+      sessionDirectory,
+      detourGateContext(admitted, options)
     );
   }
   const roleOutcome = {
@@ -27012,9 +27359,13 @@ async function settleFailureTerminalResult(admitted, failure, authority, options
       artifacts,
       runId: admitted.runId
     },
-    sessionDirectory
+    sessionDirectory,
+    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");
@@ -27035,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";
@@ -27052,6 +27437,7 @@ var init_settlement = __esm({
     init_compliance_transport();
     init_collector_ledger();
     init_engine_detour();
+    init_engine_detour_usage();
     init_judge_output();
     init_collector_output();
     init_worker_output();
@@ -27073,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,
@@ -27115,6 +27502,7 @@ function projectRoleTurnRequest(admitted, roleDetails, options) {
     ...options.correlationId === void 0 || options.correlationId.trim() === "" ? {} : { correlationId: options.correlationId },
     ...options.timeoutMs === void 0 ? {} : { timeoutMs: options.timeoutMs },
     ...options.courtAttemptId === void 0 || options.courtAttemptId.length === 0 ? {} : { courtAttemptId: options.courtAttemptId },
+    ...options.invocationScopeId === void 0 || options.invocationScopeId.length === 0 ? {} : { invocationScopeId: options.invocationScopeId },
     ...options.stationChild === void 0 ? {} : { stationChild: options.stationChild }
   };
 }
@@ -27127,9 +27515,9 @@ var init_turn_request = __esm({
 
 // src/session-identity.ts
 import { mkdir as mkdir3, readFile as readFile18, rename as rename3, writeFile as writeFile8 } from "node:fs/promises";
-import { dirname as dirname14, join as join26 } from "node:path";
+import { dirname as dirname15, join as join27 } from "node:path";
 function createSessionIdentityAuthority(authority, sessionBindingFile) {
-  const bindingPath = (principal) => join26(authority.decode(principal).sessionDirectory, sessionBindingFile);
+  const bindingPath = (principal) => join27(authority.decode(principal).sessionDirectory, sessionBindingFile);
   return {
     resolveSessionFile(principal) {
       return authority.decode(principal).sessionFile;
@@ -27148,7 +27536,7 @@ function createSessionIdentityAuthority(authority, sessionBindingFile) {
     },
     async bind(principal, sessionId) {
       const target = bindingPath(principal);
-      await mkdir3(dirname14(target), { recursive: true });
+      await mkdir3(dirname15(target), { recursive: true });
       const temporary = `${target}.${process.pid}.tmp`;
       await writeFile8(temporary, `${JSON.stringify({ sessionId })}
 `, { encoding: "utf8", mode: 384 });
@@ -27218,7 +27606,7 @@ var init_ticket_provenance = __esm({
 // src/public-cli/case-dossier-delivery.ts
 import { mkdtemp, readFile as readFile19, rm as rm2, writeFile as writeFile9 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join27 } from "node:path";
+import { join as join28 } from "node:path";
 function describeDossierFile(path) {
   return path;
 }
@@ -27243,9 +27631,9 @@ async function deliverCaseDossierAsAttachment(input) {
     home: input.home
   });
   if (section === void 0) return void 0;
-  const stagingDir = await mkdtemp(join27(tmpdir(), "ak-case-dossier-"));
+  const stagingDir = await mkdtemp(join28(tmpdir(), "ak-case-dossier-"));
   try {
-    const stagingPath = join27(stagingDir, CASE_DOSSIER_ATTACH_FILE);
+    const stagingPath = join28(stagingDir, CASE_DOSSIER_ATTACH_FILE);
     await writeFile9(stagingPath, `${section}
 `, "utf8");
     return await freezeAttachmentsIntoRun(
@@ -27271,7 +27659,7 @@ var init_case_dossier_delivery = __esm({
 
 // src/host-transition-prior-native.ts
 import { access as access3, readdir as readdir8 } from "node:fs/promises";
-import { dirname as dirname15, join as join28 } from "node:path";
+import { dirname as dirname16, join as join29 } from "node:path";
 function isEnoent3(error) {
   return typeof error === "object" && error !== null && error.code === "ENOENT";
 }
@@ -27285,7 +27673,7 @@ async function listPiNativeRecordPaths(sessionFile) {
   }
 }
 async function listSitianRecordPaths(sessionParent) {
-  const sessionRoot = dirname15(sessionParent);
+  const sessionRoot = dirname16(sessionParent);
   let entries;
   try {
     entries = await readdir8(sessionRoot, { withFileTypes: true });
@@ -27296,7 +27684,7 @@ async function listSitianRecordPaths(sessionParent) {
   const recordPaths = [];
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const recordFile = join28(sessionRoot, entry.name, "records.jsonl");
+    const recordFile = join29(sessionRoot, entry.name, "records.jsonl");
     try {
       await access3(recordFile);
       recordPaths.push(recordFile);
@@ -27364,9 +27752,9 @@ var init_public_run_credentials = __esm({
 
 // src/public-cli/auto-resume.ts
 import { constants as fsConstants2 } from "node:fs";
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 import { lstat as lstat6, mkdir as mkdir4, open as open2 } from "node:fs/promises";
-import { join as join29 } from "node:path";
+import { join as join30 } from "node:path";
 async function persistReturnedRunState(admitted, authority, options) {
   if (options?.lawful === true) {
     await markRunTerminal(admitted.runDirectory);
@@ -27481,7 +27869,7 @@ function jsonSafeReplacer() {
   };
 }
 async function writeHardenedArtifactFile(artifactsDir, namePrefix, payload) {
-  const filePath = join29(artifactsDir, `${namePrefix}-${randomUUID5()}.json`);
+  const filePath = join30(artifactsDir, `${namePrefix}-${randomUUID6()}.json`);
   const body = `${JSON.stringify(payload, jsonSafeReplacer(), 2)}
 `;
   const noFollowFlag = typeof fsConstants2.O_NOFOLLOW === "number" ? fsConstants2.O_NOFOLLOW : 0;
@@ -27752,9 +28140,9 @@ var init_auto_resume = __esm({
 });
 
 // src/public-cli/post-admission.ts
-import { randomUUID as randomUUID6 } from "node:crypto";
-import { readFile as readFile20, writeFile as writeFile10 } from "node:fs/promises";
-import { isAbsolute as isAbsolute8, join as join30, resolve as resolve8 } from "node:path";
+import { randomUUID as randomUUID7 } from "node:crypto";
+import { writeFile as writeFile10 } from "node:fs/promises";
+import { isAbsolute as isAbsolute8, join as join31, resolve as resolve8 } from "node:path";
 function describeCaughtError(error) {
   if (error instanceof Error) {
     const code = error.code;
@@ -27799,7 +28187,7 @@ async function recordBestEffortPostDispatchDiagnostic(admitted, env, diagnostic,
     try {
       const artifactsDir = await ensureRealArtifactsDirectory(admitted.runDirectory);
       await writeFile10(
-        join30(artifactsDir, `post-admission-diagnostic-${randomUUID6()}.json`),
+        join31(artifactsDir, `post-admission-diagnostic-${randomUUID7()}.json`),
         `${JSON.stringify({ version: 1, ...payload }, null, 2)}
 `,
         { encoding: "utf8", flag: "wx" }
@@ -27813,15 +28201,6 @@ async function recordBestEffortPostDispatchDiagnostic(admitted, env, diagnostic,
     }
   }
 }
-async function readInvocationHost(runDirectory) {
-  try {
-    const raw = JSON.parse(await readFile20(join30(runDirectory, "invocation.json"), "utf8"));
-    return typeof raw.host === "string" && raw.host.trim() !== "" ? raw.host : void 0;
-  } catch (error) {
-    if (error.code === "ENOENT") return void 0;
-    throw error;
-  }
-}
 async function resolveResumeMethodMaterialAdapters(input) {
   if (input.shouldLoad === false) {
     return { kind: "continue", adapters: input.emptyAdapters };
@@ -27885,7 +28264,10 @@ async function presentControlledFailure2(admitted, failureInput, adapters, autho
       admitted,
       failure,
       authority,
-      resumable ? { resume: { command: renderResumeCommand(admitted.runId) } } : {}
+      {
+        ...resumable ? { resume: { command: renderResumeCommand(admitted.runId) } } : {},
+        ...failureInput.invocationScopeId === void 0 || failureInput.invocationScopeId.length === 0 ? {} : { invocationScopeId: failureInput.invocationScopeId }
+      }
     )
   );
   presentFailureTerminal(terminal, io);
@@ -27954,12 +28336,12 @@ async function dispatchPostAdmissionTurn(input) {
       return {
         ...await presentControlledFailure2(
           admitted,
-          {
+          withEngineDetourInvocationScope({
             timedOut: false,
             code: null,
             stderr: "",
             thrown: error
-          },
+          }, request.invocationScopeId),
           adapters,
           env.principalAuthority,
           io,
@@ -27980,7 +28362,7 @@ async function dispatchPostAdmissionTurn(input) {
       return {
         ...await presentControlledFailure2(
           admitted,
-          missingCredential,
+          withEngineDetourInvocationScope(missingCredential, request.invocationScopeId),
           adapters,
           env.principalAuthority,
           io,
@@ -27994,7 +28376,7 @@ async function dispatchPostAdmissionTurn(input) {
     const principalCoordinates = admitted.principal === void 0 ? void 0 : env.principalAuthority.decode(admitted.principal);
     let hostTransition;
     try {
-      previousHost = await readInvocationHost(admitted.runDirectory);
+      previousHost = readInvocationSelectedHost(admitted.runDirectory);
       hostTransition = previousHost !== void 0 && liveHost !== void 0 && principalCoordinates !== void 0 ? await projectHostTransitionPriorNative({
         previousHost,
         liveHost,
@@ -28004,12 +28386,12 @@ async function dispatchPostAdmissionTurn(input) {
       return {
         ...await presentControlledFailure2(
           admitted,
-          {
+          withEngineDetourInvocationScope({
             timedOut: false,
             code: null,
             stderr: "",
             thrown: error
-          },
+          }, request.invocationScopeId),
           adapters,
           env.principalAuthority,
           io,
@@ -28026,12 +28408,12 @@ async function dispatchPostAdmissionTurn(input) {
       } catch (error) {
         const settled2 = await presentControlledFailure2(
           admitted,
-          {
+          withEngineDetourInvocationScope({
             timedOut: false,
             code: null,
             stderr: "",
             thrown: error
-          },
+          }, request.invocationScopeId),
           adapters,
           env.principalAuthority,
           io,
@@ -28050,6 +28432,9 @@ async function dispatchPostAdmissionTurn(input) {
     if (hostTransition !== void 0) {
       turnRequest = { ...turnRequest, hostTransition };
     }
+    if (typeof liveHost === "string" && liveHost.trim() !== "") {
+      turnRequest = { ...turnRequest, host: liveHost.trim() };
+    }
     if (isStationChildOfficerDialogue(admitted.role, env)) {
       await deliverCaseDossierAsAttachment({
         ticketNumber: admitted.ticketNumber,
@@ -28086,12 +28471,12 @@ async function dispatchPostAdmissionTurn(input) {
     } catch (error) {
       const settled2 = await settleAfterTurnStarted(
         admitted,
-        {
+        withEngineDetourInvocationScope({
           timedOut: false,
           code: null,
           stderr: "",
           thrown: error
-        },
+        }, request.invocationScopeId),
         adapters,
         env.principalAuthority,
         io,
@@ -28102,7 +28487,7 @@ async function dispatchPostAdmissionTurn(input) {
     let stderrLogWriteFailure;
     try {
       await writeFile10(
-        join30(admitted.runDirectory, "stderr.log"),
+        join31(admitted.runDirectory, "stderr.log"),
         result2.stderr,
         "utf8"
       );
@@ -28115,7 +28500,10 @@ async function dispatchPostAdmissionTurn(input) {
         io
       );
     }
-    const courtScope = request.courtAttemptId === void 0 || request.courtAttemptId.length === 0 ? void 0 : { courtAttemptId: request.courtAttemptId };
+    const courtScope = (request.courtAttemptId === void 0 || request.courtAttemptId.length === 0) && (request.invocationScopeId === void 0 || request.invocationScopeId.length === 0) ? void 0 : {
+      ...request.courtAttemptId === void 0 || request.courtAttemptId.length === 0 ? {} : { courtAttemptId: request.courtAttemptId },
+      ...request.invocationScopeId === void 0 || request.invocationScopeId.length === 0 ? {} : { invocationScopeId: request.invocationScopeId }
+    };
     let settled;
     let settledOutcome;
     let hostSignalFailed = false;
@@ -28165,12 +28553,12 @@ async function dispatchPostAdmissionTurn(input) {
     } catch (error) {
       const settledFailure = await settleAfterTurnStarted(
         admitted,
-        {
+        withEngineDetourInvocationScope({
           timedOut: false,
           code: result2.code,
           stderr: result2.stderr,
           thrown: error
-        },
+        }, request.invocationScopeId),
         adapters,
         env.principalAuthority,
         io,
@@ -28185,13 +28573,13 @@ async function dispatchPostAdmissionTurn(input) {
         } catch (error) {
           const failed = await settleAfterTurnStarted(
             admitted,
-            {
+            withEngineDetourInvocationScope({
               timedOut: false,
               code: null,
               stderr: "",
               thrown: error,
               skipRunStateWrite: true
-            },
+            }, request.invocationScopeId),
             adapters,
             env.principalAuthority,
             io,
@@ -28207,7 +28595,7 @@ async function dispatchPostAdmissionTurn(input) {
       const stderrLogWriteDetails = stderrLogWriteFailure === void 0 ? void 0 : { stderrLogWriteFailure: describeCaughtError(stderrLogWriteFailure) };
       const failed = await settleAfterTurnStarted(
         admitted,
-        {
+        withEngineDetourInvocationScope({
           timedOut: result2.timedOut,
           code: result2.code,
           stderr: result2.stderr,
@@ -28221,7 +28609,7 @@ async function dispatchPostAdmissionTurn(input) {
               details: { ...resolutionInput.knownFailure.details ?? {}, ...stderrLogWriteDetails }
             }
           } : { knownDetails: stderrLogWriteDetails }
-        },
+        }, request.invocationScopeId),
         adapters,
         env.principalAuthority,
         io,
@@ -28232,12 +28620,12 @@ async function dispatchPostAdmissionTurn(input) {
     if (stderrLogWriteFailure !== void 0) {
       const failed = await settleAfterTurnStarted(
         admitted,
-        {
+        withEngineDetourInvocationScope({
           timedOut: false,
           code: result2.code,
           stderr: result2.stderr,
           thrown: stderrLogWriteFailure
-        },
+        }, request.invocationScopeId),
         adapters,
         env.principalAuthority,
         io,
@@ -28247,7 +28635,7 @@ async function dispatchPostAdmissionTurn(input) {
     }
     const noReceipt = await attachRecordedSubmissions(
       admitted,
-      await settleHostEndedNoReceipt(admitted, env.principalAuthority),
+      await settleHostEndedNoReceipt(admitted, env.principalAuthority, courtScope),
       courtScope
     );
     if (persistRunState) {
@@ -28256,13 +28644,13 @@ async function dispatchPostAdmissionTurn(input) {
       } catch (error) {
         const failed = await settleAfterTurnStarted(
           admitted,
-          {
+          withEngineDetourInvocationScope({
             timedOut: false,
             code: null,
             stderr: "",
             thrown: error,
             skipRunStateWrite: true
-          },
+          }, request.invocationScopeId),
           adapters,
           env.principalAuthority,
           io,
@@ -28331,7 +28719,7 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
       kind: "resume",
       prompt
     },
-    ...request.message === void 0 ? {} : { courtAttemptId: randomUUID6() },
+    ...request.message === void 0 ? {} : { courtAttemptId: randomUUID7() },
     ...env.stationChild === void 0 ? {} : { stationChild: env.stationChild }
   };
 }
@@ -28349,7 +28737,7 @@ async function dispatchAfterWriterLease(input) {
 }
 function isAlreadyFrozenSummonsAttachment(runDirectory, attachmentPath) {
   const absolute = isAbsolute8(attachmentPath) ? attachmentPath : resolve8(attachmentPath);
-  return pathContainedIn(join30(runDirectory, "attachments"), absolute);
+  return pathContainedIn(join31(runDirectory, "attachments"), absolute);
 }
 async function prepareSummonsResumeMaterials(runDirectory, summons) {
   if (summons === void 0) return void 0;
@@ -28428,7 +28816,7 @@ async function runPostAdmissionSeatResume(input) {
     }
     let turnRequest = await input.buildTurnRequest(admittedForBuild, request);
     if (openCourtAttemptId !== void 0 || request.summons !== void 0 || request.message !== void 0) {
-      const courtAttemptId = openCourtAttemptId ?? (turnRequest.courtAttemptId !== void 0 && turnRequest.courtAttemptId.length > 0 ? turnRequest.courtAttemptId : randomUUID6());
+      const courtAttemptId = openCourtAttemptId ?? (turnRequest.courtAttemptId !== void 0 && turnRequest.courtAttemptId.length > 0 ? turnRequest.courtAttemptId : randomUUID7());
       turnRequest = { ...turnRequest, courtAttemptId };
       if (openCourtAttemptId === void 0) {
         const court = {
@@ -28444,6 +28832,9 @@ async function runPostAdmissionSeatResume(input) {
     if (input.env.stationChild === true) {
       let firstTurn;
       const stationAdapters = withOnceSuccessfulBeforeDispatch(adapters);
+      const invocationScopeId = mintEngineDetourInvocationScope({
+        ...input.effectiveEngine === void 0 ? {} : { effectiveEngine: input.effectiveEngine }
+      });
       return await runWithAutoResumeLoop({
         admitted: loaded.admitted,
         principalAuthority: input.env.principalAuthority,
@@ -28470,7 +28861,10 @@ async function runPostAdmissionSeatResume(input) {
                 }
               };
             }
-            const turnRequest = await buildRequestAfterLease();
+            const turnRequest = withEngineDetourInvocationScope(
+              await buildRequestAfterLease(),
+              invocationScopeId
+            );
             firstTurn = turnRequest;
             return turnRequest;
           },
@@ -28541,6 +28935,11 @@ async function runPostAdmissionOneShot(input) {
 async function runPostAdmissionResumable(input) {
   const { admitted, env, io, buildInitialRequest, buildResumeRequest, effectiveEngine } = input;
   const adapters = withOnceSuccessfulBeforeDispatch(input.adapters);
+  const invocationScopeId = mintEngineDetourInvocationScope({
+    ...effectiveEngine === void 0 ? {} : { effectiveEngine }
+  });
+  const buildScopedInitial = () => withEngineDetourInvocationScope(buildInitialRequest(), invocationScopeId);
+  const buildScopedResume = () => withEngineDetourInvocationScope(buildResumeRequest(), invocationScopeId);
   return runWithAutoResumeLoop({
     admitted,
     principalAuthority: env.principalAuthority,
@@ -28548,8 +28947,8 @@ async function runPostAdmissionResumable(input) {
     io,
     sessionAppender: env.sessionAppender,
     autoResumeLimit: env.autoResumeLimit,
-    buildInitialPayload: buildInitialRequest,
-    buildResumePayload: buildResumeRequest,
+    buildInitialPayload: buildScopedInitial,
+    buildResumePayload: buildScopedResume,
     dispatch: async (request, lease, _isFirst, attemptIo) => {
       const result2 = await dispatchPostAdmissionTurn({
         admitted,
@@ -28597,6 +28996,9 @@ async function runPostAdmissionManualResume(input) {
     }
     throw error;
   }
+  const invocationScopeId = mintEngineDetourInvocationScope({
+    ...effectiveEngine === void 0 ? {} : { effectiveEngine }
+  });
   const result2 = await dispatchAfterWriterLease({
     lease,
     build: async () => {
@@ -28608,6 +29010,7 @@ async function runPostAdmissionManualResume(input) {
         }
         request = await buildRequestAfterLease();
       }
+      request = withEngineDetourInvocationScope(request, invocationScopeId);
       return request;
     },
     dispatch: (turnRequest) => dispatchPostAdmissionTurn({
@@ -28647,6 +29050,7 @@ var init_post_admission = __esm({
     init_session_identity();
     init_host_contracts();
     init_case_dossier_delivery();
+    init_engine_detour_usage();
     init_host_transition_prior_native();
     init_public_run_credentials();
     init_run_lifecycle();
@@ -29969,7 +30373,7 @@ __export(public_role_summons_exports, {
   summonPublicRole: () => summonPublicRole
 });
 import { existsSync as existsSync10 } from "node:fs";
-import { join as join31 } from "node:path";
+import { join as join32 } from "node:path";
 function createCapturingIo() {
   const chunks = [];
   return {
@@ -29992,7 +30396,7 @@ function parentDir(path) {
 function walkPackageRoot(start) {
   let dir = start;
   for (let i = 0; i < 12; i += 1) {
-    if (existsSync10(join31(dir, "package.json")) && existsSync10(join31(dir, "souls"))) {
+    if (existsSync10(join32(dir, "package.json")) && existsSync10(join32(dir, "souls"))) {
       return dir;
     }
     const parent = parentDir(dir);
@@ -30045,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(
@@ -30061,32 +30471,43 @@ 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) {
   const packageRoot2 = resolveSummonsPackageRoot(options.packageRoot);
   const home = await resolveSummonHome(options);
-  const agentDir = options.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join31(home, ".pi", "agent");
+  const agentDir = options.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join32(home, ".pi", "agent");
   const {
     loadCredentialProviders: loadCredentialProviders2,
     loadPublicCliConfig: loadPublicCliConfig2,
@@ -30095,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": {
@@ -30142,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": {
@@ -30150,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": {
@@ -30200,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": {
@@ -30208,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": {
@@ -30216,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;
     }
   }
@@ -31325,8 +31754,8 @@ var init_analyst_book_key = __esm({
 });
 
 // src/analyst-index.ts
-import { open as open3, readFile as readFile21, unlink as unlink4 } from "node:fs/promises";
-import { dirname as dirname16, join as join32 } from "node:path";
+import { open as open3, readFile as readFile20, unlink as unlink4 } from "node:fs/promises";
+import { dirname as dirname17, join as join33 } from "node:path";
 function sleep(ms) {
   return new Promise((resolve10) => {
     setTimeout(resolve10, ms);
@@ -31334,8 +31763,8 @@ function sleep(ms) {
 }
 async function withAnalystLibraryIndexLock(ledgerHome, fn) {
   const indexPath = analystLibraryIndexPath(ledgerHome);
-  ensureRealDirectoryTree(ledgerHome, dirname16(indexPath));
-  const lockPath = join32(dirname16(indexPath), LIBRARY_INDEX_LOCK_NAME);
+  ensureRealDirectoryTree(ledgerHome, dirname17(indexPath));
+  const lockPath = join33(dirname17(indexPath), LIBRARY_INDEX_LOCK_NAME);
   assertLedgerFileInsideHome(lockPath, ledgerHome);
   const startedAt = Date.now();
   while (true) {
@@ -31362,7 +31791,7 @@ async function withAnalystLibraryIndexLock(ledgerHome, fn) {
   }
 }
 function analystLibraryIndexPath(ledgerHome) {
-  return join32(ledgerHome, "analyst", "library-index.json");
+  return join33(ledgerHome, "analyst", "library-index.json");
 }
 function rowFromIssueMetricsPage(page) {
   return {
@@ -31453,7 +31882,7 @@ async function readAnalystLibraryIndexPage(ledgerHome) {
   const path = analystLibraryIndexPath(ledgerHome);
   let raw;
   try {
-    raw = await readFile21(path, "utf8");
+    raw = await readFile20(path, "utf8");
   } catch (error) {
     if (error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR")) {
       return void 0;
@@ -31471,7 +31900,7 @@ async function readAnalystLibraryIndexPage(ledgerHome) {
 }
 async function writeAnalystLibraryIndexPage(ledgerHome, page) {
   const path = analystLibraryIndexPath(ledgerHome);
-  ensureRealDirectoryTree(ledgerHome, dirname16(path));
+  ensureRealDirectoryTree(ledgerHome, dirname17(path));
   assertLedgerFileInsideHome(path, ledgerHome);
   await writeFileAtomically(path, `${JSON.stringify(page, null, 2)}
 `);
@@ -31657,23 +32086,23 @@ var init_analyst_cohort = __esm({
 });
 
 // src/analyst-ledger.ts
-import { readdir as readdir9, readFile as readFile22 } from "node:fs/promises";
-import { basename as basename8, join as join33 } from "node:path";
+import { readdir as readdir9, readFile as readFile21 } from "node:fs/promises";
+import { basename as basename8, join as join34 } from "node:path";
 function isMissingPathError6(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
 function errorText3(error) {
   return error instanceof Error ? error.message : String(error);
 }
-function isRecord10(value) {
+function isRecord11(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function readExistingRunLifecycleState(runDirectory) {
   try {
     const raw = JSON.parse(
-      await readFile22(join33(runDirectory, "run-state.json"), "utf8")
+      await readFile21(join34(runDirectory, "run-state.json"), "utf8")
     );
-    if (!isRecord10(raw) || typeof raw.state !== "string") return void 0;
+    if (!isRecord11(raw) || typeof raw.state !== "string") return void 0;
     return raw.state;
   } catch {
     return void 0;
@@ -31703,13 +32132,13 @@ async function listLedgerBookNames(booksRoot) {
 async function readInvocationScopeFields(runDirectory) {
   let raw;
   try {
-    raw = await readFile22(join33(runDirectory, "invocation.json"), "utf8");
+    raw = await readFile21(join34(runDirectory, "invocation.json"), "utf8");
   } catch (error) {
     if (isMissingPathError6(error)) return void 0;
     throw error;
   }
   const parsed = JSON.parse(raw);
-  if (!isRecord10(parsed)) return void 0;
+  if (!isRecord11(parsed)) return void 0;
   if (typeof parsed.projectRoot !== "string" || parsed.projectRoot.trim() === "") {
     return void 0;
   }
@@ -31736,15 +32165,15 @@ function decideIssueScope(input) {
 }
 async function resolveSessionFile(runDirectory) {
   try {
-    const raw = await readFile22(join33(runDirectory, "invocation.json"), "utf8");
+    const raw = await readFile21(join34(runDirectory, "invocation.json"), "utf8");
     const parsed = JSON.parse(raw);
-    if (isRecord10(parsed) && typeof parsed.sessionFile === "string" && parsed.sessionFile.trim() !== "") {
+    if (isRecord11(parsed) && typeof parsed.sessionFile === "string" && parsed.sessionFile.trim() !== "") {
       return parsed.sessionFile;
     }
   } catch (error) {
     if (!isMissingPathError6(error)) throw error;
   }
-  return join33(runDirectory, "session", "session.jsonl");
+  return join34(runDirectory, "session", "session.jsonl");
 }
 function attributeSessionRowsForRun(input) {
   if (pathContainedIn(input.runDirectory, input.sessionFile)) {
@@ -31916,9 +32345,9 @@ async function classifyScopedRun(input) {
   }
   let gateCycles;
   try {
-    const parentSessionFile = join33(input.runDirectory, "session", "session.jsonl");
+    const parentSessionFile = join34(input.runDirectory, "session", "session.jsonl");
     gateCycles = await readAnalystGateCyclesFromAuditorRoles(
-      join33(input.runDirectory, "session", "auditor-roles"),
+      join34(input.runDirectory, "session", "auditor-roles"),
       { parentSessionFile }
     );
   } catch (error) {
@@ -31951,7 +32380,7 @@ async function classifyScopedRun(input) {
 async function scanAnalystIssueRuns(input) {
   const ledgerHome = resolveActivationLedgerHome(input.home);
   const scopeTicketNumber = input.ticketNumber;
-  const booksRoot = join33(ledgerHome, "books");
+  const booksRoot = join34(ledgerHome, "books");
   let wholeBook = false;
   let scopeRootIdentity;
   let bookNames;
@@ -31983,7 +32412,7 @@ async function scanAnalystIssueRuns(input) {
   const unreadable = [];
   const scopeConflicts = [];
   for (const book of bookNames) {
-    const bookDir = join33(booksRoot, book);
+    const bookDir = join34(booksRoot, book);
     let runDirectories;
     try {
       runDirectories = await listBookRunDirectories(bookDir);
@@ -32044,7 +32473,7 @@ var init_analyst_ledger = __esm({
 });
 
 // src/analyst-metric-families/acceptance-success-rework.ts
-function isRecord11(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function wallMsFromSpan(span) {
@@ -32053,21 +32482,21 @@ function wallMsFromSpan(span) {
 function findCollectorGroups(body) {
   if (Array.isArray(body.groups)) return body.groups;
   const receipt = body.receipt;
-  if (isRecord11(receipt) && Array.isArray(receipt.groups)) return receipt.groups;
+  if (isRecord12(receipt) && Array.isArray(receipt.groups)) return receipt.groups;
   const outcome = body.outcome;
-  if (isRecord11(outcome)) {
+  if (isRecord12(outcome)) {
     const facts = outcome.decisiveFacts;
-    if (isRecord11(facts) && Array.isArray(facts.groups)) return facts.groups;
+    if (isRecord12(facts) && Array.isArray(facts.groups)) return facts.groups;
   }
   return void 0;
 }
 function extractStatus(body) {
   const outcome = body.outcome;
-  if (isRecord11(outcome) && typeof outcome.status === "string" && outcome.status.trim() !== "") {
+  if (isRecord12(outcome) && typeof outcome.status === "string" && outcome.status.trim() !== "") {
     return outcome.status;
   }
   const receipt = body.receipt;
-  if (isRecord11(receipt) && typeof receipt.status === "string" && receipt.status.trim() !== "") {
+  if (isRecord12(receipt) && typeof receipt.status === "string" && receipt.status.trim() !== "") {
     return receipt.status;
   }
   if (typeof body.status === "string" && body.status.trim() !== "") {
@@ -32692,21 +33121,21 @@ var init_leg_wall_clock = __esm({
 });
 
 // src/analyst-metric-families/round-timeline.ts
-function isRecord12(value) {
+function isRecord13(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function wallMsFromSpan2(startedAt, endedAt) {
   return Date.parse(endedAt) - Date.parse(startedAt);
 }
 function readOutcomeStatus(body) {
-  if (!isRecord12(body.outcome)) return void 0;
+  if (!isRecord13(body.outcome)) return void 0;
   const status = body.outcome.status;
   if (typeof status !== "string" || status.trim() === "") return void 0;
   return status;
 }
 function readClassCount(body) {
-  if (!isRecord12(body.outcome)) return void 0;
-  if (!isRecord12(body.outcome.decisiveFacts)) return void 0;
+  if (!isRecord13(body.outcome)) return void 0;
+  if (!isRecord13(body.outcome.decisiveFacts)) return void 0;
   const classCount = body.outcome.decisiveFacts.classCount;
   if (typeof classCount !== "number" || !Number.isFinite(classCount)) {
     return void 0;
@@ -32850,7 +33279,7 @@ var init_analyst_metric_family = __esm({
 
 // src/analyst-page.ts
 import { createHash as createHash5 } from "node:crypto";
-import { dirname as dirname17, join as join34 } from "node:path";
+import { dirname as dirname18, join as join35 } from "node:path";
 function analystIssuePageKey(address) {
   const parts = ["book", address.bookKey];
   if (address.issueNumber !== void 0) {
@@ -32861,7 +33290,7 @@ function analystIssuePageKey(address) {
   return createHash5("sha256").update(parts.join("\0")).digest("hex").slice(0, 32);
 }
 function analystIssuePagePath(ledgerHome, address) {
-  return join34(ledgerHome, "analyst", "issues", `${analystIssuePageKey(address)}.json`);
+  return join35(ledgerHome, "analyst", "issues", `${analystIssuePageKey(address)}.json`);
 }
 function analystIssuePageAddressFromPage(page) {
   return {
@@ -32980,7 +33409,7 @@ async function buildAnalystIssueMetricsPage(input) {
 }
 async function writeAnalystIssueMetricsPage(ledgerHome, page) {
   const path = analystIssuePagePath(ledgerHome, analystIssuePageAddressFromPage(page));
-  ensureRealDirectoryTree(ledgerHome, dirname17(path));
+  ensureRealDirectoryTree(ledgerHome, dirname18(path));
   assertLedgerFileInsideHome(path, ledgerHome);
   await writeFileAtomically(path, `${JSON.stringify(page, null, 2)}
 `);
@@ -32997,7 +33426,7 @@ var init_analyst_page = __esm({
 });
 
 // src/analyst-entry.ts
-import { readFile as readFile23 } from "node:fs/promises";
+import { readFile as readFile22 } from "node:fs/promises";
 function isMissingPathError7(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
@@ -33027,7 +33456,7 @@ async function readOrComputeAnalystIssuePage(input, options) {
     ...issueNumber === void 0 && input.bookKey === void 0 ? { scopeRootIdentity: projectRoot } : {}
   });
   try {
-    const raw = await readFile23(pagePath, "utf8");
+    const raw = await readFile22(pagePath, "utf8");
     const page = JSON.parse(raw);
     if (cachedPageMatchesRequestedScope(page, { bookKey, ...input })) {
       return { mode: "issue", page, pagePath };
@@ -33122,7 +33551,7 @@ async function runAnalystModelGroupsMode(input, home) {
       scopeRootIdentity: projectRoot
     });
     try {
-      const raw = await readFile23(pagePath, "utf8");
+      const raw = await readFile22(pagePath, "utf8");
       JSON.parse(raw);
     } catch (error) {
       if (!isMissingPathError7(error)) {
@@ -33221,7 +33650,7 @@ var init_analyst_entry = __esm({
 });
 
 // src/public-cli/analyst-run.ts
-import { readFile as readFile24 } from "node:fs/promises";
+import { readFile as readFile23 } from "node:fs/promises";
 import { isAbsolute as isAbsolute10, resolve as resolve9 } from "node:path";
 function resolveAnalystIssueBookKeyFromCwd(cwd = process.cwd()) {
   try {
@@ -33274,7 +33703,7 @@ async function buildAnalystSweepModeInputFromAttachmentPaths(attachmentPaths) {
   const absolute = isAbsolute10(sourcePath) ? sourcePath : resolve9(sourcePath);
   let bytes;
   try {
-    bytes = await readFile24(absolute);
+    bytes = await readFile23(absolute);
   } catch (error) {
     throw new CliUsageError(
       `analyst sweep attachment is not a readable regular file: ${sourcePath}`,
@@ -33394,7 +33823,7 @@ __export(cli_exports, {
   runAkRole: () => runAkRole
 });
 import { realpath as realpath6 } from "node:fs/promises";
-import { join as join35 } from "node:path";
+import { join as join36 } from "node:path";
 function takePublicGlobalFlag(argv, index, options) {
   const tokens = argv.slice(index);
   const taken = options.takeDashed(tokens);
@@ -33426,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;
@@ -33444,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
   );
@@ -33470,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,
@@ -33491,7 +33955,7 @@ function resolveHome(env) {
   return env.home ?? packageMachineHome();
 }
 function resolveAgentDir(env, home) {
-  return env.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join35(home, ".pi", "agent");
+  return env.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join36(home, ".pi", "agent");
 }
 function parseThinking(value) {
   return value;
@@ -33707,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"
@@ -34108,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(
@@ -34506,7 +34828,7 @@ var init_cli = __esm({
 
 // src/public-cli/main.ts
 import { existsSync as existsSync11 } from "node:fs";
-import { dirname as dirname18, join as join36 } from "node:path";
+import { dirname as dirname19, join as join37 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/public-cli/host-pi-runtime.ts
@@ -34593,10 +34915,10 @@ function linkPackage(packageRoot2, name, targetDir) {
 }
 
 // src/public-cli/main.ts
-var here = dirname18(fileURLToPath2(import.meta.url));
+var here = dirname19(fileURLToPath2(import.meta.url));
 function resolvePackageRoot(binDir) {
-  const canonical = join36(binDir, "..", "..");
-  if (existsSync11(join36(canonical, "package.json"))) {
+  const canonical = join37(binDir, "..", "..");
+  if (existsSync11(join37(canonical, "package.json"))) {
     return canonical;
   }
   return binDir;