@akagilnc/pi-workflow-roles 0.1.2135 → 0.1.2146

package/src/collector-role.ts

@@ -61,10 +61,6 @@ const requestSchema = collectorRequestArgsSchema;
 const waitSchema = collectorWaitArgsSchema;
 const outputSchema = collectorOutputArgsSchema;
 
-// Well below the fixed 183s package-tool silence clock while avoiding noisy UI
-// churn during Collector's legal five-minute wait.
-const COLLECTOR_WAIT_PROGRESS_INTERVAL_MS = 60_000;
-
 type RequestParams = Static<typeof requestSchema>;
 type WaitParams = Static<typeof waitSchema>;
 type OutputParams = Static<typeof outputSchema>;
@@ -377,40 +373,18 @@ export function createCollectorRoleRuntime(
         "Call ak_collector_wait with a positive durationMs; runtime caps each wait to five minutes and to remaining eligibility.",
       ],
       parameters: waitSchema,
-      async execute(toolCallId, params: WaitParams, signal, onUpdate, ctx) {
+      async execute(toolCallId, params: WaitParams, signal, _onUpdate, ctx) {
         if (activation === undefined) {
           throw new Error("Collector is not activated");
         }
-        const currentActivation = activation;
-        let progressTimer: ReturnType<typeof setTimeout> | undefined;
         try {
-          currentActivation.ledger.beginOperational(COLLECTOR_WAIT_TOOL, toolCallId);
-          const waitStartedMono = currentActivation.clock.monoNow();
-          let lastElapsedMs = 0;
-          const scheduleProgress = (): void => {
-            if (onUpdate === undefined) return;
-            progressTimer = setTimeout(() => {
-              const elapsedMs = Math.max(
-                0,
-                Math.floor(currentActivation.clock.monoNow() - waitStartedMono),
-              );
-              if (elapsedMs > lastElapsedMs) {
-                lastElapsedMs = elapsedMs;
-                onUpdate({
-                  content: [],
-                  details: { kind: "collector_wait_progress", elapsedMs },
-                });
-              }
-              scheduleProgress();
-            }, COLLECTOR_WAIT_PROGRESS_INTERVAL_MS);
-          };
-          scheduleProgress();
-          const details = await currentActivation.ledger.wait(
+          activation.ledger.beginOperational(COLLECTOR_WAIT_TOOL, toolCallId);
+          const details = await activation.ledger.wait(
             params,
-            currentActivation.clock,
+            activation.clock,
             signal,
           );
-          currentActivation.ledger.completeOperational(toolCallId);
+          activation.ledger.completeOperational(toolCallId);
           return {
             content: [{
               type: "text" as const,
@@ -420,8 +394,6 @@ export function createCollectorRoleRuntime(
           };
         } catch (error) {
           hostActions.failInfrastructure(error, ctx);
-        } finally {
-          if (progressTimer !== undefined) clearTimeout(progressTimer);
         }
       },
     });

package/src/compliance-transport.ts

@@ -7,7 +7,6 @@ import {
 } from "./evidence-child-executor.ts";
 import { createAuditorDossierTool } from "./auditor-dossier-tool.ts";
 import type { DossierObservation } from "./dossier-resolution.ts";
-import { withPackageOwnedToolIdleSuspended } from "./package-owned-tool-idle.ts";
 import type { NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 
 export type ComplianceCompletion = AuditorCompletion;
@@ -117,28 +116,24 @@ export type RunComplianceAuditOptions = {
 };
 
 export async function runComplianceAudit(options: RunComplianceAuditOptions): Promise<ComplianceDecision> {
-  // #339: only the real compliance-audit await leaves the outer package-owned
-  // idle owner. Pre/post-audit work stays under the single outer backstop.
-  return withPackageOwnedToolIdleSuspended(async () => {
-    const prompt = options.serializedInput ?? AUDITOR_DOSSIER_PROMPT;
-    const receipt = await executeAuditorChild({
-      tool: options.tool,
-      dossierTool: createAuditorDossierTool(options.runDirectory),
-      systemPrompt: options.systemPrompt,
-      prompt,
-      roleLabel: options.roleLabel,
-      context: options.context,
-      retainResponse: (response) => retainComplianceResponse(options.context, response),
-      ...(options.runCompletion === undefined ? {} : { runCompletion: options.runCompletion }),
-      ...(options.signal === undefined ? {} : { signal: options.signal }),
-    });
-    if (receipt.noReceiptLifecycle !== undefined) {
-      return {
-        status: "no-receipt",
-        ...receipt.noReceiptLifecycle,
-        ...(receipt.response.usage === undefined ? {} : { usage: receipt.response.usage }),
-      };
-    }
-    return readComplianceCandidate(receipt.decision, receipt.response.usage);
+  const prompt = options.serializedInput ?? AUDITOR_DOSSIER_PROMPT;
+  const receipt = await executeAuditorChild({
+    tool: options.tool,
+    dossierTool: createAuditorDossierTool(options.runDirectory),
+    systemPrompt: options.systemPrompt,
+    prompt,
+    roleLabel: options.roleLabel,
+    context: options.context,
+    retainResponse: (response) => retainComplianceResponse(options.context, response),
+    ...(options.runCompletion === undefined ? {} : { runCompletion: options.runCompletion }),
+    ...(options.signal === undefined ? {} : { signal: options.signal }),
   });
+  if (receipt.noReceiptLifecycle !== undefined) {
+    return {
+      status: "no-receipt",
+      ...receipt.noReceiptLifecycle,
+      ...(receipt.response.usage === undefined ? {} : { usage: receipt.response.usage }),
+    };
+  }
+  return readComplianceCandidate(receipt.decision, receipt.response.usage);
 }

package/src/doctor-contracts.ts

@@ -1,5 +1,10 @@
 import { Type } from "typebox";
 import { canonicalJson } from "./canonical-json.ts";
+import {
+  seatFallbackBaseStatus,
+  seatFallbackStatusHasLawfulEvidence,
+  type WithEngineLaborFallback,
+} from "./engine-labor-fallback.ts";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
 
 export const DOCTOR_EVIDENCE_TOOL_NAME = "ak_doctor_evidence";
@@ -37,9 +42,13 @@ export type DoctorFinding =
 export type DoctorSubmission =
   | { status: "completed"; case: DoctorCaseIdentity; findings: DoctorFinding[] }
   | { status: "refused"; reason: string; missingEvidence: Array<{ need: string; targetKeys: string[] }> };
-export type DoctorOutput =
+type DoctorOutputClean =
   | { status: "completed"; case: DoctorCaseIdentity; findings: DoctorFinding[]; cost: DoctorCaseCost }
   | Extract<DoctorSubmission, { status: "refused" }>;
+/** Clean recorded shape or seat-fallback tainted accepted receipt (ADR 0071). */
+export type DoctorOutput =
+  | DoctorOutputClean
+  | WithEngineLaborFallback<DoctorOutputClean>;
 export type DoctorEvidenceEntry = { id: string; kind: "session" | "stderr"; byteLength: number; contentLength: number; sha256: string; content: string };
 export type DoctorCase = { version: 1; identity: DoctorCaseIdentity; evidence: DoctorEvidenceEntry[]; cost: DoctorCaseCost };
 
@@ -96,12 +105,19 @@ function isRecord(value: unknown): value is Record<string, unknown> { return typ
 function read(value: unknown, key: string): unknown { if (!isRecord(value)) return undefined; try { return value[key]; } catch { return undefined; } }
 export function validateDoctorSubmissionShape(value: unknown): DoctorSubmission {
   const status = read(value, "status");
-  if (status !== "completed" && status !== "refused") throw new DoctorSubmissionContractError("Doctor submission has no recognized execution status");
+  const base = typeof status === "string" ? seatFallbackBaseStatus(status) : status;
+  if (base !== "completed" && base !== "refused") throw new DoctorSubmissionContractError("Doctor submission has no recognized execution status");
+  // ADR 0071: tainted status requires latch-shaped engineLaborFallback evidence.
+  if (typeof status === "string" && !seatFallbackStatusHasLawfulEvidence(status, value)) {
+    throw new DoctorSubmissionContractError("Doctor submission has no recognized execution status");
+  }
   return value as DoctorSubmission;
 }
 export function validateRecordedDoctorOutput(value: unknown): DoctorOutput {
   const output = validateDoctorSubmissionShape(value);
-  if (read(output, "status") === "completed" && read(output, "cost") === undefined) throw new Error("Completed Doctor receipt has no runtime-owned cost testimony");
+  const status = read(output, "status");
+  const base = typeof status === "string" ? seatFallbackBaseStatus(status) : status;
+  if (base === "completed" && read(output, "cost") === undefined) throw new Error("Completed Doctor receipt has no runtime-owned cost testimony");
   return output as DoctorOutput;
 }
 

package/src/engine-detour-tool.ts

@@ -4,7 +4,7 @@
  * Evidence-child legs install the same definition via customTools (no spawn in role modules).
  * #380: engine process failure soft-returns so the seat rejoins the main road; declaration
  * is recorded once via engine-labor-fallback (no fail-closed reject-leg).
- * Caller AbortSignal cancel propagates without fallback; package-owned idle abort soft-fails.
+ * Caller AbortSignal cancel propagates without fallback.
  */
 import type {
   AgentToolResult,
@@ -27,11 +27,6 @@ import {
   recordEngineLaborFallback,
   type EngineLaborFallbackField,
 } from "./engine-labor-fallback.ts";
-import {
-  isPackageOwnedToolIdleTimeoutError,
-  pokePackageOwnedToolIdle,
-  wrapPackageOwnedToolDefinition,
-} from "./package-owned-tool-idle.ts";
 
 const engineDetourArgsSchema = Type.Object(
   {
@@ -81,18 +76,11 @@ function seatFallbackToolResult(
   };
 }
 
-/** Caller/upper-layer cancel must propagate; idle backstop is seat-fallback, not cancel. */
+/** Caller/upper-layer cancel must propagate; process failure is seat-fallback, not cancel. */
 function isCallerCancellation(
   error: unknown,
   signal: AbortSignal | undefined,
 ): boolean {
-  if (isPackageOwnedToolIdleTimeoutError(error)) return false;
-  if (
-    signal !== undefined &&
-    isPackageOwnedToolIdleTimeoutError(signal.reason)
-  ) {
-    return false;
-  }
   if (signal?.aborted === true) return true;
   if (
     typeof error === "object" &&
@@ -108,7 +96,7 @@ function isCallerCancellation(
  * Build one once-latch detour tool definition for a configured engine name.
  * `latch` is shared so parent registration can reset between activations.
  * `fail` owns host abort (parent) vs throw (evidence child) for tool misuse only.
- * Engine process failure (nonzero/empty/spawn/idle-timeout) soft-returns seat fallback (#380).
+ * Engine process failure (nonzero/empty/spawn) soft-returns seat fallback (#380).
  * Caller AbortSignal cancel propagates without writing fallback.
  */
 export function createEngineDetourToolDefinition(input: {
@@ -118,7 +106,7 @@ export function createEngineDetourToolDefinition(input: {
 }): ToolDefinition {
   const latch = input.latch ?? { used: false };
   const engineName = input.engineName;
-  return wrapPackageOwnedToolDefinition({
+  return {
     name: ENGINE_DETOUR_TOOL_NAME,
     label: "Engine Detour",
     description:
@@ -170,16 +158,13 @@ export function createEngineDetourToolDefinition(input: {
 
       let result: Awaited<ReturnType<typeof runEngineDetourOnce>>;
       try {
-        // Byte activity on stdout/stderr touches the outer package-owned idle clock
-        // (183s silence law unchanged). True hangs still die; slow streaming engines live.
         result = await runEngineDetourOnce({
           argv,
           cwd: ctx.cwd,
           ...(signal === undefined ? {} : { signal }),
-          onOutputActivity: pokePackageOwnedToolIdle,
         });
       } catch (error) {
-        // Caller cancel: propagate. Idle backstop + spawn/engine failure: seat fallback.
+        // Caller cancel: propagate. Spawn/engine failure: seat fallback.
         if (isCallerCancellation(error, signal)) {
           throw error;
         }
@@ -200,7 +185,7 @@ export function createEngineDetourToolDefinition(input: {
         },
       };
     },
-  }) as ToolDefinition;
+  } as ToolDefinition;
 }
 
 /**

package/src/engine-detour.ts

@@ -44,11 +44,6 @@ export type EngineDetourRunInput = Readonly<{
   cwd: string;
   env?: NodeJS.ProcessEnv;
   signal?: AbortSignal;
-  /**
-   * Called when the child emits at least one byte on stdout or stderr.
-   * Host wires this to the package-owned idle clock (activity = touch); no timer here.
-   */
-  onOutputActivity?: () => void;
 }>;
 
 function abortReasonError(signal: AbortSignal): Error {
@@ -78,8 +73,8 @@ export async function runEngineDetourOnce(
   return await new Promise<EngineDetourResult>((resolve, reject) => {
     let settled = false;
     const signal = input.signal;
-    // Own abort→kill explicitly so rejection preserves signal.reason (caller cancel
-    // vs package-owned idle). Do not pass `signal` to spawn (Node replaces reason).
+    // Own abort→kill explicitly so rejection preserves signal.reason (caller cancel).
+    // Do not pass `signal` to spawn (Node replaces reason).
     const child = spawn(command, args, {
       cwd: input.cwd,
       env: input.env ?? process.env,
@@ -87,17 +82,11 @@ export async function runEngineDetourOnce(
     });
     let stdout = "";
     let stderr = "";
-    const noteActivity = (chunk: string): void => {
-      if (chunk.length === 0) return;
-      input.onOutputActivity?.();
-    };
     child.stdout.setEncoding("utf8").on("data", (chunk: string) => {
       stdout += chunk;
-      noteActivity(chunk);
     });
     child.stderr.setEncoding("utf8").on("data", (chunk: string) => {
       stderr += chunk;
-      noteActivity(chunk);
     });
     const fail = (error: unknown): void => {
       if (settled) return;
@@ -116,8 +105,7 @@ export async function runEngineDetourOnce(
       resolve(result);
     };
     const onAbort = (): void => {
-      // Fail synchronously so cooperative idle/cancel paths can soft-settle
-      // before the outer package-owned idle hard-reject drain.
+      // Fail synchronously so caller-cancel soft-settle preserves signal.reason.
       fail(signal !== undefined ? abortReasonError(signal) : new Error("aborted"));
       try {
         child.kill("SIGTERM");

package/src/engine-labor-fallback.ts

@@ -32,6 +32,87 @@ export type EngineLaborFallbackField = ReturnType<
   typeof buildEngineLaborFallbackField
 >;
 
+/**
+ * Seat-fallback status taint suffix.
+ * When engineLaborFallback is declared, typed status discriminators
+ * (judgeStatus / status) must not remain clean values like converged/completed.
+ * Mechanical form: `${base}-by-fallback` — readable on the status line alone.
+ */
+export const SEAT_FALLBACK_STATUS_SUFFIX = "-by-fallback" as const;
+
+export function isSeatFallbackTaintedStatus(status: string): boolean {
+  return status.endsWith(SEAT_FALLBACK_STATUS_SUFFIX);
+}
+
+/** Strip seat-fallback taint for semantic routing / acceptance matching. */
+export function seatFallbackBaseStatus(status: string): string {
+  return isSeatFallbackTaintedStatus(status)
+    ? status.slice(0, -SEAT_FALLBACK_STATUS_SUFFIX.length)
+    : status;
+}
+
+/**
+ * ADR 0071: `-by-fallback` is lawful only with a valid `engineLaborFallback`
+ * declaration (latch-shaped triple). Clean statuses do not need the field.
+ */
+export function seatFallbackStatusHasLawfulEvidence(
+  status: string,
+  source: unknown,
+): boolean {
+  if (!isSeatFallbackTaintedStatus(status)) return true;
+  return readEngineLaborFallbackFieldFrom(source) !== undefined;
+}
+
+/** Idempotent taint: clean → `${clean}-by-fallback`; already tainted stays. */
+export function taintStatusForSeatFallback(status: string): string {
+  if (status.length === 0 || isSeatFallbackTaintedStatus(status)) return status;
+  return `${status}${SEAT_FALLBACK_STATUS_SUFFIX}`;
+}
+
+/** Clean status literal or its seat-fallback tainted form. */
+export type SeatFallbackTaintedStatus<S extends string = string> =
+  | S
+  | `${S}${typeof SEAT_FALLBACK_STATUS_SUFFIX}`;
+
+type TaintDiscriminatorFields<T> = {
+  [K in keyof T]: K extends "status" | "judgeStatus"
+    ? T[K] extends string
+      ? SeatFallbackTaintedStatus<Extract<T[K], string>>
+      : T[K]
+    : T[K];
+};
+
+/** Receipt shape after sole-built field attach + status taint (runtime truth). */
+export type WithEngineLaborFallback<T extends object> = T extends unknown
+  ? TaintDiscriminatorFields<T> & EngineLaborFallbackField
+  : never;
+
+const STATUS_DISCRIMINATOR_KEYS = ["judgeStatus", "status"] as const;
+
+/** Rewrite known status discriminators on a receipt when seat fallback is declared. */
+function taintReceiptStatusDiscriminators<T extends object>(
+  receipt: T,
+): TaintDiscriminatorFields<T> {
+  let next: Record<string, unknown> | undefined;
+  for (const key of STATUS_DISCRIMINATOR_KEYS) {
+    if (!Object.prototype.hasOwnProperty.call(receipt, key)) continue;
+    let value: unknown;
+    try {
+      value = (receipt as Record<string, unknown>)[key];
+    } catch {
+      continue;
+    }
+    if (typeof value !== "string" || value.length === 0) continue;
+    const tainted = taintStatusForSeatFallback(value);
+    if (tainted === value) continue;
+    if (next === undefined) {
+      next = { ...(receipt as object as Record<string, unknown>) };
+    }
+    next[key] = tainted;
+  }
+  return (next === undefined ? receipt : next) as TaintDiscriminatorFields<T>;
+}
+
 export type EngineLaborFallbackLatch = {
   field: EngineLaborFallbackField | undefined;
 };
@@ -62,14 +143,31 @@ export function readEngineLaborFallbackField(
 /**
  * Merge sole-built field into typed receipt details.
  * Spread only — must not construct the field key again (S1).
+ * When the field is present, also taint typed status discriminators so a
+ * status-line-only reader cannot mistake seat labor for clean engine labor.
  * Without a mechanical latch, strip any model-injected reserved key (no forged declaration).
+ * Return type widens when field is attached: discriminators may carry `-by-fallback`
+ * and the sole-built field is present (callers must not assume clean-only unions).
  */
+export function withEngineLaborFallbackField<T extends object>(
+  receipt: T,
+  field: EngineLaborFallbackField,
+): WithEngineLaborFallback<T>;
+export function withEngineLaborFallbackField<T extends object>(
+  receipt: T,
+  field: undefined,
+): T;
+export function withEngineLaborFallbackField<T extends object>(
+  receipt: T,
+  field: EngineLaborFallbackField | undefined,
+): T | WithEngineLaborFallback<T>;
 export function withEngineLaborFallbackField<T extends object>(
   receipt: T,
   field: EngineLaborFallbackField | undefined,
-): T {
+): T | WithEngineLaborFallback<T> {
   if (field !== undefined) {
-    return { ...receipt, ...field };
+    const taintedReceipt = taintReceiptStatusDiscriminators(receipt);
+    return { ...taintedReceipt, ...field } as WithEngineLaborFallback<T>;
   }
   if (
     !Object.prototype.hasOwnProperty.call(receipt, "engineLaborFallback")

package/src/evidence-child-executor.ts

@@ -36,7 +36,6 @@ import {
   engineSessionMaterialFromOptions,
   type EngineSessionMaterial,
 } from "./package-resources/engine-material.ts";
-import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.ts";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT, type NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 import { REVIEWER_VERIFICATION_BOUNDARY } from "./reviewer-construction.ts";
 import type { ReviewerPromptText } from "./reviewer-prompt-identity.ts";
@@ -750,7 +749,7 @@ export async function executeAuditorChild(
     let decisionToolFailure: unknown;
     const decisionToolFailures = new Map<string, unknown>();
     const delivery = createReceiptDeliveryPolicy();
-    const tool = wrapPackageOwnedToolDefinition({
+    const tool = {
       ...options.tool,
       label: options.roleLabel,
       async execute(...args: any[]) {
@@ -775,7 +774,7 @@ export async function executeAuditorChild(
           throw error;
         }
       },
-    });
+    };
 
     const parentSessionManager = options.context.sessionManager;
     const parentHeader = parentSessionManager?.getHeader?.();
@@ -796,7 +795,7 @@ export async function executeAuditorChild(
       thinkingLevel: options.context.thinkingLevel ?? "off",
       modelRuntime: inherited.runtime,
       systemPrompt: options.systemPrompt,
-      customTools: [wrapPackageOwnedToolDefinition({ ...options.dossierTool, label: options.roleLabel }), tool],
+      customTools: [{ ...options.dossierTool, label: options.roleLabel }, tool],
       sessionManager: auditorSessionManager,
     });
 

package/src/factory-board.ts

@@ -20,6 +20,7 @@ import { randomUUID } from "node:crypto";
 import { lstat, mkdir, realpath, rename, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
 
+import { seatFallbackBaseStatus } from "./engine-labor-fallback.ts";
 import {
   formatDurationZh,
   formatLocalDateTime,
@@ -176,7 +177,8 @@ export function decideTicketCurrentState(input: {
   const latest = sortRunsByStart(input.runs).at(-1)!;
   if (!latest.hasResult) return unacceptedBand(latest.mtimeMs, input.now.getTime());
   // Escalate is an awaiting overlay: same placement and sort band, distinct state.
-  if (latest.resultStatus === "escalate") return "escalate-awaiting";
+  // Seat-fallback taint (`escalate-by-fallback`) keeps escalate base semantics.
+  if (seatFallbackBaseStatus(latest.resultStatus) === "escalate") return "escalate-awaiting";
   return "accepted-awaiting";
 }
 
@@ -843,7 +845,9 @@ function buildBreadcrumbSteps(runs: readonly TicketTrajectoryRun[]): BreadcrumbS
     const isReturn = seen.has(group.station);
     seen.add(group.station);
     const isRejected = group.runs.some(
-      (run) => run.hasResult && REJECTED_RESULT_STATUSES.has(run.resultStatus),
+      (run) =>
+        run.hasResult &&
+        REJECTED_RESULT_STATUSES.has(seatFallbackBaseStatus(run.resultStatus)),
     );
     steps.push({
       station: group.station,

package/src/merger-contracts.ts

@@ -1,6 +1,11 @@
 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";
 
@@ -24,9 +29,13 @@ 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>>;
-export type MergerOutput =
+type MergerOutputClean =
   | { 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";
 
@@ -65,7 +74,13 @@ 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");
-  if (value.status === "completed" && isFullGitObjectId(value.mergeCommitId)) return structuredClone(value) as MergerOutput;
-  if (value.status === "escalate") return structuredClone(value) as MergerOutput;
+  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;
   throw new Error("Merger output has no recognized execution discriminator");
 }

package/src/navigator-attendance.ts

@@ -8,6 +8,7 @@ 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,
@@ -16,7 +17,6 @@ import { PACKAGED_ROLE_REGISTRY, type PackagedRole, packagedRoleMetadata } from
 import { openInProcessAgentSession } from "./in-process-session.ts";
 import { renderPublicAkRoleCommand } from "./public-command-renderer.ts";
 import { issueRoot, subjectPath } from "./work-subject-identity.ts";
-import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.ts";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT } from "./receipt-delivery-policy.ts";
 import { recordTypedProviderHttpStatus } from "./typed-provider-http.ts";
 import {
@@ -437,7 +437,7 @@ export function parseNavigatorModelSetting(value: string): { provider: string; m
 }
 
 export function createNavigatorPrepareTool(onOutput: (value: PrepareOutput) => void): ToolDefinition {
-  return wrapPackageOwnedToolDefinition({
+  return {
     name: NAVIGATOR_PREPARE_TOOL_NAME,
     label: "Navigator preparation",
     description: "Submit Navigator direction advice. Provide candidates with next.role (phase when meaningful). route/matches/reason/command are optional context, not acceptance gates.",
@@ -448,7 +448,7 @@ export function createNavigatorPrepareTool(onOutput: (value: PrepareOutput) => v
       onOutput(value as PrepareOutput);
       return { content: [{ type: "text" as const, text: "Navigator preparation accepted" }], details: value, terminate: true as const };
     },
-  });
+  };
 }
 
 /**
@@ -462,6 +462,18 @@ 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,
@@ -478,7 +490,9 @@ export function selectNavigatorCandidate(
   if (rolePhaseMatched.length > 0) {
     if (settlement.status !== undefined) {
       const statusSpecific = rolePhaseMatched.find(
-        (candidate) => candidate.matches?.statuses?.includes(settlement.status!) === true,
+        (candidate) =>
+          candidate.matches?.statuses !== undefined &&
+          statusListMatchesSettlement(candidate.matches.statuses, settlement.status!),
       );
       if (statusSpecific !== undefined) {
         return { candidate: statusSpecific, matchedToSettlement: true };

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

@@ -1,5 +1,12 @@
 /** 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";
 
@@ -10,7 +17,7 @@ export type JudgeClass = {
   disposition: string;
 };
 
-export type JudgeVerdict =
+type JudgeVerdictClean =
   | { judgeStatus: "converged"; note?: string; evidence?: unknown }
   | {
     judgeStatus: "continue";
@@ -26,6 +33,11 @@ export type JudgeVerdict =
     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;
@@ -34,6 +46,17 @@ export function validateAcceptedJudgeDetails(verdict: unknown): JudgeVerdict {
   } catch {
     throw new Error("Judge verdict has no execution discriminator");
   }
-  if (["converged", "continue", "escalate"].includes(String(judgeStatus))) return verdict as 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)
+  ) {
+    return verdict as JudgeVerdict;
+  }
   throw new Error("Judge verdict has no execution discriminator");
 }