@akagilnc/pi-workflow-roles 0.1.4321 → 0.1.4387

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

@@ -105,7 +105,7 @@ export function buildCountersignTurnRequest(
 }
 
 /** 起居郎 identity outcome — escalate stays distinct from missing terminal. */
-type CourtDiaristIdentity =
+export type CourtDiaristIdentity =
   | {
       readonly kind: "ticket";
       readonly ticketNumber: number;
@@ -119,11 +119,23 @@ type CourtDiaristIdentity =
   | { readonly kind: "unbound" }
   | { readonly kind: "escalate" };
 
-type CourtDiaristInvocationResult = {
+export type CourtDiaristInvocationResult = {
   readonly identity: CourtDiaristIdentity;
   readonly failedWithoutEscalate?: { readonly diagnostic: string };
 };
 
+/** Env slice shared by court diarist identity summons (countersign / secretariat). */
+export type CourtDiaristSummonEnv = Pick<
+  CountersignRunEnv,
+  | "cwd"
+  | "home"
+  | "agentDir"
+  | "packageRoot"
+  | "credentials"
+  | "signal"
+  | "hostAdapters"
+>;
+
 /**
  * Read #871 set from preserved diarist payloads.
  * - Field absent / null / non-array → undefined (no new set; resume keeps store).
@@ -191,13 +203,16 @@ function courtDiaristEscalated(roleOutcome: TerminalRoleOutcome | undefined): bo
  * When `boundTicketNumber` is set (typed handoff from countersign), diarist
  * binds under that key before the turn — never mechanical recognition from prose.
  */
-async function invokeCourtDiarist(input: {
+export async function invokeCourtDiarist(input: {
   readonly instruction: string;
   readonly projectRoot: string;
   readonly failureLabel: string;
+  readonly attachmentPaths?: readonly string[];
+  /** Direct parent run id for durable child lineage (ADR 0010). */
+  readonly correlationId?: string;
   /** Already-verified typed key from countersign (refresh / post-assert handoff). */
   readonly boundTicketNumber?: number;
-}, env: CountersignRunEnv, io: CliIo): Promise<CourtDiaristInvocationResult> {
+}, env: CourtDiaristSummonEnv, io: CliIo): Promise<CourtDiaristInvocationResult> {
   // Quiet face: the countersign caller must not see diarist CLI chatter.
   const quietIo: CliIo = {
     stdout() {},
@@ -210,7 +225,13 @@ async function invokeCourtDiarist(input: {
   const { summonPublicRole } = await import("../public-role-summons.ts");
   const result = await summonPublicRole({
     role: "diarist",
-    argv: ["--project", input.projectRoot, input.instruction],
+    argv: [
+      "--project",
+      input.projectRoot,
+      ...(input.attachmentPaths ?? []).flatMap((path) => ["--attach", path]),
+      "--",
+      input.instruction,
+    ],
     cwd: env.cwd,
     home: env.home,
     agentDir: env.agentDir,
@@ -218,6 +239,7 @@ async function invokeCourtDiarist(input: {
     io: quietIo,
     ...(env.credentials === undefined ? {} : { credentials: env.credentials }),
     ...(env.signal === undefined ? {} : { signal: env.signal }),
+    ...(input.correlationId === undefined ? {} : { correlationId: input.correlationId }),
     ...(input.boundTicketNumber === undefined
       ? {}
       : { boundTicketNumber: input.boundTicketNumber }),
@@ -312,6 +334,7 @@ export async function runCountersignCourtDiaristStation(
         instruction: `整理 #${ticketNumber} 的本案依据。`,
         projectRoot: admitted.projectRoot,
         failureLabel: `ticket #${ticketNumber}`,
+        correlationId: admitted.runId,
         // Refresh holds a typed key — hand it off so identity is bound before turn.
         boundTicketNumber: ticketNumber,
       },
@@ -391,6 +414,7 @@ export async function runPublicCountersign(
         instruction: parsed.instruction,
         projectRoot: admitted.projectRoot,
         failureLabel: "unbound summons",
+        correlationId: admitted.runId,
       },
       env,
       io,

package/src/public-cli/invocation.ts

@@ -179,6 +179,10 @@ export type AdmittedDiaristInvocation = AdmittedRoleInvocationBase & {
   readonly role: "diarist";
 };
 
+export type AdmittedSecretariatInvocation = AdmittedRoleInvocationBase & {
+  readonly role: "secretariat";
+};
+
 export type CoderPhase = "plan" | "apply";
 
 export type AdmittedCoderInvocation = AdmittedRoleInvocationBase & {
@@ -266,6 +270,7 @@ export type AdmittedRoleInvocation =
   | AdmittedNavigatorInvocation
   | AdmittedAuditorInvocation
   | AdmittedDiaristInvocation
+  | AdmittedSecretariatInvocation
   | AdmittedCoderInvocation
   | AdmittedFixerInvocation
   | AdmittedCollectorInvocation
@@ -769,7 +774,7 @@ export function parsePositiveTicketNumber(
 /** 共享解析体：同形 owner 的 argv → instruction/attachments/project。 */
 function parseInstructionArgv(
   args: readonly string[],
-  owner: "judge" | "countersign" | "inspector" | "gatekeeper" | "navigator" | "auditor" | "diarist",
+  owner: "judge" | "countersign" | "inspector" | "gatekeeper" | "navigator" | "auditor" | "diarist" | "secretariat",
 ): ParseInstructionArgvResult {
   const attachmentPaths: string[] = [];
   let project: string | undefined;
@@ -1033,6 +1038,12 @@ export function parseDiaristArgv(args: readonly string[]): ParseDiaristArgvResul
   return parseInstructionArgv(args, "diarist");
 }
 
+export type ParseSecretariatArgvResult = ParseInstructionArgvResult;
+
+export function parseSecretariatArgv(args: readonly string[]): ParseSecretariatArgvResult {
+  return parseInstructionArgv(args, "secretariat");
+}
+
 /**
  * Parse Coder-specific argv after the `coder` token.
  * Phase defaults to apply; spellings from PUBLIC_OPTION_TABLE.coder (#342).
@@ -1241,6 +1252,7 @@ export type AdmitInspectorInvocationOptions = AdmitJudgeInvocationOptions & {
 export type AdmitGatekeeperInvocationOptions = AdmitInspectorInvocationOptions;
 export type AdmitNavigatorInvocationOptions = AdmitInspectorInvocationOptions;
 export type AdmitDiaristInvocationOptions = AdmitInspectorInvocationOptions;
+export type AdmitSecretariatInvocationOptions = AdmitInspectorInvocationOptions;
 
 /**
  * Shared instruction-seat admission for Judge and Inspector: project check,
@@ -1249,7 +1261,7 @@ export type AdmitDiaristInvocationOptions = AdmitInspectorInvocationOptions;
  * Ticket binding is post-admission via shared seat LLM path (#635).
  */
 async function admitStandardMaterialInvocation<
-  R extends "judge" | "inspector" | "gatekeeper" | "navigator" | "auditor" | "diarist",
+  R extends "judge" | "inspector" | "gatekeeper" | "navigator" | "auditor" | "diarist" | "secretariat",
 >(
   role: R,
   options: AdmitInspectorInvocationOptions,
@@ -1393,6 +1405,13 @@ export async function admitDiaristInvocation(
   return admitStandardMaterialInvocation("diarist", options);
 }
 
+/** Admit a public Secretariat (中书省) run (#924). */
+export async function admitSecretariatInvocation(
+  options: AdmitSecretariatInvocationOptions,
+): Promise<AdmittedSecretariatInvocation> {
+  return admitStandardMaterialInvocation("secretariat", options);
+}
+
 /** Shared prompt transport for instruction-seat roles (judge/countersign/inspector). */
 export function buildInstructionTransportPrompt(
   admitted: { instruction: string; instructionEmpty: boolean; attachments: readonly { frozenPath: string }[] },
@@ -1417,6 +1436,13 @@ export function buildJudgeTransportPrompt(
   return buildInstructionTransportPrompt(admitted, engineMaterial);
 }
 
+export function buildSecretariatTransportPrompt(
+  admitted: AdmittedSecretariatInvocation,
+  engineMaterial?: EngineSessionMaterial,
+): string {
+  return buildInstructionTransportPrompt(admitted, engineMaterial);
+}
+
 export function buildInspectorTransportPrompt(
   admitted: AdmittedInspectorInvocation,
   engineMaterial?: EngineSessionMaterial,

package/src/public-cli/option-definitions.ts

@@ -36,6 +36,7 @@ export type OptionOwner =
   | "navigator"
   | "auditor"
   | "diarist"
+  | "secretariat"
   | "analyst";
 
 /**
@@ -467,6 +468,11 @@ const DIARIST_OPTIONS = [
   bindOwner("diarist", SHARED_ATTACH_SEMANTICS),
 ] as const satisfies readonly PublicOptionDefinition[];
 
+const SECRETARIAT_OPTIONS = [
+  bindOwner("secretariat", SHARED_PROJECT_SEMANTICS),
+  bindOwner("secretariat", SHARED_ATTACH_SEMANTICS),
+] as const satisfies readonly PublicOptionDefinition[];
+
 const CODER_OPTIONS = [
   {
     id: "phase",
@@ -841,6 +847,7 @@ export const PUBLIC_OPTION_TABLE = {
   navigator: NAVIGATOR_OPTIONS,
   auditor: AUDITOR_OPTIONS,
   diarist: DIARIST_OPTIONS,
+  secretariat: SECRETARIAT_OPTIONS,
   analyst: ANALYST_OPTIONS,
 } as const satisfies Record<OptionOwner, readonly PublicOptionDefinition[]>;
 
@@ -863,6 +870,7 @@ export const PUBLIC_ROLE_OPTION_OWNERS = [
   "navigator",
   "auditor",
   "diarist",
+  "secretariat",
   "analyst",
 ] as const satisfies readonly PublicRoleOptionOwner[];
 
@@ -1280,6 +1288,15 @@ const ROLE_COMMAND_HELP = {
       'ak-role diarist --attach ./design.md "补录本轮设计修订。"',
     ],
   },
+  secretariat: {
+    command: "secretariat",
+    summary:
+      "Secretariat (中书省): rewrite ticket per 票面法 and drive countersign to converged or escalate.",
+    usage: ["ak-role secretariat [options] [instruction]"],
+    examples: [
+      'ak-role secretariat "整理 #924 票面并送庭。"',
+    ],
+  },
   notary: {
     command: "notary",
     summary: "Direct Notary document check (quote fidelity + ticket alignment); zero prompt/attachment.",

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

@@ -18,9 +18,11 @@ import {
 import { CliUsageError } from "./cli-errors.ts";
 import type { RoleTurnRequestProjectionOptions } from "./turn-request.ts";
 import {
+  bindAdmittedTicketNumber,
   buildInstructionTransportPrompt,
   freezeAttachmentsIntoRun,
 } from "./invocation.ts";
+import { readRecordedSubmissionRows } from "../submission-ledger.ts";
 import { pathContainedIn } from "../activation-ledger-topology.ts";
 import { pickEngineAxis } from "../package-resources/engine-material.ts";
 import { resolveHostAwareSessionAvailability } from "../session-identity.ts";
@@ -29,7 +31,6 @@ import type {
   ControlledFailureCause,
   DurablePrincipal,
   DurablePrincipalAuthority,
-  RoleTurnContinuation,
   RoleTurnHost,
   RoleTurnKnownFailure,
   RoleTurnRequest,
@@ -37,10 +38,7 @@ import type {
   SessionCustomEntryAppender,
 } from "../host-contracts.ts";
 import { isOfficerReviewSeat } from "../host-contracts.ts";
-import {
-  deliverCaseDossierAsAttachment,
-  projectCaseDossierPointerSection,
-} from "./case-dossier-delivery.ts";
+import { deliverCaseDossierAsAttachment } from "./case-dossier-delivery.ts";
 
 /** Original error bytes, never relabeled — a secondary fact riding beside a classified cause. */
 function describeCaughtError(error: unknown): { name?: string; message: string; code?: string | number } {
@@ -51,17 +49,6 @@ function describeCaughtError(error: unknown): { name?: string; message: string;
   return { message: String(error) };
 }
 
-/** Append one system section to a continuation prompt, keeping its kind. */
-function appendContinuationSection(
-  continuation: RoleTurnContinuation,
-  section: string,
-): RoleTurnContinuation {
-  const prompt = `${continuation.prompt}\n\n${section}`;
-  return continuation.kind === "initial"
-    ? { kind: "initial", prompt }
-    : { kind: "resume", prompt };
-}
-
 /**
  * Nested gate summons (station child) on an officer seat: dialogue content is
  * peer words only (#879). ADR 0081 case dossier still hangs via the existing
@@ -592,10 +579,32 @@ export async function dispatchPostAdmissionTurn<
    */
   let afterDispatchApplied = false;
   const finishAfterTurn = async (result: DispatchOutcome): Promise<DispatchOutcome> => {
-    if (adapters.afterDispatch === undefined || afterDispatchApplied) return result;
+    if (afterDispatchApplied) return result;
     afterDispatchApplied = true;
     try {
-      await adapters.afterDispatch(admitted, lease);
+      // #858: an unbound seat may assert its ticket on the existing receipt.
+      // Read the original accepted payload; do not rewrite it, infer from prose,
+      // or reject missing/malformed declarations. An existing binding wins.
+      if (admitted.ticketNumber === undefined) {
+        const rows = await readRecordedSubmissionRows(
+          admitted.projectRoot,
+          admitted.runId,
+          { home: homeFromRunDirectory(admitted.runDirectory), sessionParent: join(admitted.runDirectory, "session", "session.jsonl") },
+        );
+        const asserted = rows
+          .filter((row) => row.kind === "accepted" && row.role === admitted.role)
+          .map((row) => row.accepted)
+          .find((payload) => {
+            if (payload === null || typeof payload !== "object" || Array.isArray(payload)) return false;
+            const value = (payload as { ticketNumber?: unknown }).ticketNumber;
+            return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
+          });
+        const ticketNumber = asserted === undefined
+          ? undefined
+          : (asserted as { ticketNumber: number }).ticketNumber;
+        if (ticketNumber !== undefined) await bindAdmittedTicketNumber(admitted, ticketNumber);
+      }
+      if (adapters.afterDispatch !== undefined) await adapters.afterDispatch(admitted, lease);
       return result;
     } catch (error) {
       const primaryFailure =
@@ -728,10 +737,11 @@ export async function dispatchPostAdmissionTurn<
 
     // 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). Case dossier delivery (ADR 0081 / #709) rides here once for
-    // every public entry. #879: station-child officer dialogue keeps peer body
-    // intact — 起居录 hangs via existing attachments freeze (not prompt wrap,
-    // not RoleTurnRequest.materials). Other entries keep the neutral prompt section.
+    // writes (#742). Case dossier delivery (ADR 0081 / #709 / #858) rides here once
+    // for every public entry on the existing attachments → readingMaterial face
+    // (station-child and ordinary share one seam). Dialogue continuation stays
+    // caller/peer opaque — never splice system path sections into user dialogue.
+    // No package-resume parallel face or typed resume identity.
     let turnRequest: RoleTurnRequest =
       env.signal === undefined ? request : { ...request, signal: env.signal };
     if (env.stationChild !== undefined) {
@@ -745,34 +755,16 @@ export async function dispatchPostAdmissionTurn<
     if (typeof liveHost === "string" && liveHost.trim() !== "") {
       turnRequest = { ...turnRequest, host: liveHost.trim() };
     }
-    if (isStationChildOfficerDialogue(admitted.role, env)) {
-      // 0081 non-body face: freeze pointer section under run/attachments/.
-      // Peer dialogue continuation.prompt stays parent payload only — the seat
-      // consumes the freeze via loadCaseDossierReadingMaterial → existing
-      // agent-start readingMaterial / systemPrompt.materials fold (not prompt splice,
-      // not RoleTurnRequest.materials).
-      await deliverCaseDossierAsAttachment({
-        ticketNumber: admitted.ticketNumber,
-        projectRoot: admitted.projectRoot,
-        home: env.home,
-        runDirectory: admitted.runDirectory,
-      });
-    } else {
-      const dossierSection = await projectCaseDossierPointerSection({
-        ticketNumber: admitted.ticketNumber,
-        projectRoot: admitted.projectRoot,
-        home: env.home,
-      });
-      if (dossierSection !== undefined) {
-        turnRequest = {
-          ...turnRequest,
-          continuation: appendContinuationSection(
-            turnRequest.continuation,
-            dossierSection,
-          ),
-        };
-      }
-    }
+    // 0081 non-dialogue face: freeze pointer section under run/attachments/.
+    // Seat consumes via loadCaseDossierReadingMaterial → existing agent-start
+    // readingMaterial / systemPrompt.materials fold. Caller instruction, empty
+    // request, and resume --message stay verbatim.
+    await deliverCaseDossierAsAttachment({
+      ticketNumber: admitted.ticketNumber,
+      projectRoot: admitted.projectRoot,
+      home: env.home,
+      runDirectory: admitted.runDirectory,
+    });
 
     // Authoritative host write happens here, at the real dispatch boundary —
     // immediately before the turn actually starts, after every retryable
@@ -1246,9 +1238,9 @@ export function resumeTurnRequestProjectionOptions(
     ...(env.model === undefined ? {} : { model: env.model }),
     ...pickEngineAxis(env),
     ...(env.timeoutMs === undefined ? {} : { timeoutMs: env.timeoutMs }),
-    ...(admitted.correlationId === undefined && env.correlationId === undefined
+    ...(env.correlationId === undefined && admitted.correlationId === undefined
       ? {}
-      : { correlationId: admitted.correlationId ?? env.correlationId }),
+      : { correlationId: env.correlationId ?? admitted.correlationId }),
     continuation: {
       kind: "resume",
       prompt,
@@ -1534,12 +1526,7 @@ export async function runPostAdmissionSeatResume<
             dispatch: async (turnRequest) => {
               const result = await dispatchPostAdmissionTurn({
                 admitted: loaded.admitted,
-                env: {
-                  ...input.env,
-                  ...(loaded.admitted.correlationId === undefined
-                    ? {}
-                    : { correlationId: loaded.admitted.correlationId }),
-                },
+                env: input.env,
                 io: attemptIo,
                 request: turnRequest,
                 lease,

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

@@ -107,7 +107,8 @@ export type RoleRunRecord = {
     | "gatekeeper"
     | "navigator"
     | "auditor"
-    | "diarist";
+    | "diarist"
+    | "secretariat";
   readonly state: RoleRunState;
   readonly bookKey: string;
   readonly projectRoot: string;
@@ -369,7 +370,8 @@ async function readRoleRunStateDisk(
     record.role !== "gatekeeper" &&
     record.role !== "navigator" &&
     record.role !== "auditor" &&
-    record.role !== "diarist"
+    record.role !== "diarist" &&
+    record.role !== "secretariat"
   ) {
     return undefined;
   }
@@ -1692,6 +1694,12 @@ export type LoadedResumableDiaristRun = {
   readonly observation?: TypedHttp429Observation;
 };
 
+export type LoadedResumableSecretariatRun = {
+  readonly admitted: import("./invocation.ts").AdmittedSecretariatInvocation;
+  readonly run: RoleRunRecord;
+  readonly observation?: TypedHttp429Observation;
+};
+
 export type LoadedResumableInstructionSeatRun = {
   readonly admitted:
     | AdmittedGatekeeperInvocation
@@ -1990,6 +1998,24 @@ export async function loadResumableDiaristRun(
   return seatLoadedResult(loaded, admitted);
 }
 
+export async function loadResumableSecretariatRun(
+  home: string,
+  runId: string,
+  authority: DurablePrincipalAuthority,
+): Promise<LoadedResumableSecretariatRun> {
+  const loaded = await loadResumableRunRecord(home, runId, authority);
+  if (loaded.run.role !== "secretariat") {
+    throw new CliUsageError(
+      `role run ${runId} belongs to ${loaded.run.role}, not secretariat`,
+    );
+  }
+  const admitted: import("./invocation.ts").AdmittedSecretariatInvocation = {
+    role: "secretariat",
+    ...resumedBaseAdmitted(loaded),
+  };
+  return seatLoadedResult(loaded, admitted);
+}
+
 export type LoadedResumableMergerRun = {
   readonly admitted: AdmittedMergerInvocation;
   readonly run: RoleRunRecord;
@@ -2223,6 +2249,7 @@ export async function peekRoleRunRole(
   | "navigator"
   | "auditor"
   | "diarist"
+  | "secretariat"
   | undefined
 > {
   const runDirectory = await findRunDirectoryById(home, runId);