@akagilnc/pi-workflow-roles 0.1.5368 → 0.1.5382

package/src/auditor-role.ts

@@ -3,8 +3,8 @@
  */
 import {
   AUDITOR_OUTPUT_TOOL_NAME,
-  auditorOutputSchema,
 } from "./package-contracts/auditor-output.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 
 export { AUDITOR_OUTPUT_TOOL_NAME };
 
@@ -12,10 +12,4 @@ export type AuditorRuntimeDependencies = {
   loadSoul(): Promise<string>;
 };
 
-export const AUDITOR_TOOL_SPEC = {
-  name: AUDITOR_OUTPUT_TOOL_NAME,
-  label: "审刑院输出",
-  description: "审刑院终局回执，status 为 converged、continue 或 escalate。",
-  promptSnippet: "审刑院终局回执",
-  parameters: auditorOutputSchema,
-} as const;
+export const AUDITOR_TOOL_SPEC = roleSubmissionDeclaration("auditor");

package/src/auditor-soul.ts

@@ -1,6 +1,8 @@
 import { readFile } from "node:fs/promises";
 import { basename, join } from "node:path";
 
+import { isRecord } from "./unknown-value.ts";
+
 import {
   joinPackageMaterials,
   readPackageMaterial,
@@ -126,7 +128,7 @@ export async function readAuditorResumeBinding(runDirectory: string): Promise<
     if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
     throw error;
   }
-  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return undefined;
+  if (!isRecord(raw)) return undefined;
   const record = raw as { sourceRunPath?: unknown; auditorSubject?: unknown };
   if (typeof record.sourceRunPath !== "string" || record.sourceRunPath.trim() === "") return undefined;
   const subject = isAuditorSoulRole(record.auditorSubject)

package/src/book-topology-migration-placement.ts

@@ -19,22 +19,11 @@ import {
   readMigrationDerivedTicketNumber,
 } from "./run-ticket-number.ts";
 
+import { isRecord, isEnoent } from "./unknown-value.ts";
+
 const TICKET_NUMBER_RE = /^[1-9][0-9]*$/;
 const RUN_DIR_NAME_RE = /^([^@]+)@([^@]+)$/;
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-/** Sole migration ENOENT projection — non-ENOENT must propagate. */
-export function isMigrationEnoent(error: unknown): boolean {
-  return (
-    error instanceof Error &&
-    "code" in error &&
-    (error as NodeJS.ErrnoException).code === "ENOENT"
-  );
-}
-
 /** Book-key directories under a books root; missing root → []. */
 export async function listMigrationBookKeys(
   booksDirectory: string,
@@ -46,7 +35,7 @@ export async function listMigrationBookKeys(
       .map((entry) => entry.name)
       .sort((a, b) => a.localeCompare(b));
   } catch (error) {
-    if (isMigrationEnoent(error)) return [];
+    if (isEnoent(error)) return [];
     throw error;
   }
 }
@@ -59,7 +48,7 @@ export async function listMigrationDirents(
     const entries = await readdir(directory, { withFileTypes: true });
     return [...entries].sort((a, b) => a.name.localeCompare(b.name));
   } catch (error) {
-    if (isMigrationEnoent(error)) return [];
+    if (isEnoent(error)) return [];
     throw error;
   }
 }
@@ -109,7 +98,7 @@ async function readProjectRootFromRun(
         return { projectRoot, sourcePage: page };
       }
     } catch (error) {
-      if (isMigrationEnoent(error)) continue;
+      if (isEnoent(error)) continue;
       throw error;
     }
   }

package/src/book-topology-migrators-t11.ts

