@akagilnc/pi-workflow-roles 0.1.5483 → 0.1.5571

package/dist/navigator-public-session.js

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import { basename } from "node:path";
-import { sitianReport } from "./sitian-facade.js";
+import { sitianReportSafe } from "./host-session-record.js";
 import {
   NavigatorUnavailableError,
   navigatorProviderFailureFromPublicTerminal,
@@ -9,6 +9,7 @@ import {
   parseNavigatorModelSetting
 } from "./navigator-session-contracts.js";
 import { runDirectoryFromHostContext } from "./host-contracts.js";
+import { parseRunLeaf } from "./role-run-placement.js";
 import { CliUsageError } from "./public-cli/cli-errors.js";
 import { isNavigatorSeat } from "./packaged-role-registry.js";
 import {
@@ -32,11 +33,9 @@ async function resolveNavigatorLedgerHome(context) {
 }
 const NAVIGATOR_HOST_RUN_POINTER_ENTRY = "ak-navigator-host-run";
 function runIdFromNavigatorDirectory(runDirectory) {
-  const entry = basename(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;
+  const parsed = parseRunLeaf(basename(runDirectory));
+  if (parsed === void 0 || parsed.role !== "navigator") return void 0;
+  return parsed.runId;
 }
 function readNavigatorHostRunPointer(entries) {
   for (let index = entries.length - 1; index >= 0; index -= 1) {
@@ -188,17 +187,14 @@ function createNativeNavigatorSessionFactory(deps) {
       routePlaybookReadFailure: () => routePlaybookReadFailure,
       appendEntry: (customType, data) => {
         sessionManager.appendCustomEntry(customType, data);
-        try {
-          sitianReport({
-            level: "event",
-            kind: "attendance",
-            cwd: context.cwd,
-            sessionParent: sessionManager.getSessionFile(),
-            payload: { customType, data },
-            source: "navigator-public-session"
-          });
-        } catch {
-        }
+        sitianReportSafe({
+          level: "event",
+          kind: "attendance",
+          cwd: context.cwd,
+          sessionParent: sessionManager.getSessionFile(),
+          payload: { customType, data },
+          source: "navigator-public-session"
+        });
       },
       entries: () => sessionManager.getEntries(),
       setModel: async (next, nextThinking) => {

package/dist/notary-source-run.js

@@ -8,6 +8,7 @@ import { lstat, realpath } from "node:fs/promises";
 import { resolveBookKeyFromGit } from "./activation-ledger-git.js";
 import { activationBookDirectory, physicalPathIdentity, resolveActivationLedgerHome, } from "./activation-ledger-topology.js";
 import { findRunDirectoryById, readRoleRunIdentity } from "./public-cli/run-lifecycle.js";
+import { formatRunLeaf, parseRunLeaf } from "./role-run-placement.js";
 async function readRetainedIdentity(runDirectory) {
     try {
         return await readRoleRunIdentity(runDirectory);
@@ -20,21 +21,12 @@ async function readRetainedIdentity(runDirectory) {
         });
     }
 }
-// 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 = /^([A-Za-z0-9][A-Za-z0-9._-]*)@([A-Za-z][A-Za-z0-9_-]*)$/;
 export class NotarySourceRunError extends Error {
     constructor(message, options) {
         super(message, options);
         this.name = "NotarySourceRunError";
     }
 }
-function parseRunDirectoryName(name) {
-    const match = RUN_DIR_NAME.exec(name);
-    if (match === null)
-        return undefined;
-    return { runId: match[1], role: match[2] };
-}
 async function requireRunDirectory(candidate, display) {
     let real;
     try {
@@ -53,7 +45,7 @@ async function requireRunDirectory(candidate, display) {
     if (!stat.isDirectory()) {
         throw new NotarySourceRunError(`notary --source-run must be a run directory: ${display}`);
     }
-    const identity = parseRunDirectoryName(basename(real));
+    const identity = parseRunLeaf(basename(real));
     if (identity === undefined) {
         throw new NotarySourceRunError(`notary --source-run must be named <runId>@<role>: ${basename(real)}`);
     }
@@ -66,7 +58,7 @@ async function requireRunDirectory(candidate, display) {
  * - absolute/relative path that realpath's to that same book runs slot
  *
  * Rejects project-tree projections and any path outside the project's ledger book runs.
- * Retained `run-state.json` must match basename identity and book binding.
+ * Retained state.jsonl run-state must match basename identity and book binding.
  */
 export async function resolveNotarySourceRunLocator(options) {
     const raw = options.sourceRun.trim();
@@ -78,14 +70,14 @@ export async function resolveNotarySourceRunLocator(options) {
     const bookDirectory = activationBookDirectory(ledgerHome, bookKey);
     const bookRunsRoot = join(bookDirectory, "runs");
     let candidate;
-    const bare = parseRunDirectoryName(raw);
+    const bare = parseRunLeaf(raw);
     if (bare !== undefined && !raw.includes("/") && !raw.includes("\\")) {
         candidate = (await findRunDirectoryById(options.home, bare.runId, bookKey, bare.role))
-            ?? join(bookRunsRoot, `${bare.runId}@${bare.role}`);
+            ?? join(bookRunsRoot, formatRunLeaf(bare.runId, bare.role));
     }
     else {
         candidate = isAbsolute(raw) ? raw : resolve(options.projectRoot, raw);
-        const identity = parseRunDirectoryName(basename(candidate));
+        const identity = parseRunLeaf(basename(candidate));
         const subjectDirectory = dirname(dirname(candidate));
         const isLegacyUnboundLocator = identity !== undefined &&
             basename(dirname(candidate)) === "runs" &&
@@ -96,7 +88,7 @@ export async function resolveNotarySourceRunLocator(options) {
         }
     }
     const real = await requireRunDirectory(candidate, raw);
-    const identity = parseRunDirectoryName(basename(real));
+    const identity = parseRunLeaf(basename(real));
     const bookIdentity = physicalPathIdentity(bookDirectory);
     const parentIdentity = physicalPathIdentity(dirname(real));
     const subjectBookIdentity = physicalPathIdentity(dirname(dirname(dirname(real))));
@@ -128,7 +120,7 @@ export async function resolveNotarySourceRunLocator(options) {
 /** Internal activation loader: path is the admitted absolute source run directory. */
 export async function loadNotarySourceRunLocator(path) {
     const real = await requireRunDirectory(path, path);
-    const identity = parseRunDirectoryName(basename(real));
+    const identity = parseRunLeaf(basename(real));
     const runState = await readRetainedIdentity(real);
     if (runState === undefined) {
         throw new NotarySourceRunError("notary source-run lacks retained run-state identity");

package/dist/packaged-role-registry.js

@@ -88,14 +88,7 @@ const PUBLIC_ROLE_RECORDS = [
     outputTool: FIXER_OUTPUT_TOOL_NAME,
     settlement: "sealed",
     artifactFace: {
-      reportPhase: true,
-      evidenceRole: true,
-      leaves: [
-        { key: "phase" },
-        { key: "packetPath" },
-        { key: "prerequisitesPath", omitUndefined: true },
-        { key: "prerequisites" }
-      ]
+      reportPhase: true
     },
     boardPlacement: "marshal",
     activationFlags: [
@@ -126,12 +119,7 @@ const PUBLIC_ROLE_RECORDS = [
     outputTool: CODER_OUTPUT_TOOL_NAME,
     settlement: "sealed",
     artifactFace: {
-      reportPhase: true,
-      evidenceRole: true,
-      leaves: [
-        { key: "phase" },
-        { key: "taskPath" }
-      ]
+      reportPhase: true
     },
     activationFlags: [
       { field: "taskPath", flag: "ak-coder-task", binds: "input" },
@@ -165,15 +153,7 @@ const PUBLIC_ROLE_RECORDS = [
     settlement: "sealed",
     /** Publish only an accepted ledger outcome; audit escalation stays unsettled here. */
     sealedAcceptedOnly: true,
-    artifactFace: {
-      evidenceRole: true,
-      leaves: [
-        { key: "baseRevision" },
-        { key: "lens" },
-        { key: "authorityRefs", copyArray: true },
-        { key: "callerProvenance", callerProvenance: true }
-      ]
-    },
+    artifactFace: {},
     /** Frozen base/lens/authority become the initial prompt; instruction follows. */
     transportPrompt: "skill-args",
     boardPlacement: "marshal",
@@ -204,14 +184,7 @@ const PUBLIC_ROLE_RECORDS = [
     bareCommand: false,
     outputTool: COLLECTOR_OUTPUT_TOOL,
     settlement: "sealed",
-    artifactFace: {
-      evidenceRole: true,
-      leaves: [
-        { key: "prNumber", omitUndefined: true },
-        { key: "repository", from: "repository.canonical" },
-        { key: "manifestDigest" }
-      ]
-    },
+    artifactFace: {},
     boardPlacement: "collector",
     /** Taishi acceptance is a typed groups array, not a status leaf. */
     analystTerminal: "groups",
@@ -240,12 +213,6 @@ const PUBLIC_ROLE_RECORDS = [
     auditTool: DOCTOR_AUDIT_TOOL_NAME,
     settlement: "sealed",
     artifactFace: {
-      evidenceRole: true,
-      leaves: [
-        { key: "issueNumber" },
-        { key: "caseRunsPath" },
-        { key: "caseIdentity" }
-      ],
       doctorReportFacts: true
     },
     /** Navigator subject is the doctor case, not the case-path file bytes. */
@@ -271,13 +238,7 @@ const PUBLIC_ROLE_RECORDS = [
     phases: [null],
     outputTool: MERGER_OUTPUT_TOOL_NAME,
     settlement: "sealed",
-    artifactFace: {
-      evidenceRole: true,
-      leaves: [
-        { key: "mergerInputPath" },
-        { key: "derived" }
-      ]
-    },
+    artifactFace: {},
     activationFlags: [
       { field: "inputPath", from: "mergerInputPath", flag: "ak-merger-input", binds: "input" }
     ],
@@ -297,8 +258,6 @@ const PUBLIC_ROLE_RECORDS = [
     sourceRunStored: "raw",
     argvResult: "source-run",
     sameParent: "source-locator",
-    /** Infrastructure failure at this stage has no accepted gate cycle to project. */
-    skipGateOnInfrastructureStage: true,
     /** 符宝郎 is a review officer and inherits the gatekeeper model. */
     reviewOfficer: true,
     provinceConfig: true,
@@ -406,8 +365,6 @@ const PUBLIC_ROLE_RECORDS = [
     sameParent: "gate-pointer",
     /** Resume restores an optional source-run path onto the admitted face. */
     resumeSourcePath: true,
-    /** Infrastructure failure at this stage has no accepted gate cycle to project. */
-    skipGateOnInfrastructureStage: true,
     /** 台院 is a review officer and inherits the gatekeeper model. */
     reviewOfficer: true,
     provinceConfig: true,
@@ -439,8 +396,6 @@ const PUBLIC_ROLE_RECORDS = [
     presentSettled: "always",
     summonResume: true,
     admission: "instruction",
-    /** Infrastructure failure at this stage has no accepted gate cycle to project. */
-    skipGateOnInfrastructureStage: true,
     sameParent: "none",
     /** Province model root. Officers name this seat via modelInheritsFrom. */
     provinceConfig: true,
@@ -608,11 +563,6 @@ function packagedAuditToolName(role) {
   if (record === void 0 || !("auditTool" in record)) return void 0;
   return record.auditTool;
 }
-function packagedSkipsGateOnInfrastructureStage(stage) {
-  return typeof stage === "string" && PUBLIC_ROLE_RECORDS.some(
-    (record) => "skipGateOnInfrastructureStage" in record && record.skipGateOnInfrastructureStage === true && record.role === stage
-  );
-}
 function packagedDurableOfficerEntry(officer) {
   return typeof officer === "string" && PUBLIC_ROLE_RECORDS.some(
     (record) => "durableOfficerEntry" in record && record.durableOfficerEntry === true && record.role === officer
@@ -699,7 +649,6 @@ export {
   packagedRoleOutputTool,
   packagedRolePhaseFlag,
   packagedRoleSessionMaterials,
-  packagedSkipsGateOnInfrastructureStage,
   packagedStoresSourceRunRaw,
   packagedSubjectChoices
 };

package/dist/pi/durable-principal.js

@@ -1,7 +1,6 @@
-import { join } from "node:path";
 import { resolveBookKeyFromGit } from "../activation-ledger-git.js";
 import { resolveActivationLedgerHome } from "../activation-ledger-topology.js";
-import { roleRunPlacement } from "../role-run-placement.js";
+import { roleRunPlacement, sessionFileIn } from "../role-run-placement.js";
 function encode(coordinates) {
     return coordinates;
 }
@@ -47,7 +46,7 @@ export const piDurablePrincipalAuthority = {
             sessionDirectory: record.sessionDirectory,
             sessionFile: typeof record.sessionFile === "string" && record.sessionFile.trim() !== ""
                 ? record.sessionFile
-                : join(record.sessionDirectory, "session.jsonl"),
+                : sessionFileIn(record.sessionDirectory),
         };
     },
 };

package/dist/pi/role-turn-host.js

@@ -5,7 +5,7 @@
  */
 import { execFile, spawn } from "node:child_process";
 import { constants } from "node:fs";
-import { access, appendFile, readFile, realpath } from "node:fs/promises";
+import { access, appendFile, realpath } from "node:fs/promises";
 import { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
@@ -14,9 +14,13 @@ import { ExplicitInternalActivationError } from "../host-contracts.js";
 import { applyEngineChildEnv, ENGINE_MODEL_FLAG_NAME, normalizeEngineName } from "../engine-detour.js";
 import { projectActivationFlags } from "../role-activation-flags.js";
 import { encodeUserDialogueStdin } from "../user-dialogue-stdin.js";
+import { readLedgerSessionJsonlLines, readStrictPiSessionJsonl } from "../ledger-session-read.js";
+import { copyAndRecordHostDossier } from "../host-session-record.js";
 import { projectThrownFailureLeaf, retainPackageFault } from "../public-cli/settlement.js";
 import { describeErrorIdentity } from "../public-cli/run-lifecycle.js";
 import { RECEIPT_DELIVERY_LIMIT_ENV } from "../receipt-delivery-policy.js";
+import { createSessionIdentityAuthority } from "../session-identity.js";
+import { sitianReport } from "../sitian-facade.js";
 /** Package-relative Internal role entrypoint (ADR 0052; same path as public-cli registry). */
 const INTERNAL_ROLE_ENTRYPOINT_RELATIVE = "extensions/role-runtime.ts";
 export function resolveInternalRoleEntrypoint(packageRoot) {
@@ -350,39 +354,99 @@ export function createPiRoleTurnHost(config) {
                 await config.recordLaunchedRolePackageIdentity(request.runDirectory, await config.observeLaunchedRolePackageIdentity(config.packageRoot, roleEntry));
             }
             const timeoutMs = request.timeoutMs ?? config.timeoutMs;
-            return await spawnRunner(args, {
+            const result = await spawnRunner(args, {
                 cwd: request.cwd,
                 env,
                 stdin,
                 ...(timeoutMs === undefined ? {} : { timeoutMs }),
                 ...(request.signal === undefined ? {} : { signal: request.signal }),
             });
+            // Deliver already-written Pi host facts. Pi lands at session/session.jsonl;
+            // bind projects host.sessions; copy records the landing. Host adapters do
+            // not write current.json — public bind/settlement seams own that render.
+            try {
+                const { sessionFile, sessionDirectory } = config.principalAuthority.decode(request.principal);
+                const sessionId = await readPiSessionHeaderId(sessionFile);
+                if (sessionId !== undefined) {
+                    await createSessionIdentityAuthority(config.principalAuthority, "pi").bind(request.principal, sessionId);
+                    copyAndRecordHostDossier({
+                        host: "pi",
+                        sessionId,
+                        cwd: request.cwd,
+                        sessionDirectory,
+                        sessionParent: sessionFile,
+                        ...(request.home !== undefined ? { home: request.home } : {}),
+                    });
+                }
+            }
+            catch (error) {
+                await retainPackageFault({
+                    runDirectory: request.runDirectory,
+                    diagnostic: `pi host dossier record failed beside host terminal: ${describeErrorIdentity(error)}`,
+                    error,
+                });
+            }
+            return result;
         },
     };
 }
-import { sitianReport } from "../sitian-facade.js";
 /**
- * Append one custom JSONL entry to the durable principal's session file.
- * Pi session codec only — AK artifact O_EXCL retention stays in public-cli.
+ * Session header id from the Pi volume the child (or fixture) already wrote.
+ * Reuses the ledger line kernel: a later malformed line must not erase a valid
+ * header already present (ADR 0086 originals are not validated whole-file).
  */
-export async function appendPiSessionCustomEntry(authority, principal, customType, data) {
-    const { sessionFile } = authority.decode(principal);
-    const text = await readFile(sessionFile, "utf8");
+async function readPiSessionHeaderId(sessionFile) {
+    try {
+        for (const line of await readLedgerSessionJsonlLines(sessionFile)) {
+            const entry = line.row;
+            if (entry === undefined || entry.type !== "session")
+                continue;
+            if (typeof entry.id === "string" && entry.id.trim() !== "")
+                return entry.id;
+        }
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return undefined;
+        throw error;
+    }
+    return undefined;
+}
+/** Last non-session entry id. Session headers are not parents of custom lines. */
+export function piSessionCustomParentId(entries) {
     let parentId = null;
-    for (const line of text.trim().split("\n").filter(Boolean)) {
-        const entry = JSON.parse(line);
+    for (const entry of entries) {
         if (typeof entry.id === "string" && entry.type !== "session")
             parentId = entry.id;
     }
-    const timestamp = new Date().toISOString();
-    const pointerLine = `${JSON.stringify({
+    return parentId;
+}
+/** One Pi custom JSONL line: type, customType, data, id, parentId, timestamp. */
+export function formatPiSessionCustomEntry(input) {
+    return `${JSON.stringify({
         type: "custom",
+        customType: input.customType,
+        data: input.data,
+        id: randomUUID(),
+        parentId: input.parentId,
+        timestamp: input.timestamp,
+    })}\n`;
+}
+/**
+ * Append one custom JSONL entry to the durable principal's session file.
+ * Pi session codec only — AK artifact O_EXCL retention stays in public-cli.
+ * Read is raw JSON.parse (SyntaxError propagates). Sitian full-traversal stays elsewhere.
+ */
+export async function appendPiSessionCustomEntry(authority, principal, customType, data) {
+    const { sessionFile } = authority.decode(principal);
+    const entries = await readStrictPiSessionJsonl(sessionFile);
+    const timestamp = new Date().toISOString();
+    const pointerLine = formatPiSessionCustomEntry({
         customType,
         data,
-        id: randomUUID(),
-        parentId,
+        parentId: piSessionCustomParentId(entries),
         timestamp,
-    })}\n`;
+    });
     await appendFile(sessionFile, pointerLine, "utf8");
     sitianReport({
         level: "event",

package/dist/public-cli/auto-resume.js

@@ -1,27 +1,10 @@
-/**
- * Single generic auto-resume loop for #416 (owner scope = single LLM call).
- * Call-local retries, at most the effective autoResumeLimit times (injected once
- * per call by the caller, #422 — never re-read from disk inside the loop),
- * in-place (same runId/session).
- * Unifies presentation: intermediate attempts use dummyIo, only final Terminal is presented.
- *
- * Owner 2026-08-23: a dispatch that exits by throwing used to bypass the entire
- * retry mechanism (the throw escaped the while-loop before the count check ever
- * ran). Every exception is now retained whole, in place, and the ordinary retry
- * path continues: same budget, same call-local count semantics. No failure-type
- * classification — every thrown value is treated identically.
- */
-import { constants as fsConstants } from "node:fs";
-import { randomUUID } from "node:crypto";
-import { open } from "node:fs/promises";
-import { join } from "node:path";
 import { AUTO_RESUME_LIMIT, describeErrorIdentity, acquireRunWriterLease, markRunTerminal, RunWriterLeaseHeldError, } from "./run-lifecycle.js";
 import { parseAutoResumeLimit } from "./config.js";
 import { processCancelSignalName } from "./process-cancel.js";
 import { isLawfulTypedTerminalOutcome, formatTerminalResult } from "./terminal.js";
-import { attachRecordedSubmissions, ensureRealArtifactsDirectory, presentFailureTerminal, retainPackageFault, } from "./settlement.js";
-export { ensureRealArtifactsDirectory };
+import { attachRecordedSubmissions, presentFailureTerminal, retainPackageFault, } from "./settlement.js";
 import { serializeThrownValue } from "../serialize-thrown-value.js";
+import { reportRunRecord } from "../sitian-facade.js";
 import { errorText } from "../unknown-value.js";
 const dummyIo = { stdout: () => { }, stderr: () => { } };
 /**
@@ -105,41 +88,19 @@ function jsonSafeReplacer() {
     };
 }
 /**
- * Retain one throwing dispatch attempt's complete exception as an independent
- * per-attempt file under the run's artifacts directory, then leave an
- * addressable pointer in the session principal (custom entry). Exclusive-create
- * open (O_EXCL) with a per-attempt unique name enforces 史必追加 (#419): a later
- * attempt can never overwrite an earlier attempt's file.
+ * Retain one throwing dispatch attempt's complete exception as a line in the
+ * run's log.jsonl, then leave an addressable pointer in the session principal
+ * (custom entry). The log only appends (史必追加, #419): a later attempt can
+ * never overwrite an earlier attempt's record.
  */
-/**
- * Hardened create-once JSON write shared by every durable artifact this loop
- * retains directly (dispatch-error dumps, lawful-persist-failure error/
- * evidence records): O_EXCL (fail loud on a colliding name, never overwrite)
- * + O_NOFOLLOW where the platform provides it (a planted symlink is never
- * followed) — mirrors settlement.ts's own hardened artifact writers.
- */
-export async function writeHardenedArtifactFile(artifactsDir, namePrefix, payload) {
-    const filePath = join(artifactsDir, `${namePrefix}-${randomUUID()}.json`);
-    const body = `${JSON.stringify(payload, jsonSafeReplacer(), 2)}\n`;
-    const noFollowFlag = typeof fsConstants.O_NOFOLLOW === "number" ? fsConstants.O_NOFOLLOW : 0;
-    const handle = await open(filePath, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL | noFollowFlag, 0o600);
-    try {
-        await handle.writeFile(body, "utf8");
-    }
-    finally {
-        await handle.close();
-    }
-    return filePath;
-}
 async function retainDispatchError(admitted, principalAuthority, sessionAppender, attempt, error) {
-    const artifactsDir = await ensureRealArtifactsDirectory(admitted.runDirectory);
     // Whole-object dump: everything the thrown value carries, nothing picked.
-    const filePath = await writeHardenedArtifactFile(artifactsDir, `dispatch-error-attempt-${attempt}`, {
+    const filePath = reportRunRecord(admitted.runDirectory, "dispatch-exception", JSON.parse(JSON.stringify({
         version: 1,
         attempt,
         recordedAt: new Date().toISOString(),
         error: serializeThrownValue(error),
-    });
+    }, jsonSafeReplacer())), "auto-resume").recordFile;
     // Addressable pointer in the dossier (卷宗): Pi session custom-entry codec
     // (appendPiSessionCustomEntry). Lease still owned here with run-writer.
     let pointerLease;

package/dist/public-cli/instruction-seat-run.js

@@ -29,11 +29,11 @@ import { packagedAdmitsCountersign, packagedBindsBoardTicket, packagedRebindSour
 import { readAuditorResumeBinding } from "../auditor-soul.js";
 import { CliUsageError } from "./cli-errors.js";
 import { admitPublicRole, bindAdmittedTicketNumber, buildInstructionTransportPrompt, materializeCountersignInvocation, persistAdmittedSourceRunPath, recordAdmittedCorrelation, recordChildDiaristRun, relocateAdmittedRunToTicket, withPreparedAttachments, } from "./invocation.js";
-import { presentControlledFailure, packageFaultNoteFor, prepareSummonsResumeMaterials, roleTurnOptions, runPostAdmissionOneShot, runPostAdmissionResumable, runPostAdmissionSeatResume, showResumeErrorPointer, resumeTurnRequestProjectionOptions, } from "./post-admission.js";
+import { bindDiaristAssertedTicketNumber, presentControlledFailure, packageFaultNoteFor, prepareSummonsResumeMaterials, roleTurnOptions, runPostAdmissionOneShot, runPostAdmissionResumable, runPostAdmissionSeatResume, showResumeErrorPointer, resumeTurnRequestProjectionOptions, } from "./post-admission.js";
 import { presentTerminal } from "./auto-resume.js";
 import { buildAutoResumeContinuationPrompt, loadResumablePublicRole, markRunAdmitted, parentRunPathFromGatePointerInstruction, readCurrentCourt, } from "./run-lifecycle.js";
 import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.js";
-import { presentStructuralRejection, readBoundSessionEntries, attachPostAuditProjection, trySettlePublicSeat, } from "./settlement.js";
+import { presentStructuralRejection, readBoundSessionEntries, attachPostAuditCountersignFact, trySettlePublicSeat, } from "./settlement.js";
 import { warnMissingMethodSkills } from "./machine-method-skills.js";
 import { formatTerminalResult, isLawfulTypedTerminalOutcome, } from "./terminal.js";
 import { admittedSeatTurnDetails, projectRoleTurnRequest, requiredMethodSkills, } from "./turn-request.js";
@@ -184,6 +184,8 @@ function isBoardTicketSeat(seat) {
     return packagedBindsBoardTicket(seat.role);
 }
 async function bindAndRelocateDiarist(admitted, authority, lease) {
+    // The diarist's asserted ticketNumber binds here, in the public call's process.
+    await bindDiaristAssertedTicketNumber(admitted);
     const boardTicket = await readBoardTicketNumber(admitted.runDirectory);
     if (boardTicket === undefined)
         return undefined;
@@ -856,7 +858,7 @@ export async function continueParentAfterChild(parentRunId, child, env, io) {
         if (stopped.exitCode === 0
             && heldUnreadableTerminal(stopped.terminal)
             && stopped.terminal !== undefined) {
-            const parentTerminal = await trySettlePublicSeat(admitted, env.principalAuthority, undefined);
+            const parentTerminal = await trySettlePublicSeat(admitted, env.principalAuthority, { ...await readCurrentCourt(admitted.runDirectory), ...packageFaultScope(admitted, env, io) });
             if (parentTerminal?.roleOutcome.kind === "accepted"
                 || parentTerminal?.roleOutcome.kind === "audit_escalation") {
                 const terminal = await presentUnsettledAudit(parentTerminal, stopped.terminal, io, admitted.runDirectory);
@@ -870,7 +872,7 @@ export async function continueParentAfterChild(parentRunId, child, env, io) {
     }
     if (resolved !== undefined && (resolved.status === "continue" || resolved.status === "converged")) {
         if (AUDITED_ROLES.has(admitted.role) && resolved.status === "converged") {
-            const terminal = await trySettlePublicSeat(admitted, env.principalAuthority, packageFaultScope(admitted, env, io));
+            const terminal = await trySettlePublicSeat(admitted, env.principalAuthority, { ...await readCurrentCourt(admitted.runDirectory), ...packageFaultScope(admitted, env, io) });
             if (terminal?.roleOutcome.kind !== "accepted")
                 throw new Error("pending submission is not recorded");
             return auditSubmittedRole({ exitCode: 0, admitted, terminal }, env, io, resolved.admitted, latestQueuePayload(resolved.terminal));
@@ -1151,11 +1153,11 @@ async function auditSubmittedRole(turn, env, io, resumedOfficer, passedReceipt)
         }
     }
     // The turn already settled this court (payloads, usage, autoResumeCount, history).
-    // Audit only adds gate rounds and, for 中书省, the officer fact. A second
-    // settle would republish the same attempt.
+    // Audit only adds, for 中书省, the officer fact. A second settle would
+    // republish the same attempt.
     if (turn.terminal === undefined)
         throw new Error(`audited ${admitted.role} submission did not settle`);
-    const terminal = await attachPostAuditProjection(admitted, env.principalAuthority, turn.terminal, packageFaultScope(admitted, env, io));
+    const terminal = await attachPostAuditCountersignFact(admitted, env.principalAuthority, turn.terminal, packageFaultScope(admitted, env, io));
     turn = { ...turn, terminal };
     await presentTerminal(terminal, { ...io, omitFailureStderrDiagnostic: true }, admitted.runDirectory);
     return turn;