@akagilnc/pi-workflow-roles 0.1.5295 → 0.1.5301

package/src/public-cli/instruction-seat-run.ts

@@ -1,8 +1,7 @@
 /**
  * One public role run: admit → turn request → post-admission → settle.
  * Seat differences are composition-root fields. An omitted reviewer lens
- * starts two ordinary single-axis runs here. Countersign keeps deferred
- * identity on this entry; the court diarist station stays in countersign-run.
+ * starts two ordinary single-axis runs here.
  */
 import { dirname, resolve, sep } from "node:path";
 import { AUDITOR_DOSSIER_PROMPT } from "../compliance-transport.ts";
@@ -39,7 +38,6 @@ import { CliUsageError } from "./cli-errors.ts";
 import {
   admitPublicRole,
   bindAdmittedTicketNumber,
-  bindCourtTicketNumbersOnAdmitted,
   buildInstructionTransportPrompt,
   materializeCountersignInvocation,
   persistAdmittedSourceRunPath,
@@ -98,12 +96,11 @@ import {
 import {
   invokeCourtDiarist,
   latestPayloadEscalated,
-  runCountersignCourtDiaristStation,
   type CountersignRunEnv,
 } from "./countersign-run.ts";
 export type InstructionSeatRunEnv = PostAdmissionEnv & Pick<
   CountersignRunEnv,
-  "reviewReask" | "gateReviewInstruction" | "parentRunPath" | "runCourtDiaristStation"
+  "reviewReask" | "gateReviewInstruction" | "parentRunPath"
 >;
 
 type SeatRunResult = {
@@ -460,8 +457,7 @@ async function runOmittedLensBatch(
 
 /**
  * Countersign on the shared entry: gate parent resume, deferred materialization,
- * 起居郎 identity, then the same one-shot settlement as every other seat.
- * Court refresh stays on runCountersignCourtDiaristStation.
+ * then the same one-shot settlement as every other seat.
  */
 async function runCountersignBody(
   parsed: PublicSeatParse,
@@ -516,88 +512,14 @@ async function runCountersignBody(
         });
       };
 
-      let typedTicket: number | undefined;
-      let typedCourtTicketNumbers: readonly number[] | undefined;
-      let identityDiaristRan = false;
-      let childDiaristRunId: string | undefined;
-      let pausedDiaristTerminal: TerminalResult | undefined;
-
-      if (gateParentRunPath === undefined && env.runCourtDiaristStation === undefined) {
-        let outcome: Awaited<ReturnType<typeof invokeCourtDiarist>>;
-        try {
-          outcome = await invokeCourtDiarist({
-            instruction: parsed.instruction ?? "",
-            projectRoot: admitted.projectRoot,
-            failureLabel: "unbound summons",
-            correlationId: admitted.runId,
-            ...(env.boundTicketNumber === undefined ? {} : { boundTicketNumber: env.boundTicketNumber }),
-          }, env, io);
-        } catch (error) {
-          await materializeAdmission(
-            isSafePositiveTicketNumber(env.boundTicketNumber) ? env.boundTicketNumber : undefined,
-          );
-          await markRunAdmitted(admitted, env.principalAuthority);
-          return await presentControlledFailure(admitted, {
-            timedOut: false,
-            code: null,
-            stderr: "",
-            thrown: error,
-          }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
-        }
-        identityDiaristRan = true;
-        if (outcome.identity.kind === "escalate") pausedDiaristTerminal = outcome.terminal;
-        if (outcome.admitted?.runDirectory.includes(`${sep}unbound${sep}runs${sep}`)) {
-          childDiaristRunId = outcome.admitted.runId;
-        }
-        if (outcome.failedWithoutEscalate !== undefined) {
-          const diagnostic = outcome.failedWithoutEscalate.diagnostic;
-          await materializeAdmission(
-            isSafePositiveTicketNumber(env.boundTicketNumber) ? env.boundTicketNumber : undefined,
-          );
-          if (childDiaristRunId !== undefined) await recordChildDiaristRun(admitted, childDiaristRunId);
-          await markRunAdmitted(admitted, env.principalAuthority);
-          return await presentControlledFailure(admitted, {
-            timedOut: false,
-            code: null,
-            stderr: "",
-            thrown: new Error(diagnostic),
-          }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
-        }
-        if (outcome.identity.kind === "ticket") {
-          typedTicket = outcome.identity.ticketNumber;
-          typedCourtTicketNumbers = outcome.identity.courtTicketNumbers;
-        }
-      }
-
-      await materializeAdmission(typedTicket);
+      await materializeAdmission(
+        isSafePositiveTicketNumber(env.boundTicketNumber) ? env.boundTicketNumber : undefined,
+      );
       await markRunAdmitted(admitted, env.principalAuthority);
-      if (childDiaristRunId !== undefined) {
-        await recordChildDiaristRun(admitted, childDiaristRunId);
-      }
-      if (pausedDiaristTerminal !== undefined) {
-        // The child already submitted its own pause; no parent turn exists yet.
-        io.stdout(formatTerminalResult(pausedDiaristTerminal));
-        return { exitCode: 0, admitted, terminal: pausedDiaristTerminal };
-      }
       if (gateParentRunPath !== undefined) {
         await persistAdmittedSourceRunPath(admitted, gateParentRunPath);
         admitted = { ...admitted, sourceRunPath: gateParentRunPath };
       }
-      if (identityDiaristRan && typedTicket !== undefined) {
-        try {
-          await bindAdmittedTicketNumber(admitted, typedTicket);
-          await relocateAdmittedRunToTicket(admitted, env.principalAuthority);
-          await bindCourtTicketNumbersOnAdmitted(admitted, typedCourtTicketNumbers ?? [typedTicket]);
-        } catch (error) {
-          return await presentControlledFailure(admitted, {
-            timedOut: false,
-            code: null,
-            stderr: "",
-            thrown: error,
-          }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
-        }
-      }
-
       const turnProjection: RoleTurnRequestProjectionOptions = {
         packageRoot: env.packageRoot,
         home: env.home,
@@ -630,13 +552,6 @@ async function runCountersignBody(
           ...seatAdapters(admitted, env),
           beforeDispatch: async (admittedSeat, lease) => {
             if (!packagedAdmitsCountersign(admittedSeat.role)) return;
-            if (!identityDiaristRan || typedTicket !== undefined) {
-              const refresh = await runCountersignCourtDiaristStation(admittedSeat, env, io);
-              if (refresh !== undefined) {
-                io.stdout(formatTerminalResult(refresh.terminal));
-                return refresh.terminal;
-              }
-            }
             await relocateAdmittedRunToTicket(admittedSeat, env.principalAuthority, lease);
             Object.assign(turnRequest, buildInstructionSeatTurnRequest(admittedSeat, turnProjection));
           },
@@ -1019,16 +934,6 @@ export async function continueParentAfterChild(
     return runPublicInstructionSeatResume({ runId: parentRunId }, env, io);
   }
   const admitted = loaded.admitted;
-  // Court diarist refresh advances only after a diarist child; gate officers
-  // (notary/auditor/…) resume straight into queueConclusionFromChild (#1057).
-  if (admitted.role === "countersign" && admitted.ticketNumber !== undefined
-    && child.role === "diarist") {
-    const refresh = await runCountersignCourtDiaristStation(admitted, env, io, child.ticketNumber);
-    if (refresh !== undefined) {
-      io.stdout(formatTerminalResult(refresh.terminal));
-      return { exitCode: 0, admitted, terminal: refresh.terminal };
-    }
-  }
   const resolved = await queueConclusionFromChild(child, env, io);
   if (resolved !== undefined && "stop" in resolved) return resolved.stop;
   if (resolved !== undefined && resolved.status === "escalate") {

package/src/public-cli/invocation.ts

@@ -60,7 +60,6 @@ import {
 import {
   loadDoctorCase,
 } from "../doctor-evidence.ts";
-import { projectCourtTicketNumbers } from "../diarist-contracts.ts";
 import type { DoctorCaseIdentity } from "../doctor-contracts.ts";
 import {
   emptyCollectorManifest,
@@ -156,17 +155,6 @@ export type AdmittedJudgeInvocation = AdmittedRoleInvocationBase & {
 
 export type AdmittedCountersignInvocation = AdmittedRoleInvocationBase & {
   readonly role: "countersign";
-  /**
-   * #871 typed co-review set for this countersign run (durable run fact).
-   * Main ticket remains `ticketNumber`; this set drives per-ticket court diarist refresh.
-   * Whole-set replace on new typed submission — never union with history.
-   */
-  courtTicketNumbers?: readonly number[];
-  /**
-   * Load-time durable set damage diagnostic (#871 B7). Resume must settle as
-   * countersign controlled failure with this text — never structural exit 2 or main-only.
-   */
-  courtTicketNumbersDamage?: string;
   /**
    * Parent run directory (#747 / #987 gate same-parent resume). Persisted on first
    * mint when gate supplies parentRunPath; independent of ticket-number lookup.
@@ -338,7 +326,7 @@ export function issueAdmissionPlacement(
     readonly cwd: string;
     readonly runId: string;
     readonly role: AdmittedRoleInvocation["role"];
-    /** Identity already asserted by 起居郎; never derive this from CLI parameters. */
+    /** Typed identity, when supplied; never derive it from CLI prose. */
     readonly subject: RoleRunSubject;
     readonly home?: string;
     /** Placement may be computed before a same-ticket lookup without touching disk. */
@@ -594,56 +582,6 @@ export async function recordAdmittedCorrelation(
   mutable.correlationIds = correlationIds;
 }
 
-/**
- * #871: persist the typed co-review set as a countersign run fact (admitted-request +
- * invocation.json). Whole-set replace — never union with a prior set. Main ticket
- * binding stays on `ticketNumber` alone. Projection reuses the sole contract helper;
- * principal membership is mandatory.
- */
-export async function bindCourtTicketNumbersOnAdmitted(
-  admitted: AdmittedCountersignInvocation,
-  courtTicketNumbers: readonly number[],
-): Promise<void> {
-  if (admitted.ticketNumber === undefined) {
-    throw new Error(
-      "bindCourtTicketNumbersOnAdmitted requires a bound principal ticketNumber",
-    );
-  }
-  const principal = requireSafePositiveTicketNumber(
-    admitted.ticketNumber,
-    "bindCourtTicketNumbersOnAdmitted principal ticketNumber",
-  );
-  // Strict write path: every member must already be a lawful number (no soft filter).
-  for (const item of courtTicketNumbers) {
-    if (!isSafePositiveTicketNumber(item)) {
-      throw new Error(
-        `bindCourtTicketNumbersOnAdmitted requires safe positive integers, got ${String(item)}`,
-      );
-    }
-  }
-  const projected = projectCourtTicketNumbers(courtTicketNumbers, {
-    principalTicket: principal,
-  });
-  if (projected === null || projected.length === 0) {
-    throw new Error("bindCourtTicketNumbersOnAdmitted requires a non-empty ticket set");
-  }
-  const frozen = Object.freeze([...projected]);
-  const admittedPath = admitted.admittedRequestPath;
-  const current = JSON.parse(await readFile(admittedPath, "utf8")) as Record<
-    string,
-    unknown
-  >;
-  await writeFile(
-    admittedPath,
-    `${JSON.stringify({ ...current, courtTicketNumbers: frozen }, null, 2)}\n`,
-    "utf8",
-  );
-  await mergeInvocationIdentityPage(admitted.runDirectory, {
-    courtTicketNumbers: frozen,
-  });
-  admitted.courtTicketNumbers = frozen;
-}
-
 /** File a role run under its latest typed ticket identity. */
 export async function relocateAdmittedRunToTicket(
   admitted: AdmittedRoleInvocation,
@@ -1904,7 +1842,7 @@ export type AdmitJudgeInvocationOptions = {
 
 export type AdmitInspectorInvocationOptions = AdmitJudgeInvocationOptions & {
   correlationId?: string;
-  /** Typed identity handed off by 起居郎 or inherited from an already-bound run. */
+  /** Typed identity from the caller or an already-bound run. */
   assertedTicketNumber?: number;
 };
 

package/src/public-cli/post-admission.ts

@@ -211,15 +211,6 @@ async function settleProcessCancelAfterTurn<A extends AdmittedRoleInvocation, T
   };
 }
 
-/**
- * Nested station-child role already finished its own call-local loop.
- * Parent records that failure once and must not auto-resume into a re-summon
- * (#840 父子不层叠). Other beforeDispatch failures keep the shared #416 budget.
- */
-export class StationChildExhaustedError extends Error {
-  override readonly name = "StationChildExhaustedError";
-}
-
 function withOnceSuccessfulBeforeDispatch<
   A extends AdmittedRoleInvocation,
   T extends TerminalResult = TerminalResult,
@@ -825,16 +816,12 @@ export async function dispatchPostAdmissionTurn<
           io,
           persistRunState,
         )) as { exitCode: number; admitted: A; terminal: T };
-        if (error instanceof StationChildExhaustedError) {
-          return { ...settled, skipAutoResume: true as const, ...deferredPersist };
-        }
         return { ...settled, ...deferredPersist };
       }
     }
 
-    // Turn request is assembled after beforeDispatch so this turn sees whatever it
-    // settled — the seat's ticket bind re-projection and any court diarist station
-    // writes (#742). Dialogue continuation stays caller/peer opaque. #1092: no
+    // Turn request is assembled after beforeDispatch so this turn sees any
+    // seat-specific admission changes. Dialogue continuation stays caller/peer opaque. #1092: no
     // code-side 起居录 path freeze or readingMaterial inject — roles read by ticket.
     // No package-resume parallel face or typed resume identity.
     // #990: one-shot / auto-resume may freeze principal+runDirectory before

package/src/public-cli/run-lifecycle.ts

@@ -31,10 +31,6 @@ export {
 import type { FixerPhase } from "../package-contracts/fixer-output.ts";
 import type { FixerPrerequisite } from "../package-contracts/fixer-packet.ts";
 import { parseCollectorRepository } from "../collector-config.ts";
-import {
-  interpretDurableCourtTicketNumbers,
-  sameCourtTicketNumbers,
-} from "../diarist-contracts.ts";
 import type { DoctorCaseIdentity } from "../doctor-contracts.ts";
 import type { NotarySourceRunLocator } from "../notary-contracts.ts";
 import {
@@ -1177,13 +1173,6 @@ type LoadedAdmittedRequestFields = {
   readonly derived?: DerivedMergerEnvelope;
   readonly correlationId?: string;
   readonly ticketNumber?: number;
-  /** #871 typed co-review set restored on countersign resume. */
-  readonly courtTicketNumbers?: readonly number[];
-  /**
-   * #871 durable set present-but-damaged diagnostic. Countersign resume settles
-   * controlled failure with this text; not a structural usage rejection.
-   */
-  readonly courtTicketNumbersDamage?: string;
   /** Collector — admitted repository/PR identity restored on resume (#633). */
   readonly prNumber?: number;
   readonly repository?: string;
@@ -1223,90 +1212,13 @@ function parsePersistedTicketIdentity(
   };
 }
 
-/**
- * #871 durable set from one run page.
- * Absent → absent. Present damage keeps the original reason (no throw here).
- */
-function readDurableCourtTicketNumbersPage(
-  record: Record<string, unknown>,
-  principalTicket: number | undefined,
-  pageLabel: string,
-):
-  | { readonly kind: "absent" }
-  | { readonly kind: "ok"; readonly tickets: readonly number[] }
-  | { readonly kind: "damage"; readonly reason: string } {
-  const interpreted = interpretDurableCourtTicketNumbers(record, {
-    ...(principalTicket === undefined ? {} : { principalTicket }),
-  });
-  if (interpreted.kind === "damage") {
-    return {
-      kind: "damage",
-      reason: `role run ${pageLabel} courtTicketNumbers is damaged: ${interpreted.reason}`,
-    };
-  }
-  if (interpreted.kind === "ok") {
-    return { kind: "ok", tickets: interpreted.tickets };
-  }
-  return { kind: "absent" };
-}
-
-/**
- * Merge admitted + invocation #871 sets.
- * Both present must match; one present wins; both absent stays legacy.
- * Damage / cross-page mismatch return a diagnostic — countersign resume settles
- * controlled failure; load itself does not structural-reject.
- */
-function mergeDurableCourtTicketNumbers(input: {
-  readonly admittedRecord: Record<string, unknown> | undefined;
-  readonly invocationRecord: Record<string, unknown> | undefined;
-  readonly principalTicket: number | undefined;
-}):
-  | { readonly kind: "ok"; readonly tickets?: readonly number[] }
-  | { readonly kind: "damage"; readonly reason: string } {
-  const fromAdmitted =
-    input.admittedRecord === undefined
-      ? ({ kind: "absent" } as const)
-      : readDurableCourtTicketNumbersPage(
-          input.admittedRecord,
-          input.principalTicket,
-          "admitted-request",
-        );
-  const fromInvocation =
-    input.invocationRecord === undefined
-      ? ({ kind: "absent" } as const)
-      : readDurableCourtTicketNumbersPage(
-          input.invocationRecord,
-          input.principalTicket,
-          "invocation",
-        );
-  if (fromAdmitted.kind === "damage") return fromAdmitted;
-  if (fromInvocation.kind === "damage") return fromInvocation;
-  if (fromAdmitted.kind === "ok" && fromInvocation.kind === "ok") {
-    if (!sameCourtTicketNumbers(fromAdmitted.tickets, fromInvocation.tickets)) {
-      return {
-        kind: "damage",
-        reason:
-          "role run courtTicketNumbers differs between admitted-request and invocation",
-      };
-    }
-    return { kind: "ok", tickets: fromAdmitted.tickets };
-  }
-  if (fromAdmitted.kind === "ok") return { kind: "ok", tickets: fromAdmitted.tickets };
-  if (fromInvocation.kind === "ok") return { kind: "ok", tickets: fromInvocation.tickets };
-  return { kind: "ok" };
-}
-
 function restoredTicketFields(fields: LoadedAdmittedRequestFields): {
   correlationId?: string;
   ticketNumber?: number;
-  courtTicketNumbers?: readonly number[];
 } {
   return {
     ...(fields.correlationId === undefined ? {} : { correlationId: fields.correlationId }),
     ...(fields.ticketNumber === undefined ? {} : { ticketNumber: fields.ticketNumber }),
-    ...(fields.courtTicketNumbers === undefined
-      ? {}
-      : { courtTicketNumbers: fields.courtTicketNumbers }),
   };
 }
 
@@ -1352,10 +1264,6 @@ async function loadResumableRunRecord(
   let derived: DerivedMergerEnvelope | undefined;
   let correlationId: string | undefined;
   let ticketNumber: number | undefined;
-  let courtTicketNumbers: readonly number[] | undefined;
-  let courtTicketNumbersDamage: string | undefined;
-  let admittedIdentityRecord: Record<string, unknown> | undefined;
-  let invocationIdentityRecord: Record<string, unknown> | undefined;
   let prNumber: number | undefined;
   let repository: string | undefined;
   let repositoryDisplay: string | undefined;
@@ -1525,7 +1433,6 @@ async function loadResumableRunRecord(
           };
         }
       }
-      admittedIdentityRecord = record;
       const fromAdmitted = parsePersistedTicketIdentity(record);
       correlationId = fromAdmitted.correlationId;
       ticketNumber = fromAdmitted.ticketNumber;
@@ -1549,7 +1456,6 @@ async function loadResumableRunRecord(
       !Array.isArray(invocationRaw)
     ) {
       const rec = invocationRaw as Record<string, unknown>;
-      invocationIdentityRecord = rec;
       if (typeof rec.provider === "string" && typeof rec.model === "string") {
         model = {
           provider: rec.provider,
@@ -1584,19 +1490,6 @@ async function loadResumableRunRecord(
       );
     }
   }
-  // #871: resolve set after main ticket so principal membership can be checked.
-  // Present-but-damaged / cross-page mismatch keep diagnostic for countersign
-  // controlled-failure; both-absent stays legacy; single lawful page restores.
-  const mergedSet = mergeDurableCourtTicketNumbers({
-    admittedRecord: admittedIdentityRecord,
-    invocationRecord: invocationIdentityRecord,
-    principalTicket: ticketNumber,
-  });
-  if (mergedSet.kind === "damage") {
-    courtTicketNumbersDamage = mergedSet.reason;
-  } else if (mergedSet.tickets !== undefined) {
-    courtTicketNumbers = mergedSet.tickets;
-  }
   const sourceRunLeaf = basename(sourceRunPath ?? "").split("@");
   const referencedRunId = sourceRun?.runId ?? sourceRunLeaf[0];
   const referencedRole = sourceRun?.role ?? sourceRunLeaf[1];
@@ -1634,10 +1527,6 @@ async function loadResumableRunRecord(
       ...(derived === undefined ? {} : { derived }),
       ...(correlationId === undefined ? {} : { correlationId }),
       ...(ticketNumber === undefined ? {} : { ticketNumber }),
-      ...(courtTicketNumbers === undefined ? {} : { courtTicketNumbers }),
-      ...(courtTicketNumbersDamage === undefined
-        ? {}
-        : { courtTicketNumbersDamage }),
       ...(prNumber === undefined ? {} : { prNumber }),
       ...(repository === undefined ? {} : { repository }),
       ...(repositoryDisplay === undefined ? {} : { repositoryDisplay }),
@@ -1782,12 +1671,6 @@ function admitResumedRole(loaded: {
       const admitted: AdmittedCountersignInvocation = {
         role: "countersign",
         ...base,
-        ...(base.courtTicketNumbers === undefined
-          ? {}
-          : { courtTicketNumbers: base.courtTicketNumbers }),
-        ...(fields.courtTicketNumbersDamage === undefined
-          ? {}
-          : { courtTicketNumbersDamage: fields.courtTicketNumbersDamage }),
       };
       return admitted;
     }

package/src/public-role-summons.ts

@@ -421,8 +421,8 @@ export async function summonPublicRole(
           // Nested court stations keep station-child semantics; dual-lens
           // ordinary Reviewer axes opt out (#946 / ADR 0082).
           ...(options.stationChild === false ? {} : { stationChild: true }),
-          // Forward composition-root adapters so nested court stations (e.g.
-          // countersign → diarist) select the same faux/production table (#924).
+          // Forward composition-root adapters so nested stations (e.g.
+          // secretariat → diarist) select the same faux/production table (#924).
           ...(options.hostAdapters === undefined
             ? {}
             : { hostAdapters: options.hostAdapters }),
@@ -535,7 +535,7 @@ export async function summonPublicRole(
   }
 
   const stderr = captured?.stderrText();
-  // An escalated officer can return its court diarist's escalation verbatim.
+  // Secretariat can return its preliminary diarist's escalation verbatim.
   // The terminal's independent run, not the officer, is the gate pointer.
   const runDirectory = result.terminal !== undefined
     && result.terminal.roleOutcome.role !== options.role