@akagilnc/pi-workflow-roles 0.1.1893 → 0.1.1918

package/dist/public-cli/main.js

@@ -14873,6 +14873,69 @@ var init_sitian_role_run_coordinates = __esm({
   }
 });
 
+// src/ticket-frontmatter.ts
+function parseTicketNumberFrontmatter(bytes) {
+  let text;
+  if (typeof bytes === "string") {
+    text = bytes;
+  } else {
+    try {
+      text = exactUtf8(bytes, "ticket face");
+    } catch {
+      return void 0;
+    }
+  }
+  let cursor;
+  if (text.startsWith("---\n")) {
+    cursor = 4;
+  } else if (text.startsWith("---\r\n")) {
+    cursor = 5;
+  } else {
+    return void 0;
+  }
+  const fmLines = [];
+  let closed = false;
+  while (cursor < text.length) {
+    const nl = text.indexOf("\n", cursor);
+    const lineEnd = nl === -1 ? text.length : nl;
+    let line2 = text.slice(cursor, lineEnd);
+    if (line2.endsWith("\r")) line2 = line2.slice(0, -1);
+    if (line2 === "---") {
+      closed = true;
+      break;
+    }
+    fmLines.push(line2);
+    if (nl === -1) break;
+    cursor = nl + 1;
+  }
+  if (!closed) return void 0;
+  let found;
+  for (const line2 of fmLines) {
+    const match = /^[ \t]*ticketNumber[ \t]*:[ \t]*(\d+)[ \t]*$/.exec(line2);
+    if (match === null) continue;
+    const value = Number(match[1]);
+    if (!Number.isInteger(value) || value < 1) return void 0;
+    if (found !== void 0 && found !== value) return void 0;
+    found = value;
+  }
+  return found;
+}
+function resolveTicketNumberFromAttachmentBodies(bodies) {
+  const found = /* @__PURE__ */ new Set();
+  for (const body of bodies) {
+    const value = parseTicketNumberFrontmatter(body);
+    if (value !== void 0) found.add(value);
+  }
+  if (found.size !== 1) return void 0;
+  return found.values().next().value;
+}
+var init_ticket_frontmatter = __esm({
+  "src/ticket-frontmatter.ts"() {
+    "use strict";
+    init_exact_utf8();
+  }
+});
+
 // src/audit-escalation.ts
 function isAuditEscalationResult(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
@@ -15338,7 +15401,9 @@ async function writeRoleInvocationLedger(source, role) {
     projectRoot: source.projectRoot,
     runDirectory: source.runDirectory,
     sessionDirectory: source.sessionDirectory,
-    sessionFile: source.sessionFile
+    sessionFile: source.sessionFile,
+    ...source.correlationId === void 0 ? {} : { correlationId: source.correlationId },
+    ...source.ticketNumber === void 0 ? {} : { ticketNumber: source.ticketNumber }
   };
   await writeFile2(
     join5(source.runDirectory, "invocation.json"),
@@ -15568,13 +15633,37 @@ async function freezeRegularFileAttachment(sourcePath, destinationDir, index) {
   const frozenPath = join5(destinationDir, name);
   await writeFile2(frozenPath, bytes);
   return {
-    provenancePath: absolute,
-    frozenPath,
-    byteLength: bytes.byteLength,
-    sha256: sha256Hex(bytes),
-    mediaKind: "regular-file"
+    attachment: {
+      provenancePath: absolute,
+      frozenPath,
+      byteLength: bytes.byteLength,
+      sha256: sha256Hex(bytes),
+      mediaKind: "regular-file"
+    },
+    body: bytes
   };
 }
+async function freezeAttachmentsWithTicketNumber(attachmentPaths, attachmentsDirectory) {
+  const attachments = [];
+  const bodies = [];
+  for (let i = 0; i < attachmentPaths.length; i += 1) {
+    const frozen = await freezeRegularFileAttachment(
+      attachmentPaths[i],
+      attachmentsDirectory,
+      i
+    );
+    attachments.push(frozen.attachment);
+    bodies.push(frozen.body);
+  }
+  const ticketNumber = resolveTicketNumberFromAttachmentBodies(bodies);
+  return {
+    attachments,
+    ...ticketNumber === void 0 ? {} : { ticketNumber }
+  };
+}
+function ticketAdmissionFields(ticketNumber) {
+  return ticketNumber === void 0 ? {} : { ticketNumber };
+}
 async function admitJudgeInvocation(options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
@@ -15585,16 +15674,11 @@ async function admitJudgeInvocation(options) {
   const attachmentsDirectory = join5(runDirectory, "attachments");
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  for (let i = 0; i < options.attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        options.attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths,
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
   const instruction = options.instruction;
   const instructionEmpty = instruction.trim() === "";
   const admitted = {
@@ -15605,6 +15689,7 @@ async function admitJudgeInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     attachments: attachments.map((a) => ({
@@ -15630,7 +15715,8 @@ async function admitJudgeInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
-    admittedRequestPath
+    admittedRequestPath,
+    ...ticketFields
   };
 }
 function buildJudgeTransportPrompt(admitted) {
@@ -15668,16 +15754,11 @@ async function admitCoderInvocation(options) {
   const attachmentsDirectory = join5(runDirectory, "attachments");
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  for (let i = 0; i < options.attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        options.attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths,
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
   const taskPath = join5(runDirectory, "task.md");
   await writeFile2(taskPath, instruction, "utf8");
   const admitted = {
@@ -15689,6 +15770,7 @@ async function admitCoderInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     taskPath,
@@ -15717,7 +15799,8 @@ async function admitCoderInvocation(options) {
     sessionDirectory,
     sessionFile,
     admittedRequestPath,
-    taskPath
+    taskPath,
+    ...ticketFields
   };
 }
 function buildCoderTransportPrompt(admitted) {
@@ -15744,29 +15827,12 @@ async function admitFixerInvocation(options) {
   if (options.phase !== "plan" && options.phase !== "apply") {
     throw new CliUsageError("fixer phase must be plan or apply");
   }
-  const projectRoot = resolve4(options.project ?? options.cwd);
-  const runId = (options.createRunId ?? uuidv7)();
-  const { ledgerHome, bookKey, runDirectory, sessionDirectory, sessionFile } = roleRunSessionCoordinates({ cwd: projectRoot, runId, role: "fixer", home: options.home });
-  const attachmentsDirectory = join5(runDirectory, "attachments");
-  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
-  ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  for (let i = 0; i < options.attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        options.attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
   let prerequisites = Object.freeze([]);
-  let prerequisitesPath;
+  let prerequisitesSource;
   if (options.prerequisitesPath !== void 0) {
     const absolutePrereq = isAbsolute3(options.prerequisitesPath) ? options.prerequisitesPath : resolve4(options.prerequisitesPath);
-    let source;
     try {
-      source = await readFile4(absolutePrereq, "utf8");
+      prerequisitesSource = await readFile4(absolutePrereq, "utf8");
     } catch (error) {
       throw new CliUsageError(
         `fixer prerequisites path is unreadable: ${options.prerequisitesPath}`,
@@ -15774,13 +15840,27 @@ async function admitFixerInvocation(options) {
       );
     }
     try {
-      prerequisites = parseFixerPrerequisites(source);
+      prerequisites = parseFixerPrerequisites(prerequisitesSource);
     } catch (error) {
       if (error instanceof FixerPacketValidationError) {
         throw new CliUsageError(error.message, { cause: error });
       }
       throw error;
     }
+  }
+  const projectRoot = resolve4(options.project ?? options.cwd);
+  const runId = (options.createRunId ?? uuidv7)();
+  const { ledgerHome, bookKey, runDirectory, sessionDirectory, sessionFile } = roleRunSessionCoordinates({ cwd: projectRoot, runId, role: "fixer", home: options.home });
+  const attachmentsDirectory = join5(runDirectory, "attachments");
+  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
+  ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths,
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
+  let prerequisitesPath;
+  if (prerequisitesSource !== void 0) {
     prerequisitesPath = join5(runDirectory, "prerequisites.json");
     await writeFile2(
       prerequisitesPath,
@@ -15800,6 +15880,7 @@ async function admitFixerInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     packetPath,
@@ -15835,7 +15916,8 @@ async function admitFixerInvocation(options) {
     admittedRequestPath,
     packetPath,
     ...prerequisitesPath === void 0 ? {} : { prerequisitesPath },
-    prerequisites
+    prerequisites,
+    ...ticketFields
   };
 }
 function buildFixerTransportPrompt(admitted) {
@@ -16003,34 +16085,32 @@ async function admitCollectorInvocation(options) {
   } else {
     repository = resolveGitHubRemoteRepository(projectRoot);
   }
-  const runId = (options.createRunId ?? uuidv7)();
-  const { ledgerHome, bookKey, runDirectory, sessionDirectory, sessionFile } = roleRunSessionCoordinates({ cwd: projectRoot, runId, role: "collector", home: options.home });
-  const attachmentsDirectory = join5(runDirectory, "attachments");
-  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
-  ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  const attachmentPaths = options.attachmentPaths ?? [];
-  for (let i = 0; i < attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
   let manifest = emptyCollectorManifest();
-  let requestManifestPath;
+  let manifestCanonicalJson;
   if (options.requestManifestPath !== void 0) {
     try {
       manifest = await loadCollectorManifest(options.requestManifestPath);
+      manifestCanonicalJson = manifest.canonicalJson;
     } catch (error) {
       throw new CliUsageError(error instanceof Error ? error.message : String(error), { cause: error });
     }
-    requestManifestPath = join5(runDirectory, "request-manifest.json");
-    await writeFile2(requestManifestPath, manifest.canonicalJson, "utf8");
   }
   const manifestDigest = manifest.digest;
+  const runId = (options.createRunId ?? uuidv7)();
+  const { ledgerHome, bookKey, runDirectory, sessionDirectory, sessionFile } = roleRunSessionCoordinates({ cwd: projectRoot, runId, role: "collector", home: options.home });
+  const attachmentsDirectory = join5(runDirectory, "attachments");
+  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
+  ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths ?? [],
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
+  let requestManifestPath;
+  if (manifestCanonicalJson !== void 0) {
+    requestManifestPath = join5(runDirectory, "request-manifest.json");
+    await writeFile2(requestManifestPath, manifestCanonicalJson, "utf8");
+  }
   const instruction = options.instruction ?? "";
   const instructionEmpty = instruction.trim() === "";
   const admitted = {
@@ -16041,6 +16121,7 @@ async function admitCollectorInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     prNumber,
@@ -16079,7 +16160,8 @@ async function admitCollectorInvocation(options) {
     prNumber,
     repository,
     ...requestManifestPath === void 0 ? {} : { requestManifestPath },
-    manifestDigest
+    manifestDigest,
+    ...ticketFields
   };
 }
 function buildCollectorTransportPrompt(_admitted) {
@@ -16276,17 +16358,11 @@ async function admitDoctorInvocation(options) {
   const attachmentsDirectory = join5(runDirectory, "attachments");
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  const attachmentPaths = options.attachmentPaths ?? [];
-  for (let i = 0; i < attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths ?? [],
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
   const instruction = options.instruction ?? "";
   const instructionEmpty = instruction.trim() === "";
   const admitted = {
@@ -16297,6 +16373,7 @@ async function admitDoctorInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     issueNumber: options.issueNumber,
@@ -16332,7 +16409,8 @@ async function admitDoctorInvocation(options) {
     admittedRequestPath,
     issueNumber: options.issueNumber,
     caseRunsPath,
-    caseIdentity: caseIdentity2
+    caseIdentity: caseIdentity2,
+    ...ticketFields
   };
 }
 function buildDoctorTransportPrompt(admitted) {
@@ -16402,16 +16480,11 @@ async function admitReviewerInvocation(options) {
   const attachmentsDirectory = join5(runDirectory, "attachments");
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  for (let i = 0; i < options.attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        options.attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths,
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
   const instruction = options.instruction;
   const instructionEmpty = instruction.trim() === "";
   const admitted = {
@@ -16422,6 +16495,7 @@ async function admitReviewerInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     baseRevision: options.baseRevision,
@@ -16453,7 +16527,8 @@ async function admitReviewerInvocation(options) {
     sessionDirectory,
     sessionFile,
     admittedRequestPath,
-    baseRevision: options.baseRevision
+    baseRevision: options.baseRevision,
+    ...ticketFields
   };
 }
 function buildReviewerTransportPrompt(admitted) {
@@ -16555,16 +16630,11 @@ async function admitMergerInvocation(options) {
   const attachmentsDirectory = join5(runDirectory, "attachments");
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-  const attachments = [];
-  for (let i = 0; i < options.attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        options.attachmentPaths[i],
-        attachmentsDirectory,
-        i
-      )
-    );
-  }
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths,
+    attachmentsDirectory
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
   const targetIntent = mergerMaterialFromUtf8(
     `Investigate primary sources for target parent ${derived.targetObjectId}. Do not invent intent.`
   );
@@ -16604,6 +16674,7 @@ async function admitMergerInvocation(options) {
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     mergerInputPath,
@@ -16643,7 +16714,8 @@ async function admitMergerInvocation(options) {
     sessionFile,
     admittedRequestPath,
     mergerInputPath,
-    derived: admitted.derived
+    derived: admitted.derived,
+    ...ticketFields
   };
 }
 function buildMergerTransportPrompt(admitted) {
@@ -16666,6 +16738,7 @@ var init_invocation = __esm({
     init_activation_ledger_topology();
     init_activation_ledger_git();
     init_sitian_role_run_coordinates();
+    init_ticket_frontmatter();
     init_doctor_evidence();
     init_collector_config();
     init_fixer_packet();
@@ -17524,6 +17597,20 @@ async function findRunDirectoryById(home, runId) {
   }
   return void 0;
 }
+function parsePersistedTicketIdentity(record4) {
+  const correlationId = typeof record4.correlationId === "string" && record4.correlationId.trim() !== "" ? record4.correlationId : void 0;
+  const ticketNumber = typeof record4.ticketNumber === "number" && Number.isInteger(record4.ticketNumber) && record4.ticketNumber >= 1 ? record4.ticketNumber : void 0;
+  return {
+    ...correlationId === void 0 ? {} : { correlationId },
+    ...ticketNumber === void 0 ? {} : { ticketNumber }
+  };
+}
+function restoredTicketFields(fields) {
+  return {
+    ...fields.correlationId === void 0 ? {} : { correlationId: fields.correlationId },
+    ...fields.ticketNumber === void 0 ? {} : { ticketNumber: fields.ticketNumber }
+  };
+}
 async function loadResumableRunRecord(home, runId) {
   const runDirectory = await findRunDirectoryById(home, runId);
   if (runDirectory === void 0) {
@@ -17555,6 +17642,8 @@ async function loadResumableRunRecord(home, runId) {
   let baseRevision;
   let mergerInputPath;
   let derived;
+  let correlationId;
+  let ticketNumber;
   try {
     const raw = JSON.parse(
       await readFile8(run.admittedRequestPath, "utf8")
@@ -17603,12 +17692,36 @@ async function loadResumableRunRecord(home, runId) {
           };
         }
       }
+      const fromAdmitted = parsePersistedTicketIdentity(record4);
+      correlationId = fromAdmitted.correlationId;
+      ticketNumber = fromAdmitted.ticketNumber;
     }
   } catch {
     throw new CliUsageError(
       `role run admitted request is unreadable: ${runId}`
     );
   }
+  if (correlationId === void 0 || ticketNumber === void 0) {
+    try {
+      const invocationRaw = JSON.parse(
+        await readFile8(join9(run.runDirectory, "invocation.json"), "utf8")
+      );
+      if (invocationRaw !== null && typeof invocationRaw === "object" && !Array.isArray(invocationRaw)) {
+        const fromInvocation = parsePersistedTicketIdentity(
+          invocationRaw
+        );
+        if (correlationId === void 0) correlationId = fromInvocation.correlationId;
+        if (ticketNumber === void 0) ticketNumber = fromInvocation.ticketNumber;
+      }
+    } catch (error) {
+      if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) {
+        throw new CliUsageError(
+          `role run invocation identity is unreadable: ${runId}`,
+          { cause: error }
+        );
+      }
+    }
+  }
   return {
     run,
     observation: run.resumable,
@@ -17623,7 +17736,9 @@ async function loadResumableRunRecord(home, runId) {
       ...prerequisites === void 0 ? {} : { prerequisites },
       ...baseRevision === void 0 ? {} : { baseRevision },
       ...mergerInputPath === void 0 ? {} : { mergerInputPath },
-      ...derived === void 0 ? {} : { derived }
+      ...derived === void 0 ? {} : { derived },
+      ...correlationId === void 0 ? {} : { correlationId },
+      ...ticketNumber === void 0 ? {} : { ticketNumber }
     }
   };
 }
@@ -17645,7 +17760,8 @@ async function loadResumableJudgeRun(home, runId) {
     runDirectory: loaded.run.runDirectory,
     sessionDirectory: loaded.run.sessionDirectory,
     sessionFile: loaded.run.sessionFile,
-    admittedRequestPath: loaded.run.admittedRequestPath
+    admittedRequestPath: loaded.run.admittedRequestPath,
+    ...restoredTicketFields(loaded.admittedFields)
   };
   return {
     admitted,
@@ -17690,7 +17806,8 @@ async function loadResumableCoderRun(home, runId) {
     sessionDirectory: loaded.run.sessionDirectory,
     sessionFile: loaded.run.sessionFile,
     admittedRequestPath: loaded.run.admittedRequestPath,
-    taskPath
+    taskPath,
+    ...restoredTicketFields(loaded.admittedFields)
   };
   return {
     admitted,
@@ -17738,7 +17855,8 @@ async function loadResumableFixerRun(home, runId) {
     admittedRequestPath: loaded.run.admittedRequestPath,
     packetPath,
     ...loaded.admittedFields.prerequisitesPath === void 0 ? {} : { prerequisitesPath: loaded.admittedFields.prerequisitesPath },
-    prerequisites
+    prerequisites,
+    ...restoredTicketFields(loaded.admittedFields)
   };
   return {
     admitted,
@@ -17771,7 +17889,8 @@ async function loadResumableReviewerRun(home, runId) {
     sessionDirectory: loaded.run.sessionDirectory,
     sessionFile: loaded.run.sessionFile,
     admittedRequestPath: loaded.run.admittedRequestPath,
-    baseRevision
+    baseRevision,
+    ...restoredTicketFields(loaded.admittedFields)
   };
   return {
     admitted,
@@ -17816,7 +17935,8 @@ async function loadResumableMergerRun(home, runId) {
     sessionFile: loaded.run.sessionFile,
     admittedRequestPath: loaded.run.admittedRequestPath,
     mergerInputPath,
-    derived
+    derived,
+    ...restoredTicketFields(loaded.admittedFields)
   };
   return {
     admitted,
@@ -21265,8 +21385,9 @@ async function dispatchAdmittedCoder(input) {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory
     };
-    if (env.correlationId !== void 0 && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== void 0 && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
     let result2;
     try {
@@ -21412,7 +21533,10 @@ async function runPublicCoder(argv, env, io, parseCoderArgv2) {
   });
   return await dispatchAdmittedCoder({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -21486,7 +21610,10 @@ async function runPublicCoderResume(argv, env, io) {
   });
   return await dispatchAdmittedCoder({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -21591,8 +21718,9 @@ async function dispatchAdmittedCollector(input) {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory
     };
-    if (env.correlationId !== void 0 && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== void 0 && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
     let result2;
     try {
@@ -21721,7 +21849,10 @@ async function runPublicCollector(argv, env, io, parseCollectorArgv2) {
   });
   return await dispatchAdmittedCollector({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease
@@ -22123,8 +22254,9 @@ async function dispatchAdmittedFixer(input) {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory
     };
-    if (env.correlationId !== void 0 && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== void 0 && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
     let result2;
     try {
@@ -22286,7 +22418,10 @@ async function runPublicFixer(argv, env, io, parseFixerArgv2) {
   });
   return await dispatchAdmittedFixer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -22353,7 +22488,10 @@ async function runPublicFixerResume(argv, env, io) {
   });
   return await dispatchAdmittedFixer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -22497,8 +22635,9 @@ async function dispatchAdmittedJudge(input) {
       // and role-runtime can record typed provider HTTP observations.
       AK_ROLE_RUN_DIR: admitted.runDirectory
     };
-    if (env.correlationId !== void 0 && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== void 0 && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
     let result2;
     try {
@@ -22631,7 +22770,10 @@ async function runPublicJudge(argv, env, io, parseJudgeArgv2) {
   });
   return await dispatchAdmittedJudge({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease
@@ -22680,7 +22822,10 @@ async function runPublicResume(argv, env, io) {
   });
   return await dispatchAdmittedJudge({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease
@@ -22838,8 +22983,9 @@ async function dispatchAdmittedMerger(input) {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory
     };
-    if (env.correlationId !== void 0 && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== void 0 && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
     let result2;
     try {
@@ -23071,7 +23217,10 @@ async function runPublicMerger(argv, env, io, parseMergerArgv2) {
   });
   return await dispatchAdmittedMerger({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -23139,7 +23288,10 @@ async function runPublicMergerResume(argv, env, io) {
   });
   return await dispatchAdmittedMerger({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -23300,8 +23452,9 @@ async function dispatchAdmittedReviewer(input) {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory
     };
-    if (env.correlationId !== void 0 && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== void 0 && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
     let result2;
     try {
@@ -23462,7 +23615,10 @@ async function runPublicReviewer(argv, env, io, parseReviewerArgv2) {
   });
   return await dispatchAdmittedReviewer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -23529,7 +23685,10 @@ async function runPublicReviewerResume(argv, env, io) {
   });
   return await dispatchAdmittedReviewer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     io,
     extraArgs,
     lease,
@@ -23554,6 +23713,7 @@ var init_reviewer_run = __esm({
 var cli_exports = {};
 __export(cli_exports, {
   CliUsageError: () => CliUsageError,
+  PUBLIC_ROLE_ARGV: () => PUBLIC_ROLE_ARGV,
   buildExplicitInternalActivationArgs: () => buildExplicitInternalActivationArgs,
   helpDocument: () => helpDocument,
   resolveInternalRoleEntrypoint: () => resolveInternalRoleEntrypoint,
@@ -23562,6 +23722,42 @@ __export(cli_exports, {
 import { realpath as realpath5 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
 import { join as join18 } from "node:path";
+function takePublicGlobalFlag(argv, index) {
+  const token = argv[index];
+  if (token === void 0) return void 0;
+  if (token === "--help" || token === "-h") {
+    return { flag: "help", consume: 1 };
+  }
+  if (token === "--model") {
+    const value = argv[index + 1];
+    if (value === void 0) {
+      return { flag: "model", consume: 1, value: void 0 };
+    }
+    return { flag: "model", consume: 2, value };
+  }
+  if (token.startsWith("--model=")) {
+    return {
+      flag: "model",
+      consume: 1,
+      value: token.slice("--model=".length)
+    };
+  }
+  if (token === "--thinking") {
+    const raw = argv[index + 1];
+    if (raw === void 0) {
+      return { flag: "thinking", consume: 1, raw: void 0 };
+    }
+    return { flag: "thinking", consume: 2, raw };
+  }
+  if (token.startsWith("--thinking=")) {
+    return {
+      flag: "thinking",
+      consume: 1,
+      raw: token.slice("--thinking=".length)
+    };
+  }
+  return void 0;
+}
 function defaultIo() {
   return {
     stdout: (text) => {
@@ -23591,40 +23787,34 @@ function parseArgv(argv) {
   let help = false;
   const positional = [];
   while (args.length > 0) {
-    const token = args.shift();
-    if (token === "--") {
+    if (args[0] === "--") {
+      args.shift();
       positional.push(...args);
       break;
     }
-    if (token === "--help" || token === "-h") {
-      help = true;
-      continue;
-    }
-    if (token === "--model") {
-      const value = args.shift();
-      if (value === void 0) throw new CliUsageError("--model requires a value");
-      model = value;
-      continue;
-    }
-    if (token.startsWith("--model=")) {
-      model = token.slice("--model=".length);
-      continue;
-    }
-    if (token === "--thinking") {
-      const value = args.shift();
-      if (value === void 0) throw new CliUsageError("--thinking requires a value");
-      thinking = parseThinking(value);
-      continue;
-    }
-    if (token.startsWith("--thinking=")) {
-      thinking = parseThinking(token.slice("--thinking=".length));
-      continue;
-    }
-    if (token.startsWith("-") && token !== "-") {
-      positional.push(token);
+    const taken = takePublicGlobalFlag(args, 0);
+    if (taken !== void 0) {
+      if (taken.flag === "help") {
+        help = true;
+        args.splice(0, taken.consume);
+        continue;
+      }
+      if (taken.flag === "model") {
+        if (taken.value === void 0) {
+          throw new CliUsageError("--model requires a value");
+        }
+        model = taken.value;
+        args.splice(0, taken.consume);
+        continue;
+      }
+      if (taken.raw === void 0) {
+        throw new CliUsageError("--thinking requires a value");
+      }
+      thinking = parseThinking(taken.raw);
+      args.splice(0, taken.consume);
       continue;
     }
-    positional.push(token);
+    positional.push(args.shift());
   }
   const [command, ...rest] = positional;
   return {
@@ -23957,7 +24147,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseJudgeArgv
+        PUBLIC_ROLE_ARGV.judge.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -23991,7 +24181,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseCoderArgv
+        PUBLIC_ROLE_ARGV.coder.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -24025,7 +24215,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseFixerArgv
+        PUBLIC_ROLE_ARGV.fixer.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -24059,7 +24249,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseCollectorArgv
+        PUBLIC_ROLE_ARGV.collector.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -24093,7 +24283,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseReviewerArgv
+        PUBLIC_ROLE_ARGV.reviewer.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -24127,7 +24317,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseDoctorArgv
+        PUBLIC_ROLE_ARGV.doctor.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -24161,7 +24351,7 @@ async function runAkRole(argv, env) {
           ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
         },
         io,
-        parseMergerArgv
+        PUBLIC_ROLE_ARGV.merger.parse
       );
       return {
         exitCode: result2.exitCode,
@@ -24183,7 +24373,7 @@ async function runAkRole(argv, env) {
     return { exitCode: 1 };
   }
 }
-var THINKING_LEVELS2;
+var PUBLIC_ROLE_ARGV, THINKING_LEVELS2;
 var init_cli = __esm({
   "src/public-cli/cli.ts"() {
     "use strict";
@@ -24203,6 +24393,15 @@ var init_cli = __esm({
     init_settlement();
     init_explicit_internal();
     init_cli_errors();
+    PUBLIC_ROLE_ARGV = {
+      judge: { parse: parseJudgeArgv },
+      coder: { parse: parseCoderArgv },
+      fixer: { parse: parseFixerArgv },
+      collector: { parse: parseCollectorArgv },
+      doctor: { parse: parseDoctorArgv },
+      merger: { parse: parseMergerArgv },
+      reviewer: { parse: parseReviewerArgv }
+    };
     THINKING_LEVELS2 = /* @__PURE__ */ new Set([
       "off",
       "minimal",