@event4u/agent-config 16.0.0 → 16.1.0

package/dist/cli-delegate/{chunk-AK6HODNQ.js → chunk-HDVVGPQW.js}

@@ -2,35 +2,37 @@ import { createRequire as __acCreateRequire } from 'node:module'; const require
 import {
   ZodFirstPartyTypeKind,
   settingsSchema
-} from "./chunk-3FKR64R5.js";
+} from "./chunk-UNCRJBT3.js";
 import {
   main
-} from "./chunk-IVBPRCQO.js";
+} from "./chunk-6KFEC3G7.js";
 import {
   RULE_SOURCE_REL
 } from "./chunk-WOKWX5PL.js";
+import {
+  classifyOwnership,
+  recordedHashesForRoot
+} from "./chunk-YDPILCOL.js";
+import {
+  appendTxLog
+} from "./chunk-5R7HOLAF.js";
 import {
   SCOPE_DETECT_AI_DIRS,
   SCOPE_DETECT_MANIFESTS
 } from "./chunk-A4QJ6ENT.js";
 import {
-  ScopeMismatchError,
   build_claude_hook_matrix,
   ensure_managed_hooks,
   expected_deploy_files,
   is_ancestor,
   load_inventory,
-  manifest_path,
   printResiduals,
   probeHostCapabilities,
-  read_manifest,
   reap_stale,
   reap_tagged_orphans,
   record_deploy,
-  save_inventory,
-  upsert_tool,
-  write_manifest
-} from "./chunk-2TAQ2K4V.js";
+  save_inventory
+} from "./chunk-6KM6ORRY.js";
 import {
   check_version,
   classify_mismatch,
@@ -53,13 +55,20 @@ import {
   ruleFileArrives,
   ruleScopeFromSettings
 } from "./chunk-DMSZHXZS.js";
+import {
+  ScopeMismatchError,
+  manifest_path,
+  read_manifest,
+  upsert_tool,
+  write_manifest
+} from "./chunk-4E2W63DA.js";
 import {
   require_dist
 } from "./chunk-OY53J6II.js";
 import {
   find_project_root_with_anchor,
   load_agent_settings
-} from "./chunk-2XY7ILBT.js";
+} from "./chunk-FC75PGJE.js";
 import {
   event4u_root,
   legacy_xdg_root,
@@ -273,13 +282,104 @@ function subtract_pointers(doc, entries) {
 
 // src/scripts/install.ts
 import { spawn, spawnSync } from "node:child_process";
-import * as crypto3 from "node:crypto";
-import * as fs12 from "node:fs";
+import * as crypto5 from "node:crypto";
+import * as fs14 from "node:fs";
 import * as os3 from "node:os";
-import * as path10 from "node:path";
+import * as path12 from "node:path";
 import process2 from "node:process";
 import { fileURLToPath as fileURLToPath2, pathToFileURL } from "node:url";
 
+// src/scripts/_lib/json_python_parity.ts
+function jsonStrNoAscii(s) {
+  let out = '"';
+  for (const ch of s) {
+    const code = ch.codePointAt(0);
+    switch (ch) {
+      case '"':
+        out += '\\"';
+        break;
+      case "\\":
+        out += "\\\\";
+        break;
+      case "\n":
+        out += "\\n";
+        break;
+      case "\r":
+        out += "\\r";
+        break;
+      case "	":
+        out += "\\t";
+        break;
+      case "\b":
+        out += "\\b";
+        break;
+      case "\f":
+        out += "\\f";
+        break;
+      default:
+        if (code < 32) {
+          out += "\\u" + code.toString(16).padStart(4, "0");
+        } else {
+          out += ch;
+        }
+    }
+  }
+  return out + '"';
+}
+function _jsonScalar(value) {
+  if (value === null || value === void 0) return "null";
+  if (typeof value === "boolean") return value ? "true" : "false";
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      if (Number.isNaN(value)) return "NaN";
+      return value > 0 ? "Infinity" : "-Infinity";
+    }
+    return String(value);
+  }
+  if (typeof value === "string") return jsonStrNoAscii(value);
+  return null;
+}
+function _dumpIndent(value, indent, depth) {
+  const scalar = _jsonScalar(value);
+  if (scalar !== null) return scalar;
+  const pad = " ".repeat(indent * (depth + 1));
+  const closePad = " ".repeat(indent * depth);
+  if (Array.isArray(value)) {
+    if (value.length === 0) return "[]";
+    const items = value.map((v) => pad + _dumpIndent(v, indent, depth + 1));
+    return `[
+${items.join(",\n")}
+${closePad}]`;
+  }
+  if (typeof value === "object" && value !== null) {
+    const obj = value;
+    const keys = Object.keys(obj);
+    if (keys.length === 0) return "{}";
+    const items = keys.map(
+      (k) => `${pad}${jsonStrNoAscii(k)}: ${_dumpIndent(obj[k], indent, depth + 1)}`
+    );
+    return `{
+${items.join(",\n")}
+${closePad}}`;
+  }
+  return jsonStrNoAscii(String(value));
+}
+function jsonDumpsIndent(value, indent) {
+  return _dumpIndent(value, indent, 0);
+}
+function jsonDumpsCompact(value) {
+  const scalar = _jsonScalar(value);
+  if (scalar !== null) return scalar;
+  if (Array.isArray(value)) {
+    return "[" + value.map((v) => jsonDumpsCompact(v)).join(",") + "]";
+  }
+  if (typeof value === "object" && value !== null) {
+    const obj = value;
+    return "{" + Object.keys(obj).map((k) => `${jsonStrNoAscii(k)}:${jsonDumpsCompact(obj[k])}`).join(",") + "}";
+  }
+  return jsonStrNoAscii(String(value));
+}
+
 // src/scripts/_lib/claude_builtin_names.ts
 var _CURRENT = [
   "add-dir",
@@ -519,9 +619,329 @@ function applyTieredPrune(deployResults, packageRoot, pruneBy) {
   };
 }
 
-// src/scripts/_lib/rule_layer_overlap.ts
+// src/install/conflictTracker.ts
+import * as crypto2 from "node:crypto";
+import * as fs3 from "node:fs";
+import * as path3 from "node:path";
+
+// src/install/fsPrimitives.ts
+import * as crypto from "node:crypto";
 import * as fs2 from "node:fs";
 import * as path2 from "node:path";
