@akagilnc/pi-workflow-roles 0.1.3873 → 0.1.3884

package/dist/public-cli/main.js

@@ -14756,18 +14756,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;
@@ -14786,34 +14774,10 @@ var init_exact_utf8 = __esm({
   }
 });
 
-// src/sha256.ts
-import { createHash } from "node:crypto";
-function sha256Hex(bytes) {
-  return createHash("sha256").update(bytes).digest("hex");
-}
-var init_sha256 = __esm({
-  "src/sha256.ts"() {
-    "use strict";
-  }
-});
-
 // src/merger-contracts.ts
 function fail2(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)) fail2(`Merger ${label} must be a non-empty canonical path set`);
-  return value;
-}
-function validateMaterial(value, label) {
-  if (!record(value) || typeof value.bytesBase64 !== "string" || typeof value.sha256 !== "string") fail2(`Merger ${label} material is malformed`);
-  const bytes = Buffer.from(value.bytesBase64, "base64");
-  exactUtf8(bytes, `Merger ${label} material`);
-  if (sha256Hex(bytes) !== value.sha256) fail2(`Merger ${label} material digest mismatch`);
-}
 function deepFreeze(value) {
   if (value && typeof value === "object") {
     for (const child of Object.values(value)) deepFreeze(child);
@@ -14821,56 +14785,48 @@ function deepFreeze(value) {
   }
   return value;
 }
+function readMaterial(value, label) {
+  if (!record(value) || typeof value.bytesBase64 !== "string") fail2(`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 (!record(value) || blank(value.attemptId) || !isFullGitObjectId(value.targetObjectId) || !isFullGitObjectId(value.sourceObjectId) || value.targetObjectId.length !== value.sourceObjectId.length) fail2("Merger input has invalid identity or object ID");
-  if (!record(value.materials)) fail2();
-  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))) fail2("Merger resolution scope must contain the complete conflict set");
-  if (!Array.isArray(value.authorizedChecks)) fail2("Merger authorized checks are malformed");
-  for (const check of value.authorizedChecks) {
-    if (!record(check) || !Array.isArray(check.argv) || check.argv.length === 0 || check.argv.some(blank)) fail2("Merger authorized check is malformed");
-  }
-  return deepFreeze(structuredClone(value));
-}
-function validateMergerOutput(value, expectedAttemptId) {
-  if (!record(value) || expectedAttemptId !== void 0 && value.attemptId !== expectedAttemptId) throw new Error("\u5408\u5E76\u56DE\u6267 attempt \u4E0D\u5339\u914D");
+  if (!record(value) || blank(value.attemptId)) fail2("Merger input requires a non-empty attemptId for accounting");
+  if (!record(value.materials)) fail2("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) => record(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 (!record(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, record, blank, MergerInputContractError;
+var materialSchema, checkSchema, mergerInputSchema, mergerOutputVariants, mergerOutputSchema, MERGER_OUTPUT_TOOL_NAME, record, blank, MergerInputContractError, asString, asStringArray2;
 var init_merger_contracts = __esm({
   "src/merger-contracts.ts"() {
     "use strict";
     init_build();
-    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 = typebox_exports.Object({ bytesBase64: typebox_exports.String(), sha256: typebox_exports.String() }, { additionalProperties: false });
     checkSchema = typebox_exports.Object({ name: typebox_exports.String({ minLength: 1 }), argv: typebox_exports.Array(typebox_exports.String({ minLength: 1 }), { minItems: 1 }) }, { additionalProperties: false });
     mergerInputSchema = typebox_exports.Object({
-      version: typebox_exports.Literal(1),
-      attemptId: typebox_exports.String({ minLength: 1 }),
-      targetObjectId: typebox_exports.String({ pattern: oidPattern }),
-      sourceObjectId: typebox_exports.String({ pattern: oidPattern }),
+      attemptId: typebox_exports.String({ minLength: 1, description: "\u5BF9\u8D26 attempt \u8EAB\u4EFD\uFF08transport\uFF09" }),
+      targetObjectId: typebox_exports.String({ description: "\u6750\u6599\uFF1Atarget parent OID\uFF1B\u53EF\u7A7A" }),
+      sourceObjectId: typebox_exports.String({ description: "\u6750\u6599\uFF1Asource parent OID\uFF1B\u53EF\u7A7A" }),
       materials: typebox_exports.Object({ task: materialSchema, authority: materialSchema, targetIntent: materialSchema, sourceIntent: materialSchema }, { additionalProperties: false }),
-      expectedConflictPaths: typebox_exports.Array(typebox_exports.String({ minLength: 1 }), { minItems: 1 }),
-      resolutionScope: typebox_exports.Array(typebox_exports.String({ minLength: 1 }), { minItems: 1 }),
+      expectedConflictPaths: typebox_exports.Array(typebox_exports.String(), { description: "\u6750\u6599\uFF1A\u5F53\u524D\u672A\u5408\u5E76\u8DEF\u5F84\uFF1B\u53EF\u7A7A" }),
+      resolutionScope: typebox_exports.Array(typebox_exports.String(), { description: "\u6750\u6599\uFF1A\u89E3\u6790\u8303\u56F4\u63D0\u793A\uFF1B\u53EF\u7A7A" }),
       authorizedChecks: typebox_exports.Array(checkSchema)
     }, { additionalProperties: false });
     mergerOutputVariants = typebox_exports.Union([
-      typebox_exports.Object({ status: typebox_exports.Literal("completed", { description: "completed \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: typebox_exports.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), report: typebox_exports.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }), mergeCommitId: typebox_exports.String({ pattern: oidPattern, description: "\u5DF2\u6838\u9A8C\u7684\u5B8C\u6210\u5408\u5E76 commit object ID" }) }, { additionalProperties: false }),
-      typebox_exports.Object({ status: typebox_exports.Literal("escalate", { description: "escalate \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: typebox_exports.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), diagnosis: typebox_exports.String({ minLength: 1, description: "\u5408\u5E76\u5B8C\u6210\u9700\u5347\u7EA7\u7684\u539F\u56E0" }), report: typebox_exports.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }) }, { additionalProperties: false })
+      typebox_exports.Object({ status: typebox_exports.Literal("completed", { description: "completed \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: typebox_exports.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), report: typebox_exports.String({ minLength: 1, description: "\u5982\u5B9E\u7ED3\u679C\u62A5\u544A" }), mergeCommitId: typebox_exports.String({ description: "\u5B8C\u6210\u5408\u5E76 commit object ID" }) }, { additionalProperties: false }),
+      typebox_exports.Object({ status: typebox_exports.Literal("escalate", { description: "escalate \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8" }), attemptId: typebox_exports.String({ minLength: 1, description: "\u5DF2\u53D7\u7406\u5408\u5E76 attempt \u8EAB\u4EFD" }), diagnosis: typebox_exports.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: typebox_exports.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";
     record = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
     blank = (v) => typeof v !== "string" || v.trim().length === 0;
@@ -14880,6 +14836,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") : [];
   }
 });
 
@@ -16366,7 +16324,7 @@ var init_sitian_contracts = __esm({
 });
 
 // src/sitian-appender.ts
-import { createHash as createHash2, randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import {
   appendFileSync,
   existsSync as existsSync5,
@@ -16382,7 +16340,7 @@ function errorCodeOf(error) {
   return error.code;
 }
 function identityClaimPath(recordFile, identity) {
-  const digest = createHash2("sha256").update(identity, "utf8").digest("hex");
+  const digest = createHash("sha256").update(identity, "utf8").digest("hex");
   return `${recordFile}.id-${digest}`;
 }
 function createExclusiveFile(path, contents) {
@@ -16526,7 +16484,7 @@ function resolveSitianRecordPathInLedger(input, ledgerHome) {
       } else {
         subjectStr = JSON.stringify(input.subject);
       }
-      const digest = createHash2("sha256").update(subjectStr).digest("hex").slice(0, 32);
+      const digest = createHash("sha256").update(subjectStr).digest("hex").slice(0, 32);
       sessionDir = join9(bookDir, category, digest);
     } else {
       sessionDir = join9(bookDir, category);
@@ -16981,6 +16939,17 @@ var init_run_ticket_number = __esm({
   }
 });
 
+// src/sha256.ts
+import { createHash as createHash2 } from "node:crypto";
+function sha256Hex(bytes) {
+  return createHash2("sha256").update(bytes).digest("hex");
+}
+var init_sha256 = __esm({
+  "src/sha256.ts"() {
+    "use strict";
+  }
+});
+
 // src/readable-gate-item.ts
 var init_readable_gate_item = __esm({
   "src/readable-gate-item.ts"() {
@@ -17756,8 +17725,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 resolve6 } 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 });
@@ -17768,10 +17752,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");
@@ -17784,40 +17789,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 : resolve6(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) };
     }
   };
 }
@@ -17857,7 +17861,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 join12 } from "node:path";
 function typedProviderHttpPath(runDirectory) {
   return join12(runDirectory, TYPED_HTTP_FILE);
@@ -17875,7 +17879,7 @@ async function clearTypedProviderHttpObservation(runDirectory) {
 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;
@@ -17904,8 +17908,8 @@ var init_typed_provider_http = __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 join13 } 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 join13 } from "node:path";
 function resumeRereadInstruction(materialPath, handbook) {
   return handbook ? `\u91CD\u65B0\u8BFB ${materialPath}\uFF0C\u518D\u7EC4\u88C5\u5916\u5305 argv` : `\u91CD\u65B0\u8BFB ${materialPath}`;
 }
@@ -17917,7 +17921,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");
 }
@@ -18003,7 +18007,7 @@ function parseCurrentCourtState(raw) {
 async function readRoleRunStateDisk(runDirectory) {
   let raw;
   try {
-    raw = JSON.parse(await readFile8(join13(runDirectory, RUN_STATE_FILE), "utf8"));
+    raw = JSON.parse(await readFile9(join13(runDirectory, RUN_STATE_FILE), "utf8"));
   } catch {
     return void 0;
   }
@@ -18235,7 +18239,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 };
@@ -18404,7 +18408,7 @@ async function readRunParentPath(runDirectory) {
   let raw;
   try {
     raw = JSON.parse(
-      await readFile8(join13(runDirectory, "admitted-request.json"), "utf8")
+      await readFile9(join13(runDirectory, "admitted-request.json"), "utf8")
     );
   } catch (error) {
     if (errorCodeOf2(error) === "ENOENT") return void 0;
@@ -18515,7 +18519,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;
@@ -18606,11 +18610,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
           };
@@ -18630,7 +18633,7 @@ async function loadResumableRunRecord(home, runId, authority) {
   let model;
   try {
     const invocationRaw = JSON.parse(
-      await readFile8(join13(run.runDirectory, "invocation.json"), "utf8")
+      await readFile9(join13(run.runDirectory, "invocation.json"), "utf8")
     );
     if (invocationRaw !== null && typeof invocationRaw === "object" && !Array.isArray(invocationRaw)) {
       const rec = invocationRaw;
@@ -19040,7 +19043,7 @@ __export(notary_source_run_exports, {
   loadNotarySourceRunLocator: () => loadNotarySourceRunLocator,
   resolveNotarySourceRunLocator: () => resolveNotarySourceRunLocator
 });
-import { dirname as dirname8, isAbsolute as isAbsolute5, join as join14, resolve as resolve6, basename as basename5 } from "node:path";
+import { dirname as dirname8, isAbsolute as isAbsolute6, join as join14, resolve as resolve7, basename as basename5 } from "node:path";
 import { lstat as lstat2, realpath as realpath3 } from "node:fs/promises";
 function parseRunDirectoryName(name) {
   const match = RUN_DIR_NAME.exec(name);
@@ -19092,7 +19095,7 @@ async function resolveNotarySourceRunLocator(options) {
   if (bare !== void 0 && !raw.includes("/") && !raw.includes("\\")) {
     candidate = join14(bookRunsRoot, `${bare.runId}@${bare.role}`);
   } else {
-    candidate = isAbsolute5(raw) ? raw : resolve6(options.projectRoot, raw);
+    candidate = isAbsolute6(raw) ? raw : resolve7(options.projectRoot, raw);
   }
   const real = await requireRunDirectory(candidate, raw);
   const identity = parseRunDirectoryName(basename5(real));
@@ -19832,7 +19835,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",
@@ -19843,8 +19846,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)
@@ -20086,10 +20089,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: {
@@ -20226,11 +20229,11 @@ import { execFileSync as execFileSync3 } from "node:child_process";
 import {
   lstat as lstat3,
   mkdir as mkdir2,
-  readFile as readFile9,
+  readFile as readFile10,
   realpath as realpath4,
   writeFile as writeFile4
 } from "node:fs/promises";
-import { basename as basename6, isAbsolute as isAbsolute6, join as join15, resolve as resolve7, sep as sep3 } from "node:path";
+import { basename as basename6, isAbsolute as isAbsolute7, join as join15, resolve as resolve8, sep as sep3 } from "node:path";
 function issueAdmissionPlacement(authority, request) {
   const principal = authority.issue(request);
   const { sessionDirectory, sessionFile } = authority.decode(principal);
@@ -20290,7 +20293,7 @@ async function writeRoleInvocationLedger(source, role, effectiveModel) {
 }
 async function recordEffectiveInvocationModel(runDirectory, model, engine, host) {
   const ledgerPath = join15(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;
@@ -20318,7 +20321,7 @@ async function recordEffectiveInvocationModel(runDirectory, model, engine, host)
 }
 async function mergeInvocationIdentityPage(runDirectory, fields) {
   const ledgerPath = join15(runDirectory, "invocation.json");
-  const current = JSON.parse(await readFile9(ledgerPath, "utf8"));
+  const current = JSON.parse(await readFile10(ledgerPath, "utf8"));
   await writeFile4(
     ledgerPath,
     `${JSON.stringify({
@@ -20334,7 +20337,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(
@@ -20361,7 +20364,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)}
@@ -20378,7 +20381,7 @@ async function recordLaunchedPiIdentity(runDirectory, identity) {
 async function observeLaunchedRolePackageIdentity(packageRoot2, selectedRoleEntry) {
   const rolePackageRoot = packageRoot2;
   const raw = JSON.parse(
-    await readFile9(join15(rolePackageRoot, "package.json"), "utf8")
+    await readFile10(join15(rolePackageRoot, "package.json"), "utf8")
   );
   if (typeof raw.version !== "string" || raw.version.trim() === "") {
     throw new Error(
@@ -20608,7 +20611,7 @@ function parseFixerArgv(args) {
   };
 }
 async function freezeRegularFileAttachment(sourcePath, destinationDir, index) {
-  const absolute = isAbsolute6(sourcePath) ? sourcePath : resolve7(sourcePath);
+  const absolute = isAbsolute7(sourcePath) ? sourcePath : resolve8(sourcePath);
   let st;
   try {
     st = await lstat3(absolute);
@@ -20623,7 +20626,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 = join15(destinationDir, name);
   await writeFile4(frozenPath, bytes);
@@ -20664,7 +20667,7 @@ async function admitStandardMaterialInvocation(role, options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -20767,7 +20770,7 @@ async function admitCountersignInvocation(options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -20847,7 +20850,7 @@ async function admitCoderInvocation(options) {
   if (options.phase !== "plan" && options.phase !== "apply") {
     throw new CliUsageError("coder phase must be plan or apply");
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -20935,9 +20938,9 @@ async function admitFixerInvocation(options) {
   let prerequisites = Object.freeze([]);
   let prerequisitesSource;
   if (options.prerequisitesPath !== void 0) {
-    const absolutePrereq = isAbsolute6(options.prerequisitesPath) ? options.prerequisitesPath : resolve7(options.prerequisitesPath);
+    const absolutePrereq = isAbsolute7(options.prerequisitesPath) ? options.prerequisitesPath : resolve8(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}`,
@@ -20953,7 +20956,7 @@ async function admitFixerInvocation(options) {
       throw error;
     }
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -21178,7 +21181,7 @@ async function admitCollectorInvocation(options) {
       throw new CliUsageError(detail, { cause: error });
     }
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   let repository;
   if (options.repo !== void 0) {
     try {
@@ -21366,12 +21369,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 = resolve7(options.projectRoot, raw);
+  const resolved = resolve8(options.projectRoot, raw);
   if (resolved !== options.projectRoot && !pathContainedIn(options.projectRoot, resolved)) {
     throw new CliUsageError(
       "doctor --runs escapes the project root"
@@ -21410,7 +21413,7 @@ async function admitDoctorInvocation(options) {
       `doctor --issue must be a positive integer, got ${options.issueNumber}`
     );
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -21571,7 +21574,7 @@ async function admitNotaryInvocation(options) {
   if (options.project !== void 0) {
     requireOptionPath("--project", options.project);
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   let sourceRun;
   try {
     sourceRun = await resolveNotarySourceRunLocator({
@@ -21689,7 +21692,7 @@ async function admitGleanerLeftInvocation(options) {
   if (options.baseRevision.trim() === "") {
     throw new CliUsageError("--base requires a nonempty revision");
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -21810,7 +21813,7 @@ async function admitReviewerInvocation(options) {
   const authorityRefs = Object.freeze(
     (options.authorityRefs ?? []).map((ref) => requireAuthorityRef(ref))
   );
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const runId = (options.createRunId ?? uuidv7)();
   const {
     principal,
@@ -21905,7 +21908,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 !== "-") {
@@ -21928,24 +21931,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
   });
@@ -21958,7 +21949,7 @@ async function admitMergerInvocation(options) {
   if (instruction.trim() === "") {
     throw new CliUsageError("merger requires a nonblank task instruction");
   }
-  const projectRoot = resolve7(options.project ?? options.cwd);
+  const projectRoot = resolve8(options.project ?? options.cwd);
   const derived = await deriveMergerEnvelopeFromActiveMerge(
     projectRoot,
     options.gitState ?? createProductionMergerGitState(projectRoot)
@@ -21981,16 +21972,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,
@@ -22002,7 +21994,6 @@ async function admitMergerInvocation(options) {
     },
     expectedConflictPaths: [...derived.expectedConflictPaths],
     resolutionScope: [...derived.resolutionScope],
-    // Authorized checks remain available on the assignment; default none.
     authorizedChecks: []
   });
   const mergerInputPath = join15(runDirectory, "merger-input.json");
@@ -22025,7 +22016,6 @@ async function admitMergerInvocation(options) {
     derived: {
       targetObjectId: derived.targetObjectId,
       sourceObjectId: derived.sourceObjectId,
-      automaticMergeTreeId: derived.automaticMergeTreeId,
       expectedConflictPaths: [...derived.expectedConflictPaths],
       resolutionScope: [...derived.resolutionScope]
     },
@@ -22289,7 +22279,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";
@@ -22310,15 +22300,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*$/;
@@ -22327,7 +22308,7 @@ var init_invocation = __esm({
 
 // src/package-resources/method-skill.ts
 import { createHash as createHash4 } from "node:crypto";
-import { readFile as readFile10, realpath as realpath5 } from "node:fs/promises";
+import { readFile as readFile11, realpath as realpath5 } from "node:fs/promises";
 import { join as join16 } from "node:path";
 function gitBlobOid(bytes) {
   const body = typeof bytes === "string" ? Buffer.from(bytes, "utf8") : Buffer.from(bytes);
@@ -22446,7 +22427,7 @@ async function loadPackagedMethodSkillMaterial(packageRoot2, name) {
   const provenancePath = join16(rootDirectory, "provenance.json");
   let provenanceRaw;
   try {
-    provenanceRaw = await readFile10(provenancePath, "utf8");
+    provenanceRaw = await readFile11(provenancePath, "utf8");
   } catch (error) {
     throw new PackagedMethodSkillUnavailableError(name, provenancePath, error);
   }
@@ -22463,7 +22444,7 @@ async function loadPackagedMethodSkillMaterial(packageRoot2, name) {
     const absolute = join16(rootDirectory, rel);
     let bytes;
     try {
-      bytes = await readFile10(absolute);
+      bytes = await readFile11(absolute);
     } catch (error) {
       throw new PackagedMethodSkillUnavailableError(name, absolute, error);
     }
@@ -22479,7 +22460,7 @@ async function loadPackagedMethodSkillMaterial(packageRoot2, name) {
   let raw;
   try {
     skillPath = await realpath5(skillPathConfigured);
-    raw = await readFile10(skillPath, "utf8");
+    raw = await readFile11(skillPath, "utf8");
   } catch (error) {
     throw new PackagedMethodSkillUnavailableError(name, skillPathConfigured, error);
   }
@@ -22582,12 +22563,12 @@ var init_compliance_transport = __esm({
 });
 
 // src/ledger-session-read.ts
-import { readFile as readFile11 } from "node:fs/promises";
+import { readFile as readFile12 } from "node:fs/promises";
 function isRecord11(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) {
@@ -22989,10 +22970,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: readFile21 } = await import("node:fs/promises");
+  const { readFile: readFile22 } = await import("node:fs/promises");
   let raw;
   try {
-    raw = JSON.parse(await readFile21(pointerPath, "utf8"));
+    raw = JSON.parse(await readFile22(pointerPath, "utf8"));
   } catch (error) {
     throw new Error(
       `direct officer run pointer unreadable in ${pointerPath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -23066,7 +23047,7 @@ var init_analyst_gate_cycles_read = __esm({
 });
 
 // src/run-terminal-artifacts.ts
-import { readdir as readdir4, readFile as readFile12 } from "node:fs/promises";
+import { readdir as readdir4, readFile as readFile13 } from "node:fs/promises";
 import { basename as basename7, dirname as dirname9, join as join18 } from "node:path";
 function isMissingPathError2(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
@@ -23098,7 +23079,7 @@ function readUsableTerminalArtifactBody(body) {
 async function readTerminalArtifactAtPath(path, file) {
   let raw;
   try {
-    raw = await readFile12(path, "utf8");
+    raw = await readFile13(path, "utf8");
   } catch (error) {
     if (isMissingPathError2(error)) return void 0;
     return {
@@ -23304,7 +23285,7 @@ var init_submission_ledger = __esm({
 
 // src/session-opening-materials.ts
 import { existsSync as existsSync7 } from "node:fs";
-import { readFile as readFile13 } from "node:fs/promises";
+import { readFile as readFile14 } from "node:fs/promises";
 import { dirname as dirname10, join as join19 } from "node:path";
 import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "node:url";
 function resolvePackageRootDir(moduleUrl = import.meta.url) {
@@ -23320,7 +23301,7 @@ function resolvePackageRootDir(moduleUrl = import.meta.url) {
   return fileURLToPath(new URL("..", moduleUrl));
 }
 async function readPackageMaterial(relativePath) {
-  return readFile13(fileURLToPath(new URL(relativePath, packageRootUrl)), "utf8");
+  return readFile14(fileURLToPath(new URL(relativePath, packageRootUrl)), "utf8");
 }
 async function joinPackageMaterials(relativePaths) {
   const chunks = [];
@@ -23589,7 +23570,7 @@ var init_reviewer_dispatch = __esm({
 });
 
 // src/public-cli/reviewer-dispatch-rejection.ts
-import { readFile as readFile14, unlink as unlink3 } from "node:fs/promises";
+import { readFile as readFile15, unlink as unlink3 } from "node:fs/promises";
 import { join as join20 } from "node:path";
 function isReviewerPreflightViolation(value) {
   return typeof value === "string" && REVIEWER_PREFLIGHT_VIOLATIONS.includes(value);
@@ -23610,7 +23591,7 @@ async function clearReviewerDispatchRejection(runDirectory) {
 async function readReviewerDispatchRejection(runDirectory) {
   let raw;
   try {
-    raw = await readFile14(reviewerDispatchRejectionPath(runDirectory), "utf8");
+    raw = await readFile15(reviewerDispatchRejectionPath(runDirectory), "utf8");
   } catch (error) {
     if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return void 0;
@@ -23976,7 +23957,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 writeFile5 } from "node:fs/promises";
+import { appendFile as appendFile2, readFile as readFile16, readdir as readdir5, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname11, join as join21 } from "node:path";
 function sealedLedgerHome(admitted) {
   return homeFromRunDirectory(admitted.runDirectory);
@@ -24094,7 +24075,7 @@ function presentControlledFailure(failure, io) {
 }
 async function inspectJudgeSession(sessionFile) {
   try {
-    await readFile15(sessionFile, "utf8");
+    await readFile16(sessionFile, "utf8");
     return { state: "present" };
   } catch (error) {
     if (isMissingPathError3(error)) return { state: "missing" };
@@ -24310,7 +24291,7 @@ function sessionReadFailure(error, fallbackMessage) {
   return failed;
 }
 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 {
@@ -26491,14 +26472,14 @@ var init_case_dossier_delivery = __esm({
 });
 
 // src/host-transition-prior-native.ts
-import { access as access2, readdir as readdir6 } from "node:fs/promises";
+import { access as access3, readdir as readdir6 } from "node:fs/promises";
 import { dirname as dirname12, join as join23 } 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 [];
@@ -26519,7 +26500,7 @@ async function listSitianRecordPaths(sessionParent) {
     if (!entry.isDirectory()) continue;
     const recordFile = join23(sessionRoot, entry.name, "records.jsonl");
     try {
-      await access2(recordFile);
+      await access3(recordFile);
       recordPaths.push(recordFile);
     } catch (error) {
       if (!isEnoent2(error)) throw error;
@@ -26584,7 +26565,7 @@ var init_public_run_credentials = __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 join24 } from "node:path";
@@ -26704,10 +26685,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 {
@@ -26937,8 +26918,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 writeFile6 } from "node:fs/promises";
-import { isAbsolute as isAbsolute7, join as join25, resolve as resolve8 } from "node:path";
+import { readFile as readFile17, writeFile as writeFile6 } from "node:fs/promises";
+import { isAbsolute as isAbsolute8, join as join25, resolve as resolve9 } from "node:path";
 function appendContinuationSection(continuation, section) {
   const prompt = `${continuation.prompt}
 
@@ -26947,7 +26928,7 @@ ${section}`;
 }
 async function readInvocationHost(runDirectory) {
   try {
-    const raw = JSON.parse(await readFile16(join25(runDirectory, "invocation.json"), "utf8"));
+    const raw = JSON.parse(await readFile17(join25(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;
@@ -27209,7 +27190,7 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
   };
 }
 function isAlreadyFrozenSummonsAttachment(runDirectory, attachmentPath) {
-  const absolute = isAbsolute7(attachmentPath) ? attachmentPath : resolve8(attachmentPath);
+  const absolute = isAbsolute8(attachmentPath) ? attachmentPath : resolve9(attachmentPath);
   return pathContainedIn(join25(runDirectory, "attachments"), absolute);
 }
 async function prepareSummonsResumeMaterials(runDirectory, summons) {
@@ -29380,8 +29361,6 @@ var init_judge_run = __esm({
 });
 
 // src/public-cli/merger-run.ts
-import { mkdir as mkdir5, writeFile as writeFile7 } from "node:fs/promises";
-import { join as join26, resolve as resolve9 } from "node:path";
 function mergerMethods(packageRoot2) {
   return [
     {
@@ -29422,70 +29401,6 @@ async function loadMergerMethodMaterial(packageRoot2) {
     "resolving-merge-conflicts"
   );
 }
-async function admitMergerShellForActivationFailure(options) {
-  const projectRoot = resolve9(options.project ?? options.cwd);
-  const runId = (options.createRunId ?? uuidv7)();
-  const {
-    principal,
-    sessionDirectory,
-    sessionFile,
-    runDirectory,
-    ledgerHome,
-    bookKey
-  } = issueAdmissionPlacement(options.principalAuthority, {
-    cwd: projectRoot,
-    runId,
-    role: "merger",
-    home: options.home
-  });
-  ensureRealDirectoryTree(ledgerHome, sessionDirectory);
-  await mkdir5(runDirectory, { recursive: true });
-  const emptyDerived = {
-    targetObjectId: "",
-    sourceObjectId: "",
-    automaticMergeTreeId: "",
-    expectedConflictPaths: [],
-    resolutionScope: []
-  };
-  const admittedRequestPath = join26(runDirectory, "admitted-request.json");
-  const mergerInputPath = join26(runDirectory, "merger-input.json");
-  await writeFile7(
-    admittedRequestPath,
-    `${JSON.stringify(
-      {
-        role: "merger",
-        runId,
-        bookKey,
-        projectRoot,
-        instruction: options.instruction,
-        instructionEmpty: false,
-        mergerInputPath,
-        derived: emptyDerived,
-        attachments: [],
-        sessionDirectory,
-        sessionFile
-      },
-      null,
-      2
-    )}
-`,
-    "utf8"
-  );
-  return {
-    role: "merger",
-    runId,
-    bookKey,
-    projectRoot,
-    instruction: options.instruction,
-    instructionEmpty: false,
-    attachments: [],
-    runDirectory,
-    principal,
-    admittedRequestPath,
-    mergerInputPath,
-    derived: emptyDerived
-  };
-}
 function mergerTurnOptions(admitted, env) {
   return {
     packageRoot: env.packageRoot,
@@ -29525,31 +29440,6 @@ async function runPublicMerger(argv, env, io, parseMergerArgv2) {
       presentStructuralRejection(error, io);
       return { exitCode: 2 };
     }
-    if (error instanceof MergerEnvelopeDerivationError) {
-      const shell = await admitMergerShellForActivationFailure({
-        home: env.home,
-        principalAuthority: env.principalAuthority,
-        cwd: env.cwd,
-        instruction: parsed.instruction,
-        ...parsed.project === void 0 ? {} : { project: parsed.project },
-        ...env.createRunId === void 0 ? {} : { createRunId: env.createRunId }
-      });
-      await markRunAdmitted(shell, env.principalAuthority);
-      return await presentControlledFailure2(
-        shell,
-        {
-          timedOut: false,
-          code: null,
-          stderr: "",
-          thrown: error,
-          knownCause: "activation",
-          knownDiagnostic: error.message
-        },
-        mergerAdapters(env.packageRoot),
-        env.principalAuthority,
-        io
-      );
-    }
     throw error;
   }
   await markRunAdmitted(admitted, env.principalAuthority);
@@ -29654,10 +29544,8 @@ async function runPublicMergerResume(request, env, io) {
 var init_merger_run = __esm({
   "src/public-cli/merger-run.ts"() {
     "use strict";
-    init_activation_ledger_topology();
     init_engine_material();
     init_method_skill();
-    init_uuidv7();
     init_cli_errors();
     init_invocation();
     init_run_lifecycle();
@@ -29853,7 +29741,7 @@ var init_reviewer_run = __esm({
 
 // src/analyst-book-key.ts
 import { statSync as statSync2 } from "node:fs";
-import { isAbsolute as isAbsolute8 } from "node:path";
+import { isAbsolute as isAbsolute9 } from "node:path";
 function resolveAnalystBookKey(projectRoot) {
   const identity = physicalPathIdentity(projectRoot);
   let stats;
@@ -29875,7 +29763,7 @@ function resolveAnalystBookKey(projectRoot) {
   }
 }
 function isSyntheticAnalystBookKey(bookKey) {
-  return bookKey.startsWith("root:") && isAbsolute8(bookKey.slice("root:".length));
+  return bookKey.startsWith("root:") && isAbsolute9(bookKey.slice("root:".length));
 }
 var init_analyst_book_key = __esm({
   "src/analyst-book-key.ts"() {
@@ -29887,13 +29775,13 @@ var init_analyst_book_key = __esm({
 
 // src/atomic-write.ts
 import { randomUUID as randomUUID6 } from "node:crypto";
-import { rename, rm, writeFile as writeFile8 } from "node:fs/promises";
-import { dirname as dirname13, join as join27 } from "node:path";
+import { rename, rm, writeFile as writeFile7 } from "node:fs/promises";
+import { dirname as dirname13, join as join26 } from "node:path";
 async function writeFileAtomically(destination, contents) {
   const parent = dirname13(destination);
-  const temporary = join27(parent, `.atomic-write-${randomUUID6()}.tmp`);
+  const temporary = join26(parent, `.atomic-write-${randomUUID6()}.tmp`);
   try {
-    await writeFile8(temporary, contents);
+    await writeFile7(temporary, contents);
     await rename(temporary, destination);
   } catch (error) {
     await rm(temporary, { force: true }).catch(() => void 0);
@@ -29907,8 +29795,8 @@ var init_atomic_write = __esm({
 });
 
 // src/analyst-index.ts
-import { open as open3, readFile as readFile17, unlink as unlink4 } from "node:fs/promises";
-import { dirname as dirname14, join as join28 } from "node:path";
+import { open as open3, readFile as readFile18, unlink as unlink4 } from "node:fs/promises";
+import { dirname as dirname14, join as join27 } from "node:path";
 function sleep(ms) {
   return new Promise((resolve11) => {
     setTimeout(resolve11, ms);
@@ -29917,7 +29805,7 @@ function sleep(ms) {
 async function withAnalystLibraryIndexLock(ledgerHome, fn) {
   const indexPath = analystLibraryIndexPath(ledgerHome);
   ensureRealDirectoryTree(ledgerHome, dirname14(indexPath));
-  const lockPath = join28(dirname14(indexPath), LIBRARY_INDEX_LOCK_NAME);
+  const lockPath = join27(dirname14(indexPath), LIBRARY_INDEX_LOCK_NAME);
   assertLedgerFileInsideHome(lockPath, ledgerHome);
   const startedAt = Date.now();
   while (true) {
@@ -29944,7 +29832,7 @@ async function withAnalystLibraryIndexLock(ledgerHome, fn) {
   }
 }
 function analystLibraryIndexPath(ledgerHome) {
-  return join28(ledgerHome, "analyst", "library-index.json");
+  return join27(ledgerHome, "analyst", "library-index.json");
 }
 function rowFromIssueMetricsPage(page) {
   return {
@@ -30035,7 +29923,7 @@ async function readAnalystLibraryIndexPage(ledgerHome) {
   const path = analystLibraryIndexPath(ledgerHome);
   let raw;
   try {
-    raw = await readFile17(path, "utf8");
+    raw = await readFile18(path, "utf8");
   } catch (error) {
     if (error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR")) {
       return void 0;
@@ -30239,8 +30127,8 @@ var init_analyst_cohort = __esm({
 });
 
 // src/analyst-ledger.ts
-import { readdir as readdir7, readFile as readFile18 } from "node:fs/promises";
-import { join as join29 } from "node:path";
+import { readdir as readdir7, readFile as readFile19 } from "node:fs/promises";
+import { join as join28 } from "node:path";
 function isMissingPathError5(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
@@ -30253,7 +30141,7 @@ function isRecord16(value) {
 async function readExistingRunLifecycleState(runDirectory) {
   try {
     const raw = JSON.parse(
-      await readFile18(join29(runDirectory, "run-state.json"), "utf8")
+      await readFile19(join28(runDirectory, "run-state.json"), "utf8")
     );
     if (!isRecord16(raw) || typeof raw.state !== "string") return void 0;
     return raw.state;
@@ -30285,7 +30173,7 @@ async function listLedgerBookNames(booksRoot) {
 async function readInvocationScopeFields(runDirectory) {
   let raw;
   try {
-    raw = await readFile18(join29(runDirectory, "invocation.json"), "utf8");
+    raw = await readFile19(join28(runDirectory, "invocation.json"), "utf8");
   } catch (error) {
     if (isMissingPathError5(error)) return void 0;
     throw error;
@@ -30317,7 +30205,7 @@ function decideIssueScope(input) {
 }
 async function resolveSessionFile(runDirectory) {
   try {
-    const raw = await readFile18(join29(runDirectory, "invocation.json"), "utf8");
+    const raw = await readFile19(join28(runDirectory, "invocation.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (isRecord16(parsed) && typeof parsed.sessionFile === "string" && parsed.sessionFile.trim() !== "") {
       return parsed.sessionFile;
@@ -30325,7 +30213,7 @@ async function resolveSessionFile(runDirectory) {
   } catch (error) {
     if (!isMissingPathError5(error)) throw error;
   }
-  return join29(runDirectory, "session", "session.jsonl");
+  return join28(runDirectory, "session", "session.jsonl");
 }
 function attributeSessionRowsForRun(input) {
   if (pathContainedIn(input.runDirectory, input.sessionFile)) {
@@ -30497,9 +30385,9 @@ async function classifyScopedRun(input) {
   }
   let gateCycles;
   try {
-    const parentSessionFile = join29(input.runDirectory, "session", "session.jsonl");
+    const parentSessionFile = join28(input.runDirectory, "session", "session.jsonl");
     gateCycles = await readAnalystGateCyclesFromAuditorRoles(
-      join29(input.runDirectory, "session", "auditor-roles"),
+      join28(input.runDirectory, "session", "auditor-roles"),
       { parentSessionFile }
     );
   } catch (error) {
@@ -30532,7 +30420,7 @@ async function classifyScopedRun(input) {
 async function scanAnalystIssueRuns(input) {
   const ledgerHome = resolveActivationLedgerHome(input.home);
   const scopeTicketNumber = input.ticketNumber;
-  const booksRoot = join29(ledgerHome, "books");
+  const booksRoot = join28(ledgerHome, "books");
   let wholeBook = false;
   let scopeRootIdentity;
   let bookNames;
@@ -30564,7 +30452,7 @@ async function scanAnalystIssueRuns(input) {
   const unreadable = [];
   const scopeConflicts = [];
   for (const book of bookNames) {
-    const runsDir = join29(booksRoot, book, "runs");
+    const runsDir = join28(booksRoot, book, "runs");
     let runNames;
     try {
       const entries = await readdir7(runsDir, { withFileTypes: true });
@@ -30576,7 +30464,7 @@ async function scanAnalystIssueRuns(input) {
     for (const runName of runNames) {
       const parsed = parseRunDirectoryName2(runName);
       if (parsed === void 0) continue;
-      const runDirectory = join29(runsDir, runName);
+      const runDirectory = join28(runsDir, runName);
       let scopeFields;
       try {
         scopeFields = await readInvocationScopeFields(runDirectory);
@@ -31430,7 +31318,7 @@ var init_analyst_metric_family = __esm({
 
 // src/analyst-page.ts
 import { createHash as createHash5 } from "node:crypto";
-import { dirname as dirname15, join as join30 } from "node:path";
+import { dirname as dirname15, join as join29 } from "node:path";
 function analystIssuePageKey(address) {
   const parts = ["book", address.bookKey];
   if (address.issueNumber !== void 0) {
@@ -31441,7 +31329,7 @@ function analystIssuePageKey(address) {
   return createHash5("sha256").update(parts.join("\0")).digest("hex").slice(0, 32);
 }
 function analystIssuePagePath(ledgerHome, address) {
-  return join30(ledgerHome, "analyst", "issues", `${analystIssuePageKey(address)}.json`);
+  return join29(ledgerHome, "analyst", "issues", `${analystIssuePageKey(address)}.json`);
 }
 function analystIssuePageAddressFromPage(page) {
   return {
@@ -31577,7 +31465,7 @@ var init_analyst_page = __esm({
 });
 
 // src/analyst-entry.ts
-import { readFile as readFile19 } from "node:fs/promises";
+import { readFile as readFile20 } from "node:fs/promises";
 function isMissingPathError6(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
@@ -31607,7 +31495,7 @@ async function readOrComputeAnalystIssuePage(input, options) {
     ...issueNumber === void 0 && input.bookKey === void 0 ? { scopeRootIdentity: projectRoot } : {}
   });
   try {
-    const raw = await readFile19(pagePath, "utf8");
+    const raw = await readFile20(pagePath, "utf8");
     const page = JSON.parse(raw);
     if (cachedPageMatchesRequestedScope(page, { bookKey, ...input })) {
       return { mode: "issue", page, pagePath };
@@ -31702,7 +31590,7 @@ async function runAnalystModelGroupsMode(input, home) {
       scopeRootIdentity: projectRoot
     });
     try {
-      const raw = await readFile19(pagePath, "utf8");
+      const raw = await readFile20(pagePath, "utf8");
       JSON.parse(raw);
     } catch (error) {
       if (!isMissingPathError6(error)) {
@@ -31801,8 +31689,8 @@ var init_analyst_entry = __esm({
 });
 
 // src/public-cli/analyst-run.ts
-import { readFile as readFile20 } from "node:fs/promises";
-import { isAbsolute as isAbsolute9, resolve as resolve10 } from "node:path";
+import { readFile as readFile21 } from "node:fs/promises";
+import { isAbsolute as isAbsolute10, resolve as resolve10 } from "node:path";
 function resolveAnalystIssueBookKeyFromCwd(cwd = process.cwd()) {
   try {
     return resolveBookKeyFromGit(cwd);
@@ -31851,10 +31739,10 @@ async function buildAnalystSweepModeInputFromAttachmentPaths(attachmentPaths) {
     );
   }
   const sourcePath = attachmentPaths[0];
-  const absolute = isAbsolute9(sourcePath) ? sourcePath : resolve10(sourcePath);
+  const absolute = isAbsolute10(sourcePath) ? sourcePath : resolve10(sourcePath);
   let bytes;
   try {
-    bytes = await readFile20(absolute);
+    bytes = await readFile21(absolute);
   } catch (error) {
     throw new CliUsageError(
       `analyst sweep attachment is not a readable regular file: ${sourcePath}`,
@@ -31974,7 +31862,7 @@ __export(cli_exports, {
   runAkRole: () => runAkRole
 });
 import { realpath as realpath6 } from "node:fs/promises";
-import { join as join31 } from "node:path";
+import { join as join30 } from "node:path";
 function takePublicGlobalFlag(argv, index, options) {
   const tokens = argv.slice(index);
   const taken = options.takeDashed(tokens);
@@ -32105,7 +31993,7 @@ function resolveHome(env) {
   return env.home ?? packageMachineHome();
 }
 function resolveAgentDir(env, home) {
-  return env.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join31(home, ".pi", "agent");
+  return env.agentDir ?? process.env.PI_CODING_AGENT_DIR ?? join30(home, ".pi", "agent");
 }
 function parseThinking(value) {
   return value;
@@ -33070,7 +32958,7 @@ var init_cli = __esm({
 
 // src/public-cli/main.ts
 import { existsSync as existsSync8 } from "node:fs";
-import { dirname as dirname16, join as join32 } from "node:path";
+import { dirname as dirname16, join as join31 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/public-cli/host-pi-runtime.ts
@@ -33159,8 +33047,8 @@ function linkPackage(packageRoot2, name, targetDir) {
 // src/public-cli/main.ts
 var here = dirname16(fileURLToPath2(import.meta.url));
 function resolvePackageRoot(binDir) {
-  const canonical = join32(binDir, "..", "..");
-  if (existsSync8(join32(canonical, "package.json"))) {
+  const canonical = join31(binDir, "..", "..");
+  if (existsSync8(join31(canonical, "package.json"))) {
     return canonical;
   }
   return binDir;