@akagilnc/pi-workflow-roles 0.1.3661 → 0.1.3663

package/dist/public-cli/notary-run.js

@@ -1,10 +1,18 @@
+/**
+ * Public Notary Role run: admit source-run locator → shared post-admission coordinator
+ * → settle Terminal result (#448 / #517). Zero caller prompt/attachment. Lifecycle is
+ * 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.js";
 import { NotarySourceRunError, resolveNotarySourceRunLocator, } from "../notary-source-run.js";
 import { engineSessionMaterialFromOptions } from "../package-resources/engine-material.js";
 import { CliUsageError } from "./cli-errors.js";
 import { admitNotaryInvocation, buildNotaryTransportPrompt, } from "./invocation.js";
 import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.js";
 import { runPostAdmissionOneShot, runPostAdmissionSeatResume, resumeTurnRequestProjectionOptions, } from "./post-admission.js";
-import { loadResumableNotaryRun, markRunAdmitted, } from "./run-lifecycle.js";
+import { appendResumeMaterialReread, loadResumableNotaryRun, markRunAdmitted, } from "./run-lifecycle.js";
 import { presentStructuralRejection, trySettleNotaryTerminalResult, } from "./settlement.js";
 import { projectRoleTurnRequest, } from "./turn-request.js";
 /** Project admitted invocation onto the host-neutral turn request. */
@@ -153,10 +161,17 @@ export async function runPublicNotaryResume(request, env, io) {
             }
             return loaded;
         },