+function resolvePath(p) {
+  try {
+    return fs2.realpathSync(path2.resolve(p));
+  } catch {
+    return path2.resolve(p);
+  }
+}
+function pathExists(p) {
+  try {
+    fs2.statSync(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function mkdirp(p) {
+  fs2.mkdirSync(p, { recursive: true });
+}
+function sha256OfFile(p) {
+  let data;
+  try {
+    data = fs2.readFileSync(p);
+  } catch {
+    return null;
+  }
+  return crypto.createHash("sha256").update(data).digest("hex");
+}
+
+// src/install/preserve.ts
+var SIDECAR_SUFFIX = ".agent-config.new";
+var EXIT_COMPLETED_WITH_CONFLICTS = 3;
+function decideDeployWrite(inputs) {
+  if (!inputs.exists) return "write";
+  if (inputs.force) return "write";
+  const ownership = classifyOwnership(inputs.recordedSha256, inputs.onDiskSha256);
+  return ownership === "recorded-modified" ? "preserve" : "write";
+}
+function sidecarPathFor(target) {
+  return `${target}${SIDECAR_SUFFIX}`;
+}
+function preservedFileMessage(target, sidecar) {
+  return `Preserved user-modified ${target}. Package content was written to ${sidecar}; the active installation is not current. Review and merge it, or rerun with --force to replace the managed file.`;
+}
+function conflictSummaryMessage(count) {
+  const noun = count === 1 ? "file" : "files";
+  return `Completed with conflicts: ${count} user-modified ${noun} preserved. Package content is staged alongside as *${SIDECAR_SUFFIX}; the active installation is not current until you merge it, or rerun with --force to replace the managed ${noun}.`;
+}
+function foreignSidecarMessage(target, sidecar) {
+  return `Refusing to replace ${sidecar}: it already exists with different content and this install cannot show it wrote it. Package content for ${target} was NOT staged. Move or delete that file and re-run, or rerun with --force to replace the managed file instead.`;
+}
+
+// src/install/conflictTracker.ts
+function createConflictTracker(host) {
+  const conflictState = {
+    root: null,
+    recorded: null,
+    preserved: [],
+    staged: /* @__PURE__ */ new Map()
+  };
+  function recordedHashFor(target) {
+    if (conflictState.root === null) return void 0;
+    conflictState.recorded ??= recordedHashesForRoot(conflictState.root);
+    const plain = path3.resolve(target);
+    if (conflictState.recorded.has(plain)) return conflictState.recorded.get(plain);
+    const real = resolvePath(target);
+    return real === plain ? void 0 : conflictState.recorded.get(real);
+  }
+  function stageInto(target, sidecar, produce) {
+    mkdirp(path3.dirname(sidecar));
+    const tmp = path3.join(
+      path3.dirname(sidecar),
+      `.${path3.basename(sidecar)}.${process.pid}.${crypto2.randomBytes(6).toString("hex")}${path3.extname(target)}`
+    );
+    const discard = () => {
+      try {
+        fs3.unlinkSync(tmp);
+      } catch {
+      }
+    };
+    let candidate;
+    try {
+      produce(tmp);
+      candidate = sha256OfFile(tmp);
+    } catch (exc) {
+      discard();
+      host.fail(
+        `Could not stage package content for ${target} at ${sidecar}: ${String(exc)}. Nothing was written; the managed file is unchanged.`
+      );
+    }
+    if (pathExists(sidecar)) {
+      const onDisk = sha256OfFile(sidecar);
+      if (onDisk !== null && onDisk === candidate) {
+        discard();
+        conflictState.staged.set(sidecar, onDisk);
+        return;
+      }
+      if (onDisk === null || onDisk !== recordedHashFor(sidecar)) {
+        discard();
+        host.fail(foreignSidecarMessage(target, sidecar));
+      }
+    }
+    try {
+      fs3.renameSync(tmp, sidecar);
+    } catch (exc) {
+      discard();
+      host.fail(
+        `Could not stage package content for ${target} at ${sidecar}: ${String(exc)}. Nothing was written; the managed file is unchanged.`
+      );
+    }
+    conflictState.staged.set(sidecar, candidate);
+    host.logWrite(sidecar);
+  }
+  function record(target, sidecar) {
+    if (conflictState.preserved.includes(target)) return;
+    conflictState.preserved.push(target);
+    host.warn(preservedFileMessage(target, sidecar));
+  }
+  return {
+    conflictState,
+    begin(root) {
+      conflictState.root = root;
+      conflictState.recorded = null;
+      conflictState.preserved = [];
+      conflictState.staged = /* @__PURE__ */ new Map();
+    },
+    /**
+     * The on-disk digest is computed HERE rather than carried from the
+     * plan: this runs immediately before the caller copies over `target`,
+     * so a file edited between planning and writing is still classified
+     * from the bytes that are actually about to be destroyed.
+     */
+    resolve(target, force) {
+      const exists = pathExists(target);
+      return decideDeployWrite({
+        exists,
+        recordedSha256: exists ? recordedHashFor(target) : void 0,
+        onDiskSha256: exists ? sha256OfFile(target) : null,
+        force
+      });
+    },
+    /**
+     * Stage the package content beside a preserved target.
+     *
+     * The staged bytes are what the installer WOULD have written — the
+     * package file plus its install-time tag — so merging the sidecar by
+     * hand yields a file that matches the digest this run records and still
+     * carries the ownership evidence the reaper reads.
+     */
+    preserve(target, source, packageRoot) {
+      const sidecar = sidecarPathFor(target);
+      stageInto(target, sidecar, (tmp) => {
+        fs3.copyFileSync(source, tmp);
+        host.tagDeployed(tmp, source, packageRoot);
+      });
+      record(target, sidecar);
+    },
+    /**
+     * The same, for a managed file the installer GENERATES rather than
+     * copies (the Claude Desktop marker).
+     *
+     * Those writers are recorded in the manifest with a digest, so they are
+     * in the class the ruling covers, and one of them wrote unconditionally
+     * — ignoring even `--force` — because the tracker was wired only into
+     * the copy loop.
+     */
+    preserveContent(target, content) {
+      const sidecar = sidecarPathFor(target);
+      stageInto(target, sidecar, (tmp) => fs3.writeFileSync(tmp, content, "utf-8"));
+      record(target, sidecar);
+    },
+    /**
+     * Runs before the installer's terminal NDJSON frame so that frame can
+     * carry the count. A failing run keeps its own code — a conflict never
+     * masks a failure.
+     */
+    finalizeRc(rc) {
+      const count = conflictState.preserved.length;
+      if (count === 0) return rc;
+      host.emitProgress({ type: "conflicts", count, paths: [...conflictState.preserved] });
+      host.warn(conflictSummaryMessage(count));
+      return rc === 0 ? EXIT_COMPLETED_WITH_CONFLICTS : rc;
+    }
+  };
+}
+
+// src/install/manifestFiles.ts
+var YAML = __toESM(require_dist(), 1);
+import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join as join3, resolve as resolve3 } from "node:path";
+function fileEntry(p, kind, hashContent) {
+  return { path: p, kind, sha256: hashContent ? sha256OfFile(p) : null };
+}
+function filesByToolFromDeploy(deployResults) {
+  const out = {};
+  for (const toolId of Object.keys(deployResults)) {
+    const [, , status, paths] = deployResults[toolId];
+    if (status === "deployed") {
+      out[toolId] = paths.map((p) => fileEntry(p, "deployed", true));
+    } else if (status === "marker") {
+      out[toolId] = paths.map((p) => fileEntry(p, "marker", true));
+    } else {
+      out[toolId] = null;
+    }
+  }
+  return out;
+}
+function filesByToolFromBridges(tools, projectRoot, scope, bridgeMarker) {
+  const out = {};
+  for (const toolId of [...tools].sort()) {
+    const marker = bridgeMarker(toolId, scope);
+    if (!marker) continue;
+    const markerPath = isAbsolute(marker) ? marker : join3(projectRoot, marker);
+    out[toolId] = [fileEntry(markerPath, "bridge", false)];
+  }
+  return out;
+}
+function expanduser(p) {
+  if (p === "~") return homedir();
+  if (p.startsWith("~/") || process.platform === "win32" && p.startsWith("~\\")) {
+    return join3(homedir(), p.slice(2));
+  }
+  return p;
+}
+function resolveRecorded(raw, projectRoot) {
+  const expanded = expanduser(raw);
+  return isAbsolute(expanded) ? resolve3(expanded) : resolve3(projectRoot, expanded);
+}
+function readRecordedByTool(manifestPath, projectRoot) {
+  const out = /* @__PURE__ */ new Map();
+  if (!existsSync2(manifestPath)) return out;
+  let doc;
+  try {
+    doc = YAML.parse(readFileSync3(manifestPath, "utf8"));
+  } catch {
+    return out;
+  }
+  if (doc === null || typeof doc !== "object" || Array.isArray(doc)) return out;
+  const tools = doc["tools"];
+  if (!Array.isArray(tools)) return out;
+  for (const tool of tools) {
+    if (tool === null || typeof tool !== "object" || Array.isArray(tool)) continue;
+    const rec = tool;
+    const name = rec["name"];
+    if (typeof name !== "string" || name.length === 0) continue;
+    const files = [];
+    const rawFiles = rec["files"];
+    if (Array.isArray(rawFiles)) {
+      for (const entry of rawFiles) {
+        if (entry === null || typeof entry !== "object" || Array.isArray(entry)) continue;
+        const raw = entry["path"];
+        if (typeof raw !== "string" || raw.length === 0) continue;
+        files.push({
+          entry,
+          resolved: resolveRecorded(raw, projectRoot)
+        });
+      }
+    }
+    const rawMerged = rec["merged_keys"];
+    const mergedKeys = Array.isArray(rawMerged) ? rawMerged : [];
+    out.set(name, { files, mergedKeys });
+  }
+  return out;
+}
+function hydrateRecordedInventories(entries, prior) {
+  for (const entry of entries) {
+    const name = entry["name"];
+    if (typeof name !== "string") continue;
+    const recorded = prior.get(name);
+    if (recorded === void 0) continue;
+    if (Array.isArray(entry["files"]) && entry["files"].length === 0) {
+      entry["files"] = recorded.files.map((f) => f.entry);
+    }
+    if (Array.isArray(entry["merged_keys"]) && entry["merged_keys"].length === 0) {
+      entry["merged_keys"] = [...recorded.mergedKeys];
+    }
+  }
+  return entries;
+}
+function reconcileToolFiles(fresh, prior, preserved) {
+  if (fresh === null || fresh === void 0) {
+    return prior === void 0 ? null : prior.files.map((f) => f.entry);
+  }
+  if (prior === void 0 || preserved.size === 0) return [...fresh];
+  const seen = /* @__PURE__ */ new Set();
+  for (const entry of fresh) {
+    const raw = entry["path"];
+    if (typeof raw === "string") seen.add(resolve3(expanduser(raw)));
+  }
+  const out = [...fresh];
+  for (const file of prior.files) {
+    const staged = preserved.get(file.resolved);
+    if (staged === void 0 || seen.has(file.resolved)) continue;
+    out.push(staged.sha256 === null ? file.entry : { ...file.entry, sha256: staged.sha256 });
+    if (staged.sidecar !== null) out.push(staged.sidecar);
+  }
+  return out;
+}
+function preservedIndex(preservedTargets, staged) {
+  const out = /* @__PURE__ */ new Map();
+  for (const target of preservedTargets) {
+    const sidecar = sidecarPathFor(target);
+    const sha = staged.get(sidecar) ?? null;
+    out.set(resolve3(target), {
+      sha256: sha,
+      sidecar: sha === null ? null : { path: sidecar, kind: "sidecar", sha256: sha }
+    });
+  }
+  return out;
+}
+
+// src/scripts/_lib/rule_layer_overlap.ts
+import * as fs4 from "node:fs";
+import * as path4 from "node:path";
 var INSTALLER_PROVENANCE_KEYS = ["package", "source_path"];
 function stripProvenance(text) {
   const lines = text.split("\n");
@@ -575,14 +995,14 @@ function compareLayers(global_layer, project_layer) {
 function readRuleLayer(dir) {
   let names;
   try {
-    names = fs2.readdirSync(dir);
+    names = fs4.readdirSync(dir);
   } catch {
     return null;
   }
   const files = /* @__PURE__ */ new Map();
   for (const name of names.filter((n) => n.endsWith(".md")).sort()) {
     try {
-      files.set(name, fs2.readFileSync(path2.join(dir, name), "utf-8"));
+      files.set(name, fs4.readFileSync(path4.join(dir, name), "utf-8"));
     } catch {
       continue;
     }
@@ -590,7 +1010,7 @@ function readRuleLayer(dir) {
   return { dir, files };
 }
 function claudeMdExcludesGlob(dir) {
-  return `${path2.resolve(dir).replace(/\/+$/, "")}/**`;
+  return `${path4.resolve(dir).replace(/\/+$/, "")}/**`;
 }
 function mergeClaudeMdExcludes(existing, entry) {
   if (!Array.isArray(existing)) return [entry];
@@ -620,26 +1040,26 @@ function decideLayerAction(report, choice, global_dir, project_dir) {
 
 // src/scripts/_lib/install_drift.ts
 var import_yaml = __toESM(require_dist(), 1);
-import * as crypto from "node:crypto";
-import * as fs3 from "node:fs";
+import * as crypto3 from "node:crypto";
+import * as fs5 from "node:fs";
 import * as os from "node:os";
-import * as path3 from "node:path";
-function expanduser(p) {
+import * as path5 from "node:path";
+function expanduser2(p) {
   if (p === "~") {
     return os.homedir();
   }
   if (p.startsWith("~/") || process.platform === "win32" && p.startsWith("~\\")) {
-    return path3.join(os.homedir(), p.slice(2));
+    return path5.join(os.homedir(), p.slice(2));
   }
   return p;
 }
 function resolve_entry_path(project_root, raw) {
-  const p = expanduser(raw);
-  return path3.isAbsolute(p) ? p : path3.join(project_root, p);
+  const p = expanduser2(raw);
+  return path5.isAbsolute(p) ? p : path5.join(project_root, p);
 }
 function sha256_of_file(p) {
   try {
-    return crypto.createHash("sha256").update(fs3.readFileSync(p)).digest("hex");
+    return crypto3.createHash("sha256").update(fs5.readFileSync(p)).digest("hex");
   } catch {
     return null;
   }
@@ -648,7 +1068,7 @@ function collect_drift(project_root, env) {
   const target = manifest_path(project_root, env);
   let text;
   try {
-    text = fs3.readFileSync(target, "utf-8");
+    text = fs5.readFileSync(target, "utf-8");
   } catch {
     return null;
   }
@@ -693,7 +1113,7 @@ function collect_drift(project_root, env) {
         continue;
       }
       const resolved = resolve_entry_path(project_root, raw_path);
-      if (!fs3.existsSync(resolved)) {
+      if (!fs5.existsSync(resolved)) {
         out.push({
           tool_id,
           path: resolved,
@@ -746,15 +1166,15 @@ function format_drift_report(entries) {
 }
 
 // src/scripts/_lib/skill_catalogue.ts
-import * as fs4 from "node:fs";
-import * as path4 from "node:path";
+import * as fs6 from "node:fs";
+import * as path6 from "node:path";
 var PROJECT_CATALOGUE_ROOTS = ["src/skills", ".claude/skills"];
 var HOST_CATALOGUE_ROOT = ".claude/skills";
 var DEFAULT_CATALOGUE_ROOTS = [
   ...PROJECT_CATALOGUE_ROOTS,
   `~/${HOST_CATALOGUE_ROOT}`
 ];
-var OBSERVATION_LOG = path4.join(
+var OBSERVATION_LOG = path6.join(
   "agents",
   "evidence",
   "metrics",
@@ -798,9 +1218,9 @@ function descriptionOf(frontmatter) {
   return "";
 }
 function readProjectedCatalogue(root) {
-  const names = fs4.readdirSync(root).filter((n) => fs4.existsSync(path4.join(root, n, "SKILL.md"))).sort();
+  const names = fs6.readdirSync(root).filter((n) => fs6.existsSync(path6.join(root, n, "SKILL.md"))).sort();
   return names.map((name, index) => {
-    const content = fs4.readFileSync(path4.join(root, name, "SKILL.md"), "utf-8");
+    const content = fs6.readFileSync(path6.join(root, name, "SKILL.md"), "utf-8");
     const frontmatter = frontmatterOf(content);
     const description = descriptionOf(frontmatter);
     return {
@@ -817,12 +1237,12 @@ function truncationModeOf(record) {
   return record.truncation_mode ?? "per-entry";
 }
 function markdownFilesUnder(root) {
-  if (!fs4.existsSync(root)) return [];
+  if (!fs6.existsSync(root)) return [];
   const out = [];
   const walk = (dir) => {
-    for (const entry of fs4.readdirSync(dir, { withFileTypes: true })) {
-      const full = path4.join(dir, entry.name);
-      if (fs4.statSync(full).isDirectory()) walk(full);
+    for (const entry of fs6.readdirSync(dir, { withFileTypes: true })) {
+      const full = path6.join(dir, entry.name);
+      if (fs6.statSync(full).isDirectory()) walk(full);
       else if (entry.name.endsWith(".md")) out.push(full);
     }
   };
@@ -830,9 +1250,9 @@ function markdownFilesUnder(root) {
   return out;
 }
 function measureCatalogueVolume(host, root) {
-  const skillsRoot = path4.join(root, "skills");
-  const skills = fs4.existsSync(skillsRoot) ? readProjectedCatalogue(skillsRoot) : [];
-  const commandEntries = markdownFilesUnder(path4.join(root, "commands")).length;
+  const skillsRoot = path6.join(root, "skills");
+  const skills = fs6.existsSync(skillsRoot) ? readProjectedCatalogue(skillsRoot) : [];
+  const commandEntries = markdownFilesUnder(path6.join(root, "commands")).length;
   return {
     host,
     root,
@@ -910,9 +1330,9 @@ function migrationPromptLines(host, eligibility, settingsPath) {
   ];
 }
 function readObservationLog(logPath) {
-  if (!fs4.existsSync(logPath)) return [];
+  if (!fs6.existsSync(logPath)) return [];
   const out = [];
-  for (const line of fs4.readFileSync(logPath, "utf-8").split("\n")) {
+  for (const line of fs6.readFileSync(logPath, "utf-8").split("\n")) {
     const trimmed = line.trim();
     if (trimmed.length === 0) continue;
     try {
@@ -952,9 +1372,9 @@ function isInteractiveSession(probe) {
 }
 
 // src/scripts/_lib/claude_desktop_bundler.ts
-import * as crypto2 from "node:crypto";
-import * as fs5 from "node:fs";
-import * as path5 from "node:path";
+import * as crypto4 from "node:crypto";
+import * as fs7 from "node:fs";
+import * as path7 from "node:path";
 
 // src/scripts/_lib/zip_min.ts
 import * as zlib from "node:zlib";
@@ -1061,7 +1481,7 @@ function _is_excluded(rel_parts) {
 }
 function _is_dir(p) {
   try {
-    return fs5.statSync(p).isDirectory();
+    return fs7.statSync(p).isDirectory();
   } catch {
     return false;
   }
@@ -1073,12 +1493,12 @@ function _compare_rel_parts(a, b) {
 }
 function _walk_skill_files(skill_dir) {
   const out = [];
-  const resolved = fs5.realpathSync(skill_dir);
+  const resolved = fs7.realpathSync(skill_dir);
   const walk = (root, relRoot) => {
     const dirNames = [];
     const fileNames = [];
-    for (const dirent of fs5.readdirSync(root, { withFileTypes: true })) {
-      const full = path5.join(root, dirent.name);
+    for (const dirent of fs7.readdirSync(root, { withFileTypes: true })) {
+      const full = path7.join(root, dirent.name);
       const isDir2 = dirent.isDirectory() || dirent.isSymbolicLink() && _is_dir(full);
       if (isDir2) {
         dirNames.push(dirent.name);
@@ -1091,13 +1511,13 @@ function _walk_skill_files(skill_dir) {
       if (_is_excluded(rel_parts)) {
         continue;
       }
-      out.push([path5.join(root, fname), rel_parts]);
+      out.push([path7.join(root, fname), rel_parts]);
     }
     for (const dname of dirNames) {
       if (_is_excluded([dname])) {
         continue;
       }
-      walk(path5.join(root, dname), [...relRoot, dname]);
+      walk(path7.join(root, dname), [...relRoot, dname]);
     }
   };
   walk(resolved, []);
@@ -1105,58 +1525,58 @@ function _walk_skill_files(skill_dir) {
   return out;
 }
 function _manifest_digest(files) {
-  const h = crypto2.createHash("sha256");
+  const h = crypto4.createHash("sha256");
   for (const [abs_path, rel_parts] of files) {
     const rel = rel_parts.join("/");
     h.update(Buffer.from(rel, "utf-8"));
     h.update(Buffer.from([0]));
-    h.update(crypto2.createHash("sha256").update(fs5.readFileSync(abs_path)).digest());
+    h.update(crypto4.createHash("sha256").update(fs7.readFileSync(abs_path)).digest());
     h.update(Buffer.from([0]));
   }
   return h.digest("hex");
 }
 function _atomic_write_zip(zip_path, files) {
-  fs5.mkdirSync(path5.dirname(zip_path), { recursive: true });
-  const stem = path5.basename(zip_path, path5.extname(zip_path));
-  const tmp_path = path5.join(
-    path5.dirname(zip_path),
-    `.${stem}.${crypto2.randomBytes(6).toString("hex")}.zip.tmp`
+  fs7.mkdirSync(path7.dirname(zip_path), { recursive: true });
+  const stem = path7.basename(zip_path, path7.extname(zip_path));
+  const tmp_path = path7.join(
+    path7.dirname(zip_path),
+    `.${stem}.${crypto4.randomBytes(6).toString("hex")}.zip.tmp`
   );
   try {
     const entries = files.map(([abs_path, rel_parts]) => ({
       name: rel_parts.join("/"),
-      data: fs5.readFileSync(abs_path)
+      data: fs7.readFileSync(abs_path)
     }));
-    fs5.writeFileSync(tmp_path, zip_write_sync(entries));
-    fs5.renameSync(tmp_path, zip_path);
+    fs7.writeFileSync(tmp_path, zip_write_sync(entries));
+    fs7.renameSync(tmp_path, zip_path);
   } finally {
-    if (fs5.existsSync(tmp_path)) {
-      fs5.unlinkSync(tmp_path);
+    if (fs7.existsSync(tmp_path)) {
+      fs7.unlinkSync(tmp_path);
     }
   }
 }
 function _write_if_changed(dest_dir, slug, files, force, written) {
   const digest = _manifest_digest(files);
-  const zip_path = path5.join(dest_dir, `${slug}.zip`);
-  const digest_path = path5.join(dest_dir, `${slug}.sha256`);
-  const recorded = fs5.existsSync(digest_path) ? fs5.readFileSync(digest_path, "utf-8").trim() : "";
-  if (!force && recorded === digest && fs5.existsSync(zip_path)) {
+  const zip_path = path7.join(dest_dir, `${slug}.zip`);
+  const digest_path = path7.join(dest_dir, `${slug}.sha256`);
+  const recorded = fs7.existsSync(digest_path) ? fs7.readFileSync(digest_path, "utf-8").trim() : "";
+  if (!force && recorded === digest && fs7.existsSync(zip_path)) {
     return;
   }
   _atomic_write_zip(zip_path, files);
-  fs5.writeFileSync(digest_path, digest + "\n", "utf-8");
+  fs7.writeFileSync(digest_path, digest + "\n", "utf-8");
   written.push(zip_path);
 }
 function build_skill_bundles(package_root, dest_dir, force = false, curation = null) {
-  const skills_root = path5.join(package_root, "dist/agent-src", "skills");
+  const skills_root = path7.join(package_root, "dist/agent-src", "skills");
   if (!_is_dir(skills_root)) {
     return [];
   }
-  fs5.mkdirSync(dest_dir, { recursive: true });
+  fs7.mkdirSync(dest_dir, { recursive: true });
   const written = [];
-  for (const name of fs5.readdirSync(skills_root).sort()) {
-    const entry = path5.join(skills_root, name);
-    const isSymlink2 = fs5.lstatSync(entry).isSymbolicLink();
+  for (const name of fs7.readdirSync(skills_root).sort()) {
+    const entry = path7.join(skills_root, name);
+    const isSymlink2 = fs7.lstatSync(entry).isSymbolicLink();
     if (!(_is_dir(entry) || isSymlink2)) {
       continue;
     }
@@ -1164,8 +1584,8 @@ function build_skill_bundles(package_root, dest_dir, force = false, curation = n
     if (curation !== null && !curation.includes(skill_name)) {
       continue;
     }
-    const skill_md = path5.join(entry, "SKILL.md");
-    if (!fs5.existsSync(skill_md)) {
+    const skill_md = path7.join(entry, "SKILL.md");
+    if (!fs7.existsSync(skill_md)) {
       continue;
     }
     const files = _walk_skill_files(entry);
@@ -1177,15 +1597,15 @@ function build_skill_bundles(package_root, dest_dir, force = false, curation = n
   return written;
 }
 function _command_slug(source_file, commands_root) {
-  const rel = path5.relative(commands_root, source_file);
-  const noExt = rel.slice(0, rel.length - path5.extname(rel).length);
-  return noExt.split(path5.sep).join("-");
+  const rel = path7.relative(commands_root, source_file);
+  const noExt = rel.slice(0, rel.length - path7.extname(rel).length);
+  return noExt.split(path7.sep).join("-");
 }
 function _iter_command_files(commands_root) {
   const found = [];
   const walk = (dir) => {
-    for (const dirent of fs5.readdirSync(dir, { withFileTypes: true })) {
-      const full = path5.join(dir, dirent.name);
+    for (const dirent of fs7.readdirSync(dir, { withFileTypes: true })) {
+      const full = path7.join(dir, dirent.name);
       if (dirent.isDirectory() || dirent.isSymbolicLink() && _is_dir(full)) {
         walk(full);
       } else if (dirent.name.endsWith(".md")) {
@@ -1195,21 +1615,21 @@ function _iter_command_files(commands_root) {
   };
   walk(commands_root);
   found.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
-  return found.filter((source_file) => path5.basename(source_file) !== "AGENTS.md");
+  return found.filter((source_file) => path7.basename(source_file) !== "AGENTS.md");
 }
 function build_command_bundles(package_root, dest_dir, force = false, curation = null) {
-  const commands_root = path5.join(package_root, "dist/agent-src", "commands");
+  const commands_root = path7.join(package_root, "dist/agent-src", "commands");
   if (!_is_dir(commands_root)) {
     return [];
   }
-  const skills_root = path5.join(package_root, "dist/agent-src", "skills");
+  const skills_root = path7.join(package_root, "dist/agent-src", "skills");
   let skill_names = /* @__PURE__ */ new Set();
   if (_is_dir(skills_root)) {
     skill_names = new Set(
-      fs5.readdirSync(skills_root).filter((name) => _is_dir(path5.join(skills_root, name)))
+      fs7.readdirSync(skills_root).filter((name) => _is_dir(path7.join(skills_root, name)))
     );
   }
-  fs5.mkdirSync(dest_dir, { recursive: true });
+  fs7.mkdirSync(dest_dir, { recursive: true });
   const written = [];
   for (const source_file of _iter_command_files(commands_root)) {
     const slug = _command_slug(source_file, commands_root);
@@ -1219,7 +1639,7 @@ function build_command_bundles(package_root, dest_dir, force = false, curation =
     if (curation !== null && !curation.includes(slug)) {
       continue;
     }
-    const files = [[fs5.realpathSync(source_file), ["SKILL.md"]]];
+    const files = [[fs7.realpathSync(source_file), ["SKILL.md"]]];
     _write_if_changed(dest_dir, slug, files, force, written);
   }
   return written;
@@ -1227,15 +1647,15 @@ function build_command_bundles(package_root, dest_dir, force = false, curation =
 
 // src/scripts/hooks/host_lowering.ts
 var import_yaml2 = __toESM(require_dist(), 1);
-import * as fs6 from "node:fs";
-import * as path6 from "node:path";
+import * as fs8 from "node:fs";
+import * as path8 from "node:path";
 import { fileURLToPath } from "node:url";
 var _IN_BUNDLE = true;
-var _REPO_ROOT = path6.resolve(
-  path6.dirname(fileURLToPath(import.meta.url)),
+var _REPO_ROOT = path8.resolve(
+  path8.dirname(fileURLToPath(import.meta.url)),
   ..._IN_BUNDLE ? ["..", ".."] : ["..", "..", ".."]
 );
-var HOST_LOWERING_PATH = path6.join(_REPO_ROOT, "src", "scripts", "hooks", "host_lowering.yaml");
+var HOST_LOWERING_PATH = path8.join(_REPO_ROOT, "src", "scripts", "hooks", "host_lowering.yaml");
 var DEFAULT_SURFACE = "any";
 function _asString(v) {
   if (v === null || v === void 0) return null;
@@ -1301,7 +1721,7 @@ function _parse(text) {
 }
 var _cache = null;
 function loadHostLowering() {
-  if (_cache === null) _cache = _parse(fs6.readFileSync(HOST_LOWERING_PATH, "utf-8"));
+  if (_cache === null) _cache = _parse(fs8.readFileSync(HOST_LOWERING_PATH, "utf-8"));
   return _cache;
 }
 function surfaceRow(host, surface = DEFAULT_SURFACE, table = loadHostLowering()) {
@@ -1320,26 +1740,26 @@ function hostBindings(host, table = loadHostLowering()) {
 }
 
 // src/install/partitionEligibility.ts
-import * as fs8 from "node:fs";
+import * as fs10 from "node:fs";
 import * as os2 from "node:os";
 
 // src/install/hostLayerFingerprint.ts
-import { createHash as createHash4 } from "node:crypto";
-import * as fs7 from "node:fs";
-import * as path7 from "node:path";
+import { createHash as createHash5 } from "node:crypto";
+import * as fs9 from "node:fs";
+import * as path9 from "node:path";
 var FINGERPRINT_SCHEMA = 1;
 function collectFiles(dir) {
   const out = [];
   const walk = (d) => {
     let entries;
     try {
-      entries = fs7.readdirSync(d, { withFileTypes: true });
+      entries = fs9.readdirSync(d, { withFileTypes: true });
     } catch {
       return;
     }
     const sorted = [...entries].sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
     for (const e of sorted) {
-      const p = path7.join(d, e.name);
+      const p = path9.join(d, e.name);
       if (e.isDirectory()) {
         walk(p);
       } else if (e.isFile()) {
@@ -1351,15 +1771,15 @@ function collectFiles(dir) {
   return out.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
 }
 function fingerprintLayers(layers) {
-  const h = createHash4("sha256");
+  const h = createHash5("sha256");
   h.update(`v${FINGERPRINT_SCHEMA}\0`);
   for (const layer of layers) {
     h.update(`layer:${layer.label}\0`);
     for (const file of collectFiles(layer.root)) {
-      h.update(path7.relative(layer.root, file));
+      h.update(path9.relative(layer.root, file));
       h.update("\0");
       try {
-        h.update(fs7.readFileSync(file));
+        h.update(fs9.readFileSync(file));
       } catch {
         h.update("\0unreadable\0");
       }
@@ -1369,11 +1789,11 @@ function fingerprintLayers(layers) {
   return h.digest("hex");
 }
 function hostLayerInputs(userHome) {
-  const claude = path7.join(userHome, ".claude");
+  const claude = path9.join(userHome, ".claude");
   return [
-    { label: "rules", root: path7.join(claude, "rules") },
-    { label: "skills", root: path7.join(claude, "skills") },
-    { label: "commands", root: path7.join(claude, "commands") }
+    { label: "rules", root: path9.join(claude, "rules") },
+    { label: "skills", root: path9.join(claude, "skills") },
+    { label: "commands", root: path9.join(claude, "commands") }
   ];
 }
 
@@ -1382,7 +1802,7 @@ var MAINTAINER_WORKSPACE = "agent-config-maintainer";
 function isExclusivelyPackageOnly(source_path) {
   let meta;
   try {
-    [meta] = parseFrontmatter(fs8.readFileSync(source_path, "utf-8"));
+    [meta] = parseFrontmatter(fs10.readFileSync(source_path, "utf-8"));
   } catch {
     return false;
   }
@@ -1413,8 +1833,8 @@ function stampHostLayerFingerprint(installedVersion, tools, lockfilePath, skip2,
 }
 
 // src/install/claudeRuleRewrite.ts
-import * as fs9 from "node:fs";
-import * as path8 from "node:path";
+import * as fs11 from "node:fs";
+import * as path10 from "node:path";
 
 // src/install/claudePathsPlan.ts
 function derive_trigger_globs(meta) {
@@ -1516,8 +1936,8 @@ function _withPreservedKeys(rendered, original) {
   }
   return ["---", ...keep, "---", "", rendered].join("\n");
 }
-function rewriteAndReport(rulesDir, quiet, info2, warn2, wrappers) {
-  const result = rewriteClaudeRules(rulesDir);
+function rewriteAndReport(rulesDir, quiet, info2, warn2, wrappers, preserved = /* @__PURE__ */ new Set()) {
+  const result = rewriteClaudeRules(rulesDir, preserved);
   if (wrappers && !quiet) {
     if (wrappers.wrapped.length > 0) {
       info2(
@@ -1566,26 +1986,27 @@ function renderClaudeRule(sourceText) {
   lines.push(pyRstrip(body) + "\n");
   return { text: lines.join("\n"), globs: plan.globs, dropped: plan.dropped };
 }
-function rewriteClaudeRules(rulesDir) {
+function rewriteClaudeRules(rulesDir, preserved = /* @__PURE__ */ new Set()) {
   const result = { rewritten: 0, scoped: [], dropped: [], failed: [] };
   let entries;
   try {
-    entries = fs9.readdirSync(rulesDir);
+    entries = fs11.readdirSync(rulesDir);
   } catch {
     return result;
   }
   for (const name of entries.filter((n) => n.endsWith(".md")).sort()) {
-    const full = path8.join(rulesDir, name);
+    const full = path10.join(rulesDir, name);
+    if (preserved.has(path10.resolve(full))) continue;
     let stat;
     try {
-      stat = fs9.lstatSync(full);
+      stat = fs11.lstatSync(full);
     } catch {
       continue;
     }
     if (!stat.isFile() || stat.isSymbolicLink()) continue;
     let text;
     try {
-      text = fs9.readFileSync(full, "utf-8");
+      text = fs11.readFileSync(full, "utf-8");
     } catch {
       continue;
     }
@@ -1595,7 +2016,7 @@ function rewriteClaudeRules(rulesDir) {
     const withOwnership = _withPreservedKeys(rendered.text, text);
     if (withOwnership !== text) {
       try {
-        fs9.writeFileSync(full, withOwnership, "utf-8");
+        fs11.writeFileSync(full, withOwnership, "utf-8");
       } catch (e) {
         result.failed.push({
           rule: name.slice(0, -3),
@@ -2969,8 +3390,8 @@ var zodToJsonSchema = (schema, options) => {
 };
 
 // src/scripts/_lib/module_detection.ts
-import * as fs10 from "node:fs";
-import * as path9 from "node:path";
+import * as fs12 from "node:fs";
+import * as path11 from "node:path";
 var _SKIP_DIRS = /* @__PURE__ */ new Set([".module-template", ".example"]);
 var _RULES = [
   ["app/Modules", "laravel-hmvc", "App\\Modules\\{ModuleName}"],
@@ -2984,14 +3405,14 @@ var _RULES = [
 ];
 function _isDir(p) {
   try {
-    return fs10.statSync(p).isDirectory();
+    return fs12.statSync(p).isDirectory();
   } catch {
     return false;
   }
 }
 function _isFile(p) {
   try {
-    return fs10.statSync(p).isFile();
+    return fs12.statSync(p).isFile();
   } catch {
     return false;
   }
@@ -3005,13 +3426,13 @@ function _isUpperChar(ch) {
 function _list_module_subdirs(root) {
   let entries;
   try {
-    entries = fs10.readdirSync(root).sort();
+    entries = fs12.readdirSync(root).sort();
   } catch {
     return [];
   }
   const out = [];
   for (const name of entries) {
-    if (!_isDir(path9.join(root, name))) {
+    if (!_isDir(path11.join(root, name))) {
       continue;
     }
     if (name.startsWith(".")) {
@@ -3033,11 +3454,11 @@ function _score_confidence(stack, root, subdirs) {
     return capitalized.length > 0 ? "high" : "medium";
   }
   if (stack === "node-monorepo") {
-    const withPkgJson = subdirs.filter((name) => _isFile(path9.join(root, name, "package.json")));
+    const withPkgJson = subdirs.filter((name) => _isFile(path11.join(root, name, "package.json")));
     return withPkgJson.length > 0 ? "high" : "medium";
   }
   if (stack === "python-src") {
-    const withInit = subdirs.filter((name) => _isFile(path9.join(root, name, "__init__.py")));
+    const withInit = subdirs.filter((name) => _isFile(path11.join(root, name, "__init__.py")));
     return withInit.length > 0 ? "high" : "medium";
   }
   if (stack === "go-internal") {
@@ -3049,7 +3470,7 @@ function detect_module_roots(project_root) {
   const high = [];
   const medium = [];
   for (const [rel_path, stack, namespace_template] of _RULES) {
-    const abs_path = path9.join(project_root, rel_path);
+    const abs_path = path11.join(project_root, rel_path);
     if (!_isDir(abs_path)) {
       continue;
     }
@@ -3071,7 +3492,7 @@ function detect_module_roots(project_root) {
 }
 
 // src/scripts/_lib/model_tier.ts
-import fs11 from "node:fs";
+import fs13 from "node:fs";
 var TIER_TO_CLAUDE_MODEL = {
   frontier: "fable",
   high: "opus",
@@ -3080,8 +3501,8 @@ var TIER_TO_CLAUDE_MODEL = {
 };
 var MODEL_TIER_RE = /^model_tier:\s*"?([a-z]+)"?\s*$/m;
 function read_model_tier(skill_md) {
-  if (!fs11.existsSync(skill_md)) return null;
-  const text = fs11.readFileSync(skill_md).toString("utf-8");
+  if (!fs13.existsSync(skill_md)) return null;
+  const text = fs13.readFileSync(skill_md).toString("utf-8");
   if (!text.startsWith("---\n")) return null;
   const end = text.indexOf("\n---\n", 4);
   if (end === -1) return null;
@@ -3096,6 +3517,30 @@ function render_native_model_md(text, tier) {
   return text.replace(MODEL_TIER_RE, `model: ${model}`);
 }
 
+// src/install/paths.ts
+import { homedir as homedir4, tmpdir } from "node:os";
+import { join as join12 } from "node:path";
+var INSTALL_ROOT_SUBPATH = ".event4u/agent-config";
+var INSTALL_LOG_FILENAME = "install-log.jsonl";
+function resolveHome(home) {
+  if (home && home.length > 0) {
+    return home;
+  }
+  const fromOs = homedir4();
+  if (!fromOs) {
+    throw new Error(
+      "Cannot resolve home directory \u2014 both $HOME (POSIX) and $USERPROFILE (Windows) are unset."
+    );
+  }
+  return fromOs;
+}
+function getInstallRoot(home) {
+  return join12(resolveHome(home), INSTALL_ROOT_SUBPATH);
+}
+function getLogPath(home) {
+  return join12(getInstallRoot(home), INSTALL_LOG_FILENAME);
+}
+
 // src/scripts/install.ts
 var _HERE = fileURLToPath2(import.meta.url);
 var SystemExitError = class extends Error {
@@ -3112,62 +3557,44 @@ var ArgparseExit = class extends Error {
   }
   code;
 };
-function expanduser2(p) {
+function expanduser3(p) {
   if (p === "~") return os3.homedir();
   if (p.startsWith("~/") || p.startsWith("~\\")) {
-    return path10.join(os3.homedir(), p.slice(2));
+    return path12.join(os3.homedir(), p.slice(2));
   }
   return p;
 }
-function resolvePath(p) {
-  try {
-    return fs12.realpathSync(path10.resolve(p));
-  } catch {
-    return path10.resolve(p);
-  }
-}
 function isFile(p) {
   try {
-    return fs12.statSync(p).isFile();
+    return fs14.statSync(p).isFile();
   } catch {
     return false;
   }
 }
 function isDir(p) {
   try {
-    return fs12.statSync(p).isDirectory();
-  } catch {
-    return false;
-  }
-}
-function pathExists(p) {
-  try {
-    fs12.statSync(p);
-    return true;
+    return fs14.statSync(p).isDirectory();
   } catch {
     return false;
   }
 }
 function isSymlink(p) {
   try {
-    return fs12.lstatSync(p).isSymbolicLink();
+    return fs14.lstatSync(p).isSymbolicLink();
   } catch {
     return false;
   }
 }
 function readText(p) {
-  return fs12.readFileSync(p, "utf-8");
+  return fs14.readFileSync(p, "utf-8");
 }
 function writeText(p, content) {
-  fs12.writeFileSync(p, content, "utf-8");
-}
-function mkdirp(p) {
-  fs12.mkdirSync(p, { recursive: true });
+  fs14.writeFileSync(p, content, "utf-8");
 }
 function sortedGlobStems(directory, suffix) {
   let entries;
   try {
-    entries = fs12.readdirSync(directory);
+    entries = fs14.readdirSync(directory);
   } catch {
     return [];
   }
@@ -3187,43 +3614,34 @@ function sortedGlobStems(directory, suffix) {
 function countZips(directory) {
   if (!isDir(directory)) return 0;
   let n = 0;
-  for (const name of fs12.readdirSync(directory)) {
+  for (const name of fs14.readdirSync(directory)) {
     if (name.endsWith(".zip")) n += 1;
   }
   return n;
 }
-function sha256OfFile(p) {
-  let data;
-  try {
-    data = fs12.readFileSync(p);
-  } catch {
-    return null;
-  }
-  return crypto3.createHash("sha256").update(data).digest("hex");
-}
 function atomicWrite0644(target, body, prefix) {
-  const dir = path10.dirname(target);
-  const tmpName = path10.join(
+  const dir = path12.dirname(target);
+  const tmpName = path12.join(
     dir,
-    `${prefix}${process2.pid}.${crypto3.randomBytes(6).toString("hex")}.yml.tmp`
+    `${prefix}${process2.pid}.${crypto5.randomBytes(6).toString("hex")}.yml.tmp`
   );
   let fd = null;
   try {
-    fd = fs12.openSync(tmpName, "wx", 420);
-    fs12.writeFileSync(fd, body, "utf-8");
-    fs12.closeSync(fd);
+    fd = fs14.openSync(tmpName, "wx", 420);
+    fs14.writeFileSync(fd, body, "utf-8");
+    fs14.closeSync(fd);
     fd = null;
-    fs12.chmodSync(tmpName, 420);
-    fs12.renameSync(tmpName, target);
+    fs14.chmodSync(tmpName, 420);
+    fs14.renameSync(tmpName, target);
   } catch (err) {
     if (fd !== null) {
       try {
-        fs12.closeSync(fd);
+        fs14.closeSync(fd);
       } catch {
       }
     }
     try {
-      fs12.unlinkSync(tmpName);
+      fs14.unlinkSync(tmpName);
     } catch {
     }
     throw err;
@@ -3234,104 +3652,15 @@ function utcStamp(now) {
   const pad = (n, w = 2) => String(n).padStart(w, "0");
   return `${d.getUTCFullYear()}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())}T${pad(d.getUTCHours())}:${pad(d.getUTCMinutes())}:${pad(d.getUTCSeconds())}Z`;
 }
-function _jsonStrNoAscii(s) {
-  let out = '"';
-  for (const ch of s) {
-    const code = ch.codePointAt(0);
-    switch (ch) {
-      case '"':
-        out += '\\"';
-        break;
-      case "\\":
-        out += "\\\\";
-        break;
-      case "\n":
-        out += "\\n";
-        break;
-      case "\r":
-        out += "\\r";
-        break;
-      case "	":
-        out += "\\t";
-        break;
-      case "\b":
-        out += "\\b";
-        break;
-      case "\f":
-        out += "\\f";
-        break;
-      default:
-        if (code < 32) {
-          out += "\\u" + code.toString(16).padStart(4, "0");
-        } else {
-          out += ch;
-        }
-    }
-  }
-  return out + '"';
-}
-function _jsonScalar(value) {
-  if (value === null || value === void 0) return "null";
-  if (typeof value === "boolean") return value ? "true" : "false";
-  if (typeof value === "number") {
-    if (!Number.isFinite(value)) {
-      if (Number.isNaN(value)) return "NaN";
-      return value > 0 ? "Infinity" : "-Infinity";
-    }
-    return String(value);
-  }
-  if (typeof value === "string") return _jsonStrNoAscii(value);
-  return null;
-}
-function _dumpIndent(value, indent, depth) {
-  const scalar = _jsonScalar(value);
-  if (scalar !== null) return scalar;
-  const pad = " ".repeat(indent * (depth + 1));
-  const closePad = " ".repeat(indent * depth);
-  if (Array.isArray(value)) {
-    if (value.length === 0) return "[]";
-    const items = value.map((v) => pad + _dumpIndent(v, indent, depth + 1));
-    return `[
-${items.join(",\n")}
-${closePad}]`;
-  }
-  if (typeof value === "object" && value !== null) {
-    const obj = value;
-    const keys = Object.keys(obj);
-    if (keys.length === 0) return "{}";
-    const items = keys.map(
-      (k) => `${pad}${_jsonStrNoAscii(k)}: ${_dumpIndent(obj[k], indent, depth + 1)}`
-    );
-    return `{
-${items.join(",\n")}
-${closePad}}`;
-  }
-  return _jsonStrNoAscii(String(value));
-}
-function jsonDumpsIndent(value, indent) {
-  return _dumpIndent(value, indent, 0);
-}
-function jsonDumpsCompact(value) {
-  const scalar = _jsonScalar(value);
-  if (scalar !== null) return scalar;
-  if (Array.isArray(value)) {
-    return "[" + value.map((v) => jsonDumpsCompact(v)).join(",") + "]";
-  }
-  if (typeof value === "object" && value !== null) {
-    const obj = value;
-    return "{" + Object.keys(obj).map((k) => `${_jsonStrNoAscii(k)}:${jsonDumpsCompact(obj[k])}`).join(",") + "}";
-  }
-  return _jsonStrNoAscii(String(value));
-}
 function yamlSafeLoad(text) {
-  let YAML;
+  let YAML2;
   try {
-    YAML = require_dist();
+    YAML2 = require_dist();
   } catch {
     return null;
   }
   try {
-    const data = YAML.parse(text, { version: "1.1" });
+    const data = YAML2.parse(text, { version: "1.1" });
     return data;
   } catch {
     return void 0;
@@ -3347,12 +3676,12 @@ var LEGACY_SETTINGS_FILE = ".agent-settings";
 var LEGACY_BACKUP_FILE = ".agent-settings.backup.key-value";
 var SETTINGS_SUBDIR = ["agents", "settings"];
 function _canonical_settings_target(project_root) {
-  return path10.join(project_root, ...SETTINGS_SUBDIR, SETTINGS_FILE);
+  return path12.join(project_root, ...SETTINGS_SUBDIR, SETTINGS_FILE);
 }
 function _resolve_settings_read(project_root) {
   const canonical = _canonical_settings_target(project_root);
   if (pathExists(canonical)) return canonical;
-  const legacy = path10.join(project_root, SETTINGS_FILE);
+  const legacy = path12.join(project_root, SETTINGS_FILE);
   if (pathExists(legacy)) return legacy;
   return canonical;
 }
@@ -3387,6 +3716,8 @@ function _emit_progress_terminal(rc) {
   if (!state.PROGRESS_NDJSON) return;
   if (rc === 0) {
     _emit_progress({ type: "done" });
+  } else if (rc === EXIT_COMPLETED_WITH_CONFLICTS) {
+    _emit_progress({ type: "done", conflicts: tracker.conflictState.preserved.length });
   } else {
     _emit_progress({ type: "error", code: "E_INSTALL", exitCode: rc });
   }
@@ -3416,9 +3747,9 @@ function fail(msg) {
   throw new SystemExitError(1);
 }
 function detect_package_root(project_root) {
-  const npm_path = path10.join(project_root, "node_modules", "@event4u", "agent-config");
+  const npm_path = path12.join(project_root, "node_modules", "@event4u", "agent-config");
   if (isDir(npm_path)) return resolvePath(npm_path);
-  if (pathExists(path10.join(project_root, "src", "config", "profiles", "minimal.ini"))) {
+  if (pathExists(path12.join(project_root, "src", "config", "profiles", "minimal.ini"))) {
     return project_root;
   }
   fail(
@@ -3426,12 +3757,12 @@ function detect_package_root(project_root) {
   );
 }
 function detect_package_type(package_root) {
-  if (package_root.split(path10.sep).includes("node_modules")) return "npm";
+  if (package_root.split(path12.sep).includes("node_modules")) return "npm";
   return "local";
 }
 function detect_package_type_for_project(project_root, package_root) {
   const npm_path = resolvePath(
-    path10.join(project_root, "node_modules", "@event4u", "agent-config")
+    path12.join(project_root, "node_modules", "@event4u", "agent-config")
   );
   const package_resolved = resolvePath(package_root);
   if (package_resolved === npm_path) return "npm";
@@ -3444,14 +3775,18 @@ function _is_interactive() {
     return false;
   }
 }
-function _resolve_file_conflict(_target, _force_hint) {
-  return "write";
-}
+var tracker = createConflictTracker({
+  warn,
+  fail,
+  logWrite: (target) => _log_tx_entry("write", target),
+  emitProgress: (frame) => _emit_progress(frame),
+  tagDeployed: (target, source, package_root) => _inject_package_tag(target, source, package_root)
+});
 function ensure_directory(p) {
   mkdirp(p);
 }
 function write_file(p, content) {
-  ensure_directory(path10.dirname(p));
+  ensure_directory(path12.dirname(p));
   writeText(p, content);
 }
 function read_json_file(p) {
@@ -3622,7 +3957,7 @@ function _append_unknown_legacy(rendered, legacy_values, unknown_keys) {
   return rendered + "\n" + suffix;
 }
 function _migrate_legacy_if_present(project_root, template_body) {
-  const legacy_target = path10.join(project_root, LEGACY_SETTINGS_FILE);
+  const legacy_target = path12.join(project_root, LEGACY_SETTINGS_FILE);
   if (!isFile(legacy_target)) return null;
   const legacy_text = readText(legacy_target);
   const [values, unknown] = _parse_legacy_settings(legacy_text);
@@ -3637,9 +3972,9 @@ function _migrate_legacy_if_present(project_root, template_body) {
     }
   }
   rendered = _append_unknown_legacy(rendered, values, unknown);
-  const backup_target = path10.join(project_root, LEGACY_BACKUP_FILE);
+  const backup_target = path12.join(project_root, LEGACY_BACKUP_FILE);
   writeText(backup_target, legacy_text);
-  fs12.unlinkSync(legacy_target);
+  fs14.unlinkSync(legacy_target);
   info(`Migrated legacy ${LEGACY_SETTINGS_FILE} \u2192 ${SETTINGS_FILE}`);
   info(`Backup saved to ${LEGACY_BACKUP_FILE}`);
   if (unknown.length > 0) {
@@ -3674,7 +4009,7 @@ function _render_template(template, profile_values) {
   return body;
 }
 function _load_valid_user_types(package_root) {
-  const directory = path10.join(package_root, USER_TYPES_DIR);
+  const directory = path12.join(package_root, USER_TYPES_DIR);
   if (!isDir(directory)) return [];
   return sortedGlobStems(directory, ".yml");
 }
@@ -3731,8 +4066,8 @@ function splitlinesKeepends(text) {
 }
 function ensure_agent_settings(project_root, package_root, profile, force, user_type = "", packs = null) {
   const target = _canonical_settings_target(project_root);
-  const profile_source = path10.join(package_root, "src", "config", "profiles", `${profile}.ini`);
-  const template_source = path10.join(package_root, "src", "config", "agent-settings.template.yml");
+  const profile_source = path12.join(package_root, "src", "config", "profiles", `${profile}.ini`);
+  const template_source = path12.join(package_root, "src", "config", "agent-settings.template.yml");
   if (!pathExists(profile_source)) fail(`Missing profile preset: ${profile_source}`);
   if (!pathExists(template_source)) fail(`Missing settings template: ${template_source}`);
   const template = readText(template_source);
@@ -3746,21 +4081,21 @@ function ensure_agent_settings(project_root, package_root, profile, force, user_
   if (profile_values["rule_loading_tier"] !== profile) {
     const got = "rule_loading_tier" in profile_values ? `'${profile_values["rule_loading_tier"]}'` : "None";
     fail(
-      `Profile preset ${path10.basename(profile_source)} has rule_loading_tier=${got} but --profile=${profile}`
+      `Profile preset ${path12.basename(profile_source)} has rule_loading_tier=${got} but --profile=${profile}`
     );
   }
   profile_values["user_type"] = _validate_user_type(package_root, user_type);
   let template_body = _render_template(template, profile_values);
   template_body = _inject_packs(template_body, packs ?? []);
-  const legacy_root = path10.join(project_root, SETTINGS_FILE);
+  const legacy_root = path12.join(project_root, SETTINGS_FILE);
   if (isFile(legacy_root) && !pathExists(target)) {
-    mkdirp(path10.dirname(target));
+    mkdirp(path12.dirname(target));
     writeText(target, readText(legacy_root));
-    fs12.unlinkSync(legacy_root);
+    fs14.unlinkSync(legacy_root);
     success(`Migrated ${SETTINGS_FILE} \u2192 agents/settings/${SETTINGS_FILE} (ADR-038)`);
     return;
   }
-  const legacy_target = path10.join(project_root, LEGACY_SETTINGS_FILE);
+  const legacy_target = path12.join(project_root, LEGACY_SETTINGS_FILE);
   if (isFile(legacy_target) && pathExists(target)) {
     warn(
       `Both ${SETTINGS_FILE} and legacy ${LEGACY_SETTINGS_FILE} exist. Skipping migration to avoid overwriting ${SETTINGS_FILE}. Delete one of them manually and re-run.`
@@ -3777,7 +4112,7 @@ function ensure_agent_settings(project_root, package_root, profile, force, user_
     skip(`${SETTINGS_FILE} already exists`);
     return;
   }
-  mkdirp(path10.dirname(target));
+  mkdirp(path12.dirname(target));
   write_file(target, template_body);
   const user_type_value = profile_values["user_type"] ?? "";
   const suffix = user_type_value ? `, user_type=${user_type_value}` : "";
@@ -3790,7 +4125,7 @@ function ensure_vscode_bridge(project_root, package_type, force) {
   const plugin_path = plugin_paths[package_type] ?? "./plugin/agent-config";
   const bridge = { "chat.pluginLocations": { [plugin_path]: true } };
   return merge_json_file(
-    path10.join(project_root, ".vscode", "settings.json"),
+    path12.join(project_root, ".vscode", "settings.json"),
     bridge,
     force,
     ".vscode/settings.json"
@@ -3799,14 +4134,14 @@ function ensure_vscode_bridge(project_root, package_type, force) {
 function ensure_augment_bridge(project_root, force) {
   const bridge = { enabledPlugins: { "agent-config@event4u": true } };
   return merge_json_file(
-    path10.join(project_root, ".augment", "settings.json"),
+    path12.join(project_root, ".augment", "settings.json"),
     bridge,
     force,
     ".augment/settings.json"
   );
 }
-var AUGMENT_USER_DIR = path10.join(os3.homedir(), ".augment");
-var AUGMENT_USER_HOOKS_DIR = path10.join(AUGMENT_USER_DIR, "hooks");
+var AUGMENT_USER_DIR = path12.join(os3.homedir(), ".augment");
+var AUGMENT_USER_HOOKS_DIR = path12.join(AUGMENT_USER_DIR, "hooks");
 var AUGMENT_DISPATCHER_TRAMPOLINE = "augment-dispatcher.sh";
 var AUGMENT_LEGACY_TRAMPOLINES = [
   "augment-chat-history.sh",
@@ -3815,29 +4150,29 @@ var AUGMENT_LEGACY_TRAMPOLINES = [
   "augment-context-hygiene.sh"
 ];
 function _deploy_augment_trampoline(package_root, name, force) {
-  const src = path10.join(package_root, "scripts", "hooks", name);
+  const src = path12.join(package_root, "scripts", "hooks", name);
   if (!pathExists(src)) {
     skip(`augment trampoline missing in package: ${src}`);
     return null;
   }
   mkdirp(AUGMENT_USER_HOOKS_DIR);
-  const dst = path10.join(AUGMENT_USER_HOOKS_DIR, name);
+  const dst = path12.join(AUGMENT_USER_HOOKS_DIR, name);
   const src_text = readText(src);
   if (pathExists(dst) && readText(dst) === src_text && !force) {
     skip(`~/.augment/hooks/${name} already up to date`);
   } else {
     writeText(dst, src_text);
-    fs12.chmodSync(dst, 493);
+    fs14.chmodSync(dst, 493);
     success(`~/.augment/hooks/${name} installed`);
   }
   return dst;
 }
 function _remove_legacy_augment_trampolines() {
   for (const name of AUGMENT_LEGACY_TRAMPOLINES) {
-    const legacy = path10.join(AUGMENT_USER_HOOKS_DIR, name);
+    const legacy = path12.join(AUGMENT_USER_HOOKS_DIR, name);
     try {
       if (isFile(legacy)) {
-        fs12.unlinkSync(legacy);
+        fs14.unlinkSync(legacy);
         skip(`removed legacy ~/.augment/hooks/${name}`);
       }
     } catch (err) {
@@ -3857,7 +4192,7 @@ function ensure_augment_user_hooks(package_root, force) {
   }
   const settings_patch = { hooks: per_event };
   return merge_json_file(
-    path10.join(AUGMENT_USER_DIR, "settings.json"),
+    path12.join(AUGMENT_USER_DIR, "settings.json"),
     settings_patch,
     force,
     "~/.augment/settings.json"
@@ -3882,7 +4217,7 @@ function _heal_legacy_claude_plugin_ids(p) {
   return removed;
 }
 function ensure_claude_bridge(project_root, force) {
-  const target = path10.join(project_root, ".claude", "settings.json");
+  const target = path12.join(project_root, ".claude", "settings.json");
   const healed = _heal_legacy_claude_plugin_ids(target);
   for (const pid of healed) {
     success(`.claude/settings.json: removed stale plugin id \`${pid}\``);
@@ -3902,29 +4237,29 @@ function ensure_cursor_bridge(project_root, force) {
   }
   const bridge = { version: 1, hooks };
   return merge_json_file(
-    path10.join(project_root, ".cursor", "hooks.json"),
+    path12.join(project_root, ".cursor", "hooks.json"),
     bridge,
     force,
     ".cursor/hooks.json"
   );
 }
-var CURSOR_USER_DIR = path10.join(os3.homedir(), ".cursor");
-var CURSOR_USER_HOOKS_DIR = path10.join(CURSOR_USER_DIR, "hooks");
+var CURSOR_USER_DIR = path12.join(os3.homedir(), ".cursor");
+var CURSOR_USER_HOOKS_DIR = path12.join(CURSOR_USER_DIR, "hooks");
 var CURSOR_DISPATCHER_TRAMPOLINE = "cursor-dispatcher.sh";
 function ensure_cursor_user_hooks(package_root, force) {
-  const src = path10.join(package_root, "scripts", "hooks", CURSOR_DISPATCHER_TRAMPOLINE);
+  const src = path12.join(package_root, "scripts", "hooks", CURSOR_DISPATCHER_TRAMPOLINE);
   if (!pathExists(src)) {
     skip(`cursor trampoline missing in package: ${src}`);
     return [];
   }
   mkdirp(CURSOR_USER_HOOKS_DIR);
-  const dst = path10.join(CURSOR_USER_HOOKS_DIR, CURSOR_DISPATCHER_TRAMPOLINE);
+  const dst = path12.join(CURSOR_USER_HOOKS_DIR, CURSOR_DISPATCHER_TRAMPOLINE);
   const src_text = readText(src);
   if (pathExists(dst) && readText(dst) === src_text && !force) {
     skip(`~/.cursor/hooks/${CURSOR_DISPATCHER_TRAMPOLINE} already up to date`);
   } else {
     writeText(dst, src_text);
-    fs12.chmodSync(dst, 493);
+    fs14.chmodSync(dst, 493);
     success(`~/.cursor/hooks/${CURSOR_DISPATCHER_TRAMPOLINE} installed`);
   }
   const hooks = {};
@@ -3933,7 +4268,7 @@ function ensure_cursor_user_hooks(package_root, force) {
   }
   const settings_patch = { version: 1, hooks };
   return merge_json_file(
-    path10.join(CURSOR_USER_DIR, "hooks.json"),
+    path12.join(CURSOR_USER_DIR, "hooks.json"),
     settings_patch,
     force,
     "~/.cursor/hooks.json"
@@ -3968,12 +4303,12 @@ exit 0
 `;
 }
 function ensure_cline_bridge(project_root, force) {
-  const hooks_dir = path10.join(project_root, ".clinerules", "hooks");
+  const hooks_dir = path12.join(project_root, ".clinerules", "hooks");
   mkdirp(hooks_dir);
   const workspace_quoted = shlexQuote(resolvePath(project_root));
   let written = 0;
   for (const { slot, native } of hostBindings("cline")) {
-    const target = path10.join(hooks_dir, native);
+    const target = path12.join(hooks_dir, native);
     const body = clineProjectHookBody(native, slot, workspace_quoted);
     if (pathExists(target) && readText(target) === body && !force) {
       continue;
@@ -3983,7 +4318,7 @@ function ensure_cline_bridge(project_root, force) {
       continue;
     }
     writeText(target, body);
-    fs12.chmodSync(target, 493);
+    fs14.chmodSync(target, 493);
     written += 1;
   }
   if (written) {
@@ -3992,27 +4327,27 @@ function ensure_cline_bridge(project_root, force) {
     skip(".clinerules/hooks/ already up to date");
   }
 }
-var CLINE_USER_DIR = path10.join(os3.homedir(), "Documents", "Cline", "Hooks");
+var CLINE_USER_DIR = path12.join(os3.homedir(), "Documents", "Cline", "Hooks");
 var CLINE_DISPATCHER_TRAMPOLINE = "cline-dispatcher.sh";
 function ensure_cline_user_hooks(package_root, force) {
-  const src = path10.join(package_root, "scripts", "hooks", CLINE_DISPATCHER_TRAMPOLINE);
+  const src = path12.join(package_root, "scripts", "hooks", CLINE_DISPATCHER_TRAMPOLINE);
   if (!pathExists(src)) {
     skip(`cline trampoline missing in package: ${src}`);
     return;
   }
   mkdirp(CLINE_USER_DIR);
-  const trampoline = path10.join(CLINE_USER_DIR, CLINE_DISPATCHER_TRAMPOLINE);
+  const trampoline = path12.join(CLINE_USER_DIR, CLINE_DISPATCHER_TRAMPOLINE);
   const src_text = readText(src);
   if (pathExists(trampoline) && readText(trampoline) === src_text && !force) {
     skip(`~/Documents/Cline/Hooks/${CLINE_DISPATCHER_TRAMPOLINE} already up to date`);
   } else {
     writeText(trampoline, src_text);
-    fs12.chmodSync(trampoline, 493);
+    fs14.chmodSync(trampoline, 493);
     success(`~/Documents/Cline/Hooks/${CLINE_DISPATCHER_TRAMPOLINE} installed`);
   }
   const trampoline_quoted = shlexQuote(trampoline);
   for (const { slot, native } of hostBindings("cline")) {
-    const wrapper = path10.join(CLINE_USER_DIR, native);
+    const wrapper = path12.join(CLINE_USER_DIR, native);
     const body = `#!/usr/bin/env bash
 # Generated by event4u/agent-config \u2014 DO NOT EDIT.
 # User-scope Cline hook for ${native} \u2192 agent-config ${slot}.
@@ -4022,7 +4357,7 @@ exec ${trampoline_quoted} ${slot} ${native}
       continue;
     }
     writeText(wrapper, body);
-    fs12.chmodSync(wrapper, 493);
+    fs14.chmodSync(wrapper, 493);
   }
 }
 function _windsurf_dispatch_command(ac_event, native) {
@@ -4038,29 +4373,29 @@ function ensure_windsurf_bridge(project_root, force) {
   }
   const bridge = { hooks };
   return merge_json_file(
-    path10.join(project_root, ".windsurf", "hooks.json"),
+    path12.join(project_root, ".windsurf", "hooks.json"),
     bridge,
     force,
     ".windsurf/hooks.json"
   );
 }
-var WINDSURF_USER_DIR = path10.join(os3.homedir(), ".codeium", "windsurf");
-var WINDSURF_USER_HOOKS_DIR = path10.join(WINDSURF_USER_DIR, "hooks");
+var WINDSURF_USER_DIR = path12.join(os3.homedir(), ".codeium", "windsurf");
+var WINDSURF_USER_HOOKS_DIR = path12.join(WINDSURF_USER_DIR, "hooks");
 var WINDSURF_DISPATCHER_TRAMPOLINE = "windsurf-dispatcher.sh";
 function ensure_windsurf_user_hooks(package_root, force) {
-  const src = path10.join(package_root, "scripts", "hooks", WINDSURF_DISPATCHER_TRAMPOLINE);
+  const src = path12.join(package_root, "scripts", "hooks", WINDSURF_DISPATCHER_TRAMPOLINE);
   if (!pathExists(src)) {
     skip(`windsurf trampoline missing in package: ${src}`);
     return [];
   }
   mkdirp(WINDSURF_USER_HOOKS_DIR);
-  const dst = path10.join(WINDSURF_USER_HOOKS_DIR, WINDSURF_DISPATCHER_TRAMPOLINE);
+  const dst = path12.join(WINDSURF_USER_HOOKS_DIR, WINDSURF_DISPATCHER_TRAMPOLINE);
   const src_text = readText(src);
   if (pathExists(dst) && readText(dst) === src_text && !force) {
     skip(`~/.codeium/windsurf/hooks/${WINDSURF_DISPATCHER_TRAMPOLINE} already up to date`);
   } else {
     writeText(dst, src_text);
-    fs12.chmodSync(dst, 493);
+    fs14.chmodSync(dst, 493);
     success(`~/.codeium/windsurf/hooks/${WINDSURF_DISPATCHER_TRAMPOLINE} installed`);
   }
   const hooks = {};
@@ -4072,7 +4407,7 @@ function ensure_windsurf_user_hooks(package_root, force) {
   }
   const settings_patch = { hooks };
   return merge_json_file(
-    path10.join(WINDSURF_USER_DIR, "hooks.json"),
+    path12.join(WINDSURF_USER_DIR, "hooks.json"),
     settings_patch,
     force,
     "~/.codeium/windsurf/hooks.json"
@@ -4094,43 +4429,43 @@ function _gemini_hooks_dict(command_factory) {
 function ensure_gemini_bridge(project_root, force) {
   const bridge = { hooks: _gemini_hooks_dict(_gemini_dispatch_command) };
   return merge_json_file(
-    path10.join(project_root, ".gemini", "settings.json"),
+    path12.join(project_root, ".gemini", "settings.json"),
     bridge,
     force,
     ".gemini/settings.json"
   );
 }
-var GEMINI_USER_DIR = path10.join(os3.homedir(), ".gemini");
-var GEMINI_USER_HOOKS_DIR = path10.join(GEMINI_USER_DIR, "hooks");
+var GEMINI_USER_DIR = path12.join(os3.homedir(), ".gemini");
+var GEMINI_USER_HOOKS_DIR = path12.join(GEMINI_USER_DIR, "hooks");
 var GEMINI_DISPATCHER_TRAMPOLINE = "gemini-dispatcher.sh";
 function ensure_gemini_user_hooks(package_root, force) {
-  const src = path10.join(package_root, "scripts", "hooks", GEMINI_DISPATCHER_TRAMPOLINE);
+  const src = path12.join(package_root, "scripts", "hooks", GEMINI_DISPATCHER_TRAMPOLINE);
   if (!pathExists(src)) {
     skip(`gemini trampoline missing in package: ${src}`);
     return [];
   }
   mkdirp(GEMINI_USER_HOOKS_DIR);
-  const dst = path10.join(GEMINI_USER_HOOKS_DIR, GEMINI_DISPATCHER_TRAMPOLINE);
+  const dst = path12.join(GEMINI_USER_HOOKS_DIR, GEMINI_DISPATCHER_TRAMPOLINE);
   const src_text = readText(src);
   if (pathExists(dst) && readText(dst) === src_text && !force) {
     skip(`~/.gemini/hooks/${GEMINI_DISPATCHER_TRAMPOLINE} already up to date`);
   } else {
     writeText(dst, src_text);
-    fs12.chmodSync(dst, 493);
+    fs14.chmodSync(dst, 493);
     success(`~/.gemini/hooks/${GEMINI_DISPATCHER_TRAMPOLINE} installed`);
   }
   const settings_patch = {
     hooks: _gemini_hooks_dict((ac_event, native) => `${dst} ${ac_event} ${native}`)
   };
   return merge_json_file(
-    path10.join(GEMINI_USER_DIR, "settings.json"),
+    path12.join(GEMINI_USER_DIR, "settings.json"),
     settings_patch,
     force,
     "~/.gemini/settings.json"
   );
 }
 function ensure_copilot_bridge(project_root, force) {
-  const target = path10.join(project_root, ".github", "plugin", "marketplace.json");
+  const target = path12.join(project_root, ".github", "plugin", "marketplace.json");
   const bridge = {
     marketplace: {
       name: "event4u-agent-marketplace",
@@ -4173,7 +4508,7 @@ See \`docs/setup/per-ide/roocode.md\` for the full activation guide.
 Run \`./agent-config --help\` for available commands.
 `;
 function ensure_roocode_bridge(project_root, force) {
-  const target = path10.join(project_root, ".roo", "rules", "agent-config.md");
+  const target = path12.join(project_root, ".roo", "rules", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".roo/rules/agent-config.md already exists");
     return;
@@ -4195,7 +4530,7 @@ To wire Claude Desktop to this project's rules, run:
 Canonical rule and skill source: \`.augment/\` (see \`AGENTS.md\`).
 `;
 function ensure_claude_desktop_bridge(project_root, force) {
-  const target = path10.join(project_root, ".claude-desktop", "agent-config.md");
+  const target = path12.join(project_root, ".claude-desktop", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".claude-desktop/agent-config.md already exists");
     return;
@@ -4220,7 +4555,7 @@ Or pass \`--read .aider/agent-config.md\` on the command line.
 Canonical rule and skill source: \`.augment/\` (see \`AGENTS.md\`).
 `;
 function ensure_aider_bridge(project_root, force) {
-  const target = path10.join(project_root, ".aider", "agent-config.md");
+  const target = path12.join(project_root, ".aider", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".aider/agent-config.md already exists");
     return;
@@ -4239,7 +4574,7 @@ developers where the rules and skills live.
 Canonical rule and skill source: \`.augment/\` (see project \`AGENTS.md\`).
 `;
 function ensure_codex_bridge(project_root, force) {
-  const target = path10.join(project_root, ".codex", "agent-config.md");
+  const target = path12.join(project_root, ".codex", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".codex/agent-config.md already exists");
     return;
@@ -4257,7 +4592,7 @@ rules per session. The canonical rule and skill source lives under
 orientation).
 `;
 function ensure_continue_bridge(project_root, force) {
-  const target = path10.join(project_root, ".continue", "rules", "agent-config.md");
+  const target = path12.join(project_root, ".continue", "rules", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".continue/rules/agent-config.md already exists");
     return;
@@ -4288,7 +4623,7 @@ orientation).
 See \`docs/setup/per-ide/kilocode.md\` for the full activation guide.
 `;
 function ensure_kilocode_bridge(project_root, force) {
-  const target = path10.join(project_root, ".kilocode", "rules", "agent-config.md");
+  const target = path12.join(project_root, ".kilocode", "rules", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".kilocode/rules/agent-config.md already exists");
     return;
@@ -4315,7 +4650,7 @@ canonical source (or symlink it):
 Canonical rule and skill source: \`.augment/\` (see \`AGENTS.md\`).
 `;
 function ensure_zed_bridge(project_root, force) {
-  const target = path10.join(project_root, ".zed", "agent-config.md");
+  const target = path12.join(project_root, ".zed", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".zed/agent-config.md already exists");
     return;
@@ -4336,7 +4671,7 @@ rules into your JetBrains profile.
 Canonical rule and skill source: \`.augment/\` (see \`AGENTS.md\`).
 `;
 function ensure_jetbrains_bridge(project_root, force) {
-  const target = path10.join(project_root, ".jetbrains", "agent-config.md");
+  const target = path12.join(project_root, ".jetbrains", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".jetbrains/agent-config.md already exists");
     return;
@@ -4367,7 +4702,7 @@ session. The canonical rule and skill source lives under \`.augment/\`
 See \`docs/setup/per-ide/kiro.md\` for the full activation guide.
 `;
 function ensure_kiro_bridge(project_root, force) {
-  const target = path10.join(project_root, ".kiro", "steering", "agent-config.md");
+  const target = path12.join(project_root, ".kiro", "steering", "agent-config.md");
   if (pathExists(target) && !force) {
     skip(".kiro/steering/agent-config.md already exists");
     return;
@@ -4404,35 +4739,35 @@ var SMOKE_BRIDGE_PATHS = {
 };
 function dirHasEntries(p) {
   try {
-    return fs12.readdirSync(p).length > 0;
+    return fs14.readdirSync(p).length > 0;
   } catch {
     return false;
   }
 }
 function _resolve_tsx_invocation(scriptPath, scriptArgs) {
   const binName = process2.platform === "win32" ? "tsx.cmd" : "tsx";
-  let dir = path10.dirname(scriptPath);
+  let dir = path12.dirname(scriptPath);
   for (; ; ) {
-    const candidate = path10.join(dir, "node_modules", ".bin", binName);
+    const candidate = path12.join(dir, "node_modules", ".bin", binName);
     if (isFile(candidate)) {
       return { command: candidate, args: [scriptPath, ...scriptArgs] };
     }
-    const parent = path10.dirname(dir);
+    const parent = path12.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
   return { command: "npx", args: ["tsx", scriptPath, ...scriptArgs] };
 }
 function _smoke_test_hooks(project_root, package_root) {
-  const dispatcher = path10.join(package_root, "scripts", "hooks", "dispatch_hook.ts");
-  const manifest = path10.join(package_root, "scripts", "hook_manifest.yaml");
+  const dispatcher = path12.join(package_root, "scripts", "hooks", "dispatch_hook.ts");
+  const manifest = path12.join(package_root, "scripts", "hook_manifest.yaml");
   if (!isFile(dispatcher) || !isFile(manifest)) return 0;
   const failed = [];
   const skipped = [];
   const passed = [];
   for (const [platform, native] of smokeProbeEvents()) {
     const rel_bridge = SMOKE_BRIDGE_PATHS[platform] ?? "";
-    const bridge_path = rel_bridge ? path10.join(project_root, rel_bridge) : null;
+    const bridge_path = rel_bridge ? path12.join(project_root, rel_bridge) : null;
     const bridge_present = Boolean(
       bridge_path && (isFile(bridge_path) || isDir(bridge_path) && dirHasEntries(bridge_path))
     );
@@ -4632,9 +4967,9 @@ To remove this marker, delete this file.
 `;
 }
 var _CLAUDE_DESKTOP_BUNDLES_SUBPATH = "claude-desktop/bundles";
-var GLOBAL_ROOT = path10.join(os3.homedir(), ".event4u", "agent-config");
-var GLOBAL_USER_SETTINGS_PATH = path10.join(GLOBAL_ROOT, ".agent-user.yml");
-var GLOBAL_AGENT_SETTINGS_PATH = path10.join(GLOBAL_ROOT, ".agent-settings.yml");
+var GLOBAL_ROOT = path12.join(os3.homedir(), ".event4u", "agent-config");
+var GLOBAL_USER_SETTINGS_PATH = path12.join(GLOBAL_ROOT, ".agent-user.yml");
+var GLOBAL_AGENT_SETTINGS_PATH = path12.join(GLOBAL_ROOT, ".agent-settings.yml");
 function _bridge_marker(tool_id, scope) {
   if (scope === "global") return USER_SCOPE_PATHS[tool_id] ?? "";
   return PROJECT_BRIDGE_MARKERS[tool_id] ?? "";
@@ -4683,7 +5018,7 @@ function _load_yaml_doc(p) {
   return _isPlainObject(data) ? data : {};
 }
 function _load_default_settings(package_root) {
-  const template_source = path10.join(package_root, "src", "config", "agent-settings.template.yml");
+  const template_source = path12.join(package_root, "src", "config", "agent-settings.template.yml");
   if (!pathExists(template_source)) return {};
   let text;
   try {
@@ -4697,11 +5032,11 @@ function _load_default_settings(package_root) {
 }
 var RULE_LAYER_CHOICES = ["global", "project", "both-acknowledged"];
 function _suppress_rule_layer(project_root, suppress_dir) {
-  const target = path10.join(project_root, ".claude", "settings.local.json");
+  const target = path12.join(project_root, ".claude", "settings.local.json");
   const existing = pathExists(target) ? read_json_file(target) : {};
   let real_dir = suppress_dir;
   try {
-    real_dir = fs12.realpathSync(suppress_dir);
+    real_dir = fs14.realpathSync(suppress_dir);
   } catch {
     real_dir = suppress_dir;
   }
@@ -4712,8 +5047,8 @@ function _suppress_rule_layer(project_root, suppress_dir) {
   success(`.claude/settings.local.json: claudeMdExcludes += ${entry}`);
 }
 function _gate_rule_layer_overlap(project_root, layer, dry_run) {
-  const global_dir = path10.join(os3.homedir(), ".claude", "rules");
-  const project_dir = path10.join(project_root, ".claude", "rules");
+  const global_dir = path12.join(os3.homedir(), ".claude", "rules");
+  const project_dir = path12.join(project_root, ".claude", "rules");
   const g = readRuleLayer(global_dir);
   const p = readRuleLayer(project_dir);
   if (g === null || p === null) return true;
@@ -4784,7 +5119,7 @@ function _run_scope_prompt(opts, reason, custom_path) {
       fail("Custom-path prompt aborted (EOF on stdin)");
     }
     if (!raw) fail("Custom-path prompt requires a non-empty path");
-    cp = resolvePath(expanduser2(raw));
+    cp = resolvePath(expanduser3(raw));
     opts.custom_path = cp;
   }
   if (!state.QUIET) info(`Custom destination: ${cp}`);
@@ -4801,9 +5136,9 @@ function detect_scope(cwd) {
   if (pathExists(_resolve_settings_read(cwd))) {
     return ["project", `existing ${SETTINGS_FILE}`];
   }
-  const has_manifest = SCOPE_DETECT_MANIFESTS.find((m) => pathExists(path10.join(cwd, m))) ?? null;
-  const has_ai_dir = SCOPE_DETECT_AI_DIRS.find((d) => isDir(path10.join(cwd, d))) ?? null;
-  const has_ai_file = SCOPE_DETECT_AI_FILES.find((f) => pathExists(path10.join(cwd, f))) ?? null;
+  const has_manifest = SCOPE_DETECT_MANIFESTS.find((m) => pathExists(path12.join(cwd, m))) ?? null;
+  const has_ai_dir = SCOPE_DETECT_AI_DIRS.find((d) => isDir(path12.join(cwd, d))) ?? null;
+  const has_ai_file = SCOPE_DETECT_AI_FILES.find((f) => pathExists(path12.join(cwd, f))) ?? null;
   if (has_manifest && (has_ai_dir || has_ai_file)) {
     const marker = has_ai_dir || has_ai_file;
     return ["prompt", `manifest (${has_manifest}) + AI-tool config (${marker})`];
@@ -4824,7 +5159,7 @@ function readLineSyncRaw(promptText) {
   for (; ; ) {
     let n;
     try {
-      n = fs12.readSync(0, buf, 0, 1, null);
+      n = fs14.readSync(0, buf, 0, 1, null);
     } catch (err) {
       const code = err.code;
       if (code === "EAGAIN") {
@@ -4869,52 +5204,20 @@ function prompt_scope_choice(reason) {
   }
   fail("Scope prompt aborted (3 invalid replies); pass --scope=project|global to override");
 }
-function _sha256_of_file(p) {
-  return sha256OfFile(p);
-}
-function _file_entry(p, kind, hash_content) {
-  return {
-    path: p,
-    kind,
-    sha256: hash_content ? _sha256_of_file(p) : null
-  };
-}
-function _files_by_tool_from_deploy(deploy_results) {
-  const out = {};
-  for (const tool_id of Object.keys(deploy_results)) {
-    const [, , status, paths] = deploy_results[tool_id];
-    if (status === "deployed") {
-      out[tool_id] = paths.map((p) => _file_entry(p, "deployed", true));
-    } else if (status === "marker") {
-      out[tool_id] = paths.map((p) => _file_entry(p, "marker", true));
-    } else {
-      out[tool_id] = [];
-    }
-  }
-  return out;
-}
-function _files_by_tool_from_bridges(tools, project_root, scope) {
-  const out = {};
-  for (const tool_id of [...tools].sort()) {
-    const marker = _bridge_marker(tool_id, scope);
-    if (!marker) continue;
-    let marker_path = marker;
-    if (!path10.isAbsolute(marker_path)) {
-      marker_path = path10.join(project_root, marker_path);
-    }
-    out[tool_id] = [_file_entry(marker_path, "bridge", false)];
-  }
-  return out;
-}
 function _update_installed_tools_manifest(project_root, tools, scope, force, files_by_tool = null, merged_keys_by_tool = null) {
   const target = manifest_path(project_root);
   const existing = read_manifest(target) ?? {};
-  let entries = Array.isArray(existing["tools"]) ? [...existing["tools"]] : [];
+  const prior = readRecordedByTool(target, project_root);
+  const preserved = preservedIndex(tracker.conflictState.preserved, tracker.conflictState.staged);
+  let entries = hydrateRecordedInventories(
+    Array.isArray(existing["tools"]) ? [...existing["tools"]] : [],
+    prior
+  );
   const version = current_package_version();
   for (const tool_id of [...tools].sort()) {
     const marker = _bridge_marker(tool_id, scope);
     if (!marker) continue;
-    const files = files_by_tool ? files_by_tool[tool_id] ?? null : null;
+    const files = reconcileToolFiles(files_by_tool?.[tool_id], prior.get(tool_id), preserved);
     const merged_keys = merged_keys_by_tool ? merged_keys_by_tool[tool_id] ?? null : null;
     try {
       entries = upsert_tool(entries, {
@@ -4939,26 +5242,26 @@ function _update_installed_tools_manifest(project_root, tools, scope, force, fil
   }
   write_manifest(target, version, entries);
   if (!state.QUIET) {
-    const rel = isRelativeTo(target, project_root) ? path10.relative(project_root, target) : target;
+    const rel = isRelativeTo(target, project_root) ? path12.relative(project_root, target) : target;
     info(`Manifest updated: ${rel}`);
   }
   return 0;
 }
 function isRelativeTo(child, parent) {
-  const rel = path10.relative(parent, child);
-  return rel === "" || !rel.startsWith("..") && !path10.isAbsolute(rel);
+  const rel = path12.relative(parent, child);
+  return rel === "" || !rel.startsWith("..") && !path12.isAbsolute(rel);
 }
 function _resolve_package_root_for_global() {
   const here = resolvePath(_HERE);
-  const candidate = path10.dirname(path10.dirname(path10.dirname(here)));
-  if (!pathExists(path10.join(candidate, "src", "config", "profiles", "minimal.ini"))) {
+  const candidate = path12.dirname(path12.dirname(path12.dirname(here)));
+  if (!pathExists(path12.join(candidate, "src", "config", "profiles", "minimal.ini"))) {
     fail(
       `Could not locate agent-config package root from ${here}. Expected src/config/profiles/minimal.ini at the parent directory.`
     );
   }
   return candidate;
 }
-var CONSUMER_BRIDGE_MARKER_RELPATH = path10.join("agents", ".event4u-bridge.yml");
+var CONSUMER_BRIDGE_MARKER_RELPATH = path12.join("agents", ".event4u-bridge.yml");
 var MIGRATE_LEGACY_YAML_FILES = [".agent-settings.yml", ".agent-user.yml"];
 var MIGRATE_LEGACY_TOOL_DIRS = [".augment", ".claude", ".cursor"];
 var AGENT_CONFIG_PACKAGE_NAME = "@event4u/agent-config";
@@ -4966,7 +5269,7 @@ function _is_agent_config_source_repo(project_root) {
   if (process2.env["AGENT_CONFIG_CONSUMER_MODE"] === "1") {
     return [false, "consumer-mode-override"];
   }
-  const pkg_json = path10.join(project_root, "package.json");
+  const pkg_json = path12.join(project_root, "package.json");
   if (isFile(pkg_json)) {
     let data = {};
     try {
@@ -4978,13 +5281,13 @@ function _is_agent_config_source_repo(project_root) {
       return [true, "package.json:name"];
     }
   }
-  if (isDir(path10.join(project_root, ".agent-src.uncondensed"))) {
+  if (isDir(path12.join(project_root, ".agent-src.uncondensed"))) {
     return [true, ".agent-src.uncondensed/"];
   }
-  const packages_dir = path10.join(project_root, "packages");
+  const packages_dir = path12.join(project_root, "packages");
   if (isDir(packages_dir)) {
-    for (const child of fs12.readdirSync(packages_dir)) {
-      if (isDir(path10.join(packages_dir, child, ".agent-src.uncondensed"))) {
+    for (const child of fs14.readdirSync(packages_dir)) {
+      if (isDir(path12.join(packages_dir, child, ".agent-src.uncondensed"))) {
         return [true, `packages/${child}/.agent-src.uncondensed/`];
       }
     }
@@ -5002,17 +5305,17 @@ function _detect_legacy_for_migration(project_root) {
     }
     return [];
   }
-  if (isFile(path10.join(project_root, INSTALL_MODE_MARKER_REL))) return [];
+  if (isFile(path12.join(project_root, INSTALL_MODE_MARKER_REL))) return [];
   const found = [];
   for (const name of MIGRATE_LEGACY_YAML_FILES) {
-    if (isFile(path10.join(project_root, name))) {
+    if (isFile(path12.join(project_root, name))) {
       found.push(name);
-    } else if (isFile(path10.join(project_root, "settings", name))) {
+    } else if (isFile(path12.join(project_root, "settings", name))) {
       found.push(`settings/${name}`);
     }
   }
   for (const name of MIGRATE_LEGACY_TOOL_DIRS) {
-    const p = path10.join(project_root, name);
+    const p = path12.join(project_root, name);
     if (isDir(p) && !isSymlink(p)) {
       found.push(`${name}/`);
     }
@@ -5024,7 +5327,7 @@ function _prompt_migrate_to_global(project_root, artefacts) {
     process2.stdout.write("\n");
     warn("Legacy project-local artefacts detected \u2014 pre-ADR-020 layout:");
     for (const rel of artefacts) {
-      info(`  ${path10.join(project_root, rel)}`);
+      info(`  ${path12.join(project_root, rel)}`);
     }
     info("The unified `agent-config migrate` sweeps these in one pass.");
     info("The wizard recreates fresh config afterwards.");
@@ -5055,20 +5358,20 @@ function _run_migrate_to_global(project_root) {
 function _format_global_root_for_marker(global_root) {
   const home = resolvePath(os3.homedir());
   const resolved = resolvePath(global_root);
-  const rel = path10.relative(home, resolved);
-  if (rel === "" || rel.startsWith("..") || path10.isAbsolute(rel)) {
+  const rel = path12.relative(home, resolved);
+  if (rel === "" || rel.startsWith("..") || path12.isAbsolute(rel)) {
     return global_root;
   }
-  return `~/${rel.split(path10.sep).join("/")}`;
+  return `~/${rel.split(path12.sep).join("/")}`;
 }
 function _remove_legacy_consumer_bridge_marker(project_root, env = null) {
   const env_map = env ?? process2.env;
   if (env_map["AGENT_CONFIG_DEV_MODE"] === "1") return null;
-  if (isDir(path10.join(project_root, ".agent-src.uncondensed"))) return null;
-  const target = path10.join(project_root, CONSUMER_BRIDGE_MARKER_RELPATH);
+  if (isDir(path12.join(project_root, ".agent-src.uncondensed"))) return null;
+  const target = path12.join(project_root, CONSUMER_BRIDGE_MARKER_RELPATH);
   if (!isFile(target)) return null;
   try {
-    fs12.rmSync(target);
+    fs14.rmSync(target);
   } catch {
     return null;
   }
@@ -5082,7 +5385,7 @@ var PROJECT_ANCHOR_TOOLS = {
 function _write_per_tool_project_anchors(project_root, tools, env = null, now = null) {
   const env_map = env ?? process2.env;
   if (env_map["AGENT_CONFIG_DEV_MODE"] === "1") return [];
-  if (isDir(path10.join(project_root, ".agent-src.uncondensed"))) return [];
+  if (isDir(path12.join(project_root, ".agent-src.uncondensed"))) return [];
   const global_root_str = _format_global_root_for_marker(
     event4u_root(env_map)
   );
@@ -5091,8 +5394,8 @@ function _write_per_tool_project_anchors(project_root, tools, env = null, now =
   for (const tool_id of Object.keys(PROJECT_ANCHOR_TOOLS).sort()) {
     const rel_path = PROJECT_ANCHOR_TOOLS[tool_id];
     if (!tools.has(tool_id)) continue;
-    const target = path10.join(project_root, rel_path);
-    mkdirp(path10.dirname(target));
+    const target = path12.join(project_root, rel_path);
+    mkdirp(path12.dirname(target));
     const body = `# event4u/agent-config \u2014 per-tool project anchor (auto-written).
 # Spec: docs/contracts/consumer-bridge.md \xA7 Per-tool anchor strategy.
 # Tool: ${tool_id}. Resolves the global install directly \u2014 no
@@ -5110,7 +5413,7 @@ installed_at: ${stamp}
 }
 var PACKAGE_TAG_ID = "event4u/agent-config";
 function _inject_package_tag(target, source, package_root) {
-  if (path10.extname(target) !== ".md") return;
+  if (path12.extname(target) !== ".md") return;
   let text;
   try {
     text = readText(target);
@@ -5138,8 +5441,8 @@ function _inject_package_tag(target, source, package_root) {
       resolved_src = source;
     }
     if (package_root !== null) {
-      const rel = path10.relative(resolvePath(package_root), resolved_src);
-      if (rel !== "" && !rel.startsWith("..") && !path10.isAbsolute(rel)) {
+      const rel = path12.relative(resolvePath(package_root), resolved_src);
+      if (rel !== "" && !rel.startsWith("..") && !path12.isAbsolute(rel)) {
         source_value = rel;
       } else {
         source_value = resolved_src;
@@ -5174,12 +5477,23 @@ function _escapes_package_root(resolved, package_root) {
   if (package_root === null) return false;
   let root;
   try {
-    root = fs12.realpathSync(package_root);
+    root = fs14.realpathSync(package_root);
   } catch {
     return false;
   }
   return !is_ancestor(root, resolved);
 }
+function _log_tx_entry(kind, target) {
+  try {
+    appendTxLog(getLogPath(), {
+      ts: (/* @__PURE__ */ new Date()).toISOString(),
+      kind,
+      path: target,
+      sha256: kind === "write" ? sha256OfFile(target) : null
+    });
+  } catch {
+  }
+}
 function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null, file_filter = null) {
   let written = 0;
   let skipped = 0;
@@ -5189,7 +5503,7 @@ function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null,
     if (file_filter !== null && !file_filter(src)) return [0, 0, written_paths];
     let resolved_src = src;
     try {
-      resolved_src = fs12.realpathSync(src);
+      resolved_src = fs14.realpathSync(src);
     } catch {
       resolved_src = src;
     }
@@ -5197,22 +5511,27 @@ function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null,
       warn(`refused: ${src} dereferences outside the package root \u2014 not copied`);
       return [0, 0, written_paths];
     }
-    mkdirp(path10.dirname(dest));
-    const decision = _resolve_file_conflict(dest, force);
-    if (decision === "skip") return [0, 1, written_paths];
-    fs12.copyFileSync(src, dest);
+    mkdirp(path12.dirname(dest));
+    const decision = tracker.resolve(dest, force);
+    if (decision === "preserve") {
+      tracker.preserve(dest, resolved_src, package_root);
+      _log_tx_entry("skip", dest);
+      return [0, 1, written_paths];
+    }
+    fs14.copyFileSync(src, dest);
     _inject_package_tag(dest, src, package_root);
+    _log_tx_entry("write", dest);
     written_paths.push(dest);
     return [1, 0, written_paths];
   }
   mkdirp(dest);
   const walk = (node) => {
     const acc = [];
-    const names = fs12.readdirSync(node).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+    const names = fs14.readdirSync(node).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
     for (const name of names) {
-      const entry = path10.join(node, name);
+      const entry = path12.join(node, name);
       acc.push(entry);
-      const lst = fs12.lstatSync(entry);
+      const lst = fs14.lstatSync(entry);
       if (lst.isDirectory() && !lst.isSymbolicLink()) {
         acc.push(...walk(entry));
       }
@@ -5220,9 +5539,9 @@ function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null,
     return acc;
   };
   for (const entry of walk(src)) {
-    const rel = path10.relative(src, entry);
-    const target = path10.join(dest, rel);
-    const lst = fs12.lstatSync(entry);
+    const rel = path12.relative(src, entry);
+    const target = path12.join(dest, rel);
+    const lst = fs14.lstatSync(entry);
     if (lst.isDirectory() && !lst.isSymbolicLink()) {
       mkdirp(target);
       continue;
@@ -5230,8 +5549,8 @@ function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null,
     let resolvedIsDir = false;
     let resolved = entry;
     try {
-      resolved = fs12.realpathSync(entry);
-      resolvedIsDir = fs12.statSync(entry).isDirectory();
+      resolved = fs14.realpathSync(entry);
+      resolvedIsDir = fs14.statSync(entry).isDirectory();
     } catch {
       resolvedIsDir = false;
     }
@@ -5256,14 +5575,17 @@ function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null,
     if (file_filter !== null && !file_filter(entry)) {
       continue;
     }
-    const decision = _resolve_file_conflict(target, force);
-    if (decision === "skip") {
+    const decision = tracker.resolve(target, force);
+    if (decision === "preserve") {
+      tracker.preserve(target, resolved, package_root);
       skipped += 1;
+      _log_tx_entry("skip", target);
       continue;
     }
-    mkdirp(path10.dirname(target));
-    fs12.copyFileSync(resolved, target);
+    mkdirp(path12.dirname(target));
+    fs14.copyFileSync(resolved, target);
     _inject_package_tag(target, resolved, package_root);
+    _log_tx_entry("write", target);
     written += 1;
     written_paths.push(target);
   }
@@ -5272,12 +5594,17 @@ function _copy_dir_dereferencing_symlinks(src, dest, force, package_root = null,
 function _claude_desktop_bundles_dir() {
   return write_target(_CLAUDE_DESKTOP_BUNDLES_SUBPATH);
 }
-function _write_claude_desktop_marker(_force, lockfile_path2, bundles_dir, bundle_count) {
-  const anchor = expanduser2(USER_SCOPE_PATHS["claude-desktop"]);
-  const target = path10.join(anchor, "agent-config.md");
+function _write_claude_desktop_marker(force, lockfile_path2, bundles_dir, bundle_count) {
+  const anchor = expanduser3(USER_SCOPE_PATHS["claude-desktop"]);
+  const target = path12.join(anchor, "agent-config.md");
   mkdirp(anchor);
   const body = claudeDesktopMarkerBody(lockfile_path2, anchor, bundles_dir, bundle_count);
+  if (tracker.resolve(target, force) === "preserve") {
+    tracker.preserveContent(target, body);
+    return [0, 1, []];
+  }
   writeText(target, body);
+  _log_tx_entry("write", target);
   return [1, 0, [target]];
 }
 function _deploy_claude_desktop(force, package_root, lockfile_path2) {
@@ -5298,23 +5625,23 @@ function _apply_claude_flat_command_wrappers(anchor, package_root, current_files
   const wrapped = [];
   const collisions = [];
   const reserved = [];
-  const commands_dir = path10.join(anchor, "commands");
+  const commands_dir = path12.join(anchor, "commands");
   let flat_entries = [];
   try {
-    flat_entries = fs12.readdirSync(commands_dir).filter((f) => f.endsWith(".md"));
+    flat_entries = fs14.readdirSync(commands_dir).filter((f) => f.endsWith(".md"));
   } catch {
   }
   for (const fname of flat_entries.sort()) {
     const slug = fname.slice(0, -".md".length);
     if (!is_claude_builtin_name(slug)) continue;
-    fs12.rmSync(path10.join(commands_dir, fname), { force: true });
+    fs14.rmSync(path12.join(commands_dir, fname), { force: true });
     current_files.delete(`commands/${fname}`);
     reserved.push(slug);
   }
   const eligible = new Set(_CLAUDE_FLAT_WRAPPER_EXTRA);
   try {
     const manifest = JSON.parse(
-      fs12.readFileSync(path10.join(package_root, "dist", "discovery", "discovery-manifest.json"), "utf8")
+      fs14.readFileSync(path12.join(package_root, "dist", "discovery", "discovery-manifest.json"), "utf8")
     );
     for (const a of manifest.artefacts ?? []) {
       if (a.category !== "command" || typeof a.slug !== "string") continue;
@@ -5325,22 +5652,22 @@ function _apply_claude_flat_command_wrappers(anchor, package_root, current_files
   }
   for (const slug of [...eligible].sort()) {
     const flat_rel = `commands/${slug}.md`;
-    const flat_abs = path10.join(anchor, "commands", `${slug}.md`);
-    if (!fs12.existsSync(flat_abs)) continue;
-    const skill_dir = path10.join(anchor, "skills", slug);
-    if (fs12.existsSync(skill_dir)) {
+    const flat_abs = path12.join(anchor, "commands", `${slug}.md`);
+    if (!fs14.existsSync(flat_abs)) continue;
+    const skill_dir = path12.join(anchor, "skills", slug);
+    if (fs14.existsSync(skill_dir)) {
       collisions.push(slug);
       continue;
     }
-    let body = fs12.readFileSync(flat_abs, "utf8");
+    let body = fs14.readFileSync(flat_abs, "utf8");
     if (body.startsWith("---\n") && !/^name:/m.test(body.split("\n---")[0] ?? "")) {
       body = body.replace("---\n", `---
 name: ${slug}
 `);
     }
-    fs12.mkdirSync(skill_dir, { recursive: true });
-    fs12.writeFileSync(path10.join(skill_dir, "SKILL.md"), body, "utf8");
-    fs12.rmSync(flat_abs, { force: true });
+    fs14.mkdirSync(skill_dir, { recursive: true });
+    fs14.writeFileSync(path12.join(skill_dir, "SKILL.md"), body, "utf8");
+    fs14.rmSync(flat_abs, { force: true });
     current_files.delete(flat_rel);
     current_files.add(`skills/${slug}/SKILL.md`);
     wrapped.push(slug);
@@ -5366,14 +5693,14 @@ function _deploy_global_content(tools, force, package_root, lockfile_path2) {
       results[tool_id] = [0, 0, "unsupported", []];
       continue;
     }
-    const anchor = expanduser2(anchor_raw);
+    const anchor = expanduser3(anchor_raw);
     let written_total = 0;
     let skipped_total = 0;
     const written_paths = [];
     let current_files = /* @__PURE__ */ new Set();
     for (const [src_rel, dest_sub] of plan) {
-      const src = path10.join(package_root, src_rel);
-      const dest = dest_sub ? path10.join(anchor, dest_sub) : anchor;
+      const src = path12.join(package_root, src_rel);
+      const dest = dest_sub ? path12.join(anchor, dest_sub) : anchor;
       const rule_filter = _rule_filter_for_source(src_rel, rule_scope);
       const [w, s, paths] = _copy_dir_dereferencing_symlinks(
         src,
@@ -5397,11 +5724,12 @@ function _deploy_global_content(tools, force, package_root, lockfile_path2) {
     if (tool_id === "claude-code") {
       const res = _apply_claude_flat_command_wrappers(anchor, package_root, current_files);
       rewriteAndReport(
-        path10.join(anchor, "rules"),
+        path12.join(anchor, "rules"),
         state.QUIET,
         info,
         warn,
-        res
+        res,
+        new Set(tracker.conflictState.preserved.map((p) => path12.resolve(p)))
       );
     }
     const missing_targets = _verify_deploy_targets(anchor, plan);
@@ -5444,10 +5772,10 @@ function _deploy_global_content(tools, force, package_root, lockfile_path2) {
     results[tool_id] = [written_total, skipped_total, "deployed", written_paths];
     if (tool_id === "claude-code") {
       try {
-        const manifest = path10.join(package_root, "src", "scripts", "hook_manifest.yaml");
+        const manifest = path12.join(package_root, "src", "scripts", "hook_manifest.yaml");
         const matrix = build_claude_hook_matrix(manifest);
         const res = ensure_managed_hooks(
-          path10.join(anchor, "settings.json"),
+          path12.join(anchor, "settings.json"),
           matrix
         );
         if (!state.QUIET) {
@@ -5481,10 +5809,10 @@ function _preview_global_reap(tools, package_root) {
     if (plan === void 0) continue;
     const anchor_raw = USER_SCOPE_PATHS[tool_id];
     if (!anchor_raw) continue;
-    const anchor = expanduser2(anchor_raw);
+    const anchor = expanduser3(anchor_raw);
     let current_files = /* @__PURE__ */ new Set();
     for (const [src_rel, dest_sub] of plan) {
-      const src = path10.join(package_root, src_rel);
+      const src = path12.join(package_root, src_rel);
       current_files = setUnion(
         current_files,
         expected_deploy_files(
@@ -5518,14 +5846,14 @@ function _preview_global_reap(tools, package_root) {
 function _verify_deploy_targets(anchor, plan) {
   const missing = [];
   for (const [, dest_sub] of plan) {
-    const target = dest_sub ? path10.join(anchor, dest_sub) : anchor;
+    const target = dest_sub ? path12.join(anchor, dest_sub) : anchor;
     const label = dest_sub || ".";
     if (!isDir(target)) {
       missing.push(label);
       continue;
     }
     try {
-      const entries = fs12.readdirSync(target);
+      const entries = fs14.readdirSync(target);
       if (entries.length === 0) missing.push(label);
     } catch {
       missing.push(label);
@@ -5543,9 +5871,9 @@ function _resolve_global_settings_doc() {
 }
 function _resolve_global_settings_path() {
   const root = event4u_root();
-  const canonical = path10.join(root, "settings", SETTINGS_FILE);
+  const canonical = path12.join(root, "settings", SETTINGS_FILE);
   if (pathExists(canonical)) return canonical;
-  const legacy = path10.join(root, SETTINGS_FILE);
+  const legacy = path12.join(root, SETTINGS_FILE);
   if (pathExists(legacy)) return legacy;
   return null;
 }
@@ -5656,7 +5984,7 @@ function install_global(tools, force, project_root = null, core_only = false) {
     info(`  schema_version=1, agent_config_version=${installed_version}`);
     info(`  tools=${merged_tools.join(",")}`);
   }
-  if (project_root !== null && pathExists(_resolve_settings_read(project_root)) && !isDir(path10.join(project_root, ".agent-src.uncondensed"))) {
+  if (project_root !== null && pathExists(_resolve_settings_read(project_root)) && !isDir(path12.join(project_root, ".agent-src.uncondensed"))) {
     const drift = collect_drift(project_root);
     if (!state.QUIET) {
       process2.stdout.write("\n");
@@ -5770,19 +6098,19 @@ function install_global(tools, force, project_root = null, core_only = false) {
       }
     }
   }
-  if (project_root !== null && pathExists(_resolve_settings_read(project_root)) && !isDir(path10.join(project_root, ".agent-src.uncondensed"))) {
-    const files_by_tool = _files_by_tool_from_deploy(deploy_results);
+  if (project_root !== null && pathExists(_resolve_settings_read(project_root)) && !isDir(path12.join(project_root, ".agent-src.uncondensed"))) {
+    const files_by_tool = filesByToolFromDeploy(deploy_results);
     const rc = _update_installed_tools_manifest(project_root, tools, "global", force, files_by_tool);
     if (rc !== 0) return rc;
     const removed_marker = _remove_legacy_consumer_bridge_marker(project_root);
     if (removed_marker !== null && !state.QUIET) {
-      const rel = isRelativeTo(removed_marker, project_root) ? path10.relative(project_root, removed_marker) : removed_marker;
+      const rel = isRelativeTo(removed_marker, project_root) ? path12.relative(project_root, removed_marker) : removed_marker;
       info(`Removed legacy bridge marker: ${rel}`);
     }
     const anchor_paths = _write_per_tool_project_anchors(project_root, tools);
     if (anchor_paths.length > 0 && !state.QUIET) {
       for (const p of anchor_paths) {
-        const rel = isRelativeTo(p, project_root) ? path10.relative(project_root, p) : p;
+        const rel = isRelativeTo(p, project_root) ? path12.relative(project_root, p) : p;
         info(`Project anchor written: ${rel}`);
       }
     }
@@ -5818,8 +6146,8 @@ function install_global(tools, force, project_root = null, core_only = false) {
 }
 function _catalogue_truncation_warnings(deploy_results, project_root) {
   const log_candidates = [
-    path10.join(event4u_root(), "state", "skill-catalogue.jsonl"),
-    ...project_root ? [path10.join(project_root, OBSERVATION_LOG)] : []
+    path12.join(event4u_root(), "state", "skill-catalogue.jsonl"),
+    ...project_root ? [path12.join(project_root, OBSERVATION_LOG)] : []
   ];
   const records = log_candidates.flatMap((p) => readObservationLog(p));
   if (records.length === 0) return [];
@@ -5833,7 +6161,7 @@ function _catalogue_truncation_warnings(deploy_results, project_root) {
     if (limit === void 0) continue;
     const anchor_raw = USER_SCOPE_PATHS[tool_id];
     if (!anchor_raw) continue;
-    const volume = measureCatalogueVolume(tool_id, expanduser2(anchor_raw));
+    const volume = measureCatalogueVolume(tool_id, expanduser3(anchor_raw));
     const warning = catalogueLimitWarning(volume, limit);
     if (warning !== null) lines.push(warning);
   }
@@ -5842,19 +6170,19 @@ function _catalogue_truncation_warnings(deploy_results, project_root) {
 function _scoped_migration_notice(deploy_results, project_root, package_root, probe) {
   if (!isInteractiveSession(probe)) return [];
   const log_candidates = [
-    path10.join(event4u_root(), "state", "skill-catalogue.jsonl"),
-    ...project_root ? [path10.join(project_root, OBSERVATION_LOG)] : []
+    path12.join(event4u_root(), "state", "skill-catalogue.jsonl"),
+    ...project_root ? [path12.join(project_root, OBSERVATION_LOG)] : []
   ];
   const limits = knownHostLimits(log_candidates.flatMap((p) => readObservationLog(p)));
   if (limits.size === 0) return [];
   const resolved = _resolve_scoped_projection(package_root);
-  const settings_path = _resolve_global_settings_path() ?? path10.join(event4u_root(), "settings", SETTINGS_FILE);
+  const settings_path = _resolve_global_settings_path() ?? path12.join(event4u_root(), "settings", SETTINGS_FILE);
   for (const tool_id of Object.keys(deploy_results).sort()) {
     const [, , status] = deploy_results[tool_id];
     if (status !== "deployed") continue;
     const anchor_raw = USER_SCOPE_PATHS[tool_id];
     if (!anchor_raw) continue;
-    const volume = measureCatalogueVolume(tool_id, expanduser2(anchor_raw));
+    const volume = measureCatalogueVolume(tool_id, expanduser3(anchor_raw));
     const eligibility = migrationEligibility(
       tool_id,
       resolved.mode,
@@ -5867,8 +6195,8 @@ function _scoped_migration_notice(deploy_results, project_root, package_root, pr
   }
   return [];
 }
-var SETTINGS_SURFACE_REL = path10.join("state", "settings-surface.json");
-var SETTINGS_DELTA_REL = path10.join("state", "settings-delta.json");
+var SETTINGS_SURFACE_REL = path12.join("state", "settings-surface.json");
+var SETTINGS_DELTA_REL = path12.join("state", "settings-delta.json");
 function _current_settings_surface(version) {
   const jsonSchema = zodToJsonSchema(settingsSchema, {
     name: "AgentSettings",
@@ -5879,20 +6207,20 @@ function _current_settings_surface(version) {
 }
 function _write_settings_surface_snapshot(installed_version) {
   const root = event4u_root();
-  const surface_path = path10.join(root, SETTINGS_SURFACE_REL);
-  const delta_path = path10.join(root, SETTINGS_DELTA_REL);
+  const surface_path = path12.join(root, SETTINGS_SURFACE_REL);
+  const delta_path = path12.join(root, SETTINGS_DELTA_REL);
   const next = _current_settings_surface(installed_version);
   let previous = null;
   try {
-    const parsed = JSON.parse(fs12.readFileSync(surface_path, "utf8"));
+    const parsed = JSON.parse(fs14.readFileSync(surface_path, "utf8"));
     if (parsed !== null && typeof parsed === "object" && parsed.entries !== void 0) previous = parsed;
   } catch {
   }
   if (previous !== null && previous.version !== next.version) {
     const delta = computeSurfaceDelta(previous, next);
     if (delta.changes.length > 0) {
-      fs12.mkdirSync(path10.dirname(delta_path), { recursive: true, mode: 448 });
-      fs12.writeFileSync(delta_path, `${JSON.stringify(delta, null, 2)}
+      fs14.mkdirSync(path12.dirname(delta_path), { recursive: true, mode: 448 });
+      fs14.writeFileSync(delta_path, `${JSON.stringify(delta, null, 2)}
 `, { mode: 384 });
       if (!state.QUIET) {
         const counts = {};
@@ -5904,8 +6232,8 @@ function _write_settings_surface_snapshot(installed_version) {
       }
     }
   }
-  fs12.mkdirSync(path10.dirname(surface_path), { recursive: true, mode: 448 });
-  fs12.writeFileSync(surface_path, `${JSON.stringify(next, null, 2)}
+  fs14.mkdirSync(path12.dirname(surface_path), { recursive: true, mode: 448 });
+  fs14.writeFileSync(surface_path, `${JSON.stringify(next, null, 2)}
 `, { mode: 384 });
 }
 function arrayStrEqual(a, b) {
@@ -6125,13 +6453,13 @@ function _minimal_templates_root() {
   const chain = [start];
   let cur = start;
   for (; ; ) {
-    const parent = path10.dirname(cur);
+    const parent = path12.dirname(cur);
     if (parent === cur) break;
     chain.push(parent);
     cur = parent;
   }
   for (const ancestor of chain) {
-    const candidate = path10.join(ancestor, "src", "templates", "minimal");
+    const candidate = path12.join(ancestor, "src", "templates", "minimal");
     if (isDir(candidate)) return candidate;
   }
   fail("Could not locate src/templates/minimal/ \u2014 package install is corrupt.");
@@ -6139,9 +6467,9 @@ function _minimal_templates_root() {
 var INSTALL_MODE_MARKER_REL = "agents/.agent-state/install-mode.txt";
 function _write_install_mode_marker(project_root, mode) {
   if (mode !== "minimal" && mode !== "full") return;
-  const marker = path10.join(project_root, INSTALL_MODE_MARKER_REL);
+  const marker = path12.join(project_root, INSTALL_MODE_MARKER_REL);
   try {
-    mkdirp(path10.dirname(marker));
+    mkdirp(path12.dirname(marker));
     writeText(marker, `${mode}
 `);
   } catch {
@@ -6150,7 +6478,7 @@ function _write_install_mode_marker(project_root, mode) {
 function install_minimal(target_root_in, force, user_type = "") {
   let target_root = resolvePath(target_root_in);
   mkdirp(target_root);
-  const parent = path10.dirname(target_root);
+  const parent = path12.dirname(target_root);
   if (parent !== target_root) {
     const existing = find_project_root_with_anchor(parent);
     if (existing !== null && existing[0] !== target_root) {
@@ -6161,21 +6489,21 @@ function install_minimal(target_root_in, force, user_type = "") {
     }
   }
   const templates = _minimal_templates_root();
-  const settings_src = path10.join(templates, SETTINGS_FILE);
-  const overrides_gitkeep_src = path10.join(templates, "overrides-gitkeep");
-  const overrides_readme_src = path10.join(templates, "agents-overrides-readme.md");
+  const settings_src = path12.join(templates, SETTINGS_FILE);
+  const overrides_gitkeep_src = path12.join(templates, "overrides-gitkeep");
+  const overrides_readme_src = path12.join(templates, "agents-overrides-readme.md");
   if (!isFile(settings_src)) fail(`Bundled minimal settings template missing under ${templates}`);
   if (!isFile(overrides_gitkeep_src) || !isFile(overrides_readme_src)) {
     fail(`Bundled overrides scaffold templates missing under ${templates}`);
   }
   info(`Minimal init \u2192 ${target_root}`);
-  const overrides_root = path10.join(target_root, "agents", "overrides");
+  const overrides_root = path12.join(target_root, "agents", "overrides");
   mkdirp(overrides_root);
   const gitkeep_body = readText(overrides_gitkeep_src);
   for (const sub of ["rules", "skills", "commands"]) {
-    const sub_dir = path10.join(overrides_root, sub);
+    const sub_dir = path12.join(overrides_root, sub);
     mkdirp(sub_dir);
-    const gitkeep_dst = path10.join(sub_dir, ".gitkeep");
+    const gitkeep_dst = path12.join(sub_dir, ".gitkeep");
     if (pathExists(gitkeep_dst) && !force) {
       skip(`agents/overrides/${sub}/.gitkeep already exists (use --force to overwrite)`);
     } else {
@@ -6183,7 +6511,7 @@ function install_minimal(target_root_in, force, user_type = "") {
       success(`Wrote agents/overrides/${sub}/.gitkeep`);
     }
   }
-  const readme_dst = path10.join(overrides_root, "README.md");
+  const readme_dst = path12.join(overrides_root, "README.md");
   if (pathExists(readme_dst) && !force) {
     skip("agents/overrides/README.md already exists (use --force to overwrite)");
   } else {
@@ -6201,14 +6529,14 @@ function install_minimal(target_root_in, force, user_type = "") {
 personal:
   user_type: ${user_type}
 `;
-      mkdirp(path10.dirname(settings_dst));
+      mkdirp(path12.dirname(settings_dst));
       writeText(settings_dst, body);
       success(`Wrote ${SETTINGS_FILE} (user_type=${user_type})`);
     }
   }
   const removed_marker = _remove_legacy_consumer_bridge_marker(target_root);
   if (removed_marker !== null) {
-    const rel = isRelativeTo(removed_marker, target_root) ? path10.relative(target_root, removed_marker) : removed_marker;
+    const rel = isRelativeTo(removed_marker, target_root) ? path12.relative(target_root, removed_marker) : removed_marker;
     success(`Removed legacy bridge marker: ${rel}`);
   }
   _write_install_mode_marker(target_root, "minimal");
@@ -6282,7 +6610,7 @@ function run_interactive_init(project_root, force) {
     );
     return 0;
   }
-  const target = path10.join(project_root, _LOCAL_CONFIG_FILE);
+  const target = path12.join(project_root, _LOCAL_CONFIG_FILE);
   if (pathExists(target) && !force) {
     warn(
       `${_LOCAL_CONFIG_FILE} already exists; re-run with --force to overwrite. Skipping interactive init.`
@@ -6309,7 +6637,7 @@ function run_interactive_init(project_root, force) {
     warn(`Could not write ${target}: ${String(exc)}`);
     return 1;
   }
-  success(`Wrote ${path10.relative(project_root, target)} (${user_type} / ${stack} / ${verbosity})`);
+  success(`Wrote ${path12.relative(project_root, target)} (${user_type} / ${stack} / ${verbosity})`);
   return 0;
 }
 var _WIZARD_READY_RE = /^WIZARD_READY (http:\/\/(?:127\.0\.0\.1|localhost):\d+\/\S*)\r?$/;
@@ -6327,12 +6655,12 @@ function _wizard_should_launch(opts) {
   return [true, ""];
 }
 function _wizard_cli_dist(_project_root) {
-  const package_root = path10.dirname(path10.dirname(path10.dirname(resolvePath(_HERE))));
-  const cli = path10.join(package_root, "dist", "cli", "agent-config.js");
+  const package_root = path12.dirname(path12.dirname(path12.dirname(resolvePath(_HERE))));
+  const cli = path12.join(package_root, "dist", "cli", "agent-config.js");
   return pathExists(cli) ? cli : null;
 }
 function _server_info_path() {
-  return path10.join(os3.homedir(), ".event4u", "agent-config", "local-server.json");
+  return path12.join(os3.homedir(), ".event4u", "agent-config", "local-server.json");
 }
 function _pid_is_agent_config(pid) {
   let res;
@@ -6349,7 +6677,7 @@ function _pid_is_agent_config(pid) {
 }
 function unlinkMissingOk(p) {
   try {
-    fs12.unlinkSync(p);
+    fs14.unlinkSync(p);
   } catch {
   }
 }
@@ -6427,14 +6755,14 @@ function _wizard_spawn(project_root, pass_project_root = true) {
 }
 function _wizard_run_sync(cmd, env, cli) {
   const total = _WIZARD_TIMEOUTS.reduce((a, b) => a + b, 0);
-  const log_path = path10.join(
+  const log_path = path12.join(
     os3.tmpdir(),
     `agent-config-wizard-${process2.pid}-${Date.now()}.log`
   );
   let child;
   let log_fd = null;
   try {
-    log_fd = fs12.openSync(log_path, "w");
+    log_fd = fs14.openSync(log_path, "w");
     child = spawn(cmd[0], cmd.slice(1), {
       env,
       detached: true,
@@ -6452,7 +6780,7 @@ function _wizard_run_sync(cmd, env, cli) {
   } finally {
     if (log_fd !== null) {
       try {
-        fs12.closeSync(log_fd);
+        fs14.closeSync(log_fd);
       } catch {
       }
     }
@@ -6702,8 +7030,8 @@ function main2(argv) {
     const target_root = resolvePath(
       opts.custom_path || opts.project || process2.env["PROJECT_ROOT"] || process2.cwd()
     );
-    const minimal_package_root = path10.dirname(
-      path10.dirname(path10.dirname(_minimal_templates_root()))
+    const minimal_package_root = path12.dirname(
+      path12.dirname(path12.dirname(_minimal_templates_root()))
     );
     const validated_user_type = _validate_user_type(minimal_package_root, opts.user_type);
     return install_minimal(target_root, opts.force, validated_user_type);
@@ -6727,19 +7055,25 @@ function main2(argv) {
       const rc3 = _run_migrate_to_global(detect_root);
       if (rc3 !== 0) return rc3;
     }
-    const rc2 = install_global(parsed_tools, opts.force, detect_root, opts.core_only);
+    tracker.begin(detect_root);
+    const rc2 = tracker.finalizeRc(
+      install_global(parsed_tools, opts.force, detect_root, opts.core_only)
+    );
     _emit_progress_terminal(rc2);
-    if (rc2 === 0 && wizard_handoff) {
-      return _wizard_spawn(detect_root, false);
+    if ((rc2 === 0 || rc2 === EXIT_COMPLETED_WITH_CONFLICTS) && wizard_handoff) {
+      const wizard_rc = _wizard_spawn(detect_root, false);
+      return wizard_rc === 0 ? rc2 : wizard_rc;
     }
     return rc2;
   }
   const project_root = custom_path || resolvePath(opts.project || process2.env["PROJECT_ROOT"] || process2.cwd());
-  const is_first_run = !pathExists(path10.join(project_root, SETTINGS_FILE));
-  const rc = _main_project_install(opts, project_root, parsed_tools, is_first_run);
+  const is_first_run = !pathExists(path12.join(project_root, SETTINGS_FILE));
+  tracker.begin(project_root);
+  let rc = _main_project_install(opts, project_root, parsed_tools, is_first_run);
   if (rc === 0 && opts.interactive) {
     run_interactive_init(project_root, opts.force);
   }
+  rc = tracker.finalizeRc(rc);
   _emit_progress_terminal(rc);
   return rc;
 }
@@ -6799,16 +7133,16 @@ function _team_setup_hint_line(project_root) {
   return "  \u2022 Claude Code team mode (optional cross-model review via the official codex plugin): run `agent-config doctor --check team` for setup status.";
 }
 function finalize_claude_model_tiers(project_root) {
-  const claude_skills = path10.join(project_root, ".claude", "skills");
-  const augment_skills = path10.join(project_root, ".augment", "skills");
+  const claude_skills = path12.join(project_root, ".claude", "skills");
+  const augment_skills = path12.join(project_root, ".augment", "skills");
   if (!isDir(claude_skills) || !isDir(augment_skills)) return 0;
   if (_read_consumer_auto_switch(project_root) !== "auto") return 0;
   let rendered = 0;
-  const entries = fs12.readdirSync(claude_skills).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+  const entries = fs14.readdirSync(claude_skills).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
   for (const name of entries) {
-    const entry = path10.join(claude_skills, name);
-    const src_dir = path10.join(augment_skills, name);
-    const src_md = path10.join(src_dir, "SKILL.md");
+    const entry = path12.join(claude_skills, name);
+    const src_dir = path12.join(augment_skills, name);
+    const src_md = path12.join(src_dir, "SKILL.md");
     let tier;
     try {
       tier = read_model_tier(src_md);
@@ -6817,22 +7151,22 @@ function finalize_claude_model_tiers(project_root) {
     }
     if (tier === null || !(tier in TIER_TO_CLAUDE_MODEL) || !isDir(src_dir)) continue;
     if (isSymlink(entry) || isFile(entry)) {
-      fs12.unlinkSync(entry);
+      fs14.unlinkSync(entry);
     } else if (isDir(entry)) {
-      fs12.rmSync(entry, { recursive: true, force: true });
+      fs14.rmSync(entry, { recursive: true, force: true });
     }
     mkdirp(entry);
-    const srcFiles = fs12.readdirSync(src_dir).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+    const srcFiles = fs14.readdirSync(src_dir).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
     for (const fname of srcFiles) {
       if (fname === "SKILL.md") {
         writeText(
-          path10.join(entry, "SKILL.md"),
+          path12.join(entry, "SKILL.md"),
           render_native_model_md(readText(src_md), tier)
         );
       } else {
-        fs12.symlinkSync(
-          path10.join("../../../.augment/skills", name, fname),
-          path10.join(entry, fname)
+        fs14.symlinkSync(
+          path12.join("../../../.augment/skills", name, fname),
+          path12.join(entry, fname)
         );
       }
     }
@@ -6850,7 +7184,7 @@ function _main_project_install(opts, project_root, parsed_tools, is_first_run) {
   let package_type;
   if (opts.package) {
     package_root = resolvePath(opts.package);
-    if (!pathExists(path10.join(package_root, "src", "config", "profiles", "minimal.ini"))) {
+    if (!pathExists(path12.join(package_root, "src", "config", "profiles", "minimal.ini"))) {
       fail(`Invalid --package path (missing src/config/profiles/minimal.ini): ${package_root}`);
     }
     package_type = detect_package_type_for_project(project_root, package_root);
@@ -6936,7 +7270,7 @@ function _main_project_install(opts, project_root, parsed_tools, is_first_run) {
     _smoke_test_hooks(project_root, package_root);
   }
   if (!opts.skip_bridges) {
-    const files_by_tool = _files_by_tool_from_bridges(parsed_tools, project_root, "project");
+    const files_by_tool = filesByToolFromBridges(parsed_tools, project_root, "project", _bridge_marker);
     const rc = _update_installed_tools_manifest(
       project_root,
       parsed_tools,
@@ -6993,9 +7327,9 @@ function _main_project_install(opts, project_root, parsed_tools, is_first_run) {
 function _resolvedArgv1() {
   if (process2.argv[1] === void 0) return void 0;
   try {
-    return fs12.realpathSync(path10.resolve(process2.argv[1]));
+    return fs14.realpathSync(path12.resolve(process2.argv[1]));
   } catch {
-    return path10.resolve(process2.argv[1]);
+    return path12.resolve(process2.argv[1]);
   }
 }
 var _argv1 = _resolvedArgv1();