@akagilnc/pi-workflow-roles 0.1.5368 → 0.1.5382

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/session-assistant-usage.ts

@@ -7,6 +7,8 @@ import { join } from "node:path";
 
 import type { PublicSummonResult } from "./public-role-summons.ts";
 
+import { errorText } from "./unknown-value.ts";
+
 export async function readAssistantUsageFromSessionFile(
   sessionFile: string,
 ): Promise<Usage | undefined> {
@@ -30,7 +32,7 @@ export async function readAssistantUsageFromSessionFile(
       });
   } catch (error) {
     throw new Error(
-      `session usage parse failed (${sessionFile}): ${error instanceof Error ? error.message : String(error)}`,
+      `session usage parse failed (${sessionFile}): ${errorText(error)}`,
       { cause: error },
     );
   }

package/src/session-dialogue.ts

@@ -1,3 +1,4 @@
+import { isRecord } from "./unknown-value.ts";
 /**
  * 对话事实适配（ADR 0075 `dialogue-only` / `no-tool-output` / `speaker-required`）。
  *
@@ -20,10 +21,6 @@ export type DialogueEvent = {
   readonly id?: string;
 };
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 /**
  * 原生 id：行级或消息体级主键的单一实现（bound 解析与落盘共用）。
  * Pi/CC：行上 `uuid`/`id`；Codex：`response_item.payload.id`（或 `message.id`）。

package/src/session-identity.ts

@@ -42,7 +42,6 @@ export function createSessionIdentityAuthority(
   };
 }
 
-
 /**
  * Native session/thread id already stored for this principal on `host`.
  * Public explicit resume reads it once and hands it to the host adapter.

package/src/sitian-reader.ts

@@ -15,9 +15,7 @@ import type {
   SitianRecord,
 } from "./sitian-contracts.ts";
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
+import { isRecord, errorText } from "./unknown-value.ts";
 
 /** Read a Sitian record volume with full traversal and non-destructive diagnostics. */
 export async function readSitianRecords(recordFile: string): Promise<SitianReadResult> {
@@ -53,7 +51,7 @@ export async function readSitianRecords(recordFile: string): Promise<SitianReadR
         kind: "malformed",
         line: index + 1,
         raw: line,
-        error: error instanceof Error ? error.message : String(error),
+        error: errorText(error),
       });
     }
   }

package/src/submission-correctable-error.ts

@@ -6,6 +6,8 @@ import {
   WorkerUnfinishedReasonReminderError,
 } from "./submission-errors.ts";
 
+import { errorText } from "./unknown-value.ts";
+
 /** Shared, unforgeable identity for submission errors that the same session may correct. */
 const correctableSubmissionErrorBrand = Symbol("ak-roles.correctable-submission-error");
 
