@akagilnc/pi-workflow-roles 0.1.5013 → 0.1.5037

package/dist/public-cli/seat-ticket-binding.js

@@ -1,10 +1,9 @@
 /**
  * Shared same-parent resume seam for gate / officer seats (#635 / #637 / #747 / #987).
  *
- * Lookup key is parent run path only (#747 / #987 Result 7). Public seats no
- * longer select a prior run by ticket number — callers use explicit
- * `ak-role resume <runId>`. Officer and gate countersign same-parent re-summons
- * keep this seam. Lookup/resume failures propagate (失败诚实) — never wash into
+ * Lookup uses the parent run path; a typed ticket narrows same-ticket gate
+ * re-summons, never creates an issue identity. Callers can also use explicit
+ * `ak-role resume <runId>`. Lookup/resume failures propagate (失败诚实) — never wash into
  * a fresh mint. Returns undefined when the caller declared an explicit fresh
  * summons (`ak-role new`) or when no prior run exists; both mint new.
  * freshSummons is required so no seat can drift back into its own skip branch.
@@ -13,7 +12,7 @@ import { resolveBookKeyFromGit } from "../activation-ledger-git.js";
 import { findLatestRunIdForSeatTicket, } from "./run-lifecycle.js";
 /**
  * Sole same-seat → resume decision by parent run path (#637 / #724 / #747 / #987).
- * A typed ticket number is a bind key, not a resume key. When a prior run is
+ * A supplied typed ticket only narrows the prior-run search. When a prior run is
  * found, resume carries this summons' materials. Lookup/resume failures
  * propagate (失败诚实) — never wash into a fresh mint. Returns undefined when
  * the caller declared an explicit fresh summons (`ak-role new`), the parent
@@ -30,9 +29,7 @@ export async function tryResumeSameTicketSeatRun(input) {
         bookKey: resolveBookKeyFromGit(input.projectRoot),
         role: input.role,
         parentRunPath: input.parentRunPath,
-        ...(input.ticketNumber === undefined
-            ? {}
-            : { ticketNumber: input.ticketNumber }),
+        ...(input.ticketNumber === undefined ? {} : { ticketNumber: input.ticketNumber }),
     });
     if (previousRunId === undefined)
         return undefined;

package/dist/public-role-summons.js

@@ -274,7 +274,10 @@ async function summonPublicRole(options) {
     result = stepped.ok;
   }
   const stderr = captured?.stderrText();
-  const runDirectory = result.admitted?.runDirectory;
+  const runDirectory = result.terminal !== void 0 && result.terminal.roleOutcome.role !== options.role && typeof result.terminal.runId === "string" ? await (await import("./public-cli/run-lifecycle.js")).findRunDirectoryById(
+    home,
+    result.terminal.runId
+  ) : result.admitted?.runDirectory;
   return {
     exitCode: result.exitCode,
     ...result.terminal === void 0 ? {} : { terminal: result.terminal },
@@ -478,8 +481,10 @@ async function summonGateOfficer(options) {
         `countersign gate summon requires parent runId from sourceRunDirectory: ${options.sourceRunDirectory}`
       );
     }
-    const { readBoardTicketNumber } = await import("./run-ticket-number.js");
+    const { isSafePositiveTicketNumber, readBoardTicketNumber } = await import("./run-ticket-number.js");
     const parentTicket = await readBoardTicketNumber(options.sourceRunDirectory);
+    const submittedTicket = options.submission !== null && typeof options.submission === "object" && !Array.isArray(options.submission) ? options.submission.ticketNumber : void 0;
+    const courtTicket = isSafePositiveTicketNumber(submittedTicket) ? submittedTicket : parentTicket;
     const instruction = options.reask ?? gateReviewInstruction ?? "";
     return summonPublicRole({
       role: options.officer,
@@ -487,7 +492,7 @@ async function summonGateOfficer(options) {
       ...common,
       correlationId,
       parentRunPath: options.sourceRunDirectory,
-      ...parentTicket === void 0 ? {} : { boundTicketNumber: parentTicket }
+      ...courtTicket === void 0 ? {} : { boundTicketNumber: courtTicket }
     });
   }
   return summonPublicRole({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.5013",
+  "version": "0.1.5037",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/resources/countersign-ticket-issue.md

@@ -0,0 +1,5 @@
+# 给事中票面审读方法
+
+中书省交卷时，以交卷原文所指的实际 GitHub issue 为审读对象；传召附带的绑定票号只用于绑卷，不替中书省决定票号。先在当前项目的 GitHub 仓库用宿主已有 CLI 读取该 issue 的现行正文（例如 `gh issue view <票号> --json body`）；不得只看中书省交卷文字或本地草稿，就声称已审 GitHub 票面。对照原交卷和实际 issue 正文，按《票面法》审读。
+
+中书省以 `converged` 交卷却没有可审的实际 GitHub issue 身份时，封驳退回中书省补齐；不得以无号草稿署票。此类封驳走现有重交通道，不由代码按回执形状拒收。issue 不存在或正文读取失败时，如实说明现场失败，不把未读到的票面判作已审。交卷与绑卷票号冲突也须说明，不猜测替代票号。

package/resources/diarist-collect.md

@@ -33,6 +33,7 @@
 
 - 认得出本庭对象：`status: completed` 且 `ticketNumber: N`，并交边界。
 - 真无票对象（方案/派单/处置案等）：`status: completed` 且 `ticketNumber: null`（或省略）。真无票是合法结果，不入录。
+- 本庭明确要新建票、但 issue 尚未建号：不是认票失败。以 `status: completed`、`ticketNumber: null` 交出已辨明的本案对话边界；起居录先随无号 run 暂存，建号后由既有归卷流程补归该号。不要借用旁票号。
 - 认不出本庭对象是哪一张：`status: escalate` 并写明 `reason`。识别不了就上抛，不得省略票号假装无录，也不得猜一个号。
 - 不得从旁及的他票或任何猜测里挑一个号顶替认不出的身份。
 - 传召文自然会提轮次、决定编号、commit sha、邻票号；你认的是本庭对象，不是文中出现的每一个数字。

package/resources/secretariat-ticket-identity.md

@@ -0,0 +1,15 @@
+# 中书省票身份与落票方法
+
+本方法适用于公开中书省调用。票面范围、审读职责和交卷形状仍以各自法源为准。
+
+## 先辨票，再改票
+
+调用者可以给票号，也可以不给。给了票号，先读取并核对该 issue，再在原 issue 上更新票面；不要另建一票。没有给票号，不等于新票：先结合本次对话、本票起居录和当前 GitHub 仓库中的 issue 判断是否已有对应票。找到已有票就更新那张；只有确认没有对应票，才在当前仓库创建 issue。不得仅凭内容相似就认定已有票，也不得因没找到就忽略搜索范围或不确定性。
+
+票面改定后，应将实际要执行的正文落到对应 GitHub issue。不能确认已有票还是新票、无法读取或更新目标 issue，或创建 issue 失败时，不得把草稿当成已落票结果送庭；可上呈或重交，并说明现场观察到的真实失败原因。若信息不足以区分多个候选 issue，可上呈请裁定，不猜票号、不另建重复票。
+
+## 落地后送庭
+
+只有确认目标 issue 存在且正文已更新为本票最终票面后，才以 `converged` 交卷，并携带该 issue 的实际票号。沿用既有交卷闸，将交卷原文交给给事中审这张有票号 issue；不以无号草稿替代 issue 审读。不另造传召或记账机制。
+
+执行 GitHub 操作时使用当前宿主实际提供的 CLI / 能力；不在包内另造 GitHub 适配层。记录足以核对身份和落地结果的证据，不把模型自报冒充为现场观察。

package/souls/audit-law.md

@@ -19,7 +19,7 @@ finding 提**类别**；实例只作证据。一次找齐全，不逐轮抽样
 
 判断不收敛（同类问题反复、修理只增不减）可上呈；你的打回与上一轮相同、对方重交只换措辞，须上呈，不得再打回。修理 diff 自身按同尺复核。
 
-衙门不是需求来源。弹章、施工方的注释与测试、你造的探针，都只是线索。判一条 finding 成立、开一条约束，判词须写明两样：要它的那一句法（先看那句讲的是不是这一条），和它在哪条真实 run 上发生过（指针）。缺一样，按过度防御或加戏驳回；判词缺这两样，审刑院打回，符宝郎驳。对方按你处方加的东西，下轮同审。
+衙门不是需求来源。弹章、施工方的注释与测试、你造的探针，都只是线索。判一条 finding 成立、开一条约束，判词须写明要它的那一句法，先看那句讲的是不是这一条；指不出的，按过度防御或加戏驳回。判词缺这一样，审刑院打回，符宝郎驳。对方按你处方加的东西，下轮同审。
 
 判例：#1025 御史台据一句注释造场景，大理寺引「上呈暂停」判成立，审刑院、符宝郎皆署；那句法没要过「谁有资格唤醒」，场景也从未发生。
 

package/src/packaged-role-registry.ts

@@ -391,7 +391,7 @@ export const PUBLIC_ROLE_RECORDS = [
     activationStage: "load-and-install",
     receiptStatusKey: "status",
     // #924: 公用《票面法》三席同装
-    sessionMaterials: ["CLAUDE.md", "souls/countersign.md", "souls/ticket-law.md"],
+    sessionMaterials: ["CLAUDE.md", "souls/countersign.md", "souls/ticket-law.md", "resources/countersign-ticket-issue.md"],
   },
   {
     role: "secretariat",
@@ -399,7 +399,7 @@ export const PUBLIC_ROLE_RECORDS = [
     presentSettled: "always",
     summonResume: false,
     admission: "instruction",
-    sameParent: "court-diarist",
+    sameParent: "none",
     phases: [null],
     outputTool: SECRETARIAT_OUTPUT_TOOL_NAME,
     settlement: "accepted",
@@ -415,6 +415,7 @@ export const PUBLIC_ROLE_RECORDS = [
       "CLAUDE.md",
       "souls/secretariat.md",
       "souls/ticket-law.md",
+      "resources/secretariat-ticket-identity.md",
       "souls/countersign.md",
       "souls/notary.md",
     ],

package/src/public-cli/cli.ts

@@ -77,7 +77,8 @@ import {
   type PublicRoleOptionOwner,
   type TypedOptionConsumer,
 } from "./option-definitions.ts";
-import { runPublicInstructionSeat, runPublicInstructionSeatResume } from "./instruction-seat-run.ts";
+import { continueParentAfterChild, runPublicInstructionSeat, runPublicInstructionSeatResume } from "./instruction-seat-run.ts";
+import { courtDiaristEscalated } from "./countersign-run.ts";
 import { runPublicAnalyst } from "./analyst-run.ts";
 import {
   AUTO_RESUME_LIMIT,
@@ -1229,7 +1230,22 @@ export async function runAkRole(
         }),
         io,
       );
-      return cliResultFromRoleRun(result);
+      let current = result;
+      while (
+        current.exitCode === 0 && current.admitted?.correlationId !== undefined
+        && current.terminal?.roleOutcome.kind === "accepted"
+        && !courtDiaristEscalated(current.terminal.roleOutcome)
+      ) {
+        const parentRunId = current.admitted.correlationId;
+        const parentRole = await peekRoleRunRole(home, parentRunId);
+        if (parentRole === undefined) break;
+        const parentSeat = resolveEffectiveSeat(config, parentRole, credentials, invocationFromParsed(parsed));
+        const parentEnv = createRoleEnvironment(env, {
+          role: parentRole, home, agentDir, cwd, credentials, seat: parentSeat, config,
+        });
+        current = await continueParentAfterChild(parentRunId, current.admitted, parentEnv, io);
+      }
+      return cliResultFromRoleRun(current);
     }
 
     if (

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

@@ -45,8 +45,8 @@ export type CountersignRunEnv = PostAdmissionEnv & {
    */
   gateReviewInstruction?: string;
   /**
-   * #969 / #987 gate path: parent run durable board ticket handoff for bind only.
-   * Resume lookup uses parentRunPath — never this ticket number (#987 Result 7).
+   * #969 / #987 gate path: parent run durable board ticket handoff for bind.
+   * Same-ticket resume lookup narrows the parent path by this typed number.
    */
   boundTicketNumber?: number;
   /**
@@ -79,6 +79,7 @@ export type CourtDiaristIdentity =
 export type CourtDiaristInvocationResult = {
   readonly identity: CourtDiaristIdentity;
   readonly admitted?: import("./invocation.ts").AdmittedRoleInvocation;
+  readonly terminal?: import("./terminal.ts").TerminalResult;
   readonly failedWithoutEscalate?: { readonly diagnostic: string };
 };
 
@@ -161,7 +162,7 @@ export type CourtDiaristSummonEnv = Pick<
  * - Multiple submissions: last qualifying set wins.
  * Live path never shape-rejects the role turn; durable damage is a separate seam.
  */
