@akagilnc/pi-workflow-roles 0.1.2383 → 0.1.2402

package/src/gatekeeper-role.ts

@@ -24,18 +24,18 @@ export type GatekeeperResult =
       readonly findings: readonly string[];
       readonly submission: unknown;
     }
+  | { readonly status: "no_receipt"; readonly stage: "gatekeeper" | "inspector" | "notary"; readonly reason: string; readonly facts: NoReceiptLifecycleFacts }
   | {
-      readonly status: "incomplete";
+      readonly status: "transport_failure";
       readonly stage: "gatekeeper" | "inspector" | "notary";
       readonly reason: string;
+      /** Original unusable submission retained for the failure channel. */
       readonly submission?: unknown;
-    }
-  | { readonly status: "no_receipt"; readonly stage: "gatekeeper" | "inspector" | "notary"; readonly reason: string; readonly facts: NoReceiptLifecycleFacts }
-  | { readonly status: "transport_failure"; readonly stage: "gatekeeper" | "inspector" | "notary"; readonly reason: string };
+    };
 
 export type GatekeeperNonPassResult = Extract<
   GatekeeperResult,
-  { status: "bounce" | "incomplete" | "no_receipt" }
+  { status: "bounce" | "no_receipt" }
 >;
 
 function nonPassMessage(result: GatekeeperNonPassResult): string {
@@ -74,15 +74,13 @@ export type GatekeeperPassHostActions = {
 // Unknown fields so wrong types/spellings still reach projection (ADR 0055/0057; 仓第 0 条).
 // Opening goes through the sole openToolObject owner — no parallel transport helper.
 const officerDecisionSchema = openToolObject(Type.Object({
-  status: Type.Unknown({ description: "pass | bounce | incomplete — guidance, not a schema gate." }),
+  status: Type.Unknown({ description: "pass | bounce — guidance, not a schema gate." }),
   findings: Type.Unknown({ description: "string[] findings retained with pass or bounce." }),
-  reason: Type.Unknown({ description: "Why the officer decision is incomplete." }),
 }));
 
 const gatekeeperDecisionSchema = openToolObject(Type.Object({
-  status: Type.Unknown({ description: "dispatch | incomplete — guidance, not a schema gate." }),
+  status: Type.Unknown({ description: "dispatch — guidance, not a schema gate." }),
   officer: Type.Unknown({ description: "inspector | notary when status is dispatch." }),
-  reason: Type.Unknown({ description: "Why Gatekeeper dispatch is incomplete." }),
 }));
 
 const INVOCATION_OVERLAY = "取证工具不受白名单限制；若取证产生临时副作用，取证结束后须自行恢复。";
@@ -104,7 +102,7 @@ function subjectTool(subject: GatekeeperSubject): AuditorDecisionTool {
 export function createOfficerDecisionTool(name: string): AuditorDecisionTool {
   return {
     name,
-    description: "Submit one typed pass, bounce, or incomplete decision.",
+    description: "Submit one typed pass or bounce decision.",
     parameters: officerDecisionSchema,
     async execute(_id, args) { return result(`accepted ${String((args as { status?: unknown })?.status)}`, args); },
   };
@@ -114,7 +112,7 @@ export function createOfficerDecisionTool(name: string): AuditorDecisionTool {
 export function createGatekeeperOutputTool(): AuditorDecisionTool {
   return {
     name: GATEKEEPER_OUTPUT_TOOL,
-    description: "Dispatch the admitted subject to one officer, or report incomplete.",
+    description: "Dispatch the admitted subject to one officer.",
     parameters: gatekeeperDecisionSchema,
     async execute(_id, args) { return result(`accepted ${String((args as { status?: unknown })?.status)}`, args); },
   };
@@ -143,15 +141,18 @@ function retainedSubmission(decision: unknown): unknown {
   return decision === undefined ? MISSING_ARGUMENTS_SUBMISSION : decision;
 }
 
-/** Neutral bookkeeping when no explicit release path is present — no format judgment. */
-function noExplicitReleaseIncomplete(
+/**
+ * No usable explicit release is infrastructure failure, not a judgment status.
+ * Original submission is retained for the failure channel (#475).
+ */
+function noUsableReleaseFailure(
   stage: "gatekeeper" | "inspector" | "notary",
   decision: unknown,
-): Extract<GatekeeperResult, { status: "incomplete" }> {
+): Extract<GatekeeperResult, { status: "transport_failure" }> {
   return {
-    status: "incomplete",
+    status: "transport_failure",
     stage,
-    reason: stage === "gatekeeper" ? "decision 无显式 dispatch" : "decision 无显式 pass",
+    reason: stage === "gatekeeper" ? "decision 无显式 dispatch" : "decision 无显式 pass/bounce",
     submission: retainedSubmission(decision),
   };
 }
@@ -163,19 +164,11 @@ function readRecord(value: unknown): Record<string, unknown> | undefined {
 
 function projectProvinceDecision(decision: unknown): GatekeeperResult | { status: "dispatch"; officer: "inspector" | "notary" } {
   const record = readRecord(decision);
-  if (record === undefined) return noExplicitReleaseIncomplete("gatekeeper", decision);
-  if (record.status === "incomplete") {
-    const reason = record.reason;
-    if (typeof reason === "string" && reason.trim() !== "") {
-      // Role's own incomplete reason is kept as-is; machine does not rewrite it.
-      return { status: "incomplete", stage: "gatekeeper", reason, submission: retainedSubmission(decision) };
-    }
-    return noExplicitReleaseIncomplete("gatekeeper", decision);
-  }
+  if (record === undefined) return noUsableReleaseFailure("gatekeeper", decision);
   if (record.status === "dispatch" && (record.officer === "inspector" || record.officer === "notary")) {
     return { status: "dispatch", officer: record.officer };
   }
-  return noExplicitReleaseIncomplete("gatekeeper", decision);
+  return noUsableReleaseFailure("gatekeeper", decision);
 }
 
 function projectOfficerDecision(
@@ -183,15 +176,7 @@ function projectOfficerDecision(
   decision: unknown,
 ): GatekeeperResult {
   const record = readRecord(decision);
-  if (record === undefined) return noExplicitReleaseIncomplete(officer, decision);
-  if (record.status === "incomplete") {
-    const reason = record.reason;
-    if (typeof reason === "string" && reason.trim() !== "") {
-      // Role's own incomplete reason is kept as-is; machine does not rewrite it.
-      return { status: "incomplete", stage: officer, reason, submission: retainedSubmission(decision) };
-    }
-    return noExplicitReleaseIncomplete(officer, decision);
-  }
+  if (record === undefined) return noUsableReleaseFailure(officer, decision);
   if (record.status === "bounce") {
     return {
       status: "bounce",
@@ -208,7 +193,7 @@ function projectOfficerDecision(
       findings: asStringArray(record.findings),
     };
   }
-  return noExplicitReleaseIncomplete(officer, decision);
+  return noUsableReleaseFailure(officer, decision);
 }
 
 export async function runGatekeeper(options: RunGatekeeperOptions): Promise<GatekeeperResult> {
@@ -221,7 +206,7 @@ export async function runGatekeeper(options: RunGatekeeperOptions): Promise<Gate
       roleLabel: "Gatekeeper",
       menxiaSeat: "gatekeeper",
       systemPrompt: `${await loadSoul("gatekeeper")}\n\n${INVOCATION_OVERLAY}`,
-      prompt: "Read the admitted subject with ak_gatekeeper_subject, then dispatch it or submit typed incomplete.",
+      prompt: "Read the admitted subject with ak_gatekeeper_subject, then dispatch it to one officer.",
       tool: createGatekeeperOutputTool(),
       dossierTool: subjectTool(options.subject),
       ...(options.signal === undefined ? {} : { signal: options.signal }),
@@ -259,7 +244,7 @@ export async function runGatekeeper(options: RunGatekeeperOptions): Promise<Gate
   }
 }
 
-/** Project GatekeeperResult onto a submit path: transport→failInfrastructure; bounce/incomplete/no_receipt→typed throw; pass silent. */
+/** Project GatekeeperResult onto a submit path: transport→failInfrastructure; bounce/no_receipt→typed throw; pass silent. */
 export async function requireGatekeeperPass(options: {
   readonly context: ExtensionContext;
   readonly subject: GatekeeperSubject;
@@ -274,11 +259,16 @@ export async function requireGatekeeperPass(options: {
   });
   if (gatekeeper.status === "pass") return;
   if (gatekeeper.status === "transport_failure") {
-    options.hostActions.failInfrastructure(
-      new Error(`Gatekeeper transport failure at ${gatekeeper.stage}: ${gatekeeper.reason}`),
-      options.context,
-      options.toolCallId,
-    );
+    // Typed stage/reason/submission ride failInfrastructure → durable tool_result (#475).
+    const error = new Error(`Gatekeeper transport failure at ${gatekeeper.stage}: ${gatekeeper.reason}`) as Error & {
+      stage: typeof gatekeeper.stage;
+      reason: string;
+      submission?: unknown;
+    };
+    error.stage = gatekeeper.stage;
+    error.reason = gatekeeper.reason;
+    if (gatekeeper.submission !== undefined) error.submission = gatekeeper.submission;
+    options.hostActions.failInfrastructure(error, options.context, options.toolCallId);
   }
   // Envelope owns the execute→tool_result bridge; this module only projects + throws.
   options.hostActions.bindGatekeeperNonPass(options.toolCallId, gatekeeper);

package/src/judge-auditor.ts

@@ -10,8 +10,8 @@ import { auditorRunDirectory } from "./auditor-dossier-tool.ts";
 import { loadAuditorSoul } from "./auditor-soul.ts";
 import {
   readJudgeAuditSubjects,
+  requireAuditMaterials,
   resolveAuditDossier,
-  toAuditIncomplete,
 } from "./dossier-resolution.ts";
 
 export const JUDGE_AUDIT_TOOL_NAME = "ak_soul_audit_decision";
@@ -37,9 +37,9 @@ export function createPiJudgeAuditor(
 ): (options: JudgeAuditOptions) => Promise<ComplianceDecision> {
   return async (options) => {
     const dossier = resolveAuditDossier();
-    if (dossier.status === "incomplete") return toAuditIncomplete(dossier.observation);
+    requireAuditMaterials(dossier);
     const subjects = readJudgeAuditSubjects(options.context);
-    if (subjects.status === "incomplete") return toAuditIncomplete(subjects.observation);
+    requireAuditMaterials(subjects);
 
     return runComplianceAudit({
       tool: auditDecisionTool,

package/src/judge-role.ts

@@ -8,10 +8,6 @@ import { Type, type Static } from "typebox";
 
 import { disposeComplianceDecision } from "./audit-escalation.ts";
 import type { ComplianceDecision } from "./compliance-transport.ts";
-import {
-  readActivationEngineLaborFallbackField,
-  withEngineLaborFallbackField,
-} from "./engine-labor-fallback.ts";
 import { requireGatekeeperPass, type GatekeeperPassHostActions } from "./gatekeeper-role.ts";
 
 import {
@@ -137,9 +133,7 @@ export function createJudgeRoleRuntime(
             } catch (error) {
               hostActions.failInfrastructure(error, ctx, toolCallId);
             }
-            // #380: attach sole-built engineLaborFallback when detour fell back to seat labor.
-            const laborFallback = readActivationEngineLaborFallbackField();
-            const acceptedDetails = withEngineLaborFallbackField(verdict, laborFallback);
+            const acceptedDetails = verdict;
             return disposeComplianceDecision<AgentToolResult<unknown>>(
               audit,
               {
@@ -161,7 +155,6 @@ export function createJudgeRoleRuntime(
                   );
                 },
                 escalate: (result) => result,
-                auditIncomplete: (result) => result,
               },
               // #380: escalate deliveredOutput must carry the same mechanical projection.
               acceptedDetails,

package/src/merger-contracts.ts

@@ -1,11 +1,6 @@
 import { Type, type Static } from "typebox";
 import { isFullGitObjectId } from "./git-object-id.ts";
 import { exactUtf8 } from "./exact-utf8.ts";
-import {
-  seatFallbackBaseStatus,
-  seatFallbackStatusHasLawfulEvidence,
-  type WithEngineLaborFallback,
-} from "./engine-labor-fallback.ts";
 import { sha256Hex } from "./sha256.ts";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
 
@@ -29,13 +24,9 @@ export const mergerOutputSchema = openToolObjectFromUnion(mergerOutputVariants);
 export type DeepReadonly<T> = T extends (...args: never[]) => unknown ? T : T extends readonly (infer U)[] ? readonly DeepReadonly<U>[] : T extends object ? { readonly [K in keyof T]: DeepReadonly<T[K]> } : T;
 export type MergerMaterial = DeepReadonly<Static<typeof materialSchema>>;
 export type MergerInput = DeepReadonly<Static<typeof mergerInputSchema>>;
-type MergerOutputClean =
+export type MergerOutput =
   | { status: "completed"; attemptId: string; report: string; mergeCommitId: string }
   | { status: "escalate"; attemptId: string; diagnosis: string; report: string };
-/** Clean submission shape or seat-fallback tainted accepted receipt (ADR 0071). */
-export type MergerOutput =
-  | MergerOutputClean
-  | WithEngineLaborFallback<MergerOutputClean>;
 export const MERGER_OUTPUT_TOOL_NAME = "ak_merger_output";
 export const MERGER_ACCEPTED_TEXT = "Merger output accepted";
 
@@ -75,12 +66,7 @@ export function validateMergerInput(value: unknown): MergerInput {
 export function validateMergerOutput(value: unknown, expectedAttemptId?: string): MergerOutput {
   if (!record(value) || (expectedAttemptId !== undefined && value.attemptId !== expectedAttemptId)) throw new Error("Merger output attempt mismatch");
   const status = typeof value.status === "string" ? value.status : undefined;
-  const statusBase = status !== undefined ? seatFallbackBaseStatus(status) : undefined;
-  // ADR 0071: tainted status requires latch-shaped engineLaborFallback evidence.
-  if (status !== undefined && !seatFallbackStatusHasLawfulEvidence(status, value)) {
-    throw new Error("Merger output has no recognized execution discriminator");
-  }
-  if (statusBase === "completed" && isFullGitObjectId(value.mergeCommitId)) return structuredClone(value) as MergerOutput;
-  if (statusBase === "escalate") return structuredClone(value) as MergerOutput;
+  if (status === "completed" && isFullGitObjectId(value.mergeCommitId)) return structuredClone(value) as MergerOutput;
+  if (status === "escalate") return structuredClone(value) as MergerOutput;
   throw new Error("Merger output has no recognized execution discriminator");
 }

package/src/merger-role.ts

@@ -1,8 +1,4 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import {
-  readActivationEngineLaborFallbackField,
-  withEngineLaborFallbackField,
-} from "./engine-labor-fallback.ts";
 import { MERGER_ACCEPTED_TEXT, MERGER_OUTPUT_TOOL_NAME, mergerOutputSchema, validateMergerInput, validateMergerOutput, type MergerInput } from "./merger-contracts.ts";
 import type { MergerGitState } from "./merger-git-state.ts";
 import { exactUtf8 } from "./exact-utf8.ts";
@@ -51,10 +47,7 @@ export function createMergerRoleRuntime(pi: ExtensionAPI, dependencies: MergerRo
             if (state.mergeCommitId !== output.mergeCommitId || !same(state.parentObjectIds, [activation.input.targetObjectId, activation.input.sourceObjectId]) || state.unmergedPaths.length !== 0 || !state.worktreeClean || state.resolutionChangedPaths.some(path => !scope.has(path))) host.failInfrastructure(new Error("Merger completed-state verification failed"), ctx, id);
           }
           accepted = true;
-          const acceptedDetails = withEngineLaborFallbackField(
-            output,
-            readActivationEngineLaborFallbackField(),
-          );
+          const acceptedDetails = output;
           return { content: [{ type: "text" as const, text: MERGER_ACCEPTED_TEXT }], details: acceptedDetails, terminate: true as const };
         } });
       pi.on("before_agent_start", event => { if (!activation) throw new Error("Merger is not activated"); const admitted = { attemptId: activation.input.attemptId, targetObjectId: activation.input.targetObjectId, sourceObjectId: activation.input.sourceObjectId, task: materialText(activation.input, "task"), authority: materialText(activation.input, "authority"), targetIntent: materialText(activation.input, "targetIntent"), sourceIntent: materialText(activation.input, "sourceIntent"), expectedConflictPaths: activation.input.expectedConflictPaths, resolutionScope: activation.input.resolutionScope, authorizedChecks: activation.input.authorizedChecks }; return { systemPrompt: `${event.systemPrompt}\n\n<merger_soul>\n${activation.soul}\n</merger_soul>\n\n<merger_assignment>\n${JSON.stringify(admitted)}\n</merger_assignment>` }; });

package/src/navigator-attendance.ts

@@ -8,7 +8,6 @@ import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
 import { Type, type Static } from "typebox";
 import { Value } from "typebox/value";
 
-import { seatFallbackBaseStatus } from "./engine-labor-fallback.ts";
 import {
   NAVIGATOR_INVOCATION_ENTRY,
   mintNavigatorInvocationId,
@@ -462,18 +461,6 @@ export type NavigatorCandidateSelection = {
   readonly matchedToSettlement: boolean;
 };
 
-/** Match route-playbook statuses against settlement, treating seat-fallback taint as base-equivalent. */
-function statusListMatchesSettlement(
-  candidateStatuses: readonly string[],
-  settlementStatus: string,
-): boolean {
-  if (candidateStatuses.includes(settlementStatus)) return true;
-  const settlementBase = seatFallbackBaseStatus(settlementStatus);
-  return candidateStatuses.some(
-    (status) => seatFallbackBaseStatus(status) === settlementBase,
-  );
-}
-
 export function selectNavigatorCandidate(
   candidates: readonly NavigatorCandidate[],
   settlement: NavigatorSettlement,
@@ -492,7 +479,7 @@ export function selectNavigatorCandidate(
       const statusSpecific = rolePhaseMatched.find(
         (candidate) =>
           candidate.matches?.statuses !== undefined &&
-          statusListMatchesSettlement(candidate.matches.statuses, settlement.status!),
+          candidate.matches.statuses.includes(settlement.status!),
       );
       if (statusSpecific !== undefined) {
         return { candidate: statusSpecific, matchedToSettlement: true };

package/src/navigator-invocation-identity.ts

@@ -15,7 +15,7 @@
  * One shared typed terminal classifier owns durable completion for lifecycle,
  * publicNavigatorSettlement, and every public CLI Receipt extractor:
  *   - accepted/human: isError exactly false and no infrastructure-failure fact
- *   - infrastructure: isError exactly true plus exact closed infrastructure fact
+ *   - infrastructure: isError exactly true plus base kind/source/reasonCode identity
  *   - retryable/missing/nonboolean/contradictory/malformed: nonterminal
  *
  * One truth table also owns marker↔terminal cardinality:
@@ -33,13 +33,25 @@ export const NAVIGATOR_INVOCATION_ENTRY = "ak-navigator-invocation" as const;
 /** Typed durable infrastructure-failure fact on a packaged role output toolResult. */
 export const NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND = "role_infrastructure_failure" as const;
 
-/** Closed fact keys — extras/missing/wrong keys fail closed. */
+/** Required base identity keys for infrastructure-failure recognition. */
 const NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS = [
   "kind",
   "source",
   "reasonCode",
 ] as const;
 
+/**
+ * Known typed failure evidence keys projected onto durable infrastructure details (#475).
+ * Extraction whitelist only — classification does not reject unknown extras (ADR 0040).
+ */
+export const NAVIGATOR_INFRASTRUCTURE_FAILURE_EVIDENCE_KEYS = [
+  "observation",
+  "candidate",
+  "submission",
+  "stage",
+  "reason",
+] as const;
+
 export type NavigatorInfrastructureFailureFact = {
   kind: typeof NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND;
   source: "shared-role-lifecycle";
@@ -55,16 +67,13 @@ export function buildNavigatorInfrastructureFailureFact(): NavigatorInfrastructu
 }
 
 /**
- * Exact closed infrastructure-failure fact.
- * Rejects extras, missing keys, wrong values/types, and non-objects.
+ * Base infrastructure-failure identity on durable details.
+ * Only kind/source/reasonCode discriminate; extra fields are allowed and retained
+ * (ADR 0040 — discriminators select the branch, they do not ban extras).
  */
-export function isNavigatorInfrastructureFailureFact(
-  value: unknown,
-): value is NavigatorInfrastructureFailureFact {
+export function hasNavigatorInfrastructureFailureBase(value: unknown): boolean {
   if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
   const record = value as Record<string, unknown>;
-  const keys = Object.keys(record);
-  if (keys.length !== NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS.length) return false;
   for (const key of NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS) {
     if (!Object.hasOwn(record, key)) return false;
   }
@@ -75,6 +84,18 @@ export function isNavigatorInfrastructureFailureFact(
   );
 }
 
+/**
+ * Exact closed infrastructure-failure fact (no evidence extensions).
+ * Classifier uses {@link hasNavigatorInfrastructureFailureBase} so enriched
+ * durable details still complete as infrastructure (#475).
+ */
+export function isNavigatorInfrastructureFailureFact(
+  value: unknown,
+): value is NavigatorInfrastructureFailureFact {
+  if (!hasNavigatorInfrastructureFailureBase(value)) return false;
+  return Object.keys(value as object).length === NAVIGATOR_INFRASTRUCTURE_FAILURE_KEYS.length;
+}
+
 const PACKAGED_ROLE_OUTPUT_TOOLS: ReadonlyMap<string, string> = new Map(
   PACKAGED_ROLE_REGISTRY.map((entry) => [entry.outputTool, entry.role]),
 );
@@ -191,11 +212,11 @@ export function classifyPackagedRoleTerminalResult(
   if (typeof message.toolName !== "string") return { kind: "nonterminal" };
   if (!PACKAGED_ROLE_OUTPUT_TOOLS.has(message.toolName)) return { kind: "nonterminal" };
 
-  const infraFact = isNavigatorInfrastructureFailureFact(message.details)
-    ? message.details
-    : undefined;
+  // Base identity is enough; durable details may carry typed failure evidence (#475).
+  const hasInfraBase = hasNavigatorInfrastructureFailureBase(message.details);
+  const infraFact = hasInfraBase ? buildNavigatorInfrastructureFailureFact() : undefined;
 
-  // Infrastructure completion: exact isError === true + exact closed infra fact.
+  // Infrastructure completion: exact isError === true + infra base identity.
   if (message.isError === true) {
     if (infraFact === undefined) return { kind: "nonterminal" };
     return { kind: "infrastructure", fact: infraFact };

package/src/notary-contracts.ts

@@ -1,17 +1,10 @@
 /**
  * Public Notary (符宝郎) terminating receipt contracts.
- * Lawful explicit releases: pass | bounce | incomplete(with non-empty reason).
- * Residual incomplete (no explicit release) is projected by public settlement, not here.
+ * Lawful explicit releases: pass | bounce.
+ * No usable result is infrastructure failure via public settlement, not a judgment status (#475).
  */
 import { Type } from "typebox";
 
-import {
-  readActivationEngineLaborFallbackField,
-  seatFallbackBaseStatus,
-  seatFallbackStatusHasLawfulEvidence,
-  withEngineLaborFallbackField,
-  type WithEngineLaborFallback,
-} from "./engine-labor-fallback.ts";
 import { openToolObject } from "./open-tool-schema.ts";
 
 export const NOTARY_OUTPUT_TOOL_NAME = "ak_notary_output";
@@ -31,14 +24,11 @@ export const NOTARY_FIXED_KICKOFF =
 export const notaryOutputSchema = openToolObject(
   Type.Object({
     status: Type.Unknown({
-      description: "pass | bounce | incomplete — guidance, not a schema gate.",
+      description: "pass | bounce — guidance, not a schema gate.",
     }),
     findings: Type.Unknown({
       description: "string[] findings retained with pass or bounce.",
     }),
-    reason: Type.Unknown({
-      description: "Why the notary decision is incomplete.",
-    }),
   }),
 );
 
@@ -48,19 +38,13 @@ export type NotarySourceRunLocator = {
   readonly role: string;
 };
 
-type NotaryOutputClean =
+export type NotaryOutput =
   | { readonly status: "pass"; readonly findings: readonly string[] }
   | {
       readonly status: "bounce";
       readonly disposition: "rewrite";
       readonly findings: readonly string[];
-    }
-  | { readonly status: "incomplete"; readonly reason: string };
-
-/** Clean submission or seat-fallback tainted accepted receipt (ADR 0071). */
-export type NotaryOutput =
-  | NotaryOutputClean
-  | WithEngineLaborFallback<NotaryOutputClean>;
+    };
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -73,24 +57,17 @@ function asStringArray(value: unknown): readonly string[] {
 
 /**
  * Project one explicit Notary release. Throws when there is no lawful explicit
- * pass / bounce / incomplete(reason) — callers map that to residual incomplete.
+ * pass / bounce — callers map that to the existing non-zero failure channel.
  */
 export function validateNotaryOutput(value: unknown): NotaryOutput {
   if (!isRecord(value)) {
     throw new Error("Notary output has no recognized execution discriminator");
   }
   const statusRaw = typeof value.status === "string" ? value.status : undefined;
-  if (statusRaw === undefined || !seatFallbackStatusHasLawfulEvidence(statusRaw, value)) {
+  if (statusRaw === undefined) {
     throw new Error("Notary output has no recognized execution discriminator");
   }
-  const status = seatFallbackBaseStatus(statusRaw);
-  if (status === "incomplete") {
-    const reason = value.reason;
-    if (typeof reason !== "string" || reason.trim() === "") {
-      throw new Error("Notary incomplete requires a non-empty reason");
-    }
-    return structuredClone(value) as NotaryOutput;
-  }
+  const status = statusRaw;
   if (status === "bounce") {
     const clone = structuredClone(value) as Record<string, unknown>;
     if (clone.disposition === undefined) clone.disposition = "rewrite";
@@ -105,20 +82,12 @@ export function validateNotaryOutput(value: unknown): NotaryOutput {
   throw new Error("Notary output has no recognized execution discriminator");
 }
 
-/** Shape check for recorded accepted details (may include engineLaborFallback). */
 export function validateRecordedNotaryOutput(value: unknown): NotaryOutput {
   return validateNotaryOutput(value);
 }
 
-export function withNotaryAcceptedDetails(output: NotaryOutput): NotaryOutput {
-  return withEngineLaborFallbackField(
-    output,
-    readActivationEngineLaborFallbackField(),
-  ) as NotaryOutput;
-}
-
 export function notaryDecisiveFacts(output: NotaryOutput): Record<string, unknown> {
-  const status = seatFallbackBaseStatus(String(output.status));
+  const status = String(output.status);
   const facts: Record<string, unknown> = { status, officer: "notary" };
   if (status === "pass" || status === "bounce") {
     const findings = (output as { findings?: unknown }).findings;
@@ -127,8 +96,5 @@ export function notaryDecisiveFacts(output: NotaryOutput): Record<string, unknow
   if (status === "bounce") {
     facts.disposition = "rewrite";
   }
-  if (status === "incomplete") {
-    facts.reason = (output as { reason: string }).reason;
-  }
   return facts;
 }

package/src/notary-role.ts

@@ -14,7 +14,6 @@ import {
   NOTARY_SOURCE_RUN_FLAG,
   notaryOutputSchema,
   validateNotaryOutput,
-  withNotaryAcceptedDetails,
   type NotarySourceRunLocator,
 } from "./notary-contracts.ts";
 
@@ -86,7 +85,7 @@ export function createNotaryRoleRuntime(
           name: NOTARY_OUTPUT_TOOL_NAME,
           label: "Notary Output",
           description:
-            "Submit one typed pass, bounce, or incomplete decision on quote fidelity and ticket alignment.",
+            "Submit one typed pass or bounce decision on quote fidelity and ticket alignment.",
           promptSnippet: "Submit the Notary decision",
           promptGuidelines: [
             `Use ${NOTARY_OUTPUT_TOOL_NAME} as the sole final action.`,
@@ -109,15 +108,14 @@ export function createNotaryRoleRuntime(
               output = validateNotaryOutput(parameters);
             } catch (error) {
               // Non-explicit release stays a rejected terminating call so public
-              // settlement can project residual incomplete (layer ②).
+              // settlement can map it to the existing non-zero failure channel (#475).
               throw error instanceof Error
                 ? error
                 : new Error(String(error));
             }
-            const acceptedDetails = withNotaryAcceptedDetails(output);
             return {
               content: [{ type: "text" as const, text: NOTARY_ACCEPTED_TEXT }],
-              details: acceptedDetails,
+              details: output,
               terminate: true as const,
             };
           },

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

@@ -1,11 +1,5 @@
 /** Package-owned Judge output leaf — no role registration surface. */
 
-import {
-  seatFallbackBaseStatus,
-  seatFallbackStatusHasLawfulEvidence,
-  type SeatFallbackTaintedStatus,
-  type WithEngineLaborFallback,
-} from "../engine-labor-fallback.ts";
 
 export const JUDGE_OUTPUT_TOOL_NAME = "ak_judge_output";
 export const JUDGE_ACCEPTED_TEXT = "Judge verdict accepted";
@@ -17,7 +11,7 @@ export type JudgeClass = {
   disposition: string;
 };
 
-type JudgeVerdictClean =
+export type JudgeVerdict =
   | { judgeStatus: "converged"; note?: string; evidence?: unknown }
   | {
     judgeStatus: "continue";
@@ -33,11 +27,6 @@ type JudgeVerdictClean =
     evidence?: unknown;
   };
 
-/** Clean submission shape or seat-fallback tainted accepted receipt (ADR 0071). */
-export type JudgeVerdict =
-  | JudgeVerdictClean
-  | WithEngineLaborFallback<JudgeVerdictClean>;
-
 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;
@@ -49,12 +38,8 @@ export function validateAcceptedJudgeDetails(verdict: unknown): JudgeVerdict {
   if (typeof judgeStatus !== "string") {
     throw new Error("Judge verdict has no execution discriminator");
   }
-  const base = seatFallbackBaseStatus(judgeStatus) as SeatFallbackTaintedStatus<
-    "converged" | "continue" | "escalate"
-  >;
   if (
-    ["converged", "continue", "escalate"].includes(base) &&
-    seatFallbackStatusHasLawfulEvidence(judgeStatus, verdict)
+    ["converged", "continue", "escalate"].includes(judgeStatus)
   ) {
     return verdict as JudgeVerdict;
   }