@akagilnc/pi-workflow-roles 0.1.4035 → 0.1.4193

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

@@ -12,6 +12,7 @@ import {
   admitDiaristInvocation,
   bindAdmittedTicketNumber,
   buildInstructionTransportPrompt,
+  relocateAdmittedRunToTicket,
   type AdmittedDiaristInvocation,
   type ParseDiaristArgvResult,
 } from "./invocation.ts";
@@ -27,6 +28,7 @@ import {
   loadResumableDiaristRun,
   markRunAdmitted,
   type PublicResumeRequest,
+  type RunWriterLease,
   type SameTicketSummonsMaterials,
 } from "./run-lifecycle.ts";
 import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.ts";
@@ -40,7 +42,7 @@ import {
   projectRoleTurnRequest,
   type RoleTurnRequestProjectionOptions,
 } from "./turn-request.ts";
-import { readRunTicketNumber } from "../run-ticket-number.ts";
+import { readBoardTicketNumber } from "../run-ticket-number.ts";
 
 export type DiaristRunEnv = PostAdmissionEnv & {
   principalAuthority: DurablePrincipalAuthority;
@@ -66,11 +68,38 @@ export function buildDiaristTurnRequest(
   );
 }
 
-function diaristAdapters(): PostAdmissionAdapters<AdmittedDiaristInvocation> {
+/**
+ * Board-bound ticket on pages → memory bind + unbound→ticket relocate under lease.
+ * Shared by resume (interrupted board-bound unbound) and post-turn first assert.
+ */
+async function bindAndRelocateDiaristIfBoardBound(
+  admitted: AdmittedDiaristInvocation,
+  authority: DiaristRunEnv["principalAuthority"],
+  lease: RunWriterLease,
+): Promise<void> {
+  const boardTicket = await readBoardTicketNumber(admitted.runDirectory);
+  if (boardTicket === undefined) return;
+  if (admitted.ticketNumber === undefined) {
+    await bindAdmittedTicketNumber(admitted, boardTicket);
+  }
+  await relocateAdmittedRunToTicket(admitted, authority, lease);
+}
+
+function diaristAdapters(
+  env: DiaristRunEnv,
+): PostAdmissionAdapters<AdmittedDiaristInvocation> {
   return {
     trySettle: (admitted, authority, scope) =>
       trySettleDiaristTerminalResult(admitted, authority, scope),
     shouldPresentSettled: () => true,
+    // Resume interrupted state: board ticket already on pages, run still under unbound/.
+    beforeDispatch: async (admitted, lease) => {
+      await bindAndRelocateDiaristIfBoardBound(admitted, env.principalAuthority, lease);
+    },
+    // First post-turn assert: accept hook wrote board pages; relocate before lease release.
+    afterDispatch: async (admitted, lease) => {
+      await bindAndRelocateDiaristIfBoardBound(admitted, env.principalAuthority, lease);
+    },
   };
 }
 
@@ -141,6 +170,7 @@ export async function runPublicDiarist(
       ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
       ...(env.model === undefined ? {} : { model: env.model }),
       ...(env.correlationId === undefined ? {} : { correlationId: env.correlationId }),
+      ...(handoffTicket === undefined ? {} : { assertedTicketNumber: handoffTicket }),
     });
   } catch (error) {
     if (error instanceof CliUsageError) {
@@ -152,14 +182,6 @@ export async function runPublicDiarist(
 
   await markRunAdmitted(admitted, env.principalAuthority);
 
-  // Typed handoff: bind before the turn so identity is on durable pages.
-  if (
-    typeof handoffTicket === "number" &&
-    Number.isSafeInteger(handoffTicket) &&
-    handoffTicket >= 1
-  ) {
-    await bindAdmittedTicketNumber(admitted, handoffTicket);
-  }
 
   const turnProjection: RoleTurnRequestProjectionOptions = {
     packageRoot: env.packageRoot,
@@ -189,22 +211,8 @@ export async function runPublicDiarist(
     env,
     io,
     request: turnRequest,
-    adapters: diaristAdapters(),
+    adapters: diaristAdapters(env),
     ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
-  }).then(async (result) => {
-    // Accept hook binds ticket onto durable pages (#771). Mirror that page fact
-    // onto the caller-visible admitted object — never pick a ticketNumber out of
-    // the payload sequence (#881 sole-collapse ban on ticket/escalate).
-    if (admitted.ticketNumber === undefined && result.admitted !== undefined) {
-      const fromPages = await readRunTicketNumber(admitted.runDirectory);
-      if (fromPages !== undefined) {
-        await bindAdmittedTicketNumber(admitted, fromPages);
-        if (result.admitted.ticketNumber === undefined) {
-          (result.admitted as { ticketNumber?: number }).ticketNumber = fromPages;
-        }
-      }
-    }
-    return result;
   });
 }
 
@@ -242,7 +250,7 @@ export async function runPublicDiaristResume(
         ),
       );
     },
