@akagilnc/pi-workflow-roles 0.1.5245 → 0.1.5252

package/dist/acp-host/production-host.js

@@ -10894,11 +10894,6 @@ async function appendRunAttemptHistory(source, outcome) {
   } catch {
   }
 }
-function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex, terminalIndex, marker) {
-  if (attendanceIndex <= terminalIndex) return false;
-  if (details.invocationId !== marker.invocationId) return false;
-  return true;
-}
 function parseNavigatorAttendanceDetails(details) {
   const disposition = details.disposition;
   const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string" ? { advisoryDiagnostic: details.routePlaybookReadFailure } : {};
@@ -11049,54 +11044,12 @@ function extractNavigatorAttendanceFact(entries) {
       reason: "Navigator attendance has no durable packaged role terminal"
     };
   }
-  let markerIndex = -1;
-  for (let i = terminal.index - 1; i >= 0; i -= 1) {
+  for (let i = terminal.index; i < entries.length; 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"
-    };
-  }
-  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-  if (marker === void 0) {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is uncorrelated with session invocation facts"
-    };
-  }
-  for (let i = entries.length - 1; i >= 0; i -= 1) {
-    const entry = entries[i];
-    if (entry?.type === "custom_message" && entry.customType === "ak-navigator-attendance") {
-      const details = entry.message?.details ?? entry.details;
-      if (!isRecord10(details)) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is unparseable"
-        };
-      }
-      if (!navigatorAttendanceCorrelatedWithBoundMarker(
-        details,
-        i,
-        terminal.index,
-        marker
-      )) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is uncorrelated with session invocation facts"
-        };
-      }
-      return parseNavigatorAttendanceDetails(details);
-    }
+    if (entry?.type !== "custom" || entry.customType !== "ak-role-submission-closure") continue;
+    const details = isRecord10(entry.data) ? entry.data.navigator : void 0;
+    if (!isRecord10(details)) break;
+    return parseNavigatorAttendanceDetails(details);
   }
   return {
     disposition: "unavailable",
@@ -24028,8 +23981,15 @@ async function projectClosedSubmissionLifecycle(closed, context, phase, recordAc
     isError: false,
     details: closed.accepted
   };
-  context.sessionManager.appendCustomEntry?.("ak-role-submission-closure", closure);
-  await settle(publicNavigatorSettlement(closed.role, phase, closure));
+  let navigator;
+  try {
+    navigator = await settle(publicNavigatorSettlement(closed.role, phase, closure));
+  } finally {
+    context.sessionManager.appendCustomEntry?.("ak-role-submission-closure", {
+      ...closure,
+      ...navigator === void 0 ? {} : { navigator }
+    });
+  }
 }
 function createFiledOfficerRuntime(roleHost, spec, dependencies) {
   let soul;
@@ -24388,6 +24348,8 @@ function createRoleRuntimeExtension(dependencies) {
     let activeReviewerParent;
     let navigatorAttendance;
     let pendingNavigatorPresentation;
+    let navigatorActivation = 0;
+    let navigatorDeliveryClosed = false;
     let pendingNavigatorSettlement;
     let navigatorWorkContext;
     let navigatorSessionParent;
@@ -24440,6 +24402,7 @@ function createRoleRuntimeExtension(dependencies) {
         void settlePromise.catch(() => void 0);
         const raced = await raceNavigatorGrace(settlePromise, NAVIGATOR_POST_ROLE_GRACE_MS);
         if (raced.status !== "timeout") return;
+        navigatorDeliveryClosed = true;
         if (pendingNavigatorPresentation === void 0) {
           const report = {
             disposition: "unavailable",
@@ -24464,6 +24427,7 @@ function createRoleRuntimeExtension(dependencies) {
       })();
       pendingNavigatorSettlement = pending;
       await pending;
+      return pendingNavigatorPresentation?.event;
     };
     projectClosedSubmission = async (closed, context) => projectClosedSubmissionLifecycle(
       closed,
@@ -24943,6 +24907,8 @@ function createRoleRuntimeExtension(dependencies) {
       receiptDelivery = createReceiptDeliveryPolicy();
       noReceiptRecorded = false;
       pendingNavigatorPresentation = void 0;
+      navigatorActivation += 1;
+      navigatorDeliveryClosed = false;
       pendingNavigatorSettlement = void 0;
       pendingInfrastructureFailures.clear();
       pendingSubmissionNonPassByToolCallId.clear();
@@ -25038,6 +25004,7 @@ function createRoleRuntimeExtension(dependencies) {
             } catch {
             }
           }
+          const activation = navigatorActivation;
           navigatorAttendance = await dependencies.createNavigatorAttendance({
             context: ctx,
             role: entry.role,
@@ -25048,7 +25015,9 @@ function createRoleRuntimeExtension(dependencies) {
             invocationId,
             ...contextError === void 0 ? {} : { contextError },
             onEvent: (navigatorEvent, report) => {
-              pendingNavigatorPresentation = { event: navigatorEvent, report };
+              if (activation === navigatorActivation && !navigatorDeliveryClosed) {
+                pendingNavigatorPresentation = { event: navigatorEvent, report };
+              }
             }
           });
           if (navigatorWorkContext.contextError === void 0 && navigatorWorkContext.subjectProvenance !== "placeholder") {

package/dist/headless-host/production-host.js

@@ -11314,11 +11314,6 @@ async function appendRunAttemptHistory(source, outcome) {
   } catch {
   }
 }
-function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex, terminalIndex, marker) {
-  if (attendanceIndex <= terminalIndex) return false;
-  if (details.invocationId !== marker.invocationId) return false;
-  return true;
-}
 function parseNavigatorAttendanceDetails(details) {
   const disposition = details.disposition;
   const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string" ? { advisoryDiagnostic: details.routePlaybookReadFailure } : {};
@@ -11469,54 +11464,12 @@ function extractNavigatorAttendanceFact(entries) {
       reason: "Navigator attendance has no durable packaged role terminal"
     };
   }
-  let markerIndex = -1;
-  for (let i = terminal.index - 1; i >= 0; i -= 1) {
+  for (let i = terminal.index; i < entries.length; 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"
-    };
-  }
-  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-  if (marker === void 0) {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is uncorrelated with session invocation facts"
-    };
-  }
-  for (let i = entries.length - 1; i >= 0; i -= 1) {
-    const entry = entries[i];
-    if (entry?.type === "custom_message" && entry.customType === "ak-navigator-attendance") {
-      const details = entry.message?.details ?? entry.details;
-      if (!isRecord10(details)) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is unparseable"
-        };
-      }
-      if (!navigatorAttendanceCorrelatedWithBoundMarker(
-        details,
-        i,
-        terminal.index,
-        marker
-      )) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is uncorrelated with session invocation facts"
-        };
-      }
-      return parseNavigatorAttendanceDetails(details);
-    }
+    if (entry?.type !== "custom" || entry.customType !== "ak-role-submission-closure") continue;
+    const details = isRecord10(entry.data) ? entry.data.navigator : void 0;
+    if (!isRecord10(details)) break;
+    return parseNavigatorAttendanceDetails(details);
   }
   return {
     disposition: "unavailable",
@@ -24121,8 +24074,15 @@ async function projectClosedSubmissionLifecycle(closed, context, phase, recordAc
     isError: false,
     details: closed.accepted
   };
-  context.sessionManager.appendCustomEntry?.("ak-role-submission-closure", closure);
-  await settle(publicNavigatorSettlement(closed.role, phase, closure));
+  let navigator;
+  try {
+    navigator = await settle(publicNavigatorSettlement(closed.role, phase, closure));
+  } finally {
+    context.sessionManager.appendCustomEntry?.("ak-role-submission-closure", {
+      ...closure,
+      ...navigator === void 0 ? {} : { navigator }
+    });
+  }
 }
 function createFiledOfficerRuntime(roleHost, spec, dependencies) {
   let soul;
@@ -24481,6 +24441,8 @@ function createRoleRuntimeExtension(dependencies) {
     let activeReviewerParent;
     let navigatorAttendance;
     let pendingNavigatorPresentation;
+    let navigatorActivation = 0;
+    let navigatorDeliveryClosed = false;
     let pendingNavigatorSettlement;
     let navigatorWorkContext;
     let navigatorSessionParent;
@@ -24533,6 +24495,7 @@ function createRoleRuntimeExtension(dependencies) {
         void settlePromise.catch(() => void 0);
         const raced = await raceNavigatorGrace(settlePromise, NAVIGATOR_POST_ROLE_GRACE_MS);
         if (raced.status !== "timeout") return;
+        navigatorDeliveryClosed = true;
         if (pendingNavigatorPresentation === void 0) {
           const report = {
             disposition: "unavailable",
@@ -24557,6 +24520,7 @@ function createRoleRuntimeExtension(dependencies) {
       })();
       pendingNavigatorSettlement = pending;
       await pending;
+      return pendingNavigatorPresentation?.event;
     };
     projectClosedSubmission = async (closed, context) => projectClosedSubmissionLifecycle(
       closed,
@@ -25036,6 +25000,8 @@ function createRoleRuntimeExtension(dependencies) {
       receiptDelivery = createReceiptDeliveryPolicy();
       noReceiptRecorded = false;
       pendingNavigatorPresentation = void 0;
+      navigatorActivation += 1;
+      navigatorDeliveryClosed = false;
       pendingNavigatorSettlement = void 0;
       pendingInfrastructureFailures.clear();
       pendingSubmissionNonPassByToolCallId.clear();
@@ -25131,6 +25097,7 @@ function createRoleRuntimeExtension(dependencies) {
             } catch {
             }
           }
+          const activation = navigatorActivation;
           navigatorAttendance = await dependencies.createNavigatorAttendance({
             context: ctx,
             role: entry.role,
@@ -25141,7 +25108,9 @@ function createRoleRuntimeExtension(dependencies) {
             invocationId,
             ...contextError === void 0 ? {} : { contextError },
             onEvent: (navigatorEvent, report) => {
-              pendingNavigatorPresentation = { event: navigatorEvent, report };
+              if (activation === navigatorActivation && !navigatorDeliveryClosed) {
+                pendingNavigatorPresentation = { event: navigatorEvent, report };
+              }
             }
           });
           if (navigatorWorkContext.contextError === void 0 && navigatorWorkContext.subjectProvenance !== "placeholder") {

package/dist/navigator-invocation-identity.js

@@ -146,47 +146,6 @@ function findLatestDurablePackagedRoleTerminal(entries) {
   }
   return void 0;
 }
-function bindCurrentDurableTerminalToMarker(entries) {
-  const terminal = findLatestDurablePackagedRoleTerminal(entries);
-  if (terminal === void 0) return { kind: "absent" };
-  let markerIndex = -1;
-  for (let i = terminal.index - 1; i >= 0; i -= 1) {
-    if (isInvocationMarkerEntry(entries[i])) {
-      markerIndex = i;
-      break;
-    }
-  }
-  if (markerIndex < 0) {
-    return { kind: "unbound", terminal };
-  }
-  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-  if (marker === void 0) {
-    return { kind: "unbound", terminal };
-  }
-  let windowEnd = entries.length;
-  for (let i = markerIndex + 1; i < entries.length; i += 1) {
-    if (isInvocationMarkerEntry(entries[i])) {
-      windowEnd = i;
-      break;
-    }
-  }
-  let durableCount = 0;
-  for (let i = markerIndex + 1; i < windowEnd; i += 1) {
-    if (durableTerminalAt(entries, i) !== void 0) durableCount += 1;
-  }
-  if (durableCount !== 1) return { kind: "ambiguous" };
-  if (terminal.index <= markerIndex || terminal.index >= windowEnd) {
-    return { kind: "ambiguous" };
-  }
-  return {
-    kind: "bound",
-    terminal,
-    marker: { ...marker, index: markerIndex }
-  };
-}
-function isReceiptSettlementBindingClear(entries) {
-  return bindCurrentDurableTerminalToMarker(entries).kind !== "ambiguous";
-}
 function resolveLifecycleInvocationPrincipal(entries, expected) {
   const markerIndex = latestInvocationMarkerIndex(entries);
   if (markerIndex < 0) {
@@ -206,35 +165,19 @@ function resolveLifecycleInvocationPrincipal(entries, expected) {
   }
   return { invocationId: marker.invocationId, resume: true };
 }
-function currentInvocationPrincipalFromSession(entries, beforeIndex = entries.length) {
-  return currentInvocationMarkerFromSession(entries, beforeIndex)?.invocationId;
-}
-function currentInvocationMarkerFromSession(entries, beforeIndex = entries.length) {
-  const limit = Math.min(Math.max(beforeIndex, 0), entries.length);
-  for (let i = limit - 1; i >= 0; i -= 1) {
-    const entry = entries[i];
-    if (!isInvocationMarkerEntry(entry)) continue;
-    return parseInvocationMarkerIdentity(entry?.data);
-  }
-  return void 0;
-}
 export {
   NAVIGATOR_INFRASTRUCTURE_FAILURE_EVIDENCE_KEYS,
   NAVIGATOR_INFRASTRUCTURE_FAILURE_KIND,
   NAVIGATOR_INVOCATION_ENTRY,
   NAVIGATOR_ROUTE_PLAYBOOK_FAILURE_ENTRY,
-  bindCurrentDurableTerminalToMarker,
   buildNavigatorInfrastructureFailureFact,
   classifyPackagedRoleTerminalResult,
-  currentInvocationMarkerFromSession,
-  currentInvocationPrincipalFromSession,
   extractInfrastructureFailureEvidence,
   findLatestDurablePackagedRoleTerminal,
   hasNavigatorInfrastructureFailureBase,
   isAcceptedPackagedRoleTerminalResult,
   isDurablePackagedRoleTerminalResult,
   isNavigatorInfrastructureFailureFact,
-  isReceiptSettlementBindingClear,
   markerMatchesExpectedIdentity,
   mintNavigatorInvocationId,
   parseInvocationMarkerIdentity,

package/dist/public-cli/main.js

@@ -23840,11 +23840,6 @@ async function appendRunAttemptHistory(source, outcome) {
   } catch {
   }
 }
-function navigatorAttendanceCorrelatedWithBoundMarker(details, attendanceIndex, terminalIndex, marker) {
-  if (attendanceIndex <= terminalIndex) return false;
-  if (details.invocationId !== marker.invocationId) return false;
-  return true;
-}
 function parseNavigatorAttendanceDetails(details) {
   const disposition = details.disposition;
   const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string" ? { advisoryDiagnostic: details.routePlaybookReadFailure } : {};
@@ -23995,54 +23990,12 @@ function extractNavigatorAttendanceFact(entries) {
       reason: "Navigator attendance has no durable packaged role terminal"
     };
   }
-  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"
-    };
-  }
-  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-  if (marker === void 0) {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is uncorrelated with session invocation facts"
-    };
-  }
-  for (let i = entries.length - 1; i >= 0; i -= 1) {
+  for (let i = terminal.index; i < entries.length; i += 1) {
     const entry = entries[i];
-    if (entry?.type === "custom_message" && entry.customType === "ak-navigator-attendance") {
-      const details = entry.message?.details ?? entry.details;
-      if (!isRecord8(details)) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is unparseable"
-        };
-      }
-      if (!navigatorAttendanceCorrelatedWithBoundMarker(
-        details,
-        i,
-        terminal.index,
-        marker
-      )) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is uncorrelated with session invocation facts"
-        };
-      }
-      return parseNavigatorAttendanceDetails(details);
-    }
+    if (entry?.type !== "custom" || entry.customType !== "ak-role-submission-closure") continue;
+    const details = isRecord8(entry.data) ? entry.data.navigator : void 0;
+    if (!isRecord8(details)) break;
+    return parseNavigatorAttendanceDetails(details);
   }
   return {
     disposition: "unavailable",

package/dist/public-cli/settlement.js

@@ -26,7 +26,7 @@ import { DOCTOR_CANDIDATE_ENTRY_TYPE } from "../dossier-resolution.js";
 import { REVIEWER_OUTPUT_TOOL_NAME, } from "../package-contracts/reviewer-output.js";
 import { packagedAuditToolName, packagedDurableOfficerEntry, packagedRoleAcceptedOutputTool, packagedRoleMetadata, packagedSkipsGateOnInfrastructureStage, } from "../packaged-role-registry.js";
 import { SECRETARIAT_COUNTERSIGN_TERMINAL_FACT_KEY, SECRETARIAT_GATE_OFFICER_ENTRY_TYPE, } from "../secretariat-contracts.js";
-import { classifyPackagedRoleTerminalResult, findLatestDurablePackagedRoleTerminal, hasNavigatorInfrastructureFailureBase, isAcceptedPackagedRoleTerminalResult, isReceiptSettlementBindingClear, NAVIGATOR_INVOCATION_ENTRY, NAVIGATOR_ROUTE_PLAYBOOK_FAILURE_ENTRY, parseInvocationMarkerIdentity, } from "../navigator-invocation-identity.js";
+import { classifyPackagedRoleTerminalResult, findLatestDurablePackagedRoleTerminal, hasNavigatorInfrastructureFailureBase, isAcceptedPackagedRoleTerminalResult, NAVIGATOR_ROUTE_PLAYBOOK_FAILURE_ENTRY, } from "../navigator-invocation-identity.js";
 import { NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_TURN_LIMIT, noReceiptLifecycleFacts, parseNoReceiptLifecycleFacts, } from "../receipt-delivery-policy.js";
 import { roleRunArtifactsDirectory } from "../role-run-placement.js";
 import { rewriteRunDirectoryPathValue } from "../role-run-relocation.js";
@@ -1353,19 +1353,6 @@ export async function appendRunAttemptHistory(source, outcome) {
     }
     catch { }
 }
