@akagilnc/pi-workflow-roles 0.1.4782 → 0.1.4802

package/dist/public-cli/main.js

@@ -16630,7 +16630,7 @@ function piUserDialogueBody(request) {
     const _exhaustive = request.continuation;
     return _exhaustive;
   })();
-  return request.continuation.kind === "resume" && request.activation.role === "reviewer" ? rawPrompt : applyPiNativeSkillInvocation(request.methods, rawPrompt);
+  return request.continuation.kind === "resume" ? rawPrompt : applyPiNativeSkillInvocation(request.methods, rawPrompt);
 }
 async function resolveSelectedPi(command, cwd, env) {
   const searchPath = env.PATH ?? (platform === "win32" ? process.env.PATH ?? "" : "/usr/bin:/bin");
@@ -17711,7 +17711,7 @@ async function listPullRequestNumbersByCommit(runner, input) {
 function createGhApiRunner(options = {}) {
   const spawnImpl = options.spawnImpl ?? spawn2;
   return async (args, runOptions = {}) => {
-    return await new Promise((resolve11, reject) => {
+    return await new Promise((resolve12, reject) => {
       const signal = runOptions.signal;
       if (signal?.aborted) {
         reject(signal.reason ?? new Error("aborted"));
@@ -17784,11 +17784,11 @@ function createGhApiRunner(options = {}) {
               const value = line2.slice(idx + 1).trim();
               headers[name] = value;
             }
-            resolve11({ status, headers, bodyText });
+            resolve12({ status, headers, bodyText });
             return;
           }
           if (code === 0) {
-            resolve11({ status: 200, headers: {}, bodyText: stdout });
+            resolve12({ status: 200, headers: {}, bodyText: stdout });
             return;
           }
           const failure = new Error(
@@ -18169,27 +18169,14 @@ var init_typed_provider_http = __esm({
 // src/public-cli/run-lifecycle.ts
 import { chmod, lstat as lstat2, open, readdir as readdir4, readFile as readFile10, unlink as unlink2, writeFile as writeFile3 } from "node:fs/promises";
 import { basename as basename5, join as join14 } from "node:path";
-function selectResumeContinuationPrompt(message, engineMaterial) {
-  const lines = message !== void 0 ? [message] : [];
-  return appendEngineSessionMaterial(lines, engineMaterial).join("\n");
-}
-function buildResumeContinuationPrompt(options) {
-  return selectResumeContinuationPrompt(
-    options.message,
-    engineSessionMaterialFromOptions({
-      packageRoot: options.packageRoot,
-      ...pickEngineAxis(options)
-    })
-  );
-}
 function buildAutoResumeContinuationPrompt(options) {
-  return selectResumeContinuationPrompt(
-    RESUME_TRANSPORT_ENVELOPE,
+  return appendEngineSessionMaterial(
+    [RESUME_TRANSPORT_ENVELOPE],
     engineSessionMaterialFromOptions({
       packageRoot: options.packageRoot,
       ...pickEngineAxis(options)
     })
-  );
+  ).join("\n");
 }
 function isV1ResumableProvider(provider) {
   return V1_RESUMABLE_PROVIDERS.includes(provider);
@@ -18729,7 +18716,7 @@ async function runHasFormedSessionPrincipal(runDirectory) {
   }
 }
 async function findLatestRunIdForSeatTicket(input) {
-  if (input.ticketNumber === void 0 && input.parentRunPath === void 0) {
+  if (input.parentRunPath.trim() === "") {
     return void 0;
   }
   const ledgerHome = resolveActivationLedgerHome(input.home);
@@ -18748,13 +18735,8 @@ async function findLatestRunIdForSeatTicket(input) {
     if (!entry.endsWith(suffix)) continue;
     const runId = entry.slice(0, entry.length - suffix.length);
     if (runId.length === 0) continue;
-    if (input.parentRunPath !== void 0) {
-      const parentPath = await readRunParentPath(runDirectory);
-      if (parentPath !== input.parentRunPath) continue;
-    } else if (input.ticketNumber !== void 0) {
-      const ticketNumber = await readBoardTicketNumber(runDirectory);
-      if (ticketNumber !== input.ticketNumber) continue;
-    }
+    const parentPath = await readRunParentPath(runDirectory);
+    if (parentPath !== input.parentRunPath) continue;
     if (!await runHasFormedSessionPrincipal(runDirectory)) continue;
     if (best === void 0 || runId > best) best = runId;
   }
@@ -20677,7 +20659,7 @@ var init_option_definitions = __esm({
       },
       resume: {
         command: "resume",
-        summary: "Resume a role run under the live seat table (model/host/engine); session principal must still exist. [message] applies only to seats that accept caller instruction; Notary/\u7B26\u5B9D\u90CE must omit message and derives evidence from the existing source-run/dossier binding. Global --model/--thinking/--host/--engine must be placed before <runId> (either before `resume` or between `resume` and <runId>); the one argv after <runId> is the opaque message, not a flag position (#471).",
+        summary: "Resume a role run under the live seat table (model/host/engine); session principal must still exist. Every callable seat, including Notary/\u7B26\u5B9D\u90CE, accepts the optional caller message and passes it through unchanged as the continuation prompt. Notary explicit new still accepts only its source-run locator, not a caller prompt. Global --model/--thinking/--host/--engine must be placed before <runId> (either before `resume` or between `resume` and <runId>); the one argv after <runId> is the opaque message, not a flag position (#471).",
         usage: ["ak-role resume <runId> [message]"],
         examples: [
           "ak-role resume 01abc\u2026",
@@ -27219,10 +27201,10 @@ function presentFailureTerminal(terminal, io) {
 }
 function defaultNavigatorGraceSleep() {
   let timer;
-  const sleep2 = ((ms) => new Promise((resolve11) => {
+  const sleep2 = ((ms) => new Promise((resolve12) => {
     timer = setTimeout(() => {
       timer = void 0;
-      resolve11();
+      resolve12();
     }, ms);
   }));
   sleep2.cancel = () => {
@@ -27234,7 +27216,7 @@ function defaultNavigatorGraceSleep() {
   return sleep2;
 }
 function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep2 = defaultNavigatorGraceSleep()) {
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve12, reject) => {
     let settled = false;
     const finish = (action) => {
       if (settled) return;
@@ -27243,11 +27225,11 @@ function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep2
       action();
     };
     void work.then(
-      (value) => finish(() => resolve11({ status: "done", value })),
+      (value) => finish(() => resolve12({ status: "done", value })),
       (error) => finish(() => reject(error))
     );
     void sleep2(graceMs).then(() => {
-      finish(() => resolve11({ status: "timeout" }));
+      finish(() => resolve12({ status: "timeout" }));
     });
   });
 }
@@ -27843,22 +27825,10 @@ async function runWithAutoResumeLoop(options) {
   let everyAttemptThrew = true;
   const retainedErrorFiles = [];
   while (true) {
-    let lease;
-    try {
-      lease = await acquireRunWriterLease(
-        options.admitted.runDirectory,
-        (diagnostic) => options.io.stderr(diagnostic)
-      );
-    } catch (error) {
-      if (error instanceof RunWriterLeaseHeldError) {
-        presentStructuralRejection(error, options.io);
-        return { exitCode: 2 };
-      }
-      throw error;
-    }
     let result;
     let turnStartedBeforeThrow = false;
     try {
+      const lease = isFirst ? await acquireRunWriterLease(options.admitted.runDirectory) : void 0;
       result = await options.dispatch(currentPayload, lease, isFirst, dummyIo);
     } catch (error) {
       lastThrownError = error;
@@ -27992,8 +27962,8 @@ async function runWithAutoResumeLoop(options) {
     autoResumeAttempts++;
     if (result?.turnDispatched === true || turnStartedBeforeThrow) {
       currentPayload = options.buildResumePayload();
+      isFirst = false;
     }
-    isFirst = false;
   }
 }
 var dummyIo, TurnDispatchedFailure, DISPATCH_ERROR_RETENTION_ENTRY_TYPE;
@@ -28483,7 +28453,7 @@ async function dispatchPostAdmissionTurn(input) {
             await recordBestEffortPostDispatchDiagnostic(
               admitted,
               env,
-              `current-court cleanup failed after accepted settlement (best-effort continue, self-heals on next resume): ${describeErrorIdentity(error)}`,
+              `current-court cleanup failed after accepted settlement (best-effort continue): ${describeErrorIdentity(error)}`,
               io
             );
           }
@@ -28659,21 +28629,14 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
     } else if (request.summons !== void 0) {
       prompt = request.message;
     } else {
-      prompt = buildResumeContinuationPrompt({
-        packageRoot: env.packageRoot,
-        ...pickEngineAxis(env),
-        message: request.message
-      });
+      prompt = request.message;
     }
   } else if (summonsPrepared !== void 0) {
     prompt = officerDialogue ? summonsPrepared.instructionEmpty ? "" : summonsPrepared.instruction : buildInstructionTransportPrompt(summonsPrepared);
   } else if (request.summons !== void 0) {
     prompt = "";
   } else {
-    prompt = buildResumeContinuationPrompt({
-      packageRoot: env.packageRoot,
-      ...pickEngineAxis(env)
-    });
+    prompt = "";
   }
   return {
     packageRoot: env.packageRoot,
@@ -28698,7 +28661,7 @@ async function dispatchAfterWriterLease(input) {
     handedOffToDispatch = true;
     return await input.dispatch(request);
   } finally {
-    if (!handedOffToDispatch) {
+    if (!handedOffToDispatch && input.lease !== void 0) {
       await input.lease.release();
     }
   }
@@ -28751,20 +28714,11 @@ async function runPostAdmissionSeatResume(input) {
   let preparedCleanup;
   const buildRequestAfterLease = async () => {
     let openCourtAttemptId;
-    let admittedForBuild = loaded.admitted;
+    const admittedForBuild = loaded.admitted;
     if (request.summons === void 0) {
       const openCourt = await readCurrentCourt(admittedForBuild.runDirectory);
       if (openCourt !== void 0) {
         openCourtAttemptId = openCourt.courtAttemptId;
-        request = {
-          runId: request.runId,
-          ...request.message === void 0 ? {} : { message: request.message },
-          ...openCourt.summons === void 0 ? {} : { summons: openCourt.summons }
-        };
-        if (openCourt.summons !== void 0) {
-          const reloaded = await input.load(request);
-          admittedForBuild = reloaded.admitted;
-        }
       }
     }
     if (request.summons !== void 0) {
@@ -28826,7 +28780,7 @@ async function runPostAdmissionSeatResume(input) {
         // Same as public manual resume: prior-court sealed acceptance is not a
         // redispatch brake (#833). New-court station-child turns still auto-resume.
         dispatch: async (payload, lease, _isFirst, attemptIo) => dispatchAfterWriterLease({
-          lease,
+          ...lease === void 0 ? {} : { lease },
           build: async () => {
             if (payload.resumeTurn && firstTurn !== void 0) {
               return {
@@ -28850,7 +28804,7 @@ async function runPostAdmissionSeatResume(input) {
               env,
               io: attemptIo,
               request: turnRequest,
-              lease,
+              ...lease === void 0 ? {} : { lease },
               adapters: stationAdapters,
               persistRunState: false,
               ...input.effectiveEngine === void 0 ? {} : { effectiveEngine: input.effectiveEngine }
@@ -28936,7 +28890,7 @@ async function runPostAdmissionResumable(input) {
         },
         io: attemptIo,
         request,
-        lease,
+        ...lease === void 0 ? {} : { lease },
         adapters,
         persistRunState: false,
         // #600: every attempt (initial + auto-resume) writes seat engine when present.
@@ -29180,15 +29134,12 @@ var init_coder_run = __esm({
 // src/public-cli/seat-ticket-binding.ts
 async function tryResumeSameTicketSeatRun(input) {
   if (input.freshSummons === true) return void 0;
-  if (input.parentRunPath === void 0 && input.ticketNumber === void 0) {
-    return void 0;
-  }
+  if (input.parentRunPath.trim() === "") return void 0;
   const previousRunId = await findLatestRunIdForSeatTicket({
     home: input.home,
     bookKey: resolveBookKeyFromGit(input.projectRoot),
     role: input.role,
-    ...input.parentRunPath === void 0 ? {} : { parentRunPath: input.parentRunPath },
-    ...input.ticketNumber === void 0 ? {} : { ticketNumber: input.ticketNumber }
+    parentRunPath: input.parentRunPath
   });
   if (previousRunId === void 0) return void 0;
   return await input.resume(previousRunId, input.summons);
@@ -29712,11 +29663,6 @@ async function runPublicNotaryResume(request, env, io) {
     env,
     io,
     load: async (effective) => {
-      if (effective.message !== void 0) {
-        throw new CliUsageError(
-          "notary rejects caller prompt/instruction; only zero caller-prompt continuation admitted"
-        );
-      }
       const loaded = await loadResumableNotaryRun(
         env.home,
         effective.runId,
@@ -30205,29 +30151,7 @@ async function runPublicDiarist(argv2, env, io, parseDiaristArgv2) {
     }
     throw error;
   }
-  const projectRoot = parsed.project ?? env.cwd;
   const handoffTicket = env.boundTicketNumber;
-  if (typeof handoffTicket === "number" && Number.isSafeInteger(handoffTicket) && handoffTicket >= 1) {
-    const summons = {
-      instruction: parsed.instruction,
-      instructionEmpty: parsed.instruction.trim() === "",
-      attachmentPaths: parsed.attachmentPaths
-    };
-    const resumed = await tryResumeSameTicketSeatRun({
-      home: env.home,
-      projectRoot,
-      role: "diarist",
-      ticketNumber: handoffTicket,
-      freshSummons: env.freshSummons,
-      summons,
-      resume: (runId, materials) => runPublicDiaristResume(
-        { runId, ...materials === void 0 ? {} : { summons: materials } },
-        env,
-        io
-      )
-    });
-    if (resumed !== void 0) return resumed;
-  }
   let admitted;
   try {
     admitted = await admitDiaristInvocation({
@@ -30312,7 +30236,6 @@ var init_diarist_run = __esm({
     init_invocation();
     init_post_admission();
     init_run_lifecycle();
-    init_seat_ticket_binding();
     init_settlement();
     init_turn_request();
     init_run_ticket_number();
@@ -30591,7 +30514,7 @@ async function runPublicReviewerResume(request, env, io) {
         ...sandbox.executionCwd === void 0 ? {} : { cwd: sandbox.executionCwd },
         continuation: {
           kind: "resume",
-          prompt: reviewerResumePrompt(activeEnv, effective.message)
+          prompt: effective.message ?? ""
         }
       });
     },
@@ -30857,6 +30780,7 @@ async function summonPublicRole(options) {
           ...options.reviewReask === void 0 ? {} : { reviewReask: options.reviewReask },
           ...options.gateReviewInstruction === void 0 ? {} : { gateReviewInstruction: options.gateReviewInstruction },
           ...options.boundTicketNumber === void 0 ? {} : { boundTicketNumber: options.boundTicketNumber },
+          ...options.parentRunPath === void 0 || options.parentRunPath.trim() === "" ? {} : { parentRunPath: options.parentRunPath },
           ...options.correlationId === void 0 || options.correlationId.trim() === "" ? {} : { correlationId: options.correlationId },
           ...options.createRunId === void 0 ? {} : { createRunId: options.createRunId },
           ...options.executionCwd === void 0 ? {} : { executionCwd: options.executionCwd }
@@ -31359,6 +31283,7 @@ async function summonGateOfficer(options) {
       argv: ["--project", options.cwd, "--", instruction],
       ...common,
       correlationId,
+      parentRunPath: options.sourceRunDirectory,
       ...parentTicket === void 0 ? {} : { boundTicketNumber: parentTicket }
     });
   }
@@ -31387,6 +31312,7 @@ __export(countersign_run_exports, {
   runPublicCountersign: () => runPublicCountersign,
   runPublicCountersignResume: () => runPublicCountersignResume
 });
+import { resolve as resolve10 } from "node:path";
 function buildCountersignTurnRequest(admitted, options) {
   return projectRoleTurnRequest(
     admitted,
@@ -31581,6 +31507,28 @@ async function runPublicCountersign(argv2, env, io, parseCountersignArgv2) {
     throw error;
   }
   let admitted;
+  const gateParentRunPath = typeof env.parentRunPath === "string" && env.parentRunPath.trim() !== "" ? env.parentRunPath : void 0;
+  if (gateParentRunPath !== void 0) {
+    const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction ?? parsed.instruction;
+    const resumed = await tryResumeSameTicketSeatRun({
+      home: env.home,
+      projectRoot: resolve10(parsed.project ?? env.cwd),
+      role: "countersign",
+      parentRunPath: gateParentRunPath,
+      freshSummons: env.freshSummons,
+      summons: {
+        sourceRunPath: gateParentRunPath,
+        instruction: resumeInstruction,
+        instructionEmpty: resumeInstruction.trim() === ""
+      },
+      resume: (runId, materials) => runPublicCountersignResume(
+        { runId, ...materials === void 0 ? {} : { summons: materials } },
+        env,
+        io
+      )
+    });
+    if (resumed !== void 0) return resumed;
+  }
   try {
     admitted = await admitCountersignInvocation({
       home: env.home,
@@ -31624,7 +31572,7 @@ async function runPublicCountersign(argv2, env, io, parseCountersignArgv2) {
                 instruction: parsed.instruction,
                 projectRoot: admitted.projectRoot,
                 failureLabel: "unbound summons",
-                // #969: parent durable ticket is the resume/bind key (ADR 0079).
+                // #969: parent durable ticket is the bind key (not a resume lookup).
                 ...env.boundTicketNumber === void 0 ? {} : { boundTicketNumber: env.boundTicketNumber }
               },
               env,
@@ -31680,59 +31628,13 @@ async function runPublicCountersign(argv2, env, io, parseCountersignArgv2) {
           } else if (isSafePositiveTicketNumber(env.boundTicketNumber)) {
             typedTicket = env.boundTicketNumber;
           }
-          if (typedTicket !== void 0) {
-            const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction ?? parsed.instruction;
-            const summons = {
-              instruction: resumeInstruction,
-              instructionEmpty: resumeInstruction.trim() === ""
-            };
-            const resumed = await tryResumeSameTicketSeatRun({
-              home: env.home,
-              projectRoot: admitted.projectRoot,
-              role: "countersign",
-              ticketNumber: typedTicket,
-              freshSummons: env.freshSummons,
-              summons,
-              resume: async (runId, materials) => {
-                const retained = await loadResumableCountersignRun(
-                  env.home,
-                  runId,
-                  env.principalAuthority
-                );
-                if (retained.admitted === void 0) {
-                  throw new Error(
-                    `retained countersign run disappeared before resume: ${runId}`
-                  );
-                }
-                const frozenPaths = (await freezePreparedAttachmentsIntoRun(
-                  preparedAttachments,
-                  retained.admitted.runDirectory,
-                  `s-${Date.now().toString(36)}`
-                )).map((attachment) => attachment.frozenPath);
-                const preparedMaterials = {
-                  ...materials ?? {},
-                  ...frozenPaths.length === 0 ? {} : { attachmentPaths: frozenPaths }
-                };
-                return await runPublicCountersignResume(
-                  {
-                    runId,
-                    summons: preparedMaterials
-                  },
-                  {
-                    ...env,
-                    ...typedCourtTicketNumbers === void 0 ? {} : { pendingCourtTicketNumbers: typedCourtTicketNumbers }
-                  },
-                  io
-                );
-              }
-            });
-            if (resumed !== void 0) {
-              return resumed;
-            }
-          }
         }
         await materializeAdmission();
         await markRunAdmitted(admitted, env.principalAuthority);
+        if (gateParentRunPath !== void 0) {
+          await persistAdmittedSourceRunPath(admitted, gateParentRunPath);
+          admitted = { ...admitted, sourceRunPath: gateParentRunPath };
+        }
         if (identityDiaristRan && typedTicket !== void 0) {
           try {
             await bindAdmittedTicketNumber(admitted, typedTicket);
@@ -31851,22 +31753,7 @@ async function runPublicCountersignResume(request, env, io) {
         )
       );
     },
-    adapters: countersignAdapters({
-      beforeDispatch: async (admitted) => {
-        if (admitted.courtTicketNumbersDamage !== void 0) {
-          throw new StationChildExhaustedError(
-            admitted.courtTicketNumbersDamage
-          );
-        }
-        if (env.pendingCourtTicketNumbers !== void 0) {
-          await bindCourtTicketNumbersOnAdmitted(
-            admitted,
-            env.pendingCourtTicketNumbers
-          );
-        }
-        await runCountersignCourtDiaristStation(admitted, env, io);
-      }
-    }),
+    adapters: countersignAdapters(),
     ...env.engine === void 0 ? {} : { effectiveEngine: env.engine }
   });
 }
@@ -32569,8 +32456,8 @@ var init_atomic_write = __esm({
 import { open as open3, readFile as readFile18, unlink as unlink4 } from "node:fs/promises";
 import { dirname as dirname17, join as join32 } from "node:path";
 function sleep(ms) {
-  return new Promise((resolve11) => {
-    setTimeout(resolve11, ms);
+  return new Promise((resolve12) => {
+    setTimeout(resolve12, ms);
   });
 }
 async function withAnalystLibraryIndexLock(ledgerHome, fn) {
@@ -34523,7 +34410,7 @@ var init_analyst_entry = __esm({
 
 // src/public-cli/analyst-run.ts
 import { readFile as readFile21 } from "node:fs/promises";
-import { isAbsolute as isAbsolute10, resolve as resolve10 } from "node:path";
+import { isAbsolute as isAbsolute10, resolve as resolve11 } from "node:path";
 function resolveAnalystIssueBookKeyFromCwd(cwd = process.cwd()) {
   try {
     return resolveBookKeyFromGit(cwd);
@@ -34572,7 +34459,7 @@ async function buildAnalystSweepModeInputFromAttachmentPaths(attachmentPaths) {
     );
   }
   const sourcePath = attachmentPaths[0];
-  const absolute = isAbsolute10(sourcePath) ? sourcePath : resolve10(sourcePath);
+  const absolute = isAbsolute10(sourcePath) ? sourcePath : resolve11(sourcePath);
   let bytes;
   try {
     bytes = await readFile21(absolute);

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

@@ -145,9 +145,6 @@ export async function runPublicNotaryResume(request, env, io) {
         env,
         io,
         load: async (effective) => {
-            if (effective.message !== undefined) {
-                throw new CliUsageError("notary rejects caller prompt/instruction; only zero caller-prompt continuation admitted");
-            }
             const loaded = await loadResumableNotaryRun(env.home, effective.runId, env.principalAuthority);
             const summons = effective.summons;
             if (summons?.sourceRunPath !== undefined &&

package/dist/public-cli/option-definitions.js

@@ -1145,7 +1145,7 @@ const SUPPORT_COMMAND_HELP = {
     },
     resume: {
         command: "resume",
-        summary: "Resume a role run under the live seat table (model/host/engine); session principal must still exist. [message] applies only to seats that accept caller instruction; Notary/符宝郎 must omit message and derives evidence from the existing source-run/dossier binding. Global --model/--thinking/--host/--engine must be placed before <runId> (either before `resume` or between `resume` and <runId>); the one argv after <runId> is the opaque message, not a flag position (#471).",
+        summary: "Resume a role run under the live seat table (model/host/engine); session principal must still exist. Every callable seat, including Notary/符宝郎, accepts the optional caller message and passes it through unchanged as the continuation prompt. Notary explicit new still accepts only its source-run locator, not a caller prompt. Global --model/--thinking/--host/--engine must be placed before <runId> (either before `resume` or between `resume` and <runId>); the one argv after <runId> is the opaque message, not a flag position (#471).",
         usage: ["ak-role resume <runId> [message]"],
         examples: [
             "ak-role resume 01abc…",