@akagilnc/pi-workflow-roles 0.1.5845 → 0.1.5853

package/src/public-cli/settlement.ts

@@ -45,11 +45,9 @@ import {
   homeFromRunDirectory,
   type AdmittedRoleInvocation,
 } from "./invocation.ts";
+import { findLatestDurablePackagedRoleTerminal } from "../navigator-invocation-identity.ts";
 import {
-  findLatestDurablePackagedRoleTerminal,
-  NAVIGATOR_ROUTE_PLAYBOOK_FAILURE_ENTRY,
-} from "../navigator-invocation-identity.ts";
-import {
+  isNavigatorSeat,
   packagedRoleAcceptedOutputTool,
   packagedRoleMetadata,
   type PackagedArtifactFace,
@@ -462,11 +460,13 @@ async function settleNoReceiptTerminal(
   }
   return attachEngineDetourToolUsage({
     roleOutcome,
-    navigator: await extractNavigatorFactFromAdmittedSession(
-      coordinates.sessionFile,
-      admitted.runDirectory,
-      scope,
-    ),
+    navigator: isNavigatorSeat(admitted.role)
+      ? NAVIGATOR_SEAT_OWN_FACT
+      : await extractNavigatorFactFromAdmittedSession(
+        coordinates.sessionFile,
+        admitted.runDirectory,
+        scope,
+      ),
     artifacts: [],
     runId: admitted.runId,
   }, coordinates.sessionDirectory, detourUsageContext(admitted, scope));
@@ -1075,9 +1075,6 @@ function parseNavigatorAttendanceDetails(
   details: Record<string, unknown>,
 ): TerminalNavigatorFact {
   const disposition = details.disposition;
-  const advisoryDiagnostic = typeof details.routePlaybookReadFailure === "string"
-    ? { advisoryDiagnostic: details.routePlaybookReadFailure }
-    : {};
   // #959: advice prose is presented as-is. Legacy "recommendation" with next/reason/
   // command is projected into prose so historical sessions still render — never wash
   // a real recommendation into no-advice when any advice body is recoverable.
@@ -1108,20 +1105,13 @@ function parseNavigatorAttendanceDetails(
     }
     if (prose === undefined || prose.trim() === "") {
       // Attended but empty body is affirmative no-advice, not unavailable (#959).
-      return {
-        disposition: "no-advice",
-        ...advisoryDiagnostic,
-      };
+      return { disposition: "no-advice" };
     }
-    return adviceNavigatorFact({
-      prose,
-      ...advisoryDiagnostic,
-    });
+    return adviceNavigatorFact({ prose });
   }
   if (disposition === "unavailable") {
     return {
       disposition: "unavailable",
-      ...advisoryDiagnostic,
       source:
         typeof details.unavailableSource === "string"
           ? details.unavailableSource
@@ -1134,10 +1124,7 @@ function parseNavigatorAttendanceDetails(
   }
   // arrival and legacy silence both mean affirmative lawful no next-role advice.
   if (disposition === "no-advice" || disposition === "arrival" || disposition === "silence") {
-    return {
-      disposition: "no-advice",
-      ...advisoryDiagnostic,
-    };
+    return { disposition: "no-advice" };
   }
   return {
     disposition: "unavailable",
@@ -1235,28 +1222,8 @@ function detourUsageContext(
   };
 }
 
-function routePlaybookFailureMessage(entries: readonly SessionEntry[]): string | undefined {
-  for (let i = entries.length - 1; i >= 0; i -= 1) {
-    const entry = entries[i];
-    if (entry?.type !== "custom" || entry.customType !== NAVIGATOR_ROUTE_PLAYBOOK_FAILURE_ENTRY) continue;
-    const data = entry.data;
-    if (!isRecord(data) || typeof data.message !== "string" || data.message.trim() === "") return undefined;
-    return data.message;
-  }
-  return undefined;
-}
-
 export function extractNavigatorFact(
   entries: readonly SessionEntry[],
-): TerminalNavigatorFact {
-  const fact = extractNavigatorAttendanceFact(entries);
-  if (fact.advisoryDiagnostic !== undefined) return fact;
-  const message = routePlaybookFailureMessage(entries);
-  return message === undefined ? fact : { ...fact, advisoryDiagnostic: message };
-}
-
-function extractNavigatorAttendanceFact(
-  entries: readonly SessionEntry[],
 ): TerminalNavigatorFact {
   // Affirmative attendance only. Missing / unparseable is never no-advice.
   // The shared lifecycle places the settled event on this submission's closure;
@@ -1290,6 +1257,9 @@ function extractNavigatorAttendanceFact(
  * Never infers no-advice from omission; session read failures stay typed unavailable
  * so the controlled-failure Terminal itself still settles.
  */
+/** The navigator run is the advice itself; it has no attendance of its own (#1192). */
+const NAVIGATOR_SEAT_OWN_FACT: TerminalNavigatorFact = { disposition: "no-advice" };
+
 async function extractNavigatorFactFromAdmittedSession(
   sessionFile: string,
   runDirectory: string,
@@ -1495,7 +1465,7 @@ async function finishLawfulSeat(
     : await publishDeclaredSeatTerminal(admitted, roleOutcome, coordinates, entries, scope);
   const terminal = await attachEngineDetourToolUsage({
     roleOutcome,
-    navigator: extractNavigatorFact(entries),
+    navigator: isNavigatorSeat(admitted.role) ? NAVIGATOR_SEAT_OWN_FACT : extractNavigatorFact(entries),
     artifacts,
     runId: admitted.runId,
     ...(submissionToolCallId === undefined || submissionToolCallId.length === 0
@@ -1698,11 +1668,13 @@ export async function settleFailureTerminalResult(
   const coordinates = coordinatesFromAdmitted(authority, admitted);
   const { sessionDirectory, sessionFile } = coordinates;
   // Exact-session attendance only — never infer no-advice from caller omission.
-  const navigator = await extractNavigatorFactFromAdmittedSession(
-    sessionFile,
-    admitted.runDirectory,
-    options,
-  );
+  const navigator = isNavigatorSeat(admitted.role)
+    ? NAVIGATOR_SEAT_OWN_FACT
+    : await extractNavigatorFactFromAdmittedSession(
+      sessionFile,
+      admitted.runDirectory,
+      options,
+    );
   let artifacts: TerminalArtifactRef[] = [];
   if (options.previewOnly !== true) {
     try {

package/src/public-cli/terminal.ts

@@ -90,17 +90,12 @@ export type TerminalNavigatorFact =
       /** #959: navigator speaks prose; code does not parse or rank the advice. */
       disposition: "advice";
       prose: string;
-      advisoryDiagnostic?: string;
-    }
-  | {
-      disposition: "no-advice";
-      advisoryDiagnostic?: string;
     }
+  | { disposition: "no-advice" }
   | {
       disposition: "unavailable";
       source: string;
       reason: string;
-      advisoryDiagnostic?: string;
     };
 
 /**
@@ -163,15 +158,8 @@ export type TerminalResult = {
  * Build an advice navigator fact (#959). Prose is presented as submitted;
  * code does not parse route/next or judge usability.
  */
-export function adviceNavigatorFact(input: {
-  prose: string;
-  advisoryDiagnostic?: string;
-}): TerminalNavigatorFact {
-  return {
-    disposition: "advice",
-    prose: input.prose,
-    ...(input.advisoryDiagnostic === undefined ? {} : { advisoryDiagnostic: input.advisoryDiagnostic }),
-  };
+export function adviceNavigatorFact(input: { prose: string }): TerminalNavigatorFact {
+  return { disposition: "advice", prose: input.prose };
 }
 
 /**
@@ -221,9 +209,6 @@ export function formatTerminalResult(result: TerminalResult): string {
     }
   }
   lines.push(`navigator\t${result.navigator.disposition}`);
-  if (result.navigator.advisoryDiagnostic !== undefined) {
-    lines.push(`navigator-advisory\t${encodeTerminalField(result.navigator.advisoryDiagnostic)}`);
-  }
   if (result.navigator.disposition === "advice") {
     // #959: present navigator prose as-is — no next/reason/command parsing.
     lines.push(`prose\t${encodeTerminalField(result.navigator.prose)}`);

package/src/public-cli/turn-request.ts

@@ -70,8 +70,6 @@ export type RoleTurnRequestProjectionOptions = {
   invocationScopeId?: string;
   /** Station child role run (#840): omit automatic navigator attendance. */
   readonly stationChild?: boolean;
-  /** #1160 attendance auto byStatus prepare (not direct navigator prose). */
-  readonly navigatorByStatusPrepare?: boolean;
   /**
    * #1132: the one effective delivery-request ceiling (#422 single resolve by
    * the caller). Projected so the host adapter's own re-ask loop and the AK
@@ -125,9 +123,6 @@ export function projectRoleTurnRequest(
       ? {}
       : { invocationScopeId: options.invocationScopeId }),
     ...(options.stationChild === undefined ? {} : { stationChild: options.stationChild }),
-    ...(options.navigatorByStatusPrepare === undefined
-      ? {}
-      : { navigatorByStatusPrepare: options.navigatorByStatusPrepare }),
     ...(options.deliveryRequestLimit === undefined
       ? {}
       : { deliveryRequestLimit: options.deliveryRequestLimit }),

package/src/public-role-summons.ts

@@ -122,11 +122,6 @@ export type PublicSummonRequest = {
    * (#946 / ADR 0082).
    */
   readonly stationChild?: boolean;
-  /**
-   * #1160 attendance auto byStatus prepare. Nested navigator only — never set
-   * on direct `ak-role navigator` (keeps free-form prose exit).
-   */
-  readonly navigatorByStatusPrepare?: boolean;
 };
 
 const execFileAsync = promisify(execFile);
@@ -404,9 +399,6 @@ export async function summonPublicRole(
           // Nested court stations keep station-child semantics; dual-lens
           // ordinary Reviewer axes opt out (#946 / ADR 0082).
           ...(options.stationChild === false ? {} : { stationChild: true }),
-          ...(options.navigatorByStatusPrepare === true
-            ? { navigatorByStatusPrepare: true as const }
-            : {}),
           // Forward composition-root adapters so nested stations (e.g.
           // secretariat → diarist) select the same faux/production table (#924).
           ...(options.hostAdapters === undefined

package/src/receipt-delivery-policy.ts

@@ -152,27 +152,6 @@ export function createReceiptDeliveryPolicy(limit?: number) {
       deliveryTurns += 1;
       spend();
     },
-    /**
-     * Stop asking. The issued count stays whatever was actually sent (#1132 —
-     * do not fill the remainder up to the ceiling).
-     */
-    closeBudget() { closed = true; },
-    /**
-     * A nested session settled without an accepted receipt. Close so this layer
-     * does not open another prompt on that session. The issued count stays the
-     * larger of the two seams: a nested zero must not wipe prompts this layer
-     * already sent, and adding the two counts would bill one send twice.
-     */
-    recordNestedNoReceipt(facts: Partial<NoReceiptLifecycleFacts>) {
-      if (typeof facts.terminalToolCalled === "boolean") {
-        terminalToolCalled = terminalToolCalled || facts.terminalToolCalled;
-      }
-      if (facts.rejectedReceipts !== undefined) {
-        rejectedReceipts.push(...facts.rejectedReceipts);
-      }
-      if (facts.deliveryTurns !== undefined) deliveryTurns = Math.max(deliveryTurns, facts.deliveryTurns);
-      closed = true;
-    },
     nextAction(): "accepted" | "request-delivery" | "no-receipt" {
       if (accepted) return "accepted";
       if (closed) return "no-receipt";

package/src/role-runtime-dependencies.ts

@@ -2,8 +2,8 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 
 import { loadDoctorCase } from "./doctor-evidence.ts";
-import { createNativeNavigatorSessionFactory, createNavigatorAttendance } from "./navigator-attendance.ts";
-import { loadNavigatorWorkContext } from "./navigator-work-context.ts";
+import { createNavigatorAttendance } from "./navigator-attendance.ts";
+import { createNavigatorLookup } from "./navigator-lookup.ts";
 import { loadNotarySourceRunLocator } from "./notary-source-run.ts";
 import { type RoleRuntimeDependencies } from "./role-runtime.ts";
 import {
@@ -40,7 +40,7 @@ export function createRoleRuntimeDependencies(packageRoot: string): RoleRuntimeD
   // packageRoot is the install root (resources/ lives there). Never resolve via
   // import.meta.url — headless/acp production-host bundles live under dist/*/
   // and would otherwise look for dist/resources/ (#962).
-  const navigatorSessionFactory = createNativeNavigatorSessionFactory();
+  const navigatorLookup = createNavigatorLookup();
   return {
     packageRoot,
     loadRoleReferenceMaterials: loadPackagedRoleReferenceMaterials,
@@ -48,20 +48,13 @@ export function createRoleRuntimeDependencies(packageRoot: string): RoleRuntimeD
     loadDoctorCase,
     loadNotarySourceRun: loadNotarySourceRunLocator,
     loadMergerInput: async (path) => JSON.parse(await readFile(path, "utf8")),
-    loadNavigatorWorkContext: (options) => loadNavigatorWorkContext({
-      context: options.context,
-      role: options.role,
-      ...(options.getFlag === undefined ? {} : { getFlag: options.getFlag }),
-    }),
     createNavigatorAttendance: (options) => createNavigatorAttendance({
       context: options.context,
       role: options.role,
       phase: options.phase,
       subjectKey: options.subjectKey,
       invocationId: options.invocationId,
-      createSession: navigatorSessionFactory,
-      ...(options.deliveryRequestLimit === undefined ? {} : { deliveryRequestLimit: options.deliveryRequestLimit }),
-      ...(options.contextError === undefined ? {} : { contextError: options.contextError }),
+      lookup: navigatorLookup,
       onEvent: options.onEvent,
     }),
   };