@akagilnc/pi-workflow-roles 0.1.5583 → 0.1.5593

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

@@ -7,7 +7,6 @@
  */
 import { randomUUID } from "node:crypto";
 import { writeFile } from "node:fs/promises";
-import { isAbsolute, join, resolve } from "node:path";
 
 import {
   buildAutoResumeContinuationPrompt,
@@ -22,12 +21,10 @@ import { projectPublicTurnAxes, type RoleTurnRequestProjectionOptions } from "./
 import {
   bindAdmittedTicketNumber,
   buildInstructionTransportPrompt,
-  freezeAttachmentsIntoRun,
   relocateAdmittedRunToTicket,
 } from "./invocation.ts";
 import { readRecordedSubmissionRows } from "../submission-ledger.ts";
 import { parseTicketNumber, readDeclaredTicketNumber } from "../run-ticket-number.ts";
-import { pathContainedIn } from "../activation-ledger-topology.ts";
 import { readStoredHostSessionId } from "../session-identity.ts";
 import { reportRunRecord } from "../sitian-facade.ts";
 import {
@@ -135,10 +132,11 @@ function projectRelocatedTurnIdentity(
   mutableRequest.principal = admitted.principal;
   const activation = mutableRequest.activation;
   if (isRecord(activation)) {
-    for (const field of ["taskPath", "packetPath", "prerequisitesPath", "inputPath", "requestManifestPath"] as const) {
+    for (const field of ["taskPath", "packetPath", "prerequisitesPath", "inputPath"] as const) {
       const record = activation as Record<string, unknown>;
       if (field in record) record[field] = rewrite(record[field]);
     }
+    // #1165: activation.requestManifestPath is a caller path — do not rewrite.
   }
   if (result.terminal !== undefined) {
     for (const artifact of result.terminal.artifacts) {
@@ -1476,7 +1474,7 @@ export function resumeTurnRequestProjectionOptions(
   summonsPrepared?: {
     readonly instruction: string;
     readonly instructionEmpty: boolean;
-    readonly attachments: readonly { frozenPath: string }[];
+    readonly attachments: readonly { path: string }[];
   },
 ): RoleTurnRequestProjectionOptions {
   // #879: officer dialogue content is caller/peer words only — no「请重读」,
@@ -1487,7 +1485,7 @@ export function resumeTurnRequestProjectionOptions(
   if (request.message !== undefined) {
     if (summonsPrepared !== undefined) {
       // #755: same-ticket review / open-court — caller words.
-      // #879 station-child officer: words only (attachments are independent freeze).
+      // #879 station-child officer: words only (paths remain on summons materials).
       prompt = officerDialogue
         ? request.message
         : buildInstructionTransportPrompt({
@@ -1504,8 +1502,10 @@ export function resumeTurnRequestProjectionOptions(
   } else if (summonsPrepared !== undefined) {
     // #879 station-child officer: instruction bytes === peer body/reask (no wrap).
     // Other seats keep #755 instruction + optional attachment path listing.
+    // #1165 J3: officer dialogue is raw instruction bytes; do not gate on
+    // instructionEmpty metadata (resume of older admitted pages).
     prompt = officerDialogue
-      ? (summonsPrepared.instructionEmpty ? "" : summonsPrepared.instruction)
+      ? summonsPrepared.instruction
       : buildInstructionTransportPrompt(summonsPrepared);
   } else if (request.summons !== undefined) {
     // #879: same-ticket summons with no instruction (e.g. notary source-run binding
@@ -1634,31 +1634,17 @@ async function runSettledAutoResumeLoop<
   });
 }
 
-function isAlreadyFrozenSummonsAttachment(
-  runDirectory: string,
-  attachmentPath: string,
-): boolean {
-  const absolute = isAbsolute(attachmentPath)
-    ? attachmentPath
-    : resolve(attachmentPath);
-  return pathContainedIn(join(runDirectory, "attachments"), absolute);
-}
-
 /**
- * Freeze same-ticket summons attachments into the retained run directory (#637).
- * No-op materials (no paths / instruction-only) skip the freeze.
- * Paths already under this run's attachments/ are the accepted freeze identity —
- * reuse them for the same internal re-summons flow.
- * Manual resume never calls this — old attachment semantics stay intact.
+ * Same-ticket summons materials: caller paths as-is (#1165). No copy or freeze.
  */
 export async function prepareSummonsResumeMaterials(
-  runDirectory: string,
+  _runDirectory: string,
   summons: SameTicketSummonsMaterials | undefined,
 ): Promise<
   | {
       readonly instruction: string;
       readonly instructionEmpty: boolean;
-      readonly attachments: readonly { frozenPath: string }[];
+      readonly attachments: readonly { path: string }[];
     }
   | undefined
 > {
@@ -1668,16 +1654,8 @@ export async function prepareSummonsResumeMaterials(
   }
   const instruction = summons.instruction ?? "";
   const instructionEmpty =
-    summons.instructionEmpty ?? instruction.trim() === "";
-  let attachments: readonly { frozenPath: string }[] = [];
-  if (summons.attachmentPaths !== undefined && summons.attachmentPaths.length > 0) {
-    const alreadyFrozen = summons.attachmentPaths.every((path) =>
-      isAlreadyFrozenSummonsAttachment(runDirectory, path),
-    );
-    attachments = alreadyFrozen
-      ? summons.attachmentPaths.map((frozenPath) => ({ frozenPath }))
-      : await freezeAttachmentsIntoRun(summons.attachmentPaths, runDirectory);
-  }
+    summons.instructionEmpty ?? instruction.length === 0;
+  const attachments = (summons.attachmentPaths ?? []).map((path) => ({ path }));
   return { instruction, instructionEmpty, attachments };
 }
 
@@ -1778,28 +1756,6 @@ export async function runPostAdmissionSeatResume<
           }
         }
 
-        // Internal re-summons freezes external paths once and records that identity.
-        if (request.summons !== undefined) {
-          const prepared = await prepareSummonsResumeMaterials(
-            admittedForBuild.runDirectory,
-            request.summons,
-          );
-          if (
-            prepared !== undefined &&
-            (request.summons.attachmentPaths?.length ?? 0) > 0
-          ) {
-            request = {
-              ...request,
-              summons: {
-                ...request.summons,
-                attachmentPaths: prepared.attachments.map(
-                  (attachment) => attachment.frozenPath,
-                ),
-              },
-            };
-          }
-        }
-
         // Public explicit resume: attach the stored native id when the caller
         // left it unset (399c3c8c). In-call auto-resume / 催交 / gate retry omit
         // the field; those load inside the host adapter (host-contracts).

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

@@ -53,6 +53,7 @@ import {
   type AdmittedRoleInvocation,
   type CoderPhase,
   type DerivedMergerEnvelope,
+  normalizeAdmittedAttachment,
   type FrozenAttachment,
   type InvocationEffectiveModel,
   type ReviewerLens,
@@ -183,7 +184,7 @@ function parseSameTicketSummonsMaterials(
   const instructionEmpty =
     typeof record.instructionEmpty === "boolean" ? record.instructionEmpty : undefined;
   const attachmentPaths = Array.isArray(record.attachmentPaths)
-    ? record.attachmentPaths.filter((p): p is string => typeof p === "string" && p.length > 0)
+    ? record.attachmentPaths.filter((p): p is string => typeof p === "string")
     : undefined;
   const sourceRunPath =
     typeof record.sourceRunPath === "string" && record.sourceRunPath.trim() !== ""
@@ -1007,7 +1008,6 @@ type LoadedAdmittedRequestFields = {
   readonly repository?: string;
   readonly repositoryDisplay?: string;
   readonly requestManifestPath?: string;
-  readonly manifestDigest?: string;
   /** Collector wait-window ms restored on resume (#678). */
   readonly waitWindowMs?: number;
   /** Doctor — admitted single-case identity restored on resume (#633). */
@@ -1096,7 +1096,6 @@ async function loadResumableRunRecord(
   let repository: string | undefined;
   let repositoryDisplay: string | undefined;
   let requestManifestPath: string | undefined;
-  let manifestDigest: string | undefined;
   let waitWindowMs: number | undefined;
   let issueNumber: number | undefined;
   let caseRunsPath: string | undefined;
@@ -1122,7 +1121,9 @@ async function loadResumableRunRecord(
         instructionEmpty = record.instructionEmpty;
       }
       if (Array.isArray(record.attachments)) {
-        attachments = record.attachments as FrozenAttachment[];
+        attachments = record.attachments
+          .map((item) => normalizeAdmittedAttachment(item))
+          .filter((item): item is FrozenAttachment => item !== undefined);
       }
       if (record.phase === "plan" || record.phase === "apply") {
         phase = record.phase;
@@ -1161,12 +1162,10 @@ async function loadResumableRunRecord(
       if (typeof record.repositoryDisplay === "string" && record.repositoryDisplay.trim() !== "") {
         repositoryDisplay = record.repositoryDisplay;
       }
-      if (typeof record.requestManifestPath === "string" && record.requestManifestPath.trim() !== "") {
+      // #1165: opaque caller path on resume — do not trim-filter provided values.
+      if (typeof record.requestManifestPath === "string") {
         requestManifestPath = record.requestManifestPath;
       }
-      if (typeof record.manifestDigest === "string" && record.manifestDigest.trim() !== "") {
-        manifestDigest = record.manifestDigest;
-      }
       if (typeof record.waitWindowMs === "number" && Number.isSafeInteger(record.waitWindowMs) && record.waitWindowMs >= 1) {
         waitWindowMs = record.waitWindowMs;
       }
@@ -1335,7 +1334,6 @@ async function loadResumableRunRecord(
       ...(repository === undefined ? {} : { repository }),
       ...(repositoryDisplay === undefined ? {} : { repositoryDisplay }),
       ...(requestManifestPath === undefined ? {} : { requestManifestPath }),
-      ...(manifestDigest === undefined ? {} : { manifestDigest }),
       ...(waitWindowMs === undefined ? {} : { waitWindowMs }),
       ...(issueNumber === undefined ? {} : { issueNumber }),
       ...(caseRunsPath === undefined ? {} : { caseRunsPath }),
@@ -1575,12 +1573,8 @@ function admitResumedRole(loaded: {
       return admitted;
     }
     case "collect-target": {
-      const { prNumber, repository, repositoryDisplay, manifestDigest } = fields;
-      if (
-        repository === undefined ||
-        repositoryDisplay === undefined ||
-        manifestDigest === undefined
-      ) {
+      const { prNumber, repository, repositoryDisplay } = fields;
+      if (repository === undefined || repositoryDisplay === undefined) {
         throw new CliUsageError(
           `role run admitted collector repository identity is missing: ${runId}`,
         );
@@ -1606,7 +1600,6 @@ function admitResumedRole(loaded: {
           ? {}
           : { requestManifestPath: fields.requestManifestPath }),
         ...(fields.waitWindowMs === undefined ? {} : { waitWindowMs: fields.waitWindowMs }),
-        manifestDigest,
       };
       return admitted;
     }

package/src/public-role-summons.ts

@@ -496,7 +496,7 @@ export async function summonPublicRole(
           runId: resumeRunId,
           summons: {
             instruction,
-            instructionEmpty: instruction.trim() === "",
+            instructionEmpty: instruction.length === 0,
           },
         },
         env as never,

package/src/role-run-placement.ts

@@ -170,6 +170,5 @@ export function ensureRoleRunPlacement(
   ledgerHome: string,
   placement: RoleRunPlacement,
 ): void {
-  // attachments/ appears only when something is frozen into it.
   ensureRoleRunDirectory(ledgerHome, placement.sessionDirectory);
 }

package/src/role-run-relocation.ts

@@ -26,7 +26,7 @@ const ADMITTED_PAGE_FIELDS = [
   "taskPath",
   "packetPath",
   "prerequisitesPath",
-  "requestManifestPath",
+  // #1165: requestManifestPath is a caller path — never rewrite.
   "mergerInputPath",
   "sourceRunPath",
 ] as const;
@@ -202,7 +202,7 @@ function rewriteSourceRunLocator(
   );
 }
 
-/** Same-ticket summons materials: typed source-run + frozen attachment pointers. */
+/** Same-ticket summons materials: typed source-run; caller attach paths stay as-is (#1165). */
 function rewriteSummonsMaterials(
   value: unknown,
   rewrites: readonly RunDirectoryPathRewrite[],
@@ -214,12 +214,7 @@ function rewriteSummonsMaterials(
     rewrites,
   );
   rewriteSourceRunLocator(value.sourceRun, rewrites);
-  // Bare-resume frozen attachment pointers (string[]), not free text / bytes.
-  if (Array.isArray(value.attachmentPaths)) {
-    value.attachmentPaths = value.attachmentPaths.map((path) =>
-      rewriteRunDirectoryPathValueAgainstRewrites(path, rewrites),
-    );
-  }
+  // #1165: summons.attachmentPaths are caller paths — do not rewrite.
 }
 
 /** Project one admitted page in memory after its containing run moved. */
@@ -229,13 +224,7 @@ export function rewriteAdmittedRoleRunPage(
 ): void {
   rewriteRunDirectoryPathFieldsAgainstRewrites(page, ADMITTED_PAGE_FIELDS, rewrites);
   rewriteSourceRunLocator(page.sourceRun, rewrites);
-  if (Array.isArray(page.attachments)) {
-    for (const attachment of page.attachments) {
-      if (isRecord(attachment)) {
-        rewriteRunDirectoryPathFieldsAgainstRewrites(attachment, ["frozenPath"], rewrites);
-      }
-    }
-  }
+  // #1165: admitted attachments are caller paths outside the run directory — do not rewrite.
   if (isRecord(page.principal)) {
     rewriteRunDirectoryPathFieldsAgainstRewrites(
       page.principal,
@@ -432,12 +421,13 @@ async function rewriteNestedMachinePathPages(
 }
 
 /**
- * Rewrite the admitted / invocation / runState fact rows (path fields: attachment
- * frozenPath / summons.attachmentPaths pointers only), then nested package-owned
- * session seams. Callers may rewrite before or after the filesystem move/copy:
- * `pagesDirectory` is where the pages currently live on disk; path strings that
- * still name `oldRunDirectory` become `newRunDirectory`. `crossRunRewrites`
- * covers officer/parent pointers that landed under a different final placement.
+ * Rewrite the admitted / invocation / runState fact rows (typed run placement
+ * paths only; caller --attach / --request-manifest paths stay as-is, #1165),
+ * then nested package-owned session seams. Callers may rewrite before or after
+ * the filesystem move/copy: `pagesDirectory` is where the pages currently live
+ * on disk; path strings that still name `oldRunDirectory` become
+ * `newRunDirectory`. `crossRunRewrites` covers officer/parent pointers that
+ * landed under a different final placement.
  */
 export async function rewriteRoleRunDurablePages(input: {
   readonly pagesDirectory: string;
@@ -462,7 +452,7 @@ export async function rewriteRoleRunDurablePages(input: {
           rewrites,
         );
       }
-      // Open court summons: source-run locators + frozen attachment path pointers.
+      // Open court summons: source-run locators only; caller attach paths stay (#1165).
       if (isRecord(page.currentCourt)) {
         rewriteSummonsMaterials(page.currentCourt.summons, rewrites);
       }