@akagilnc/pi-workflow-roles 0.1.3873 → 0.1.3886

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

@@ -418,7 +418,7 @@ function normalizeReviewComment(raw) {
 function createGhApiRunner(options = {}) {
   const spawnImpl = options.spawnImpl ?? spawn;
   return async (args, runOptions = {}) => {
-    return await new Promise((resolve19, reject) => {
+    return await new Promise((resolve20, reject) => {
       const signal = runOptions.signal;
       if (signal?.aborted) {
         reject(signal.reason ?? new Error("aborted"));
@@ -491,11 +491,11 @@ function createGhApiRunner(options = {}) {
               const value = line2.slice(idx + 1).trim();
               headers[name] = value;
             }
-            resolve19({ status, headers, bodyText });
+            resolve20({ status, headers, bodyText });
             return;
           }
           if (code === 0) {
-            resolve19({ status: 200, headers: {}, bodyText: stdout });
+            resolve20({ status: 200, headers: {}, bodyText: stdout });
             return;
           }
           const failure2 = new Error(
@@ -884,10 +884,10 @@ __export(session_assistant_usage_exports, {
 });
 import { join as join2 } from "node:path";
 async function readAssistantUsageFromSessionFile(sessionFile) {
-  const { readFile: readFile22 } = await import("node:fs/promises");
+  const { readFile: readFile23 } = await import("node:fs/promises");
   let text;
   try {
-    text = await readFile22(sessionFile, "utf8");
+    text = await readFile23(sessionFile, "utf8");
   } catch (error) {
     if (error?.code === "ENOENT") return void 0;
     throw error;
@@ -1488,7 +1488,7 @@ async function spawnEngineDetourOnce(input) {
   }
   const command = input.argv[0];
   const args = input.argv.slice(1);
-  return await new Promise((resolve19, reject) => {
+  return await new Promise((resolve20, reject) => {
     let settled = false;
     const signal = input.signal;
     const child = spawn2(command, args, {
@@ -1518,7 +1518,7 @@ async function spawnEngineDetourOnce(input) {
       if (signal !== void 0) {
         signal.removeEventListener("abort", onAbort);
       }
-      resolve19(result);
+      resolve20(result);
     };
     const onAbort = () => {
       fail5(signal !== void 0 ? abortReasonError(signal) : new Error("aborted"));
@@ -2487,18 +2487,6 @@ var init_doctor_contracts = __esm({
   }
 });
 
-// src/git-object-id.ts
-function isFullGitObjectId(value) {
-  return typeof value === "string" && FULL_GIT_OBJECT_ID_RE.test(value);
-}
-var FULL_GIT_OBJECT_ID_RE;
-var init_git_object_id = __esm({
-  "src/git-object-id.ts"() {
-    "use strict";
-    FULL_GIT_OBJECT_ID_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
-  }
-});
-
 // src/exact-utf8.ts
 function exactUtf8(bytes, label) {
   let text;
@@ -2517,35 +2505,11 @@ var init_exact_utf8 = __esm({
   }
 });
 
-// src/sha256.ts
-import { createHash as createHash3 } from "node:crypto";
-function sha256Hex(bytes) {
-  return createHash3("sha256").update(bytes).digest("hex");
-}
-var init_sha256 = __esm({
-  "src/sha256.ts"() {
-    "use strict";
-  }
-});
-
 // src/merger-contracts.ts
 import { Type as Type10 } from "typebox";
 function fail3(message = "Merger input violates its exact contract") {
   throw new MergerInputContractError(message);
 }
-function canonicalPath(path) {
-  return typeof path === "string" && path.length > 0 && !path.startsWith("/") && !path.includes("\0") && path.split("/").every((part) => part !== "" && part !== "." && part !== "..");
-}
-function validatePathSet(value, label) {
-  if (!Array.isArray(value) || value.length === 0 || !value.every(canonicalPath)) fail3(`Merger ${label} must be a non-empty canonical path set`);
-  return value;
-}
-function validateMaterial(value, label) {
-  if (!record2(value) || typeof value.bytesBase64 !== "string" || typeof value.sha256 !== "string") fail3(`Merger ${label} material is malformed`);
-  const bytes = Buffer.from(value.bytesBase64, "base64");
-  exactUtf8(bytes, `Merger ${label} material`);
-  if (sha256Hex(bytes) !== value.sha256) fail3(`Merger ${label} material digest mismatch`);
-}
 function deepFreeze(value) {
   if (value && typeof value === "object") {
     for (const child of Object.values(value)) deepFreeze(child);
@@ -2553,55 +2517,47 @@ function deepFreeze(value) {
   }
   return value;
 }
+function readMaterial(value, label) {
+  if (!record2(value) || typeof value.bytesBase64 !== "string") fail3(`Merger ${label} material is malformed`);
+  exactUtf8(Buffer.from(value.bytesBase64, "base64"), `Merger ${label} material`);
+  return { bytesBase64: value.bytesBase64, sha256: typeof value.sha256 === "string" ? value.sha256 : "" };
+}
 function validateMergerInput(value) {
-  if (!record2(value) || blank(value.attemptId) || !isFullGitObjectId(value.targetObjectId) || !isFullGitObjectId(value.sourceObjectId) || value.targetObjectId.length !== value.sourceObjectId.length) fail3("Merger input has invalid identity or object ID");
-  if (!record2(value.materials)) fail3();
-  for (const key of ["task", "authority", "targetIntent", "sourceIntent"]) validateMaterial(value.materials[key], key);
-  const conflicts = validatePathSet(value.expectedConflictPaths, "expected conflict paths");
-  const scope = validatePathSet(value.resolutionScope, "resolution scope");
-  if (!conflicts.every((path) => scope.includes(path))) fail3("Merger resolution scope must contain the complete conflict set");
-  if (!Array.isArray(value.authorizedChecks)) fail3("Merger authorized checks are malformed");
-  for (const check of value.authorizedChecks) {
-    if (!record2(check) || !Array.isArray(check.argv) || check.argv.length === 0 || check.argv.some(blank)) fail3("Merger authorized check is malformed");
-  }
-  return deepFreeze(structuredClone(value));
-}
-function validateMergerOutput(value, expectedAttemptId) {
-  if (!record2(value) || expectedAttemptId !== void 0 && value.attemptId !== expectedAttemptId) throw new Error("\u5408\u5E76\u56DE\u6267 attempt \u4E0D\u5339\u914D");
+  if (!record2(value) || blank(value.attemptId)) fail3("Merger input requires a non-empty attemptId for accounting");
+  if (!record2(value.materials)) fail3("Merger materials are missing");
+  const materials = { task: readMaterial(value.materials.task, "task"), authority: readMaterial(value.materials.authority, "authority"), targetIntent: readMaterial(value.materials.targetIntent, "targetIntent"), sourceIntent: readMaterial(value.materials.sourceIntent, "sourceIntent") };
+  const authorizedChecks = Array.isArray(value.authorizedChecks) ? value.authorizedChecks.filter((check) => record2(check)).map((c) => ({ name: asString(c.name), argv: asStringArray2(c.argv).filter((a) => a.trim().length > 0) })).filter((c) => c.name.trim().length > 0 && c.argv.length > 0) : [];
+  return deepFreeze(structuredClone({ attemptId: value.attemptId.trim(), targetObjectId: asString(value.targetObjectId), sourceObjectId: asString(value.sourceObjectId), materials, expectedConflictPaths: asStringArray2(value.expectedConflictPaths), resolutionScope: asStringArray2(value.resolutionScope), authorizedChecks }));
+}
+function validateMergerOutput(value) {
+  if (!record2(value)) throw new Error("\u5408\u5E76\u56DE\u6267\u65E0\u5DF2\u8BC6\u522B\u7684\u6267\u884C\u5224\u522B");
   const status = typeof value.status === "string" ? value.status : void 0;
-  if (status === "completed" && isFullGitObjectId(value.mergeCommitId)) return structuredClone(value);
-  if (status === "escalate") return structuredClone(value);
+  if (status === "completed" || status === "escalate") return structuredClone(value);
   throw new Error("\u5408\u5E76\u56DE\u6267\u65E0\u5DF2\u8BC6\u522B\u7684\u6267\u884C\u5224\u522B");
 }
-var oidPattern, materialSchema, checkSchema, mergerInputSchema, mergerOutputVariants, mergerOutputSchema, MERGER_OUTPUT_TOOL_NAME, MERGER_ACCEPTED_TEXT, record2, blank, MergerInputContractError;
+var materialSchema, checkSchema, mergerInputSchema, mergerOutputVariants, mergerOutputSchema, MERGER_OUTPUT_TOOL_NAME, MERGER_ACCEPTED_TEXT, record2, blank, MergerInputContractError, asString, asStringArray2;
 var init_merger_contracts = __esm({
   "src/merger-contracts.ts"() {
     "use strict";
-    init_git_object_id();
     init_exact_utf8();
-    init_sha256();
     init_open_tool_schema();
     init_terminating_infrastructure();
-    oidPattern = "^(?:[0-9a-f]{40}|[0-9a-f]{64})$";
     materialSchema = Type10.Object({ bytesBase64: Type10.String(), sha256: Type10.String() }, { additionalProperties: false });
     checkSchema = Type10.Object({ name: Type10.String({ minLength: 1 }), argv: Type10.Array(Type10.String({ minLength: 1 }), { minItems: 1 }) }, { additionalProperties: false });
     mergerInputSchema = Type10.Object({
-      version: Type10.Literal(1),
-      attemptId: Type10.String({ minLength: 1 }),
-      targetObjectId: Type10.String({ pattern: oidPattern }),
-      sourceObjectId: Type10.String({ pattern: oidPattern }),
+      attemptId: Type10.String({ minLength: 1, description: "\u5BF9\u8D26 attempt \u8EAB\u4EFD\uFF08transport\uFF09" }),
+      targetObjectId: Type10.String({ description: "\u6750\u6599\uFF1Atarget parent OID\uFF1B\u53EF\u7A7A" }),
+      sourceObjectId: Type10.String({ description: "\u6750\u6599\uFF1Asource parent OID\uFF1B\u53EF\u7A7A" }),
       materials: Type10.Object({ task: materialSchema, authority: materialSchema, targetIntent: materialSchema, sourceIntent: materialSchema }, { additionalProperties: false }),
-      expectedConflictPaths: Type10.Array(Type10.String({ minLength: 1 }), { minItems: 1 }),
-      resolutionScope: Type10.Array(Type10.String({ minLength: 1 }), { minItems: 1 }),
+      expectedConflictPaths: Type10.Array(Type10.String(), { description: "\u6750\u6599\uFF1A\u5F53\u524D\u672A\u5408\u5E76\u8DEF\u5F84\uFF1B\u53EF\u7A7A" }),
+      resolutionScope: Type10.Array(Type10.String(), { description: "\u6750\u6599\uFF1A\u89E3\u6790\u8303\u56F4\u63D0\u793A\uFF1B\u53EF\u7A7A" }),
       authorizedChecks: Type10.Array(checkSchema)
     }, { additionalProperties: false });
     mergerOutputVariants = Type10.Union([
-      Type10.Object({ status: Type10.Literal("completed", { description: "completed \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: Type10.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), report: Type10.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }), mergeCommitId: Type10.String({ pattern: oidPattern, description: "\u5DF2\u6838\u9A8C\u7684\u5B8C\u6210\u5408\u5E76 commit object ID" }) }, { additionalProperties: false }),
-      Type10.Object({ status: Type10.Literal("escalate", { description: "escalate \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: Type10.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), diagnosis: Type10.String({ minLength: 1, description: "\u5408\u5E76\u5B8C\u6210\u9700\u5347\u7EA7\u7684\u539F\u56E0" }), report: Type10.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }) }, { additionalProperties: false })
+      Type10.Object({ status: Type10.Literal("completed", { description: "completed \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: Type10.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), report: Type10.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }), mergeCommitId: Type10.String({ description: "\u5B8C\u6210\u5408\u5E76 commit object ID" }) }, { additionalProperties: false }),
+      Type10.Object({ status: Type10.Literal("escalate", { description: "escalate \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: Type10.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), diagnosis: Type10.String({ minLength: 1, description: "\u5408\u5E76\u65E0\u6CD5\u6216\u4E0D\u5E94\u7531\u672C\u5E2D\u5B8C\u6210\u7684\u539F\u56E0\uFF08\u542B\u65E0\u8FDB\u884C\u4E2D\u5408\u5E76\u3001\u65E0\u6D3B\u53EF\u5E72\u3001\u9700\u65B0\u7684\u4EA7\u54C1/\u6743\u529B\u51B3\u5B9A\uFF09" }), report: Type10.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }) }, { additionalProperties: false })
     ]);
-    mergerOutputSchema = withInfrastructureFailureDeclaration(
-      openToolObjectFromUnion(mergerOutputVariants)
-    );
+    mergerOutputSchema = withInfrastructureFailureDeclaration(openToolObjectFromUnion(mergerOutputVariants));
     MERGER_OUTPUT_TOOL_NAME = "ak_merger_output";
     MERGER_ACCEPTED_TEXT = "\u5408\u5E76\u56DE\u6267\u5DF2\u63A5\u53D7";
     record2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
@@ -2612,6 +2568,8 @@ var init_merger_contracts = __esm({
         this.name = "MergerInputContractError";
       }
     };
+    asString = (v) => typeof v === "string" ? v : "";
+    asStringArray2 = (v) => Array.isArray(v) ? v.filter((item) => typeof item === "string") : [];
   }
 });
 
@@ -3175,7 +3133,7 @@ var init_sitian_contracts = __esm({
 });
 
 // src/sitian-appender.ts
-import { createHash as createHash4, randomUUID } from "node:crypto";
+import { createHash as createHash3, randomUUID } from "node:crypto";
 import {
   appendFileSync,
   existsSync,
@@ -3191,7 +3149,7 @@ function errorCodeOf(error) {
   return error.code;
 }
 function identityClaimPath(recordFile, identity) {
-  const digest = createHash4("sha256").update(identity, "utf8").digest("hex");
+  const digest = createHash3("sha256").update(identity, "utf8").digest("hex");
   return `${recordFile}.id-${digest}`;
 }
 function createExclusiveFile(path, contents) {
@@ -3335,7 +3293,7 @@ function resolveSitianRecordPathInLedger(input, ledgerHome) {
       } else {
         subjectStr = JSON.stringify(input.subject);
       }
-      const digest = createHash4("sha256").update(subjectStr).digest("hex").slice(0, 32);
+      const digest = createHash3("sha256").update(subjectStr).digest("hex").slice(0, 32);
       sessionDir = join6(bookDir, category, digest);
     } else {
       sessionDir = join6(bookDir, category);
@@ -3809,6 +3767,17 @@ var init_run_ticket_number = __esm({
   }
 });
 
+// src/sha256.ts
+import { createHash as createHash4 } from "node:crypto";
+function sha256Hex(bytes) {
+  return createHash4("sha256").update(bytes).digest("hex");
+}
+var init_sha256 = __esm({
+  "src/sha256.ts"() {
+    "use strict";
+  }
+});
+
 // src/audit-escalation.ts
 function buildAuditEscalationResult(decision, deliveredOutput) {
   const auditOwned = {
@@ -4524,8 +4493,23 @@ var init_collector_target = __esm({
   }
 });
 
+// src/git-object-id.ts
+function isFullGitObjectId(value) {
+  return typeof value === "string" && FULL_GIT_OBJECT_ID_RE.test(value);
+}
+var FULL_GIT_OBJECT_ID_RE;
+var init_git_object_id = __esm({
+  "src/git-object-id.ts"() {
+    "use strict";
+    FULL_GIT_OBJECT_ID_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+  }
+});
+
 // src/merger-git-state.ts
 import { execFile as execFile2 } from "node:child_process";
+import { access as access2, readFile as readFile7 } from "node:fs/promises";
+import { constants as fsConstants } from "node:fs";
+import { isAbsolute as isAbsolute4, resolve as resolve8 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 async function git(cwd, args) {
   const { stdout } = await execFileAsync2("git", args, { cwd, encoding: "buffer", maxBuffer: 16 * 1024 * 1024 });
@@ -4536,10 +4520,31 @@ function line(bytes, label) {
   if (!value) throw new Error(`${label} is empty`);
   return value;
 }
-function nulPaths(bytes, label) {
-  const raw = exactUtf8(bytes, label);
-  if (raw.length > 0 && !raw.endsWith("\0")) throw new Error(`${label} is not NUL terminated`);
-  return raw.split("\0").filter(Boolean).sort((a, b) => Buffer.compare(Buffer.from(a), Buffer.from(b)));
+async function pathExists(path) {
+  try {
+    await access2(path, fsConstants.F_OK);
+    return true;
+  } catch (error) {
+    if (error.code === "ENOENT") return false;
+    throw error;
+  }
+}
+async function requireInsideWorkTree(cwd) {
+  const stdout = await git(cwd, ["rev-parse", "--is-inside-work-tree"]);
+  if (exactUtf8(stdout, "Git worktree check").trim() !== "true") throw new Error("Assigned path is not inside a Git work tree");
+}
+async function tryResolveCommit(cwd, rev) {
+  let stdout;
+  try {
+    const res = await execFileAsync2("git", ["rev-parse", "--verify", "--quiet", `${rev}^{commit}`], { cwd, encoding: "buffer", maxBuffer: 16 * 1024 * 1024 });
+    stdout = new Uint8Array(res.stdout);
+  } catch (error) {
+    if (error.code === 1) return void 0;
+    throw error;
+  }
+  const oid = line(stdout, `Git ${rev}`);
+  if (!isFullGitObjectId(oid)) throw new Error(`Git ${rev} identity is unavailable or invalid`);
+  return oid;
 }
 async function unmerged(cwd) {
   const raw = exactUtf8(await git(cwd, ["ls-files", "-u", "-z"]), "Git unmerged index");
@@ -4552,40 +4557,39 @@ async function unmerged(cwd) {
   }
   return [...paths].sort((a, b) => Buffer.compare(Buffer.from(a), Buffer.from(b)));
 }
+async function resolveHeadMaterial(cwd) {
+  const commit = await tryResolveCommit(cwd, "HEAD");
+  if (commit !== void 0) return commit;
+  try {
+    await execFileAsync2("git", ["rev-parse", "--verify", "--quiet", "HEAD"], { cwd, encoding: "buffer", maxBuffer: 16 * 1024 * 1024 });
+  } catch (error) {
+    if (error.code === 1) return "";
+    throw error;
+  }
+  throw new Error("Git HEAD identity is unavailable or invalid");
+}
 function createProductionMergerGitState(repositoryRoot = process.cwd()) {
   return {
     async activeMerge() {
-      const targetObjectId = line(await git(repositoryRoot, ["rev-parse", "--verify", "HEAD"]), "Git HEAD");
-      let mergeHeadRaw;
-      try {
-        mergeHeadRaw = await git(repositoryRoot, ["rev-parse", "--verify", "MERGE_HEAD"]);
-      } catch {
-        throw new Error("Assigned repository does not have one ordinary in-progress merge");
-      }
-      const mergeHeads = exactUtf8(mergeHeadRaw, "Git MERGE_HEAD").trim().split(/\r?\n/).filter(Boolean);
-      if (mergeHeads.length !== 1 || !isFullGitObjectId(targetObjectId) || !isFullGitObjectId(mergeHeads[0]) || targetObjectId.length !== mergeHeads[0].length) throw new Error("Assigned repository does not have one ordinary in-progress merge");
-      let automaticMergeTreeRaw;
-      try {
-        automaticMergeTreeRaw = await git(repositoryRoot, ["rev-parse", "--verify", "AUTO_MERGE^{tree}"]);
-      } catch {
-        throw new Error("Git automatic merge tree identity is unavailable or invalid");
+      await requireInsideWorkTree(repositoryRoot);
+      const targetObjectId = await resolveHeadMaterial(repositoryRoot);
+      const mergeHeadReported = line(await git(repositoryRoot, ["rev-parse", "--git-path", "MERGE_HEAD"]), "Git MERGE_HEAD path");
+      const mergeHeadPath = isAbsolute4(mergeHeadReported) ? mergeHeadReported : resolve8(repositoryRoot, mergeHeadReported);
+      let sourceObjectId = "";
+      if (await pathExists(mergeHeadPath)) {
+        const raw = exactUtf8(await readFile7(mergeHeadPath), "Git MERGE_HEAD");
+        const mergeHeads = raw.trim().split(/\r?\n/).map((row) => row.trim()).filter(Boolean);
+        if (mergeHeads.length === 0) throw new Error("Git MERGE_HEAD is empty");
+        if (mergeHeads.length !== 1) throw new Error("Assigned repository does not have one ordinary in-progress merge");
+        const source = mergeHeads[0];
+        if (!isFullGitObjectId(source)) throw new Error("Git MERGE_HEAD identity is unavailable or invalid");
+        const resolved = await tryResolveCommit(repositoryRoot, source);
+        if (resolved === void 0 || targetObjectId !== "" && resolved.length !== targetObjectId.length) {
+          throw new Error("Git MERGE_HEAD identity is unavailable or invalid");
+        }
+        sourceObjectId = resolved;
       }
-      const automaticMergeTreeId = line(automaticMergeTreeRaw, "Git automatic merge tree");
-      if (!isFullGitObjectId(automaticMergeTreeId) || automaticMergeTreeId.length !== targetObjectId.length) throw new Error("Git automatic merge tree identity is unavailable or invalid");
-      return { targetObjectId, sourceObjectId: mergeHeads[0], unmergedPaths: await unmerged(repositoryRoot), automaticMergeTreeId };
-    },
-    async completedMerge(mergeCommitId, automaticMergeTreeId) {
-      if (!isFullGitObjectId(mergeCommitId) || !isFullGitObjectId(automaticMergeTreeId) || mergeCommitId.length !== automaticMergeTreeId.length) throw new Error("Merger completion object ID is invalid");
-      const identity = exactUtf8(await git(repositoryRoot, ["show", "-s", "--format=%H%x00%P", mergeCommitId]), "Git merge commit").trimEnd().split("\0");
-      if (identity.length !== 2 || identity[0] !== mergeCommitId) throw new Error("Git merge completion identity drifted");
-      const parentObjectIds = identity[1].split(" ").filter(Boolean);
-      const currentHead = line(await git(repositoryRoot, ["rev-parse", "--verify", "HEAD"]), "Git HEAD");
-      const status = await git(repositoryRoot, ["status", "--porcelain=v1", "-z", "--untracked-files=all"]);
-      const frozenTree = line(await git(repositoryRoot, ["rev-parse", "--verify", `${automaticMergeTreeId}^{tree}`]), "Git frozen automatic merge tree");
-      if (frozenTree !== automaticMergeTreeId) throw new Error("Git frozen automatic merge tree identity drifted");
-      const mergeTree = line(await git(repositoryRoot, ["rev-parse", "--verify", `${mergeCommitId}^{tree}`]), "Git completed merge tree");
-      const resolutionChangedPaths = nulPaths(await git(repositoryRoot, ["diff-tree", "--no-commit-id", "--name-only", "-r", "-z", "--no-renames", automaticMergeTreeId, mergeTree]), "Git resolution path delta");
-      return { mergeCommitId: currentHead, parentObjectIds, unmergedPaths: await unmerged(repositoryRoot), worktreeClean: status.byteLength === 0 && currentHead === mergeCommitId, resolutionChangedPaths };
+      return { targetObjectId, sourceObjectId, unmergedPaths: await unmerged(repositoryRoot) };
     }
   };
 }
@@ -4625,7 +4629,7 @@ var init_uuidv7 = __esm({
 });
 
 // src/typed-provider-http.ts
-import { readFile as readFile7, unlink, writeFile as writeFile2 } from "node:fs/promises";
+import { readFile as readFile8, unlink, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join9 } from "node:path";
 function typedProviderHttpPath(runDirectory) {
   return join9(runDirectory, TYPED_HTTP_FILE);
@@ -4659,7 +4663,7 @@ async function recordTypedProviderHttpStatus(runDirectory, observation) {
 async function readLatestTypedProviderHttpObservation(runDirectory) {
   let text;
   try {
-    text = await readFile7(typedProviderHttpPath(runDirectory), "utf8");
+    text = await readFile8(typedProviderHttpPath(runDirectory), "utf8");
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return void 0;
@@ -4746,8 +4750,8 @@ var init_engine_material = __esm({
 });
 
 // src/public-cli/run-lifecycle.ts
-import { chmod, open, readdir as readdir2, readFile as readFile8, unlink as unlink2, writeFile as writeFile3 } from "node:fs/promises";
-import { isAbsolute as isAbsolute4, join as join11 } from "node:path";
+import { chmod, open, readdir as readdir2, readFile as readFile9, unlink as unlink2, writeFile as writeFile3 } from "node:fs/promises";
+import { isAbsolute as isAbsolute5, join as join11 } from "node:path";
 function resumeRereadInstruction(materialPath, handbook) {
   return handbook ? `\u91CD\u65B0\u8BFB ${materialPath}\uFF0C\u518D\u7EC4\u88C5\u5916\u5305 argv` : `\u91CD\u65B0\u8BFB ${materialPath}`;
 }
@@ -4759,7 +4763,7 @@ function instructResumeHandbookRead(prompt, engineMaterial) {
     if (handbookPath !== void 0 && value === handbookPath) {
       return resumeRereadInstruction(handbookPath, true);
     }
-    if (isAbsolute4(value)) return resumeRereadInstruction(value, false);
+    if (isAbsolute5(value)) return resumeRereadInstruction(value, false);
     return line2;
   }).join("\n");
 }
@@ -4845,7 +4849,7 @@ function parseCurrentCourtState(raw) {
 async function readRoleRunStateDisk(runDirectory) {
   let raw;
   try {
-    raw = JSON.parse(await readFile8(join11(runDirectory, RUN_STATE_FILE), "utf8"));
+    raw = JSON.parse(await readFile9(join11(runDirectory, RUN_STATE_FILE), "utf8"));
   } catch {
     return void 0;
   }
@@ -5077,7 +5081,7 @@ function isProcessAlive(pid) {
 async function autopsyWriterLock(lockPath) {
   let content;
   try {
-    content = await readFile8(lockPath, "utf8");
+    content = await readFile9(lockPath, "utf8");
   } catch (error) {
     if (errorCodeOf2(error) === "ENOENT") return { verdict: "absent" };
     return { verdict: "absent", readFailure: error };
@@ -5246,7 +5250,7 @@ async function readRunParentPath(runDirectory) {
   let raw;
   try {
     raw = JSON.parse(
-      await readFile8(join11(runDirectory, "admitted-request.json"), "utf8")
+      await readFile9(join11(runDirectory, "admitted-request.json"), "utf8")
     );
   } catch (error) {
     if (errorCodeOf2(error) === "ENOENT") return void 0;
@@ -5357,7 +5361,7 @@ async function loadResumableRunRecord(home, runId, authority) {
   let sourceRun;
   try {
     const raw = JSON.parse(
-      await readFile8(run.admittedRequestPath, "utf8")
+      await readFile9(run.admittedRequestPath, "utf8")
     );
     if (raw !== null && typeof raw === "object" && !Array.isArray(raw)) {
       const record4 = raw;
@@ -5448,11 +5452,10 @@ async function loadResumableRunRecord(home, runId, authority) {
       }
       if (record4.derived !== null && typeof record4.derived === "object" && !Array.isArray(record4.derived)) {
         const d = record4.derived;
-        if (typeof d.targetObjectId === "string" && typeof d.sourceObjectId === "string" && typeof d.automaticMergeTreeId === "string" && Array.isArray(d.expectedConflictPaths) && Array.isArray(d.resolutionScope) && d.expectedConflictPaths.every((p) => typeof p === "string") && d.resolutionScope.every((p) => typeof p === "string")) {
+        if (typeof d.targetObjectId === "string" && typeof d.sourceObjectId === "string" && Array.isArray(d.expectedConflictPaths) && Array.isArray(d.resolutionScope) && d.expectedConflictPaths.every((p) => typeof p === "string") && d.resolutionScope.every((p) => typeof p === "string")) {
           derived = {
             targetObjectId: d.targetObjectId,
             sourceObjectId: d.sourceObjectId,
-            automaticMergeTreeId: d.automaticMergeTreeId,
             expectedConflictPaths: d.expectedConflictPaths,
             resolutionScope: d.resolutionScope
           };
@@ -5472,7 +5475,7 @@ async function loadResumableRunRecord(home, runId, authority) {
   let model;
   try {
     const invocationRaw = JSON.parse(
-      await readFile8(join11(run.runDirectory, "invocation.json"), "utf8")
+      await readFile9(join11(run.runDirectory, "invocation.json"), "utf8")
     );
     if (invocationRaw !== null && typeof invocationRaw === "object" && !Array.isArray(invocationRaw)) {
       const rec = invocationRaw;
@@ -5671,7 +5674,7 @@ __export(notary_source_run_exports, {
   loadNotarySourceRunLocator: () => loadNotarySourceRunLocator,
   resolveNotarySourceRunLocator: () => resolveNotarySourceRunLocator
 });
-import { dirname as dirname8, isAbsolute as isAbsolute5, join as join12, resolve as resolve8, basename as basename5 } from "node:path";
+import { dirname as dirname8, isAbsolute as isAbsolute6, join as join12, resolve as resolve9, basename as basename5 } from "node:path";
 import { lstat as lstat2, realpath as realpath4 } from "node:fs/promises";
 function parseRunDirectoryName(name) {
   const match = RUN_DIR_NAME.exec(name);
@@ -5723,7 +5726,7 @@ async function resolveNotarySourceRunLocator(options) {
   if (bare !== void 0 && !raw.includes("/") && !raw.includes("\\")) {
     candidate = join12(bookRunsRoot, `${bare.runId}@${bare.role}`);
   } else {
-    candidate = isAbsolute5(raw) ? raw : resolve8(options.projectRoot, raw);
+    candidate = isAbsolute6(raw) ? raw : resolve9(options.projectRoot, raw);
   }
   const real = await requireRunDirectory(candidate, raw);
   const identity = parseRunDirectoryName(basename5(real));
@@ -6404,7 +6407,7 @@ var init_option_definitions = __esm({
       }
     ];
     MERGER_OPTIONS = [
-      // Merger project face differs: requires an in-progress ordinary merge root.
+      // Merger project face: worktree whose Git materials are handed to the role.
       {
         id: "project",
         owner: "merger",
@@ -6415,8 +6418,8 @@ var init_option_definitions = __esm({
         repeatable: false,
         form: "option",
         description: {
-          en: "Project root with one ordinary in-progress merge (defaults to cwd).",
-          zh: "\u5DF2\u6709\u8FDB\u884C\u4E2D ordinary merge \u7684\u9879\u76EE\u6839\uFF08\u9ED8\u8BA4 cwd\uFF09\u3002"
+          en: "Project root whose Git merge materials are read (defaults to cwd).",
+          zh: "\u8BFB\u53D6 Git merge \u6750\u6599\u7684\u9879\u76EE\u6839\uFF08\u9ED8\u8BA4 cwd\uFF09\u3002"
         }
       },
       bindOwner("merger", SHARED_ATTACH_SEMANTICS)
@@ -6657,10 +6660,10 @@ var init_option_definitions = __esm({
       },
       merger: {
         command: "merger",
-        summary: "Resolve one ordinary merge already in conflict.",
+        summary: "Reconcile merge materials in a worktree (escalate when nothing to merge).",
         usage: ["ak-role merger [options] <instruction>"],
         examples: [
-          'ak-role merger --project /path/to/worktree "Reconcile the active merge."'
+          'ak-role merger --project /path/to/worktree "Reconcile the merge."'
         ]
       },
       inspector: {
@@ -6795,7 +6798,6 @@ var init_option_definitions = __esm({
 // src/public-cli/invocation.ts
 var invocation_exports = {};
 __export(invocation_exports, {
-  MergerEnvelopeDerivationError: () => MergerEnvelopeDerivationError,
   admitAuditorInvocation: () => admitAuditorInvocation,
   admitCoderInvocation: () => admitCoderInvocation,
   admitCollectorInvocation: () => admitCollectorInvocation,
@@ -6865,11 +6867,11 @@ import { existsSync as existsSync4 } from "node:fs";
 import {
   lstat as lstat3,
   mkdir,
-  readFile as readFile9,
+  readFile as readFile10,
   realpath as realpath5,
   writeFile as writeFile4
 } from "node:fs/promises";
-import { basename as basename6, isAbsolute as isAbsolute6, join as join13, resolve as resolve9, sep as sep3 } from "node:path";
+import { basename as basename6, isAbsolute as isAbsolute7, join as join13, resolve as resolve10, sep as sep3 } from "node:path";
 function issueAdmissionPlacement(authority, request) {
   const principal = authority.issue(request);
   const { sessionDirectory, sessionFile } = authority.decode(principal);
@@ -6929,7 +6931,7 @@ async function writeRoleInvocationLedger(source, role, effectiveModel) {
 }
 async function recordEffectiveInvocationModel(runDirectory, model, engine, host) {
   const ledgerPath = join13(runDirectory, "invocation.json");
-  const current = JSON.parse(await readFile9(ledgerPath, "utf8"));
+  const current = JSON.parse(await readFile10(ledgerPath, "utf8"));
   const next = { ...current };
   if (model !== void 0) {
     next.provider = model.provider;
@@ -6957,7 +6959,7 @@ async function recordEffectiveInvocationModel(runDirectory, model, engine, host)
 }
 async function mergeInvocationIdentityPage(runDirectory, fields) {
   const ledgerPath = join13(runDirectory, "invocation.json");
-  const current = JSON.parse(await readFile9(ledgerPath, "utf8"));
+  const current = JSON.parse(await readFile10(ledgerPath, "utf8"));
   await writeFile4(
     ledgerPath,
     `${JSON.stringify({
@@ -6973,7 +6975,7 @@ async function persistAdmittedSourceRunPath(admitted, sourceRunPath) {
     throw new Error("persistAdmittedSourceRunPath requires a non-empty sourceRunPath");
   }
   const admittedPath = admitted.admittedRequestPath;
-  const current = JSON.parse(await readFile9(admittedPath, "utf8"));
+  const current = JSON.parse(await readFile10(admittedPath, "utf8"));
   if (typeof current.sourceRunPath === "string") {
     if (current.sourceRunPath === sourceRunPath) return;
     throw new Error(
@@ -7000,7 +7002,7 @@ async function bindAdmittedTicketNumber(admitted, ticketNumber) {
   admitted.ticketNumber = ticketNumber;
   await mergeInvocationIdentityPage(admitted.runDirectory, { ticketNumber });
   const admittedPath = admitted.admittedRequestPath;
-  const current = JSON.parse(await readFile9(admittedPath, "utf8"));
+  const current = JSON.parse(await readFile10(admittedPath, "utf8"));
   await writeFile4(
     admittedPath,
     `${JSON.stringify({ ...current, ticketNumber }, null, 2)}
@@ -7016,7 +7018,7 @@ async function bindTicketNumberOnRunDirectory(runDirectory, ticketNumber) {
   }
   const admittedPath = join13(runDirectory, "admitted-request.json");
   const invocationPath = join13(runDirectory, "invocation.json");
-  const admitted = JSON.parse(await readFile9(admittedPath, "utf8"));
+  const admitted = JSON.parse(await readFile10(admittedPath, "utf8"));
   const existing = admitted.ticketNumber;
   if (typeof existing === "number") {
     if (existing === ticketNumber) return;
@@ -7026,7 +7028,7 @@ async function bindTicketNumberOnRunDirectory(runDirectory, ticketNumber) {
   }
   if (existsSync4(invocationPath)) {
     const invocation = JSON.parse(
-      await readFile9(invocationPath, "utf8")
+      await readFile10(invocationPath, "utf8")
     );
     if (typeof invocation.ticketNumber === "number" && invocation.ticketNumber !== ticketNumber) {
       throw new Error(
@@ -7051,7 +7053,7 @@ async function recordLaunchedPiIdentity(runDirectory, identity) {
 async function observeLaunchedRolePackageIdentity(packageRoot, selectedRoleEntry) {
   const rolePackageRoot = packageRoot;
   const raw = JSON.parse(
-    await readFile9(join13(rolePackageRoot, "package.json"), "utf8")
+    await readFile10(join13(rolePackageRoot, "package.json"), "utf8")
   );
   if (typeof raw.version !== "string" || raw.version.trim() === "") {
     throw new Error(
@@ -7292,7 +7294,7 @@ function parseFixerArgv(args) {
   };
 }
 async function freezeRegularFileAttachment(sourcePath, destinationDir, index) {
-  const absolute = isAbsolute6(sourcePath) ? sourcePath : resolve9(sourcePath);
+  const absolute = isAbsolute7(sourcePath) ? sourcePath : resolve10(sourcePath);
   let st;
   try {
     st = await lstat3(absolute);
@@ -7307,7 +7309,7 @@ async function freezeRegularFileAttachment(sourcePath, destinationDir, index) {
       `attachment must be a regular file (not a directory or symlink): ${sourcePath}`
     );
   }
-  const bytes = await readFile9(absolute);
+  const bytes = await readFile10(absolute);
   const name = `${String(index).padStart(2, "0")}-${basename6(absolute)}`;
   const frozenPath = join13(destinationDir, name);
   await writeFile4(frozenPath, bytes);
@@ -7348,7 +7350,7 @@ async function admitStandardMaterialInvocation(role, options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -7451,7 +7453,7 @@ async function admitCountersignInvocation(options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -7516,7 +7518,7 @@ function buildCountersignTransportPrompt(admitted, engineMaterial) {
 async function loadAdmittedJudgeRequest(runDirectory) {
   try {
     const raw = JSON.parse(
-      await readFile9(join13(runDirectory, "admitted-request.json"), "utf8")
+      await readFile10(join13(runDirectory, "admitted-request.json"), "utf8")
     );
     if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return void 0;
     const record4 = raw;
@@ -7551,7 +7553,7 @@ async function admitCoderInvocation(options) {
   if (options.phase !== "plan" && options.phase !== "apply") {
     throw new CliUsageError("coder phase must be plan or apply");
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -7639,9 +7641,9 @@ async function admitFixerInvocation(options) {
   let prerequisites = Object.freeze([]);
   let prerequisitesSource;
   if (options.prerequisitesPath !== void 0) {
-    const absolutePrereq = isAbsolute6(options.prerequisitesPath) ? options.prerequisitesPath : resolve9(options.prerequisitesPath);
+    const absolutePrereq = isAbsolute7(options.prerequisitesPath) ? options.prerequisitesPath : resolve10(options.prerequisitesPath);
     try {
-      prerequisitesSource = await readFile9(absolutePrereq, "utf8");
+      prerequisitesSource = await readFile10(absolutePrereq, "utf8");
     } catch (error) {
       throw new CliUsageError(
         `fixer prerequisites path is unreadable: ${options.prerequisitesPath}`,
@@ -7657,7 +7659,7 @@ async function admitFixerInvocation(options) {
       throw error;
     }
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -7882,7 +7884,7 @@ async function admitCollectorInvocation(options) {
       throw new CliUsageError(detail, { cause: error });
     }
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   let repository;
   if (options.repo !== void 0) {
     try {
@@ -8070,12 +8072,12 @@ async function resolveDoctorCaseRunsPath(options) {
   if (raw === "") {
     throw new CliUsageError("doctor --runs requires a path");
   }
-  if (isAbsolute6(raw)) {
+  if (isAbsolute7(raw)) {
     throw new CliUsageError(
       "doctor --runs must be a project-relative path"
     );
   }
-  const resolved = resolve9(options.projectRoot, raw);
+  const resolved = resolve10(options.projectRoot, raw);
   if (resolved !== options.projectRoot && !pathContainedIn(options.projectRoot, resolved)) {
     throw new CliUsageError(
       "doctor --runs escapes the project root"
@@ -8114,7 +8116,7 @@ async function admitDoctorInvocation(options) {
       `doctor --issue must be a positive integer, got ${options.issueNumber}`
     );
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -8275,7 +8277,7 @@ async function admitNotaryInvocation(options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   let sourceRun;
   try {
     sourceRun = await resolveNotarySourceRunLocator({
@@ -8393,7 +8395,7 @@ async function admitGleanerLeftInvocation(options) {
   if (options.baseRevision.trim() === "") {
     throw new CliUsageError("--base requires a nonempty revision");
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -8514,7 +8516,7 @@ async function admitReviewerInvocation(options) {
   const authorityRefs = Object.freeze(
     (options.authorityRefs ?? []).map((ref) => requireAuthorityRef(ref))
   );
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -8609,7 +8611,7 @@ function parseMergerArgv(args) {
     const token = tokens.shift();
     if (isRejectedPublicSpelling("merger", token) || token === "--targetObjectId" || token.startsWith("--targetObjectId=") || token === "--sourceObjectId" || token.startsWith("--sourceObjectId=") || token === "--expectedConflictPaths" || token.startsWith("--expectedConflictPaths=") || token === "--resolutionScope" || token.startsWith("--resolutionScope=")) {
       throw new CliUsageError(
-        "merger does not accept public packet fields; the adapter derives the active-merge envelope"
+        "merger does not accept public packet fields; the adapter reads Git merge materials"
       );
     }
     if (token.startsWith("-") && token !== "-") {
@@ -8632,24 +8634,12 @@ function mergerMaterialFromUtf8(text) {
   });
 }
 async function deriveMergerEnvelopeFromActiveMerge(projectRoot, gitState = createProductionMergerGitState(projectRoot)) {
-  let state;
-  try {
-    state = await gitState.activeMerge();
-  } catch (error) {
-    const message = error instanceof Error && error.message.trim() !== "" ? error.message : "Assigned repository does not have one ordinary in-progress merge";
-    throw new MergerEnvelopeDerivationError(message, { cause: error });
-  }
-  if (state.unmergedPaths.length === 0) {
-    throw new MergerEnvelopeDerivationError(
-      "Assigned repository does not have one ordinary in-progress merge with a complete conflict set"
-    );
-  }
+  const state = await gitState.activeMerge();
   const expectedConflictPaths = Object.freeze([...state.unmergedPaths]);
   const resolutionScope = Object.freeze([...state.unmergedPaths]);
   return Object.freeze({
     targetObjectId: state.targetObjectId,
     sourceObjectId: state.sourceObjectId,
-    automaticMergeTreeId: state.automaticMergeTreeId,
     expectedConflictPaths,
     resolutionScope
   });
@@ -8662,7 +8652,7 @@ async function admitMergerInvocation(options) {
   if (instruction.trim() === "") {
     throw new CliUsageError("merger requires a nonblank task instruction");
   }
-  const projectRoot = resolve9(options.project ?? options.cwd);
+  const projectRoot = resolve10(options.project ?? options.cwd);
   const derived = await deriveMergerEnvelopeFromActiveMerge(
     projectRoot,
     options.gitState ?? createProductionMergerGitState(projectRoot)
@@ -8685,16 +8675,17 @@ async function admitMergerInvocation(options) {
   ensureRealDirectoryTree(ledgerHome, sessionDirectory);
   ensureRealDirectoryTree(ledgerHome, attachmentsDirectory);
   const attachments = await freezeAttachments(options.attachmentPaths, attachmentsDirectory);
+  const targetLabel = derived.targetObjectId === "" ? "(none observed)" : derived.targetObjectId;
+  const sourceLabel = derived.sourceObjectId === "" ? "(none observed)" : derived.sourceObjectId;
   const targetIntent = mergerMaterialFromUtf8(
-    `Investigate primary sources for target parent ${derived.targetObjectId}. Do not invent intent.`
+    `Investigate primary sources for target parent ${targetLabel}. Do not invent intent.`
   );
   const sourceIntent = mergerMaterialFromUtf8(
-    `Investigate primary sources for source parent ${derived.sourceObjectId}. Do not invent intent.`
+    `Investigate primary sources for source parent ${sourceLabel}. Do not invent intent.`
   );
   const taskMaterial = mergerMaterialFromUtf8(instruction);
   const authorityMaterial = mergerMaterialFromUtf8(instruction);
   const mergerInput = validateMergerInput({
-    version: 1,
     attemptId: runId,
     targetObjectId: derived.targetObjectId,
     sourceObjectId: derived.sourceObjectId,
@@ -8706,7 +8697,6 @@ async function admitMergerInvocation(options) {
     },
     expectedConflictPaths: [...derived.expectedConflictPaths],
     resolutionScope: [...derived.resolutionScope],
-    // Authorized checks remain available on the assignment; default none.
     authorizedChecks: []
   });
   const mergerInputPath = join13(runDirectory, "merger-input.json");
@@ -8729,7 +8719,6 @@ async function admitMergerInvocation(options) {
     derived: {
       targetObjectId: derived.targetObjectId,
       sourceObjectId: derived.sourceObjectId,
-      automaticMergeTreeId: derived.automaticMergeTreeId,
       expectedConflictPaths: [...derived.expectedConflictPaths],
       resolutionScope: [...derived.resolutionScope]
     },
@@ -8993,7 +8982,7 @@ function parseAnalystArgv(args) {
     ...ticketRaw === void 0 ? {} : { ticket: parseAnalystTicketNumber(ticketRaw) }
   };
 }
-var MergerEnvelopeDerivationError, DOCTOR_ISSUE_NUMBER_PATTERN, DOCTOR_CASE_RUNS_PATH_PATTERN, ANALYST_TICKET_NUMBER_PATTERN;
+var DOCTOR_ISSUE_NUMBER_PATTERN, DOCTOR_CASE_RUNS_PATH_PATTERN, ANALYST_TICKET_NUMBER_PATTERN;
 var init_invocation = __esm({
   "src/public-cli/invocation.ts"() {
     "use strict";
@@ -9014,15 +9003,6 @@ var init_invocation = __esm({
     init_engine_material();
     init_cli_errors();
     init_option_definitions();
-    MergerEnvelopeDerivationError = class extends Error {
-      code = "merger-envelope-derivation";
-      /** Typed cause for #107 classifyPostAdmissionFailure (isTypedActivationError). */
-      knownCause = "activation";
-      constructor(message, options) {
-        super(message, options);
-        this.name = "MergerEnvelopeDerivationError";
-      }
-    };
     DOCTOR_ISSUE_NUMBER_PATTERN = /^[1-9]\d*$/;
     DOCTOR_CASE_RUNS_PATH_PATTERN = /\/\.ak-roles\/books\/[^/]+\/issues\/([1-9]\d*)\/runs$/;
     ANALYST_TICKET_NUMBER_PATTERN = /^[1-9]\d*$/;
@@ -9583,7 +9563,7 @@ __export(config_exports, {
   setPersistentSeatHost: () => setPersistentSeatHost,
   validatePublicCliConfigAxes: () => validatePublicCliConfigAxes
 });
-import { mkdir as mkdir2, readFile as readFile10, writeFile as writeFile5 } from "node:fs/promises";
+import { mkdir as mkdir2, readFile as readFile11, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname9, join as join17 } from "node:path";
 function isGateOfficerSeat(value) {
   return GATE_OFFICER_SEATS.includes(value);
@@ -9597,7 +9577,7 @@ function publicCliConfigPath(home) {
 async function loadPublicCliConfig(home) {
   const path = publicCliConfigPath(home);
   try {
-    const raw = await readFile10(path, "utf8");
+    const raw = await readFile11(path, "utf8");
     return parsePublicCliConfig(JSON.parse(raw));
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -10001,7 +9981,7 @@ function credentialProvidersFromAuthData(data) {
 }
 async function loadCredentialProviders(agentDir) {
   try {
-    const raw = await readFile10(join17(agentDir, "auth.json"), "utf8");
+    const raw = await readFile11(join17(agentDir, "auth.json"), "utf8");
     return credentialProvidersFromAuthData(JSON.parse(raw));
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -10344,14 +10324,14 @@ var init_case_dossier_delivery = __esm({
 });
 
 // src/host-transition-prior-native.ts
-import { access as access2, readdir as readdir3 } from "node:fs/promises";
+import { access as access3, readdir as readdir3 } from "node:fs/promises";
 import { dirname as dirname10, join as join19 } from "node:path";
 function isEnoent2(error) {
   return typeof error === "object" && error !== null && error.code === "ENOENT";
 }
 async function listPiNativeRecordPaths(sessionFile) {
   try {
-    await access2(sessionFile);
+    await access3(sessionFile);
     return [sessionFile];
   } catch (error) {
     if (isEnoent2(error)) return [];
@@ -10372,7 +10352,7 @@ async function listSitianRecordPaths(sessionParent) {
     if (!entry.isDirectory()) continue;
     const recordFile = join19(sessionRoot, entry.name, "records.jsonl");
     try {
-      await access2(recordFile);
+      await access3(recordFile);
       recordPaths.push(recordFile);
     } catch (error) {
       if (!isEnoent2(error)) throw error;
@@ -10754,12 +10734,12 @@ var init_submission_ledger = __esm({
 });
 
 // src/ledger-session-read.ts
-import { readFile as readFile11 } from "node:fs/promises";
+import { readFile as readFile12 } from "node:fs/promises";
 function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function readLedgerSessionJsonl(path) {
-  const text = await readFile11(path, "utf8");
+  const text = await readFile12(path, "utf8");
   const lines = text.split("\n");
   const rows = [];
   for (let index = 0; index < lines.length; index += 1) {
@@ -11068,10 +11048,10 @@ function pairGateRounds(volumes) {
   return rounds.sort((a, b) => a.officerStartedAt.localeCompare(b.officerStartedAt)).map((round, index) => ({ ...round, roundIndex: index + 1 }));
 }
 async function resolveOfficerSessionFromPointerFile(pointerPath) {
-  const { readFile: readFile22 } = await import("node:fs/promises");
+  const { readFile: readFile23 } = await import("node:fs/promises");
   let raw;
   try {
-    raw = JSON.parse(await readFile22(pointerPath, "utf8"));
+    raw = JSON.parse(await readFile23(pointerPath, "utf8"));
   } catch (error) {
     throw new Error(
       `direct officer run pointer unreadable in ${pointerPath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -11146,7 +11126,7 @@ var init_analyst_gate_cycles_read = __esm({
 
 // src/session-opening-materials.ts
 import { existsSync as existsSync7 } from "node:fs";
-import { readFile as readFile12 } from "node:fs/promises";
+import { readFile as readFile13 } from "node:fs/promises";
 import { dirname as dirname12, join as join22 } from "node:path";
 import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "node:url";
 function resolvePackageRootDir(moduleUrl = import.meta.url) {
@@ -11162,7 +11142,7 @@ function resolvePackageRootDir(moduleUrl = import.meta.url) {
   return fileURLToPath(new URL("..", moduleUrl));
 }
 async function readPackageMaterial(relativePath) {
-  return readFile12(fileURLToPath(new URL(relativePath, packageRootUrl)), "utf8");
+  return readFile13(fileURLToPath(new URL(relativePath, packageRootUrl)), "utf8");
 }
 async function joinPackageMaterials(relativePaths) {
   const chunks = [];
@@ -11403,7 +11383,7 @@ var init_reviewer_preflight_error = __esm({
 
 // src/reviewer-pinned-git.ts
 import { execFile as execFile3 } from "node:child_process";
-import { access as access3, realpath as realpath6 } from "node:fs/promises";
+import { access as access4, realpath as realpath6 } from "node:fs/promises";
 import { promisify as promisify3 } from "node:util";
 async function execGit(args, options) {
   try {
@@ -11437,7 +11417,7 @@ function isConfirmedPinnedPathAbsent(error, path) {
 }
 async function repositoryIsAvailable(root) {
   try {
-    await access3(`${root}/.git`);
+    await access4(`${root}/.git`);
     return { available: true };
   } catch (cause) {
     return { available: false, cause };
@@ -12023,7 +12003,7 @@ var init_reviewer_dispatch = __esm({
 
 // src/public-cli/reviewer-dispatch-rejection.ts
 import { writeFileSync as writeFileSync4 } from "node:fs";
-import { readFile as readFile13, unlink as unlink3 } from "node:fs/promises";
+import { readFile as readFile14, unlink as unlink3 } from "node:fs/promises";
 import { join as join23 } from "node:path";
 function isReviewerPreflightViolation(value) {
   return typeof value === "string" && REVIEWER_PREFLIGHT_VIOLATIONS.includes(value);
@@ -12042,7 +12022,7 @@ function recordReviewerDispatchRejectionSync(runDirectory, rejection) {
 async function readReviewerDispatchRejection(runDirectory) {
   let raw;
   try {
-    raw = await readFile13(reviewerDispatchRejectionPath(runDirectory), "utf8");
+    raw = await readFile14(reviewerDispatchRejectionPath(runDirectory), "utf8");
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return void 0;
@@ -12084,12 +12064,12 @@ function createSystemCollectorClock() {
   return {
     wallNow: () => /* @__PURE__ */ new Date(),
     monoNow: () => Number(process.hrtime.bigint() - start) / 1e6,
-    sleep: (ms, signal) => new Promise((resolve19, reject) => {
+    sleep: (ms, signal) => new Promise((resolve20, reject) => {
       if (signal?.aborted) {
         reject(signal.reason ?? new Error("aborted"));
         return;
       }
-      const timer = setTimeout(resolve19, ms);
+      const timer = setTimeout(resolve20, ms);
       const onAbort = () => {
         clearTimeout(timer);
         reject(signal?.reason ?? new Error("aborted"));
@@ -13433,7 +13413,7 @@ var init_collector_ledger = __esm({
 
 // src/package-resources/method-skill.ts
 import { createHash as createHash7 } from "node:crypto";
-import { readFile as readFile14, realpath as realpath7 } from "node:fs/promises";
+import { readFile as readFile15, realpath as realpath7 } from "node:fs/promises";
 import { join as join24 } from "node:path";
 function gitBlobOid(bytes) {
   const body = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : Buffer.from(bytes);
@@ -13552,7 +13532,7 @@ async function loadPackagedMethodSkillMaterial(packageRoot, name) {
   const provenancePath = join24(rootDirectory, "provenance.json");
   let provenanceRaw;
   try {
-    provenanceRaw = await readFile14(provenancePath, "utf8");
+    provenanceRaw = await readFile15(provenancePath, "utf8");
   } catch (error) {
     throw new PackagedMethodSkillUnavailableError(name, provenancePath, error);
   }
@@ -13569,7 +13549,7 @@ async function loadPackagedMethodSkillMaterial(packageRoot, name) {
     const absolute = join24(rootDirectory, rel);
     let bytes;
     try {
-      bytes = await readFile14(absolute);
+      bytes = await readFile15(absolute);
     } catch (error) {
       throw new PackagedMethodSkillUnavailableError(name, absolute, error);
     }
@@ -13585,7 +13565,7 @@ async function loadPackagedMethodSkillMaterial(packageRoot, name) {
   let raw;
   try {
     skillPath = await realpath7(skillPathConfigured);
-    raw = await readFile14(skillPath, "utf8");
+    raw = await readFile15(skillPath, "utf8");
   } catch (error) {
     throw new PackagedMethodSkillUnavailableError(name, skillPathConfigured, error);
   }
@@ -13641,7 +13621,7 @@ var init_method_skill = __esm({
 });
 
 // src/work-subject-identity.ts
-import { resolve as resolve10 } from "node:path";
+import { resolve as resolve11 } from "node:path";
 function issueRoot(value) {
   const normalized = value.replaceAll("\\", "/");
   const marker = ".ak/work/issues/";
@@ -13651,7 +13631,7 @@ function issueRoot(value) {
   return issue === void 0 || issue === "" ? void 0 : normalized.slice(0, index + marker.length) + issue;
 }
 function workIdentityFromCwd(cwd) {
-  const resolvedCwd = resolve10(cwd, ".");
+  const resolvedCwd = resolve11(cwd, ".");
   const cwdIssue = issueRoot(resolvedCwd);
   if (cwdIssue !== void 0) return cwdIssue;
   if (resolvedCwd.includes("/.ak/work/")) return resolvedCwd;
@@ -13662,11 +13642,11 @@ function isMachineLedgerSessionPath(sessionPath) {
 }
 function subjectPath(sessionDir, cwd = process.cwd()) {
   if (sessionDir === "") {
-    return workIdentityFromCwd(cwd) ?? resolve10(cwd, ".ak/work");
+    return workIdentityFromCwd(cwd) ?? resolve11(cwd, ".ak/work");
   }
-  const resolvedSession = resolve10(cwd, sessionDir || ".ak/work");
+  const resolvedSession = resolve11(cwd, sessionDir || ".ak/work");
   if (isMachineLedgerSessionPath(resolvedSession)) {
-    return workIdentityFromCwd(cwd) ?? resolve10(cwd, ".ak/work");
+    return workIdentityFromCwd(cwd) ?? resolve11(cwd, ".ak/work");
   }
   const issue = issueRoot(resolvedSession);
   if (issue !== void 0) return issue;
@@ -14081,7 +14061,7 @@ var init_terminal = __esm({
 
 // src/public-cli/settlement.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { appendFile as appendFile2, readFile as readFile15, readdir as readdir5, writeFile as writeFile6 } from "node:fs/promises";
+import { appendFile as appendFile2, readFile as readFile16, readdir as readdir5, writeFile as writeFile6 } from "node:fs/promises";
 import { dirname as dirname13, join as join25 } from "node:path";
 function sealedLedgerHome(admitted) {
   return homeFromRunDirectory(admitted.runDirectory);
@@ -14194,7 +14174,7 @@ function presentStructuralRejection(error, io) {
 }
 async function inspectJudgeSession(sessionFile) {
   try {
-    await readFile15(sessionFile, "utf8");
+    await readFile16(sessionFile, "utf8");
     return { state: "present" };
   } catch (error) {
     if (isMissingPathError2(error)) return { state: "missing" };
@@ -14410,7 +14390,7 @@ function sessionReadFailure(error, fallbackMessage) {
   return failed2;
 }
 async function readBoundSessionEntries(sessionFile) {
-  const text = await readFile15(sessionFile, "utf8");
+  const text = await readFile16(sessionFile, "utf8");
   const entries = [];
   for (const line2 of text.trim().split("\n").filter(Boolean)) {
     try {
@@ -15803,10 +15783,10 @@ function presentFailureTerminal(terminal, io) {
 }
 function defaultNavigatorGraceSleep() {
   let timer;
-  const sleep = ((ms) => new Promise((resolve19) => {
+  const sleep = ((ms) => new Promise((resolve20) => {
     timer = setTimeout(() => {
       timer = void 0;
-      resolve19();
+      resolve20();
     }, ms);
   }));
   sleep.cancel = () => {
@@ -15818,7 +15798,7 @@ function defaultNavigatorGraceSleep() {
   return sleep;
 }
 function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep = defaultNavigatorGraceSleep()) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve20, reject) => {
     let settled = false;
     const finish = (action) => {
       if (settled) return;
@@ -15827,11 +15807,11 @@ function raceNavigatorGrace(work, graceMs = NAVIGATOR_POST_ROLE_GRACE_MS, sleep
       action();
     };
     void work.then(
-      (value) => finish(() => resolve19({ status: "done", value })),
+      (value) => finish(() => resolve20({ status: "done", value })),
       (error) => finish(() => reject(error))
     );
     void sleep(graceMs).then(() => {
-      finish(() => resolve19({ status: "timeout" }));
+      finish(() => resolve20({ status: "timeout" }));
     });
   });
 }
@@ -15884,7 +15864,7 @@ var init_settlement = __esm({
 });
 
 // src/public-cli/auto-resume.ts
-import { constants as fsConstants } from "node:fs";
+import { constants as fsConstants2 } from "node:fs";
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { lstat as lstat5, mkdir as mkdir4, open as open2 } from "node:fs/promises";
 import { join as join26 } from "node:path";
@@ -16004,10 +15984,10 @@ async function retainDispatchError(admitted, principalAuthority, sessionAppender
     2
   )}
 `;
-  const noFollowFlag = typeof fsConstants.O_NOFOLLOW === "number" ? fsConstants.O_NOFOLLOW : 0;
+  const noFollowFlag = typeof fsConstants2.O_NOFOLLOW === "number" ? fsConstants2.O_NOFOLLOW : 0;
   const handle = await open2(
     filePath,
-    fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL | noFollowFlag,
+    fsConstants2.O_WRONLY | fsConstants2.O_CREAT | fsConstants2.O_EXCL | noFollowFlag,
     384
   );
   try {
@@ -16237,8 +16217,8 @@ var init_auto_resume = __esm({
 
 // src/public-cli/post-admission.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
-import { readFile as readFile16, writeFile as writeFile7 } from "node:fs/promises";
-import { isAbsolute as isAbsolute7, join as join27, resolve as resolve11 } from "node:path";
+import { readFile as readFile17, writeFile as writeFile7 } from "node:fs/promises";
+import { isAbsolute as isAbsolute8, join as join27, resolve as resolve12 } from "node:path";
 function appendContinuationSection(continuation, section) {
   const prompt = `${continuation.prompt}
 
@@ -16247,7 +16227,7 @@ ${section}`;
 }
 async function readInvocationHost(runDirectory) {
   try {
-    const raw = JSON.parse(await readFile16(join27(runDirectory, "invocation.json"), "utf8"));
+    const raw = JSON.parse(await readFile17(join27(runDirectory, "invocation.json"), "utf8"));
     return typeof raw.host === "string" && raw.host.trim() !== "" ? raw.host : void 0;
   } catch (error) {
     if (error.code === "ENOENT") return void 0;
@@ -16509,7 +16489,7 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
   };
 }
 function isAlreadyFrozenSummonsAttachment(runDirectory, attachmentPath) {
-  const absolute = isAbsolute7(attachmentPath) ? attachmentPath : resolve11(attachmentPath);
+  const absolute = isAbsolute8(attachmentPath) ? attachmentPath : resolve12(attachmentPath);
   return pathContainedIn(join27(runDirectory, "attachments"), absolute);
 }
 async function prepareSummonsResumeMaterials(runDirectory, summons) {
@@ -18139,13 +18119,13 @@ var init_compliance_transport = __esm({
 
 // src/dossier-resolution.ts
 import { existsSync as existsSync9, statSync as statSync2 } from "node:fs";
-import { resolve as resolve12 } from "node:path";
+import { resolve as resolve13 } from "node:path";
 function resolveAuditDossier(env = process.env) {
   const raw = env[AUDIT_RUN_DIR_ENV];
   if (typeof raw !== "string" || raw.trim() === "") {
     return { status: "ok" };
   }
-  const runDirectory = resolve12(raw);
+  const runDirectory = resolve13(raw);
   try {
     if (!existsSync9(runDirectory) || !statSync2(runDirectory).isDirectory()) {
       return { status: "incomplete", observation: { kind: "missing-dossier" } };
@@ -18426,7 +18406,7 @@ __export(archivist_record_entry_exports, {
   subjectKeyedRecordDirectory: () => subjectKeyedRecordDirectory
 });
 import { existsSync as existsSync10, mkdirSync as mkdirSync4, readFileSync as readFileSync3, realpathSync as realpathSync2, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname14, resolve as resolve13, join as join30 } from "node:path";
+import { dirname as dirname14, resolve as resolve14, join as join30 } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 function readCurrentSession(sessionDir) {
   const ledger = join30(sessionDir, CURRENT_SESSION_LEDGER);
@@ -18456,8 +18436,8 @@ function writeCurrentSession(sessionDir, sessionFile) {
   }
 }
 function assertRecentFinalFileUnderSessionDir(sessionDir, recentFile) {
-  const absoluteSessionDir = resolve13(sessionDir);
-  const absoluteFile = resolve13(recentFile);
+  const absoluteSessionDir = resolve14(sessionDir);
+  const absoluteFile = resolve14(recentFile);
   if (absoluteFile !== absoluteSessionDir && !pathContainedIn(absoluteSessionDir, absoluteFile)) {
     throw new ActivationLedgerError(
       `archivist record session must be under the authorized nest (${sessionDir}): ${recentFile}`
@@ -18504,7 +18484,7 @@ function createRecordSessionOpen(options) {
   } else if (parentFile === void 0 || parentFile.length === 0) {
     return { session: SessionManager.inMemory(cwd), resumed: false };
   } else {
-    const parentResolved = resolve13(parentFile);
+    const parentResolved = resolve14(parentFile);
     sessionDir = physicallyContainedIn(ledgerHome, parentResolved) ? join30(dirname14(parentResolved), options.kind) : join30(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
     parentSession = parentFile;
   }
@@ -18739,7 +18719,7 @@ var init_navigator_public_session = __esm({
 
 // src/navigator-attendance.ts
 import { createHash as createHash9 } from "node:crypto";
-import { resolve as resolve14 } from "node:path";
+import { resolve as resolve15 } from "node:path";
 import "@earendil-works/pi-coding-agent";
 import { Type as Type15 } from "typebox";
 function resolveNavigatorAuthorityMaterial(roleInput, fileAuthority) {
@@ -18855,7 +18835,7 @@ function navigatorSubjectKey(subjectRoot, subject, provenance = "role_input") {
 }
 function navigatorSubjectKeyForInput(subjectRoot, reference, cwd = process.cwd()) {
   if (issueRoot(subjectRoot) !== void 0 || !subjectRoot.includes("/.ak/work/")) return subjectRoot;
-  const resolvedReference = resolve14(cwd, reference);
+  const resolvedReference = resolve15(cwd, reference);
   const marker = "/runs/";
   if (resolvedReference.includes(marker)) {
     return subjectRoot;
@@ -19868,7 +19848,7 @@ import {
   statSync as statSync3,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { isAbsolute as isAbsolute8, resolve as resolve16 } from "node:path";
+import { isAbsolute as isAbsolute9, resolve as resolve17 } from "node:path";
 function materializeDeferredSessionFile(sessionManager, resolvedFile) {
   const header = sessionManager.getHeader?.();
   if (header === null || header === void 0 || header.type !== "session") {
@@ -19896,12 +19876,12 @@ function durableSessionPointer(sessionManager) {
       "Workflow role activation requires a durable Pi session file principal (getSessionFile); directory-only or --no-session invocations are rejected"
     );
   }
-  if (!isAbsolute8(file)) {
+  if (!isAbsolute9(file)) {
     throw new Error(
       `Workflow role activation requires an absolute durable session file path; got relative path: ${file}`
     );
   }
-  const resolvedFile = resolve16(file);
+  const resolvedFile = resolve17(file);
   try {
     lstatSync2(resolvedFile);
   } catch (error) {
@@ -19975,7 +19955,7 @@ import {
   openSync,
   writeSync
 } from "node:fs";
-import { dirname as dirname17, isAbsolute as isAbsolute9, resolve as resolve17 } from "node:path";
+import { dirname as dirname17, isAbsolute as isAbsolute10, resolve as resolve18 } from "node:path";
 function correlationIdentityFromEnv(env = process.env) {
   const raw = env.AK_CORRELATION_ID;
   if (typeof raw === "string" && raw.trim().length > 0) {
@@ -20004,13 +19984,13 @@ function serializeAcceptedActivationFact(fact) {
 `;
 }
 function appendActivationLedgerLine(ledgerPath, line2, options) {
-  if (!isAbsolute9(options.ledgerHome)) {
+  if (!isAbsolute10(options.ledgerHome)) {
     throw new ActivationLedgerError(
       `activation ledger home must be absolute: ${options.ledgerHome}`
     );
   }
-  const resolvedLedger = resolve17(ledgerPath);
-  const resolvedHome = resolve17(options.ledgerHome);
+  const resolvedLedger = resolve18(ledgerPath);
+  const resolvedHome = resolve18(options.ledgerHome);
   const parent = dirname17(resolvedLedger);
   ensureRealDirectoryTree(resolvedHome, parent);
   assertLedgerFileInsideHome(resolvedLedger, resolvedHome);
@@ -20369,7 +20349,7 @@ var init_collector_tool_schemas = __esm({
 });
 
 // src/collector-handbook.ts
-import { readFile as readFile18 } from "node:fs/promises";
+import { readFile as readFile19 } from "node:fs/promises";
 import { join as join33, sep as sep4 } from "node:path";
 function resolveCollectorHandbookRoot(sessionPath) {
   if (typeof sessionPath !== "string" || sessionPath.trim().length === 0) {
@@ -20423,7 +20403,7 @@ function createCollectorHandbookStore(input) {
     ensureRealDirectoryTree(input.ledgerHome, parentDir2);
     assertLedgerFileInsideHome(path, input.ledgerHome);
     try {
-      const body = await readFile18(path, "utf8");
+      const body = await readFile19(path, "utf8");
       assertHandbookBudget(body, "\u6B63\u6587");
       return body;
     } catch (error) {
@@ -22103,7 +22083,7 @@ var init_reviewer_role = __esm({
 // src/worker-submission-gates.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { existsSync as existsSync11, lstatSync as lstatSync3, readdirSync as readdirSync2, readFileSync as readFileSync4, rmdirSync, rmSync } from "node:fs";
-import { resolve as resolve18 } from "node:path";
+import { resolve as resolve19 } from "node:path";
 function git2(cwd, args) {
   return execFileSync4("git", args, {
     cwd,
@@ -22142,7 +22122,7 @@ function escapeGitConfigValueRegex(value) {
 function unsetOwnedHooksPath(file) {
   const owned = [];
   for (const value of tryGetAll(file, "core.hooksPath")) {
-    if (!ownedHook(resolve18(value, HOOK_FILE))) continue;
+    if (!ownedHook(resolve19(value, HOOK_FILE))) continue;
     try {
       gitFile(file, [
         "--unset-all",
@@ -22157,15 +22137,15 @@ function unsetOwnedHooksPath(file) {
   return owned;
 }
 function rmOwnedDir(dir) {
-  const hookPath = resolve18(dir, HOOK_FILE);
+  const hookPath = resolve19(dir, HOOK_FILE);
   if (!ownedHook(hookPath)) return;
   rmSync(hookPath, { force: true });
   if (existsSync11(dir) && readdirSync2(dir).length === 0) rmdirSync(dir);
 }
 function linkedGitDirs(commonDir) {
-  const root = resolve18(commonDir, "worktrees");
+  const root = resolve19(commonDir, "worktrees");
   if (!existsSync11(root)) return [];
-  return readdirSync2(root).map((name) => resolve18(root, name)).filter((dir) => lstatSync3(dir).isDirectory());
+  return readdirSync2(root).map((name) => resolve19(root, name)).filter((dir) => lstatSync3(dir).isDirectory());
 }
 function uninstallPackageWorkerHooks(cwd) {
   let inside;
@@ -22179,14 +22159,14 @@ function uninstallPackageWorkerHooks(cwd) {
   const clear = (configFile) => {
     for (const hooks of unsetOwnedHooksPath(configFile)) rmOwnedDir(hooks);
   };
-  clear(resolve18(commonDir, "config"));
-  clear(resolve18(commonDir, "config.worktree"));
-  rmOwnedDir(resolve18(commonDir, HOOKS_DIR));
-  const legacy = resolve18(commonDir, "hooks", HOOK_FILE);
+  clear(resolve19(commonDir, "config"));
+  clear(resolve19(commonDir, "config.worktree"));
+  rmOwnedDir(resolve19(commonDir, HOOKS_DIR));
+  const legacy = resolve19(commonDir, "hooks", HOOK_FILE);
   if (ownedHook(legacy)) rmSync(legacy, { force: true });
   for (const gitDir of linkedGitDirs(commonDir)) {
-    clear(resolve18(gitDir, "config.worktree"));
-    rmOwnedDir(resolve18(gitDir, HOOKS_DIR));
+    clear(resolve19(gitDir, "config.worktree"));
+    rmOwnedDir(resolve19(gitDir, HOOKS_DIR));
   }
 }
 function isRecord19(value) {
@@ -22755,63 +22735,42 @@ var init_worker_role = __esm({
 });
 
 // src/merger-role.ts
-function same(a, b) {
-  return a.length === b.length && a.every((value, i) => value === b[i]);
-}
 function materialText(input, key) {
   return exactUtf8(Buffer.from(input.materials[key].bytesBase64, "base64"), `Merger ${key}`);
 }
-function createMergerRoleRuntime(pi, dependencies, host) {
+function createMergerRoleRuntime(pi, dependencies) {
   let activation;
   let registered = false;
   let accepted = false;
   pi.registerFlag(MERGER_INPUT_FLAG.name, MERGER_INPUT_FLAG.definition);
-  return { async activate() {
-    const path = pi.getFlag(MERGER_INPUT_FLAG.name);
-    if (typeof path !== "string" || path.trim().length === 0) throw new Error("Merger requires --ak-merger-input");
-    const soul = (await dependencies.loadSoul()).trim();
-    if (!soul) throw new Error("Merger soul is empty");
-    const input = validateMergerInput(await dependencies.loadInput(path));
-    const state = await dependencies.gitState.activeMerge();
-    if (state.targetObjectId !== input.targetObjectId || state.sourceObjectId !== input.sourceObjectId || !same(state.unmergedPaths, input.expectedConflictPaths) || state.unmergedPaths.length === 0 || !isFullGitObjectId(state.automaticMergeTreeId) || state.automaticMergeTreeId.length !== input.targetObjectId.length) throw new Error("Merger activation rejected repository parent, merge, automatic-result, or complete conflict-set drift");
-    activation = { soul, input, automaticMergeTreeId: state.automaticMergeTreeId };
-    accepted = false;
-    if (!registered) {
-      registered = true;
-      pi.registerTool({
-        name: MERGER_OUTPUT_TOOL_NAME,
-        label: "\u5408\u5E76\u8F93\u51FA",
-        description: "\u63D0\u4EA4\u5408\u5E76\u7ED3\u679C\uFF1B\u8F93\u51FA\u5206\u652F\u4E3A completed \u4E0E escalate\uFF1B\u57FA\u7840\u8BBE\u65BD\u53CA Git \u5931\u8D25\u7531 abort \u901A\u9053\u627F\u63A5\u3002",
-        promptSnippet: "\u63D0\u4EA4\u5408\u5E76\u7ED3\u679C",
-        parameters: mergerOutputSchema,
-        async execute(id, params, _signal, _update, ctx) {
-          if (!activation) throw new Error("\u6821\u4E66\u90CE\u672A\u6FC0\u6D3B");
-          if (accepted) throw new Error("\u5408\u5E76\u56DE\u6267\u5DF2\u53D7\u7406");
-          let output;
-          try {
-            output = validateMergerOutput(params, activation.input.attemptId);
-          } catch (error) {
-            host.failInfrastructure(error, ctx, id);
-          }
-          if (output.status === "completed") {
-            let state2;
-            try {
-              state2 = await dependencies.gitState.completedMerge(output.mergeCommitId, activation.automaticMergeTreeId);
-            } catch (error) {
-              host.failInfrastructure(error, ctx, id);
-            }
-            const scope = new Set(activation.input.resolutionScope);
-            if (state2.mergeCommitId !== output.mergeCommitId || !same(state2.parentObjectIds, [activation.input.targetObjectId, activation.input.sourceObjectId]) || state2.unmergedPaths.length !== 0 || !state2.worktreeClean || state2.resolutionChangedPaths.some((path2) => !scope.has(path2))) host.failInfrastructure(new Error("Merger completed-state verification failed"), ctx, id);
+  return {
+    async activate() {
+      const path = pi.getFlag(MERGER_INPUT_FLAG.name);
+      if (typeof path !== "string" || path.trim().length === 0) throw new Error("Merger requires --ak-merger-input");
+      const soul = (await dependencies.loadSoul()).trim();
+      if (!soul) throw new Error("Merger soul is empty");
+      const input = validateMergerInput(await dependencies.loadInput(path));
+      activation = { soul, input };
+      accepted = false;
+      if (!registered) {
+        registered = true;
+        pi.registerTool({
+          name: MERGER_OUTPUT_TOOL_NAME,
+          label: "\u5408\u5E76\u8F93\u51FA",
+          description: "\u63D0\u4EA4\u5408\u5E76\u7ED3\u679C\uFF1B\u8F93\u51FA\u5206\u652F\u4E3A completed \u4E0E escalate\u3002",
+          promptSnippet: "\u63D0\u4EA4\u5408\u5E76\u7ED3\u679C",
+          parameters: mergerOutputSchema,
+          async execute(_id, params, _signal, _update, _ctx) {
+            if (!activation) throw new Error("\u6821\u4E66\u90CE\u672A\u6FC0\u6D3B");
+            if (accepted) throw new Error("\u5408\u5E76\u56DE\u6267\u5DF2\u53D7\u7406");
+            accepted = true;
+            return { content: [{ type: "text", text: MERGER_ACCEPTED_TEXT }], details: params, terminate: true };
           }
-          accepted = true;
-          const acceptedDetails = output;
-          return { content: [{ type: "text", text: MERGER_ACCEPTED_TEXT }], details: acceptedDetails, terminate: true };
-        }
-      });
-      pi.on("before_agent_start", (event) => {
-        if (!activation) throw new Error("\u6821\u4E66\u90CE\u672A\u6FC0\u6D3B");
-        const admitted = { attemptId: activation.input.attemptId, targetObjectId: activation.input.targetObjectId, sourceObjectId: activation.input.sourceObjectId, task: materialText(activation.input, "task"), authority: materialText(activation.input, "authority"), targetIntent: materialText(activation.input, "targetIntent"), sourceIntent: materialText(activation.input, "sourceIntent"), expectedConflictPaths: activation.input.expectedConflictPaths, resolutionScope: activation.input.resolutionScope, authorizedChecks: activation.input.authorizedChecks };
-        return { systemPrompt: `${event.systemPrompt}
+        });
+        pi.on("before_agent_start", (event) => {
+          if (!activation) throw new Error("\u6821\u4E66\u90CE\u672A\u6FC0\u6D3B");
+          const admitted = { attemptId: activation.input.attemptId, targetObjectId: activation.input.targetObjectId, sourceObjectId: activation.input.sourceObjectId, task: materialText(activation.input, "task"), authority: materialText(activation.input, "authority"), targetIntent: materialText(activation.input, "targetIntent"), sourceIntent: materialText(activation.input, "sourceIntent"), expectedConflictPaths: activation.input.expectedConflictPaths, resolutionScope: activation.input.resolutionScope, authorizedChecks: activation.input.authorizedChecks };
+          return { systemPrompt: `${event.systemPrompt}
 
 <merger_soul>
 ${activation.soul}
@@ -22820,13 +22779,14 @@ ${activation.soul}
 <merger_assignment>
 ${JSON.stringify(admitted)}
 </merger_assignment>` };
-      });
-    }
-    const all = pi.getAllTools().map((tool) => tool.name);
-    if (all.filter((item) => item === MERGER_OUTPUT_TOOL_NAME).length !== 1) {
-      throw new Error(`Merger required tool collision or missing: ${MERGER_OUTPUT_TOOL_NAME}`);
+        });
+      }
+      const all = pi.getAllTools().map((tool) => tool.name);
+      if (all.filter((item) => item === MERGER_OUTPUT_TOOL_NAME).length !== 1) {
+        throw new Error(`Merger required tool collision or missing: ${MERGER_OUTPUT_TOOL_NAME}`);
+      }
     }
-  } };
+  };
 }
 var MERGER_INPUT_FLAG;
 var init_merger_role = __esm({
@@ -22834,8 +22794,7 @@ var init_merger_role = __esm({
     "use strict";
     init_merger_contracts();
     init_exact_utf8();
-    init_git_object_id();
-    MERGER_INPUT_FLAG = { name: "ak-merger-input", definition: { description: "Path to an immutable digest-bound Merger v1 input JSON file", type: "string" } };
+    MERGER_INPUT_FLAG = { name: "ak-merger-input", definition: { description: "Path to Merger assignment materials JSON", type: "string" } };
   }
 });
 
@@ -23788,7 +23747,6 @@ function createRoleRuntimeExtension(dependencies) {
         }
       }
     );
-    let sessionMergerGitState = dependencies.mergerGitState;
     const merger = createMergerRoleRuntime(roleHost, {
       async loadSoul() {
         if (!dependencies.loadMergerSoul) throw new Error("Merger runtime dependencies are not configured");
@@ -23797,18 +23755,8 @@ function createRoleRuntimeExtension(dependencies) {
       async loadInput(path) {
         if (!dependencies.loadMergerInput) throw new Error("Merger runtime dependencies are not configured");
         return dependencies.loadMergerInput(path);
-      },
-      gitState: {
-        activeMerge() {
-          if (!sessionMergerGitState) throw new Error("Merger runtime dependencies are not configured");
-          return sessionMergerGitState.activeMerge();
-        },
-        completedMerge(mergeCommitId, automaticMergeTreeId) {
-          if (!sessionMergerGitState) throw new Error("Merger runtime dependencies are not configured");
-          return sessionMergerGitState.completedMerge(mergeCommitId, automaticMergeTreeId);
-        }
       }
-    }, hostActions);
+    });
     let activeCollector;
     let collectorFirstDispatchDone = false;
     const collectorBusiness = createCollectorRoleRuntime(
@@ -24043,10 +23991,6 @@ function createRoleRuntimeExtension(dependencies) {
         auditor,
         diarist,
         merger: async () => {
-          if (dependencies.mergerGitState === void 0) {
-            sessionMergerGitState = dependencies.createMergerGitState?.(ctx.cwd);
-          }
-          if (sessionMergerGitState === void 0) throw new Error("Merger runtime dependencies are not configured");
           await merger.activate();
         }
       };
@@ -25416,7 +25360,7 @@ import { mkdtemp as mkdtemp3, rm as rm4 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join36 } from "node:path";
 async function runCommand(command, args, options = {}) {
-  return await new Promise((resolve19, reject) => {
+  return await new Promise((resolve20, reject) => {
     const child = spawn4(command, args, { ...options.cwd === void 0 ? {} : { cwd: options.cwd }, stdio: ["ignore", "pipe", "pipe"], signal: options.signal });
     let stdout = "", stderr = "";
     child.stdout.setEncoding("utf8").on("data", (chunk) => {
@@ -25436,7 +25380,7 @@ async function runCommand(command, args, options = {}) {
       const actual = code ?? 1;
       if ((options.allowedCodes ?? [0]).includes(actual)) {
         settled = true;
-        resolve19({ stdout, stderr, code: actual });
+        resolve20({ stdout, stderr, code: actual });
       } else fail5(void 0, code, signal);
     });
   });
@@ -25686,7 +25630,7 @@ var init_reviewer_agent = __esm({
 import { randomUUID as randomUUID9 } from "node:crypto";
 
 // src/role-runtime-dependencies.ts
-import { readFile as readFile19 } from "node:fs/promises";
+import { readFile as readFile20 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/canonical-skill-binding.ts
@@ -25757,7 +25701,6 @@ async function loadCanonicalSkillBinding(name) {
 init_collector_github();
 init_doctor_auditor();
 init_doctor_evidence();
-init_merger_git_state();
 init_navigator_attendance();
 
 // src/navigator-work-context.ts
@@ -25766,17 +25709,17 @@ init_navigator_attendance();
 init_notary_source_run();
 init_packaged_role_registry();
 init_invocation();
-import { readFile as readFile17 } from "node:fs/promises";
-import { resolve as resolve15 } from "node:path";
+import { readFile as readFile18 } from "node:fs/promises";
+import { resolve as resolve16 } from "node:path";
 function navigatorInputReference(getFlag, role) {
   if (getFlag === void 0) return void 0;
   const name = packagedRoleInputFlag(role);
   const value = name === void 0 ? void 0 : getFlag(name);
-  return typeof value === "string" && value !== "" ? resolve15(value) : void 0;
+  return typeof value === "string" && value !== "" ? resolve16(value) : void 0;
 }
 async function loadNavigatorWorkContext(options) {
   const reference = navigatorInputReference(options.getFlag, options.role);
-  const input = reference === void 0 || options.role === "doctor" || options.role === "notary" ? void 0 : await readFile17(reference, "utf8");
+  const input = reference === void 0 || options.role === "doctor" || options.role === "notary" ? void 0 : await readFile18(reference, "utf8");
   const subjectRoot = subjectPath(reference ?? options.context.sessionManager.getSessionDir(), options.context.cwd);
   let subjectKey = reference === void 0 ? subjectRoot : navigatorSubjectKeyForInput(subjectRoot, reference, options.context.cwd);
   let subject = input ?? `work subject: ${subjectKey}`;
@@ -25793,7 +25736,7 @@ async function loadNavigatorWorkContext(options) {
   }
   const publicRunDir = process.env.AK_ROLE_RUN_DIR;
   const currentSessionDir = options.context.sessionManager.getSessionDir();
-  const isBoundPublicRun = typeof publicRunDir === "string" && publicRunDir.trim() !== "" && resolve15(currentSessionDir) === resolve15(publicRunDir, "session");
+  const isBoundPublicRun = typeof publicRunDir === "string" && publicRunDir.trim() !== "" && resolve16(currentSessionDir) === resolve16(publicRunDir, "session");
   if (options.role === "judge" && isBoundPublicRun) {
     let admitted;
     try {
@@ -25826,14 +25769,14 @@ async function loadNavigatorWorkContext(options) {
   }
   const workRoot = subjectRoot.includes("/.ak/work/") ? subjectRoot : void 0;
   const authorityFiles = workRoot === void 0 ? [] : [
-    resolve15(workRoot, "authority.md"),
-    resolve15(workRoot, "authority.txt"),
-    resolve15(workRoot, "design-v2/owner-direction.md")
+    resolve16(workRoot, "authority.md"),
+    resolve16(workRoot, "authority.txt"),
+    resolve16(workRoot, "design-v2/owner-direction.md")
   ];
   let authorityMaterial;
   for (const path of authorityFiles) {
     try {
-      const content = await readFile17(path, "utf8");
+      const content = await readFile18(path, "utf8");
       if (content.trim() !== "") {
         authorityMaterial = content;
         break;
@@ -25905,14 +25848,14 @@ function createRoleRuntimeDependencies(packageRoot) {
   return {
     loadJudgeSoul: () => loadMainRoleSessionMaterials("judge"),
     loadFixerSoul: () => loadMainRoleSessionMaterials("fixer"),
-    loadFixPacket: (path) => readFile19(path, "utf8"),
+    loadFixPacket: (path) => readFile20(path, "utf8"),
     loadCoderSoul: () => loadMainRoleSessionMaterials("coder"),
-    loadCoderTask: (path) => readFile19(path, "utf8"),
+    loadCoderTask: (path) => readFile20(path, "utf8"),
     loadReviewerSoul: () => loadMainRoleSessionMaterials("reviewer"),
     createReviewerPinnedGitReader: () => createReviewerPinnedGitReader(),
     createReviewerIssueFetcher: () => createGhIssueSoftFetcher(),
     loadCollectorSoul: () => loadMainRoleSessionMaterials("collector"),
-    loadCollectorHandbookSeed: () => readFile19(collectorHandbookSeedPath, "utf8"),
+    loadCollectorHandbookSeed: () => readFile20(collectorHandbookSeedPath, "utf8"),
     createCollectorTransport: () => createGhCollectorGitHubTransport(),
     loadDoctorSoul: () => loadMainRoleSessionMaterials("doctor"),
     loadDoctorCase,
@@ -25926,8 +25869,7 @@ function createRoleRuntimeDependencies(packageRoot) {
     loadDiaristSoul: () => loadMainRoleSessionMaterials("diarist"),
     loadNotarySourceRun: loadNotarySourceRunLocator,
     loadMergerSoul: () => loadMainRoleSessionMaterials("merger"),
-    loadMergerInput: async (path) => JSON.parse(await readFile19(path, "utf8")),
-    createMergerGitState: (repositoryRoot) => createProductionMergerGitState(repositoryRoot),
+    loadMergerInput: async (path) => JSON.parse(await readFile20(path, "utf8")),
     async loadCanonicalSkillBinding(name) {
       if (name === "tdd") {
         return loadPackagedCanonicalSkillBinding(packageRoot, "tdd");
@@ -25955,7 +25897,7 @@ function createRoleRuntimeDependencies(packageRoot) {
       authority: options.authority,
       invocationId: options.invocationId,
       loadSoul: () => loadMainRoleSessionMaterials("navigator"),
-      loadRoutePlaybook: () => readFile19(navigatorRoutePlaybookPath, "utf8"),
+      loadRoutePlaybook: () => readFile20(navigatorRoutePlaybookPath, "utf8"),
       loadRoleHelp: async (role) => formatNavigatorRoleHelp(role),
       createSession: navigatorSessionFactory,
       ...options.contextError === void 0 ? {} : { contextError: options.contextError },
@@ -25974,7 +25916,7 @@ init_role_activation_flags();
 init_submission_correctable_error();
 init_navigator_invocation_identity();
 import { randomUUID as randomUUID7 } from "node:crypto";
-import { mkdir as mkdir5, readFile as readFile20, writeFile as writeFile9 } from "node:fs/promises";
+import { mkdir as mkdir5, readFile as readFile21, writeFile as writeFile9 } from "node:fs/promises";
 import { createServer } from "node:net";
 import { basename as basename8, dirname as dirname19, join as join37 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -25994,11 +25936,11 @@ ${method.body}`,
   });
 }
 async function listen(server, path) {
-  await new Promise((resolve19, reject) => {
+  await new Promise((resolve20, reject) => {
     server.once("error", reject);
     server.listen(path, () => {
       server.off("error", reject);
-      resolve19();
+      resolve20();
     });
   });
 }
@@ -26036,7 +25978,7 @@ async function prepareRoleEnvelope(options) {
   for (const method of request.methods) {
     if (method.kind !== "skill") continue;
     const name = basename8(dirname19(method.path));
-    const raw = await readFile20(method.path, "utf8");
+    const raw = await readFile21(method.path, "utf8");
     methodSkills.set(name, { path: method.path, body: stripSkillFrontmatter(raw).trim() });
   }
   let sessionFile = options.sessionFile ?? join37(request.runDirectory, "session", "session.jsonl");
@@ -26397,8 +26339,8 @@ async function prepareRoleEnvelope(options) {
     try {
       const closeAll = server.closeAllConnections;
       if (typeof closeAll === "function") closeAll.call(server);
-      await new Promise((resolve19, reject) => {
-        server.close((error) => error ? reject(error) : resolve19());
+      await new Promise((resolve20, reject) => {
+        server.close((error) => error ? reject(error) : resolve20());
       });
     } catch (error) {
       cleanupFailures.push(error);
@@ -26465,7 +26407,7 @@ async function prepareRoleEnvelope(options) {
         message: { role: "user", content: prompt }
       });
     }
-    const methodPrompt = (await Promise.all(request.methods.map(({ path }) => readFile20(path, "utf8")))).join("\n\n");
+    const methodPrompt = (await Promise.all(request.methods.map(({ path }) => readFile21(path, "utf8")))).join("\n\n");
     const promptResults = await emit("before_agent_start", {
       prompt,
       systemPrompt: methodPrompt,
@@ -26524,7 +26466,7 @@ async function prepareRoleEnvelope(options) {
 }
 
 // src/session-identity.ts
-import { mkdir as mkdir6, readFile as readFile21, rename as rename2, writeFile as writeFile10 } from "node:fs/promises";
+import { mkdir as mkdir6, readFile as readFile22, rename as rename2, writeFile as writeFile10 } from "node:fs/promises";
 import { dirname as dirname20, join as join38 } from "node:path";
 function createSessionIdentityAuthority(authority, sessionBindingFile) {
   const bindingPath = (principal) => join38(authority.decode(principal).sessionDirectory, sessionBindingFile);
@@ -26534,7 +26476,7 @@ function createSessionIdentityAuthority(authority, sessionBindingFile) {
     },
     async load(principal) {
       try {
-        const value = JSON.parse(await readFile21(bindingPath(principal), "utf8"));
+        const value = JSON.parse(await readFile22(bindingPath(principal), "utf8"));
         if (typeof value !== "object" || value === null || typeof value.sessionId !== "string") {
           throw new Error("durable session binding is invalid");
         }
@@ -26782,7 +26724,7 @@ function resultCandidateText(line2) {
   }
 }
 function spawnHeadlessTurn(options) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve20, reject) => {
     if (options.signal?.aborted) {
       reject(hostAbortedError("headless host aborted"));
       return;
@@ -26841,7 +26783,7 @@ function spawnHeadlessTurn(options) {
       settled = true;
       if (timer !== void 0) clearTimeout(timer);
       options.signal?.removeEventListener("abort", onAbort);
-      resolve19({ code, stdout: resultStdout, stderr, timedOut });
+      resolve20({ code, stdout: resultStdout, stderr, timedOut });
     };
     const onAbort = () => {
       child.kill("SIGTERM");