@akagilnc/pi-workflow-roles 0.1.5478 → 0.1.5504

package/src/notary-source-run.ts

@@ -14,6 +14,7 @@ import {
 } from "./activation-ledger-topology.ts";
 import type { NotarySourceRunLocator } from "./notary-contracts.ts";
 import { findRunDirectoryById, readRoleRunIdentity } from "./public-cli/run-lifecycle.ts";
+import { formatRunLeaf, parseRunLeaf } from "./role-run-placement.ts";
 
 async function readRetainedIdentity(runDirectory: string) {
   try {
@@ -26,11 +27,6 @@ async function readRetainedIdentity(runDirectory: string) {
   }
 }
 
-// Run directory leaf: <runId>@<role>. Production uses uuidv7 runIds; offline tracers
-// may use deterministic non-uuid leaves. Role token stays identifier-shaped.
-const RUN_DIR_NAME =
-  /^([A-Za-z0-9][A-Za-z0-9._-]*)@([A-Za-z][A-Za-z0-9_-]*)$/;
-
 export class NotarySourceRunError extends Error {
   constructor(message: string, options?: ErrorOptions) {
     super(message, options);
@@ -38,12 +34,6 @@ export class NotarySourceRunError extends Error {
   }
 }
 
-function parseRunDirectoryName(name: string): { runId: string; role: string } | undefined {
-  const match = RUN_DIR_NAME.exec(name);
-  if (match === null) return undefined;
-  return { runId: match[1]!, role: match[2]! };
-}
-
 async function requireRunDirectory(candidate: string, display: string): Promise<string> {
   let real: string;
   try {
@@ -68,7 +58,7 @@ async function requireRunDirectory(candidate: string, display: string): Promise<
       `notary --source-run must be a run directory: ${display}`,
     );
   }
-  const identity = parseRunDirectoryName(basename(real));
+  const identity = parseRunLeaf(basename(real));
   if (identity === undefined) {
     throw new NotarySourceRunError(
       `notary --source-run must be named <runId>@<role>: ${basename(real)}`,
@@ -102,13 +92,13 @@ export async function resolveNotarySourceRunLocator(options: {
   const bookRunsRoot = join(bookDirectory, "runs");
 
   let candidate: string;
-  const bare = parseRunDirectoryName(raw);
+  const bare = parseRunLeaf(raw);
   if (bare !== undefined && !raw.includes("/") && !raw.includes("\\")) {
     candidate = (await findRunDirectoryById(options.home, bare.runId, bookKey, bare.role))
-      ?? join(bookRunsRoot, `${bare.runId}@${bare.role}`);
+      ?? join(bookRunsRoot, formatRunLeaf(bare.runId, bare.role));
   } else {
     candidate = isAbsolute(raw) ? raw : resolve(options.projectRoot, raw);
-    const identity = parseRunDirectoryName(basename(candidate));
+    const identity = parseRunLeaf(basename(candidate));
     const subjectDirectory = dirname(dirname(candidate));
     const isLegacyUnboundLocator =
       identity !== undefined &&
@@ -126,7 +116,7 @@ export async function resolveNotarySourceRunLocator(options: {
   }
 
   const real = await requireRunDirectory(candidate, raw);
-  const identity = parseRunDirectoryName(basename(real))!;
+  const identity = parseRunLeaf(basename(real))!;
 
   const bookIdentity = physicalPathIdentity(bookDirectory);
   const parentIdentity = physicalPathIdentity(dirname(real));
@@ -176,7 +166,7 @@ export async function loadNotarySourceRunLocator(
   path: string,
 ): Promise<NotarySourceRunLocator> {
   const real = await requireRunDirectory(path, path);
-  const identity = parseRunDirectoryName(basename(real))!;
+  const identity = parseRunLeaf(basename(real))!;
   const runState = await readRetainedIdentity(real);
   if (runState === undefined) {
     throw new NotarySourceRunError(

package/src/packaged-role-registry.ts

@@ -334,8 +334,6 @@ export const PUBLIC_ROLE_RECORDS = [
     sourceRunStored: "raw",
     argvResult: "source-run",
     sameParent: "source-locator",
-    /** Infrastructure failure at this stage has no accepted gate cycle to project. */
-    skipGateOnInfrastructureStage: true,
     /** 符宝郎 is a review officer and inherits the gatekeeper model. */
     reviewOfficer: true,
     provinceConfig: true,
@@ -443,8 +441,6 @@ export const PUBLIC_ROLE_RECORDS = [
     sameParent: "gate-pointer",
     /** Resume restores an optional source-run path onto the admitted face. */
     resumeSourcePath: true,
-    /** Infrastructure failure at this stage has no accepted gate cycle to project. */
-    skipGateOnInfrastructureStage: true,
     /** 台院 is a review officer and inherits the gatekeeper model. */
     reviewOfficer: true,
     provinceConfig: true,
@@ -476,8 +472,6 @@ export const PUBLIC_ROLE_RECORDS = [
     presentSettled: "always",
     summonResume: true,
     admission: "instruction",
-    /** Infrastructure failure at this stage has no accepted gate cycle to project. */
-    skipGateOnInfrastructureStage: true,
     sameParent: "none",
     /** Province model root. Officers name this seat via modelInheritsFrom. */
     provinceConfig: true,
@@ -725,15 +719,6 @@ export function packagedAuditToolName(role: string): string | undefined {
   return record.auditTool;
 }
 
-/** Infrastructure-failure stage that must not be re-read as an accepted gate cycle. */
-export function packagedSkipsGateOnInfrastructureStage(stage: unknown): boolean {
-  return typeof stage === "string" && PUBLIC_ROLE_RECORDS.some((record) =>
-    "skipGateOnInfrastructureStage" in record
-    && record.skipGateOnInfrastructureStage === true
-    && record.role === stage
-  );
-}
-
 /** Durable officer entry whose name is the seat role. */
 export function packagedDurableOfficerEntry(officer: unknown): boolean {
   return typeof officer === "string" && PUBLIC_ROLE_RECORDS.some((record) =>

package/src/pi/durable-principal.ts

@@ -1,5 +1,3 @@
-import { join } from "node:path";
-
 import type {
   DurablePrincipal,
   DurablePrincipalAuthority,
@@ -8,7 +6,7 @@ import type {
 } from "../host-contracts.ts";
 import { resolveBookKeyFromGit } from "../activation-ledger-git.ts";
 import { resolveActivationLedgerHome } from "../activation-ledger-topology.ts";
-import { roleRunPlacement } from "../role-run-placement.ts";
+import { roleRunPlacement, sessionFileIn } from "../role-run-placement.ts";
 
 type PiDurablePrincipal = DurablePrincipal & {
   readonly sessionDirectory: string;
@@ -69,7 +67,7 @@ export const piDurablePrincipalAuthority: DurablePrincipalAuthority = {
       sessionFile:
         typeof record.sessionFile === "string" && record.sessionFile.trim() !== ""
           ? record.sessionFile
-          : join(record.sessionDirectory, "session.jsonl"),
+          : sessionFileIn(record.sessionDirectory),
     };
   },
 };

package/src/pi/role-turn-host.ts

@@ -5,7 +5,7 @@
  */
 import { execFile, spawn } from "node:child_process";
 import { constants } from "node:fs";
-import { access, appendFile, readFile, realpath } from "node:fs/promises";
+import { access, appendFile, realpath } from "node:fs/promises";
 import { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
@@ -25,6 +25,7 @@ import { ExplicitInternalActivationError } from "../host-contracts.ts";
 import { applyEngineChildEnv, ENGINE_MODEL_FLAG_NAME, normalizeEngineName } from "../engine-detour.ts";
 import { projectActivationFlags } from "../role-activation-flags.ts";
 import { encodeUserDialogueStdin } from "../user-dialogue-stdin.ts";
+import { readStrictPiSessionJsonl } from "../ledger-session-read.ts";
 import { projectThrownFailureLeaf, retainPackageFault } from "../public-cli/settlement.ts";
 import { describeErrorIdentity } from "../public-cli/run-lifecycle.ts";
 import { RECEIPT_DELIVERY_LIMIT_ENV } from "../receipt-delivery-policy.ts";
@@ -462,9 +463,38 @@ export function createPiRoleTurnHost(config: PiRoleTurnHostConfig): RoleTurnHost
 
 import { sitianReport } from "../sitian-facade.ts";
 
+/** Last non-session entry id. Session headers are not parents of custom lines. */
+export function piSessionCustomParentId(
+  entries: readonly { id?: unknown; type?: unknown }[],
+): string | null {
+  let parentId: string | null = null;
+  for (const entry of entries) {
+    if (typeof entry.id === "string" && entry.type !== "session") parentId = entry.id;
+  }
+  return parentId;
+}
+
+/** One Pi custom JSONL line: type, customType, data, id, parentId, timestamp. */
+export function formatPiSessionCustomEntry(input: {
+  readonly customType: string;
+  readonly data: unknown;
+  readonly parentId: string | null;
+  readonly timestamp: string;
+}): string {
+  return `${JSON.stringify({
+    type: "custom",
+    customType: input.customType,
+    data: input.data,
+    id: randomUUID(),
+    parentId: input.parentId,
+    timestamp: input.timestamp,
+  })}\n`;
+}
+
 /**
  * Append one custom JSONL entry to the durable principal's session file.
  * Pi session codec only — AK artifact O_EXCL retention stays in public-cli.
+ * Read is raw JSON.parse (SyntaxError propagates). Sitian full-traversal stays elsewhere.
  */
 export async function appendPiSessionCustomEntry(
   authority: DurablePrincipalAuthority,
@@ -473,21 +503,14 @@ export async function appendPiSessionCustomEntry(
   data: unknown,
 ): Promise<void> {
   const { sessionFile } = authority.decode(principal);
-  const text = await readFile(sessionFile, "utf8");
-  let parentId: string | null = null;
-  for (const line of text.trim().split("\n").filter(Boolean)) {
-    const entry = JSON.parse(line) as { id?: unknown; type?: unknown };
-    if (typeof entry.id === "string" && entry.type !== "session") parentId = entry.id;
-  }
+  const entries = await readStrictPiSessionJsonl(sessionFile) as { id?: unknown; type?: unknown }[];
   const timestamp = new Date().toISOString();
-  const pointerLine = `${JSON.stringify({
-    type: "custom",
+  const pointerLine = formatPiSessionCustomEntry({
     customType,
     data,
-    id: randomUUID(),
-    parentId,
+    parentId: piSessionCustomParentId(entries),
     timestamp,
-  })}\n`;
+  });
   await appendFile(sessionFile, pointerLine, "utf8");
   sitianReport({
     level: "event",

package/src/public-cli/instruction-seat-run.ts

@@ -83,7 +83,7 @@ import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.ts";
 import {
   presentStructuralRejection,
   readBoundSessionEntries,
-  attachPostAuditProjection,
+  attachPostAuditCountersignFact,
   trySettlePublicSeat,
   type SettlementCourtScope,
 } from "./settlement.ts";
@@ -1399,10 +1399,10 @@ async function auditSubmittedRole(
     }
   }
   // The turn already settled this court (payloads, usage, autoResumeCount, history).
-  // Audit only adds gate rounds and, for 中书省, the officer fact. A second
-  // settle would republish the same attempt.
+  // Audit only adds, for 中书省, the officer fact. A second settle would
+  // republish the same attempt.
   if (turn.terminal === undefined) throw new Error(`audited ${admitted.role} submission did not settle`);
-  const terminal = await attachPostAuditProjection(
+  const terminal = await attachPostAuditCountersignFact(
     admitted,
     env.principalAuthority,
     turn.terminal,

package/src/public-cli/invocation.ts

@@ -27,6 +27,7 @@ import { resolveBookKeyFromGit } from "../activation-ledger-git.ts";
 import {
   ensureRoleRunDirectory,
   ensureRoleRunPlacement,
+  formatRunLeaf,
   isUnboundRunDirectory,
   listBookRunDirectories,
   roleRunArtifactsDirectory,
@@ -51,6 +52,7 @@ import {
 } from "../packaged-role-registry.ts";
 import {
   isSafePositiveTicketNumber,
+  parseTicketNumber,
   readBoardTicketNumber,
   requireSafePositiveTicketNumber,
 } from "../run-ticket-number.ts";
@@ -600,7 +602,7 @@ export async function relocateAdmittedRunToTicket(
     const childRunIds = parentPage.childDiaristRunIds;
     for (const childRunId of Array.isArray(childRunIds) ? childRunIds : []) {
       if (typeof childRunId !== "string") continue;
-      const childDirectory = join(dirname(oldRunDirectory), `${childRunId}@diarist`);
+      const childDirectory = join(dirname(oldRunDirectory), formatRunLeaf(childRunId, "diarist"));
       // A child that already filed under a ticket keeps its own assertion.
       if (!existsSync(childDirectory)) continue;
       const childTarget = roleRunPlacement(ledgerHome, {
@@ -759,20 +761,22 @@ export async function recordLaunchedRolePackageIdentity(
   });
 }
 
+/** Trim, then the shared ticket spelling. Callers keep their own diagnostic text. */
+function rejectUnlessTicketNumber(raw: string, message: string): number {
+  const parsed = parseTicketNumber(raw.trim());
+  if (parsed === undefined) throw new CliUsageError(message);
+  return parsed;
+}
+
 /** Positive ticket number for analyst query-scope face (and shared integer parse). */
 export function parsePositiveTicketNumber(
   raw: string,
   flag: string,
 ): number {
-  const trimmed = raw.trim();
-  if (!ANALYST_TICKET_NUMBER_PATTERN.test(trimmed)) {
-    throw new CliUsageError(`${flag} must be a positive integer, got ${raw}`);
-  }
-  const value = Number(trimmed);
-  if (!Number.isSafeInteger(value) || value < 1) {
-    throw new CliUsageError(`${flag} must be a positive integer, got ${raw}`);
-  }
-  return value;
+  return rejectUnlessTicketNumber(
+    raw,
+    `${flag} must be a positive integer, got ${raw}`,
+  );
 }
 
 /**
@@ -1650,7 +1654,10 @@ export async function admitPublicRole(
           }
           let caseIdentity: DoctorCaseIdentity;
           try {
-            const patient = await loadDoctorCase(caseRunsPath);
+            const patient = await loadDoctorCase(
+              caseRunsPath,
+              parsed.runs === undefined ? undefined : placed.projectRoot,
+            );
             if (patient.identity.issueNumber !== issueNumber) {
               throw new CliUsageError(
                 `doctor case issue ${patient.identity.issueNumber} does not match --issue ${issueNumber}`,
@@ -2311,32 +2318,21 @@ function isGitRemoteMissing(error: unknown): boolean {
   return status === 2;
 }
 
-/** Positive Issue number grammar shared with Doctor case path identity. */
-const DOCTOR_ISSUE_NUMBER_PATTERN = /^[1-9]\d*$/;
-
-/** Match retained Doctor case runs roots (ADR 0017 / loadDoctorCase). */
-/** Canonical Doctor case: `<book>/<ticket>/runs`. Legacy `issues/<n>/runs` is read-only compat. */
-const DOCTOR_CASE_RUNS_PATH_PATTERN =
-  /\/\.ak-roles\/books\/[^/]+\/(?:issues\/)?([1-9]\d*)\/runs$/;
-
 /**
  * Parse a positive Issue number for public Doctor admission.
  * Leading zeros and non-integers are structural rejects.
  */
 export function parseDoctorIssueNumber(raw: string): number {
-  const trimmed = raw.trim();
-  if (!DOCTOR_ISSUE_NUMBER_PATTERN.test(trimmed)) {
-    throw new CliUsageError(
-      `doctor --issue must be a positive integer, got ${raw}`,
-    );
-  }
-  return Number(trimmed);
+  return rejectUnlessTicketNumber(
+    raw,
+    `doctor --issue must be a positive integer, got ${raw}`,
+  );
 }
 
 /**
  * Resolve the retained Doctor case runs root from Issue identity.
- * Default is the #78 book locator; optional --runs must stay project-confined
- * and match Doctor case grammar for the same issue number.
+ * Default is the #78 book locator; optional --runs must stay project-confined.
+ * loadDoctorCase owns retained-root grammar at IO; admission matches its case identity.
  */
 export async function resolveDoctorCaseRunsPath(options: {
   home: string;
@@ -2388,18 +2384,6 @@ export async function resolveDoctorCaseRunsPath(options: {
     );
   }
 
-  const normalized = real.split(sep).join("/");
-  const match = normalized.match(DOCTOR_CASE_RUNS_PATH_PATTERN);
-  if (!match) {
-    throw new CliUsageError(
-      "doctor --runs must be an .ak-roles/books/<book>/<n>/runs directory",
-    );
-  }
-  if (Number(match[1]) !== options.issueNumber) {
-    throw new CliUsageError(
-      `doctor --runs issue ${match[1]} does not match --issue ${options.issueNumber}`,
-    );
-  }
   return real;
 }
 
@@ -2477,8 +2461,6 @@ export type AdmitMergerInvocationOptions = {
   assertedTicketNumber?: number;
 };
 
-const ANALYST_TICKET_NUMBER_PATTERN = /^[1-9]\d*$/;
-
 /**
  * Parse a positive ticket / issue number for public analyst admission.
  * Leading zeros and non-integers are structural rejects (same face as #176).
@@ -2488,20 +2470,10 @@ export function parseAnalystTicketNumber(
   raw: string,
   flag: string = "--ticket",
 ): number {
-  const trimmed = raw.trim();
-  if (!ANALYST_TICKET_NUMBER_PATTERN.test(trimmed)) {
-    throw new CliUsageError(
-      `analyst ${flag} must be a positive integer, got ${raw}`,
-    );
-  }
-  const value = Number(trimmed);
-  // Digit-only strings beyond MAX_SAFE_INTEGER round or become Infinity — reject.
-  if (!Number.isSafeInteger(value) || value < 1) {
-    throw new CliUsageError(
-      `analyst ${flag} must be a positive integer, got ${raw}`,
-    );
-  }
-  return value;
+  return rejectUnlessTicketNumber(
+    raw,
+    `analyst ${flag} must be a positive integer, got ${raw}`,
+  );
 }
 
 /**
@@ -2535,7 +2507,7 @@ export function parseAnalystCohortIssueToken(
   const sep = trimmed.lastIndexOf(":");
   if (sep > 0) {
     const rhs = trimmed.slice(sep + 1);
-    if (ANALYST_TICKET_NUMBER_PATTERN.test(rhs)) {
+    if (parseTicketNumber(rhs) !== undefined) {
       const bookKey = trimmed.slice(0, sep);
       if (bookKey.trim() === "") {
         throw new CliUsageError(

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

@@ -16,7 +16,7 @@ import {
   activationBookDirectory,
   resolveActivationLedgerHome,
 } from "../activation-ledger-topology.ts";
-import { listBookRunDirectories } from "../role-run-placement.ts";
+import { findRoleRunDirectory, listBookRunDirectories, parseRunLeaf, sessionFileIn } from "../role-run-placement.ts";
 import { isSafePositiveTicketNumber } from "../run-ticket-number.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import type { FixerPhase } from "../package-contracts/fixer-output.ts";
@@ -25,6 +25,7 @@ import { parseCollectorRepository } from "../collector-config.ts";
 import type { DoctorCaseIdentity } from "../doctor-contracts.ts";
 import type { NotarySourceRunLocator } from "../notary-contracts.ts";
 import {
+  retainedRunPathsMatch,
   rewriteAdmittedRoleRunPage,
   rewriteRunDirectoryPathValue,
 } from "../role-run-relocation.ts";
@@ -915,31 +916,12 @@ export async function findRunDirectoryById(
     if (errorCodeOf(error) === "ENOENT") return undefined;
     throw error;
   }
-  const matches: string[] = [];
-  for (const bookKey of bookKeys) {
-    if (onlyBookKey !== undefined && bookKey !== onlyBookKey) continue;
-    const bookDir = activationBookDirectory(ledgerHome, bookKey);
-    let runDirectories: string[];
-    try {
-      runDirectories = await listBookRunDirectories(bookDir);
-    } catch (error) {
-      if (errorCodeOf(error) === "ENOENT") continue;
-      throw error;
-    }
-    for (const runDirectory of runDirectories) {
-      const entry = basename(runDirectory);
-      if (
-        (onlyRole === undefined && (entry === `${runId}@judge` || entry.startsWith(`${runId}@`))) ||
-        entry === `${runId}@${onlyRole}`
-      ) {
-        matches.push(runDirectory);
-      }
-    }
-  }
-  if (matches.length === 0) return undefined;
-  if (matches.length === 1) return matches[0];
-  throw new Error(
-    `ambiguous role run id ${runId}: ${matches.join(", ")}`,
+  return findRoleRunDirectory(
+    bookKeys
+      .filter((bookKey) => onlyBookKey === undefined || bookKey === onlyBookKey)
+      .map((bookKey) => activationBookDirectory(ledgerHome, bookKey)),
+    runId,
+    onlyRole,
   );
 }
 
@@ -999,7 +981,7 @@ async function runHasFormedSessionPrincipal(runDirectory: string): Promise<boole
     typeof disk.principalWire.sessionFile === "string" &&
     disk.principalWire.sessionFile.trim() !== ""
       ? disk.principalWire.sessionFile
-      : join(disk.principalWire.sessionDirectory, "session.jsonl");
+      : sessionFileIn(disk.principalWire.sessionDirectory);
   try {
     const stat = await lstat(sessionFile);
     return stat.isFile() && !stat.isSymbolicLink();
@@ -1040,17 +1022,14 @@ export async function findLatestRunIdForSeatTicket(input: {
     if (errorCodeOf(error) === "ENOENT") return undefined;
     throw error;
   }
-  const suffix = `@${input.role}`;
   let best: string | undefined;
   for (const runDirectory of runDirectories) {
-    const entry = basename(runDirectory);
-    if (!entry.endsWith(suffix)) continue;
-    const runId = entry.slice(0, entry.length - suffix.length);
-    if (runId.length === 0) continue;
+    const parsed = parseRunLeaf(basename(runDirectory));
+    if (parsed === undefined || parsed.role !== input.role) continue;
+    const runId = parsed.runId;
     const parentPath = await readRunParentPath(runDirectory);
-    // The parent's ticket can change after this child was admitted. Within one
-    // book the run leaf is its stable identity; directory placement is not.
-    if (parentPath !== input.parentRunPath && basename(parentPath ?? "") !== basename(input.parentRunPath)) continue;
+    // Follow the parent's retained placement without collapsing distinct book/subject bindings.
+    if (!await retainedRunPathsMatch(parentPath, input.parentRunPath, input.parentRunPath)) continue;
     // Durable fact: never resume-select a provisional that never formed principal.
     if (!(await runHasFormedSessionPrincipal(runDirectory))) continue;
     if (best === undefined || runId > best) best = runId;
@@ -1226,7 +1205,7 @@ async function loadResumableRunRecord(
         lens = record.lens;
       }
       // Collector — admitted repository/PR identity (#633 resume).
-      if (typeof record.prNumber === "number" && Number.isSafeInteger(record.prNumber) && record.prNumber >= 1) {
+      if (isSafePositiveTicketNumber(record.prNumber)) {
         prNumber = record.prNumber;
       }
       if (typeof record.repository === "string" && record.repository.trim() !== "") {
@@ -1245,7 +1224,7 @@ async function loadResumableRunRecord(
         waitWindowMs = record.waitWindowMs;
       }
       // Doctor — admitted single-case identity (#633 resume).
-      if (typeof record.issueNumber === "number" && Number.isSafeInteger(record.issueNumber) && record.issueNumber >= 1) {
+      if (isSafePositiveTicketNumber(record.issueNumber)) {
         issueNumber = record.issueNumber;
       }
       if (typeof record.caseRunsPath === "string" && record.caseRunsPath.trim() !== "") {
@@ -1256,9 +1235,7 @@ async function loadResumableRunRecord(
       ) {
         const ci = record.caseIdentity as Record<string, unknown>;
         if (
-          typeof ci.issueNumber === "number" &&
-          Number.isSafeInteger(ci.issueNumber) &&
-          ci.issueNumber >= 1 &&
+          isSafePositiveTicketNumber(ci.issueNumber) &&
           typeof ci.runsPath === "string" &&
           ci.runsPath.trim() !== ""
         ) {
@@ -1376,9 +1353,9 @@ async function loadResumableRunRecord(
       );
     }
   }
-  const sourceRunLeaf = basename(sourceRunPath ?? "").split("@");
-  const referencedRunId = sourceRun?.runId ?? sourceRunLeaf[0];
-  const referencedRole = sourceRun?.role ?? sourceRunLeaf[1];
+  const sourceRunLeaf = parseRunLeaf(basename(sourceRunPath ?? ""));
+  const referencedRunId = sourceRun?.runId ?? sourceRunLeaf?.runId;
+  const referencedRole = sourceRun?.role ?? sourceRunLeaf?.role;
   if (referencedRunId !== undefined && referencedRunId !== "") {
     const currentSourceRunDirectory = await findRunDirectoryById(
       home,