@akagilnc/pi-workflow-roles 0.1.4586 → 0.1.4631

package/dist/acp-host/production-host.js

@@ -62,7 +62,7 @@ async function spawnEngineDetourOnce(input) {
   }
   const command = input.argv[0];
   const args = input.argv.slice(1);
-  return await new Promise((resolve22, reject) => {
+  return await new Promise((resolve21, reject) => {
     let settled = false;
     const signal = input.signal;
     const child = spawn(command, args, {
@@ -92,7 +92,7 @@ async function spawnEngineDetourOnce(input) {
       if (signal !== void 0) {
         signal.removeEventListener("abort", onAbort);
       }
-      resolve22(result);
+      resolve21(result);
     };
     const onAbort = () => {
       fail4(signal !== void 0 ? abortReasonError(signal) : new Error("aborted"));
@@ -202,7 +202,6 @@ var activation_ledger_topology_exports = {};
 __export(activation_ledger_topology_exports, {
   ActivationLedgerError: () => ActivationLedgerError,
   activationBookDirectory: () => activationBookDirectory,
-  activationWaitingLedgerPath: () => activationWaitingLedgerPath,
   assertLedgerFileInsideHome: () => assertLedgerFileInsideHome,
   ensureRealDirectoryTree: () => ensureRealDirectoryTree,
   errnoCode: () => errnoCode,
@@ -265,9 +264,6 @@ function resolveActivationLedgerHomeForPath(path) {
 function activationBookDirectory(ledgerHome, bookKey) {
   return join2(ledgerHome, "books", bookKey);
 }
-function activationWaitingLedgerPath(ledgerHome, bookKey) {
-  return join2(activationBookDirectory(ledgerHome, bookKey), "waiting.jsonl");
-}
 function pathContainedIn(root, candidate) {
   const rel = relative(root, candidate);
   return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
@@ -1807,7 +1803,48 @@ var init_collector_output = __esm({
 });
 
 // src/package-contracts/navigator-output.ts
+var navigator_output_exports = {};
+__export(navigator_output_exports, {
+  NAVIGATOR_ACCEPTED_TEXT: () => NAVIGATOR_ACCEPTED_TEXT,
+  NAVIGATOR_OUTPUT_TOOL_NAME: () => NAVIGATOR_OUTPUT_TOOL_NAME,
+  navigatorOutputSchema: () => navigatorOutputSchema,
+  navigatorProseFromUnknown: () => navigatorProseFromUnknown,
+  projectLawfulNavigatorOutput: () => projectLawfulNavigatorOutput,
+  validateRecordedNavigatorOutput: () => validateRecordedNavigatorOutput
+});
 import { Type as Type5 } from "typebox";
+function projectLawfulNavigatorOutput(value) {
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "string") return { prose: value };
+  if (typeof value === "object" && !Array.isArray(value)) {
+    const record4 = value;
+    if (typeof record4.prose === "string") return { prose: record4.prose };
+    if (record4.prose !== void 0 && record4.prose !== null) {
+      return { prose: typeof record4.prose === "string" ? record4.prose : String(record4.prose) };
+    }
+    const keys = Object.keys(record4);
+    if (keys.length === 0) return { prose: "" };
+    try {
+      return { prose: JSON.stringify(record4) };
+    } catch {
+      return { prose: String(record4) };
+    }
+  }
+  return { prose: String(value) };
+}
+function validateRecordedNavigatorOutput(value) {
+  const projected = projectLawfulNavigatorOutput(value);
+  if (projected === void 0) {
+    throw new Error("Navigator output is empty");
+  }
+  return projected;
+}
+function navigatorProseFromUnknown(value) {
+  const projected = projectLawfulNavigatorOutput(value);
+  if (projected === void 0) return void 0;
+  const trimmed = projected.prose.trim();
+  return trimmed === "" ? void 0 : projected.prose;
+}
 var NAVIGATOR_OUTPUT_TOOL_NAME, NAVIGATOR_ACCEPTED_TEXT, navigatorOutputSchema;
 var init_navigator_output = __esm({
   "src/package-contracts/navigator-output.ts"() {
@@ -1819,11 +1856,8 @@ var init_navigator_output = __esm({
     navigatorOutputSchema = withTerminatingOutputDeclarations(
       openToolObject(
         Type5.Object({
-          status: Type5.Unknown({
-            description: "advice \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8"
-          }),
-          candidates: Type5.Unknown({
-            description: "\u6392\u597D\u5E8F\u7684\u8DEF\u7EBF\u5EFA\u8BAE\u6570\u7EC4\uFF0C\u5143\u7D20\u542B next/phase/reason \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8"
+          prose: Type5.Unknown({
+            description: "\u6E38\u5955\u4F7F\u6563\u6587\u5EFA\u8BAE\uFF0C\u539F\u6837\u5448\u73B0\u3002\u4E0D\u8981\u6C42 candidates/next \u7B49\u7ED3\u6784\u5316\u5B57\u6BB5\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8"
           })
         })
       )
@@ -3405,9 +3439,6 @@ ${paths.join("\n")}`
       if (typeof process.env.AK_ROLE_AUDITOR_SUBJECT === "string" && process.env.AK_ROLE_AUDITOR_SUBJECT.trim() !== "") {
         env.AK_ROLE_AUDITOR_SUBJECT = process.env.AK_ROLE_AUDITOR_SUBJECT;
       }
-      if (request.correlationId !== void 0 && request.correlationId.trim() !== "") {
-        env.AK_CORRELATION_ID = request.correlationId;
-      }
       if (config.recordLaunchedRolePackageIdentity !== void 0 && config.observeLaunchedRolePackageIdentity !== void 0) {
         await config.recordLaunchedRolePackageIdentity(
           request.runDirectory,
@@ -4754,7 +4785,7 @@ function normalizeReviewComment(raw) {
 function createGhApiRunner(options = {}) {
   const spawnImpl = options.spawnImpl ?? spawn3;
   return async (args, runOptions = {}) => {
-    return await new Promise((resolve22, reject) => {
+    return await new Promise((resolve21, reject) => {
       const signal = runOptions.signal;
       if (signal?.aborted) {
         reject(signal.reason ?? new Error("aborted"));
@@ -4827,11 +4858,11 @@ function createGhApiRunner(options = {}) {
               const value = line2.slice(idx + 1).trim();
               headers[name] = value;
             }
-            resolve22({ status, headers, bodyText });
+            resolve21({ status, headers, bodyText });
             return;
           }
           if (code === 0) {
-            resolve22({ status: 200, headers: {}, bodyText: stdout });
+            resolve21({ status: 200, headers: {}, bodyText: stdout });
             return;
           }
           const failure2 = new Error(
@@ -5420,6 +5451,56 @@ var init_typed_provider_http = __esm({
 });
 
 // src/public-cli/run-lifecycle.ts
+var run_lifecycle_exports = {};
+__export(run_lifecycle_exports, {
+  AUTO_RESUME_LIMIT: () => AUTO_RESUME_LIMIT,
+  GATE_DOSSIER_POINTER_PREFIX: () => GATE_DOSSIER_POINTER_PREFIX,
+  RESUME_TRANSPORT_ENVELOPE: () => RESUME_TRANSPORT_ENVELOPE,
+  RunWriterLeaseHeldError: () => RunWriterLeaseHeldError,
+  V1_RESUMABLE_PROVIDERS: () => V1_RESUMABLE_PROVIDERS,
+  acquireRunWriterLease: () => acquireRunWriterLease,
+  autopsyWriterLock: () => autopsyWriterLock,
+  buildAutoResumeContinuationPrompt: () => buildAutoResumeContinuationPrompt,
+  buildResumeContinuationPrompt: () => buildResumeContinuationPrompt,
+  clearCurrentCourt: () => clearCurrentCourt,
+  clearTypedProviderHttpObservation: () => clearTypedProviderHttpObservation,
+  describeErrorIdentity: () => describeErrorIdentity,
+  findLatestRunIdForSeatTicket: () => findLatestRunIdForSeatTicket,
+  findRunDirectoryById: () => findRunDirectoryById,
+  isDurablePrincipalAvailable: () => isDurablePrincipalAvailable,
+  isV1ResumableProvider: () => isV1ResumableProvider,
+  loadResumableCoderRun: () => loadResumableCoderRun,
+  loadResumableCollectorRun: () => loadResumableCollectorRun,
+  loadResumableCountersignRun: () => loadResumableCountersignRun,
+  loadResumableDiaristRun: () => loadResumableDiaristRun,
+  loadResumableDoctorRun: () => loadResumableDoctorRun,
+  loadResumableFixerRun: () => loadResumableFixerRun,
+  loadResumableGleanerLeftRun: () => loadResumableGleanerLeftRun,
+  loadResumableInspectorRun: () => loadResumableInspectorRun,
+  loadResumableInstructionSeatRun: () => loadResumableInstructionSeatRun,
+  loadResumableJudgeRun: () => loadResumableJudgeRun,
+  loadResumableMergerRun: () => loadResumableMergerRun,
+  loadResumableNotaryRun: () => loadResumableNotaryRun,
+  loadResumableReviewerRun: () => loadResumableReviewerRun,
+  loadResumableSecretariatRun: () => loadResumableSecretariatRun,
+  markRunAdmitted: () => markRunAdmitted,
+  markRunResumable: () => markRunResumable,
+  markRunRunning: () => markRunRunning,
+  markRunTerminal: () => markRunTerminal,
+  parentRunPathFromGatePointerInstruction: () => parentRunPathFromGatePointerInstruction,
+  peekRoleRunRole: () => peekRoleRunRole,
+  readCurrentCourt: () => readCurrentCourt,
+  readLatestTypedProviderHttpObservation: () => readLatestTypedProviderHttpObservation,
+  readRoleRunIdentity: () => readRoleRunIdentity,
+  readRoleRunState: () => readRoleRunState,
+  readRunParentPath: () => readRunParentPath,
+  readTypedHttp429Observation: () => readTypedHttp429Observation,
+  recordCurrentCourt: () => recordCurrentCourt,
+  recordTypedProviderHttpStatus: () => recordTypedProviderHttpStatus,
+  renderResumeCommand: () => renderResumeCommand,
+  selectResumeContinuationPrompt: () => selectResumeContinuationPrompt,
+  writeRoleRunState: () => writeRoleRunState
+});
 import { chmod, lstat as lstat2, open, readdir as readdir4, readFile as readFile9, unlink as unlink2, writeFile as writeFile4 } from "node:fs/promises";
 import { basename as basename4, join as join15 } from "node:path";
 function selectResumeContinuationPrompt(message, engineMaterial) {
@@ -5435,6 +5516,15 @@ function buildResumeContinuationPrompt(options) {
     })
   );
 }
+function buildAutoResumeContinuationPrompt(options) {
+  return selectResumeContinuationPrompt(
+    RESUME_TRANSPORT_ENVELOPE,
+    engineSessionMaterialFromOptions({
+      packageRoot: options.packageRoot,
+      ...pickEngineAxis(options)
+    })
+  );
+}
 function isV1ResumableProvider(provider) {
   return V1_RESUMABLE_PROVIDERS.includes(provider);
 }
@@ -5598,6 +5688,11 @@ function materializeRoleRunFromDisk(disk, authority) {
     return void 0;
   }
 }
+async function readRoleRunState(runDirectory, authority) {
+  const disk = await readRoleRunStateDisk(runDirectory);
+  if (disk === void 0) return void 0;
+  return materializeRoleRunFromDisk(disk, authority)?.run;
+}
 async function readRoleRunIdentity(runDirectory) {
   const disk = await readRoleRunStateDisk(runDirectory);
   if (disk === void 0) return void 0;
@@ -6331,6 +6426,75 @@ async function loadResumableJudgeRun(home, runId, authority) {
   };
   return seatLoadedResult(loaded, admitted);
 }
+async function loadResumableCoderRun(home, runId, authority) {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "coder") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not coder`
+    );
+  }
+  const phase = loaded.admittedFields.phase ?? loaded.run.phase;
+  if (phase !== "plan" && phase !== "apply") {
+    throw new CliUsageError(
+      `role run admitted coder phase is missing: ${runId}`
+    );
+  }
+  const taskPath = loaded.admittedFields.taskPath;
+  if (taskPath === void 0) {
+    throw new CliUsageError(
+      `role run admitted coder task path is missing: ${runId}`
+    );
+  }
+  if (loaded.admittedFields.instruction.trim() === "") {
+    throw new CliUsageError(
+      `role run admitted coder task is blank: ${runId}`
+    );
+  }
+  const admitted = {
+    role: "coder",
+    phase,
+    ...resumedBaseAdmitted(loaded),
+    instructionEmpty: false,
+    taskPath
+  };
+  return seatLoadedResult(loaded, admitted);
+}
+async function loadResumableFixerRun(home, runId, authority) {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "fixer") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not fixer`
+    );
+  }
+  const phase = loaded.admittedFields.phase ?? loaded.run.phase;
+  if (phase !== "plan" && phase !== "apply") {
+    throw new CliUsageError(
+      `role run admitted fixer phase is missing: ${runId}`
+    );
+  }
+  const packetPath = loaded.admittedFields.packetPath;
+  if (packetPath === void 0) {
+    throw new CliUsageError(
+      `role run admitted fixer packet path is missing: ${runId}`
+    );
+  }
+  if (loaded.admittedFields.instruction.trim() === "") {
+    throw new CliUsageError(
+      `role run admitted fixer instruction is blank: ${runId}`
+    );
+  }
+  const prerequisites = loaded.admittedFields.prerequisites ?? Object.freeze([]);
+  const admitted = {
+    role: "fixer",
+    phase,
+    ...resumedBaseAdmitted(loaded),
+    instructionEmpty: false,
+    packetPath,
+    ...loaded.admittedFields.prerequisitesPath === void 0 ? {} : { prerequisitesPath: loaded.admittedFields.prerequisitesPath },
+    prerequisites
+  };
+  return seatLoadedResult(loaded, admitted);
+}
 async function loadResumableReviewerRun(home, runId, authority) {
   const loaded = await loadResumableRunRecord(home, runId, authority);
   if (loaded.run.role !== "reviewer") {
@@ -6404,6 +6568,26 @@ async function loadResumableInstructionSeatRun(home, runId, authority) {
   };
   return seatLoadedResult(loaded, admitted);
 }
+async function loadResumableGleanerLeftRun(home, runId, authority) {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "gleaner-left") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not gleaner-left`
+    );
+  }
+  const baseRevision = loaded.admittedFields.baseRevision;
+  if (baseRevision === void 0 || baseRevision.trim() === "") {
+    throw new CliUsageError(
+      `role run admitted gleaner-left base revision is missing: ${runId}`
+    );
+  }
+  const admitted = {
+    role: "gleaner-left",
+    ...resumedBaseAdmitted(loaded),
+    baseRevision
+  };
+  return seatLoadedResult(loaded, admitted);
+}
 async function loadResumableDiaristRun(home, runId, authority) {
   const loaded = await loadResumableRunRecord(home, runId, authority);
   if (loaded.run.role !== "diarist") {
@@ -6417,6 +6601,88 @@ async function loadResumableDiaristRun(home, runId, authority) {
   };
   return seatLoadedResult(loaded, admitted);
 }
+async function loadResumableSecretariatRun(home, runId, authority) {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "secretariat") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not secretariat`
+    );
+  }
+  const admitted = {
+    role: "secretariat",
+    ...resumedBaseAdmitted(loaded)
+  };
+  return seatLoadedResult(loaded, admitted);
+}
+async function loadResumableMergerRun(home, runId, authority) {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "merger") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not merger`
+    );
+  }
+  const mergerInputPath = loaded.admittedFields.mergerInputPath;
+  if (mergerInputPath === void 0) {
+    throw new CliUsageError(
+      `role run admitted merger input path is missing: ${runId}`
+    );
+  }
+  const derived = loaded.admittedFields.derived;
+  if (derived === void 0) {
+    throw new CliUsageError(
+      `role run admitted merger envelope is missing: ${runId}`
+    );
+  }
+  if (loaded.admittedFields.instruction.trim() === "") {
+    throw new CliUsageError(
+      `role run admitted merger task is blank: ${runId}`
+    );
+  }
+  const admitted = {
+    role: "merger",
+    ...resumedBaseAdmitted(loaded),
+    instructionEmpty: false,
+    mergerInputPath,
+    derived
+  };
+  return seatLoadedResult(loaded, admitted);
+}
+async function loadResumableCollectorRun(home, runId, authority) {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "collector") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not collector`
+    );
+  }
+  const { prNumber, repository, repositoryDisplay, manifestDigest } = loaded.admittedFields;
+  if (repository === void 0 || repositoryDisplay === void 0 || manifestDigest === void 0) {
+    throw new CliUsageError(
+      `role run admitted collector repository identity is missing: ${runId}`
+    );
+  }
+  let parsedRepository;
+  try {
+    parsedRepository = parseCollectorRepository(repositoryDisplay);
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new CliUsageError(detail, { cause: error });
+  }
+  if (parsedRepository.canonical !== repository) {
+    throw new CliUsageError(
+      `role run admitted collector repository does not match its canonical form: ${runId}`
+    );
+  }
+  const admitted = {
+    role: "collector",
+    ...resumedBaseAdmitted(loaded),
+    ...prNumber === void 0 ? {} : { prNumber },
+    repository: parsedRepository,
+    ...loaded.admittedFields.requestManifestPath === void 0 ? {} : { requestManifestPath: loaded.admittedFields.requestManifestPath },
+    ...loaded.admittedFields.waitWindowMs === void 0 ? {} : { waitWindowMs: loaded.admittedFields.waitWindowMs },
+    manifestDigest
+  };
+  return seatLoadedResult(loaded, admitted);
+}
 async function loadResumableDoctorRun(home, runId, authority) {
   const loaded = await loadResumableRunRecord(home, runId, authority);
   if (loaded.run.role !== "doctor") {
@@ -6474,6 +6740,12 @@ async function loadResumableInspectorRun(home, runId, authority) {
   };
   return seatLoadedResult(loaded, admitted);
 }
+async function peekRoleRunRole(home, runId) {
+  const runDirectory = await findRunDirectoryById(home, runId);
+  if (runDirectory === void 0) return void 0;
+  const run = await readRoleRunIdentity(runDirectory);
+  return run?.role;
+}
 var V1_RESUMABLE_PROVIDERS, AUTO_RESUME_LIMIT, RESUME_TRANSPORT_ENVELOPE, RUN_STATE_FILE, WRITER_LOCK_FILE, RunWriterLeaseHeldError, WRITER_LEASE_RECLAIM_ROUNDS, GATE_DOSSIER_POINTER_PREFIX;
 var init_run_lifecycle = __esm({
   "src/public-cli/run-lifecycle.ts"() {
@@ -6490,7 +6762,7 @@ var init_run_lifecycle = __esm({
     init_invocation();
     V1_RESUMABLE_PROVIDERS = ["openai-codex", "xai"];
     AUTO_RESUME_LIMIT = 2;
-    RESUME_TRANSPORT_ENVELOPE = "[ak-role:resume-continue]";
+    RESUME_TRANSPORT_ENVELOPE = "\u7EE7\u7EED\u3002";
     RUN_STATE_FILE = "run-state.json";
     WRITER_LOCK_FILE = "writer.lock";
     RunWriterLeaseHeldError = class extends Error {
@@ -7545,7 +7817,7 @@ var init_option_definitions = __esm({
       },
       navigator: {
         command: "navigator",
-        summary: "Direct Navigator (\u6E38\u5955\u4F7F) route advice: ordered next-role candidates.",
+        summary: "Direct Navigator (\u6E38\u5955\u4F7F) free-form prose route advice.",
         usage: ["ak-role navigator [options] [instruction]"],
         examples: [
           'ak-role navigator "\u521A\u5B8C\u6210 coder apply \u6536\u655B\uFF0C\u4E0B\u4E00\u6B65\uFF1F"'
@@ -11835,31 +12107,58 @@ async function restoreState(cwd, runId, scope) {
     }, 0)
   };
 }
+function sessionParentFromHostContext(context) {
+  const runDirectory = runDirectoryFromHostContext(context);
+  if (runDirectory !== void 0) return join24(runDirectory, "session", "session.jsonl");
+  const sessionFile = context.sessionManager.getSessionFile?.();
+  if (typeof sessionFile === "string" && sessionFile.length > 0) return sessionFile;
+  const sessionDir = context.sessionManager.getSessionDir?.();
+  if (typeof sessionDir === "string" && sessionDir.length > 0) {
+    return join24(sessionDir, "session.jsonl");
+  }
+  return void 0;
+}
+function homeFromHostContext(context, home) {
+  if (home !== void 0) return home;
+  const sessionParent = sessionParentFromHostContext(context);
+  return sessionParent !== void 0 ? tryHomeFromAkRolesPath(sessionParent) : void 0;
+}
+async function sealAcceptedSubmission(options) {
+  const runId = runIdentity(options.context);
+  const attemptId = attemptIdentity(options.context, runId);
+  const sessionParent = sessionParentFromHostContext(options.context);
+  const home = homeFromHostContext(options.context, options.home);
+  const state = await restoreState(options.context.cwd, runId, {
+    ...home === void 0 ? {} : { home },
+    ...sessionParent === void 0 ? {} : { sessionParent }
+  });
+  const pointer = sitianReport({
+    level: "event",
+    kind: "sealed",
+    subject: { runId, attemptId },
+    ...state.prior === void 0 ? {} : { priorEventId: state.prior.identity },
+    payload: {
+      type: "sealed",
+      attemptId,
+      toolCallId: options.toolCallId,
+      role: options.role,
+      accepted: options.accepted
+    },
+    source: "role-runtime",
+    cwd: options.context.cwd,
+    ...home !== void 0 ? { home } : {},
+    ...sessionParent === void 0 ? {} : { sessionParent }
+  });
+  state.prior = pointer;
+}
 function createSubmissionLedgerHost(host, outputTools, failInfrastructure2 = (error) => {
   throw error;
 }, projectClosure = () => void 0, options) {
   const states = /* @__PURE__ */ new Map();
-  const sessionParentFromContext = (context) => {
-    const runDirectory = runDirectoryFromHostContext(context);
-    if (runDirectory !== void 0) {
-      return join24(runDirectory, "session", "session.jsonl");
-    }
-    const sessionFile = context.sessionManager.getSessionFile?.();
-    if (typeof sessionFile === "string" && sessionFile.length > 0) return sessionFile;
-    const sessionDir = context.sessionManager.getSessionDir?.();
-    if (typeof sessionDir === "string" && sessionDir.length > 0) {
-      return join24(sessionDir, "session.jsonl");
-    }
-    return void 0;
-  };
-  const resolveHomeFromContext = (context) => {
-    if (options?.home !== void 0) return options.home;
-    const sessionParent = sessionParentFromContext(context);
-    return sessionParent !== void 0 ? tryHomeFromAkRolesPath(sessionParent) : void 0;
-  };
+  const resolveHomeFromContext = (context) => homeFromHostContext(context, options?.home);
   const stateFor = (context, runId) => states.get(runId) ?? (() => {
     const home = resolveHomeFromContext(context);
-    const sessionParent = sessionParentFromContext(context);
+    const sessionParent = sessionParentFromHostContext(context);
     const pending = restoreState(context.cwd, runId, {
       ...home === void 0 ? {} : { home },
       ...sessionParent === void 0 ? {} : { sessionParent }
@@ -11869,7 +12168,7 @@ function createSubmissionLedgerHost(host, outputTools, failInfrastructure2 = (er
   })();
   const appendFor = (state, context, runId, attemptId, event) => {
     const home = resolveHomeFromContext(context);
-    const sessionParent = sessionParentFromContext(context);
+    const sessionParent = sessionParentFromHostContext(context);
     const pointer = sitianReport({
       level: "event",
       kind: event.type,
@@ -12312,12 +12611,12 @@ function createSystemCollectorClock() {
   return {
     wallNow: () => /* @__PURE__ */ new Date(),
     monoNow: () => Number(process.hrtime.bigint() - start) / 1e6,
-    sleep: (ms, signal) => new Promise((resolve22, reject) => {
+    sleep: (ms, signal) => new Promise((resolve21, reject) => {
       if (signal?.aborted) {
         reject(signal.reason ?? new Error("aborted"));
         return;
       }
-      const timer = setTimeout(resolve22, ms);
+      const timer = setTimeout(resolve21, ms);
       const onAbort = () => {
         clearTimeout(timer);
         reject(signal?.reason ?? new Error("aborted"));
@@ -14197,44 +14496,6 @@ var init_receipt_delivery_policy = __esm({
   }
 });
 
-// src/public-command-renderer.ts
-function isPublicCallableRole2(role) {
-  return PUBLIC_CALLABLE_ROLES3.has(role);
-}
-function renderPublicAkRoleCommand(target) {
-  if (!isPublicCallableRole2(target.role)) return void 0;
-  const role = target.role;
-  const metadata = packagedRoleMetadata(role);
-  if (metadata !== void 0 && "bareCommand" in metadata && metadata.bareCommand === false) {
-    return void 0;
-  }
-  if (target.phase === null || target.phase === void 0) {
-    return `ak-role ${role}`;
-  }
-  if (role === "coder" || role === "fixer") {
-    return `ak-role ${role} ${target.phase}`;
-  }
-  return `ak-role ${role}`;
-}
-var PUBLIC_CALLABLE_ROLES3;
-var init_public_command_renderer = __esm({
-  "src/public-command-renderer.ts"() {
-    "use strict";
-    init_packaged_role_registry();
-    PUBLIC_CALLABLE_ROLES3 = new Set(
-      PACKAGED_ROLE_REGISTRY.map((entry) => entry.role)
-    );
-  }
-});
-
-// src/public-cli/command-renderer.ts
-var init_command_renderer = __esm({
-  "src/public-cli/command-renderer.ts"() {
-    "use strict";
-    init_public_command_renderer();
-  }
-});
-
 // src/public-cli/terminal.ts
 function encodeTerminalField(value) {
   return JSON.stringify(value);
@@ -14245,14 +14506,10 @@ function isLawfulTypedTerminalOutcome(outcome) {
 function exitCodeForTerminalOutcome(outcome) {
   return isLawfulTypedTerminalOutcome(outcome) ? 0 : 1;
 }
-function recommendationNavigatorFact(input) {
-  const command = typeof input.modelCommand === "string" && input.modelCommand.trim() !== "" ? input.modelCommand : isPublicCallableRole2(input.next.role) ? renderPublicAkRoleCommand(input.next) : void 0;
+function adviceNavigatorFact(input) {
   return {
-    disposition: "recommendation",
-    next: input.next,
-    reason: input.reason,
-    ...command === void 0 ? {} : { command },
-    ...input.route === void 0 ? {} : { route: input.route },
+    disposition: "advice",
+    prose: input.prose,
     ...input.advisoryDiagnostic === void 0 ? {} : { advisoryDiagnostic: input.advisoryDiagnostic }
   };
 }
@@ -14280,14 +14537,8 @@ function formatTerminalResult(result) {
   if (result.navigator.advisoryDiagnostic !== void 0) {
     lines.push(`navigator-advisory	${encodeTerminalField(result.navigator.advisoryDiagnostic)}`);
   }
-  if (result.navigator.disposition === "recommendation") {
-    lines.push(
-      `next	${result.navigator.next.role}	${result.navigator.next.phase ?? "none"}`
-    );
-    lines.push(`reason	${encodeTerminalField(result.navigator.reason)}`);
-    if (result.navigator.command !== void 0) {
-      lines.push(`command	${encodeTerminalField(result.navigator.command)}`);
-    }
+  if (result.navigator.disposition === "advice") {
+    lines.push(`prose	${encodeTerminalField(result.navigator.prose)}`);
   } else if (result.navigator.disposition === "unavailable") {
     lines.push(
       `unavailable	${result.navigator.source}	${encodeTerminalField(result.navigator.reason)}`
@@ -14336,7 +14587,6 @@ function formatTerminalResult(result) {
 var init_terminal = __esm({
   "src/public-cli/terminal.ts"() {
     "use strict";
-    init_command_renderer();
   }
 });
 
@@ -15316,10 +15566,6 @@ async function appendRunAttemptHistory(source, outcome) {
   } catch {
   }
 }
-function navigatorPhaseValue(value) {
-  if (value === "plan" || value === "apply") return value;
-  return null;
-}
 function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex, terminalIndex, marker) {
   if (attendanceIndex <= terminalIndex) return false;
   if (details.invocationId !== marker.invocationId) return false;
@@ -15328,29 +15574,33 @@ function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex,
 function parseNavigatorAttendanceDetails(details) {
   const disposition = details.disposition;
   const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string" ? { advisoryDiagnostic: details.routePlaybookReadFailure } : {};
-  if (disposition === "recommendation") {
-    const next = details.next;
-    if (!isRecord11(next) || typeof next.role !== "string") {
+  if (disposition === "advice" || disposition === "recommendation") {
+    let prose;
+    if (typeof details.prose === "string" && details.prose.trim() !== "") {
+      prose = details.prose;
+    } else {
+      const next = isRecord11(details.next) && typeof details.next.role === "string" ? details.next.role : void 0;
+      const reason = typeof details.reason === "string" && details.reason.trim() !== "" ? details.reason : void 0;
+      const command = typeof details.command === "string" && details.command.trim() !== "" ? details.command : void 0;
+      if (reason !== void 0 && next !== void 0) {
+        prose = `${reason}\uFF08\u4E0B\u4E00\u6B65\uFF1A${next}\uFF09`;
+      } else if (reason !== void 0) {
+        prose = reason;
+      } else if (next !== void 0) {
+        prose = `\u4E0B\u4E00\u6B65\uFF1A${next}`;
+      } else if (command !== void 0) {
+        prose = command;
+      }
+    }
+    if (prose === void 0 || prose.trim() === "") {
       return {
-        disposition: "unavailable",
-        source: "unknown",
-        reason: "navigator recommendation missing typed next role"
+        disposition: "no-advice",
+        ...advisoryDiagnostic
       };
     }
-    const reason = typeof details.reason === "string" ? details.reason : "";
-    const route = Array.isArray(details.route) ? details.route.filter(isRecord11).map((target) => ({
-      role: String(target.role),
-      phase: navigatorPhaseValue(target.phase)
-    })) : void 0;
-    return recommendationNavigatorFact({
-      ...advisoryDiagnostic,
-      next: {
-        role: next.role,
-        phase: navigatorPhaseValue(next.phase)
-      },
-      reason,
-      ...route === void 0 ? {} : { route },
-      ...typeof details.command === "string" ? { modelCommand: details.command } : {}
+    return adviceNavigatorFact({
+      prose,
+      ...advisoryDiagnostic
     });
   }
   if (disposition === "unavailable") {
@@ -16776,10 +17026,10 @@ function presentFailureTerminal(terminal, io) {
 }
 function defaultNavigatorGraceSleep() {
   let timer;
-  const sleep = ((ms) => new Promise((resolve22) => {
+  const sleep = ((ms) => new Promise((resolve21) => {
     timer = setTimeout(() => {
       timer = void 0;
-      resolve22();
+      resolve21();
     }, ms);
   }));
   sleep.cancel = () => {
@@ -16791,7 +17041,7 @@ function defaultNavigatorGraceSleep() {
   return sleep;
 }
 function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep = defaultNavigatorGraceSleep()) {
-  return new Promise((resolve22, reject) => {
+  return new Promise((resolve21, reject) => {
     let settled = false;
     const finish = (action) => {
       if (settled) return;
@@ -16800,11 +17050,11 @@ function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep
       action();
     };
     void work.then(
-      (value) => finish(() => resolve22({ status: "done", value })),
+      (value) => finish(() => resolve21({ status: "done", value })),
       (error) => finish(() => reject(error))
     );
     void sleep(graceMs).then(() => {
-      finish(() => resolve22({ status: "timeout" }));
+      finish(() => resolve21({ status: "timeout" }));
     });
   });
 }
@@ -17810,6 +18060,24 @@ var init_public_run_credentials = __esm({
   }
 });
 
+// src/public-cli/process-cancel.ts
+function processCancelSignalName(signal) {
+  if (signal === void 0 || signal.aborted !== true) return void 0;
+  const reason = signal.reason;
+  if (reason === "SIGTERM" || reason === "SIGINT" || reason === "SIGHUP") {
+    return reason;
+  }
+  return void 0;
+}
+function processCancelDiagnostic(signalName) {
+  return `ak-role terminated by ${signalName}`;
+}
+var init_process_cancel = __esm({
+  "src/public-cli/process-cancel.ts"() {
+    "use strict";
+  }
+});
+
 // src/public-cli/auto-resume.ts
 import { constants as fsConstants2 } from "node:fs";
 import { randomUUID as randomUUID5 } from "node:crypto";
@@ -18112,6 +18380,10 @@ async function runWithAutoResumeLoop(options) {
         if (terminal !== void 0) presentTerminal(terminal, options.io);
         return result;
       }
+      if (processCancelSignalName(options.signal) !== void 0) {
+        if (terminal !== void 0) presentTerminal(terminal, options.io);
+        return result;
+      }
     }
     if (result !== void 0) {
       const terminal = result.terminal;
@@ -18145,6 +18417,28 @@ async function runWithAutoResumeLoop(options) {
           terminal
         };
       }
+      const cancelName = processCancelSignalName(options.signal);
+      if (cancelName !== void 0) {
+        const terminal = await attachDispatchExceptionTerminal(
+          options.admitted,
+          dispatchExceptionFailureTerminal({
+            role: options.admitted.role,
+            runId: options.admitted.runId,
+            causeError: lastThrownError,
+            errorFiles: retainedErrorFiles,
+            autoResumeAttempts,
+            endReason: `ak-role terminated by ${cancelName}`,
+            everyAttemptThrew
+          }),
+          options.io
+        );
+        await finalizeExceptionRunBestEffort(options.admitted.runDirectory, options.io);
+        presentTerminal(terminal, options.io);
+        return {
+          exitCode: 1,
+          terminal
+        };
+      }
       if (!await isPrincipalAvailable(options.admitted.principal)) {
         const terminal = await attachDispatchExceptionTerminal(
           options.admitted,
@@ -18181,6 +18475,7 @@ var init_auto_resume = __esm({
     init_role_run_placement();
     init_run_lifecycle();
     init_config();
+    init_process_cancel();
     init_terminal();
     init_settlement();
     dummyIo = { stdout: () => {
@@ -18213,6 +18508,36 @@ function describeCaughtError(error) {
 function isStationChildOfficerDialogue(role, env) {
   return env.stationChild === true && isOfficerReviewSeat(role);
 }
+function withProcessCancelSkipAutoResume(result, signal) {
+  if (processCancelSignalName(signal) === void 0) {
+    return result;
+  }
+  return { ...result, skipAutoResume: true };
+}
+async function settleProcessCancelAfterTurn(input) {
+  const failed = await settleAfterTurnStarted(
+    input.admitted,
+    withEngineDetourInvocationScope(
+      {
+        timedOut: input.result.timedOut,
+        code: input.result.code,
+        stderr: input.result.stderr,
+        knownDiagnostic: processCancelDiagnostic(input.cancelName)
+      },
+      input.invocationScopeId
+    ),
+    input.adapters,
+    input.env.principalAuthority,
+    input.io,
+    input.persistRunState
+  );
+  return {
+    ...failed,
+    turnDispatched: true,
+    skipAutoResume: true,
+    ...input.deferredPersist
+  };
+}
 function withOnceSuccessfulBeforeDispatch(adapters) {
   const hook = adapters.beforeDispatch;
   if (hook === void 0) return adapters;
@@ -18373,6 +18698,31 @@ async function dispatchPostAdmissionTurn(input) {
   const finishAfterTurn = async (result) => {
     if (afterDispatchApplied) return result;
     afterDispatchApplied = true;
+    const cancelBeforeFinish = processCancelSignalName(env.signal);
+    if (cancelBeforeFinish !== void 0 && result.terminal !== void 0 && isLawfulTypedTerminalOutcome(result.terminal.roleOutcome)) {
+      result = {
+        ...await settleAfterTurnStarted(
+          admitted,
+          withEngineDetourInvocationScope(
+            {
+              timedOut: false,
+              code: null,
+              stderr: "",
+              knownDiagnostic: processCancelDiagnostic(cancelBeforeFinish),
+              skipRunStateWrite: true
+            },
+            request.invocationScopeId
+          ),
+          adapters,
+          env.principalAuthority,
+          io,
+          persistRunState
+        ),
+        turnDispatched: true,
+        skipAutoResume: true,
+        ...deferredPersist
+      };
+    }
     try {
       if (admitted.ticketNumber === void 0) {
         const rows = await readRecordedSubmissionRows(
@@ -18519,20 +18869,26 @@ async function dispatchPostAdmissionTurn(input) {
     try {
       result = await env.roleTurnHost.executeTurn(turnRequest);
     } catch (error) {
+      const processCancelName = processCancelSignalName(env.signal);
       const settled2 = await settleAfterTurnStarted(
         admitted,
         withEngineDetourInvocationScope({
           timedOut: false,
           code: null,
           stderr: "",
-          thrown: error
+          thrown: processCancelName === void 0 ? error : new Error(processCancelDiagnostic(processCancelName), { cause: error })
         }, request.invocationScopeId),
         adapters,
         env.principalAuthority,
         io,
         persistRunState
       );
-      return await finishAfterTurn({ ...settled2, turnDispatched: true, ...deferredPersist });
+      return await finishAfterTurn(
+        withProcessCancelSkipAutoResume(
+          { ...settled2, turnDispatched: true, ...deferredPersist },
+          env.signal
+        )
+      );
     }
     let stderrLogWriteFailure;
     try {
@@ -18572,7 +18928,8 @@ async function dispatchPostAdmissionTurn(input) {
         credential: credentialFailure,
         runDirectory: admitted.runDirectory
       });
-      const directHostFailureSignal = result.timedOut || result.knownFailure !== void 0 || runnerKnownFailure !== void 0 || credentialFailure !== void 0;
+      const processCancelName = processCancelSignalName(env.signal);
+      const directHostFailureSignal = result.timedOut || result.knownFailure !== void 0 || runnerKnownFailure !== void 0 || credentialFailure !== void 0 || processCancelName !== void 0;
       hostSignalFailed = directHostFailureSignal || result.code !== null && result.code !== 0 || resolution.knownFailure !== void 0;
       settled = await adapters.trySettle(admitted, env.principalAuthority, courtScope);
       if (settled !== void 0) {
@@ -18580,7 +18937,8 @@ async function dispatchPostAdmissionTurn(input) {
       }
       const settledIsFreshThisAttempt = settled === void 0 || settled.roleOutcome.kind !== "accepted" && settled.roleOutcome.kind !== "audit_escalation" ? true : await attemptProducedFreshSubmission(admitted, courtScope);
       const staleAcceptanceOutranksRealFailure = !settledIsFreshThisAttempt && hostSignalFailed;
-      if (settled !== void 0 && shouldPresent(settled) && !directHostFailureSignal && !staleAcceptanceOutranksRealFailure && stderrLogWriteFailure === void 0) {
+      const cancelAfterSettle = processCancelSignalName(env.signal);
+      if (settled !== void 0 && shouldPresent(settled) && !directHostFailureSignal && !staleAcceptanceOutranksRealFailure && stderrLogWriteFailure === void 0 && cancelAfterSettle === void 0) {
         if (settled.roleOutcome.kind === "accepted" && request.courtAttemptId !== void 0 && request.courtAttemptId.length > 0) {
           try {
             await clearCurrentCourt(admitted.runDirectory, request.courtAttemptId);
@@ -18617,6 +18975,22 @@ async function dispatchPostAdmissionTurn(input) {
       return await finishAfterTurn({ ...settledFailure, turnDispatched: true, ...deferredPersist });
     }
     if (settledOutcome !== void 0) {
+      const lateCancel = processCancelSignalName(env.signal);
+      if (lateCancel !== void 0) {
+        return await finishAfterTurn(
+          await settleProcessCancelAfterTurn({
+            admitted,
+            cancelName: lateCancel,
+            result,
+            adapters,
+            env,
+            io,
+            persistRunState,
+            deferredPersist,
+            invocationScopeId: request.invocationScopeId
+          })
+        );
+      }
       if (persistRunState) {
         try {
           await persistReturnedRunState(admitted, env.principalAuthority, { lawful: true });
@@ -18635,13 +19009,19 @@ async function dispatchPostAdmissionTurn(input) {
             io,
             persistRunState
           );
-          return await finishAfterTurn({ ...failed, turnDispatched: true, ...deferredPersist });
+          return await finishAfterTurn(
+            withProcessCancelSkipAutoResume(
+              { ...failed, turnDispatched: true, ...deferredPersist },
+              env.signal
+            )
+          );
         }
       }
       return await finishAfterTurn({ ...settledOutcome, ...deferredPersist });
     }
     if (hostSignalFailed) {
       const resolutionInput = controlledFailureInputFromResolution(resolution);
+      const processCancelName = processCancelSignalName(env.signal);
       const stderrLogWriteDetails = stderrLogWriteFailure === void 0 ? void 0 : { stderrLogWriteFailure: describeCaughtError(stderrLogWriteFailure) };
       const failed = await settleAfterTurnStarted(
         admitted,
@@ -18650,6 +19030,7 @@ async function dispatchPostAdmissionTurn(input) {
           code: result.code,
           stderr: result.stderr,
           ...resolutionInput,
+          ...processCancelName === void 0 ? {} : { knownDiagnostic: processCancelDiagnostic(processCancelName) },
           // Secondary fact only — never the cause. Rides on whichever channel
           // classification actually reads (knownFailure.details owns it when
           // a knownFailure exists; the top-level knownDetails otherwise).
@@ -18665,7 +19046,12 @@ async function dispatchPostAdmissionTurn(input) {
         io,
         persistRunState
       );
-      return await finishAfterTurn({ ...failed, turnDispatched: true, ...deferredPersist });
+      return await finishAfterTurn(
+        withProcessCancelSkipAutoResume(
+          { ...failed, turnDispatched: true, ...deferredPersist },
+          env.signal
+        )
+      );
     }
     if (stderrLogWriteFailure !== void 0) {
       const failed = await settleAfterTurnStarted(
@@ -18688,8 +19074,24 @@ async function dispatchPostAdmissionTurn(input) {
       await settleHostEndedNoReceipt(admitted, env.principalAuthority, courtScope),
       courtScope
     );
-    if (persistRunState) {
-      try {
+    const noReceiptCancel = processCancelSignalName(env.signal);
+    if (noReceiptCancel !== void 0) {
+      return await finishAfterTurn(
+        await settleProcessCancelAfterTurn({
+          admitted,
+          cancelName: noReceiptCancel,
+          result,
+          adapters,
+          env,
+          io,
+          persistRunState,
+          deferredPersist,
+          invocationScopeId: request.invocationScopeId
+        })
+      );
+    }
+    if (persistRunState) {
+      try {
         await persistReturnedRunState(admitted, env.principalAuthority, { lawful: true });
       } catch (error) {
         const failed = await settleAfterTurnStarted(
@@ -18706,7 +19108,12 @@ async function dispatchPostAdmissionTurn(input) {
           io,
           persistRunState
         );
-        return await finishAfterTurn({ ...failed, turnDispatched: true, ...deferredPersist });
+        return await finishAfterTurn(
+          withProcessCancelSkipAutoResume(
+            { ...failed, turnDispatched: true, ...deferredPersist },
+            env.signal
+          )
+        );
       }
     }
     return await finishAfterTurn({
@@ -18902,6 +19309,7 @@ async function runPostAdmissionSeatResume(input) {
         io: input.io,
         sessionAppender: env.sessionAppender,
         autoResumeLimit: env.autoResumeLimit,
+        ...env.signal === void 0 ? {} : { signal: env.signal },
         buildInitialPayload: () => ({ resumeTurn: false }),
         buildResumePayload: () => ({ resumeTurn: true }),
         // Same as public manual resume: prior-court sealed acceptance is not a
@@ -18977,7 +19385,7 @@ async function runPostAdmissionOneShot(input) {
       ...input.request,
       continuation: {
         kind: "resume",
-        prompt: buildResumeContinuationPrompt({
+        prompt: buildAutoResumeContinuationPrompt({
           packageRoot: input.env.packageRoot,
           ...pickEngineAxis({
             engine: input.effectiveEngine ?? input.env.engine,
@@ -19005,6 +19413,7 @@ async function runPostAdmissionResumable(input) {
     io,
     sessionAppender: env.sessionAppender,
     autoResumeLimit: env.autoResumeLimit,
+    ...env.signal === void 0 ? {} : { signal: env.signal },
     buildInitialPayload: buildScopedInitial,
     buildResumePayload: buildScopedResume,
     dispatch: async (request, lease, _isFirst, attemptIo) => {
@@ -19113,6 +19522,7 @@ var init_post_admission = __esm({
     init_host_transition_prior_native();
     init_public_run_credentials();
     init_run_lifecycle();
+    init_process_cancel();
     init_activation_ledger_topology();
     init_settlement();
     init_terminal();
@@ -19849,7 +20259,7 @@ async function runPublicJudge(argv, env, io, parseJudgeArgv2) {
       ...admitted.correlationId === void 0 && env.correlationId === void 0 ? {} : { correlationId: admitted.correlationId ?? env.correlationId },
       continuation: {
         kind: "resume",
-        prompt: buildResumeContinuationPrompt({
+        prompt: buildAutoResumeContinuationPrompt({
           packageRoot: env.packageRoot,
           ...pickEngineAxis(env)
         })
@@ -21232,14 +21642,32 @@ async function summonPublicRole(options) {
     case "navigator":
     case "gatekeeper": {
       const seat2 = options.role;
-      const [{ runPublicInstructionSeat: runPublicInstructionSeat2 }, invocation] = await Promise.all([
+      const [{ runPublicInstructionSeat: runPublicInstructionSeat2, runPublicInstructionSeatResume: runPublicInstructionSeatResume2 }, invocation] = await Promise.all([
         Promise.resolve().then(() => (init_instruction_seat_run(), instruction_seat_run_exports)),
         Promise.resolve().then(() => (init_invocation(), invocation_exports))
       ]);
       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;
-      result = stepped.ok;
+      const resumeRunId = typeof options.resumeRunId === "string" && options.resumeRunId.trim() !== "" ? options.resumeRunId.trim() : void 0;
+      if (resumeRunId !== void 0) {
+        const instruction = options.argv[0] ?? "";
+        const stepped = await runPrepared(parse, (env) => runPublicInstructionSeatResume2(
+          {
+            runId: resumeRunId,
+            summons: {
+              instruction,
+              instructionEmpty: instruction.trim() === ""
+            }
+          },
+          env,
+          io
+        ));
+        if ("fail" in stepped) return stepped.fail;
+        result = stepped.ok;
+      } else {
+        const stepped = await runPrepared(parse, (env, once) => runPublicInstructionSeat2(options.argv, env, io, seat2, once));
+        if ("fail" in stepped) return stepped.fail;
+        result = stepped.ok;
+      }
       break;
     }
     case "judge": {
@@ -21653,14 +22081,14 @@ var init_public_role_summons = __esm({
 });
 
 // src/acp-host/production-host.ts
-import { randomUUID as randomUUID9 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 
 // src/role-envelope.ts
 init_engine_detour();
-import { randomUUID as randomUUID8 } from "node:crypto";
-import { mkdir as mkdir7, writeFile as writeFile12 } from "node:fs/promises";
+import { randomUUID as randomUUID9 } from "node:crypto";
+import { appendFile as appendFile3, mkdir as mkdir7, writeFile as writeFile12 } from "node:fs/promises";
 import { createServer } from "node:net";
-import { dirname as dirname22, join as join41 } from "node:path";
+import { dirname as dirname21, join as join41 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/gatekeeper-pass-envelope.ts
@@ -21788,7 +22216,8 @@ init_host_contracts();
 init_sitian_facade();
 init_submission_ledger();
 init_collector_ledger();
-import { readFileSync as readFileSync6, writeSync as writeSync4 } from "node:fs";
+import { randomUUID as randomUUID8 } from "node:crypto";
+import { readFileSync as readFileSync6, writeSync as writeSync3 } from "node:fs";
 import { join as join40 } from "node:path";
 import { Value as Value4 } from "typebox/value";
 
@@ -21830,16 +22259,7 @@ function namedActivationCause(error) {
 init_activation_ledger_topology();
 
 // src/activation-ledger.ts
-init_activation_ledger_topology();
 init_activation_ledger_git();
-import {
-  constants as constants2,
-  closeSync as closeSync2,
-  fstatSync,
-  openSync as openSync2,
-  writeSync
-} from "node:fs";
-import { dirname as dirname19, isAbsolute as isAbsolute10, resolve as resolve16 } from "node:path";
 
 // src/activation-ledger-session.ts
 init_activation_ledger_topology();
@@ -21943,129 +22363,11 @@ function durableSessionPointer(sessionManager) {
 
 // src/activation-ledger.ts
 init_activation_ledger_topology();
-var ACTIVATION_LEDGER_APPEND_OPEN_FLAGS = constants2.O_APPEND | constants2.O_CREAT | constants2.O_WRONLY | constants2.O_NOFOLLOW;
-var ACCEPTED_ACTIVATION_EVENT = "accepted-activation";
-var ACCEPTED_ACTIVATION_FACT_KEYS = Object.freeze([
-  "event",
-  "role",
-  "observedAt",
-  "bookKey",
-  "session",
-  "correlation"
-]);
-function correlationIdentityFromEnv(env = process.env) {
-  const raw = env.AK_CORRELATION_ID;
-  if (typeof raw === "string" && raw.trim().length > 0) {
-    return { kind: "caller", id: raw };
-  }
-  return { kind: "absent" };
-}
-function projectAcceptedActivationFact(input) {
-  const closed = {
-    event: ACCEPTED_ACTIVATION_EVENT,
-    role: input.role,
-    observedAt: input.observedAt,
-    bookKey: input.bookKey,
-    session: { kind: "session-file", path: input.session.path },
-    correlation: input.correlation.kind === "caller" ? { kind: "caller", id: input.correlation.id } : { kind: "absent" }
-  };
-  return Object.fromEntries(
-    ACCEPTED_ACTIVATION_FACT_KEYS.map((key) => [key, closed[key]])
-  );
-}
-function buildAcceptedActivationFact(input) {
-  return projectAcceptedActivationFact(input);
-}
-function serializeAcceptedActivationFact(fact) {
-  return `${JSON.stringify(projectAcceptedActivationFact(fact))}
-`;
-}
-function appendActivationLedgerLine(ledgerPath, line2, options) {
-  if (!isAbsolute10(options.ledgerHome)) {
-    throw new ActivationLedgerError(
-      `activation ledger home must be absolute: ${options.ledgerHome}`
-    );
-  }
-  const resolvedLedger = resolve16(ledgerPath);
-  const resolvedHome = resolve16(options.ledgerHome);
-  const parent = dirname19(resolvedLedger);
-  ensureRealDirectoryTree(resolvedHome, parent);
-  assertLedgerFileInsideHome(resolvedLedger, resolvedHome);
-  if (typeof constants2.O_NOFOLLOW !== "number") {
-    throw new ActivationLedgerError(
-      "activation ledger append requires O_NOFOLLOW open-flag support (anti-symlink TOCTOU protection must not be silently dropped); refusing to append"
-    );
-  }
-  const bytes = Buffer.isBuffer(line2) ? line2 : Buffer.from(line2);
-  let ledgerFd;
-  let primaryFailure;
-  try {
-    try {
-      ledgerFd = openSync2(resolvedLedger, ACTIVATION_LEDGER_APPEND_OPEN_FLAGS, 420);
-    } catch (error) {
-      throw new ActivationLedgerError(
-        `activation ledger failed to open ledger file (${resolvedLedger}): ${errorText(error)}`,
-        { cause: error }
-      );
-    }
-    let opened;
-    try {
-      opened = fstatSync(ledgerFd);
-    } catch (error) {
-      throw new ActivationLedgerError(
-        `activation ledger failed to fstat ledger file (${resolvedLedger}): ${errorText(error)}`,
-        { cause: error }
-      );
-    }
-    if (!opened.isFile()) {
-      throw new ActivationLedgerError(
-        `activation ledger is not a regular file: ${resolvedLedger}`
-      );
-    }
-    const written = writeSync(ledgerFd, bytes, 0, bytes.length, null);
-    if (written !== bytes.length) {
-      throw new ActivationLedgerError(
-        `activation ledger short write: wrote ${written} of ${bytes.length} bytes to ${resolvedLedger}`
-      );
-    }
-  } catch (error) {
-    primaryFailure = error;
-  }
-  if (ledgerFd !== void 0) {
-    try {
-      closeSync2(ledgerFd);
-    } catch (closeFailure) {
-      if (primaryFailure !== void 0) {
-        throw new AggregateError(
-          [primaryFailure, closeFailure],
-          "activation ledger operation and close failed",
-          { cause: primaryFailure }
-        );
-      }
-      throw closeFailure;
-    }
-  }
-  if (primaryFailure !== void 0) throw primaryFailure;
-}
-function appendAcceptedActivationFact(ledgerPath, fact, options) {
-  appendActivationLedgerLine(
-    ledgerPath,
-    Buffer.from(serializeAcceptedActivationFact(fact), "utf8"),
-    { ledgerHome: options.ledgerHome }
-  );
-}
-function appendAcceptedActivationToBook(options) {
-  appendAcceptedActivationFact(
-    activationWaitingLedgerPath(options.ledgerHome, options.fact.bookKey),
-    options.fact,
-    { ledgerHome: options.ledgerHome }
-  );
-}
 
 // src/stderr-jsonl.ts
-import { writeSync as writeSync2 } from "node:fs";
+import { writeSync } from "node:fs";
 var STDERR_JSONL_WRITE_RETRY_LIMIT = 100;
-function writeStderrJsonlRecord(record4, write = writeSync2) {
+function writeStderrJsonlRecord(record4, write = writeSync) {
   const bytes = Buffer.from(`${JSON.stringify(record4)}
 `);
   let offset = 0;
@@ -22085,7 +22387,7 @@ function writeStderrJsonlRecord(record4, write = writeSync2) {
 }
 
 // src/tool-execution-observation.ts
-import { writeSync as writeSync3 } from "node:fs";
+import { writeSync as writeSync2 } from "node:fs";
 import { Type as Type13 } from "typebox";
 import { Value as Value2 } from "typebox/value";
 var TOOL_EXECUTION_UPDATE_THROTTLE_MS = 3e4;
@@ -22116,7 +22418,7 @@ function validateToolExecutionObservationRecord(record4) {
   }
   return record4;
 }
-function writeToolExecutionObservationRecord(record4, write = writeSync3) {
+function writeToolExecutionObservationRecord(record4, write = writeSync2) {
   writeStderrJsonlRecord(validateToolExecutionObservationRecord(record4), write);
 }
 function isProducingToolUpdate(partialResult) {
@@ -22353,9 +22655,9 @@ import { join as join38, sep as sep6 } from "node:path";
 // src/atomic-write.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
 import { rename as rename3, rm as rm5, writeFile as writeFile11 } from "node:fs/promises";
-import { dirname as dirname20, join as join37 } from "node:path";
+import { dirname as dirname19, join as join37 } from "node:path";
 async function writeFileAtomically(destination, contents) {
-  const parent = dirname20(destination);
+  const parent = dirname19(destination);
   const temporary = join37(parent, `.atomic-write-${randomUUID7()}.tmp`);
   try {
     await writeFile11(temporary, contents);
@@ -23634,7 +23936,7 @@ init_navigator_output();
 var NAVIGATOR_TOOL_SPEC = {
   name: NAVIGATOR_OUTPUT_TOOL_NAME,
   label: "\u6E38\u5955\u4F7F\u5EFA\u8BAE",
-  description: "\u6E38\u5955\u4F7F\u7EC8\u5C40\u56DE\u6267\uFF1A\u6392\u597D\u5E8F\u7684\u4E0B\u4E00\u6B65\u89D2\u8272\u8DEF\u7EBF\u5EFA\u8BAE\u3002",
+  description: "\u6E38\u5955\u4F7F\u7EC8\u5C40\u56DE\u6267\uFF1A\u6563\u6587\u5EFA\u8BAE\uFF0C\u539F\u6837\u5448\u73B0\u3002",
   promptSnippet: "\u6E38\u5955\u4F7F\u5EFA\u8BAE",
   parameters: navigatorOutputSchema
 };
@@ -23659,12 +23961,13 @@ import { createHash as createHash9 } from "node:crypto";
 init_navigator_invocation_identity();
 init_packaged_role_registry();
 init_activation_ledger_topology();
-import { resolve as resolve17 } from "node:path";
+import { resolve as resolve16 } from "node:path";
 import "@earendil-works/pi-coding-agent";
 import { Type as Type22 } from "typebox";
 
 // src/navigator-public-session.ts
 init_sitian_facade();
+import { basename as basename10 } from "node:path";
 
 // src/navigator-session-contracts.ts
 import { Type as Type21 } from "typebox";
@@ -23852,6 +24155,7 @@ async function resolveNavigatorSeatSelection(context) {
 
 // src/navigator-public-session.ts
 init_host_contracts();
+init_cli_errors();
 async function resolveNavigatorLedgerHome(context) {
   const { tryHomeFromAkRolesPath: tryHomeFromAkRolesPath2 } = await Promise.resolve().then(() => (init_activation_ledger_topology(), activation_ledger_topology_exports));
   const runDirectory = runDirectoryFromHostContext(context);
@@ -23866,7 +24170,42 @@ async function resolveNavigatorLedgerHome(context) {
   }
   return void 0;
 }
-function createNativeNavigatorSessionFactory() {
+var NAVIGATOR_HOST_RUN_POINTER_ENTRY = "ak-navigator-host-run";
+function exactRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function runIdFromNavigatorDirectory(runDirectory) {
+  const entry = basename10(runDirectory);
+  const suffix = "@navigator";
+  if (!entry.endsWith(suffix)) return void 0;
+  const runId = entry.slice(0, entry.length - suffix.length);
+  return runId.length > 0 ? runId : void 0;
+}
+function readNavigatorHostRunPointer(entries) {
+  for (let index = entries.length - 1; index >= 0; index -= 1) {
+    const entry = entries[index];
+    if (!exactRecord2(entry)) continue;
+    if (entry.type === "custom" && entry.customType === NAVIGATOR_HOST_RUN_POINTER_ENTRY) {
+      const data = entry.data;
+      if (exactRecord2(data) && typeof data.runId === "string" && data.runId.trim() !== "") {
+        return data.runId.trim();
+      }
+    }
+  }
+  return void 0;
+}
+async function navigatorHostRunResumable(home, runId) {
+  const { piDurablePrincipalAuthority: piDurablePrincipalAuthority2 } = await Promise.resolve().then(() => (init_durable_principal(), durable_principal_exports));
+  const { loadResumableInstructionSeatRun: loadResumableInstructionSeatRun2 } = await Promise.resolve().then(() => (init_run_lifecycle(), run_lifecycle_exports));
+  try {
+    const loaded = await loadResumableInstructionSeatRun2(home, runId, piDurablePrincipalAuthority2);
+    return loaded.admitted.role === "navigator";
+  } catch (error) {
+    if (error instanceof CliUsageError) return false;
+    throw error;
+  }
+}
+function createNativeNavigatorSessionFactory(deps) {
   return async ({ context, subject, tool }) => {
     let thinkingLevel;
     const { createRecordSession: createRecordSession2, NAVIGATOR_RECORD_KIND: NAVIGATOR_RECORD_KIND2 } = await Promise.resolve().then(() => (init_archivist_record_entry(), archivist_record_entry_exports));
@@ -23882,6 +24221,11 @@ function createNativeNavigatorSessionFactory() {
     let noReceipt;
     let disposed = false;
     let inFlightPrompt;
+    let hostRunId = readNavigatorHostRunPointer(sessionManager.getEntries());
+    const summon = deps?.summonPublicRole ?? (async (options) => {
+      const { summonPublicRole: summonPublicRole2 } = await Promise.resolve().then(() => (init_public_role_summons(), public_role_summons_exports));
+      return summonPublicRole2(options);
+    });
     return {
       prompt: async (text) => {
         if (disposed) {
@@ -23891,14 +24235,24 @@ function createNativeNavigatorSessionFactory() {
         noReceipt = void 0;
         const run = (async () => {
           try {
-            const { summonPublicRole: summonPublicRole2 } = await Promise.resolve().then(() => (init_public_role_summons(), public_role_summons_exports));
             const summonHome = await resolveNavigatorLedgerHome(context);
-            const summoned = await summonPublicRole2({
+            const resumeRunId = hostRunId;
+            const baseSummon = {
               role: "navigator",
               argv: [text],
               cwd: context.cwd,
               ...summonHome === void 0 ? {} : { home: summonHome }
-            });
+            };
+            const resumable = deps?.hostRunResumable ?? navigatorHostRunResumable;
+            let summoned;
+            if (resumeRunId === void 0 || summonHome === void 0) {
+              summoned = await summon(baseSummon);
+            } else if (await resumable(summonHome, resumeRunId)) {
+              summoned = await summon({ ...baseSummon, resumeRunId });
+            } else {
+              hostRunId = void 0;
+              summoned = await summon(baseSummon);
+            }
             const outcome = summoned.terminal?.roleOutcome;
             if (outcome === void 0) {
               const detail = summoned.stderr?.trim() || `exit ${summoned.exitCode}`;
@@ -23921,21 +24275,31 @@ function createNativeNavigatorSessionFactory() {
               noReceipt = outcome;
               return;
             }
+            const runDirectory = summoned.runDirectory ?? (typeof summoned.admitted?.runDirectory === "string" ? summoned.admitted.runDirectory : void 0);
+            if (typeof runDirectory === "string" && runDirectory.trim() !== "") {
+              const nextRunId = runIdFromNavigatorDirectory(runDirectory);
+              if (nextRunId !== void 0) {
+                hostRunId = nextRunId;
+                sessionManager.appendCustomEntry(NAVIGATOR_HOST_RUN_POINTER_ENTRY, { runId: nextRunId });
+              }
+            }
             if (outcome.kind !== "accepted") {
               return;
             }
+            const { navigatorProseFromUnknown: navigatorProseFromUnknown2 } = await Promise.resolve().then(() => (init_navigator_output(), navigator_output_exports));
+            const proseParts = [];
             for (const payload of outcome.payloads ?? []) {
-              if (typeof payload !== "object" || payload === null || Array.isArray(payload)) continue;
-              const candidates = payload.candidates;
-              if (!Array.isArray(candidates)) continue;
-              await tool.execute(
-                "navigator-public-prepare",
-                { candidates },
-                void 0,
-                void 0,
-                context
-              );
+              const prose = navigatorProseFromUnknown2(payload);
+              if (prose !== void 0) proseParts.push(prose);
             }
+            if (proseParts.length === 0) return;
+            await tool.execute(
+              "navigator-public-prepare",
+              { prose: proseParts.join("\n\n") },
+              void 0,
+              void 0,
+              context
+            );
           } catch (error) {
             if (error instanceof NavigatorUnavailableError) throw error;
             const fact = navigatorProviderFailureFromError(error);
@@ -23989,9 +24353,9 @@ function createNativeNavigatorSessionFactory() {
 
 // src/navigator-attendance.ts
 init_sitian_facade();
-init_public_command_renderer();
 init_work_subject_identity();
 init_receipt_delivery_policy();
+init_navigator_output();
 var NAVIGATOR_EVENT_TYPE = "ak-navigator-attendance";
 var NAVIGATOR_PREPARE_ACCEPTED_TEXT = "\u6E38\u5955\u4F7F\u51C6\u5907\u5DF2\u63A5\u53D7";
 function resolveNavigatorAuthorityMaterial(roleInput, fileAuthority) {
@@ -24001,107 +24365,40 @@ function resolveNavigatorAuthorityMaterial(roleInput, fileAuthority) {
 }
 var NAVIGATOR_TARGETS = PACKAGED_ROLE_REGISTRY.map(({ role, phases }) => ({ role, phases }));
 var prepareSchema = Type22.Object({
-  candidates: Type22.Optional(Type22.Unknown({
-    description: "\u65B9\u5411\u5019\u9009\uFF1Bcandidates[].next.role \u5FC5\u586B\uFF0Cphase \u53EF\u9009\uFF0Croute/matches/reason/command \u53EF\u9009\u4E0A\u4E0B\u6587\uFF0C\u975E\u53D7\u7406\u95F8"
+  prose: Type22.Optional(Type22.Unknown({
+    description: "\u6E38\u5955\u4F7F\u6563\u6587\u5EFA\u8BAE\uFF0C\u539F\u6837\u5448\u73B0\u3002\u4E0D\u8981\u6C42 candidates/next \u7ED3\u6784\u3002\u975E\u53D7\u7406\u95F8"
   }))
 }, { additionalProperties: true });
-var ROUTE_ENTRY = "ak-navigator-route";
 var CONTEXT_ENTRY = "ak-navigator-context";
 var INVOCATION_ENTRY = NAVIGATOR_INVOCATION_ENTRY;
 var SETTLEMENT_ENTRY = "ak-navigator-settlement";
-var targetRoles = new Set(NAVIGATOR_TARGETS.map(({ role }) => role));
-function exactRecord2(value) {
+function exactRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function rejectedPrepareReason(entries, start) {
   const recent = entries.slice(start);
   const prepareCalls = /* @__PURE__ */ new Set();
   for (const entry of recent) {
-    if (!exactRecord2(entry) || entry.type !== "message" || !exactRecord2(entry.message) || entry.message.role !== "assistant" || !Array.isArray(entry.message.content)) continue;
+    if (!exactRecord3(entry) || entry.type !== "message" || !exactRecord3(entry.message) || entry.message.role !== "assistant" || !Array.isArray(entry.message.content)) continue;
     for (const part of entry.message.content) {
-      if (exactRecord2(part) && part.type === "toolCall" && part.name === NAVIGATOR_PREPARE_TOOL_NAME && typeof part.id === "string") prepareCalls.add(part.id);
+      if (exactRecord3(part) && part.type === "toolCall" && part.name === NAVIGATOR_PREPARE_TOOL_NAME && typeof part.id === "string") prepareCalls.add(part.id);
     }
   }
   let reason;
   for (const entry of recent) {
-    if (!exactRecord2(entry) || entry.type !== "message" || !exactRecord2(entry.message) || entry.message.role !== "toolResult" || entry.message.isError !== true) continue;
+    if (!exactRecord3(entry) || entry.type !== "message" || !exactRecord3(entry.message) || entry.message.role !== "toolResult" || entry.message.isError !== true) continue;
     const callId = entry.message.toolCallId;
     if (entry.message.toolName !== NAVIGATOR_PREPARE_TOOL_NAME || typeof callId !== "string" || !prepareCalls.has(callId)) {
       return void 0;
     }
     const content = entry.message.content;
-    const text = Array.isArray(content) ? content.flatMap((part) => exactRecord2(part) && typeof part.text === "string" ? [part.text] : []).join("") : typeof content === "string" ? content : "";
+    const text = Array.isArray(content) ? content.flatMap((part) => exactRecord3(part) && typeof part.text === "string" ? [part.text] : []).join("") : typeof content === "string" ? content : "";
     if (text.trim() !== "") reason = text.trim();
   }
   return reason;
 }
-function targetIsValid(value) {
-  if (!exactRecord2(value) || !targetRoles.has(String(value.role))) return false;
-  const metadata = packagedRoleMetadata(String(value.role));
-  return metadata !== void 0 && metadata.phases.includes(value.phase);
-}
-function normalizeTarget(value) {
-  if (!exactRecord2(value)) return void 0;
-  const role = typeof value.role === "string" ? value.role.trim() : "";
-  if (role === "") return void 0;
-  if (value.phase === void 0 || value.phase === null) {
-    return { role, phase: null };
-  }
-  if (value.phase === "plan" || value.phase === "apply") {
-    return { role, phase: value.phase };
-  }
-  return { role, phase: null };
-}
-function normalizeMatches(value) {
-  if (!exactRecord2(value)) return void 0;
-  if (typeof value.role !== "string" || value.role.trim() === "") return void 0;
-  if (value.kind !== "accepted") return void 0;
-  let phase;
-  if (value.phase === void 0 || value.phase === null) phase = null;
-  else if (value.phase === "plan" || value.phase === "apply") phase = value.phase;
-  else return void 0;
-  if (value.statuses !== void 0) {
-    if (!Array.isArray(value.statuses) || value.statuses.some((status) => typeof status !== "string" || status.trim() === "")) {
-      return void 0;
-    }
-    return {
-      role: value.role,
-      phase,
-      kind: "accepted",
-      statuses: [...value.statuses]
-    };
-  }
-  return { role: value.role, phase, kind: "accepted" };
-}
-function normalizeCandidate(value) {
-  if (!exactRecord2(value)) return void 0;
-  const next = normalizeTarget(value.next);
-  const route = Array.isArray(value.route) ? value.route.map(normalizeTarget).filter((target) => target !== void 0) : void 0;
-  const matches = normalizeMatches(value.matches);
-  const id = typeof value.id === "string" && value.id.trim() !== "" ? value.id : void 0;
-  const reason = typeof value.reason === "string" && value.reason.trim() !== "" ? value.reason : void 0;
-  const command = typeof value.command === "string" ? value.command : void 0;
-  return {
-    ...id === void 0 ? {} : { id },
-    ...matches === void 0 ? {} : { matches },
-    ...route === void 0 || route.length === 0 ? {} : { route },
-    ...next === void 0 ? {} : { next },
-    ...reason === void 0 ? {} : { reason },
-    ...command === void 0 ? {} : { command }
-  };
-}
-function normalizePrepareOutput(value) {
-  if (!exactRecord2(value) || !Array.isArray(value.candidates)) return [];
-  return value.candidates.map(normalizeCandidate).filter((candidate) => candidate !== void 0);
-}
-function routeEqual(a, b) {
-  return a !== void 0 && a.length === b.length && a.every((target, index) => target.role === b[index].role && target.phase === b[index].phase);
-}
-function routeText(route) {
-  return route.map((target) => target.phase === null ? target.role : `${target.role} ${target.phase}`).join(" \u2192 ");
-}
-function targetText(target) {
-  return target.phase === null ? target.role : `${target.role} ${target.phase}`;
+function normalizePrepareProse(value) {
+  return navigatorProseFromUnknown(value);
 }
 function navigatorSubjectKey(subjectRoot, subject, provenance = "role_input") {
   if (issueRoot(subjectRoot) !== void 0 || !subjectRoot.includes("/.ak/work/")) return subjectRoot;
@@ -24112,7 +24409,7 @@ function navigatorSubjectKey(subjectRoot, subject, provenance = "role_input") {
 }
 function navigatorSubjectKeyForInput(subjectRoot, reference, cwd = process.cwd()) {
   if (issueRoot(subjectRoot) !== void 0 || !subjectRoot.includes("/.ak/work/")) return subjectRoot;
-  const resolvedReference = resolve17(cwd, reference);
+  const resolvedReference = resolve16(cwd, reference);
   const marker = "/runs/";
   if (resolvedReference.includes(marker)) {
     return subjectRoot;
@@ -24123,7 +24420,7 @@ function createNavigatorPrepareTool(onOutput) {
   return {
     name: NAVIGATOR_PREPARE_TOOL_NAME,
     label: "\u6E38\u5955\u4F7F\u51C6\u5907",
-    description: "\u63D0\u4EA4\u6E38\u5955\u4F7F\u65B9\u5411\u5EFA\u8BAE\u3002",
+    description: "\u63D0\u4EA4\u6E38\u5955\u4F7F\u6563\u6587\u5EFA\u8BAE\u3002",
     parameters: prepareSchema,
     async execute(_id, value) {
       onOutput(value);
@@ -24131,34 +24428,6 @@ function createNavigatorPrepareTool(onOutput) {
     }
   };
 }
-function selectNavigatorCandidate(candidates, settlement) {
-  if (settlement.kind !== "accepted") return void 0;
-  const usable = candidates.filter((candidate) => candidate.next !== void 0);
-  if (usable.length === 0) return void 0;
-  const rolePhaseMatched = usable.filter(
-    (candidate) => candidate.matches !== void 0 && candidate.matches.role === settlement.role && candidate.matches.phase === settlement.phase
-  );
-  if (rolePhaseMatched.length > 0) {
-    if (settlement.status !== void 0) {
-      const statusSpecific = rolePhaseMatched.find(
-        (candidate) => candidate.matches?.statuses !== void 0 && candidate.matches.statuses.includes(settlement.status)
-      );
-      if (statusSpecific !== void 0) {
-        return { candidate: statusSpecific, matchedToSettlement: true };
-      }
-    }
-    const rolePhaseGeneric = rolePhaseMatched.find(
-      (candidate) => candidate.matches?.statuses === void 0
-    );
-    if (rolePhaseGeneric !== void 0) {
-      return { candidate: rolePhaseGeneric, matchedToSettlement: true };
-    }
-    return void 0;
-  }
-  const unbound = usable.find((candidate) => candidate.matches === void 0);
-  if (unbound === void 0) return void 0;
-  return { candidate: unbound, matchedToSettlement: false };
-}
 function formatNavigatorReport(report) {
   const playbookFailure = report.routePlaybookReadFailure === void 0 ? [] : [`\u8DEF\u4E66\u8BFB\u53D6\u5931\u8D25\uFF1A${report.routePlaybookReadFailure}`];
   if (report.disposition === "no-advice") return playbookFailure.join("\n");
@@ -24168,31 +24437,24 @@ function formatNavigatorReport(report) {
   if (report.disposition === "arrival") {
     return [...playbookFailure, ...report.arrivalMessage ? [report.arrivalMessage] : []].join("\n");
   }
-  return [
-    ...playbookFailure,
-    ...report.route === void 0 ? [] : [`\u8DEF\u7EBF\uFF1A${routeText(report.route)}`],
-    ...report.next === void 0 ? [] : [`\u4E0B\u4E00\u6B65\uFF1A${targetText(report.next)}`],
-    ...report.reason === void 0 || report.reason.trim() === "" ? [] : [`\u7406\u7531\uFF1A${report.reason}`],
-    ...report.command === void 0 || report.command.trim() === "" ? [] : [`\u547D\u4EE4\uFF1A${report.command}`]
-  ].join("\n");
+  return [...playbookFailure, ...report.prose ? [report.prose] : []].join("\n");
 }
 function createNavigatorAttendance(options) {
   let preparation;
+  let preparationInFlight = false;
   let sessionReady;
   let session;
   let subjectKey = options.subjectKey;
   let subject = options.subject;
   let authority = options.authority;
   let contextError = options.contextError;
-  let candidates;
+  let preparedProse;
   const invocationPrincipal = options.invocationId ?? mintNavigatorInvocationId();
   let activeInvocationId = invocationPrincipal;
-  let previousRoute;
   let outputSink;
   let settlementTail = Promise.resolve();
   let settlementFailure;
   let preparationFailure;
-  let preparationNoReceipt = false;
   let routePlaybookReadFailure;
   let disposed = false;
   let warmedHelp;
@@ -24219,12 +24481,7 @@ function createNavigatorAttendance(options) {
   };
   let routePlaybookSettlement;
   let prepareBoundSettlement;
-  const prepare = async () => {
-    const boundSettlement = prepareBoundSettlement;
-    prepareBoundSettlement = void 0;
-    preparationNoReceipt = false;
-    const invocationId = invocationPrincipal;
-    activeInvocationId = invocationId;
+  const loadMaterialsAndSession = async (invocationId) => {
     if (contextError !== void 0) throw navigatorUnavailableError("context", contextError);
     if (typeof authority !== "string" || authority.trim() === "") {
       throw navigatorUnavailableError(
@@ -24282,21 +24539,6 @@ function createNavigatorAttendance(options) {
     const helpContext = help.map(({ role, help: text }) => `<role_help role="${role}">
 ${text}
 </role_help>`).join("\n");
-    let output;
-    let prepareBatchRejected = false;
-    outputSink = (value) => {
-      if (output === void 0) {
-        output = value;
-        return;
-      }
-      const prior2 = output.candidates;
-      const next = value.candidates;
-      const merged = [
-        ...Array.isArray(prior2) ? prior2 : prior2 === void 0 ? [] : [prior2],
-        ...Array.isArray(next) ? next : next === void 0 ? [] : [next]
-      ];
-      output = { ...value, candidates: merged };
-    };
     const tool = createNavigatorPrepareTool((value) => {
       outputSink?.(value);
     });
@@ -24304,7 +24546,12 @@ ${text}
       sessionReady = (async () => {
         let created;
         try {
-          created = await options.createSession({ context: options.context, subject: subjectKey, ...options.modelSettingPath === void 0 ? {} : { modelSettingPath: options.modelSettingPath }, tool });
+          created = await options.createSession({
+            context: options.context,
+            subject: subjectKey,
+            ...options.modelSettingPath === void 0 ? {} : { modelSettingPath: options.modelSettingPath },
+            tool
+          });
         } catch (error) {
           throw navigatorUnavailableError("session", error);
         }
@@ -24335,26 +24582,40 @@ ${text}
       session.appendEntry(INVOCATION_ENTRY, { invocationId, role: options.role, phase: options.phase, subjectKey });
     }
     if (disposed) throw navigatorUnavailableError("session", new Error("Navigator attendance was disposed"));
-    const activeSession = session;
-    if (activeSession === void 0) throw new Error("Navigator session was not created");
-    const prior = activeSession.entries().filter((entry) => exactRecord2(entry) && entry.type === "custom" && entry.customType === ROUTE_ENTRY && exactRecord2(entry.data) && entry.data.subjectKey === subjectKey).at(-1)?.data;
-    if (exactRecord2(prior) && Array.isArray(prior.route) && prior.route.every((target) => targetIsValid(target))) {
-      previousRoute = prior.route.map((target) => ({ role: target.role, phase: target.phase }));
-    }
-    const publicSettlementHistory = activeSession.entries().filter((entry) => exactRecord2(entry) && entry.type === "custom" && entry.customType === SETTLEMENT_ENTRY && exactRecord2(entry.data)).map((entry) => entry.data);
+    if (session === void 0) throw new Error("Navigator session was not created");
+    return { soul, routePlaybook, helpContext, modelSetting, model, help, activeSession: session };
+  };
+  const prepare = async (materialsBundle) => {
+    const boundSettlement = prepareBoundSettlement;
+    prepareBoundSettlement = void 0;
+    const invocationId = invocationPrincipal;
+    activeInvocationId = invocationId;
+    let output;
+    let prepareBatchRejected = false;
+    outputSink = (value) => {
+      if (output === void 0) {
+        output = value;
+        return;
+      }
+      const prior = normalizePrepareProse(output) ?? "";
+      const next = normalizePrepareProse(value) ?? "";
+      const merged = [prior, next].filter((part) => part.trim() !== "").join("\n\n");
+      output = { prose: merged };
+    };
+    const { soul, routePlaybook, helpContext, help, activeSession } = materialsBundle ?? await loadMaterialsAndSession(invocationId);
+    const publicSettlementHistory = activeSession.entries().filter((entry) => exactRecord3(entry) && entry.type === "custom" && entry.customType === SETTLEMENT_ENTRY && exactRecord3(entry.data)).map((entry) => entry.data);
     const projection = {
       subjectKey,
       subject,
       authority,
       currentRole: { role: options.role, phase: options.phase },
       ...boundSettlement === void 0 ? {} : { currentSettlement: boundSettlement },
-      priorRoute: exactRecord2(prior) && Array.isArray(prior.route) && prior.route.every((target) => targetIsValid(target)) ? prior.route.map((target) => ({ role: target.role, phase: target.phase })) : null,
       publicSettlementHistory,
       liveRoleHelp: help
     };
     activeSession.appendEntry(CONTEXT_ENTRY, projection);
-    const request = [
-      "\u672C\u6B21\u5BFC\u822A\u6750\u6599\u5982\u4E0B\uFF1A",
+    const request = boundSettlement === void 0 ? [
+      "\u672C\u8F6E\u4E3A\u5F85\u547D\u8F6E\u3002",
       `<navigator_soul>
 ${soul}
 </navigator_soul>`,
@@ -24370,12 +24631,32 @@ ${authority}
       `<current_role>
 ${JSON.stringify({ role: options.role, phase: options.phase })}
 </current_role>`,
-      ...boundSettlement === void 0 ? [] : [`<current_settlement>
+      `<public_settlement_history>
+${JSON.stringify(projection.publicSettlementHistory)}
+</public_settlement_history>`,
+      `<live_role_help>
+${helpContext}
+</live_role_help>`
+    ].join("\n\n") : [
+      "\u672C\u8F6E\u4E3A\u7ED3\u7B97\u6295\u5582\u8F6E\u3002",
+      `<navigator_soul>
+${soul}
+</navigator_soul>`,
+      ...routePlaybookReadFailure === void 0 ? [`<route_playbook>
+${routePlaybook}
+</route_playbook>`] : ["\u53EF\u9009\u8DEF\u7EBF\u624B\u518C\u672A\u80FD\u8BFB\u53D6\u3002"],
+      `<work_subject>
+${subject}
+</work_subject>`,
+      `<controlling_authority>
+${authority}
+</controlling_authority>`,
+      `<current_role>
+${JSON.stringify({ role: options.role, phase: options.phase })}
+</current_role>`,
+      `<current_settlement>
 ${JSON.stringify(boundSettlement)}
-</current_settlement>`],
-      `<prior_route>
-${JSON.stringify(prior ?? null)}
-</prior_route>`,
+</current_settlement>`,
       `<public_settlement_history>
 ${JSON.stringify(projection.publicSettlementHistory)}
 </public_settlement_history>`,
@@ -24416,33 +24697,47 @@ ${helpContext}
           if (deliveryRequest && output === void 0) delivery.recordDeliveryRequest();
         };
         await promptAllowingRejectedPrepare(request, false);
-        while (output === void 0 && delivery.nextAction() === "request-delivery") {
-          await promptAllowingRejectedPrepare(RECEIPT_DELIVERY_PROMPT, true);
-        }
-        if (output === void 0 && delivery.nextAction() === "no-receipt" && activeSession.providerFailure?.() === void 0) {
-          const facts = delivery.facts({ runPointer: activeSession.recordPointer(), attemptPointer: invocationId });
-          activeSession.appendEntry(NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, facts);
-          preparationNoReceipt = true;
-          candidates = [];
-          return candidates;
+        if (boundSettlement !== void 0) {
+          while (output === void 0 && prepareBatchRejected && delivery.nextAction() === "request-delivery") {
+            await promptAllowingRejectedPrepare(RECEIPT_DELIVERY_PROMPT, true);
+          }
+          if (output === void 0 && delivery.nextAction() === "request-delivery") {
+            while (delivery.nextAction() === "request-delivery") {
+              delivery.recordDeliveryRequest();
+            }
+          }
+          if (output === void 0 && delivery.nextAction() === "no-receipt" && activeSession.providerFailure?.() === void 0) {
+            const facts = delivery.facts({ runPointer: activeSession.recordPointer(), attemptPointer: invocationId });
+            activeSession.appendEntry(NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, facts);
+            preparedProse = void 0;
+            return void 0;
+          }
         }
       } catch (error) {
         throw error instanceof NavigatorUnavailableError ? error : navigatorUnavailableError("transport", error);
       }
       if (output === void 0) {
+        if (boundSettlement === void 0) {
+          preparedProse = void 0;
+          return void 0;
+        }
         const nativeFailure = [...activeSession.entries()].reverse().find((entry) => {
-          if (!exactRecord2(entry) || entry.type !== "message" || !exactRecord2(entry.message)) return false;
+          if (!exactRecord3(entry) || entry.type !== "message" || !exactRecord3(entry.message)) return false;
           return entry.message.role === "assistant" && typeof entry.message.errorMessage === "string" && entry.message.errorMessage.trim() !== "";
         });
-        const nativeMessage = exactRecord2(nativeFailure) && exactRecord2(nativeFailure.message) ? nativeFailure.message : void 0;
+        const nativeMessage = exactRecord3(nativeFailure) && exactRecord3(nativeFailure.message) ? nativeFailure.message : void 0;
         const errorMessage = nativeMessage !== void 0 && typeof nativeMessage.errorMessage === "string" ? nativeMessage.errorMessage : "Navigator did not submit direction advice";
         const providerFailure = activeSession.providerFailure?.();
         const source = providerFailure?.source ?? "unknown";
         const cause = providerFailure?.cause ?? source;
         throw navigatorUnavailableError(source, errorMessage, cause);
       }
-      candidates = normalizePrepareOutput(output);
-      return candidates;
+      if (boundSettlement === void 0) {
+        preparedProse = void 0;
+        return void 0;
+      }
+      preparedProse = normalizePrepareProse(output);
+      return preparedProse;
     } finally {
       outputSink = void 0;
     }
@@ -24453,7 +24748,6 @@ ${helpContext}
       if (next.subjectKey !== subjectKey && session !== void 0) {
         const previous = session;
         session = void 0;
-        previousRoute = void 0;
         closing = previous.dispose();
       }
       subjectKey = next.subjectKey;
@@ -24475,13 +24769,16 @@ ${helpContext}
     prepare() {
       if (disposed || preparation !== void 0) return;
       preparationFailure = void 0;
-      preparation = prepare();
+      preparationInFlight = true;
+      preparation = prepare().finally(() => {
+        preparationInFlight = false;
+      });
       void preparation.catch((error) => {
         preparationFailure = error;
       });
     },
     isPreparing() {
-      return preparation !== void 0 || sessionReady !== void 0;
+      return preparationInFlight;
     },
     knownRoutePlaybookReadFailure() {
       return routePlaybookReadFailure;
@@ -24505,81 +24802,70 @@ ${helpContext}
     if (disposed) return;
     const invocationId = activeInvocationId ?? invocationPrincipal;
     let report;
-    if (settlement.kind === "human_decision" || settlement.kind === "role_infrastructure_failure") {
-      if (sessionReady !== void 0) {
-        try {
-          await sessionReady;
-        } catch (error) {
-          preparationFailure ??= error;
-        }
+    if (sessionReady !== void 0) {
+      try {
+        await sessionReady;
+      } catch (error) {
+        preparationFailure ??= error;
       }
-      if (preparation !== void 0) {
-        try {
-          await preparation;
-        } catch (error) {
-          preparationFailure ??= error;
-        }
+    }
+    if (preparation !== void 0) {
+      try {
+        await preparation;
+      } catch (error) {
+        preparationFailure ??= error;
       }
-      session?.appendEntry(SETTLEMENT_ENTRY, { invocationId, subjectKey, role: settlement.role, phase: settlement.phase, kind: settlement.kind, ...settlement.kind === "human_decision" ? { status: settlement.status } : {} });
+      preparation = void 0;
+    }
+    const settlementFact = {
+      invocationId,
+      subjectKey,
+      role: settlement.role,
+      phase: settlement.phase,
+      kind: settlement.kind,
+      ..."status" in settlement && settlement.status !== void 0 ? { status: settlement.status } : {}
+    };
+    let drainedProse;
+    if (settlement.kind === "arrival") {
+      session?.appendEntry(SETTLEMENT_ENTRY, settlementFact);
       if (preparationFailure !== void 0) {
         report = unavailable(invocationId, preparationFailure);
       } else {
-        report = { disposition: "no-advice" };
+        report = {
+          disposition: "arrival",
+          ...settlement.message === void 0 ? {} : { arrivalMessage: settlement.message }
+        };
       }
-    } else if (settlement.kind === "arrival") {
-      if (sessionReady !== void 0) {
+    } else {
+      if (session !== void 0) preparationFailure = void 0;
+      let coldMaterials;
+      if (session === void 0 && preparationFailure === void 0) {
         try {
-          await sessionReady;
+          coldMaterials = await loadMaterialsAndSession(invocationId);
         } catch (error) {
-          preparationFailure ??= error;
+          preparationFailure = error;
         }
       }
-      if (preparation !== void 0) {
+      session?.appendEntry(SETTLEMENT_ENTRY, settlementFact);
+      if (preparationFailure === void 0) {
+        prepareBoundSettlement = settlement;
+        preparation = prepare(coldMaterials);
+        void preparation.catch((error) => {
+          preparationFailure = error;
+        });
         try {
-          await preparation;
+          drainedProse = await preparation;
         } catch (error) {
           preparationFailure ??= error;
         }
+        preparation = void 0;
       }
-      report = preparationFailure === void 0 ? { disposition: "arrival", ...settlement.message === void 0 ? {} : { arrivalMessage: settlement.message } } : unavailable(invocationId, preparationFailure);
-    } else if (preparation === void 0) {
-      report = unavailable(invocationId, "Navigator preparation did not start");
-    } else {
-      try {
-        if (sessionReady !== void 0) await sessionReady;
-        let prepared = await preparation;
-        session?.appendEntry(SETTLEMENT_ENTRY, { invocationId, subjectKey, role: settlement.role, phase: settlement.phase, kind: settlement.kind, ...settlement.status === void 0 ? {} : { status: settlement.status } });
-        let selected = selectNavigatorCandidate(prepared, settlement);
-        if (selected?.candidate.next !== void 0 && !selected.matchedToSettlement) {
-          if (disposed) return;
-          prepareBoundSettlement = settlement;
-          prepared = await prepare();
-          if (disposed) return;
-          selected = selectNavigatorCandidate(prepared, settlement);
-        }
-        const selectedCandidate = selected?.candidate;
-        if (selectedCandidate?.next === void 0 && preparationNoReceipt) {
-          report = { disposition: "no-advice" };
-        } else if (selectedCandidate?.next === void 0) {
-          throw new Error("Navigator prepared no machine-usable next direction");
-        } else {
-          const selectedRoute = selectedCandidate.route;
-          const routeChanged = selectedRoute !== void 0 && !routeEqual(previousRoute, selectedRoute);
-          const command = typeof selectedCandidate.command === "string" && selectedCandidate.command.trim() !== "" ? selectedCandidate.command : renderPublicAkRoleCommand(selectedCandidate.next);
-          report = {
-            disposition: "recommendation",
-            ...routeChanged ? { route: selectedRoute } : {},
-            next: selectedCandidate.next,
-            ...selectedCandidate.reason === void 0 ? {} : { reason: selectedCandidate.reason },
-            ...command === void 0 ? {} : { command }
-          };
-          if (selectedRoute !== void 0) {
-            previousRoute = selectedRoute;
-            session?.appendEntry(ROUTE_ENTRY, { invocationId, subjectKey, route: selectedRoute });
-          }
-        }
-      } catch (error) {
-        report = unavailable(invocationId, error);
+      if (preparationFailure !== void 0) {
+        report = unavailable(invocationId, preparationFailure);
+      } else if (typeof drainedProse === "string" && drainedProse.trim() !== "") {
+        report = { disposition: "advice", prose: drainedProse };
+      } else {
+        report = { disposition: "no-advice" };
       }
     }
     await routePlaybookSettlement;
@@ -24593,10 +24879,7 @@ ${helpContext}
       role: options.role,
       phase: options.phase,
       subjectKey,
-      ...report.route === void 0 ? {} : { route: report.route },
-      ...report.next === void 0 ? {} : { next: report.next },
-      ...report.reason === void 0 ? {} : { reason: report.reason },
-      ...report.command === void 0 ? {} : { command: report.command },
+      ...report.prose === void 0 ? {} : { prose: report.prose },
       ...report.unavailableReason === void 0 ? {} : { unavailableReason: report.unavailableReason },
       ...report.unavailableSource === void 0 ? {} : { unavailableSource: report.unavailableSource },
       ...report.unavailableCause === void 0 ? {} : { unavailableCause: report.unavailableCause },
@@ -24612,9 +24895,8 @@ ${helpContext}
     }
     preparation = void 0;
     sessionReady = void 0;
-    candidates = void 0;
+    preparedProse = void 0;
     preparationFailure = void 0;
-    preparationNoReceipt = false;
     routePlaybookSettlement = void 0;
     routePlaybookReadFailure = void 0;
   }
@@ -24829,7 +25111,7 @@ init_submission_errors();
 init_submission_errors();
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { existsSync as existsSync12, lstatSync as lstatSync3, readdirSync as readdirSync3, readFileSync as readFileSync5, rmdirSync, rmSync } from "node:fs";
-import { resolve as resolve18 } from "node:path";
+import { resolve as resolve17 } from "node:path";
 var WORKER_SUBMISSION_GATE_RECORD_KIND = WORKER_SUBMISSION_GATE_KIND;
 var WORKER_COMMIT_BASELINE_ENTRY_TYPE = "commit-baseline";
 var WORKER_COMMIT_REMINDER_BOUNCE_ENTRY_TYPE = "commit-reminder-bounce";
@@ -24878,7 +25160,7 @@ function escapeGitConfigValueRegex(value) {
 function unsetOwnedHooksPath(file) {
   const owned = [];
   for (const value of tryGetAll(file, "core.hooksPath")) {
-    if (!ownedHook(resolve18(value, HOOK_FILE))) continue;
+    if (!ownedHook(resolve17(value, HOOK_FILE))) continue;
     try {
       gitFile(file, [
         "--unset-all",
@@ -24893,15 +25175,15 @@ function unsetOwnedHooksPath(file) {
   return owned;
 }
 function rmOwnedDir(dir) {
-  const hookPath = resolve18(dir, HOOK_FILE);
+  const hookPath = resolve17(dir, HOOK_FILE);
   if (!ownedHook(hookPath)) return;
   rmSync(hookPath, { force: true });
   if (existsSync12(dir) && readdirSync3(dir).length === 0) rmdirSync(dir);
 }
 function linkedGitDirs(commonDir) {
-  const root = resolve18(commonDir, "worktrees");
+  const root = resolve17(commonDir, "worktrees");
   if (!existsSync12(root)) return [];
-  return readdirSync3(root).map((name) => resolve18(root, name)).filter((dir) => lstatSync3(dir).isDirectory());
+  return readdirSync3(root).map((name) => resolve17(root, name)).filter((dir) => lstatSync3(dir).isDirectory());
 }
 function uninstallPackageWorkerHooks(cwd) {
   let inside;
@@ -24915,14 +25197,14 @@ function uninstallPackageWorkerHooks(cwd) {
   const clear = (configFile) => {
     for (const hooks of unsetOwnedHooksPath(configFile)) rmOwnedDir(hooks);
   };
-  clear(resolve18(commonDir, "config"));
-  clear(resolve18(commonDir, "config.worktree"));
-  rmOwnedDir(resolve18(commonDir, HOOKS_DIR));
-  const legacy = resolve18(commonDir, "hooks", HOOK_FILE);
+  clear(resolve17(commonDir, "config"));
+  clear(resolve17(commonDir, "config.worktree"));
+  rmOwnedDir(resolve17(commonDir, HOOKS_DIR));
+  const legacy = resolve17(commonDir, "hooks", HOOK_FILE);
   if (ownedHook(legacy)) rmSync(legacy, { force: true });
   for (const gitDir of linkedGitDirs(commonDir)) {
-    clear(resolve18(gitDir, "config.worktree"));
-    rmOwnedDir(resolve18(gitDir, HOOKS_DIR));
+    clear(resolve17(gitDir, "config.worktree"));
+    rmOwnedDir(resolve17(gitDir, HOOKS_DIR));
   }
 }
 function isRecord13(value) {
@@ -25675,7 +25957,7 @@ async function executeActivationStage(role, stage, infrastructure) {
     throw activationError;
   }
 }
-function writeActivationTraceRecord(record4, write = writeSync4) {
+function writeActivationTraceRecord(record4, write = writeSync3) {
   writeStderrJsonlRecord(record4, write);
 }
 var ActivationBarrierError = class extends Error {
@@ -26101,6 +26383,21 @@ function createCountersignRoleRuntime(roleHost, dependencies, hostActions) {
     dependencies
   );
 }
+function lastAssistantProse(messages) {
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const message = messages[index];
+    if (message?.role !== "assistant" || !Array.isArray(message.content)) continue;
+    const texts = [];
+    for (const part of message.content) {
+      if (part.type === "text" && typeof part.text === "string" && part.text.length > 0) {
+        texts.push(part.text);
+      }
+    }
+    if (texts.length === 0) continue;
+    return texts.join("");
+  }
+  return void 0;
+}
 function createRoleRuntimeExtension(dependencies) {
   return (envelopeHost) => {
     let projectClosedSubmission = async () => {
@@ -26159,10 +26456,6 @@ function createRoleRuntimeExtension(dependencies) {
       if (settlement === void 0 || attendance === void 0) return;
       const workContext = navigatorWorkContext;
       const pending = (async () => {
-        if (settlement.kind !== "accepted") {
-          await attendance.settle(settlement);
-          return;
-        }
         const settlePromise = attendance.settle(settlement);
         void settlePromise.catch(() => void 0);
         const raced = await raceNavigatorGrace(settlePromise, NAVIGATOR_POST_ROLE_GRACE_MS);
@@ -26363,10 +26656,8 @@ function createRoleRuntimeExtension(dependencies) {
         pendingSubmissionNonPassByToolCallId.delete(event.toolCallId);
         return { details: submissionNonPass, isError: true };
       }
-      if (event.isError) return;
-      return;
     });
-    roleHost.on("agent_end", (event, ctx) => {
+    roleHost.on("agent_end", async (event, ctx) => {
       const lastMessage = event.messages.at(-1);
       if (lastMessage?.role === "assistant" && (lastMessage.stopReason === "error" || lastMessage.stopReason === "aborted")) {
         if (receiptDelivery.nextAction() !== "accepted") {
@@ -26374,6 +26665,47 @@ function createRoleRuntimeExtension(dependencies) {
         }
         return;
       }
+      const role = selectedRole ?? roleHost.getFlag(ROLE_FLAG.name);
+      if (role === "navigator" && receiptDelivery.nextAction() !== "accepted") {
+        const prose = lastAssistantProse(event.messages);
+        if (prose !== void 0 && prose.trim() !== "") {
+          const accepted = { prose };
+          await sealAcceptedSubmission({
+            context: ctx,
+            role: "navigator",
+            accepted,
+            toolCallId: `navigator-prose-exit:${randomUUID8()}`
+          });
+          await projectClosedSubmission(
+            { role: "navigator", kind: "accepted", accepted },
+            ctx
+          );
+          return;
+        }
+        if (!noReceiptRecorded) {
+          const runPointer = runDirectoryFromHostContext(ctx);
+          if (runPointer !== void 0) {
+            noReceiptRecorded = true;
+            while (receiptDelivery.nextAction() === "request-delivery") {
+              receiptDelivery.recordDeliveryRequest();
+            }
+            const facts = receiptDelivery.facts({ runPointer, attemptPointer: `current:${runPointer}` });
+            envelopeHost.appendEntry(NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, facts);
+            try {
+              sitianReport({
+                level: "event",
+                kind: "no-receipt-lifecycle",
+                cwd: ctx.cwd,
+                sessionParent: ctx.sessionManager.getSessionFile(),
+                payload: facts,
+                source: "role-runtime"
+              });
+            } catch {
+            }
+          }
+        }
+        return;
+      }
       if (receiptDelivery.nextAction() === "request-delivery") {
         receiptDelivery.recordDeliveryRequest();
         envelopeHost.appendEntry("ak-receipt-delivery-request");
@@ -26857,11 +27189,8 @@ function createRoleRuntimeExtension(dependencies) {
         }
       };
       try {
-        const bookKey = resolveBookKeyFromGit(ctx.cwd);
-        const correlation = correlationIdentityFromEnv();
-        const sessionFile = ctx.sessionManager.getSessionFile?.() || ctx.sessionManager.getSessionDir?.();
-        const ledgerHome = resolveActivationLedgerHomeForPath(sessionFile);
-        const session = durableSessionPointer(ctx.sessionManager);
+        resolveBookKeyFromGit(ctx.cwd);
+        durableSessionPointer(ctx.sessionManager);
         const isStationChild = roleHost.getFlag(STATION_CHILD_FLAG.name) === true;
         if (dependencies.createNavigatorAttendance !== void 0 && entry.role !== "navigator" && !isStationChild) {
           navigatorSessionParent = ctx.sessionManager.getSessionFile();
@@ -26948,16 +27277,6 @@ function createRoleRuntimeExtension(dependencies) {
           if (entry.role === "coder") coder.armSubmissionGate(ctx.cwd, ctx.sessionManager);
           else fixer.armSubmissionGate(ctx.cwd, ctx.sessionManager);
         }
-        appendAcceptedActivationToBook({
-          ledgerHome,
-          fact: buildAcceptedActivationFact({
-            role: entry.role,
-            observedAt: clock(),
-            bookKey,
-            session,
-            correlation
-          })
-        });
         admitted = true;
       } catch (error) {
         failInfrastructure(error, ctx);
@@ -26971,11 +27290,11 @@ init_role_activation_flags();
 init_submission_correctable_error();
 init_navigator_invocation_identity();
 async function listen(server, path) {
-  await new Promise((resolve22, reject) => {
+  await new Promise((resolve21, reject) => {
     server.once("error", reject);
     server.listen(path, () => {
       server.off("error", reject);
-      resolve22();
+      resolve21();
     });
   });
 }
@@ -27008,10 +27327,10 @@ async function prepareRoleEnvelope(options) {
   let rejection;
   let infrastructureRoundFailure;
   const hostAbort = new AbortController();
-  const runId = request.runDirectory.split("/").filter(Boolean).at(-1) ?? randomUUID8();
+  const runId = request.runDirectory.split("/").filter(Boolean).at(-1) ?? randomUUID9();
   await mkdir7(request.runDirectory, { recursive: true });
   let sessionFile = options.sessionFile ?? join41(request.runDirectory, "session", "session.jsonl");
-  await mkdir7(dirname22(sessionFile), { recursive: true });
+  await mkdir7(dirname21(sessionFile), { recursive: true });
   if (request.continuation.kind !== "resume") {
     try {
       await writeFile12(
@@ -27030,6 +27349,25 @@ async function prepareRoleEnvelope(options) {
       if (error.code !== "EEXIST") throw error;
     }
   }
+  let durableWriteChain = Promise.resolve();
+  let armDurableWriteFailure;
+  const persistPackageSessionEntry = (entry) => {
+    const customType = typeof entry.customType === "string" ? entry.customType : "unknown";
+    const line2 = `${JSON.stringify({
+      ...entry,
+      id: typeof entry.id === "string" ? entry.id : randomUUID9(),
+      timestamp: typeof entry.timestamp === "string" ? entry.timestamp : (/* @__PURE__ */ new Date()).toISOString()
+    })}
+`;
+    durableWriteChain = durableWriteChain.then(async () => {
+      try {
+        await appendFile3(sessionFile, line2, "utf8");
+      } catch (error) {
+        const diagnostic = error instanceof Error ? error.message : String(error);
+        armDurableWriteFailure?.(customType, diagnostic);
+      }
+    });
+  };
   const context = {
     cwd: request.cwd,
     mode: "print",
@@ -27042,7 +27380,7 @@ async function prepareRoleEnvelope(options) {
       getLeafEntry: () => sessionEntries.at(-1),
       getLeafId: () => runId,
       getEntries: () => sessionEntries,
-      getSessionDir: () => dirname22(sessionFile),
+      getSessionDir: () => dirname21(sessionFile),
       getSessionFile: () => sessionFile,
       getHeader: () => ({ type: "session", id: runId }),
       setSessionFile(path) {
@@ -27052,6 +27390,7 @@ async function prepareRoleEnvelope(options) {
         const entry = { type: "custom", customType, data };
         sessionEntries.push(entry);
         customEntries.push({ customType, data });
+        persistPackageSessionEntry(entry);
       }
     },
     abort() {
@@ -27065,6 +27404,7 @@ async function prepareRoleEnvelope(options) {
     const entry = { type: "custom_message", customType, ...payload, message: payload };
     sessionEntries.push(entry);
     customEntries.push({ customType, data: message.details ?? message.content });
+    persistPackageSessionEntry(entry);
   };
   const emit = async (event, value) => {
     const results = [];
@@ -27144,7 +27484,7 @@ async function prepareRoleEnvelope(options) {
     }
   };
   createRoleRuntimeExtension(options.dependencies)(envelope);
-  const token = randomUUID8();
+  const token = randomUUID9();
   const server = createServer((socket) => serveSocket(socket));
   function rememberProjectedRejection(details, toolCallId, content) {
     if (typeof details !== "object" || details === null) return;
@@ -27180,6 +27520,17 @@ async function prepareRoleEnvelope(options) {
     };
     hostAbort.abort();
   }
+  armDurableWriteFailure = (customType, diagnostic) => {
+    rememberInfrastructureFailure(
+      {
+        cause: "infrastructure",
+        kind: "role_infrastructure_failure",
+        code: "durable-session-write-failed",
+        customType
+      },
+      [{ type: "text", text: `ak-role: durable session entry flush failed (${customType}): ${diagnostic}` }]
+    );
+  };
   function declareRoundInfrastructureFailure(error) {
     const diagnostic = error instanceof Error ? error.message : String(error);
     const content = [{ type: "text", text: diagnostic }];
@@ -27225,7 +27576,7 @@ async function prepareRoleEnvelope(options) {
   async function invokeAkTool(name, args) {
     const tool = tools.get(name);
     if (tool === void 0) throw new Error(`Unknown AK tool: ${name}`);
-    const toolCallId = randomUUID8();
+    const toolCallId = randomUUID9();
     calls.push({ toolCallId, toolName: name });
     sessionEntries.push({
       type: "message",
@@ -27341,6 +27692,15 @@ async function prepareRoleEnvelope(options) {
   const relay = fileURLToPath2(new URL("./mcp-relay.mjs", import.meta.url));
   await listen(server, options.socketPath);
   let disposed = false;
+  let durableFailureHandedToCloseRound = false;
+  const settleDurableWrites = async () => {
+    await durableWriteChain;
+    if (infrastructureRoundFailure !== void 0) {
+      durableFailureHandedToCloseRound = true;
+      return { accepted: false, failure: infrastructureRoundFailure };
+    }
+    return void 0;
+  };
   const dispose = async () => {
     if (disposed) return;
     disposed = true;
@@ -27350,11 +27710,25 @@ async function prepareRoleEnvelope(options) {
     } catch (error) {
       cleanupFailures.push(error);
     }
+    try {
+      const alreadyHanded = durableFailureHandedToCloseRound;
+      const durableFailure = await settleDurableWrites();
+      if (durableFailure !== void 0 && !alreadyHanded) {
+        cleanupFailures.push(
+          Object.assign(
+            new Error(durableFailure.failure.diagnostic ?? "durable session entry flush failed"),
+            { code: durableFailure.failure.identity?.code ?? "durable-session-write-failed" }
+          )
+        );
+      }
+    } catch (error) {
+      cleanupFailures.push(error);
+    }
     try {
       const closeAll = server.closeAllConnections;
       if (typeof closeAll === "function") closeAll.call(server);
-      await new Promise((resolve22, reject) => {
-        server.close((error) => error ? reject(error) : resolve22());
+      await new Promise((resolve21, reject) => {
+        server.close((error) => error ? reject(error) : resolve21());
       });
     } catch (error) {
       cleanupFailures.push(error);
@@ -27371,6 +27745,7 @@ async function prepareRoleEnvelope(options) {
     if (calls.some((call) => call.toolName === terminatingToolName)) return;
     await invokeAkTool(terminatingToolName, params ?? {});
   }
+  ;
   const closeRound = async () => {
     if (calls.length > 0) {
       const roundCalls = [...calls];
@@ -27378,6 +27753,7 @@ async function prepareRoleEnvelope(options) {
       await emit("turn_end", { turnIndex: 0, calls: roundCalls });
     }
     if (infrastructureRoundFailure !== void 0) {
+      durableFailureHandedToCloseRound = true;
       return { accepted: false, failure: infrastructureRoundFailure };
     }
     let closure;
@@ -27389,6 +27765,8 @@ async function prepareRoleEnvelope(options) {
     }
     if (closure !== void 0) {
       await emit("agent_settled", {});
+      const durableFailure2 = await settleDurableWrites();
+      if (durableFailure2 !== void 0) return durableFailure2;
       return { accepted: true };
     }
     if (rejection !== void 0) {
@@ -27398,9 +27776,13 @@ async function prepareRoleEnvelope(options) {
         message: rejection.message
       };
       rejection = void 0;
+      const durableFailure2 = await settleDurableWrites();
+      if (durableFailure2 !== void 0) return durableFailure2;
       return { accepted: false, retry };
     }
     await emit("agent_settled", {});
+    const durableFailure = await settleDurableWrites();
+    if (durableFailure !== void 0) return durableFailure;
     return { accepted: true };
   };
   try {
@@ -27488,12 +27870,12 @@ import { join as join42 } from "node:path";
 // src/canonical-skill-binding.ts
 import { readFile as readFile20, realpath as realpath8 } from "node:fs/promises";
 import { homedir } from "node:os";
-import { dirname as dirname23, resolve as resolve19 } from "node:path";
+import { dirname as dirname22, resolve as resolve18 } from "node:path";
 import { stripFrontmatter } from "@earendil-works/pi-coding-agent";
 function captureCanonicalSkillExpansion(name, snapshot, configuredPath, evidence, originalRequest) {
   const matchedPath = evidence?.location === configuredPath ? configuredPath : evidence?.location === snapshot.path ? snapshot.path : void 0;
   const expectedContent = matchedPath === void 0 ? void 0 : snapshot.body;
-  const prefixedContent = matchedPath === void 0 ? void 0 : `References are relative to ${dirname23(matchedPath)}.
+  const prefixedContent = matchedPath === void 0 ? void 0 : `References are relative to ${dirname22(matchedPath)}.
 
 ${snapshot.body}`;
   if (evidence?.name !== name || matchedPath === void 0 || evidence.content !== expectedContent && evidence.content !== prefixedContent || evidence.userMessage !== originalRequest) {
@@ -27511,7 +27893,7 @@ var CanonicalSkillUnavailableError = class extends Error {
   code = "canonical-skill-unavailable";
 };
 async function loadCanonicalSkillBinding(name) {
-  const configuredPath = resolve19(
+  const configuredPath = resolve18(
     homedir(),
     `.agents/skills/${name}/SKILL.md`
   );
@@ -27530,7 +27912,7 @@ async function loadCanonicalSkillBinding(name) {
   const snapshot = Object.freeze({
     raw,
     path,
-    baseDir: dirname23(path),
+    baseDir: dirname22(path),
     body,
     snapshotIdentity: Object.freeze({ text: raw })
   });
@@ -27559,7 +27941,7 @@ init_doctor_evidence();
 init_doctor_evidence();
 init_host_contracts();
 import { readFile as readFile21 } from "node:fs/promises";
-import { resolve as resolve20 } from "node:path";
+import { resolve as resolve19 } from "node:path";
 init_notary_source_run();
 init_packaged_role_registry();
 init_invocation();
@@ -27567,7 +27949,7 @@ function navigatorInputReference(getFlag, role) {
   if (getFlag === void 0) return void 0;
   const name = packagedRoleInputFlag(role);
   const value = name === void 0 ? void 0 : getFlag(name);
-  return typeof value === "string" && value !== "" ? resolve20(value) : void 0;
+  return typeof value === "string" && value !== "" ? resolve19(value) : void 0;
 }
 async function loadNavigatorWorkContext(options) {
   const reference = navigatorInputReference(options.getFlag, options.role);
@@ -27588,7 +27970,7 @@ async function loadNavigatorWorkContext(options) {
   }
   const publicRunDir = runDirectoryFromHostContext(options.context);
   const currentSessionDir = options.context.sessionManager.getSessionDir();
-  const isBoundPublicRun = publicRunDir !== void 0 && resolve20(currentSessionDir) === resolve20(publicRunDir, "session");
+  const isBoundPublicRun = publicRunDir !== void 0 && resolve19(currentSessionDir) === resolve19(publicRunDir, "session");
   if (options.role === "judge" && isBoundPublicRun) {
     let admitted;
     try {
@@ -27621,9 +28003,9 @@ async function loadNavigatorWorkContext(options) {
   }
   const workRoot = subjectRoot.includes("/.ak/work/") ? subjectRoot : void 0;
   const authorityFiles = workRoot === void 0 ? [] : [
-    resolve20(workRoot, "authority.md"),
-    resolve20(workRoot, "authority.txt"),
-    resolve20(workRoot, "design-v2/owner-direction.md")
+    resolve19(workRoot, "authority.md"),
+    resolve19(workRoot, "authority.txt"),
+    resolve19(workRoot, "design-v2/owner-direction.md")
   ];
   let authorityMaterial;
   for (const path of authorityFiles) {
@@ -27653,7 +28035,7 @@ async function loadNavigatorWorkContext(options) {
 init_notary_source_run();
 
 // src/package-resources/method-skill-binding.ts
-import { dirname as dirname24 } from "node:path";
+import { dirname as dirname23 } from "node:path";
 init_method_skill();
 async function loadPackagedCanonicalSkillBinding(packageRoot, name) {
   const material = await loadPackagedMethodSkillMaterial(packageRoot, name);
@@ -27661,7 +28043,7 @@ async function loadPackagedCanonicalSkillBinding(packageRoot, name) {
   const snapshot = Object.freeze({
     raw: material.raw,
     path: material.skillPath,
-    baseDir: dirname24(material.skillPath),
+    baseDir: dirname23(material.skillPath),
     body: material.body,
     snapshotIdentity: Object.freeze({ text: material.raw })
   });
@@ -27807,7 +28189,7 @@ function hostAbortedError(message = "host aborted") {
 function raceAgainstHostAbort(work, abortSignal, message = "host aborted") {
   if (abortSignal?.aborted) return Promise.reject(hostAbortedError(message));
   if (abortSignal === void 0) return work;
-  return new Promise((resolve22, reject) => {
+  return new Promise((resolve21, reject) => {
     let settled = false;
     const onAbort = () => {
       if (settled) return;
@@ -27822,7 +28204,7 @@ function raceAgainstHostAbort(work, abortSignal, message = "host aborted") {
         if (settled) return;
         settled = true;
         abortSignal.removeEventListener("abort", onAbort);
-        resolve22(value);
+        resolve21(value);
       },
       (error) => {
         if (settled) return;
@@ -27914,6 +28296,9 @@ function reportHostSessionEvent(input) {
   });
 }
 
+// src/acp-host/role-turn-host.ts
+init_navigator_output();
+
 // src/agent-start-materials.ts
 function renderAgentStartMaterials(body, materials) {
   if (materials.length === 0) return body;
@@ -27926,7 +28311,42 @@ function renderSystemPromptOverride(authority) {
 }
 
 // src/acp-host/role-turn-host.ts
-function failure(cause, name, code, details) {
+function acpAgentTextChunk(params) {
+  let kind;
+  let content;
+  let textFallback;
+  const nested = params.update;
+  if (typeof nested === "object" && nested !== null && !Array.isArray(nested)) {
+    const record4 = nested;
+    kind = record4.sessionUpdate;
+    content = record4.content;
+    textFallback = record4.text;
+  } else {
+    kind = params.sessionUpdate ?? nested;
+    content = params.content;
+    textFallback = params.text;
+  }
+  if (kind !== "agent_message_chunk" && kind !== "agent_message") return void 0;
+  if (typeof content === "string" && content.length > 0) return content;
+  if (typeof content === "object" && content !== null && !Array.isArray(content)) {
+    const record4 = content;
+    if (typeof record4.text === "string" && record4.text.length > 0) return record4.text;
+  }
+  if (Array.isArray(content)) {
+    const parts = [];
+    for (const part of content) {
+      if (typeof part === "string" && part.length > 0) parts.push(part);
+      else if (typeof part === "object" && part !== null) {
+        const record4 = part;
+        if (typeof record4.text === "string" && record4.text.length > 0) parts.push(record4.text);
+      }
+    }
+    if (parts.length > 0) return parts.join("");
+  }
+  if (typeof textFallback === "string" && textFallback.length > 0) return textFallback;
+  return void 0;
+}
+function failure(cause, name, code, details, diagnostic) {
   return {
     code: null,
     stderr: "",
@@ -27934,10 +28354,24 @@ function failure(cause, name, code, details) {
     knownFailure: {
       cause,
       identity: { name, code },
+      ...diagnostic === void 0 ? {} : { diagnostic },
       ...details === void 0 ? {} : { details }
     }
   };
 }
+function withCleanupFailure(outcome, cleanupError) {
+  const message = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
+  if (outcome.knownFailure === void 0) {
+    return failure("session", "AcpDisposeFailure", "dispose-failed", { cleanupError: message }, message);
+  }
+  return {
+    ...outcome,
+    knownFailure: {
+      ...outcome.knownFailure,
+      details: { ...outcome.knownFailure.details ?? {}, cleanupError: message }
+    }
+  };
+}
 function acpError(code, message, cause) {
   return Object.assign(new Error(message, cause === void 0 ? void 0 : { cause }), { code });
 }
@@ -28010,8 +28444,8 @@ function connectAcpStdio(options) {
     request(method, params) {
       if (closed) return Promise.reject(terminalError ?? acpError("acp-connection-closed", "ACP connection is closed"));
       const id = ++nextId;
-      return new Promise((resolve22, reject) => {
-        pending.set(id, { resolve: resolve22, reject });
+      return new Promise((resolve21, reject) => {
+        pending.set(id, { resolve: resolve21, reject });
         child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
 `, (error) => {
           if (error === null || error === void 0) return;
@@ -28038,7 +28472,7 @@ function connectAcpStdio(options) {
       settleClosed(acpError("acp-connection-closed", "ACP connection is closed"));
       child.stdin.end();
       child.kill("SIGTERM");
-      await new Promise((resolve22) => child.once("close", () => resolve22()));
+      await new Promise((resolve21) => child.once("close", () => resolve21()));
     }
   });
 }
@@ -28049,137 +28483,168 @@ function createAcpRoleTurnHost(config) {
     let connection;
     let sessionId;
     let accepted = false;
+    let outcome = failure("session", "AcpNoOutcome", "no-outcome");
     try {
       if (prepared.mcpServers.length === 0) {
-        return failure("activation", "UncontrolledAcpSession", "ak-config-missing");
-      }
-      connection = await config.connect(request);
-      const sessionParent = config.sessionIdentity.resolveSessionFile(request.principal);
-      const recordAbort = new AbortController();
-      let hostSessionRecordFailure;
-      const hostSessionRecordResult = () => ({
-        code: null,
-        stderr: "",
-        timedOut: false,
-        knownFailure: hostSessionRecordFailure
-      });
-      const noteHostSessionRecordFailure = (error) => {
-        if (hostSessionRecordFailure !== void 0) return;
-        hostSessionRecordFailure = {
-          cause: "session",
-          identity: { name: "HostSessionRecordFailure", code: "host-session-record-failed" },
-          diagnostic: error instanceof Error ? error.message : String(error)
-        };
-        try {
-          recordAbort.abort();
-        } catch {
-        }
-      };
-      const rpc = (method, params) => raceAgainstHostAbort(connection.request(method, params), recordAbort.signal, "host-session-record-failed");
-      connection.onNotification?.((method, params) => {
-        if (method !== "session/update" || hostSessionRecordFailure !== void 0) return;
-        try {
-          reportHostSessionEvent({
-            host: config.hostName,
-            cwd: request.cwd,
-            sessionParent,
-            source: "acp-host",
-            event: { method, params }
-          });
-        } catch (error) {
-          noteHostSessionRecordFailure(error);
-        }
-      });
-      try {
-        const initialized = await rpc("initialize", {
-          protocolVersion: 1,
-          clientCapabilities: {}
+        outcome = failure("activation", "UncontrolledAcpSession", "ak-config-missing");
+      } else {
+        connection = await config.connect(request);
+        const sessionParent = config.sessionIdentity.resolveSessionFile(request.principal);
+        const recordAbort = new AbortController();
+        let hostSessionRecordFailure;
+        const hostSessionRecordResult = () => ({
+          code: null,
+          stderr: "",
+          timedOut: false,
+          knownFailure: hostSessionRecordFailure
         });
-        const initializeMeta = initialized._meta;
-        const availableModels = Array.isArray(initializeMeta?.modelState?.availableModels) ? initializeMeta.modelState.availableModels : void 0;
-        if (request.model !== void 0 && availableModels !== void 0 && !availableModels.some((entry) => typeof entry === "object" && entry !== null && entry.modelId === acpModelId(config.modelPassing, request.model))) {
-          return failure("activation", "AcpHostModelMismatch", "host-model-mismatch", {
-            provider: request.model.provider,
-            model: request.model.model
-          });
-        }
-        const sessionBindParams = {
-          cwd: request.cwd,
-          mcpServers: prepared.mcpServers,
-          _meta: { systemPromptOverride, yoloMode: false }
-        };
-        const loadSession = async (bindSessionId) => {
-          const loaded = await rpc("session/load", {
-            sessionId: bindSessionId,
-            ...sessionBindParams
-          });
-          return typeof loaded.sessionId === "string" && loaded.sessionId !== "" ? loaded.sessionId : bindSessionId;
+        const noteHostSessionRecordFailure = (error) => {
+          if (hostSessionRecordFailure !== void 0) return;
+          hostSessionRecordFailure = {
+            cause: "session",
+            identity: { name: "HostSessionRecordFailure", code: "host-session-record-failed" },
+            diagnostic: error instanceof Error ? error.message : String(error)
+          };
+          try {
+            recordAbort.abort();
+          } catch {
+          }
         };
-        if (request.continuation.kind === "resume" && config.boundResume === "session/load") {
-          const boundSessionId = await config.sessionIdentity.load(request.principal);
-          if (boundSessionId !== void 0 && boundSessionId !== "") {
-            sessionId = await loadSession(boundSessionId);
+        const rpc = (method, params) => raceAgainstHostAbort(connection.request(method, params), recordAbort.signal, "host-session-record-failed");
+        const agentProseChunks = [];
+        let collectAgentProse = false;
+        connection.onNotification?.((method, params) => {
+          if (method !== "session/update" || hostSessionRecordFailure !== void 0) return;
+          if (collectAgentProse) {
+            const chunk = acpAgentTextChunk(params);
+            if (chunk !== void 0) agentProseChunks.push(chunk);
           }
-        }
-        if (sessionId === void 0) {
-          const session = await rpc("session/new", sessionBindParams);
-          sessionId = typeof session.sessionId === "string" ? session.sessionId : void 0;
-          if (sessionId === void 0 || sessionId === "") {
-            return failure("session", "AcpSessionFailure", "session-id-missing");
+          try {
+            reportHostSessionEvent({
+              host: config.hostName,
+              cwd: request.cwd,
+              sessionParent,
+              source: "acp-host",
+              event: { method, params }
+            });
+          } catch (error) {
+            noteHostSessionRecordFailure(error);
           }
-          await config.sessionIdentity.bind(request.principal, sessionId);
-        }
-        if (config.modelPassing === "set_model" && request.model !== void 0 && sessionId !== void 0) {
-          await rpc("session/set_model", {
-            sessionId,
-            modelId: acpModelId(config.modelPassing, request.model)
+        });
+        try {
+          const initialized = await rpc("initialize", {
+            protocolVersion: 1,
+            clientCapabilities: {}
           });
-          sessionId = await loadSession(sessionId);
-        }
-        const activeConnection = connection;
-        const activeSessionId = sessionId;
-        const turnResult = await driveExternalRoleTurnRounds(prepared, request, {
-          roundLimitName: "AcpRoundLimit",
-          currentSessionId: () => sessionId,
-          async runRound({ prompt, abortSignal }) {
-            if (hostSessionRecordFailure !== void 0) return { status: "terminal", result: hostSessionRecordResult() };
-            const abortParts = [recordAbort.signal];
-            if (abortSignal !== void 0) abortParts.push(abortSignal);
-            const combinedAbort = AbortSignal.any(abortParts);
-            let result;
-            try {
-              result = await raceAgainstHostAbort(
-                activeConnection.request("session/prompt", {
-                  sessionId: activeSessionId,
-                  prompt: [{ type: "text", text: prompt }]
-                }),
-                combinedAbort,
-                "ACP host aborted"
-              );
-            } catch (error) {
-              if (hostSessionRecordFailure !== void 0) {
-                return { status: "terminal", result: hostSessionRecordResult() };
+          const initializeMeta = initialized._meta;
+          const availableModels = Array.isArray(initializeMeta?.modelState?.availableModels) ? initializeMeta.modelState.availableModels : void 0;
+          if (request.model !== void 0 && availableModels !== void 0 && !availableModels.some((entry) => typeof entry === "object" && entry !== null && entry.modelId === acpModelId(config.modelPassing, request.model))) {
+            outcome = failure("activation", "AcpHostModelMismatch", "host-model-mismatch", {
+              provider: request.model.provider,
+              model: request.model.model
+            });
+          } else {
+            const sessionBindParams = {
+              cwd: request.cwd,
+              mcpServers: prepared.mcpServers,
+              _meta: { systemPromptOverride, yoloMode: false }
+            };
+            const loadSession = async (bindSessionId) => {
+              const loaded = await rpc("session/load", {
+                sessionId: bindSessionId,
+                ...sessionBindParams
+              });
+              return typeof loaded.sessionId === "string" && loaded.sessionId !== "" ? loaded.sessionId : bindSessionId;
+            };
+            if (request.continuation.kind === "resume" && config.boundResume === "session/load") {
+              const boundSessionId = await config.sessionIdentity.load(request.principal);
+              if (boundSessionId !== void 0 && boundSessionId !== "") {
+                sessionId = await loadSession(boundSessionId);
               }
-              throw error;
             }
-            if (result.stopReason === "refusal") {
-              return {
-                status: "terminal",
-                result: failure("output", "AcpRefusal", "refusal", { sessionId })
-              };
+            let sessionReady = true;
+            if (sessionId === void 0) {
+              const session = await rpc("session/new", sessionBindParams);
+              sessionId = typeof session.sessionId === "string" ? session.sessionId : void 0;
+              if (sessionId === void 0 || sessionId === "") {
+                outcome = failure("session", "AcpSessionFailure", "session-id-missing");
+                sessionReady = false;
+              } else {
+                await config.sessionIdentity.bind(request.principal, sessionId);
+              }
+            }
+            if (sessionReady) {
+              if (config.modelPassing === "set_model" && request.model !== void 0 && sessionId !== void 0) {
+                await rpc("session/set_model", {
+                  sessionId,
+                  modelId: acpModelId(config.modelPassing, request.model)
+                });
+                sessionId = await loadSession(sessionId);
+              }
+              const activeConnection = connection;
+              const activeSessionId = sessionId;
+              const turnResult = await driveExternalRoleTurnRounds(prepared, request, {
+                roundLimitName: "AcpRoundLimit",
+                currentSessionId: () => sessionId,
+                async runRound({ prompt, abortSignal }) {
+                  if (hostSessionRecordFailure !== void 0) return { status: "terminal", result: hostSessionRecordResult() };
+                  const abortParts = [recordAbort.signal];
+                  if (abortSignal !== void 0) abortParts.push(abortSignal);
+                  const combinedAbort = AbortSignal.any(abortParts);
+                  let result;
+                  agentProseChunks.length = 0;
+                  collectAgentProse = prepared.terminatingToolName === NAVIGATOR_OUTPUT_TOOL_NAME;
+                  try {
+                    result = await raceAgainstHostAbort(
+                      activeConnection.request("session/prompt", {
+                        sessionId: activeSessionId,
+                        prompt: [{ type: "text", text: prompt }]
+                      }),
+                      combinedAbort,
+                      "ACP host aborted"
+                    );
+                  } catch (error) {
+                    collectAgentProse = false;
+                    agentProseChunks.length = 0;
+                    if (hostSessionRecordFailure !== void 0) {
+                      return { status: "terminal", result: hostSessionRecordResult() };
+                    }
+                    throw error;
+                  }
+                  collectAgentProse = false;
+                  if (result.stopReason === "refusal") {
+                    agentProseChunks.length = 0;
+                    return {
+                      status: "terminal",
+                      result: failure("output", "AcpRefusal", "refusal", { sessionId })
+                    };
+                  }
+                  if (prepared.terminatingToolName === NAVIGATOR_OUTPUT_TOOL_NAME) {
+                    const prose = agentProseChunks.join("");
+                    agentProseChunks.length = 0;
+                    if (navigatorProseFromUnknown(prose) !== void 0) {
+                      await prepared.ingestStructuredOutput({ prose });
+                    }
+                  } else {
+                    agentProseChunks.length = 0;
+                  }
+                  return { status: "delivered", stderr: activeConnection.stderr?.() ?? "" };
+                },
+                async afterAccepted() {
+                  await rpc("session/close", { sessionId: activeSessionId });
+                  accepted = true;
+                }
+              });
+              outcome = hostSessionRecordFailure !== void 0 ? hostSessionRecordResult() : turnResult;
             }
-            return { status: "delivered", stderr: activeConnection.stderr?.() ?? "" };
-          },
-          async afterAccepted() {
-            await rpc("session/close", { sessionId: activeSessionId });
-            accepted = true;
           }
-        });
-        if (hostSessionRecordFailure !== void 0) return hostSessionRecordResult();
-        return turnResult;
-      } catch (error) {
-        if (hostSessionRecordFailure !== void 0) return hostSessionRecordResult();
-        throw error;
+        } catch (error) {
+          if (hostSessionRecordFailure !== void 0) {
+            outcome = hostSessionRecordResult();
+          } else {
+            throw error;
+          }
+        }
       }
     } finally {
       if (connection !== void 0) {
@@ -28196,16 +28661,18 @@ function createAcpRoleTurnHost(config) {
       }
       try {
         await prepared.dispose?.();
-      } catch {
+      } catch (cleanupError) {
+        outcome = withCleanupFailure(outcome, cleanupError);
       }
     }
+    return outcome;
   });
 }
 
 // src/acp-host/seat-profile-soul.ts
-import { constants as constants3 } from "node:fs";
+import { constants as constants2 } from "node:fs";
 import { access as access4, copyFile, lstat as lstat8, mkdir as mkdir8, readlink as readlink2, symlink as symlink2, unlink as unlink3 } from "node:fs/promises";
-import { dirname as dirname25, join as join44, relative as relative4, resolve as resolve21 } from "node:path";
+import { dirname as dirname24, join as join44, relative as relative4, resolve as resolve20 } from "node:path";
 function seatProfileName(spec, role) {
   return `${spec.namePrefix}${role}`;
 }
@@ -28214,7 +28681,7 @@ function packageRoleSoulPath(packageRoot, role) {
 }
 async function pathExists2(path) {
   try {
-    await access4(path, constants3.F_OK);
+    await access4(path, constants2.F_OK);
     return true;
   } catch {
     return false;
@@ -28223,13 +28690,13 @@ async function pathExists2(path) {
 async function ensureSeatProfileSoul(options) {
   const { spec, operatorHome, packageRoot, role } = options;
   const profileName = seatProfileName(spec, role);
-  const soulTarget = resolve21(packageRoleSoulPath(packageRoot, role));
+  const soulTarget = resolve20(packageRoleSoulPath(packageRoot, role));
   if (!await pathExists2(soulTarget)) {
     throw new Error(`packaged role soul missing: ${soulTarget}`);
   }
   const profilesRoot = join44(operatorHome, ...spec.profilesRootFromHome);
   const profileDir = join44(profilesRoot, profileName);
-  const hostRoot = dirname25(profilesRoot);
+  const hostRoot = dirname24(profilesRoot);
   const soulPath = join44(profileDir, spec.soulFileName);
   if (!await pathExists2(profileDir)) {
     await mkdir8(profileDir, { recursive: true });
@@ -28269,7 +28736,7 @@ function createComposedAcpRoleTurnHost(config) {
       request,
       dependencies: config.roleRuntimeDependencies,
       sessionFile: config.sessionIdentity.resolveSessionFile(request.principal),
-      socketPath: config.socketPath?.(request) ?? `/tmp/ak-acp-mcp-${randomUUID9()}.sock`
+      socketPath: config.socketPath?.(request) ?? `/tmp/ak-acp-mcp-${randomUUID10()}.sock`
     })
   });
 }