@uzysjung/agent-harness 26.168.0 → 26.169.0

package/dist/index.js

@@ -17,10 +17,12 @@ import {
   INTERNAL_BUNDLED_SKILL_IDS,
   LEGACY_INSTALL_LOG_DIR,
   POLICY_DIRS,
+  PROJECT_SKELETON_DIRS,
   REMOVED_CATALOG_ASSETS,
   RENAMED_SKILL_IDS,
   RETIRED_AGENTS,
   RETIRED_AGENT_IDS,
+  RETIRED_HOOK_WIRING_REFS,
   RETIRED_PATHS,
   RETIRED_SKILL_IDS,
   SHARED_FILES,
@@ -35,10 +37,11 @@ import {
   assetCliSupport,
   assetReachesCli,
   assetTrustTier,
-  backupDir,
+  backupContent,
   backupFile,
   backupIfLossyUtf8,
   backupOriginal,
+  buildAssetEntries,
   buildAssetSpec,
   buildInstallLog,
   buildManifest,
@@ -47,12 +50,10 @@ import {
   collectPolicyHashes,
   collectSkillHashes,
   continuousNoteEnd,
-  copyBackupDir,
   copyDir,
   copyFile,
   corruptedInstallLogMessage,
   createOutsideGuard,
-  dirTreesIdentical,
   dropContinuousSkillsNote,
   dropHarnessQuoteBlocks,
   ensureDir,
@@ -103,7 +104,7 @@ import {
   targetsInclude,
   upsertHarnessImport,
   writeInstallLog
-} from "./chunk-V4UY222W.js";
+} from "./chunk-SU2RUN2W.js";
 
 // node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
@@ -787,8 +788,7 @@ var cac = (name = "") => new CAC(name);
 
 // src/commands/install.ts
 init_esm_shims();
-import { rmSync as rmSync4 } from "fs";
-import { join as join32, resolve as resolve2 } from "path";
+import { resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/adapters/index.ts
@@ -827,45 +827,59 @@ function keepHookRef(hook, claudeDir, removed) {
   if (!exists && !removed.includes(relPath)) removed.push(relPath);
   return exists;
 }
-function scanStaleHookRefs(settingsPath, claudeDir, spare) {
+function findStaleHookRefs(settingsPath, claudeDir, spare) {
   let settings;
   try {
     settings = JSON.parse(readFileSync(settingsPath, "utf8"));
   } catch {
-    return null;
+    return [];
+  }
+  const stale = [];
+  for (const eventEntries of Object.values(settings.hooks ?? {})) {
+    if (!Array.isArray(eventEntries)) continue;
+    for (const entry of eventEntries) {
+      if (!Array.isArray(entry?.hooks)) continue;
+      for (const hook of entry.hooks) {
+        if (spare?.(projectAnchoredRef(hook?.command ?? "", claudeDir) ?? "") === true) continue;
+        keepHookRef(hook, claudeDir, stale);
+      }
+    }
+  }
+  return stale;
+}
+function removeRetiredHookRefs(settingsPath, claudeDir, refs, opts = {}) {
+  let settings;
+  try {
+    settings = JSON.parse(readFileSync(settingsPath, "utf8"));
+  } catch {
+    return [];
   }
-  const hookEvents = settings.hooks ?? {};
   const removed = [];
-  const cleanedHooks = {};
-  for (const [eventName, eventEntries] of Object.entries(hookEvents)) {
-    if (!Array.isArray(eventEntries)) {
-      cleanedHooks[eventName] = eventEntries;
+  const isRetiredDead = (hook) => {
+    const rel = projectAnchoredRef(hook?.command ?? "", claudeDir);
+    if (rel === void 0 || !refs.includes(rel)) return false;
+    if (opts.evenIfScriptExists !== true && existsSync(join(claudeDir, rel))) return false;
+    if (!removed.includes(rel)) removed.push(rel);
+    return true;
+  };
+  const hooks = {};
+  for (const [event, entries] of Object.entries(settings.hooks ?? {})) {
+    if (!Array.isArray(entries)) {
+      hooks[event] = entries;
       continue;
     }
-    cleanedHooks[eventName] = eventEntries.filter((entry) => Array.isArray(entry?.hooks)).map((entry) => ({
-      ...entry,
-      hooks: entry.hooks.filter(
-        (hook) => (
-          // `spare` 가 고른 참조(기록된 하네스 스크립트 — update 가 되살리고 배선은 writer 가 소유한다)는 판정하지 않는다
-          spare?.(projectAnchoredRef(hook?.command ?? "", claudeDir) ?? "") === true || keepHookRef(hook, claudeDir, removed)
-        )
-      )
-    })).filter((entry) => entry.hooks.length > 0);
+    hooks[event] = entries.flatMap((entry) => {
+      if (!Array.isArray(entry?.hooks)) return [entry];
+      const kept = entry.hooks.filter((hook) => !isRetiredDead(hook));
+      if (kept.length === entry.hooks.length) return [entry];
+      return kept.length > 0 ? [{ ...entry, hooks: kept }] : [];
+    });
   }
-  return { settings, cleanedHooks, removed };
-}
-function findStaleHookRefs(settingsPath, claudeDir) {
-  return scanStaleHookRefs(settingsPath, claudeDir)?.removed ?? [];
-}
-function cleanStaleHookRefs(settingsPath, claudeDir, spare) {
-  const scan = scanStaleHookRefs(settingsPath, claudeDir, spare);
-  if (scan === null) return [];
-  if (scan.removed.length > 0) {
-    const next = { ...scan.settings, hooks: scan.cleanedHooks };
-    writeFileSync(settingsPath, `${JSON.stringify(next, null, 2)}
+  if (removed.length > 0 && opts.write !== false) {
+    writeFileSync(settingsPath, `${JSON.stringify({ ...settings, hooks }, null, 2)}
 `);
   }
-  return scan.removed;
+  return removed;
 }
 
 // src/adapters/contract.ts
@@ -1424,6 +1438,125 @@ init_esm_shims();
 
 // src/agents-md-merge.ts
 init_esm_shims();
+
+// src/retired-anchor-sections.ts
+init_esm_shims();
+import { createHash } from "crypto";
+function retiredAnchorSectionKey(lines2) {
+  const out = lines2.map((l) => l.replace(/\r$/, "").trimEnd());
+  while (out.length > 1 && out.at(-1) === "") out.pop();
+  return createHash("sha256").update(out.join("\n")).digest("hex");
+}
+var RETIRED_ANCHOR_SECTION_KEYS = /* @__PURE__ */ new Set([
+  "522bac15bc17949697e291b837c0d9624f5e0c7666400a3baf94cdef7cfab8b5",
+  // ## Rule 1 — Think Before Coding
+  "ea10b7cd9b84a71949a071fae15256f490b3fe407159d7bddcf3f882310fa835",
+  // ## Rule 2 — Simplicity First
+  "c486465d9554f2de1711cd056437f6a95a5d3243264b82d29a6957f24b5a6de3",
+  // ## Rule 3 — Surgical Changes
+  "3d080574cc7ae81eda75c4aa019445b38b6f69c5f9eeeda9097e10b6041e7e94",
+  // ## Rule 4 — Goal-Driven Execution
+  "11e43547f6b1613a5dabb3edaf5131d696a3fd375b3c22558f03555a0f5cf2ef",
+  // ## Rule 5 — Use the model only for judgment calls
+  "60d91718de6ae16ec86b50e7c9a939a6ca5fc0721422b592700cc9972f55aca2",
+  // ## Rule 6 — Token budgets are not advisory
+  "9d482c7307cbcb02acc6fb35cd57b24baa9fce04528e2bd21e1e877603f8b85b",
+  // ## Rule 7 — Surface conflicts, don't average them
+  "abca09f13833ce18bd0ffc0793d59780c35447ca79c2a512afcbc9d7a7116ed8",
+  // ## Rule 8 — Read before you write
+  "5b4eae6c3dc2d92cfb1772889650882a4a2115f08a36602da9a1d96697059b91",
+  // ## Rule 9 — Tests verify intent, not just behavior
+  "632670b8897dc373d4a12f611c2436d9a8e86d8cdab917eecabc4bf2a56f8030",
+  // ## Rule 10 — Checkpoint after every significant step
+  "252e99f25b05a47e5ce884ac9f1e1d34156116b9a76331e2510b1354a6c98cd4",
+  // ## Rule 11 — Match the codebase's conventions, even if you disagree
+  "c28a12b589b6576379793c51fd01dbfaf91d391ac773f84ae0477ddb60a1e3e8",
+  // ## Rule 12 — Fail loud
+  "72feaf96f998989351f8083edb891c7b0c3bccca65dbea2732fb2864b8f98bd4",
+  // ## 의사결정 및 컨펌 요청 시
+  "95c932ecb4f4fdcdd8d483f9d02166b906f6eb045ef33ee474a16913d0c3e6cd",
+  // ## Phase/작업 완료 시 Self-Audit 실행:
+  "c7f9fa755bd66d80c2df496c6c759e8accd736cd8fef64460feb7ae9cd4c8006",
+  // ## Context Management
+  "6ec0b415a8f86c9940bccd3e6db895ea4a110185e76fef223a348f9553fd897c",
+  // ## Rule 12 — Fail loud
+  "a78f0ffa6b51c9b45c964ecb92db951534336f7e558a3d39d11f015ee6c3466c",
+  // ## Anti-Patterns (Forbidden)
+  "50d00a511e87571d7ff85f6584b87b9f5c2eef06122d8ac5fdccf3f047643f12",
+  // ## When Requesting Decisions or Confirmation
+  "574519e07f48bcc04f0e3d505c0f9c157ddd426b5eda2baa99656cd4712dad2b",
+  // ## Run Self-Audit on Phase/Task Completion
+  "df73823c02e6eee000388444964acfec233ffeec0e20fdc5d31eb018d2ca93c1",
+  // ## Context Management
+  "8f49f0a592575a65eadd3e33950c96616223aa8bb116707103affeef71db28c6",
+  // ## Delegate the Building, Keep the Deciding
+  "6115eccc3b2702f436a9db7d6af9803fa7b1fbf7b9ff1110ea658fadd67ec5ea",
+  // ## 1. Think before coding
+  "15b120395ec8e757ecbe3e65775371a9120953617fb37eb062e0c176b52f045a",
+  // ## 2. Prefer the simplest sufficient solution
+  "cc466b4781444ca54aedebd20ba3aa531c3aa84cc438953df84b133bd32a0e1e",
+  // ## 3. Make surgical changes and preserve existing work
+  "f6d1f6f02cb3c19e61becf329f20335c54e684bccb06b33e4b7f66eb49f9c6b6",
+  // ## 4. Define success before editing
+  "372bf30b282b861c6a89e355c94ffd239bb0202e2ef928f8af99d640579710f0",
+  // ## 5. Report evidence, not confidence
+  "66ca0e3aae98d24c65afbc418645df29d8c570be81918c42192eb1beecd21f23",
+  // ## 6. Do not cross high-impact boundaries alone
+  "9c6c27eb57a9790273fa3fdf0df3628d927b025f870f09933692d1b522d73a25",
+  // ## Decisions and explanations
+  "922d100c2dc6ef8a53989a920c3554afa7efd148255bc144412403c0289439e6",
+  // ## Decisions and explanations
+  "330a67775a28557431aebf36a44018fc5194a4b929bf2cf95184b1f0828a6360",
+  // ## 1. Understand First
+  "3b2f0147dc7bd0f01fd12485790199ef4ee96a6b723e244ffbf3dc96933a1ab8",
+  // ## 2. Define Success and Keep It Simple
+  "8802fb25c05879c98dbf8407001d239c410d25b4fa2521b11d9d7cc108f73b29",
+  // ## 3. Preserve Sound Boundaries
+  "1d0d9bf05d8870dd0dc62e388ceffc98923f1dd2074ef8038f80a50c9b5b9a81",
+  // ## 4. Make Surgical Changes
+  "05e08e2318061141464ae714d6770d35527576affa787740d9c6d9345d3462dd",
+  // ## 5. Verify and Review
+  "7b39f1f92a72517d6ae52599becfef29f675e48185a3483dc993d7accd4aee7c",
+  // ## 6. Protect High-Impact Boundaries
+  "d5d93c55de33e4cdcb38f76c6d6d70a6e0beac7a176c8aa1daa09905ccc5fe39",
+  // ## 7. Report Evidence
+  "cefc8bb6194d4f1b6302345e96ffb3a28b8b992032fd40f9f5b4f18997657e7a",
+  // ## Presenting a decision
+  "7385ff5df34148278a8f4b164c11ba5f9355626abcc13a822dd1ebb206321c2f",
+  // ## Skills that apply continuously
+  "ad9fd1ff225c57c9801a7d7472bf4ddf9c952c602f4a93eae86fbcb3bcf468bc",
+  // ## 7. Report Evidence
+  "868fe823fc40011d08816c9f1105ef6df7ca7f2479779303ce9583bba1ce6e0d",
+  // ## Skills that apply continuously
+  "3f8259ca7c92d79cca1a36bba38f36d4ef5a96fd6cafbd0edb5a79492082f46f",
+  // ## Presenting a decision
+  "ecfdcd50e97723af77cfe6889bbad784cdeb86dd0c52af3ff98ddf6adf80f445",
+  // ## 1. Resolve what matters, then act
+  "9321cb1312a080bcf560940b8f86d3d59b39c667add4b8f3ad785ddae9bc8b20",
+  // ## 2. Choose the simplest sufficient solution
+  "a4c345996a8578cc24b62fde27084e5848a61e4a40d91b0c72a95da46203b43c",
+  // ## 3. Keep changes focused and preserve existing work
+  "1adbf1bf88bb8288744e1c1d73518ffdec12a5b668d5a225e2bedd006844466c",
+  // ## 4. Define success and verify proportionally
+  "7636e57a877d54039f0c2829fde84202c65378bd36b8c8abb7274a29eaa5f8ac",
+  // ## 5. Report evidence and stop unproductive loops
+  "ddf2be9e04c04bf53ad9b5476e45639b33a60bf49bd3a83835796632052b17b4",
+  // ## 6. Keep authority explicit
+  "16b0edc0f4886a9f9ec94e6fb97206c385286b2c9d5563b2324b7a2f4a434435",
+  // ## 1. Understand what success means
+  "b10ab1eafe25bb7ba3b20b907b1d7eedde03e52fbd49905f24e192e30b4e1b9a",
+  // ## 2. Choose and adapt the approach
+  "69bcfb8b37ac184b1a30945a0dea59108ef1242c2f40fb778be118cbd524aea7",
+  // ## 3. Keep changes focused and coherent
+  "f22a5a13c5ed8460c9370212d91354d0fea2fefc7f420a1eb3088504ae8da6c0",
+  // ## 4. Verify outcomes in proportion to consequences
+  "7a335cde69e8055ee5e137a9a5c09fd7f7c2e551ab099a2cda87f0c3dcd95a19",
+  // ## 5. Let evidence determine readiness
+  "79797568bb71bd0f7b14393f72e61721a4bfe99ecfb6126ffa38a6c03c53d765"
+  // ## 6. Act within clear authority
+]);
+
+// src/agents-md-merge.ts
 var marker = (name) => ({
   start: `<!-- uzys-harness:${name}:start -->`,
   end: `<!-- uzys-harness:${name}:end -->`
@@ -1562,8 +1695,11 @@ function mergeAgentsMd(params) {
   }
   const rulesNow = sectionBody(existing, names, RULES_SECTION);
   const rulesNew = sectionBody(rendered, names, RULES_SECTION);
+  let replacedRulesHeadings = null;
   if (rulesNow !== null && rulesNew !== null && blockRange(rulesNow, ANCHOR_BLOCK) !== null) {
     bodies.set(RULES_SECTION, refreshBlock(rulesNow, rulesNew, ANCHOR_BLOCK));
+  } else if (rulesNow !== null && rulesNew !== null) {
+    replacedRulesHeadings = headingLines(rulesNew);
   }
   const merged = bodies.size === 0 ? rendered : assemble(rendered, names, bodies);
   const mergedText = merged.replace(/\r/g, "");
@@ -1571,8 +1707,8 @@ function mergeAgentsMd(params) {
     existing,
     names,
     rendered,
-    template,
-    params.harnessRuleHeadings ?? /* @__PURE__ */ new Set()
+    params.harnessRuleHeadings ?? /* @__PURE__ */ new Set(),
+    replacedRulesHeadings
   ).filter((e2) => !mergedText.includes(e2.join("\n").replace(/\r/g, "")));
   if (extras.length === 0) return merged;
   return `${merged.replace(/\n+$/, "\n")}${extras.map((e2) => e2.join("\n")).join("\n")}`.replace(
@@ -1580,24 +1716,48 @@ function mergeAgentsMd(params) {
     "\n"
   );
 }
-function extraTopLevelSections(existing, names, rendered, template, harnessRuleHeadings) {
+function headingOwner(bare, ctx) {
+  const name = /^## (.+?)\s*$/.exec(bare)?.[1];
+  if (name !== void 0 && ctx.names.has(name)) return "harness";
+  if (ctx.region === CONTEXT_SECTION || ctx.region === RULES_SECTION) return "body";
+  if (ctx.region === HARNESS_RULES_SECTION && ctx.harnessHeadings.has(bare.trim())) {
+    return "harness";
+  }
+  return "installer";
+}
+function headingLines(body) {
+  return new Set(body.filter((l) => /^## /.test(l)).map((l) => l.replace(/\r$/, "").trim()));
+}
+function renderedRuleHeadings(rendered, names) {
+  return headingLines(sectionBody(rendered, names, HARNESS_RULES_SECTION) ?? []);
+}
+function extraTopLevelSections(existing, names, rendered, harnessRuleHeadings, replacedRulesHeadings) {
+  const harnessHeadings = /* @__PURE__ */ new Set([
+    ...harnessRuleHeadings,
+    ...renderedRuleHeadings(rendered, names)
+  ]);
   const out = [];
+  const replacedSections = /* @__PURE__ */ new Set();
   let current = null;
-  let inHarnessRules = false;
+  let region = null;
   for (const line of existing.split("\n")) {
     const bare = line.replace(/\r$/, "");
     const name = /^## (.+?)\s*$/.exec(bare)?.[1];
     if (name !== void 0) {
       if (current !== null) out.push(current);
-      if (names.has(name)) inHarnessRules = name === HARNESS_RULES_SECTION;
-      const harnessAuthored = names.has(name) || inHarnessRules && harnessRuleHeadings.has(bare.trim()) || rendered.includes(bare) || template.includes(bare) || line.trim() === CONTINUOUS_SKILLS_HEADING;
-      current = harnessAuthored ? null : [line];
+      if (names.has(name)) region = name;
+      const owner = headingOwner(bare, { region, names, harnessHeadings });
+      const replacedBody = owner === "body" && region === RULES_SECTION && replacedRulesHeadings !== null && !replacedRulesHeadings.has(bare.trim());
+      current = owner === "installer" || replacedBody ? [line] : null;
+      if (replacedBody && current !== null) replacedSections.add(current);
       continue;
     }
     if (current !== null) current.push(line);
   }
   if (current !== null) out.push(current);
-  return out.map((lines2) => {
+  return out.filter(
+    (lines2) => !replacedSections.has(lines2) || !RETIRED_ANCHOR_SECTION_KEYS.has(retiredAnchorSectionKey(lines2))
+  ).map((lines2) => {
     const trimmed = [...lines2];
     while (trimmed.length > 1 && (trimmed.at(-1) ?? "").trim() === "") trimmed.pop();
     return trimmed;
@@ -1630,14 +1790,9 @@ function installerSectionsInHarnessArea(existing, names, harnessRuleHeadings) {
     const name = /^## (.+?)\s*$/.exec(bare)?.[1];
     if (name !== void 0) {
       if (current !== null) out.push(current);
-      current = null;
-      if (names.has(name)) {
-        region = name;
-        continue;
-      }
-      if (region === CONTEXT_SECTION || region === RULES_SECTION) continue;
-      const harnessRule = region === HARNESS_RULES_SECTION && harnessRuleHeadings.has(bare.trim());
-      if (!harnessRule) current = [bare];
+      if (names.has(name)) region = name;
+      const owner = headingOwner(bare, { region, names, harnessHeadings: harnessRuleHeadings });
+      current = owner === "installer" ? [bare] : null;
       continue;
     }
     if (current !== null) current.push(bare);
@@ -2993,8 +3148,8 @@ function padDisplay(s, width) {
 
 // src/install-writes.ts
 init_esm_shims();
-import { existsSync as existsSync5, mkdirSync, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
-import { dirname, join as join6, relative, sep } from "path";
+import { existsSync as existsSync6, mkdirSync, readFileSync as readFileSync4, statSync, writeFileSync as writeFileSync3 } from "fs";
+import { dirname, join as join7, relative, sep } from "path";
 
 // src/env-files.ts
 init_esm_shims();
@@ -3003,8 +3158,9 @@ import { join as join4 } from "path";
 var ENV_EXAMPLE_BODY = `# .env.example \u2014 csr-supabase Track
 # Copy to .env (gitignored) and fill in values: cp .env.example .env
 
-# ===== Supabase Management API (MCP server\uC6A9) =====
-# Personal Access Token \u2014 @supabase/mcp-server\uAC00 \uD504\uB85C\uC81D\uD2B8 \uC0DD\uC131/\uB9C8\uC774\uADF8\uB808\uC774\uC158/Edge Functions \uBC30\uD3EC\uC5D0 \uC0AC\uC6A9
+# ===== Supabase Management API =====
+# MCP \uC11C\uBC84(https://mcp.supabase.com/mcp)\uB294 \uCCAB \uC0AC\uC6A9 \uB54C \uBE0C\uB77C\uC6B0\uC800 OAuth \uB85C\uADF8\uC778 \u2014 \uC774 \uD1A0\uD070\uC774 \uD544\uC694 \uC5C6\uB2E4.
+# Personal Access Token \u2014 \uB85C\uCEEC stdio \uC11C\uBC84(@supabase/mcp-server-supabase)\uB098 CI \uCC98\uB7FC \uBE0C\uB77C\uC6B0\uC800 \uB85C\uADF8\uC778\uC774 \uC548 \uB418\uB294 \uACF3\uC5D0\uC11C\uB9CC
 # \uBC1C\uAE09: https://supabase.com/dashboard/account/tokens
 SUPABASE_ACCESS_TOKEN=
 
@@ -3169,6 +3325,28 @@ function advisory(input) {
   if (input.run === "update") return j("leave", "", "keep");
   return j("create", LINES.scaffoldWrote, "advisory");
 }
+function judgeDisplaced(input) {
+  if (input.backup === null) return { verdict: "leave", line: "", record: "forget" };
+  if (!input.backupExists) {
+    return {
+      verdict: "advise",
+      line: "could not put back your earlier file \u2014 its backup is no longer there",
+      record: "forget"
+    };
+  }
+  if (!input.slotEmpty) {
+    return {
+      verdict: "advise",
+      line: `not put back \u2014 the spot is taken; your earlier file is at ${input.backup}`,
+      record: "keep"
+    };
+  }
+  return {
+    verdict: "restore",
+    line: `put back your earlier file (from ${input.backup})`,
+    record: "forget"
+  };
+}
 
 // src/mcp-merge.ts
 init_esm_shims();
@@ -3188,6 +3366,12 @@ var PRIOR_MCP_SERVERS = [
     value: { type: "stdio", command: "npx", args: ["-y", "@railway/mcp-server"] },
     updated: "now Railway's remote server \u2014 sign in on first use, see NEXT"
   },
+  {
+    // #766 — `@supabase/mcp-server` 는 npm 에 없는 이름이라(404) 서버가 뜬 적이 없다
+    name: "supabase",
+    value: { type: "stdio", command: "npx", args: ["-y", "@supabase/mcp-server"] },
+    updated: "now Supabase's remote server \u2014 sign in on first use, see NEXT"
+  },
   {
     name: "chrome-devtools",
     value: { type: "stdio", command: "npx", args: ["-y", "chrome-devtools-mcp@latest"] },
@@ -3366,6 +3550,8 @@ function recordedMcpAssetIds(log) {
 
 // src/recorded.ts
 init_esm_shims();
+import { existsSync as existsSync5 } from "fs";
+import { join as join6 } from "path";
 
 // src/cli-ownership.ts
 init_esm_shims();
@@ -3379,19 +3565,19 @@ var SHARED_BY_ALL = (self) => [
 ];
 var CLI_OWNERSHIP = {
   claude: [
-    { path: ".claude/", kind: "dir", sharedWith: [] },
+    { path: ".claude/", kind: "recorded", sharedWith: [] },
     { path: HARNESS_ANCHOR_FILE, kind: "anchor", sharedWith: [] },
     { path: "CLAUDE.md", kind: "import-block", sharedWith: [] },
     ...SHARED_BY_ALL("claude")
   ],
   codex: [
-    { path: ".codex/", kind: "dir", sharedWith: [] },
+    { path: ".codex/", kind: "recorded", sharedWith: [] },
     { path: "AGENTS.md", kind: "recorded", sharedWith: ["opencode", "antigravity"] },
     { path: ".agents/skills/", kind: "recorded", sharedWith: ["opencode", "antigravity"] },
     ...SHARED_BY_ALL("codex")
   ],
   opencode: [
-    { path: ".opencode/", kind: "dir", sharedWith: [] },
+    { path: ".opencode/", kind: "recorded", sharedWith: [] },
     { path: "opencode.json", kind: "recorded", sharedWith: [] },
     { path: "AGENTS.md", kind: "recorded", sharedWith: ["codex", "antigravity"] },
     { path: ".agents/skills/", kind: "recorded", sharedWith: ["codex", "antigravity"] },
@@ -3440,14 +3626,36 @@ function ownersOf(path) {
   );
 }
 function isRecordedTrackTarget(log, path) {
+  return recordedTrackTargets(log)(path);
+}
+function recordedTrackTargets(log) {
   const spec = {
     tracks: log.spec.tracks.filter(isTrack),
     selectedInternalSkills: INTERNAL_BUNDLED_SKILL_IDS
   };
-  return buildManifest(spec).some(
-    (e2) => e2.applies(spec) && (e2.type === "dir" ? path.startsWith(`${e2.target}/`) : e2.target === path)
+  const entries = buildManifest(spec).filter((e2) => e2.applies(spec));
+  const templates = join6(resolveBundleRoot(), "templates");
+  return (path) => entries.some(
+    (e2) => e2.type === "dir" ? path.startsWith(`${e2.target}/`) && existsSync5(join6(templates, e2.source, path.slice(e2.target.length + 1))) : e2.target === path
   );
 }
+function recordedTrackSpots(log) {
+  const spec = {
+    tracks: log.spec.tracks.filter(isTrack),
+    selectedInternalSkills: INTERNAL_BUNDLED_SKILL_IDS
+  };
+  const templates = join6(resolveBundleRoot(), "templates");
+  const out = [];
+  for (const e2 of buildManifest(spec)) {
+    if (!e2.applies(spec) || !e2.target.startsWith(CLAUDE_DIR)) continue;
+    if (e2.type === "file") out.push(e2.target);
+    else
+      for (const rel of listFilesRecursive(join6(templates, e2.source)))
+        out.push(`${e2.target}/${rel}`);
+  }
+  for (const p2 of RETIRED_PATHS) out.push(`${CLAUDE_DIR}${p2}`);
+  return out;
+}
 function isRetiredPath(path) {
   return path.startsWith(CLAUDE_DIR) && RETIRED_PATHS.includes(path.slice(CLAUDE_DIR.length));
 }
@@ -3480,9 +3688,30 @@ function recorded(log, path, opts = {}) {
   const owners = ownersOf(path);
   const ownedByLog = owners.some((c3) => clis.includes(c3));
   const claudePath = path.startsWith(CLAUDE_DIR);
-  if (ownedByLog && isTarget(path) && (!claudePath || legacyOwned())) return { state: "no-sha" };
+  if (ownedByLog && (claudePath ? legacyOwned() : isTarget(path))) {
+    if (scanFieldOf(log, path) === "present") return { state: "none" };
+    return { state: "no-sha" };
+  }
   return { state: "none" };
 }
+function scanFieldOf(log, path) {
+  const present2 = (yes) => yes ? "present" : "absent";
+  if (path.startsWith(SKILLS_DIR)) return present2(log.skillFiles !== void 0);
+  if (isExternalOnly(path))
+    return present2((log.externalFiles ?? []).some((f) => isExternalOnly(f.path)));
+  const policy = POLICY_DIRS.find(
+    ({ dir, ext }) => path.startsWith(`${CLAUDE_DIR}${dir}/`) && path.endsWith(ext)
+  );
+  if (policy === void 0) return "outside";
+  return present2((log.policyFiles ?? []).some((f) => f.path.startsWith(`${policy.dir}/`)));
+}
+function isExternalOnly(path) {
+  const owners = ownersOf(path);
+  return owners.length > 0 && !owners.includes("claude");
+}
+function recordedOwner(log) {
+  return (path) => recorded(log, path, { isTarget: () => true }).state !== "none";
+}
 function kindOf(log, path) {
   if (adapterFor(path) !== null) return "shared";
   if (isScaffoldPath(path)) return "advisory";
@@ -3520,10 +3749,10 @@ function createInstallWriter(args) {
     else external.set(path, sha256);
   }
   function harness(path, from, opts = {}) {
-    const abs = join6(projectDir, path);
+    const abs = join7(projectDir, path);
     if (outside.skip(abs)) return null;
     const next = "source" in from ? readFileSync4(from.source, "utf8") : from.content;
-    const disk = existsSync5(abs) ? readFileSync4(abs, "utf8") : null;
+    const disk = existsSync6(abs) ? readFileSync4(abs, "utf8") : null;
     const j4 = judge({
       op: "write",
       kind: "harness",
@@ -3585,8 +3814,8 @@ function createInstallWriter(args) {
     const file = SHARED_FILES[path];
     if (file === void 0) throw new Error(`install: ${path} is not a shared file`);
     const adapter = ADAPTERS[file.adapter];
-    const abs = join6(projectDir, path);
-    const disk = existsSync5(abs) ? readFileSync4(abs, "utf8") : null;
+    const abs = join7(projectDir, path);
+    const disk = existsSync6(abs) ? readFileSync4(abs, "utf8") : null;
     const own = new Map(
       (previousLog?.portions ?? []).filter((p2) => p2.path === path).map((p2) => [p2.key, p2.sha256])
     );
@@ -3742,21 +3971,36 @@ function thisRunExclusions(spec, previous, accepts) {
   ]);
   return { spec: specWithExclusions(spec, excluded), excluded };
 }
-function inheritScanned(previous) {
+function inheritScanned(previous, projectDir) {
   if (previous === null) return { policyFiles: [], skillFiles: [] };
   const policyFiles = previous.policyFiles ?? [];
   const skillFiles = previous.skillFiles ?? [];
   if (previous.records === "writer")
     return { policyFiles: [...policyFiles], skillFiles: [...skillFiles] };
   const owned = (full) => recorded(previous, full).state !== "none";
+  const kept = policyFiles.filter((f) => owned(`${CLAUDE_DIR2}${f.path}`));
   return {
-    policyFiles: policyFiles.filter((f) => owned(`${CLAUDE_DIR2}${f.path}`)),
+    policyFiles: projectDir === void 0 ? kept : [...kept, ...retiredClaims(previous, projectDir, kept)],
     skillFiles: skillFiles.filter((f) => owned(`${SKILLS_DIR2}${f.path}`))
   };
 }
+function retiredClaims(previous, projectDir, kept) {
+  const have = new Set(kept.map((f) => f.path));
+  const out = [];
+  for (const p2 of RETIRED_PATHS) {
+    if (have.has(p2) || recorded(previous, `${CLAUDE_DIR2}${p2}`).state === "none") continue;
+    const abs = join7(projectDir, CLAUDE_DIR2, p2);
+    try {
+      if (!statSync(abs).isFile()) continue;
+      out.push({ path: p2, sha256: hashContent(readFileSync4(abs, "utf8")) });
+    } catch {
+    }
+  }
+  return out;
+}
 function composeWriterLog(args) {
   const { base, previous, ledger } = args;
-  const inherited = inheritScanned(previous);
+  const inherited = inheritScanned(previous, args.projectDir);
   const policyFiles = mergeExternalFiles(inherited.policyFiles, ledger.policyFiles);
   const skillFiles = mergeExternalFiles(inherited.skillFiles, ledger.skillFiles);
   const externalFiles = mergeExternalFiles(previous?.externalFiles, [
@@ -3852,7 +4096,7 @@ function legacySettingsSeed(text, render, projectDir) {
   } catch {
     return seed;
   }
-  const claudeDir = join6(projectDir, ".claude");
+  const claudeDir = join7(projectDir, ".claude");
   const candidates = new Set([...render.keys()].filter((k2) => k2.startsWith("hooks.")));
   const hooks = isObject2(root) && isObject2(root.hooks) ? root.hooks : {};
   for (const [event, groups] of Object.entries(hooks)) {
@@ -3965,13 +4209,13 @@ function legacyGitignoreSeed(text, render, previous) {
 
 // src/installer.ts
 init_esm_shims();
-import { chmodSync as chmodSync3, existsSync as existsSync21, readdirSync as readdirSync4, readFileSync as readFileSync22, writeFileSync as writeFileSync8 } from "fs";
-import { basename as basename4, join as join29, relative as relative3, resolve, sep as sep4 } from "path";
+import { chmodSync as chmodSync3, existsSync as existsSync22, readdirSync as readdirSync4, readFileSync as readFileSync22, writeFileSync as writeFileSync9 } from "fs";
+import { basename as basename4, join as join30, relative as relative3, resolve, sep as sep4 } from "path";
 
 // src/anchor-seed.ts
 init_esm_shims();
-import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync5 } from "fs";
+import { join as join8 } from "path";
 
 // src/agents-md-render.ts
 init_esm_shims();
@@ -4055,7 +4299,7 @@ ${CODEX_SIZE_NOTE}` : RULES_NOTE : "",
 
 // src/anchor-seed.ts
 function readIfExists(path) {
-  if (!existsSync6(path)) return null;
+  if (!existsSync7(path)) return null;
   try {
     return readFileSync5(path, "utf8");
   } catch {
@@ -4078,7 +4322,7 @@ function compose(body, into) {
 ${trimmed.join("\n")}`;
 }
 function seedAgentsMdProjectContext(projectDir) {
-  const root = readIfExists(join7(projectDir, "CLAUDE.md"));
+  const root = readIfExists(join8(projectDir, "CLAUDE.md"));
   if (root === null) return null;
   const withoutImport = stripHarnessImport(root) ?? root;
   const body = dropHarnessQuoteBlocks(dropTitle(withoutImport.split("\n")));
@@ -4086,9 +4330,9 @@ function seedAgentsMdProjectContext(projectDir) {
   return compose(body, "agents-md");
 }
 function seedRootClaudeProjectContext(projectDir, harnessRoot) {
-  const agents = readIfExists(join7(projectDir, "AGENTS.md"));
+  const agents = readIfExists(join8(projectDir, "AGENTS.md"));
   if (agents === null) return null;
-  const template = readIfExists(join7(harnessRoot, AGENTS_MD_TEMPLATE));
+  const template = readIfExists(join8(harnessRoot, AGENTS_MD_TEMPLATE));
   if (template === null) return null;
   const installer = projectContextInstallerLines({ existing: agents, template });
   if (installer === null) return null;
@@ -4099,8 +4343,8 @@ function seedRootClaudeProjectContext(projectDir, harnessRoot) {
 
 // src/ci-scaffold.ts
 init_esm_shims();
-import { existsSync as existsSync7 } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync8 } from "fs";
+import { join as join9 } from "path";
 var PYTHON_TRACKS = "data|csr-fastapi|full";
 var VARIANTS = [
   {
@@ -4124,12 +4368,12 @@ function installCiScaffold(ctx) {
   for (const v2 of VARIANTS) {
     if (!v2.applies(ctx.tracks)) continue;
     const relTarget = `.github/workflows/${v2.target}`;
-    const target = join8(ctx.projectDir, relTarget);
-    if (existsSync7(target)) {
+    const target = join9(ctx.projectDir, relTarget);
+    if (existsSync8(target)) {
       report.skippedExisting.push(relTarget);
       continue;
     }
-    copyFile(join8(ctx.harnessRoot, "templates/github-workflows", v2.source), target);
+    copyFile(join9(ctx.harnessRoot, "templates/github-workflows", v2.source), target);
     report.written.push(relTarget);
   }
   return report;
@@ -4137,19 +4381,18 @@ function installCiScaffold(ctx) {
 
 // src/cli-transforms.ts
 init_esm_shims();
-import { existsSync as existsSync16, readFileSync as readFileSync16 } from "fs";
-import { join as join21 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync16 } from "fs";
+import { join as join22 } from "path";
 
 // src/agents-md-transform.ts
 init_esm_shims();
-import { existsSync as existsSync11, readFileSync as readFileSync9 } from "fs";
-import { basename, join as join13 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
+import { basename, join as join14 } from "path";
 
 // src/agents-skill-targets.ts
 init_esm_shims();
-import { join as join9, sep as sep2 } from "path";
-function bundledSkillTargets(projectDir) {
-  const log = readInstallLog(projectDir);
+import { join as join10, sep as sep2 } from "path";
+function bundledSkillTargets(projectDir, log = readInstallLog(projectDir)) {
   if (log === null) return [];
   const tracks = log.spec.tracks.filter(
     (t) => TRACKS.includes(t)
@@ -4162,7 +4405,7 @@ function bundledSkillTargets(projectDir) {
 }
 function allowSkillCreation(writer, projectDir, ids) {
   if (ids.length === 0) return writer;
-  const roots = ids.map((id) => `${join9(projectDir, ".agents", "skills", id)}${sep2}`);
+  const roots = ids.map((id) => `${join10(projectDir, ".agents", "skills", id)}${sep2}`);
   return {
     write(absPath, content, opts) {
       const inTarget = roots.some((root) => absPath.startsWith(root));
@@ -4183,24 +4426,24 @@ function agentsSkillSlot(params) {
 
 // src/owned-write.ts
 init_esm_shims();
-import { existsSync as existsSync8, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname2, relative as relative2, sep as sep3 } from "path";
 
 // src/foreign-slot.ts
 init_esm_shims();
-import { lstatSync, realpathSync, statSync } from "fs";
-import { join as join10 } from "path";
+import { lstatSync, realpathSync, statSync as statSync2 } from "fs";
+import { join as join11 } from "path";
 var SKILL_SLOT = /^((?:\.claude|\.agents)\/skills\/[^/]+)(?:\/|$)/;
 function occupiedByNonDirectory(path) {
   const stat = lstatSync(path, { throwIfNoEntry: false });
   return stat !== void 0 && !stat.isDirectory();
 }
 function linksToProjectSharedSkill(projectDir, id) {
-  const slot = join10(projectDir, ".claude/skills", id);
+  const slot = join11(projectDir, ".claude/skills", id);
   if (lstatSync(slot, { throwIfNoEntry: false })?.isSymbolicLink() !== true) return false;
   try {
     const real = realpathSync(slot);
-    return real === join10(realpathSync(projectDir), ".agents/skills", id) && statSync(real).isDirectory();
+    return real === join11(realpathSync(projectDir), ".agents/skills", id) && statSync2(real).isDirectory();
   } catch {
     return false;
   }
@@ -4208,15 +4451,15 @@ function linksToProjectSharedSkill(projectDir, id) {
 function foreignOwnedTarget(projectDir, rel) {
   const slot = SKILL_SLOT.exec(rel)?.[1];
   if (slot === void 0) return null;
-  if (occupiedByNonDirectory(join10(projectDir, slot))) return slot;
+  if (occupiedByNonDirectory(join11(projectDir, slot))) return slot;
   if (rel !== slot) {
     const parts = rel.slice(slot.length + 1).split("/");
     let cursor = slot;
     for (const part of parts.slice(0, -1)) {
       cursor = `${cursor}/${part}`;
-      if (occupiedByNonDirectory(join10(projectDir, cursor))) return cursor;
+      if (occupiedByNonDirectory(join11(projectDir, cursor))) return cursor;
     }
-    const leaf = lstatSync(join10(projectDir, rel), { throwIfNoEntry: false });
+    const leaf = lstatSync(join11(projectDir, rel), { throwIfNoEntry: false });
     if (leaf !== void 0 && !leaf.isFile()) return rel;
   }
   return null;
@@ -4224,13 +4467,18 @@ function foreignOwnedTarget(projectDir, rel) {
 
 // src/owned-write.ts
 function createOwnedWriter(projectDir, baseline, options = {}) {
-  const { now = /* @__PURE__ */ new Date(), refreshOnly = false, journal } = options;
+  const { now = /* @__PURE__ */ new Date(), refreshOnly = false, journal, owned = () => false } = options;
   const written = /* @__PURE__ */ new Map();
   const backedUp = [];
   const backupPaths = [];
   const foreignOwned = [];
   const restored = [];
+  const displaced = /* @__PURE__ */ new Map();
   const outside = createOutsideGuard(projectDir);
+  const displace = (f) => {
+    displaced.set(f.path, f);
+    journal?.displaced?.(f);
+  };
   let updated = 0;
   return {
     write(absPath, content, opts) {
@@ -4242,7 +4490,7 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
       }
       if (outside.skip(absPath)) return false;
       const digest = hashContent(content);
-      if (!existsSync8(absPath)) {
+      if (!existsSync9(absPath)) {
         const recordedPath = baseline.has(rel);
         if (refreshOnly && !opts?.createInRefresh && !recordedPath) return false;
         mkdirSync2(dirname2(absPath), { recursive: true });
@@ -4251,12 +4499,20 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
         if (refreshOnly && recordedPath) restored.push(rel);
       } else {
         const current = readFileSync6(absPath, "utf8");
+        const firstContact = !baseline.has(rel) && !owned(rel);
+        if (current === content && firstContact) {
+          displace({ path: rel, change: "displaced", notes: [] });
+          return true;
+        }
         if (current !== content) {
           if (!isHarnessOwned(baseline, rel, current)) {
             const backup = backupFile(absPath, now);
             backupPaths.push(backup);
-            backedUp.push(rel);
             journal?.backup(backup);
+            if (firstContact) {
+              const backupRel = relative2(projectDir, backup).split(sep3).join("/");
+              displace({ path: rel, change: "displaced", notes: [backupRel] });
+            } else backedUp.push(rel);
           }
           writeFileSync4(absPath, content);
           updated++;
@@ -4276,7 +4532,8 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
         backedUp: [...backedUp],
         backupPaths: [...backupPaths],
         updated,
-        restored: [...restored]
+        restored: [...restored],
+        displaced: [...displaced.values()]
       };
     }
   };
@@ -4284,8 +4541,8 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
 
 // src/rules-port.ts
 init_esm_shims();
-import { existsSync as existsSync9, readdirSync, readFileSync as readFileSync7 } from "fs";
-import { join as join11 } from "path";
+import { existsSync as existsSync10, readdirSync, readFileSync as readFileSync7 } from "fs";
+import { join as join12 } from "path";
 function claudePaths(source) {
   if (!source.startsWith("---\n")) return [];
   const end = source.indexOf("\n---", 4);
@@ -4313,16 +4570,16 @@ function stripClaudeFrontmatter(source) {
 function portRules(harnessRoot, ruleNames) {
   const ported = [];
   for (const name of ruleNames) {
-    const src = join11(harnessRoot, "templates/rules", `${name}.md`);
-    if (!existsSync9(src)) continue;
+    const src = join12(harnessRoot, "templates/rules", `${name}.md`);
+    if (!existsSync10(src)) continue;
     const source = readFileSync7(src, "utf8");
     ported.push({ name, body: stripClaudeFrontmatter(source), paths: claudePaths(source) });
   }
   return ported;
 }
 function ruleHeadings(harnessRoot) {
-  const dir = join11(harnessRoot, "templates/rules");
-  if (!existsSync9(dir)) return /* @__PURE__ */ new Set();
+  const dir = join12(harnessRoot, "templates/rules");
+  if (!existsSync10(dir)) return /* @__PURE__ */ new Set();
   const names = readdirSync(dir).filter((f) => f.endsWith(".md")).map((f) => f.slice(0, -3));
   const block = renderRulesBlock(portRules(harnessRoot, names));
   return new Set(
@@ -4336,8 +4593,8 @@ function renderRulesBlock(rules) {
 
 // src/shared-write.ts
 init_esm_shims();
-import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync8, rmSync, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname3, join as join12 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync3, readFileSync as readFileSync8, rmSync, statSync as statSync3, writeFileSync as writeFileSync5 } from "fs";
+import { dirname as dirname3, join as join13 } from "path";
 function toPortions(path, portions) {
   const adapter = adapterFor(path);
   if (adapter === null) throw new Error(`shared-write: ${path} is not a shared file`);
@@ -4352,8 +4609,8 @@ function writeShared(params) {
   const { projectDir, path, render, record, baseline, writer, refreshOnly } = params;
   const adapter = adapterFor(path);
   if (adapter === null) throw new Error(`shared-write: ${path} is not a shared file`);
-  const abs = join12(projectDir, path);
-  const onDisk = existsSync10(abs) ? readFileSync8(abs, "utf8") : null;
+  const abs = join13(projectDir, path);
+  const onDisk = existsSync11(abs) ? readFileSync8(abs, "utf8") : null;
   const recorded2 = recordedFor(path, record);
   const excluded = excludedKeys(path, record.excluded ?? []);
   const result = (action2, rest = {}) => ({
@@ -4472,8 +4729,8 @@ function agentsMdModel(disk, recordedByHarness, recordedBlock = false) {
   return "block";
 }
 function writeAgentsMd(params) {
-  const abs = join12(params.projectDir, AGENTS_MD);
-  const disk = existsSync10(abs) ? readFileSync8(abs, "utf8") : null;
+  const abs = join13(params.projectDir, AGENTS_MD);
+  const disk = existsSync11(abs) ? readFileSync8(abs, "utf8") : null;
   const recordedBlock = (params.record.portions ?? []).some((p2) => p2.path === AGENTS_MD);
   if (agentsMdModel(disk, params.baseline.has(AGENTS_MD), recordedBlock) === "sections") {
     params.writer.write(
@@ -4526,8 +4783,8 @@ function stripShared(params) {
     portions: [],
     ...rest
   });
-  const abs = join12(projectDir, path);
-  if (!existsSync10(abs) || !statSync2(abs).isFile()) return out("none");
+  const abs = join13(projectDir, path);
+  if (!existsSync11(abs) || !statSync3(abs).isFile()) return out("none");
   const disk = readFileSync8(abs, "utf8");
   const recorded2 = new Map(
     params.portions.filter((p2) => p2.path === path).map((p2) => [p2.key, p2.sha256])
@@ -4579,18 +4836,19 @@ function runAgentsMdTransform(params) {
   const clis = agentsMdClis(params.clis);
   const writer = createOwnedWriter(projectDir, baseline, {
     refreshOnly,
-    ...params.journal === void 0 ? {} : { journal: params.journal }
+    ...params.journal === void 0 ? {} : { journal: params.journal },
+    ...params.owned === void 0 ? {} : { owned: params.owned }
   });
-  const claudeMd = readRequired(join13(harnessRoot, "templates/CLAUDE.md"));
-  const template = readRequired(join13(harnessRoot, AGENTS_MD_TEMPLATE));
+  const claudeMd = readRequired(join14(harnessRoot, "templates/CLAUDE.md"));
+  const template = readRequired(join14(harnessRoot, AGENTS_MD_TEMPLATE));
   const { skillIds } = agentsSkillSlot({
     projectDir,
     selectedInternalSkills: params.selectedInternalSkills,
     refreshOnly,
     writer
   });
-  const agentsMdPath = join13(projectDir, "AGENTS.md");
-  const exists = existsSync11(agentsMdPath);
+  const agentsMdPath = join14(projectDir, "AGENTS.md");
+  const exists = existsSync12(agentsMdPath);
   const creates = !exists && (!refreshOnly || params.installedByRecord === true);
   const legacy = params.legacyContext ?? null;
   const fromRoot = creates ? seedAgentsMdProjectContext(projectDir) : null;
@@ -4632,13 +4890,13 @@ function runAgentsMdTransform(params) {
   };
 }
 function seededInto(path, before, seed, from) {
-  if (seed === null || !existsSync11(path)) return null;
+  if (seed === null || !existsSync12(path)) return null;
   const after = readFileSync9(path, "utf8");
   const body = renameSlashes(seed.slice(seed.indexOf("\n\n") + 2));
   return after !== before && after.includes(body) ? from : null;
 }
 function readRequired(path) {
-  if (!existsSync11(path)) {
+  if (!existsSync12(path)) {
     throw new Error(`AGENTS.md transform: required source missing: ${path}`);
   }
   return readFileSync9(path, "utf8");
@@ -4647,7 +4905,7 @@ function readRequired(path) {
 // src/antigravity/retire-anchor.ts
 init_esm_shims();
 import { lstatSync as lstatSync2, readFileSync as readFileSync10, rmSync as rmSync2 } from "fs";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 var LEGACY_ANTIGRAVITY_ANCHOR_SECTIONS = ["Project Context", "Project Rules", "Protected Files"];
 function anchorRecord(previous) {
   return previous.find((f) => f.path === LEGACY_ANTIGRAVITY_ANCHOR) ?? null;
@@ -4675,7 +4933,7 @@ function legacyContextLines(text) {
 }
 function readLegacyAntigravityContext(projectDir, previous) {
   if (anchorRecord(previous) === null) return null;
-  const text = readRegular(join14(projectDir, LEGACY_ANTIGRAVITY_ANCHOR));
+  const text = readRegular(join15(projectDir, LEGACY_ANTIGRAVITY_ANCHOR));
   if (text === null) return null;
   const lines2 = legacyContextLines(text);
   if (lines2 === null) return null;
@@ -4699,7 +4957,7 @@ function retireAntigravityAnchor(args) {
   const rec = anchorRecord(args.previous);
   if (rec === null) return null;
   const path = LEGACY_ANTIGRAVITY_ANCHOR;
-  const abs = join14(args.projectDir, path);
+  const abs = join15(args.projectDir, path);
   const left = (why) => ({
     path,
     action: "left",
@@ -4737,12 +4995,12 @@ function relativeBackup(projectDir, backup) {
 
 // src/antigravity/transform.ts
 init_esm_shims();
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/codex/skills.ts
 init_esm_shims();
-import { chmodSync, existsSync as existsSync12, readFileSync as readFileSync11 } from "fs";
-import { join as join15 } from "path";
+import { chmodSync, existsSync as existsSync13, readFileSync as readFileSync11 } from "fs";
+import { join as join16 } from "path";
 function renderBundledSkill(source) {
   const trimmed = source.trimEnd();
   const lines2 = trimmed.split(/\r?\n/);
@@ -4774,13 +5032,13 @@ function writeBundledSkillDirs(params) {
   const { harnessRoot, projectDir, skillIds, writer } = params;
   const written = [];
   for (const id of skillIds) {
-    const srcDir = join15(harnessRoot, "templates/skills", id);
-    const srcSkill = join15(srcDir, "SKILL.md");
-    if (!existsSync12(srcSkill)) {
+    const srcDir = join16(harnessRoot, "templates/skills", id);
+    const srcSkill = join16(srcDir, "SKILL.md");
+    if (!existsSync13(srcSkill)) {
       continue;
     }
-    const targetDir = join15(projectDir, ".agents", "skills", id);
-    const targetSkill = join15(targetDir, "SKILL.md");
+    const targetDir = join16(projectDir, ".agents", "skills", id);
+    const targetSkill = join16(targetDir, "SKILL.md");
     if (!writer.write(targetSkill, renderBundledSkill(readFileSync11(srcSkill, "utf8")))) {
       continue;
     }
@@ -4789,10 +5047,10 @@ function writeBundledSkillDirs(params) {
       if (rel === "SKILL.md") continue;
       if (rel.split("/").some((segment2) => segment2.startsWith("."))) continue;
       const segments = rel.split("/");
-      const raw = readFileSync11(join15(srcDir, ...segments), "utf8");
+      const raw = readFileSync11(join16(srcDir, ...segments), "utf8");
       const ported = rel.endsWith(".md") || rel.endsWith(".sh") ? `${portBody(raw)}
 ` : raw;
-      const target = join15(targetDir, ...segments);
+      const target = join16(targetDir, ...segments);
       if (!writer.write(target, ported, { createInRefresh: true })) continue;
       if (rel.endsWith(".sh")) chmodSync(target, 493);
       written.push(target);
@@ -4822,7 +5080,8 @@ function runAntigravityTransform(params) {
   } = params;
   const writer = createOwnedWriter(projectDir, baseline, {
     refreshOnly: refreshOnly ?? false,
-    ...params.journal === void 0 ? {} : { journal: params.journal }
+    ...params.journal === void 0 ? {} : { journal: params.journal },
+    ...params.owned === void 0 ? {} : { owned: params.owned }
   });
   const { skillIds, skillWriter } = agentsSkillSlot({
     projectDir,
@@ -4833,7 +5092,7 @@ function runAntigravityTransform(params) {
   const antigravityInstalled = params.installedByRecord === true;
   const harnessRuleFiles = [];
   for (const rule of portRules(harnessRoot, rules)) {
-    const target = join16(projectDir, ".agents", "rules", `${rule.name}.md`);
+    const target = join17(projectDir, ".agents", "rules", `${rule.name}.md`);
     const content = `${antigravityFrontmatter(rule)}${rule.body}
 `;
     if (!writer.write(target, content, { createInRefresh: antigravityInstalled })) {
@@ -4857,11 +5116,11 @@ function runAntigravityTransform(params) {
 // src/codex/opt-in.ts
 init_esm_shims();
 import { homedir } from "os";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 
 // src/codex/trust-entry.ts
 init_esm_shims();
-import { existsSync as existsSync13, mkdirSync as mkdirSync4, readFileSync as readFileSync12, realpathSync as realpathSync2, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync4, readFileSync as readFileSync12, realpathSync as realpathSync2, writeFileSync as writeFileSync6 } from "fs";
 import { dirname as dirname4 } from "path";
 var UNSAFE_APPEND = "adding the entry would make this file unreadable TOML \u2014 left untouched";
 function trustKeysFor(projectDir) {
@@ -4904,7 +5163,7 @@ function registerTrustEntry(opts) {
   const keys = trustKeysFor(projectDir);
   const key = keys[0] ?? projectDir;
   try {
-    const existing = existsSync13(configPath) ? readFileSync12(configPath, "utf8") : "";
+    const existing = existsSync14(configPath) ? readFileSync12(configPath, "utf8") : "";
     let parsed;
     try {
       parsed = parse(existing);
@@ -4955,8 +5214,8 @@ function firstLine(e2) {
 
 // src/codex/opt-in.ts
 function runCodexOptIn(ctx) {
-  const codexHome = ctx.codexHome ?? join17(homedir(), ".codex");
-  const configPath = join17(codexHome, "config.toml");
+  const codexHome = ctx.codexHome ?? join18(homedir(), ".codex");
+  const configPath = join18(codexHome, "config.toml");
   const result = registerTrustEntry({ configPath, projectDir: ctx.projectDir });
   return {
     trustEntry: {
@@ -4971,13 +5230,13 @@ function runCodexOptIn(ctx) {
 
 // src/codex/transform.ts
 init_esm_shims();
-import { chmodSync as chmodSync2, existsSync as existsSync14, readFileSync as readFileSync14 } from "fs";
-import { basename as basename2, join as join19 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync15, readFileSync as readFileSync14 } from "fs";
+import { basename as basename2, join as join20 } from "path";
 
 // src/codex/config-toml.ts
 init_esm_shims();
 import { readFileSync as readFileSync13 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 var TABLES_REGION = "tables";
 function configRegions(rendered) {
   const lines2 = rendered.split(/\r?\n/);
@@ -5022,7 +5281,7 @@ function retiredFeatureKeys(disk) {
 function retiredFeaturesLeftBehind(projectDir, r) {
   if (r.action !== "left" && !r.leftAsIs.includes(TABLES_REGION)) return [];
   try {
-    return retiredFeatureKeys(readFileSync13(join18(projectDir, ".codex/config.toml"), "utf8"));
+    return retiredFeatureKeys(readFileSync13(join19(projectDir, ".codex/config.toml"), "utf8"));
   } catch {
     return [];
   }
@@ -5090,9 +5349,10 @@ function runCodexTransform(params) {
   } = params;
   const writer = createOwnedWriter(projectDir, baseline, {
     refreshOnly: refreshOnly ?? false,
-    ...params.journal === void 0 ? {} : { journal: params.journal }
+    ...params.journal === void 0 ? {} : { journal: params.journal },
+    ...params.owned === void 0 ? {} : { owned: params.owned }
   });
-  const configTemplate = readRequired2(join19(harnessRoot, "templates/codex/config.toml.template"));
+  const configTemplate = readRequired2(join20(harnessRoot, "templates/codex/config.toml.template"));
   const projectName = basename2(projectDir);
   const { skillIds, skillWriter } = agentsSkillSlot({
     projectDir,
@@ -5100,7 +5360,7 @@ function runCodexTransform(params) {
     refreshOnly: refreshOnly ?? false,
     writer
   });
-  const configTomlPath = join19(projectDir, CONFIG_TOML);
+  const configTomlPath = join20(projectDir, CONFIG_TOML);
   const configToml = writeConfigToml({
     projectDir,
     regions: configRegions(
@@ -5111,15 +5371,15 @@ function runCodexTransform(params) {
     record: shared2,
     refreshOnly: refreshOnly ?? false
   });
-  const hookDir = join19(projectDir, ".codex/hooks");
+  const hookDir = join20(projectDir, ".codex/hooks");
   const hookFiles = [];
   for (const hook of HOOK_NAMES) {
-    const src = join19(harnessRoot, "templates/hooks", `${hook}.sh`);
-    if (!existsSync14(src)) {
+    const src = join20(harnessRoot, "templates/hooks", `${hook}.sh`);
+    if (!existsSync15(src)) {
       continue;
     }
     const ported = readFileSync14(src, "utf8").replace(ENV_VAR_RENAME, "CODEX_PROJECT_DIR");
-    const target = join19(hookDir, `${hook}.sh`);
+    const target = join20(hookDir, `${hook}.sh`);
     if (!writer.write(target, ported)) continue;
     chmodSync2(target, 493);
     hookFiles.push(target);
@@ -5141,8 +5401,8 @@ function runCodexTransform(params) {
 var CONFIG_TOML = ".codex/config.toml";
 var LEGACY_CHANGED = "written by an earlier harness version and changed since \u2014 left as is; harness part not added";
 function writeConfigToml(args) {
-  const abs = join19(args.projectDir, CONFIG_TOML);
-  const disk = existsSync14(abs) ? readFileSync14(abs, "utf8") : null;
+  const abs = join20(args.projectDir, CONFIG_TOML);
+  const disk = existsSync15(abs) ? readFileSync14(abs, "utf8") : null;
   const regions = disk === null ? null : ADAPTERS["toml-region"].read(disk);
   if (disk !== null && regions?.size === 0 && isChangedLegacyConfig(disk, args.baseline.get(CONFIG_TOML))) {
     return {
@@ -5172,7 +5432,7 @@ function writeConfigToml(args) {
   });
 }
 function readRequired2(path) {
-  if (!existsSync14(path)) {
+  if (!existsSync15(path)) {
     throw new Error(`Codex transform: required source missing: ${path}`);
   }
   return readFileSync14(path, "utf8");
@@ -5180,8 +5440,8 @@ function readRequired2(path) {
 
 // src/opencode/transform.ts
 init_esm_shims();
-import { existsSync as existsSync15, readdirSync as readdirSync2, readFileSync as readFileSync15, unlinkSync } from "fs";
-import { join as join20 } from "path";
+import { existsSync as existsSync16, readdirSync as readdirSync2, readFileSync as readFileSync15, unlinkSync } from "fs";
+import { join as join21 } from "path";
 
 // src/opencode/opencode-json.ts
 init_esm_shims();
@@ -5235,10 +5495,11 @@ function runOpencodeTransform(params) {
   } = params;
   const writer = createOwnedWriter(projectDir, baseline, {
     refreshOnly: refreshOnly ?? false,
-    ...params.journal === void 0 ? {} : { journal: params.journal }
+    ...params.journal === void 0 ? {} : { journal: params.journal },
+    ...params.owned === void 0 ? {} : { owned: params.owned }
   });
   const opencodeTemplate = readRequired3(
-    join20(harnessRoot, "templates/opencode/opencode.json.template")
+    join21(harnessRoot, "templates/opencode/opencode.json.template")
   );
   const { skillIds, skillWriter } = agentsSkillSlot({
     projectDir,
@@ -5247,7 +5508,7 @@ function runOpencodeTransform(params) {
     writer
   });
   ensureDir(projectDir);
-  const opencodeJsonPath = join20(projectDir, OPENCODE_JSON);
+  const opencodeJsonPath = join21(projectDir, OPENCODE_JSON);
   const render = renderOpencodeMcp(mcp);
   const opencodeJson = writeShared({
     projectDir,
@@ -5266,13 +5527,13 @@ function runOpencodeTransform(params) {
     writer: skillWriter
   });
   const retiredCommands = [];
-  const cmdDir = join20(projectDir, ".opencode/commands");
-  if (existsSync15(cmdDir)) {
+  const cmdDir = join21(projectDir, ".opencode/commands");
+  if (existsSync16(cmdDir)) {
     for (const entry of readdirSync2(cmdDir)) {
       if (!entry.endsWith(".md")) continue;
       const id = entry.slice(0, -3);
-      if (!existsSync15(join20(harnessRoot, "templates/skills", id, "SKILL.md"))) continue;
-      const victim = join20(cmdDir, entry);
+      if (!existsSync16(join21(harnessRoot, "templates/skills", id, "SKILL.md"))) continue;
+      const victim = join21(cmdDir, entry);
       if (writer.skipOutside(victim)) continue;
       try {
         backupFile(victim);
@@ -5292,7 +5553,7 @@ function runOpencodeTransform(params) {
 }
 var OPENCODE_JSON = "opencode.json";
 function readRequired3(path) {
-  if (!existsSync15(path)) {
+  if (!existsSync16(path)) {
     throw new Error(`OpenCode transform: required source missing: ${path}`);
   }
   return readFileSync15(path, "utf8");
@@ -5317,7 +5578,7 @@ function trackDefaultMcpAssetIds(harnessRoot, tracks) {
 }
 function trackDefaultMcpNames(harnessRoot, tracks) {
   const { templateMcpPath } = mcpSources(harnessRoot);
-  const base = existsSync16(templateMcpPath) ? Object.keys(JSON.parse(readFileSync16(templateMcpPath, "utf8")).mcpServers) : [];
+  const base = existsSync17(templateMcpPath) ? Object.keys(JSON.parse(readFileSync16(templateMcpPath, "utf8")).mcpServers) : [];
   return /* @__PURE__ */ new Set([
     ...base,
     ...trackRows(harnessRoot).filter((r) => anyTrack(tracks, r.pattern)).map((r) => r.name)
@@ -5325,7 +5586,7 @@ function trackDefaultMcpNames(harnessRoot, tracks) {
 }
 function trackRows(harnessRoot) {
   const { trackMapPath } = mcpSources(harnessRoot);
-  return existsSync16(trackMapPath) ? parseTrackMcpMap(readFileSync16(trackMapPath, "utf8")) : [];
+  return existsSync17(trackMapPath) ? parseTrackMcpMap(readFileSync16(trackMapPath, "utf8")) : [];
 }
 function renderEverySelectableMcp(harnessRoot, tracks) {
   return composeMcpJson({
@@ -5345,8 +5606,8 @@ function adapterExcluded(harnessRoot, excluded) {
 }
 function mcpSources(harnessRoot) {
   return {
-    templateMcpPath: join21(harnessRoot, "templates/mcp.json"),
-    trackMapPath: join21(harnessRoot, "templates/track-mcp-map.tsv")
+    templateMcpPath: join22(harnessRoot, "templates/mcp.json"),
+    trackMapPath: join22(harnessRoot, "templates/track-mcp-map.tsv")
   };
 }
 var ALL_CLI_TARGETS = CLI_BASES;
@@ -5363,9 +5624,13 @@ function runCliTransforms(params) {
     codexTrust = false,
     shared: shared2 = {},
     recordedClis: recordedClis2 = [],
-    journal
+    journal,
+    owned
   } = params;
-  const journalParam = journal === void 0 ? {} : { journal };
+  const writerParams = {
+    ...journal === void 0 ? {} : { journal },
+    ...owned === void 0 ? {} : { owned }
+  };
   const legacyContext = readLegacyAntigravityContext(projectDir, previousExternal);
   const outside = createOutsideGuard(projectDir);
   const baseline = new Map(previousExternal.map((f) => [f.path, f.sha256]));
@@ -5373,6 +5638,7 @@ function runCliTransforms(params) {
   const externalBackups = [];
   const externalBackedUp = [];
   const externalForeignOwned = [];
+  const displaced = /* @__PURE__ */ new Map();
   let externalOutside = [];
   let externalUpdated = 0;
   const restoredFiles = [];
@@ -5392,6 +5658,8 @@ function runCliTransforms(params) {
     }
     externalBackups.push(...report.ownership.backupPaths);
     externalBackedUp.push(...report.ownership.backedUp);
+    for (const f of report.ownership.displaced ?? [])
+      if (!displaced.has(f.path)) displaced.set(f.path, f);
     for (const f of report.ownership.foreignOwned) {
       if (!externalForeignOwned.includes(f)) externalForeignOwned.push(f);
     }
@@ -5411,7 +5679,7 @@ function runCliTransforms(params) {
       baseline,
       refreshOnly,
       shared: shared2,
-      ...journalParam
+      ...writerParams
     });
     absorb(codex);
     absorbShared(codex, [codex.configToml]);
@@ -5431,7 +5699,7 @@ function runCliTransforms(params) {
       baseline,
       refreshOnly,
       shared: shared2,
-      ...journalParam
+      ...writerParams
     });
     absorb(opencode);
     absorbShared(opencode, [opencode.opencodeJson]);
@@ -5447,7 +5715,7 @@ function runCliTransforms(params) {
       baseline,
       refreshOnly,
       installedByRecord: recordedClis2.includes("antigravity"),
-      ...journalParam
+      ...writerParams
     });
     absorb(antigravity);
     journal?.done("antigravity");
@@ -5469,7 +5737,7 @@ function runCliTransforms(params) {
       installedByRecord: agentsSet.some((c3) => recordedClis2.includes(c3)),
       shared: shared2,
       legacyContext,
-      ...journalParam
+      ...writerParams
     });
     absorb(agentsMd);
     absorbShared(agentsMd, [agentsMd.agentsMd.shared]);
@@ -5497,6 +5765,7 @@ function runCliTransforms(params) {
     externalBackups,
     externalUpdated,
     externalBackedUp,
+    displaced: [...displaced.values()],
     externalForeignOwned,
     externalOutside,
     sharedFiles,
@@ -5508,8 +5777,8 @@ function runCliTransforms(params) {
 
 // src/excluded-still-there.ts
 init_esm_shims();
-import { existsSync as existsSync17 } from "fs";
-import { join as join22 } from "path";
+import { existsSync as existsSync18 } from "fs";
+import { join as join23 } from "path";
 function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
   const out = [];
   const add = (id, catalog) => {
@@ -5522,7 +5791,7 @@ function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
   for (const id of excluded) {
     if (INTERNAL_BUNDLED_SKILL_IDS.includes(id)) {
       const there = [".claude/skills", ".agents/skills"].some(
-        (d2) => existsSync17(join22(projectDir, d2, id))
+        (d2) => existsSync18(join23(projectDir, d2, id))
       );
       if (there) add(id, false);
     } else {
@@ -5536,17 +5805,17 @@ function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
 function assetStillThere(projectDir, asset) {
   if (asset.method !== "skill" || asset.scope === "global") return true;
   if (asset.files !== void 0)
-    return asset.files.some((f) => existsSync17(join22(projectDir, f.path)));
+    return asset.files.some((f) => existsSync18(join23(projectDir, f.path)));
   const dir = asset.detail.skill ?? asset.id;
-  return [".claude/skills", ".agents/skills"].some((d2) => existsSync17(join22(projectDir, d2, dir)));
+  return [".claude/skills", ".agents/skills"].some((d2) => existsSync18(join23(projectDir, d2, dir)));
 }
 
 // src/external-installer.ts
 init_esm_shims();
 import { spawnSync } from "child_process";
-import { existsSync as existsSync18, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync5, readFileSync as readFileSync17, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join23 } from "path";
+import { dirname as dirname5, join as join24 } from "path";
 var SKILL_ROOTS = [".claude/skills", ".agents/skills"];
 function skillRootOf(cli) {
   return cli === "claude" ? ".claude/skills" : ".agents/skills";
@@ -5554,11 +5823,11 @@ function skillRootOf(cli) {
 function snapshotSkillRoots(projectDir) {
   const out = /* @__PURE__ */ new Map();
   for (const root of SKILL_ROOTS) {
-    if (outsideProjectTarget(projectDir, join23(projectDir, root)) !== null) continue;
-    for (const rel of listFilesRecursive(join23(projectDir, root))) {
+    if (outsideProjectTarget(projectDir, join24(projectDir, root)) !== null) continue;
+    for (const rel of listFilesRecursive(join24(projectDir, root))) {
       const path = `${root}/${rel}`;
       try {
-        out.set(path, hashContent(readFileSync17(join23(projectDir, path), "utf8")));
+        out.set(path, hashContent(readFileSync17(join24(projectDir, path), "utf8")));
       } catch {
       }
     }
@@ -5635,7 +5904,7 @@ function installOne(asset, ctx) {
         return runSpawn(asset, ctx.spawn, "npx", buildSkillArgs(method, ctx.cli, ctx.scope), cwd);
       }
       const outside = SKILL_ROOTS.flatMap((root) => {
-        const hit = outsideProjectTarget(cwd, join23(cwd, root));
+        const hit = outsideProjectTarget(cwd, join24(cwd, root));
         return hit === null ? [] : [{ root, target: hit.target }];
       });
       const outRoots = new Set(outside.map((o) => o.root));
@@ -5712,6 +5981,11 @@ function refreshExternalSkills(projectDir, deps = {}) {
   if (targets.length === 0) {
     return { ...none, notInCatalog, unknown: false };
   }
+  const targetIds = new Set(targets.map((a) => a.id));
+  const settle = holdSkillSlots(
+    projectDir,
+    log.assets.filter((a) => targetIds.has(a.id))
+  );
   const report = (deps.run ?? runExternalInstall)(
     {
       tracks: log.spec.tracks,
@@ -5732,6 +6006,8 @@ function refreshExternalSkills(projectDir, deps = {}) {
       ...deps.warn ? { warn: deps.warn } : {}
     }
   );
+  settle();
+  recordRefreshedFiles(projectDir, log, report, deps.writeLog ?? writeInstallLog);
   return {
     attempted: report.attempted.length,
     refreshed: report.succeeded,
@@ -5740,6 +6016,65 @@ function refreshExternalSkills(projectDir, deps = {}) {
     unknown: false
   };
 }
+function holdSkillSlots(projectDir, assets) {
+  const held = assets.flatMap((a) => holdSlotFiles(projectDir, a.files));
+  return () => held.flatMap((h2) => settleHeld(h2) ?? []);
+}
+function holdSlotFiles(projectDir, files) {
+  if (files === void 0) return [];
+  const sha = new Map(files.map((f) => [f.path, f.sha256]));
+  const slots = new Set(files.map((f) => f.path.split("/").slice(0, 3).join("/")));
+  const out = [];
+  for (const slot of slots) {
+    if (outsideProjectTarget(projectDir, join24(projectDir, slot)) !== null) continue;
+    for (const rel of listFilesRecursive(join24(projectDir, slot))) {
+      const path = `${slot}/${rel}`;
+      const abs = join24(projectDir, path);
+      let content;
+      try {
+        content = readFileSync17(abs);
+      } catch {
+        continue;
+      }
+      const recordedSha = sha.get(path);
+      if (recordedSha === void 0) out.push({ abs, content, recorded: false });
+      else if (hashContent(content.toString("utf8")) !== recordedSha)
+        out.push({ abs, content, recorded: true });
+    }
+  }
+  return out;
+}
+function settleHeld(h2) {
+  let now = null;
+  try {
+    now = readFileSync17(h2.abs);
+  } catch {
+  }
+  if (now?.equals(h2.content)) return null;
+  if (!h2.recorded && now === null) {
+    mkdirSync5(dirname5(h2.abs), { recursive: true });
+    writeFileSync7(h2.abs, h2.content);
+    return null;
+  }
+  return backupContent(h2.abs, h2.content);
+}
+function recordRefreshedFiles(projectDir, log, report, writeLog) {
+  const next = new Map(
+    buildAssetEntries(report, log.scope, log.assets).filter((e2) => e2.files !== void 0).map((e2) => [e2.id, e2.files])
+  );
+  let changed = false;
+  const assets = log.assets.map((a) => {
+    const files = next.get(a.id);
+    if (files === void 0 || JSON.stringify(files) === JSON.stringify(a.files)) return a;
+    changed = true;
+    return { ...a, files };
+  });
+  if (!changed) return;
+  try {
+    writeLog(projectDir, { ...log, assets });
+  } catch {
+  }
+}
 function buildSkillArgs(method, cli, scope) {
   const args = [skillsCliSpec(), "add", method.source];
   if (method.skill) {
@@ -5816,8 +6151,8 @@ function detectVersion(method, spawn, scope, projectDir) {
       case "plugin":
         return detectPluginVersion(method.pluginId, scope, projectDir);
       case "npm": {
-        const pkgJson = scope === "global" ? detectGlobalNpmPackageJsonPath(method.pkg, spawn) : join23(projectDir, "node_modules", method.pkg, "package.json");
-        if (!pkgJson || !existsSync18(pkgJson)) return void 0;
+        const pkgJson = scope === "global" ? detectGlobalNpmPackageJsonPath(method.pkg, spawn) : join24(projectDir, "node_modules", method.pkg, "package.json");
+        if (!pkgJson || !existsSync19(pkgJson)) return void 0;
         const parsed = JSON.parse(readFileSync17(pkgJson, "utf8"));
         return parsed.version;
       }
@@ -5830,8 +6165,8 @@ function detectVersion(method, spawn, scope, projectDir) {
 }
 function detectPluginVersion(pluginId, scope, projectDir) {
   const claudeScope = scope === "global" ? "user" : "project";
-  const path = join23(homedir2(), ".claude/plugins/installed_plugins.json");
-  if (!existsSync18(path)) return void 0;
+  const path = join24(homedir2(), ".claude/plugins/installed_plugins.json");
+  if (!existsSync19(path)) return void 0;
   const data = JSON.parse(readFileSync17(path, "utf8"));
   const entries = data.plugins?.[pluginId] ?? [];
   const matches = entries.filter(
@@ -5845,7 +6180,7 @@ function detectPluginVersion(pluginId, scope, projectDir) {
 }
 function detectGlobalNpmPackageJsonPath(pkg, spawn) {
   const npmRoot = getNpmGlobalRoot(spawn);
-  return npmRoot ? join23(npmRoot, pkg, "package.json") : void 0;
+  return npmRoot ? join24(npmRoot, pkg, "package.json") : void 0;
 }
 var npmGlobalRootCache;
 function getNpmGlobalRoot(spawn) {
@@ -5865,7 +6200,7 @@ function getNpmGlobalRoot(spawn) {
 // src/key-ids.ts
 init_esm_shims();
 import { readFileSync as readFileSync18 } from "fs";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 function renderedKeyIds(harnessRoot, input, clis) {
   const out = /* @__PURE__ */ new Set();
   const add = (path, key) => {
@@ -5888,7 +6223,7 @@ function renderedKeyIds(harnessRoot, input, clis) {
   for (const name of Object.keys(mcp.mcpServers)) add(".mcp.json", `mcpServers.${name}`);
   for (const key of gitignoreRender().keys()) add(".gitignore", key);
   if (clis.includes("claude")) {
-    const template = readFileSync18(join24(harnessRoot, "templates/settings.json"), "utf8");
+    const template = readFileSync18(join25(harnessRoot, "templates/settings.json"), "utf8");
     for (const key of renderSettingsPortion(template, () => true).keys()) {
       add(".claude/settings.json", key);
     }
@@ -5929,7 +6264,7 @@ function withoutAccepts(harnessRoot, spec, previous) {
 
 // src/linked-skill-bodies.ts
 init_esm_shims();
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 function refreshLinkedSkillBodies(params) {
   const { harnessRoot, projectDir, ids, baseline, journal } = params;
   const bodyKey = (id) => `.agents/skills/${id}/SKILL.md`;
@@ -5940,10 +6275,11 @@ function refreshLinkedSkillBodies(params) {
   );
   const result = writer.result();
   return {
-    updated: ours.filter((id) => written.has(join25(projectDir, bodyKey(id)))),
+    updated: ours.filter((id) => written.has(join26(projectDir, bodyKey(id)))),
     notOurs: ids.filter((id) => !baseline.has(bodyKey(id))),
     files: result.files,
     backupPaths: result.backupPaths,
+    displaced: result.displaced ?? [],
     foreignOwned: result.foreignOwned,
     outside: result.outside ?? []
   };
@@ -5952,7 +6288,7 @@ function refreshLinkedSkillBodies(params) {
 // src/out-of-track.ts
 init_esm_shims();
 import { lstatSync as lstatSync3, readFileSync as readFileSync19, rmSync as rmSync3 } from "fs";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 var AGENTS_RULE = /^\.agents\/rules\/([^/]+)\.md$/;
 var ANCHOR_RULE = "uzys-harness";
 function reclaimOutOfTrack(args) {
@@ -5972,7 +6308,7 @@ function reclaimOutOfTrack(args) {
     const name = AGENTS_RULE.exec(f.path)?.[1];
     if (name === void 0 || name === ANCHOR_RULE || rendered.has(name)) continue;
     if (isBaselineExcluded(`.claude/rules/${name}.md`, args.excluded)) continue;
-    const abs = join26(projectDir, f.path);
+    const abs = join27(projectDir, f.path);
     if (args.outside.skip(abs)) continue;
     const stat = lstatSync3(abs, { throwIfNoEntry: false });
     if (stat !== void 0 && !stat.isFile()) continue;
@@ -6013,15 +6349,15 @@ function tracksBringing(rule) {
 
 // src/state.ts
 init_esm_shims();
-import { existsSync as existsSync19, readFileSync as readFileSync20 } from "fs";
-import { join as join27 } from "path";
+import { existsSync as existsSync20, readFileSync as readFileSync20 } from "fs";
+import { join as join28 } from "path";
 var META_FILE = ".claude/.installed-tracks";
 var LEGACY_ANCHOR_FILE = ".claude/CLAUDE.md";
 var TRACE_RULES = ["htmx", "nextjs", "data-analysis", "pyside6", "cli-development"].map(
   (r) => `.claude/rules/${r}.md`
 );
 function detectInstallState(projectDir) {
-  const hasClaudeDir = existsSync19(join27(projectDir, ".claude"));
+  const hasClaudeDir = existsSync20(join28(projectDir, ".claude"));
   const read = readInstallLogStatus(projectDir);
   if (read.status === "ok") {
     return {
@@ -6041,17 +6377,17 @@ function tracksFromLog(tracks) {
   return [...new Set(tracks.filter(isTrack))].sort();
 }
 function collectTraces(projectDir) {
-  const at5 = (rel) => join27(projectDir, rel);
-  const contains = (rel, needle) => existsSync19(at5(rel)) && readFileSync20(at5(rel), "utf8").includes(needle);
+  const at5 = (rel) => join28(projectDir, rel);
+  const contains = (rel, needle) => existsSync20(at5(rel)) && readFileSync20(at5(rel), "utf8").includes(needle);
   const traces = [];
-  if (existsSync19(at5(META_FILE)))
+  if (existsSync20(at5(META_FILE)))
     traces.push({ path: META_FILE, tracks: readMetafile(at5(META_FILE)) });
-  if (existsSync19(at5(HARNESS_ANCHOR_FILE))) traces.push({ path: HARNESS_ANCHOR_FILE });
+  if (existsSync20(at5(HARNESS_ANCHOR_FILE))) traces.push({ path: HARNESS_ANCHOR_FILE });
   if (contains("CLAUDE.md", "<!-- uzys-harness:import:start -->"))
     traces.push({ path: "CLAUDE.md" });
   if (contains("AGENTS.md", "<!-- uzys-harness:")) traces.push({ path: "AGENTS.md" });
   for (const rel of [".agents/rules/uzys-harness.md", LEGACY_ANCHOR_FILE, ...TRACE_RULES]) {
-    if (existsSync19(at5(rel))) traces.push({ path: rel });
+    if (existsSync20(at5(rel))) traces.push({ path: rel });
   }
   return traces;
 }
@@ -6100,17 +6436,17 @@ function reportNotInstalled(detected, projectDir, err) {
 init_esm_shims();
 import {
   copyFileSync,
-  existsSync as existsSync20,
+  existsSync as existsSync21,
   lstatSync as lstatSync4,
-  mkdirSync as mkdirSync5,
+  mkdirSync as mkdirSync6,
   readdirSync as readdirSync3,
   readFileSync as readFileSync21,
   rmdirSync,
-  statSync as statSync3,
+  statSync as statSync4,
   unlinkSync as unlinkSync2,
-  writeFileSync as writeFileSync7
+  writeFileSync as writeFileSync8
 } from "fs";
-import { basename as basename3, dirname as dirname5, join as join28 } from "path";
+import { basename as basename3, dirname as dirname6, join as join29 } from "path";
 var LEGACY_ANCHOR_FILE2 = ".claude/CLAUDE.md";
 function buildUpdateSpec(projectDir, tracks, only) {
   const log = readInstallLog(projectDir);
@@ -6132,7 +6468,7 @@ function parseUpdateOnly(raw) {
   return { ok: true, groups: [...new Set(raw)] };
 }
 function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
-  const claudeDir = join28(projectDir, ".claude");
+  const claudeDir = join29(projectDir, ".claude");
   const startedAt = Date.now();
   const backupsAtStart = new Set(
     collectRunBackups(projectDir, Number.NEGATIVE_INFINITY).map((b2) => b2.backup)
@@ -6174,33 +6510,63 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   report.restored = fresh.restored;
   const logAtStart = readInstallLog(projectDir);
   const claudeManaged = logAtStart === null || installedClis(logAtStart).includes("claude");
-  report.claudeUnrecorded = !claudeManaged && logAtStart !== null && existsSync20(claudeDir) ? recordClaudeCommand(logAtStart, installedTracks(projectDir)) : null;
+  const recordOf = recordedStateOf(logAtStart);
+  const claudeDisplaced = [];
+  report.claudeUnrecorded = !claudeManaged && logAtStart !== null && existsSync21(claudeDir) ? recordClaudeCommand(logAtStart, installedTracks(projectDir)) : null;
   const policyBase = policyBaseline(projectDir);
   for (const { dir, ext } of POLICY_DIRS) {
     if (!claudeManaged || !wants(dir === "hooks" ? "hooks" : "rules")) continue;
-    const target = join28(claudeDir, dir);
-    const source = join28(templatesDir, dir);
+    const target = join29(claudeDir, dir);
+    const source = join29(templatesDir, dir);
     const label = `.claude/${dir}`;
-    const ctx = { prefix: dir, baseline: policyBase, outside, excluded: excludedIds(logAtStart) };
+    const ctx = {
+      prefix: dir,
+      baseline: policyBase,
+      outside,
+      excluded: excludedIds(logAtStart),
+      // 0단계가 방금 깐 파일은 기록 전이지만 하네스 것이다 — 첫 접촉으로 읽지 않는다
+      justWritten: new Set(fresh.installed),
+      ...recordOf === void 0 ? {} : { recordOf }
+    };
     const synced = updateDir(target, source, ext, ctx);
     report.updated[label] = synced.updated;
     report.policyBackedUp.push(...synced.backedUp);
+    claudeDisplaced.push(...synced.displaced);
     report.pruned[label] = pruneOrphans(target, source, ext, ctx);
   }
   const syncedDirs = POLICY_DIRS.filter((d2) => wants(d2.dir === "hooks" ? "hooks" : "rules")).map(
     (d2) => d2.dir
   );
   if (claudeManaged && syncedDirs.length > 0)
-    refreshPolicyBaseline(projectDir, templatesDir, syncedDirs, outsidePaths(outside, ".claude/"));
+    refreshPolicyBaseline(
+      projectDir,
+      templatesDir,
+      syncedDirs,
+      outsidePaths(outside, ".claude/"),
+      notOursUnder(claudeDisplaced, ".claude/")
+    );
+  const skillTargets = logAtStart === null ? void 0 : recordedSkillIds(projectDir, logAtStart);
   const skillSync = claudeManaged && wants("skills") ? syncSkills(
-    join28(claudeDir, "skills"),
-    join28(templatesDir, "skills"),
+    join29(claudeDir, "skills"),
+    join29(templatesDir, "skills"),
     skillBaseline(projectDir),
     /* @__PURE__ */ new Date(),
     (relInSkills) => foreignOwnedTarget(projectDir, `.claude/skills/${relInSkills}`),
     outside,
-    excludedSkillOf(logAtStart)
-  ) : { updated: 0, backedUp: [], skippedLinks: [], foreignOwned: [], pruned: [] };
+    excludedSkillOf(logAtStart),
+    {
+      ...recordOf === void 0 ? {} : { recordOf },
+      ...skillTargets === void 0 ? {} : { targets: skillTargets }
+    }
+  ) : {
+    updated: 0,
+    backedUp: [],
+    skippedLinks: [],
+    foreignOwned: [],
+    pruned: [],
+    displaced: []
+  };
+  claudeDisplaced.push(...skillSync.displaced);
   if (wants("skills")) report.updated[".claude/skills"] = skillSync.updated;
   report.skillsBackedUp = skillSync.backedUp;
   report.skillsSkippedLinks = skillSync.skippedLinks;
@@ -6210,10 +6576,17 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   report.restored.push(...newSkills.restored);
   const copiedSkills = [...newSkills.installed, ...newSkills.restored];
   if (claudeManaged && wants("skills"))
-    refreshSkillBaseline(projectDir, templatesDir, outsidePaths(outside, ".claude/skills/"));
+    refreshSkillBaseline(
+      projectDir,
+      templatesDir,
+      outsidePaths(outside, ".claude/skills/"),
+      skillTargets,
+      notOursUnder(claudeDisplaced, ".claude/skills/")
+    );
   else if (claudeManaged && copiedSkills.length > 0)
     recordNewSkillBaseline(projectDir, templatesDir, copiedSkills);
-  if (existsSync20(claudeDir) && claudeManaged) {
+  if (claudeDisplaced.length > 0) recordDisplaced(projectDir, claudeDisplaced);
+  if (existsSync21(claudeDir) && claudeManaged) {
     if (wants("anchor")) syncHarnessAnchor(projectDir, templatesDir, report, outside);
   }
   const harnessMcp = renderHarnessMcp(harnessRoot, {
@@ -6232,14 +6605,18 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
     droppedKeys: legacyDroppedKeys(logAtStart),
     harnessMcp
   });
-  const settingsPath = join28(claudeDir, "settings.json");
-  if (claudeManaged && wants("hooks") && existsSync20(settingsPath) && !outside.skip(settingsPath)) {
-    report.staleHookRefs = cleanStaleHookRefs(
+  const settingsPath = join29(claudeDir, "settings.json");
+  if (claudeManaged && wants("hooks") && existsSync21(settingsPath) && !outside.skip(settingsPath)) {
+    report.retiredHookRefsRemoved = removeRetiredHookRefs(
+      settingsPath,
+      claudeDir,
+      RETIRED_HOOK_WIRING_REFS
+    );
+    report.staleHookRefs = findStaleHookRefs(
       settingsPath,
       claudeDir,
       recordedHarnessHook(projectDir, logAtStart)
     );
-    if (report.staleHookRefs.length > 0) dropHealedHookPortions(projectDir, report.staleHookRefs);
   }
   if (wants("hooks")) report.mcpAllowlistRetired = retireMcpAllowlist(projectDir);
   report.retiredAgents = staleAgentFiles(claudeDir);
@@ -6249,6 +6626,7 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   const external = wants("external") ? refreshExternalCli(projectDir, harnessRoot, legacyDroppedKeys(logAtStart), harnessMcp) : {
     externalUpdated: 0,
     externalBackedUp: [],
+    displaced: [],
     externalForeignOwned: [],
     externalOutside: [],
     written: [],
@@ -6340,9 +6718,15 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   report.externalSkillsUnknown = skillRefresh.unknown;
   const outsideLinks = mergeOutside(outside.list(), sharedWrites.outside, external.externalOutside);
   if (outsideLinks.length > 0) report.outsideLinks = outsideLinks;
+  const displacedAll = [...claudeDisplaced, ...external.displaced];
+  const displacedMoved = displacedAll.filter((f) => f.notes.length > 0).map((f) => f.path);
+  const displacedSame = displacedAll.filter((f) => f.notes.length === 0).map((f) => f.path);
+  if (displacedMoved.length > 0) report.displaced = displacedMoved;
+  if (displacedSame.length > 0) report.displacedSame = displacedSame;
   report.backups = collectRunBackups(projectDir, startedAt, backupsAtStart);
   const onRecord = checksumOnRecord(logAtStart);
-  const noChecksum = report.backups.map((b2) => b2.path).filter((p2) => !onRecord(p2));
+  const firstContact = new Set(displacedMoved);
+  const noChecksum = report.backups.map((b2) => b2.path).filter((p2) => !onRecord(p2) && !firstContact.has(p2));
   if (noChecksum.length > 0) report.noChecksum = noChecksum;
   writeBackupList(projectDir, report.backups, new Set(noChecksum));
   return report;
@@ -6422,7 +6806,8 @@ function checksumOnRecord(log) {
   const paths = /* @__PURE__ */ new Set([
     ...(log.policyFiles ?? []).map((f) => `.claude/${f.path}`),
     ...(log.skillFiles ?? []).map((f) => `.claude/skills/${f.path}`),
-    ...(log.externalFiles ?? []).map((f) => f.path)
+    ...(log.externalFiles ?? []).map((f) => f.path),
+    ...log.assets.flatMap((a) => a.files ?? []).map((f) => f.path)
   ]);
   const anchor = log.templates.rootClaudeMd;
   if (anchor !== void 0) paths.add(anchor.path);
@@ -6435,7 +6820,7 @@ function retiredFeaturesPart(projectDir, f) {
 }
 function legacyHookOnDisk(projectDir, rel) {
   try {
-    return hasLegacyHarnessHook(readFileSync21(join28(projectDir, rel), "utf8"));
+    return hasLegacyHarnessHook(readFileSync21(join29(projectDir, rel), "utf8"));
   } catch {
     return false;
   }
@@ -6461,8 +6846,8 @@ function writeUpdateSharedFiles(args) {
     excluded: adapterExcluded(harnessRoot, excluded)
   });
   const tracks = installedTracks(projectDir);
-  const settingsSource = join28(templatesDir, "settings.json");
-  if (args.claudeManaged && wants("hooks") && existsSync20(settingsSource)) {
+  const settingsSource = join29(templatesDir, "settings.json");
+  if (args.claudeManaged && wants("hooks") && existsSync21(settingsSource)) {
     const spec = buildAssetSpec({ tracks, options: DEFAULT_OPTIONS });
     const manifest = buildManifest(spec);
     writeSettingsShared(
@@ -6472,7 +6857,7 @@ function writeUpdateSharedFiles(args) {
       log,
       (script) => {
         const target = `.claude/hooks/${script}`;
-        return manifest.some((e2) => e2.target === target && e2.applies(spec)) && !isBaselineExcluded(target, excluded) && existsSync20(join28(projectDir, target));
+        return manifest.some((e2) => e2.target === target && e2.applies(spec)) && !isBaselineExcluded(target, excluded) && existsSync21(join29(projectDir, target));
       }
       // 기록이 claude 를 깔린 CLI 로 말한다 = install 이 이 파일을 썼다 — 없으면 만든다(훅 배선이 여기 산다)
     );
@@ -6536,11 +6921,11 @@ function catalogRemovedOnRecord(log) {
 }
 function staleSkillDirs(projectDir, claudeDir, clis) {
   const stale = (id) => RENAMED_SKILL_IDS[id] !== void 0 || RETIRED_SKILL_IDS.includes(id);
-  const dirs = [join28(claudeDir, "skills")];
-  if (clis.some((cli) => cli !== "claude")) dirs.push(join28(projectDir, ".agents", "skills"));
+  const dirs = [join29(claudeDir, "skills")];
+  if (clis.some((cli) => cli !== "claude")) dirs.push(join29(projectDir, ".agents", "skills"));
   const ids = /* @__PURE__ */ new Set();
   for (const dir of dirs) {
-    if (!existsSync20(dir)) continue;
+    if (!existsSync21(dir)) continue;
     for (const e2 of readdirSync3(dir, { withFileTypes: true })) {
       if (e2.isDirectory() && stale(e2.name)) ids.add(e2.name);
     }
@@ -6548,14 +6933,14 @@ function staleSkillDirs(projectDir, claudeDir, clis) {
   return [...ids];
 }
 function staleAgentFiles(claudeDir) {
-  const dir = join28(claudeDir, "agents");
-  if (!existsSync20(dir)) return [];
+  const dir = join29(claudeDir, "agents");
+  if (!existsSync21(dir)) return [];
   return readdirSync3(dir, { withFileTypes: true }).filter((e2) => e2.isFile() && e2.name.endsWith(".md")).map((e2) => basename3(e2.name, ".md")).filter((id) => RETIRED_AGENT_IDS.includes(id));
 }
 function demotedAgentFiles(claudeDir, tracks) {
   if (tracks.length === 0) return [];
-  const dir = join28(claudeDir, "agents");
-  if (!existsSync20(dir)) return [];
+  const dir = join29(claudeDir, "agents");
+  if (!existsSync21(dir)) return [];
   const demoted = TRACK_AGENTS.filter(([, pattern]) => !anyTrack(tracks, pattern)).map(
     ([id]) => id
   );
@@ -6577,21 +6962,21 @@ function installNewAssets(projectDir, templatesDir, wants, outside) {
     if (!wants(group)) continue;
     if (entry.target === HARNESS_ANCHOR_FILE) continue;
     if (isBaselineExcluded(entry.target, baselineExcluded)) continue;
-    const target = join28(projectDir, entry.target);
+    const target = join29(projectDir, entry.target);
     const foreign = foreignOwnedTarget(projectDir, entry.target);
     if (foreign !== null) {
       if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
       continue;
     }
-    if (existsSync20(target)) continue;
-    const source = join28(templatesDir, entry.source);
-    if (!existsSync20(source)) continue;
+    if (existsSync21(target)) continue;
+    const source = join29(templatesDir, entry.source);
+    if (!existsSync21(source)) continue;
     if (outside.skip(target)) continue;
     if (entry.target.startsWith(".claude/")) {
       if (!claudeSelected) continue;
       if (entry.target === SETTINGS_TARGET) continue;
     }
-    mkdirSync5(dirname5(target), { recursive: true });
+    mkdirSync6(dirname6(target), { recursive: true });
     copyFileSync(source, target);
     const recordedAs = entry.target.startsWith(".claude/") ? entry.target.slice(8) : entry.target;
     const wired = entry.target.startsWith(".claude/hooks/") && wiredBefore.has(entry.target.slice(".claude/hooks/".length));
@@ -6611,27 +6996,27 @@ function collectRunBackups(projectDir, startedAt, exclude) {
   const consider = (rel) => {
     if (!BACKUP_SUFFIX.test(rel)) return;
     if (exclude?.has(rel)) return;
-    const abs = join28(projectDir, rel);
-    if (statSync3(abs).mtimeMs < startedAt - 1e3) return;
+    const abs = join29(projectDir, rel);
+    if (statSync4(abs).mtimeMs < startedAt - 1e3) return;
     out.push({ path: rel.replace(BACKUP_SUFFIX, ""), backup: rel });
   };
   for (const e2 of readdirSync3(projectDir, { withFileTypes: true }))
     if (e2.isFile()) consider(e2.name);
   for (const dir of BACKUP_SCAN_DIRS) {
-    for (const rel of listFilesRecursive(join28(projectDir, dir))) consider(`${dir}/${rel}`);
+    for (const rel of listFilesRecursive(join29(projectDir, dir))) consider(`${dir}/${rel}`);
   }
   return out.sort((a, b2) => a.path.localeCompare(b2.path));
 }
 function writeBackupList(projectDir, backups, noChecksum = /* @__PURE__ */ new Set()) {
-  const dir = join28(projectDir, ".uzys-agent-harness");
-  const file = join28(dir, "update-backups.json");
+  const dir = join29(projectDir, ".uzys-agent-harness");
+  const file = join29(dir, "update-backups.json");
   try {
     if (backups.length === 0) {
-      if (existsSync20(file)) unlinkSync2(file);
+      if (existsSync21(file)) unlinkSync2(file);
       return;
     }
-    if (!existsSync20(dir)) return;
-    writeFileSync7(
+    if (!existsSync21(dir)) return;
+    writeFileSync8(
       file,
       `${JSON.stringify(
         {
@@ -6662,15 +7047,15 @@ function installNewSkillDirs(projectDir, templatesDir, tracks, outside) {
     if (entry.type !== "dir" || !entry.target.startsWith(".claude/skills/")) continue;
     if (!entry.applies(spec) || isBaselineExcluded(entry.target, excluded)) continue;
     if (skillExcluded.has(entry.target.slice(".claude/skills/".length))) continue;
-    const target = join28(projectDir, entry.target);
+    const target = join29(projectDir, entry.target);
     const foreign = foreignOwnedTarget(projectDir, entry.target);
     if (foreign !== null) {
       if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
       continue;
     }
-    if (existsSync20(target)) continue;
-    const source = join28(templatesDir, entry.source);
-    if (!existsSync20(source)) continue;
+    if (existsSync21(target)) continue;
+    const source = join29(templatesDir, entry.source);
+    if (!existsSync21(source)) continue;
     if (outside.skip(target)) continue;
     copyDir(source, target, (rel) => foreignOwnedTarget(projectDir, `${entry.target}/${rel}`));
     if (priorIds.has(entry.target.slice(".claude/skills/".length))) restored.push(entry.target);
@@ -6681,6 +7066,7 @@ function installNewSkillDirs(projectDir, templatesDir, tracks, outside) {
 function recordNewSkillBaseline(projectDir, templatesDir, targets) {
   const log = readInstallLog(projectDir);
   if (!log) return;
+  if (log.skillFiles === void 0) return;
   const ids = new Set(targets.map((t) => t.slice(".claude/skills/".length)));
   const added = collectSkillHashes(projectDir, templatesDir).filter(
     (f) => ids.has(f.path.split("/")[0] ?? "")
@@ -6700,14 +7086,14 @@ function trackOnlyFileAssets(tracks) {
   );
 }
 function syncHarnessAnchor(projectDir, templatesDir, report, outside, now = /* @__PURE__ */ new Date()) {
-  if (existsSync20(join28(projectDir, LEGACY_ANCHOR_FILE2))) {
+  if (existsSync21(join29(projectDir, LEGACY_ANCHOR_FILE2))) {
     report.legacyAnchor = LEGACY_ANCHOR_FILE2;
   }
-  const templateMd = join28(templatesDir, "CLAUDE.md");
-  if (!existsSync20(templateMd)) return;
-  const anchor = join28(projectDir, HARNESS_ANCHOR_FILE);
+  const templateMd = join29(templatesDir, "CLAUDE.md");
+  if (!existsSync21(templateMd)) return;
+  const anchor = join29(projectDir, HARNESS_ANCHOR_FILE);
   if (outside.skip(anchor)) return;
-  const existed = existsSync20(anchor);
+  const existed = existsSync21(anchor);
   if (existed) {
     const current = readFileSync21(anchor, "utf8");
     if (current !== readFileSync21(templateMd, "utf8")) {
@@ -6731,21 +7117,21 @@ function syncHarnessAnchor(projectDir, templatesDir, report, outside, now = /* @
   recordAnchorBaseline(projectDir, anchor);
 }
 function upsertRootImport(projectDir, outside) {
-  const target = join28(projectDir, "CLAUDE.md");
+  const target = join29(projectDir, "CLAUDE.md");
   if (outside.skip(target)) return false;
-  const existing = existsSync20(target) ? readFileSync21(target, "utf8") : null;
+  const existing = existsSync21(target) ? readFileSync21(target, "utf8") : null;
   const next = upsertHarnessImport(existing, {
     projectName: basename3(projectDir),
     tracks: installedTracks(projectDir),
     // ADR-085 — update 는 선택 목록을 인자로 받지 않는다. `syncSkills` 와 같은 판정을 쓴다:
     // `.claude/skills/<id>` 가 있으면 그 스킬은 이 설치가 고른 것이다.
     continuousSkills: CONTINUOUS_SKILLS.map((s) => s.id).filter(
-      (id) => existsSync20(join28(projectDir, ".claude/skills", id))
+      (id) => existsSync21(join29(projectDir, ".claude/skills", id))
     )
   });
   if (next === existing) return false;
   if (existing !== null) backupIfLossyUtf8(target);
-  writeFileSync7(target, next);
+  writeFileSync8(target, next);
   return true;
 }
 function installedTracks(projectDir) {
@@ -6775,7 +7161,7 @@ function excludedBaselineOnDisk(projectDir, log) {
   if (excluded.size === 0) return [];
   const spec = buildAssetSpec({ tracks: installedTracks(projectDir), options: DEFAULT_OPTIONS });
   return buildManifest(spec).filter(
-    (e2) => e2.applies(spec) && isBaselineExcluded(e2.target, excluded) && existsSync20(join28(projectDir, e2.target))
+    (e2) => e2.applies(spec) && isBaselineExcluded(e2.target, excluded) && existsSync21(join29(projectDir, e2.target))
   ).map((e2) => e2.target);
 }
 function excludedSkillOf(log) {
@@ -6785,12 +7171,12 @@ function excludedSkillOf(log) {
 function recordedRenderInputs(projectDir, log) {
   const excluded = excludedIds(log);
   return {
-    // 스킬은 **디스크에 있는 것만** 넘긴다. 스킬 *파일*은 전체 목록을 넘겨도 refreshOnly 가
-    // 없는 것을 건너뛰지만, `AGENTS.md` 의 상시 스킬 안내(ADR-085)는 이 목록 그대로 렌더돼
-    // `--without` 으로 뺀 스킬(#505)·opt-in 스킬을 "열어라"고 적었다(실측 2026-09-21). 판정은
-    // `upsertRootImport` 와 같다 — `.claude/skills/<id>` 또는 `.agents/skills/<id>` 가 있으면 깔린 것.
+    // 스킬은 **기록 + 이번 릴리즈 기본**만 넘긴다(#761 — `recordedBundledSkills`). 스킬 *파일*은 전체 목록을 넘겨도
+    // refreshOnly 가 없는 것을 건너뛰지만, `AGENTS.md` 의 상시 스킬 안내(ADR-085)는 이 목록 그대로 렌더돼
+    // `--without` 으로 뺀 스킬(#505)·opt-in 스킬을 "열어라"고 적었다(실측 2026-09-21). 디스크에 같은 이름의 폴더가
+    // 있다는 것은 그 스킬을 깔았다는 증거가 아니다(ADR-096 D6) — 손으로 만든 opt-in 이름 폴더를 덮지 않는다.
     // ADR-099 R3 — 뺀 스킬은 디스크에 남아 있어도 갱신하지도 안내하지도 않는다(install 이 내는 것과 같은 목록)
-    selectedInternalSkills: installedBundledSkills(projectDir).filter(
+    selectedInternalSkills: recordedBundledSkills(projectDir, log).filter(
       (id) => !excludedSkillOf(log)(id)
     ),
     // #601 — install 과 같은 SSOT(resolveRules)를 설치된 트랙으로. 렌더 경로(AGENTS.md 절 · antigravity 룰 생성)는
@@ -6800,11 +7186,29 @@ function recordedRenderInputs(projectDir, log) {
     )
   };
 }
-function installedBundledSkills(projectDir) {
-  return INTERNAL_BUNDLED_SKILL_IDS.filter(
-    (id) => existsSync20(join28(projectDir, ".claude/skills", id)) || existsSync20(join28(projectDir, ".agents/skills", id))
-  );
+function recordedBundledSkills(projectDir, log) {
+  if (log === null) {
+    return INTERNAL_BUNDLED_SKILL_IDS.filter(
+      (id) => existsSync21(join29(projectDir, ".claude/skills", id)) || existsSync21(join29(projectDir, ".agents/skills", id))
+    );
+  }
+  const ids = recordedSkillIds(projectDir, log);
+  return INTERNAL_BUNDLED_SKILL_IDS.filter((id) => ids.has(id));
 }
+function recordedSkillIds(projectDir, log) {
+  const isTarget = recordedTrackTargets(log);
+  const ids = new Set(bundledSkillTargets(projectDir, log));
+  for (const f of log.skillFiles ?? []) {
+    const id = f.path.split("/")[0] ?? "";
+    if (recorded(log, `.claude/skills/${f.path}`, { isTarget }).state !== "none") ids.add(id);
+  }
+  for (const f of log.externalFiles ?? []) {
+    const id = SHARED_SKILL_ID.exec(f.path)?.[1];
+    if (id !== void 0) ids.add(id);
+  }
+  return ids;
+}
+var SHARED_SKILL_ID = /^\.agents\/skills\/([^/]+)\//;
 function installedCliTargets(log) {
   if (log === null) return ALL_CLI_TARGETS;
   return installedClis(log);
@@ -6832,9 +7236,9 @@ var SHARED_SKILLS_DIR = ".agents/skills";
 var SHARED_SKILL_FILE = /^\.agents\/skills\/([^/]+)\//;
 var SHARED_SKILL_MD = /^\.agents\/skills\/([^/]+)\/SKILL\.md$/;
 function sharedSkillIdsOnDisk(projectDir) {
-  const root = join28(projectDir, SHARED_SKILLS_DIR);
-  if (!existsSync20(root)) return /* @__PURE__ */ new Set();
-  return new Set(readdirSync3(root).filter((id) => existsSync20(join28(root, id, "SKILL.md"))));
+  const root = join29(projectDir, SHARED_SKILLS_DIR);
+  if (!existsSync21(root)) return /* @__PURE__ */ new Set();
+  return new Set(readdirSync3(root).filter((id) => existsSync21(join29(root, id, "SKILL.md"))));
 }
 var CREATED_SHARED_HOW = {
   "opencode.json": "created from template (harness part + template defaults)",
@@ -6861,14 +7265,14 @@ function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp) {
   const log = readInstallLog(projectDir);
   const presentBefore = sharedSkillIdsOnDisk(projectDir);
   const rulesBefore = /* @__PURE__ */ new Set();
-  const rulesDir = join28(projectDir, ".agents", "rules");
-  if (existsSync20(rulesDir)) {
+  const rulesDir = join29(projectDir, ".agents", "rules");
+  if (existsSync21(rulesDir)) {
     try {
       for (const f of readdirSync3(rulesDir)) rulesBefore.add(f);
     } catch {
     }
   }
-  const agentsMdBefore = existsSync20(join28(projectDir, "AGENTS.md"));
+  const agentsMdBefore = existsSync21(join29(projectDir, "AGENTS.md"));
   const result = runCliTransforms({
     harnessRoot,
     projectDir,
@@ -6884,7 +7288,10 @@ function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp) {
     shared: { portions: log?.portions ?? [], excluded: [...excludedIds(log)] },
     // ADR-099 R2 (#584) — 기록이 깔린 CLI 로 말하면 그 CLI 의 앵커·룰을 없어도 만든다(디스크의 앵커 존재가 아니라 기록)
     // 기록 없음: CLI 경로로는 도달 불가 — 진입 판정(#699)이 먼저 거절. 엔진 단위 방어(빈 집합).
-    recordedClis: log === null ? [] : installedClis(log)
+    recordedClis: log === null ? [] : installedClis(log),
+    // #761 B-1 — 외부 기록이 아예 없던 옛 판의 산출물은 첫 접촉이 아니라 체크섬 없는 하네스 파일이다(install 과 같은 판정).
+    // 앞 단계(`refreshNeutralHelpers`)가 헬퍼만 든 `externalFiles` 를 적어도 같은 답이다 — 헬퍼는 외부 자리로 세지 않는다(B-2)
+    owned: recordedOwner(log)
   });
   if (log) {
     const retiredPath = result.anchorRetired?.forget === true ? result.anchorRetired.path : null;
@@ -6902,7 +7309,8 @@ function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp) {
     if (portions.length > 0) next.portions = portions;
     else delete next.portions;
     const created = result.sharedFiles.filter((f) => f.createdAsRoot === true).map((f) => ({ path: f.path, change: "created", notes: ["\uD558\uB124\uC2A4 \uBAAB\uB9CC(\uBE14\uB85D)"] }));
-    if (created.length > 0) next.rootFiles = mergeRootFiles(log.rootFiles, created);
+    const roots = [...created, ...withoutLostBackups(log.rootFiles, result.displaced ?? [])];
+    if (roots.length > 0) next.rootFiles = mergeRootFiles(log.rootFiles, roots);
     try {
       writeInstallLog(projectDir, next);
     } catch {
@@ -6959,6 +7367,7 @@ function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp) {
   return {
     externalUpdated: result.externalUpdated,
     externalBackedUp: result.externalBackedUp,
+    displaced: result.displaced ?? [],
     externalForeignOwned: result.externalForeignOwned,
     externalOutside: result.externalOutside,
     written: result.externalFiles.map((f) => f.path),
@@ -7001,92 +7410,154 @@ function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp) {
     })
   };
 }
-function isHarnessOwned2(ctx, rel, current) {
-  return isHarnessOwned(ctx.baseline, `${ctx.prefix}/${rel}`, current);
-}
 function updateDir(target, source, ext, ctx, now = /* @__PURE__ */ new Date()) {
-  if (!existsSync20(target) || !existsSync20(source)) return { updated: 0, backedUp: [] };
+  if (!existsSync21(target) || !existsSync21(source))
+    return { updated: 0, backedUp: [], displaced: [] };
   let updated = 0;
   const backedUp = [];
+  const displaced = [];
   for (const file of readdirSync3(target)) {
     if (!file.endsWith(ext)) continue;
-    const targetFile = join28(target, file);
-    const sourceFile = join28(source, file);
-    if (!existsSync20(sourceFile)) continue;
+    const targetFile = join29(target, file);
+    const sourceFile = join29(source, file);
+    if (!existsSync21(sourceFile)) continue;
     if (ctx.outside?.skip(targetFile)) continue;
-    if (ctx.excluded && isBaselineExcluded(`.claude/${ctx.prefix}/${file}`, ctx.excluded)) continue;
+    const projectRel = `.claude/${ctx.prefix}/${file}`;
+    if (ctx.excluded && isBaselineExcluded(projectRel, ctx.excluded)) continue;
+    if (ctx.justWritten?.has(projectRel)) continue;
     const next = readFileSync21(sourceFile, "utf8");
-    const current = readFileSync21(targetFile, "utf8");
-    if (current === next) continue;
-    if (!isHarnessOwned2(ctx, file, current)) {
-      backupFile(targetFile, now);
-      backedUp.push(`${ctx.prefix}/${file}`);
-    }
-    writeFileSync7(targetFile, next);
-    updated++;
+    const rec = ctx.recordOf?.(projectRel) ?? baselineRecord(ctx.baseline, `${ctx.prefix}/${file}`);
+    const w3 = judgedUpdateWrite(targetFile, rec, next, now);
+    if (w3.changed) updated++;
+    if (w3.kind === "edited") backedUp.push(`${ctx.prefix}/${file}`);
+    const d2 = displacedEntry(w3, projectRel, targetFile);
+    if (d2 !== null) displaced.push(d2);
   }
-  return { updated, backedUp };
+  return { updated, backedUp, displaced };
 }
-function syncSkills(targetDir, sourceDir, baseline, now = /* @__PURE__ */ new Date(), foreignOf, outside, excludedSkill) {
-  if (!existsSync20(targetDir) || !existsSync20(sourceDir))
-    return { updated: 0, backedUp: [], skippedLinks: [], foreignOwned: [], pruned: [] };
+function syncSkills(targetDir, sourceDir, baseline, now = /* @__PURE__ */ new Date(), foreignOf, outside, excludedSkill, opts = {}) {
+  if (!existsSync21(targetDir) || !existsSync21(sourceDir))
+    return {
+      updated: 0,
+      backedUp: [],
+      skippedLinks: [],
+      foreignOwned: [],
+      pruned: [],
+      displaced: []
+    };
   let updated = 0;
   const backedUp = [];
   const skippedLinks = [];
   const foreignOwned = [];
   const pruned = [];
+  const displaced = [];
   for (const skill of readdirSync3(sourceDir, { withFileTypes: true })) {
     if (!skill.isDirectory()) continue;
-    const targetSkill = join28(targetDir, skill.name);
+    const targetSkill = join29(targetDir, skill.name);
     if (occupiedByNonDirectory(targetSkill)) {
       skippedLinks.push(skill.name);
       continue;
     }
-    if (!existsSync20(targetSkill)) continue;
+    if (opts.targets !== void 0 && !opts.targets.has(skill.name)) continue;
+    if (!existsSync21(targetSkill)) continue;
     if (excludedSkill?.(skill.name)) continue;
-    for (const rel of listFilesRecursive(join28(sourceDir, skill.name))) {
-      const targetFile = join28(targetSkill, rel);
+    for (const rel of listFilesRecursive(join29(sourceDir, skill.name))) {
+      const targetFile = join29(targetSkill, rel);
       const foreign = foreignOf(`${skill.name}/${rel}`);
       if (foreign !== null) {
         if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
         continue;
       }
       if (outside?.skip(targetFile)) continue;
-      const next = readFileSync21(join28(sourceDir, skill.name, rel), "utf8");
-      if (!existsSync20(targetFile)) {
-        mkdirSync5(dirname5(targetFile), { recursive: true });
-        writeFileSync7(targetFile, next);
-        updated++;
-        continue;
-      }
-      const current = readFileSync21(targetFile, "utf8");
-      if (current === next) continue;
-      const recorded2 = baseline.get(`${skill.name}/${rel}`);
-      if (recorded2 === void 0 || hashContent(current) !== recorded2) {
-        backupFile(targetFile, now);
-        backedUp.push(`${skill.name}/${rel}`);
-      }
-      writeFileSync7(targetFile, next);
-      updated++;
-    }
-    const bundled = new Set(listFilesRecursive(join28(sourceDir, skill.name)));
+      const next = readFileSync21(join29(sourceDir, skill.name, rel), "utf8");
+      const projectRel = `.claude/skills/${skill.name}/${rel}`;
+      const rec = opts.recordOf?.(projectRel) ?? baselineRecord(baseline, `${skill.name}/${rel}`);
+      const w3 = judgedUpdateWrite(targetFile, rec, next, now);
+      if (w3.changed) updated++;
+      if (w3.kind === "edited") backedUp.push(`${skill.name}/${rel}`);
+      const d2 = displacedEntry(w3, projectRel, targetFile);
+      if (d2 !== null) displaced.push(d2);
+    }
+    const bundled = new Set(listFilesRecursive(join29(sourceDir, skill.name)));
     for (const rel of listFilesRecursive(targetSkill)) {
       if (bundled.has(rel) || basename3(rel).includes(".backup-")) continue;
       if (foreignOf(`${skill.name}/${rel}`) !== null) continue;
-      const targetFile = join28(targetSkill, rel);
+      const targetFile = join29(targetSkill, rel);
       if (outside?.skip(targetFile)) continue;
-      const recorded2 = baseline.get(`${skill.name}/${rel}`);
-      if (recorded2 === void 0 || hashContent(readFileSync21(targetFile, "utf8")) !== recorded2) {
+      const rec = opts.recordOf?.(`.claude/skills/${skill.name}/${rel}`) ?? baselineRecord(baseline, `${skill.name}/${rel}`);
+      if (rec.state !== "sha" || hashContent(readFileSync21(targetFile, "utf8")) !== rec.sha256) {
         backupFile(targetFile, now);
         backedUp.push(`${skill.name}/${rel}`);
       }
       unlinkSync2(targetFile);
       pruned.push(`${skill.name}/${rel}`);
-      for (let d2 = dirname5(targetFile); d2 !== targetSkill && readdirSync3(d2).length === 0; d2 = dirname5(d2))
+      for (let d2 = dirname6(targetFile); d2 !== targetSkill && readdirSync3(d2).length === 0; d2 = dirname6(d2))
         rmdirSync(d2);
     }
   }
-  return { updated, backedUp, skippedLinks, foreignOwned, pruned };
+  return { updated, backedUp, skippedLinks, foreignOwned, pruned, displaced };
+}
+function judgedUpdateWrite(abs, rec, next, now) {
+  const disk = existsSync21(abs) ? readFileSync21(abs, "utf8") : null;
+  const j4 = judge({ op: "write", kind: "harness", rec, disk, next, run: "update" });
+  let backup;
+  switch (j4.verdict) {
+    case "leave":
+      break;
+    case "create":
+      mkdirSync6(dirname6(abs), { recursive: true });
+      writeFileSync8(abs, next);
+      break;
+    case "overwrite":
+      writeFileSync8(abs, next);
+      break;
+    case "backup+overwrite":
+      backup = backupFile(abs, now);
+      writeFileSync8(abs, next);
+      break;
+    default:
+      throw new Error(`update: '${j4.verdict}' is not a write verdict (${abs})`);
+  }
+  const changed = j4.verdict !== "leave";
+  if (j4.record === "displaced") return { kind: "displacedSame", changed };
+  if (backup === void 0) return { kind: changed ? "written" : "same", changed };
+  return { kind: j4.record === "displaced+sha" ? "displaced" : "edited", changed, backup };
+}
+function displacedEntry(w3, projectRel, abs) {
+  if (w3.kind === "displacedSame") return { path: projectRel, change: "displaced", notes: [] };
+  if (w3.kind !== "displaced" || w3.backup === void 0) return null;
+  const backupRel = `${projectRel}${w3.backup.slice(abs.length)}`;
+  return { path: projectRel, change: "displaced", notes: [backupRel] };
+}
+function baselineRecord(baseline, key) {
+  const sha256 = baseline.get(key);
+  return sha256 === void 0 ? { state: "no-sha" } : { state: "sha", sha256 };
+}
+function recordedStateOf(log) {
+  if (log === null) return void 0;
+  const isTarget = recordedTrackTargets(log);
+  return (projectRel) => recorded(log, projectRel, { isTarget });
+}
+function notOursUnder(displaced, prefix) {
+  return new Set(
+    displaced.filter((f) => f.notes.length === 0 && f.path.startsWith(prefix)).map((f) => f.path.slice(prefix.length))
+  );
+}
+function withoutLostBackups(prior, add) {
+  const backedUp = new Set(
+    (prior ?? []).filter((f) => f.change === "displaced" && f.notes.length > 0).map((f) => f.path)
+  );
+  return add.filter((f) => f.notes.length > 0 || !backedUp.has(f.path));
+}
+function recordDisplaced(projectDir, displaced) {
+  const log = readInstallLog(projectDir);
+  if (!log) return;
+  const add = withoutLostBackups(log.rootFiles, displaced);
+  if (add.length === 0) return;
+  try {
+    writeInstallLog(projectDir, { ...log, rootFiles: mergeRootFiles(log.rootFiles, add) });
+  } catch {
+  }
 }
 function skillBaseline(projectDir) {
   const log = readInstallLog(projectDir);
@@ -7096,15 +7567,18 @@ function policyBaseline(projectDir) {
   const log = readInstallLog(projectDir);
   return new Map((log?.policyFiles ?? []).map((f) => [f.path, f.sha256]));
 }
-function refreshPolicyBaseline(projectDir, templatesDir, dirs, outside) {
+function refreshPolicyBaseline(projectDir, templatesDir, dirs, outside, notOurs = /* @__PURE__ */ new Set()) {
   const log = readInstallLog(projectDir);
   if (!log) return;
   const excluded = excludedIds(log);
   const inDirs = (path) => (dirs === void 0 || dirs.some((d2) => path.startsWith(`${d2}/`))) && !outside.has(path) && !isBaselineExcluded(`.claude/${path}`, excluded);
-  const policyFiles = [
+  const rewritten = [
     ...(log.policyFiles ?? []).filter((f) => !inDirs(f.path)),
-    ...collectPolicyHashes(projectDir, templatesDir).filter((f) => inDirs(f.path))
+    ...collectPolicyHashes(projectDir, templatesDir).filter(
+      (f) => inDirs(f.path) && !notOurs.has(f.path)
+    )
   ];
+  const policyFiles = [...rewritten, ...retiredClaims(log, projectDir, rewritten)];
   const next = { ...log };
   if (policyFiles.length > 0) next.policyFiles = policyFiles;
   else delete next.policyFiles;
@@ -7118,13 +7592,16 @@ function outsidePaths(outside, prefix) {
     outside.list().filter((o) => o.path.startsWith(prefix)).map((o) => o.path.slice(prefix.length))
   );
 }
-function refreshSkillBaseline(projectDir, templatesDir, outside) {
+function refreshSkillBaseline(projectDir, templatesDir, outside, targets, notOurs = /* @__PURE__ */ new Set()) {
   const log = readInstallLog(projectDir);
   if (!log) return;
   const excludedSkill = excludedSkillOf(log);
   const keepPrior = (path) => outside.has(path) || excludedSkill(path.split("/")[0] ?? "");
+  const ours = (path) => (targets === void 0 || targets.has(path.split("/")[0] ?? "")) && !notOurs.has(path);
   const skillFiles = [
-    ...collectSkillHashes(projectDir, templatesDir).filter((f) => !keepPrior(f.path)),
+    ...collectSkillHashes(projectDir, templatesDir).filter(
+      (f) => !keepPrior(f.path) && ours(f.path)
+    ),
     ...(log.skillFiles ?? []).filter((f) => keepPrior(f.path))
   ];
   const next = { ...log };
@@ -7136,18 +7613,20 @@ function refreshSkillBaseline(projectDir, templatesDir, outside) {
   }
 }
 function pruneOrphans(target, source, ext, ctx, now = /* @__PURE__ */ new Date()) {
-  if (!existsSync20(target) || !existsSync20(source)) return [];
+  if (!existsSync21(target) || !existsSync21(source)) return [];
   const removed = [];
   for (const file of readdirSync3(target)) {
     if (!file.endsWith(ext)) continue;
-    const sourceFile = join28(source, file);
-    if (!existsSync20(sourceFile)) {
-      const targetFile = join28(target, file);
-      if (!ctx.baseline.has(`${ctx.prefix}/${file}`)) continue;
+    const sourceFile = join29(source, file);
+    if (!existsSync21(sourceFile)) {
+      const targetFile = join29(target, file);
+      const key = `${ctx.prefix}/${file}`;
+      if (!ctx.baseline.has(key)) continue;
       if (ctx.outside?.skip(targetFile)) continue;
       try {
         const current = readFileSync21(targetFile, "utf8");
-        if (!isHarnessOwned2(ctx, file, current)) backupFile(targetFile, now);
+        const owned = ctx.baseline.get(key) === hashContent(current) && ctx.recordOf?.(`.claude/${key}`).state !== "no-sha";
+        if (!owned) backupFile(targetFile, now);
         unlinkSync2(targetFile);
         removed.push(file);
       } catch {
@@ -7157,8 +7636,8 @@ function pruneOrphans(target, source, ext, ctx, now = /* @__PURE__ */ new Date()
   return removed;
 }
 function retireMcpAllowlist(projectDir, now = /* @__PURE__ */ new Date()) {
-  const target = join28(projectDir, ".mcp-allowlist");
-  if (!existsSync20(target)) return null;
+  const target = join29(projectDir, ".mcp-allowlist");
+  if (!existsSync21(target)) return null;
   try {
     const backup = backupFile(target, now);
     unlinkSync2(target);
@@ -7173,9 +7652,9 @@ function refreshNeutralHelpers(projectDir, templatesDir, report) {
   for (const entry of buildManifest(spec)) {
     if (entry.type !== "file" || !isCliNeutralTarget(entry.target)) continue;
     if (!entry.applies(spec)) continue;
-    const abs = join28(projectDir, entry.target);
-    const source = join28(templatesDir, entry.source);
-    if (!existsSync20(source)) continue;
+    const abs = join29(projectDir, entry.target);
+    const source = join29(templatesDir, entry.source);
+    if (!existsSync21(source)) continue;
     let st2;
     try {
       st2 = lstatSync4(abs);
@@ -7197,7 +7676,7 @@ function refreshNeutralHelpers(projectDir, templatesDir, report) {
       continue;
     }
     if (recorded2 === void 0 || recorded2.sha256 !== diskSha) backupFile(abs);
-    writeFileSync7(abs, freshContent, "utf8");
+    writeFileSync8(abs, freshContent, "utf8");
     refreshed.set(entry.target, freshSha);
     report.updated[entry.target] = (report.updated[entry.target] ?? 0) + 1;
   }
@@ -7221,34 +7700,16 @@ function recordClaudeCommand(log, tracks) {
     " "
   );
 }
-function dropHealedHookPortions(projectDir, healedFiles) {
-  const healed = new Set(healedFiles.map((f) => f.split("/").pop() ?? f));
-  const isHealedKey = (key) => {
-    const at5 = key.lastIndexOf("#");
-    return at5 !== -1 && healed.has(key.slice(at5 + 1));
-  };
-  const log = readInstallLog(projectDir);
-  if (log === null) return;
-  const portions = (log.portions ?? []).filter(
-    (p2) => !(p2.path === join28(".claude", "settings.json") && isHealedKey(p2.key))
-  );
-  if (portions.length > 0) log.portions = portions;
-  else delete log.portions;
-  try {
-    writeInstallLog(projectDir, log);
-  } catch {
-  }
-}
 
 // src/installer.ts
 function runInstall(ctx) {
   const { harnessRoot, projectDir } = ctx;
   const mode = ctx.mode ?? "fresh";
-  const templatesDir = join29(harnessRoot, "templates");
-  if (!existsSync21(templatesDir)) {
+  const templatesDir = join30(harnessRoot, "templates");
+  if (!existsSync22(templatesDir)) {
     throw new Error(`Templates dir not found: ${templatesDir}`);
   }
-  const claudeDir = join29(projectDir, ".claude");
+  const claudeDir = join30(projectDir, ".claude");
   const previousLog = readInstallLog(projectDir);
   const legacyAnchor = mode === "update" ? null : legacyAnchorTrace(projectDir, ctx.spec);
   if (mode === "update" && previousLog === null) {
@@ -7256,17 +7717,13 @@ function runInstall(ctx) {
       `Update mode requires an install record at ${installLogPath(projectDir)} \u2014 run: agent-harness install --track <name>`
     );
   }
-  if (mode === "update" && !existsSync21(claudeDir) && installedClis(previousLog).includes("claude")) {
+  if (mode === "update" && !existsSync22(claudeDir) && installedClis(previousLog).includes("claude")) {
     throw new Error(
       `Update mode found a broken install at ${projectDir} \u2014 this project installed Claude Code assets but \`.claude/\` is gone. Reinstall instead: agent-harness install --track <name>`
     );
   }
   if (mode === "update" && previousLog !== null) {
-    return runUpdateInstall(
-      ctx,
-      templatesDir,
-      resolveUpdateBackupPath(ctx, claudeDir, previousLog)
-    );
+    return runUpdateInstall(ctx, templatesDir);
   }
   const { spec, excluded } = thisRunExclusions(
     ctx.spec,
@@ -7277,8 +7734,8 @@ function runInstall(ctx) {
   const manifestSpec = buildManifestSpec(spec);
   const baselineExcluded = new Set(spec.baselineExclude ?? []);
   if (spec.cli.includes("claude")) {
-    const settingsPath = join29(projectDir, ".claude", "settings.json");
-    if (existsSync21(settingsPath)) {
+    const settingsPath = join30(projectDir, ".claude", "settings.json");
+    if (existsSync22(settingsPath)) {
       try {
         JSON.parse(readFileSync22(settingsPath, "utf8"));
       } catch {
@@ -7352,6 +7809,7 @@ function runInstallStages(ctx, args) {
     externalBackups,
     externalUpdated: _externalUpdated,
     externalBackedUp: _externalBackedUp,
+    displaced: cliDisplaced = [],
     externalForeignOwned,
     externalOutside,
     sharedFiles: cliSharedFiles,
@@ -7383,6 +7841,8 @@ function runInstallStages(ctx, args) {
     previousExternal: previousLog?.externalFiles ?? [],
     // #642 (ADR-096 D2) — CLI 집합은 누적이다: 기록된 CLI 도 `AGENTS.md` 집합에 들어간다(`--reinstall` 도 누적)
     recordedClis: previousLog === null ? [] : installedClis(previousLog),
+    // #761 B-1 — 외부 기록이 아예 없던 옛 판의 산출물은 첫 접촉이 아니라 체크섬 없는 하네스 파일이다(`.claude/` B3 와 같은 판정)
+    owned: recordedOwner(previousLog),
     // ADR-097 결정 2 — 범위 조건 없이 `--with-codex-trust` 하나로 정한다.
     codexTrust: spec.options.withCodexTrust,
     // #551 R2 — `.codex/config.toml` · `opencode.json` · 첫 접촉 `AGENTS.md` 의 몫도 `.mcp.json` 과 같은 왕복을
@@ -7433,8 +7893,6 @@ function runInstallStages(ctx, args) {
     filesCopied: base.filesCopied,
     dirsCopied: base.dirsCopied,
     skipped: base.skipped,
-    // #551 PR-3 — install · `--reinstall` 은 폴더를 옮기지 않는다. 백업은 파일마다 `backups`/`judged` 에 있다.
-    backup: null,
     installedTracks: [...spec.tracks].sort(),
     mcpServers: mcp,
     ...cliTransforms,
@@ -7482,7 +7940,7 @@ function runInstallStages(ctx, args) {
     ...outOfTrack.removed.length + outOfTrack.backedUp.length + outOfTrack.kept.length > 0 ? { outOfTrack } : {}
   };
   ctx.onProgress?.({ type: "baseline-complete", baseline });
-  const external = runExternalPhase(ctx);
+  const { report: external, backups: externalSkillBackups } = runExternalPhase(ctx, previousLog);
   writeInstallLogSafe(
     ctx,
     // 링크 본문의 기준선도 같은 필드다 — 같은 경로면 뒤(이번에 쓴 값)가 이긴다.
@@ -7495,11 +7953,20 @@ function runInstallStages(ctx, args) {
       ...collectRootFiles(envFiles, ciScaffold, ledger.shared),
       // ADR-099 R2 — 파일째 사라진 첫 접촉 블록 모델 `AGENTS.md` 를 블록만 담아 다시 만들었다(기준선 밖) — uninstall 이
       // 블록을 걷고 남는 것이 없으면 파일째 지운다
-      ...cliSharedFiles.filter((f) => f.createdAsRoot === true).map((f) => ({ path: f.path, change: "created", notes: ["\uD558\uB124\uC2A4 \uBAAB\uB9CC(\uBE14\uB85D)"] }))
+      ...cliSharedFiles.filter((f) => f.createdAsRoot === true).map((f) => ({ path: f.path, change: "created", notes: ["\uD558\uB124\uC2A4 \uBAAB\uB9CC(\uBE14\uB85D)"] })),
+      // #761 — 외부 변환 · 링크 본문이 첫 접촉으로 비켜 둔 설치자 파일. 하네스가 떠날 때 되돌리는 근거다
+      ...cliDisplaced,
+      ...linked.displaced
     ],
     cliTransforms.codexOptIn
   );
-  return { ...baseline, external, staleHookRefs: [] };
+  return {
+    ...baseline,
+    // #770 HIGH-1 — 외부 스킬을 다시 받으며 남긴 백업은 Phase 1 행 뒤에 생긴다 — 보고에도 싣는다
+    ...externalSkillBackups.length > 0 ? { backups: [...baseline.backups ?? [], ...externalSkillBackups] } : {},
+    external,
+    staleHookRefs: []
+  };
 }
 function legacyAnchorTrace(projectDir, spec) {
   if (!spec.cli.includes("claude")) return null;
@@ -7507,12 +7974,7 @@ function legacyAnchorTrace(projectDir, spec) {
   if (state !== "none" || traces.length < 2) return null;
   return traces.some((t) => t.path === LEGACY_ANCHOR_FILE) ? LEGACY_ANCHOR_FILE : null;
 }
-function resolveUpdateBackupPath(ctx, claudeDir, previousLog) {
-  const claudeUntouched = !installedClis(previousLog).includes("claude");
-  if (!(ctx.backup ?? !claudeUntouched)) return null;
-  return copyBackupDir(claudeDir);
-}
-function runUpdateInstall(ctx, templatesDir, backupPath) {
+function runUpdateInstall(ctx, templatesDir) {
   const updateReport = runUpdateMode(
     ctx.projectDir,
     templatesDir,
@@ -7527,7 +7989,6 @@ function runUpdateInstall(ctx, templatesDir, backupPath) {
     baselineExcluded: [],
     baselineExcludedOnDisk: [],
     baselineForeignOwned: [],
-    backup: backupPath,
     installedTracks: [...ctx.spec.tracks].sort(),
     mcpServers: [],
     codex: null,
@@ -7557,7 +8018,7 @@ function releasedThisRun(args) {
     }
     if (id.startsWith(BASELINE_PREFIX)) {
       const again2 = manifest.some(
-        (e2) => e2.applies(manifestSpec) && classifyBaselineTarget(e2.target)?.id === id && existsSync21(join29(projectDir, e2.target))
+        (e2) => e2.applies(manifestSpec) && classifyBaselineTarget(e2.target)?.id === id && existsSync22(join30(projectDir, e2.target))
       );
       return { id, again: again2, tail: "the harness manages it again" };
     }
@@ -7566,7 +8027,7 @@ function releasedThisRun(args) {
       options: spec.options,
       ...spec.userOverride ? { userOverride: spec.userOverride } : {}
     });
-    const recorded2 = (previousLog?.assets.some((a) => a.id === id) ?? false) || [".claude/skills", ".agents/skills"].some((d2) => existsSync21(join29(projectDir, d2, id)));
+    const recorded2 = (previousLog?.assets.some((a) => a.id === id) ?? false) || [".claude/skills", ".agents/skills"].some((d2) => existsSync22(join30(projectDir, d2, id)));
     return {
       id,
       again,
@@ -7578,10 +8039,10 @@ function pendingKeyExcludes(projectDir, keyExclude, touched) {
   const done = new Set(touched);
   return keyExclude.flatMap((id) => {
     const path = sharedPathOfKeyId(id);
-    if (path === null || done.has(path) || !existsSync21(join29(projectDir, path))) return [];
+    if (path === null || done.has(path) || !existsSync22(join30(projectDir, path))) return [];
     const name = adapterFor(path);
     const keys = [...excludedKeys(path, [id])];
-    const present2 = name === null ? null : ADAPTERS[name].read(readFileSync22(join29(projectDir, path), "utf8"), keys, projectDir);
+    const present2 = name === null ? null : ADAPTERS[name].read(readFileSync22(join30(projectDir, path), "utf8"), keys, projectDir);
     return present2 !== null && present2.size === 0 ? [] : [{ id, path }];
   });
 }
@@ -7625,8 +8086,8 @@ function installCliNeutralAssets(manifestSpec, templatesDir, baselineExcluded, w
       continue;
     }
     if (!isCliNeutralTarget(entry.target)) continue;
-    const source = join29(templatesDir, entry.source);
-    if (!existsSync21(source)) {
+    const source = join30(templatesDir, entry.source);
+    if (!existsSync22(source)) {
       result.skipped += 1;
       continue;
     }
@@ -7646,14 +8107,14 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
     if (!entry.applies(manifestSpec)) {
       continue;
     }
-    const target = join29(projectDir, entry.target);
+    const target = join30(projectDir, entry.target);
     if (isBaselineExcluded(entry.target, baselineExcluded)) {
       result.excluded.push(entry.target);
-      if (existsSync21(target)) result.excludedOnDisk.push(entry.target);
+      if (existsSync22(target)) result.excludedOnDisk.push(entry.target);
       continue;
     }
-    const source = join29(templatesDir, entry.source);
-    if (!existsSync21(source)) {
+    const source = join30(templatesDir, entry.source);
+    if (!existsSync22(source)) {
       result.skipped += 1;
       continue;
     }
@@ -7683,19 +8144,19 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
           if (!result.foreignOwned.includes(slot)) result.foreignOwned.push(slot);
           continue;
         }
-        if (writer.skipOutside(join29(projectDir, entry.target, rel))) {
+        if (writer.skipOutside(join30(projectDir, entry.target, rel))) {
           leftOutside += 1;
           continue;
         }
-        writer.harness(`${entry.target}/${rel}`, { source: join29(source, rel) });
+        writer.harness(`${entry.target}/${rel}`, { source: join30(source, rel) });
       }
       if (leftOutside > 0) continue;
       result.dirsCopied += 1;
     }
     accumulateCategory(result.categories, entry);
   }
-  const hookDir = join29(projectDir, ".claude/hooks");
-  if (existsSync21(hookDir)) {
+  const hookDir = join30(projectDir, ".claude/hooks");
+  if (existsSync22(hookDir)) {
     chmodHooksSync(hookDir, projectDir);
   }
   writer.harness(
@@ -7711,12 +8172,12 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
   if (settingsSource !== null) {
     writeSettingsPortion(writer, settingsSource, projectDir, previousLog, (script) => {
       const target = `${HOOKS_PREFIX}${script}`;
-      return manifest.some((e2) => e2.target === target && e2.applies(manifestSpec)) && !isBaselineExcluded(target, baselineExcluded) && existsSync21(join29(projectDir, target));
+      return manifest.some((e2) => e2.target === target && e2.applies(manifestSpec)) && !isBaselineExcluded(target, baselineExcluded) && existsSync22(join30(projectDir, target));
     });
     result.keptHookRefs.push(
       ...findStaleHookRefs(
-        join29(projectDir, ".claude", "settings.json"),
-        join29(projectDir, ".claude")
+        join30(projectDir, ".claude", "settings.json"),
+        join30(projectDir, ".claude")
       )
     );
   }
@@ -7726,7 +8187,7 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
     // ADR-085 · update(`upsertRootImport`)와 같은 판정 — 실제로 깔린 스킬만 안내한다. 밖 링크라 쓰지 않은
     // 스킬(ADR-098)을 "installed" 라 적으면 다음 update 가 그 절을 걷어 내 두 동작이 서로 반대로 쓴다.
     (manifestSpec.selectedInternalSkills ?? []).filter(
-      (id) => existsSync21(join29(projectDir, ".claude", "skills", id))
+      (id) => existsSync22(join30(projectDir, ".claude", "skills", id))
     ),
     harnessRoot,
     writer
@@ -7765,9 +8226,9 @@ function writeEnvironmentFiles(writer, envExampleCreated, previousLog) {
     gitignoreNpxSkillsAdded: res.added.filter((line) => line !== ".env")
   };
 }
-function runExternalPhase(ctx) {
+function runExternalPhase(ctx, previousLog) {
   if (ctx.runExternal === null) {
-    return null;
+    return { report: null, backups: [] };
   }
   const { projectDir, spec } = ctx;
   const runExt = ctx.runExternal ?? runExternalInstall;
@@ -7788,17 +8249,24 @@ function runExternalPhase(ctx) {
     options: spec.options,
     ...spec.userOverride ? { userOverride: spec.userOverride } : {}
   };
-  const applicableCount = selectExternalTargets(EXTERNAL_ASSETS, {
-    ...filterCtx,
-    cli: spec.cli
-  }).targets.length;
-  ctx.onProgress?.({ type: "external-start", assetCount: applicableCount });
+  const { targets } = selectExternalTargets(EXTERNAL_ASSETS, { ...filterCtx, cli: spec.cli });
+  ctx.onProgress?.({ type: "external-start", assetCount: targets.length });
+  const skillIds = new Set(targets.filter((a) => a.method.kind === "skill").map((a) => a.id));
+  const settle = holdSkillSlots(
+    projectDir,
+    (previousLog?.assets ?? []).filter((a) => a.method === "skill" && skillIds.has(a.id))
+  );
   const external = runExt(
     { ...filterCtx, cli: spec.cli, projectDir, ...spec.scope ? { scope: spec.scope } : {} },
     externalDeps
   );
-  ctx.onProgress?.({ type: "external-complete", report: external });
-  return external;
+  const backups = settle();
+  ctx.onProgress?.({
+    type: "external-complete",
+    report: external,
+    ...backups.length > 0 ? { backups } : {}
+  });
+  return { report: external, backups };
 }
 var InstallInterruptedError = class extends Error {
   constructor(message, written, record, backups = [], hadInstall = false) {
@@ -7819,11 +8287,16 @@ function createInterruptJournal() {
   const shared2 = /* @__PURE__ */ new Map();
   const completed = /* @__PURE__ */ new Set();
   const backups = [];
+  const displacedFiles = /* @__PURE__ */ new Map();
   const journal = {
     files,
     shared: shared2,
     completed,
     backups,
+    displacedFiles,
+    displaced: (f) => {
+      if (!displacedFiles.has(f.path)) displacedFiles.set(f.path, f);
+    },
     codexOptIn: null,
     trust: (report) => {
       journal.codexOptIn = report;
@@ -7875,7 +8348,7 @@ function recordInterruptedInstall(ctx, error, run) {
       ledger.anchor,
       previousLog,
       false,
-      [...rootFiles, ...ledger.rootFiles],
+      [...rootFiles, ...ledger.rootFiles, ...journal.displacedFiles.values()],
       codexTrust
     );
     const path = writeInstallLog(
@@ -7998,9 +8471,9 @@ function accumulateCategory(cats, entry) {
   }
 }
 function writeRootClaudeMd(projectDir, tracks, continuousSkills, harnessRoot, writer) {
-  const target = join29(projectDir, "CLAUDE.md");
+  const target = join30(projectDir, "CLAUDE.md");
   if (writer.skipOutside(target)) return null;
-  const existing = existsSync21(target) ? readFileSync22(target, "utf-8") : null;
+  const existing = existsSync22(target) ? readFileSync22(target, "utf-8") : null;
   const seeded = existing === null ? seedRootClaudeProjectContext(projectDir, harnessRoot) : null;
   const content = upsertHarnessImport(existing, {
     projectName: basename4(projectDir),
@@ -8010,7 +8483,7 @@ function writeRootClaudeMd(projectDir, tracks, continuousSkills, harnessRoot, wr
   });
   if (content !== existing) {
     if (existing !== null) backupIfLossyUtf8(target);
-    writeFileSync8(target, content);
+    writeFileSync9(target, content);
   }
   return {
     created: existing === null,
@@ -8034,8 +8507,8 @@ function listHookFiles(hookDir) {
 // src/commands/install-render.ts
 init_esm_shims();
 import { homedir as homedir3 } from "os";
-import { existsSync as existsSync23, readdirSync as readdirSync5, readFileSync as readFileSync24 } from "fs";
-import { join as join31, relative as relative4 } from "path";
+import { existsSync as existsSync24, readdirSync as readdirSync5, readFileSync as readFileSync24 } from "fs";
+import { join as join32, relative as relative4 } from "path";
 
 // src/preset-recommend.ts
 init_esm_shims();
@@ -8071,10 +8544,10 @@ function groupAssetsByCategory(assetIds) {
 
 // src/resident-entries.ts
 init_esm_shims();
-import { existsSync as existsSync22, readFileSync as readFileSync23 } from "fs";
-import { basename as basename5, join as join30 } from "path";
+import { existsSync as existsSync23, readFileSync as readFileSync23 } from "fs";
+import { basename as basename5, join as join31 } from "path";
 function residentEntries(spec) {
-  const skillThere = (id) => INTERNAL_BUNDLED_SKILL_IDS.includes(id) && [".claude/skills", ".agents/skills"].some((d2) => existsSync22(join30(spec.projectDir, d2, id)));
+  const skillThere = (id) => INTERNAL_BUNDLED_SKILL_IDS.includes(id) && [".claude/skills", ".agents/skills"].some((d2) => existsSync23(join31(spec.projectDir, d2, id)));
   const forceExclude = (spec.userOverride?.forceExclude ?? []).filter((id) => !skillThere(id));
   const assetSpec = buildManifestSpec(
     spec.userOverride ? { ...spec, userOverride: { ...spec.userOverride, forceExclude } } : spec
@@ -8100,7 +8573,7 @@ function residentEntries(spec) {
 function residentCostFor(spec, entries = residentEntries(spec), contextFiles) {
   if (contextFiles !== void 0) return residentCost(entries, void 0, spec.cli, contextFiles);
   const cost = residentCost(entries, void 0, spec.cli, plannedClaudeContext(spec));
-  if (anchorSurface(spec.cli).scaffold === "agents-md" && existsSync22(join30(spec.projectDir, "AGENTS.md"))) {
+  if (anchorSurface(spec.cli).scaffold === "agents-md" && existsSync23(join31(spec.projectDir, "AGENTS.md"))) {
     return makeResidentCost({
       ...cost,
       contextNote: "planned, not counting text already in AGENTS.md"
@@ -8111,8 +8584,8 @@ function residentCostFor(spec, entries = residentEntries(spec), contextFiles) {
 function plannedClaudeContext(spec) {
   if (!spec.cli.includes("claude")) return void 0;
   const root = resolveBundleRoot();
-  const rootClaude = join30(spec.projectDir, "CLAUDE.md");
-  const existing = existsSync22(rootClaude) ? readFileSync23(rootClaude, "utf-8") : null;
+  const rootClaude = join31(spec.projectDir, "CLAUDE.md");
+  const existing = existsSync23(rootClaude) ? readFileSync23(rootClaude, "utf-8") : null;
   const seeded = existing === null ? seedRootClaudeProjectContext(spec.projectDir, root) : null;
   if (existing === null && seeded === null) return void 0;
   const manifestSpec = buildManifestSpec(spec);
@@ -8122,14 +8595,14 @@ function plannedClaudeContext(spec) {
     continuousSkills: manifestSpec.selectedInternalSkills ?? [],
     ...seeded === null ? {} : { projectContext: seeded }
   });
-  return [join30(root, "templates", "CLAUDE.md"), { text }];
+  return [join31(root, "templates", "CLAUDE.md"), { text }];
 }
 function onDiskTargets(spec, assetSpec) {
   const out = /* @__PURE__ */ new Set();
   for (const e2 of buildManifest(assetSpec)) {
     if (!e2.applies(assetSpec)) continue;
     const t = classifyBaselineTarget(e2.target);
-    if (t !== null && existsSync22(join30(spec.projectDir, e2.target))) out.add(t.id);
+    if (t !== null && existsSync23(join31(spec.projectDir, e2.target))) out.add(t.id);
   }
   return out;
 }
@@ -8191,6 +8664,7 @@ function createInstallRenderer(log, spec, verbose) {
         log("");
         phase2HeaderPrinted = true;
       } else if (event.type === "external-complete") {
+        for (const b2 of event.backups ?? []) log(assetRow("success", "backup", shortenPath(b2)));
         const excluded = event.report.excludedByCli;
         if (excluded.length > 0) {
           if (!phase2HeaderPrinted) {
@@ -8239,10 +8713,6 @@ function renderUpdateSummary(log, spec, report) {
   log("");
   log(infoRow("STATUS", c.green("Update complete")));
   log(infoRow("MODE", "update"));
-  if (report.backup) {
-    log(infoRow("BACKUP", shortenPath(report.backup)));
-    log(infoRow("ROLLBACK", `rm -rf .claude && mv ${shellQuotePath(report.backup)} .claude`));
-  }
   const cost = formatResidentCostLine(
     rulesInsideAgentsMd(
       spec,
@@ -8268,7 +8738,8 @@ function renderUpdateSummary(log, spec, report) {
         `${backups.length} file(s) ${how}, as *.backup-<time>${unmeasuredPart} \xB7 list: .uzys-agent-harness/update-backups.json`
       )
     );
-    if (removedBefore < backups.length)
+    const displacedN = report.updateMode?.displaced?.length ?? 0;
+    if (removedBefore + displacedN < backups.length)
       log(
         infoRow(
           "NEXT",
@@ -8283,23 +8754,23 @@ function residentEntriesOnDisk(spec) {
   const hasClaude = spec.cli.includes("claude");
   const surface = anchorSurface(spec.cli).scaffold;
   const mdFiles = (dir, kind, skip) => {
-    const abs = join31(spec.projectDir, dir);
-    return existsSync23(abs) ? readdirSync5(abs, { withFileTypes: true }).filter((e2) => e2.isFile() && e2.name.endsWith(".md") && e2.name !== skip).map((e2) => ({
+    const abs = join32(spec.projectDir, dir);
+    return existsSync24(abs) ? readdirSync5(abs, { withFileTypes: true }).filter((e2) => e2.isFile() && e2.name.endsWith(".md") && e2.name !== skip).map((e2) => ({
       source: `${kind}/${e2.name}`,
       // `target` 은 `residentCost` 의 분류 키다 — 실제 자리는 `file` 이 말한다.
       target: `.claude/${kind}/${e2.name}`,
       // 배포판이 아니라 **이 프로젝트의 파일**을 잰다 — 사용자가 고친 본문도,
       // 배포판에 더는 없는 파일도 실제로 상주하는 것은 이쪽이다.
-      file: join31(abs, e2.name)
+      file: join32(abs, e2.name)
     })) : [];
   };
-  const rules = surface === "claude" ? mdFiles(join31(".claude", "rules"), "rules") : rulesInline(spec.cli) ? planned.filter((e2) => e2.target.startsWith(".claude/rules/")) : mdFiles(join31(".agents", "rules"), "rules", "uzys-harness.md");
-  const slot = hasClaude ? join31(".claude", "skills") : join31(".agents", "skills");
+  const rules = surface === "claude" ? mdFiles(join32(".claude", "rules"), "rules") : rulesInline(spec.cli) ? planned.filter((e2) => e2.target.startsWith(".claude/rules/")) : mdFiles(join32(".agents", "rules"), "rules", "uzys-harness.md");
+  const slot = hasClaude ? join32(".claude", "skills") : join32(".agents", "skills");
   const skills = planned.filter((e2) => e2.target.startsWith(".claude/skills/")).map((e2) => ({
     ...e2,
-    file: join31(spec.projectDir, slot, e2.target.slice(".claude/skills/".length))
-  })).filter((e2) => existsSync23(e2.file));
-  const agents = hasClaude ? mdFiles(join31(".claude", "agents"), "agents") : [];
+    file: join32(spec.projectDir, slot, e2.target.slice(".claude/skills/".length))
+  })).filter((e2) => existsSync24(e2.file));
+  const agents = hasClaude ? mdFiles(join32(".claude", "agents"), "agents") : [];
   return [
     ...planned.filter(
       (e2) => !e2.target.startsWith(".claude/rules/") && !e2.target.startsWith(".claude/agents/") && !e2.target.startsWith(".claude/skills/")
@@ -8311,8 +8782,8 @@ function residentEntriesOnDisk(spec) {
 }
 function contextFilesOnDisk(spec) {
   const surface = anchorSurface(spec.cli).scaffold;
-  const files = surface === "claude" ? [HARNESS_ANCHOR_FILE, "CLAUDE.md", join31(".claude", "CLAUDE.md")] : ["AGENTS.md"];
-  return files.map((f) => join31(spec.projectDir, f));
+  const files = surface === "claude" ? [HARNESS_ANCHOR_FILE, "CLAUDE.md", join32(".claude", "CLAUDE.md")] : ["AGENTS.md"];
+  return files.map((f) => join32(spec.projectDir, f));
 }
 function rulesInsideAgentsMd(spec, cost) {
   if (anchorSurface(spec.cli).scaffold !== "agents-md" || !rulesInline(spec.cli)) return cost;
@@ -8566,9 +9037,9 @@ function renderFinalSummary(log, spec, report, fromWizard) {
   const codexTrusted = report.codexOptIn?.trustEntry.status === "registered" || report.codexOptIn?.trustEntry.status === "already-present";
   const alreadyTrustedGlobally = (() => {
     try {
-      const home = process.env.CODEX_HOME ?? join31(homedir3(), ".codex");
-      const configPath = join31(home, "config.toml");
-      if (!existsSync23(configPath)) return false;
+      const home = process.env.CODEX_HOME ?? join32(homedir3(), ".codex");
+      const configPath = join32(home, "config.toml");
+      if (!existsSync24(configPath)) return false;
       return hasTrustEntry(readFileSync24(configPath, "utf8"), spec.projectDir);
     } catch {
       return false;
@@ -8594,7 +9065,7 @@ function renderFinalSummary(log, spec, report, fromWizard) {
   const remote = (report.shared ?? []).find((f) => f.path === ".mcp.json")?.remote ?? [];
   for (const line of remoteMcpNextLines(remote, spec.cli)) log(`${" ".repeat(16)} ${line}`);
   const scaffoldFiles = scaffoldFilesForCli(spec.cli).filter(
-    (f) => f === "CLAUDE.md" && report.rootClaudeMd?.created === true || hasFillPrompt(join31(spec.projectDir, f))
+    (f) => f === "CLAUDE.md" && report.rootClaudeMd?.created === true || hasFillPrompt(join32(spec.projectDir, f))
   );
   if (scaffoldFiles.length > 0) {
     const auditInstalled = buildManifestSpec(spec).selectedInternalSkills?.includes("audit-harness-fit");
@@ -8664,12 +9135,25 @@ function linkedSkillRows(log, updated, notOurs) {
     );
   }
 }
+function hadFileRow(log, area, paths) {
+  if (paths.length === 0) return;
+  log(
+    assetRow(
+      "skip",
+      `${area} had files with these names`,
+      `${paths.length} backed up as *.backup-<time> \u2014 yours, put back on uninstall \xB7 ${paths.join(", ")}`
+    )
+  );
+}
 function renderPhase1Rows(log, baseline, verbose = false) {
   if (baseline.updateMode) {
     const noChecksum = new Set(baseline.updateMode.noChecksum ?? []);
-    if (baseline.backup) {
-      log(assetRow("success", "backup", shortenPath(baseline.backup)));
-    }
+    const displaced = baseline.updateMode.displaced ?? [];
+    const displacedSkills = displaced.filter((p2) => p2.startsWith(".claude/skills/"));
+    const displacedPolicy = displaced.filter(
+      (p2) => p2.startsWith(".claude/") && !p2.startsWith(".claude/skills/")
+    );
+    const displacedExternal = displaced.filter((p2) => !p2.startsWith(".claude/"));
     for (const [dir, count] of Object.entries(baseline.updateMode.updated)) {
       if (count > 0) log(assetRow("success", dir, `${count} files updated`));
     }
@@ -8803,6 +9287,7 @@ function renderPhase1Rows(log, baseline, verbose = false) {
         )
       );
     }
+    hadFileRow(log, ".claude/skills", displacedSkills);
     if (baseline.updateMode.skillsPruned.length > 0) {
       log(
         assetRow(
@@ -8886,6 +9371,7 @@ function renderPhase1Rows(log, baseline, verbose = false) {
         )
       );
     }
+    hadFileRow(log, "policy files", displacedPolicy);
     const unmeasured = [...noChecksum].filter((p2) => p2 !== ".mcp-allowlist");
     if (unmeasured.length > 0) {
       log(
@@ -8896,13 +9382,23 @@ function renderPhase1Rows(log, baseline, verbose = false) {
         )
       );
     }
+    const retiredRefs = baseline.updateMode.retiredHookRefsRemoved ?? [];
+    if (retiredRefs.length > 0) {
+      log(
+        assetRow(
+          "success",
+          "settings.json retired hook refs",
+          `${retiredRefs.length} removed (harness wiring from an earlier release; script gone: ${retiredRefs.join(", ")})`
+        )
+      );
+    }
     const staleRefs = baseline.updateMode.staleHookRefs;
     if (staleRefs.length > 0) {
       log(
         assetRow(
           "skip",
           "settings.json stale hook refs",
-          `${staleRefs.length} removed (${staleRefs.join(", ")})`
+          `${staleRefs.length} left (yours \u2014 not in the install record; script missing: ${staleRefs.join(", ")})`
         )
       );
     }
@@ -8925,6 +9421,17 @@ function renderPhase1Rows(log, baseline, verbose = false) {
         )
       );
     }
+    hadFileRow(log, "external CLI files", displacedExternal);
+    const displacedSame = baseline.updateMode.displacedSame ?? [];
+    if (displacedSame.length > 0) {
+      log(
+        assetRow(
+          "skip",
+          "same as the harness version",
+          `${displacedSame.length} ${LINES.sameAsHarness} \xB7 ${displacedSame.join(", ")}`
+        )
+      );
+    }
     if (baseline.updateMode.externalSkillsRefreshed > 0) {
       log(
         assetRow(
@@ -9092,9 +9599,6 @@ function renderPhase1Rows(log, baseline, verbose = false) {
       )
     );
   }
-  if (baseline.backup) {
-    log(assetRow("success", "backup", shortenPath(baseline.backup), TEMPLATES_COL));
-  }
   const shared2 = baseline.shared;
   if (shared2 !== void 0) {
     for (const f of shared2) {
@@ -9330,9 +9834,6 @@ function shortenPath(p2) {
   }
   return p2;
 }
-function shellQuotePath(p2) {
-  return `'${p2.replace(/'/g, `'\\''`)}'`;
-}
 function rootClaudeMdMeta(root, trackCount) {
   const tracks = `${trackCount} track${trackCount > 1 ? "s" : ""} noted`;
   if (!root.created) return `@import ${HARNESS_ANCHOR_FILE} (body preserved)`;
@@ -9616,16 +10117,6 @@ function executeSpec(requested, deps = {}) {
     exit(1);
     return;
   }
-  if (deps.mode === "update" && report.backup !== null) {
-    const liveClaude = join32(spec.projectDir, ".claude");
-    if (dirTreesIdentical(liveClaude, report.backup)) {
-      try {
-        rmSync4(report.backup, { recursive: true, force: true });
-        report.backup = null;
-      } catch {
-      }
-    }
-  }
   if (report.updateMode) {
     renderUpdateSummary(log, spec, report);
     return;
@@ -9704,7 +10195,7 @@ function registerInstallCommand(cli) {
 
 // src/commands/list.ts
 init_esm_shims();
-import { existsSync as existsSync24, readFileSync as readFileSync25 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync25 } from "fs";
 import { join as join33, resolve as resolve3 } from "path";
 function listAction(options = {}, deps = {}) {
   const log = deps.log ?? console.log;
@@ -9809,7 +10300,7 @@ function formatHarnessFileRows(log, projectDir) {
   const rootMd = log.templates.rootClaudeMd;
   if (rootMd) {
     const path = join33(projectDir, rootMd.path);
-    const modified = existsSync24(path) && hashContent(readFileSync25(path, "utf8")) !== rootMd.sha256;
+    const modified = existsSync25(path) && hashContent(readFileSync25(path, "utf8")) !== rootMd.sha256;
     rows.push(
       modified ? `    ${c.dim(rootMd.path)}  ${c.yellow("(\uC218\uC815\uB428 \u2014 uninstall \uC2DC \uBCF4\uC874)")}` : `    ${c.dim(rootMd.path)}`
     );
@@ -9823,7 +10314,7 @@ var ROOT_FILE_CHANGE = {
   displaced: "\uBE44\uCF1C \uB460"
 };
 function formatRootFileRows(rootFiles, projectDir) {
-  const present2 = rootFiles.filter((f) => existsSync24(join33(projectDir, f.path)));
+  const present2 = rootFiles.filter((f) => existsSync25(join33(projectDir, f.path)));
   const width = Math.max(0, ...present2.map((f) => f.path.length));
   return present2.map(
     (f) => `    ${c.dim(padDisplay(f.path, width))}  ${c.dim(ROOT_FILE_CHANGE[f.change])}  ${c.dim(f.notes.join(" / "))}`
@@ -9842,18 +10333,21 @@ init_esm_shims();
 import { spawnSync as spawnSync2 } from "child_process";
 import {
   accessSync,
-  existsSync as existsSync25,
+  existsSync as existsSync26,
   constants as fsConstants,
   lstatSync as lstatSync5,
+  mkdirSync as mkdirSync7,
   readdirSync as readdirSync6,
   readFileSync as readFileSync26,
+  readlinkSync,
   realpathSync as realpathSync3,
+  renameSync,
   rmdirSync as rmdirSync2,
-  rmSync as rmSync5,
-  statSync as statSync4,
-  writeFileSync as writeFileSync9
+  rmSync as rmSync4,
+  statSync as statSync5,
+  writeFileSync as writeFileSync10
 } from "fs";
-import { dirname as dirname6, join as join34, relative as relative5, resolve as resolve4, sep as sep5 } from "path";
+import { dirname as dirname7, join as join34, relative as relative5, resolve as resolve4, sep as sep5 } from "path";
 
 // src/uninstall-interactive.ts
 init_esm_shims();
@@ -11130,7 +11624,7 @@ var defaultPrompts = {
         {
           value: "hooks",
           label: "Hooks \xB7 settings.json",
-          hint: "stale hook refs cleaned"
+          hint: "harness hook wiring \xB7 dead refs reported, not removed"
         },
         {
           value: "external",
@@ -11272,20 +11766,26 @@ function buildUninstallModeChoices(clis, assetCount) {
     {
       value: "selected",
       label: "Remove selected assets",
-      hint: assetCount > 0 ? `pick from the ${assetCount} external assets; templates (.claude/ etc.) stay` : "no external assets recorded",
+      hint: assetCount > 0 ? `pick from the ${assetCount} external assets; harness files stay` : "no external assets recorded",
       enabled: assetCount > 0
     },
     {
       value: "all",
       label: "Remove everything",
-      hint: "assets + templates + the install record \u2014 CLI folders (.claude/ \xB7 .codex/ \xB7 .opencode/, whichever exist) are moved aside as <dir>.backup-<time>",
+      hint: "assets + harness files + the install record \u2014 harness files are removed one by one; your own files in .claude/ \xB7 .codex/ \xB7 .opencode/ stay",
       enabled: true
     }
   ];
 }
+var CLI_FOLDERS = [".claude/", ".codex/", ".opencode/"];
+var FOLDER_CLI = {
+  ".claude/": "claude",
+  ".codex/": "codex",
+  ".opencode/": "opencode"
+};
 function describeOwned(p2) {
-  if (p2.kind === "dir") {
-    return `${p2.path} \u2192 moved aside as ${p2.path.replace(/\/+$/, "")}.backup-<time> (your own files there stay in it)`;
+  if (CLI_FOLDERS.includes(p2.path)) {
+    return `${p2.path} harness files, one by one (your own files there stay)`;
   }
   if (p2.kind === "import-block") return `the import block in ${p2.path} (your text stays)`;
   if (p2.path === "AGENTS.md") return "AGENTS.md harness sections (your ## Project Context stays)";
@@ -11296,7 +11796,7 @@ function keptLinkLines(projectDir, dirs) {
   return dirs.flatMap((d2) => {
     const o = outsideLinkAt(projectDir, d2.replace(/\/+$/, ""));
     return o ? [
-      `  \xB7 ${o.link} stays \u2014 the link points outside the project (${o.link} \u2192 ${o.linkTarget}); not moved, nothing behind it removed`
+      `  \xB7 ${o.link} stays \u2014 the link points outside the project (${o.link} \u2192 ${o.linkTarget}); nothing behind it is removed`
     ] : [];
   });
 }
@@ -11331,7 +11831,7 @@ function cliDirs(cli, installed) {
     cli,
     installed.filter((c3) => c3 !== cli)
   );
-  return [...exclusive, ...sharedNowUnowned].filter((p2) => p2.kind === "dir").map((p2) => p2.path);
+  return [...exclusive, ...sharedNowUnowned].filter((p2) => CLI_FOLDERS.includes(p2.path)).map((p2) => p2.path);
 }
 function buildCliRows(installed) {
   return installed.map((cli) => {
@@ -11370,12 +11870,10 @@ async function runInteractiveUninstall(projectDir, deps = {}) {
       [
         "Remove everything? This is the same as: agent-harness uninstall --yes",
         `  \xB7 ${log.assets.length} recorded asset(s) \u2014 only those with an automatic reverse path are removed`,
-        "  \xB7 templates: CLI folders (.claude/ \xB7 .codex/ \xB7 .opencode/, whichever exist) are moved aside as <dir>.backup-<time> (your own files there stay in them)",
+        "  \xB7 harness files are removed one by one; your own files in .claude/ \xB7 .codex/ \xB7 .opencode/ stay (a file of yours the harness had replaced is put back)",
         ...keptLinkLines(
           projectDir,
-          [log.templates?.claudeDir, log.templates?.codexDir, log.templates?.opencodeDir].filter(
-            (d2) => typeof d2 === "string"
-          )
+          CLI_FOLDERS.filter((d2) => FOLDER_CLI[d2] !== void 0 && clis.includes(FOLDER_CLI[d2]))
         ),
         "  \xB7 the install record goes too",
         "  \xB7 files outside (.mcp.json etc.) are not deleted \u2014 you get instructions instead"
@@ -11472,14 +11970,9 @@ Proceed?`, initialValue: false });
 }
 
 // src/commands/uninstall.ts
-function templateDirPath(projectDir, rel) {
-  return join34(projectDir, rel.replace(/\/+$/, ""));
-}
-function outsideTemplateLink(projectDir, rel) {
-  return outsideLinkAt(projectDir, rel.replace(/\/+$/, ""));
-}
+var CODEX_CONFIG = ".codex/config.toml";
 function keptOutsideLinkLine(o, log) {
-  const head = `  ${c.yellow("\u2298")} ${o.link} \u2014 left as is: the link points outside the project (${o.link} \u2192 ${o.linkTarget}). Not moved, and nothing behind it is removed`;
+  const head = `  ${c.yellow("\u2298")} ${o.link} \u2014 left as is: the link points outside the project (${o.link} \u2192 ${o.linkTarget}). Nothing behind it is removed`;
   const files = recordedUnder(log, o.link);
   if (files.length === 0) return `${head}; clean up harness files there by hand if intended.`;
   const shown = files.slice(0, KEPT_LINK_FILES_SHOWN).join(" \xB7 ");
@@ -11496,17 +11989,18 @@ function recordedUnder(log, link) {
   ];
   return [...new Set(paths.filter((p2) => p2.startsWith(`${link}/`)))].sort();
 }
-function underKeptLink(path, kept) {
-  return kept.some((k2) => path.startsWith(`${k2.link}/`));
-}
-function movedAsideLine(projectDir, rel, backup) {
-  return `  ${status.success(`${rel} moved aside \u2192 ${relative5(projectDir, backup)} (your own files there are kept)`)}`;
-}
-var MOVE_ASIDE_PREVIEW = (rel) => `  \u25CB move ${rel} aside \u2192 ${rel.replace(/\/+$/, "")}.backup-<time> (your own files there stay in the backup)`;
-function recordedTemplateDirs(log) {
-  return [log.templates?.claudeDir, log.templates?.codexDir, log.templates?.opencodeDir].filter(
-    (d2) => typeof d2 === "string"
-  );
+function keepTemplatesRemovedLines(log) {
+  const ids = log.assets.filter((a) => a.scope === "project").map((a) => a.id);
+  return [
+    status.failure(
+      c.red(
+        "ERROR: --keep-templates was removed in v26.169.0 \u2014 harness files are now removed one by one and your own files in .claude/ \xB7 .codex/ \xB7 .opencode/ stay in place."
+      )
+    ),
+    c.dim(
+      ids.length > 0 ? `       To remove only the external assets: agent-harness uninstall --only ${ids.join(",")}` : "       nothing on record for --only \u2014 run uninstall (everything) or uninstall --cli <name>"
+    )
+  ];
 }
 function uninstallAction(options, deps = {}) {
   const log = deps.log ?? console.log;
@@ -11515,7 +12009,6 @@ function uninstallAction(options, deps = {}) {
   const spawn = deps.spawn ?? defaultSpawn2;
   const rm = deps.rm ?? defaultRm;
   const writeLog = deps.writeLog ?? writeInstallLog;
-  const moveAside = deps.moveAside ?? backupDir;
   const harnessRoot = (deps.resolveHarnessRoot ?? defaultHarnessRoot)();
   const projectDir = resolve4(options.projectDir ?? process.cwd());
   const detected = detectInstallState(projectDir);
@@ -11525,10 +12018,15 @@ function uninstallAction(options, deps = {}) {
     exit(1);
     return;
   }
+  if (options.keepTemplates) {
+    for (const line of keepTemplatesRemovedLines(installLog)) err(line);
+    exit(1);
+    return;
+  }
   if (options.cli !== void 0) {
     removeCliAction(
       { options, installLog, projectDir, harnessRoot },
-      { log, err, exit, rm, writeLog, moveAside }
+      { log, err, exit, rm, writeLog }
     );
     return;
   }
@@ -11547,46 +12045,31 @@ function uninstallAction(options, deps = {}) {
     return;
   }
   const targetAssets = selectedIds ? installLog.assets.filter((a) => selectedIds.includes(a.id)) : installLog.assets;
-  const keepTemplates = options.keepTemplates || selectedIds !== null;
-  const movedDirs = keepTemplates ? [] : recordedTemplateDirs(installLog);
-  const sharedPaths = keepTemplates ? [] : [...CLI_SHARED, ...ROOT_SHARED];
+  const assetsOnly = selectedIds !== null;
   const rootFiles = withSkillsLock(
     selectedIds ? [] : (installLog.rootFiles ?? []).filter(
-      (f) => !underAny(f.path, movedDirs) && !((ROOT_SHARED.includes(f.path) || CLI_SHARED.includes(f.path)) && !keepTemplates)
+      (f) => !UNINSTALL_SHARED.includes(f.path) && f.change !== "displaced"
     ),
     targetAssets,
     projectDir
   );
   const globalTrust = selectedIds ? void 0 : installLog.codexTrust;
-  const templatesLog = {
-    ...installLog,
-    externalFiles: (installLog.externalFiles ?? []).filter(
-      (f) => !f.path.startsWith(`${INSTALL_LOG_DIR}/`)
-    )
-  };
   const journal = [];
   let filesRemoved = 0;
   const rmJ = (path) => {
     rm(path);
     filesRemoved += 1;
   };
-  const moveAsideJ = (path) => {
-    const backup = moveAside(path);
-    if (backup)
-      journal.push(`moved ${relative5(projectDir, path)} aside \u2192 ${relative5(projectDir, backup)}`);
-    return backup;
-  };
-  const plan = planReverse(targetAssets, { spawn, projectDir, rm: rmJ, movedDirs });
+  const plan = planReverse(targetAssets, { spawn, projectDir, rm: rmJ });
   for (const line of headerLines(installLog, selectedIds, targetAssets.length)) log(line);
   if (options.dryRun) {
     for (const line of dryRunLines(
       plan,
-      templatesLog,
+      installLog,
       projectDir,
-      keepTemplates,
+      assetsOnly,
       rootFiles,
       harnessRoot,
-      sharedPaths,
       globalTrust
     )) {
       log(line);
@@ -11594,15 +12077,7 @@ function uninstallAction(options, deps = {}) {
     exit(0);
     return;
   }
-  const blocked = unwritablePaths({
-    projectDir,
-    installLog: templatesLog,
-    targetAssets,
-    selectedIds,
-    keepTemplates,
-    movedDirs,
-    sharedPaths
-  });
+  const blocked = unwritablePaths({ projectDir, installLog, targetAssets, selectedIds });
   if (blocked.length > 0) {
     err(status.failure(c.red("ERROR: uninstall cannot write here \u2014 nothing was removed:")));
     for (const p2 of blocked) err(c.dim(`       \xB7 ${p2 === "." ? "the project folder" : p2}`));
@@ -11614,32 +12089,21 @@ function uninstallAction(options, deps = {}) {
   let reversed;
   try {
     reversed = executeReverse(plan, log, logSurvives, journal);
-    if (!keepTemplates) {
-      const sharedStrips = stripCliShared(installLog, projectDir, harnessRoot, sharedPaths, true);
-      for (const r of sharedStrips) {
-        if (r.removed.length > 0) journal.push(`removed the harness part from ${r.path}`);
-      }
-      const { rootClaudeMdKept, importStripped, external, moved, keptLinks } = removeTemplates(
-        templatesLog,
-        projectDir,
-        { rm: rmJ, moveAside: moveAsideJ },
+    if (!assetsOnly) {
+      const done = removeHarnessFiles(installLog, projectDir, FULL_SCOPE, {
+        rm: rmJ,
+        write: true,
         harnessRoot
-      );
-      for (const m of moved) log(movedAsideLine(projectDir, m.rel, m.backup));
-      for (const o of keptLinks) log(keptOutsideLinkLine(o, installLog));
-      if (recordedTemplateDirs(installLog).length === 0) {
-        log(`  ${status.success("templates removed: (none)")}`);
+      });
+      for (const r of done.shared) {
+        if (r.removed.length > 0 || r.fileRemoved)
+          journal.push(`removed the harness part from ${r.path}`);
       }
-      for (const line of externalRemovalLines(external)) log(line);
-      for (const line of sharedStripLines(sharedStrips, false)) log(line);
-      if (importStripped) {
-        log(`  ${status.success("CLAUDE.md \u2014 harness @import removed (\uBCF8\uBB38 \uBCF4\uC874)")}`);
+      for (const d2 of done.displaced) {
+        if (d2.verdict === "restore") journal.push(`put back ${d2.path}`);
       }
-      if (rootClaudeMdKept) {
-        const kept = installLog.templates.rootClaudeMd?.path ?? "CLAUDE.md";
-        log(
-          `  ${c.yellow("\u2298")} ${kept} kept \u2014 modified since install. Remove manually if intended.`
-        );
+      for (const line of harnessRemovalLines(done, installLog, projectDir, FULL_SCOPE, false)) {
+        log(line);
       }
     }
   } catch (e2) {
@@ -11664,26 +12128,20 @@ function uninstallAction(options, deps = {}) {
     { installLog, projectDir, selectedIds, removedIds },
     { log, err, rm, writeLog }
   );
-  for (const line of advisoryLines(
-    plan,
-    projectDir,
-    rootFiles,
-    options.keepTemplates === true,
-    globalTrust
-  )) {
+  for (const line of advisoryLines(plan, projectDir, rootFiles, globalTrust)) {
     log(line);
   }
   const outcome = summarize({
     succeeded,
     failed,
     logWriteFailed,
-    // 제거된 것도 없고 templates 도 안 지웠는데, 사용자에게 줄 방법조차 없을 때만 실패다.
+    // 제거된 것도 없고 하네스 파일도 안 건드렸는데, 사용자에게 줄 방법조차 없을 때만 실패다.
     //   ① `--only` = "이걸 빼라"는 특정 요청 — 하나도 못 뺐으면 요청 불이행 (C1).
     //   ② 자동 경로가 없는 자산이 남았으면 — 안내할 명령조차 없다 (R1).
     //   ③ 반면 global 자산만 남은 경우는 **정확한 수기 명령을 출력했으므로** 성공이다.
     //      D16 설계대로의 정상이고, 여기까지 묶으면 global scope 사용자는 exit 0 을 영원히
     //      못 받는다 (로그가 지워져 재시도하면 더 나빠진다).
-    nothingDone: succeeded === 0 && keepTemplates && (logSurvives || plan.noReversePath.length > 0)
+    nothingDone: succeeded === 0 && assetsOnly && (logSurvives || plan.noReversePath.length > 0)
   });
   log("");
   log(outcome.line);
@@ -11700,18 +12158,19 @@ function unwritablePaths(ctx) {
     if (!safeExists(abs)) return;
     const real = safeRealpath(abs);
     if (real !== null && isOutsideProject(projectDir, real)) return;
-    need.add(dirname6(path));
+    need.add(dirname7(path));
   };
   for (const a of project)
     if (a.method === "skill") for (const f of a.files ?? []) parentOf(f.path);
-  if (!ctx.keepTemplates) {
+  if (ctx.selectedIds === null) {
     const recordedShared = new Set((installLog.portions ?? []).map((p2) => p2.path));
-    for (const p2 of ctx.sharedPaths) {
-      if (recordedShared.has(p2) && existsSync25(join34(projectDir, p2))) need.add(p2);
-    }
-    for (const f of installLog.externalFiles ?? []) {
-      if (!underAny(f.path, ctx.movedDirs)) parentOf(f.path);
+    const made = new Set((installLog.externalFiles ?? []).map((f) => f.path));
+    for (const p2 of UNINSTALL_SHARED) {
+      if (recordedShared.has(p2) && existsSync26(join34(projectDir, p2))) need.add(p2);
+      if (made.has(p2)) parentOf(p2);
     }
+    for (const p2 of harnessCandidates(installLog)) parentOf(p2);
+    for (const f of installLog.rootFiles ?? []) if (f.change === "displaced") parentOf(f.path);
     if (hasRootImport(projectDir)) need.add("CLAUDE.md");
   }
   return [...need].filter((p2) => {
@@ -11801,14 +12260,15 @@ function settleLog(ctx, io) {
     }
   } else {
     io.rm(join34(projectDir, INSTALL_LOG_DIR));
-    if (outsideTemplateLink(projectDir, LEGACY_INSTALL_LOG_DIR) === null) {
+    if (outsideLinkAt(projectDir, LEGACY_INSTALL_LOG_DIR) === null) {
       io.rm(legacyInstallLogPath(projectDir));
+      pruneEmptyDirsUpward(projectDir, join34(projectDir, LEGACY_INSTALL_LOG_DIR));
     }
     io.log(`  ${status.success("install log removed")}`);
   }
   return false;
 }
-function dryRunLines(plan, installLog, projectDir, keepTemplates, rootFiles, harnessRoot, sharedPaths, globalTrust) {
+function dryRunLines(plan, installLog, projectDir, assetsOnly, rootFiles, harnessRoot, globalTrust) {
   const lines2 = [c.yellow("[DRY RUN] reverse list (\uC2E4\uC81C \uBCC0\uACBD \uC5C6\uC74C):"), ""];
   if (plan.reverseSteps.length === 0) {
     lines2.push(c.dim("  (no project-scope assets to reverse)"));
@@ -11821,35 +12281,19 @@ function dryRunLines(plan, installLog, projectDir, keepTemplates, rootFiles, har
       ...(plan.hints.get(a.id) ?? []).map((h2) => c.dim(`    \u21B3 ${h2}`))
     ])
   );
-  if (!keepTemplates) {
-    const dirs = recordedTemplateDirs(installLog);
-    for (const rel of dirs) {
-      const kept = outsideTemplateLink(projectDir, rel);
-      if (kept) lines2.push(keptOutsideLinkLine(kept, installLog));
-      else if (existsSync25(join34(projectDir, rel))) lines2.push(MOVE_ASIDE_PREVIEW(rel));
-    }
-    if (dirs.length === 0) lines2.push("  \u25CB remove templates: (none)");
-    const rootMd = installLog.templates.rootClaudeMd;
-    if (rootMd) {
-      lines2.push(
-        rootClaudeMdModified(installLog, projectDir) ? `  \u25CB keep ${rootMd.path} (modified since install \u2014 preserved)` : `  \u25CB remove ${rootMd.path}`
-      );
-    }
-    if (hasRootImport(projectDir)) {
-      lines2.push("  \u25CB strip harness @import from CLAUDE.md (\uBCF8\uBB38 \uBCF4\uC874)");
-    }
-    lines2.push(...previewExternalLines(installLog, projectDir, harnessRoot, dirs));
-    lines2.push(
-      ...sharedStripLines(
-        stripCliShared(installLog, projectDir, harnessRoot, sharedPaths, false),
-        true
-      )
-    );
+  if (!assetsOnly) {
+    const preview = removeHarnessFiles(installLog, projectDir, FULL_SCOPE, {
+      rm: () => {
+      },
+      write: false,
+      harnessRoot
+    });
+    lines2.push(...harnessRemovalLines(preview, installLog, projectDir, FULL_SCOPE, true));
   }
-  lines2.push(...advisoryLines(plan, projectDir, rootFiles, keepTemplates, globalTrust), "");
+  lines2.push(...advisoryLines(plan, projectDir, rootFiles, globalTrust), "");
   return lines2;
 }
-function advisoryLines(plan, projectDir, rootFiles, keepTemplates = false, globalTrust) {
+function advisoryLines(plan, projectDir, rootFiles, globalTrust) {
   const lines2 = [];
   if (globalTrust) {
     lines2.push(
@@ -11870,24 +12314,25 @@ function advisoryLines(plan, projectDir, rootFiles, keepTemplates = false, globa
       lines2.push(c.dim(`  \xB7 ${adv.asset.id} (${adv.asset.method})`), c.dim(`      ${adv.command}`));
     }
   }
-  lines2.push(...rootFileAdvisoryLines(rootFiles, projectDir, keepTemplates));
+  lines2.push(...rootFileAdvisoryLines(rootFiles, projectDir));
   lines2.push(...backupArtifactAdvisoryLines(projectDir));
   return lines2;
 }
 function backupArtifactAdvisoryLines(projectDir) {
-  const stampRe = /\.backup-\d{8}T\d{6}$/;
   const found = [];
   for (const e2 of readdirSync6(projectDir, { withFileTypes: true })) {
-    if ([".claude", ".codex", ".opencode"].some((d2) => e2.name.startsWith(`${d2}.backup-`))) {
+    if (CLI_FOLDERS2.some((d2) => e2.name.startsWith(`${d2}.backup-`))) {
       found.push(e2.name);
-    } else if (e2.isFile() && stampRe.test(e2.name)) {
+    } else if (e2.isFile() && BACKUP_SUFFIX.test(e2.name)) {
       found.push(e2.name);
     }
   }
-  const agents = join34(projectDir, ".agents");
-  if (existsSync25(agents)) {
-    for (const rel of listFilesRecursive(agents)) {
-      if (stampRe.test(rel)) found.push(`.agents/${rel}`);
+  for (const dir of BACKUP_SCAN_DIRS) {
+    if (dir === INSTALL_LOG_DIR) continue;
+    const abs = join34(projectDir, dir);
+    if (!existsSync26(abs) || outsideLinkAt(projectDir, dir) !== null) continue;
+    for (const rel of listFilesRecursive(abs)) {
+      if (BACKUP_SUFFIX.test(rel)) found.push(`${dir}/${rel}`);
     }
   }
   if (found.length === 0) return [];
@@ -11898,9 +12343,9 @@ function backupArtifactAdvisoryLines(projectDir) {
     ...found.sort().map((f) => c.dim(`  ${f}`))
   ];
 }
-function rootFileAdvisoryLines(rootFiles, projectDir, keepTemplates = false) {
-  const header = keepTemplates ? "[LEFT] uninstall \uD6C4 \uB0A8\uB294 \uAC83 \u2014 templates \uBCF4\uC874(.claude/ \uB4F1) + \uB8E8\uD2B8 \uD30C\uC77C (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4):" : "[ROOT] `.claude/` \uBC16\uC5D0 \uB0A8\uB294 \uAC83 (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4):";
-  const present2 = rootFiles.filter((f) => existsSync25(join34(projectDir, f.path)));
+function rootFileAdvisoryLines(rootFiles, projectDir) {
+  const header = "[ROOT] `.claude/` \uBC16\uC5D0 \uB0A8\uB294 \uAC83 (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4):";
+  const present2 = rootFiles.filter((f) => existsSync26(join34(projectDir, f.path)));
   if (present2.length === 0) return [];
   const outside = /* @__PURE__ */ new Map();
   const inside = present2.filter((f) => {
@@ -11943,7 +12388,7 @@ function rootFileMeaning(f, projectDir) {
     case "displaced": {
       const backup = f.notes[0];
       if (backup === void 0) return "\uD558\uB124\uC2A4 \uD310\uACFC \uAC19\uC740 \uC124\uCE58\uC790 \uD30C\uC77C\uC774 \uC788\uB358 \uC790\uB9AC (\uADF8\uB300\uB85C \uB450\uC5C8\uB2E4)";
-      return existsSync25(join34(projectDir, backup)) ? `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC740 ${backup} \uC5D0 \uC788\uB2E4` : `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC758 \uBC31\uC5C5(${backup})\uC774 \uB354\uB294 \uC5C6\uB2E4`;
+      return existsSync26(join34(projectDir, backup)) ? `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC740 ${backup} \uC5D0 \uC788\uB2E4` : `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC758 \uBC31\uC5C5(${backup})\uC774 \uB354\uB294 \uC5C6\uB2E4`;
     }
   }
 }
@@ -11954,8 +12399,8 @@ var TEMPLATE_DIR_FIELD = {
 };
 function resolveCliTarget(ctx, io) {
   const { options, installLog } = ctx;
-  if (options.only !== void 0 || options.keepTemplates) {
-    io.err(status.failure(c.red("ERROR: --cli \uB294 --only \xB7 --keep-templates \uC640 \uD568\uAED8 \uC4F8 \uC218 \uC5C6\uB2E4")));
+  if (options.only !== void 0) {
+    io.err(status.failure(c.red("ERROR: --cli \uB294 --only \uC640 \uD568\uAED8 \uC4F8 \uC218 \uC5C6\uB2E4")));
     io.err(
       c.dim(
         "       CLI \uD558\uB098 \uC81C\uAC70: uninstall --cli <name>  /  \uC790\uC0B0 \uD558\uB098 \uC81C\uAC70: uninstall --only <id>"
@@ -11989,20 +12434,24 @@ function resolveCliTarget(ctx, io) {
 function underAny(path, owned) {
   return owned.some((o) => o.endsWith("/") ? path.startsWith(o) : path === o);
 }
-function planCliRemoval(target, remaining, installLog) {
+function planCliRemoval(target, remaining) {
   const { exclusive, sharedNowUnowned } = removableFor(target, remaining);
   const owned = [...exclusive, ...sharedNowUnowned];
-  const recorded2 = owned.filter((o) => o.kind === "recorded").map((o) => o.path);
-  const scopedFiles = (installLog.externalFiles ?? []).filter(
-    (f) => underAny(f.path, recorded2)
-  );
+  const prefixes = owned.filter((o) => o.kind === "recorded" || o.kind === "anchor").map((o) => o.path);
+  const has = (path) => underAny(path, prefixes);
   return {
     target,
-    dirs: owned.filter((o) => o.kind === "dir").map((o) => o.path),
-    shared: CLI_SHARED.filter((p2) => recorded2.includes(p2)),
-    scoped: { ...installLog, externalFiles: scopedFiles },
-    anchor: owned.some((o) => o.kind === "anchor"),
-    importBlock: owned.some((o) => o.kind === "import-block")
+    scope: {
+      has,
+      // `.claude/settings.json` 은 claude 의 `.claude/` 아래 · `.codex/config.toml` 은 codex 의 `.codex/` 아래 · `AGENTS.md` ·
+      // `opencode.json` 은 마지막 사용자일 때만 표에 든다. `.mcp.json`(`keep`) · `.gitignore` 는 CLI 하나로 빠지지 않는다
+      shared: UNINSTALL_SHARED.filter(has),
+      // claude 를 뺄 때 `.claude/` 아래 다섯 — `docs/decisions` 는 CLI 소속이 아니다
+      skeleton: PROJECT_SKELETON_DIRS.filter(has),
+      folders: CLI_FOLDERS2.filter((d2) => has(`${d2}/`)),
+      importBlock: owned.some((o) => o.kind === "import-block"),
+      anchor: owned.some((o) => o.kind === "anchor")
+    }
   };
 }
 function removeCliHeader(target, installed, remaining) {
@@ -12019,27 +12468,14 @@ function removeCliHeader(target, installed, remaining) {
 function removeCliDryRunLines(plan, ctx, remaining) {
   const { installLog, projectDir, harnessRoot } = ctx;
   const lines2 = [c.yellow("[DRY RUN] CLI \uC81C\uAC70 \uBBF8\uB9AC\uBCF4\uAE30 (\uC2E4\uC81C \uBCC0\uACBD \uC5C6\uC74C):"), ""];
-  for (const dir of plan.dirs) {
-    const kept = outsideTemplateLink(projectDir, dir);
-    if (kept) lines2.push(keptOutsideLinkLine(kept, installLog));
-    else if (existsSync25(join34(projectDir, dir))) lines2.push(MOVE_ASIDE_PREVIEW(dir));
-  }
-  lines2.push(...previewExternalLines(plan.scoped, projectDir, harnessRoot));
-  lines2.push(
-    ...sharedStripLines(
-      stripCliShared(installLog, projectDir, harnessRoot, plan.shared, false),
-      true
-    )
-  );
-  const rootMd = plan.anchor ? installLog.templates.rootClaudeMd : void 0;
-  if (rootMd && existsSync25(join34(projectDir, rootMd.path))) {
-    lines2.push(
-      rootClaudeMdModified(installLog, projectDir) ? `  \u25CB keep ${rootMd.path} (modified since install \u2014 preserved)` : `  \u25CB remove ${rootMd.path}`
-    );
-  }
-  if (plan.importBlock && hasRootImport(projectDir)) {
-    lines2.push("  \u25CB strip harness @import from CLAUDE.md (\uBCF8\uBB38 \uBCF4\uC874)");
-  }
+  const preview = removeHarnessFiles(installLog, projectDir, plan.scope, {
+    rm: () => {
+    },
+    write: false,
+    harnessRoot
+  });
+  lines2.push(...harnessRemovalLines(preview, installLog, projectDir, plan.scope, true));
+  lines2.push(...assetsLeftLines(installLog, projectDir, plan.scope));
   const rerender = agentsMdRerenderSet(plan.target, remaining, installLog, projectDir);
   if (rerender !== null) {
     lines2.push(`  \u25CB would re-render AGENTS.md for ${displayNames(rerender)} (your sections kept)`);
@@ -12055,7 +12491,7 @@ function agentsMdRerenderSet(target, remaining, log, projectDir) {
   const set = agentsMdClis(remaining);
   if (set.length === 0) return null;
   const recorded2 = (log.externalFiles ?? []).some((f) => f.path === AGENTS_MD2) || (log.portions ?? []).some((p2) => p2.path === AGENTS_MD2);
-  if (!recorded2 || !existsSync25(join34(projectDir, AGENTS_MD2))) return null;
+  if (!recorded2 || !existsSync26(join34(projectDir, AGENTS_MD2))) return null;
   return set;
 }
 function rerenderAgentsMd(ctx, set) {
@@ -12096,21 +12532,7 @@ function rerenderLines(r) {
   }
   return lines2;
 }
-function removeHarnessAnchor(ctx, io) {
-  const { installLog, projectDir } = ctx;
-  const rootMd = installLog.templates.rootClaudeMd;
-  if (!rootMd || !existsSync25(join34(projectDir, rootMd.path))) return false;
-  if (rootClaudeMdModified(installLog, projectDir)) {
-    io.log(
-      `  ${c.yellow("\u2298")} ${rootMd.path} kept \u2014 modified since install. Remove manually if intended.`
-    );
-    return false;
-  }
-  io.rm(join34(projectDir, rootMd.path));
-  io.log(`  ${status.success(`${rootMd.path} removed`)}`);
-  return true;
-}
-function settleCliLog(ctx, target, remaining, recovered, anchorRemoved, removedDirs, shared2) {
+function settleCliLog(ctx, target, remaining, done, anchorRemoved) {
   const { installLog } = ctx;
   const next = {
     ...installLog,
@@ -12123,23 +12545,26 @@ function settleCliLog(ctx, target, remaining, recovered, anchorRemoved, removedD
     },
     templates: { ...installLog.templates }
   };
-  next.assets = installLog.assets.map(
-    (a) => a.files === void 0 ? a : { ...a, files: a.files.filter((f) => !underAny(f.path, removedDirs)) }
-  );
   const field = TEMPLATE_DIR_FIELD[target];
   if (field) delete next.templates[field];
   if (anchorRemoved) delete next.templates.rootClaudeMd;
-  const survivors = (installLog.externalFiles ?? []).filter(
-    (f) => !recovered.has(f.path) && !underAny(f.path, removedDirs)
-  );
+  if (target === "claude") {
+    delete next.policyFiles;
+    delete next.skillFiles;
+  }
+  const survivors = (installLog.externalFiles ?? []).filter((f) => !done.forgotten.has(f.path));
   if (survivors.length > 0) next.externalFiles = survivors;
   else delete next.externalFiles;
-  const touched = new Set(shared2.map((r) => r.path));
+  const settled = new Set(done.displaced.filter((d2) => d2.forget).map((d2) => d2.path));
+  if (installLog.rootFiles !== void 0) {
+    next.rootFiles = installLog.rootFiles.filter(
+      (f) => !(f.change === "displaced" && settled.has(f.path))
+    );
+  }
+  const touched = new Set(done.shared.map((r) => r.path));
   const portions = [
-    ...(installLog.portions ?? []).filter(
-      (p2) => !touched.has(p2.path) && !underAny(p2.path, removedDirs)
-    ),
-    ...shared2.flatMap((r) => r.portions)
+    ...(installLog.portions ?? []).filter((p2) => !touched.has(p2.path)),
+    ...done.shared.flatMap((r) => r.portions)
   ];
   if (portions.length > 0) next.portions = portions;
   else delete next.portions;
@@ -12151,36 +12576,26 @@ function removeCliAction(ctx, io) {
   const { options, installLog, projectDir, harnessRoot } = ctx;
   const installed = installedClis(installLog);
   const remaining = installed.filter((cli) => cli !== target);
-  const plan = planCliRemoval(target, remaining, installLog);
+  const plan = planCliRemoval(target, remaining);
   for (const line of removeCliHeader(target, installed, remaining)) io.log(line);
   if (options.dryRun) {
     for (const line of removeCliDryRunLines(plan, ctx, remaining)) io.log(line);
     io.exit(0);
     return;
   }
-  for (const dir of plan.dirs) {
-    const kept = outsideTemplateLink(projectDir, dir);
-    if (kept) {
-      io.log(keptOutsideLinkLine(kept, installLog));
-      continue;
-    }
-    if (!existsSync25(join34(projectDir, dir))) continue;
-    const backup = io.moveAside(templateDirPath(projectDir, dir));
-    if (backup) io.log(movedAsideLine(projectDir, dir, backup));
-  }
-  const external = removeExternalFiles(plan.scoped, projectDir, io.rm, harnessRoot);
-  for (const line of externalRemovalLines(external)) io.log(line);
-  const shared2 = stripCliShared(installLog, projectDir, harnessRoot, plan.shared, true);
-  for (const line of sharedStripLines(shared2, false)) io.log(line);
-  if (plan.importBlock && stripRootImport(projectDir)) {
-    io.log(`  ${status.success("CLAUDE.md \u2014 harness @import removed (\uBCF8\uBB38 \uBCF4\uC874)")}`);
+  const done = removeHarnessFiles(installLog, projectDir, plan.scope, {
+    rm: io.rm,
+    write: true,
+    harnessRoot
+  });
+  for (const line of harnessRemovalLines(done, installLog, projectDir, plan.scope, false)) {
+    io.log(line);
   }
-  const anchorRemoved = plan.anchor ? removeHarnessAnchor(ctx, io) : false;
+  for (const line of assetsLeftLines(installLog, projectDir, plan.scope)) io.log(line);
   const rerenderSet = agentsMdRerenderSet(target, remaining, installLog, projectDir);
   const rerender = rerenderSet === null ? null : rerenderAgentsMd(ctx, rerenderSet);
   if (rerender !== null) for (const line of rerenderLines(rerender)) io.log(line);
-  const recovered = /* @__PURE__ */ new Set([...external.removed, ...external.stripped]);
-  const settled = settleCliLog(ctx, target, remaining, recovered, anchorRemoved, plan.dirs, shared2);
+  const settled = settleCliLog(ctx, target, remaining, done, done.anchor.removed);
   const next = rerender === null ? settled : withRerender(settled, rerender);
   try {
     io.writeLog(projectDir, next);
@@ -12199,19 +12614,36 @@ function removeCliAction(ctx, io) {
   io.log(status.success(c.green(`${target} removed (remaining: ${remaining.join(", ")})`)));
   io.exit(0);
 }
-var CLI_SHARED = ["AGENTS.md", "opencode.json"];
-var ROOT_SHARED = [".mcp.json", ".gitignore"];
+var UNINSTALL_SHARED = Object.keys(SHARED_FILES).filter(
+  (p2) => p2 !== "CLAUDE.md"
+);
 var SKILLS_LOCK = "skills-lock.json";
 function withSkillsLock(rootFiles, assets, projectDir) {
   const out = [...rootFiles];
   const skills = assets.some((a) => a.method === "skill" && a.scope === "project");
-  if (skills && !out.some((f) => f.path === SKILLS_LOCK) && existsSync25(join34(projectDir, SKILLS_LOCK))) {
+  if (skills && !out.some((f) => f.path === SKILLS_LOCK) && existsSync26(join34(projectDir, SKILLS_LOCK))) {
     out.push({ path: SKILLS_LOCK, change: "advisory", notes: [] });
   }
   return out;
 }
-function remnantFor(path, log, harnessRoot) {
+function remnantFor(path, log, harnessRoot, projectDir) {
   const clis = installedClis(log);
+  if (path === SETTINGS_TARGET) {
+    return (disk) => {
+      try {
+        const template = readFileSync26(join34(harnessRoot, "templates", "settings.json"), "utf8");
+        const render = renderSettingsPortion(template, () => true);
+        return [...legacySettingsSeed(disk, render, projectDir).keys()].filter(
+          (k2) => !k2.endsWith("{}")
+        );
+      } catch {
+        return [];
+      }
+    };
+  }
+  if (path === CODEX_CONFIG) {
+    return (disk) => [...ADAPTERS["toml-region"].read(disk)?.keys() ?? []];
+  }
   if (path === ".gitignore") {
     return (disk) => [...legacyGitignoreSeed(disk, gitignoreRender(), log).keys()];
   }
@@ -12261,6 +12693,12 @@ function knownServerValues(servers, form, prefix = "mcpServers.") {
   return out;
 }
 function remnantLine(path) {
+  if (path === SETTINGS_TARGET) {
+    return (names) => `may still hold the harness's hooks (not on record): ${names.join(" \xB7 ")} \u2014 delete them by hand if they are not yours`;
+  }
+  if (path === CODEX_CONFIG) {
+    return (names) => `harness regions not on record: ${names.join(" \xB7 ")} \u2014 delete them by hand if you want them gone`;
+  }
   if (path === ".mcp.json") {
     return (names) => `may still hold the harness's MCP servers (not on record): ${names.join(" \xB7 ")} \u2014 delete them by hand if they are not yours`;
   }
@@ -12269,31 +12707,11 @@ function remnantLine(path) {
   }
   return path === AGENTS_MD2 ? () => "the harness block is not on record (written before the harness recorded its part) \u2014 delete the <!-- uzys-harness:agents --> block by hand if you want it gone" : (names) => `may still hold the harness's MCP servers (not on record): ${names.join(" \xB7 ")} \u2014 delete them by hand if they are not yours`;
 }
-function stripCliShared(log, projectDir, harnessRoot, paths, write) {
-  const harnessMade = new Set((log.externalFiles ?? []).map((f) => f.path));
-  const created = new Set(
-    (log.rootFiles ?? []).filter((f) => f.change === "created").map((f) => f.path)
-  );
-  return paths.filter((path) => !harnessMade.has(path)).map(
-    (path) => stripShared({
-      projectDir,
-      path,
-      portions: log.portions ?? [],
-      excluded: [...excludedIds(log)],
-      remnant: remnantFor(path, log, harnessRoot),
-      remnantLine: remnantLine(path),
-      write,
-      // ADR-099 R2 — 블록만 담아 다시 만든 `AGENTS.md`(첫 접촉 블록 모델)도 하네스가 만든 파일이다
-      removeIfEmpty: created.has(path)
-    })
-  );
-}
 function sharedStripLines(results, preview) {
   const lines2 = [];
   for (const r of results) {
     const display = (k2) => {
       if (k2 === AGENTS_BLOCK_NAME) return ["harness block"];
-      if (!ROOT_SHARED.includes(r.path)) return [k2];
       const id = keyId(r.path, k2);
       return id === null ? [] : [id.slice(id.indexOf(":") + 1)];
     };
@@ -12343,7 +12761,7 @@ function noReverseHints(asset, ctx) {
   }
   if (asset.method !== "skill") return [];
   const name = asset.detail.skill;
-  const left = name === void 0 ? [] : [".claude/skills", ".agents/skills"].map((root) => `${root}/${name}/`).filter((p2) => !underAny(p2, ctx.movedDirs) && existsSync25(join34(ctx.projectDir, p2)));
+  const left = name === void 0 ? [] : [".claude/skills", ".agents/skills"].map((root) => `${root}/${name}/`).filter((p2) => existsSync26(join34(ctx.projectDir, p2)));
   return [
     left.length > 0 ? `files it put down are not on record (installed by an older version) \u2014 left: ${left.join(" \xB7 ")} (delete by hand if the harness installed it)` : "files it put down are not on record (installed by an older version) \u2014 nothing removed"
   ];
@@ -12423,118 +12841,513 @@ function buildGlobalAdvisoryCmd(asset) {
       return "(no standard reverse \u2014 manual)";
   }
 }
-function removeTemplates(log, projectDir, io, harnessRoot) {
-  const { rm } = io;
-  const movedDirs = removedDirsList(log);
-  const recovered = recoverMovedSymlinkTargets(log, projectDir, movedDirs, io.rm);
-  const outsidePortions = recoverMovedSymlinkPortions(log, projectDir, movedDirs);
-  const keptLinks = [];
-  const moved = recordedTemplateDirs(log).flatMap((rel) => {
-    const kept = outsideTemplateLink(projectDir, rel);
-    if (kept) {
-      keptLinks.push(kept);
-      return [];
+var CLAUDE_DIR3 = ".claude/";
+var LEGACY_LOG = `${LEGACY_INSTALL_LOG_DIR}/${INSTALL_LOG_FILENAME}`;
+var SKILLS_DIR3 = ".claude/skills/";
+var CLI_FOLDERS2 = [".claude", ".codex", ".opencode"];
+var LEFT_FILES_SHOWN = 3;
+var FULL_SCOPE = {
+  has: () => true,
+  shared: UNINSTALL_SHARED,
+  skeleton: PROJECT_SKELETON_DIRS,
+  folders: CLI_FOLDERS2,
+  importBlock: true,
+  anchor: true
+};
+function removeHarnessFiles(log, projectDir, scope, io) {
+  const out = {
+    removed: [],
+    backedUp: [],
+    forgotten: /* @__PURE__ */ new Set(),
+    stripped: [],
+    kept: [],
+    unjudged: [],
+    outside: [],
+    displaced: [],
+    shared: [],
+    retiredWiring: [],
+    importStripped: false,
+    anchor: { removed: false, lines: [] }
+  };
+  const pruneFrom = [];
+  stripSharedFiles(log, projectDir, scope.shared, io, out, pruneFrom);
+  const isTarget = harnessTargets(log);
+  for (const path of harnessCandidates(log)) {
+    if (scope.has(path))
+      removeRecordedFile(path, { log, projectDir, io, out, isTarget, pruneFrom });
+  }
+  if (scope.importBlock) {
+    out.importStripped = io.write ? stripRootImport(projectDir) : hasRootImport(projectDir);
+  }
+  if (scope.anchor) {
+    out.anchor = removeAnchor(log, projectDir, io);
+    const anchorPath = log.templates?.rootClaudeMd?.path;
+    if (out.anchor.removed && anchorPath !== void 0) out.removedAnchor = anchorPath;
+  }
+  restoreDisplaced(log, projectDir, scope, io, out);
+  if (io.write) {
+    for (const p2 of pruneFrom) pruneEmptyDirsUpward(projectDir, dirname7(join34(projectDir, p2)));
+    for (const d2 of scope.skeleton) {
+      const abs = join34(projectDir, d2);
+      if (outsideProjectTarget(projectDir, abs) !== null) continue;
+      pruneEmptyDirsUpward(projectDir, abs);
     }
-    const backup = io.moveAside(templateDirPath(projectDir, rel));
-    return backup ? [{ rel, backup }] : [];
-  });
-  const external = removeExternalFiles(log, projectDir, rm, harnessRoot);
-  external.removed.push(...recovered.removed);
-  external.kept.push(...recovered.kept);
-  for (const o of [...recovered.outside, ...outsidePortions]) {
-    if (!external.outside.some((e2) => e2.path === o.path)) external.outside.push(o);
-  }
-  external.outside = external.outside.filter((o) => !underKeptLink(o.path, keptLinks));
-  const importStripped = stripRootImport(projectDir);
-  const rootMd = log.templates?.rootClaudeMd;
-  if (rootMd) {
-    if (rootClaudeMdModified(log, projectDir))
-      return { rootClaudeMdKept: true, importStripped, external, moved, keptLinks };
-    rm(join34(projectDir, rootMd.path));
   }
-  return { rootClaudeMdKept: false, importStripped, external, moved, keptLinks };
+  return out;
 }
-var AGENTS_MD2 = "AGENTS.md";
-function readAgentsMdTemplate(harnessRoot) {
+function harnessCandidates(log) {
+  const paths = [
+    ...(log.policyFiles ?? []).map((f) => `${CLAUDE_DIR3}${f.path}`),
+    ...(log.skillFiles ?? []).map((f) => `${SKILLS_DIR3}${f.path}`),
+    ...(log.externalFiles ?? []).map((f) => f.path).filter((p2) => !p2.startsWith(`${INSTALL_LOG_DIR}/`)),
+    // 어느 필드에도 적힌 적 없는 옛 판의 하네스 파일 — `isTarget` 이 알려 준다(A8 · install 과 같은 방식)
+    INSTALLED_TRACKS,
+    // 스캔 필드가 아예 없는 옛 로그(v26.125.0 이하)는 필드가 하네스 파일을 열거하지 못한다 — manifest 의 하네스 자리 ·
+    // 은퇴 경로를 후보로 넣고 `recorded()` 가 가른다(필드 없음 → `no-sha` · 필드 있음 → 기록에 없으면 `none`, PR-D 리뷰 N1).
+    // 그 은퇴 자리는 새 install · update 가 필드를 쓸 때 `policyFiles` 로 이어받는다(`retiredClaims` — 재리뷰 BLOCKER-1 ②)
+    ...log.records === "writer" ? [] : recordedTrackSpots(log)
+  ];
+  return [...new Set(paths)].filter((p2) => kindOf(log, p2) === "harness");
+}
+function harnessTargets(log) {
+  const tracked = recordedTrackTargets(log);
+  return (p2) => p2 === INSTALLED_TRACKS || tracked(p2);
+}
+function templateNext(harnessRoot, log, path) {
+  if (path === INSTALLED_TRACKS) return installedTracksText(log.spec.tracks.filter(isTrack));
+  if (!path.startsWith(CLAUDE_DIR3)) return null;
   try {
-    return readFileSync26(join34(harnessRoot, AGENTS_MD_TEMPLATE), "utf8");
+    return readFileSync26(join34(harnessRoot, "templates", path.slice(CLAUDE_DIR3.length)), "utf8");
   } catch {
     return null;
   }
 }
-function recoverMovedSymlinkPortions(log, projectDir, dirs) {
-  const outside = [];
-  const paths = new Set((log.portions ?? []).map((p2) => p2.path));
+function removeRecordedFile(path, ctx) {
+  const { log, projectDir, io, out } = ctx;
+  const abs = join34(projectDir, path);
+  let foreign;
+  try {
+    foreign = foreignOwnedTarget(projectDir, path);
+  } catch {
+    out.unjudged.push(path);
+    return;
+  }
+  if (foreign !== null) {
+    out.forgotten.add(path);
+    return;
+  }
+  const outside = outsideProjectTarget(projectDir, abs);
+  if (outside !== null) {
+    out.outside.push(outside);
+    return;
+  }
+  let st2;
+  try {
+    st2 = lstatSync5(abs, { throwIfNoEntry: false });
+  } catch {
+    out.unjudged.push(path);
+    return;
+  }
+  if (st2 === void 0 || st2.isSymbolicLink() && !existsSync26(abs)) {
+    out.forgotten.add(path);
+    return;
+  }
+  let effective = abs;
+  let disk;
+  try {
+    const real = realpathSync3(abs);
+    if (!statSync5(real).isFile()) {
+      out.unjudged.push(path);
+      return;
+    }
+    if (st2.isSymbolicLink()) effective = real;
+    disk = readFileSync26(effective, "utf8");
+  } catch {
+    out.unjudged.push(path);
+    return;
+  }
+  const verdict = judge({
+    op: "remove",
+    kind: "harness",
+    rec: recorded(log, path, { isTarget: ctx.isTarget }),
+    disk,
+    next: templateNext(io.harnessRoot, log, path)
+  });
+  if (verdict.verdict !== "remove" && verdict.verdict !== "backup+remove") return;
+  let backup = null;
+  if (verdict.verdict === "backup+remove") {
+    backup = io.write ? relative5(projectDir, backupFile(effective)).split(sep5).join("/") : `${relative5(projectDir, effective).split(sep5).join("/")}.backup-<time>`;
+  }
+  if (io.write) {
+    if (effective !== abs) io.rm(abs);
+    io.rm(effective);
+  }
+  out.removed.push(path);
+  out.forgotten.add(path);
+  ctx.pruneFrom.push(path);
+  if (backup !== null) out.backedUp.push({ path, backup, line: verdict.line });
+}
+function stripSharedFiles(log, projectDir, paths, io, out, pruneFrom) {
+  const made = new Map((log.externalFiles ?? []).map((f) => [f.path, f.sha256]));
+  const created = new Set(
+    (log.rootFiles ?? []).filter((f) => f.change === "created").map((f) => f.path)
+  );
+  const onRecord = /* @__PURE__ */ new Set([
+    ...(log.portions ?? []).map((p2) => p2.path),
+    ...made.keys(),
+    ...(log.rootFiles ?? []).map((f) => f.path)
+  ]);
+  const clis = installedClis(log);
+  const relevant = (path) => {
+    const owners = ownersOf(path);
+    return onRecord.has(path) || owners.length === 0 || owners.some((c3) => clis.includes(c3));
+  };
   for (const path of paths) {
-    if (path.startsWith(".agents/skills/")) continue;
-    if (!dirs.some((d2) => path.startsWith(d2))) continue;
+    if (!relevant(path)) continue;
     const abs = join34(projectDir, path);
-    if (!safeIsSymlink(abs)) continue;
-    const target = safeRealpath(abs);
-    if (target !== null && isOutsideProject(projectDir, target)) {
-      outside.push({ path, target });
+    if (safeExists(abs)) {
+      const o = outsideProjectTarget(projectDir, abs);
+      if (o !== null) {
+        out.outside.push(o);
+        continue;
+      }
+    }
+    if (path === SETTINGS_TARGET && safeExists(abs)) {
+      out.retiredWiring = removeRetiredHookRefs(
+        abs,
+        join34(projectDir, ".claude"),
+        RETIRED_HOOK_WIRING_REFS,
+        { evenIfScriptExists: true, write: io.write }
+      );
+    }
+    const sha = made.get(path);
+    if (sha !== void 0 && removeHarnessMadeShared(path, sha, projectDir, io, out, pruneFrom)) {
       continue;
     }
-    stripShared({
+    const r = stripShared({
       projectDir,
       path,
       portions: log.portions ?? [],
       excluded: [...excludedIds(log)],
-      remnant: () => [],
-      remnantLine: () => "",
-      write: true
+      remnant: remnantFor(path, log, io.harnessRoot, projectDir),
+      remnantLine: remnantLine(path),
+      write: io.write,
+      // 하네스가 만든 파일(#569 `created` · #13 `externalFiles`)은 몫을 걷고 남는 것이 없으면 파일째 지운다
+      removeIfEmpty: created.has(path) || sha !== void 0
     });
+    if (r.fileRemoved) pruneFrom.push(path);
+    out.shared.push(r);
   }
-  return outside;
 }
-function removedDirsList(log) {
-  return recordedTemplateDirs(log);
+function removeHarnessMadeShared(path, sha, projectDir, io, out, pruneFrom) {
+  const abs = join34(projectDir, path);
+  if (!existsSync26(abs)) {
+    out.forgotten.add(path);
+    return true;
+  }
+  let effective = abs;
+  let current;
+  try {
+    const real = realpathSync3(abs);
+    if (!statSync5(real).isFile()) {
+      out.unjudged.push(path);
+      return true;
+    }
+    if (lstatSync5(abs).isSymbolicLink()) effective = real;
+    current = readFileSync26(effective, "utf8");
+  } catch {
+    out.unjudged.push(path);
+    return true;
+  }
+  if (hashContent(current) !== sha) {
+    if (path === AGENTS_MD2) {
+      out.kept.push(path);
+      return true;
+    }
+    out.forgotten.add(path);
+    return false;
+  }
+  if (path === AGENTS_MD2) {
+    const verdict = agentsMdRemainder(current, io.harnessRoot);
+    if (!verdict.ok) {
+      out.unjudged.push(path);
+      return true;
+    }
+    if (verdict.remainder !== null) {
+      try {
+        if (io.write) writeFileSync10(effective, neutralizeScaffoldBanner(verdict.remainder), "utf8");
+        out.stripped.push(path);
+        out.forgotten.add(path);
+      } catch {
+        out.unjudged.push(path);
+      }
+      return true;
+    }
+  }
+  if (io.write) {
+    if (effective !== abs) io.rm(abs);
+    io.rm(effective);
+  }
+  out.shared.push({
+    path,
+    action: "removed",
+    line: "",
+    removed: [],
+    kept: [],
+    portions: [],
+    fileRemoved: true
+  });
+  out.forgotten.add(path);
+  pruneFrom.push(path);
+  return true;
 }
-function recoverMovedSymlinkTargets(log, projectDir, dirs, rm) {
-  const removed = [];
-  const kept = [];
-  const outside = [];
-  for (const { path, sha256 } of log.externalFiles ?? []) {
-    if (path.startsWith(".agents/skills/")) continue;
-    if (!dirs.some((d2) => path.startsWith(d2))) continue;
-    const abs = join34(projectDir, path);
-    if (!safeIsSymlink(abs)) continue;
-    let target;
-    try {
-      target = realpathSync3(abs);
-      if (!statSync4(target).isFile()) continue;
-    } catch {
-      continue;
+function restoreDisplaced(log, projectDir, scope, io, out) {
+  const willBeGone = /* @__PURE__ */ new Set([
+    ...out.removed,
+    ...out.removedAnchor === void 0 ? [] : [out.removedAnchor]
+  ]);
+  for (const f of log.rootFiles ?? []) {
+    if (f.change !== "displaced" || !scope.has(f.path)) continue;
+    const slot = join34(projectDir, f.path);
+    if (outsideProjectTarget(projectDir, slot) !== null) continue;
+    const backup = f.notes[0] ?? null;
+    const d2 = judgeDisplaced({
+      backup,
+      backupExists: backup !== null && safeExists(join34(projectDir, backup)),
+      slotEmpty: !safeExists(slot) || !io.write && willBeGone.has(f.path)
+    });
+    if (io.write && d2.verdict === "restore" && backup !== null) {
+      mkdirSync7(dirname7(slot), { recursive: true });
+      renameSync(join34(projectDir, backup), slot);
     }
-    if (isOutsideProject(projectDir, target)) {
-      outside.push({ path, target });
-      continue;
+    out.displaced.push({
+      path: f.path,
+      backup,
+      verdict: d2.verdict,
+      line: d2.line,
+      forget: d2.record === "forget"
+    });
+  }
+}
+function topOf(path) {
+  const i = path.indexOf("/");
+  return i < 0 ? path : `${path.slice(0, i)}/`;
+}
+function harnessRemovalLines(r, log, projectDir, scope, preview) {
+  const lines2 = [];
+  const groups = /* @__PURE__ */ new Map();
+  for (const p2 of r.removed) {
+    const g = groups.get(topOf(p2)) ?? { removed: 0, backedUp: 0 };
+    g.removed += 1;
+    groups.set(topOf(p2), g);
+  }
+  for (const b2 of r.backedUp) {
+    const g = groups.get(topOf(b2.path));
+    if (g) g.backedUp += 1;
+  }
+  if (preview) {
+    for (const [top, g] of groups) {
+      const edited = g.backedUp > 0 ? ` (${g.backedUp} you edited \u2192 saved beside as *.backup-<time>)` : "";
+      lines2.push(`  \u25CB remove ${g.removed} harness file(s) under ${top}${edited}`);
+    }
+  } else if (groups.size > 0) {
+    const parts = [...groups].map(
+      ([top, g], i) => i === 0 ? `${top} ${g.removed} harness file(s)` : `${top} ${g.removed}`
+    );
+    lines2.push(`  ${status.success(`removed  ${parts.join(" \xB7 ")}`)}`);
+    for (const b2 of r.backedUp) {
+      const what = b2.line.includes("<file>.backup-<time>") ? b2.line.replace("<file>.backup-<time>", b2.backup) : `${b2.line} (${b2.backup})`;
+      lines2.push(`  ${status.success(`backed up  ${b2.path} \u2014 ${what}`)}`);
     }
+  }
+  if (r.importStripped) {
+    lines2.push(
+      preview ? "  \u25CB strip harness @import from CLAUDE.md (\uBCF8\uBB38 \uBCF4\uC874)" : `  ${status.success("CLAUDE.md \u2014 harness @import removed (\uBCF8\uBB38 \uBCF4\uC874)")}`
+    );
+  }
+  lines2.push(...r.anchor.lines);
+  const restore = r.displaced.filter((d2) => d2.verdict === "restore");
+  if (preview && restore.length > 0) {
+    lines2.push(
+      `  \u25CB put back ${restore.length} file(s) of yours (displaced): ${restore.map((d2) => d2.path).join(" \xB7 ")}`
+    );
+  }
+  for (const d2 of r.displaced) {
+    if (d2.verdict === "restore" && !preview) {
+      lines2.push(`  ${status.success(`put back  ${d2.path} (from ${d2.backup})`)}`);
+    } else if (d2.verdict === "advise") {
+      lines2.push(`  ${c.yellow("\u2298")} ${d2.path} \u2014 ${d2.line}`);
+    }
+  }
+  for (const path of r.stripped) {
+    lines2.push(
+      preview ? `  \u25CB strip harness sections from ${path} (\uBCF8\uBB38 \uBCF4\uC874)` : `  ${status.success(`${path} \u2014 harness sections removed (\uBCF8\uBB38 \uBCF4\uC874)`)}`
+    );
+  }
+  for (const path of r.unjudged) {
+    lines2.push(
+      path === AGENTS_MD2 ? `  ${c.yellow("\u2298")} ${path} kept \u2014 harness sections could not be separated (a file or template could not be read, or the write failed). Remove manually if intended.` : `  ${c.yellow("\u2298")} ${path} left \u2014 could not read it to judge. Remove manually if intended.`
+    );
+  }
+  lines2.push(...outsideLines(r.outside, log));
+  for (const path of r.kept) {
+    lines2.push(
+      `  ${c.yellow("\u2298")} ${path} kept \u2014 modified since install. Remove manually if intended.`
+    );
+  }
+  if (r.retiredWiring.length > 0) {
+    const refs = r.retiredWiring.join(" \xB7 ");
+    lines2.push(
+      preview ? `  \u25CB remove retired harness hook wiring from ${SETTINGS_TARGET}: ${refs}` : `  ${status.success(`${SETTINGS_TARGET} \u2014 removed retired harness hook wiring: ${refs}`)}`
+    );
+  }
+  lines2.push(...sharedStripLines(r.shared, preview));
+  lines2.push(...leftFolderLines(r, log, projectDir, scope, preview));
+  return lines2;
+}
+function outsideLines(outside, log) {
+  const byLink = /* @__PURE__ */ new Map();
+  for (const o of outside) if (!byLink.has(o.link)) byLink.set(o.link, o);
+  return [...byLink.values()].map(
+    (o) => o.link === o.path ? `  ${c.yellow("\u2298")} ${o.path} kept \u2014 link target is outside the project (${o.target}). Not touched; remove manually if intended.` : keptOutsideLinkLine(o, log)
+  );
+}
+function leftFolderLines(r, log, projectDir, scope, preview) {
+  const assetFiles = new Set(log.assets.flatMap((a) => (a.files ?? []).map((f) => f.path)));
+  const gone = new Set(
+    preview ? [...r.removed, ...r.shared.filter((s) => s.fileRemoved).map((s) => s.path)] : []
+  );
+  const back = preview ? r.displaced.filter((d2) => d2.verdict === "restore").map((d2) => d2.path) : [];
+  const said = (full) => r.unjudged.includes(full) || r.kept.includes(full) || r.outside.some((o) => o.path === full || full.startsWith(`${o.link}/`));
+  const whose = "not on the install record \u2014 yours, or left by an older harness version; delete by hand any that are not yours";
+  const lines2 = [];
+  for (const dir of scope.folders) {
+    if (outsideLinkAt(projectDir, dir) !== null) continue;
+    const entries = /* @__PURE__ */ new Map();
+    for (const n of yoursUnder(projectDir, dir)) {
+      const full = `${dir}/${n.name}`;
+      if (full === LEGACY_LOG) continue;
+      if (!gone.has(full) && !assetFiles.has(full) && !said(full)) entries.set(n.name, n.shown);
+    }
+    for (const p2 of back)
+      if (p2.startsWith(`${dir}/`)) entries.set(p2.slice(dir.length + 1), p2.slice(dir.length + 1));
+    const shown = [...entries.values()].sort();
+    if (shown.length === 0) continue;
+    const head = shown.slice(0, LEFT_FILES_SHOWN).join(" \xB7 ");
+    const more = shown.length > LEFT_FILES_SHOWN ? ` +${shown.length - LEFT_FILES_SHOWN} more` : "";
+    const what = `${dir}/ \u2014 ${shown.length} file(s) ${whose}: ${head}${more}`;
+    lines2.push(preview ? `  \u25CB leave ${what}` : `  ${c.yellow("\u2298")} left  ${what}`);
+  }
+  return lines2;
+}
+function yoursUnder(projectDir, dir) {
+  const out = [];
+  const walk2 = (abs2, prefix) => {
+    let entries;
     try {
-      if (hashContent(readFileSync26(target, "utf8")) !== sha256) {
-        kept.push(path);
-        continue;
-      }
-      rm(target);
-      removed.push(path);
+      entries = readdirSync6(abs2, { withFileTypes: true });
     } catch {
-      kept.push(path);
+      return;
     }
+    for (const e2 of entries) {
+      const name = `${prefix}${e2.name}`;
+      if (e2.isDirectory()) walk2(join34(abs2, e2.name), `${name}/`);
+      else if (BACKUP_SUFFIX.test(e2.name)) continue;
+      else if (e2.isSymbolicLink()) {
+        let target = "?";
+        try {
+          target = readlinkSync(join34(abs2, e2.name));
+        } catch {
+        }
+        out.push({ name, shown: `${name} (your link \u2192 ${target})` });
+      } else out.push({ name, shown: name });
+    }
+  };
+  const abs = join34(projectDir, dir);
+  try {
+    if (!statSync5(abs).isDirectory()) return [];
+  } catch {
+    return [];
   }
-  return { removed, kept, outside };
+  walk2(abs, "");
+  return out;
 }
-function safeRealpath(abs) {
+function assetsLeftLines(log, projectDir, scope) {
+  const lines2 = [];
+  for (const a of log.assets) {
+    const here = (a.files ?? []).map((f) => f.path).filter((p2) => scope.has(p2) && safeExists(join34(projectDir, p2)));
+    if (here.length === 0) continue;
+    const slots = [...new Set(here.map((p2) => p2.split("/").slice(0, 3).join("/")))].sort();
+    lines2.push(
+      `  ${c.yellow("\u2298")} left  ${slots.join(" \xB7 ")} (asset ${a.id}) \u2014 remove with: agent-harness uninstall --only ${a.id}`
+    );
+  }
+  return lines2;
+}
+function removeAnchor(log, projectDir, io) {
+  const rootMd = log.templates?.rootClaudeMd;
+  if (!rootMd) return { removed: false, lines: [] };
+  const abs = join34(projectDir, rootMd.path);
+  if (!existsSync26(abs)) return { removed: false, lines: [] };
+  const outside = outsideProjectTarget(projectDir, abs);
+  if (outside !== null) return { removed: false, lines: outsideLines([outside], log) };
+  let disk;
   try {
-    return realpathSync3(abs);
+    disk = readFileSync26(abs, "utf8");
+  } catch {
+    return {
+      removed: false,
+      lines: [
+        `  ${c.yellow("\u2298")} ${rootMd.path} left \u2014 could not read it to judge. Remove manually if intended.`
+      ]
+    };
+  }
+  const verdict = judge({
+    op: "remove",
+    kind: "harness",
+    rec: { state: "sha", sha256: rootMd.sha256 },
+    disk,
+    next: null
+  });
+  const edited = verdict.verdict === "backup+remove";
+  if (edited && rootMd.path === "CLAUDE.md") {
+    return {
+      removed: false,
+      lines: [
+        io.write ? `  ${c.yellow("\u2298")} ${rootMd.path} kept \u2014 modified since install. Remove manually if intended.` : `  \u25CB keep ${rootMd.path} (modified since install \u2014 preserved)`
+      ]
+    };
+  }
+  if (!io.write) {
+    return {
+      removed: true,
+      lines: [
+        edited ? `  \u25CB remove ${rootMd.path} (you edited it \u2192 saved beside as ${rootMd.path}.backup-<time>)` : `  \u25CB remove ${rootMd.path}`
+      ]
+    };
+  }
+  const backup = edited ? relative5(projectDir, backupFile(abs)).split(sep5).join("/") : null;
+  io.rm(abs);
+  return {
+    removed: true,
+    lines: [
+      backup === null ? `  ${status.success(`${rootMd.path} removed`)}` : `  ${status.success(`backed up  ${rootMd.path} \u2014 ${verdict.line.replace("<file>.backup-<time>", backup)}`)}`
+    ]
+  };
+}
+var AGENTS_MD2 = "AGENTS.md";
+function readAgentsMdTemplate(harnessRoot) {
+  try {
+    return readFileSync26(join34(harnessRoot, AGENTS_MD_TEMPLATE), "utf8");
   } catch {
     return null;
   }
 }
-function safeIsSymlink(abs) {
+function safeRealpath(abs) {
   try {
-    return lstatSync5(abs).isSymbolicLink();
+    return realpathSync3(abs);
   } catch {
-    return false;
+    return null;
   }
 }
 function neutralizeScaffoldBanner(text) {
@@ -12552,71 +13365,6 @@ function agentsMdRemainder(current, harnessRoot) {
     })
   };
 }
-function removeExternalFiles(log, projectDir, rm, harnessRoot) {
-  const removed = [];
-  const kept = [];
-  const stripped = [];
-  const unjudged = [];
-  const outside = [];
-  for (const { path, sha256 } of log.externalFiles ?? []) {
-    const abs = join34(projectDir, path);
-    if (!existsSync25(abs)) continue;
-    let current;
-    let effective = abs;
-    const foreignSkillSlot = path.startsWith(".agents/skills/");
-    try {
-      const isLink = lstatSync5(abs).isSymbolicLink();
-      if (isLink && foreignSkillSlot) continue;
-      const resolved = realpathSync3(abs);
-      if (!statSync4(resolved).isFile()) continue;
-      if (isOutsideProject(projectDir, resolved)) {
-        outside.push({ path, target: resolved });
-        continue;
-      }
-      if (isLink) effective = resolved;
-      current = readFileSync26(effective, "utf8");
-    } catch {
-      unjudged.push(path);
-      continue;
-    }
-    if (hashContent(current) !== sha256) {
-      kept.push(path);
-      continue;
-    }
-    if (path === AGENTS_MD2) {
-      const verdict = agentsMdRemainder(current, harnessRoot);
-      if (!verdict.ok) {
-        unjudged.push(path);
-        continue;
-      }
-      if (verdict.remainder !== null) {
-        try {
-          writeFileSync9(effective, neutralizeScaffoldBanner(verdict.remainder), "utf8");
-          stripped.push(path);
-        } catch {
-          unjudged.push(path);
-        }
-        continue;
-      }
-    }
-    rm(effective);
-    if (effective !== abs) {
-      try {
-        rm(abs);
-      } catch {
-      }
-    }
-    removed.push(path);
-  }
-  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname6(join34(projectDir, path)));
-  const decisions = join34(projectDir, "docs", "decisions");
-  try {
-    if (existsSync25(decisions) && readdirSync6(decisions).length === 0)
-      rmSync5(decisions, { recursive: true });
-  } catch {
-  }
-  return { removed, kept, stripped, unjudged, outside };
-}
 function removeToolFiles(files, projectDir, rm) {
   const notes = [];
   const removed = [];
@@ -12650,7 +13398,7 @@ function removeToolFiles(files, projectDir, rm) {
       notes.push(`left ${path} \u2014 ${e2 instanceof Error ? e2.message : String(e2)}`);
     }
   }
-  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname6(join34(projectDir, path)));
+  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname7(join34(projectDir, path)));
   return failed > 0 ? { ok: false, message: `${failed} file(s) could not be removed`, notes } : { ok: true, notes };
 }
 function pruneEmptyDirsUpward(projectDir, startDir) {
@@ -12664,7 +13412,7 @@ function pruneEmptyDirsUpward(projectDir, startDir) {
     } catch {
       return;
     }
-    cursor = dirname6(cursor);
+    cursor = dirname7(cursor);
   }
 }
 function stripRootImport(projectDir) {
@@ -12673,121 +13421,31 @@ function stripRootImport(projectDir) {
   if (stripped === null) return false;
   try {
     backupIfLossyUtf8(join34(projectDir, "CLAUDE.md"));
-    writeFileSync9(join34(projectDir, "CLAUDE.md"), stripped, "utf8");
+    writeFileSync10(join34(projectDir, "CLAUDE.md"), stripped, "utf8");
     return true;
   } catch {
     return false;
   }
 }
-function previewExternalLines(installLog, projectDir, harnessRoot, movedDirs = []) {
-  const lines2 = [];
-  let removable = 0;
-  for (const { path, sha256 } of installLog.externalFiles ?? []) {
-    const abs = join34(projectDir, path);
-    const underMoved = underAny(path, movedDirs);
-    const isLink = !underMoved || existsSync25(abs) ? safeIsSymlink(abs) : false;
-    if (underMoved && !isLink) continue;
-    if (!existsSync25(abs)) continue;
-    let effective = abs;
-    const foreignSkillSlot = path.startsWith(".agents/skills/");
-    try {
-      const isLinkPath = lstatSync5(abs).isSymbolicLink();
-      if (isLinkPath && foreignSkillSlot) continue;
-      const resolved = realpathSync3(abs);
-      if (!statSync4(resolved).isFile()) continue;
-      if (isOutsideProject(projectDir, resolved)) {
-        lines2.push(`  \u25CB keep ${path} (link target outside project: ${resolved} \u2014 preserved)`);
-        continue;
-      }
-      if (isLinkPath) effective = resolved;
-    } catch {
-      continue;
-    }
-    const current = readFileSync26(effective, "utf8");
-    if (hashContent(current) !== sha256) {
-      lines2.push(`  \u25CB keep ${path} (modified since install \u2014 preserved)`);
-      continue;
-    }
-    if (path === AGENTS_MD2) {
-      const verdict = agentsMdRemainder(current, harnessRoot);
-      if (!verdict.ok) {
-        lines2.push(`  \u25CB keep ${path} (harness sections could not be separated \u2014 preserved)`);
-        continue;
-      }
-      if (verdict.remainder !== null) {
-        lines2.push(`  \u25CB strip harness sections from ${path} (\uBCF8\uBB38 \uBCF4\uC874)`);
-        continue;
-      }
-    }
-    removable += 1;
-  }
-  if (removable > 0) lines2.unshift(`  \u25CB remove ${removable} CLI output file(s)`);
-  return lines2;
-}
-function externalRemovalLines(external) {
-  const lines2 = [];
-  if (external.removed.length > 0) {
-    lines2.push(`  ${status.success(`CLI outputs removed: ${external.removed.length} file(s)`)}`);
-  }
-  for (const path of external.stripped) {
-    lines2.push(`  ${status.success(`${path} \u2014 harness sections removed (\uBCF8\uBB38 \uBCF4\uC874)`)}`);
-  }
-  for (const path of external.unjudged) {
-    lines2.push(
-      `  ${c.yellow("\u2298")} ${path} kept \u2014 harness sections could not be separated (a file or template could not be read, or the write failed). Remove manually if intended.`
-    );
-  }
-  const outsideGroups = /* @__PURE__ */ new Map();
-  for (const o of external.outside) {
-    const key = `${dirname6(o.path)}\0${dirname6(o.target)}`;
-    outsideGroups.set(key, [...outsideGroups.get(key) ?? [], o]);
-  }
-  for (const group of outsideGroups.values()) {
-    const first = group[0];
-    if (!first) continue;
-    if (group.length === 1) {
-      lines2.push(
-        `  ${c.yellow("\u2298")} ${first.path} kept \u2014 link target is outside the project (${first.target}). Not touched; remove manually if intended.`
-      );
-    } else {
-      lines2.push(
-        `  ${c.yellow("\u2298")} ${dirname6(first.path)}/ kept ${group.length} file(s) \u2014 link target is outside the project (${dirname6(first.target)}). Not touched; remove manually if intended.`
-      );
-    }
-  }
-  for (const path of external.kept) {
-    lines2.push(
-      `  ${c.yellow("\u2298")} ${path} kept \u2014 modified since install. Remove manually if intended.`
-    );
-  }
-  return lines2;
-}
 function hasRootImport(projectDir) {
   const current = readRootClaudeMd(projectDir);
   return current !== null && stripHarnessImport(current) !== null;
 }
 function readRootClaudeMd(projectDir) {
   const path = join34(projectDir, "CLAUDE.md");
-  if (!existsSync25(path)) return null;
+  if (!existsSync26(path)) return null;
   try {
     return readFileSync26(path, "utf8");
   } catch {
     return null;
   }
 }
-function rootClaudeMdModified(log, projectDir) {
-  const rootMd = log.templates.rootClaudeMd;
-  if (!rootMd) return false;
-  const path = join34(projectDir, rootMd.path);
-  if (!existsSync25(path)) return false;
-  return hashContent(readFileSync26(path, "utf8")) !== rootMd.sha256;
-}
 function defaultSpawn2(cmd, args) {
   return spawnSync2(cmd, [...args], { encoding: "utf8", stdio: "pipe", timeout: 12e4 });
 }
 function defaultRm(path) {
-  if (existsSync25(path)) {
-    rmSync5(path, { recursive: true, force: true });
+  if (existsSync26(path)) {
+    rmSync4(path, { recursive: true, force: true });
   }
 }
 function registerUninstallCommand(cli) {
@@ -12795,10 +13453,10 @@ function registerUninstallCommand(cli) {
     default: process.cwd()
   }).option("--dry-run", "[Mode] List reverse steps without executing").option(
     "--keep-templates",
-    "[Mode] Keep `.claude/`, `.codex/`, `.opencode/` templates (remove only external assets). Without a terminal it still needs --yes, --only, --cli or --dry-run"
+    "[Removed in v26.169.0] Rejected \u2014 prints the `--only <ids>` that removes only the external assets"
   ).option(
     "--only <ids>",
-    "[Scope] Remove only these assets (comma-separated ids from `agent-harness list`). Templates untouched"
+    "[Scope] Remove only these assets (comma-separated ids from `agent-harness list`). Harness files untouched"
   ).option(
     "--cli <name>",
     `[Scope] Remove one CLI only (${CLI_BASES.join(" | ")}). Shared files stay until the last user leaves`
@@ -12809,6 +13467,7 @@ function registerUninstallCommand(cli) {
 function shouldRunInteractive(options, isTty) {
   if (!isTty) return false;
   if (options.yes || options.dryRun) return false;
+  if (options.keepTemplates) return false;
   return options.only === void 0 && options.cli === void 0;
 }
 async function dispatchUninstall(options) {
@@ -12924,11 +13583,24 @@ function installedTargetState(projectDir) {
   const log = readInstallLog(projectDir);
   if (!log) return { installed: [], projectScoped: [] };
   const mcp = recordedMcpAssetIds(log);
+  const skills = recordedBundledSkillIds(log);
   return {
-    installed: [...log.assets.map((a) => a.id), ...mcp],
-    projectScoped: [...log.assets.filter((a) => a.scope !== "global").map((a) => a.id), ...mcp]
+    installed: [...log.assets.map((a) => a.id), ...mcp, ...skills],
+    projectScoped: [
+      ...log.assets.filter((a) => a.scope !== "global").map((a) => a.id),
+      ...mcp,
+      ...skills
+    ]
   };
 }
+function recordedBundledSkillIds(log) {
+  if (log === null) return [];
+  return INTERNAL_BUNDLED_SKILL_IDS.filter(
+    (id) => [`.claude/skills/${id}/SKILL.md`, `.agents/skills/${id}/SKILL.md`].some(
+      (path) => recorded(log, path).state === "sha"
+    )
+  );
+}
 function wizardRecommended(tracks) {
   return [
     .../* @__PURE__ */ new Set([
@@ -12966,6 +13638,7 @@ function classifyUpdateIntent(log, confirmed, legacyTracks = []) {
   if (recorded2.some((a) => a.scope !== "global" && !picked.has(a.id) && !out.has(a.id)))
     return "add";
   if (recordedMcpAssetIds(log).some((id) => !picked.has(id) && !out.has(id))) return "add";
+  if (recordedBundledSkillIds(log).some((id) => !picked.has(id) && !out.has(id))) return "add";
   const offered = new Set(listBaselineTargets({ tracks: confirmed.tracks }).map((t) => t.id));
   const recordedBaseline = [...out].filter((id) => offered.has(id));
   if (!sameSet(confirmed.baselineExclude, recordedBaseline)) return "add";
@@ -12983,7 +13656,9 @@ function coveredByRecord(log, legacyTracks) {
     ...(log?.assets ?? []).map((a) => a.id),
     // #709 — 기록된 선택 MCP 서버 · 기록 트랙의 기본 MCP 행은 refresh 가 그대로 둔다(`.mcp.json` 몫 기록 · 트랙 표)
     ...recordedMcpAssetIds(log),
-    ...trackDefaultMcpAssetIds(resolveBundleRoot(), recordTracks)
+    ...trackDefaultMcpAssetIds(resolveBundleRoot(), recordTracks),
+    // #760 — 기록된 번들 스킬은 refresh 가 그대로 갱신한다(`skillFiles` · `externalFiles` 기준선)
+    ...recordedBundledSkillIds(log)
   ]);
   for (const id of recommendedExternalAssets(recordTracks)) {
     const asset = EXTERNAL_ASSETS.find((a) => a.id === id);
@@ -13253,7 +13928,9 @@ async function confirmUpdate(input) {
       ...baselineExclude,
       ...unchecked(log, tracks, assetIds, baselineIds),
       // #709 — 기록된 선택 MCP 서버의 체크를 풀었으면 뺀다(opt-in 이라 추천 대비 빼기에 안 든다)
-      ...recordedMcpAssetIds(log).filter((id) => !assetIds.includes(id))
+      ...recordedMcpAssetIds(log).filter((id) => !assetIds.includes(id)),
+      // #760 — 기록된 번들 스킬(opt-in 포함)의 체크를 풀었으면 뺀다 — 같은 이유
+      ...recordedBundledSkillIds(log).filter((id) => !assetIds.includes(id))
     ])
   ];
   const options = {