@akagilnc/pi-workflow-roles 0.1.5756 → 0.1.5775

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

@@ -86,15 +86,6 @@ export type RoleRunRecord = {
   readonly phase?: CoderPhase | FixerPhase;
 };
 
-/**
- * Package-owned non-empty Chinese neutral resume transport (#959 / ADR 0073).
- * Used by:
- *   - auto-resume (all seats via buildAutoResumeContinuationPrompt) — required so
- *     hosts that reject empty stdin (codex) still receive a prompt.
- * Public manual resume forwards only the caller's bytes (#987).
- */
-export const RESUME_TRANSPORT_ENVELOPE = "继续。" as const;
-
 /** Public manual resume request after the unique CLI parser owns runId + optional message. */
 export type PublicResumeRequest = {
   readonly runId: string;
@@ -139,16 +130,6 @@ export type SameTicketSummonsMaterials = {
   readonly sourceRun?: NotarySourceRunLocator;
 };
 
-/**
- * Auto-resume continuation only (#959 / ADR 0080).
- * Always non-empty Chinese neutral envelope. Engine / outsourcing material
- * rides startup readingMaterial (#1167), never this continuation.
- * Never call this from manual `ak-role resume`.
- */
-export function buildAutoResumeContinuationPrompt(): string {
-  return RESUME_TRANSPORT_ENVELOPE;
-}
-
 const WRITER_LOCK_FILE = "writer.lock";
 
 export async function writeRoleRunState(

package/src/public-role-summons.ts

@@ -723,21 +723,19 @@ export async function summonGateOfficer(options: {
   }
   // Officer host is seat-owned only (#821), not a parent override channel.
   // #879: binding pointer = parent run directory; dialogue content = submission body.
-  // Conclusion re-ask keeps sole ownership of reviewReask when present.
-  // #1195 ticket-court notary (countersign source): do not preload the parent body.
-  // Identity binds via --source-run; the notary reads the ticket and verdict itself
-  // and its dispatch comes from resolveReviewSeatDialogueBody.
-  // Other officers / non-countersign sources still receive the parent submission body.
+  // Conclusion re-ask owns reviewReask when present (no parallel gate body).
+  // #1208: notary never preloads parent body; review dialogue is the fixed
+  // dispatch from resolveReviewSeatDialogueBody. Named operational reasks
+  // ride reviewReask here (or the resume message seam elsewhere). Other
+  // officers still receive the parent submission body when reask is absent.
   let gateReviewInstruction: string | undefined;
-  if (options.reask === undefined && options.submission !== undefined) {
-    const { isTicketCourtCountersignSource } = await import("./run-terminal-artifacts.ts");
-    const blindTicketCourt =
-      options.officer === "notary"
-      && isTicketCourtCountersignSource(options.sourceRunDirectory);
-    if (!blindTicketCourt) {
-      const { readableGateItem } = await import("./readable-gate-item.ts");
-      gateReviewInstruction = readableGateItem(options.submission);
-    }
+  if (
+    options.reask === undefined
+    && options.submission !== undefined
+    && options.officer !== "notary"
+  ) {
+    const { readableGateItem } = await import("./readable-gate-item.ts");
+    gateReviewInstruction = readableGateItem(options.submission);
   }
   const { runIdFromRunDirectory } = await import("./run-terminal-artifacts.ts");
   const parentRunId = runIdFromRunDirectory(options.sourceRunDirectory);
@@ -805,8 +803,21 @@ export async function summonGateOfficer(options: {
       ? (options.submission as { ticketNumber?: unknown }).ticketNumber
       : undefined;
     const courtTicket = isSafePositiveTicketNumber(submittedTicket) ? submittedTicket : parentTicket;
-    // Argv instruction = reask or parent payload bytes only (never a fabricated line).
-    const instruction = options.reask ?? gateReviewInstruction ?? "";
+    // #1208 C1: argv dialogue from the same shared resolver as every other seat
+    // (never a parallel reask/gate/empty choice here). Request-field wiring of
+    // reviewReask / gateReviewInstruction onto env stays field assembly only.
+    // Terminal "" only when the resolver itself has no body — not a third source.
+    const { resolveReviewSeatDialogueBody } = await import("./public-cli/instruction-seat-run.ts");
+    const instruction =
+      (await resolveReviewSeatDialogueBody({
+        role: options.officer,
+        ...(options.reask === undefined ? {} : { reviewReask: options.reask }),
+        ...(gateReviewInstruction === undefined
+          ? {}
+          : { gateReviewInstruction }),
+        projectRoot: options.cwd,
+        home,
+      })) ?? "";
     return summonPublicRole({
       role: options.officer,
       argv: ["--project", options.cwd, "--", instruction],

package/src/role-runtime.ts

@@ -1078,6 +1078,8 @@ export function createRoleRuntimeExtension(
     // #1132: one ceiling for this turn, closed over from the execution seam.
     let receiptDelivery = createReceiptDeliveryPolicy(deliveryLimit);
     let noReceiptRecorded = false;
+    /** #1208: this-turn dialogue bytes from before_agent_start for receipt催交 resend. */
+    let turnDialoguePrompt: string | undefined;
     /** Envelope-owned: abort/teardown attendance without re-blocking the parent court (#959). */
     const disposeNavigatorAttendanceNonBlocking = (
       attendance: NavigatorAttendanceDependency | undefined,
@@ -1182,6 +1184,8 @@ export function createRoleRuntimeExtension(
     roleHost.on("before_agent_start", async (event, ctx) => {
       const role = roleHost.getFlag(ROLE_FLAG.name);
       const prompt = event.prompt;
+      // #1208: each before_agent_start carries this turn's actual prompt (incl. empty).
+      if (typeof prompt === "string") turnDialoguePrompt = prompt;
       if (role === undefined) return;
       if (!admitted || selectedRole !== role) {
         failInfrastructure(new ActivationBarrierError(role), ctx);
@@ -1373,6 +1377,7 @@ export function createRoleRuntimeExtension(
         receiptDelivery.recordDeliveryRequest();
         // Keep the package-owned continuation off the public input lifecycle:
         // receipt delivery must not be mistaken for later caller input.
+        // #1208: resend this turn's actual dialogue; stats stay on policy/lifecycle.
         const scopeId = ctx.invocationScopeId?.trim() ?? "";
         envelopeHost.appendEntry(
           RECEIPT_DELIVERY_REQUEST_ENTRY,
@@ -1388,7 +1393,7 @@ export function createRoleRuntimeExtension(
         });
         envelopeHost.sendMessage({
           customType: "ak-receipt-delivery-prompt",
-          content: JSON.stringify(receiptDelivery.deliveryState()),
+          content: turnDialoguePrompt ?? "",
           display: false,
         }, { triggerTurn: true, deliverAs: "followUp" });
       } else if (receiptDelivery.nextAction() === "no-receipt" && !noReceiptRecorded) {
@@ -1644,6 +1649,7 @@ export function createRoleRuntimeExtension(
       activeCollector = undefined;
       receiptDelivery = createReceiptDeliveryPolicy(deliveryLimit);
       noReceiptRecorded = false;
+      turnDialoguePrompt = undefined;
       pendingNavigatorPresentation = undefined;
       navigatorActivation += 1;
       navigatorDeliveryClosed = false;

package/src/run-terminal-artifacts.ts

@@ -125,10 +125,3 @@ export function roleFromRunDirectory(runDirectory: string): string | undefined {
   return parseRunLeaf(basename(runDirectory))?.role;
 }
 
-/**
- * #1195 ticket-court blind review: notary source is a countersign run.
- * Identity still binds; countersign body is not preloaded into dialogue.
- */
-export function isTicketCourtCountersignSource(runDirectory: string): boolean {
-  return roleFromRunDirectory(runDirectory) === "countersign";
-}