@akagilnc/pi-workflow-roles 0.1.2068 → 0.1.2071

package/dist/navigator-attendance.js

@@ -90,13 +90,6 @@ function navigatorUnavailableError(source, error, cause = source) {
   const message = error instanceof Error ? error.message : String(error);
   return error instanceof NavigatorUnavailableError ? error : new NavigatorUnavailableError(source, message, cause, error);
 }
-function navigatorAdviceConsistentWithSettlement(next, settlement) {
-  if (settlement.kind !== "accepted") return true;
-  if (settlement.status === "unfinished" && next.role === "judge") return false;
-  if (settlement.role === "fixer" && settlement.phase === "apply" && settlement.status === "completed" && next.role === "fixer" && next.phase === "apply") return false;
-  if (next.role !== "merger") return true;
-  return settlement.role === "judge" && settlement.status === "converged";
-}
 const prepareSchema = Type.Object({}, { additionalProperties: true });
 const ROUTE_ENTRY = "ak-navigator-route";
 const CONTEXT_ENTRY = "ak-navigator-context";
@@ -269,17 +262,29 @@ function selectNavigatorCandidate(candidates, settlement) {
   if (settlement.kind !== "accepted") return void 0;
   const usable = candidates.filter((candidate) => candidate.next !== void 0);
   if (usable.length === 0) return void 0;
-  const matched = usable.filter(
+  const rolePhaseMatched = usable.filter(
     (candidate) => candidate.matches !== void 0 && candidate.matches.role === settlement.role && candidate.matches.phase === settlement.phase
   );
-  if (matched.length > 0) {
+  if (rolePhaseMatched.length > 0) {
     if (settlement.status !== void 0) {
-      const statusSpecific = matched.find((candidate) => candidate.matches?.statuses?.includes(settlement.status) === true);
-      if (statusSpecific !== void 0) return statusSpecific;
+      const statusSpecific = rolePhaseMatched.find(
+        (candidate) => candidate.matches?.statuses?.includes(settlement.status) === true
+      );
+      if (statusSpecific !== void 0) {
+        return { candidate: statusSpecific, matchedToSettlement: true };
+      }
     }
-    return matched.find((candidate) => candidate.matches?.statuses === void 0);
+    const rolePhaseGeneric = rolePhaseMatched.find(
+      (candidate) => candidate.matches?.statuses === void 0
+    );
+    if (rolePhaseGeneric !== void 0) {
+      return { candidate: rolePhaseGeneric, matchedToSettlement: true };
+    }
+    return void 0;
   }
-  return usable.find((candidate) => candidate.matches === void 0);
+  const unbound = usable.find((candidate) => candidate.matches === void 0);
+  if (unbound === void 0) return void 0;
+  return { candidate: unbound, matchedToSettlement: false };
 }
 function formatNavigatorReport(report) {
   const playbookFailure = report.routePlaybookReadFailure === void 0 ? [] : [`\u8DEF\u4E66\u8BFB\u53D6\u5931\u8D25\uFF1A${oneLine(report.routePlaybookReadFailure)}`];
@@ -375,6 +380,7 @@ function createNavigatorAttendance(options) {
   const prepare = async () => {
     const boundSettlement = prepareBoundSettlement;
     prepareBoundSettlement = void 0;
+    preparationNoReceipt = false;
     const invocationId = invocationPrincipal;
     activeInvocationId = invocationId;
     if (contextError !== void 0) throw navigatorUnavailableError("context", contextError);
@@ -704,27 +710,25 @@ ${helpContext}
         let prepared = await preparation;
         session?.appendEntry(SETTLEMENT_ENTRY, { invocationId, subjectKey, role: settlement.role, phase: settlement.phase, kind: settlement.kind, ...settlement.status === void 0 ? {} : { status: settlement.status } });
         let selected = selectNavigatorCandidate(prepared, settlement);
-        if (selected?.next !== void 0 && !navigatorAdviceConsistentWithSettlement(selected.next, settlement)) {
+        if (selected?.candidate.next !== void 0 && !selected.matchedToSettlement) {
           prepareBoundSettlement = settlement;
           prepared = await prepare();
           selected = selectNavigatorCandidate(prepared, settlement);
-          if (selected?.next !== void 0 && !navigatorAdviceConsistentWithSettlement(selected.next, settlement)) {
-            throw new Error("Navigator advice contradicts the accepted settlement");
-          }
         }
-        if (selected?.next === void 0 && preparationNoReceipt) {
+        const selectedCandidate = selected?.candidate;
+        if (selectedCandidate?.next === void 0 && preparationNoReceipt) {
           report = { disposition: "no-advice" };
-        } else if (selected?.next === void 0) {
+        } else if (selectedCandidate?.next === void 0) {
           throw new Error("Navigator prepared no machine-usable next direction");
         } else {
-          const selectedRoute = selected.route;
+          const selectedRoute = selectedCandidate.route;
           const routeChanged = selectedRoute !== void 0 && !routeEqual(previousRoute, selectedRoute);
-          const command = renderPublicAkRoleCommand(selected.next);
+          const command = renderPublicAkRoleCommand(selectedCandidate.next);
           report = {
             disposition: "recommendation",
             ...routeChanged ? { route: selectedRoute } : {},
-            next: selected.next,
-            ...selected.reason === void 0 ? {} : { reason: oneLine(selected.reason) },
+            next: selectedCandidate.next,
+            ...selectedCandidate.reason === void 0 ? {} : { reason: oneLine(selectedCandidate.reason) },
             ...command === void 0 ? {} : { command }
           };
           if (selectedRoute !== void 0) {
@@ -1056,7 +1060,6 @@ export {
   createNavigatorPrepareTool,
   decorateSettlementWithNavigation,
   formatNavigatorReport,
-  navigatorAdviceConsistentWithSettlement,
   navigatorModelSettingPath,
   navigatorProviderFailure,
   navigatorProviderFailureFromError,

package/dist/public-cli/main.js

@@ -14295,9 +14295,6 @@ var init_merger_contracts = __esm({
 });
 
 // src/packaged-role-registry.ts
-function packagedRoleMetadata(role) {
-  return PACKAGED_ROLE_REGISTRY.find((entry) => entry.role === role);
-}
 var PACKAGED_ROLE_REGISTRY;
 var init_packaged_role_registry = __esm({
   "src/packaged-role-registry.ts"() {
@@ -14812,9 +14809,6 @@ function physicalPathIdentity(path) {
     }
   }
 }
-function physicallyContainedIn(root, candidate) {
-  return pathContainedIn(physicalPathIdentity(root), physicalPathIdentity(candidate));
-}
 function errnoCode(error) {
   return error !== null && typeof error === "object" && "code" in error && typeof error.code === "string" ? error.code : void 0;
 }
@@ -19428,48 +19422,6 @@ var init_engine_detour = __esm({
 });
 
 // src/work-subject-identity.ts
-import { resolve as resolve6 } from "node:path";
-function issueRoot(value) {
-  const normalized = value.replaceAll("\\", "/");
-  const marker = ".ak/work/issues/";
-  const index = normalized.indexOf(marker);
-  if (index < 0) return void 0;
-  const issue = normalized.slice(index + marker.length).split("/")[0]?.split("#")[0];
-  return issue === void 0 || issue === "" ? void 0 : normalized.slice(0, index + marker.length) + issue;
-}
-function workIdentityFromCwd(cwd) {
-  const resolvedCwd = resolve6(cwd, ".");
-  const cwdIssue = issueRoot(resolvedCwd);
-  if (cwdIssue !== void 0) return cwdIssue;
-  if (resolvedCwd.includes("/.ak/work/")) return resolvedCwd;
-  return void 0;
-}
-function isMachineLedgerSessionPath(sessionPath) {
-  return physicallyContainedIn(resolveActivationLedgerHome(), sessionPath);
-}
-function subjectPath(sessionDir, cwd = process.cwd()) {
-  if (sessionDir === "") {
-    return workIdentityFromCwd(cwd) ?? resolve6(cwd, ".ak/work");
-  }
-  const resolvedSession = resolve6(cwd, sessionDir || ".ak/work");
-  if (isMachineLedgerSessionPath(resolvedSession)) {
-    return workIdentityFromCwd(cwd) ?? resolve6(cwd, ".ak/work");
-  }
-  const issue = issueRoot(resolvedSession);
-  if (issue !== void 0) return issue;
-  const runsMarker = "/runs/";
-  const runsIndex = resolvedSession.indexOf(runsMarker);
-  if (runsIndex >= 0) {
-    return resolvedSession.slice(0, runsIndex);
-  }
-  return resolvedSession;
-}
-function workSubjectKeyFromProjectRoot(projectRoot) {
-  return subjectPath("", projectRoot);
-}
-function workSubjectKeysEqual(left, right) {
-  return physicalPathIdentity(left) === physicalPathIdentity(right);
-}
 var init_work_subject_identity = __esm({
   "src/work-subject-identity.ts"() {
     "use strict";
@@ -19510,18 +19462,6 @@ function parseInvocationMarkerIdentity(data) {
     subjectKey: record4.subjectKey
   };
 }
-function markerMatchesExpectedIdentity(marker, expected) {
-  if (marker.role !== expected.role) return false;
-  if (expected.phase !== void 0) {
-    if (marker.phase !== expected.phase) return false;
-  } else if (expected.allowedPhases !== void 0) {
-    if (!expected.allowedPhases.includes(marker.phase)) return false;
-  }
-  if (expected.subjectKey !== void 0) {
-    if (!workSubjectKeysEqual(marker.subjectKey, expected.subjectKey)) return false;
-  }
-  return true;
-}
 function classifyPackagedRoleTerminalResult(message) {
   if (typeof message.toolName !== "string") return { kind: "nonterminal" };
   if (!PACKAGED_ROLE_OUTPUT_TOOLS.has(message.toolName)) return { kind: "nonterminal" };
@@ -21011,55 +20951,9 @@ function navigatorPhaseValue(value) {
   if (value === "plan" || value === "apply") return value;
   return null;
 }
-function attendanceIdentityFromAdmitted(admitted) {
-  const subjectKey = workSubjectKeyFromProjectRoot(admitted.projectRoot);
-  if (admitted.role === "coder" || admitted.role === "fixer") {
-    return { phase: admitted.phase, subjectKey };
-  }
-  return { phase: null, subjectKey };
-}
-function independentExpectedIdentity(entries, terminalRole, supplied) {
-  let subjectKey;
-  for (const entry of entries) {
-    if (entry?.type !== "session") continue;
-    if (typeof entry.cwd === "string" && entry.cwd.trim() !== "") {
-      subjectKey = workSubjectKeyFromProjectRoot(entry.cwd);
-    }
-    break;
-  }
-  if (typeof supplied?.subjectKey === "string") {
-    subjectKey = supplied.subjectKey;
-  }
-  let phase;
-  let allowedPhases;
-  if (supplied !== void 0 && Object.hasOwn(supplied, "phase")) {
-    phase = supplied.phase ?? null;
-  } else {
-    const meta = packagedRoleMetadata(terminalRole);
-    if (meta !== void 0) {
-      if (meta.phases.length === 1) {
-        phase = meta.phases[0];
-      } else {
-        allowedPhases = meta.phases;
-      }
-    }
-  }
-  return {
-    role: terminalRole,
-    ...phase !== void 0 ? { phase } : {},
-    ...allowedPhases !== void 0 ? { allowedPhases } : {},
-    ...subjectKey !== void 0 ? { subjectKey } : {}
-  };
-}
-function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex, terminal, marker) {
-  if (attendanceIndex <= terminal.index) return false;
-  if (details.version !== 1) return false;
-  if (details.role !== terminal.role) return false;
-  if (details.role !== marker.role) return false;
+function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex, terminalIndex, marker) {
+  if (attendanceIndex <= terminalIndex) return false;
   if (details.invocationId !== marker.invocationId) return false;
-  if (details.phase !== marker.phase) return false;
-  if (typeof details.subjectKey !== "string") return false;
-  if (!workSubjectKeysEqual(details.subjectKey, marker.subjectKey)) return false;
   return true;
 }
 function parseNavigatorAttendanceDetails(details) {
@@ -21110,39 +21004,32 @@ function parseNavigatorAttendanceDetails(details) {
     reason: "Navigator attendance disposition is unparseable"
   };
 }
-function extractNavigatorFact(entries, identity) {
-  const binding = bindCurrentDurableTerminalToMarker(entries);
-  if (binding.kind === "absent") {
+function extractNavigatorFact(entries) {
+  const terminal = findLatestDurablePackagedRoleTerminal(entries);
+  if (terminal === void 0) {
     return {
       disposition: "unavailable",
       source: "unknown",
       reason: "Navigator attendance has no durable packaged role terminal"
     };
   }
-  if (binding.kind === "ambiguous") {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is ambiguous across multiple durable role terminals"
-    };
-  }
-  if (binding.kind === "unbound") {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is uncorrelated with session invocation facts"
-    };
+  let markerIndex = -1;
+  for (let i = terminal.index - 1; i >= 0; i -= 1) {
+    const entry = entries[i];
+    if (entry?.type === "custom" && entry.customType === NAVIGATOR_INVOCATION_ENTRY) {
+      markerIndex = i;
+      break;
+    }
   }
-  const { terminal, marker } = binding;
-  if (marker.role !== terminal.role) {
+  if (markerIndex < 0) {
     return {
       disposition: "unavailable",
       source: "unknown",
       reason: "Navigator attendance is uncorrelated with session invocation facts"
     };
   }
-  const expected = independentExpectedIdentity(entries, terminal.role, identity);
-  if (!markerMatchesExpectedIdentity(marker, expected)) {
+  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
+  if (marker === void 0) {
     return {
       disposition: "unavailable",
       source: "unknown",
@@ -21163,7 +21050,7 @@ function extractNavigatorFact(entries, identity) {
       if (!navigatorAttendanceCorrelatedWithBoundMarker(
         details,
         i,
-        { index: terminal.index, role: terminal.role },
+        terminal.index,
         marker
       )) {
         return {
@@ -21184,7 +21071,7 @@ function extractNavigatorFact(entries, identity) {
 async function extractNavigatorFactFromAdmittedSession(admitted) {
   try {
     const entries = await readBoundSessionEntries(admitted.sessionFile);
-    return extractNavigatorFact(entries, attendanceIdentityFromAdmitted(admitted));
+    return extractNavigatorFact(entries);
   } catch (error) {
     if (isMissingPathError2(error)) {
       return {
@@ -21347,10 +21234,7 @@ async function settleLawfulJudgeTerminalResult(admitted) {
   if (roleOutcome === void 0) {
     return void 0;
   }
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishJudgeArtifacts(
     admitted,
     roleOutcome,
@@ -21371,10 +21255,7 @@ async function settleLawfulCoderTerminalResult(admitted, options = {}) {
   if (entries === void 0) return void 0;
   const extracted = extractCoderRoleOutcome(entries);
   if (extracted === void 0) return void 0;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishCoderArtifacts(
     admitted,
     extracted.outcome,
@@ -21506,10 +21387,7 @@ async function settleLawfulFixerTerminalResult(admitted, options) {
   if (entries === void 0) return void 0;
   const extracted = extractFixerRoleOutcome(entries);
   if (extracted === void 0) return void 0;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const methodInvocations = extractFixerMethodInvocations(entries, {
     allowedLocations: [
       options.methodSkillPath,
@@ -21635,10 +21513,7 @@ async function settleLawfulCollectorTerminalResult(admitted) {
     return void 0;
   }
   assertCollectorReceiptMatchesAdmitted(extracted.receipt, admitted);
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishCollectorArtifacts(
     admitted,
     extracted.outcome,
@@ -21762,10 +21637,7 @@ async function settleLawfulDoctorTerminalResult(admitted) {
       throw error;
     }
   }
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishDoctorArtifacts(
     admitted,
     extracted.outcome,
@@ -21926,10 +21798,7 @@ async function settleLawfulReviewerTerminalResult(admitted, options) {
   if (entries === void 0) return void 0;
   const extracted = extractReviewerRoleOutcome(entries);
   if (extracted === void 0) return void 0;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const methodInvocations = extractReviewerMethodInvocations(entries, {
     allowedLocations: [
       options.methodSkillPath,
@@ -22109,10 +21978,7 @@ async function settleLawfulMergerTerminalResult(admitted, options) {
     ]
   });
   if (methodInvocations.length === 0) return void 0;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted)
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishMergerArtifacts(
     admitted,
     extracted.outcome,
@@ -22439,8 +22305,6 @@ var init_settlement = __esm({
     init_method_skill();
     init_navigator_invocation_identity();
     init_receipt_delivery_policy();
-    init_packaged_role_registry();
-    init_work_subject_identity();
     init_invocation();
     init_terminal();
     CONCISE_DIAGNOSTIC_MAX_CHARS = 480;
@@ -24040,7 +23904,7 @@ var init_judge_run = __esm({
 
 // src/public-cli/merger-run.ts
 import { mkdir as mkdir4, writeFile as writeFile11 } from "node:fs/promises";
-import { join as join17, resolve as resolve7 } from "node:path";
+import { join as join17, resolve as resolve6 } from "node:path";
 function buildMergerActivationExtraArgs(admitted, options) {
   const prompt = buildMergerTransportPrompt(admitted);
   const skillPath = resolvePackagedMethodSkillPath(
@@ -24265,7 +24129,7 @@ async function loadMergerMethodMaterial(packageRoot2) {
   );
 }
 async function admitMergerShellForActivationFailure(options) {
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve6(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const { ledgerHome, bookKey, runDirectory, sessionDirectory, sessionFile } = roleRunSessionCoordinates({ cwd: projectRoot, runId, role: "merger", home: options.home });
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
@@ -24920,8 +24784,8 @@ var init_atomic_write = __esm({
 import { open as open3, readFile as readFile10, unlink as unlink4 } from "node:fs/promises";
 import { dirname as dirname8, join as join20 } from "node:path";
 function sleep(ms) {
-  return new Promise((resolve9) => {
-    setTimeout(resolve9, ms);
+  return new Promise((resolve8) => {
+    setTimeout(resolve8, ms);
   });
 }
 async function withTaishiLibraryIndexLock(ledgerHome, fn) {
@@ -26808,7 +26672,7 @@ var init_taishi_entry = __esm({
 
 // src/public-cli/taishi-run.ts
 import { readFile as readFile15 } from "node:fs/promises";
-import { isAbsolute as isAbsolute5, resolve as resolve8 } from "node:path";
+import { isAbsolute as isAbsolute5, resolve as resolve7 } from "node:path";
 async function buildTaishiIssueModeInputFromPublicArgv(parsed, ledgerHome) {
   const ticket = parsed.ticket;
   const directRoot = parsed.projectRoot;
@@ -26854,7 +26718,7 @@ async function buildTaishiSweepModeInputFromAttachmentPaths(attachmentPaths) {
     );
   }
   const sourcePath = attachmentPaths[0];
-  const absolute = isAbsolute5(sourcePath) ? sourcePath : resolve8(sourcePath);
+  const absolute = isAbsolute5(sourcePath) ? sourcePath : resolve7(sourcePath);
   let bytes;
   try {
     bytes = await readFile15(absolute);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.2068",
+  "version": "0.1.2071",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/src/navigator-attendance.ts

@@ -197,33 +197,6 @@ export type NavigatorContextProjection = {
   liveRoleHelp: Array<{ role: NavigatorTargetRole; help: string }>;
 };
 
-/**
- * Shared terminal-internal consistency for Navigator advice vs the just-accepted
- * settlement (family #224/#226/#227). One table for all seats — not per-role guards.
- *
- * Merger closes delivery. It is only consistent immediately after judge converged.
- * Fresh accepted work from any other seat must not skip to merger.
- *
- * Unfinished is an open handoff (ADR 0050): recommending judge would send half-done
- * work to audit. Machine criterion anchors only status=unfinished — refused and
- * partially_completed remain settled terminals whose judge path stays lawful.
- * Positive continuation is free-form via rebind + status-matched candidates
- * (ADR 0010/0061); this only suppresses self-contradictory typed emission.
- */
-export function navigatorAdviceConsistentWithSettlement(
-  next: NavigatorRouteTarget,
-  settlement: NavigatorSettlement,
-): boolean {
-  if (settlement.kind !== "accepted") return true;
-  // #227: open unfinished handoff must not be typed as next=judge.
-  if (settlement.status === "unfinished" && next.role === "judge") return false;
-  // #265: completed Fixer apply must not be sent back to repeat the same work.
-  if (settlement.role === "fixer" && settlement.phase === "apply" && settlement.status === "completed"
-    && next.role === "fixer" && next.phase === "apply") return false;
-  if (next.role !== "merger") return true;
-  return settlement.role === "judge" && settlement.status === "converged";
-}
-
 // Provider admission is ADR 0060 object root only. Nested advisory shape
 // (candidates/next/route/matches/reason/command) is never a gate — every object
 // root reaches the unique execute/normalize path exactly once.
@@ -478,25 +451,52 @@ export function createNavigatorPrepareTool(onOutput: (value: PrepareOutput) => v
   });
 }
 
-export function selectNavigatorCandidate(candidates: readonly NavigatorCandidate[], settlement: NavigatorSettlement): NavigatorCandidate | undefined {
+/**
+ * Candidate pick plus whether matches keyed it to this settlement.
+ * Single owner for role/phase/status match truth (selection ranking + stale-context rebind).
+ * Structural only — never inspects next.role for routing legality.
+ */
+export type NavigatorCandidateSelection = {
+  readonly candidate: NavigatorCandidate;
+  /** True when matches keyed this candidate to the settlement (no stale-context rebind). */
+  readonly matchedToSettlement: boolean;
+};
+
+export function selectNavigatorCandidate(
+  candidates: readonly NavigatorCandidate[],
+  settlement: NavigatorSettlement,
+): NavigatorCandidateSelection | undefined {
   if (settlement.kind !== "accepted") return undefined;
   const usable = candidates.filter((candidate) => candidate.next !== undefined);
   if (usable.length === 0) return undefined;
-  const matched = usable.filter((candidate) =>
+  const rolePhaseMatched = usable.filter((candidate) =>
     candidate.matches !== undefined
     && candidate.matches.role === settlement.role
     && candidate.matches.phase === settlement.phase,
   );
   // Status-specific candidates outrank role/phase generics regardless of declaration order.
-  if (matched.length > 0) {
+  if (rolePhaseMatched.length > 0) {
     if (settlement.status !== undefined) {
-      const statusSpecific = matched.find((candidate) => candidate.matches?.statuses?.includes(settlement.status!) === true);
-      if (statusSpecific !== undefined) return statusSpecific;
+      const statusSpecific = rolePhaseMatched.find(
+        (candidate) => candidate.matches?.statuses?.includes(settlement.status!) === true,
+      );
+      if (statusSpecific !== undefined) {
+        return { candidate: statusSpecific, matchedToSettlement: true };
+      }
+    }
+    const rolePhaseGeneric = rolePhaseMatched.find(
+      (candidate) => candidate.matches?.statuses === undefined,
+    );
+    if (rolePhaseGeneric !== undefined) {
+      return { candidate: rolePhaseGeneric, matchedToSettlement: true };
     }
-    return matched.find((candidate) => candidate.matches?.statuses === undefined);
+    return undefined;
   }
   // v1 direction-only / broken matches: absent match metadata must not drop a usable next.
-  return usable.find((candidate) => candidate.matches === undefined);
+  // Not settlement-keyed → caller may run one stale-context rebind.
+  const unbound = usable.find((candidate) => candidate.matches === undefined);
+  if (unbound === undefined) return undefined;
+  return { candidate: unbound, matchedToSettlement: false };
 }
 
 export function formatNavigatorReport(report: NavigatorReport): string {
@@ -631,6 +631,9 @@ export function createNavigatorAttendance(options: NavigatorAttendanceOptions) {
     // pi.appendEntry at lifecycle start — not optional sessionManager probing.
     const boundSettlement = prepareBoundSettlement;
     prepareBoundSettlement = undefined;
+    // Each prepare owns the no-receipt flag; a later settlement-bound rebind must
+    // not inherit a speculative no-receipt outcome.
+    preparationNoReceipt = false;
     const invocationId = invocationPrincipal;
     activeInvocationId = invocationId;
     if (contextError !== undefined) throw navigatorUnavailableError("context", contextError);
@@ -958,40 +961,34 @@ export function createNavigatorAttendance(options: NavigatorAttendanceOptions) {
           let prepared = await preparation;
           session?.appendEntry(SETTLEMENT_ENTRY, { invocationId, subjectKey, role: settlement.role, phase: settlement.phase, kind: settlement.kind, ...(settlement.status === undefined ? {} : { status: settlement.status }) });
           let selected = selectNavigatorCandidate(prepared, settlement);
-          // Family #224/#226/#227 shared seam: speculative prepare runs before the
-          // current terminal exists and may treat prior history as decisive. When
-          // selected next contradicts this accepted settlement, discard it and
-          // re-prepare once bound to the settlement (single shared mechanism).
-          if (
-            selected?.next !== undefined
-            && !navigatorAdviceConsistentWithSettlement(selected.next, settlement)
-          ) {
+          // Speculative prepare runs before this terminal exists and may treat prior
+          // history as decisive. When selection provenance says matches did not key
+          // this candidate to the settlement, rebind once with currentSettlement.
+          // Stale-context repair only — reachable without any next.role legality
+          // table. After selection (speculative or rebound), advice is passed
+          // through as-is (ADR 0010 / ADR 0061: caller may ignore).
+          if (selected?.candidate.next !== undefined && !selected.matchedToSettlement) {
             prepareBoundSettlement = settlement;
             prepared = await prepare();
             selected = selectNavigatorCandidate(prepared, settlement);
-            if (
-              selected?.next !== undefined
-              && !navigatorAdviceConsistentWithSettlement(selected.next, settlement)
-            ) {
-              throw new Error("Navigator advice contradicts the accepted settlement");
-            }
           }
           // Budget exhaustion is affirmative typed no-advice; malformed submitted
           // advice remains the existing unavailable path.
-          if (selected?.next === undefined && preparationNoReceipt) {
+          const selectedCandidate = selected?.candidate;
+          if (selectedCandidate?.next === undefined && preparationNoReceipt) {
             report = { disposition: "no-advice" };
-          } else if (selected?.next === undefined) {
+          } else if (selectedCandidate?.next === undefined) {
             throw new Error("Navigator prepared no machine-usable next direction");
           } else {
-          const selectedRoute = selected.route;
+          const selectedRoute = selectedCandidate.route;
           const routeChanged = selectedRoute !== undefined && !routeEqual(previousRoute, selectedRoute);
           // Single owner: public registry renderer (ADR 0052). Model command prose is never authority.
-          const command = renderPublicAkRoleCommand(selected.next);
+          const command = renderPublicAkRoleCommand(selectedCandidate.next);
           report = {
             disposition: "recommendation",
             ...(routeChanged ? { route: selectedRoute } : {}),
-            next: selected.next,
-            ...(selected.reason === undefined ? {} : { reason: oneLine(selected.reason) }),
+            next: selectedCandidate.next,
+            ...(selectedCandidate.reason === undefined ? {} : { reason: oneLine(selectedCandidate.reason) }),
             ...(command === undefined ? {} : { command }),
           };
           if (selectedRoute !== undefined) {

package/src/public-cli/settlement.ts

@@ -73,21 +73,16 @@ import {
   type PackagedMethodSkillProvenance,
 } from "../package-resources/method-skill.ts";
 import {
-  bindCurrentDurableTerminalToMarker,
   classifyPackagedRoleTerminalResult,
+  findLatestDurablePackagedRoleTerminal,
   isAcceptedPackagedRoleTerminalResult,
   isReceiptSettlementBindingClear,
-  markerMatchesExpectedIdentity,
-  type ExpectedInvocationIdentity,
+  NAVIGATOR_INVOCATION_ENTRY,
+  parseInvocationMarkerIdentity,
   type InvocationMarkerIdentity,
 } from "../navigator-invocation-identity.ts";
 import type { NavigatorPhase } from "../navigator-attendance.ts";
 import { NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, parseNoReceiptLifecycleFacts, type NoReceiptLifecycleFacts } from "../receipt-delivery-policy.ts";
-import { packagedRoleMetadata } from "../packaged-role-registry.ts";
-import {
-  workSubjectKeyFromProjectRoot,
-  workSubjectKeysEqual,
-} from "../work-subject-identity.ts";
 import {
   ensureRunArtifactsDir,
   type AdmittedCoderInvocation,
@@ -493,12 +488,6 @@ type SessionEntry = {
   parentSession?: string;
 };
 
-/** Optional independent identity from admitted/shared lifecycle (not attendance self-fields). */
-export type NavigatorAttendanceIdentity = {
-  readonly phase?: NavigatorPhase;
-  readonly subjectKey?: string;
-};
-
 function isMissingPathError(error: unknown): boolean {
   return (
     error instanceof Error &&
@@ -2001,91 +1990,20 @@ function navigatorPhaseValue(value: unknown): NavigatorPhase {
   return null;
 }
 
-function attendanceIdentityFromAdmitted(
-  admitted: AdmittedRoleInvocation,
-): NavigatorAttendanceIdentity {
-  // Public CLI sessions live under the machine ledger; Navigator derives subject from
-  // the project/cwd work identity, not the per-run session directory spelling.
-  const subjectKey = workSubjectKeyFromProjectRoot(admitted.projectRoot);
-  if (admitted.role === "coder" || admitted.role === "fixer") {
-    return { phase: admitted.phase, subjectKey };
-  }
-  return { phase: null, subjectKey };
-}
-
 /**
- * Independent expected role/phase/subject for marker correlation.
- * Role comes from the durable packaged terminal tool; phase/subject from admitted
- * lifecycle, Developer session cwd, or registry — never attendance self-fields.
- */
-function independentExpectedIdentity(
-  entries: readonly SessionEntry[],
-  terminalRole: string,
-  supplied?: NavigatorAttendanceIdentity,
-): ExpectedInvocationIdentity {
-  let subjectKey: string | undefined;
-  for (const entry of entries) {
-    if (entry?.type !== "session") continue;
-    if (typeof entry.cwd === "string" && entry.cwd.trim() !== "") {
-      subjectKey = workSubjectKeyFromProjectRoot(entry.cwd);
-    }
-    break;
-  }
-  if (typeof supplied?.subjectKey === "string") {
-    subjectKey = supplied.subjectKey;
-  }
-
-  let phase: NavigatorPhase | undefined;
-  let allowedPhases: readonly NavigatorPhase[] | undefined;
-  // null is a real phase fact (Judge/Reviewer/…); only omit when not independently known.
-  if (supplied !== undefined && Object.hasOwn(supplied, "phase")) {
-    phase = supplied.phase ?? null;
-  } else {
-    const meta = packagedRoleMetadata(terminalRole);
-    if (meta !== undefined) {
-      if (meta.phases.length === 1) {
-        phase = meta.phases[0] as NavigatorPhase;
-      } else {
-        allowedPhases = meta.phases as readonly NavigatorPhase[];
-      }
-    }
-  }
-
-  return {
-    role: terminalRole,
-    ...(phase !== undefined ? { phase } : {}),
-    ...(allowedPhases !== undefined ? { allowedPhases } : {}),
-    ...(subjectKey !== undefined ? { subjectKey } : {}),
-  };
-}
-
-/**
- * Attendance must match the bound marker identity and current durable terminal role.
- * Self-shape of attendance fields is not correlation. Marker already matched the
- * independent expected identity before this check runs.
+ * Minimal attendance provenance against the bound marker (ADR 0043).
+ * Keep only invocationId + post-terminal ordering. Runtime-self-produced
+ * role/phase/subject/version are not re-reconciled here (ADR 0042).
  */
 function navigatorAttendanceCorrelatedWithBoundMarker(
   details: Record<string, unknown>,
   attendanceIndex: number,
-  terminal: { index: number; role: string },
+  terminalIndex: number,
   marker: InvocationMarkerIdentity,
 ): boolean {
-  if (attendanceIndex <= terminal.index) return false;
-  if (details.version !== 1) return false;
-
-  // Role comes from the packaged terminal tool — compare, do not self-validate.
-  if (details.role !== terminal.role) return false;
-  // Marker role must already equal terminal role (checked by caller); attendance follows marker.
-  if (details.role !== marker.role) return false;
-
+  if (attendanceIndex <= terminalIndex) return false;
   // Exact current invocation token is the bound marker principal.
   if (details.invocationId !== marker.invocationId) return false;
-
-  // Phase and subject ride the same marker identity truth table.
-  if (details.phase !== marker.phase) return false;
-  if (typeof details.subjectKey !== "string") return false;
-  if (!workSubjectKeysEqual(details.subjectKey, marker.subjectKey)) return false;
-
   return true;
 }
 
@@ -2157,45 +2075,37 @@ function parseNavigatorAttendanceDetails(
 
 export function extractNavigatorFact(
   entries: readonly SessionEntry[],
-  identity?: NavigatorAttendanceIdentity,
 ): TerminalNavigatorFact {
   // Affirmative attendance only. Missing / uncorrelated / unparseable is never no-advice.
-  // One truth table: durable classifier + singleton marker binding + marker identity match.
-  const binding = bindCurrentDurableTerminalToMarker(entries);
-  if (binding.kind === "absent") {
+  // Minimal provenance: latest durable terminal + nearest preceding marker +
+  // invocationId + post-terminal order. Marker↔terminal cardinality belongs to
+  // receipt settlement (isReceiptSettlementBindingClear), not attendance extraction.
+  const terminal = findLatestDurablePackagedRoleTerminal(entries);
+  if (terminal === undefined) {
     return {
       disposition: "unavailable",
       source: "unknown",
       reason: "Navigator attendance has no durable packaged role terminal",
     };
   }
-  if (binding.kind === "ambiguous") {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is ambiguous across multiple durable role terminals",
-    };
-  }
-  if (binding.kind === "unbound") {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is uncorrelated with session invocation facts",
-    };
-  }
 
-  const { terminal, marker } = binding;
-  // Marker role must match the durable terminal tool's role.
-  if (marker.role !== terminal.role) {
+  let markerIndex = -1;
+  for (let i = terminal.index - 1; i >= 0; i -= 1) {
+    const entry = entries[i];
+    if (entry?.type === "custom" && entry.customType === NAVIGATOR_INVOCATION_ENTRY) {
+      markerIndex = i;
+      break;
+    }
+  }
+  if (markerIndex < 0) {
     return {
       disposition: "unavailable",
       source: "unknown",
       reason: "Navigator attendance is uncorrelated with session invocation facts",
     };
   }
-  // Marker phase/subject (and role) must match independently admitted expected identity.
-  const expected = independentExpectedIdentity(entries, terminal.role, identity);
-  if (!markerMatchesExpectedIdentity(marker, expected)) {
+  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
+  if (marker === undefined) {
     return {
       disposition: "unavailable",
       source: "unknown",
@@ -2218,7 +2128,7 @@ export function extractNavigatorFact(
         !navigatorAttendanceCorrelatedWithBoundMarker(
           details,
           i,
-          { index: terminal.index, role: terminal.role },
+          terminal.index,
           marker,
         )
       ) {
@@ -2249,7 +2159,7 @@ async function extractNavigatorFactFromAdmittedSession(
 ): Promise<TerminalNavigatorFact> {
   try {
     const entries = await readBoundSessionEntries(admitted.sessionFile);
-    return extractNavigatorFact(entries, attendanceIdentityFromAdmitted(admitted));
+    return extractNavigatorFact(entries);
   } catch (error) {
     if (isMissingPathError(error)) {
       return {
@@ -2483,10 +2393,7 @@ async function settleLawfulJudgeTerminalResult(
   if (roleOutcome === undefined) {
     return undefined;
   }
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   // Lawful outcome exists — artifact publication keeps original errno/name.
   const artifacts = await publishJudgeArtifacts(
     admitted,
@@ -2539,10 +2446,7 @@ async function settleLawfulCoderTerminalResult(
   if (entries === undefined) return undefined;
   const extracted = extractCoderRoleOutcome(entries);
   if (extracted === undefined) return undefined;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishCoderArtifacts(
     admitted,
     extracted.outcome,
@@ -2745,10 +2649,7 @@ async function settleLawfulFixerTerminalResult(
   if (entries === undefined) return undefined;
   const extracted = extractFixerRoleOutcome(entries);
   if (extracted === undefined) return undefined;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   const methodInvocations = extractFixerMethodInvocations(entries, {
     allowedLocations: [
       options.methodSkillPath,
@@ -2915,10 +2816,7 @@ async function settleLawfulCollectorTerminalResult(
     return undefined;
   }
   assertCollectorReceiptMatchesAdmitted(extracted.receipt, admitted);
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishCollectorArtifacts(
     admitted,
     extracted.outcome,
@@ -3095,10 +2993,7 @@ async function settleLawfulDoctorTerminalResult(
       throw error;
     }
   }
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishDoctorArtifacts(
     admitted,
     extracted.outcome,
@@ -3353,10 +3248,7 @@ async function settleLawfulReviewerTerminalResult(
   if (entries === undefined) return undefined;
   const extracted = extractReviewerRoleOutcome(entries);
   if (extracted === undefined) return undefined;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   const methodInvocations = extractReviewerMethodInvocations(entries, {
     allowedLocations: [
       options.methodSkillPath,
@@ -3623,10 +3515,7 @@ async function settleLawfulMergerTerminalResult(
   });
   // Every invocation must expand the merge-only method before conflict work.
   if (methodInvocations.length === 0) return undefined;
-  const navigator = extractNavigatorFact(
-    entries,
-    attendanceIdentityFromAdmitted(admitted),
-  );
+  const navigator = extractNavigatorFact(entries);
   const artifacts = await publishMergerArtifacts(
     admitted,
     extracted.outcome,