-function courtTicketNumbersFromOutcome(
+export function courtTicketNumbersFromOutcome(
   roleOutcome: TerminalRoleOutcome | undefined,
   principalTicket: number,
   submissions?: readonly unknown[],
@@ -199,7 +200,7 @@ function courtTicketNumbersFromOutcome(
 }
 
 /** Routing boolean over the child's own typed sequence — does not pick or rewrite a sole row. */
-function courtDiaristEscalated(
+export function courtDiaristEscalated(
   roleOutcome: TerminalRoleOutcome | undefined,
 ): boolean {
   if (roleOutcome === undefined) return false;
@@ -280,6 +281,7 @@ export async function invokeCourtDiarist(
         diagnostic: courtDiaristEscalateDiagnostic(roleOutcome, submissions),
       },
       ...(result.admitted === undefined ? {} : { admitted: result.admitted }),
+      ...(result.terminal === undefined ? {} : { terminal: result.terminal }),
     };
   }
 
@@ -328,14 +330,15 @@ export async function invokeCourtDiarist(
  * Missing ticketNumber (true-unbound / identity deferred) skips the refresh
  * station — no diary is minted for a true-unbound run. First-entry identity
  * lives on the shared countersign entry (typed 起居郎 key for bind). Bound refresh:
- * 起居郎 failure propagates (失败诚实).
+ * technical failure propagates; LLM escalation remains a recorded conclusion.
  * Path delivery onto materials is not this station's job — post-admission owns it.
  */
 export async function runCountersignCourtDiaristStation(
   admitted: AdmittedCountersignInvocation,
   env: CountersignRunEnv,
   io: CliIo,
-): Promise<void> {
+  afterTicketNumber?: number,
+): Promise<{ readonly terminal: import("./terminal.ts").TerminalResult; readonly childRunId?: string } | undefined> {
   if (env.runCourtDiaristStation !== undefined) {
     await env.runCourtDiaristStation(admitted);
     return;
@@ -362,7 +365,8 @@ export async function runCountersignCourtDiaristStation(
     refreshTickets = [admitted.ticketNumber];
   }
 
-  for (const ticketNumber of refreshTickets) {
+  const completedIndex = afterTicketNumber === undefined ? -1 : refreshTickets.indexOf(afterTicketNumber);
+  for (const ticketNumber of refreshTickets.slice(completedIndex + 1)) {
     const outcome = await invokeCourtDiarist(
       {
         instruction: `整理 #${ticketNumber} 的本案依据。`,
@@ -376,13 +380,16 @@ export async function runCountersignCourtDiaristStation(
       io,
     );
 
-    if (outcome.identity.kind === "escalate") {
-      throw new StationChildExhaustedError(outcome.identity.diagnostic);
-    }
     if (outcome.failedWithoutEscalate !== undefined) {
       throw new StationChildExhaustedError(
         outcome.failedWithoutEscalate.diagnostic,
       );
     }
+    if (outcome.identity.kind === "escalate" && outcome.terminal !== undefined) {
+      return {
+        terminal: outcome.terminal,
+        ...(outcome.admitted === undefined ? {} : { childRunId: outcome.admitted.runId }),
+      };
+    }
   }
 }

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

@@ -388,9 +388,7 @@ async function runCountersignBody(
       projectRoot: resolve(parsed.project ?? env.cwd),
       role: "countersign",
       parentRunPath: gateParentRunPath,
-      ...(env.boundTicketNumber === undefined
-        ? {}
-        : { ticketNumber: env.boundTicketNumber }),
+      ...(isSafePositiveTicketNumber(env.boundTicketNumber) ? { ticketNumber: env.boundTicketNumber } : {}),
       freshSummons: env.freshSummons,
       summons: {
         sourceRunPath: gateParentRunPath,
@@ -430,15 +428,17 @@ async function runCountersignBody(
       let typedTicket: number | undefined;
       let typedCourtTicketNumbers: readonly number[] | undefined;
       let identityDiaristRan = false;
-      let unboundDiaristRunId: string | undefined;
+      let childDiaristRunId: string | undefined;
+      let pausedDiaristTerminal: TerminalResult | undefined;
 
-      if (env.runCourtDiaristStation === 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) {
@@ -454,17 +454,16 @@ async function runCountersignBody(
           }, 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}`)) {
-          unboundDiaristRunId = outcome.admitted.runId;
+          childDiaristRunId = outcome.admitted.runId;
         }
-        if (outcome.identity.kind === "escalate" || outcome.failedWithoutEscalate !== undefined) {
-          const diagnostic = outcome.identity.kind === "escalate"
-            ? outcome.identity.diagnostic
-            : outcome.failedWithoutEscalate?.diagnostic ?? "";
+        if (outcome.failedWithoutEscalate !== undefined) {
+          const diagnostic = outcome.failedWithoutEscalate.diagnostic;
           await materializeAdmission(
             isSafePositiveTicketNumber(env.boundTicketNumber) ? env.boundTicketNumber : undefined,
           );
-          if (unboundDiaristRunId !== undefined) await recordChildDiaristRun(admitted, unboundDiaristRunId);
+          if (childDiaristRunId !== undefined) await recordChildDiaristRun(admitted, childDiaristRunId);
           await markRunAdmitted(admitted, env.principalAuthority);
           return await presentControlledFailure(admitted, {
             timedOut: false,
@@ -474,19 +473,20 @@ async function runCountersignBody(
           }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
         }
         if (outcome.identity.kind === "ticket") {
-          typedTicket = isSafePositiveTicketNumber(env.boundTicketNumber)
-            ? env.boundTicketNumber
-            : outcome.identity.ticketNumber;
+          typedTicket = outcome.identity.ticketNumber;
           typedCourtTicketNumbers = outcome.identity.courtTicketNumbers;
-        } else if (isSafePositiveTicketNumber(env.boundTicketNumber)) {
-          typedTicket = env.boundTicketNumber;
         }
       }
 
       await materializeAdmission(typedTicket);
       await markRunAdmitted(admitted, env.principalAuthority);
-      if (unboundDiaristRunId !== undefined) {
-        await recordChildDiaristRun(admitted, unboundDiaristRunId);
+      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);
@@ -540,7 +540,11 @@ async function runCountersignBody(
           beforeDispatch: async (admittedSeat, lease) => {
             if (!packagedAdmitsCountersign(admittedSeat.role)) return;
             if (!identityDiaristRan || typedTicket !== undefined) {
-              await runCountersignCourtDiaristStation(admittedSeat, env, io);
+              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));
@@ -628,7 +632,6 @@ export async function runPublicInstructionSeat(
         projectRoot,
         role,
         parentRunPath: sourceDirectory,
-        ...(auditorTicket === undefined ? {} : { ticketNumber: auditorTicket }),
         freshSummons: env.freshSummons,
         summons,
         resume: (runId, materials) => runPublicInstructionSeatResume(
@@ -657,7 +660,6 @@ export async function runPublicInstructionSeat(
         projectRoot,
         role,
         parentRunPath,
-        ...(env.boundTicketNumber === undefined ? {} : { ticketNumber: env.boundTicketNumber }),
         freshSummons: env.freshSummons,
         summons,
         resume: (runId, materials) => runPublicInstructionSeatResume(
@@ -686,7 +688,6 @@ export async function runPublicInstructionSeat(
       throw error;
     }
     const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
-    const knownTicket = (await readBoardTicketNumber(source.runDirectory)) ?? env.boundTicketNumber;
     const summons: SameTicketSummonsMaterials = {
       sourceRunPath: source.runDirectory,
       sourceRun: source,
@@ -697,7 +698,6 @@ export async function runPublicInstructionSeat(
       projectRoot,
       role,
       parentRunPath: source.runDirectory,
-      ...(knownTicket === undefined ? {} : { ticketNumber: knownTicket }),
       freshSummons: env.freshSummons,
       summons,
       resume: (runId, materials) => runPublicInstructionSeatResume(
@@ -737,52 +737,33 @@ export async function runPublicInstructionSeat(
 
   const runAdmitted = async (): Promise<SeatRunResult> => {
     await markRunAdmitted(admitted, env.principalAuthority);
-    if (record.sameParent === "court-diarist") {
-      const { invokeCourtDiarist } = await import("./countersign-run.ts");
-      const outcome = await invokeCourtDiarist({
-        instruction: parsed.instruction ?? "",
-        projectRoot: admitted.projectRoot,
-        failureLabel: "secretariat unbound summons",
-        attachmentPaths: admitted.attachments.map((attachment) => attachment.frozenPath),
-        correlationId: admitted.runId,
-      }, {
-        cwd: env.cwd,
-        home: env.home,
-        agentDir: env.agentDir,
-        packageRoot: env.packageRoot,
-        ...(env.credentials === undefined ? {} : { credentials: env.credentials }),
-        ...(env.signal === undefined ? {} : { signal: env.signal }),
-        ...(env.hostAdapters === undefined ? {} : { hostAdapters: env.hostAdapters }),
-      }, io);
+    if (role === "secretariat") {
+      let outcome: Awaited<ReturnType<typeof invokeCourtDiarist>>;
+      try {
+        outcome = await invokeCourtDiarist({
+          instruction: parsed.instruction ?? "",
+          projectRoot: admitted.projectRoot,
+          failureLabel: "secretariat unbound summons",
+          attachmentPaths: admitted.attachments.map((attachment) => attachment.frozenPath),
+          correlationId: admitted.runId,
+        }, env, io);
+      } catch (error) {
+        return await presentControlledFailure(admitted, {
+          timedOut: false, code: null, stderr: "", thrown: error,
+        }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
+      }
       if (outcome.admitted?.runDirectory.includes(`${sep}unbound${sep}runs${sep}`)) {
         await recordChildDiaristRun(admitted, outcome.admitted.runId);
       }
-      if (outcome.identity.kind === "escalate" || outcome.failedWithoutEscalate !== undefined) {
-        const diagnostic = outcome.identity.kind === "escalate"
-          ? outcome.identity.diagnostic
-          : outcome.failedWithoutEscalate?.diagnostic ?? "";
+      if (outcome.failedWithoutEscalate !== undefined) {
         return await presentControlledFailure(admitted, {
-          timedOut: false,
-          code: null,
-          stderr: "",
-          thrown: new Error(diagnostic),
+          timedOut: false, code: null, stderr: "",
+          thrown: new Error(outcome.failedWithoutEscalate.diagnostic),
         }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
       }
-      if (outcome.identity.kind === "ticket") {
-        try {
-          if (outcome.admitted === undefined) throw new Error("court diarist ticket has no admitted run");
-          await bindAdmittedTicketNumber(outcome.admitted, outcome.identity.ticketNumber);
-          await relocateAdmittedRunToTicket(outcome.admitted, env.principalAuthority);
-          await bindAdmittedTicketNumber(admitted, outcome.identity.ticketNumber);
-          await relocateAdmittedRunToTicket(admitted, env.principalAuthority);
-        } catch (error) {
-          return await presentControlledFailure(admitted, {
-            timedOut: false,
-            code: null,
-            stderr: "",
-            thrown: error,
-          }, seatAdapters(admitted, env), env.principalAuthority, io) as SeatRunResult;
-        }
+      if (outcome.identity.kind === "escalate" && outcome.terminal !== undefined) {
+        io.stdout(formatTerminalResult(outcome.terminal));
+        return { exitCode: 0, admitted, terminal: outcome.terminal };
       }
     }
     return dispatchAdmitted(admitted, env, io);
@@ -856,3 +837,25 @@ export async function runPublicInstructionSeatResume(
     ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
   });
 }
+
+/** Continue the parent once any escalated child has submitted. */
+export async function continueParentAfterChild(
+  parentRunId: string,
+  child: AdmittedRoleInvocation,
+  env: InstructionSeatRunEnv,
+  io: CliIo,
+): Promise<SeatRunResult> {
+  const loaded = await loadResumablePublicRole(env.home, parentRunId, env.principalAuthority, true);
+  if (loaded.run.state !== "admitted") {
+    return runPublicInstructionSeatResume({ runId: parentRunId }, env, io);
+  }
+  const admitted = loaded.admitted;
+  if (admitted.role === "countersign" && admitted.ticketNumber !== undefined) {
+    const refresh = await runCountersignCourtDiaristStation(admitted, env, io, child.ticketNumber);
+    if (refresh !== undefined) {
+      io.stdout(formatTerminalResult(refresh.terminal));
+      return { exitCode: 0, admitted, terminal: refresh.terminal };
+    }
+  }
+  return dispatchAdmitted(admitted, env, io);
+}

package/src/public-cli/invocation.ts

@@ -27,6 +27,7 @@ import { resolveBookKeyFromGit } from "../activation-ledger-git.ts";
 import {
   ensureRoleRunDirectory,
   ensureRoleRunPlacement,
+  listBookRunDirectories,
   roleRunArtifactsDirectory,
   roleRunPlacement,
   type RoleRunSubject,
@@ -539,19 +540,13 @@ export async function persistAdmittedSourceRunPath(
 /**
  * Bind a post-admission resolved ticketNumber onto the in-memory admitted
  * object and both durable pages (invocation.json + admitted-request.json).
- * Used by known-ticket reuse when admission was unbound (#635 / #709).
- * Never clears an existing binding.
+ * A later typed role receipt replaces an earlier assertion (#1025).
  */
 export async function bindAdmittedTicketNumber(
   admitted: AdmittedRoleInvocation,
   ticketNumber: number,
 ): Promise<void> {
-  if (admitted.ticketNumber !== undefined) {
-    if (admitted.ticketNumber === ticketNumber) return;
-    throw new Error(
-      `bindAdmittedTicketNumber refuses to replace existing ticket #${admitted.ticketNumber} with #${ticketNumber}`,
-    );
-  }
+  if (admitted.ticketNumber === ticketNumber) return;
   await bindTicketNumberOnRunDirectory(admitted.runDirectory, ticketNumber);
   (admitted as { ticketNumber?: number }).ticketNumber = ticketNumber;
 }
@@ -642,7 +637,7 @@ export async function bindCourtTicketNumbersOnAdmitted(
   admitted.courtTicketNumbers = frozen;
 }
 
-/** Move a settled first-entry run from unbound to its asserted ticket directory. */
+/** File a role run under its latest typed ticket identity. */
 export async function relocateAdmittedRunToTicket(
   admitted: AdmittedRoleInvocation,
   authority: DurablePrincipalAuthority,
@@ -668,6 +663,8 @@ export async function relocateAdmittedRunToTicket(
     for (const childRunId of Array.isArray(childRunIds) ? childRunIds : []) {
       if (typeof childRunId !== "string") continue;
       const childDirectory = join(dirname(oldRunDirectory), `${childRunId}@diarist`);
+      // A child that already filed under a ticket keeps its own assertion.
+      if (!existsSync(childDirectory)) continue;
       const childTarget = roleRunPlacement(ledgerHome, {
         bookKey: admitted.bookKey,
         subject: { ticketNumber: admitted.ticketNumber },
@@ -675,7 +672,6 @@ export async function relocateAdmittedRunToTicket(
         role: "diarist",
       });
       authority.seal(childTarget);
-      if (!existsSync(childDirectory) && existsSync(childTarget.runDirectory)) continue;
       await bindTicketNumberOnRunDirectory(childDirectory, admitted.ticketNumber);
       await rehomeUnboundTicketProvenance(childDirectory, admitted.ticketNumber, admitted.projectRoot, homeFromRunDirectory(oldRunDirectory));
       ensureRoleRunDirectory(ledgerHome, dirname(childTarget.runDirectory));
@@ -683,14 +679,13 @@ export async function relocateAdmittedRunToTicket(
     }
   }
 
-  // An identity diarist can file before its caller obtains a ticket. Both its
-  // own bind and the caller's later bind use this existing relocation seam.
+  // The first ticket assignment moves only an unbound diarist's own diary.
   if (admitted.role === "diarist") {
     await rehomeUnboundTicketProvenance(oldRunDirectory, admitted.ticketNumber, admitted.projectRoot, homeFromRunDirectory(oldRunDirectory));
   }
 
-  // Rename commits the run placement. Diary assignment above is an idempotent
-  // Sitian append, not part of an atomic transaction with this directory move.
+  // Rename commits the run placement. Diary assignment above is a Sitian append
+  // outside the atomic directory move.
   // Persisted paths are resolved from typed run identity on read.
   await rename(oldRunDirectory, target.runDirectory);
 
@@ -752,34 +747,11 @@ export async function bindTicketNumberOnRunDirectory(
     "bindTicketNumberOnRunDirectory",
   );
   const admittedPath = join(runDirectory, "admitted-request.json");
-  const invocationPath = join(runDirectory, "invocation.json");
   const admitted = JSON.parse(await readFile(admittedPath, "utf8")) as Record<
     string,
     unknown
   >;
-  const existing = admitted.ticketNumber;
-  if (typeof existing === "number") {
-    if (existing === ticketNumber) return;
-    throw new Error(
-      `bindTicketNumberOnRunDirectory refuses to replace existing ticket #${existing} with #${ticketNumber}`,
-    );
-  }
-  // Conflict guard before any write: crash window of bindAdmittedTicketNumber
-  // can leave invocation bound while admitted-request is still unbound — refuse
-  // silent rebind. Read-before-merge; never check the page just overwritten.
-  if (existsSync(invocationPath)) {
-    const invocation = JSON.parse(
-      await readFile(invocationPath, "utf8"),
-    ) as Record<string, unknown>;
-    if (
-      typeof invocation.ticketNumber === "number" &&
-      invocation.ticketNumber !== ticketNumber
-    ) {
-      throw new Error(
-        `bindTicketNumberOnRunDirectory refuses to replace invocation ticket #${invocation.ticketNumber} with #${ticketNumber}`,
-      );
-    }
-  }
+  if (admitted.ticketNumber === ticketNumber) return;
   await writeFile(
     admittedPath,
     `${JSON.stringify({ ...admitted, ticketNumber }, null, 2)}\n`,

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

@@ -223,8 +223,9 @@ function withOnceSuccessfulBeforeDispatch<
     ...adapters,
     beforeDispatch: async (admitted, lease) => {
       if (succeeded) return;
-      await hook(admitted, lease);
+      const result = await hook(admitted, lease);
       succeeded = true;
+      return result;
     },
   };
 }
@@ -352,7 +353,8 @@ export type PostAdmissionAdapters<
     result: RoleTurnResult;
     sessionFile: string;
   }) => Promise<RoleTurnKnownFailure | undefined>;
-  beforeDispatch?: (admitted: A, lease?: RunWriterLease) => Promise<void> | void;
+  /** A child office may pause this run with its unchanged terminal before a host turn starts. */
+  beforeDispatch?: (admitted: A, lease?: RunWriterLease) => Promise<T | void> | T | void;
   /**
    * After the host turn settles and before any held writer lease is released.
    * Post-turn bind/relocate (e.g. Diarist first assert) must run here so a
@@ -709,9 +711,8 @@ export async function dispatchPostAdmissionTurn<
       };
     }
     try {
-      // #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.
+      // #858: the first typed assertion files an unbound run. Later receipts
+      // remain untouched; this seam does not adjudicate a ticket change.
       if (admitted.ticketNumber === undefined) {
         const rows = await readRecordedSubmissionRows(
           admitted.projectRoot,
@@ -825,7 +826,10 @@ export async function dispatchPostAdmissionTurn<
     // (#840 父子不层叠).
     if (adapters.beforeDispatch !== undefined) {
       try {
-        await adapters.beforeDispatch(admitted, lease);
+        const paused = await adapters.beforeDispatch(admitted, lease);
+        if (paused !== undefined) {
+          return { exitCode: 0, admitted, terminal: paused, skipAutoResume: true as const };
+        }
       } catch (error) {
         const settled = (await presentControlledFailure(
           admitted,