@akagilnc/pi-workflow-roles 0.1.5365 → 0.1.5368

package/dist/headless-host/production-host.js

@@ -3000,6 +3000,7 @@ __export(config_exports, {
   providerConfigured: () => providerConfigured,
   publicCliConfigPath: () => publicCliConfigPath,
   resolveEffectiveSeat: () => resolveEffectiveSeat,
+  resolvePublicAgentDir: () => resolvePublicAgentDir,
   resolvedSeatWithModel: () => resolvedSeatWithModel,
   savePublicCliConfig: () => savePublicCliConfig,
   setAutoResumeLimit: () => setAutoResumeLimit,
@@ -3479,6 +3480,9 @@ function credentialProvidersFromAuthData(data) {
     xai: Object.prototype.hasOwnProperty.call(record4, "xai")
   };
 }
+function resolvePublicAgentDir(explicit, home) {
+  return explicit ?? process.env.PI_CODING_AGENT_DIR ?? join6(home, ".pi", "agent");
+}
 async function loadCredentialProviders(agentDir) {
   try {
     const raw = await readFile4(join6(agentDir, "auth.json"), "utf8");
@@ -3639,6 +3643,9 @@ function roleRunPlacement(ledgerHome, input) {
 function roleRunArtifactsDirectory(runDirectory) {
   return join9(runDirectory, "artifacts");
 }
+function isUnboundRunDirectory(runDirectory) {
+  return runDirectory.replaceAll("\\", "/").includes("/unbound/runs/");
+}
 function ensureRoleRunDirectory(ledgerHome, directory) {
   return ensureRealDirectoryTree(ledgerHome, directory);
 }
@@ -4979,6 +4986,170 @@ var init_role_turn_host = __esm({
   }
 });
 
+// src/public-cli/host-providers.ts
+import { readFileSync } from "node:fs";
+import { join as join16 } from "node:path";
+function hostProvidersPath(home) {
+  if (typeof home !== "string" || home.trim() === "") {
+    throw new Error("home must be explicitly provided");
+  }
+  return join16(home, ".ak-roles", "host-providers.json");
+}
+function hermesProviderModelsCachePath(home) {
+  return join16(home, ".hermes", "provider_models_cache.json");
+}
+function parseHostProvidersTable(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error("host-providers.json must be an object");
+  }
+  const out = {};
+  for (const [host, byProvider] of Object.entries(value)) {
+    if (host.trim() === "") {
+      throw new Error("host-providers.json host key must be non-empty");
+    }
+    if (byProvider === null || typeof byProvider !== "object" || Array.isArray(byProvider)) {
+      throw new Error(`host-providers.json[${host}] must be an object`);
+    }
+    const providers = {};
+    for (const [seatProvider, hostProvider] of Object.entries(
+      byProvider
+    )) {
+      if (seatProvider.trim() === "") {
+        throw new Error(
+          `host-providers.json[${host}] seat-provider key must be non-empty`
+        );
+      }
+      if (typeof hostProvider !== "string" || hostProvider.trim() === "") {
+        throw new Error(
+          `host-providers.json[${host}][${seatProvider}] must be a non-empty string`
+        );
+      }
+      providers[seatProvider] = hostProvider;
+    }
+    if (Object.keys(providers).length > 0) {
+      out[host] = providers;
+    }
+  }
+  return out;
+}
+function loadHostProvidersTable(home) {
+  const path = hostProvidersPath(home);
+  try {
+    const raw = readFileSync(path, "utf8");
+    return parseHostProvidersTable(JSON.parse(raw));
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+      return {};
+    }
+    throw error;
+  }
+}
+function hostCatalogOffersModel(catalogModels, seatModel) {
+  return catalogModels.some(
+    (entry) => entry === seatModel || entry.endsWith(`/${seatModel}`)
+  );
+}
+function listHermesProvidersForModel(home, seatModel) {
+  const path = hermesProviderModelsCachePath(home);
+  let text;
+  try {
+    text = readFileSync(path, "utf8");
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+      return [];
+    }
+    throw error;
+  }
+  const raw = JSON.parse(text);
+  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
+    throw new Error(
+      `hermes provider_models_cache.json must be an object: ${path}`
+    );
+  }
+  const found = [];
+  for (const [provider, entry] of Object.entries(raw)) {
+    if (entry === null || typeof entry !== "object" || Array.isArray(entry)) {
+      continue;
+    }
+    const models = entry.models;
+    if (!Array.isArray(models)) continue;
+    const names = models.filter((m) => typeof m === "string");
+    if (hostCatalogOffersModel(names, seatModel)) {
+      found.push(provider);
+    }
+  }
+  return found.sort();
+}
+function listDirectoryProvidersForModel(home, host, seatModel) {
+  if (host === "hermes") {
+    return listHermesProvidersForModel(home, seatModel);
+  }
+  return void 0;
+}
+function projectHostFacingProvider(selection, host, table, home) {
+  if (selection === void 0) return void 0;
+  const mapped = table[host]?.[selection.provider];
+  if (mapped !== void 0) {
+    return mapped === selection.provider ? selection : { ...selection, provider: mapped };
+  }
+  const directory = listDirectoryProvidersForModel(home, host, selection.model);
+  if (directory === void 0) {
+    return selection;
+  }
+  if (directory.length === 1) {
+    const only = directory[0];
+    return only === selection.provider ? selection : { ...selection, provider: only };
+  }
+  if (directory.length === 0) {
+    throw new HostProviderResolutionError({
+      message: `host ${host} has no provider offering model ${selection.model}; seat provider was ${selection.provider}`,
+      host,
+      seatProvider: selection.provider,
+      seatModel: selection.model
+    });
+  }
+  throw new HostProviderResolutionError({
+    message: `host ${host} has multiple providers for model ${selection.model}: ${directory.join(", ")}; set host-providers.json[${host}][${selection.provider}] to one of them`,
+    host,
+    seatProvider: selection.provider,
+    seatModel: selection.model,
+    candidates: directory
+  });
+}
+function renderHostProvidersTable(table) {
+  const lines = [];
+  for (const host of Object.keys(table).sort()) {
+    const byProvider = table[host];
+    for (const seatProvider of Object.keys(byProvider).sort()) {
+      lines.push(
+        `hostProvider	${host}	${seatProvider}	${byProvider[seatProvider]}`
+      );
+    }
+  }
+  return lines.length === 0 ? "" : `${lines.join("\n")}
+`;
+}
+var HostProviderResolutionError;
+var init_host_providers = __esm({
+  "src/public-cli/host-providers.ts"() {
+    "use strict";
+    HostProviderResolutionError = class extends Error {
+      host;
+      seatProvider;
+      seatModel;
+      candidates;
+      constructor(options) {
+        super(options.message);
+        this.name = "HostProviderResolutionError";
+        this.host = options.host;
+        this.seatProvider = options.seatProvider;
+        this.seatModel = options.seatModel;
+        this.candidates = options.candidates ?? [];
+      }
+    };
+  }
+});
+
 // src/public-cli/github-remote.ts
 function ownerRepoFromGitHubRemoteUrl(remoteUrl) {
   const trimmed = remoteUrl.trim();
@@ -5442,13 +5613,13 @@ var init_session_dialogue = __esm({
 
 // src/ticket-provenance.ts
 import { readFile as readFile12, unlink as unlink2 } from "node:fs/promises";
-import { basename as basename5, dirname as dirname11, join as join16, resolve as resolve9 } from "node:path";
+import { basename as basename5, dirname as dirname11, join as join17, resolve as resolve9 } from "node:path";
 function dialogueSessionSourceRoots(home) {
   const machineHome = typeof home === "string" && home.trim() !== "" ? home : packageMachineHome();
   return [
-    join16(machineHome, ".claude", "projects"),
-    join16(machineHome, ".codex", "sessions"),
-    join16(machineHome, ".pi", "agent", "sessions")
+    join17(machineHome, ".claude", "projects"),
+    join17(machineHome, ".codex", "sessions"),
+    join17(machineHome, ".pi", "agent", "sessions")
   ];
 }
 function isLedgerRoleSessionFile(absolute, home) {
@@ -5486,7 +5657,7 @@ function ticketProvenanceRecordInput(ticketNumber, cwd, home, runDirectory) {
   };
 }
 async function rehomeUnboundTicketProvenance(runDirectory, ticketNumber, cwd, home) {
-  const source = join16(runDirectory, "records.jsonl");
+  const source = join17(runDirectory, "records.jsonl");
   let content;
   try {
     content = await readFile12(source, "utf8");
@@ -5671,7 +5842,7 @@ var init_ticket_provenance = __esm({
 });
 
 // src/notary-source-run.ts
-import { dirname as dirname12, isAbsolute as isAbsolute5, join as join17, resolve as resolve10, basename as basename6 } from "node:path";
+import { dirname as dirname12, isAbsolute as isAbsolute5, join as join18, resolve as resolve10, basename as basename6 } from "node:path";
 import { lstat, realpath as realpath3 } from "node:fs/promises";
 async function readRetainedIdentity(runDirectory) {
   try {
@@ -5728,11 +5899,11 @@ async function resolveNotarySourceRunLocator(options) {
   const ledgerHome = resolveActivationLedgerHome(options.home);
   const bookKey = resolveBookKeyFromGit(options.projectRoot);
   const bookDirectory = activationBookDirectory(ledgerHome, bookKey);
-  const bookRunsRoot = join17(bookDirectory, "runs");
+  const bookRunsRoot = join18(bookDirectory, "runs");
   let candidate;
   const bare = parseRunDirectoryName(raw);
   if (bare !== void 0 && !raw.includes("/") && !raw.includes("\\")) {
-    candidate = await findRunDirectoryById(options.home, bare.runId, bookKey, bare.role) ?? join17(bookRunsRoot, `${bare.runId}@${bare.role}`);
+    candidate = await findRunDirectoryById(options.home, bare.runId, bookKey, bare.role) ?? join18(bookRunsRoot, `${bare.runId}@${bare.role}`);
   } else {
     candidate = isAbsolute5(raw) ? raw : resolve10(options.projectRoot, raw);
     const identity2 = parseRunDirectoryName(basename6(candidate));
@@ -6873,7 +7044,7 @@ import {
   writeFile as writeFile4
 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { basename as basename7, dirname as dirname13, isAbsolute as isAbsolute6, join as join18, resolve as resolve11, sep as sep3 } from "node:path";
+import { basename as basename7, dirname as dirname13, isAbsolute as isAbsolute6, join as join19, resolve as resolve11, sep as sep3 } from "node:path";
 function issueAdmissionPlacement(authority, request) {
   const ledgerHome = resolveActivationLedgerHome(request.home);
   const bookKey = resolveBookKeyFromGit(request.cwd);
@@ -6927,81 +7098,71 @@ async function writeRoleInvocationLedger(source, role, effectiveModel) {
     ...effectiveModelLedgerFields(effectiveModel)
   };
   await writeFile4(
-    join18(source.runDirectory, "invocation.json"),
+    join19(source.runDirectory, "invocation.json"),
     `${JSON.stringify(identity, null, 2)}
 `,
     "utf8"
   );
 }
 async function recordEffectiveInvocationModel(runDirectory, model, engine, host, engineModel) {
-  const ledgerPath = join18(runDirectory, "invocation.json");
-  const current = JSON.parse(await readFile13(ledgerPath, "utf8"));
-  const next = { ...current };
-  if (model !== void 0) {
-    next.provider = model.provider;
-    next.model = model.model;
-    if (model.thinking === void 0) {
-      delete next.thinking;
-    } else {
-      next.thinking = model.thinking;
+  await updateDurableJsonPage(join19(runDirectory, "invocation.json"), (current) => {
+    const next = { ...current };
+    if (model !== void 0) {
+      next.provider = model.provider;
+      next.model = model.model;
+      if (model.thinking === void 0) {
+        delete next.thinking;
+      } else {
+        next.thinking = model.thinking;
+      }
     }
-  }
-  if (engine === null) {
-    delete next.engine;
-  } else if (engine !== void 0) {
-    next.engine = engine;
-  }
-  if (engineModel === null) {
-    delete next.engineModel;
-  } else if (engineModel !== void 0) {
-    next.engineModel = engineModel;
-  }
-  if (host !== void 0) {
-    next.host = host;
-  }
-  await writeFile4(
-    ledgerPath,
-    `${JSON.stringify(next, null, 2)}
-`,
-    "utf8"
-  );
+    if (engine === null) {
+      delete next.engine;
+    } else if (engine !== void 0) {
+      next.engine = engine;
+    }
+    if (engineModel === null) {
+      delete next.engineModel;
+    } else if (engineModel !== void 0) {
+      next.engineModel = engineModel;
+    }
+    if (host !== void 0) {
+      next.host = host;
+    }
+    return next;
+  });
+}
+async function updateDurableJsonPage(path, update) {
+  const current = JSON.parse(await readFile13(path, "utf8"));
+  const next = update(current);
+  if (next === void 0) return;
+  await writeFile4(path, `${JSON.stringify(next, null, 2)}
+`, "utf8");
 }
 async function mergeInvocationIdentityPage(runDirectory, fields) {
-  const ledgerPath = join18(runDirectory, "invocation.json");
-  const current = JSON.parse(await readFile13(ledgerPath, "utf8"));
-  await writeFile4(
-    ledgerPath,
-    `${JSON.stringify({
-      ...current,
-      ...fields
-    }, null, 2)}
-`,
-    "utf8"
-  );
+  await updateDurableJsonPage(join19(runDirectory, "invocation.json"), (current) => ({
+    ...current,
+    ...fields
+  }));
 }
 async function persistAdmittedSourceRunPath(admitted, sourceRunPath, auditorSubject) {
   if (sourceRunPath.trim() === "") {
     throw new Error("persistAdmittedSourceRunPath requires a non-empty sourceRunPath");
   }
-  const admittedPath = admitted.admittedRequestPath;
-  const current = JSON.parse(await readFile13(admittedPath, "utf8"));
-  if (typeof current.sourceRunPath === "string" && current.sourceRunPath !== sourceRunPath) {
-    throw new Error(
-      `persistAdmittedSourceRunPath refuses to replace ${current.sourceRunPath} with ${sourceRunPath}`
-    );
-  }
-  const sameSubject = auditorSubject === void 0 || current.auditorSubject === auditorSubject;
-  if (current.sourceRunPath === sourceRunPath && sameSubject) return;
-  await writeFile4(
-    admittedPath,
-    `${JSON.stringify({
+  await updateDurableJsonPage(admitted.admittedRequestPath, (current) => {
+    if (typeof current.sourceRunPath === "string" && current.sourceRunPath !== sourceRunPath) {
+      throw new Error(
+        `persistAdmittedSourceRunPath refuses to replace ${current.sourceRunPath} with ${sourceRunPath}`
+      );
+    }
+    const sameSubject = auditorSubject === void 0 || current.auditorSubject === auditorSubject;
+    if (current.sourceRunPath === sourceRunPath && sameSubject) return void 0;
+    return {
       ...current,
       sourceRunPath,
       ...auditorSubject === void 0 ? {} : { auditorSubject }
-    }, null, 2)}
-`,
-    "utf8"
-  );
+    };
+  });
 }
 async function bindAdmittedTicketNumber(admitted, ticketNumber) {
   if (admitted.ticketNumber === ticketNumber) return;
@@ -7009,22 +7170,17 @@ async function bindAdmittedTicketNumber(admitted, ticketNumber) {
   admitted.ticketNumber = ticketNumber;
 }
 async function recordAdmittedCorrelation(admitted, correlationId) {
-  const current = JSON.parse(
-    await readFile13(admitted.admittedRequestPath, "utf8")
-  );
-  const prior = [
-    ...Array.isArray(current.correlationIds) ? current.correlationIds.filter(
-      (value) => typeof value === "string" && value.trim() !== ""
-    ) : [],
-    ...typeof current.correlationId === "string" && current.correlationId.trim() !== "" ? [current.correlationId] : []
-  ];
-  const correlationIds = [.../* @__PURE__ */ new Set([...prior, correlationId])];
-  await writeFile4(
-    admitted.admittedRequestPath,
-    `${JSON.stringify({ ...current, correlationId, correlationIds }, null, 2)}
-`,
-    "utf8"
-  );
+  let correlationIds = [];
+  await updateDurableJsonPage(admitted.admittedRequestPath, (current) => {
+    const prior = [
+      ...Array.isArray(current.correlationIds) ? current.correlationIds.filter(
+        (value) => typeof value === "string" && value.trim() !== ""
+      ) : [],
+      ...typeof current.correlationId === "string" && current.correlationId.trim() !== "" ? [current.correlationId] : []
+    ];
+    correlationIds = [.../* @__PURE__ */ new Set([...prior, correlationId])];
+    return { ...current, correlationId, correlationIds };
+  });
   await mergeInvocationIdentityPage(admitted.runDirectory, {
     correlationId,
     correlationIds
@@ -7034,7 +7190,7 @@ async function recordAdmittedCorrelation(admitted, correlationId) {
   mutable.correlationIds = correlationIds;
 }
 async function relocateAdmittedRunToTicket(admitted, authority, heldLease) {
-  if (admitted.ticketNumber === void 0 || !admitted.runDirectory.includes(`${sep3}unbound${sep3}runs${sep3}`)) return void 0;
+  if (admitted.ticketNumber === void 0 || !isUnboundRunDirectory(admitted.runDirectory)) return void 0;
   const oldRunDirectory = admitted.runDirectory;
   const ledgerHome = resolveActivationLedgerHome(homeFromRunDirectory(oldRunDirectory));
   const target = roleRunPlacement(ledgerHome, {
@@ -7050,7 +7206,7 @@ async function relocateAdmittedRunToTicket(admitted, authority, heldLease) {
     const childRunIds = parentPage.childDiaristRunIds;
     for (const childRunId of Array.isArray(childRunIds) ? childRunIds : []) {
       if (typeof childRunId !== "string") continue;
-      const childDirectory = join18(dirname13(oldRunDirectory), `${childRunId}@diarist`);
+      const childDirectory = join19(dirname13(oldRunDirectory), `${childRunId}@diarist`);
       if (!existsSync4(childDirectory)) continue;
       const childTarget = roleRunPlacement(ledgerHome, {
         bookKey: admitted.bookKey,
@@ -7096,26 +7252,27 @@ async function relocateAdmittedRunToTicket(admitted, authority, heldLease) {
   return { oldRunDirectory, newRunDirectory: target.runDirectory };
 }
 async function recordChildDiaristRun(parent, childRunId) {
-  const page = JSON.parse(await readFile13(parent.admittedRequestPath, "utf8"));
-  const existing = Array.isArray(page.childDiaristRunIds) ? page.childDiaristRunIds.filter((runId) => typeof runId === "string") : [];
-  const childDiaristRunIds = existing.includes(childRunId) ? existing : [...existing, childRunId];
-  await writeFile4(parent.admittedRequestPath, `${JSON.stringify({ ...page, childDiaristRunIds }, null, 2)}
-`, "utf8");
+  await updateDurableJsonPage(parent.admittedRequestPath, (page) => {
+    const existing = Array.isArray(page.childDiaristRunIds) ? page.childDiaristRunIds.filter((runId) => typeof runId === "string") : [];
+    const childDiaristRunIds = existing.includes(childRunId) ? existing : [...existing, childRunId];
+    return { ...page, childDiaristRunIds };
+  });
 }
 async function bindTicketNumberOnRunDirectory(runDirectory, ticketNumber) {
   requireSafePositiveTicketNumber(
     ticketNumber,
     "bindTicketNumberOnRunDirectory"
   );
-  const admittedPath = join18(runDirectory, "admitted-request.json");
-  const admitted = JSON.parse(await readFile13(admittedPath, "utf8"));
-  if (admitted.ticketNumber === ticketNumber) return;
-  await writeFile4(
-    admittedPath,
-    `${JSON.stringify({ ...admitted, ticketNumber }, null, 2)}
-`,
-    "utf8"
-  );
+  const admittedPath = join19(runDirectory, "admitted-request.json");
+  let unchanged = false;
+  await updateDurableJsonPage(admittedPath, (admitted) => {
+    if (admitted.ticketNumber === ticketNumber) {
+      unchanged = true;
+      return void 0;
+    }
+    return { ...admitted, ticketNumber };
+  });
+  if (unchanged) return;
   await mergeInvocationIdentityPage(runDirectory, { ticketNumber });
 }
 async function recordLaunchedPiIdentity(runDirectory, identity) {
@@ -7127,7 +7284,7 @@ async function recordLaunchedPiIdentity(runDirectory, identity) {
 async function observeLaunchedRolePackageIdentity(packageRoot, selectedRoleEntry) {
   const rolePackageRoot = packageRoot;
   const raw = JSON.parse(
-    await readFile13(join18(rolePackageRoot, "package.json"), "utf8")
+    await readFile13(join19(rolePackageRoot, "package.json"), "utf8")
   );
   if (typeof raw.version !== "string" || raw.version.trim() === "") {
     throw new Error(
@@ -7337,18 +7494,22 @@ function requireOptionPath(flag, value) {
   }
   return value;
 }
+function skillArgTokenFault(value) {
+  if (value === void 0 || value.trim() === "") return "empty";
+  if (/\s/.test(value)) return "whitespace";
+  if (value.startsWith("-")) return "optionLike";
+  return void 0;
+}
 function requireSkillArgToken(value, messages) {
-  if (value === void 0 || value.trim() === "") {
-    throw new CliUsageError(messages.empty);
-  }
-  if (/\s/.test(value)) {
-    throw new CliUsageError(messages.whitespace);
-  }
-  if (value.startsWith("-")) {
-    throw new CliUsageError(messages.optionLike);
-  }
+  const fault = skillArgTokenFault(value);
+  if (fault !== void 0) throw new CliUsageError(messages[fault]);
   return value;
 }
+function admittedReviewerBaseFault(value) {
+  const fault = skillArgTokenFault(value);
+  if (fault === void 0) return void 0;
+  return fault === "empty" ? "missing" : "damaged";
+}
 function requireReviewerBaseRevision(value) {
   return requireSkillArgToken(value, {
     empty: "--base requires a nonempty revision",
@@ -7415,13 +7576,13 @@ async function removePreparedAttachmentDirectory(stagingDirectory) {
 }
 async function withPreparedAttachments(attachmentPaths, use) {
   if (attachmentPaths.length === 0) return await use([]);
-  const stagingDirectory = await mkdtemp(join18(tmpdir(), "ak-role-attachments-"));
+  const stagingDirectory = await mkdtemp(join19(tmpdir(), "ak-role-attachments-"));
   const prepared = [];
   let result;
   try {
     for (let index = 0; index < attachmentPaths.length; index += 1) {
       const { absolute, bytes } = await readRegularFileAttachment(attachmentPaths[index]);
-      const snapshotPath = join18(stagingDirectory, String(index).padStart(6, "0"));
+      const snapshotPath = join19(stagingDirectory, String(index).padStart(6, "0"));
       await writeFile4(snapshotPath, bytes);
       prepared.push({ absolute, snapshotPath });
     }
@@ -7442,7 +7603,7 @@ async function withPreparedAttachments(attachmentPaths, use) {
   return result;
 }
 async function freezeAttachmentBytes(provenancePath, bytes, destinationDir, index) {
-  const frozenPath = join18(
+  const frozenPath = join19(
     destinationDir,
     `${String(index).padStart(2, "0")}-${basename7(provenancePath)}`
   );
@@ -7485,14 +7646,14 @@ async function freezeAttachments(attachmentPaths, attachmentsDirectory) {
 async function freezeAttachmentsIntoRun(attachmentPaths, runDirectory, summonsKey = `s-${Date.now().toString(36)}`) {
   if (attachmentPaths.length === 0) return [];
   const ledgerHome = resolveActivationLedgerHome(homeFromRunDirectory(runDirectory));
-  const attachmentsDirectory = join18(runDirectory, "attachments", summonsKey);
+  const attachmentsDirectory = join19(runDirectory, "attachments", summonsKey);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
   return freezeAttachments(attachmentPaths, attachmentsDirectory);
 }
 async function freezePreparedAttachmentsIntoRun(prepared, runDirectory, summonsKey) {
   if (prepared.length === 0) return [];
   const ledgerHome = resolveActivationLedgerHome(homeFromRunDirectory(runDirectory));
-  const attachmentsDirectory = summonsKey === void 0 ? join18(runDirectory, "attachments") : join18(runDirectory, "attachments", summonsKey);
+  const attachmentsDirectory = summonsKey === void 0 ? join19(runDirectory, "attachments") : join19(runDirectory, "attachments", summonsKey);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
   const attachments = [];
   for (let index = 0; index < prepared.length; index += 1) {
@@ -7569,16 +7730,13 @@ async function admitPublicRole(role, parsed, env, override) {
         attachmentPaths,
         ...project,
         placedFields: async (placed) => {
-          const taskPath = join18(placed.runDirectory, "task.md");
+          const taskPath = join19(placed.runDirectory, "task.md");
           await writeFile4(taskPath, instruction, "utf8");
           return { phase, taskPath };
         }
       });
     }
     case "worker-packet": {
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
-      }
       if (instruction.trim() === "") {
         throw new CliUsageError("fixer requires a nonblank repair instruction");
       }
@@ -7615,7 +7773,7 @@ async function admitPublicRole(role, parsed, env, override) {
         placedFields: async (placed) => {
           let prerequisitesPath;
           if (prerequisitesSource !== void 0) {
-            prerequisitesPath = join18(placed.runDirectory, "prerequisites.json");
+            prerequisitesPath = join19(placed.runDirectory, "prerequisites.json");
             await writeFile4(
               prerequisitesPath,
               `${JSON.stringify(prerequisites, null, 2)}
@@ -7623,7 +7781,7 @@ async function admitPublicRole(role, parsed, env, override) {
               "utf8"
             );
           }
-          const packetPath = join18(placed.runDirectory, "fix-packet.md");
+          const packetPath = join19(placed.runDirectory, "fix-packet.md");
           await writeFile4(packetPath, instruction, "utf8");
           return {
             phase,
@@ -7635,18 +7793,7 @@ async function admitPublicRole(role, parsed, env, override) {
       });
     }
     case "collect-target": {
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
-      }
-      let explicitPrNumber;
-      if (parsed.prNumber !== void 0) {
-        try {
-          explicitPrNumber = parseCollectorPrNumber(parsed.prNumber);
-        } catch (error) {
-          const detail = error instanceof Error ? error.message : String(error);
-          throw new CliUsageError(detail, { cause: error });
-        }
-      }
+      const explicitPrNumber = parsed.prNumber;
       const projectRoot = resolve11(parsed.project ?? shared.cwd);
       let repository;
       if (parsed.repo !== void 0) {
@@ -7681,7 +7828,7 @@ async function admitPublicRole(role, parsed, env, override) {
         placedFields: async (placed) => {
           let requestManifestPath;
           if (manifestCanonicalJson !== void 0) {
-            requestManifestPath = join18(placed.runDirectory, "request-manifest.json");
+            requestManifestPath = join19(placed.runDirectory, "request-manifest.json");
             await writeFile4(requestManifestPath, manifestCanonicalJson, "utf8");
           }
           return {
@@ -7696,15 +7843,12 @@ async function admitPublicRole(role, parsed, env, override) {
       return { ...admittedCollector, repository };
     }
     case "case-identity": {
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
-      }
-      const issueNumber = parsed.issueNumber ?? Number.NaN;
-      if (!Number.isInteger(issueNumber) || issueNumber < 1 || !DOCTOR_ISSUE_NUMBER_PATTERN.test(String(issueNumber))) {
+      if (parsed.issueNumber === void 0) {
         throw new CliUsageError(
-          `doctor --issue must be a positive integer, got ${issueNumber}`
+          `doctor --issue must be a positive integer, got ${Number.NaN}`
         );
       }
+      const issueNumber = parsed.issueNumber;
       let frozenAttachments = [];
       const admittedDoctor = await admitStandardMaterialInvocation("doctor", {
         ...shared,
@@ -7760,22 +7904,21 @@ async function admitPublicRole(role, parsed, env, override) {
       return { ...admittedDoctor, attachments: frozenAttachments };
     }
     case "source-locator": {
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
-      }
       const projectRoot = resolve11(parsed.project ?? shared.cwd);
-      let sourceRun;
-      try {
-        sourceRun = await resolveNotarySourceRunLocator({
-          projectRoot,
-          sourceRun: parsed.sourceRun ?? "",
-          home: shared.home
-        });
-      } catch (error) {
-        if (error instanceof NotarySourceRunError) {
-          throw new CliUsageError(error.message, { cause: error });
+      let sourceRun = override?.resolvedSourceRun;
+      if (sourceRun === void 0) {
+        try {
+          sourceRun = await resolveNotarySourceRunLocator({
+            projectRoot,
+            sourceRun: parsed.sourceRun ?? "",
+            home: shared.home
+          });
+        } catch (error) {
+          if (error instanceof NotarySourceRunError) {
+            throw new CliUsageError(error.message, { cause: error });
+          }
+          throw error;
         }
-        throw error;
       }
       const inheritedTicketNumber = await readBoardTicketNumber(sourceRun.runDirectory);
       const knownTicketNumber = inheritedTicketNumber ?? shared.assertedTicketNumber;
@@ -7793,9 +7936,6 @@ async function admitPublicRole(role, parsed, env, override) {
       });
     }
     case "gleaner": {
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
-      }
       const baseRevision = parsed.baseRevision ?? "";
       if (baseRevision.trim() === "") {
         throw new CliUsageError("--base requires a nonempty revision");
@@ -7810,16 +7950,19 @@ async function admitPublicRole(role, parsed, env, override) {
       });
     }
     case "review-basis": {
-      const lens = requireReviewerLens(parsed.lens);
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
+      if (parsed.lens === void 0) {
+        throw new CliUsageError("--lens requires completeness or correctness");
+      }
+      if (parsed.baseRevision === void 0) {
+        throw new CliUsageError("--base requires a nonempty revision");
       }
-      const baseRevision = requireReviewerBaseRevision(parsed.baseRevision);
       const rawRefs = parsed.authorityRefs ?? [];
       if (rawRefs.length === 0) {
         throw new CliUsageError("reviewer requires --authority-ref <ref>");
       }
-      const authorityRefs = Object.freeze(rawRefs.map((ref) => requireAuthorityRef(ref)));
+      const lens = parsed.lens;
+      const baseRevision = parsed.baseRevision;
+      const authorityRefs = Object.freeze([...rawRefs]);
       const admittedReviewer = await admitStandardMaterialInvocation("reviewer", {
         ...shared,
         instruction,
@@ -7834,9 +7977,6 @@ async function admitPublicRole(role, parsed, env, override) {
       return { ...admittedReviewer, authorityRefs };
     }
     case "merge-envelope": {
-      if (parsed.project !== void 0) {
-        requireOptionPath("--project", parsed.project);
-      }
       if (instruction.trim() === "") {
         throw new CliUsageError("merger requires a nonblank task instruction");
       }
@@ -7871,7 +8011,7 @@ async function admitPublicRole(role, parsed, env, override) {
             resolutionScope: [...derived.resolutionScope],
             authorizedChecks: []
           });
-          const mergerInputPath = join18(placed.runDirectory, "merger-input.json");
+          const mergerInputPath = join19(placed.runDirectory, "merger-input.json");
           await writeFile4(
             mergerInputPath,
             `${JSON.stringify(mergerInput, null, 2)}
@@ -7898,9 +8038,6 @@ function admissionSubject(ticketNumber) {
   return { ticketNumber: fields.ticketNumber };
 }
 async function placeRoleAdmission(options) {
-  if (options.project !== void 0) {
-    requireOptionPath("--project", options.project);
-  }
   const projectRoot = resolve11(options.project ?? options.cwd);
   const runId = options.runId ?? (options.createRunId ?? uuidv7)();
   const ticketFields = ticketAdmissionFields(options.assertedTicketNumber);
@@ -7945,7 +8082,7 @@ function persistedAttachmentRefs(attachments) {
   }));
 }
 async function persistPlacedAdmission(admitted, placed, model) {
-  const admittedRequestPath = join18(placed.runDirectory, "admitted-request.json");
+  const admittedRequestPath = join19(placed.runDirectory, "admitted-request.json");
   await writeAdmittedRequestPersistence(admittedRequestPath, admitted, {
     sessionDirectory: placed.sessionDirectory,
     sessionFile: placed.sessionFile
@@ -7998,7 +8135,7 @@ async function admitStandardMaterialInvocation(role, options) {
     attachments: persistedAttachmentRefs(placed.attachments),
     ...placed.ticketFields
   };
-  const admittedRequestPath = defer ? join18(placed.runDirectory, "admitted-request.json") : await persistPlacedAdmission(admitted, placed, options.model);
+  const admittedRequestPath = defer ? join19(placed.runDirectory, "admitted-request.json") : await persistPlacedAdmission(admitted, placed, options.model);
   return {
     role,
     runId: placed.runId,
@@ -8076,7 +8213,7 @@ async function materializeCountersignInvocation(admitted, options) {
   });
   const placement = placed;
   admitted.runDirectory = placement.runDirectory;
-  admitted.admittedRequestPath = join18(
+  admitted.admittedRequestPath = join19(
     placement.runDirectory,
     "admitted-request.json"
   );
@@ -8103,7 +8240,7 @@ async function materializeCountersignInvocation(admitted, options) {
 async function loadAdmittedJudgeRequest(runDirectory) {
   try {
     const raw = JSON.parse(
-      await readFile13(join18(runDirectory, "admitted-request.json"), "utf8")
+      await readFile13(join19(runDirectory, "admitted-request.json"), "utf8")
     );
     if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return void 0;
     const record4 = raw;
@@ -8192,7 +8329,7 @@ function parseDoctorIssueNumber(raw) {
 }
 async function resolveDoctorCaseRunsPath(options) {
   const ledgerHome = resolveActivationLedgerHome(options.home);
-  const defaultRuns = join18(
+  const defaultRuns = join19(
     activationBookDirectory(ledgerHome, options.bookKey),
     String(options.issueNumber),
     "runs"
@@ -8286,11 +8423,11 @@ function parseAnalystCohortIssueToken(raw, flag) {
       `${flag} requires a comma-separated list of N or book:N`
     );
   }
-  const sep6 = trimmed.lastIndexOf(":");
-  if (sep6 > 0) {
-    const rhs = trimmed.slice(sep6 + 1);
+  const sep5 = trimmed.lastIndexOf(":");
+  if (sep5 > 0) {
+    const rhs = trimmed.slice(sep5 + 1);
     if (ANALYST_TICKET_NUMBER_PATTERN.test(rhs)) {
-      const bookKey = trimmed.slice(0, sep6);
+      const bookKey = trimmed.slice(0, sep5);
       if (bookKey.trim() === "") {
         throw new CliUsageError(
           `${flag} book:N requires a non-empty book key, got ${raw}`
@@ -8513,15 +8650,15 @@ var init_invocation = __esm({
 
 // src/public-cli/load-production-acp-host.ts
 import { existsSync as existsSync5 } from "node:fs";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 import { pathToFileURL } from "node:url";
 async function loadProductionAcpHostFactory(packageRoot, host) {
   const description = lookupHostDescription(host);
   if (description === void 0) {
     throw new Error(`unregistered host: ${host}`);
   }
-  const built = join19(packageRoot, "dist/acp-host/production-host.js");
-  const source = join19(packageRoot, "src/acp-host/production-host.ts");
+  const built = join20(packageRoot, "dist/acp-host/production-host.js");
+  const source = join20(packageRoot, "src/acp-host/production-host.ts");
   const target = existsSync5(built) ? built : source;
   const href = pathToFileURL(target).href;
   const mod = await import(href);
@@ -8537,15 +8674,15 @@ var init_load_production_acp_host = __esm({
 
 // src/public-cli/load-production-headless-host.ts
 import { existsSync as existsSync6 } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join21 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 async function loadProductionHeadlessHostFactory(packageRoot, host) {
   const description = lookupHeadlessHostDescription(host);
   if (description === void 0) {
     throw new Error(`unregistered headless host: ${host}`);
   }
-  const built = join20(packageRoot, "dist/headless-host/production-host.js");
-  const source = join20(packageRoot, "src/headless-host/production-host.ts");
+  const built = join21(packageRoot, "dist/headless-host/production-host.js");
+  const source = join21(packageRoot, "src/headless-host/production-host.ts");
   const target = existsSync6(built) ? built : source;
   const href = pathToFileURL2(target).href;
   const mod = await import(href);
@@ -8670,179 +8807,45 @@ var init_role_turn_host_resolution = __esm({
   }
 });
 
-// src/public-cli/host-providers.ts
-var host_providers_exports = {};
-__export(host_providers_exports, {
-  HostProviderResolutionError: () => HostProviderResolutionError,
-  hermesProviderModelsCachePath: () => hermesProviderModelsCachePath,
-  hostCatalogOffersModel: () => hostCatalogOffersModel,
-  hostProvidersPath: () => hostProvidersPath,
-  listHermesProvidersForModel: () => listHermesProvidersForModel,
-  loadHostProvidersTable: () => loadHostProvidersTable,
-  parseHostProvidersTable: () => parseHostProvidersTable,
-  projectHostFacingProvider: () => projectHostFacingProvider,
-  renderHostProvidersTable: () => renderHostProvidersTable
+// src/public-cli/role-seat-runtime.ts
+var role_seat_runtime_exports = {};
+__export(role_seat_runtime_exports, {
+  openRoleSeatRuntime: () => openRoleSeatRuntime
 });
-import { readFileSync } from "node:fs";
-import { join as join21 } from "node:path";
-function hostProvidersPath(home) {
-  if (typeof home !== "string" || home.trim() === "") {
-    throw new Error("home must be explicitly provided");
-  }
-  return join21(home, ".ak-roles", "host-providers.json");
-}
-function hermesProviderModelsCachePath(home) {
-  return join21(home, ".hermes", "provider_models_cache.json");
-}
-function parseHostProvidersTable(value) {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) {
-    throw new Error("host-providers.json must be an object");
-  }
-  const out = {};
-  for (const [host, byProvider] of Object.entries(value)) {
-    if (host.trim() === "") {
-      throw new Error("host-providers.json host key must be non-empty");
-    }
-    if (byProvider === null || typeof byProvider !== "object" || Array.isArray(byProvider)) {
-      throw new Error(`host-providers.json[${host}] must be an object`);
-    }
-    const providers = {};
-    for (const [seatProvider, hostProvider] of Object.entries(
-      byProvider
-    )) {
-      if (seatProvider.trim() === "") {
-        throw new Error(
-          `host-providers.json[${host}] seat-provider key must be non-empty`
-        );
-      }
-      if (typeof hostProvider !== "string" || hostProvider.trim() === "") {
-        throw new Error(
-          `host-providers.json[${host}][${seatProvider}] must be a non-empty string`
-        );
-      }
-      providers[seatProvider] = hostProvider;
-    }
-    if (Object.keys(providers).length > 0) {
-      out[host] = providers;
-    }
-  }
-  return out;
-}
-function loadHostProvidersTable(home) {
-  const path = hostProvidersPath(home);
-  try {
-    const raw = readFileSync(path, "utf8");
-    return parseHostProvidersTable(JSON.parse(raw));
-  } catch (error) {
-    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-      return {};
-    }
-    throw error;
-  }
-}
-function hostCatalogOffersModel(catalogModels, seatModel) {
-  return catalogModels.some(
-    (entry) => entry === seatModel || entry.endsWith(`/${seatModel}`)
+function openRoleSeatRuntime(input) {
+  const hostAdapters = composeRoleTurnHostAdapters(
+    input.resolution,
+    input.principalAuthority
   );
-}
-function listHermesProvidersForModel(home, seatModel) {
-  const path = hermesProviderModelsCachePath(home);
-  let text;
-  try {
-    text = readFileSync(path, "utf8");
-  } catch (error) {
-    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-      return [];
-    }
-    throw error;
-  }
-  const raw = JSON.parse(text);
-  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
-    throw new Error(
-      `hermes provider_models_cache.json must be an object: ${path}`
-    );
-  }
-  const found = [];
-  for (const [provider, entry] of Object.entries(raw)) {
-    if (entry === null || typeof entry !== "object" || Array.isArray(entry)) {
-      continue;
-    }
-    const models = entry.models;
-    if (!Array.isArray(models)) continue;
-    const names = models.filter((m) => typeof m === "string");
-    if (hostCatalogOffersModel(names, seatModel)) {
-      found.push(provider);
-    }
-  }
-  return found.sort();
-}
-function listDirectoryProvidersForModel(home, host, seatModel) {
-  if (host === "hermes") {
-    return listHermesProvidersForModel(home, seatModel);
-  }
-  return void 0;
-}
-function projectHostFacingProvider(selection, host, table, home) {
-  if (selection === void 0) return void 0;
-  const mapped = table[host]?.[selection.provider];
-  if (mapped !== void 0) {
-    return mapped === selection.provider ? selection : { ...selection, provider: mapped };
-  }
-  const directory = listDirectoryProvidersForModel(home, host, selection.model);
-  if (directory === void 0) {
-    return selection;
-  }
-  if (directory.length === 1) {
-    const only = directory[0];
-    return only === selection.provider ? selection : { ...selection, provider: only };
-  }
-  if (directory.length === 0) {
-    throw new HostProviderResolutionError({
-      message: `host ${host} has no provider offering model ${selection.model}; seat provider was ${selection.provider}`,
-      host,
-      seatProvider: selection.provider,
-      seatModel: selection.model
-    });
-  }
-  throw new HostProviderResolutionError({
-    message: `host ${host} has multiple providers for model ${selection.model}: ${directory.join(", ")}; set host-providers.json[${host}][${selection.provider}] to one of them`,
-    host,
-    seatProvider: selection.provider,
-    seatModel: selection.model,
-    candidates: directory
+  const roleTurnHost = selectRoleTurnHost(hostAdapters, {
+    role: input.role,
+    seat: input.seat
   });
+  input.afterHost?.();
+  const seatWithModel = resolvedSeatWithModel(input.seat);
+  if (seatWithModel === void 0) return { ok: false };
+  const projected = input.hostFacingModel ?? projectHostFacingProvider(
+    seatWithModel.selection,
+    seatWithModel.host,
+    loadHostProvidersTable(input.home),
+    input.home
+  );
+  return {
+    ok: true,
+    roleTurnHost,
+    hostAdapters,
+    ...projected === void 0 ? {} : { model: projected },
+    ...pickEngineAxis(seatWithModel),
+    host: seatWithModel.host
+  };
 }
-function renderHostProvidersTable(table) {
-  const lines = [];
-  for (const host of Object.keys(table).sort()) {
-    const byProvider = table[host];
-    for (const seatProvider of Object.keys(byProvider).sort()) {
-      lines.push(
-        `hostProvider	${host}	${seatProvider}	${byProvider[seatProvider]}`
-      );
-    }
-  }
-  return lines.length === 0 ? "" : `${lines.join("\n")}
-`;
-}
-var HostProviderResolutionError;
-var init_host_providers = __esm({
-  "src/public-cli/host-providers.ts"() {
+var init_role_seat_runtime = __esm({
+  "src/public-cli/role-seat-runtime.ts"() {
     "use strict";
-    HostProviderResolutionError = class extends Error {
-      host;
-      seatProvider;
-      seatModel;
-      candidates;
-      constructor(options) {
-        super(options.message);
-        this.name = "HostProviderResolutionError";
-        this.host = options.host;
-        this.seatProvider = options.seatProvider;
-        this.seatModel = options.seatModel;
-        this.candidates = options.candidates ?? [];
-      }
-    };
+    init_engine_material();
+    init_config();
+    init_host_providers();
+    init_role_turn_host_resolution();
   }
 });
 
@@ -12340,75 +12343,326 @@ var init_submission_gate = __esm({
   }
 });
 
-// src/session-identity.ts
-import { mkdir as mkdir2, readFile as readFile17, rename as rename3, writeFile as writeFile6 } from "node:fs/promises";
-import { dirname as dirname18, join as join29 } from "node:path";
-function createSessionIdentityAuthority(authority, sessionBindingFile) {
-  const bindingPath = (principal) => join29(authority.decode(principal).sessionDirectory, sessionBindingFile);
-  return {
-    resolveSessionFile(principal) {
-      return authority.decode(principal).sessionFile;
-    },
-    async load(principal) {
-      try {
-        const value = JSON.parse(await readFile17(bindingPath(principal), "utf8"));
-        if (typeof value !== "object" || value === null || typeof value.sessionId !== "string") {
-          throw new Error("durable session binding is invalid");
-        }
-        return value.sessionId;
-      } catch (error) {
-        if (error.code === "ENOENT") return void 0;
-        throw error;
-      }
-    },
-    async bind(principal, sessionId) {
-      const target = bindingPath(principal);
-      await mkdir2(dirname18(target), { recursive: true });
-      const temporary = `${target}.${process.pid}.tmp`;
-      await writeFile6(temporary, `${JSON.stringify({ sessionId })}
-`, { encoding: "utf8", mode: 384 });
-      await rename3(temporary, target);
-    }
-  };
+// src/public-cli/machine-method-skills.ts
+import { accessSync, constants as constants2, statSync as statSync3 } from "node:fs";
+import { lstat as lstat4, mkdir as mkdir2, symlink } from "node:fs/promises";
+import { join as join29 } from "node:path";
+import { spawnSync } from "node:child_process";
+function skillRoot(home) {
+  return join29(home, ".agents/skills");
 }
-async function readStoredHostSessionId(host, authority, principal) {
-  if (host === void 0 || host === DEFAULT_ROLE_TURN_HOST) return void 0;
-  const description = lookupHostDescription(host) ?? lookupHeadlessHostDescription(host);
-  if (description === void 0) return void 0;
-  const sessionId = await createSessionIdentityAuthority(
-    authority,
-    description.sessionBindingFile
-  ).load(principal);
-  if (sessionId === void 0 || sessionId === "") return void 0;
-  return sessionId;
+function installedMethodSkillPath(home, name) {
+  return installedSkillPath(skillRoot(home), name);
 }
-var init_session_identity = __esm({
-  "src/session-identity.ts"() {
-    "use strict";
-    init_host_descriptions();
+function installedSkillPath(root, name) {
+  const path = join29(root, name, "SKILL.md");
+  try {
+    if (!statSync3(path).isFile()) return void 0;
+    accessSync(path, constants2.R_OK);
+    return path;
+  } catch (error) {
+    const code = error.code;
+    if (code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "EPERM" || code === "ELOOP") return void 0;
+    throw error;
   }
-});
-
-// src/public-cli/process-cancel.ts
-function processCancelSignalName(signal) {
-  if (signal === void 0 || signal.aborted !== true) return void 0;
-  const reason = signal.reason;
-  if (reason === "SIGTERM" || reason === "SIGINT" || reason === "SIGHUP") {
-    return reason;
+}
+function linkedSkillRoot(home, host) {
+  if (host === "claude" || host === "claude-code") {
+    return join29(process.env.CLAUDE_CONFIG_DIR?.trim() || join29(home, ".claude"), "skills");
   }
+  if (host === "hermes") return join29(home, ".hermes/skills");
   return void 0;
 }
-function processCancelDiagnostic(signalName) {
-  return `ak-role terminated by ${signalName}`;
+async function occupied(path) {
+  try {
+    await lstat4(path);
+    return true;
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+    return false;
+  }
 }
-var init_process_cancel = __esm({
-  "src/public-cli/process-cancel.ts"() {
-    "use strict";
+function warnOccupied(path, stdout) {
+  stdout(`Warning: ${path} is already occupied; left untouched.
+`);
+}
+async function warnMissingMethodSkills(home, host, role, skills, stdout) {
+  const missing = [];
+  const linkedRoot = linkedSkillRoot(home, host);
+  for (const skill of skills) {
+    if (installedMethodSkillPath(home, skill) === void 0 || linkedRoot !== void 0 && installedSkillPath(linkedRoot, skill) === void 0) missing.push(skill);
+  }
+  for (const skill of missing) {
+    stdout(`Warning: required machine Skill "${skill}" is missing for ${role}; its method guidance may be unavailable and reduce work quality. Run \`ak-role setup\` to install required Skills.
+`);
+  }
+}
+function runSkillsCli(args, home) {
+  const result = spawnSync("npx", ["--yes", "skills", ...args], {
+    stdio: "inherit",
+    env: { ...process.env, HOME: home }
+  });
+  if (result.error !== void 0) throw result.error;
+  return result.status === 0;
+}
+function addSkills(source, skills, home) {
+  if (skills.length === 0) return true;
+  return runSkillsCli([
+    "add",
+    source,
+    ...skills.flatMap((skill) => ["--skill", skill]),
+    "--agent",
+    "codex",
+    "--global",
+    "--yes"
+  ], home);
+}
+function updateRequiredSkills(home) {
+  const names = packagedMethodSkillNames();
+  if (names.length === 0) return true;
+  return runSkillsCli(["update", "-g", "-y", ...names], home);
+}
+async function runMachineSkillSetup(home, stdout) {
+  const canonical = skillRoot(home);
+  const missingBySource = /* @__PURE__ */ new Map();
+  let unsourced = false;
+  for (const name of packagedMethodSkillNames()) {
+    const path = join29(canonical, name);
+    if (await occupied(path)) {
+      warnOccupied(path, stdout);
+      continue;
+    }
+    const source = SKILL_SOURCE[name];
+    if (source === void 0) {
+      unsourced = true;
+      stdout(`Warning: required machine Skill "${name}" has no install source; setup did not install it.
+`);
+      continue;
+    }
+    const missing = missingBySource.get(source) ?? [];
+    missing.push(name);
+    missingBySource.set(source, missing);
+  }
+  for (const [source, missing] of missingBySource) {
+    if (!addSkills(source, missing, home)) return 1;
+  }
+  if (unsourced) return 1;
+  for (const host of ["claude-code", "hermes"]) {
+    const root = linkedSkillRoot(home, host);
+    const description = host === "claude-code" ? HEADLESS_HOST_DESCRIPTIONS.claude : HOST_DESCRIPTIONS.hermes;
+    try {
+      accessSync(resolveHostBinary(description, home), constants2.X_OK);
+    } catch (error) {
+      if (["ENOENT", "ENOTDIR", "EACCES"].includes(error.code ?? "")) continue;
+      throw error;
+    }
+    for (const name of packagedMethodSkillNames()) {
+      const target = join29(canonical, name);
+      if (installedMethodSkillPath(home, name) === void 0) continue;
+      const link = join29(root, name);
+      if (await occupied(link)) {
+        warnOccupied(link, stdout);
+        continue;
+      }
+      await mkdir2(root, { recursive: true });
+      await symlink(target, link, "dir");
+    }
+  }
+  if (!updateRequiredSkills(home)) return 1;
+  stdout("Machine method Skills setup finished. Existing same-name Skills were left untouched.\n");
+  return 0;
+}
+var SKILL_SOURCE;
+var init_machine_method_skills = __esm({
+  "src/public-cli/machine-method-skills.ts"() {
+    "use strict";
+    init_host_descriptions();
+    init_packaged_role_registry();
+    SKILL_SOURCE = {
+      tdd: "mattpocock/skills",
+      "diagnosing-bugs": "mattpocock/skills",
+      "resolving-merge-conflicts": "mattpocock/skills",
+      "ak-cross-m-review": "Akagilnc/ak-cross-m-review"
+    };
+  }
+});
+
+// src/public-cli/turn-request.ts
+function projectPublicTurnAxes(env) {
+  return {
+    packageRoot: env.packageRoot,
+    home: env.home,
+    agentDir: env.agentDir,
+    ...env.model === void 0 ? {} : { model: env.model },
+    ...pickEngineAxis(env),
+    ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs }
+  };
+}
+function projectRoleTurnRequest(admitted, roleDetails, options) {
+  const cwd = admitted.projectRoot ?? admitted.repoRoot ?? admitted.cwd;
+  if (cwd === void 0) throw new Error("admitted invocation missing working directory");
+  if (admitted.principal === void 0) throw new Error("admitted invocation missing principal");
+  return {
+    principal: admitted.principal,
+    activation: roleDetails.activation,
+    methods: roleDetails.methods ?? [],
+    continuation: options.continuation,
+    ...options.model === void 0 ? {} : { model: options.model },
+    ...pickEngineAxis(options),
+    cwd,
+    home: options.home,
+    agentDir: options.agentDir,
+    runDirectory: admitted.runDirectory,
+    ...options.correlationId === void 0 || options.correlationId.trim() === "" ? {} : { correlationId: options.correlationId },
+    ...options.timeoutMs === void 0 ? {} : { timeoutMs: options.timeoutMs },
+    ...options.courtAttemptId === void 0 || options.courtAttemptId.length === 0 ? {} : { courtAttemptId: options.courtAttemptId },
+    ...options.invocationScopeId === void 0 || options.invocationScopeId.length === 0 ? {} : { invocationScopeId: options.invocationScopeId },
+    ...options.stationChild === void 0 ? {} : { stationChild: options.stationChild }
+  };
+}
+function packagedSettleSkill(admitted) {
+  const record4 = packagedRoleMetadata(admitted.role);
+  if (record4 === void 0) return void 0;
+  if ("applyMethod" in record4 && record4.applyMethod !== void 0) {
+    return "phase" in admitted && admitted.phase === "apply" ? record4.applyMethod : void 0;
+  }
+  if ("settleMethod" in record4 && record4.settleMethod !== void 0) return record4.settleMethod;
+  return void 0;
+}
+function readAdmittedPath2(admitted, path) {
+  let current = admitted;
+  for (const key of path.split(".")) {
+    if (current === null || typeof current !== "object") return void 0;
+    current = current[key];
+  }
+  return current;
+}
+function activationForAdmitted(admitted) {
+  if (packagedRoleMetadata(admitted.role) === void 0) {
+    throw new Error(`no turn projection for ${admitted.role}`);
+  }
+  const activation = { role: admitted.role };
+  for (const spec of packagedRoleActivationFlags(admitted.role)) {
+    let value = readAdmittedPath2(admitted, spec.from ?? spec.field);
+    if (spec.fallback === "gate-pointer") {
+      const trimmed = typeof value === "string" ? value.trim() : "";
+      value = trimmed !== "" ? trimmed : parentRunPathFromGatePointerInstruction(admitted.instruction);
+      if (typeof value !== "string" || value === "") continue;
+    }
+    if (value === void 0) continue;
+    if (spec.text === true) {
+      if (typeof value !== "number") continue;
+      value = String(value);
+    }
+    activation[spec.field] = value;
+  }
+  return activation;
+}
+function requiredMethodSkills(admitted) {
+  const record4 = packagedRoleMetadata(admitted.role);
+  const names = [];
+  if (record4 !== void 0 && "methodSkills" in record4 && record4.methodSkills !== void 0) {
+    names.push(...record4.methodSkills);
+  }
+  const apply = packagedSettleSkill(admitted);
+  if (apply !== void 0 && !names.includes(apply)) names.push(apply);
+  return names;
+}
+function methodBindings(admitted, home, host) {
+  if (host !== void 0 && host !== "pi") return [];
+  return requiredMethodSkills(admitted).flatMap((name) => {
+    const path = installedMethodSkillPath(home, name);
+    return path === void 0 ? [] : [{
+      kind: "skill",
+      path
+    }];
+  });
+}
+function admittedSeatTurnDetails(admitted, home, host) {
+  return {
+    activation: activationForAdmitted(admitted),
+    methods: methodBindings(admitted, home, host)
+  };
+}
+var init_turn_request = __esm({
+  "src/public-cli/turn-request.ts"() {
+    "use strict";
+    init_engine_material();
+    init_packaged_role_registry();
+    init_machine_method_skills();
+    init_run_lifecycle();
+  }
+});
+
+// src/session-identity.ts
+import { mkdir as mkdir3, readFile as readFile17, rename as rename3, writeFile as writeFile6 } from "node:fs/promises";
+import { dirname as dirname18, join as join30 } from "node:path";
+function createSessionIdentityAuthority(authority, sessionBindingFile) {
+  const bindingPath = (principal) => join30(authority.decode(principal).sessionDirectory, sessionBindingFile);
+  return {
+    resolveSessionFile(principal) {
+      return authority.decode(principal).sessionFile;
+    },
+    async load(principal) {
+      try {
+        const value = JSON.parse(await readFile17(bindingPath(principal), "utf8"));
+        if (typeof value !== "object" || value === null || typeof value.sessionId !== "string") {
+          throw new Error("durable session binding is invalid");
+        }
+        return value.sessionId;
+      } catch (error) {
+        if (error.code === "ENOENT") return void 0;
+        throw error;
+      }
+    },
+    async bind(principal, sessionId) {
+      const target = bindingPath(principal);
+      await mkdir3(dirname18(target), { recursive: true });
+      const temporary = `${target}.${process.pid}.tmp`;
+      await writeFile6(temporary, `${JSON.stringify({ sessionId })}
+`, { encoding: "utf8", mode: 384 });
+      await rename3(temporary, target);
+    }
+  };
+}
+async function readStoredHostSessionId(host, authority, principal) {
+  if (host === void 0 || host === DEFAULT_ROLE_TURN_HOST) return void 0;
+  const description = lookupHostDescription(host) ?? lookupHeadlessHostDescription(host);
+  if (description === void 0) return void 0;
+  const sessionId = await createSessionIdentityAuthority(
+    authority,
+    description.sessionBindingFile
+  ).load(principal);
+  if (sessionId === void 0 || sessionId === "") return void 0;
+  return sessionId;
+}
+var init_session_identity = __esm({
+  "src/session-identity.ts"() {
+    "use strict";
+    init_host_descriptions();
+  }
+});
+
+// src/public-cli/process-cancel.ts
+function processCancelSignalName(signal) {
+  if (signal === void 0 || signal.aborted !== true) return void 0;
+  const reason = signal.reason;
+  if (reason === "SIGTERM" || reason === "SIGINT" || reason === "SIGHUP") {
+    return reason;
+  }
+  return void 0;
+}
+function processCancelDiagnostic(signalName) {
+  return `ak-role terminated by ${signalName}`;
+}
+var init_process_cancel = __esm({
+  "src/public-cli/process-cancel.ts"() {
+    "use strict";
   }
 });
 
 // src/host-session-record.ts
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 import {
   appendFileSync as appendFileSync2,
   copyFileSync,
@@ -12419,10 +12673,10 @@ import {
   mkdirSync as mkdirSync3,
   readdirSync as readdirSync2,
   rmSync,
-  statSync as statSync3
+  statSync as statSync4
 } from "node:fs";
 import { homedir } from "node:os";
-import { dirname as dirname19, join as join30 } from "node:path";
+import { dirname as dirname19, join as join31 } from "node:path";
 function declareHostSessionFailure(error) {
   const message = error instanceof Error ? error.stack || error.message : String(error);
   process.stderr.write(`[host-session] Dossier record failure: ${message}
@@ -12447,12 +12701,12 @@ function findCodexRollout(sessionsDir, sessionId) {
       return;
     }
     for (const entry of entries) {
-      const fullPath = join30(dir, entry.name);
+      const fullPath = join31(dir, entry.name);
       if (entry.isDirectory()) {
         scan(fullPath, depth + 1);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl") && entry.name.includes(sessionId)) {
         try {
-          const stat2 = statSync3(fullPath);
+          const stat2 = statSync4(fullPath);
           matches.push({ path: fullPath, mtime: stat2.mtimeMs });
         } catch {
           matches.push({ path: fullPath, mtime: 0 });
@@ -12471,25 +12725,25 @@ function sanitizeClaudeCwd(cwd) {
 function resolveNativeSessionPath(options) {
   const home = options.home || homedir();
   if (options.host === "claude") {
-    const configDir = process.env.CLAUDE_CONFIG_DIR || join30(home, ".claude");
+    const configDir = process.env.CLAUDE_CONFIG_DIR || join31(home, ".claude");
     const sanitizedCwd = sanitizeClaudeCwd(options.cwd);
-    return join30(configDir, "projects", sanitizedCwd, `${options.sessionId}.jsonl`);
+    return join31(configDir, "projects", sanitizedCwd, `${options.sessionId}.jsonl`);
   }
   if (options.host === "codex") {
     return findCodexRollout(codexSessionsDirectory(home), options.sessionId);
   }
   if (options.host === "grok-build") {
-    const grokHome = process.env.GROK_HOME || join30(home, ".grok");
-    return join30(grokHome, "sessions", encodeURIComponent(options.cwd), options.sessionId);
+    const grokHome = process.env.GROK_HOME || join31(home, ".grok");
+    return join31(grokHome, "sessions", encodeURIComponent(options.cwd), options.sessionId);
   }
   return void 0;
 }
 function codexSessionsDirectory(home) {
-  return join30(process.env.CODEX_HOME || join30(home || homedir(), ".codex"), "sessions");
+  return join31(process.env.CODEX_HOME || join31(home || homedir(), ".codex"), "sessions");
 }
 function recordRunStart(runDirectory) {
   try {
-    appendFileSync2(join30(runDirectory, ".run-starts"), "\n");
+    appendFileSync2(join31(runDirectory, ".run-starts"), "\n");
   } catch (error) {
     declareHostSessionFailure(error);
   }
@@ -12513,12 +12767,12 @@ function resolveHostDossierLandingPath(options) {
     } catch {
     }
   }
-  const startsPath = join30(dirname19(options.sessionDirectory), ".run-starts");
+  const startsPath = join31(dirname19(options.sessionDirectory), ".run-starts");
   let starts = 0;
   if (existsSync9(startsPath)) starts = readFileSync3(startsPath, "utf8").length;
   const ordinal = Math.max(maxOrdinal + 1, starts, options.continuation.kind === "resume" ? 2 : 1);
   const baseName = `${options.host}-${sanitizedModel}-${ordinal}`;
-  const landingPath = options.host === "grok-build" ? join30(options.sessionDirectory, baseName) : join30(options.sessionDirectory, `${baseName}.jsonl`);
+  const landingPath = options.host === "grok-build" ? join31(options.sessionDirectory, baseName) : join31(options.sessionDirectory, `${baseName}.jsonl`);
   return { landingPath, ordinal, sanitizedModel };
 }
 function recordNativeSessionPointer(options) {
@@ -12544,25 +12798,25 @@ function recordNativeSessionPointer(options) {
 }
 function copyFileCloneOrFallback(src, dest) {
   try {
-    const res = spawnSync("cp", ["-c", src, dest]);
+    const res = spawnSync2("cp", ["-c", src, dest]);
     if (res.status === 0) return;
   } catch {
   }
   copyFileSync(src, dest);
 }
 function copyGrokDossier(srcDir, destDir) {
-  const chatHistorySrc = join30(srcDir, "chat_history.jsonl");
+  const chatHistorySrc = join31(srcDir, "chat_history.jsonl");
   if (!existsSync9(chatHistorySrc)) {
     throw new Error(`Grok native chat_history.jsonl missing at ${chatHistorySrc}`);
   }
   mkdirSync3(destDir, { recursive: true });
-  const chatHistoryDest = join30(destDir, "chat_history.jsonl");
+  const chatHistoryDest = join31(destDir, "chat_history.jsonl");
   copyFileCloneOrFallback(chatHistorySrc, chatHistoryDest);
-  const usageSrc = join30(srcDir, "usage.json");
+  const usageSrc = join31(srcDir, "usage.json");
   if (!existsSync9(usageSrc)) {
     throw new Error(`Grok native usage.json missing at ${usageSrc}`);
   }
-  copyFileCloneOrFallback(usageSrc, join30(destDir, "usage.json"));
+  copyFileCloneOrFallback(usageSrc, join31(destDir, "usage.json"));
 }
 function copyAndRecordHostDossier(options) {
   if (options.host === "pi" || options.host === "hermes") {
@@ -12637,7 +12891,7 @@ function copyAndRecordHostDossier(options) {
     }
     try {
       mkdirSync3(options.sessionDirectory, { recursive: true });
-      closeSync(openSync(join30(options.sessionDirectory, `${options.host}-${sanitizedModel}-${ordinal}.failed`), "a"));
+      closeSync(openSync(join31(options.sessionDirectory, `${options.host}-${sanitizedModel}-${ordinal}.failed`), "a"));
     } catch {
     }
     sitianReportSafe({
@@ -12670,8 +12924,8 @@ var init_host_session_record = __esm({
 // src/public-cli/auto-resume.ts
 import { constants as fsConstants2 } from "node:fs";
 import { randomUUID as randomUUID6 } from "node:crypto";
-import { lstat as lstat4, mkdir as mkdir3, open } from "node:fs/promises";
-import { join as join31 } from "node:path";
+import { lstat as lstat5, mkdir as mkdir4, open } from "node:fs/promises";
+import { join as join32 } from "node:path";
 async function persistReturnedRunState(admitted, options) {
   if (options?.lawful === true) {
     await markRunTerminal(admitted.runDirectory);
@@ -12705,20 +12959,20 @@ async function finalizeExceptionRunBestEffort(runDirectory, io) {
   }
 }
 async function ensureRealArtifactsDirectory(runDirectory) {
-  const runStat = await lstat4(runDirectory);
+  const runStat = await lstat5(runDirectory);
   if (runStat.isSymbolicLink() || !runStat.isDirectory()) {
     throw new Error("run artifact retention: run directory is not a real directory");
   }
   const artifactsDir = roleRunArtifactsDirectory(runDirectory);
   try {
-    const existing = await lstat4(artifactsDir);
+    const existing = await lstat5(artifactsDir);
     if (existing.isSymbolicLink() || !existing.isDirectory()) {
       throw new Error("run artifact retention: artifacts path is not a real directory");
     }
   } catch (error) {
     if (!isMissingPathError5(error)) throw error;
-    await mkdir3(artifactsDir, { recursive: true });
-    const created = await lstat4(artifactsDir);
+    await mkdir4(artifactsDir, { recursive: true });
+    const created = await lstat5(artifactsDir);
     if (created.isSymbolicLink() || !created.isDirectory()) {
       throw new Error("run artifact retention: artifacts directory is not a real directory");
     }
@@ -12740,7 +12994,7 @@ function jsonSafeReplacer() {
   };
 }
 async function writeHardenedArtifactFile(artifactsDir, namePrefix, payload) {
-  const filePath = join31(artifactsDir, `${namePrefix}-${randomUUID6()}.json`);
+  const filePath = join32(artifactsDir, `${namePrefix}-${randomUUID6()}.json`);
   const body = `${JSON.stringify(payload, jsonSafeReplacer(), 2)}
 `;
   const noFollowFlag = typeof fsConstants2.O_NOFOLLOW === "number" ? fsConstants2.O_NOFOLLOW : 0;
@@ -12995,7 +13249,7 @@ var init_auto_resume = __esm({
 // src/public-cli/post-admission.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
 import { writeFile as writeFile7 } from "node:fs/promises";
-import { isAbsolute as isAbsolute7, join as join32, resolve as resolve13 } from "node:path";
+import { isAbsolute as isAbsolute7, join as join33, resolve as resolve13 } from "node:path";
 function describeCaughtError(error) {
   if (error instanceof Error) {
     const code = error.code;
@@ -13090,12 +13344,10 @@ async function recordBestEffortPostDispatchDiagnostic(admitted, env, diagnostic,
   } catch (appendError) {
     try {
       const artifactsDir = await ensureRealArtifactsDirectory(admitted.runDirectory);
-      await writeFile7(
-        join32(artifactsDir, `post-admission-diagnostic-${randomUUID7()}.json`),
-        `${JSON.stringify({ version: 1, ...payload }, null, 2)}
-`,
-        { encoding: "utf8", flag: "wx" }
-      );
+      await writeHardenedArtifactFile(artifactsDir, "post-admission-diagnostic", {
+        version: 1,
+        ...payload
+      });
     } catch (artifactError) {
       retentionFailure = `post-dispatch diagnostic durable retention failed on both channels (best-effort continue): dossier=${describeErrorIdentity(appendError)}; artifact=${describeErrorIdentity(artifactError)}`;
     }
@@ -13232,7 +13484,7 @@ async function dispatchPostAdmissionTurn(input) {
         const rows = await readRecordedSubmissionRows(
           admitted.projectRoot,
           admitted.runId,
-          { home: homeFromRunDirectory(admitted.runDirectory), sessionParent: join32(admitted.runDirectory, "session", "session.jsonl") }
+          { home: homeFromRunDirectory(admitted.runDirectory), sessionParent: join33(admitted.runDirectory, "session", "session.jsonl") }
         );
         let ticketNumber;
         for (const row of rows) {
@@ -13359,7 +13611,7 @@ async function dispatchPostAdmissionTurn(input) {
     let stderrLogWriteFailure;
     try {
       await writeFile7(
-        join32(admitted.runDirectory, "stderr.log"),
+        join33(admitted.runDirectory, "stderr.log"),
         result.stderr,
         "utf8"
       );
@@ -13593,13 +13845,8 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
     prompt = "";
   }
   return {
-    packageRoot: env.packageRoot,
-    home: env.home,
+    ...projectPublicTurnAxes(env),
     ...env.host === void 0 ? {} : { host: env.host },
-    agentDir: env.agentDir,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...pickEngineAxis(env),
-    ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...env.correlationId === void 0 && admitted.correlationId === void 0 ? {} : { correlationId: env.correlationId ?? admitted.correlationId },
     continuation: {
       kind: "resume",
@@ -13612,13 +13859,8 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
 function roleTurnOptions(env, admitted, continuation) {
   const correlationId = env.correlationId ?? admitted.correlationId;
   return {
-    packageRoot: env.packageRoot,
-    home: env.home,
+    ...projectPublicTurnAxes(env),
     ...env.host === void 0 ? {} : { host: env.host },
-    agentDir: env.agentDir,
-    ...env.model === void 0 ? {} : { model: env.model },
-    ...pickEngineAxis(env),
-    ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...correlationId === void 0 || correlationId.trim() === "" ? {} : { correlationId },
     continuation,
     ...env.stationChild === void 0 ? {} : { stationChild: env.stationChild }
@@ -13636,9 +13878,46 @@ async function dispatchAfterWriterLease(input) {
     }
   }
 }
+async function runSettledAutoResumeLoop(input) {
+  const adapters = withOnceSuccessfulBeforeDispatch(input.adapters);
+  const dispatchEnv = input.dispatchEnv ?? input.env;
+  return runWithAutoResumeLoop({
+    admitted: input.admitted,
+    principalAuthority: input.env.principalAuthority,
+    io: input.io,
+    sessionAppender: input.env.sessionAppender,
+    autoResumeLimit: input.env.autoResumeLimit,
+    ...input.env.signal === void 0 ? {} : { signal: input.env.signal },
+    buildInitialPayload: input.buildInitialPayload,
+    buildResumePayload: input.buildResumePayload,
+    dispatch: async (payload, lease, _isFirst, attemptIo) => dispatchAfterWriterLease({
+      ...lease === void 0 ? {} : { lease },
+      build: () => input.toRequest(payload),
+      dispatch: async (request) => {
+        const result = await dispatchPostAdmissionTurn({
+          admitted: input.admitted,
+          env: dispatchEnv,
+          io: attemptIo,
+          request,
+          ...lease === void 0 ? {} : { lease },
+          adapters,
+          persistRunState: false,
+          ...input.effectiveEngine === void 0 ? {} : { effectiveEngine: input.effectiveEngine }
+        });
+        return settleDeferredPersist(
+          input.admitted,
+          input.env.principalAuthority,
+          adapters,
+          attemptIo,
+          result
+        );
+      }
+    })
+  });
+}
 function isAlreadyFrozenSummonsAttachment(runDirectory, attachmentPath) {
   const absolute = isAbsolute7(attachmentPath) ? attachmentPath : resolve13(attachmentPath);
-  return pathContainedIn(join32(runDirectory, "attachments"), absolute);
+  return pathContainedIn(join33(runDirectory, "attachments"), absolute);
 }
 async function prepareSummonsResumeMaterials(runDirectory, summons) {
   if (summons === void 0) return void 0;
@@ -13749,60 +14028,34 @@ async function runPostAdmissionSeatResume(input) {
   try {
     if (env.stationChild === true) {
       let firstTurn;
-      const stationAdapters = withOnceSuccessfulBeforeDispatch(adapters);
       const invocationScopeId = mintEngineDetourInvocationScope({
         ...input.effectiveEngine === void 0 ? {} : { effectiveEngine: input.effectiveEngine }
       });
-      return await runWithAutoResumeLoop({
+      return await runSettledAutoResumeLoop({
         admitted: loaded.admitted,
-        principalAuthority: env.principalAuthority,
+        env,
         io: input.io,
-        sessionAppender: env.sessionAppender,
-        autoResumeLimit: env.autoResumeLimit,
-        ...env.signal === void 0 ? {} : { signal: env.signal },
+        adapters,
+        ...input.effectiveEngine === void 0 ? {} : { effectiveEngine: input.effectiveEngine },
         buildInitialPayload: () => ({ resumeTurn: false }),
         buildResumePayload: () => ({ resumeTurn: true }),
-        // Same as public manual resume: prior-court sealed acceptance is not a
-        // redispatch brake (#833). New-court station-child turns still auto-resume.
-        dispatch: async (payload, lease, _isFirst, attemptIo) => dispatchAfterWriterLease({
-          ...lease === void 0 ? {} : { lease },
-          build: async () => {
-            if (payload.resumeTurn && firstTurn !== void 0) {
-              return {
-                ...firstTurn,
-                continuation: {
-                  kind: "resume",
-                  prompt: RESUME_TRANSPORT_ENVELOPE
-                }
-              };
-            }
-            const turnRequest = withEngineDetourInvocationScope(
-              await buildRequestAfterLease(),
-              invocationScopeId
-            );
-            firstTurn = turnRequest;
-            return turnRequest;
-          },
-          dispatch: async (turnRequest) => {
-            const result = await dispatchPostAdmissionTurn({
-              admitted: loaded.admitted,
-              env,
-              io: attemptIo,
-              request: turnRequest,
-              ...lease === void 0 ? {} : { lease },
-              adapters: stationAdapters,
-              persistRunState: false,
-              ...input.effectiveEngine === void 0 ? {} : { effectiveEngine: input.effectiveEngine }
-            });
-            return settleDeferredPersist(
-              loaded.admitted,
-              env.principalAuthority,
-              stationAdapters,
-              attemptIo,
-              result
-            );
+        toRequest: async (payload) => {
+          if (payload.resumeTurn && firstTurn !== void 0) {
+            return {
+              ...firstTurn,
+              continuation: {
+                kind: "resume",
+                prompt: RESUME_TRANSPORT_ENVELOPE
+              }
+            };
           }
-        })
+          const turnRequest = withEngineDetourInvocationScope(
+            await buildRequestAfterLease(),
+            invocationScopeId
+          );
+          firstTurn = turnRequest;
+          return turnRequest;
+        }
       });
     }
     const resumed = await runPostAdmissionManualResume({
@@ -13893,7 +14146,7 @@ async function presentResumeFailurePointer(io, thrown, publish) {
 }
 async function writeResumeDiagnosticFile(runDirectory, runId, failure, role) {
   const dir = await ensureRealArtifactsDirectory(runDirectory);
-  const path = join32(dir, `resume-diagnostic-${randomUUID7()}.json`);
+  const path = join33(dir, `resume-diagnostic-${randomUUID7()}.json`);
   await writeFile7(
     path,
     `${JSON.stringify({
@@ -13934,38 +14187,25 @@ async function runPostAdmissionOneShot(input) {
 }
 async function runPostAdmissionResumable(input) {
   const { admitted, env, io, buildInitialRequest, buildResumeRequest, effectiveEngine } = input;
-  const adapters = withOnceSuccessfulBeforeDispatch(input.adapters);
   const invocationScopeId = mintEngineDetourInvocationScope({
     ...effectiveEngine === void 0 ? {} : { effectiveEngine }
   });
   const buildScopedInitial = () => withEngineDetourInvocationScope(buildInitialRequest(), invocationScopeId);
   const buildScopedResume = () => withEngineDetourInvocationScope(buildResumeRequest(), invocationScopeId);
-  return runWithAutoResumeLoop({
+  return runSettledAutoResumeLoop({
     admitted,
-    principalAuthority: env.principalAuthority,
+    env,
     io,
-    sessionAppender: env.sessionAppender,
-    autoResumeLimit: env.autoResumeLimit,
-    ...env.signal === void 0 ? {} : { signal: env.signal },
+    adapters: input.adapters,
+    ...effectiveEngine === void 0 ? {} : { effectiveEngine },
+    // Ordinary in-call retry keeps the admitted correlation when one was stored.
+    dispatchEnv: {
+      ...env,
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
     buildInitialPayload: buildScopedInitial,
     buildResumePayload: buildScopedResume,
-    dispatch: async (request, lease, _isFirst, attemptIo) => {
-      const result = await dispatchPostAdmissionTurn({
-        admitted,
-        env: {
-          ...env,
-          ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-        },
-        io: attemptIo,
-        request,
-        ...lease === void 0 ? {} : { lease },
-        adapters,
-        persistRunState: false,
-        // #600: every attempt (initial + auto-resume) writes seat engine when present.
-        ...effectiveEngine === void 0 ? {} : { effectiveEngine }
-      });
-      return settleDeferredPersist(admitted, env.principalAuthority, adapters, attemptIo, result);
-    }
+    toRequest: async (request) => request
   });
 }
 async function runPostAdmissionManualResume(input) {
@@ -13976,326 +14216,86 @@ async function runPostAdmissionManualResume(input) {
     adapters,
     effectiveEngine,
     buildRequestAfterLease
-  } = input;
-  let request = input.request;
-  const effectiveModel = env.model;
-  const invocationScopeId = mintEngineDetourInvocationScope({
-    ...effectiveEngine === void 0 ? {} : { effectiveEngine }
-  });
-  if (request === void 0) {
-    if (buildRequestAfterLease === void 0) {
-      throw new Error(
-        "runPostAdmissionManualResume requires request or buildRequestAfterLease"
-      );
-    }
-    request = await buildRequestAfterLease();
-  }
-  request = withEngineDetourInvocationScope(request, invocationScopeId);
-  const result = await dispatchPostAdmissionTurn({
-    admitted,
-    env: {
-      ...env,
-      ...effectiveModel === void 0 ? {} : { model: effectiveModel },
-      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
-    },
-    io,
-    request,
-    adapters,
-    ...effectiveEngine === void 0 ? {} : { effectiveEngine }
-  });
-  if (result.terminal !== void 0 && isLawfulTypedTerminalOutcome(result.terminal.roleOutcome)) {
-    io.stdout(formatTerminalResult(result.terminal));
-  }
-  if (result.terminal !== void 0) {
-    result.terminal.autoResumeCount = 0;
-  }
-  return result;
-}
-var POST_ADMISSION_CLEANUP_DIAGNOSTIC_ENTRY_TYPE;
-var init_post_admission = __esm({
-  "src/public-cli/post-admission.ts"() {
-    "use strict";
-    init_run_lifecycle();
-    init_cli_errors();
-    init_invocation();
-    init_submission_ledger();
-    init_run_ticket_number();
-    init_activation_ledger_topology();
-    init_engine_material();
-    init_session_identity();
-    init_role_run_relocation();
-    init_packaged_role_registry();
-    init_engine_detour_usage();
-    init_run_lifecycle();
-    init_process_cancel();
-    init_activation_ledger_topology();
-    init_host_session_record();
-    init_settlement();
-    init_terminal();
-    init_auto_resume();
-    POST_ADMISSION_CLEANUP_DIAGNOSTIC_ENTRY_TYPE = "ak_post_admission_cleanup_diagnostic";
-  }
-});
-
-// src/public-cli/seat-ticket-binding.ts
-async function tryResumeSameTicketSeatRun(input) {
-  if (input.freshSummons === true) return void 0;
-  if (input.parentRunPath.trim() === "") return void 0;
-  const previousRunId = await findLatestRunIdForSeatTicket({
-    home: input.home,
-    bookKey: resolveBookKeyFromGit(input.projectRoot),
-    role: input.role,
-    parentRunPath: input.parentRunPath,
-    ...input.ticketNumber === void 0 ? {} : { ticketNumber: input.ticketNumber }
-  });
-  if (previousRunId === void 0) return void 0;
-  return await input.resume(previousRunId, input.summons);
-}
-var init_seat_ticket_binding = __esm({
-  "src/public-cli/seat-ticket-binding.ts"() {
-    "use strict";
-    init_activation_ledger_git();
-    init_run_lifecycle();
-  }
-});
-
-// src/public-cli/machine-method-skills.ts
-import { accessSync, constants as constants2, statSync as statSync4 } from "node:fs";
-import { lstat as lstat5, mkdir as mkdir4, symlink } from "node:fs/promises";
-import { join as join33 } from "node:path";
-import { spawnSync as spawnSync2 } from "node:child_process";
-function skillRoot(home) {
-  return join33(home, ".agents/skills");
-}
-function installedMethodSkillPath(home, name) {
-  return installedSkillPath(skillRoot(home), name);
-}
-function installedSkillPath(root, name) {
-  const path = join33(root, name, "SKILL.md");
-  try {
-    if (!statSync4(path).isFile()) return void 0;
-    accessSync(path, constants2.R_OK);
-    return path;
-  } catch (error) {
-    const code = error.code;
-    if (code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "EPERM" || code === "ELOOP") return void 0;
-    throw error;
-  }
-}
-function linkedSkillRoot(home, host) {
-  if (host === "claude" || host === "claude-code") {
-    return join33(process.env.CLAUDE_CONFIG_DIR?.trim() || join33(home, ".claude"), "skills");
-  }
-  if (host === "hermes") return join33(home, ".hermes/skills");
-  return void 0;
-}
-async function occupied(path) {
-  try {
-    await lstat5(path);
-    return true;
-  } catch (error) {
-    if (error.code !== "ENOENT") throw error;
-    return false;
-  }
-}
-function warnOccupied(path, stdout) {
-  stdout(`Warning: ${path} is already occupied; left untouched.
-`);
-}
-async function warnMissingMethodSkills(home, host, role, skills, stdout) {
-  const missing = [];
-  const linkedRoot = linkedSkillRoot(home, host);
-  for (const skill of skills) {
-    if (installedMethodSkillPath(home, skill) === void 0 || linkedRoot !== void 0 && installedSkillPath(linkedRoot, skill) === void 0) missing.push(skill);
-  }
-  for (const skill of missing) {
-    stdout(`Warning: required machine Skill "${skill}" is missing for ${role}; its method guidance may be unavailable and reduce work quality. Run \`ak-role setup\` to install required Skills.
-`);
-  }
-}
-function runSkillsCli(args, home) {
-  const result = spawnSync2("npx", ["--yes", "skills", ...args], {
-    stdio: "inherit",
-    env: { ...process.env, HOME: home }
-  });
-  if (result.error !== void 0) throw result.error;
-  return result.status === 0;
-}
-function addSkills(source, skills, home) {
-  if (skills.length === 0) return true;
-  return runSkillsCli([
-    "add",
-    source,
-    ...skills.flatMap((skill) => ["--skill", skill]),
-    "--agent",
-    "codex",
-    "--global",
-    "--yes"
-  ], home);
-}
-function updateRequiredSkills(home) {
-  const names = packagedMethodSkillNames();
-  if (names.length === 0) return true;
-  return runSkillsCli(["update", "-g", "-y", ...names], home);
-}
-async function runMachineSkillSetup(home, stdout) {
-  const canonical = skillRoot(home);
-  const missingBySource = /* @__PURE__ */ new Map();
-  let unsourced = false;
-  for (const name of packagedMethodSkillNames()) {
-    const path = join33(canonical, name);
-    if (await occupied(path)) {
-      warnOccupied(path, stdout);
-      continue;
-    }
-    const source = SKILL_SOURCE[name];
-    if (source === void 0) {
-      unsourced = true;
-      stdout(`Warning: required machine Skill "${name}" has no install source; setup did not install it.
-`);
-      continue;
-    }
-    const missing = missingBySource.get(source) ?? [];
-    missing.push(name);
-    missingBySource.set(source, missing);
-  }
-  for (const [source, missing] of missingBySource) {
-    if (!addSkills(source, missing, home)) return 1;
-  }
-  if (unsourced) return 1;
-  for (const host of ["claude-code", "hermes"]) {
-    const root = linkedSkillRoot(home, host);
-    const description = host === "claude-code" ? HEADLESS_HOST_DESCRIPTIONS.claude : HOST_DESCRIPTIONS.hermes;
-    try {
-      accessSync(resolveHostBinary(description, home), constants2.X_OK);
-    } catch (error) {
-      if (["ENOENT", "ENOTDIR", "EACCES"].includes(error.code ?? "")) continue;
-      throw error;
-    }
-    for (const name of packagedMethodSkillNames()) {
-      const target = join33(canonical, name);
-      if (installedMethodSkillPath(home, name) === void 0) continue;
-      const link = join33(root, name);
-      if (await occupied(link)) {
-        warnOccupied(link, stdout);
-        continue;
-      }
-      await mkdir4(root, { recursive: true });
-      await symlink(target, link, "dir");
+  } = input;
+  let request = input.request;
+  const effectiveModel = env.model;
+  const invocationScopeId = mintEngineDetourInvocationScope({
+    ...effectiveEngine === void 0 ? {} : { effectiveEngine }
+  });
+  if (request === void 0) {
+    if (buildRequestAfterLease === void 0) {
+      throw new Error(
+        "runPostAdmissionManualResume requires request or buildRequestAfterLease"
+      );
     }
+    request = await buildRequestAfterLease();
   }
-  if (!updateRequiredSkills(home)) return 1;
-  stdout("Machine method Skills setup finished. Existing same-name Skills were left untouched.\n");
-  return 0;
+  request = withEngineDetourInvocationScope(request, invocationScopeId);
+  const result = await dispatchPostAdmissionTurn({
+    admitted,
+    env: {
+      ...env,
+      ...effectiveModel === void 0 ? {} : { model: effectiveModel },
+      ...admitted.correlationId === void 0 ? {} : { correlationId: admitted.correlationId }
+    },
+    io,
+    request,
+    adapters,
+    ...effectiveEngine === void 0 ? {} : { effectiveEngine }
+  });
+  if (result.terminal !== void 0 && isLawfulTypedTerminalOutcome(result.terminal.roleOutcome)) {
+    io.stdout(formatTerminalResult(result.terminal));
+  }
+  if (result.terminal !== void 0) {
+    result.terminal.autoResumeCount = 0;
+  }
+  return result;
 }
-var SKILL_SOURCE;
-var init_machine_method_skills = __esm({
-  "src/public-cli/machine-method-skills.ts"() {
+var POST_ADMISSION_CLEANUP_DIAGNOSTIC_ENTRY_TYPE;
+var init_post_admission = __esm({
+  "src/public-cli/post-admission.ts"() {
     "use strict";
-    init_host_descriptions();
+    init_run_lifecycle();
+    init_cli_errors();
+    init_turn_request();
+    init_invocation();
+    init_submission_ledger();
+    init_run_ticket_number();
+    init_activation_ledger_topology();
+    init_engine_material();
+    init_session_identity();
+    init_role_run_relocation();
     init_packaged_role_registry();
-    SKILL_SOURCE = {
-      tdd: "mattpocock/skills",
-      "diagnosing-bugs": "mattpocock/skills",
-      "resolving-merge-conflicts": "mattpocock/skills",
-      "ak-cross-m-review": "Akagilnc/ak-cross-m-review"
-    };
+    init_engine_detour_usage();
+    init_run_lifecycle();
+    init_process_cancel();
+    init_activation_ledger_topology();
+    init_host_session_record();
+    init_settlement();
+    init_terminal();
+    init_auto_resume();
+    POST_ADMISSION_CLEANUP_DIAGNOSTIC_ENTRY_TYPE = "ak_post_admission_cleanup_diagnostic";
   }
 });
 
-// src/public-cli/turn-request.ts
-function projectRoleTurnRequest(admitted, roleDetails, options) {
-  const cwd = admitted.projectRoot ?? admitted.repoRoot ?? admitted.cwd;
-  if (cwd === void 0) throw new Error("admitted invocation missing working directory");
-  if (admitted.principal === void 0) throw new Error("admitted invocation missing principal");
-  return {
-    principal: admitted.principal,
-    activation: roleDetails.activation,
-    methods: roleDetails.methods ?? [],
-    continuation: options.continuation,
-    ...options.model === void 0 ? {} : { model: options.model },
-    ...pickEngineAxis(options),
-    cwd,
-    home: options.home,
-    agentDir: options.agentDir,
-    runDirectory: admitted.runDirectory,
-    ...options.correlationId === void 0 || options.correlationId.trim() === "" ? {} : { correlationId: options.correlationId },
-    ...options.timeoutMs === void 0 ? {} : { timeoutMs: options.timeoutMs },
-    ...options.courtAttemptId === void 0 || options.courtAttemptId.length === 0 ? {} : { courtAttemptId: options.courtAttemptId },
-    ...options.invocationScopeId === void 0 || options.invocationScopeId.length === 0 ? {} : { invocationScopeId: options.invocationScopeId },
-    ...options.stationChild === void 0 ? {} : { stationChild: options.stationChild }
-  };
-}
-function packagedSettleSkill(admitted) {
-  const record4 = packagedRoleMetadata(admitted.role);
-  if (record4 === void 0) return void 0;
-  if ("applyMethod" in record4 && record4.applyMethod !== void 0) {
-    return "phase" in admitted && admitted.phase === "apply" ? record4.applyMethod : void 0;
-  }
-  if ("settleMethod" in record4 && record4.settleMethod !== void 0) return record4.settleMethod;
-  return void 0;
-}
-function readAdmittedPath2(admitted, path) {
-  let current = admitted;
-  for (const key of path.split(".")) {
-    if (current === null || typeof current !== "object") return void 0;
-    current = current[key];
-  }
-  return current;
-}
-function activationForAdmitted(admitted) {
-  if (packagedRoleMetadata(admitted.role) === void 0) {
-    throw new Error(`no turn projection for ${admitted.role}`);
-  }
-  const activation = { role: admitted.role };
-  for (const spec of packagedRoleActivationFlags(admitted.role)) {
-    let value = readAdmittedPath2(admitted, spec.from ?? spec.field);
-    if (spec.fallback === "gate-pointer") {
-      const trimmed = typeof value === "string" ? value.trim() : "";
-      value = trimmed !== "" ? trimmed : parentRunPathFromGatePointerInstruction(admitted.instruction);
-      if (typeof value !== "string" || value === "") continue;
-    }
-    if (value === void 0) continue;
-    if (spec.text === true) {
-      if (typeof value !== "number") continue;
-      value = String(value);
-    }
-    activation[spec.field] = value;
-  }
-  return activation;
-}
-function requiredMethodSkills(admitted) {
-  const record4 = packagedRoleMetadata(admitted.role);
-  const names = [];
-  if (record4 !== void 0 && "methodSkills" in record4 && record4.methodSkills !== void 0) {
-    names.push(...record4.methodSkills);
-  }
-  const apply = packagedSettleSkill(admitted);
-  if (apply !== void 0 && !names.includes(apply)) names.push(apply);
-  return names;
-}
-function methodBindings(admitted, home, host) {
-  if (host !== void 0 && host !== "pi") return [];
-  return requiredMethodSkills(admitted).flatMap((name) => {
-    const path = installedMethodSkillPath(home, name);
-    return path === void 0 ? [] : [{
-      kind: "skill",
-      path
-    }];
+// src/public-cli/seat-ticket-binding.ts
+async function tryResumeSameTicketSeatRun(input) {
+  if (input.freshSummons === true) return void 0;
+  if (input.parentRunPath.trim() === "") return void 0;
+  const previousRunId = await findLatestRunIdForSeatTicket({
+    home: input.home,
+    bookKey: resolveBookKeyFromGit(input.projectRoot),
+    role: input.role,
+    parentRunPath: input.parentRunPath,
+    ...input.ticketNumber === void 0 ? {} : { ticketNumber: input.ticketNumber }
   });
+  if (previousRunId === void 0) return void 0;
+  return await input.resume(previousRunId, input.summons);
 }
-function admittedSeatTurnDetails(admitted, home, host) {
-  return {
-    activation: activationForAdmitted(admitted),
-    methods: methodBindings(admitted, home, host)
-  };
-}
-var init_turn_request = __esm({
-  "src/public-cli/turn-request.ts"() {
+var init_seat_ticket_binding = __esm({
+  "src/public-cli/seat-ticket-binding.ts"() {
     "use strict";
-    init_engine_material();
-    init_packaged_role_registry();
-    init_machine_method_skills();
+    init_activation_ledger_git();
     init_run_lifecycle();
   }
 });
@@ -14410,7 +14410,7 @@ __export(instruction_seat_run_exports, {
   runPublicInstructionSeat: () => runPublicInstructionSeat,
   runPublicInstructionSeatResume: () => runPublicInstructionSeatResume
 });
-import { dirname as dirname20, resolve as resolve14, sep as sep4 } from "node:path";
+import { dirname as dirname20, resolve as resolve14 } from "node:path";
 function unreadablePostSubmissionStatus(admitted, terminal) {
   if (terminal?.roleOutcome.kind !== "accepted") return void 0;
   const route = POST_SUBMISSION_ROUTING[admitted.role];
@@ -14642,27 +14642,43 @@ async function runOmittedLensBatch(argv, parsed, env, io) {
   io.stdout(formatTerminalResult(terminal));
   return { exitCode: failed ? 1 : 0, terminal };
 }
+function resumeSameParentInstructionSeat(input) {
+  return tryResumeSameTicketSeatRun({
+    home: input.env.home,
+    projectRoot: input.projectRoot,
+    role: input.role,
+    parentRunPath: input.parentRunPath,
+    ...input.ticketNumber === void 0 ? {} : { ticketNumber: input.ticketNumber },
+    freshSummons: input.env.freshSummons,
+    summons: input.summons,
+    resume: (runId, materials) => runPublicInstructionSeatResume(
+      { runId, ...materials === void 0 ? {} : { summons: materials } },
+      input.env,
+      input.io
+    )
+  });
+}
+function sameParentInstruction(env, fallback) {
+  const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
+  if (resumeInstruction === void 0) return fallback;
+  return { instruction: resumeInstruction, instructionEmpty: false };
+}
 async function runCountersignBody(parsed, env, io) {
   const gateParentRunPath = typeof env.parentRunPath === "string" && env.parentRunPath.trim() !== "" ? env.parentRunPath : void 0;
   if (gateParentRunPath !== void 0) {
     const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction ?? parsed.instruction ?? "";
-    const resumed = await tryResumeSameTicketSeatRun({
-      home: env.home,
+    const resumed = await resumeSameParentInstructionSeat({
+      env,
+      io,
       projectRoot: resolve14(parsed.project ?? env.cwd),
       role: "countersign",
       parentRunPath: gateParentRunPath,
       ...isSafePositiveTicketNumber(env.boundTicketNumber) ? { ticketNumber: env.boundTicketNumber } : {},
-      freshSummons: env.freshSummons,
       summons: {
         sourceRunPath: gateParentRunPath,
         instruction: resumeInstruction,
         instructionEmpty: resumeInstruction.trim() === ""
-      },
-      resume: (runId, materials) => runPublicInstructionSeatResume(
-        { runId, ...materials === void 0 ? {} : { summons: materials } },
-        env,
-        io
-      )
+      }
     });
     if (resumed != null) return resumed;
   }
@@ -14694,12 +14710,7 @@ async function runCountersignBody(parsed, env, io) {
         admitted = { ...admitted, sourceRunPath: gateParentRunPath };
       }
       const turnProjection = {
-        packageRoot: env.packageRoot,
-        home: env.home,
-        agentDir: env.agentDir,
-        ...env.model === void 0 ? {} : { model: env.model },
-        ...pickEngineAxis(env),
-        ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
+        ...projectPublicTurnAxes(env),
         ...env.correlationId === void 0 || env.correlationId.trim() === "" ? {} : { correlationId: env.correlationId },
         continuation: {
           kind: "initial",
@@ -14770,17 +14781,18 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv2) {
   let auditorSubject;
   let auditorSource;
   let auditorTicket;
+  let resolvedNotarySource;
   if (record4.sameParent === "subject-source") {
-    if (!isAuditorSoulRole(parsed.subject)) {
+    if (parsed.subject === void 0) {
       presentStructuralRejection(new CliUsageError("auditor --subject requires judge|doctor"), io);
       return { exitCode: 2 };
     }
     auditorSubject = parsed.subject;
-    const source = typeof parsed.sourceRun === "string" ? parsed.sourceRun.trim() : "";
-    if (source === "") {
+    if (parsed.sourceRun === void 0) {
       presentStructuralRejection(new CliUsageError("auditor --source-run requires a run locator"), io);
       return { exitCode: 2 };
     }
+    const source = parsed.sourceRun;
     try {
       const resolved = await resolveNotarySourceRunLocator({ projectRoot, sourceRun: source, home: env.home });
       auditorSource = resolved.runDirectory;
@@ -14791,26 +14803,23 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv2) {
     }
     if (auditorSource === void 0) return { exitCode: 2 };
     const sourceDirectory = auditorSource;
-    const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
     const summons = {
-      ...resumeInstruction === void 0 ? { instruction: parsed.instruction ?? "", instructionEmpty: (parsed.instruction ?? "").trim() === "" } : { instruction: resumeInstruction, instructionEmpty: false },
+      ...sameParentInstruction(env, {
+        instruction: parsed.instruction ?? "",
+        instructionEmpty: (parsed.instruction ?? "").trim() === ""
+      }),
       attachmentPaths: parsed.attachmentPaths ?? []
     };
     const resumed = await withAuditorSoulEnv({
       subject: auditorSubject,
       sourceRunDirectory: auditorSource,
-      run: () => tryResumeSameTicketSeatRun({
-        home: env.home,
+      run: () => resumeSameParentInstructionSeat({
+        env,
+        io,
         projectRoot,
         role,
         parentRunPath: sourceDirectory,
-        freshSummons: env.freshSummons,
-        summons,
-        resume: (runId, materials) => runPublicInstructionSeatResume(
-          { runId, ...materials === void 0 ? {} : { summons: materials } },
-          env,
-          io
-        )
+        summons
       })
     });
     if (resumed != null) return resumed;
@@ -14818,24 +14827,21 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv2) {
   if (record4.sameParent === "gate-pointer") {
     const parentRunPath = parentRunPathFromGatePointerInstruction(parsed.instruction ?? "");
     if (parentRunPath !== void 0) {
-      const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
       const summons = {
         sourceRunPath: parentRunPath,
-        ...resumeInstruction === void 0 ? { instruction: parsed.instruction ?? "", instructionEmpty: (parsed.instruction ?? "").trim() === "" } : { instruction: resumeInstruction, instructionEmpty: false },
+        ...sameParentInstruction(env, {
+          instruction: parsed.instruction ?? "",
+          instructionEmpty: (parsed.instruction ?? "").trim() === ""
+        }),
         attachmentPaths: parsed.attachmentPaths ?? []
       };
-      const resumed = await tryResumeSameTicketSeatRun({
-        home: env.home,
+      const resumed = await resumeSameParentInstructionSeat({
+        env,
+        io,
         projectRoot,
         role,
         parentRunPath,
-        freshSummons: env.freshSummons,
-        summons,
-        resume: (runId, materials) => runPublicInstructionSeatResume(
-          { runId, ...materials === void 0 ? {} : { summons: materials } },
-          env,
-          io
-        )
+        summons
       });
       if (resumed != null) return resumed;
     }
@@ -14861,28 +14867,28 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv2) {
       sourceRun: source,
       ...resumeInstruction === void 0 ? {} : { instruction: resumeInstruction, instructionEmpty: false }
     };
-    const resumed = await tryResumeSameTicketSeatRun({
-      home: env.home,
+    resolvedNotarySource = source;
+    const resumed = await resumeSameParentInstructionSeat({
+      env,
+      io,
       projectRoot,
       role,
       parentRunPath: source.runDirectory,
-      freshSummons: env.freshSummons,
-      summons,
-      resume: (runId, materials) => runPublicInstructionSeatResume(
-        { runId, ...materials === void 0 ? {} : { summons: materials } },
-        env,
-        io
-      )
+      summons
     });
     if (resumed != null) return resumed;
   }
   let admitted;
   try {
+    const admissionOverride = {
+      ...auditorTicket === void 0 ? {} : { assertedTicketNumber: auditorTicket },
+      ...resolvedNotarySource === void 0 ? {} : { resolvedSourceRun: resolvedNotarySource }
+    };
     admitted = await admitPublicRole(
       role,
       parsed,
       env,
-      auditorTicket === void 0 ? void 0 : { assertedTicketNumber: auditorTicket }
+      auditorTicket === void 0 && resolvedNotarySource === void 0 ? void 0 : admissionOverride
     );
   } catch (error) {
     const rejected = usageExit(error, io);
@@ -14920,7 +14926,7 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv2) {
           thrown: error
         }, seatAdapters(admitted, env), env.principalAuthority, io);
       }
-      if (outcome.admitted?.runDirectory.includes(`${sep4}unbound${sep4}runs${sep4}`)) {
+      if (outcome.admitted !== void 0 && isUnboundRunDirectory(outcome.admitted.runDirectory)) {
         await recordChildDiaristRun(admitted, outcome.admitted.runId);
       }
       if (outcome.failedWithoutEscalate !== void 0) {
@@ -15269,6 +15275,7 @@ var AUDITED_ROLES, SECRETARIAT_STATUS_REASK, COUNTERSIGN_STATUS_REASK, WORKER_RO
 var init_instruction_seat_run = __esm({
   "src/public-cli/instruction-seat-run.ts"() {
     "use strict";
+    init_role_run_placement();
     init_compliance_transport();
     init_archivist_record_pointer();
     init_doctor_auditor();
@@ -17466,7 +17473,6 @@ __export(cli_exports, {
   runAkRole: () => runAkRole
 });
 import { realpath as realpath5 } from "node:fs/promises";
-import { join as join37 } from "node:path";
 function publicSeatArgv(owner) {
   return {
     parse: (args) => parsePublicSeatArgv(owner, args),
@@ -17505,50 +17511,42 @@ function takePublicGlobalFlag(argv, index, options) {
   return void 0;
 }
 function createRoleEnvironment(env, options, afterHost) {
-  const role = options.role;
   const extraPiArgs = env.extraPiArgs;
   const timeoutMs = env.timeoutMs;
-  const hostAdapters = composeRoleTurnHostAdapters(
-    {
+  const opened = openRoleSeatRuntime({
+    resolution: {
       packageRoot: env.packageRoot,
       ...env.roleTurnHost === void 0 ? {} : { roleTurnHost: env.roleTurnHost },
       ...env.hostAdapters === void 0 ? {} : { hostAdapters: env.hostAdapters },
       ...extraPiArgs === void 0 ? {} : { extraPiArgs },
       ...timeoutMs === void 0 ? {} : { timeoutMs }
     },
-    env.principalAuthority
-  );
-  const roleTurnHost = selectRoleTurnHost(hostAdapters, {
-    role,
-    seat: options.seat
+    principalAuthority: env.principalAuthority,
+    role: options.role,
+    seat: options.seat,
+    home: options.home,
+    ...afterHost === void 0 ? {} : { afterHost }
   });
-  afterHost?.();
-  const seatWithModel = resolvedSeatWithModel(options.seat);
-  if (seatWithModel === void 0) {
+  if (!opened.ok) {
     throw new CliUsageError(
       missingResolvedSeatModelMessage(options.seat.seat, "invocation-or-config")
     );
   }
-  const hostFacingSelection = projectHostFacingProvider(
-    seatWithModel.selection,
-    seatWithModel.host,
-    loadHostProvidersTable(options.home),
-    options.home
-  );
   return {
     home: options.home,
     principalAuthority: env.principalAuthority,
     agentDir: options.agentDir,
     sessionAppender: appendPiSessionCustomEntry,
     packageRoot: env.packageRoot,
-    roleTurnHost,
-    hostAdapters,
+    roleTurnHost: opened.roleTurnHost,
+    hostAdapters: opened.hostAdapters,
     cwd: options.cwd,
     ...options.credentials === void 0 ? {} : { credentials: options.credentials },
     ...env.correlationId === void 0 ? {} : { correlationId: env.correlationId },
-    ...hostFacingSelection === void 0 ? {} : { model: hostFacingSelection },
-    ...projectSeatEngine(options.seat),
-    ...projectSeatHost(options.seat),
+    ...opened.model === void 0 ? {} : { model: opened.model },
+    ...opened.engine === void 0 ? {} : { engine: opened.engine },
+    ...opened.engineModel === void 0 ? {} : { engineModel: opened.engineModel },
+    host: opened.host,
     ...timeoutMs === void 0 ? {} : { timeoutMs },
     ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId },
     ...options.config?.autoResumeLimit === void 0 ? {} : { autoResumeLimit: options.config.autoResumeLimit },
@@ -17557,15 +17555,19 @@ function createRoleEnvironment(env, options, afterHost) {
     ...env.signal === void 0 ? {} : { signal: env.signal }
   };
 }
-async function dispatchPublicRoleCommand(env, home, io, parsed, role, parse, run) {
-  const agentDir = resolveAgentDir(env, home);
+async function loadPublicRoleDispatchParts(env, home) {
+  const agentDir = resolvePublicAgentDir(env.agentDir, home);
   const cwd = env.cwd ?? process.cwd();
   const config = await loadAndValidateConfig(home, env.packageRoot);
   const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
+  return { agentDir, cwd, config, credentials };
+}
+async function dispatchPublicRoleCommand(env, home, io, parsed, role, parse, run) {
+  const parts = await loadPublicRoleDispatchParts(env, home);
   const seat = resolveEffectiveSeat(
-    config,
+    parts.config,
     role,
-    credentials,
+    parts.credentials,
     invocationFromParsed(parsed)
   );
   let parsedRoleArgv;
@@ -17573,7 +17575,15 @@ async function dispatchPublicRoleCommand(env, home, io, parsed, role, parse, run
     parsed.args,
     createRoleEnvironment(
       env,
-      { role, home, agentDir, cwd, credentials, seat, config },
+      {
+        role,
+        home,
+        agentDir: parts.agentDir,
+        cwd: parts.cwd,
+        credentials: parts.credentials,
+        seat,
+        config: parts.config
+      },
       () => {
         parsedRoleArgv = parse(parsed.args);
       }
@@ -17604,9 +17614,6 @@ function defaultIo() {
 function resolveHome(env) {
   return env.home ?? packageMachineHome();
 }
-function resolveAgentDir(env, home) {
-  return env.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join37(home, ".pi", "agent");
-}
 function parseThinking(value) {
   return value;
 }
@@ -17725,12 +17732,6 @@ function requireCallableSeat(seat, axis, verb) {
     throw new CliUsageError(`unknown ${axis}-axis seat: ${seat}`);
   }
 }
-function projectSeatEngine(seat) {
-  return pickEngineAxis(seat);
-}
-function projectSeatHost(seat) {
-  return { host: seat.host };
-}
 function loadAndValidateConfig(home, packageRoot) {
   return loadPublicCliConfig(home).then((config) => {
     try {
@@ -18176,7 +18177,7 @@ async function runAkRole(argv, env) {
         throw new CliUsageError("roles takes no arguments");
       }
       const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(resolveAgentDir(env, home));
+      const credentials = env.credentials ?? await loadCredentialProviders(resolvePublicAgentDir(env.agentDir, home));
       const seats = effectiveSeatConfigurations(
         config,
         credentials,
@@ -18216,16 +18217,13 @@ async function runAkRole(argv, env) {
         runId: resumeRequest.runId,
         authority: env.principalAuthority ?? piDurablePrincipalAuthority
       };
-      const agentDir = resolveAgentDir(env, home);
-      const cwd = env.cwd ?? process.cwd();
-      const config = await loadAndValidateConfig(home, env.packageRoot);
-      const credentials = env.credentials ?? await loadCredentialProviders(agentDir);
+      const parts = await loadPublicRoleDispatchParts(env, home);
       const resumeRole = await peekRoleRunRole(home, resumeRequest.runId);
       const seatRole = resumeRole ?? "judge";
       const seat = resolveEffectiveSeat(
-        config,
+        parts.config,
         seatRole,
-        credentials,
+        parts.credentials,
         invocationFromParsed(parsed)
       );
       const result = await runPublicInstructionSeatResume(
@@ -18233,11 +18231,11 @@ async function runAkRole(argv, env) {
         createRoleEnvironment(env, {
           role: seatRole,
           home,
-          agentDir,
-          cwd,
-          credentials,
+          agentDir: parts.agentDir,
+          cwd: parts.cwd,
+          credentials: parts.credentials,
           seat,
-          config
+          config: parts.config
         }),
         io
       );
@@ -18251,15 +18249,20 @@ async function runAkRole(argv, env) {
         };
         const parentRole = await peekRoleRunRole(home, parentRunId);
         if (parentRole === void 0) break;
-        const parentSeat = resolveEffectiveSeat(config, parentRole, credentials, invocationFromParsed(parsed));
+        const parentSeat = resolveEffectiveSeat(
+          parts.config,
+          parentRole,
+          parts.credentials,
+          invocationFromParsed(parsed)
+        );
         const parentEnv = createRoleEnvironment(env, {
           role: parentRole,
           home,
-          agentDir,
-          cwd,
-          credentials,
+          agentDir: parts.agentDir,
+          cwd: parts.cwd,
+          credentials: parts.credentials,
           seat: parentSeat,
-          config
+          config: parts.config
         });
         current = await continueParentAfterChild(parentRunId, current.admitted, parentEnv, io);
       }
@@ -18342,6 +18345,7 @@ var init_cli = __esm({
     init_machine_method_skills();
     init_post_admission();
     init_role_turn_host();
+    init_role_seat_runtime();
     init_role_turn_host_resolution();
     init_invocation();
     init_option_definitions();
@@ -18377,7 +18381,7 @@ __export(public_role_summons_exports, {
 import { execFile as execFile3 } from "node:child_process";
 import { existsSync as existsSync10 } from "node:fs";
 import { realpath as realpath6 } from "node:fs/promises";
-import { join as join38 } from "node:path";
+import { join as join37 } from "node:path";
 import { promisify as promisify3 } from "node:util";
 function createCapturingIo() {
   const chunks = [];
@@ -18401,7 +18405,7 @@ function parentDir(path) {
 function walkPackageRoot(start) {
   let dir = start;
   for (let i = 0; i < 12; i += 1) {
-    if (existsSync10(join38(dir, "package.json")) && existsSync10(join38(dir, "souls"))) {
+    if (existsSync10(join37(dir, "package.json")) && existsSync10(join37(dir, "souls"))) {
       return dir;
     }
     const parent = parentDir(dir);
@@ -18442,12 +18446,6 @@ async function resolveSummonHome(options) {
   if (fromCwd !== void 0 && fromCwd.length > 0) return fromCwd;
   return packageMachineHome2();
 }
-function projectSeatEngine2(seat) {
-  return pickEngineAxis(seat);
-}
-function projectSeatHost2(seat) {
-  return seat.host === void 0 ? {} : { host: seat.host };
-}
 function hostSelectionFailureFromUnknown(error) {
   if (typeof error !== "object" || error === null) return void 0;
   if (error.name !== "HostSelectionError") return void 0;
@@ -18458,44 +18456,36 @@ async function createSummonEnv(options, afterHost) {
   const [
     { piDurablePrincipalAuthority: piDurablePrincipalAuthority2 },
     { appendPiSessionCustomEntry: appendPiSessionCustomEntry2 },
-    { resolveRoleTurnHost: resolveRoleTurnHost2 },
-    { missingResolvedSeatModelMessage: missingResolvedSeatModelMessage2, resolvedSeatWithModel: resolvedSeatWithModel2 }
+    { openRoleSeatRuntime: openRoleSeatRuntime2 },
+    { missingResolvedSeatModelMessage: missingResolvedSeatModelMessage2 }
   ] = await Promise.all([
     Promise.resolve().then(() => (init_durable_principal(), durable_principal_exports)),
     Promise.resolve().then(() => (init_role_turn_host(), role_turn_host_exports)),
-    Promise.resolve().then(() => (init_role_turn_host_resolution(), role_turn_host_resolution_exports)),
+    Promise.resolve().then(() => (init_role_seat_runtime(), role_seat_runtime_exports)),
     Promise.resolve().then(() => (init_config(), config_exports))
   ]);
   const principalAuthority = options.principalAuthority ?? piDurablePrincipalAuthority2;
-  const roleTurnHost = resolveRoleTurnHost2(
-    {
+  const opened = openRoleSeatRuntime2({
+    resolution: {
       packageRoot: options.packageRoot,
       ...options.roleTurnHost === void 0 ? {} : { roleTurnHost: options.roleTurnHost },
       ...options.hostAdapters === void 0 ? {} : { hostAdapters: options.hostAdapters },
       ...options.extraPiArgs === void 0 || options.extraPiArgs.length === 0 ? {} : { extraPiArgs: options.extraPiArgs },
       ...options.timeoutMs === void 0 ? {} : { timeoutMs: options.timeoutMs }
     },
-    { role: options.role, seat: options.seat, principalAuthority }
-  );
-  afterHost?.();
-  const seatWithModel = resolvedSeatWithModel2(options.seat);
-  if (seatWithModel === void 0) {
+    principalAuthority,
+    role: options.role,
+    seat: options.seat,
+    home: options.home,
+    ...afterHost === void 0 ? {} : { afterHost },
+    ...options.hostFacingModel === void 0 ? {} : { hostFacingModel: options.hostFacingModel }
+  });
+  if (!opened.ok) {
     return {
       ok: false,
       missingModelMessage: missingResolvedSeatModelMessage2(options.role)
     };
   }
-  const hostName = seatWithModel.host ?? "pi";
-  let hostFacingSelection = options.hostFacingModel;
-  if (hostFacingSelection === void 0) {
-    const { loadHostProvidersTable: loadHostProvidersTable2, projectHostFacingProvider: projectHostFacingProvider2 } = await Promise.resolve().then(() => (init_host_providers(), host_providers_exports));
-    hostFacingSelection = projectHostFacingProvider2(
-      seatWithModel.selection,
-      hostName,
-      loadHostProvidersTable2(options.home),
-      options.home
-    );
-  }
   return {
     ok: true,
     env: {
@@ -18504,12 +18494,13 @@ async function createSummonEnv(options, afterHost) {
       agentDir: options.agentDir,
       sessionAppender: appendPiSessionCustomEntry2,
       packageRoot: options.packageRoot,
-      roleTurnHost,
+      roleTurnHost: opened.roleTurnHost,
       cwd: options.cwd,
       credentials: options.credentials,
-      ...hostFacingSelection === void 0 ? {} : { model: hostFacingSelection },
-      ...projectSeatEngine2(seatWithModel),
-      ...projectSeatHost2(seatWithModel),
+      ...opened.model === void 0 ? {} : { model: opened.model },
+      ...opened.engine === void 0 ? {} : { engine: opened.engine },
+      ...opened.engineModel === void 0 ? {} : { engineModel: opened.engineModel },
+      host: opened.host,
       ...options.timeoutMs === void 0 ? {} : { timeoutMs: options.timeoutMs }
     }
   };
@@ -18517,13 +18508,14 @@ async function createSummonEnv(options, afterHost) {
 async function summonPublicRole(options) {
   const packageRoot = resolveSummonsPackageRoot(options.packageRoot);
   const home = await resolveSummonHome(options);
-  const agentDir = options.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join38(home, ".pi", "agent");
   const {
     loadCredentialProviders: loadCredentialProviders2,
     loadPublicCliConfig: loadPublicCliConfig2,
     resolveEffectiveSeat: resolveEffectiveSeat2,
+    resolvePublicAgentDir: resolvePublicAgentDir2,
     validatePublicCliConfigAxes: validatePublicCliConfigAxes2
   } = await Promise.resolve().then(() => (init_config(), config_exports));
+  const agentDir = resolvePublicAgentDir2(options.agentDir, home);
   const credentials = options.credentials ?? await loadCredentialProviders2(agentDir);
   const config = await loadPublicCliConfig2(home);
   validatePublicCliConfigAxes2(config, packageRoot);
@@ -18880,7 +18872,6 @@ var AK_ROLE_PACKAGE_ROOT_ENV, execFileAsync3;
 var init_public_role_summons = __esm({
   "src/public-role-summons.ts"() {
     "use strict";
-    init_engine_material();
     AK_ROLE_PACKAGE_ROOT_ENV = "AK_ROLE_PACKAGE_ROOT";
     execFileAsync3 = promisify3(execFile3);
   }
@@ -19025,11 +19016,11 @@ var init_compliance_transport = __esm({
 });
 
 // src/role-run-relocation.ts
-import { join as join39, sep as sep5 } from "node:path";
+import { join as join38, sep as sep4 } from "node:path";
 function rewriteRunDirectoryPathValue(value, oldRunDirectory, newRunDirectory) {
   if (typeof value !== "string") return value;
   if (value === oldRunDirectory) return newRunDirectory;
-  const prefix = `${oldRunDirectory}${sep5}`;
+  const prefix = `${oldRunDirectory}${sep4}`;
   if (value.startsWith(prefix)) {
     return `${newRunDirectory}${value.slice(oldRunDirectory.length)}`;
   }
@@ -19039,7 +19030,7 @@ function rewriteRunDirectoryPathValueAgainstRewrites(value, rewrites) {
   if (typeof value !== "string" || rewrites.length === 0) return value;
   let best;
   for (const rewrite of rewrites) {
-    if (value === rewrite.oldRunDirectory || value.startsWith(`${rewrite.oldRunDirectory}${sep5}`)) {
+    if (value === rewrite.oldRunDirectory || value.startsWith(`${rewrite.oldRunDirectory}${sep4}`)) {
       if (best === void 0 || rewrite.oldRunDirectory.length > best.oldRunDirectory.length) {
         best = rewrite;
       }
@@ -19153,7 +19144,7 @@ __export(run_lifecycle_exports, {
   writeRoleRunState: () => writeRoleRunState
 });
 import { chmod, lstat as lstat6, open as open3, readdir as readdir7, readFile as readFile22, unlink as unlink5, writeFile as writeFile8 } from "node:fs/promises";
-import { basename as basename10, join as join40 } from "node:path";
+import { basename as basename10, join as join39 } from "node:path";
 function buildAutoResumeContinuationPrompt(options) {
   return appendEngineSessionMaterial(
     [RESUME_TRANSPORT_ENVELOPE],
@@ -19179,7 +19170,7 @@ function renderResumeCommand(runId) {
 async function writeRoleRunState(runDirectory, record4) {
   const payload = { ...record4, runDirectory };
   await writeFile8(
-    join40(runDirectory, RUN_STATE_FILE),
+    join39(runDirectory, RUN_STATE_FILE),
     `${JSON.stringify(payload, null, 2)}
 `,
     "utf8"
@@ -19229,7 +19220,7 @@ function parseCurrentCourtState(raw) {
 async function readRoleRunStateRaw(runDirectory) {
   let raw;
   try {
-    raw = JSON.parse(await readFile22(join40(runDirectory, RUN_STATE_FILE), "utf8"));
+    raw = JSON.parse(await readFile22(join39(runDirectory, RUN_STATE_FILE), "utf8"));
   } catch (error) {
     if (errorCodeOf(error) === "ENOENT") return void 0;
     throw error;
@@ -19323,7 +19314,7 @@ async function writeRoleRunStateDisk(runDirectory, disk) {
     ...disk.currentCourt === void 0 ? {} : { currentCourt: disk.currentCourt }
   };
   await writeFile8(
-    join40(runDirectory, RUN_STATE_FILE),
+    join39(runDirectory, RUN_STATE_FILE),
     `${JSON.stringify(payload, null, 2)}
 `,
     "utf8"
@@ -19546,7 +19537,7 @@ async function createWriterLease(lockPath, runDirectory, reportCleanupFailure) {
     },
     relocate(nextRunDirectory) {
       currentRunDirectory = nextRunDirectory;
-      currentLockPath = join40(nextRunDirectory, WRITER_LOCK_FILE);
+      currentLockPath = join39(nextRunDirectory, WRITER_LOCK_FILE);
     },
     async release() {
       if (released) return;
@@ -19585,10 +19576,10 @@ async function acquireRunWriterLease(runDirectory, onCleanupFailure) {
   };
   const reportReadFailure = (error) => {
     reportDiagnostic(
-      `writer lease lock read failed (holder liveness unverifiable; lock left in place) at ${join40(runDirectory, WRITER_LOCK_FILE)}: ${describeErrorIdentity(error)}`
+      `writer lease lock read failed (holder liveness unverifiable; lock left in place) at ${join39(runDirectory, WRITER_LOCK_FILE)}: ${describeErrorIdentity(error)}`
     );
   };
-  const lockPath = join40(runDirectory, WRITER_LOCK_FILE);
+  const lockPath = join39(runDirectory, WRITER_LOCK_FILE);
   let lastAutopsy = { verdict: "absent" };
   let lastReclaimFailure;
   for (let reclaimsLeft = WRITER_LEASE_RECLAIM_ROUNDS; ; reclaimsLeft -= 1) {
@@ -19643,7 +19634,7 @@ async function acquireRunWriterLease(runDirectory, onCleanupFailure) {
 async function findRunDirectoryById(home, runId, onlyBookKey, onlyRole) {
   if (runId.trim() === "") return void 0;
   const ledgerHome = resolveActivationLedgerHome(home);
-  const booksRoot = join40(ledgerHome, "books");
+  const booksRoot = join39(ledgerHome, "books");
   let bookKeys;
   try {
     bookKeys = await readdir7(booksRoot);
@@ -19684,7 +19675,7 @@ async function readRunParentPath(runDirectory) {
   let raw;
   try {
     raw = JSON.parse(
-      await readFile22(join40(runDirectory, "admitted-request.json"), "utf8")
+      await readFile22(join39(runDirectory, "admitted-request.json"), "utf8")
     );
   } catch (error) {
     if (errorCodeOf(error) === "ENOENT") return void 0;
@@ -19705,7 +19696,7 @@ async function readRunParentPath(runDirectory) {
 async function runHasFormedSessionPrincipal(runDirectory) {
   const disk = await readRoleRunStateDisk(runDirectory);
   if (disk === void 0) return false;
-  const sessionFile = typeof disk.principalWire.sessionFile === "string" && disk.principalWire.sessionFile.trim() !== "" ? disk.principalWire.sessionFile : join40(disk.principalWire.sessionDirectory, "session.jsonl");
+  const sessionFile = typeof disk.principalWire.sessionFile === "string" && disk.principalWire.sessionFile.trim() !== "" ? disk.principalWire.sessionFile : join39(disk.principalWire.sessionDirectory, "session.jsonl");
   try {
     const stat2 = await lstat6(sessionFile);
     return stat2.isFile() && !stat2.isSymbolicLink();
@@ -19723,7 +19714,7 @@ async function findLatestRunIdForSeatTicket(input) {
   let runDirectories;
   try {
     runDirectories = await listBookRunDirectories(
-      input.ticketNumber === void 0 ? bookDir : join40(bookDir, String(input.ticketNumber))
+      input.ticketNumber === void 0 ? bookDir : join39(bookDir, String(input.ticketNumber))
     );
   } catch (error) {
     if (errorCodeOf(error) === "ENOENT") return void 0;
@@ -19921,7 +19912,7 @@ async function loadResumableRunRecord(home, runId, authority) {
   let model;
   try {
     const invocationRaw = JSON.parse(
-      await readFile22(join40(run.runDirectory, "invocation.json"), "utf8")
+      await readFile22(join39(run.runDirectory, "invocation.json"), "utf8")
     );
     if (invocationRaw !== null && typeof invocationRaw === "object" && !Array.isArray(invocationRaw)) {
       const rec = invocationRaw;
@@ -20113,14 +20104,10 @@ function admitResumedRole(loaded) {
     }
     case "review-basis": {
       const rawBase = fields.baseRevision;
-      if (rawBase === void 0 || rawBase.trim() === "") {
-        throw new CliUsageError(
-          `role run admitted reviewer base revision is missing: ${runId}`
-        );
-      }
-      if (/\s/.test(rawBase) || rawBase.startsWith("-")) {
+      const baseFault = admittedReviewerBaseFault(rawBase);
+      if (baseFault !== void 0 || rawBase === void 0) {
         throw new CliUsageError(
-          `role run admitted reviewer base revision is damaged: ${runId}`
+          baseFault === "damaged" ? `role run admitted reviewer base revision is damaged: ${runId}` : `role run admitted reviewer base revision is missing: ${runId}`
         );
       }
       const lens = fields.lens;
@@ -20290,7 +20277,7 @@ var init_run_lifecycle = __esm({
 
 // src/archivist-record-topology.ts
 import { createHash as createHash4 } from "node:crypto";
-import { join as join41 } from "node:path";
+import { join as join40 } from "node:path";
 function resolveNavigatorWorkSubjectPlacement(input) {
   let ledgerHome;
   if (input.parentSessionFile !== void 0 && input.parentSessionFile.length > 0) {
@@ -20303,7 +20290,7 @@ function resolveNavigatorWorkSubjectPlacement(input) {
   const digest = createHash4("sha256").update(input.subject).digest("hex").slice(0, 32);
   return {
     ledgerHome,
-    sessionDir: join41(
+    sessionDir: join40(
       activationBookDirectory(ledgerHome, resolveBookKeyFromGit(input.cwd)),
       NAVIGATOR_RECORD_KIND,
       digest
@@ -20375,10 +20362,10 @@ import {
   statSync as statSync6,
   writeFileSync as writeFileSync2
 } from "node:fs";
-import { dirname as dirname23, resolve as resolve16, join as join42 } from "node:path";
+import { dirname as dirname23, resolve as resolve16, join as join41 } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 function readCurrentSession(sessionDir) {
-  const ledger = join42(sessionDir, CURRENT_SESSION_LEDGER);
+  const ledger = join41(sessionDir, CURRENT_SESSION_LEDGER);
   try {
     const value = JSON.parse(readFileSync4(ledger, "utf8"));
     if (typeof value !== "object" || value === null || typeof value.sessionFile !== "string" || value.sessionFile.length === 0) {
@@ -20393,7 +20380,7 @@ function readCurrentSession(sessionDir) {
   }
 }
 function writeCurrentSession(sessionDir, sessionFile) {
-  const ledger = join42(sessionDir, CURRENT_SESSION_LEDGER);
+  const ledger = join41(sessionDir, CURRENT_SESSION_LEDGER);
   try {
     writeFileSync2(ledger, `${JSON.stringify({ sessionFile })}
 `, { flag: "wx" });
@@ -20409,7 +20396,7 @@ function isCurrentSessionClaimRace(error) {
   return errnoCode(error.cause) === "EEXIST";
 }
 function currentSessionLedgerPath(sessionDir) {
-  return join42(sessionDir, CURRENT_SESSION_LEDGER);
+  return join41(sessionDir, CURRENT_SESSION_LEDGER);
 }
 function readBoundedSessionHeader(filePath) {
   const fd = openSync2(filePath, "r");
@@ -20496,7 +20483,7 @@ function mostRecentNavigatorSessionFile(sessionDir, cwd) {
   const matched = [];
   for (const name of names) {
     if (!name.endsWith(".jsonl")) continue;
-    const filePath = join42(absoluteSessionDir, name);
+    const filePath = join41(absoluteSessionDir, name);
     let st;
     try {
       st = statSync6(filePath);
@@ -20608,7 +20595,7 @@ function createRecordSessionOpen(options, host = piRecordSessionHost) {
     if (!physicallyContainedIn(ledgerHome, parentResolved)) {
       throw new Error("Durable record ownership requires a parent session inside the ledger home");
     }
-    sessionDir = join42(dirname23(parentResolved), options.kind);
+    sessionDir = join41(dirname23(parentResolved), options.kind);
     parentSession = parentFile;
     mayResumeSameNest = options.kind === WORKER_SUBMISSION_GATE_KIND;
   }
@@ -21747,7 +21734,7 @@ init_sitian_facade();
 init_submission_ledger();
 import { randomUUID as randomUUID8 } from "node:crypto";
 import { readFileSync as readFileSync6, writeSync as writeSync2 } from "node:fs";
-import { join as join44 } from "node:path";
+import { join as join43 } from "node:path";
 import { Value as Value4 } from "typebox/value";
 
 // src/activation-trace.ts
@@ -22780,11 +22767,11 @@ function reliableWindow(cwd, baseline, head) {
   const raw = git2(cwd, ["log", "--format=%P%x1e%s", range]);
   if (raw.length === 0) return [];
   return raw.split("\n").flatMap((line2) => {
-    const sep6 = line2.indexOf("");
-    if (sep6 < 0) return [];
+    const sep5 = line2.indexOf("");
+    if (sep5 < 0) return [];
     return [{
-      subject: line2.slice(sep6 + 1),
-      merge: line2.slice(0, sep6).trim().includes(" ")
+      subject: line2.slice(sep5 + 1),
+      merge: line2.slice(0, sep5).trim().includes(" ")
     }];
   });
 }
@@ -23633,7 +23620,7 @@ function readDiaristTicketAssertion(submitted) {
 function readRoleRunCoordinates(ctx, label) {
   const runDirectory = runDirectoryFromHostContext(ctx);
   if (runDirectory === void 0) throw new Error(`${label} requires AK_ROLE_RUN_DIR`);
-  const admittedPath = join44(runDirectory, "admitted-request.json");
+  const admittedPath = join43(runDirectory, "admitted-request.json");
   const admitted = JSON.parse(readFileSync6(admittedPath, "utf8"));
   if (typeof admitted.projectRoot !== "string" || admitted.projectRoot.trim() === "") {
     throw new Error(`${label} admitted-request missing projectRoot (${admittedPath})`);
@@ -24563,7 +24550,7 @@ init_packaged_role_registry();
 import { randomUUID as randomUUID9 } from "node:crypto";
 import { appendFile as appendFile3, mkdir as mkdir5, writeFile as writeFile9 } from "node:fs/promises";
 import { createServer } from "node:net";
-import { dirname as dirname25, join as join45 } from "node:path";
+import { dirname as dirname25, join as join44 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 init_role_activation_flags();
 init_submission_correctable_error();
@@ -24609,7 +24596,7 @@ async function prepareRoleEnvelope(options) {
   const hostAbort = new AbortController();
   const runId = request.runDirectory.split("/").filter(Boolean).at(-1) ?? randomUUID9();
   await mkdir5(request.runDirectory, { recursive: true });
-  let sessionFile = options.sessionFile ?? join45(request.runDirectory, "session", "session.jsonl");
+  let sessionFile = options.sessionFile ?? join44(request.runDirectory, "session", "session.jsonl");
   await mkdir5(dirname25(sessionFile), { recursive: true });
   if (request.continuation.kind !== "resume") {
     try {
@@ -25133,7 +25120,7 @@ import { spawn as spawn3, spawnSync as spawnSync3 } from "node:child_process";
 import { randomUUID as randomUUID10 } from "node:crypto";
 import { existsSync as existsSync15 } from "node:fs";
 import { writeFile as writeFile10 } from "node:fs/promises";
-import { dirname as dirname26, isAbsolute as isAbsolute12, join as join46, resolve as resolve21 } from "node:path";
+import { dirname as dirname26, isAbsolute as isAbsolute12, join as join45, resolve as resolve21 } from "node:path";
 
 // src/external-host-turn-loop.ts
 var EXTERNAL_ROLE_TURN_ROUND_LIMIT = 8;
@@ -25583,7 +25570,7 @@ function formatCodexFailurePayload(payload) {
 function cwdIsGitWorkTree(cwd) {
   let dir = cwd;
   for (; ; ) {
-    if (existsSync15(join46(dir, ".git"))) return true;
+    if (existsSync15(join45(dir, ".git"))) return true;
     const parent = dirname26(dir);
     if (parent === dir) return false;
     dir = parent;
@@ -25794,13 +25781,13 @@ function createHeadlessRoleTurnHost(config) {
           await config.sessionIdentity.bind(request.principal, sessionId);
         }
         const env = { ...process.env, ...config.env ?? {} };
-        const systemPromptPath = join46(request.runDirectory, "headless-system-prompt.txt");
+        const systemPromptPath = join45(request.runDirectory, "headless-system-prompt.txt");
         await writeFile10(systemPromptPath, systemPrompt, "utf8");
         let mcpConfigPath;
         let outputSchemaPath;
         if (codex) {
           if (prepared.terminatingToolName !== NAVIGATOR_OUTPUT_TOOL_NAME) {
-            outputSchemaPath = join46(request.runDirectory, "headless-output-schema.json");
+            outputSchemaPath = join45(request.runDirectory, "headless-output-schema.json");
             await writeFile10(
               outputSchemaPath,
               `${JSON.stringify(closeJsonSchemaForCodex(prepared.jsonSchema), null, 2)}
@@ -25809,7 +25796,7 @@ function createHeadlessRoleTurnHost(config) {
             );
           }
         } else {
-          mcpConfigPath = join46(request.runDirectory, "headless-mcp-config.json");
+          mcpConfigPath = join45(request.runDirectory, "headless-mcp-config.json");
           await writeFile10(
             mcpConfigPath,
             `${JSON.stringify(headlessMcpConfigDocument(prepared.mcpServers), null, 2)}
@@ -26073,7 +26060,7 @@ function createHeadlessRoleTurnHost(config) {
             host: config.hostName,
             sessionId: exitedSessionId,
             cwd: request.cwd,
-            sessionDirectory: join46(request.runDirectory, "session"),
+            sessionDirectory: join45(request.runDirectory, "session"),
             sessionParent,
             continuation: request.continuation,
             ...request.model !== void 0 ? { model: request.model } : {},