@akagilnc/pi-workflow-roles 0.1.5714 → 0.1.5753

package/src/judge-role.ts

@@ -13,7 +13,7 @@ export { JUDGE_OUTPUT_TOOL_NAME };
 export type { JudgeVerdict };
 
 /** The only judge audit order: 符宝郎, then 审刑院. */
-const JUDGE_GATES: readonly GatekeeperSubject[] = [
+export const JUDGE_GATES: readonly GatekeeperSubject[] = [
   { kind: "judge_draft" },
   { kind: "judge_compliance" },
 ];

package/src/navigator-public-session.ts

@@ -61,11 +61,18 @@ export function runIdFromNavigatorDirectory(runDirectory: string): string | unde
  * 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> {
+export async function navigatorHostRunResumable(
+  home: string,
+  runId: string,
+  runDirectory?: string,
+): Promise<boolean> {
   const { piDurablePrincipalAuthority } = await import("./pi/durable-principal.ts");
   const { loadResumablePublicRole } = await import("./public-cli/run-lifecycle.ts");
   try {
-    const loaded = await loadResumablePublicRole(home, runId, piDurablePrincipalAuthority);
+    const loaded = await loadResumablePublicRole(
+      home, runId, piDurablePrincipalAuthority,
+      runDirectory === undefined ? undefined : { runDirectory },
+    );
     return isNavigatorSeat(loaded.admitted.role);
   } catch (error) {
     if (error instanceof CliUsageError) return false;
@@ -79,6 +86,7 @@ export type NavigatorPublicSummon = (options: {
   readonly cwd: string;
   readonly home?: string;
   readonly resumeRunId?: string;
+  readonly resumeRunDirectory?: string;
   /** Shared-lifecycle cancel forwarded from HostContext.signal (#675 / #959). */
   readonly signal?: AbortSignal;
   /** #1160 attendance auto byStatus prepare — host mounts structured schema. */
@@ -95,7 +103,7 @@ export function createNativeNavigatorSessionFactory(deps?: {
   /** Test/composition inject — production leaves unset and uses public-role-summons. */
   readonly summonPublicRole?: NavigatorPublicSummon;
   /** Test inject — production uses navigatorHostRunResumable (typed CLI load). */
-  readonly hostRunResumable?: (home: string, runId: string) => Promise<boolean>;
+  readonly hostRunResumable?: (home: string, runId: string, runDirectory?: string) => Promise<boolean>;
 }): NavigatorSessionFactory {
   return async ({ context, tool }) => {
     // Model is enforced at prepare (attendance seat resolve) and at prompt (summon).
@@ -105,8 +113,8 @@ export function createNativeNavigatorSessionFactory(deps?: {
     let noReceipt: Partial<NoReceiptLifecycleFacts> | undefined;
     let routePlaybookReadFailure: string | undefined;
     let disposed = false;
-    /** In-factory host run id for CLI resume within this attendance lifetime. */
-    let hostRunId: string | undefined;
+    /** Existing in-memory host continuity, retaining the directory already selected. */
+    let hostRun: { runId: string; runDirectory: string } | undefined;
 
     const summon: NavigatorPublicSummon = deps?.summonPublicRole
       ?? (async (options) => {
@@ -130,7 +138,7 @@ export function createNativeNavigatorSessionFactory(deps?: {
           // Admission after every await: dispose during preflight must not start summon
           // (ADR 0018 / #959 — legal HostContext may omit signal).
           if (disposed) return;
-          const resumeRunId = hostRunId;
+          const resumeRunId = hostRun?.runId;
 
           // Call contract only: forward shared-lifecycle signal; do not own AbortController here
           // (ADR 0018 / #959 — cancel ownership stays on the attendance/envelope seam).
@@ -153,12 +161,16 @@ export function createNativeNavigatorSessionFactory(deps?: {
             if (disposed) return;
             summoned = await summon(baseSummon);
           } else {
-            const canResume = await resumable(summonHome, resumeRunId);
+            const canResume = await resumable(summonHome, resumeRunId, hostRun?.runDirectory);
             if (disposed) return;
             if (canResume) {
-              summoned = await summon({ ...baseSummon, resumeRunId });
+              summoned = await summon({
+                ...baseSummon,
+                resumeRunId,
+                ...(hostRun === undefined ? {} : { resumeRunDirectory: hostRun.runDirectory }),
+              });
             } else {
-              hostRunId = undefined;
+              hostRun = undefined;
               summoned = await summon(baseSummon);
             }
           }
@@ -217,7 +229,7 @@ export function createNativeNavigatorSessionFactory(deps?: {
             const nextRunId = runIdFromNavigatorDirectory(runDirectory);
             if (nextRunId !== undefined) {
               // In-memory only for this attendance lifetime (#1178) — no side-branch pointer ledger.
-              hostRunId = nextRunId;
+              hostRun = { runId: nextRunId, runDirectory };
             }
           }
 

package/src/notary-contracts.ts

@@ -3,7 +3,7 @@
  * Lawful explicit releases: converged | continue | escalate.
  * No usable result is infrastructure failure via public settlement, not a judgment status (#475).
  */
-import { REVIEW_SUBMISSION_OUTPUT_TOOL_NAME, reviewSubmissionSchema } from "./review-submission.ts";
+import { REVIEW_SUBMISSION_OUTPUT_TOOL_NAME, courtReviewSubmissionSchema } from "./review-submission.ts";
 
 import { isRecord } from "./unknown-value.ts";
 
@@ -25,7 +25,8 @@ export const NOTARY_TICKET_FLAG = {
   },
 } as const;
 
-export const notaryOutputSchema = reviewSubmissionSchema;
+/** #1195: generation-required clauses; package still records missing tables as-is. */
+export const notaryOutputSchema = courtReviewSubmissionSchema;
 
 export type NotarySourceRunLocator = {
   readonly runDirectory: string;

package/src/notary-source-run.ts

@@ -13,7 +13,7 @@ import {
   resolveActivationLedgerHome,
 } from "./activation-ledger-topology.ts";
 import type { NotarySourceRunLocator } from "./notary-contracts.ts";
-import { findRunDirectoryById, readRoleRunIdentity } from "./public-cli/run-lifecycle.ts";
+import { findRunDirectoryById, resolveLiveRunDirectoryPath, readRoleRunIdentity } from "./public-cli/run-lifecycle.ts";
 import { formatRunLeaf, parseRunLeaf } from "./role-run-placement.ts";
 
 async function readRetainedIdentity(runDirectory: string) {
@@ -106,12 +106,7 @@ export async function resolveNotarySourceRunLocator(options: {
       basename(subjectDirectory) === "unbound" &&
       resolve(dirname(subjectDirectory)) === resolve(bookDirectory);
     if (isLegacyUnboundLocator) {
-      candidate = (await findRunDirectoryById(
-        options.home,
-        identity.runId,
-        bookKey,
-        identity.role,
-      )) ?? candidate;
+      candidate = (await resolveLiveRunDirectoryPath(candidate, options.home ?? ledgerHome, bookKey)) ?? candidate;
     }
   }
 

package/src/packaged-role-registry.ts

@@ -315,8 +315,6 @@ export const PUBLIC_ROLE_RECORDS = [
     presentSettled: "always",
     summonResume: false,
     admission: "court-materials",
-    /** Durable custom entry names this officer. */
-    durableOfficerEntry: true,
     sameParent: "none",
     phases: [null],
     outputTool: COUNTERSIGN_OUTPUT_TOOL_NAME,
@@ -342,8 +340,6 @@ export const PUBLIC_ROLE_RECORDS = [
     phases: [null],
     outputTool: SECRETARIAT_OUTPUT_TOOL_NAME,
     settlement: "accepted",
-    /** Project the durable 给事中 officer entry onto the shared accepted-tool settlement. */
-    projectCountersignTerminal: true,
     activationFlags: [
       { field: "ticketNumber" },
     ],
@@ -671,15 +667,6 @@ export function packagedAuditToolName(role: string): string | undefined {
   return record.auditTool;
 }
 
-/** Durable officer entry whose name is the seat role. */
-export function packagedDurableOfficerEntry(officer: unknown): boolean {
-  return typeof officer === "string" && PUBLIC_ROLE_RECORDS.some((record) =>
-    "durableOfficerEntry" in record
-    && record.durableOfficerEntry === true
-    && record.role === officer
-  );
-}
-
 /** Admitted-request role whose navigator subject is the public instruction. */
 export function packagedPublicInstructionSubject(role: unknown): boolean {
   return typeof role === "string" && PUBLIC_ROLE_RECORDS.some((record) =>

package/src/public-cli/cli.ts

@@ -60,6 +60,7 @@ import {
   type NamedRoleTurnHostAdapter,
 } from "./role-turn-host-resolution.ts";
 import {
+  admittedSourceRunPath,
   parseAnalystArgv,
   parsePublicSeatArgv,
   type PublicSeatArgvOwner,
@@ -83,6 +84,7 @@ import { latestPayloadEscalated } from "./countersign-run.ts";
 import { runPublicAnalyst } from "./analyst-run.ts";
 import {
   AUTO_RESUME_LIMIT,
+  findRunDirectoryById,
   peekRoleRunRole,
   type PublicResumeRequest,
 } from "./run-lifecycle.ts";
@@ -1084,7 +1086,7 @@ export async function runAkRole(
 ): Promise<CliResult> {
   const io = env.io ?? defaultIo();
   let resumeFailureContext:
-    | { readonly home: string; readonly runId: string; readonly authority: DurablePrincipalAuthority }
+    | { readonly home: string; readonly runId: string; readonly authority: DurablePrincipalAuthority; readonly runDirectory?: string }
     | undefined;
 
   try {
@@ -1200,14 +1202,19 @@ export async function runAkRole(
     // must still exist. Seat and dispatch follow the durable admitted role.
     // #471: unique parser owns {runId, message?}; five role paths only consume it.
     if (parsed.command === "resume") {
-      const resumeRequest = parseResumeRequest(parsed.args);
+      let resumeRequest = parseResumeRequest(parsed.args);
       resumeFailureContext = {
         home,
         runId: resumeRequest.runId,
         authority: env.principalAuthority ?? piDurablePrincipalAuthority,
       };
+      const runDirectory = await findRunDirectoryById(home, resumeRequest.runId);
+      if (runDirectory !== undefined) {
+        resumeRequest = { ...resumeRequest, runDirectory };
+        resumeFailureContext = { ...resumeFailureContext, runDirectory };
+      }
       const parts = await loadPublicRoleDispatchParts(env, home);
-      const resumeRole = await peekRoleRunRole(home, resumeRequest.runId);
+      const resumeRole = await peekRoleRunRole(home, resumeRequest.runId, resumeRequest);
       // Missing durable role keeps the judge seat table. The resume entry
       // itself is one function; it reads the stored run.
       const seatRole = resumeRole ?? "judge";
@@ -1238,12 +1245,18 @@ export async function runAkRole(
         && !latestPayloadEscalated(current.terminal.roleOutcome)
       ) {
         const parentRunId = current.admitted.correlationId;
+        const parentSource = admittedSourceRunPath(current.admitted);
         resumeFailureContext = {
           home,
           runId: parentRunId,
+          ...(parentSource === undefined ? {} : { runDirectory: parentSource }),
           authority: env.principalAuthority ?? piDurablePrincipalAuthority,
         };
-        const parentRole = await peekRoleRunRole(home, parentRunId);
+        const parentRole = await peekRoleRunRole(
+          home,
+          parentRunId,
+          parentSource === undefined ? undefined : { runDirectory: parentSource },
+        );
         if (parentRole === undefined) break;
         const parentSeat = resolveEffectiveSeat(
           parts.config,
@@ -1309,6 +1322,7 @@ export async function runAkRole(
         resumeFailureContext.authority,
         io,
         error,
+        resumeFailureContext.runDirectory,
       )
     ) {
       return {