@@ -25,7 +25,6 @@ import {
 import {
   findPlacedMigratingRun,
   isFlatRunsRelative,
-  isMigrationEnoent,
   isTicketNumberString,
   listBackupRunLeaves,
   listMigrationBookKeys,
@@ -37,6 +36,8 @@ import {
   type RunDirectoryPathRewrite,
 } from "./role-run-relocation.ts";
 
+import { isRecord, errorText, isEnoent } from "./unknown-value.ts";
+
 const AUDITOR_ROLES_PARTITION = "auditor-roles";
 const ISSUES_PARTITION = "issues";
 const DEPRECATED_KINDS_PARTITION = "deprecated-kinds";
@@ -101,7 +102,7 @@ async function directoryExists(path: string): Promise<boolean> {
     const info = await stat(path);
     return info.isDirectory();
   } catch (error) {
-    if (isMigrationEnoent(error)) return false;
+    if (isEnoent(error)) return false;
     throw error;
   }
 }
@@ -219,7 +220,7 @@ async function readJsonlParentSession(path: string): Promise<string | undefined>
   try {
     raw = await readFile(path, "utf8");
   } catch (error) {
-    if (isMigrationEnoent(error)) return undefined;
+    if (isEnoent(error)) return undefined;
     throw error;
   }
   const newline = raw.indexOf("\n");
@@ -227,7 +228,7 @@ async function readJsonlParentSession(path: string): Promise<string | undefined>
   if (line.length === 0) return undefined;
   try {
     const header: unknown = JSON.parse(line);
-    if (header === null || typeof header !== "object" || Array.isArray(header)) {
+    if (!isRecord(header)) {
       return undefined;
     }
     const parentSession = (header as { parentSession?: unknown }).parentSession;
@@ -268,13 +269,13 @@ async function findTrueVolumeParent(
   try {
     ledgerRaw = await readFile(join(volumeDirectory, CURRENT_SESSION_LEDGER), "utf8");
   } catch (error) {
-    if (isMigrationEnoent(error)) return undefined;
+    if (isEnoent(error)) return undefined;
     throw error;
   }
   let sessionFileField: string;
   try {
     const ledger: unknown = JSON.parse(ledgerRaw);
-    if (ledger === null || typeof ledger !== "object" || Array.isArray(ledger)) {
+    if (!isRecord(ledger)) {
       return undefined;
     }
     const sessionFile = (ledger as { sessionFile?: unknown }).sessionFile;
@@ -298,7 +299,7 @@ async function findTrueVolumeParent(
     const info = await lstat(liveSession);
     if (!info.isFile()) return undefined;
   } catch (error) {
-    if (isMigrationEnoent(error)) return undefined;
+    if (isEnoent(error)) return undefined;
     throw error;
   }
 
@@ -413,7 +414,7 @@ async function readSessionFileField(path: string): Promise<string | undefined> {
   try {
     raw = await readFile(path, "utf8");
   } catch (error) {
-    if (isMigrationEnoent(error)) return undefined;
+    if (isEnoent(error)) return undefined;
     throw error;
   }
   let parsed: unknown;
@@ -422,12 +423,12 @@ async function readSessionFileField(path: string): Promise<string | undefined> {
   } catch (error) {
     throw new Error(
       `book topology migration cannot read current-session pointer at ${path}: invalid JSON (${
-        error instanceof Error ? error.message : String(error)
+        errorText(error)
       })`,
       { cause: error },
     );
   }
-  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+  if (!isRecord(parsed)) {
     throw new Error(
       `book topology migration cannot read current-session pointer at ${path}: expected a JSON object`,
     );
@@ -480,7 +481,7 @@ async function mergeRewrittenCurrentSession(
     srcStat = await stat(srcPath);
     srcRaw = await readFile(srcPath, "utf8");
   } catch (error) {
-    if (isMigrationEnoent(error)) return;
+    if (isEnoent(error)) return;
     throw error;
   }
 
@@ -488,7 +489,7 @@ async function mergeRewrittenCurrentSession(
   let nextSessionFile: string | undefined;
   try {
     const parsed: unknown = JSON.parse(srcRaw);
-    if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
+    if (isRecord(parsed)) {
       const record = parsed as Record<string, unknown>;
       if (typeof record.sessionFile === "string") {
         const rewritten = rewritePathIntoDestination(
@@ -510,7 +511,7 @@ async function mergeRewrittenCurrentSession(
   try {
     destStat = await stat(destPath);
   } catch (error) {
-    if (!isMigrationEnoent(error)) throw error;
+    if (!isEnoent(error)) throw error;
   }
   await writeWinningCurrentSession(
     destPath,
@@ -656,7 +657,7 @@ async function copyIssuesNonRunTree(source: string, destination: string): Promis
         `book topology migration refuses to overwrite ${to} with ${from}`,
       );
     } catch (error) {
-      if (!isMigrationEnoent(error)) throw error;
+      if (!isEnoent(error)) throw error;
     }
     await cp(from, to, { preserveTimestamps: true });
   }
@@ -719,7 +720,7 @@ async function unlinkIfPresent(path: string): Promise<void> {
   try {
     await unlink(path);
   } catch (error) {
-    if (!isMigrationEnoent(error)) throw error;
+    if (!isEnoent(error)) throw error;
   }
 }
 

package/src/book-topology-mixed-volume-migrators.ts

@@ -17,12 +17,13 @@ import {
 import {
   bookHistoricalRoots,
   findPlacedMigratingRun,
-  isMigrationEnoent,
   listMigrationBookKeys,
   listMigrationDirents,
   runRefFromBoundPath,
 } from "./book-topology-migration-placement.ts";
 
+import { isRecord, isEnoent } from "./unknown-value.ts";
+
 const SITIAN_MIXED_VOLUME_PARTITIONS = [
   "attendance",
   "auditor",
@@ -32,10 +33,6 @@ const SITIAN_MIXED_VOLUME_PARTITIONS = [
 
 const CURRENT_SESSION_LEDGER = "current-session.json";
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function posixRelative(from: string, to: string): string {
   return relative(from, to).split(sep).join("/");
 }
@@ -98,7 +95,7 @@ async function readRegularBackupFile(path: string): Promise<string | undefined>
   try {
     info = await lstat(path);
   } catch (error) {
-    if (isMigrationEnoent(error)) return undefined;
+    if (isEnoent(error)) return undefined;
     throw error;
   }
   if (!info.isFile()) {

package/src/book-topology-record-class-migrators.ts

@@ -9,7 +9,6 @@
  * - malformed → unbound with exact bytes + malformedRows entry
  * - misplaced: any foreign jsonl whose kind is one of the three classes
  */
-import { createHash } from "node:crypto";
 import { appendFile, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { dirname, join, relative, sep } from "node:path";
 
@@ -18,7 +17,6 @@ import {
   findBookRunDirectory,
   findPlacedMigratingRun,
   findUniquePrincipalPlacedRun,
-  isMigrationEnoent,
   isTicketNumberString,
   listMigrationBookKeys,
   listMigrationDirents,
@@ -36,6 +34,9 @@ import {
 import { S4_SUBMISSION_LEDGER_KINDS } from "./sitian-appender.ts";
 import { projectTicketProvenanceHeader } from "./ticket-provenance-contracts.ts";
 
+import { sha256Hex } from "./sha256.ts";
+import { isRecord, isEnoent } from "./unknown-value.ts";
+
 const TICKET_PROVENANCE = "ticket-provenance";
 const SUBMISSION_LEDGER = "submission-ledger";
 const ATTEMPT_HISTORY = "attempt-history";
@@ -47,10 +48,6 @@ type JsonLine =
   | { readonly ok: true; readonly value: Record<string, unknown>; readonly raw: string }
   | { readonly ok: false; readonly raw: string };
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function parseJsonlLine(raw: string): JsonLine {
   try {
     const value: unknown = JSON.parse(raw);
@@ -70,7 +67,7 @@ function lineSource(backupBooksDirectory: string, filePath: string, index: numbe
 }
 
 function stableKey(material: string): string {
-  return createHash("sha256").update(material).digest("hex").slice(0, 32);
+  return sha256Hex(material).slice(0, 32);
 }
 
 async function readJsonlLines(filePath: string): Promise<readonly string[]> {
@@ -78,7 +75,7 @@ async function readJsonlLines(filePath: string): Promise<readonly string[]> {
   try {
     text = await readFile(filePath, "utf8");
   } catch (error) {
-    if (isMigrationEnoent(error)) return [];
+    if (isEnoent(error)) return [];
     throw error;
   }
   if (text.length === 0) return [];
@@ -629,7 +626,7 @@ async function mergeOfferedIdentities(
     await stat(from);
     lines = await readJsonlLines(from);
   } catch (error) {
-    if (isMigrationEnoent(error)) return;
+    if (isEnoent(error)) return;
     throw error;
   }
   const destFile = join(destDir, OFFERED_IDENTITIES);
@@ -704,7 +701,7 @@ async function migrateHomePartitionBook(
       try {
         await stat(recordsFile);
       } catch (error) {
-        if (isMigrationEnoent(error)) continue;
+        if (isEnoent(error)) continue;
         throw error;
       }
       await migrateJsonlFileByKind(context, bookKey, writes, recordsFile, TICKET_PROVENANCE, outcomes);

package/src/book-topology-runs-migrator.ts

@@ -10,7 +10,6 @@ import { basename, dirname, join, relative, sep } from "node:path";
 
 import {
   destinationRunDirectory,
-  isMigrationEnoent,
   isTicketNumberString,
   listBackupRunLeaves,
   listMigrationBookKeys,
@@ -32,6 +31,8 @@ import {
   readBoardTicketNumber,
 } from "./run-ticket-number.ts";
 
+import { isEnoent } from "./unknown-value.ts";
+
 const RUNS_PARTITION = "runs";
 
 const RUN_LEAF =
@@ -62,7 +63,7 @@ async function pathExists(path: string): Promise<boolean> {
     await stat(path);
     return true;
   } catch (error) {
-    if (isMigrationEnoent(error)) return false;
+    if (isEnoent(error)) return false;
     throw error;
   }
 }
@@ -307,7 +308,7 @@ export async function relocateBoardBoundUnboundRunsInBook(
   try {
     entries = await readdir(unboundRuns, { withFileTypes: true });
   } catch (error) {
-    if (isMigrationEnoent(error)) return [];
+    if (isEnoent(error)) return [];
     throw error;
   }
 

package/src/collector-config.ts

@@ -1,6 +1,8 @@
-import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 
+import { sha256Hex } from "./sha256.ts";
+import { isRecord } from "./unknown-value.ts";
+
 export const COLLECTOR_OWNER_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?$/;
 export const COLLECTOR_REPO_PATTERN = /^[A-Za-z0-9](?:[A-Za-z0-9._-]{0,98}[A-Za-z0-9])?$/;
 
@@ -51,17 +53,13 @@ export function parseCollectorPrNumber(raw: unknown): number {
   return value;
 }
 
-function record(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function canonicalManifest(requests: readonly CollectorRequestConfig[]): string {
   return `${JSON.stringify({ requests: requests.map((request) => ({ id: request.id, body: request.requestBody })) })}\n`;
 }
 
 export function emptyCollectorManifest(): CollectorManifest {
   const canonicalJson = canonicalManifest([]);
-  return { requests: [], canonicalJson, digest: createHash("sha256").update(canonicalJson).digest("hex") };
+  return { requests: [], canonicalJson, digest: sha256Hex(canonicalJson) };
 }
 
 /** Optional request configuration. It names requests, never expected observers. */
@@ -70,17 +68,17 @@ export async function loadCollectorManifest(path: string): Promise<CollectorMani
   try { bytes = await readFile(path); } catch (error) { fail(`Collector request manifest is unreadable at ${path}`, error); }
   let parsed: unknown;
   try { parsed = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes)); } catch (error) { fail("Collector request manifest must be UTF-8 JSON", error); }
-  if (!record(parsed)) fail("Collector request manifest must be an object");
+  if (!isRecord(parsed)) fail("Collector request manifest must be an object");
   const rawRequests = parsed.requests ?? [];
   if (!Array.isArray(rawRequests)) fail("Collector request manifest requests must be an array");
   const requests: CollectorRequestConfig[] = [];
   const ids = new Set<string>();
   for (const [index, item] of rawRequests.entries()) {
-    if (!record(item) || typeof item.id !== "string" || item.id.length === 0 || typeof item.body !== "string" || item.body.trim() === "") fail(`Collector request manifest requests[${index}] is invalid`);
+    if (!isRecord(item) || typeof item.id !== "string" || item.id.length === 0 || typeof item.body !== "string" || item.body.trim() === "") fail(`Collector request manifest requests[${index}] is invalid`);
     if (ids.has(item.id)) fail(`Collector request manifest has duplicate request id "${item.id}"`);
     ids.add(item.id);
     requests.push({ id: item.id, requestBody: item.body });
   }
   const canonicalJson = canonicalManifest(requests);
-  return { requests, canonicalJson, digest: createHash("sha256").update(canonicalJson).digest("hex"), sourcePath: path };
+  return { requests, canonicalJson, digest: sha256Hex(canonicalJson), sourcePath: path };
 }

package/src/collector-role.ts

@@ -3,8 +3,9 @@
  * #1088: code no longer observes/requests/merges GitHub findings — the LLM
  * uses host CLI tools. Envelope owns host-surface + construction seatbelt.
  */
-import type { RoleHost, HostContext, HostToolResult } from "./host-contracts.ts";
-import type { Static } from "typebox";
+import type { RoleHost, HostContext } from "./host-contracts.ts";
+import { registerFiledSubmissionTool } from "./filed-submission.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 
 import {
   emptyCollectorManifest,
@@ -17,8 +18,6 @@ import {
 import {
   COLLECTOR_OUTPUT_TOOL,
 } from "./package-contracts/collector-output.ts";
-import { collectorOutputArgsSchema } from "./collector-tool-schemas.ts";
-
 export { COLLECTOR_OUTPUT_TOOL };
 
 export const COLLECTOR_REQUIRED_TOOLS = [COLLECTOR_OUTPUT_TOOL] as const;
@@ -54,8 +53,6 @@ export const COLLECTOR_TRANSPORT_FLAGS = Object.freeze([
   }),
 ] as const);
 
-const outputSchema = collectorOutputArgsSchema;
-type OutputParams = Static<typeof outputSchema>;
 
 export type CollectorRoleDependencies = {
   loadSoul(): Promise<string>;
@@ -164,28 +161,8 @@ export function createCollectorRoleRuntime(
       if (toolsRegistered) return;
       toolsRegistered = true;
 
-      pi.registerTool({
-        name: COLLECTOR_OUTPUT_TOOL,
-        label: "通进司输出",
-        description: "提交通进司回执。",
-        promptSnippet: "提交通进司回执",
-        parameters: outputSchema,
-        async execute(
-          _toolCallId: string,
-          params: OutputParams,
-          _signal: AbortSignal | undefined,
-          _onUpdate: unknown,
-          _ctx: HostContext,
-        ): Promise<HostToolResult<unknown>> {
-          const activation = getActivation();
-          if (activation === undefined) throw new Error("通进司未激活");
-          // #1088 / #836: record as submitted — runtime does not merge findings.
-          return {
-            content: [],
-            details: params,
-            terminate: true as const,
-          };
-        },
+      registerFiledSubmissionTool(pi, roleSubmissionDeclaration("collector"), {
+        readyError: () => (getActivation() === undefined ? "通进司未激活" : undefined),
       });
     },
   };

package/src/compliance-transport.ts

@@ -8,6 +8,7 @@ import { officerConclusionReask } from "./gatekeeper-role.ts";
 import { receivedDiscriminator } from "./submission-errors.ts";
 import { coalesceSubmissionRows } from "./public-cli/terminal.ts";
 import { readableGateItem } from "./readable-gate-item.ts";
+import { isRecord } from "./unknown-value.ts";
 
 export type ComplianceNoReceipt = NoReceiptLifecycleFacts & { status: "no-receipt"; usage?: Usage };
 /**
@@ -63,7 +64,7 @@ function readListField(value: unknown): readonly unknown[] { return Array.isArra
 
 /** Try to project a known three-state compliance decision; undefined when not converged/continue/escalate. */
 export function tryReadComplianceCandidate(arguments_: unknown, usage?: Usage): ComplianceDecision | undefined {
-  if (typeof arguments_ !== "object" || arguments_ === null || Array.isArray(arguments_)) {
+  if (!isRecord(arguments_)) {
     return undefined;
   }
   const args = arguments_ as Record<string, unknown>;

package/src/countersign-contracts.ts

@@ -6,6 +6,7 @@
  */
 
 import { REVIEW_QUEUE_STATUSES, REVIEW_SUBMISSION_OUTPUT_TOOL_NAME } from "./review-submission.ts";
+import { isRecord } from "./unknown-value.ts";
 
 export const COUNTERSIGN_OUTPUT_TOOL_NAME = REVIEW_SUBMISSION_OUTPUT_TOOL_NAME;
 
@@ -25,7 +26,7 @@ export type CountersignVerdict =
   };
 
 export function validateRecordedCountersignOutput(verdict: unknown): CountersignVerdict {
-  if (verdict === null || typeof verdict !== "object" || Array.isArray(verdict)) {
+  if (!isRecord(verdict)) {
     throw new Error("Countersign verdict has no execution discriminator");
   }
   let status: unknown;

package/src/countersign-role.ts

@@ -1,4 +1,5 @@
 import { reviewSubmissionSchema } from "./review-submission.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 import {
   COUNTERSIGN_OUTPUT_TOOL_NAME,
   validateRecordedCountersignOutput,
@@ -26,10 +27,4 @@ export type CountersignRuntimeDependencies = {
  * 决定工具规格。生命周期装配（注册、activate、prompt 注入、singleton 检查、
  * terminate）归注册信封 owner——src/role-runtime.ts（ADR 0018 / #572 R2 判词）。
  */
-export const COUNTERSIGN_TOOL_SPEC = {
-  name: COUNTERSIGN_OUTPUT_TOOL_NAME,
-  label: "给事中输出",
-  description: "给事中决议。",
-  promptSnippet: "给事中决议",
-  parameters: countersignVerdictSchema,
-} as const;
+export const COUNTERSIGN_TOOL_SPEC = roleSubmissionDeclaration("countersign");

package/src/diarist-contracts.ts

@@ -7,11 +7,16 @@
  * #901: LLM submits bounds; the mechanical layer projects source bytes.
  */
 
+import { Type } from "typebox";
+
+import { openToolObject } from "./open-tool-schema.ts";
+import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 import {
   projectTicketProvenanceSessions,
   type TicketProvenanceSession,
 } from "./ticket-provenance-contracts.ts";
 import { isSafePositiveTicketNumber } from "./run-ticket-number.ts";
+import { isRecord } from "./unknown-value.ts";
 
 export const DIARIST_OUTPUT_TOOL_NAME = "ak_diarist_output";
 
@@ -43,7 +48,7 @@ export type DiaristOutput =
     };
 
 export function validateRecordedDiaristOutput(value: unknown): DiaristOutput {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+  if (!isRecord(value)) {
     throw new Error("Diarist output has no execution discriminator");
   }
   let status: unknown;
@@ -78,7 +83,7 @@ export function projectDiaristTicketSessions(
   if (!Array.isArray(raw)) return undefined;
   const perTicket = new Map<number, TicketProvenanceSession[]>();
   for (const entry of raw) {
-    if (entry === null || typeof entry !== "object" || Array.isArray(entry)) return undefined;
+    if (!isRecord(entry)) return undefined;
     const { ticketNumber, sessions: rawSessions } = entry as Record<string, unknown>;
     if (!isSafePositiveTicketNumber(ticketNumber)) return undefined;
     const sessions = projectTicketProvenanceSessions(rawSessions);
@@ -87,3 +92,36 @@ export function projectDiaristTicketSessions(
   }
   return Array.from(perTicket, ([ticketNumber, sessions]) => ({ ticketNumber, sessions }));
 }
+
+/**
+ * 起居郎交卷形状。
+ * #901：交边界（sessions）；正文与不可解析原字节由机械投影。
+ * status 的合法词（completed | escalate）写在 description，结算认这些词。
+ * sessions / ticketSessions 是投影所读的边界：卷路径或端点读不出时走既有 reask，不中止本轮。
+ * 声明只留字段名和语义说明，不留类型、嵌套、长度、必填。
+ */
+const DIARIST_SESSIONS_DESCRIPTION =
+  "对话边界。每卷含 path（会话卷绝对或可读路径）与 ranges（本卷本轮各区间）。每段区间含 from / to；起点与终点各写 id（原生 id）或 line（本轮行号），二选一。空列表＝本轮无对话可划。端点无法指名时走 reask，不中止。" as const;
+
+export const diaristOutputSchema = withTerminatingOutputDeclarations(
+  openToolObject(
+    Type.Object({
+      status: Type.Unknown({
+        description: "completed | escalate",
+      }),
+      ticketNumber: Type.Optional(
+        Type.Unknown({
+          description:
+            "本庭对象票号（正整数）或 null/省略＝真无票；下游走 typed 键；认不出用 status=escalate，不洗成无录。机械层不重判。",
+        }),
+      ),
+      reason: Type.Unknown({
+        description: "status 为 escalate 时：认不出本庭对象的原因",
+      }),
+      sessions: Type.Optional(Type.Unknown({ description: DIARIST_SESSIONS_DESCRIPTION })),
+      ticketSessions: Type.Unknown({
+        description: `多票庭逐票对话边界；每票含 ticketNumber（本条边界所归票号，正整数）与 sessions（${DIARIST_SESSIONS_DESCRIPTION}）。一次交卷各票各自分录。与单票 sessions 二选一。`,
+      }),
+    }),
+  ),
+);

package/src/diarist-role.ts

@@ -1,53 +1,20 @@
 import type { Static } from "typebox";
-import { Type } from "typebox";
 
-import { openToolObject } from "./open-tool-schema.ts";
-import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 import {
   DIARIST_OUTPUT_TOOL_NAME,
+  diaristOutputSchema,
   validateRecordedDiaristOutput,
   type DiaristOutput,
 } from "./diarist-contracts.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 
 export {
   DIARIST_OUTPUT_TOOL_NAME,
+  diaristOutputSchema,
 } from "./diarist-contracts.ts";
 export type { DiaristOutput };
 export { validateRecordedDiaristOutput };
 
-/**
- * 起居郎交卷形状。
- * #901：交边界（sessions）；正文与不可解析原字节由机械投影。
- * status 的合法词（completed | escalate）写在 description，结算认这些词。
- * sessions / ticketSessions 是投影所读的边界：卷路径或端点读不出时走既有 reask，不中止本轮。
- * 声明只留字段名和语义说明，不留类型、嵌套、长度、必填。
- */
-const DIARIST_SESSIONS_DESCRIPTION =
-  "对话边界。每卷含 path（会话卷绝对或可读路径）与 ranges（本卷本轮各区间）。每段区间含 from / to；起点与终点各写 id（原生 id）或 line（本轮行号），二选一。空列表＝本轮无对话可划。端点无法指名时走 reask，不中止。" as const;
-
-export const diaristOutputSchema = withTerminatingOutputDeclarations(
-  openToolObject(
-    Type.Object({
-      status: Type.Unknown({
-        description: "completed | escalate",
-      }),
-      ticketNumber: Type.Optional(
-        Type.Unknown({
-          description:
-            "本庭对象票号（正整数）或 null/省略＝真无票；下游走 typed 键；认不出用 status=escalate，不洗成无录。机械层不重判。",
-        }),
-      ),
-      reason: Type.Unknown({
-        description: "status 为 escalate 时：认不出本庭对象的原因",
-      }),
-      sessions: Type.Optional(Type.Unknown({ description: DIARIST_SESSIONS_DESCRIPTION })),
-      ticketSessions: Type.Unknown({
-        description: `多票庭逐票对话边界；每票含 ticketNumber（本条边界所归票号，正整数）与 sessions（${DIARIST_SESSIONS_DESCRIPTION}）。一次交卷各票各自分录。与单票 sessions 二选一。`,
-      }),
-    }),
-  ),
-);
-
 export type DiaristOutputParameters = Static<typeof diaristOutputSchema>;
 
 export type DiaristRuntimeDependencies = {
@@ -57,11 +24,4 @@ export type DiaristRuntimeDependencies = {
 /**
  * 决定工具规格。生命周期装配归注册信封 owner——src/role-runtime.ts（ADR 0018）。
  */
-export const DIARIST_TOOL_SPEC = {
-  name: DIARIST_OUTPUT_TOOL_NAME,
-  label: "起居郎输出",
-  description:
-    "起居郎交单票 sessions 或多票逐票 ticketSessions 边界；认不出本庭对象则 escalate。",
-  promptSnippet: "起居郎交边界",
-  parameters: diaristOutputSchema,
-} as const;
+export const DIARIST_TOOL_SPEC = roleSubmissionDeclaration("diarist");