-/**
- * 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, attendanceIndex, terminalIndex, marker) {
-    if (attendanceIndex <= terminalIndex)
-        return false;
-    // Exact current invocation token is the bound marker principal.
-    if (details.invocationId !== marker.invocationId)
-        return false;
-    return true;
-}
 function parseNavigatorAttendanceDetails(details) {
     const disposition = details.disposition;
     const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string"
@@ -1586,10 +1573,9 @@ export function extractNavigatorFact(entries) {
     return message === undefined ? fact : { ...fact, advisoryDiagnostic: message };
 }
 function extractNavigatorAttendanceFact(entries) {
-    // Affirmative attendance only. Missing / uncorrelated / unparseable is never no-advice.
-    // Minimal provenance: latest durable terminal + nearest preceding marker +
-    // invocationId + post-terminal order. Marker↔terminal cardinality belongs to
-    // receipt settlement (isReceiptSettlementBindingClear), not attendance extraction.
+    // Affirmative attendance only. Missing / unparseable is never no-advice.
+    // The shared lifecycle places the settled event on this submission's closure;
+    // an unrelated attendance message cannot supply another call's result.
     const terminal = findLatestDurablePackagedRoleTerminal(entries);
     if (terminal === undefined) {
         return {
@@ -1598,49 +1584,14 @@ function extractNavigatorAttendanceFact(entries) {
             reason: "Navigator attendance has no durable packaged role terminal",
         };
     }
-    let markerIndex = -1;
-    for (let i = terminal.index - 1; i >= 0; i -= 1) {
+    for (let i = terminal.index; i < entries.length; i += 1) {
         const entry = entries[i];
-        if (entry?.type === "custom" && entry.customType === NAVIGATOR_INVOCATION_ENTRY) {
-            markerIndex = i;
+        if (entry?.type !== "custom" || entry.customType !== "ak-role-submission-closure")
+            continue;
+        const details = isRecord(entry.data) ? entry.data.navigator : undefined;
+        if (!isRecord(details))
             break;
-        }
-    }
-    if (markerIndex < 0) {
-        return {
-            disposition: "unavailable",
-            source: "unknown",
-            reason: "Navigator attendance is uncorrelated with session invocation facts",
-        };
-    }
-    const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-    if (marker === undefined) {
-        return {
-            disposition: "unavailable",
-            source: "unknown",
-            reason: "Navigator attendance is uncorrelated with session invocation facts",
-        };
-    }
-    for (let i = entries.length - 1; i >= 0; i -= 1) {
-        const entry = entries[i];
-        if (entry?.type === "custom_message" && entry.customType === "ak-navigator-attendance") {
-            const details = entry.message?.details ?? entry.details;
-            if (!isRecord(details)) {
-                return {
-                    disposition: "unavailable",
-                    source: "unknown",
-                    reason: "Navigator attendance is unparseable",
-                };
-            }
-            if (!navigatorAttendanceCorrelatedWithBoundMarker(details, i, terminal.index, marker)) {
-                return {
-                    disposition: "unavailable",
-                    source: "unknown",
-                    reason: "Navigator attendance is uncorrelated with session invocation facts",
-                };
-            }
-            return parseNavigatorAttendanceDetails(details);
-        }
+        return parseNavigatorAttendanceDetails(details);
     }
     // Absence is not successful no-advice — require affirmative typed attendance.
     return {

package/package.json

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

package/src/navigator-invocation-identity.ts

@@ -1,5 +1,5 @@
 /**
- * Exact current-invocation principal for Navigator attendance correlation.
+ * Exact current-invocation principal for shared role lifecycle (#1087).
  * Shared role lifecycle owns one opaque uuidv7 per Role invocation and persists
  * it on the role session via Pi's guaranteed `pi.appendEntry` boundary.
  *
@@ -7,21 +7,14 @@
  * unfinished exact-session resume reuses the latest valid marker only when its
  * role/phase/subjectKey still match the expected identity; a packaged role
  * terminal completing that marker starts the next invocation (fresh mint).
- * Terminal settlement binds the nearest independent marker strictly before the
- * current durable packaged role terminal and compares equality — never attendance
- * self-shape, markers after the terminal, or stale older markers behind a
- * malformed nearest. Non-UUIDv7 principals are never accepted.
+ * Public settlement does not re-correlate attendance against this principal
+ * (ADR 0042); lifecycle dispose/grace owns call-boundary isolation (ADR 0084).
  *
  * One shared typed terminal classifier owns durable completion for lifecycle,
  * publicNavigatorSettlement, and every public CLI Receipt extractor:
  *   - accepted/human: isError exactly false and no infrastructure-failure fact
  *   - infrastructure: isError exactly true plus base kind/source/reasonCode identity
  *   - retryable/missing/nonboolean/contradictory/malformed: nonterminal
- *
- * One truth table also owns marker↔terminal cardinality:
- *   - a marker binds exactly one durable packaged role terminal
- *   - multiple durable terminals after the same marker → ambiguous / fail-closed
- *   - marker role/phase/subjectKey must match the terminal + independent expected
  */
 
 import { LEGACY_REVIEW_OUTPUT_ROLES, PACKAGED_ROLE_REGISTRY } from "./packaged-role-registry.ts";
