@akagilnc/pi-workflow-roles 0.1.5289 → 0.1.5301

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

package/src/role-runtime.ts

@@ -73,6 +73,7 @@ import {
 import { SECRETARIAT_OUTPUT_TOOL_NAME } from "./secretariat-contracts.ts";
 import {
   projectDiaristSessions,
+  projectDiaristTicketSessions,
 } from "./diarist-contracts.ts";
 import { commitDiaristProjection } from "./diarist.ts";
 import { TicketProvenanceInputError } from "./ticket-provenance.ts";
@@ -834,7 +835,7 @@ function readDiaristRunCoordinates(ctx: HostContext): {
 
 /** Plain-language re-ask when diarist bounds cannot be used (#901 / reask-not-explode). */
 const DIARIST_BOUNDS_REASK =
-  "边界无法使用。请重交 sessions：每卷 path + ranges，每端以原生 id 或本轮行号二选一指名。" as const;
+  "边界无法使用。多票请逐票重交 ticketSessions，单票重交 sessions；每卷 path + ranges，每端以原生 id 或本轮行号二选一指名。" as const;
 /**
  * #708 / #779 / #901: 起居郎 public seat on the shared filed-officer envelope.
  * LLM judges ticket + dialogue bounds; mechanical layer reprojects the unique
@@ -870,18 +871,23 @@ export function createDiaristRoleRuntime(
             await bindTicketNumberOnRunDirectory(coords.runDirectory, ticketNumber);
           }
         }
-        const sessions = projectDiaristSessions(parameters);
-        if (sessions === undefined) {
+        const singleSessions = submitted && !Object.hasOwn(submitted, "ticketSessions")
+          ? projectDiaristSessions(parameters)
+          : undefined;
+        const ticketSessions = submitted && Object.hasOwn(submitted, "ticketSessions")
+          ? projectDiaristTicketSessions(submitted)
+          : singleSessions === undefined
+            ? undefined
+            : [{ ticketNumber: ticketNumber ?? null, sessions: singleSessions }];
+        if (ticketSessions === undefined) {
           throw new ParentQueueReaskError(DIARIST_BOUNDS_REASK);
         }
-        let facts;
         try {
-          facts = await commitDiaristProjection({
-            ticketNumber: ticketNumber ?? null,
+          await commitDiaristProjection({
             cwd: coords.projectRoot,
             home: coords.home,
             runDirectory: coords.runDirectory,
-            sessions,
+            tickets: ticketSessions,
           });
         } catch (error) {
           // Bound/session input failures → reask via typed identity (not message prefix).

package/src/ticket-provenance.ts

@@ -162,11 +162,6 @@ export async function rehomeUnboundTicketProvenance(
   await unlink(source);
 }
 
-export type ReprojectTicketProvenanceResult = {
-  readonly recordFile: string;
-  readonly lines: readonly TicketProvenanceLine[];
-};
-
 /**
  * Resolve a bound endpoint against this round's session lines.
  * id → first physical line carrying that native id; line → that 1-based line.
@@ -327,53 +322,45 @@ async function projectSessionRanges(input: {
 }
 
 /**
- * Append dialogue projection from LLM-submitted bounds into records.jsonl.
+ * Project every submitted boundary before appending any ticket's record.
  * #1090: 纯追加——不回读已成录历史查重、不折叠、不刷新；同一区间再次提交也留下新的追加记录。
  * 证不出的 body 原字节原样留卷。
  */
-export async function reprojectTicketProvenance(input: {
-  readonly ticketNumber: number | null;
+export async function reprojectTicketProvenanceBatch(input: {
   readonly cwd: string;
   readonly home?: string;
   readonly runDirectory?: string;
-  readonly sessions: readonly TicketProvenanceSession[];
-}): Promise<ReprojectTicketProvenanceResult> {
-  const recordInput = ticketProvenanceRecordInput(
-    input.ticketNumber,
-    input.cwd,
-    input.home,
-    input.runDirectory,
-  );
-  const resolved = resolveSitianRecordPath(recordInput);
-  if (input.sessions.length === 0) {
-    return {
-      recordFile: resolved.recordFile,
-      lines: [],
-    };
+  readonly tickets: readonly {
+    readonly ticketNumber: number | null;
+    readonly sessions: readonly TicketProvenanceSession[];
+  }[];
+}): Promise<void> {
+  const projections = [];
+  for (const ticket of input.tickets) {
+    const recordInput = ticketProvenanceRecordInput(
+      ticket.ticketNumber, input.cwd, input.home, input.runDirectory,
+    );
+    const entries: (TicketProvenanceLine | TicketProvenanceRaw)[] = [];
+    for (let s = 0; s < ticket.sessions.length; s += 1) {
+      const projected = await projectSessionRanges({
+        s,
+        session: ticket.sessions[s]!,
+        ...(input.home === undefined ? {} : { home: input.home }),
+      });
+      entries.push(...projected.entries);
+    }
+    projections.push({ ticket, recordInput, entries });
   }
 
-  const entries: (TicketProvenanceLine | TicketProvenanceRaw)[] = [];
-  for (let s = 0; s < input.sessions.length; s += 1) {
-    const session = input.sessions[s]!;
-    const projected = await projectSessionRanges({
-      s,
-      session,
-      ...(input.home === undefined ? {} : { home: input.home }),
+  for (const { ticket, recordInput, entries } of projections) {
+    if (ticket.sessions.length === 0) continue;
+    appendSitianRecord({
+      ...recordInput,
+      payload: {
+        type: "ticket-provenance-append",
+        sessions: ticket.sessions,
+        lines: entries,
+      },
     });
-    entries.push(...projected.entries);
   }
-
-  const pointer = appendSitianRecord({
-    ...recordInput,
-    payload: {
-      type: "ticket-provenance-append",
-      sessions: input.sessions,
-      lines: entries,
-    },
-  });
-
-  return {
-    recordFile: pointer.recordFile,
-    lines: entries.filter((entry): entry is TicketProvenanceLine => "speaker" in entry),
-  };
 }