@@ -49,7 +51,7 @@ export type CorrectableExecuteRejectionProjection = {
 export function projectCorrectableExecuteRejection(
   error: unknown,
 ): CorrectableExecuteRejectionProjection {
-  const diagnostic = error instanceof Error ? error.message : String(error);
+  const diagnostic = errorText(error);
   if (error instanceof GatekeeperDecisionError) {
     return { diagnostic, details: { ...(error.result as Record<string, unknown>) } };
   }

package/src/submission-errors.ts

@@ -1,5 +1,6 @@
 import type { SubmissionGateNonPassResult } from "./gatekeeper-role.ts";
 import { readableGateItem } from "./readable-gate-item.ts";
+import { isRecord } from "./unknown-value.ts";
 
 /**
  * Tool-result text the parent model sees (#753 / #750 evidence).
@@ -69,7 +70,7 @@ export function unreadableDiscriminatorNotice(field: string, received: unknown):
 
 /** The received discriminator only — never the rest of the receipt. */
 export function receivedDiscriminator(receipt: unknown, field: string): unknown {
-  if (receipt === null || typeof receipt !== "object" || Array.isArray(receipt)) return undefined;
+  if (!isRecord(receipt)) return undefined;
   if (!Object.hasOwn(receipt, field)) return undefined;
   return (receipt as Record<string, unknown>)[field];
 }

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 (latest !== null && typeof latest === "object" && !Array.isArray(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 {
@@ -54,6 +53,8 @@ export function latestQueuePayload(terminal: TerminalResult | undefined): unknow
 }
 import { sessionFileFromPublicSummon } from "./session-assistant-usage.ts";
 
+import { isRecord } from "./unknown-value.ts";
+
 /**
  * Shared-envelope default officer summon (ADR 0018).
  * Role modules must not own this drive seam — only project results.
@@ -129,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;

package/src/submission-ledger.ts

@@ -12,7 +12,6 @@ import {
   type RoleHost,
 } from "./host-contracts.ts";
 
-
 import { runIdFromRunDirectory } from "./run-terminal-artifacts.ts";
 import { readSitianRecords, resolveSitianRecordPathInLedger, sitianReport, type RecordPointer } from "./sitian-facade.ts";
 import type { SitianRecord } from "./sitian-contracts.ts";
@@ -22,6 +21,8 @@ import { isCorrectableExecuteError } from "./submission-correctable-error.ts";
 import { failOnInfrastructureFailureDeclaration, infrastructureFailureDiagnostic } from "./package-contracts/terminating-infrastructure.ts";
 import { REVIEW_SUBMISSION_OUTPUT_TOOL_NAME } from "./review-submission.ts";
 
+import { isRecord, errorText } from "./unknown-value.ts";
+
 export type SubmissionCall = { readonly id: string; readonly name: string };
 export type SubmissionOutcomeKind = "correctable-rejection" | "audit-escalation" | "infrastructure";
 /** Typed correctable-rejection codes — bounce/reminder paths only (#836: no sole/non-terminate reject). */
@@ -662,9 +663,7 @@ export function createSubmissionLedgerHost(
             // host-failure seam. Tool identity comes from the registry map.
             const reviewEscalate = tool.name === REVIEW_SUBMISSION_OUTPUT_TOOL_NAME
               && infrastructureFailureDiagnostic(params) !== undefined
-              && params !== null
-              && typeof params === "object"
-              && !Array.isArray(params)
+              && isRecord(params)
               && (params as Record<string, unknown>).status === "escalate";
             if (!reviewEscalate) {
               failOnInfrastructureFailureDeclaration(
@@ -688,7 +687,7 @@ export function createSubmissionLedgerHost(
                 toolCallId,
                 outcome: "correctable-rejection",
                 code: "typed-bounce",
-                diagnostic: error instanceof Error ? error.message : String(error),
+                diagnostic: errorText(error),
                 role,
                 accepted: params,
               });
@@ -699,7 +698,7 @@ export function createSubmissionLedgerHost(
                 attemptId,
                 toolCallId,
                 outcome: "infrastructure",
-                diagnostic: error instanceof Error ? error.message : String(error),
+                diagnostic: errorText(error),
                 role,
                 accepted: params,
               });

package/src/ticket-provenance-contracts.ts

@@ -1,3 +1,4 @@
+import { isRecord } from "./unknown-value.ts";
 /**
  * 起居录（ticket-provenance）typed 形状 —— ADR 0075 / ADR 0081 / #1090。
  *
@@ -61,10 +62,6 @@ export type TicketProvenanceLine = {
   readonly text: string;
 };
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function positiveInteger(value: unknown): number | undefined {
   if (typeof value === "number" && Number.isSafeInteger(value) && value >= 1) return value;
   if (typeof value === "string" && /^[1-9][0-9]*$/.test(value)) {

package/src/ticket-provenance.ts

@@ -32,6 +32,8 @@ import {
   type TicketProvenanceSession,
 } from "./ticket-provenance-contracts.ts";
 
+import { errorText } from "./unknown-value.ts";
+
 /**
  * Typed input failure for diarist bounds/session path (reask, not infrastructure).
  * Accept hook discriminates with instanceof — never Error.message prefixes.
@@ -281,7 +283,7 @@ async function projectSessionRanges(input: {
     if (error instanceof TicketProvenanceInputError) throw error;
     const code = errnoCode(error);
     if (code === "ENOENT" || code === "ENOTDIR" || code === "EISDIR") {
-      const detail = error instanceof Error ? error.message : String(error);
+      const detail = errorText(error);
       throw new TicketProvenanceInputError(
         `session unreadable: ${input.session.path} (${detail})`,
         { cause: error },

package/src/ticket-snapshot.ts

@@ -13,6 +13,8 @@
  */
 import { createGhApiRunner, type GhApiRunner } from "./gh-api-runner.ts";
 
+import { isRecord } from "./unknown-value.ts";
+
 export type BookRepoBinding = {
   bookKey: string;
   owner: string;
@@ -92,10 +94,6 @@ export class TicketSnapshotApiError extends Error {
   }
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function requireNonEmpty(value: string, label: string): string {
   const trimmed = value.trim();
   if (!trimmed) throw new Error(`${label} must be a non-empty string`);

package/src/ticket-trajectory.ts

@@ -46,6 +46,7 @@ import {
 } from "./package-contracts/terminating-tools.ts";
 import { LEGACY_REVIEW_OUTPUT_ROLES, PACKAGED_ROLE_REGISTRY } from "./packaged-role-registry.ts";
 
+import { isRecord, isMissingPathError } from "./unknown-value.ts";
 
 /** Declared refresh bound for the same viewing surface (seconds). */
 export const DEFAULT_REFRESH_BOUNDARY_SECONDS = 30;
@@ -122,14 +123,6 @@ export type TicketTrajectoryRun = {
 
 type ParsedRun = TicketTrajectoryRun;
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function isMissingPathError(error: unknown): boolean {
-  return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
-}
-
 /** realpath when the node exists; lexical path only for recognized absence — never for other errors. */
 async function realpathOrLexicalIfMissing(path: string): Promise<string> {
   try {

package/src/typed-provider-http.ts

@@ -5,6 +5,8 @@
 import { readFile, unlink, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
+import { isEnoent, isRecord } from "./unknown-value.ts";
+
 const TYPED_HTTP_FILE = "typed-provider-http.json";
 
 export type TypedProviderHttpObservation = {
@@ -27,13 +29,7 @@ export async function clearTypedProviderHttpObservation(
   try {
     await unlink(typedProviderHttpPath(runDirectory));
   } catch (error) {
-    if (
-      error instanceof Error &&
-      "code" in error &&
-      (error as { code?: unknown }).code === "ENOENT"
-    ) {
-      return;
-    }
+    if (isEnoent(error)) return;
     throw error;
   }
 }
@@ -75,17 +71,11 @@ export async function readLatestTypedProviderHttpObservation(
   try {
     text = await readFile(typedProviderHttpPath(runDirectory), "utf8");
   } catch (error) {
-    if (
-      error instanceof Error &&
-      "code" in error &&
-      (error as { code?: unknown }).code === "ENOENT"
-    ) {
-      return undefined;
-    }
+    if (isEnoent(error)) return undefined;
     throw error;
   }
   const raw: unknown = JSON.parse(text);
-  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
+  if (!isRecord(raw)) {
     throw new Error("typed provider HTTP observation must be a JSON object");
   }
   const record = raw as Record<string, unknown>;

package/src/unknown-value.ts

@@ -0,0 +1,34 @@
+import { Guard } from "typebox/guard";
+
+/**
+ * Sole readers for a plain object, a Node errno, and an Error message.
+ * Callers choose which codes count; ENOTDIR is not ENOENT.
+ * Plain objects are TypeBox `Guard.IsObjectNotArray`.
+ */
+
+export function isRecord(value: unknown): value is Record<string, unknown> {
+  return Guard.IsObjectNotArray(value);
+}
+
+export function errnoCode(error: unknown): string | undefined {
+  return error !== null && typeof error === "object" && "code" in error
+    && typeof (error as { code: unknown }).code === "string"
+    ? (error as { code: string }).code
+    : undefined;
+}
+
+/** `Error.message`, otherwise `String(value)`. */
+export function errorText(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+/** True only for ENOENT on an Error. ENOTDIR and every other code stay distinct. */
+export function isEnoent(error: unknown): boolean {
+  return error instanceof Error && errnoCode(error) === "ENOENT";
+}
+
+/** ENOENT or ENOTDIR on an Error. */
+export function isMissingPathError(error: unknown): boolean {
+  const code = errnoCode(error);
+  return error instanceof Error && (code === "ENOENT" || code === "ENOTDIR");
+}

package/src/user-dialogue-stdin.ts

@@ -3,6 +3,8 @@
  * Pi's piped-stdin reader trims the wrapper; the body field keeps original bytes.
  * No size cap and no path/pointer substitute — the whole dialogue rides the envelope.
  */
+import { isRecord } from "./unknown-value.ts";
+
 export const USER_DIALOGUE_STDIN_KIND = "ak-user-dialogue" as const;
 
 export type UserDialogueStdinEnvelope = {
@@ -15,7 +17,7 @@ export function encodeUserDialogueStdin(body: string): string {
 }
 
 function isUserDialogueEnvelope(value: unknown): value is UserDialogueStdinEnvelope {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  if (!isRecord(value)) return false;
   const record = value as { kind?: unknown; body?: unknown };
   return record.kind === USER_DIALOGUE_STDIN_KIND && typeof record.body === "string";
 }

package/src/worker-role.ts

@@ -1,18 +1,15 @@
-import type { RoleHost, HostContext, HostToolResult, HostGatekeeperActions } from "./host-contracts.ts";
-import { Type, type Static } from "typebox";
-import { openToolObject } from "./open-tool-schema.ts";
-import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
+import type { RoleHost, HostContext, HostGatekeeperActions } from "./host-contracts.ts";
 
 import {
-  CODER_OUTPUT_TOOL_NAME,
-  FIXER_OUTPUT_TOOL_NAME,
   validateAcceptedWorkerDetails,
   type CoderOutput,
   type FixerOutput,
   type WorkerOutput,
   type WorkerRoleLabel,
 } from "./package-contracts/worker-output.ts";
-import { PARTIALLY_COMPLETED_DEFINITION, fixerOutputSchema, validateFixerOutput, type FixerPhase } from "./package-contracts/fixer-output.ts";
+import { validateFixerOutput, type FixerPhase } from "./package-contracts/fixer-output.ts";
+import { registerFiledSubmissionTool } from "./filed-submission.ts";
+import { roleSubmissionDeclaration } from "./role-submission-declarations.ts";
 import {
   FixerPacketValidationError,
   parseFixerPrerequisites,
@@ -23,37 +20,22 @@ import {
   WorkerCommitReminderError,
   WorkerPrefixReminderError,
   WorkerUnfinishedReasonReminderError,
+  type WorkerSubmissionGate,
 } from "./worker-submission-gates.ts";
 import {
   fixerBashSeatbeltDenyReason,
   matchFixerBashForbiddenLiteral,
 } from "./fixer-bash-seatbelt.ts";
 
+import { isRecord } from "./unknown-value.ts";
+
 export {
   CODER_OUTPUT_TOOL_NAME,
   FIXER_OUTPUT_TOOL_NAME,
+  coderOutputSchema,
   validateAcceptedWorkerDetails,
-};
-export type { WorkerOutput };
-
-// 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),
-);
-export type { FixerOutput, CoderOutput };
+} from "./package-contracts/worker-output.ts";
+export type { WorkerOutput, FixerOutput, CoderOutput };
 export const FIXER_FLAG_DEFINITIONS = {
   packet: {
     name: "ak-fix-packet",
@@ -104,10 +86,6 @@ export type WorkerRoleRuntime = {
   armSubmissionGate(cwd: string, parent: { getSessionFile(): string | undefined }): void;
 };
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 /** Read only the field that selects the worker's next package-owned path. */
 function workerStatusOf(output: WorkerOutput): string | undefined {
   return isRecord(output) && typeof output.status === "string"
@@ -130,10 +108,48 @@ export function validateWorkerOutput(
   return validateAcceptedWorkerDetails(output, "Coder") as CoderOutput;
 }
 
+/**
+ * Coder and fixer share one submission sequence: record via the shared tool,
+ * then read status and bounce through the same reminder gate.
+ * Seat differences stay in the ready check and the projection.
+ */
+function registerWorkerSubmission(
+  pi: RoleHost,
+  role: "coder" | "fixer",
+  options: {
+    readonly notReady: string;
+    readonly ready: () => boolean;
+    readonly phase: () => WorkerPhase | undefined;
+    readonly project: (parameters: unknown, phase: WorkerPhase) => WorkerOutput;
+    readonly submissionGate: WorkerSubmissionGate;
+    readonly hostActions: WorkerRoleHostActions;
+  },
+): void {
+  registerFiledSubmissionTool(pi, roleSubmissionDeclaration(role), {
+    readyError: () => (options.ready() ? undefined : options.notReady),
+    beforeAccept: async ({ toolCallId, parameters, ctx }) => {
+      const phase = options.phase();
+      if (phase === undefined) throw new Error(options.notReady);
+      const output = options.project(parameters, phase);
+      const status = workerStatusOf(output);
+      if (status !== undefined) {
+        assertAcceptableThroughHost(
+          options.submissionGate,
+          status,
+          output,
+          options.hostActions,
+          ctx,
+          toolCallId,
+        );
+      }
+      return output;
+    },
+  });
+}
 
 /** Reminder bounces stay typed rejects; IO/infrastructure keep identity via host failInfrastructure. */
 function assertAcceptableThroughHost(
-  submissionGate: { assertAcceptable(status: string, details?: unknown): void },
+  submissionGate: WorkerSubmissionGate,
   status: string,
   details: unknown,
   hostActions: WorkerRoleHostActions,
@@ -215,30 +231,13 @@ export function createFixerRoleRuntime(
 
       if (!lifecycleRegistered) {
         lifecycleRegistered = true;
-        pi.registerTool({
-          name: FIXER_OUTPUT_TOOL_NAME,
-          label: "修内司输出",
-          description: "提交修内司终局回执。",
-          promptSnippet: "提交修内司终局回执",
-          parameters: fixerOutputSchema,
-          async execute(toolCallId: string, parameters: unknown, _signal: AbortSignal | undefined, _onUpdate: unknown, ctx: HostContext): Promise<HostToolResult<unknown>> {
-            if (packet === undefined || phase === undefined) {
-              throw new Error("修内司修理包与阶段未装载");
-            }
-            const output = deepFreeze(validateFixerOutput(parameters, phase));
-            const status = workerStatusOf(output);
-            if (status !== undefined) {
-              assertAcceptableThroughHost(
-                submissionGate,
-                status,
-                output,
-                hostActions,
-                ctx,
-                toolCallId,
-              );
-            }
-            return { content: [], details: output, terminate: true as const };
-          },
+        registerWorkerSubmission(pi, "fixer", {
+          notReady: "修内司修理包与阶段未装载",
+          ready: () => packet !== undefined && phase !== undefined,
+          phase: () => phase,
+          project: (parameters, current) => deepFreeze(validateFixerOutput(parameters, current)),
+          submissionGate,
+          hostActions,
         });
         pi.on("tool_call", (event) => {
           if (event.toolName !== "bash") return;
@@ -313,32 +312,13 @@ export function createCoderRoleRuntime(
 
       if (!lifecycleRegistered) {
         lifecycleRegistered = true;
-        pi.registerTool({
-          name: CODER_OUTPUT_TOOL_NAME,
-          label: "将作监输出",
-          description: "提交将作监终局回执。",
-          promptSnippet: "提交将作监终局回执",
-          parameters: coderOutputSchema,
-          async execute(toolCallId: string, parameters: unknown, _signal: AbortSignal | undefined, _onUpdate: unknown, ctx: HostContext): Promise<HostToolResult<unknown>> {
-            if (task === undefined || phase === undefined) {
-              throw new Error("将作监任务与阶段未装载");
-            }
-            const output = validateWorkerOutput(parameters, phase, "Coder");
-            const status = workerStatusOf(output);
-            // #836: skill-expansion evidence rejection deleted (陛下「2.4/5 删」).
-            // Skill still ships with the package (ADR 0052); code no longer refuses on it.
-            if (status !== undefined) {
-              assertAcceptableThroughHost(
-                submissionGate,
-                status,
-                output,
-                hostActions,
-                ctx,
-                toolCallId,
-              );
-            }
-            return { content: [], details: output, terminate: true as const };
-          },
+        registerWorkerSubmission(pi, "coder", {
+          notReady: "将作监任务与阶段未装载",
+          ready: () => task !== undefined && phase !== undefined,
+          phase: () => phase,
+          project: (parameters, current) => validateWorkerOutput(parameters, current, "Coder"),
+          submissionGate,
+          hostActions,
         });
         pi.on("before_agent_start", (event, ctx) => {
           if (soul === undefined) throw new Error("将作监职分未装载");