@akagilnc/pi-workflow-roles 0.1.1883 → 0.1.1918

package/src/public-cli/explicit-internal.ts

@@ -21,6 +21,12 @@ import {
   type ReviewerPreflightViolation,
 } from "../reviewer-dispatch.ts";
 import type { ControlledFailureCause } from "./terminal.ts";
+import {
+  hasUpstreamErrorTestimony,
+  projectConfirmedRemotePayload,
+} from "../upstream-error-testimony.ts";
+
+export { hasUpstreamErrorTestimony } from "../upstream-error-testimony.ts";
 
 /** Durable Reviewer-rejection child→parent page under AK_ROLE_RUN_DIR. */
 const REVIEWER_DISPATCH_REJECTION_FILE = "typed-known-failure.json";
@@ -147,34 +153,70 @@ export type ExplicitInternalKnownFailure = {
   readonly details?: Readonly<Record<string, unknown>>;
 };
 
+function nonEmptyString(value: unknown): string | undefined {
+  return typeof value === "string" && value.trim() !== "" ? value : undefined;
+}
+
+function sessionStopDetails(input: {
+  readonly errorMessage?: string | null;
+  readonly provider?: string;
+  readonly model?: string;
+  readonly api?: string;
+  readonly rawStopReason?: string;
+  readonly httpStatus?: number;
+  readonly diagnostics?: unknown;
+  readonly body?: unknown;
+  readonly code?: unknown;
+  readonly errno?: unknown;
+}): Record<string, unknown> {
+  const details: Record<string, unknown> = {};
+  const errorMessage = nonEmptyString(input.errorMessage);
+  if (errorMessage !== undefined) details.errorMessage = errorMessage;
+  const api = nonEmptyString(input.api);
+  if (api !== undefined) details.api = api;
+  const rawStopReason = nonEmptyString(input.rawStopReason);
+  if (rawStopReason !== undefined) details.rawStopReason = rawStopReason;
+  const testimony = hasUpstreamErrorTestimony(input);
+  if (testimony) {
+    const provider = nonEmptyString(input.provider);
+    if (provider !== undefined) details.provider = provider;
+    const model = nonEmptyString(input.model);
+    if (model !== undefined) details.model = model;
+  }
+  if (typeof input.httpStatus === "number") details.httpStatus = input.httpStatus;
+  if (input.diagnostics !== undefined) details.diagnostics = input.diagnostics;
+  // SDK structured payload fields: project only when held on a confirmed-remote node.
+  if (testimony) Object.assign(details, projectConfirmedRemotePayload(input));
+  return details;
+}
+
 /**
- * Produce a typed provider knownFailure from a native session assistant stop.
- * Source fields are session-typed (stopReason / errorMessage / provider) — never
- * child stderr prose. Used by the public classifier after a real Pi child exits.
+ * Project a native session assistant stop onto the existing knownFailure chain.
+ * Classification follows two-way testimony: typed HTTP status or SDK structure
+ * keeps provider; stopReason, configured provider/model, or errorMessage prose
+ * alone is the existing unrecognized value. Present upstream payload is preserved
+ * in details without rewriting; missing fields are omitted.
  */
 export function knownFailureFromProviderStop(input: {
   readonly stopReason?: string;
   readonly errorMessage?: string | null;
   readonly provider?: string;
   readonly model?: string;
+  readonly api?: string;
+  readonly rawStopReason?: string;
+  readonly httpStatus?: number;
+  readonly diagnostics?: unknown;
+  readonly body?: unknown;
+  readonly code?: unknown;
+  readonly errno?: unknown;
 }): ExplicitInternalKnownFailure | undefined {
-  if (input.stopReason !== "error") return undefined;
-  const diagnostic =
-    typeof input.errorMessage === "string" && input.errorMessage.trim() !== ""
-      ? input.errorMessage.trim()
-      : "provider failure";
-  const identity: { name: string; code?: string } = {
-    name: "ProviderStopError",
-  };
-  if (typeof input.provider === "string" && input.provider.trim() !== "") {
-    identity.code = input.provider;
-  } else if (typeof input.model === "string" && input.model.trim() !== "") {
-    identity.code = input.model;
-  }
+  if (input.stopReason !== "error" && input.stopReason !== "aborted") return undefined;
+  const diagnostic = nonEmptyString(input.errorMessage);
+  const details = sessionStopDetails(input);
   return {
-    cause: "provider",
-    identity,
-    diagnostic,
+    cause: hasUpstreamErrorTestimony(input) ? "provider" : "unrecognized",
+    ...(diagnostic === undefined ? {} : { diagnostic }),
+    ...(Object.keys(details).length === 0 ? {} : { details }),
   };
 }
 

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

