@akagilnc/pi-workflow-roles 0.1.1893 → 0.1.1941

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

@@ -211,8 +211,9 @@ async function dispatchAdmittedCollector(input: {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory,
     };
-    if (env.correlationId !== undefined && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== undefined && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
 
     let result: ExplicitInternalPiResult;
@@ -368,7 +369,10 @@ export async function runPublicCollector(
 
   return await dispatchAdmittedCollector({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,

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

@@ -312,8 +312,9 @@ async function dispatchAdmittedFixer(input: {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory,
     };
-    if (env.correlationId !== undefined && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== undefined && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
 
     let result: ExplicitInternalPiResult;
@@ -507,7 +508,10 @@ export async function runPublicFixer(
 
   return await dispatchAdmittedFixer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,
@@ -593,7 +597,10 @@ export async function runPublicFixerResume(
 
   return await dispatchAdmittedFixer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,

package/src/public-cli/invocation.ts

@@ -20,6 +20,7 @@ import {
 } from "../activation-ledger-topology.ts";
 import { resolveBookKeyFromGit } from "../activation-ledger-git.ts";
 import { roleRunSessionCoordinates } from "../sitian-role-run-coordinates.ts";
+import { resolveTicketNumberFromAttachmentBodies } from "../ticket-frontmatter.ts";
 import {
   loadDoctorCase,
 } from "../doctor-evidence.ts";
@@ -73,6 +74,16 @@ export type AdmittedRoleInvocationBase = {
   /** Exact Pi session file principal (bound at admission; reopened on resume). */
   readonly sessionFile: string;
   readonly admittedRequestPath: string;
+  /**
+   * Optional opaque invocation correlation restored from a prior admitted page
+   * (ADR 0049 host channel). Admission does not mint ticket-binding ids.
+   */
+  readonly correlationId?: string;
+  /**
+   * Typed ticket face from frozen attachment frontmatter (`ticketNumber`).
+   * Absent when no attachment carries a valid contract field (unbound).
+   */
+  readonly ticketNumber?: number;
 };
 
 export type AdmittedJudgeInvocation = AdmittedRoleInvocationBase & {
@@ -123,6 +134,11 @@ export type AdmittedReviewerInvocation = AdmittedRoleInvocationBase & {
   readonly role: "reviewer";
   /** Required fixed base revision for the pinned review target (ADR 0037). */
   readonly baseRevision: string;
+  /**
+   * Optional durable authority references/URLs frozen at admission.
+   * Spec evidence-child material only — never Standards, never invocation prose promotion.
+   */
+  readonly authorityRefs: readonly string[];
 };
 
 /** Mechanical envelope derived from the active ordinary two-parent merge. */
@@ -153,7 +169,7 @@ export type AdmittedRoleInvocation =
 
 type RoleInvocationLedgerSource = Pick<
   AdmittedRoleInvocationBase,
-  "runId" | "bookKey" | "projectRoot" | "runDirectory" | "sessionDirectory" | "sessionFile"
+  "runId" | "bookKey" | "projectRoot" | "runDirectory" | "sessionDirectory" | "sessionFile" | "correlationId" | "ticketNumber"
 >;
 
 /**
@@ -173,6 +189,8 @@ async function writeRoleInvocationLedger(
     runDirectory: source.runDirectory,
     sessionDirectory: source.sessionDirectory,
     sessionFile: source.sessionFile,
+    ...(source.correlationId === undefined ? {} : { correlationId: source.correlationId }),
+    ...(source.ticketNumber === undefined ? {} : { ticketNumber: source.ticketNumber }),
   };
   await writeFile(
     join(source.runDirectory, "invocation.json"),
@@ -305,6 +323,8 @@ export type ParseReviewerArgvResult = {
   attachmentPaths: string[];
   /** Required fixed base revision for the pinned review target. */
   baseRevision: string;
+  /** Repeatable durable authority references/URLs (exact order preserved). */
+  authorityRefs: string[];
   project?: string;
 };
 
@@ -340,6 +360,25 @@ function requireOptionPath(
   return value;
 }
 
+/**
+ * Public --authority-ref admission grammar (refs-only).
+ * Unique owner for fresh argv and durable resume restore — no string-only parallel.
+ * Accepts durable reference tokens as-is; rejects blank and inline Spec prose
+ * (whitespace-bearing sentences). Does not fetch, normalize, or judge content.
+ */
+export function requireAuthorityRef(value: string | undefined): string {
+  if (value === undefined || value.trim() === "") {
+    throw new CliUsageError("--authority-ref requires a nonempty durable reference");
+  }
+  // Spec prose sentences contain whitespace; durable public refs are single tokens.
+  if (/\s/.test(value)) {
+    throw new CliUsageError(
+      "--authority-ref requires a durable reference, not inline Spec prose",
+    );
+  }
+  return value;
+}
+
 /**
  * Parse Judge-specific argv after the `judge` token.
  * Rejects any public burden selector/hint and unknown flags.
@@ -525,7 +564,7 @@ async function freezeRegularFileAttachment(
   sourcePath: string,
   destinationDir: string,
   index: number,
-): Promise<FrozenAttachment> {
+): Promise<{ attachment: FrozenAttachment; body: Buffer }> {
   const absolute = isAbsolute(sourcePath) ? sourcePath : resolve(sourcePath);
   let st;
   try {
@@ -546,14 +585,49 @@ async function freezeRegularFileAttachment(
   const frozenPath = join(destinationDir, name);
   await writeFile(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,
   };
 }
 
+/** Freeze attachments and resolve typed ticketNumber from frozen bodies (bind-if-present). */
+async function freezeAttachmentsWithTicketNumber(
+  attachmentPaths: readonly string[],
+  attachmentsDirectory: string,
+): Promise<{
+  readonly attachments: FrozenAttachment[];
+  readonly ticketNumber?: number;
+}> {
+  const attachments: FrozenAttachment[] = [];
+  const bodies: Buffer[] = [];
+  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 === undefined ? {} : { ticketNumber }),
+  };
+}
+
+function ticketAdmissionFields(
+  ticketNumber: number | undefined,
+): { ticketNumber?: number } {
+  return ticketNumber === undefined ? {} : { ticketNumber };
+}
+
 export type AdmitJudgeInvocationOptions = {
   home: string;
   cwd: string;
@@ -583,16 +657,11 @@ export async function admitJudgeInvocation(
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
 
-  const attachments: FrozenAttachment[] = [];
-  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() === "";
@@ -604,6 +673,7 @@ export async function admitJudgeInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     attachments: attachments.map((a) => ({
@@ -630,6 +700,7 @@ export async function admitJudgeInvocation(
     sessionDirectory,
     sessionFile,
     admittedRequestPath,
+    ...ticketFields,
   };
 }
 
@@ -721,16 +792,11 @@ export async function admitCoderInvocation(
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
 
-  const attachments: FrozenAttachment[] = [];
-  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 = join(runDirectory, "task.md");
   await writeFile(taskPath, instruction, "utf8");
@@ -744,6 +810,7 @@ export async function admitCoderInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     taskPath,
@@ -773,6 +840,7 @@ export async function admitCoderInvocation(
     sessionFile,
     admittedRequestPath,
     taskPath,
+    ...ticketFields,
   };
 }
 
@@ -828,34 +896,15 @@ export async function admitFixerInvocation(
     throw new CliUsageError("fixer phase must be plan or apply");
   }
 
-  const projectRoot = resolve(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 = join(runDirectory, "attachments");
-  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
-  ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
-
-  const attachments: FrozenAttachment[] = [];
-  for (let i = 0; i < options.attachmentPaths.length; i += 1) {
-    attachments.push(
-      await freezeRegularFileAttachment(
-        options.attachmentPaths[i]!,
-        attachmentsDirectory,
-        i,
-      ),
-    );
-  }
-
+  // Validate/read prerequisites before freezing request materials.
   let prerequisites: readonly FixerPrerequisite[] = Object.freeze([]);
-  let prerequisitesPath: string | undefined;
+  let prerequisitesSource: string | undefined;
   if (options.prerequisitesPath !== undefined) {
     const absolutePrereq = isAbsolute(options.prerequisitesPath)
       ? options.prerequisitesPath
       : resolve(options.prerequisitesPath);
-    let source: string;
     try {
-      source = await readFile(absolutePrereq, "utf8");
+      prerequisitesSource = await readFile(absolutePrereq, "utf8");
     } catch (error) {
       throw new CliUsageError(
         `fixer prerequisites path is unreadable: ${options.prerequisitesPath}`,
@@ -863,13 +912,31 @@ export async function admitFixerInvocation(
       );
     }
     try {
-      prerequisites = parseFixerPrerequisites(source);
+      prerequisites = parseFixerPrerequisites(prerequisitesSource);
     } catch (error) {
       if (error instanceof FixerPacketValidationError) {
         throw new CliUsageError(error.message, { cause: error });
       }
       throw error;
     }
+  }
+
+  const projectRoot = resolve(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 = join(runDirectory, "attachments");
+  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
+  ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
+
+  const { attachments, ticketNumber } = await freezeAttachmentsWithTicketNumber(
+    options.attachmentPaths,
+    attachmentsDirectory,
+  );
+  const ticketFields = ticketAdmissionFields(ticketNumber);
+
+  let prerequisitesPath: string | undefined;
+  if (prerequisitesSource !== undefined) {
     prerequisitesPath = join(runDirectory, "prerequisites.json");
     await writeFile(
       prerequisitesPath,
@@ -890,6 +957,7 @@ export async function admitFixerInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     packetPath,
@@ -926,6 +994,7 @@ export async function admitFixerInvocation(
     packetPath,
     ...(prerequisitesPath === undefined ? {} : { prerequisitesPath }),
     prerequisites,
+    ...ticketFields,
   };
 }
 
@@ -1103,6 +1172,19 @@ export async function admitCollectorInvocation(
     repository = resolveGitHubRemoteRepository(projectRoot);
   }
 
+  // Validate optional request-manifest before freezing request materials.
+  let manifest = emptyCollectorManifest();
+  let manifestCanonicalJson: string | undefined;
+  if (options.requestManifestPath !== undefined) {
+    try {
+      manifest = await loadCollectorManifest(options.requestManifestPath);
+      manifestCanonicalJson = manifest.canonicalJson;
+    } catch (error) {
+      throw new CliUsageError(error instanceof Error ? error.message : String(error), { cause: error });
+    }
+  }
+  const manifestDigest = manifest.digest;
+
   const runId = (options.createRunId ?? uuidv7)();
   const { ledgerHome, bookKey, runDirectory, sessionDirectory, sessionFile } =
     roleRunSessionCoordinates({ cwd: projectRoot, runId, role: "collector", home: options.home });
@@ -1110,30 +1192,17 @@ export async function admitCollectorInvocation(
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
 
-  const attachments: FrozenAttachment[] = [];
-  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);
 
-  let manifest = emptyCollectorManifest();
   let requestManifestPath: string | undefined;
-  if (options.requestManifestPath !== undefined) {
-    try {
-      manifest = await loadCollectorManifest(options.requestManifestPath);
-    } catch (error) {
-      throw new CliUsageError(error instanceof Error ? error.message : String(error), { cause: error });
-    }
+  if (manifestCanonicalJson !== undefined) {
     requestManifestPath = join(runDirectory, "request-manifest.json");
-    await writeFile(requestManifestPath, manifest.canonicalJson, "utf8");
+    await writeFile(requestManifestPath, manifestCanonicalJson, "utf8");
   }
-  const manifestDigest = manifest.digest;
 
   const instruction = options.instruction ?? "";
   const instructionEmpty = instruction.trim() === "";
@@ -1145,6 +1214,7 @@ export async function admitCollectorInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     prNumber,
@@ -1184,6 +1254,7 @@ export async function admitCollectorInvocation(
     repository,
     ...(requestManifestPath === undefined ? {} : { requestManifestPath }),
     manifestDigest,
+    ...ticketFields,
   };
 }
 
@@ -1462,17 +1533,11 @@ export async function admitDoctorInvocation(
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
 
-  const attachments: FrozenAttachment[] = [];
-  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() === "";
@@ -1484,6 +1549,7 @@ export async function admitDoctorInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     issueNumber: options.issueNumber,
@@ -1520,6 +1586,7 @@ export async function admitDoctorInvocation(
     issueNumber: options.issueNumber,
     caseRunsPath,
     caseIdentity,
+    ...ticketFields,
   };
 }
 
@@ -1540,13 +1607,15 @@ export function buildDoctorTransportPrompt(
 
 /**
  * Parse Reviewer-specific argv after the `reviewer` token.
- * Public flags: --project and required --base (the non-interactive CLI cannot answer the canonical fixed-point question).
+ * Public flags: --project, required --base, optional repeatable --authority-ref.
  * Reviewer gathers its own evidence; users submit neither attachments nor capability packets.
+ * Caller instruction remains scope/procedure provenance — not Spec authority.
  */
 export function parseReviewerArgv(
   args: readonly string[],
 ): ParseReviewerArgvResult {
   const attachmentPaths: string[] = [];
+  const authorityRefs: string[] = [];
   let project: string | undefined;
   let baseRevision: string | undefined;
   const positional: string[] = [];
@@ -1574,6 +1643,14 @@ export function parseReviewerArgv(
       baseRevision = requireOptionPath("--base", token.slice("--base=".length));
       continue;
     }
+    if (token === "--authority-ref") {
+      authorityRefs.push(requireAuthorityRef(tokens.shift()));
+      continue;
+    }
+    if (token.startsWith("--authority-ref=")) {
+      authorityRefs.push(requireAuthorityRef(token.slice("--authority-ref=".length)));
+      continue;
+    }
     if (token.startsWith("-") && token !== "-") {
       throw new CliUsageError(`unknown reviewer option: ${token}`);
     }
@@ -1587,6 +1664,7 @@ export function parseReviewerArgv(
     instruction: positional.join(" "),
     attachmentPaths,
     baseRevision,
+    authorityRefs,
     ...(project === undefined ? {} : { project }),
   };
 }
@@ -1598,6 +1676,8 @@ export type AdmitReviewerInvocationOptions = {
   instruction: string;
   attachmentPaths: readonly string[];
   baseRevision: string;
+  /** Optional durable authority references/URLs; frozen unchanged at admission. */
+  authorityRefs?: readonly string[];
   project?: string;
   createRunId?: () => string;
 };
@@ -1605,6 +1685,7 @@ export type AdmitReviewerInvocationOptions = {
 /**
  * Admit a Reviewer Role run on the fixed base only.
  * Caller instruction is optional provenance; Reviewer acquires issue/authority independently.
+ * Optional authorityRefs are frozen as durable references only — not Spec prose.
  */
 export async function admitReviewerInvocation(
   options: AdmitReviewerInvocationOptions,
@@ -1615,6 +1696,9 @@ export async function admitReviewerInvocation(
   if (options.baseRevision.trim() === "") {
     throw new CliUsageError("--base requires a nonempty revision");
   }
+  const authorityRefs = Object.freeze(
+    (options.authorityRefs ?? []).map((ref) => requireAuthorityRef(ref)),
+  );
 
   const projectRoot = resolve(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
@@ -1625,16 +1709,11 @@ export async function admitReviewerInvocation(
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
 
   // Public parse already rejects attachments; keep freeze loop for structural symmetry.
-  const attachments: FrozenAttachment[] = [];
-  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() === "";
@@ -1646,9 +1725,11 @@ export async function admitReviewerInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     baseRevision: options.baseRevision,
+    authorityRefs: [...authorityRefs],
     attachments: attachments.map((a) => ({
       provenancePath: a.provenancePath,
       frozenPath: a.frozenPath,
@@ -1678,6 +1759,8 @@ export async function admitReviewerInvocation(
     sessionFile,
     admittedRequestPath,
     baseRevision: options.baseRevision,
+    authorityRefs,
+    ...ticketFields,
   };
 }
 
@@ -1845,16 +1928,11 @@ export async function admitMergerInvocation(
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
 
-  const attachments: FrozenAttachment[] = [];
-  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);
 
   // Intent materials seed primary-source investigation; the method owns the work.
   const targetIntent = mergerMaterialFromUtf8(
@@ -1866,6 +1944,7 @@ export async function admitMergerInvocation(
   const taskMaterial = mergerMaterialFromUtf8(instruction);
   const authorityMaterial = mergerMaterialFromUtf8(instruction);
 
+  // Validate merger envelope before placing admitted identity.
   const mergerInput = validateMergerInput({
     version: 1,
     attemptId: runId,
@@ -1898,6 +1977,7 @@ export async function admitMergerInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     mergerInputPath,
@@ -1938,6 +2018,7 @@ export async function admitMergerInvocation(
     admittedRequestPath,
     mergerInputPath,
     derived: admitted.derived,
+    ...ticketFields,
   };
 }
 

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

@@ -289,8 +289,9 @@ async function dispatchAdmittedJudge(input: {
       // and role-runtime can record typed provider HTTP observations.
       AK_ROLE_RUN_DIR: admitted.runDirectory,
     };
-    if (env.correlationId !== undefined && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== undefined && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
 
     let result: ExplicitInternalPiResult;
@@ -450,7 +451,10 @@ export async function runPublicJudge(
 
   return await dispatchAdmittedJudge({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,
@@ -520,7 +524,10 @@ export async function runPublicResume(
 
   return await dispatchAdmittedJudge({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,