-        buildTurnRequest: (admitted, effective) => 
-        // #755: review continuation is plain dialogue / resume envelope — no
-        //「重新读」candidate line, no engine handbook packaging.
-        buildNotaryTurnRequest(admitted, resumeTurnRequestProjectionOptions(admitted, effective, env)),
+        buildTurnRequest: (admitted, effective) => {
+            const projection = resumeTurnRequestProjectionOptions(admitted, 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/dist/public-cli/post-admission.js

@@ -8,10 +8,11 @@
 import { randomUUID } from "node:crypto";
 import { readFile, writeFile } from "node:fs/promises";
 import { isAbsolute, join, resolve } from "node:path";
-import { buildResumeContinuationPrompt, RESUME_TRANSPORT_ENVELOPE, } from "./run-lifecycle.js";
+import { buildResumeContinuationPrompt, instructResumeHandbookRead, } from "./run-lifecycle.js";
 import { CliUsageError } from "./cli-errors.js";
 import { buildInstructionTransportPrompt, freezeAttachmentsIntoRun, } from "./invocation.js";
 import { pathContainedIn } from "../activation-ledger-topology.js";
+import { engineSessionMaterialFromOptions } from "../package-resources/engine-material.js";
 import { projectCaseDossierPointerSection } from "./case-dossier-delivery.js";
 /** Append one system section to a continuation prompt, keeping its kind. */
 function appendContinuationSection(continuation, section) {
@@ -258,37 +259,36 @@ export async function dispatchPostAdmissionTurn(input) {
     }
 }
 /**
- * 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, request, env, summonsPrepared) {
+    const engineMaterial = engineSessionMaterialFromOptions({
+        ...(env.engine === undefined ? {} : { engine: env.engine }),
+        packageRoot: env.packageRoot,
+    });
     let prompt;
     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({
+        // 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,
-            });
-        }
-        else if (request.summons !== undefined) {
-            // #755: same-ticket summons without prepared materials — caller words only.
-            prompt = request.message;
+            }, engineMaterial), engineMaterial);
         }
         else {
-            // Bare manual resume — outsourcing engine axis keeps handbook (#600/#736).
             prompt = buildResumeContinuationPrompt({
                 packageRoot: env.packageRoot,
                 ...(env.engine === undefined ? {} : { engine: env.engine }),
@@ -297,16 +297,9 @@ export function resumeTurnRequestProjectionOptions(admitted, request, env, summo
         }
     }
     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 }),

package/dist/public-cli/run-lifecycle.js

@@ -32,10 +32,11 @@ function resumeRereadInstruction(materialPath, handbook) {
         : `重新读 ${materialPath}`;
 }
 /**
- * Engine-axis resume-only material lines (#736 / ADR 0069·0071).
- * #755 withdrew this rewrite from 审核循环续话; review same-ticket resume stays
- * plain dialogue via resumeTurnRequestProjectionOptions. Outsourcing resume
- * still rewrites neutral handbook/path pointers into 重新读 instructions.
+ * Resume-only material lines (#736 ticket exemption to ADR 0073 §3).
+ * Neutral `- <absolute path>` pointers already on the continuation
+ * (handbook from appendEngineSessionMaterial; frozen attachments from
+ * instruction-seat transport) become reread instructions.
+ * Handbook keeps the argv suffix; other materials are path-only.
  * First-round delivery is unchanged; never pastes material body.
  */
 export function instructResumeHandbookRead(prompt, engineMaterial) {
@@ -55,9 +56,16 @@ export function instructResumeHandbookRead(prompt, engineMaterial) {
     })
         .join("\n");
 }
+/** Append a live-path reread instruction when the pointer is not already on the continuation. */
+export function appendResumeMaterialReread(prompt, materialPath) {
+    const instruction = resumeRereadInstruction(materialPath, false);
+    const lines = prompt.split("\n");
+    if (lines.includes(instruction))
+        return prompt;
+    return prompt.length === 0 ? instruction : `${prompt}\n${instruction}`;
+}
 /**
- * Unique continuation-prompt selector for manual/auto engine-axis resume
- * (#471 / #600 / #736). Not used for 审核循环 same-ticket summons (#755).
+ * Unique continuation-prompt selector for manual/auto resume (#471 / #600 / #736).
  * Message present → base bytes unchanged; absent → package transport envelope.
  * When engine material is present, append structured engine coordinates then
  * rewrite absolute material pointer lines into 重新读 instructions. Zero parse,

package/package.json

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

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,6 +22,7 @@ import {
   freezeAttachmentsIntoRun,
 } from "./invocation.ts";
 import { pathContainedIn } from "../activation-ledger-topology.ts";
+import { engineSessionMaterialFromOptions } from "../package-resources/engine-material.ts";
 
 import type {
   ControlledFailureCause,
@@ -493,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,
@@ -516,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 }),
@@ -538,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 }),

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

@@ -163,10 +163,11 @@ function resumeRereadInstruction(materialPath: string, handbook: boolean): strin
 }
 
 /**
- * Engine-axis resume-only material lines (#736 / ADR 0069·0071).
- * #755 withdrew this rewrite from 审核循环续话; review same-ticket resume stays
- * plain dialogue via resumeTurnRequestProjectionOptions. Outsourcing resume
- * still rewrites neutral handbook/path pointers into 重新读 instructions.
+ * Resume-only material lines (#736 ticket exemption to ADR 0073 §3).
+ * Neutral `- <absolute path>` pointers already on the continuation
+ * (handbook from appendEngineSessionMaterial; frozen attachments from
+ * instruction-seat transport) become reread instructions.
+ * Handbook keeps the argv suffix; other materials are path-only.
  * First-round delivery is unchanged; never pastes material body.
  */
 export function instructResumeHandbookRead(
@@ -188,9 +189,19 @@ export function instructResumeHandbookRead(
     .join("\n");
 }
 
+/** Append a live-path reread instruction when the pointer is not already on the continuation. */
+export function appendResumeMaterialReread(
+  prompt: string,
+  materialPath: string,
+): string {
+  const instruction = resumeRereadInstruction(materialPath, false);
+  const lines = prompt.split("\n");
+  if (lines.includes(instruction)) return prompt;
+  return prompt.length === 0 ? instruction : `${prompt}\n${instruction}`;
+}
+
 /**
- * Unique continuation-prompt selector for manual/auto engine-axis resume
- * (#471 / #600 / #736). Not used for 审核循环 same-ticket summons (#755).
+ * Unique continuation-prompt selector for manual/auto resume (#471 / #600 / #736).
  * Message present → base bytes unchanged; absent → package transport envelope.
  * When engine material is present, append structured engine coordinates then
  * rewrite absolute material pointer lines into 重新读 instructions. Zero parse,