-    adapters: diaristAdapters(),
+    adapters: diaristAdapters(env),
     ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
   });
 }

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

@@ -12,6 +12,7 @@ import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.ts";
 import {
   admitInspectorInvocation,
   buildInspectorTransportPrompt,
+  persistAdmittedSourceRunPath,
   type AdmittedInspectorInvocation,
   type ParseInspectorArgvResult,
 } from "./invocation.ts";
@@ -50,18 +51,35 @@ export type InspectorRunEnv = PostAdmissionEnv & {
    * Never a public CLI argv — must not pollute the 卷宗指针 parentRunPath key (#747).
    */
   reviewReask?: string;
+  /**
+   * #879 gate summons: verbatim parent-submission body for officer dialogue content.
+   * Rides summons.instruction / first-mint prompt when reviewReask is absent.
+   * Argv 卷宗指针 stays the binding/lookup key only.
+   */
+  gateReviewInstruction?: string;
 };
 
+function inspectorParentRunPath(
+  admitted: AdmittedInspectorInvocation,
+): string | undefined {
+  if (typeof admitted.sourceRunPath === "string" && admitted.sourceRunPath.trim() !== "") {
+    return admitted.sourceRunPath;
+  }
+  return parentRunPathFromGatePointerInstruction(admitted.instruction);
+}
+
 /** Project admitted invocation onto the host-neutral turn request. */
 export function buildInspectorTurnRequest(
   admitted: AdmittedInspectorInvocation,
   options: RoleTurnRequestProjectionOptions,
 ): RoleTurnRequest {
+  const sourceRun = inspectorParentRunPath(admitted);
   return projectRoleTurnRequest(
     admitted,
     {
       activation: {
         role: "inspector" as const,
+        ...(sourceRun === undefined ? {} : { sourceRun }),
       },
     },
     options,
@@ -97,7 +115,7 @@ export async function runPublicInspector(
   // #753/#786: gate re-ask / verbatim submission body ride summons.instruction on resume.
   const parentRunPath = parentRunPathFromGatePointerInstruction(parsed.instruction);
   if (parentRunPath !== undefined) {
-    const resumeInstruction = env.reviewReask;
+    const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
     const summons: SameTicketSummonsMaterials = {
       sourceRunPath: parentRunPath,
       ...(resumeInstruction === undefined
@@ -147,6 +165,10 @@ export async function runPublicInspector(
   }
 
   await markRunAdmitted(admitted, env.principalAuthority);
+  if (parentRunPath !== undefined) {
+    await persistAdmittedSourceRunPath(admitted, parentRunPath);
+    admitted = { ...admitted, sourceRunPath: parentRunPath };
+  }
 
   const engineMaterial = engineSessionMaterialFromOptions({
     ...pickEngineAxis(env),
@@ -164,7 +186,9 @@ export async function runPublicInspector(
       : { correlationId: env.correlationId }),
     continuation: {
       kind: "initial",
-      prompt: buildInspectorTransportPrompt(admitted, engineMaterial),
+      // #879: gate first mint uses parent payload as content; binding stays typed activation.
+      prompt: (env.reviewReask ?? env.gateReviewInstruction)
+        ?? buildInspectorTransportPrompt(admitted, engineMaterial),
     },
   });
 

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

@@ -7,13 +7,12 @@
  */
 import type { DurablePrincipalAuthority, RoleTurnRequest } from "../host-contracts.ts";
 import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.ts";
-import { readRunTicketNumber } from "../run-ticket-number.ts";
+import { readBoardTicketNumber } from "../run-ticket-number.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import {
   admitAuditorInvocation,
   admitGatekeeperInvocation,
   admitNavigatorInvocation,
-  bindAdmittedTicketNumber,
   buildInstructionTransportPrompt,
   persistAdmittedSourceRunPath,
   type AdmittedAuditorInvocation,
@@ -69,6 +68,11 @@ export type InstructionSeatRunEnv = PostAdmissionEnv & {
    * Never a public CLI argv — must not pollute the --source-run parent lookup key (#747).
    */
   reviewReask?: string;
+  /**
+   * #879 gate summons: verbatim parent-submission body for officer dialogue content.
+   * Rides summons.instruction / first-mint prompt when reviewReask is absent.
+   */
+  gateReviewInstruction?: string;
 };
 
 /** Project an admitted instruction-seat invocation onto the host-neutral turn request. */
@@ -281,7 +285,8 @@ export async function runPublicInstructionSeat(
         home: env.home,
       });
       auditorSourceRun = resolved.runDirectory;
-      auditorSourceTicket = await readRunTicketNumber(resolved.runDirectory);
+      // Auditor inherits board identity only — migration-derived is display, not admission.
+      auditorSourceTicket = await readBoardTicketNumber(resolved.runDirectory);
     } catch (error) {
       presentStructuralRejection(
         new CliUsageError(error instanceof Error ? error.message : String(error)),
@@ -291,8 +296,9 @@ export async function runPublicInstructionSeat(
     }
   }
 
-  // #756/#786: auditor reask / verbatim submission body ride summons.instruction on resume.
-  const resumeInstruction = env.reviewReask;
+  // #756/#879: auditor reask / verbatim submission body ride summons.instruction.
+  // Binding pointer stays --source-run / argv 卷宗指针; content is body or reask.
+  const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
   const summons: SameTicketSummonsMaterials = {
     ...(resumeInstruction === undefined
       ? {
@@ -339,6 +345,9 @@ export async function runPublicInstructionSeat(
       ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
       ...(env.model === undefined ? {} : { model: env.model }),
       ...(env.correlationId === undefined ? {} : { correlationId: env.correlationId }),
+      ...(auditorSourceTicket === undefined
+        ? {}
+        : { assertedTicketNumber: auditorSourceTicket }),
     });
   } catch (error) {
     if (error instanceof CliUsageError) {
@@ -372,13 +381,15 @@ export async function runPublicInstructionSeat(
           : { correlationId: env.correlationId }),
         continuation: {
           kind: "initial",
-          prompt: buildInstructionTransportPrompt(
-            admitted,
-            engineSessionMaterialFromOptions({
-              ...pickEngineAxis(env),
-              packageRoot: env.packageRoot,
-            }),
-          ),
+          // #879: gate first mint uses parent payload as content when present.
+          prompt: (env.reviewReask ?? env.gateReviewInstruction)
+            ?? buildInstructionTransportPrompt(
+              admitted,
+              engineSessionMaterialFromOptions({
+                ...pickEngineAxis(env),
+                packageRoot: env.packageRoot,
+              }),
+            ),
         },
       });
 
@@ -387,14 +398,7 @@ export async function runPublicInstructionSeat(
         env,
         io,
         request: turnRequest,
-        adapters: instructionSeatAdapters({
-          beforeDispatch: async (admittedSeat) => {
-            // Auditor inherits source-run ticket (notary face) — typed, not prose match.
-            if (auditorSourceTicket !== undefined) {
-              await bindAdmittedTicketNumber(admittedSeat, auditorSourceTicket);
-            }
-          },
-        }),
+        adapters: instructionSeatAdapters(),
         ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
       });
     },