@akagilnc/pi-workflow-roles 0.1.5013 → 0.1.5037

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

@@ -1127,11 +1127,10 @@ async function runHasFormedSessionPrincipal(runDirectory: string): Promise<boole
 /**
  * Locate the latest retained run for one seat under a book (#637 / #747).
  * Same walk surface as findRunDirectoryById (listBookRunDirectories). Match by
- * parent run path (officer / gate seats, #747 / #987). A typed ticket number
- * does not select a run. runId is UUIDv7 — lexicographic max is latest among
- * runs that formed a session principal. No parallel index. Public ticket-number
- * selection of a prior run was deleted (#987 Result 7); callers use explicit
- * `ak-role resume <runId>`.
+ * parent run path (officer / gate seats, #747 / #987), narrowed to a supplied
+ * typed ticket for same-ticket gate re-summons. runId is UUIDv7 — lexicographic
+ * max is latest among runs that formed a session principal. No parallel index;
+ * callers can use explicit `ak-role resume <runId>`.
  * Only a truly missing book directory means no history; damage/permission errors propagate.
  */
 export async function findLatestRunIdForSeatTicket(input: {
@@ -1148,12 +1147,8 @@ export async function findLatestRunIdForSeatTicket(input: {
   const bookDir = activationBookDirectory(ledgerHome, input.bookKey);
   let runDirectories: string[];
   try {
-    // A typed ticket narrows the existing walk surface to that ticket's runs;
-    // same-parent matching below still selects the actual prior leg.
     runDirectories = await listBookRunDirectories(
-      input.ticketNumber === undefined
-        ? bookDir
-        : join(bookDir, String(input.ticketNumber)),
+      input.ticketNumber === undefined ? bookDir : join(bookDir, String(input.ticketNumber)),
     );
   } catch (error) {
     if (errorCodeOf(error) === "ENOENT") return undefined;
@@ -1167,7 +1162,9 @@ export async function findLatestRunIdForSeatTicket(input: {
     const runId = entry.slice(0, entry.length - suffix.length);
     if (runId.length === 0) continue;
     const parentPath = await readRunParentPath(runDirectory);
-    if (parentPath !== input.parentRunPath) continue;
+    // The parent's ticket can change after this child was admitted. Within one
+    // book the run leaf is its stable identity; directory placement is not.
+    if (parentPath !== input.parentRunPath && basename(parentPath ?? "") !== basename(input.parentRunPath)) continue;
     // Durable fact: never resume-select a provisional that never formed principal.
     if (!(await runHasFormedSessionPrincipal(runDirectory))) continue;
     if (best === undefined || runId > best) best = runId;
@@ -1328,6 +1325,7 @@ async function loadResumableRunRecord(
   home: string,
   runId: string,
   authority: DurablePrincipalAuthority,
+  allowUnformedAdmitted = false,
 ): Promise<{
   readonly run: RoleRunRecord;
   readonly principal: DurablePrincipal;
@@ -1350,7 +1348,7 @@ async function loadResumableRunRecord(
     throw new CliUsageError(`unknown role run id: ${runId}`);
   }
   const { run, principal } = materialized;
-  if (!(await isDurablePrincipalAvailable(principal, authority))) {
+  if (!(allowUnformedAdmitted && run.state === "admitted") && !(await isDurablePrincipalAvailable(principal, authority))) {
     throw new CliUsageError(
       `role run Pi session principal is unavailable: ${runId}`,
     );
@@ -1757,8 +1755,9 @@ export async function loadResumablePublicRole(
   home: string,
   runId: string,
   authority: DurablePrincipalAuthority,
+  allowUnformedAdmitted = false,
 ): Promise<LoadedResumablePublicRole> {
-  const loaded = await loadResumableRunRecord(home, runId, authority);
+  const loaded = await loadResumableRunRecord(home, runId, authority, allowUnformedAdmitted);
   return seatLoadedResult(loaded, admitResumedRole(loaded));
 }
 

package/src/public-cli/seat-ticket-binding.ts

@@ -1,10 +1,9 @@
 /**
  * Shared same-parent resume seam for gate / officer seats (#635 / #637 / #747 / #987).
  *
- * Lookup key is parent run path only (#747 / #987 Result 7). Public seats no
- * longer select a prior run by ticket number — callers use explicit
- * `ak-role resume <runId>`. Officer and gate countersign same-parent re-summons
- * keep this seam. Lookup/resume failures propagate (失败诚实) — never wash into
+ * Lookup uses the parent run path; a typed ticket narrows same-ticket gate
+ * re-summons, never creates an issue identity. Callers can also use explicit
+ * `ak-role resume <runId>`. Lookup/resume failures propagate (失败诚实) — never wash into
  * a fresh mint. Returns undefined when the caller declared an explicit fresh
  * summons (`ak-role new`) or when no prior run exists; both mint new.
  * freshSummons is required so no seat can drift back into its own skip branch.
@@ -18,7 +17,7 @@ import {
 
 /**
  * Sole same-seat → resume decision by parent run path (#637 / #724 / #747 / #987).
- * A typed ticket number is a bind key, not a resume key. When a prior run is
+ * A supplied typed ticket only narrows the prior-run search. When a prior run is
  * found, resume carries this summons' materials. Lookup/resume failures
  * propagate (失败诚实) — never wash into a fresh mint. Returns undefined when
  * the caller declared an explicit fresh summons (`ak-role new`), the parent
@@ -45,9 +44,7 @@ export async function tryResumeSameTicketSeatRun<T>(input: {
     bookKey: resolveBookKeyFromGit(input.projectRoot),
     role: input.role,
     parentRunPath: input.parentRunPath,
-    ...(input.ticketNumber === undefined
-      ? {}
-      : { ticketNumber: input.ticketNumber }),
+    ...(input.ticketNumber === undefined ? {} : { ticketNumber: input.ticketNumber }),
   });
   if (previousRunId === undefined) return undefined;
   return await input.resume(previousRunId, input.summons);

package/src/public-role-summons.ts

@@ -535,7 +535,16 @@ export async function summonPublicRole(
   }
 
   const stderr = captured?.stderrText();
-  const runDirectory = result.admitted?.runDirectory;
+  // A parked officer can return its court diarist's escalation verbatim. The
+  // terminal's independent run, not the parked officer, is the gate pointer.
+  const runDirectory = result.terminal !== undefined
+    && result.terminal.roleOutcome.role !== options.role
+    && typeof result.terminal.runId === "string"
+    ? await (await import("./public-cli/run-lifecycle.ts")).findRunDirectoryById(
+      home,
+      result.terminal.runId,
+    )
+    : result.admitted?.runDirectory;
   return {
     exitCode: result.exitCode,
     ...(result.terminal === undefined ? {} : { terminal: result.terminal }),
@@ -851,8 +860,12 @@ export async function summonGateOfficer(options: {
         `countersign gate summon requires parent runId from sourceRunDirectory: ${options.sourceRunDirectory}`,
       );
     }
-    const { readBoardTicketNumber } = await import("./run-ticket-number.ts");
+    const { isSafePositiveTicketNumber, readBoardTicketNumber } = await import("./run-ticket-number.ts");
     const parentTicket = await readBoardTicketNumber(options.sourceRunDirectory);
+    const submittedTicket = options.submission !== null && typeof options.submission === "object" && !Array.isArray(options.submission)
+      ? (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 ?? "";
     return summonPublicRole({
@@ -861,7 +874,7 @@ export async function summonGateOfficer(options: {
       ...common,
       correlationId,
       parentRunPath: options.sourceRunDirectory,
-      ...(parentTicket === undefined ? {} : { boundTicketNumber: parentTicket }),
+      ...(courtTicket === undefined ? {} : { boundTicketNumber: courtTicket }),
     });
   }
   // Inspector: argv stays pure 卷宗指针 (#747 parentRunPath lookup key).