@@ -47,7 +47,7 @@ import {
   RESUME_TRANSPORT_ENVELOPE,
   RunWriterLeaseHeldError,
   type RunWriterLease,
-  readTypedHttp429Observation,
+  type TypedProviderHttpObservation,
 } from "./run-lifecycle.ts";
 import {
   classifyPostAdmissionFailure,
@@ -59,7 +59,9 @@ import {
   isLawfulTypedTerminalOutcome,
   presentFailureTerminal,
   presentStructuralRejection,
-  resolveAuditedRunnerKnownFailure,
+  resolveAuditedRunnerFailureResolution,
+  resolveControlledFailureResumeObservation,
+  controlledFailureInputFromResolution,
   explicitInternalKnownFailureClassificationInput,
   settleFailureTerminalResult,
   trySettleFixerTerminalResult,
@@ -205,6 +207,8 @@ async function presentControlledFailure(
     stderr: string;
     thrown?: unknown;
     knownFailure?: ExplicitInternalKnownFailure;
+    typedHttpObservationSettled?: true;
+    typedHttpObservation?: TypedProviderHttpObservation;
   },
   io: CliIo,
 ): Promise<{
@@ -213,10 +217,23 @@ async function presentControlledFailure(
   terminal: TerminalResult;
 }> {
   const hasThrown = Object.hasOwn(failureInput, "thrown");
+  const resumeObservation = await resolveControlledFailureResumeObservation({
+    runDirectory: admitted.runDirectory,
+    ...(failureInput.typedHttpObservationSettled === true
+      ? {
+        typedHttpObservationSettled: true as const,
+        ...(failureInput.typedHttpObservation === undefined
+          ? {}
+          : { typedHttpObservation: failureInput.typedHttpObservation }),
+      }
+      : {}),
+  });
+  const knownFailure =
+    failureInput.knownFailure ?? resumeObservation.observationReadFailure;
   const session =
     !hasThrown &&
     !failureInput.timedOut &&
-    failureInput.knownFailure === undefined
+    knownFailure === undefined
       ? await inspectJudgeSession(admitted.sessionFile)
       : undefined;
   const failure = classifyPostAdmissionFailure({
@@ -224,12 +241,12 @@ async function presentControlledFailure(
     code: failureInput.code,
     stderr: failureInput.stderr,
     ...(hasThrown ? { thrown: failureInput.thrown } : {}),
-    ...explicitInternalKnownFailureClassificationInput(failureInput.knownFailure),
+    ...explicitInternalKnownFailureClassificationInput(knownFailure),
     ...(session === undefined ? {} : { session }),
   });
 
   const hasLawfulTerminalResult = await hasLawfulFixerTerminalResult(admitted);
-  const typedHttp429 = await readTypedHttp429Observation(admitted.runDirectory);
+  const typedHttp429 = resumeObservation.typedHttp429;
   const sessionPrincipalAvailable = await isSessionPrincipalAvailable(
     admitted.sessionFile,
   );
@@ -295,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;
@@ -386,10 +404,11 @@ async function dispatchAdmittedFixer(input: {
       env.model,
       env.credentials,
     );
-    const knownFailure = await resolveAuditedRunnerKnownFailure({
+    const resolution = await resolveAuditedRunnerFailureResolution({
       runner: result.knownFailure,
       sessionFile: admitted.sessionFile,
       credential: credentialFailure,
+      runDirectory: admitted.runDirectory,
     });
     return await presentControlledFailure(
       admitted,
@@ -397,7 +416,7 @@ async function dispatchAdmittedFixer(input: {
         timedOut: result.timedOut,
         code: result.code,
         stderr: result.stderr,
-        ...(knownFailure === undefined ? {} : { knownFailure }),
+        ...controlledFailureInputFromResolution(resolution),
       },
       io,
     );
@@ -489,7 +508,10 @@ export async function runPublicFixer(
 
   return await dispatchAdmittedFixer({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,
@@ -575,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 & {
@@ -153,7 +164,7 @@ export type AdmittedRoleInvocation =
 
 type RoleInvocationLedgerSource = Pick<
   AdmittedRoleInvocationBase,
-  "runId" | "bookKey" | "projectRoot" | "runDirectory" | "sessionDirectory" | "sessionFile"
+  "runId" | "bookKey" | "projectRoot" | "runDirectory" | "sessionDirectory" | "sessionFile" | "correlationId" | "ticketNumber"
 >;
 
 /**
@@ -173,6 +184,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"),
@@ -525,7 +538,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 +559,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 +631,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 +647,7 @@ export async function admitJudgeInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     attachments: attachments.map((a) => ({
@@ -630,6 +674,7 @@ export async function admitJudgeInvocation(
     sessionDirectory,
     sessionFile,
     admittedRequestPath,
+    ...ticketFields,
   };
 }
 
@@ -721,16 +766,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 +784,7 @@ export async function admitCoderInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     taskPath,
@@ -773,6 +814,7 @@ export async function admitCoderInvocation(
     sessionFile,
     admittedRequestPath,
     taskPath,
+    ...ticketFields,
   };
 }
 
@@ -828,34 +870,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 +886,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 +931,7 @@ export async function admitFixerInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     packetPath,
@@ -926,6 +968,7 @@ export async function admitFixerInvocation(
     packetPath,
     ...(prerequisitesPath === undefined ? {} : { prerequisitesPath }),
     prerequisites,
+    ...ticketFields,
   };
 }
 
@@ -1103,6 +1146,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 +1166,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 +1188,7 @@ export async function admitCollectorInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     prNumber,
@@ -1184,6 +1228,7 @@ export async function admitCollectorInvocation(
     repository,
     ...(requestManifestPath === undefined ? {} : { requestManifestPath }),
     manifestDigest,
+    ...ticketFields,
   };
 }
 
@@ -1462,17 +1507,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 +1523,7 @@ export async function admitDoctorInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     issueNumber: options.issueNumber,
@@ -1520,6 +1560,7 @@ export async function admitDoctorInvocation(
     issueNumber: options.issueNumber,
     caseRunsPath,
     caseIdentity,
+    ...ticketFields,
   };
 }
 
@@ -1625,16 +1666,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,6 +1682,7 @@ export async function admitReviewerInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty,
     baseRevision: options.baseRevision,
@@ -1678,6 +1715,7 @@ export async function admitReviewerInvocation(
     sessionFile,
     admittedRequestPath,
     baseRevision: options.baseRevision,
+    ...ticketFields,
   };
 }
 
@@ -1845,16 +1883,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 +1899,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 +1932,7 @@ export async function admitMergerInvocation(
     runDirectory,
     sessionDirectory,
     sessionFile,
+    ...ticketFields,
     instruction,
     instructionEmpty: false,
     mergerInputPath,
@@ -1938,6 +1973,7 @@ export async function admitMergerInvocation(
     admittedRequestPath,
     mergerInputPath,
     derived: admitted.derived,
+    ...ticketFields,
   };
 }