@akagilnc/pi-workflow-roles 0.1.3652 → 0.1.3663

package/src/public-cli/diarist-run.ts

@@ -24,9 +24,8 @@ import {
   type ParseDiaristArgvResult,
 } from "./invocation.ts";
 import {
-  applyInstructionTicketProbe,
-  probeInstructionTicket,
-  ticketNumberFromProbe,
+  bindReusedTicketNumber,
+  resolveDiaristSummonsTicketNumber,
   tryResumeSameTicketSeatRun,
 } from "./seat-ticket-binding.ts";
 import {
@@ -170,16 +169,15 @@ export async function runPublicDiarist(
   }
 
   // #637: same ticket → resume this seat's prior run with this summons' materials.
-  // Probe captures DiaristTicketResolutionError so admit+beforeDispatch can settle
-  // controlled failure (bare pre-admit throw skips terminal settlement).
+  // #709 / ADR 0081: reuse book records, or take the caller's sole dispatch token
+  // on a first summons that has not yet minted a volume — no seat recognizer call.
   const projectRoot = parsed.project ?? env.cwd;
-  const ticketProbe = await probeInstructionTicket(
-    parsed.instruction,
+  const reusedTicketNumber = await resolveDiaristSummonsTicketNumber({
+    instruction: parsed.instruction,
     projectRoot,
-    env,
-  );
-  const probedTicketNumber = ticketNumberFromProbe(ticketProbe);
-  if (probedTicketNumber !== undefined) {
+    home: env.home,
+  });
+  if (reusedTicketNumber !== undefined) {
     const summons: SameTicketSummonsMaterials = {
       instruction: parsed.instruction,
       instructionEmpty: parsed.instruction.trim() === "",
@@ -189,7 +187,7 @@ export async function runPublicDiarist(
       home: env.home,
       projectRoot,
       role: "diarist",
-      ticketNumber: probedTicketNumber,
+      ticketNumber: reusedTicketNumber,
       freshSummons: env.freshSummons,
       summons,
       resume: (runId, materials) =>
@@ -256,7 +254,7 @@ export async function runPublicDiarist(
     request: turnRequest,
     adapters: diaristAdapters({
       beforeDispatch: async (admittedSeat) => {
-        await applyInstructionTicketProbe(admittedSeat, ticketProbe);
+        await bindReusedTicketNumber(admittedSeat, reusedTicketNumber);
         const sourcesPath = await freezeDiaristSourceCatalog(admittedSeat, env);
         Object.assign(
           turnRequest,

package/src/public-cli/inspector-run.ts

@@ -9,8 +9,8 @@ import type { DurablePrincipalAuthority, RoleTurnRequest } from "../host-contrac
 import { engineSessionMaterialFromOptions } from "../package-resources/engine-material.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import {
-  applyInstructionTicketProbe,
-  probeInstructionTicket,
+  bindReusedTicketNumber,
+  resolveKnownTicketNumber,
   tryResumeSameTicketSeatRun,
 } from "./seat-ticket-binding.ts";
 import {
@@ -88,15 +88,14 @@ export async function runPublicInspector(
   }
 
   // #747: same parent (卷宗指针) → resume prior inspector run with this summons' materials.
-  // Probe captures DiaristTicketResolutionError so admit+beforeDispatch can settle
-  // controlled failure (bare pre-admit throw skips terminal settlement).
+  // #709: ticket identity is reused from records this book already holds — no seat model call.
   // No bare catch→fresh: lookup/resume failures surface; only true absence mints new.
   const projectRoot = parsed.project ?? env.cwd;
-  const ticketProbe = await probeInstructionTicket(
-    parsed.instruction,
+  const reusedTicketNumber = await resolveKnownTicketNumber({
+    instruction: parsed.instruction,
     projectRoot,
-    env,
-  );
+    home: env.home,
+  });
   const parentRunPath = parentRunPathFromGatePointerInstruction(parsed.instruction);
   if (parentRunPath !== undefined) {
     const summons: SameTicketSummonsMaterials = {
@@ -171,8 +170,8 @@ export async function runPublicInspector(
     request: turnRequest,
     adapters: inspectorAdapters({
       beforeDispatch: async (admittedSeat) => {
-        // #635/#637: apply pre-admit probe inside controlled-failure boundary.
-        await applyInstructionTicketProbe(admittedSeat, ticketProbe);
+        // #635/#709: bind the reused identity inside the controlled-failure boundary.
+        await bindReusedTicketNumber(admittedSeat, reusedTicketNumber);
       },
     }),
     ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),

package/src/public-cli/instruction-seat-run.ts

@@ -36,11 +36,9 @@ import {
   type SameTicketSummonsMaterials,
 } from "./run-lifecycle.ts";
 import {
-  applyInstructionTicketProbe,
-  probeInstructionTicket,
-  ticketNumberFromProbe,
+  bindReusedTicketNumber,
+  resolveKnownTicketNumber,
   tryResumeSameTicketSeatRun,
-  type InstructionTicketProbe,
 } from "./seat-ticket-binding.ts";
 import {
   presentStructuralRejection,
@@ -248,11 +246,11 @@ export async function runPublicInstructionSeat(
   let auditorSubject: "judge" | "doctor" | undefined;
   let auditorSourceRun: string | undefined;
   let auditorSourceTicket: number | undefined;
-  let ticketProbe: InstructionTicketProbe | undefined;
+  let reusedTicketNumber: number | undefined;
 
   // #637 / #747: resume prior seat run with this summons' materials.
   // Auditor (#747): parent --source-run path is the lookup key.
-  // Other instruction seats: ticket probe (inspector face). No bare catch→fresh.
+  // Other instruction seats: reuse known ticket (#709). No bare catch→fresh.
   const projectRoot = parsed.project ?? env.cwd;
   if (role === "auditor") {
     if (parsed.subject !== "judge" && parsed.subject !== "doctor") {
@@ -288,12 +286,11 @@ export async function runPublicInstructionSeat(
       return { exitCode: 2 };
     }
   } else {
-    // Inspector face: unconditional probe (same seam as inspector-run.ts).
-    ticketProbe = await probeInstructionTicket(
-      parsed.instruction,
+    reusedTicketNumber = await resolveKnownTicketNumber({
+      instruction: parsed.instruction,
       projectRoot,
-      env,
-    );
+      home: env.home,
+    });
   }
 
   const summons: SameTicketSummonsMaterials = {
@@ -322,26 +319,22 @@ export async function runPublicInstructionSeat(
         }),
     });
     if (resumed !== undefined) return resumed;
-  } else {
-    const probedTicketNumber =
-      ticketProbe === undefined ? undefined : ticketNumberFromProbe(ticketProbe);
-    if (probedTicketNumber !== undefined) {
-      const resumed = await tryResumeSameTicketSeatRun({
-        home: env.home,
-        projectRoot,
-        role,
-        ticketNumber: probedTicketNumber,
-        freshSummons: env.freshSummons,
-        summons,
-        resume: (runId, materials) =>
-          runPublicInstructionSeatResume(
-            { runId, ...(materials === undefined ? {} : { summons: materials }) },
-            env,
-            io,
-          ),
-      });
-      if (resumed !== undefined) return resumed;
-    }
+  } else if (reusedTicketNumber !== undefined) {
+    const resumed = await tryResumeSameTicketSeatRun({
+      home: env.home,
+      projectRoot,
+      role,
+      ticketNumber: reusedTicketNumber,
+      freshSummons: env.freshSummons,
+      summons,
+      resume: (runId, materials) =>
+        runPublicInstructionSeatResume(
+          { runId, ...(materials === undefined ? {} : { summons: materials }) },
+          env,
+          io,
+        ),
+    });
+    if (resumed !== undefined) return resumed;
   }
 
   let admitted: AdmittedInstructionSeatInvocation;
@@ -406,13 +399,13 @@ export async function runPublicInstructionSeat(
         request: turnRequest,
         adapters: instructionSeatAdapters({
           beforeDispatch: async (admittedSeat) => {
-            // #635/#637: ticket bind inside controlled-failure boundary.
+            // #635/#709: ticket bind inside controlled-failure boundary.
             // Auditor inherits source-run ticket (notary face).
-            // Other seats: same applyInstructionTicketProbe as inspector-run.
+            // Other seats: reuse known ticket identity.
             if (auditorSourceTicket !== undefined) {
               await bindAdmittedTicketNumber(admittedSeat, auditorSourceTicket);
-            } else if (ticketProbe !== undefined) {
-              await applyInstructionTicketProbe(admittedSeat, ticketProbe);
+            } else {
+              await bindReusedTicketNumber(admittedSeat, reusedTicketNumber);
             }
           },
         }),

package/src/public-cli/invocation.ts

@@ -105,17 +105,10 @@ export type AdmittedRoleInvocationBase = {
    */
   readonly correlationId?: string;
   /**
-   * Typed ticketNumber after seat LLM bind or notary source-run inheritance (#635).
-   * Admission does not bind from CLI flag or attachment frontmatter.
+   * Typed ticketNumber after known-identity reuse or notary source-run inheritance
+   * (#635 / #709). Admission does not bind from CLI flag or attachment frontmatter.
    */
   readonly ticketNumber?: number;
-  /**
-   * Seat LLM ticket resolution settled as true-unbound (#635).
-   * Distinct from unbound-not-yet-resolved (field absent). Mutually exclusive
-   * with ticketNumber; both are durable one-shot conclusions so auto-resume
-   * and manual resume never re-enter hermes resolution.
-   */
-  readonly ticketResolution?: "true-unbound";
   /** Effective model from invocation identity; restored on resume when no CLI model is given. */
   readonly model?: InvocationEffectiveModel;
 };
@@ -464,8 +457,8 @@ export async function persistAdmittedSourceRunPath(
 /**
  * Bind a post-admission resolved ticketNumber onto the in-memory admitted
  * object and both durable pages (invocation.json + admitted-request.json).
- * Used by seat LLM ticket binding when admission was unbound
- * (#635 / #582 diarist-resolves-ticket-llm-layer). Never clears an existing binding.
+ * Used by known-ticket reuse when admission was unbound (#635 / #709).
+ * Never clears an existing binding.
  */
 export async function bindAdmittedTicketNumber(
   admitted: AdmittedRoleInvocation,
@@ -474,11 +467,6 @@ export async function bindAdmittedTicketNumber(
   if (!Number.isSafeInteger(ticketNumber) || ticketNumber < 1) {
     throw new Error(`bindAdmittedTicketNumber requires a safe positive integer, got ${String(ticketNumber)}`);
   }
-  if (admitted.ticketResolution === "true-unbound") {
-    throw new Error(
-      "bindAdmittedTicketNumber refuses to replace durable true-unbound ticket resolution",
-    );
-  }
   if (admitted.ticketNumber !== undefined) {
     if (admitted.ticketNumber === ticketNumber) return;
     throw new Error(
@@ -499,36 +487,6 @@ export async function bindAdmittedTicketNumber(
   );
 }
 
-/**
- * Persist seat LLM true-unbound conclusion onto in-memory admitted + both durable
- * pages so later auto-resume attempts and manual resume never re-enter hermes (#635).
- */
-export async function recordTrueUnboundTicketResolution(
-  admitted: AdmittedRoleInvocation,
-): Promise<void> {
-  if (admitted.ticketNumber !== undefined) {
-    throw new Error(
-      `recordTrueUnboundTicketResolution refuses to overwrite ticket #${admitted.ticketNumber}`,
-    );
-  }
-  if (admitted.ticketResolution === "true-unbound") return;
-  (admitted as { ticketResolution?: "true-unbound" }).ticketResolution =
-    "true-unbound";
-  await mergeInvocationIdentityPage(admitted.runDirectory, {
-    ticketResolution: "true-unbound",
-  });
-  const admittedPath = admitted.admittedRequestPath;
-  const current = JSON.parse(await readFile(admittedPath, "utf8")) as Record<
-    string,
-    unknown
-  >;
-  await writeFile(
-    admittedPath,
-    `${JSON.stringify({ ...current, ticketResolution: "true-unbound" }, null, 2)}\n`,
-    "utf8",
-  );
-}
-
 /** Add the identity returned by the production Pi launch seam to its existing ledger page. */
 export async function recordLaunchedPiIdentity(
   runDirectory: string,

package/src/public-cli/notary-run.ts

@@ -4,6 +4,9 @@
  * the shared post-admission seam; this module keeps only Notary adapters.
  * #637 / #747: same-parent (--source-run) re-summons resume the seat's previous run.
  */
+import { existsSync } from "node:fs";
+
+import { gateSubmissionCandidatePath } from "../auditor-dossier-tool.ts";
 import type { DurablePrincipalAuthority, RoleTurnRequest } from "../host-contracts.ts";
 import {
   NotarySourceRunError,
@@ -26,6 +29,7 @@ import {
   resumeTurnRequestProjectionOptions,
 } from "./post-admission.ts";
 import {
+  appendResumeMaterialReread,
   loadResumableNotaryRun,
   markRunAdmitted,
   type PublicResumeRequest,
@@ -234,13 +238,21 @@ export async function runPublicNotaryResume(
       }
       return loaded;
     },
-    buildTurnRequest: (admitted, effective) =>
-      // #755: review continuation is plain dialogue / resume envelope — no
-      //「重新读」candidate line, no engine handbook packaging.
-      buildNotaryTurnRequest(
+    buildTurnRequest: (admitted, effective) => {
+      const projection = resumeTurnRequestProjectionOptions(
         admitted,
-        resumeTurnRequestProjectionOptions(admitted, effective, env),
-      ),
+        effective,
+        env,
+      );
+      const candidatePath = gateSubmissionCandidatePath(admitted.sourceRunPath);
+      const prompt = existsSync(candidatePath)
+        ? appendResumeMaterialReread(projection.continuation.prompt, candidatePath)
+        : projection.continuation.prompt;
+      return buildNotaryTurnRequest(admitted, {
+        ...projection,
+        continuation: { kind: "resume", prompt },
+      });
+    },
     adapters: notaryAdapters(),
     ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
   });

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

@@ -11,7 +11,7 @@ import { isAbsolute, join, resolve } from "node:path";
 
 import {
   buildResumeContinuationPrompt,
-  RESUME_TRANSPORT_ENVELOPE,
+  instructResumeHandbookRead,
   type PublicResumeRequest,
   type SameTicketSummonsMaterials,
 } from "./run-lifecycle.ts";
@@ -22,17 +22,31 @@ import {
   freezeAttachmentsIntoRun,
 } from "./invocation.ts";
 import { pathContainedIn } from "../activation-ledger-topology.ts";
+import { engineSessionMaterialFromOptions } from "../package-resources/engine-material.ts";
 
 import type {
   ControlledFailureCause,
   DurablePrincipal,
   DurablePrincipalAuthority,
+  RoleTurnContinuation,
   RoleTurnHost,
   RoleTurnKnownFailure,
   RoleTurnRequest,
   RoleTurnResult,
   SessionCustomEntryAppender,
 } from "../host-contracts.ts";
+import { projectCaseDossierPointerSection } from "./case-dossier-delivery.ts";
+
+/** 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 };
+}
 import { projectHostTransitionPriorNative } from "../host-transition-prior-native.ts";
 import type { CredentialProviders, SeatModelConfig } from "./config.ts";
 import {
@@ -297,10 +311,10 @@ export async function dispatchPostAdmissionTurn<
       admitted.principal === undefined
         ? undefined
         : env.principalAuthority.decode(admitted.principal);
-    let turnRequest: RoleTurnRequest;
+    let hostTransition: RoleTurnRequest["hostTransition"];
     try {
       previousHost = await readInvocationHost(admitted.runDirectory);
-      const hostTransition =
+      hostTransition =
         previousHost !== undefined && liveHost !== undefined && principalCoordinates !== undefined
           ? await projectHostTransitionPriorNative({
               previousHost,
@@ -308,10 +322,6 @@ export async function dispatchPostAdmissionTurn<
               piSessionFile: principalCoordinates.sessionFile,
             })
           : undefined;
-      turnRequest = env.signal === undefined ? request : { ...request, signal: env.signal };
-      if (hostTransition !== undefined) {
-        turnRequest = { ...turnRequest, hostTransition };
-      }
     } catch (error) {
       // prior-native IO is on the public one-shot path — controlled failure, not bare throw.
       return (await presentControlledFailure(
@@ -351,6 +361,32 @@ export async function dispatchPostAdmissionTurn<
       }
     }
 
+    // Turn request is assembled after beforeDispatch so this turn sees whatever it
+    // settled — the seat's ticket bind re-projection. Case dossier delivery
+    // (ADR 0081) rides here for every public entry: first call, same-ticket
+    // re-summons and manual resume alike. System refs append their own neutral
+    // section; caller frozen attachments and the seat's own prompt bytes are
+    // never rewritten.
+    let turnRequest: RoleTurnRequest =
+      env.signal === undefined ? request : { ...request, signal: env.signal };
+    if (hostTransition !== undefined) {
+      turnRequest = { ...turnRequest, hostTransition };
+    }
+    const dossierSection = await projectCaseDossierPointerSection({
+      ticketNumber: admitted.ticketNumber,
+      projectRoot: admitted.projectRoot,
+      home: env.home,
+    });
+    if (dossierSection !== undefined) {
+      turnRequest = {
+        ...turnRequest,
+        continuation: appendContinuationSection(
+          turnRequest.continuation,
+          dossierSection,
+        ),
+      };
+    }
+
     let result: RoleTurnResult;
     try {
       result = await env.roleTurnHost.executeTurn(turnRequest);
@@ -458,18 +494,15 @@ export async function dispatchPostAdmissionTurn<
 }
 
 /**
- * Shared resume continuation projection (#471 / #600 / #633 / #637 / #755):
- * seat-table model/engine/timeout axes, restored correlation, and either
- * - manual resume (no same-ticket summons): package envelope / optional caller
- *   message, with engine-axis handbook via buildResumeContinuationPrompt, or
- * - same-ticket summons (审核循环续话): caller/peer words + optional frozen
- *   attachment paths only — no「重新读」、no engine handbook packaging
- *   (#750/#755), whether or not attachments are present.
- * Caller message wins as prompt base when supplied (bytes unchanged, including
- * blank/whitespace); else summons instruction. Attachment projection must not
- * re-interpret the caller message as instructionEmpty.
+ * Shared resume continuation projection (#471 / #600 / #633 / #637): seat-table
+ * model/engine/timeout axes, restored correlation, and either
+ * - manual resume: package envelope / optional caller message (unchanged), or
+ * - same-ticket summons: this turn's instruction + frozen attachment paths.
+ * Caller message and summons materials each keep their place: a resume message
+ * keeps manual-resume prompt semantics while open-court frozen attachments still
+ * ride; summons instruction is only the prompt base when no caller message.
  * Seats add only their activation projection. Call prepareSummonsResumeMaterials
- * first when request.summons carries instruction or attachment paths.
+ * first when request.summons carries attachment paths.
  */
 export function resumeTurnRequestProjectionOptions(
   admitted: AdmittedRoleInvocation,
@@ -481,21 +514,32 @@ export function resumeTurnRequestProjectionOptions(
     readonly attachments: readonly { frozenPath: string }[];
   },
 ): RoleTurnRequestProjectionOptions {
+  const engineMaterial = engineSessionMaterialFromOptions({
+    ...(env.engine === undefined ? {} : { engine: env.engine }),
+    packageRoot: env.packageRoot,
+  });
   let prompt: string;
   if (request.message !== undefined) {
-    if (summonsPrepared !== undefined) {
-      // #755: same-ticket review / open-court — caller words + optional paths.
-      // Attachments are not a gate: message-only summons must stay plain too.
-      prompt = buildInstructionTransportPrompt({
-        instruction: request.message,
-        instructionEmpty: false,
-        attachments: summonsPrepared.attachments,
-      });
-    } else if (request.summons !== undefined) {
-      // #755: same-ticket summons without prepared materials — caller words only.
-      prompt = request.message;
+    // Manual resume caller-message semantics stay authoritative for the prompt:
+    // message present → base bytes unchanged (including blank/whitespace).
+    // Open-court frozen attachments still continue when present; attachment
+    // projection must not re-interpret the caller message as instructionEmpty.
+    if (
+      summonsPrepared !== undefined &&
+      summonsPrepared.attachments.length > 0
+    ) {
+      prompt = instructResumeHandbookRead(
+        buildInstructionTransportPrompt(
+          {
+            instruction: request.message,
+            instructionEmpty: false,
+            attachments: summonsPrepared.attachments,
+          },
+          engineMaterial,
+        ),
+        engineMaterial,
+      );
     } else {
-      // Bare manual resume — outsourcing engine axis keeps handbook (#600/#736).
       prompt = buildResumeContinuationPrompt({
         packageRoot: env.packageRoot,
         ...(env.engine === undefined ? {} : { engine: env.engine }),
@@ -503,14 +547,11 @@ export function resumeTurnRequestProjectionOptions(
       });
     }
   } else if (summonsPrepared !== undefined) {
-    // #755: same-ticket review summons — instruction/attachments only.
-    prompt = buildInstructionTransportPrompt(summonsPrepared);
-  } else if (request.summons !== undefined) {
-    // #755: same-ticket summons with no instruction/attachments (e.g. notary
-    // source-run pointer) — plain resume envelope, no handbook / 重新读.
-    prompt = RESUME_TRANSPORT_ENVELOPE;
+    prompt = instructResumeHandbookRead(
+      buildInstructionTransportPrompt(summonsPrepared, engineMaterial),
+      engineMaterial,
+    );
   } else {
-    // Bare manual resume — outsourcing engine axis keeps handbook (#600/#736).
     prompt = buildResumeContinuationPrompt({
       packageRoot: env.packageRoot,
       ...(env.engine === undefined ? {} : { engine: env.engine }),