@akagilnc/pi-workflow-roles 0.1.3565 → 0.1.3621

package/src/navigator-session-contracts.ts

@@ -10,12 +10,9 @@ import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
-import { auditorRunDirectory } from "./auditor-dossier-tool.ts";
 import type { HostContext, HostInstitutionalModelSelection } from "./host-contracts.ts";
-import {
-  InstitutionalResolutionError,
-  readInstitutionalSeatSelection,
-} from "./institutional-resolution.ts";
+import type { NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
+
 
 export const NAVIGATOR_PREPARE_TOOL_NAME = "ak_navigator_prepare" as const;
 export const NAVIGATOR_DEFAULT_MODEL = "openai-codex/gpt-5.6-luna:max" as const;
@@ -162,6 +159,12 @@ export type NavigatorPreparationSession = {
   appendEntry(customType: string, data: unknown): void;
   entries(): readonly unknown[];
   providerFailure?(): NavigatorProviderFailureFact | undefined;
+  /**
+   * Facts of a nested session that already settled without an accepted receipt.
+   * Present means its own delivery budget is spent — another prompt would open an
+   * independent summon rather than press the session that owes the receipt.
+   */
+  noReceipt?(): NoReceiptLifecycleFacts | undefined;
   setModel?(model: string, thinkingLevel?: string): Promise<void>;
   getThinkingLevel?(): string | undefined;
   recordPointer(): string;
@@ -204,6 +207,7 @@ export async function writeNavigatorModelSetting(model: string, path = navigator
 export function parseNavigatorModelSetting(value: string): {
   provider: string;
   model: string;
+  /** Host thinking passthrough — omit when bare provider/model (#675 ⑥). */
   thinkingLevel?: string;
 } {
   const slash = value.indexOf("/");
@@ -216,68 +220,71 @@ export function parseNavigatorModelSetting(value: string): {
   const suffix = colon < 0 ? undefined : modelWithThinking.slice(colon + 1);
   const model = colon < 0 ? modelWithThinking : modelWithThinking.slice(0, colon);
   if (model === "") throw new Error("Navigator model setting must include a model");
-  // Suffix is opaque pass-through; bare provider/model omits thinkingLevel (Pi default).
-  return suffix === undefined
-    ? { provider, model }
-    : { provider, model, thinkingLevel: suffix };
+  if (suffix !== undefined && suffix.trim() === "") {
+    throw new Error("Navigator model setting thinking suffix must be non-blank");
+  }
+  return {
+    provider,
+    model,
+    ...(suffix === undefined ? {} : { thinkingLevel: suffix }),
+  };
 }
 
 /**
- * Prefer institutional-resolution navigator seat; fall back to model file only when
- * the page is missing or lacks the seat (typed reasons). Corrupted pages fail loud.
+ * Navigator model selection from the public seat table only (#675 / #617 DK-3).
+ * No legacy navigator-model.json fallback — missing seat is a real model failure.
+ * Host/engine axes ride the shared public summons path; attendance open consumes
+ * model/thinking here and defers host selection to the shared envelope when present.
  */
 export async function resolveNavigatorSeatSelection(
   context: HostContext,
-  modelSettingPath: string | undefined,
-  defaultModelSettingPath: string,
 ): Promise<{ selection: HostInstitutionalModelSelection; configuredLabel: string; thinkingLevel?: string }> {
-  const runDirectory = auditorRunDirectory(context);
-  if (runDirectory !== undefined) {
-    try {
-      const selection = await readInstitutionalSeatSelection(runDirectory, "navigator");
+  try {
+    const { loadPublicCliConfig } = await import("./public-cli/config.ts");
+    const { seatModelOnly } = await import("./public-cli/registry.ts");
+    const { packageMachineHome } = await import("./activation-ledger-topology.ts");
+    const homeCandidate = (context as unknown as { home?: unknown }).home;
+    const envHome = process.env.HOME;
+    // Prefer explicit context home, then process HOME (hermetic tests), never
+    // jump straight to the real machine home when a temp HOME is armed.
+    const home =
+      typeof homeCandidate === "string"
+        ? homeCandidate
+        : typeof envHome === "string" && envHome.trim() !== ""
+          ? envHome
+          : packageMachineHome();
+    const config = await loadPublicCliConfig(home);
+    const modelOnly = seatModelOnly(config.seats.navigator);
+    // Seat table is the only model authority — no legacy navigator-model.json.
+    // Bare missing seat uses the package default constant (not a file path).
+    if (modelOnly === undefined) {
+      const parsed = parseNavigatorModelSetting(NAVIGATOR_DEFAULT_MODEL);
       return {
         selection: {
-          provider: selection.provider,
-          model: selection.model,
-          ...(selection.thinking === undefined ? {} : { thinking: selection.thinking }),
+          provider: parsed.provider,
+          model: parsed.model,
+          ...(parsed.thinkingLevel === undefined ? {} : { thinking: parsed.thinkingLevel }),
         },
-        configuredLabel: selection.thinking === undefined
-          ? `${selection.provider}/${selection.model}`
-          : `${selection.provider}/${selection.model}:${selection.thinking}`,
-        ...(selection.thinking === undefined ? {} : { thinkingLevel: selection.thinking }),
+        configuredLabel: NAVIGATOR_DEFAULT_MODEL,
+        ...(parsed.thinkingLevel === undefined ? {} : { thinkingLevel: parsed.thinkingLevel }),
       };
-    } catch (error) {
-      if (
-        error instanceof InstitutionalResolutionError
-        && (error.reason === "missing-page" || error.reason === "missing-seat")
-      ) {
-        // documented bare-seam fallback
-      } else {
-        throw error instanceof NavigatorUnavailableError
-          ? error
-          : navigatorUnavailableError("model", error);
-      }
     }
-  }
-  let configured: string;
-  try {
-    configured = await readNavigatorModelSetting(modelSettingPath ?? defaultModelSettingPath);
+    // Host params passthrough only — no map/validate/default (#675 ⑥).
+    const thinkingRaw = modelOnly.thinking;
+    const configuredLabel =
+      thinkingRaw === undefined
+        ? `${modelOnly.provider}/${modelOnly.model}`
+        : `${modelOnly.provider}/${modelOnly.model}:${thinkingRaw}`;
+    return {
+      selection: {
+        provider: modelOnly.provider,
+        model: modelOnly.model,
+        ...(thinkingRaw === undefined ? {} : { thinking: thinkingRaw }),
+      },
+      configuredLabel,
+      ...(thinkingRaw === undefined ? {} : { thinkingLevel: thinkingRaw }),
+    };
   } catch (error) {
     throw navigatorUnavailableError("model", error);
   }
-  let parsed: ReturnType<typeof parseNavigatorModelSetting>;
-  try {
-    parsed = parseNavigatorModelSetting(configured);
-  } catch (error) {
-    throw navigatorUnavailableError("model", error);
-  }
-  return {
-    selection: {
-      provider: parsed.provider,
-      model: parsed.model,
-      ...(parsed.thinkingLevel === undefined ? {} : { thinking: parsed.thinkingLevel }),
-    },
-    configuredLabel: configured,
-    ...(parsed.thinkingLevel === undefined ? {} : { thinkingLevel: parsed.thinkingLevel }),
-  };
 }

package/src/notary-source-run.ts

@@ -15,8 +15,10 @@ import {
 import type { NotarySourceRunLocator } from "./notary-contracts.ts";
 import { readRoleRunIdentity } from "./public-cli/run-lifecycle.ts";
 
+// Run directory leaf: <runId>@<role>. Production uses uuidv7 runIds; offline tracers
+// may use deterministic non-uuid leaves. Role token stays identifier-shaped.
 const RUN_DIR_NAME =
-  /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})@([A-Za-z][A-Za-z0-9_-]*)$/i;
+  /^([A-Za-z0-9][A-Za-z0-9._-]*)@([A-Za-z][A-Za-z0-9_-]*)$/;
 
 export class NotarySourceRunError extends Error {
   constructor(message: string, options?: ErrorOptions) {

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

@@ -0,0 +1,82 @@
+/**
+ * Public Auditor (审刑院) terminating receipt contracts (#675).
+ * Lawful explicit releases: pass | revise | escalate.
+ */
+import { Type } from "typebox";
+
+import { openToolObject } from "../open-tool-schema.ts";
+import { withInfrastructureFailureDeclaration } from "./terminating-infrastructure.ts";
+
+export const AUDITOR_OUTPUT_TOOL_NAME = "ak_auditor_output" as const;
+export const AUDITOR_ACCEPTED_TEXT = "审刑院回执已接受";
+
+export const auditorOutputSchema = withInfrastructureFailureDeclaration(
+  openToolObject(
+    Type.Object({
+      status: Type.Unknown({
+        description: "pass | revise | escalate — 形状指引，非 schema 闸",
+      }),
+      violations: Type.Optional(Type.Unknown({
+        description: "status 为 revise 时的违规条目",
+      })),
+      conflicts: Type.Optional(Type.Unknown({
+        description: "status 为 escalate 时的冲突",
+      })),
+      decisionGate: Type.Optional(Type.Unknown({
+        description: "status 为 escalate 时的决策闸",
+      })),
+    }),
+  ),
+);
+
+export type AuditorOutput =
+  | { readonly status: "pass" }
+  | { readonly status: "revise"; readonly violations?: unknown }
+  | {
+      readonly status: "escalate";
+      readonly conflicts?: unknown;
+      readonly decisionGate?: unknown;
+    };
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+export function projectLawfulAuditorOutput(value: unknown): AuditorOutput | undefined {
+  if (!isRecord(value)) return undefined;
+  if (value.status === "pass") return { status: "pass" };
+  if (value.status === "revise") {
+    return {
+      status: "revise",
+      ...(Object.hasOwn(value, "violations") ? { violations: value.violations } : {}),
+    };
+  }
+  if (value.status === "escalate") {
+    return {
+      status: "escalate",
+      ...(Object.hasOwn(value, "conflicts") ? { conflicts: value.conflicts } : {}),
+      ...(Object.hasOwn(value, "decisionGate") ? { decisionGate: value.decisionGate } : {}),
+    };
+  }
+  return undefined;
+}
+
+export function validateRecordedAuditorOutput(value: unknown): AuditorOutput {
+  const projected = projectLawfulAuditorOutput(value);
+  if (projected === undefined) {
+    throw new Error("Auditor output has no recognized execution discriminator");
+  }
+  return projected;
+}
+
+export function auditorDecisiveFacts(output: AuditorOutput): Record<string, unknown> {
+  const facts: Record<string, unknown> = { status: output.status };
+  if (output.status === "revise" && output.violations !== undefined) {
+    facts.violations = output.violations;
+  }
+  if (output.status === "escalate") {
+    if (output.conflicts !== undefined) facts.conflicts = output.conflicts;
+    if (output.decisionGate !== undefined) facts.decisionGate = output.decisionGate;
+  }
+  return facts;
+}

package/src/package-contracts/evidence-child-output.ts

@@ -0,0 +1,51 @@
+/**
+ * Public Evidence-Child terminating receipt contracts (#675).
+ * One report body; shape is not an admission gate (ADR 0055).
+ */
+import { Type } from "typebox";
+
+import { openToolObject } from "../open-tool-schema.ts";
+import { withInfrastructureFailureDeclaration } from "./terminating-infrastructure.ts";
+
+export const EVIDENCE_CHILD_OUTPUT_TOOL_NAME = "ak_evidence_child_output" as const;
+export const EVIDENCE_CHILD_ACCEPTED_TEXT = "取证回执已接受";
+
+export const evidenceChildOutputSchema = withInfrastructureFailureDeclaration(
+  openToolObject(
+    Type.Object({
+      report: Type.Unknown({
+        description: "取证报告正文 — 形状指引，非 schema 闸",
+      }),
+    }),
+  ),
+);
+
+/** Report body retained as delivered — no type/blank/field-presence reshape (ADR 0055 / §0). */
+export type EvidenceChildOutput = { readonly report: unknown };
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+export function projectLawfulEvidenceChildOutput(
+  value: unknown,
+): EvidenceChildOutput | undefined {
+  // No field-presence gate (ADR 0055 / CLAUDE.md §0 / #675). Retain delivered bytes:
+  // report key when present, otherwise the whole object as the report body.
+  if (!isRecord(value)) return undefined;
+  return { report: Object.hasOwn(value, "report") ? value.report : value };
+}
+
+export function validateRecordedEvidenceChildOutput(value: unknown): EvidenceChildOutput {
+  const projected = projectLawfulEvidenceChildOutput(value);
+  if (projected === undefined) {
+    throw new Error("Evidence-child output is not an object");
+  }
+  return projected;
+}
+
+export function evidenceChildDecisiveFacts(
+  output: EvidenceChildOutput,
+): Record<string, unknown> {
+  return { report: output.report };
+}

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

@@ -4,6 +4,7 @@
 export const JUDGE_OUTPUT_TOOL_NAME = "ak_judge_output";
 export const JUDGE_ACCEPTED_TEXT = "大理寺回执已接受";
 export const JUDGE_ACCEPTED_AUDIT_NO_RECEIPT_TEXT = "大理寺回执已接受；审计无回执";
+export const JUDGE_ACCEPTED_AUDIT_UNREADABLE_TEXT = "大理寺回执已接受；审计形状不可读";
 
 export type JudgeClass = {
   name: string;

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

@@ -10,8 +10,8 @@ export type ReviewerAmendments = Readonly<Partial<Record<"standards" | "spec", s
 export type ReviewerIntent =
   | Readonly<{ status: "completed"; amendments?: ReviewerAmendments }>
   | Readonly<{ status: "refused"; diagnostic: string; amendments?: ReviewerAmendments }>;
-/** Child report is plain text — no length/digest identity shell (ADR 0031). */
-export type VerbatimChildReport = Readonly<{ text: string }>;
+/** Child report body retained as delivered — no type/blank reshape (ADR 0031 / 0055 / #675). */
+export type VerbatimChildReport = Readonly<{ text: unknown }>;
 /** Prompt projection on the receipt face is plain text (ADR 0031). */
 export type ReviewerReceiptPrompt = Readonly<{ text: string }>;
 /** Canonical Skill content on the receipt face is plain text (ADR 0031/0032). */

package/src/package-contracts/terminating-tools.ts

@@ -29,11 +29,14 @@ import { CorrectableSubmissionError } from "../submission-correctable-error.ts";
 import { DOCTOR_ACCEPTED_TEXT, DOCTOR_OUTPUT_TOOL_NAME, validateDoctorSubmissionShape, validateRecordedDoctorOutput, type DoctorOutput, type DoctorSubmission } from "../doctor-contracts.ts";
 import { GATEKEEPER_ACCEPTED_TEXT, GATEKEEPER_OUTPUT_TOOL_NAME, validateRecordedGatekeeperOutput, type GatekeeperDirectOutput } from "./gatekeeper-output.ts";
 import { NAVIGATOR_ACCEPTED_TEXT, NAVIGATOR_OUTPUT_TOOL_NAME, validateRecordedNavigatorOutput, type NavigatorAdvice } from "./navigator-output.ts";
+import { AUDITOR_ACCEPTED_TEXT, AUDITOR_OUTPUT_TOOL_NAME, validateRecordedAuditorOutput, type AuditorOutput } from "./auditor-output.ts";
+import { EVIDENCE_CHILD_ACCEPTED_TEXT, EVIDENCE_CHILD_OUTPUT_TOOL_NAME, validateRecordedEvidenceChildOutput, type EvidenceChildOutput } from "./evidence-child-output.ts";
 import { MERGER_ACCEPTED_TEXT, MERGER_OUTPUT_TOOL_NAME, validateMergerOutput, type MergerOutput } from "../merger-contracts.ts";
 import { NOTARY_ACCEPTED_TEXT, NOTARY_OUTPUT_TOOL_NAME, validateRecordedNotaryOutput, type NotaryOutput } from "../notary-contracts.ts";
 import { COUNTERSIGN_ACCEPTED_TEXT, COUNTERSIGN_OUTPUT_TOOL_NAME, validateRecordedCountersignOutput, type CountersignVerdict } from "../countersign-contracts.ts";
 import { GLEANER_LEFT_ACCEPTED_TEXT, GLEANER_LEFT_OUTPUT_TOOL_NAME, validateRecordedGleanerLeftOutput, type GleanerLeftOutput } from "../gleaner-left-contracts.ts";
 import { INSPECTOR_ACCEPTED_TEXT, INSPECTOR_OUTPUT_TOOL_NAME, validateRecordedInspectorOutput, type InspectorOutput } from "../inspector-contracts.ts";
+import { DIARIST_ACCEPTED_TEXT, DIARIST_OUTPUT_TOOL_NAME, validateRecordedDiaristOutput, type DiaristOutput } from "../diarist-contracts.ts";
 import {
   CODER_ACCEPTED_TEXT,
   CODER_OUTPUT_TOOL_NAME,
@@ -71,6 +74,9 @@ export {
   validateRecordedInspectorOutput,
   validateRecordedGatekeeperOutput,
   validateRecordedNavigatorOutput,
+  validateRecordedAuditorOutput,
+  validateRecordedEvidenceChildOutput,
+  validateRecordedDiaristOutput,
 };
 export type {
   CollectorReceipt,
@@ -87,6 +93,9 @@ export type {
   InspectorOutput,
   GatekeeperDirectOutput,
   NavigatorAdvice,
+  AuditorOutput,
+  EvidenceChildOutput,
+  DiaristOutput,
 };
 
 export const TERMINATING_TOOL_NAMES = [
@@ -103,6 +112,9 @@ export const TERMINATING_TOOL_NAMES = [
   INSPECTOR_OUTPUT_TOOL_NAME,
   GATEKEEPER_OUTPUT_TOOL_NAME,
   NAVIGATOR_OUTPUT_TOOL_NAME,
+  AUDITOR_OUTPUT_TOOL_NAME,
+  EVIDENCE_CHILD_OUTPUT_TOOL_NAME,
+  DIARIST_OUTPUT_TOOL_NAME,
 ] as const;
 
 export type TerminatingToolName = (typeof TERMINATING_TOOL_NAMES)[number];
@@ -119,7 +131,10 @@ export type AcceptedDetails =
   | GleanerLeftOutput
   | InspectorOutput
   | GatekeeperDirectOutput
-  | NavigatorAdvice;
+  | NavigatorAdvice
+  | AuditorOutput
+  | EvidenceChildOutput
+  | DiaristOutput;
 
 export function isTerminatingToolName(
   name: string,
@@ -155,6 +170,12 @@ export function acceptedTextFor(toolName: TerminatingToolName): string {
       return GATEKEEPER_ACCEPTED_TEXT;
     case NAVIGATOR_OUTPUT_TOOL_NAME:
       return NAVIGATOR_ACCEPTED_TEXT;
+    case AUDITOR_OUTPUT_TOOL_NAME:
+      return AUDITOR_ACCEPTED_TEXT;
+    case EVIDENCE_CHILD_OUTPUT_TOOL_NAME:
+      return EVIDENCE_CHILD_ACCEPTED_TEXT;
+    case DIARIST_OUTPUT_TOOL_NAME:
+      return DIARIST_ACCEPTED_TEXT;
   }
 }
 
@@ -213,15 +234,24 @@ export function validateAcceptedDetails(
     [INSPECTOR_OUTPUT_TOOL_NAME]: ["pass", "bounce"],
     [GATEKEEPER_OUTPUT_TOOL_NAME]: ["dispatch", "pass"],
     [NAVIGATOR_OUTPUT_TOOL_NAME]: ["advice"],
+    [AUDITOR_OUTPUT_TOOL_NAME]: ["pass", "revise", "escalate"],
+    [EVIDENCE_CHILD_OUTPUT_TOOL_NAME]: [],
+    [DIARIST_OUTPUT_TOOL_NAME]: ["completed"],
   };
   const collectorDiscriminator = toolName === COLLECTOR_OUTPUT_TOOL && Array.isArray(candidate?.groups);
+  // Evidence-child: any object is a candidate body — no report-field presence gate (#675 / ADR 0055).
+  const evidenceChildDiscriminator =
+    toolName === EVIDENCE_CHILD_OUTPUT_TOOL_NAME
+    && candidate !== null
+    && typeof candidate === "object"
+    && !Array.isArray(candidate);
   const baseDiscriminator = discriminator;
   const runtimeBindingMissing =
     (toolName === DOCTOR_OUTPUT_TOOL_NAME && baseDiscriminator === "completed" && !(candidate?.cost !== null && typeof candidate?.cost === "object")) ||
     (toolName === REVIEWER_OUTPUT_TOOL_NAME && candidate?.version !== 2);
   if (
     runtimeBindingMissing ||
-    (!collectorDiscriminator && (typeof discriminator !== "string" || !lawfulStatuses[toolName].includes(baseDiscriminator as string)))
+    (!collectorDiscriminator && !evidenceChildDiscriminator && (typeof discriminator !== "string" || !lawfulStatuses[toolName].includes(baseDiscriminator as string)))
   ) {
     throw new AcceptedDetailsContractError("terminating receipt has no recognized execution discriminator");
   }
@@ -253,6 +283,12 @@ export function validateAcceptedDetails(
       return validateRecordedGatekeeperOutput(details);
     case NAVIGATOR_OUTPUT_TOOL_NAME:
       return validateRecordedNavigatorOutput(details);
+    case AUDITOR_OUTPUT_TOOL_NAME:
+      return validateRecordedAuditorOutput(details);
+    case EVIDENCE_CHILD_OUTPUT_TOOL_NAME:
+      return validateRecordedEvidenceChildOutput(details);
+    case DIARIST_OUTPUT_TOOL_NAME:
+      return validateRecordedDiaristOutput(details);
     }
   } catch (error) {
     if (error instanceof Error && error.constructor === Error) throw new AcceptedDetailsContractError(error.message, { cause: error });
@@ -280,6 +316,15 @@ export function validateAcceptedLifecycle(
     if (!deepEqual(testimony, projected)) throw new Error("accepted tool lifecycle details mismatch");
     return details;
   }
+  if (toolName === DIARIST_OUTPUT_TOOL_NAME) {
+    // Envelope-owned mechanical sitian facts are runtime-bound on details only
+    // (same shape as the Doctor runtime cost); the submitted arguments carry the
+    // role's own selections. Machine facts never come from model self-report.
+    const { sitian: _mechanical, ...submitted } = details as DiaristOutput & { sitian?: unknown };
+    const testimony = validateAcceptedDetails(toolName, argumentsValue);
+    if (!deepEqual(testimony, submitted)) throw new Error("accepted tool lifecycle details mismatch");
+    return details;
+  }
   const argumentsDetails = validateAcceptedDetails(toolName, argumentsValue);
   if (!deepEqual(argumentsDetails, details)) throw new Error("accepted tool lifecycle details mismatch");
   return details;
@@ -301,7 +346,12 @@ export function acceptedFacts(toolName: TerminatingToolName, details: AcceptedDe
     case GLEANER_LEFT_OUTPUT_TOOL_NAME:
     case INSPECTOR_OUTPUT_TOOL_NAME:
     case GATEKEEPER_OUTPUT_TOOL_NAME:
-    case NAVIGATOR_OUTPUT_TOOL_NAME: return { status: (details as { status: string }).status };
+    case NAVIGATOR_OUTPUT_TOOL_NAME:
+    case AUDITOR_OUTPUT_TOOL_NAME:
+      return { status: (details as { status: string }).status };
+    case EVIDENCE_CHILD_OUTPUT_TOOL_NAME:
+      return { status: "report" };
+    case DIARIST_OUTPUT_TOOL_NAME: return { status: (details as { status: string }).status };
     case JUDGE_OUTPUT_TOOL_NAME: return { status: (details as { judgeStatus: string }).judgeStatus };
     case COUNTERSIGN_OUTPUT_TOOL_NAME: return { status: (details as { countersignStatus: string }).countersignStatus };
     case MERGER_OUTPUT_TOOL_NAME: {

package/src/packaged-role-registry.ts

@@ -11,6 +11,12 @@ import { NOTARY_OUTPUT_TOOL_NAME } from "./notary-contracts.ts";
 import { COUNTERSIGN_OUTPUT_TOOL_NAME } from "./countersign-contracts.ts";
 import { GLEANER_LEFT_OUTPUT_TOOL_NAME } from "./gleaner-left-contracts.ts";
 import { INSPECTOR_OUTPUT_TOOL_NAME } from "./inspector-contracts.ts";
+import { AUDITOR_OUTPUT_TOOL_NAME } from "./package-contracts/auditor-output.ts";
+import { EVIDENCE_CHILD_OUTPUT_TOOL_NAME } from "./package-contracts/evidence-child-output.ts";
+import {
+  DIARIST_OUTPUT_TOOL_NAME,
+  DIARIST_SOURCES_FLAG,
+} from "./diarist-contracts.ts";
 
 /** Shared by public notary and gatekeeper-province notary. */
 export const NOTARY_SESSION_MATERIALS = [
@@ -29,6 +35,28 @@ export const INSPECTOR_SESSION_MATERIALS = [
   "souls/gate-output-guide.md",
 ] as const;
 
+/**
+ * Public 审刑院 shipping roster (#675 owner).
+ * Runtime assembly is subject-selected via AUDITOR_SESSION_MATERIALS
+ * (judge-auditor.md / doctor-auditor.md) — never a generic auditor.md.
+ * This list is the union of files that must ship; load path is loadAuditorSoul(subject).
+ */
+export const AUDITOR_PUBLIC_SESSION_MATERIALS = [
+  "CLAUDE.md",
+  "souls/judge-auditor.md",
+  "souls/doctor-auditor.md",
+  "souls/audit-law.md",
+  "souls/quality-law.md",
+] as const;
+
+/** Public evidence-child materials (#675). audit-law supplies lawful 取证授权; seat identity only in evidence-child.md. */
+export const EVIDENCE_CHILD_SESSION_MATERIALS = [
+  "CLAUDE.md",
+  "souls/evidence-child.md",
+  "souls/audit-law.md",
+  "souls/quality-law.md",
+] as const;
+
 /**
  * One record per public callable role (#639: includes gatekeeper and navigator).
  */
@@ -185,6 +213,41 @@ export const PUBLIC_ROLE_RECORDS = [
     activationStage: "load-and-install",
     sessionMaterials: ["CLAUDE.md", "souls/navigator.md"],
   },
+  // #675: 审刑院 / evidence-child are roles like any other — public ak-role entries.
+  {
+    role: "auditor",
+    phases: [null],
+    outputTool: AUDITOR_OUTPUT_TOOL_NAME,
+    inputFlag: undefined,
+    phaseFlag: undefined,
+    activationStage: "load-and-install",
+    sessionMaterials: AUDITOR_PUBLIC_SESSION_MATERIALS,
+  },
+  {
+    role: "evidence-child",
+    phases: [null],
+    outputTool: EVIDENCE_CHILD_OUTPUT_TOOL_NAME,
+    inputFlag: undefined,
+    phaseFlag: undefined,
+    activationStage: "load-and-install",
+    sessionMaterials: EVIDENCE_CHILD_SESSION_MATERIALS,
+  },
+  // #708 / ADR 0075 `diarist-is-role`: 起居郎 is a seat like any other. The
+  // frozen source catalog rides the shared input-flag seam; it is absent for a
+  // true-unbound summons (no ticket → no diary).
+  {
+    role: "diarist",
+    phases: [null],
+    outputTool: DIARIST_OUTPUT_TOOL_NAME,
+    inputFlag: DIARIST_SOURCES_FLAG.name,
+    phaseFlag: undefined,
+    activationStage: "load-and-install",
+    sessionMaterials: [
+      "CLAUDE.md",
+      "souls/diarist.md",
+      "resources/diarist-collect.md",
+    ],
+  },
 ] as const;
 
 export type PublicRoleRecord = (typeof PUBLIC_ROLE_RECORDS)[number];

package/src/pi/adapter.ts

@@ -7,7 +7,8 @@ import {
   type ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
 import type { Static, TSchema } from "typebox";
-import { requireGatekeeperPass, type GatekeeperNonPassResult, type GatekeeperSubject } from "../gatekeeper-role.ts";
+import type { GatekeeperNonPassResult, GatekeeperSubject } from "../gatekeeper-role.ts";
+import { requireGatekeeperPass } from "../gatekeeper-pass-envelope.ts";
 import type {
   HostContext,
   HostEventRegistration,

package/src/pi/in-process-session.ts

@@ -207,7 +207,7 @@ export type OpenPiInstitutionalSessionResult = {
   readonly streamFailure: unknown;
 };
 
-export async function openPiInstitutionalSession(
+export async function openPiInProcessSession(
   options: OpenPiInstitutionalSessionOptions,
 ): Promise<OpenPiInstitutionalSessionResult> {
   const label = options.label ?? "Institutional sub-session";
@@ -237,7 +237,7 @@ export async function openPiInstitutionalSession(
       ? childRegistry.find(selection.provider, selection.model)
       : undefined;
 
-    const withTypedReason = (error: Error, reason: "auth" | "model"): Error =>
+    const withTypedReason = (error: Error, reason: "auth" | "model" | "thinking"): Error =>
       Object.assign(error, { reason });
 
     // Existing Navigator/model contract (pre-#590): unknown provider or model is
@@ -633,15 +633,26 @@ export async function openPiInstitutionalSession(
       }
     }
 
-    // 7. Create AgentSession — thinking is opaque pass-through. Absent selection
-    // omits thinkingLevel (Pi owns default). Pi clamps unsupported levels itself;
-    // we do not re-check or invent package defaults.
+    // 7. Create AgentSession
+    // Thinking is opaque pass-through (#683 / #675 ⑥). Absent selection omits
+    // thinkingLevel (Pi owns default). Pi clamps unsupported levels itself;
+    // we do not re-check or invent package defaults. When reusing a session file,
+    // re-apply seat model after open so Pi cannot restore a stale model over
+    // selection (#675 ⑤ / #697).
+    const requestedThinking = selection.thinking;
+    const priorEntries =
+      typeof (sessionManager as { getEntries?: () => readonly unknown[] }).getEntries === "function"
+        ? (sessionManager as { getEntries: () => readonly unknown[] }).getEntries()
+        : [];
+    const reusedSession = priorEntries.some((entry) => {
+      if (typeof entry !== "object" || entry === null) return false;
+      const type = (entry as { type?: unknown }).type;
+      return type === "message" || type === "model_change" || type === "thinking_level_change";
+    });
     const { session } = await createAgentSession({
       cwd: options.cwd,
       model: effectiveModel,
-      ...(options.selection.thinking === undefined
-        ? {}
-        : { thinkingLevel: options.selection.thinking as any }),
+      ...(requestedThinking === undefined ? {} : { thinkingLevel: requestedThinking as any }),
       modelRuntime: runtime,
       sessionManager,
       settingsManager: settings,
@@ -651,9 +662,23 @@ export async function openPiInstitutionalSession(
       ...(options.toolsAllowlist === undefined ? {} : { tools: options.toolsAllowlist as string[] }),
       ...(customTools.length === 0 ? {} : { customTools }),
     });
-    await session.setModel(effectiveModel);
-    if (options.selection.thinking !== undefined) {
-      session.setThinkingLevel(options.selection.thinking as any);
+    if (reusedSession) {
+      try {
+        await session.setModel(effectiveModel);
+        if (requestedThinking !== undefined) {
+          session.setThinkingLevel(requestedThinking as any);
+        }
+      } catch (error) {
+        session.dispose();
+        throw withTypedReason(
+          error instanceof Error
+            ? error
+            : new Error(
+              `${label} failed to apply seat model/thinking for ${selection.provider}/${selection.model}`,
+            ),
+          requestedThinking !== undefined ? "thinking" : "model",
+        );
+      }
     }
 
     // 8. Event subscriptions
@@ -832,4 +857,5 @@ export async function openPiInstitutionalSession(
     }
     throw openError;
   }
-}
+}
+