@akagilnc/pi-workflow-roles 0.1.5375 → 0.1.5382

package/src/notary-role.ts

@@ -1,4 +1,6 @@
-import type { RoleHost, HostContext, HostToolResult } from "./host-contracts.ts";
+import type { RoleHost, HostContext } from "./host-contracts.ts";
+import { registerFiledSubmissionTool } from "./filed-submission.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 /**
  * Public Notary role runtime — direct officer seat (not through Gatekeeper province).
  * Caller supplies only a source-run locator; Notary self-fetches authoritative materials.
@@ -10,7 +12,6 @@ import {
   NOTARY_OUTPUT_TOOL_NAME,
   NOTARY_SOURCE_RUN_FLAG,
   NOTARY_TICKET_FLAG,
-  notaryOutputSchema,
   type NotarySourceRunLocator,
 } from "./notary-contracts.ts";
 
@@ -156,24 +157,8 @@ export function createNotaryRoleRuntime(
 
       if (!registered) {
         registered = true;
-        pi.registerTool({
-          name: NOTARY_OUTPUT_TOOL_NAME,
-          label: "符宝郎输出",
-          description: "提交引文保真与票面对齐的 converged/continue/escalate 决议。",
-          promptSnippet: "提交符宝郎决议",
-          parameters: notaryOutputSchema,
-          async execute(toolCallId: string, parameters: unknown, _signal: AbortSignal | undefined, _onUpdate: unknown, ctx: HostContext, ): Promise<HostToolResult<unknown>> {
-            if (activation === undefined) {
-              throw new Error("符宝郎未激活");
-            }
-            // #753: handler only records — params as submitted, no findings/disposition rewrite.
-            // #541 infra declaration + sole-final barrier are ledger-owned (#575).
-            return {
-              content: [],
-              details: parameters,
-              terminate: true as const,
-            };
-          },
+        registerFiledSubmissionTool(pi, roleSubmissionDeclaration("notary"), {
+          readyError: () => (activation === undefined ? "符宝郎未激活" : undefined),
         });
         // Evidence assembly only (ADR 0018): soul + bound projection.
         // Ticket value is envelope-admitted at activate — not re-read from flags here.

package/src/package-contracts/reviewer-output.ts

@@ -1,7 +1,32 @@
 /** Package-owned Reviewer intent — original role payload only (#836 删 8). */
 
+import { Type } from "typebox";
+
+import { openToolObject } from "../open-tool-schema.ts";
+import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
+
 export const REVIEWER_OUTPUT_TOOL_NAME = "ak_reviewer_output";
 
+const REVIEWER_AMENDMENTS_DESCRIPTION =
+  "已运行 lens 的 amendments 承载 candidates、逐条处置与 verdict 的完整报告（非仅 verdict 行）；显式单轴时另一轴可省略（completeness / correctness）。hard-stop／usage error 为 refused 时，已产出报告仍照录对应 lens 字段。" as const;
+// #1134: `status` alone is the trajectory field (#917 §6 two normal lens verdicts →
+// completed; hard-stop / usage error → refused); its words ride the description.
+// amendments/diagnostic are LLM/human-read narrative content returned as
+// submitted — declaration keeps name + semantic description only, no nested
+// object shape, no string type, no required constraint.
+const REVIEWER_STATUS_DESCRIPTION =
+  "completed | refused。两种正常 lens verdict（completeness / correctness）均 completed；hard-stop 与 usage error 为 refused（已产出报告仍照录进所选 lens amendments）。" as const;
+const reviewerOutputObject = Type.Object({
+  status: Type.Unknown({ description: REVIEWER_STATUS_DESCRIPTION }),
+  amendments: Type.Unknown({ description: REVIEWER_AMENDMENTS_DESCRIPTION }),
+  diagnostic: Type.Unknown({
+    description: "拒绝诊断说明；hard-stop／usage error 原因进此字段，已产出报告另照录 amendments",
+  }),
+});
+export const reviewerOutputSchema = withTerminatingOutputDeclarations(
+  openToolObject(reviewerOutputObject),
+);
+
 /** Seat-owned per-lens finding body text (completeness / correctness). */
 export type ReviewerAmendments = Readonly<
   Partial<Record<"completeness" | "correctness", string>>

package/src/package-contracts/worker-output.ts

@@ -1,19 +1,39 @@
 /** Package-owned independent Coder and Fixer output leaves. */
 
-export {
+import { Type } from "typebox";
+
+import { openToolObject } from "../open-tool-schema.ts";
+import {
   FIXER_OUTPUT_TOOL_NAME,
   fixerOutputSchema,
+  PARTIALLY_COMPLETED_DEFINITION,
   validateFixerOutput,
+  type FixerBlocker,
+  type FixerClassResult,
+  type FixerOutput,
+  type FixerPhase,
 } from "./fixer-output.ts";
+import { fixerPrerequisiteSchema, fixerPrerequisitesSchema, parseFixerPrerequisites, validateFixerPrerequisites } from "./fixer-packet.ts";
+import type { FixerInvocationInput, FixerPrerequisite } from "./fixer-packet.ts";
+import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
+
+export {
+  FIXER_OUTPUT_TOOL_NAME,
+  fixerOutputSchema,
+  validateFixerOutput,
+  fixerPrerequisiteSchema,
+  fixerPrerequisitesSchema,
+  parseFixerPrerequisites,
+  validateFixerPrerequisites,
+};
 export type {
   FixerBlocker,
   FixerClassResult,
   FixerOutput,
   FixerPhase,
-} from "./fixer-output.ts";
-export { fixerPrerequisiteSchema, fixerPrerequisitesSchema, parseFixerPrerequisites, validateFixerPrerequisites } from "./fixer-packet.ts";
-export type { FixerInvocationInput, FixerPrerequisite } from "./fixer-packet.ts";
-import { validateFixerOutput, type FixerOutput } from "./fixer-output.ts";
+  FixerInvocationInput,
+  FixerPrerequisite,
+};
 
 export const CODER_OUTPUT_TOOL_NAME = "ak_coder_output";
 export type WorkerRoleLabel = "Coder" | "Fixer";
@@ -31,3 +51,21 @@ export function validateAcceptedCoderDetails(output: unknown): CoderOutput {
 export function validateAcceptedWorkerDetails(output: unknown, roleLabel: WorkerRoleLabel = "Coder"): WorkerOutput {
   return roleLabel === "Fixer" ? validateFixerOutput(output) : validateAcceptedCoderDetails(output);
 }
+
+// status 的合法词写在 description。WORKER_DONE_STATUSES 只让 completed /
+// partially_completed 进入提交闸。unfinished 且未见理由说明时，运行时同 run 催全
+// （ADR 0050）；理由在不在不按 JSON 类型判，也不在派发前用长度拒收。
+// report / remainingScope / reason 的声明只留字段名和语义。
+const CODER_STATUS_DESCRIPTION =
+  `planned | completed | refused | partially_completed | unfinished。unfinished：缺前置或违宪约束致本局未完成。${PARTIALLY_COMPLETED_DEFINITION}` as const;
+const coderOutputObject = Type.Object({
+  status: Type.Unknown({ description: CODER_STATUS_DESCRIPTION }),
+  report: Type.Unknown({ description: "如实结果报告" }),
+  remainingScope: Type.Unknown({ description: "本局后剩余工作" }),
+  reason: Type.Unknown({
+    description: "阻断原因：缺前置或违宪约束。缺待决 owner 决定或答复属缺前置。",
+  }),
+});
+export const coderOutputSchema = withTerminatingOutputDeclarations(
+  openToolObject(coderOutputObject),
+);

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

@@ -11,6 +11,8 @@ import { createPiDoctorAuditor } from "../doctor-auditor.ts";
 
 import type { DurablePrincipalAuthority, HostContext, RoleTurnRequest } from "../host-contracts.ts";
 import { officerConclusionReask, gateOfficerForSubject } from "../gatekeeper-role.ts";
+import { receivedDiscriminator } from "../submission-errors.ts";
+import { REVIEW_QUEUE_STATUSES } from "../review-submission.ts";
 import { runJudgeGates } from "../judge-role.ts";
 import { WORKER_DONE_STATUSES } from "../worker-submission-contracts.ts";
 import { SECRETARIAT_GATE_OFFICER_ENTRY_TYPE } from "../secretariat-contracts.ts";
@@ -116,7 +118,6 @@ type SeatRunResult = {
 
 const AUDITED_ROLES = new Set<PackagedRole>(["judge", "fixer", "coder", "secretariat", "countersign", "doctor"]);
 const SECRETARIAT_STATUS_REASK = "secretariatStatus 不是 converged、escalate 之一。请重新交卷，secretariatStatus 写明其一。";
-const COUNTERSIGN_STATUS_REASK = "status 不是 converged、continue、escalate 三态之一。请重新交卷，status 写明其一。";
 const WORKER_ROUTING_STATUSES: ReadonlySet<string> = new Set([
   "planned", "completed", "refused", "partially_completed", "unfinished",
 ]);
@@ -127,11 +128,10 @@ const DOCTOR_STATUS_REASK =
   "status 不是 completed、refused 之一。请重新交卷，status 写明其一。";
 const POST_SUBMISSION_ROUTING: Partial<Record<PackagedRole, {
   readonly statuses: ReadonlySet<string>;
-  readonly reask: string;
+  readonly reask?: string;
 }>> = {
   judge: {
-    statuses: new Set(["converged", "continue", "escalate"]),
-    reask: "status 不是 converged、continue、escalate 三态之一。请重新交卷，status 写明其一。",
+    statuses: REVIEW_QUEUE_STATUSES,
   },
   coder: {
     statuses: WORKER_ROUTING_STATUSES,
@@ -161,12 +161,10 @@ function unreadablePostSubmissionStatus(
   const route = POST_SUBMISSION_ROUTING[admitted.role];
   if (route === undefined) return undefined;
   const payload = terminal.roleOutcome.payloads?.at(-1);
-  const status = isRecord(payload)
-    ? (payload as Record<string, unknown>).status
-    : undefined;
+  const status = receivedDiscriminator(payload, "status");
   return typeof status === "string" && route.statuses.has(status)
     ? undefined
-    : route.reask;
+    : route.reask ?? officerConclusionReask(status);
 }
 
 async function reaskUnreadablePostSubmissionStatus(
@@ -908,7 +906,6 @@ export async function runPublicInstructionSeatResume(
   return resume();
 }
 
-const QUEUE_CONCLUSIONS = new Set(["converged", "continue", "escalate"]);
 const GATE_CHILD_ROLES = new Set(["notary", "auditor", "inspector", "countersign"]);
 
 /**
@@ -933,7 +930,7 @@ async function queueConclusionFromChild(
       undefined,
     );
     const status = latestQueueStatus(terminal);
-    if (terminal !== undefined && status !== undefined && QUEUE_CONCLUSIONS.has(status)) {
+    if (terminal !== undefined && typeof status === "string" && REVIEW_QUEUE_STATUSES.has(status)) {
       return { admitted: current, terminal, status };
     }
     const reasked = await runPublicInstructionSeatResume({
@@ -944,7 +941,7 @@ async function queueConclusionFromChild(
       return { stop: reasked };
     }
     const reaskedStatus = latestQueueStatus(reasked.terminal);
-    if (reaskedStatus !== undefined && QUEUE_CONCLUSIONS.has(reaskedStatus)) {
+    if (typeof reaskedStatus === "string" && REVIEW_QUEUE_STATUSES.has(reaskedStatus)) {
       return { admitted: reasked.admitted, terminal: reasked.terminal, status: reaskedStatus };
     }
     if (latestPayloadEscalated(reasked.terminal.roleOutcome)) return { stop: reasked };
@@ -1006,8 +1003,8 @@ async function auditSubmittedRole(
     return runPublicInstructionSeatResume({ runId: admitted.runId, message: SECRETARIAT_STATUS_REASK },
       { ...env, autoResumeLimit: 0 }, io);
   }
-  if (admitted.role === "countersign" && (typeof status !== "string" || !QUEUE_CONCLUSIONS.has(status))) {
-    return runPublicInstructionSeatResume({ runId: admitted.runId, message: COUNTERSIGN_STATUS_REASK },
+  if (admitted.role === "countersign" && (typeof status !== "string" || !REVIEW_QUEUE_STATUSES.has(status))) {
+    return runPublicInstructionSeatResume({ runId: admitted.runId, message: officerConclusionReask(status) },
       { ...env, autoResumeLimit: 0 }, io);
   }
   // Self-escalation is a valid open routing state for these seats only.

package/src/reviewer-role.ts

@@ -1,12 +1,9 @@
-import type { RoleHost, HostContext, HostToolResult } from "./host-contracts.ts";
-import { Type } from "typebox";
-import { openToolObject } from "./open-tool-schema.ts";
-import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
+import type { RoleHost, HostContext } from "./host-contracts.ts";
 
-import { REVIEWER_OUTPUT_TOOL_NAME, type ReviewerIntent } from "./package-contracts/reviewer-output.ts";
+import { registerFiledSubmissionTool } from "./filed-submission.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 
-export { REVIEWER_OUTPUT_TOOL_NAME };
-export type { ReviewerIntent };
+export { REVIEWER_OUTPUT_TOOL_NAME, reviewerOutputSchema, type ReviewerIntent } from "./package-contracts/reviewer-output.ts";
 
 /** Frozen admitted inputs the behavior layer may consume — no flag surface. */
 export type ReviewerAdmittedInputs = Readonly<{
@@ -17,25 +14,6 @@ export type ReviewerAdmittedInputs = Readonly<{
   ticketNumber?: number;
 }>;
 
-const REVIEWER_AMENDMENTS_DESCRIPTION =
-  "已运行 lens 的 amendments 承载 candidates、逐条处置与 verdict 的完整报告（非仅 verdict 行）；显式单轴时另一轴可省略（completeness / correctness）。hard-stop／usage error 为 refused 时，已产出报告仍照录对应 lens 字段。" as const;
-// #1134: `status` alone is the trajectory field (#917 §6 two normal lens verdicts →
-// completed; hard-stop / usage error → refused); its words ride the description.
-// amendments/diagnostic are LLM/human-read narrative content returned as
-// submitted — declaration keeps name + semantic description only, no nested
-// object shape, no string type, no required constraint.
-const REVIEWER_STATUS_DESCRIPTION =
-  "completed | refused。两种正常 lens verdict（completeness / correctness）均 completed；hard-stop 与 usage error 为 refused（已产出报告仍照录进所选 lens amendments）。" as const;
-const reviewerOutputObject = Type.Object({
-  status: Type.Unknown({ description: REVIEWER_STATUS_DESCRIPTION }),
-  amendments: Type.Unknown({ description: REVIEWER_AMENDMENTS_DESCRIPTION }),
-  diagnostic: Type.Unknown({
-    description: "拒绝诊断说明；hard-stop／usage error 原因进此字段，已产出报告另照录 amendments",
-  }),
-});
-export const reviewerOutputSchema = withTerminatingOutputDeclarations(
-  openToolObject(reviewerOutputObject),
-);
 export type ReviewerRoleDependencies = {
   loadSoul(): Promise<string>;
 };
@@ -70,15 +48,9 @@ export function createReviewerRoleRuntime(
 
       if (!registered) {
         registered = true;
-        pi.registerTool({ name: REVIEWER_OUTPUT_TOOL_NAME, label: "御史台输出", description: "提交御史台终局回执。", promptSnippet: "提交御史台终局回执", parameters: reviewerOutputSchema,
-          async execute(_id: string, parameters: unknown): Promise<HostToolResult<unknown>> {
-            if (!soul) throw new Error("御史台输入未装载");
-            return {
-              content: [],
-              details: parameters,
-              terminate: true as const,
-            };
-          } });
+        registerFiledSubmissionTool(pi, roleSubmissionDeclaration("reviewer"), {
+          readyError: () => (soul === undefined || soul.length === 0 ? "御史台输入未装载" : undefined),
+        });
       }
       const activatedSoul = soul;
       const activatedBase = fixedBaseRevision;

package/src/role-runtime.ts

@@ -6,7 +6,6 @@ import {
 
   runDirectoryFromHostContext,
   type HostContext,
-  type HostToolResult,
   type RoleEnvelopeHost,
   type RoleHost,
 } from "./host-contracts.ts";
@@ -14,6 +13,8 @@ import {
 import { Value } from "typebox/value";
 import { sitianReport } from "./sitian-facade.ts";
 import { createSubmissionLedgerHost, sealAcceptedSubmission } from "./submission-ledger.ts";
+import { registerFiledSubmissionTool, type FiledSubmissionBeforeAccept } from "./filed-submission.ts";
+import type { RoleSubmissionDeclaration } from "./role-submission-declarations.ts";
 
 import { activationTraceRecordSchema, namedActivationCause, type ActivationTraceRecord, type ActivationTraceWriter } from "./activation-trace.ts";
 import { homeFromRunDirectory } from "./activation-ledger-topology.ts";
@@ -547,18 +548,6 @@ export async function projectClosedSubmissionLifecycle(
   }
 }
 
-/**
- * Optional pre-accept hook on the shared filed-officer envelope (ADR 0075).
- * May return a details projection (envelope-owned machine facts recorded next to
- * the submitted parameters); undefined keeps the parameters as submitted.
- */
-type FiledOfficerBeforeAccept = (input: {
-  readonly toolCallId: string;
-  readonly parameters: unknown;
-  readonly signal: AbortSignal | undefined;
-  readonly ctx: HostContext;
-}) => Promise<unknown>;
-
 /**
  * Shared registration envelope for filed officers (ADR 0018 / #572):
  * activate, tool register, before_agent_start prompt, inventory check.
@@ -569,9 +558,9 @@ function createFiledOfficerRuntime(
   roleHost: RoleHost,
   spec: {
     role: PackagedRole;
-    tool: { name: string; label: string; description: string; promptSnippet: string; parameters: unknown };
+    tool: RoleSubmissionDeclaration;
     soulTag: string;
-    beforeAccept?: FiledOfficerBeforeAccept;
+    beforeAccept?: FiledSubmissionBeforeAccept;
   },
   dependencies: { loadSoul(): Promise<string> },
 ) {
@@ -584,26 +573,9 @@ function createFiledOfficerRuntime(
       soul = loaded;
       if (!registered) {
         registered = true;
-        roleHost.registerTool({
-          name: spec.tool.name,
-          label: spec.tool.label,
-          description: spec.tool.description,
-          promptSnippet: spec.tool.promptSnippet,
-          parameters: spec.tool.parameters as never,
-          async execute(toolCallId, parameters, signal, _onUpdate, ctx): Promise<HostToolResult<unknown>> {
-            if (soul === undefined) throw new Error(`${spec.role} 职分未装载`);
-            const projected =
-              spec.beforeAccept === undefined
-                ? undefined
-                : await spec.beforeAccept({ toolCallId, parameters, signal, ctx });
-            // Accept-as-is + terminate only. Shape is not an admission gate
-            // (第 0 条 / ADR 0055); sole-final barrier is ledger-owned (#575).
-            return {
-              content: [],
-              details: projected === undefined ? parameters : projected,
-              terminate: true as const,
-            };
-          },
+        registerFiledSubmissionTool(roleHost, spec.tool, {
+          readyError: () => (soul === undefined ? `${spec.role} 职分未装载` : undefined),
+          ...(spec.beforeAccept === undefined ? {} : { beforeAccept: spec.beforeAccept }),
         });
         roleHost.on("before_agent_start", (event) => {
           if (soul === undefined) throw new Error(`${spec.role} 职分未装载`);

package/src/role-submission-declarations.ts

@@ -0,0 +1,143 @@
+/**
+ * Field guidance for each public seat's submission tool (#1031).
+ * The tool name is the role registry's outputTool. This module does not restate it.
+ * Review seats keep the #1028 schema. Other seats keep their own field guidance.
+ * Execute lives in filed-submission.ts.
+ */
+import { packagedRoleOutputTool, type PackagedRole } from "./packaged-role-registry.ts";
+import { reviewSubmissionSchema } from "./review-submission.ts";
+import { collectorOutputArgsSchema } from "./collector-tool-schemas.ts";
+import { diaristOutputSchema } from "./diarist-contracts.ts";
+import { doctorSubmissionSchema, DOCTOR_OUTPUT_TOOL_DESCRIPTION } from "./doctor-contracts.ts";
+import { fixerOutputSchema } from "./package-contracts/fixer-output.ts";
+import { gatekeeperOutputSchema } from "./package-contracts/gatekeeper-output.ts";
+import { gleanerLeftOutputSchema } from "./gleaner-left-contracts.ts";
+import { mergerOutputSchema } from "./merger-contracts.ts";
+import { navigatorOutputSchema } from "./package-contracts/navigator-output.ts";
+import { reviewerOutputSchema } from "./package-contracts/reviewer-output.ts";
+import { secretariatVerdictSchema } from "./secretariat-contracts.ts";
+import { coderOutputSchema } from "./package-contracts/worker-output.ts";
+
+export type RoleSubmissionDeclaration = {
+  readonly role: PackagedRole;
+  readonly name: string;
+  readonly label: string;
+  readonly description: string;
+  readonly promptSnippet?: string;
+  readonly parameters: unknown;
+};
+
+type SubmissionFace = Omit<RoleSubmissionDeclaration, "role" | "name">;
+
+const SUBMISSION_FACE = {
+  judge: {
+    label: "大理寺输出",
+    description: "提交大理寺终局判词；交卷调用结束后，由公开调用接缝按判词状态执行适用审核。",
+    promptSnippet: "提交大理寺终局判词",
+    parameters: reviewSubmissionSchema,
+  },
+  fixer: {
+    label: "修内司输出",
+    description: "提交修内司终局回执。",
+    promptSnippet: "提交修内司终局回执",
+    parameters: fixerOutputSchema,
+  },
+  coder: {
+    label: "将作监输出",
+    description: "提交将作监终局回执。",
+    promptSnippet: "提交将作监终局回执",
+    parameters: coderOutputSchema,
+  },
+  reviewer: {
+    label: "御史台输出",
+    description: "提交御史台终局回执。",
+    promptSnippet: "提交御史台终局回执",
+    parameters: reviewerOutputSchema,
+  },
+  collector: {
+    label: "通进司输出",
+    description: "提交通进司回执。",
+    promptSnippet: "提交通进司回执",
+    parameters: collectorOutputArgsSchema,
+  },
+  doctor: {
+    label: "太医署输出",
+    description: DOCTOR_OUTPUT_TOOL_DESCRIPTION,
+    parameters: doctorSubmissionSchema,
+  },
+  merger: {
+    label: "合并输出",
+    description: "提交合并结果；输出分支为 completed 与 escalate。",
+    promptSnippet: "提交合并结果",
+    parameters: mergerOutputSchema,
+  },
+  notary: {
+    label: "符宝郎输出",
+    description: "提交引文保真与票面对齐的 converged/continue/escalate 决议。",
+    promptSnippet: "提交符宝郎决议",
+    parameters: reviewSubmissionSchema,
+  },
+  countersign: {
+    label: "给事中输出",
+    description: "给事中决议。",
+    promptSnippet: "给事中决议",
+    parameters: reviewSubmissionSchema,
+  },
+  secretariat: {
+    label: "中书省输出",
+    description: "中书省终局回执。",
+    promptSnippet: "中书省终局回执",
+    parameters: secretariatVerdictSchema,
+  },
+  "gleaner-left": {
+    label: "左拾遗输出",
+    description: "左拾遗弹章。",
+    promptSnippet: "左拾遗弹章",
+    parameters: gleanerLeftOutputSchema,
+  },
+  inspector: {
+    label: "台院输出",
+    description: "台院终局回执，状态为 converged、continue 或 escalate。",
+    promptSnippet: "台院终局回执",
+    parameters: reviewSubmissionSchema,
+  },
+  gatekeeper: {
+    label: "门下省决议",
+    description: "门下省终局决议。status 为 dispatch 或 pass。",
+    promptSnippet: "门下省决议",
+    parameters: gatekeeperOutputSchema,
+  },
+  navigator: {
+    label: "游奕使建议",
+    description: "游奕使终局回执：散文建议，原样呈现。",
+    promptSnippet: "游奕使建议",
+    parameters: navigatorOutputSchema,
+  },
+  auditor: {
+    label: "审刑院输出",
+    description: "审刑院终局回执，status 为 converged、continue 或 escalate。",
+    promptSnippet: "审刑院终局回执",
+    parameters: reviewSubmissionSchema,
+  },
+  diarist: {
+    label: "起居郎输出",
+    description: "起居郎交单票 sessions 或多票逐票 ticketSessions 边界；认不出本庭对象则 escalate。",
+    promptSnippet: "起居郎交边界",
+    parameters: diaristOutputSchema,
+  },
+} as const satisfies Record<PackagedRole, SubmissionFace>;
+
+/** Tool name comes from the registry record. Label and schema stay on this face. */
+export function roleSubmissionDeclaration(role: PackagedRole): RoleSubmissionDeclaration {
+  const name = packagedRoleOutputTool(role);
+  if (name === undefined) throw new Error(`${role} output tool is not declared`);
+  const face = SUBMISSION_FACE[role];
+  return {
+    role,
+    name,
+    label: face.label,
+    description: face.description,
+    ...("promptSnippet" in face ? { promptSnippet: face.promptSnippet } : {}),
+    parameters: face.parameters,
+  };
+}

package/src/secretariat-contracts.ts

@@ -7,7 +7,42 @@
  * is defaulted, rewritten, or dropped (ADR 0055).
  */
 
+import { Type } from "typebox";
+
+import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
+
 export const SECRETARIAT_OUTPUT_TOOL_NAME = "ak_secretariat_output";
+
+/**
+ * 中书省终局回执形状。
+ * #1134: `secretariatStatus` alone is the trajectory field
+ * (src/packaged-role-registry.ts receiptStatusKey; the public settlement reads
+ * converged | escalate to route); its words ride the description. note/evidence/
+ * decisionGate are declared name + semantic description only — the string type, the
+ * number type, the nested question/options object shape and the required constraint
+ * are deleted, because the package declaration IS the host's pre-dispatch validator.
+ * (ticketNumber keeps its own declaration: it is the declared seat identity the
+ * activation flag and settlement read, not narrative content.)
+ */
+export const secretariatVerdictSchema = withTerminatingOutputDeclarations(
+  Type.Object(
+    {
+      secretariatStatus: Type.Unknown({
+        description: "converged | escalate",
+      }),
+      ticketNumber: Type.Optional(
+        Type.Unknown({ description: "本票号；署时指向最终正文所在票" }),
+      ),
+      note: Type.Unknown({ description: "附注" }),
+      evidence: Type.Optional(Type.Unknown({ description: "留存证据" })),
+      decisionGate: Type.Unknown({
+        description: "需陛下处置的问题与选项；可写 question 与 options，原样留存。",
+      }),
+    },
+    { additionalProperties: true },
+  ),
+);
+(secretariatVerdictSchema as unknown as { required: string[] }).required = [];
 /**
  * #969 durable custom entry: 给事中 terminal (署|上呈) for seat settlement projection.
  * Carries original receipt bytes + nested runId. Envelope persists custom entries

package/src/secretariat-role.ts

@@ -4,54 +4,18 @@
  * shared envelope — src/role-runtime.ts (ADR 0018 / #924).
  */
 import type { Static } from "typebox";
-import { Type } from "typebox";
 
-import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
-import { SECRETARIAT_OUTPUT_TOOL_NAME, type SecretariatVerdict } from "./secretariat-contracts.ts";
+import { SECRETARIAT_OUTPUT_TOOL_NAME, secretariatVerdictSchema, type SecretariatVerdict } from "./secretariat-contracts.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 
 export { SECRETARIAT_OUTPUT_TOOL_NAME } from "./secretariat-contracts.ts";
 export type { SecretariatVerdict };
 
-/**
- * 中书省终局回执形状。
- * #1134: `secretariatStatus` alone is the trajectory field
- * (src/packaged-role-registry.ts:406 receiptStatusKey; the public settlement reads
- * converged | escalate to route); its words ride the description. note/evidence/
- * decisionGate are declared name + semantic description only — the string type, the
- * number type, the nested question/options object shape and the required constraint
- * are deleted, because the package declaration IS the host's pre-dispatch validator.
- * (ticketNumber keeps its own declaration: it is the declared seat identity the
- * activation flag and settlement read, not narrative content.)
- */
-export const secretariatVerdictSchema = withTerminatingOutputDeclarations(
-  Type.Object(
-    {
-      secretariatStatus: Type.Unknown({
-        description: "converged | escalate",
-      }),
-      ticketNumber: Type.Optional(
-        Type.Unknown({ description: "本票号；署时指向最终正文所在票" }),
-      ),
-      note: Type.Unknown({ description: "附注" }),
-      evidence: Type.Optional(Type.Unknown({ description: "留存证据" })),
-      decisionGate: Type.Unknown({
-        description: "需陛下处置的问题与选项；可写 question 与 options，原样留存。",
-      }),
-    },
-    { additionalProperties: true },
-  ),
-);
-(secretariatVerdictSchema as unknown as { required: string[] }).required = [];
+export { secretariatVerdictSchema } from "./secretariat-contracts.ts";
 
 export type SecretariatVerdictParameters = Static<typeof secretariatVerdictSchema>;
 
-export const SECRETARIAT_OUTPUT_TOOL_SPEC = {
-  name: SECRETARIAT_OUTPUT_TOOL_NAME,
-  label: "中书省输出",
-  description: "中书省终局回执。",
-  promptSnippet: "中书省终局回执",
-  parameters: secretariatVerdictSchema,
-} as const;
+export const SECRETARIAT_OUTPUT_TOOL_SPEC = roleSubmissionDeclaration("secretariat");
 
 export type SecretariatRuntimeDependencies = {
   loadSoul(): Promise<string>;

package/src/submission-gate.ts

@@ -28,21 +28,20 @@ import {
 } from "./gatekeeper-role.ts";
 import type { PublicSummonResult } from "./public-role-summons.ts";
 import type { TerminalResult } from "./public-cli/terminal.ts";
+import { receivedDiscriminator } from "./submission-errors.ts";
+import type { ReviewQueueWord } from "./review-submission.ts";
 
-/** Queue word of the latest this-terminal payload. History does not outrank it. */
-export function latestQueueStatus(terminal: TerminalResult | undefined): string | undefined {
+/** Received discriminator of the latest payload, retained verbatim for re-ask. */
+export function latestQueueStatus(terminal: TerminalResult | undefined): unknown {
   const outcome = terminal?.roleOutcome;
   if (outcome === undefined) return undefined;
   if (outcome.kind === "audit_escalation") return "escalate";
   if (outcome.kind !== "accepted") return undefined;
   const latest = outcome.payloads?.[outcome.payloads.length - 1];
-  if (isRecord(latest)) {
-    const status = (latest as { status?: unknown }).status;
-    if (typeof status === "string" && status.trim() !== "") return status;
+  if (isRecord(latest) && Object.hasOwn(latest, "status")) {
+    return receivedDiscriminator(latest, "status");
   }
-  return typeof outcome.status === "string" && outcome.status.trim() !== ""
-    ? outcome.status
-    : undefined;
+  return outcome.status;
 }
 
 export function latestQueuePayload(terminal: TerminalResult | undefined): unknown {
@@ -131,7 +130,7 @@ function bookDirectOfficerPointer(
  * public terminal without a second authority.
  */
 export type SubmissionGateOutcome = {
-  readonly status: "converged" | "continue" | "escalate";
+  readonly status: ReviewQueueWord;
   readonly officer: GateOfficer;
   readonly receipt: unknown;
   readonly runId?: string;