@akagilnc/pi-workflow-roles 0.1.4321 → 0.1.4363

package/src/public-cli/post-admission.ts

@@ -18,9 +18,11 @@ import {
 import { CliUsageError } from "./cli-errors.ts";
 import type { RoleTurnRequestProjectionOptions } from "./turn-request.ts";
 import {
+  bindAdmittedTicketNumber,
   buildInstructionTransportPrompt,
   freezeAttachmentsIntoRun,
 } from "./invocation.ts";
+import { readRecordedSubmissionRows } from "../submission-ledger.ts";
 import { pathContainedIn } from "../activation-ledger-topology.ts";
 import { pickEngineAxis } from "../package-resources/engine-material.ts";
 import { resolveHostAwareSessionAvailability } from "../session-identity.ts";
@@ -29,7 +31,6 @@ import type {
   ControlledFailureCause,
   DurablePrincipal,
   DurablePrincipalAuthority,
-  RoleTurnContinuation,
   RoleTurnHost,
   RoleTurnKnownFailure,
   RoleTurnRequest,
@@ -37,10 +38,7 @@ import type {
   SessionCustomEntryAppender,
 } from "../host-contracts.ts";
 import { isOfficerReviewSeat } from "../host-contracts.ts";
-import {
-  deliverCaseDossierAsAttachment,
-  projectCaseDossierPointerSection,
-} from "./case-dossier-delivery.ts";
+import { deliverCaseDossierAsAttachment } from "./case-dossier-delivery.ts";
 
 /** Original error bytes, never relabeled — a secondary fact riding beside a classified cause. */
 function describeCaughtError(error: unknown): { name?: string; message: string; code?: string | number } {
@@ -51,17 +49,6 @@ function describeCaughtError(error: unknown): { name?: string; message: string;
   return { message: String(error) };
 }
 
-/** Append one system section to a continuation prompt, keeping its kind. */
-function appendContinuationSection(
-  continuation: RoleTurnContinuation,
-  section: string,
-): RoleTurnContinuation {
-  const prompt = `${continuation.prompt}\n\n${section}`;
-  return continuation.kind === "initial"
-    ? { kind: "initial", prompt }
-    : { kind: "resume", prompt };
-}
-
 /**
  * Nested gate summons (station child) on an officer seat: dialogue content is
  * peer words only (#879). ADR 0081 case dossier still hangs via the existing
@@ -592,10 +579,32 @@ export async function dispatchPostAdmissionTurn<
    */
   let afterDispatchApplied = false;
   const finishAfterTurn = async (result: DispatchOutcome): Promise<DispatchOutcome> => {
-    if (adapters.afterDispatch === undefined || afterDispatchApplied) return result;
+    if (afterDispatchApplied) return result;
     afterDispatchApplied = true;
     try {
-      await adapters.afterDispatch(admitted, lease);
+      // #858: an unbound seat may assert its ticket on the existing receipt.
+      // Read the original accepted payload; do not rewrite it, infer from prose,
+      // or reject missing/malformed declarations. An existing binding wins.
+      if (admitted.ticketNumber === undefined) {
+        const rows = await readRecordedSubmissionRows(
+          admitted.projectRoot,
+          admitted.runId,
+          { home: homeFromRunDirectory(admitted.runDirectory), sessionParent: join(admitted.runDirectory, "session", "session.jsonl") },
+        );
+        const asserted = rows
+          .filter((row) => row.kind === "accepted" && row.role === admitted.role)
+          .map((row) => row.accepted)
+          .find((payload) => {
+            if (payload === null || typeof payload !== "object" || Array.isArray(payload)) return false;
+            const value = (payload as { ticketNumber?: unknown }).ticketNumber;
+            return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
+          });
+        const ticketNumber = asserted === undefined
+          ? undefined
+          : (asserted as { ticketNumber: number }).ticketNumber;
+        if (ticketNumber !== undefined) await bindAdmittedTicketNumber(admitted, ticketNumber);
+      }
+      if (adapters.afterDispatch !== undefined) await adapters.afterDispatch(admitted, lease);
       return result;
     } catch (error) {
       const primaryFailure =
@@ -728,10 +737,11 @@ export async function dispatchPostAdmissionTurn<
 
     // Turn request is assembled after beforeDispatch so this turn sees whatever it
     // settled — the seat's ticket bind re-projection and any court diarist station
-    // writes (#742). Case dossier delivery (ADR 0081 / #709) rides here once for
-    // every public entry. #879: station-child officer dialogue keeps peer body
-    // intact — 起居录 hangs via existing attachments freeze (not prompt wrap,
-    // not RoleTurnRequest.materials). Other entries keep the neutral prompt section.
+    // writes (#742). Case dossier delivery (ADR 0081 / #709 / #858) rides here once
+    // for every public entry on the existing attachments → readingMaterial face
+    // (station-child and ordinary share one seam). Dialogue continuation stays
+    // caller/peer opaque — never splice system path sections into user dialogue.
+    // No package-resume parallel face or typed resume identity.
     let turnRequest: RoleTurnRequest =
       env.signal === undefined ? request : { ...request, signal: env.signal };
     if (env.stationChild !== undefined) {
@@ -745,34 +755,16 @@ export async function dispatchPostAdmissionTurn<
     if (typeof liveHost === "string" && liveHost.trim() !== "") {
       turnRequest = { ...turnRequest, host: liveHost.trim() };
     }
-    if (isStationChildOfficerDialogue(admitted.role, env)) {
-      // 0081 non-body face: freeze pointer section under run/attachments/.
-      // Peer dialogue continuation.prompt stays parent payload only — the seat
-      // consumes the freeze via loadCaseDossierReadingMaterial → existing
-      // agent-start readingMaterial / systemPrompt.materials fold (not prompt splice,
-      // not RoleTurnRequest.materials).
-      await deliverCaseDossierAsAttachment({
-        ticketNumber: admitted.ticketNumber,
-        projectRoot: admitted.projectRoot,
-        home: env.home,
-        runDirectory: admitted.runDirectory,
-      });
-    } else {
-      const dossierSection = await projectCaseDossierPointerSection({
-        ticketNumber: admitted.ticketNumber,
-        projectRoot: admitted.projectRoot,
-        home: env.home,
-      });
-      if (dossierSection !== undefined) {
-        turnRequest = {
-          ...turnRequest,
-          continuation: appendContinuationSection(
-            turnRequest.continuation,
-            dossierSection,
-          ),
-        };
-      }
-    }
+    // 0081 non-dialogue face: freeze pointer section under run/attachments/.
+    // Seat consumes via loadCaseDossierReadingMaterial → existing agent-start
+    // readingMaterial / systemPrompt.materials fold. Caller instruction, empty
+    // request, and resume --message stay verbatim.
+    await deliverCaseDossierAsAttachment({
+      ticketNumber: admitted.ticketNumber,
+      projectRoot: admitted.projectRoot,
+      home: env.home,
+      runDirectory: admitted.runDirectory,
+    });
 
     // Authoritative host write happens here, at the real dispatch boundary —
     // immediately before the turn actually starts, after every retryable

package/src/public-cli/settlement.ts

@@ -1086,38 +1086,7 @@ async function loadBoundAuditorVolumes(
   }
   const parentId = parentEntries.find((entry) => entry.type === "session")?.id;
   if (parentId === undefined) return undefined;
-  const isResumeEnvelopeBytes = (value: unknown): boolean => {
-    if (typeof value !== "string") return false;
-    if (value.length === 0) return true;
-    const nl = value.indexOf("\n");
-    const firstLine = nl === -1 ? value : value.slice(0, nl);
-    const body = firstLine === "" && nl !== -1 ? value.slice(nl + 1) : value;
-    return body.startsWith("本次配置的劳务引擎及其手册：") || body.startsWith("- engine:");
-  };
-  const isResumeEnvelope = (msg: unknown): boolean => {
-    if (!isRecord(msg) || msg.role !== "user") return false;
-    const text = typeof msg.text === "string" ? msg.text : typeof (msg as { content?: unknown }).content === "string" ? (msg as { content: string }).content : undefined;
-    if (isResumeEnvelopeBytes(text)) return true;
-    const content = (msg as { content?: unknown }).content;
-    if (Array.isArray(content)) {
-      return content.some((p) => isRecord(p) && (isResumeEnvelopeBytes(p.text) || isResumeEnvelopeBytes(p.content)));
-    }
-    return false;
-  };
-  let latestParentUserIndex = -1;
-  for (let i = parentEntries.length - 1; i >= 0; i -= 1) {
-    const entry = parentEntries[i];
-    if (entry?.type !== "message" || entry.message?.role !== "user") continue;
-    if (isResumeEnvelope(entry.message)) continue;
-    latestParentUserIndex = i;
-    break;
-  }
   const childDirectories = [join(dirname(sessionFile), "auditor-roles")];
-  // Auto-resume seam (owner A): stale check must ignore resume envelope and
-  // prioritize retention. Previous `attemptEntryIndex < latest` discarded the
-  // first attempt's child after resume advanced latest, losing retentionFailure
-  // when retry had no compliance entry. Fix: ignore envelope for staleness and
-  // prefer any valid compliance failure before falling back to primary.
   const valid: BoundAuditorVolume[] = [];
   let sawAnyDirectory = false;
   for (const childDirectory of childDirectories) {
@@ -1166,10 +1135,6 @@ async function loadBoundAuditorVolumes(
           typeof bindingParent?.attemptEntryId === "string"
             ? bindingParent.attemptEntryId
             : undefined;
-        const attemptEntryIndex =
-          attemptEntryId === undefined
-            ? -1
-            : parentEntries.findIndex((entry) => entry.id === attemptEntryId);
         const boundSessionFile =
           typeof bindingParent?.sessionFile === "string"
             ? bindingParent.sessionFile
@@ -1177,12 +1142,7 @@ async function loadBoundAuditorVolumes(
               ? header.parentSession
               : undefined;
         if (boundSessionFile !== sessionFile) continue;
-        if (
-          bindingParent !== undefined &&
-          (bindingParent.sessionId !== parentId || attemptEntryIndex < latestParentUserIndex)
-        ) {
-          continue;
-        }
+        if (bindingParent !== undefined && bindingParent.sessionId !== parentId) continue;
         if (bindingParent === undefined && header.parentSession !== sessionFile) continue;
         valid.push({
           entries: entries.slice(start, end),
@@ -1190,8 +1150,8 @@ async function loadBoundAuditorVolumes(
           sessionFile,
           ...(attemptEntryId === undefined ? {} : { attemptEntryId }),
         });
-        // Keep every qualifying interval in the current parent-user range.
-        // A single first-match break drops later same-user summons failures (#636).
+        // Keep every interval bound to this parent. Auditor payload is relayed as
+        // recorded; code does not expire it from later user-message shape (#858).
       }
     }
   }
@@ -1254,16 +1214,6 @@ function providerStopFallbackFromAuditorVolumes(
   return undefined;
 }
 
-/** Recover a provider stop from the auditor child bound to the current parent attempt. */
-export async function readBoundAuditorKnownFailure(
-  sessionFile: string,
-): Promise<RoleTurnKnownFailure | undefined> {
-  const volumes = await loadBoundAuditorVolumes(sessionFile);
-  if (volumes === undefined) return undefined;
-  return complianceFailureFromAuditorVolumes(volumes)
-    ?? providerStopFallbackFromAuditorVolumes(volumes);
-}
-
 /** Strong auditor tier only — retained compliance-failure entries, no provider-stop fallback. */
 async function readBoundAuditorComplianceFailure(
   sessionFile: string,

package/src/reviewer-role.ts

@@ -1,7 +1,7 @@
 import type { RoleHost, HostContext, HostToolResult } from "./host-contracts.ts";
 import { Type } from "typebox";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
-import { withInfrastructureFailureDeclaration } from "./package-contracts/terminating-infrastructure.ts";
+import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 
 import type { AnyCanonicalSkillBinding, CanonicalSkillBinding } from "./canonical-skill-binding.ts";
 export type { CanonicalSkillBinding };
@@ -43,7 +43,7 @@ const reviewerOutputVariants = Type.Union([
     amendments: Type.Optional(reviewerAmendmentsSchema),
   }, { additionalProperties: false }),
 ]);
-export const reviewerOutputSchema = withInfrastructureFailureDeclaration(
+export const reviewerOutputSchema = withTerminatingOutputDeclarations(
   openToolObjectFromUnion(reviewerOutputVariants),
 );
 export type ReviewerRoleDependencies = {

package/src/sitian-appender.ts

@@ -210,6 +210,22 @@ type SitianRecordPath = {
   readonly ledgerHome: string;
 };
 
+/** Sole records leaf under every sitian volume directory. */
+const SITIAN_RECORDS_LEAF = "records.jsonl" as const;
+
+/**
+ * Ticket-provenance under-book paths (docs/dossier-topology.md sole authority).
+ * Writer ticket branch and owner-visible shape share this join — one code path.
+ */
+function ticketProvenanceUnderBookPaths(
+  ledgerHome: string,
+  bookKey: string,
+  ticketId: string,
+): { sessionDir: string; recordFile: string } {
+  const sessionDir = join(activationBookDirectory(ledgerHome, bookKey), ticketId);
+  return { sessionDir, recordFile: join(sessionDir, SITIAN_RECORDS_LEAF) };
+}
+
 /** Pure topology owner shared by ambient writes and explicit-home submission reads. */
 export function resolveSitianRecordPathInLedger(
   input: SitianRecordInput,
@@ -228,13 +244,16 @@ export function resolveSitianRecordPathInLedger(
     : undefined;
 
   let sessionDir: string;
+  let recordFile: string;
   if (ticketNumber !== undefined) {
     // docs/dossier-topology.md: ticket dir holds the unique records.jsonl directly (#900).
-    const bookDir = activationBookDirectory(
+    const paths = ticketProvenanceUnderBookPaths(
       ledgerHome,
       resolveBookKeyFromGit(input.cwd ?? process.cwd()),
+      ticketNumber,
     );
-    sessionDir = join(bookDir, ticketNumber);
+    sessionDir = paths.sessionDir;
+    recordFile = paths.recordFile;
   } else {
     if (
       input.sessionParent === undefined
@@ -244,12 +263,26 @@ export function resolveSitianRecordPathInLedger(
       throw new Error("Sitian record ownership requires a parent session inside the ledger home");
     }
     sessionDir = join(dirname(input.sessionParent), category);
+    recordFile = join(sessionDir, SITIAN_RECORDS_LEAF);
   }
 
-  const recordFile = join(sessionDir, "records.jsonl");
   return { sessionDir, recordFile, ledgerHome };
 }
 
+/**
+ * Owner-visible ticket 起居录 path shape via the writer ticket joins
+ * (ticketProvenanceUnderBookPaths). Ledger leaf is the package-owned `.ak-roles`
+ * name (ADR 0048); variable slots keep owner labels; no fake-home path reverse.
+ */
+export function projectTicketRecordsPathShape(): string {
+  const { recordFile } = ticketProvenanceUnderBookPaths(
+    join("~", ".ak-roles"),
+    "<簿>",
+    "<票号>",
+  );
+  return recordFile.replace(/\\/g, "/");
+}
+
 /** Compute a write destination from ambient ledger topology (ADR 0065). */
 export function resolveSitianRecordPath(input: SitianRecordInput): SitianRecordPath {
   const ledgerHome =

package/src/worker-role.ts

@@ -1,7 +1,7 @@
 import type { RoleHost, HostContext, HostToolResult, HostGatekeeperActions } from "./host-contracts.ts";
 import { Type, type Static } from "typebox";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
-import { withInfrastructureFailureDeclaration } from "./package-contracts/terminating-infrastructure.ts";
+import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 import { CorrectableSubmissionError } from "./submission-correctable-error.ts";
 
 import type {
@@ -73,7 +73,7 @@ const coderOutputVariants = Type.Union([
     })),
   }, { additionalProperties: false }),
 ]);
-export const coderOutputSchema = withInfrastructureFailureDeclaration(
+export const coderOutputSchema = withTerminatingOutputDeclarations(
   openToolObjectFromUnion(coderOutputVariants),
 );
 export type { FixerOutput, CoderOutput };