@akagilnc/pi-workflow-roles 0.1.5148 → 0.1.5194

package/dist/public-cli/settlement.js

@@ -54,16 +54,18 @@ function roleOutcomeFromRows(role, rows) {
     const terminal = mine.filter((row) => row.kind === "accepted" || row.kind === "audit-escalation");
     if (terminal.length === 0)
         return undefined;
-    // Role-result block is the full recorded sequence for this seat, not a sole pick.
+    // Full sequence stays on payloads. The queue kind follows the latest terminal
+    // row only — an earlier escalation must not outrank a later acceptance or
+    // keep that earlier receipt (#1057).
     const payloads = mine.map((row) => row.accepted);
-    if (terminal.some((row) => row.kind === "audit-escalation")) {
-        const audited = terminal.slice().reverse().find((row) => row.kind === "audit-escalation" && Object.hasOwn(row, "auditReceipt"));
+    const latest = terminal[terminal.length - 1];
+    if (latest.kind === "audit-escalation") {
         return {
             kind: "audit_escalation", role, status: "audit_escalation", payloads,
-            ...(audited === undefined ? {} : { decisiveFacts: {
-                    auditEscalationReceipt: audited.auditReceipt,
-                    ...(Object.hasOwn(audited, "auditOfficer") ? { auditEscalationOfficer: audited.auditOfficer } : {}),
-                } }),
+            ...(Object.hasOwn(latest, "auditReceipt") ? { decisiveFacts: {
+                    auditEscalationReceipt: latest.auditReceipt,
+                    ...(Object.hasOwn(latest, "auditOfficer") ? { auditEscalationOfficer: latest.auditOfficer } : {}),
+                } } : {}),
         };
     }
     return { kind: "accepted", role, payloads };
@@ -535,7 +537,7 @@ function sessionReadFailure(error, fallbackMessage) {
  * Read the exact bound Pi session file principal.
  * Does not scan the session directory for "latest" — resume identity is the file.
  */
-async function readBoundSessionEntries(sessionFile) {
+export async function readBoundSessionEntries(sessionFile) {
     const text = await readFile(sessionFile, "utf8");
     const entries = [];
     for (const line of text.trim().split("\n").filter(Boolean)) {
@@ -1286,6 +1288,8 @@ function snapshotAuditDetails(details) {
  * terminal identity; the retained response must be this seat's real escalate
  * decision and its projected audit-owned fields must agree with it.
  */
+// Historical pre-#1057 session artifacts may still contain this old projection;
+// no current submission path writes it, but resume/settlement must read it.
 function boundAuditEscalationForResult(entries, resultIndex, message, role, outputToolName) {
     const roleCall = boundRoleToolCallForResult(entries, resultIndex, message, outputToolName);
     if (roleCall === undefined)
@@ -2216,6 +2220,22 @@ async function applySecretariatCountersignTerminal(admitted, authority, settled)
     }
     return settled;
 }
+/**
+ * After the audit gate returns, attach gate rounds and the secretariat officer
+ * fact onto the terminal this turn already settled. Does not publish again —
+ * a second publish would append another attempt-history row for the same attempt.
+ */
+export async function attachPostAuditProjection(admitted, authority, terminal) {
+    const { sessionDirectory, sessionFile } = coordinatesFromAdmitted(authority, admitted);
+    const gate = await extractGateFactFromSessionDirectory(sessionDirectory, {
+        runDirectory: admitted.runDirectory,
+        parentSessionFile: sessionFile,
+    });
+    const withGate = gate === undefined ? terminal : { ...terminal, gate };
+    if (admitted.role !== "secretariat")
+        return withGate;
+    return applySecretariatCountersignTerminal(admitted, authority, withGate);
+}
 function publicationAttemptFromError(path, error) {
     if (error instanceof Error) {
         const identity = {

package/dist/public-role-summons.js

@@ -439,6 +439,8 @@ async function summonGateOfficer(options) {
     const { readableGateItem } = await import("./readable-gate-item.js");
     gateReviewInstruction = readableGateItem(options.submission);
   }
+  const { runIdFromRunDirectory } = await import("./run-terminal-artifacts.js");
+  const parentRunId = runIdFromRunDirectory(options.sourceRunDirectory);
   const common = {
     cwd: options.cwd,
     ...home === void 0 ? {} : { home },
@@ -449,7 +451,8 @@ async function summonGateOfficer(options) {
     ...gateReviewInstruction === void 0 ? {} : { gateReviewInstruction },
     ...options.roleTurnHost === void 0 ? {} : { roleTurnHost: options.roleTurnHost },
     ...options.hostAdapters === void 0 ? {} : { hostAdapters: options.hostAdapters },
-    ...options.createRunId === void 0 ? {} : { createRunId: options.createRunId }
+    ...options.createRunId === void 0 ? {} : { createRunId: options.createRunId },
+    ...parentRunId === void 0 || parentRunId.trim() === "" ? {} : { correlationId: parentRunId }
   };
   const { packagedGateSummon } = await import("./packaged-role-registry.js");
   const gateSummon = packagedGateSummon(options.officer);
@@ -474,13 +477,12 @@ async function summonGateOfficer(options) {
     });
   }
   if (gateSummon === "parent-instruction") {
-    const { runIdFromRunDirectory } = await import("./run-terminal-artifacts.js");
-    const correlationId = runIdFromRunDirectory(options.sourceRunDirectory);
-    if (correlationId === void 0 || correlationId.trim() === "") {
+    if (parentRunId === void 0 || parentRunId.trim() === "") {
       throw new Error(
         `countersign gate summon requires parent runId from sourceRunDirectory: ${options.sourceRunDirectory}`
       );
     }
+    const correlationId = parentRunId;
     const { isSafePositiveTicketNumber, readBoardTicketNumber } = await import("./run-ticket-number.js");
     const parentTicket = await readBoardTicketNumber(options.sourceRunDirectory);
     const submittedTicket = options.submission !== null && typeof options.submission === "object" && !Array.isArray(options.submission) ? options.submission.ticketNumber : void 0;

package/dist/submission-errors.js

@@ -9,7 +9,7 @@ function serializeReceipt(receipt) {
     return readableGateItem(receipt);
 }
 function gatekeeperNonPassMessage(result) {
-    if (result.status === "continue" || result.status === "escalate") {
+    if (result.status === "continue") {
         return serializeReceipt(result.receipt);
     }
     if (result.status === "transport_failure") {

package/dist/submission-gate.js

@@ -0,0 +1,165 @@
+import { bookDirectOfficerRunPointer } from "./archivist-record-pointer.js";
+import { GatekeeperDecisionError, officerConclusionReask, projectGatekeeperRun, } from "./gatekeeper-role.js";
+/** Queue word of the latest this-terminal payload. History does not outrank it. */
+export function latestQueueStatus(terminal) {
+    const outcome = terminal?.roleOutcome;
+    if (outcome === undefined)
+        return undefined;
+    if (outcome.kind === "audit_escalation")
+        return "escalate";
+    if (outcome.kind !== "accepted")
+        return undefined;
+    const latest = outcome.payloads?.[outcome.payloads.length - 1];
+    if (latest !== null && typeof latest === "object" && !Array.isArray(latest)) {
+        const status = latest.status;
+        if (typeof status === "string" && status.trim() !== "")
+            return status;
+    }
+    return typeof outcome.status === "string" && outcome.status.trim() !== ""
+        ? outcome.status
+        : undefined;
+}
+export function latestQueuePayload(terminal) {
+    const outcome = terminal?.roleOutcome;
+    if (outcome === undefined)
+        return undefined;
+    if (outcome.kind !== "accepted" && outcome.kind !== "audit_escalation")
+        return undefined;
+    const payloads = outcome.payloads ?? [];
+    return payloads.length === 0 ? undefined : payloads[payloads.length - 1];
+}
+import { sessionFileFromPublicSummon } from "./session-assistant-usage.js";
+/**
+ * Shared-envelope default officer summon (ADR 0018).
+ * Role modules must not own this drive seam — only project results.
+ */
+export function createDefaultGateOfficerSummon(options) {
+    return async (officer, sourceRunDirectory, signal, reask, submission) => {
+        const { summonGateOfficer } = await import("./public-role-summons.js");
+        return summonGateOfficer({
+            officer,
+            sourceRunDirectory,
+            cwd: options.cwd,
+            ...(signal === undefined ? {} : { signal }),
+            ...(reask === undefined ? {} : { reask }),
+            ...(submission === undefined ? {} : { submission }),
+            ...(options.home === undefined ? {} : { home: options.home }),
+            ...(options.packageRoot === undefined ? {} : { packageRoot: options.packageRoot }),
+            ...(options.io === undefined ? {} : { io: options.io }),
+            ...(options.roleTurnHost === undefined ? {} : { roleTurnHost: options.roleTurnHost }),
+            ...(options.hostAdapters === undefined ? {} : { hostAdapters: options.hostAdapters }),
+            ...(options.createRunId === undefined ? {} : { createRunId: options.createRunId }),
+        });
+    };
+}
+/**
+ * Book a typed pointer under parent session/auditor-roles (archivist-owned write).
+ * Offline mocks without a real session leave no nested volume (lawful zero).
+ */
+function bookDirectOfficerPointer(context, officer, result, summoned) {
+    if (result.status !== "converged"
+        && result.status !== "continue"
+        && result.status !== "escalate"
+        && result.status !== "needs_reask"
+        && result.status !== "transport_failure") {
+        return;
+    }
+    const parentFile = context.sessionManager?.getSessionFile?.();
+    if (typeof parentFile !== "string" || parentFile.trim() === "")
+        return;
+    const sessionFile = sessionFileFromPublicSummon(summoned);
+    if (sessionFile === undefined) {
+        // No independent 正本 to point at — do not synthesize a parallel session.
+        return;
+    }
+    bookDirectOfficerRunPointer({
+        parentSessionFile: parentFile,
+        officer,
+        sessionFile,
+        ...(typeof summoned.runDirectory === "string" && summoned.runDirectory.trim() !== ""
+            ? { runDirectory: summoned.runDirectory }
+            : {}),
+    });
+}
+/**
+ * Shared envelope: project gate, book officer pointer, map onto host actions.
+ * Review loop has no round cap (#753 no-round-cap).
+ * On converged, returns the officer snapshot (receipt + nested runId) for seat projection.
+ */
+export async function requireSubmissionGate(options) {
+    let reask;
+    // No round cap — end only on converged, continue/escalate, or real failure.
+    const summonOfficer = options.summonOfficer ??
+        createDefaultGateOfficerSummon({
+            cwd: options.context.cwd ?? process.cwd(),
+        });
+    for (;;) {
+        const projected = await projectGatekeeperRun({
+            context: options.context,
+            subject: options.subject,
+            summonOfficer,
+            ...(options.signal === undefined ? {} : { signal: options.signal }),
+            ...(options.submission === undefined ? {} : { submission: options.submission }),
+            ...(reask === undefined ? {} : { reask }),
+        });
+        const gatekeeper = projected.result;
+        // Envelope-owned pointer book. Failure is host infrastructure — single face.
+        if (projected.summoned !== undefined) {
+            try {
+                bookDirectOfficerPointer(options.context, projected.officer, gatekeeper, projected.summoned);
+            }
+            catch (error) {
+                options.hostActions.failInfrastructure(error, options.context, options.toolCallId);
+            }
+        }
+        if (gatekeeper.status === "converged") {
+            return {
+                status: "converged",
+                officer: projected.officer,
+                receipt: gatekeeper.receipt,
+                ...(typeof gatekeeper.runId === "string" && gatekeeper.runId.trim() !== ""
+                    ? { runId: gatekeeper.runId }
+                    : {}),
+            };
+        }
+        if (gatekeeper.status === "continue") {
+            return {
+                status: "continue",
+                officer: projected.officer,
+                receipt: gatekeeper.receipt,
+                ...(typeof gatekeeper.runId === "string" && gatekeeper.runId.trim() !== ""
+                    ? { runId: gatekeeper.runId }
+                    : {}),
+            };
+        }
+        if (gatekeeper.status === "needs_reask") {
+            reask = officerConclusionReask(gatekeeper.receivedStatus);
+            continue;
+        }
+        if (gatekeeper.status === "transport_failure") {
+            const failure = Object.assign(new Error(gatekeeper.reason), {
+                name: "GatekeeperTransportFailure",
+                ...(gatekeeper.submission === undefined ? {} : { submission: gatekeeper.submission }),
+            });
+            options.hostActions.failInfrastructure(failure, options.context, options.toolCallId);
+        }
+        if (gatekeeper.status === "escalate") {
+            return {
+                status: "escalate",
+                officer: projected.officer,
+                receipt: gatekeeper.receipt,
+                ...(typeof gatekeeper.runId === "string" && gatekeeper.runId.trim() !== ""
+                    ? { runId: gatekeeper.runId }
+                    : {}),
+                ...(typeof projected.summoned?.runDirectory === "string"
+                    && projected.summoned.runDirectory.trim() !== ""
+                    ? { runDirectory: projected.summoned.runDirectory }
+                    : {}),
+            };
+        }
+        // no_receipt: keep the lifecycle failure channel; continue is an ordinary
+        // nonterminal tool result above, not an exception or correctable rejection.
+        options.hostActions.bindSubmissionNonPass(options.toolCallId, gatekeeper);
+        throw new GatekeeperDecisionError(gatekeeper);
+    }
+}

package/dist/submission-ledger.js

@@ -1,7 +1,6 @@
 import { join } from "node:path";
 import { resolveActivationLedgerHome, tryHomeFromAkRolesPath, } from "./activation-ledger-topology.js";
 import { courtAttemptIdFromHostContext, runDirectoryFromHostContext, } from "./host-contracts.js";
-import { isAuditEscalationProjection } from "./audit-escalation.js";
 import { runIdFromRunDirectory } from "./run-terminal-artifacts.js";
 import { readSitianRecords, resolveSitianRecordPathInLedger, sitianReport } from "./sitian-facade.js";
 import { findRunDirectoryById } from "./public-cli/run-lifecycle.js";
@@ -528,32 +527,6 @@ export function createSubmissionLedgerHost(host, outputTools, failInfrastructure
                     }
                     // #836: ledger authority is the LLM tool-call params as-is (角色原话), never result.details.
                     // Machine facts on result.details stay on the tool-result face returned to the model.
-                    if (isAuditEscalationProjection(result.details) || isAuditEscalationProjection(params)) {
-                        const audit = isAuditEscalationProjection(result.details)
-                            && typeof result.details.audit === "object"
-                            && result.details.audit !== null
-                            ? result.details.audit
-                            : undefined;
-                        const closed = {
-                            role,
-                            kind: "audit_escalation",
-                            accepted: params,
-                        };
-                        append({
-                            type: "outcome",
-                            attemptId,
-                            toolCallId,
-                            outcome: "audit-escalation",
-                            role,
-                            accepted: params,
-                            ...(audit !== undefined && (Object.hasOwn(audit, "receipt") || Object.hasOwn(audit, "conflicts"))
-                                ? { auditReceipt: Object.hasOwn(audit, "receipt") ? audit.receipt : audit.conflicts }
-                                : {}),
-                            ...(audit !== undefined && Object.hasOwn(audit, "officer") ? { auditOfficer: audit.officer } : {}),
-                        });
-                        await projectClosure(closed, context);
-                        return result;
-                    }
                     // A continuing gate leaves the candidate recorded but has not accepted it.
                     if (result.terminate === false)
                         return result;

package/dist/worker-submission-contracts.js

@@ -0,0 +1,8 @@
+/**
+ * Statuses that enter the worker officer submission gate (ADR 0066):
+ * completed/partially_completed enter gate ①; planned/refused/unfinished do not.
+ */
+export const WORKER_DONE_STATUSES = new Set([
+    "completed",
+    "partially_completed",
+]);

package/package.json

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

package/src/archivist-record-entry.ts

@@ -6,7 +6,6 @@
 import {
   closeSync,
   existsSync,
-  mkdirSync,
   openSync,
   readdirSync,
   readFileSync,
@@ -32,6 +31,11 @@ import {
 } from "./archivist-record-topology.ts";
 import type { HostRecordSession, RecordSessionHost } from "./host-contracts.ts";
 import { piRecordSessionHost } from "./pi/record-session-host.ts";
+export {
+  DIRECT_OFFICER_RUN_POINTER_KIND,
+  bookDirectOfficerRunPointer,
+} from "./archivist-record-pointer.ts";
+export type { DirectOfficerRunPointer } from "./archivist-record-pointer.ts";
 
 export {
   NAVIGATOR_RECORD_KIND,
@@ -473,51 +477,3 @@ export function createRecordSessionOpen(
 export function createRecordSession(options: CreateRecordSessionOptions): HostRecordSession {
   return createRecordSessionOpen(options).session;
 }
-
-
-/** Typed parent-side pointer to an independent officer run 正本 (ADR 0079 / #675). */
-export const DIRECT_OFFICER_RUN_POINTER_KIND = "direct-officer-run-pointer" as const;
-
-export type DirectOfficerRunPointer = {
-  readonly version: 1;
-  readonly kind: typeof DIRECT_OFFICER_RUN_POINTER_KIND;
-  readonly officer: "inspector" | "notary" | "auditor" | "countersign";
-  /** Absolute path to the officer session.jsonl 正本. */
-  readonly sessionFile: string;
-  /** Officer run directory when known. */
-  readonly runDirectory?: string;
-};
-
-/**
- * Book a typed pointer under parent session/auditor-roles (same nest owner as
- * createRecordSession). Never fabricates user/assistant/toolResult rows (#675).
- * Directory placement stays with the archivist record entry (ADR 0018 / 0065).
- *
- * Stable leaf per officer under one parent (#753 gate-round accounting):
- * same-parent re-summons upsert the same pointer instead of minting N files that
- * each re-scan the full officer session and multiply terminal gate-round counts.
- */
-export function bookDirectOfficerRunPointer(options: {
-  readonly parentSessionFile: string;
-  readonly officer: "inspector" | "notary" | "auditor" | "countersign";
-  readonly sessionFile: string;
-  readonly runDirectory?: string;
-}): DirectOfficerRunPointer {
-  const nest = join(dirname(options.parentSessionFile), "auditor-roles");
-  mkdirSync(nest, { recursive: true });
-  const pointer: DirectOfficerRunPointer = {
-    version: 1,
-    kind: DIRECT_OFFICER_RUN_POINTER_KIND,
-    officer: options.officer,
-    sessionFile: options.sessionFile,
-    ...(options.runDirectory !== undefined && options.runDirectory.trim() !== ""
-      ? { runDirectory: options.runDirectory }
-      : {}),
-  };
-  writeFileSync(
-    join(nest, `${options.officer}.pointer.json`),
-    `${JSON.stringify(pointer)}\n`,
-    "utf8",
-  );
-  return pointer;
-}

package/src/archivist-record-pointer.ts

@@ -0,0 +1,49 @@
+import { mkdirSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+
+/** Typed parent-side pointer to an independent officer run 正本 (ADR 0079 / #675). */
+export const DIRECT_OFFICER_RUN_POINTER_KIND = "direct-officer-run-pointer" as const;
+
+export type DirectOfficerRunPointer = {
+  readonly version: 1;
+  readonly kind: typeof DIRECT_OFFICER_RUN_POINTER_KIND;
+  readonly officer: "inspector" | "notary" | "auditor" | "countersign";
+  /** Absolute path to the officer session.jsonl 正本. */
+  readonly sessionFile: string;
+  /** Officer run directory when known. */
+  readonly runDirectory?: string;
+};
+
+/**
+ * Book a typed pointer under parent session/auditor-roles (same nest owner as
+ * createRecordSession). Never fabricates user/assistant/toolResult rows (#675).
+ * Directory placement stays with the archivist record entry (ADR 0018 / 0065).
+ *
+ * Stable leaf per officer under one parent (#753 gate-round accounting):
+ * same-parent re-summons upsert the same pointer instead of minting N files that
+ * each re-scan the full officer session and multiply terminal gate-round counts.
+ */
+export function bookDirectOfficerRunPointer(options: {
+  readonly parentSessionFile: string;
+  readonly officer: "inspector" | "notary" | "auditor" | "countersign";
+  readonly sessionFile: string;
+  readonly runDirectory?: string;
+}): DirectOfficerRunPointer {
+  const nest = join(dirname(options.parentSessionFile), "auditor-roles");
+  mkdirSync(nest, { recursive: true });
+  const pointer: DirectOfficerRunPointer = {
+    version: 1,
+    kind: DIRECT_OFFICER_RUN_POINTER_KIND,
+    officer: options.officer,
+    sessionFile: options.sessionFile,
+    ...(options.runDirectory !== undefined && options.runDirectory.trim() !== ""
+      ? { runDirectory: options.runDirectory }
+      : {}),
+  };
+  writeFileSync(
+    join(nest, `${options.officer}.pointer.json`),
+    `${JSON.stringify(pointer)}\n`,
+    "utf8",
+  );
+  return pointer;
+}