@akagilnc/pi-workflow-roles 0.1.4980 → 0.1.4989

package/src/inspector-role.ts

@@ -1,8 +1,5 @@
 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 { reviewSubmissionSchema } from "./review-submission.ts";
 import {
   INSPECTOR_OUTPUT_TOOL_NAME,
   validateRecordedInspectorOutput,
@@ -17,21 +14,7 @@ export type { InspectorOutput };
 export { validateRecordedInspectorOutput };
 
 /** 台院事后察举交卷形状；形状指引，非 schema 闸。 */
-export const inspectorOutputSchema = withTerminatingOutputDeclarations(
-  openToolObject(
-    Type.Object({
-      status: Type.Unknown({
-        description: "pass | bounce | escalate — 形状指引，非 schema 闸",
-      }),
-      findings: Type.Unknown({
-        description: "随交卷留存的问题记录",
-      }),
-      reason: Type.Optional(Type.Unknown({
-        description: "status 为 escalate 时的上呈理由",
-      })),
-    }),
-  ),
-);
+export const inspectorOutputSchema = reviewSubmissionSchema;
 
 export type InspectorOutputParameters = Static<typeof inspectorOutputSchema>;
 
@@ -45,7 +28,7 @@ export type InspectorRuntimeDependencies = {
 export const INSPECTOR_TOOL_SPEC = {
   name: INSPECTOR_OUTPUT_TOOL_NAME,
   label: "台院输出",
-  description: "台院终局回执，状态为 pass、bounce 或 escalate。",
+  description: "台院终局回执，状态为 converged、continue 或 escalate。",
   promptSnippet: "台院终局回执",
   parameters: inspectorOutputSchema,
 } as const;

package/src/judge-role.ts

@@ -1,7 +1,6 @@
 import type { RoleHost, HostContext, HostToolResult, HostGatekeeperActions } from "./host-contracts.ts";
-import { Type, type Static } from "typebox";
-
-import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
+import type { Static } from "typebox";
+import { reviewSubmissionSchema } from "./review-submission.ts";
 import { GatekeeperDecisionError, ParentQueueReaskError } from "./submission-errors.ts";
 import { projectGatekeeperEscalation } from "./audit-escalation.ts";
 
@@ -14,50 +13,17 @@ import {
 
 const JUDGE_QUEUE_STATUSES = new Set(["converged", "continue", "escalate"]);
 const JUDGE_STATUS_REASK =
-  "judgeStatus 不是 converged、continue、escalate 三态之一。请重新交卷，status 写明其一。" as const;
+  "status 不是 converged、continue、escalate 三态之一。请重新交卷，status 写明其一。" as const;
 
 export { JUDGE_OUTPUT_TOOL_NAME };
 export type { JudgeVerdict };
 
 // #836 r16 class 1: fix/classes/note/decisionGate are LLM/human-read narrative
 // content — 符宝郎/审刑院 read the raw receipt, no code branches on their length
-// or nested presence. `judgeStatus` alone is the machine discriminator the
-// queue reads to pick pass/bounce/escalate (src/judge-role.ts:90-125).
-// #836 (ADR 0003 Amendment): judgeStatus kept open like countersignStatus
-// (src/countersign-role.ts) — a closed domain here would reject an unknown
-// value before the rawStatus/ParentQueueReaskError check below ever runs.
-export const judgeVerdictSchema = withTerminatingOutputDeclarations(
-  Type.Object(
-    {
-      judgeStatus: Type.Unknown({ description: "converged | continue | escalate — 形状指引，非 schema 闸" }),
-      fix: Type.Optional(
-        Type.Object(
-          { summary: Type.Optional(Type.String({ description: "continue 时的补救摘要" })) },
-          { additionalProperties: true, description: "continue 时的补救说明" },
-        ),
-      ),
-      classes: Type.Optional(Type.Array(Type.Object({
-        name: Type.Optional(Type.String()),
-        owner: Type.Optional(Type.String()),
-        boundary: Type.Optional(Type.String()),
-        disposition: Type.Optional(Type.String()),
-      }, { additionalProperties: true }), { description: "已裁决 finding 类及其 owner 与修理边界" })),
-      note: Type.Optional(Type.String({ description: "可选裁决附注" })),
-      evidence: Type.Optional(Type.Unknown({ description: "留存的裁决证据" })),
-      decisionGate: Type.Optional(
-        Type.Object(
-          {
-            question: Type.Optional(Type.String()),
-            options: Type.Optional(Type.Array(Type.String())),
-          },
-          { additionalProperties: true, description: "需人权威处置的问题与选项" },
-        ),
-      ),
-    },
-    { additionalProperties: true },
-  ),
-);
-(judgeVerdictSchema as unknown as { required: string[] }).required = [];
+// or nested presence. `status` alone is the machine discriminator the
+// queue reads to pick converged/continue/escalate (below).
+// The shared open schema preserves role-specific prose without adding another contract.
+export const judgeVerdictSchema = reviewSubmissionSchema;
 
 type JudgeVerdictParameters = Static<typeof judgeVerdictSchema>;
 
@@ -97,12 +63,12 @@ export function createJudgeRoleRuntime(
           parameters: judgeVerdictSchema,
           async execute(toolCallId: string, parameters: Static<typeof judgeVerdictSchema>, signal: AbortSignal | undefined, _onUpdate: unknown, ctx: HostContext): Promise<HostToolResult<unknown>> {
             if (soul === undefined) throw new Error("大理寺职分未装载");
-            // #756 queue: read judgeStatus only — escalate skips gates (thrown to caller);
+            // #756 queue: read shared status only — escalate skips gates;
             // unreadable status returns to judge; else 符宝郎内闸 then 审刑院合规.
             const rawStatus =
               parameters !== null && typeof parameters === "object" && !Array.isArray(parameters)
-              && typeof (parameters as Record<string, unknown>).judgeStatus === "string"
-                ? (parameters as Record<string, unknown>).judgeStatus as string
+              && typeof (parameters as Record<string, unknown>).status === "string"
+                ? (parameters as Record<string, unknown>).status as string
                 : undefined;
             if (rawStatus === undefined || !JUDGE_QUEUE_STATUSES.has(rawStatus)) {
               throw new ParentQueueReaskError(JUDGE_STATUS_REASK);
@@ -119,10 +85,10 @@ export function createJudgeRoleRuntime(
             const verdict = validateVerdict(parameters);
             // Candidate verdict is already on the parent session books as this
             // tool-call leaf (first-record-then-audit; run 019fea05 L61/L62).
-            // #753: 符宝郎内闸 — bounce returns raw receipt; escalate pauses.
-            let draftPass: { receipt: unknown } | undefined;
+            // #753: 符宝郎内闸 — continue returns the raw receipt as a nonterminal tool result.
+            let draftPass: { status: "converged" | "continue"; receipt: unknown } | undefined;
             try {
-              const obtainedDraftPass = await pi.requireGatekeeperPass!({
+              const obtainedDraftPass = await pi.requireSubmissionGate!({
                 context: ctx,
                 subject: { kind: "judge_draft" },
                 ...(signal === undefined ? {} : { signal }),
@@ -132,11 +98,18 @@ export function createJudgeRoleRuntime(
                 submission: parameters,
               });
               draftPass = obtainedDraftPass || undefined;
+              if (draftPass?.status === "continue") {
+                return {
+                  content: [{ type: "text" as const, text: readableGateItem(draftPass.receipt) }],
+                  details: verdict,
+                  terminate: false,
+                };
+              }
               if (draftPass !== undefined) hostActions.bindPriorGatePass(toolCallId, draftPass.receipt);
               // #756: 审刑院合规路径 — same review-queue law as 符宝郎/台院.
-              // pass → accept; bounce → raw auditor receipt; escalate → pause;
+              // converged → accept; continue → raw auditor receipt; escalate → pause;
               // not three-state → resume auditor; no round cap; no disposeCompliance mapping.
-              const compliancePass = await pi.requireGatekeeperPass!({
+              const compliancePass = await pi.requireSubmissionGate!({
                 context: ctx,
                 subject: { kind: "judge_compliance" },
                 ...(signal === undefined ? {} : { signal }),
@@ -145,6 +118,13 @@ export function createJudgeRoleRuntime(
                 // #879: same parent payload for 审刑院; not recovered from session latest.
                 submission: parameters,
               });
+              if (compliancePass?.status === "continue") {
+                return {
+                  content: [draftPass, compliancePass].filter((pass) => pass !== undefined).map((pass) => ({ type: "text" as const, text: readableGateItem(pass.receipt) })),
+                  details: verdict,
+                  terminate: false,
+                };
+              }
               return {
                 content: [draftPass, compliancePass].filter((pass) => pass !== undefined).map((pass) => ({ type: "text" as const, text: readableGateItem(pass.receipt) })),
                 details: verdict,

package/src/navigator-invocation-identity.ts

@@ -24,7 +24,7 @@
  *   - marker role/phase/subjectKey must match the terminal + independent expected
  */
 
-import { PACKAGED_ROLE_REGISTRY } from "./packaged-role-registry.ts";
+import { LEGACY_REVIEW_OUTPUT_ROLES, PACKAGED_ROLE_REGISTRY } from "./packaged-role-registry.ts";
 import { isUuidV7, uuidv7 } from "./uuidv7.ts";
 import { workSubjectKeysEqual } from "./work-subject-identity.ts";
 
@@ -113,7 +113,8 @@ export function isNavigatorInfrastructureFailureFact(
 }
 
 const PACKAGED_ROLE_OUTPUT_TOOLS: ReadonlyMap<string, string> = new Map(
-  PACKAGED_ROLE_REGISTRY.map((entry) => [entry.outputTool, entry.role]),
+  [...PACKAGED_ROLE_REGISTRY.filter((entry) => entry.outputTool !== "ak_submission_output")
+    .map((entry) => [entry.outputTool, entry.role] as const), ...LEGACY_REVIEW_OUTPUT_ROLES],
 );
 
 export type NavigatorInvocationEntryLike = {
@@ -226,7 +227,7 @@ export function classifyPackagedRoleTerminalResult(
   message: PackagedRoleTerminalMessage,
 ): PackagedRoleTerminalClassification {
   if (typeof message.toolName !== "string") return { kind: "nonterminal" };
-  if (!PACKAGED_ROLE_OUTPUT_TOOLS.has(message.toolName)) return { kind: "nonterminal" };
+  if (!PACKAGED_ROLE_OUTPUT_TOOLS.has(message.toolName) && message.toolName !== "ak_submission_output") return { kind: "nonterminal" };
 
   // Base identity is enough; durable details may carry typed failure evidence (#475).
   const hasInfraBase = hasNavigatorInfrastructureFailureBase(message.details);
@@ -285,12 +286,23 @@ function durableTerminalAt(
       ? entry.message
       : undefined;
   if (typeof message?.toolName !== "string") return undefined;
-  const role = PACKAGED_ROLE_OUTPUT_TOOLS.get(message.toolName);
+  const marker = message.toolName === "ak_submission_output"
+    ? entries.slice(0, index).reverse().find(isInvocationMarkerEntry)
+    : undefined;
+  const role = message.toolName === "ak_submission_output"
+    ? parseInvocationMarkerIdentity(marker?.data)?.role ?? "unknown"
+    : PACKAGED_ROLE_OUTPUT_TOOLS.get(message.toolName);
   if (role === undefined) return undefined;
   const classification = classifyPackagedRoleTerminalResult(message);
   if (classification.kind !== "accepted" && classification.kind !== "infrastructure") {
     return undefined;
   }
+  // A non-error toolResult is only a submitted candidate: the gate may still
+  // return continue even when the parent's own status was converged. Current
+  // invocations seal via the ledger-owned closure entry. Historical named
+  // review tools predate that entry and remain readable as legacy terminals.
+  if (entry?.type === "message" && classification.kind === "accepted"
+    && !LEGACY_REVIEW_OUTPUT_ROLES.has(message.toolName)) return undefined;
   return {
     index,
     role,

package/src/notary-contracts.ts

@@ -1,14 +1,11 @@
 /**
  * Public Notary (符宝郎) terminating receipt contracts.
- * Lawful explicit releases: pass | bounce | escalate.
+ * Lawful explicit releases: converged | continue | escalate.
  * No usable result is infrastructure failure via public settlement, not a judgment status (#475).
  */
-import { Type } from "typebox";
+import { REVIEW_SUBMISSION_OUTPUT_TOOL_NAME, reviewSubmissionSchema } from "./review-submission.ts";
 
-import { openToolObject } from "./open-tool-schema.ts";
-import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
-
-export const NOTARY_OUTPUT_TOOL_NAME = "ak_notary_output";
+export const NOTARY_OUTPUT_TOOL_NAME: string = REVIEW_SUBMISSION_OUTPUT_TOOL_NAME;
 export const NOTARY_SOURCE_RUN_FLAG = {
   name: "ak-notary-source-run",
   definition: {
@@ -30,21 +27,7 @@ export const NOTARY_TICKET_FLAG = {
 export const NOTARY_FIXED_KICKOFF =
   "符宝郎案卷已受理；来源 run 定位见会话材料。";
 
-export const notaryOutputSchema = withTerminatingOutputDeclarations(
-  openToolObject(
-    Type.Object({
-      status: Type.Unknown({
-        description: "pass | bounce | escalate — 形状指引，非 schema 闸",
-      }),
-      findings: Type.Unknown({
-        description: "string[] findings，随 pass、bounce 或 escalate 留存",
-      }),
-      reason: Type.Optional(Type.Unknown({
-        description: "status 为 escalate 时的上呈理由",
-      })),
-    }),
-  ),
-);
+export const notaryOutputSchema = reviewSubmissionSchema;
 
 export type NotarySourceRunLocator = {
   readonly runDirectory: string;
@@ -54,8 +37,8 @@ export type NotarySourceRunLocator = {
 
 /** Recognition face only — fields retained as submitted (#753, no disposition/findings forge). */
 export type NotaryOutput =
-  | { readonly status: "pass"; readonly findings?: unknown }
-  | { readonly status: "bounce"; readonly findings?: unknown }
+  | { readonly status: "converged"; readonly findings?: unknown }
+  | { readonly status: "continue"; readonly findings?: unknown }
   | {
       readonly status: "escalate";
       readonly reason?: unknown;
@@ -67,7 +50,7 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 }
 
 /**
- * Recognize one lawful explicit Notary release (pass | bounce | escalate).
+ * Recognize one lawful explicit Notary release (converged | continue | escalate).
  * #753: no field rewrite — submitted params retained as-is (no disposition forge,
  * no findings array rewrite). Recognition only for recording/settlement callers.
  */
@@ -89,7 +72,7 @@ export function retainNotarySubmission(value: unknown): unknown {
 }
 
 /**
- * Settlement/recording path: only lawful recorded pass/bounce/escalate.
+ * Settlement/recording path: only lawful recorded converged/continue/escalate.
  * Does not gate role admission — callers must not use this to reject a submission.
  */
 export function validateRecordedNotaryOutput(value: unknown): NotaryOutput {
@@ -98,4 +81,3 @@ export function validateRecordedNotaryOutput(value: unknown): NotaryOutput {
   }
   return value as NotaryOutput;
 }
-

package/src/notary-role.ts

@@ -159,7 +159,7 @@ export function createNotaryRoleRuntime(
         pi.registerTool({
           name: NOTARY_OUTPUT_TOOL_NAME,
           label: "符宝郎输出",
-          description: "提交引文保真与票面对齐的 typed pass/bounce/escalate 决议。",
+          description: "提交引文保真与票面对齐的 converged/continue/escalate 决议。",
           promptSnippet: "提交符宝郎决议",
           parameters: notaryOutputSchema,
           async execute(toolCallId: string, parameters: unknown, _signal: AbortSignal | undefined, _onUpdate: unknown, ctx: HostContext, ): Promise<HostToolResult<unknown>> {

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

@@ -1,36 +1,16 @@
 /**
  * Public Auditor (审刑院) terminating receipt contracts (#675 / #754).
- * Lawful explicit releases: pass | bounce | escalate.
+ * Lawful explicit releases: converged | continue | escalate.
  */
-import { Type } from "typebox";
+import { REVIEW_SUBMISSION_OUTPUT_TOOL_NAME, reviewSubmissionSchema } from "../review-submission.ts";
 
-import { openToolObject } from "../open-tool-schema.ts";
-import { withTerminatingOutputDeclarations } from "./terminating-infrastructure.ts";
+export const AUDITOR_OUTPUT_TOOL_NAME: string = REVIEW_SUBMISSION_OUTPUT_TOOL_NAME;
 
-export const AUDITOR_OUTPUT_TOOL_NAME = "ak_auditor_output" as const;
-
-export const auditorOutputSchema = withTerminatingOutputDeclarations(
-  openToolObject(
-    Type.Object({
-      status: Type.Unknown({
-        description: "pass | bounce | escalate — 形状指引，非 schema 闸",
-      }),
-      violations: Type.Optional(Type.Unknown({
-        description: "status 为 bounce 时的违规条目",
-      })),
-      conflicts: Type.Optional(Type.Unknown({
-        description: "status 为 escalate 时的冲突",
-      })),
-      decisionGate: Type.Optional(Type.Unknown({
-        description: "status 为 escalate 时的决策闸",
-      })),
-    }),
-  ),
-);
+export const auditorOutputSchema = reviewSubmissionSchema;
 
 export type AuditorOutput =
-  | { readonly status: "pass" }
-  | { readonly status: "bounce"; readonly violations?: unknown }
+  | { readonly status: "converged" }
+  | { readonly status: "continue"; readonly violations?: unknown }
   | {
       readonly status: "escalate";
       readonly conflicts?: unknown;
@@ -50,4 +30,3 @@ export function validateRecordedAuditorOutput(value: unknown): AuditorOutput {
   if (!isRecord(value)) throw new Error("Auditor output is not an object");
   return value as AuditorOutput;
 }
-

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

@@ -1,7 +1,9 @@
 /** Package-owned Judge output leaf — no role registration surface. */
 
 
-export const JUDGE_OUTPUT_TOOL_NAME = "ak_judge_output";
+import { REVIEW_SUBMISSION_OUTPUT_TOOL_NAME } from "../review-submission.ts";
+
+export const JUDGE_OUTPUT_TOOL_NAME: string = REVIEW_SUBMISSION_OUTPUT_TOOL_NAME;
 
 export type JudgeClass = {
   name: string;
@@ -11,16 +13,16 @@ export type JudgeClass = {
 };
 
 export type JudgeVerdict =
-  | { judgeStatus: "converged"; note?: string; evidence?: unknown }
+  | { status: "converged"; note?: string; evidence?: unknown }
   | {
-    judgeStatus: "continue";
+    status: "continue";
     fix: { summary: string };
     classes: JudgeClass[];
     note?: string;
     evidence?: unknown;
   }
   | {
-    judgeStatus: "escalate";
+    status: "escalate";
     decisionGate: { question: string; options: string[] };
     note?: string;
     evidence?: unknown;
@@ -28,17 +30,17 @@ export type JudgeVerdict =
 
 export function validateAcceptedJudgeDetails(verdict: unknown): JudgeVerdict {
   if (verdict === null || typeof verdict !== "object" || Array.isArray(verdict)) throw new Error("Judge verdict has no execution discriminator");
-  let judgeStatus: unknown;
+  let status: unknown;
   try {
-    judgeStatus = (verdict as Record<string, unknown>).judgeStatus;
+    status = (verdict as Record<string, unknown>).status;
   } catch {
     throw new Error("Judge verdict has no execution discriminator");
   }
-  if (typeof judgeStatus !== "string") {
+  if (typeof status !== "string") {
     throw new Error("Judge verdict has no execution discriminator");
   }
   if (
-    ["converged", "continue", "escalate"].includes(judgeStatus)
+    ["converged", "continue", "escalate"].includes(status)
   ) {
     return verdict as JudgeVerdict;
   }

package/src/package-contracts/terminating-tools.ts

@@ -18,7 +18,7 @@ import {
   validateReviewerIntent,
   type ReviewerIntent,
 } from "./reviewer-output.ts";
-import { PACKAGED_ROLE_REGISTRY } from "../packaged-role-registry.ts";
+import { LEGACY_REVIEW_OUTPUT_ROLES, PACKAGED_ROLE_REGISTRY } from "../packaged-role-registry.ts";
 import { CorrectableSubmissionError } from "../submission-correctable-error.ts";
 import { DOCTOR_OUTPUT_TOOL_NAME, validateDoctorSubmissionShape, validateRecordedDoctorOutput, type DoctorOutput, type DoctorSubmission } from "../doctor-contracts.ts";
 import { GATEKEEPER_OUTPUT_TOOL_NAME, validateRecordedGatekeeperOutput, type GatekeeperDirectOutput } from "./gatekeeper-output.ts";
@@ -80,7 +80,10 @@ export type {
   SecretariatVerdict,
 };
 
-export const TERMINATING_TOOL_NAMES = PACKAGED_ROLE_REGISTRY.map((entry) => entry.outputTool);
+export const TERMINATING_TOOL_NAMES = [...new Set([
+  ...PACKAGED_ROLE_REGISTRY.map((entry) => entry.outputTool),
+  ...LEGACY_REVIEW_OUTPUT_ROLES.keys(),
+])];
 
 export type TerminatingToolName = (typeof TERMINATING_TOOL_NAMES)[number];
 
@@ -152,7 +155,10 @@ export type AcceptedFacts = {
 export function acceptedFacts(toolName: TerminatingToolName, details: AcceptedDetails): AcceptedFacts {
   const record = details as Record<string, unknown>;
   const entry = PACKAGED_ROLE_REGISTRY.find((candidate) => candidate.outputTool === toolName);
-  const statusKey = entry !== undefined && "receiptStatusKey" in entry ? entry.receiptStatusKey : "status";
+  const legacyRole = LEGACY_REVIEW_OUTPUT_ROLES.get(toolName);
+  const statusKey = legacyRole === "judge" || legacyRole === "countersign"
+    ? `${legacyRole}Status`
+    : entry !== undefined && "receiptStatusKey" in entry ? entry.receiptStatusKey : "status";
   const status = typeof record[statusKey] === "string" ? record[statusKey] : undefined;
   const commitKey = entry !== undefined && "receiptCommitKey" in entry ? entry.receiptCommitKey : undefined;
   const commitWhen = entry !== undefined && "receiptCommitWhen" in entry ? entry.receiptCommitWhen : undefined;

package/src/packaged-role-registry.ts

@@ -17,6 +17,15 @@ import { DIARIST_OUTPUT_TOOL_NAME } from "./diarist-contracts.ts";
 import { SECRETARIAT_OUTPUT_TOOL_NAME } from "./secretariat-contracts.ts";
 import { JUDGE_AUDIT_TOOL_NAME } from "./judge-auditor.ts";
 
+/** Historical durable session names; these are read aliases, never registered tools. */
+export const LEGACY_REVIEW_OUTPUT_ROLES = new Map<string, string>([
+  ["ak_judge_output", "judge"],
+  ["ak_notary_output", "notary"],
+  ["ak_countersign_output", "countersign"],
+  ["ak_inspector_output", "inspector"],
+  ["ak_auditor_output", "auditor"],
+]);
+
 /**
  * Success-face fields that still differ by seat. Presence and omission match
  * the former per-seat publishers. Key order is not part of the contract.
@@ -92,7 +101,7 @@ export const PUBLIC_ROLE_RECORDS = [
     /** Navigator subject is the public admitted instruction when the run is bound. */
     navigatorSubject: "public-instruction",
     activationStage: "load-and-install",
-    receiptStatusKey: "judgeStatus",
+    receiptStatusKey: "status",
     sessionMaterials: [
       "CLAUDE.md",
       "souls/judge.md",
@@ -374,15 +383,13 @@ export const PUBLIC_ROLE_RECORDS = [
     outputTool: COUNTERSIGN_OUTPUT_TOOL_NAME,
     settlement: "accepted",
     gateStageLabel: "给事中",
-    /** Gate queue reads countersignStatus, not the shared three-state status. */
-    gateDecision: "countersign-status",
     /** Gate summon carries the parent payload as the instruction and a parent run id. */
     gateSummon: "parent-instruction",
     activationFlags: [
       { field: "ticketNumber" },
     ],
     activationStage: "load-and-install",
-    receiptStatusKey: "countersignStatus",
+    receiptStatusKey: "status",
     // #924: 公用《票面法》三席同装
     sessionMaterials: ["CLAUDE.md", "souls/countersign.md", "souls/ticket-law.md"],
   },
@@ -804,7 +811,7 @@ export function packagedGateStageLabel(role: string): string | undefined {
   return record.gateStageLabel;
 }
 
-/** Countersign gate queue reads countersignStatus. Every other officer uses the shared three-state. */
+/** How the gate caller builds one officer summons. Pointer is the inspector face. */
 export type PackagedGateSummon = "source-run" | "subject-source" | "parent-instruction" | "pointer";
 
 /** How the gate caller builds one officer summons. Pointer is the inspector face. */
@@ -813,11 +820,3 @@ export function packagedGateSummon(role: string): PackagedGateSummon {
   if (record !== undefined && "gateSummon" in record) return record.gateSummon;
   return "pointer";
 }
-
-export function packagedGateDecision(role: string): "countersign-status" | "three-state" {
-  const record = packagedRoleMetadata(role);
-  if (record !== undefined && "gateDecision" in record && record.gateDecision === "countersign-status") {
-    return "countersign-status";
-  }
-  return "three-state";
-}

package/src/pi/adapter.ts

@@ -7,8 +7,8 @@ import {
   type ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
 import type { Static, TSchema } from "typebox";
-import type { GatekeeperNonPassResult, GatekeeperSubject } from "../gatekeeper-role.ts";
-import { requireGatekeeperPass } from "../gatekeeper-pass-envelope.ts";
+import type { SubmissionGateNonPassResult, GatekeeperSubject } from "../gatekeeper-role.ts";
+import { requireSubmissionGate } from "../submission-gate.ts";
 import type {
   HostContext,
   HostEventRegistration,
@@ -85,7 +85,7 @@ export function toPiContext(context: HostContext): ExtensionContext {
 }
 
 /** Gatekeeper receives HostContext directly (#518 §1③) without recovering raw ExtensionContext via WeakMap. */
-function requirePiGatekeeperPass(options: {
+function requirePiSubmissionGate(options: {
   context: HostContext;
   subject: GatekeeperSubject;
   signal?: AbortSignal;
@@ -93,11 +93,12 @@ function requirePiGatekeeperPass(options: {
   toolCallId: string;
   submission?: unknown;
 }): Promise<void | {
+  readonly status: "converged" | "continue";
   readonly officer: string;
   readonly receipt: unknown;
   readonly runId?: string;
 }> {
-  return requireGatekeeperPass({
+  return requireSubmissionGate({
     context: options.context,
     subject: options.subject,
     ...(options.signal === undefined ? {} : { signal: options.signal }),
@@ -203,7 +204,7 @@ export function createPiRoleHostAdapter(
     })),
     setActiveTools: (names) => pi.setActiveTools(names),
     getActiveTools: () => pi.getActiveTools(),
-    requireGatekeeperPass: requirePiGatekeeperPass,
+    requireSubmissionGate: requirePiSubmissionGate,
     on(...registration: HostEventRegistration) {
       const context = (value: ExtensionContext) => projectPiContext(value, options.transcriptFromContext);
       if (registration[0] === "before_agent_start") {

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

@@ -89,7 +89,7 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 function isEscalatePayload(payload: unknown): boolean {
   if (!isRecord(payload)) return false;
   return (
-    payload.status === "escalate" || payload.countersignStatus === "escalate"
+    payload.status === "escalate"
   );
 }
 

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

@@ -1199,7 +1199,7 @@ const ROLE_COMMAND_HELP = {
   },
   inspector: {
     command: "inspector",
-    summary: "Direct Inspector (台院) complexity and test-quality check; pass or bounce.",
+    summary: "Direct Inspector (台院) complexity and test-quality check; converged, continue, or escalate.",
     usage: ["ak-role inspector [options] [instruction]"],
     examples: [
       'ak-role inspector --attach ./change.patch "Review this material."',
@@ -1223,7 +1223,7 @@ const ROLE_COMMAND_HELP = {
   },
   auditor: {
     command: "auditor",
-    summary: "Direct Auditor (审刑院) compliance audit: pass, bounce, or escalate.",
+    summary: "Direct Auditor (审刑院) compliance audit: converged, continue, or escalate.",
     usage: ["ak-role auditor --subject <judge|doctor> --source-run <runId@role|path> [options] [instruction]"],
     examples: [
       'ak-role auditor --subject judge --source-run 01abc…@judge --attach ./dossier "审：本 run 是否合规。"',

package/src/public-cli/settlement.ts

@@ -2935,10 +2935,9 @@ async function settleLawfulSeatAcceptedTerminalResult(
   const entries = await readLawfulSettlementEntries(sessionFile) ?? [];
   const submissions = await recordedSubmissionPayloads(admitted, scope);
   // #843: collector shape (ledger closed first) plus current user-turn freshness.
-  // A lawful bound non-error seat toolResult (isError === false + one-to-one call
-  // bind, same grade as residual) means this turn sealed — a prior bounce residual
-  // in the same turn must not outrank it. Missing isError, unbound, or mis-bound
-  // results do not establish success and do not reject/abort. A current-attempt
+  // Only the ledger-owned closure establishes this turn's success. A non-error
+  // toolResult may be a candidate whose nested gate continued the conversation.
+  // A current-attempt
   // residual without that success is this turn's own failure and must not be
   // masked by run-scoped stale acceptance (bare resume without courtAttemptId).
   // Same-turn accept-then-bounce keeps the success marker: terminal stays
@@ -2947,18 +2946,16 @@ async function settleLawfulSeatAcceptedTerminalResult(
   let thisAttemptHasSeatSuccess = false;
   let residual: BoundErroredToolCandidate | undefined;
   for (let index = entries.length - 1; index >= scanStart; index -= 1) {
+    const entry = entries[index];
+    if (entry?.type === "custom" && entry.customType === "ak-role-submission-closure"
+      && isRecord(entry.data) && entry.data.toolName === spec.toolName
+      && classifyPackagedRoleTerminalResult(entry.data).kind === "accepted") {
+      thisAttemptHasSeatSuccess = true;
+    }
     const message = entries[index]?.message;
     if (message?.role !== "toolResult") continue;
     if (message.toolName !== spec.toolName) continue;
-    if (message.isError === false) {
-      if (
-        boundRoleToolCallForResult(entries, index, message, spec.toolName) !==
-          undefined
-      ) {
-        thisAttemptHasSeatSuccess = true;
-      }
-      continue;
-    }
+    if (message.isError === false) continue;
     if (residual === undefined) {
       residual = boundErroredToolCandidate(
         entries,
@@ -2969,7 +2966,9 @@ async function settleLawfulSeatAcceptedTerminalResult(
     }
   }
   const roleOutcome = await sealedLedgerOutcome(admitted, spec.role as TerminalRoleName, scope);
-  if (roleOutcome !== undefined && (thisAttemptHasSeatSuccess || residual === undefined)) {
+  if (roleOutcome !== undefined && (
+    thisAttemptHasSeatSuccess || residual === undefined || (scope?.courtAttemptId !== undefined && scope.courtAttemptId.length > 0)
+  )) {
     const navigator = extractNavigatorFact(entries);
     const artifacts = await publishDeclaredSeatArtifacts(
       admitted,