@@ -147,7 +140,7 @@ export type InvocationMarkerIdentity = {
   readonly subjectKey: string;
 };
 
-/** Independently admitted / registry / cwd expected identity for resume and correlation. */
+/** Independently admitted / registry / cwd expected identity for lifecycle resume. */
 export type ExpectedInvocationIdentity = {
   readonly role: string;
   readonly phase?: InvocationPhase;
@@ -342,83 +335,6 @@ export function findLatestDurablePackagedRoleTerminal(
   return undefined;
 }
 
-/**
- * Truth-table binding of the current durable packaged role terminal to its
- * owning invocation marker. Singleton cardinality: multiple durable terminals
- * after the same marker are ambiguous and fail closed.
- */
-export type DurableTerminalMarkerBinding =
-  | {
-      readonly kind: "bound";
-      readonly terminal: DurablePackagedRoleTerminalRef;
-      readonly marker: InvocationMarkerIdentity & { readonly index: number };
-    }
-  | {
-      readonly kind: "unbound";
-      readonly terminal: DurablePackagedRoleTerminalRef;
-    }
-  | { readonly kind: "absent" }
-  | { readonly kind: "ambiguous" };
-
-export function bindCurrentDurableTerminalToMarker(
-  entries: readonly NavigatorInvocationEntryLike[],
-): DurableTerminalMarkerBinding {
-  const terminal = findLatestDurablePackagedRoleTerminal(entries);
-  if (terminal === undefined) return { kind: "absent" };
-
-  let markerIndex = -1;
-  for (let i = terminal.index - 1; i >= 0; i -= 1) {
-    if (isInvocationMarkerEntry(entries[i])) {
-      markerIndex = i;
-      break;
-    }
-  }
-  if (markerIndex < 0) {
-    return { kind: "unbound", terminal };
-  }
-
-  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-  if (marker === undefined) {
-    // Malformed nearest marker: no stale fallback; terminal exists but is unbound.
-    return { kind: "unbound", terminal };
-  }
-
-  let windowEnd = entries.length;
-  for (let i = markerIndex + 1; i < entries.length; i += 1) {
-    if (isInvocationMarkerEntry(entries[i])) {
-      windowEnd = i;
-      break;
-    }
-  }
-
-  let durableCount = 0;
-  for (let i = markerIndex + 1; i < windowEnd; i += 1) {
-    if (durableTerminalAt(entries, i) !== undefined) durableCount += 1;
-  }
-  if (durableCount !== 1) return { kind: "ambiguous" };
-  // Current terminal must be the singleton inside this marker window.
-  if (terminal.index <= markerIndex || terminal.index >= windowEnd) {
-    return { kind: "ambiguous" };
-  }
-
-  return {
-    kind: "bound",
-    terminal,
-    marker: { ...marker, index: markerIndex },
-  };
-}
-
-/**
- * Whether public Receipt settlement may proceed for the current durable terminal.
- * Only ambiguous multi-terminal bindings fail closed; attendance mismatch does not
- * pollute an otherwise legal single Receipt.
- */
-export function isReceiptSettlementBindingClear(
-  entries: readonly NavigatorInvocationEntryLike[],
-): boolean {
-  return bindCurrentDurableTerminalToMarker(entries).kind !== "ambiguous";
-}
-
 export type LifecycleInvocationPrincipal = {
   readonly invocationId: string;
   /** True when the principal is already on the admitted session (resume; do not re-append). */
@@ -463,36 +379,3 @@ export function resolveLifecycleInvocationPrincipal(
 
   return { invocationId: marker.invocationId, resume: true };
 }
-
-/**
- * Exact current invocation principal already present on the role session.
- * `beforeIndex` is the current packaged role terminal index: only the nearest
- * marker strictly before that bound is applicable. A malformed nearest marker
- * fails closed (undefined) — never falls back to a stale older valid marker.
- * Markers at/after the terminal (future prepare/event) are never considered.
- * Non-UUIDv7 values are rejected.
- */
-export function currentInvocationPrincipalFromSession(
-  entries: readonly NavigatorInvocationEntryLike[],
-  beforeIndex: number = entries.length,
-): string | undefined {
-  return currentInvocationMarkerFromSession(entries, beforeIndex)?.invocationId;
-}
-
-/**
- * Full marker identity nearest before `beforeIndex` (current durable terminal).
- * Malformed nearest fails closed — no stale older fallback.
- */
-export function currentInvocationMarkerFromSession(
-  entries: readonly NavigatorInvocationEntryLike[],
-  beforeIndex: number = entries.length,
-): InvocationMarkerIdentity | undefined {
-  const limit = Math.min(Math.max(beforeIndex, 0), entries.length);
-  for (let i = limit - 1; i >= 0; i -= 1) {
-    const entry = entries[i];
-    if (!isInvocationMarkerEntry(entry)) continue;
-    // Nearest marker only — parse full identity or fail closed.
-    return parseInvocationMarkerIdentity(entry?.data);
-  }
-  return undefined;
-}

package/src/public-cli/settlement.ts

@@ -88,11 +88,7 @@ import {
   findLatestDurablePackagedRoleTerminal,
   hasNavigatorInfrastructureFailureBase,
   isAcceptedPackagedRoleTerminalResult,
-  isReceiptSettlementBindingClear,
-  NAVIGATOR_INVOCATION_ENTRY,
   NAVIGATOR_ROUTE_PLAYBOOK_FAILURE_ENTRY,
-  parseInvocationMarkerIdentity,
-  type InvocationMarkerIdentity,
 } from "../navigator-invocation-identity.ts";
 import {
   NO_RECEIPT_LIFECYCLE_ENTRY_TYPE,
@@ -1921,23 +1917,6 @@ export async function appendRunAttemptHistory(
   } catch {}
 }
 
-/**
- * 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,
-  terminalIndex: number,
-  marker: InvocationMarkerIdentity,
-): boolean {
-  if (attendanceIndex <= terminalIndex) return false;
-  // Exact current invocation token is the bound marker principal.
-  if (details.invocationId !== marker.invocationId) return false;
-  return true;
-}
-
 function parseNavigatorAttendanceDetails(
   details: Record<string, unknown>,
 ): TerminalNavigatorFact {
@@ -2216,10 +2195,9 @@ export function extractNavigatorFact(
 function extractNavigatorAttendanceFact(
   entries: readonly SessionEntry[],
 ): TerminalNavigatorFact {
-  // Affirmative attendance only. Missing / uncorrelated / unparseable is never no-advice.
-  // Minimal provenance: latest durable terminal + nearest preceding marker +
-  // invocationId + post-terminal order. Marker↔terminal cardinality belongs to
-  // receipt settlement (isReceiptSettlementBindingClear), not attendance extraction.
+  // Affirmative attendance only. Missing / unparseable is never no-advice.
+  // The shared lifecycle places the settled event on this submission's closure;
+  // an unrelated attendance message cannot supply another call's result.
   const terminal = findLatestDurablePackagedRoleTerminal(entries);
   if (terminal === undefined) {
     return {
@@ -2229,57 +2207,12 @@ function extractNavigatorAttendanceFact(
     };
   }
 
-  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",
-    };
-  }
-  const marker = parseInvocationMarkerIdentity(entries[markerIndex]?.data);
-  if (marker === undefined) {
-    return {
-      disposition: "unavailable",
-      source: "unknown",
-      reason: "Navigator attendance is uncorrelated with session invocation facts",
-    };
-  }
-
-  for (let i = entries.length - 1; i >= 0; i -= 1) {
+  for (let i = terminal.index; i < entries.length; i += 1) {
     const entry = entries[i];
-    if (entry?.type === "custom_message" && entry.customType === "ak-navigator-attendance") {
-      const details = entry.message?.details ?? (entry as { details?: unknown }).details;
-      if (!isRecord(details)) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is unparseable",
-        };
-      }
-      if (
-        !navigatorAttendanceCorrelatedWithBoundMarker(
-          details,
-          i,
-          terminal.index,
-          marker,
-        )
-      ) {
-        return {
-          disposition: "unavailable",
-          source: "unknown",
-          reason: "Navigator attendance is uncorrelated with session invocation facts",
-        };
-      }
-      return parseNavigatorAttendanceDetails(details);
-    }
+    if (entry?.type !== "custom" || entry.customType !== "ak-role-submission-closure") continue;
+    const details = isRecord(entry.data) ? entry.data.navigator : undefined;
+    if (!isRecord(details)) break;
+    return parseNavigatorAttendanceDetails(details);
   }
   // Absence is not successful no-advice — require affirmative typed attendance.
   return {

package/src/role-runtime.ts

@@ -523,7 +523,7 @@ export async function projectClosedSubmissionLifecycle(
   context: HostContext,
   phase: NavigatorPhase,
   recordAccepted: () => void,
-  settle: (settlement: NavigatorSettlement | undefined) => Promise<void>,
+  settle: (settlement: NavigatorSettlement | undefined) => Promise<NavigatorEvent | undefined>,
 ): Promise<void> {
   recordAccepted();
   const closure = {
@@ -531,8 +531,17 @@ export async function projectClosedSubmissionLifecycle(
     isError: false,
     details: closed.accepted,
   };
-  context.sessionManager.appendCustomEntry?.("ak-role-submission-closure", closure);
-  await settle(publicNavigatorSettlement(closed.role, phase, closure));
+  let navigator: NavigatorEvent | undefined;
+  try {
+    navigator = await settle(publicNavigatorSettlement(closed.role, phase, closure));
+  } finally {
+    // A Navigator failure cannot erase an already accepted role closure.
+    // Missing attendance remains a typed unavailable at public settlement.
+    context.sessionManager.appendCustomEntry?.("ak-role-submission-closure", {
+      ...closure,
+      ...(navigator === undefined ? {} : { navigator }),
+    });
+  }
 }
 
 /**
@@ -1032,6 +1041,8 @@ export function createRoleRuntimeExtension(
     let navigatorAttendance: NavigatorAttendanceDependency | undefined;
     // #351: session-lifecycle owner for periodic OAuth refresh (orthogonal to role admission).
     let pendingNavigatorPresentation: { event: import("./navigator-attendance.ts").NavigatorEvent; report: import("./navigator-attendance.ts").NavigatorReport } | undefined;
+    let navigatorActivation = 0;
+    let navigatorDeliveryClosed = false;
     let pendingNavigatorSettlement: Promise<void> | undefined;
     let navigatorWorkContext: NavigatorWorkContext | undefined;
     let navigatorSessionParent: string | undefined;
@@ -1085,7 +1096,7 @@ export function createRoleRuntimeExtension(
       }
       void Promise.resolve(pending).then(undefined, recordDisposeFailure);
     };
-    const settleNavigatorProjection = async (settlement: NavigatorSettlement | undefined) => {
+    const settleNavigatorProjection = async (settlement: NavigatorSettlement | undefined): Promise<NavigatorEvent | undefined> => {
       const attendance = navigatorAttendance;
       if (settlement === undefined || attendance === undefined) return;
       const workContext = navigatorWorkContext;
@@ -1099,6 +1110,7 @@ export function createRoleRuntimeExtension(
         void settlePromise.catch(() => undefined);
         const raced = await raceNavigatorGrace(settlePromise, NAVIGATOR_POST_ROLE_GRACE_MS);
         if (raced.status !== "timeout") return;
+        navigatorDeliveryClosed = true;
         if (pendingNavigatorPresentation === undefined) {
           const report: NavigatorReport = {
             disposition: "unavailable",
@@ -1124,6 +1136,7 @@ export function createRoleRuntimeExtension(
       })();
       pendingNavigatorSettlement = pending;
       await pending;
+      return pendingNavigatorPresentation?.event;
     };
     projectClosedSubmission = async (closed, context) => projectClosedSubmissionLifecycle(
       closed,
@@ -1695,6 +1708,8 @@ export function createRoleRuntimeExtension(
       receiptDelivery = createReceiptDeliveryPolicy();
       noReceiptRecorded = false;
       pendingNavigatorPresentation = undefined;
+      navigatorActivation += 1;
+      navigatorDeliveryClosed = false;
       pendingNavigatorSettlement = undefined;
       pendingInfrastructureFailures.clear();
       pendingSubmissionNonPassByToolCallId.clear();
@@ -1811,6 +1826,7 @@ export function createRoleRuntimeExtension(
               });
             } catch {}
           }
+          const activation = navigatorActivation;
           navigatorAttendance = await dependencies.createNavigatorAttendance({
             context: ctx,
             role: entry.role,
@@ -1821,7 +1837,9 @@ export function createRoleRuntimeExtension(
             invocationId,
             ...(contextError === undefined ? {} : { contextError }),
             onEvent: (navigatorEvent, report) => {
-              pendingNavigatorPresentation = { event: navigatorEvent, report };
+              if (activation === navigatorActivation && !navigatorDeliveryClosed) {
+                pendingNavigatorPresentation = { event: navigatorEvent, report };
+              }
             },
           });
           // Concrete work context starts standby attendance (record only, no model).