@akagilnc/pi-workflow-roles 0.1.4802 → 0.1.4874

package/src/diarist-role.ts

@@ -10,7 +10,6 @@ import {
 } from "./diarist-contracts.ts";
 
 export {
-  DIARIST_ACCEPTED_TEXT,
   DIARIST_OUTPUT_TOOL_NAME,
 } from "./diarist-contracts.ts";
 export type { DiaristOutput };

package/src/doctor-auditor.ts

@@ -10,8 +10,7 @@ import {
   resolveAuditDossier,
 } from "./dossier-resolution.ts";
 import type { HostContext } from "./host-contracts.ts";
-
-export const DOCTOR_AUDIT_TOOL_NAME = "ak_doctor_audit_decision";
+export { DOCTOR_AUDIT_TOOL_NAME } from "./doctor-contracts.ts";
 
 export type DoctorAuditOptions = {
   context: HostContext;

package/src/doctor-contracts.ts

@@ -5,7 +5,7 @@ import { withTerminatingOutputDeclarations } from "./package-contracts/terminati
 
 export const DOCTOR_EVIDENCE_TOOL_NAME = "ak_doctor_evidence";
 export const DOCTOR_OUTPUT_TOOL_NAME = "ak_doctor_output";
-export const DOCTOR_ACCEPTED_TEXT = "太医署回执已接受";
+export const DOCTOR_AUDIT_TOOL_NAME = "ak_doctor_audit_decision";
 export const DOCTOR_ACCEPTED_AUDIT_NO_RECEIPT_TEXT = "太医署回执已接受；审计无回执";
 export const DOCTOR_OUTPUT_TOOL_DESCRIPTION = "提交唯一终局单案证词；completed 允许空 findings。";
 export const DOCTOR_TARGET_KINDS = ["law", "gate", "template", "station", "seat"] as const;

package/src/doctor-role.ts

@@ -3,7 +3,8 @@ import { disposeComplianceDecision } from "./audit-escalation.ts";
 import { ComplianceResponseRetentionError, type ComplianceDecision } from "./compliance-transport.ts";
 import { GatekeeperDecisionError } from "./submission-errors.ts";
 import { DOCTOR_CANDIDATE_ENTRY_TYPE } from "./dossier-resolution.ts";
-import { DOCTOR_ACCEPTED_AUDIT_NO_RECEIPT_TEXT, DOCTOR_ACCEPTED_TEXT, DOCTOR_EVIDENCE_TOOL_NAME, DOCTOR_OUTPUT_TOOL_DESCRIPTION, DOCTOR_OUTPUT_TOOL_NAME, DoctorEvidenceStore, doctorEvidenceReadSchema, doctorSubmissionSchema, validateDoctorOutput, type DoctorCase } from "./doctor-contracts.ts";
+import { packagedRoleAcceptedText } from "./packaged-role-registry.ts";
+import { DOCTOR_ACCEPTED_AUDIT_NO_RECEIPT_TEXT, DOCTOR_EVIDENCE_TOOL_NAME, DOCTOR_OUTPUT_TOOL_DESCRIPTION, DOCTOR_OUTPUT_TOOL_NAME, DoctorEvidenceStore, doctorEvidenceReadSchema, doctorSubmissionSchema, validateDoctorOutput, type DoctorCase } from "./doctor-contracts.ts";
 
 import { sitianReport } from "./sitian-facade.ts";
 
@@ -36,7 +37,7 @@ export function createDoctorRoleRuntime(pi: RoleHost, dependencies: DoctorRoleDe
   let activation: { soul: string; patient: DoctorCase; store: DoctorEvidenceStore } | undefined; let registered = false; pi.registerFlag(DOCTOR_CASE_FLAG.name, DOCTOR_CASE_FLAG.definition);
   return { async activate() { const path = pi.getFlag(DOCTOR_CASE_FLAG.name); if (typeof path !== "string" || !path.trim()) throw new Error("Doctor requires --ak-doctor-case"); const soul = (await dependencies.loadSoul()).trim(); if (!soul) throw new Error("Doctor soul is empty"); const patient = await dependencies.loadCase(path); activation = { soul, patient, store: new DoctorEvidenceStore(patient) };
     if (!registered) { registered = true; pi.registerTool({ name: DOCTOR_EVIDENCE_TOOL_NAME, label: "太医署证据", description: "分页读取留存的 Pi session 字节。", parameters: doctorEvidenceReadSchema, async execute(_id: string, params: { evidenceId: string; offset?: number; limit?: number }) { if (!activation) throw new Error("太医署未激活"); const details = activation.store.read(params.evidenceId, params.offset, params.limit); return { content: [{ type: "text" as const, text: JSON.stringify(details) }], details }; } });
-      pi.registerTool({ name: DOCTOR_OUTPUT_TOOL_NAME, label: "太医署输出", description: DOCTOR_OUTPUT_TOOL_DESCRIPTION, parameters: doctorSubmissionSchema, async execute(id: string, params: unknown, signal: AbortSignal | undefined, _update: unknown, ctx: HostContext): Promise<HostToolResult<unknown>> { if (!activation) throw new Error("太医署未激活"); const active = activation; const testimony = validateDoctorOutput(params, active.patient, active.store); try { appendCandidate(ctx, { version: 1, testimony, cost: active.patient.cost, readRecord: active.store.readRecord(), patientIdentity: active.patient.identity }); } catch (error) { host.failInfrastructure(error, ctx, id); } let audit: ComplianceDecision; try { audit = await dependencies.auditCompliance(signal === undefined ? { context: ctx } : { context: ctx, signal }); } catch (error) { host.failInfrastructure(error, ctx, id); } const acceptedDetails = testimony; return disposeComplianceDecision<HostToolResult<unknown>>(audit, { pass: (usage) => ({ content: [{ type: "text" as const, text: DOCTOR_ACCEPTED_TEXT }], details: acceptedDetails, terminate: true as const, ...(usage === undefined ? {} : { usage }) }), noReceipt: (auditNoReceipt, usageProjection) => { try { appendCandidate(ctx, { version: 1, testimony, cost: active.patient.cost, auditNoReceipt, readRecord: active.store.readRecord(), patientIdentity: active.patient.identity }); } catch (error) { host.failInfrastructure(error, ctx, id); } return { content: [{ type: "text" as const, text: DOCTOR_ACCEPTED_AUDIT_NO_RECEIPT_TEXT }], details: acceptedDetails, terminate: true as const, ...usageProjection }; }, received: () => { throw new Error("审刑院非三态应交 runComplianceAudit 重问说话者"); }, bounce: (violations) => { throw new GatekeeperDecisionError({ status: "bounce", officer: "auditor", receipt: violations }); }, escalate: (result) => result, transportFailure: (facts) => { host.failInfrastructure(Object.assign(new Error(facts.diagnostic), { name: "ComplianceTransportFailure", ...(facts.submissions === undefined && facts.terminal === undefined ? {} : { submission: facts.submissions ?? facts.terminal }) }), ctx, id); } }, acceptedDetails); } });
+      pi.registerTool({ name: DOCTOR_OUTPUT_TOOL_NAME, label: "太医署输出", description: DOCTOR_OUTPUT_TOOL_DESCRIPTION, parameters: doctorSubmissionSchema, async execute(id: string, params: unknown, signal: AbortSignal | undefined, _update: unknown, ctx: HostContext): Promise<HostToolResult<unknown>> { if (!activation) throw new Error("太医署未激活"); const active = activation; const testimony = validateDoctorOutput(params, active.patient, active.store); try { appendCandidate(ctx, { version: 1, testimony, cost: active.patient.cost, readRecord: active.store.readRecord(), patientIdentity: active.patient.identity }); } catch (error) { host.failInfrastructure(error, ctx, id); } let audit: ComplianceDecision; try { audit = await dependencies.auditCompliance(signal === undefined ? { context: ctx } : { context: ctx, signal }); } catch (error) { host.failInfrastructure(error, ctx, id); } const acceptedDetails = testimony; return disposeComplianceDecision<HostToolResult<unknown>>(audit, { pass: (usage) => ({ content: [{ type: "text" as const, text: packagedRoleAcceptedText("doctor") }], details: acceptedDetails, terminate: true as const, ...(usage === undefined ? {} : { usage }) }), noReceipt: (auditNoReceipt, usageProjection) => { try { appendCandidate(ctx, { version: 1, testimony, cost: active.patient.cost, auditNoReceipt, readRecord: active.store.readRecord(), patientIdentity: active.patient.identity }); } catch (error) { host.failInfrastructure(error, ctx, id); } return { content: [{ type: "text" as const, text: DOCTOR_ACCEPTED_AUDIT_NO_RECEIPT_TEXT }], details: acceptedDetails, terminate: true as const, ...usageProjection }; }, received: () => { throw new Error("审刑院非三态应交 runComplianceAudit 重问说话者"); }, bounce: (violations) => { throw new GatekeeperDecisionError({ status: "bounce", officer: "auditor", receipt: violations }); }, escalate: (result) => result, transportFailure: (facts) => { host.failInfrastructure(Object.assign(new Error(facts.diagnostic), { name: "ComplianceTransportFailure", ...(facts.submissions === undefined && facts.terminal === undefined ? {} : { submission: facts.submissions ?? facts.terminal }) }), ctx, id); } }, acceptedDetails); } });
       pi.on("before_agent_start", (event) => { if (!activation) throw new Error("太医署未激活"); const catalog = { version: activation.patient.version, identity: activation.patient.identity, admittedMetrics: { cost: activation.patient.cost }, lawfulTargetKeys: ["case", ...activation.patient.cost.invocations.sources], evidence: activation.patient.evidence.map(({ id, kind, sha256, byteLength, contentLength }) => ({ id, kind, sha256, byteLength, contentLength })) }; return { systemPrompt: `${event.systemPrompt}\n\n<doctor_soul>\n${activation.soul}\n</doctor_soul>\n\n<doctor_case>\n${JSON.stringify(catalog)}\n</doctor_case>` }; }); }
     const required = [DOCTOR_EVIDENCE_TOOL_NAME, DOCTOR_OUTPUT_TOOL_NAME]; const names = pi.getAllTools().map((tool) => tool.name); for (const name of required) if (names.filter((item) => item === name).length !== 1) throw new Error(`Doctor required tool collision or missing: ${name}`); pi.setActiveTools(required); const active = pi.getActiveTools?.() ?? required; if (active.length !== 2 || !required.every((name) => active.includes(name))) throw new Error("Doctor active tool narrowing failed"); } };
 }

package/src/external-host-turn-loop.ts

@@ -9,7 +9,7 @@ import type {
   RoleTurnRequest,
   RoleTurnResult,
 } from "./host-contracts.ts";
-import { isOfficerReviewSeat } from "./host-contracts.ts";
+import { isOfficerReviewSeat } from "./packaged-role-registry.ts";
 
 export const EXTERNAL_ROLE_TURN_ROUND_LIMIT = 8 as const;
 

package/src/factory-board.ts

@@ -20,6 +20,7 @@ import { randomUUID } from "node:crypto";
 import { lstat, mkdir, realpath, rename, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
 
+import { packagedBoardPlacement } from "./packaged-role-registry.ts";
 import {
   formatDurationZh,
   formatLocalDateTime,
@@ -187,16 +188,18 @@ function placeTicket(prepared: PreparedTicket): BoardPlacement {
   const sorted = sortRunsByStart(prepared.runs);
   const latest = sorted.at(-1)!;
   if (latest.station === "unknown") return "unknown";
-  if (latest.station === "judge") {
+  // ADR 0053: marshal-driven runs land in 尚书省. Marshal is not a packaged seat.
+  if (latest.station === "marshal") return "marshal";
+  const placement = packagedBoardPlacement(latest.station);
+  if (placement === "judge-history") {
     // Unknown history never counts as construction evidence.
-    const started = sorted.some((run) => run.station !== "unknown" && run.station !== "judge");
+    const started = sorted.some((run) => {
+      if (run.station === "unknown") return false;
+      return packagedBoardPlacement(run.station) !== "judge-history";
+    });
     return started ? "marshal" : "court";
   }
-  if (latest.station === "coder") return "coder";
-  if (latest.station === "fixer" || latest.station === "reviewer") return "marshal";
-  // ADR 0053: marshal-driven runs land in 尚书省 once the seat ships (station maps now).
-  if (latest.station === "marshal") return "marshal";
-  if (latest.station === "collector") return "collector";
+  if (placement !== undefined) return placement;
   return `other:${latest.station}`;
 }
 

package/src/gatekeeper-role.ts

@@ -2,6 +2,7 @@ import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { HostContext } from "./host-contracts.ts";
 
 import { auditorRunDirectory } from "./auditor-dossier-tool.ts";
+import { packagedGateDecision, packagedGateStageLabel } from "./packaged-role-registry.ts";
 import type { NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 import { GatekeeperDecisionError } from "./submission-errors.ts";
 import { INSPECTOR_OUTPUT_TOOL_NAME } from "./inspector-contracts.ts";
@@ -82,18 +83,21 @@ export type GatekeeperNonPassResult = Extract<
 >;
 
 function gateSeatLabel(stage: GateOfficer): string {
-  if (stage === "inspector") return "台院";
-  if (stage === "auditor") return "审刑院";
-  if (stage === "countersign") return "给事中";
-  return "符宝郎";
+  return packagedGateStageLabel(stage) ?? stage;
 }
 
+/** Subject kind → review officer. One table; default is notary. */
+const GATE_OFFICER_BY_SUBJECT = {
+  worker_completion: "inspector",
+  judge_compliance: "auditor",
+  judge_draft: "notary",
+  countersign_verdict: "notary",
+  secretariat_verdict: "countersign",
+} as const satisfies Record<GatekeeperSubject["kind"], GateOfficer>;
+
 /** Subject kind → review officer (#753 countersign/notary, #756 judge/auditor + worker/inspector, #969 secretariat/countersign). */
 export function gateOfficerForSubject(subject: GatekeeperSubject): GateOfficer {
-  if (subject.kind === "worker_completion") return "inspector";
-  if (subject.kind === "judge_compliance") return "auditor";
-  if (subject.kind === "secretariat_verdict") return "countersign";
-  return "notary";
+  return GATE_OFFICER_BY_SUBJECT[subject.kind];
 }
 
 export { GatekeeperDecisionError } from "./submission-errors.ts";
@@ -222,7 +226,7 @@ function projectOfficerDecision(
   const record = readRecord(decision);
   // 给事中: only countersignStatus, strict three-word map; never generic status,
   // never unmapped raw word, never fallbackStatus (#969 / ADR 0040/0055).
-  if (officer === "countersign") {
+  if (packagedGateDecision(officer) === "countersign-status") {
     const countersignStatus =
       record !== undefined && typeof record.countersignStatus === "string"
         ? record.countersignStatus
@@ -417,7 +421,9 @@ export const COUNTERSIGN_CONCLUSION_REASK =
 
 /** Pick the re-ask line for the officer under review. */
 export function officerConclusionReask(officer: GateOfficer): string {
-  return officer === "countersign" ? COUNTERSIGN_CONCLUSION_REASK : OFFICER_CONCLUSION_REASK;
+  return packagedGateDecision(officer) === "countersign-status"
+    ? COUNTERSIGN_CONCLUSION_REASK
+    : OFFICER_CONCLUSION_REASK;
 }
 
 /**

package/src/gleaner-left-contracts.ts

@@ -5,7 +5,6 @@
  */
 
 export const GLEANER_LEFT_OUTPUT_TOOL_NAME = "ak_gleaner_left_output";
-export const GLEANER_LEFT_ACCEPTED_TEXT = "左拾遗回执已接受";
 
 /** Internal transport: comparison-base revision for the unanchored merge-candidate diff. */
 export const GLEANER_LEFT_BASE_FLAG = {

package/src/gleaner-left-role.ts

@@ -10,7 +10,6 @@ import {
 } from "./gleaner-left-contracts.ts";
 
 export {
-  GLEANER_LEFT_ACCEPTED_TEXT,
   GLEANER_LEFT_OUTPUT_TOOL_NAME,
 } from "./gleaner-left-contracts.ts";
 export type { GleanerLeftOutput };

package/src/headless-host/role-turn-host.ts

@@ -464,7 +464,13 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
     let outcome: RoleTurnResult = failure("session", "HeadlessNoOutcome", "no-outcome");
     try {
       // Claude mints a package UUID for --session-id; codex waits for thread.started.
-      let sessionId = await config.sessionIdentity.load(request.principal);
+      // Public explicit resume already read the stored native id. Auto-resume omits it.
+      const explicitHostSessionId = request.continuation.kind === "resume"
+        ? request.continuation.hostSessionId
+        : undefined;
+      let sessionId = explicitHostSessionId !== undefined && explicitHostSessionId !== ""
+        ? explicitHostSessionId
+        : await config.sessionIdentity.load(request.principal);
       let sessionKind: "new" | "resume" =
         request.continuation.kind === "resume" && sessionId !== undefined && sessionId !== ""
           ? "resume"

package/src/host-contracts.ts

@@ -140,7 +140,16 @@ export type RoleTurnActivation =
 
 export type RoleTurnContinuation =
   | { readonly kind: "initial"; readonly prompt: string }
-  | { readonly kind: "resume"; readonly prompt: string };
+  | {
+      readonly kind: "resume";
+      readonly prompt: string;
+      /**
+       * Stored native host session/thread id for a public explicit resume.
+       * Absent on in-call auto-resume and in-gate retries; those still load
+       * through the host adapter. Never the package run id.
+       */
+      readonly hostSessionId?: string;
+    };
 
 /** Seat model consumed by the turn host (provider/model/thinking). */
 export type RoleTurnModelConfig = {
@@ -162,11 +171,6 @@ export type RoleTurnHostTransition = {
   readonly priorNativePaths: readonly string[];
 };
 
-/** Gate review officers (台院 / 符宝郎 / 审刑院). Single authority for seat checks. */
-export function isOfficerReviewSeat(role: string): boolean {
-  return role === "notary" || role === "inspector" || role === "auditor";
-}
-
 /** One main-session turn request over the host-neutral execution seam. */
 export type RoleTurnRequest = {
   readonly principal: DurablePrincipal;

package/src/inspector-contracts.ts

@@ -5,7 +5,6 @@
  */
 
 export const INSPECTOR_OUTPUT_TOOL_NAME = "ak_inspector_output" as const;
-export const INSPECTOR_ACCEPTED_TEXT = "台院回执已接受";
 export const INSPECTOR_SOURCE_RUN_FLAG = {
   name: "ak-inspector-source-run",
   definition: {

package/src/inspector-role.ts

@@ -4,14 +4,12 @@ import { Type } from "typebox";
 import { openToolObject } from "./open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 import {
-  INSPECTOR_ACCEPTED_TEXT,
   INSPECTOR_OUTPUT_TOOL_NAME,
   validateRecordedInspectorOutput,
   type InspectorOutput,
 } from "./inspector-contracts.ts";
 
 export {
-  INSPECTOR_ACCEPTED_TEXT,
   INSPECTOR_OUTPUT_TOOL_NAME,
 };
 export { INSPECTOR_OUTPUT_TOOL_NAME as INSPECTOR_OUTPUT_TOOL };

package/src/institutional-resolution.ts

@@ -5,10 +5,11 @@
  * is the live public seat table (model/host/engine).
  */
 import type {
-  GateOfficerSeat,
   PublicCliConfig,
   SeatModelConfig,
 } from "./public-cli/config.ts";
+import type { PublicConfigurableSeat } from "./public-cli/registry.ts";
+import { packagedModelParent } from "./packaged-role-registry.ts";
 import { seatModelOnly } from "./public-cli/registry.ts";
 
 /**
@@ -29,16 +30,17 @@ export type ConfiguredProvinceOfficerResolution = {
  */
 export function resolveConfiguredProvinceOfficer(
   config: PublicCliConfig,
-  officer: GateOfficerSeat,
+  officer: PublicConfigurableSeat,
 ): ConfiguredProvinceOfficerResolution {
   const ownModel = seatModelOnly(config.seats[officer]);
   if (ownModel !== undefined) {
     return { selection: ownModel, source: "persistent" };
   }
-  if (officer === "gatekeeper") {
+  const parent = packagedModelParent(officer);
+  if (parent === undefined) {
     return { source: "unconfigured" };
   }
-  const gatekeeperModel = seatModelOnly(config.seats.gatekeeper);
+  const gatekeeperModel = seatModelOnly(config.seats[parent]);
   if (gatekeeperModel !== undefined) {
     return { selection: gatekeeperModel, source: "inherit-gatekeeper" };
   }

package/src/judge-role.ts

@@ -4,8 +4,8 @@ import { Type, type Static } from "typebox";
 import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 import { ParentQueueReaskError } from "./submission-errors.ts";
 
+import { packagedRoleAcceptedText } from "./packaged-role-registry.ts";
 import {
-  JUDGE_ACCEPTED_TEXT,
   JUDGE_OUTPUT_TOOL_NAME,
   validateAcceptedJudgeDetails,
   type JudgeVerdict,
@@ -107,7 +107,7 @@ export function createJudgeRoleRuntime(
               // Parent escalate → throw to caller as-is; officers do not attend (#753 / #756).
               const verdict = validateVerdict(parameters);
               return {
-                content: [{ type: "text" as const, text: JUDGE_ACCEPTED_TEXT }],
+                content: [{ type: "text" as const, text: packagedRoleAcceptedText("judge") }],
                 details: verdict,
                 terminate: true as const,
               };
@@ -138,7 +138,7 @@ export function createJudgeRoleRuntime(
               submission: parameters,
             });
             return {
-              content: [{ type: "text" as const, text: JUDGE_ACCEPTED_TEXT }],
+              content: [{ type: "text" as const, text: packagedRoleAcceptedText("judge") }],
               details: verdict,
               terminate: true as const,
             };

package/src/merger-contracts.ts

@@ -34,7 +34,6 @@ export type MergerOutput =
   | { status: "completed"; attemptId: string; report: string; mergeCommitId: string }
   | { status: "escalate"; attemptId: string; diagnosis: string; report: string };
 export const MERGER_OUTPUT_TOOL_NAME = "ak_merger_output";
-export const MERGER_ACCEPTED_TEXT = "合并回执已接受";
 
 const record = (v: unknown): v is Record<string, unknown> => typeof v === "object" && v !== null && !Array.isArray(v);
 const blank = (v: unknown) => typeof v !== "string" || v.trim().length === 0;

package/src/merger-role.ts

@@ -1,6 +1,6 @@
 import type { RoleHost, HostContext } from "./host-contracts.ts";
+import { packagedRoleAcceptedText } from "./packaged-role-registry.ts";
 import {
-  MERGER_ACCEPTED_TEXT,
   MERGER_OUTPUT_TOOL_NAME,
   mergerOutputSchema,
   validateMergerInput,
@@ -40,7 +40,7 @@ export function createMergerRoleRuntime(pi: RoleHost, dependencies: MergerRoleDe
           name: MERGER_OUTPUT_TOOL_NAME, label: "合并输出", description: "提交合并结果；输出分支为 completed 与 escalate。", promptSnippet: "提交合并结果", parameters: mergerOutputSchema,
           async execute(_id: string, params: unknown, _signal: AbortSignal | undefined, _update: unknown, _ctx: HostContext) {
             if (!activation) throw new Error("校书郎未激活");
-            return { content: [{ type: "text" as const, text: MERGER_ACCEPTED_TEXT }], details: params, terminate: true as const };
+            return { content: [{ type: "text" as const, text: packagedRoleAcceptedText("merger") }], details: params, terminate: true as const };
           },
         });
         pi.on("before_agent_start", (event) => {

package/src/navigator-public-session.ts

@@ -22,6 +22,7 @@ import type { NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 import { runDirectoryFromHostContext, type HostContext } from "./host-contracts.ts";
 import type { PublicSummonResult } from "./public-role-summons.ts";
 import { CliUsageError } from "./public-cli/cli-errors.ts";
+import { isNavigatorSeat } from "./packaged-role-registry.ts";
 
 /**
  * Ledger process home for navigator attendance: admitted HostContext.runDirectory
@@ -76,16 +77,16 @@ export function readNavigatorHostRunPointer(entries: readonly unknown[]): string
 
 /**
  * Typed preflight via public CLI load path: can this run reopen as navigator?
- * CliUsageError (code AK_ROLE_USAGE) from loadResumableInstructionSeatRun means
- * unknown id / principal unavailable / non-instruction seat — not resumable.
- * Other throws propagate. Never reads stderr prose.
+ * CliUsageError (code AK_ROLE_USAGE) from loadResumablePublicRole means
+ * unknown id or principal unavailable — not resumable. Any other disk role
+ * is not this navigator host run. Other throws propagate. Never reads stderr prose.
  */
 export async function navigatorHostRunResumable(home: string, runId: string): Promise<boolean> {
   const { piDurablePrincipalAuthority } = await import("./pi/durable-principal.ts");
-  const { loadResumableInstructionSeatRun } = await import("./public-cli/run-lifecycle.ts");
+  const { loadResumablePublicRole } = await import("./public-cli/run-lifecycle.ts");
   try {
-    const loaded = await loadResumableInstructionSeatRun(home, runId, piDurablePrincipalAuthority);
-    return loaded.admitted.role === "navigator";
+    const loaded = await loadResumablePublicRole(home, runId, piDurablePrincipalAuthority);
+    return isNavigatorSeat(loaded.admitted.role);
   } catch (error) {
     if (error instanceof CliUsageError) return false;
     throw error;

package/src/navigator-work-context.ts

@@ -17,7 +17,7 @@ import {
   type NavigatorWorkContext,
 } from "./navigator-attendance.ts";
 import { loadNotarySourceRunLocator } from "./notary-source-run.ts";
-import { packagedRoleInputFlag } from "./packaged-role-registry.ts";
+import { packagedNavigatorSubject, packagedRoleInputFlag } from "./packaged-role-registry.ts";
 import { loadAdmittedJudgeRequest } from "./public-cli/invocation.ts";
 
 export type NavigatorWorkContextLoaderOptions = {
@@ -44,7 +44,8 @@ export async function loadNavigatorWorkContext(
   options: NavigatorWorkContextLoaderOptions,
 ): Promise<NavigatorWorkContext> {
   const reference = navigatorInputReference(options.getFlag, options.role);
-  const input = reference === undefined || options.role === "doctor" || options.role === "notary"
+  const subjectMode = packagedNavigatorSubject(options.role);
+  const input = reference === undefined || subjectMode === "case" || subjectMode === "source-run"
     ? undefined
     : await readFile(reference, "utf8");
   const subjectRoot = subjectPath(reference ?? options.context.sessionManager.getSessionDir(), options.context.cwd);
@@ -53,12 +54,12 @@ export async function loadNavigatorWorkContext(
     : navigatorSubjectKeyForInput(subjectRoot, reference, options.context.cwd);
   let subject = input ?? `work subject: ${subjectKey}`;
   let subjectProvenance: NavigatorSubjectProvenance = input === undefined ? "placeholder" : "role_input";
-  if (options.role === "doctor" && reference !== undefined) {
+  if (subjectMode === "case" && reference !== undefined) {
     const patient = await loadDoctorCase(reference);
     subject = JSON.stringify({ identity: patient.identity, cost: patient.cost });
     subjectProvenance = "role_input";
   }
-  if (options.role === "notary" && reference !== undefined) {
+  if (subjectMode === "source-run" && reference !== undefined) {
     const locator = await loadNotarySourceRunLocator(reference);
     subject = JSON.stringify({ sourceRun: locator });
     subjectProvenance = "role_input";
@@ -68,10 +69,7 @@ export async function loadNavigatorWorkContext(
   const currentSessionDir = options.context.sessionManager.getSessionDir();
   const isBoundPublicRun = publicRunDir !== undefined
     && resolve(currentSessionDir) === resolve(publicRunDir, "session");
-  if (
-    options.role === "judge" &&
-    isBoundPublicRun
-  ) {
+  if (subjectMode === "public-instruction" && isBoundPublicRun) {
     let admitted;
     try {
       admitted = await loadAdmittedJudgeRequest(publicRunDir);

package/src/notary-contracts.ts

@@ -9,7 +9,6 @@ import { openToolObject } from "./open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 
 export const NOTARY_OUTPUT_TOOL_NAME = "ak_notary_output";
-export const NOTARY_ACCEPTED_TEXT = "符宝郎回执已接受";
 export const NOTARY_SOURCE_RUN_FLAG = {
   name: "ak-notary-source-run",
   definition: {

package/src/notary-role.ts

@@ -6,8 +6,8 @@ import type { RoleHost, HostContext, HostToolResult } from "./host-contracts.ts"
  * This module keeps evidence assembly + projection only.
  */
 
+import { packagedRoleAcceptedText } from "./packaged-role-registry.ts";
 import {
-  NOTARY_ACCEPTED_TEXT,
   NOTARY_OUTPUT_TOOL_NAME,
   NOTARY_SOURCE_RUN_FLAG,
   NOTARY_TICKET_FLAG,
@@ -16,7 +16,6 @@ import {
 } from "./notary-contracts.ts";
 
 export {
-  NOTARY_ACCEPTED_TEXT,
   NOTARY_OUTPUT_TOOL_NAME,
   NOTARY_SOURCE_RUN_FLAG,
   NOTARY_TICKET_FLAG,
@@ -171,7 +170,7 @@ export function createNotaryRoleRuntime(
             // #753: handler only records — params as submitted, no findings/disposition rewrite.
             // #541 infra declaration + sole-final barrier are ledger-owned (#575).
             return {
-              content: [{ type: "text" as const, text: NOTARY_ACCEPTED_TEXT }],
+              content: [{ type: "text" as const, text: packagedRoleAcceptedText("notary") }],
               details: parameters,
               terminate: true as const,
             };

package/src/package-contracts/auditor-output.ts

@@ -8,7 +8,6 @@ import { openToolObject } from "../open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
 
 export const AUDITOR_OUTPUT_TOOL_NAME = "ak_auditor_output" as const;
-export const AUDITOR_ACCEPTED_TEXT = "审刑院回执已接受";
 
 export const auditorOutputSchema = withTerminatingOutputDeclarations(
   openToolObject(

package/src/package-contracts/collector-output.ts

@@ -1,7 +1,6 @@
 /** Package-owned Collector receipt leaf — no role registration surface. */
 
 export const COLLECTOR_OUTPUT_TOOL = "ak_collector_output";
-export const COLLECTOR_ACCEPTED_TEXT = "通进司回执已接受";
 export const COLLECTOR_HOST = "github.com";
 
 export type CollectorIdentityGroup = {

package/src/package-contracts/fixer-output.ts

@@ -3,7 +3,6 @@ import { openToolObjectFromUnion } from "../open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
 
 export const FIXER_OUTPUT_TOOL_NAME = "ak_fixer_output";
-export const FIXER_ACCEPTED_TEXT = "修内司回执已接受";
 
 // #836 r16 class 1: these are LLM/human-read narrative content — the candidate
 // row lands on the ledger as submitted (src/submission-ledger.ts:351-390) and no

package/src/package-contracts/gatekeeper-output.ts

@@ -9,7 +9,6 @@ import { openToolObject } from "../open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
 
 export const GATEKEEPER_OUTPUT_TOOL_NAME = "ak_gatekeeper_output";
-export const GATEKEEPER_ACCEPTED_TEXT = "门下省决议已受理";
 
 /** Same open decision shape the province uses inside audit sessions. */
 export const gatekeeperDecisionSchema = openToolObject(

package/src/package-contracts/judge-output.ts

@@ -2,7 +2,6 @@
 
 
 export const JUDGE_OUTPUT_TOOL_NAME = "ak_judge_output";
-export const JUDGE_ACCEPTED_TEXT = "大理寺回执已接受";
 
 export type JudgeClass = {
   name: string;

package/src/package-contracts/navigator-output.ts

@@ -11,7 +11,6 @@ import { openToolObject } from "../open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
 
 export const NAVIGATOR_OUTPUT_TOOL_NAME = "ak_navigator_output";
-export const NAVIGATOR_ACCEPTED_TEXT = "游奕使建议已受理";
 
 export const navigatorOutputSchema = withTerminatingOutputDeclarations(
   openToolObject(

package/src/package-contracts/reviewer-output.ts

@@ -1,7 +1,6 @@
 /** Package-owned Reviewer intent — original role payload only (#836 删 8). */
 
 export const REVIEWER_OUTPUT_TOOL_NAME = "ak_reviewer_output";
-export const REVIEWER_ACCEPTED_TEXT = "御史台回执已接受";
 
 /** Seat-owned per-lens finding body text (completeness / correctness). */
 export type ReviewerAmendments = Readonly<