@akagilnc/pi-workflow-roles 0.1.2383 → 0.1.2402

package/src/public-cli/terminal.ts

@@ -6,7 +6,6 @@
  * extra rows or shift column boundaries (note / fix.summary / decision question / reason).
  */
 import { renderPublicAkRoleCommand } from "./command-renderer.ts";
-import type { ComplianceAuditIncomplete } from "../compliance-transport.ts";
 import type { NavigatorPhase } from "../navigator-attendance.ts";
 import type { NoReceiptLifecycleFacts } from "../receipt-delivery-policy.ts";
 
@@ -41,9 +40,10 @@ export type TerminalRoleName =
   | "merger"
   | "notary";
 
+/** Merger/Collector residual only — Notary/audit residual abolished (#475). */
 export type ResidualIncompleteTerminalOutcome = {
   kind: "incomplete";
-  role: "merger" | "collector" | "notary";
+  role: "merger" | "collector";
   status: "incomplete";
   decision: "no-usable-result";
   candidate: unknown;
@@ -52,35 +52,6 @@ export type ResidualIncompleteTerminalOutcome = {
   decisiveFacts: Readonly<Record<string, unknown>>;
 };
 
-export type AuditIncompleteTerminalOutcome = {
-  kind: "audit_incomplete";
-  role: TerminalRoleName;
-  status: "audit-incomplete";
-  decision: "no-usable-decision";
-  /** The original role submission arguments, retained independently. */
-  roleCandidate: unknown;
-  /** The malformed auditor candidate and observation retained by compliance transport. */
-  audit: ComplianceAuditIncomplete;
-  acceptedReceipt: false;
-  decisiveFacts: Readonly<Record<string, unknown>>;
-};
-
-/** JSON-safe public stand-in for an omitted tool-call `arguments` member. */
-export const JSON_SAFE_UNDEFINED_ARGUMENT = Object.freeze({
-  kind: "json-safe-sentinel",
-  type: "undefined",
-} as const);
-
-export type AuditIncompleteResidual = {
-  readonly roleCandidate: unknown;
-  readonly audit: ComplianceAuditIncomplete;
-  readonly acceptedReceipt: false;
-};
-
-export function jsonSafeComplianceCandidate(value: unknown): unknown {
-  return value === undefined ? JSON_SAFE_UNDEFINED_ARGUMENT : value;
-}
-
 export type NoReceiptTerminalOutcome = NoReceiptLifecycleFacts & {
   kind: "no_receipt";
   role: TerminalRoleName;
@@ -102,7 +73,6 @@ export type TerminalRoleOutcome =
       status: "audit_escalation";
       decisiveFacts: Readonly<Record<string, unknown>>;
     }
-  | AuditIncompleteTerminalOutcome
   | ResidualIncompleteTerminalOutcome
   | NoReceiptTerminalOutcome
   | {
@@ -113,8 +83,6 @@ export type TerminalRoleOutcome =
       /** Original diagnostic identity retained for the caller. */
       diagnostic: string;
       decisiveFacts: Readonly<Record<string, unknown>>;
-      /** Retained audit residual when publication itself failed. */
-      auditResidual?: AuditIncompleteResidual;
     };
 
 /** Lawful typed terminal results exit zero (including audit_escalation). */
@@ -131,7 +99,7 @@ export function exitCodeForTerminalOutcome(
 }
 
 export function buildResidualIncompleteTerminalOutcome(input: {
-  role: "merger" | "collector" | "notary";
+  role: "merger" | "collector";
   candidate: unknown;
   diagnostic: string;
 }): ResidualIncompleteTerminalOutcome {
@@ -152,42 +120,6 @@ export function buildResidualIncompleteTerminalOutcome(input: {
   };
 }
 
-export function buildAuditIncompleteTerminalOutcome(input: {
-  role: TerminalRoleName;
-  roleCandidate: unknown;
-  audit: ComplianceAuditIncomplete;
-}): AuditIncompleteTerminalOutcome {
-  const roleCandidate = jsonSafeComplianceCandidate(input.roleCandidate);
-  const audit = {
-    ...input.audit,
-    candidate: jsonSafeComplianceCandidate(input.audit.candidate),
-  };
-  return {
-    kind: "audit_incomplete",
-    role: input.role,
-    status: "audit-incomplete",
-    decision: "no-usable-decision",
-    roleCandidate,
-    audit,
-    acceptedReceipt: false,
-    decisiveFacts: {
-      decision: "no-usable-decision",
-      roleCandidate,
-      auditCandidate: audit.candidate,
-      auditObservation: audit.observation,
-      observationKind: audit.observation.kind,
-      observationType: audit.observation.kind === "non-object-arguments"
-        ? audit.observation.type
-        : audit.observation.kind === "object-status-unreadable"
-          ? audit.observation.status
-          : audit.observation.kind === "missing-subject"
-            ? audit.observation.subject
-            : audit.observation.kind,
-      acceptedReceipt: false,
-    },
-  };
-}
-
 export type TerminalNavigatorFact =
   | {
       disposition: "recommendation";

package/src/reviewer-auditor.ts

@@ -10,8 +10,8 @@ import {
 } from "./compliance-transport.ts";
 import {
   readReviewerAuditSubjects,
+  requireAuditMaterials,
   resolveAuditDossier,
-  toAuditIncomplete,
 } from "./dossier-resolution.ts";
 
 export const REVIEWER_AUDIT_TOOL_NAME = "ak_reviewer_audit_decision";
@@ -35,9 +35,9 @@ export function createPiReviewerAuditor(
 ): (options: ReviewerAuditOptions) => Promise<ComplianceDecision> {
   return async (options) => {
     const dossier = resolveAuditDossier();
-    if (dossier.status === "incomplete") return toAuditIncomplete(dossier.observation);
+    requireAuditMaterials(dossier);
     const subjects = readReviewerAuditSubjects(options.context);
-    if (subjects.status === "incomplete") return toAuditIncomplete(subjects.observation);
+    requireAuditMaterials(subjects);
 
     return runComplianceAudit({
       tool: reviewerDecisionTool,

package/src/reviewer-role.ts

@@ -7,10 +7,6 @@ export type { CanonicalSkillBinding };
 import { disposeComplianceDecision } from "./audit-escalation.ts";
 import type { ComplianceDecision } from "./compliance-transport.ts";
 import { appendActiveSessionCustomEntry } from "./compliance-transport.ts";
-import {
-  readActivationEngineLaborFallbackField,
-  withEngineLaborFallbackField,
-} from "./engine-labor-fallback.ts";
 import { REVIEWER_CANDIDATE_ENTRY_TYPE } from "./dossier-resolution.ts";
 import { type ReviewerSpecDisposition } from "./reviewer-construction.ts";
 import { createReviewerDispatcher, type AcceptedReviewerDispatch, type AcceptedReviewerExecution, type ReviewerIssueFetcher, type ReviewerPinnedGitReader } from "./reviewer-dispatch.ts";
@@ -160,15 +156,11 @@ export function createReviewerRoleRuntime(
             const output = validateReviewerIntent(parameters);
             let record: ReviewerExecutionRecord;
             try { record = ledger.recordForAudit(output.status); } catch (error) { if ((error as any)?.fatalReviewerInfrastructure) hostActions.failInfrastructure(error, toolCtx, id); throw error; }
-            const candidate = withEngineLaborFallbackField(
-              assembleRuntimeReviewerReceipt({
+            const candidate = assembleRuntimeReviewerReceipt({
                 intent: output,
                 record,
                 canonicalSkillText: binding.snapshot.raw,
-              }),
-              // #380: sole-built declaration when any leg detour fell back to seat labor.
-              readActivationEngineLaborFallbackField(),
-            );
+              });
             // First-record-then-audit: candidate lands on the parent session books
             // before the auditor is spawned (zero hand-delivery).
             try {
@@ -210,7 +202,6 @@ export function createReviewerRoleRuntime(
                   try { await dependencies.shutdownAgent?.(); } catch (error) { hostActions.failInfrastructure(ledger.recordInfrastructureFailure(error), toolCtx, id); }
                   return result;
                 },
-                auditIncomplete: (result) => result,
               },
               candidate,
             );

package/src/role-runtime.ts

@@ -23,13 +23,6 @@ import {
 } from "./tool-execution-observation.ts";
 import { ENGINE_DETOUR_TOOL_NAME } from "./engine-detour.ts";
 import { registerEngineDetourTool } from "./engine-detour-tool.ts";
-import {
-  createEngineLaborFallbackLatch,
-  installActivationEngineLaborFallbackLatch,
-  restoreEngineLaborFallbackFromSessionEntries,
-  seatFallbackBaseStatus,
-  seatFallbackStatusHasLawfulEvidence,
-} from "./engine-labor-fallback.ts";
 import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT } from "./receipt-delivery-policy.ts";
 import { createOAuthKeepalive, type OAuthKeepaliveOptions } from "./oauth-keepalive.ts";
 
@@ -50,6 +43,7 @@ import { decorateSettlementWithNavigation, formatNavigatorReport, NAVIGATOR_EVEN
 import {
   buildNavigatorInfrastructureFailureFact,
   classifyPackagedRoleTerminalResult,
+  NAVIGATOR_INFRASTRUCTURE_FAILURE_EVIDENCE_KEYS,
   NAVIGATOR_INVOCATION_ENTRY,
   resolveLifecycleInvocationPrincipal,
 } from "./navigator-invocation-identity.ts";
@@ -220,9 +214,11 @@ import { createMergerRoleRuntime, type MergerRoleDependencies } from "./merger-r
 export {
   buildNavigatorInfrastructureFailureFact,
   classifyPackagedRoleTerminalResult,
+  hasNavigatorInfrastructureFailureBase,
   isAcceptedPackagedRoleTerminalResult,
   isDurablePackagedRoleTerminalResult,
   isNavigatorInfrastructureFailureFact,
+  NAVIGATOR_INFRASTRUCTURE_FAILURE_EVIDENCE_KEYS,
   NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND,
   type NavigatorInfrastructureFailureFact,
   type PackagedRoleTerminalClassification,
@@ -550,6 +546,35 @@ function failInfrastructure(error: unknown, ctx: ExtensionContext): never {
   throw error;
 }
 
+/**
+ * Envelope-owned pending infrastructure failure: closed fact + original Error evidence.
+ * tool_result projects once from this record; settlement consumes durable details as-is.
+ */
+type PendingInfrastructureFailure = {
+  readonly details: Record<string, unknown>;
+};
+
+function extractInfrastructureFailureEvidence(error: unknown): Record<string, unknown> {
+  if (typeof error !== "object" || error === null) return {};
+  const record = error as Record<string, unknown>;
+  const evidence: Record<string, unknown> = {};
+  for (const key of NAVIGATOR_INFRASTRUCTURE_FAILURE_EVIDENCE_KEYS) {
+    if (!Object.hasOwn(record, key)) continue;
+    // undefined → null so JSON durable details retain the empty-candidate key.
+    evidence[key] = record[key] === undefined ? null : record[key];
+  }
+  return evidence;
+}
+
+function buildPendingInfrastructureFailure(error: unknown): PendingInfrastructureFailure {
+  return {
+    details: {
+      ...buildNavigatorInfrastructureFailureFact(),
+      ...extractInfrastructureFailureEvidence(error),
+    },
+  };
+}
+
 function navigatorPhase(pi: ExtensionAPI, role: string): NavigatorPhase {
   const metadata = packagedRoleMetadata(role);
   if (metadata === undefined || metadata.phases[0] === null) return null;
@@ -582,12 +607,7 @@ export function publicNavigatorSettlement(role: string, phase: NavigatorPhase, e
   const status = typeof details.status === "string"
     ? details.status
     : typeof details.judgeStatus === "string" ? details.judgeStatus : undefined;
-  // ADR 0071: `-by-fallback` without latch-shaped evidence is not a lawful terminal.
-  if (status !== undefined && !seatFallbackStatusHasLawfulEvidence(status, event.details)) {
-    return undefined;
-  }
-  // Seat-fallback taint keeps escalate semantics (base) while preserving the polluted token.
-  if (status !== undefined && seatFallbackBaseStatus(status) === "escalate") {
+  if (status !== undefined && status === "escalate") {
     return { kind: "human_decision", role, phase, status };
   }
   return { kind: "accepted", role, phase, ...(status === undefined ? {} : { status }) };
@@ -616,12 +636,11 @@ export function createRoleRuntimeExtension(
     let pendingNavigatorPresentation: { event: import("./navigator-attendance.ts").NavigatorEvent; report: import("./navigator-attendance.ts").NavigatorReport } | undefined;
     let pendingNavigatorSettlement: Promise<void> | undefined;
     let navigatorWorkContext: NavigatorWorkContext | undefined;
-    const pendingInfrastructureToolCallIds = new Set<string>();
+    /** toolCallId → fact+evidence; one-shot projected onto durable tool_result (#475). */
+    const pendingInfrastructureFailures = new Map<string, PendingInfrastructureFailure>();
     // Envelope-owned execute→tool_result bridge for Gatekeeper non-pass (ADR 0018).
     const pendingGatekeeperNonPassByToolCallId = new Map<string, GatekeeperNonPassResult>();
-    // #357 T2 / #378 / #380 / #391: engine detour once-latch + seat-fallback latch (any role+engine).
     let engineDetourRegistration: ReturnType<typeof registerEngineDetourTool> | undefined;
-    let engineLaborFallbackLatch = createEngineLaborFallbackLatch();
     // #288 primary-session thin adapter. The policy is the sole budget owner;
     // terminating-tool rejections and mechanical delivery requests share two turns.
     let receiptDelivery = createReceiptDeliveryPolicy();
@@ -705,11 +724,11 @@ export function createRoleRuntimeExtension(
     pi.on("tool_result", async (event) => {
       const role = selectedRole;
       if (role === undefined) return;
-      const isRoleInfrastructureFailure = pendingInfrastructureToolCallIds.delete(event.toolCallId);
-      // Overlay typed infra fact so live settlement and durable session entry agree.
-      const infrastructureDetails = isRoleInfrastructureFailure
-        ? buildNavigatorInfrastructureFailureFact()
-        : undefined;
+      const pendingInfra = pendingInfrastructureFailures.get(event.toolCallId);
+      const isRoleInfrastructureFailure = pendingInfra !== undefined;
+      if (pendingInfra !== undefined) pendingInfrastructureFailures.delete(event.toolCallId);
+      // One-shot project fact + typed evidence so live settlement and durable session agree.
+      const infrastructureDetails = pendingInfra?.details;
       const classified = infrastructureDetails === undefined
         ? event
         : { ...event, details: infrastructureDetails };
@@ -878,7 +897,7 @@ export function createRoleRuntimeExtension(
       navigatorAttendance?.dispose();
       navigatorAttendance = undefined;
       pendingNavigatorSettlement = undefined;
-      pendingInfrastructureToolCallIds.clear();
+      pendingInfrastructureFailures.clear();
       pendingGatekeeperNonPassByToolCallId.clear();
       observationFace.reset();
     });
@@ -886,7 +905,7 @@ export function createRoleRuntimeExtension(
     const hostActions = {
       failInfrastructure(error: unknown, ctx: ExtensionContext, toolCallId?: string): never {
         if (toolCallId !== undefined) {
-          pendingInfrastructureToolCallIds.add(toolCallId);
+          pendingInfrastructureFailures.set(toolCallId, buildPendingInfrastructureFailure(error));
         }
         failInfrastructure(error, ctx);
       },
@@ -1105,20 +1124,8 @@ export function createRoleRuntimeExtension(
       observationFace.reset();
       pendingNavigatorPresentation = undefined;
       pendingNavigatorSettlement = undefined;
-      pendingInfrastructureToolCallIds.clear();
+      pendingInfrastructureFailures.clear();
       pendingGatekeeperNonPassByToolCallId.clear();
-      engineLaborFallbackLatch = createEngineLaborFallbackLatch();
-      // #380 resume: restore sole-built fallback from durable same-session detour results.
-      const sessionEntries =
-        typeof ctx.sessionManager?.getEntries === "function"
-          ? ctx.sessionManager.getEntries()
-          : [];
-      restoreEngineLaborFallbackFromSessionEntries(
-        engineLaborFallbackLatch,
-        sessionEntries,
-        ENGINE_DETOUR_TOOL_NAME,
-      );
-      installActivationEngineLaborFallbackLatch(engineLaborFallbackLatch);
       engineDetourRegistration?.resetLatch();
       navigatorWorkContext = undefined;
       // #351: OAuth keepalive is orthogonal to --ak-role; start before role early-return
@@ -1234,7 +1241,6 @@ export function createRoleRuntimeExtension(
         await executeActivationStage(entry.role, activationStage(entry.role, runtime), { clock, writeTrace });
         // #357 T2 / #378 / #380 / #391: any role+engine activation registers the package detour tool once.
         // Gate is env presence only — no per-engine execute branch; no role-module spawn.
-        // Seat-fallback latch is activation-scoped (installed at session_start) so legs share it.
         if (engineDetourRegistration === undefined) {
           engineDetourRegistration = registerEngineDetourTool(pi, hostActions);
           if (!engineDetourRegistration.registered) {

package/src/worker-role.ts

@@ -6,10 +6,6 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import { Type, type Static } from "typebox";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
-import {
-  readActivationEngineLaborFallbackField,
-  withEngineLaborFallbackField,
-} from "./engine-labor-fallback.ts";
 
 import type {
   AnyCanonicalSkillBinding,
@@ -299,11 +295,7 @@ export function createFixerRoleRuntime(
                 toolCallId,
               });
             }
-            // #391: attach sole-built engineLaborFallback when detour fell back to seat labor.
-            const acceptedDetails = withEngineLaborFallbackField(
-              output,
-              readActivationEngineLaborFallbackField(),
-            );
+            const acceptedDetails = output;
             return {
               content: [{ type: "text" as const, text: "Fixer report accepted" }],
               details: acceptedDetails,
@@ -452,11 +444,7 @@ export function createCoderRoleRuntime(
                 toolCallId,
               });
             }
-            // #391: attach sole-built engineLaborFallback when detour fell back to seat labor.
-            const acceptedDetails = withEngineLaborFallbackField(
-              output,
-              readActivationEngineLaborFallbackField(),
-            );
+            const acceptedDetails = output;
             return {
               content: [{ type: "text" as const, text: "Coder report accepted" }],
               details: acceptedDetails,

package/dist/engine-labor-fallback.js

@@ -1,136 +0,0 @@
-let activationLatch;
-function buildEngineLaborFallbackField(input) {
-  return Object.freeze({
-    engineLaborFallback: Object.freeze({
-      engine: input.engine,
-      failure: input.failure,
-      laborBy: "seat"
-    })
-  });
-}
-const SEAT_FALLBACK_STATUS_SUFFIX = "-by-fallback";
-function isSeatFallbackTaintedStatus(status) {
-  return status.endsWith(SEAT_FALLBACK_STATUS_SUFFIX);
-}
-function seatFallbackBaseStatus(status) {
-  return isSeatFallbackTaintedStatus(status) ? status.slice(0, -SEAT_FALLBACK_STATUS_SUFFIX.length) : status;
-}
-function seatFallbackStatusHasLawfulEvidence(status, source) {
-  if (!isSeatFallbackTaintedStatus(status)) return true;
-  return readEngineLaborFallbackFieldFrom(source) !== void 0;
-}
-function taintStatusForSeatFallback(status) {
-  if (status.length === 0 || isSeatFallbackTaintedStatus(status)) return status;
-  return `${status}${SEAT_FALLBACK_STATUS_SUFFIX}`;
-}
-const STATUS_DISCRIMINATOR_KEYS = ["judgeStatus", "status"];
-function taintReceiptStatusDiscriminators(receipt) {
-  let next;
-  for (const key of STATUS_DISCRIMINATOR_KEYS) {
-    if (!Object.prototype.hasOwnProperty.call(receipt, key)) continue;
-    let value;
-    try {
-      value = receipt[key];
-    } catch {
-      continue;
-    }
-    if (typeof value !== "string" || value.length === 0) continue;
-    const tainted = taintStatusForSeatFallback(value);
-    if (tainted === value) continue;
-    if (next === void 0) {
-      next = { ...receipt };
-    }
-    next[key] = tainted;
-  }
-  return next === void 0 ? receipt : next;
-}
-function createEngineLaborFallbackLatch() {
-  return { field: void 0 };
-}
-function recordEngineLaborFallback(latch, input) {
-  const field = buildEngineLaborFallbackField(input);
-  if (latch.field === void 0) latch.field = field;
-  return latch.field;
-}
-function readEngineLaborFallbackField(latch) {
-  return latch?.field;
-}
-function withEngineLaborFallbackField(receipt, field) {
-  if (field !== void 0) {
-    const taintedReceipt = taintReceiptStatusDiscriminators(receipt);
-    return { ...taintedReceipt, ...field };
-  }
-  if (!Object.prototype.hasOwnProperty.call(receipt, "engineLaborFallback")) {
-    return receipt;
-  }
-  const { engineLaborFallback: _forged, ...rest } = receipt;
-  return rest;
-}
-function installActivationEngineLaborFallbackLatch(latch) {
-  activationLatch = latch;
-}
-function clearActivationEngineLaborFallbackLatch() {
-  activationLatch = void 0;
-}
-function activationEngineLaborFallbackLatch() {
-  return activationLatch;
-}
-function readActivationEngineLaborFallbackField() {
-  return readEngineLaborFallbackField(activationLatch);
-}
-function readEngineLaborFallbackFieldFrom(source) {
-  if (typeof source !== "object" || source === null || Array.isArray(source)) {
-    return void 0;
-  }
-  let raw;
-  try {
-    raw = source.engineLaborFallback;
-  } catch {
-    return void 0;
-  }
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return void 0;
-  const rec = raw;
-  if (typeof rec.engine !== "string" || typeof rec.failure !== "string" || rec.laborBy !== "seat") {
-    return void 0;
-  }
-  return buildEngineLaborFallbackField({
-    engine: rec.engine,
-    failure: rec.failure
-  });
-}
-function restoreEngineLaborFallbackFromSessionEntries(latch, entries, toolName) {
-  for (const entry of entries) {
-    if (typeof entry !== "object" || entry === null) continue;
-    const row = entry;
-    if (row.type !== "message") continue;
-    const message = row.message;
-    if (typeof message !== "object" || message === null) continue;
-    const msg = message;
-    if (msg.role !== "toolResult") continue;
-    if (msg.toolName !== toolName) continue;
-    const field = readEngineLaborFallbackFieldFrom(msg.details);
-    if (field === void 0) continue;
-    recordEngineLaborFallback(latch, {
-      engine: field.engineLaborFallback.engine,
-      failure: field.engineLaborFallback.failure
-    });
-  }
-}
-export {
-  SEAT_FALLBACK_STATUS_SUFFIX,
-  activationEngineLaborFallbackLatch,
-  buildEngineLaborFallbackField,
-  clearActivationEngineLaborFallbackLatch,
-  createEngineLaborFallbackLatch,
-  installActivationEngineLaborFallbackLatch,
-  isSeatFallbackTaintedStatus,
-  readActivationEngineLaborFallbackField,
-  readEngineLaborFallbackField,
-  readEngineLaborFallbackFieldFrom,
-  recordEngineLaborFallback,
-  restoreEngineLaborFallbackFromSessionEntries,
-  seatFallbackBaseStatus,
-  seatFallbackStatusHasLawfulEvidence,
-  taintStatusForSeatFallback,
-  withEngineLaborFallbackField
-};