@uzysjung/agent-harness 26.176.0 → 26.177.0

package/dist/index.js

@@ -133,6 +133,7 @@ import {
   selectedMcpServers,
   sharedPathOfKeyId,
   shouldInstallAsset,
+  skillFolderOf,
   skillNames,
   stripAgentsMd,
   stripHarnessImport,
@@ -145,7 +146,7 @@ import {
   withoutAppleDouble,
   wrapHarnessBlock,
   writeInstallLog
-} from "./chunk-HB6UJWC6.js";
+} from "./chunk-JIVFWRYB.js";
 
 // node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
@@ -1948,8 +1949,8 @@ function legacyGitignoreSeed(text, render, previous) {
 
 // src/installer.ts
 init_esm_shims();
-import { chmodSync as chmodSync3, existsSync as existsSync20, readdirSync as readdirSync5, readFileSync as readFileSync21, writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename6, join as join29, relative as relative7, resolve, sep as sep8 } from "path";
+import { chmodSync as chmodSync3, existsSync as existsSync20, readdirSync as readdirSync5, readFileSync as readFileSync22, writeFileSync as writeFileSync7 } from "fs";
+import { basename as basename6, join as join30, relative as relative7, resolve, sep as sep8 } from "path";
 
 // src/anchor-seed.ts
 init_esm_shims();
@@ -2770,6 +2771,11 @@ function renderBundledSkill(source) {
 ${portBody(body)}
 `;
 }
+function renderBundledSkillFile(rel, raw) {
+  if (rel === "SKILL.md") return renderBundledSkill(raw);
+  return rel.endsWith(".md") || rel.endsWith(".sh") ? `${portBody(raw)}
+` : raw;
+}
 function portBody(body) {
   return renameSlashes(body).replace(/CLAUDE_PROJECT_DIR/g, "CODEX_PROJECT_DIR").trimEnd();
 }
@@ -2784,7 +2790,7 @@ function writeBundledSkillDirs(params) {
     }
     const targetDir = join13(projectDir, ".agents", "skills", id);
     const targetSkill = join13(targetDir, "SKILL.md");
-    if (!writer.write(targetSkill, renderBundledSkill(readFileSync9(srcSkill, "utf8")))) {
+    if (!writer.write(targetSkill, renderBundledSkillFile("SKILL.md", readFileSync9(srcSkill, "utf8")))) {
       continue;
     }
     written.push(targetSkill);
@@ -2793,8 +2799,7 @@ function writeBundledSkillDirs(params) {
       if (rel.split("/").some((segment) => segment.startsWith("."))) continue;
       const segments = rel.split("/");
       const raw = readFileSync9(join13(srcDir, ...segments), "utf8");
-      const ported = rel.endsWith(".md") || rel.endsWith(".sh") ? `${portBody(raw)}
-` : raw;
+      const ported = renderBundledSkillFile(rel, raw);
       const target = join13(targetDir, ...segments);
       if (!writer.write(target, ported, { createInRefresh: true })) continue;
       if (rel.endsWith(".sh")) chmodSync(target, 493);
@@ -2812,6 +2817,10 @@ trigger: glob
 globs: "${rule.paths.join(", ")}"
 ---
 
+`;
+}
+function renderAntigravityRule(rule) {
+  return `${antigravityFrontmatter(rule)}${rule.body}
 `;
 }
 function runAntigravityTransform(params) {
@@ -2838,8 +2847,7 @@ function runAntigravityTransform(params) {
   const harnessRuleFiles = [];
   for (const rule of portRules(harnessRoot, rules)) {
     const target = join14(projectDir, ".agents", "rules", `${rule.name}.md`);
-    const content = `${antigravityFrontmatter(rule)}${rule.body}
-`;
+    const content = renderAntigravityRule(rule);
     if (!writer.write(target, content, { createInRefresh: antigravityInstalled })) {
       continue;
     }
@@ -3090,6 +3098,9 @@ function quoteIfNeeded(name) {
 // src/codex/transform.ts
 var HOOK_NAMES = ["session-start"];
 var ENV_VAR_RENAME = /CLAUDE_PROJECT_DIR/g;
+function renderCodexHook(source) {
+  return source.replace(ENV_VAR_RENAME, "CODEX_PROJECT_DIR");
+}
 function runCodexTransform(params) {
   const {
     harnessRoot,
@@ -3131,7 +3142,7 @@ function runCodexTransform(params) {
     if (!existsSync13(src)) {
       continue;
     }
-    const ported = readFileSync12(src, "utf8").replace(ENV_VAR_RENAME, "CODEX_PROJECT_DIR");
+    const ported = renderCodexHook(readFileSync12(src, "utf8"));
     const target = join17(hookDir, `${hook}.sh`);
     if (!writer.write(target, ported)) continue;
     chmodSync2(target, 493);
@@ -3550,12 +3561,58 @@ function runCliTransforms(params) {
 
 // src/displaced.ts
 init_esm_shims();
-import { lstatSync as lstatSync3, mkdirSync as mkdirSync5, readFileSync as readFileSync15, renameSync } from "fs";
-import { basename as basename3, dirname as dirname5, join as join21, posix as posix2 } from "path";
+import { lstatSync as lstatSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync16, renameSync } from "fs";
+import { basename as basename3, dirname as dirname5, join as join22, posix as posix3 } from "path";
+
+// src/harness-bytes.ts
+init_esm_shims();
+import { lstatSync as lstatSync3, readFileSync as readFileSync15 } from "fs";
+import { join as join20, posix } from "path";
+var CLAUDE_DIR3 = ".claude/";
+function harnessBytesAt(log, path, isTarget = recordedTrackTargets(log)) {
+  const norm = posix.normalize(path);
+  const root = resolveBundleRoot();
+  const text = (rel) => readFileSync15(join20(root, "templates", rel), "utf8");
+  try {
+    const rule = /^\.agents\/rules\/([^/]+)\.md$/.exec(norm)?.[1];
+    if (rule !== void 0) {
+      const [ported] = isTarget(`${CLAUDE_DIR3}rules/${rule}.md`) ? portRules(root, [rule]) : [];
+      return ported === void 0 ? null : Buffer.from(renderAntigravityRule(ported));
+    }
+    const hook = /^\.codex\/hooks\/([^/]+)$/.exec(norm)?.[1];
+    if (hook !== void 0) {
+      return isTarget(`${CLAUDE_DIR3}hooks/${hook}`) ? Buffer.from(renderCodexHook(text(`hooks/${hook}`))) : null;
+    }
+    const skill = /^\.agents\/skills\/([^/]+\/.+)$/.exec(norm)?.[1];
+    if (skill !== void 0) {
+      return isTarget(`${CLAUDE_DIR3}skills/${skill}`) ? Buffer.from(
+        renderBundledSkillFile(skill.slice(skill.indexOf("/") + 1), text(`skills/${skill}`))
+      ) : null;
+    }
+    if (norm.startsWith(CLAUDE_DIR3) && isTarget(norm)) {
+      return readFileSync15(join20(root, "templates", norm.slice(CLAUDE_DIR3.length)));
+    }
+  } catch {
+  }
+  return null;
+}
+function holdsHarnessBytes(log, projectDir, path, isTarget = recordedTrackTargets(log)) {
+  const slot = join20(projectDir, path);
+  try {
+    if (!lstatSync3(slot).isFile()) return false;
+    const disk = readFileSync15(slot);
+    const bundle = harnessBytesAt(log, path, isTarget);
+    if (bundle !== null && disk.equals(bundle)) return true;
+    const rec = recorded(log, path, { isTarget });
+    return rec.state === "sha" && rec.sha256 === hashContent(disk.toString("utf8"));
+  } catch {
+    return false;
+  }
+}
 
 // src/harness-slot.ts
 init_esm_shims();
-import { isAbsolute, join as join20, posix, relative as relative4, sep as sep5 } from "path";
+import { isAbsolute, join as join21, posix as posix2, relative as relative4, sep as sep5 } from "path";
 var ownedOf = (...kinds) => [
   ...new Set(
     Object.values(CLI_OWNERSHIP).flat().filter((o) => kinds.includes(o.kind)).map((o) => o.path)
@@ -3577,9 +3634,9 @@ function within(rel, slots) {
   return slots.places.some((p2) => p2.endsWith("/") ? rel.startsWith(p2) : rel === p2);
 }
 function realRel(projectDir, norm, follow) {
-  const target = follow ? resolveWriteTarget(join20(projectDir, norm)) : (() => {
-    const dir = resolveWriteTarget(join20(projectDir, posix.dirname(norm)));
-    return dir === null ? null : join20(dir, posix.basename(norm));
+  const target = follow ? resolveWriteTarget(join21(projectDir, norm)) : (() => {
+    const dir = resolveWriteTarget(join21(projectDir, posix2.dirname(norm)));
+    return dir === null ? null : join21(dir, posix2.basename(norm));
   })();
   if (target === null) return null;
   const rel = relative4(resolveWriteTarget(projectDir) ?? projectDir, target);
@@ -3587,29 +3644,65 @@ function realRel(projectDir, norm, follow) {
   const slash = rel.split(sep5).join("/");
   return slash === ".." || slash.startsWith("../") ? null : slash;
 }
+function inSlotByName(path, slots = HARNESS_FILES) {
+  return within(posix2.normalize(path), slots);
+}
 function inHarnessSlot(projectDir, path, slots = HARNESS_FILES, opts = {}) {
-  const norm = posix.normalize(path);
+  const norm = posix2.normalize(path);
   if (!within(norm, slots)) return false;
   const real = realRel(projectDir, norm, opts.follow === true);
   return real !== null && within(real, slots);
 }
 
+// src/screen-text.ts
+init_esm_shims();
+function screenText(text) {
+  return text.replace(/[^\p{L}\p{N}\p{M}._\-/~+@:,=%]/gu, (ch, at2) => {
+    if (ch === " " && at2 > 0 && at2 < text.length - 1 && text[at2 - 1] !== " " && text[at2 + 1] !== " ") {
+      return ch;
+    }
+    return asCode(ch);
+  });
+}
+function oneLine(text) {
+  return text.replace(/[\p{Cc}\u2028\u2029]/gu, asCode);
+}
+function asCode(ch) {
+  const cp = ch.codePointAt(0);
+  return cp > 65535 ? `\\u{${cp.toString(16)}}` : `\\u${cp.toString(16).padStart(4, "0")}`;
+}
+
 // src/displaced.ts
 function exists(abs) {
   try {
-    lstatSync3(abs);
+    lstatSync4(abs);
     return true;
   } catch {
     return false;
   }
 }
 function outsideBackup(projectDir, backup) {
-  const abs = join21(projectDir, backup);
+  const abs = join22(projectDir, backup);
   const hit = outsideProjectTarget(projectDir, dirname5(abs));
-  return hit === null ? null : join21(hit.target, basename3(abs));
+  return hit === null ? null : join22(hit.target, basename3(abs));
 }
 function isBackupOf(path, backup) {
-  return backupOriginal(posix2.normalize(backup)) === posix2.normalize(path);
+  return backupOriginal(posix3.normalize(backup)) === posix3.normalize(path);
+}
+function replacesOnlyHarnessCopy(log, projectDir, path, isTarget) {
+  if (harnessBytesAt(log, path, isTarget) === null) return false;
+  return !exists(join22(projectDir, path)) || holdsHarnessBytes(log, projectDir, path, isTarget);
+}
+function handBackOf(log, projectDir, f, isTarget) {
+  const backup = f.notes[0];
+  if (backup === void 0 || !inSlotByName(f.path)) return null;
+  if (outsideBackup(projectDir, backup) !== null || !isBackupOf(f.path, backup)) return null;
+  if (!exists(join22(projectDir, backup)) || isLegacyDisplaced(log, projectDir, f)) return null;
+  return {
+    from: posix3.normalize(backup),
+    to: posix3.normalize(f.path),
+    safe: replacesOnlyHarnessCopy(log, projectDir, f.path, isTarget)
+  };
 }
 function isLegacyDisplaced(log, projectDir, f) {
   if (f.change !== "displaced") return false;
@@ -3617,7 +3710,7 @@ function isLegacyDisplaced(log, projectDir, f) {
   if (outsideBackup(projectDir, at2) !== null) return false;
   let original;
   try {
-    original = readFileSync15(join21(projectDir, at2), "utf8");
+    original = readFileSync16(join22(projectDir, at2), "utf8");
   } catch {
     return false;
   }
@@ -3625,17 +3718,21 @@ function isLegacyDisplaced(log, projectDir, f) {
 }
 function restoreDisplaced(log, projectDir, opts) {
   const out = [];
+  let bundleTargets;
   for (const f of log.rootFiles ?? []) {
     if (f.change !== "displaced" || !opts.has(f.path)) continue;
-    const slot = join21(projectDir, f.path);
+    const slot = join22(projectDir, f.path);
     if (outsideProjectTarget(projectDir, slot) !== null) continue;
     if (!inHarnessSlot(projectDir, f.path)) {
+      bundleTargets ??= recordedTrackTargets(log);
+      const handBack = handBackOf(log, projectDir, f, bundleTargets);
       out.push({
         path: f.path,
         backup: f.notes[0] ?? null,
         verdict: "advise",
         line: "not put back \u2014 the install record says this tool moved a file of yours aside here, but this is (or leads) outside the places this tool installs to; left it as is",
-        forget: true
+        forget: true,
+        ...handBack === null ? {} : { handBack }
       });
       continue;
     }
@@ -3646,7 +3743,7 @@ function restoreDisplaced(log, projectDir, opts) {
         path: f.path,
         backup,
         verdict: "advise",
-        line: `not put back \u2014 the install record points its backup outside this project (${away}); left that file where it is`,
+        line: `not put back \u2014 the install record points its backup outside this project (${screenText(away)}); left that file where it is`,
         forget: true
       });
       continue;
@@ -3656,19 +3753,19 @@ function restoreDisplaced(log, projectDir, opts) {
         path: f.path,
         backup,
         verdict: "advise",
-        line: `not put back \u2014 the install record names ${JSON.stringify(backup)} as the backup, which is not a backup this tool made for this file; left that file where it is`,
+        line: `not put back \u2014 the install record names "${screenText(backup)}" as the backup, which is not a backup this tool made for this file; left that file where it is`,
         forget: true
       });
       continue;
     }
     const d2 = judgeDisplaced({
       backup,
-      backupExists: backup !== null && exists(join21(projectDir, backup)),
+      backupExists: backup !== null && exists(join22(projectDir, backup)),
       slotEmpty: !exists(slot) || !opts.write && opts.willBeGone?.has(f.path) === true
     });
     if (opts.write && d2.verdict === "restore" && backup !== null) {
       mkdirSync5(dirname5(slot), { recursive: true });
-      renameSync(join21(projectDir, backup), slot);
+      renameSync(join22(projectDir, backup), slot);
     }
     out.push({
       path: f.path,
@@ -3688,7 +3785,7 @@ function withoutRestored(rootFiles, outcomes) {
 // src/excluded-still-there.ts
 init_esm_shims();
 import { existsSync as existsSync16 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
   const out = [];
   const add = (id, catalog) => {
@@ -3701,7 +3798,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) => existsSync16(join22(projectDir, d2, id))
+        (d2) => existsSync16(join23(projectDir, d2, id))
       );
       if (there) add(id, false);
     } else {
@@ -3714,10 +3811,13 @@ 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) => existsSync16(join22(projectDir, f.path)));
+  if (asset.files?.some((f) => existsSync16(join23(projectDir, f.path)))) return true;
+  if (asset.files !== void 0 && asset.filesPartial !== true) return false;
   const dir = asset.detail.skill ?? asset.id;
-  return [".claude/skills", ".agents/skills"].some((d2) => existsSync16(join22(projectDir, d2, dir)));
+  const listed = new Set((asset.files ?? []).map((f) => f.path.split("/").slice(0, 3).join("/")));
+  return [".claude/skills", ".agents/skills"].some(
+    (d2) => !listed.has(`${d2}/${dir}`) && existsSync16(join23(projectDir, d2, dir))
+  );
 }
 
 // src/external-installer.ts
@@ -3727,10 +3827,10 @@ import {
   accessSync,
   existsSync as existsSync17,
   constants as fsConstants,
-  lstatSync as lstatSync4,
+  lstatSync as lstatSync5,
   mkdirSync as mkdirSync6,
   readdirSync as readdirSync3,
-  readFileSync as readFileSync16,
+  readFileSync as readFileSync17,
   readlinkSync,
   realpathSync as realpathSync3,
   renameSync as renameSync2,
@@ -3738,7 +3838,10 @@ import {
   rmSync as rmSync3
 } from "fs";
 import { homedir as homedir2 } from "os";
-import { basename as basename4, dirname as dirname6, join as join23, relative as relative5, sep as sep6 } from "path";
+import { basename as basename4, dirname as dirname6, isAbsolute as isAbsolute2, join as join24, relative as relative5, sep as sep6 } from "path";
+function outsideSlotNote(o) {
+  return o.slot !== void 0 ? `${o.slot}/ left as is (links outside the skill folders: ${o.target})` : `${o.root}/ left as is (links outside the project: ${o.target})`;
+}
 var SKILL_ROOTS = [".claude/skills", ".agents/skills"];
 function skillRootOf(cli) {
   return cli === "claude" ? ".claude/skills" : ".agents/skills";
@@ -3746,11 +3849,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(readFileSync16(join23(projectDir, path), "utf8")));
+        out.set(path, hashContent(readFileSync17(join24(projectDir, path), "utf8")));
       } catch {
       }
     }
@@ -3768,8 +3871,8 @@ function homeSkillDirs(roots) {
     }
     for (const name of names) {
       try {
-        const st2 = lstatSync4(join23(root, name), { bigint: true });
-        if (st2.isDirectory()) out.set(join23(root, name), `${st2.ino}:${st2.ctimeNs}`);
+        const st2 = lstatSync5(join24(root, name), { bigint: true });
+        if (st2.isDirectory()) out.set(join24(root, name), `${st2.ino}:${st2.ctimeNs}`);
       } catch {
       }
     }
@@ -3782,9 +3885,9 @@ function writtenSkillNames(before, after) {
 }
 function lockedSkillNames(source) {
   const xdg = process.env.XDG_STATE_HOME;
-  const path = xdg ? join23(xdg, "skills", ".skill-lock.json") : join23(homedir2(), ".agents", ".skill-lock.json");
+  const path = xdg ? join24(xdg, "skills", ".skill-lock.json") : join24(homedir2(), ".agents", ".skill-lock.json");
   try {
-    const lock = JSON.parse(readFileSync16(path, "utf8"));
+    const lock = JSON.parse(readFileSync17(path, "utf8"));
     if (typeof lock.version !== "number" || lock.version < 3) return null;
     if (typeof lock.skills !== "object" || lock.skills === null) return null;
     const out = /* @__PURE__ */ new Set();
@@ -3884,18 +3987,30 @@ function installOne(asset, ctx) {
         const written = writtenSkillNames(before2, homeSkillDirs(roots));
         return { ...result2, skills: written.filter((n) => locked.has(n)) };
       }
-      const outside = SKILL_ROOTS.flatMap((root) => {
-        const hit = outsideProjectTarget(cwd, join23(cwd, root));
-        return hit === null ? [] : [{ root, target: hit.target }];
-      });
+      const outside = SKILL_ROOTS.flatMap(
+        (root) => {
+          const hit = outsideProjectTarget(cwd, join24(cwd, root));
+          if (hit !== null) return [{ root, target: hit.target }];
+          const slot = method.skill === void 0 ? root : `${root}/${method.skill}`;
+          if (inSkillFolders(cwd, slot)) return [];
+          return [{ root, target: resolveWriteTarget(join24(cwd, slot)) ?? slot, slot }];
+        }
+      );
       const outRoots = new Set(outside.map((o) => o.root));
       const cli = ctx.cli.filter((c3) => !outRoots.has(skillRootOf(c3)));
       if (outside.length > 0 && cli.length === 0) {
-        const where = outside.map((o) => `${o.root} \u2192 ${o.target}`).join(", ");
+        const away = outside.filter((o) => o.slot === void 0);
+        const where = away.map((o) => `${o.root} \u2192 ${o.target}`).join(", ");
+        const reasons = [
+          ...away.length > 0 ? [`the skill folder links outside the project (${where})`] : [],
+          ...outside.flatMap(
+            (o) => o.slot === void 0 ? [] : [`${o.slot} links outside the skill folders (${o.target})`]
+          )
+        ];
         return {
           asset,
           ok: false,
-          message: `not installed \u2014 the skill folder links outside the project (${where}); left as is`,
+          message: `not installed \u2014 ${reasons.join("; ")}; left as is`,
           outside
         };
       }
@@ -3974,6 +4089,7 @@ function refreshExternalSkills(projectDir, deps = {}) {
   const slotCtx = { log, scope: "project" };
   const settle = holdSkillSlots(projectDir, {
     recorded: log.assets.filter((a) => targetIds.has(a.id)),
+    assets: targets,
     slots: skillSlotsFor(inProject, clis, slotCtx),
     unlisted: unlistedSkillSlots(inProject, clis, slotCtx),
     log,
@@ -4028,6 +4144,9 @@ function refreshExternalSkills(projectDir, deps = {}) {
   );
   const late = reclaimNewlyNamed(projectDir, log, next);
   const reclaimedAll = [...reclaimed, ...late];
+  const leftAsIs = report.attempted.flatMap(
+    (r) => r.ok && r.outside !== void 0 && r.outside.length > 0 ? [{ id: r.asset.id, outside: r.outside }] : []
+  );
   return {
     attempted: report.attempted.length,
     refreshed: report.succeeded,
@@ -4035,6 +4154,7 @@ function refreshExternalSkills(projectDir, deps = {}) {
     notInCatalog,
     unknown: false,
     ...reclaimedAll.length > 0 ? { reclaimed: reclaimedAll } : {},
+    ...leftAsIs.length > 0 ? { leftAsIs } : {},
     judged: [...reclaimedAll.flatMap((r) => r.judged), ...judged]
   };
 }
@@ -4042,15 +4162,16 @@ function holdSkillSlots(projectDir, hold) {
   const now = /* @__PURE__ */ new Date();
   const asides = /* @__PURE__ */ new Map();
   const moved = [];
+  const kept = slotFilesToKeep(projectDir, hold);
   try {
-    for (const f of slotFilesToKeep(projectDir, hold)) {
+    for (const f of kept.files) {
       const root = dirname6(f.slot);
       let dir = asides.get(root);
       if (dir === void 0) {
-        dir = claimBackupDir(join23(projectDir, root), now);
+        dir = claimBackupDir(join24(projectDir, root), now);
         asides.set(root, dir);
       }
-      const aside = join23(dir, f.rel.slice(root.length + 1));
+      const aside = join24(dir, f.rel.slice(root.length + 1));
       mkdirSync6(dirname6(aside), { recursive: true });
       renameSync2(f.abs, aside);
       moved.push({ ...f, aside });
@@ -4073,19 +4194,32 @@ function holdSkillSlots(projectDir, hold) {
       displaced: [],
       judged: []
     };
+    const ok = (report?.attempted ?? []).filter((r) => r.ok);
     const rewritten = new Set(
-      (report?.attempted ?? []).flatMap(
-        (r) => r.ok ? (r.files?.created ?? []).map((x) => skillFolderOf(x.path)) : []
-      )
+      [
+        ...ok.flatMap((r) => (r.files?.created ?? []).map((x) => skillFolderOf(x.path))),
+        ...skillSlotsFor(
+          ok.map((r) => r.asset),
+          hold.clis,
+          { log: hold.log, scope: hold.scope }
+        )
+      ].flatMap((p2) => realOrNull(join24(projectDir, p2)) ?? [])
     );
     const back = /* @__PURE__ */ new Set();
     const failed = [];
     for (const f of moved) {
       const restore = failedSlots === null || failedSlots.some((s) => f.rel === s || f.rel.startsWith(`${s}/`));
       try {
-        const r = settleAside(projectDir, f, restore, rewritten.has(skillFolderOf(f.rel)));
+        const literal = realFileOrNull(f.abs) === f.real;
+        const at2 = literal ? f : { ...f, abs: inProjectSpelling(projectDir, f.real) };
+        const r = settleAside(
+          projectDir,
+          at2,
+          restore,
+          f.folder !== null && rewritten.has(f.folder) && inCanonicalSkillRoot(projectDir, f.real)
+        );
         if (r === "back") {
-          back.add(f.rel);
+          if (literal) back.add(f.rel);
           continue;
         }
         out.backups.push(r.backup);
@@ -4111,9 +4245,30 @@ function holdSkillSlots(projectDir, hold) {
         `could not put back ${failed.length} file(s) moved aside before the skill tool ran \u2014 they stay in ${at2}: ${failed.join(", ")}`
       );
     }
-    return { ...out, report: report === null ? null : withoutCreated(report, back) };
+    const settled = report === null ? null : settledReport(report, back, coveredBy(report, kept, hold));
+    return { ...out, report: settled };
   };
 }
+function coveredBy(report, kept, hold) {
+  const unlisted = new Set(hold.unlisted ?? []);
+  const out = /* @__PURE__ */ new Map();
+  if (unlisted.size === 0) return out;
+  for (const r of report.attempted) {
+    if (!r.ok || r.files === void 0) continue;
+    const own = new Set(
+      skillSlotsFor([r.asset], hold.clis, { log: hold.log, scope: hold.scope }).filter(
+        (s) => unlisted.has(s)
+      )
+    );
+    const folders = /* @__PURE__ */ new Set();
+    for (const f of r.files.created) {
+      const folder = skillFolderOf(f.path);
+      if (own.has(kept.ownerOf(f.path)) && !kept.left.has(folder)) folders.add(folder);
+    }
+    if (folders.size > 0) out.set(r, folders);
+  }
+  return out;
+}
 function skillSlotsFor(assets, clis, ctx) {
   if (resolveScope(ctx.scope) === "global") return [];
   const roots = clis.length === 0 ? [...SKILL_ROOTS] : [...new Set(clis.map(skillRootOf))];
@@ -4126,11 +4281,15 @@ function skillSlotsFor(assets, clis, ctx) {
   return [...out];
 }
 function unlistedSkillSlots(assets, clis, ctx) {
-  const unlisted = assets.filter((a) => {
+  const out = assets.flatMap((a) => {
     const prior = ctx.log?.assets.find((r) => r.id === a.id);
-    return prior !== void 0 && prior.files === void 0;
+    if (prior === void 0) return [];
+    if (prior.files === void 0) return skillSlotsFor([a], clis, ctx);
+    if (prior.filesPartial !== true) return [];
+    const listed = new Set(prior.files.map((f) => skillFolderOf(f.path)));
+    return skillSlotsFor([a], clis, ctx).filter((s) => !listed.has(s));
   });
-  return skillSlotsFor(unlisted, clis, ctx);
+  return [...new Set(out)];
 }
 function reclaimGlobalSkillCopies(projectDir, log, opts) {
   const clis = installedClis(log);
@@ -4150,13 +4309,13 @@ function reclaimGlobalSkillCopies(projectDir, log, opts) {
     for (const name of names) {
       for (const root of roots) {
         const slot = `${root}/${name}`;
-        const real = realOrNull(join23(projectDir, slot));
+        const real = realOrNull(join24(projectDir, slot));
         if (real !== null) {
           if (seen.has(real)) continue;
           seen.add(real);
         }
         const ctx = { log, others, write: opts.write, rm, id: a.id };
-        const r = reclaimCopy(projectDir, slot, join23(globalSkillRoot(root), name), ctx);
+        const r = reclaimCopy(projectDir, slot, join24(globalSkillRoot(root), name), ctx);
         if (r !== null) out.push(r);
       }
     }
@@ -4165,17 +4324,17 @@ function reclaimGlobalSkillCopies(projectDir, log, opts) {
 }
 function globalSkillRoot(root) {
   if (root === ".claude/skills") {
-    return join23(process.env.CLAUDE_CONFIG_DIR?.trim() || join23(homedir2(), ".claude"), "skills");
+    return join24(process.env.CLAUDE_CONFIG_DIR?.trim() || join24(homedir2(), ".claude"), "skills");
   }
-  return join23(homedir2(), ".agents/skills");
+  return join24(homedir2(), ".agents/skills");
 }
 function isSkillName(name) {
   return typeof name === "string" && name !== "" && name !== "." && name !== ".." && !/[\\/]/.test(name);
 }
 function reclaimCopy(projectDir, slot, home, ctx) {
-  const abs = join23(projectDir, slot);
+  const abs = join24(projectDir, slot);
   try {
-    if (lstatSync4(abs, { throwIfNoEntry: false })?.isDirectory() !== true) return null;
+    if (lstatSync5(abs, { throwIfNoEntry: false })?.isDirectory() !== true) return null;
     if (outsideProjectTarget(projectDir, abs) !== null) return null;
     if (existsSync17(home) && realpathSync3(abs) === realpathSync3(home)) return null;
   } catch {
@@ -4206,15 +4365,15 @@ function reclaimCopy(projectDir, slot, home, ctx) {
       res.left.push({ path, why: "a link \u2014 not part of the copy the tool put here" });
       continue;
     }
-    const file = join23(abs, rel);
+    const file = join24(abs, rel);
     try {
-      const mine = readFileSync16(file);
-      const same = homeExists && readOrNull(join23(home, rel))?.equals(mine) === true;
+      const mine = readFileSync17(file);
+      const same = homeExists && readOrNull(join24(home, rel))?.equals(mine) === true;
       const backupAbs = !same && ctx.write ? backupFile(file, now) : void 0;
       if (ctx.write) ctx.rm(file);
       res.removed.push(path);
       if (same) continue;
-      const line = homeExists ? `not the same as the global copy (${join23(home, rel)}) \u2014 saved as <file>.backup-<time>, removed from live` : `no global copy at ${home} to compare \u2014 saved as <file>.backup-<time>, removed from live`;
+      const line = homeExists ? `not the same as the global copy (${join24(home, rel)}) \u2014 saved as <file>.backup-<time>, removed from live` : `no global copy at ${home} to compare \u2014 saved as <file>.backup-<time>, removed from live`;
       const judged = {
         path,
         verdict: "backup+remove",
@@ -4233,6 +4392,14 @@ function reclaimCopy(projectDir, slot, home, ctx) {
   if (ctx.write && res.removed.length > 0) pruneEmptyDirs(abs);
   return res.removed.length > 0 || res.left.length > 0 ? res : null;
 }
+function inCanonicalSkillRoot(projectDir, real) {
+  const rel = relative5(realOrNull(projectDir) ?? projectDir, real).split(sep6).join("/");
+  return SKILL_ROOTS.some((r) => rel.startsWith(`${r}/`));
+}
+function inProjectSpelling(projectDir, real) {
+  const at2 = relative5(realOrNull(projectDir) ?? projectDir, real);
+  return at2 === "" || at2 === ".." || at2.startsWith(`..${sep6}`) || isAbsolute2(at2) ? real : join24(projectDir, at2);
+}
 function realOrNull(abs) {
   try {
     return realpathSync3(abs);
@@ -4242,11 +4409,11 @@ function realOrNull(abs) {
 }
 function realFileOrNull(abs) {
   const dir = realOrNull(dirname6(abs));
-  return dir === null ? null : join23(dir, basename4(abs));
+  return dir === null ? null : join24(dir, basename4(abs));
 }
 function readOrNull(abs) {
   try {
-    return readFileSync16(abs);
+    return readFileSync17(abs);
   } catch {
     return null;
   }
@@ -4259,7 +4426,7 @@ function slotFilesToKeep(projectDir, hold) {
   const sha = new Map(mine.map((f) => [f.path, f.sha256]));
   const realSha = new Map(
     mine.flatMap((f) => {
-      const real = realFileOrNull(join23(projectDir, f.path));
+      const real = realFileOrNull(join24(projectDir, f.path));
       return real === null ? [] : [[real, f.sha256]];
     })
   );
@@ -4268,42 +4435,61 @@ function slotFilesToKeep(projectDir, hold) {
     (hold.log?.assets ?? []).filter((a) => !targetIds.has(a.id)).flatMap((a) => (a.files ?? []).map((f) => f.path))
   );
   const slots = /* @__PURE__ */ new Set([
-    ...mine.map((f) => f.path.split("/")).filter((parts) => parts.length > 3).map((parts) => parts.slice(0, 3).join("/")),
+    ...hold.recorded.flatMap(
+      (a) => recordedSlots(
+        projectDir,
+        a,
+        hold.assets.find((c3) => c3.id === a.id)
+      )
+    ),
     ...hold.slots
   ]);
   const unlisted = new Set(hold.unlisted ?? []);
-  const unlistedAt = (path) => {
+  const ownerOf = (path) => {
     let owner = "";
     for (const s of slots) if (path.startsWith(`${s}/`) && s.length > owner.length) owner = s;
-    return unlisted.has(owner);
+    return owner;
   };
+  const unlistedAt = (path) => unlisted.has(ownerOf(path));
   const out = /* @__PURE__ */ new Map();
+  const left = /* @__PURE__ */ new Set();
   const realProject = realpathSync3(projectDir);
   for (const slot of slots) {
-    if (outsideProjectTarget(projectDir, join23(projectDir, slot)) !== null) continue;
-    for (const { rel, link } of listEntriesRecursive(join23(projectDir, slot))) {
+    if (outsideProjectTarget(projectDir, join24(projectDir, slot)) !== null) continue;
+    if (!inSkillFolders(projectDir, slot)) continue;
+    for (const { rel, link } of listEntriesRecursive(join24(projectDir, slot))) {
       const path = `${slot}/${rel}`;
-      if (link && SKILL_ROOTS.includes(dirname6(path))) continue;
-      const abs = join23(projectDir, path);
-      const real = join23(realpathSync3(dirname6(abs)), basename4(abs));
+      if (link && SKILL_ROOTS.includes(dirname6(path))) {
+        left.add(skillFolderOf(path));
+        continue;
+      }
+      const abs = join24(projectDir, path);
+      const real = join24(realpathSync3(dirname6(abs)), basename4(abs));
       const prev = out.get(real);
-      if (prev !== void 0 && (prev.rel === path || real !== join23(realProject, path))) continue;
+      if (prev !== void 0 && (prev.rel === path || real !== join24(realProject, path))) continue;
       const recordedSha = sha.get(path) ?? realSha.get(real);
-      if (recordedSha === void 0 && (others.has(path) || recorded(hold.log, path).state !== "none"))
+      if (recordedSha === void 0 && (others.has(path) || recorded(hold.log, path).state !== "none")) {
+        left.add(skillFolderOf(path));
         continue;
+      }
       try {
         if (!link) {
-          if (recordedSha !== void 0 && hashContent(readFileSync16(abs, "utf8")) === recordedSha)
+          if (recordedSha !== void 0 && hashContent(readFileSync17(abs, "utf8")) === recordedSha) {
+            left.add(skillFolderOf(path));
             continue;
+          }
           accessSync(abs, fsConstants.R_OK);
         }
       } catch {
+        left.add(skillFolderOf(path));
         continue;
       }
       const listed = recordedSha !== void 0;
       out.set(real, {
         abs,
+        real,
         rel: path,
+        folder: realOrNull(join24(projectDir, skillFolderOf(path))),
         slot,
         recorded: listed,
         unlisted: !listed && unlistedAt(path) && backupOriginal(path) === null,
@@ -4311,20 +4497,51 @@ function slotFilesToKeep(projectDir, hold) {
       });
     }
   }
-  return [...out.values()];
+  return { files: [...out.values()], left, ownerOf };
+}
+function recordedSlots(projectDir, asset, catalog) {
+  if (catalog?.method.kind !== "skill") return [];
+  const named = catalog.method.skill;
+  if (asset.detail.skill !== named || named !== void 0 && !isSkillName(named)) return [];
+  const out = /* @__PURE__ */ new Set();
+  for (const f of asset.files ?? []) {
+    const parts = f.path.split("/");
+    if (parts.length <= 3) continue;
+    const root = `${parts[0]}/${parts[1]}`;
+    const name = parts[2];
+    if (!SKILL_ROOTS.includes(root) || !isSkillName(name)) continue;
+    if (named !== void 0 && name !== named) continue;
+    const slot = `${root}/${name}`;
+    if (!inSkillFolders(projectDir, slot)) continue;
+    out.add(slot);
+  }
+  return [...out];
+}
+function inSkillFolders(projectDir, slot) {
+  if (resolveWriteTarget(join24(projectDir, slot)) === null) return true;
+  const name = slot.split("/").slice(2).join("/");
+  const base = resolveWriteTarget(projectDir) ?? projectDir;
+  const roots = SKILL_ROOTS.flatMap((r) => {
+    const real = resolveWriteTarget(join24(projectDir, r));
+    if (real === null) return [r];
+    const rel = relative5(base, real).split(sep6).join("/");
+    return rel === "" || rel === ".." || rel.startsWith("../") || isAbsolute2(rel) ? [r] : [r, rel];
+  });
+  const places = [...new Set(roots.map((r) => name === "" ? `${r}/` : `${r}/${name}/`))];
+  return inHarnessSlot(projectDir, `${slot}/_`, { places });
 }
 function settleAside(projectDir, f, restore, folderRewritten) {
   let now = null;
   let vacant = false;
   try {
-    if (f.link) lstatSync4(f.abs);
-    else now = readFileSync16(f.abs);
+    if (f.link) lstatSync5(f.abs);
+    else now = readFileSync17(f.abs);
   } catch (e2) {
     const code = e2.code;
     if (code !== "ENOENT" && code !== "ENOTDIR") throw e2;
     vacant = true;
   }
-  const keep = vacant ? f.unlisted ? !folderRewritten : f.link || !f.recorded : f.link ? lstatSync4(f.abs).isSymbolicLink() && readlinkSync(f.abs) === readlinkSync(f.aside) : now?.equals(readFileSync16(f.aside)) === true;
+  const keep = vacant ? !folderRewritten || f.link || !f.recorded && !f.unlisted : f.link ? lstatSync5(f.abs).isSymbolicLink() && readlinkSync(f.abs) === readlinkSync(f.aside) : now?.equals(readFileSync17(f.aside)) === true;
   if (restore || keep) {
     mkdirSync6(dirname6(f.abs), { recursive: true });
     renameSync2(f.aside, f.abs);
@@ -4339,25 +4556,27 @@ function settleAside(projectDir, f, restore, folderRewritten) {
     displaced: { path: f.rel, change: "displaced", notes: [toProjectRel(projectDir, backup)] }
   };
 }
-function skillFolderOf(path) {
-  return path.split("/").slice(0, 3).join("/");
-}
-function withoutCreated(report, paths) {
-  if (paths.size === 0) return report;
+function settledReport(report, paths, covered) {
+  if (paths.size === 0 && covered.size === 0) return report;
   return {
     ...report,
-    attempted: report.attempted.map(
-      (r) => r.files === void 0 ? r : {
+    attempted: report.attempted.map((r) => {
+      if (r.files === void 0) return r;
+      const folders = covered.get(r);
+      const created = r.files.created.filter(
+        (x) => !paths.has(x.path) || folders?.has(skillFolderOf(x.path)) === true
+      );
+      return {
         ...r,
-        files: { ...r.files, created: r.files.created.filter((x) => !paths.has(x.path)) }
-      }
-    )
+        files: { ...r.files, created, ...folders ? { covered: [...folders].sort() } : {} }
+      };
+    })
   };
 }
 function pruneEmptyDirs(dir) {
   try {
     for (const e2 of readdirSync3(dir, { withFileTypes: true }))
-      if (e2.isDirectory()) pruneEmptyDirs(join23(dir, e2.name));
+      if (e2.isDirectory()) pruneEmptyDirs(join24(dir, e2.name));
     rmdirSync(dir);
   } catch {
   }
@@ -4367,7 +4586,7 @@ function toProjectRel(projectDir, abs) {
 }
 function recordRefreshedFiles(projectDir, log, report, displaced, writeLog) {
   const next = new Map(
-    buildAssetEntries(report, log.scope, log.assets).filter((e2) => e2.files !== void 0).map((e2) => [e2.id, e2.files])
+    buildAssetEntries(report, log.scope, log.assets).filter((e2) => e2.files !== void 0).map((e2) => [e2.id, e2])
   );
   const named = new Map(
     report.attempted.flatMap(
@@ -4376,13 +4595,19 @@ function recordRefreshedFiles(projectDir, log, report, displaced, writeLog) {
   );
   let changed = displaced.length > 0;
   const assets = log.assets.map((a) => {
-    const files = next.get(a.id);
+    const entry = next.get(a.id);
+    const files = entry?.files;
+    const partial = entry?.filesPartial === true ? { filesPartial: true } : {};
+    const sameFiles = files === void 0 || JSON.stringify(files) === JSON.stringify(a.files) && entry?.filesPartial === a.filesPartial;
     const { skills } = skillNames(a, a.scope, named.get(a.id));
-    const sameFiles = files === void 0 || JSON.stringify(files) === JSON.stringify(a.files);
     const sameSkills = skills === void 0 || JSON.stringify(skills) === JSON.stringify(a.skills);
     if (sameFiles && sameSkills) return a;
     changed = true;
-    return { ...a, ...sameFiles ? {} : { files }, ...skills !== void 0 ? { skills } : {} };
+    return {
+      ...a,
+      ...sameFiles ? {} : { files, ...partial },
+      ...skills !== void 0 ? { skills } : {}
+    };
   });
   if (!changed) return log;
   const written = {
@@ -4490,9 +4715,9 @@ 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");
+        const pkgJson = scope === "global" ? detectGlobalNpmPackageJsonPath(method.pkg, spawn) : join24(projectDir, "node_modules", method.pkg, "package.json");
         if (!pkgJson || !existsSync17(pkgJson)) return void 0;
-        const parsed = JSON.parse(readFileSync16(pkgJson, "utf8"));
+        const parsed = JSON.parse(readFileSync17(pkgJson, "utf8"));
         return parsed.version;
       }
       default:
@@ -4504,9 +4729,9 @@ 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");
+  const path = join24(homedir2(), ".claude/plugins/installed_plugins.json");
   if (!existsSync17(path)) return void 0;
-  const data = JSON.parse(readFileSync16(path, "utf8"));
+  const data = JSON.parse(readFileSync17(path, "utf8"));
   const entries = data.plugins?.[pluginId] ?? [];
   const matches = entries.filter(
     (e2) => claudeScope === "user" ? e2.scope === "user" : e2.scope === "project" && e2.projectPath === projectDir
@@ -4519,7 +4744,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) {
@@ -4538,8 +4763,8 @@ function getNpmGlobalRoot(spawn) {
 
 // src/key-ids.ts
 init_esm_shims();
-import { readFileSync as readFileSync17 } from "fs";
-import { join as join24 } from "path";
+import { readFileSync as readFileSync18 } from "fs";
+import { join as join25 } from "path";
 function renderedKeyIds(harnessRoot, input, clis) {
   const out = /* @__PURE__ */ new Set();
   const add = (path, key) => {
@@ -4562,7 +4787,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 = readFileSync17(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);
     }
@@ -4603,7 +4828,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`;
@@ -4614,7 +4839,7 @@ 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,
@@ -4628,8 +4853,8 @@ function refreshLinkedSkillBodies(params) {
 
 // src/out-of-track.ts
 init_esm_shims();
-import { lstatSync as lstatSync5, readFileSync as readFileSync18, rmSync as rmSync4 } from "fs";
-import { join as join26 } from "path";
+import { lstatSync as lstatSync6, readFileSync as readFileSync19, rmSync as rmSync4 } from "fs";
+import { join as join27 } from "path";
 var AGENTS_RULE = /^\.agents\/rules\/([^/]+)\.md$/;
 var ANCHOR_RULE = "uzys-harness";
 function reclaimOutOfTrack(args) {
@@ -4649,17 +4874,17 @@ 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;
     if (!inHarnessSlot(projectDir, f.path)) continue;
-    const stat = lstatSync5(abs, { throwIfNoEntry: false });
+    const stat = lstatSync6(abs, { throwIfNoEntry: false });
     if (stat !== void 0 && !stat.isFile()) continue;
     if (stat !== void 0 && claudeCopy.has(`rules/${name}.md`)) {
       out.kept.push(f.path);
       out.bringBack[f.path] = tracksBringing(name);
       continue;
     }
-    const disk = stat === void 0 ? null : readFileSync18(abs, "utf8");
+    const disk = stat === void 0 ? null : readFileSync19(abs, "utf8");
     const verdict = judge({
       op: "remove",
       kind: "harness",
@@ -4691,15 +4916,15 @@ function tracksBringing(rule) {
 
 // src/state.ts
 init_esm_shims();
-import { existsSync as existsSync18, readFileSync as readFileSync19 } from "fs";
-import { join as join27 } from "path";
+import { existsSync as existsSync18, 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 = existsSync18(join27(projectDir, ".claude"));
+  const hasClaudeDir = existsSync18(join28(projectDir, ".claude"));
   const read = readInstallLogStatus(projectDir);
   if (read.status === "ok") {
     return {
@@ -4719,10 +4944,10 @@ function tracksFromLog(tracks) {
   return [...new Set(tracks.filter(isTrack))].sort();
 }
 function collectTraces(projectDir) {
-  const at2 = (rel) => join27(projectDir, rel);
+  const at2 = (rel) => join28(projectDir, rel);
   const text = (rel) => {
     try {
-      return readFileSync19(at2(rel), "utf8");
+      return readFileSync20(at2(rel), "utf8");
     } catch {
       return null;
     }
@@ -4786,14 +5011,14 @@ init_esm_shims();
 import {
   copyFileSync,
   existsSync as existsSync19,
-  lstatSync as lstatSync6,
+  lstatSync as lstatSync7,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync20,
+  readFileSync as readFileSync21,
   rmdirSync as rmdirSync2,
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync6
 } from "fs";
-import { basename as basename5, dirname as dirname7, join as join28, relative as relative6, sep as sep7 } from "path";
+import { basename as basename5, dirname as dirname7, join as join29, relative as relative6, sep as sep7 } from "path";
 var LEGACY_ANCHOR_FILE2 = ".claude/CLAUDE.md";
 function buildUpdateSpec(projectDir, tracks, only) {
   const log = readInstallLog(projectDir);
@@ -4815,7 +5040,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)
@@ -4886,7 +5111,7 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
     harnessMcp,
     harnessWrote: harness.wrote
   });
-  const settingsPath = join28(claudeDir, "settings.json");
+  const settingsPath = join29(claudeDir, "settings.json");
   if (claudeManaged && wants("hooks") && existsSync19(settingsPath) && !outside.skip(settingsPath)) {
     report.retiredHookRefsRemoved = removeRetiredHookRefs(
       settingsPath,
@@ -5000,6 +5225,7 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   const skillRefresh = wants("external") ? (deps.refreshSkills ?? refreshExternalSkills)(projectDir) : { attempted: 0, refreshed: 0, failed: [], notInCatalog: [], unknown: false };
   report.externalSkillsRefreshed = skillRefresh.refreshed;
   report.externalSkillsFailed = skillRefresh.failed;
+  if (skillRefresh.leftAsIs !== void 0) report.externalSkillsLeftAsIs = skillRefresh.leftAsIs;
   const removedOnRecord = wants("external") ? catalogRemovedOnRecord(logAtStart) : [];
   if (removedOnRecord.length > 0) report.catalogRemoved = removedOnRecord;
   const saidAsRemoved = new Set(removedOnRecord.map((e2) => e2.id));
@@ -5033,7 +5259,7 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
     judged.filter((j4) => j4.recorded === "no-sha" && j4.backup !== void 0).map((j4) => j4.path)
   );
   report.backups = collectRunBackups(projectDir, startedAt, backupsAtStart).map(
-    (b2) => existsSync19(join28(projectDir, b2.path)) ? b2 : { ...b2, removed: true }
+    (b2) => existsSync19(join29(projectDir, b2.path)) ? b2 : { ...b2, removed: true }
   );
   const noChecksum = report.backups.map((b2) => b2.path).filter((p2) => unmeasured.has(p2));
   if (noChecksum.length > 0) report.noChecksum = noChecksum;
@@ -5116,7 +5342,7 @@ function reclaimOutOfTrackRecorded(projectDir, outside) {
 function deadMcpLeft(projectDir) {
   let servers;
   try {
-    servers = JSON.parse(readFileSync20(join28(projectDir, ".mcp.json"), "utf8")).mcpServers;
+    servers = JSON.parse(readFileSync21(join29(projectDir, ".mcp.json"), "utf8")).mcpServers;
   } catch {
     return [];
   }
@@ -5131,7 +5357,7 @@ function retiredFeaturesPart(projectDir, f) {
 }
 function legacyHookOnDisk(projectDir, rel) {
   try {
-    return hasLegacyHarnessHook(readFileSync20(join28(projectDir, rel), "utf8"));
+    return hasLegacyHarnessHook(readFileSync21(join29(projectDir, rel), "utf8"));
   } catch {
     return false;
   }
@@ -5157,13 +5383,13 @@ function writeUpdateSharedFiles(args) {
     excluded: adapterExcluded(harnessRoot, excluded)
   });
   const tracks = installedTracks(projectDir);
-  const settingsSource = join28(templatesDir, "settings.json");
+  const settingsSource = join29(templatesDir, "settings.json");
   if (args.claudeManaged && wants("hooks") && existsSync19(settingsSource)) {
     const spec = buildAssetSpec({ tracks, options: DEFAULT_OPTIONS });
     const manifest = buildManifest(spec);
     writeSettingsShared(
       writer,
-      readFileSync20(settingsSource, "utf8"),
+      readFileSync21(settingsSource, "utf8"),
       projectDir,
       log,
       (script) => {
@@ -5232,8 +5458,8 @@ 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 (!existsSync19(dir)) continue;
@@ -5244,13 +5470,13 @@ function staleSkillDirs(projectDir, claudeDir, clis) {
   return [...ids];
 }
 function staleAgentFiles(claudeDir) {
-  const dir = join28(claudeDir, "agents");
+  const dir = join29(claudeDir, "agents");
   if (!existsSync19(dir)) return [];
   return readdirSync4(dir, { withFileTypes: true }).filter((e2) => e2.isFile() && e2.name.endsWith(".md")).map((e2) => basename5(e2.name, ".md")).filter((id) => RETIRED_AGENT_IDS.includes(id));
 }
 function demotedAgentFiles(claudeDir, tracks) {
   if (tracks.length === 0) return [];
-  const dir = join28(claudeDir, "agents");
+  const dir = join29(claudeDir, "agents");
   if (!existsSync19(dir)) return [];
   const demoted = TRACK_AGENTS.filter(([, pattern]) => !anyTrack(tracks, pattern)).map(
     ([id]) => id
@@ -5266,19 +5492,19 @@ function updateHarnessTargets(projectDir, templatesDir, log, wants, report, fore
     if (!wants(e2.target.startsWith(".claude/hooks/") ? "hooks" : "rules")) continue;
     if (e2.target.startsWith(".claude/") && !claude) continue;
     if (isBaselineExcluded(e2.target, excluded)) continue;
-    const source = join28(templatesDir, e2.source);
+    const source = join29(templatesDir, e2.source);
     if (!existsSync19(source)) continue;
     const policy = POLICY_DIRS.find((d2) => e2.target.startsWith(`.claude/${d2.dir}/`));
     files.push({
       path: e2.target,
       source,
       unit: e2.target,
-      unitExisted: existsSync19(join28(projectDir, e2.target)),
+      unitExisted: existsSync19(join29(projectDir, e2.target)),
       label: policy === void 0 ? e2.target : `.claude/${policy.dir}`
     });
   }
   const refreshedSkills = [];
-  const skillsSource = join28(templatesDir, "skills");
+  const skillsSource = join29(templatesDir, "skills");
   if (!claude || !(wants("skills") || wants("new-skills")) || !existsSync19(skillsSource)) {
     return { files, refreshedSkills };
   }
@@ -5288,20 +5514,20 @@ function updateHarnessTargets(projectDir, templatesDir, log, wants, report, fore
   for (const d2 of readdirSync4(skillsSource, { withFileTypes: true })) {
     if (!d2.isDirectory()) continue;
     const unit = `.claude/skills/${d2.name}`;
-    if (occupiedByNonDirectory(join28(projectDir, unit))) {
+    if (occupiedByNonDirectory(join29(projectDir, unit))) {
       report.skillsSkippedLinks.push(d2.name);
       continue;
     }
     if (!ids.has(d2.name) || excludedSkill(d2.name)) continue;
-    const existed = existsSync19(join28(projectDir, unit));
+    const existed = existsSync19(join29(projectDir, unit));
     if (existed ? !wants("skills") : !wants("new-skills") || !creatable.has(d2.name)) continue;
-    for (const rel of listFilesRecursive(join28(skillsSource, d2.name))) {
+    for (const rel of listFilesRecursive(join29(skillsSource, d2.name))) {
       const foreign = foreignOwnedTarget(projectDir, `${unit}/${rel}`);
       if (foreign !== null) {
         if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
         continue;
       }
-      const source = join28(skillsSource, d2.name, rel);
+      const source = join29(skillsSource, d2.name, rel);
       files.push({
         path: `${unit}/${rel}`,
         source,
@@ -5339,8 +5565,8 @@ function updateHarnessFiles(args) {
     report.updated[label] = 0;
     const ctx = { prefix: dir, outside, recordOf, projectDir, judged };
     report.pruned[label] = pruneOrphans(
-      join28(projectDir, label),
-      join28(templatesDir, dir),
+      join29(projectDir, label),
+      join29(templatesDir, dir),
       ext,
       ctx,
       now
@@ -5424,19 +5650,19 @@ function pruneSkillExtras(projectDir, templatesDir, ids, outside, recordOf, now,
   const backedUp = [];
   const failed = [];
   for (const id of ids) {
-    const targetSkill = join28(projectDir, ".claude/skills", id);
-    const bundled = new Set(listFilesRecursive(join28(templatesDir, "skills", id)));
+    const targetSkill = join29(projectDir, ".claude/skills", id);
+    const bundled = new Set(listFilesRecursive(join29(templatesDir, "skills", id)));
     for (const rel of listFilesRecursive(targetSkill)) {
       if (bundled.has(rel) || basename5(rel).includes(".backup-")) continue;
       if (foreignOwnedTarget(projectDir, `.claude/skills/${id}/${rel}`) !== null) continue;
-      const targetFile = join28(targetSkill, rel);
+      const targetFile = join29(targetSkill, rel);
       if (outside.skip(targetFile)) continue;
       const path = `.claude/skills/${id}/${rel}`;
       const rec = recordOf(path);
       let line;
       let backupAbs = null;
       try {
-        const disk = rec.state === "sha" ? readFileSync20(targetFile, "utf8") : "";
+        const disk = rec.state === "sha" ? readFileSync21(targetFile, "utf8") : "";
         line = rec.state === "none" ? NOT_RECORDED_REMOVED : judge({ op: "remove", kind: "harness", rec, disk, next: null }).line;
         if (rec.state !== "sha" || hashContent(disk) !== rec.sha256) {
           backupAbs = backupFile(targetFile, now);
@@ -5504,20 +5730,20 @@ 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 (lstatSync6(abs).mtimeMs < startedAt - 1e3) return;
+    const abs = join29(projectDir, rel);
+    if (lstatSync7(abs).mtimeMs < startedAt - 1e3) return;
     out.push({ path: rel.replace(BACKUP_SUFFIX, ""), backup: rel });
   };
   for (const e2 of withoutAppleDouble(readdirSync4(projectDir, { withFileTypes: true })))
     if (e2.isFile()) consider(e2.name);
   for (const dir of BACKUP_SCAN_DIRS) {
-    for (const { rel } of listEntriesRecursive(join28(projectDir, dir))) consider(`${dir}/${rel}`);
+    for (const { rel } of listEntriesRecursive(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 (existsSync19(file)) unlinkSync2(file);
@@ -5549,17 +5775,17 @@ function trackOnlyFileAssets(tracks) {
   );
 }
 function syncHarnessAnchor(projectDir, templatesDir, report, outside, judged, now = /* @__PURE__ */ new Date()) {
-  if (existsSync19(join28(projectDir, LEGACY_ANCHOR_FILE2))) {
+  if (existsSync19(join29(projectDir, LEGACY_ANCHOR_FILE2))) {
     report.legacyAnchor = LEGACY_ANCHOR_FILE2;
   }
-  const templateMd = join28(templatesDir, "CLAUDE.md");
+  const templateMd = join29(templatesDir, "CLAUDE.md");
   if (!existsSync19(templateMd)) return;
-  const anchor = join28(projectDir, HARNESS_ANCHOR_FILE);
+  const anchor = join29(projectDir, HARNESS_ANCHOR_FILE);
   if (outside.skip(anchor)) return;
   const existed = existsSync19(anchor);
   if (existed) {
-    const current = readFileSync20(anchor, "utf8");
-    if (current !== readFileSync20(templateMd, "utf8")) {
+    const current = readFileSync21(anchor, "utf8");
+    if (current !== readFileSync21(templateMd, "utf8")) {
       const recorded2 = readInstallLog(projectDir)?.templates.rootClaudeMd;
       const owned = recorded2?.path === HARNESS_ANCHOR_FILE && hashContent(current) === recorded2.sha256;
       if (!owned) {
@@ -5567,7 +5793,7 @@ function syncHarnessAnchor(projectDir, templatesDir, report, outside, judged, no
         report.anchorBackedUp = true;
         const rel = relative6(projectDir, backup).split(sep7).join("/");
         const rec = recorded2?.path === HARNESS_ANCHOR_FILE ? { state: "sha", sha256: recorded2.sha256 } : { state: "no-sha" };
-        const next = readFileSync20(templateMd, "utf8");
+        const next = readFileSync21(templateMd, "utf8");
         const { line } = judge({ op: "write", kind: "harness", rec, disk: current, next });
         judged.push({
           path: HARNESS_ANCHOR_FILE,
@@ -5592,15 +5818,15 @@ function syncHarnessAnchor(projectDir, templatesDir, report, outside, judged, no
   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 = existsSync19(target) ? readFileSync20(target, "utf8") : null;
+  const existing = existsSync19(target) ? readFileSync21(target, "utf8") : null;
   const next = upsertHarnessImport(existing, {
     projectName: basename5(projectDir),
     // ADR-085 — update 는 선택 목록을 인자로 받지 않는다. 앞 단계(하네스 파일 쓰기)가 지나간 디스크로 판정한다:
     // `.claude/skills/<id>` 가 있으면 그 스킬은 이 설치가 고른 것이다.
     continuousSkills: CONTINUOUS_SKILLS.map((s) => s.id).filter(
-      (id) => existsSync19(join28(projectDir, ".claude/skills", id))
+      (id) => existsSync19(join29(projectDir, ".claude/skills", id))
     )
   });
   if (next === existing) return false;
@@ -5621,7 +5847,7 @@ function recordAnchorBaseline(projectDir, anchor) {
       ...log.templates,
       rootClaudeMd: {
         path: HARNESS_ANCHOR_FILE,
-        sha256: hashContent(readFileSync20(anchor, "utf8"))
+        sha256: hashContent(readFileSync21(anchor, "utf8"))
       }
     }
   };
@@ -5635,7 +5861,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) && existsSync19(join28(projectDir, e2.target))
+    (e2) => e2.applies(spec) && isBaselineExcluded(e2.target, excluded) && existsSync19(join29(projectDir, e2.target))
   ).map((e2) => e2.target);
 }
 function excludedSkillOf(log) {
@@ -5663,7 +5889,7 @@ function recordedRenderInputs(projectDir, log, tracks = installedTracks(projectD
 function recordedBundledSkills(projectDir, log) {
   if (log === null) {
     return INTERNAL_BUNDLED_SKILL_IDS.filter(
-      (id) => existsSync19(join28(projectDir, ".claude/skills", id)) || existsSync19(join28(projectDir, ".agents/skills", id))
+      (id) => existsSync19(join29(projectDir, ".claude/skills", id)) || existsSync19(join29(projectDir, ".agents/skills", id))
     );
   }
   const ids = recordedSkillIds(projectDir, log);
@@ -5714,9 +5940,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);
+  const root = join29(projectDir, SHARED_SKILLS_DIR);
   if (!existsSync19(root)) return /* @__PURE__ */ new Set();
-  return new Set(readdirSync4(root).filter((id) => existsSync19(join28(root, id, "SKILL.md"))));
+  return new Set(readdirSync4(root).filter((id) => existsSync19(join29(root, id, "SKILL.md"))));
 }
 var CREATED_SHARED_HOW = {
   "opencode.json": "created from template (harness part + template defaults)",
@@ -5743,14 +5969,14 @@ function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp, li
   const log = readInstallLog(projectDir);
   const presentBefore = sharedSkillIdsOnDisk(projectDir);
   const rulesBefore = /* @__PURE__ */ new Set();
-  const rulesDir = join28(projectDir, ".agents", "rules");
+  const rulesDir = join29(projectDir, ".agents", "rules");
   if (existsSync19(rulesDir)) {
     try {
       for (const f of readdirSync4(rulesDir)) rulesBefore.add(f);
     } catch {
     }
   }
-  const agentsMdBefore = existsSync19(join28(projectDir, "AGENTS.md"));
+  const agentsMdBefore = existsSync19(join29(projectDir, "AGENTS.md"));
   const result = runCliTransforms({
     harnessRoot,
     projectDir,
@@ -5927,12 +6153,12 @@ function pruneOrphans(target, source, ext, ctx, now) {
   if (!existsSync19(target) || !existsSync19(source)) return [];
   const removed = [];
   for (const file of readdirSync4(target)) {
-    if (!file.endsWith(ext) || existsSync19(join28(source, file))) continue;
-    const targetFile = join28(target, file);
+    if (!file.endsWith(ext) || existsSync19(join29(source, file))) continue;
+    const targetFile = join29(target, file);
     const path = `.claude/${ctx.prefix}/${file}`;
     const rec = ctx.recordOf(path);
     try {
-      const disk = readFileSync20(targetFile, "utf8");
+      const disk = readFileSync21(targetFile, "utf8");
       const { verdict, line } = judge({ op: "remove", kind: "harness", rec, disk, next: null });
       if (verdict === "leave" || ctx.outside.skip(targetFile)) continue;
       if (!inHarnessSlot(ctx.projectDir, path, HARNESS_FILES, { follow: true })) continue;
@@ -5954,7 +6180,7 @@ function pruneOrphans(target, source, ext, ctx, now) {
   return removed;
 }
 function retireMcpAllowlist(projectDir, now = /* @__PURE__ */ new Date()) {
-  const target = join28(projectDir, ".mcp-allowlist");
+  const target = join29(projectDir, ".mcp-allowlist");
   if (!existsSync19(target)) return null;
   try {
     const backup = backupFile(target, now);
@@ -5976,11 +6202,11 @@ function recordClaudeCommand(log, tracks) {
 function runInstall(ctx) {
   const { harnessRoot, projectDir } = ctx;
   const mode = ctx.mode ?? "fresh";
-  const templatesDir = join29(harnessRoot, "templates");
+  const templatesDir = join30(harnessRoot, "templates");
   if (!existsSync20(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) {
@@ -6005,10 +6231,10 @@ 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");
+    const settingsPath = join30(projectDir, ".claude", "settings.json");
     if (existsSync20(settingsPath)) {
       try {
-        JSON.parse(readFileSync21(settingsPath, "utf8"));
+        JSON.parse(readFileSync22(settingsPath, "utf8"));
       } catch {
         throw new Error(
           `${relative7(process.cwd(), settingsPath)} is not valid JSON \u2014 left untouched, so no hooks were wired. Fix or delete that file, then run the install again`
@@ -6305,7 +6531,7 @@ function releasedThisRun(args) {
     }
     if (id.startsWith(BASELINE_PREFIX)) {
       const again2 = manifest.some(
-        (e2) => e2.applies(manifestSpec) && classifyBaselineTarget(e2.target)?.id === id && existsSync20(join29(projectDir, e2.target))
+        (e2) => e2.applies(manifestSpec) && classifyBaselineTarget(e2.target)?.id === id && existsSync20(join30(projectDir, e2.target))
       );
       return { id, again: again2, tail: "the harness manages it again" };
     }
@@ -6314,7 +6540,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) => existsSync20(join29(projectDir, d2, id)));
+    const recorded2 = (previousLog?.assets.some((a) => a.id === id) ?? false) || [".claude/skills", ".agents/skills"].some((d2) => existsSync20(join30(projectDir, d2, id)));
     return {
       id,
       again,
@@ -6326,10 +6552,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) || !existsSync20(join29(projectDir, path))) return [];
+    if (path === null || done.has(path) || !existsSync20(join30(projectDir, path))) return [];
     const name = adapterFor(path);
     const keys = [...excludedKeys(path, [id])];
-    const present = name === null ? null : ADAPTERS[name].read(readFileSync21(join29(projectDir, path), "utf8"), keys, projectDir);
+    const present = name === null ? null : ADAPTERS[name].read(readFileSync22(join30(projectDir, path), "utf8"), keys, projectDir);
     return present !== null && present.size === 0 ? [] : [{ id, path }];
   });
 }
@@ -6373,7 +6599,7 @@ function installCliNeutralAssets(manifestSpec, templatesDir, baselineExcluded, w
       continue;
     }
     if (!isCliNeutralTarget(entry.target)) continue;
-    const source = join29(templatesDir, entry.source);
+    const source = join30(templatesDir, entry.source);
     if (!existsSync20(source)) {
       result.skipped += 1;
       continue;
@@ -6394,13 +6620,13 @@ 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 (existsSync20(target)) result.excludedOnDisk.push(entry.target);
       continue;
     }
-    const source = join29(templatesDir, entry.source);
+    const source = join30(templatesDir, entry.source);
     if (!existsSync20(source)) {
       result.skipped += 1;
       continue;
@@ -6431,18 +6657,18 @@ 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");
+  const hookDir = join30(projectDir, ".claude/hooks");
   if (existsSync20(hookDir)) {
     chmodHooksSync(hookDir, projectDir);
   }
@@ -6464,8 +6690,8 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
     });
     result.keptHookRefs.push(
       ...findStaleHookRefs(
-        join29(projectDir, ".claude", "settings.json"),
-        join29(projectDir, ".claude")
+        join30(projectDir, ".claude", "settings.json"),
+        join30(projectDir, ".claude")
       )
     );
   }
@@ -6474,7 +6700,7 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
     // ADR-085 · update(`upsertRootImport`)와 같은 판정 — 실제로 깔린 스킬만 안내한다. 밖 링크라 쓰지 않은
     // 스킬(ADR-098)을 "installed" 라 적으면 다음 update 가 그 절을 걷어 내 두 동작이 서로 반대로 쓴다.
     (manifestSpec.selectedInternalSkills ?? []).filter(
-      (id) => existsSync20(join29(projectDir, ".claude", "skills", id))
+      (id) => existsSync20(join30(projectDir, ".claude", "skills", id))
     ),
     harnessRoot,
     writer
@@ -6490,7 +6716,7 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
 function writeSettingsPortion(writer, source, projectDir, previousLog, hookInstalled) {
   return writeSettingsShared(
     writer,
-    readFileSync21(source, "utf8"),
+    readFileSync22(source, "utf8"),
     projectDir,
     previousLog,
     hookInstalled
@@ -6543,6 +6769,7 @@ function runExternalPhase(ctx, previousLog) {
   const slotCtx = { log: previousLog, scope: spec.scope };
   const settle = holdSkillSlots(projectDir, {
     recorded: (previousLog?.assets ?? []).filter((a) => a.method === "skill" && skillIds.has(a.id)),
+    assets: skills,
     slots: skillSlotsFor(skills, spec.cli, slotCtx),
     // #902 — 옛 판이 파일 목록 없이 깐 자산의 자리 — 그 안 파일은 되살리지 않고 백업만 남긴다
     unlisted: unlistedSkillSlots(skills, spec.cli, slotCtx),
@@ -6564,7 +6791,7 @@ function runExternalPhase(ctx, previousLog) {
     throw e2;
   }
   const { report: external, backups, displaced } = settle(ran);
-  const displacedBackups = new Set(displaced.map((f) => join29(projectDir, f.notes[0] ?? "")));
+  const displacedBackups = new Set(displaced.map((f) => join30(projectDir, f.notes[0] ?? "")));
   const editBackups = backups.filter((b2) => !displacedBackups.has(b2));
   ctx.onProgress?.({
     type: "external-complete",
@@ -6777,9 +7004,9 @@ function accumulateCategory(cats, entry) {
   }
 }
 function writeRootClaudeMd(projectDir, continuousSkills, harnessRoot, writer) {
-  const target = join29(projectDir, "CLAUDE.md");
+  const target = join30(projectDir, "CLAUDE.md");
   if (writer.skipOutside(target)) return null;
-  const existing = existsSync20(target) ? readFileSync21(target, "utf-8") : null;
+  const existing = existsSync20(target) ? readFileSync22(target, "utf-8") : null;
   const seeded = existing === null ? seedRootClaudeProjectContext(projectDir, harnessRoot) : null;
   const content = upsertHarnessImport(existing, {
     projectName: basename6(projectDir),
@@ -6811,8 +7038,8 @@ function listHookFiles(hookDir) {
 
 // src/commands/install-render.ts
 init_esm_shims();
-import { existsSync as existsSync22, readdirSync as readdirSync6, readFileSync as readFileSync23 } from "fs";
-import { join as join31, relative as relative8 } from "path";
+import { existsSync as existsSync22, readdirSync as readdirSync6, readFileSync as readFileSync24 } from "fs";
+import { join as join32, relative as relative8 } from "path";
 
 // src/preset-recommend.ts
 init_esm_shims();
@@ -6867,10 +7094,10 @@ function groupAssetsByCategory(assetIds) {
 
 // src/resident-entries.ts
 init_esm_shims();
-import { existsSync as existsSync21, readFileSync as readFileSync22 } from "fs";
-import { basename as basename7, join as join30 } from "path";
+import { existsSync as existsSync21, readFileSync as readFileSync23 } from "fs";
+import { basename as basename7, join as join31 } from "path";
 function residentEntries(spec) {
-  const skillThere = (id) => INTERNAL_BUNDLED_SKILL_IDS.includes(id) && [".claude/skills", ".agents/skills"].some((d2) => existsSync21(join30(spec.projectDir, d2, id)));
+  const skillThere = (id) => INTERNAL_BUNDLED_SKILL_IDS.includes(id) && [".claude/skills", ".agents/skills"].some((d2) => existsSync21(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
@@ -6896,7 +7123,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" && existsSync21(join30(spec.projectDir, "AGENTS.md"))) {
+  if (anchorSurface(spec.cli).scaffold === "agents-md" && existsSync21(join31(spec.projectDir, "AGENTS.md"))) {
     return makeResidentCost({
       ...cost,
       contextNote: "planned, not counting text already in AGENTS.md"
@@ -6907,8 +7134,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 = existsSync21(rootClaude) ? readFileSync22(rootClaude, "utf-8") : null;
+  const rootClaude = join31(spec.projectDir, "CLAUDE.md");
+  const existing = existsSync21(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);
@@ -6917,14 +7144,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 && existsSync21(join30(spec.projectDir, e2.target))) out.add(t.id);
+    if (t !== null && existsSync21(join31(spec.projectDir, e2.target))) out.add(t.id);
   }
   return out;
 }
@@ -7053,7 +7280,7 @@ function createInstallRenderer(log, spec, verbose) {
       },
       onAssetResult: (result) => {
         const base = result.ok ? formatAssetMeta(result.asset, result.version) : result.message ?? "failed";
-        const outsideNote = result.ok && result.outside?.length ? ` \xB7 ${result.outside.map((o) => `${o.root}/ left as is (links outside the project: ${o.target})`).join(" \xB7 ")}` : "";
+        const outsideNote = result.ok && result.outside?.length ? ` \xB7 ${result.outside.map(outsideSlotNote).join(" \xB7 ")}` : "";
         const meta = `${base}${outsideNote}`;
         log(`  ${assetRow(result.ok ? "success" : "skip", result.asset.id, meta)}`);
       }
@@ -7111,23 +7338,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);
+    const abs = join32(spec.projectDir, dir);
     return existsSync22(abs) ? readdirSync6(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))
+    file: join32(spec.projectDir, slot, e2.target.slice(".claude/skills/".length))
   })).filter((e2) => existsSync22(e2.file));
-  const agents = hasClaude ? mdFiles(join31(".claude", "agents"), "agents") : [];
+  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/")
@@ -7139,8 +7366,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;
@@ -7407,7 +7634,7 @@ function renderFinalSummary(log, spec, report, fromWizard) {
   const alreadyTrustedGlobally = (() => {
     try {
       if (!existsSync22(configPath)) return false;
-      return hasTrustEntry(readFileSync23(configPath, "utf8"), spec.projectDir);
+      return hasTrustEntry(readFileSync24(configPath, "utf8"), spec.projectDir);
     } catch {
       return false;
     }
@@ -7432,7 +7659,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");
@@ -7448,7 +7675,7 @@ function renderFinalSummary(log, spec, report, fromWizard) {
 }
 function hasFillPrompt(path) {
   try {
-    return readFileSync23(path, "utf8").includes("<!-- FILL:");
+    return readFileSync24(path, "utf8").includes("<!-- FILL:");
   } catch {
     return false;
   }
@@ -7749,6 +7976,7 @@ function renderPhase1Rows(log, baseline, verbose = false) {
         )
       );
     }
+    for (const row of leftAsIsRows(baseline.updateMode.externalSkillsLeftAsIs ?? [])) log(row);
     if (baseline.updateMode.externalSkillsFailed.length > 0) {
       const failed = baseline.updateMode.externalSkillsFailed;
       const head = failed[0];
@@ -8082,6 +8310,11 @@ function excludedKeyParts(f) {
   }
   return parts;
 }
+function leftAsIsRows(items) {
+  return items.map(
+    ({ id, outside }) => assetRow("skip", "external skills", `${id}: ${outside.map(outsideSlotNote).join(" \xB7 ")}`)
+  );
+}
 function catalogRemovedRows(items) {
   return items.map((e2) => {
     const parts = [
@@ -8521,8 +8754,8 @@ function registerInstallCommand(cli) {
 
 // src/commands/list.ts
 init_esm_shims();
-import { existsSync as existsSync23, readFileSync as readFileSync24 } from "fs";
-import { join as join32, resolve as resolve3 } from "path";
+import { existsSync as existsSync23, readFileSync as readFileSync25 } from "fs";
+import { join as join33, resolve as resolve3 } from "path";
 function listAction(options = {}, deps = {}) {
   const log = deps.log ?? console.log;
   const err = deps.err ?? console.error;
@@ -8626,8 +8859,8 @@ function formatHarnessFileRows(log, projectDir) {
   const rows = [`    ${c.dim(tops.length > 0 ? tops.join("  ") : "(none recorded)")}`];
   const rootMd = log.templates.rootClaudeMd;
   if (rootMd) {
-    const path = join32(projectDir, rootMd.path);
-    const modified = existsSync23(path) && hashContent(readFileSync24(path, "utf8")) !== rootMd.sha256;
+    const path = join33(projectDir, rootMd.path);
+    const modified = existsSync23(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)}`
     );
@@ -8641,7 +8874,7 @@ var ROOT_FILE_CHANGE = {
   displaced: "\uBE44\uCF1C \uB460"
 };
 function formatRootFileRows(rootFiles, projectDir) {
-  const present = rootFiles.filter((f) => existsSync23(join32(projectDir, f.path)));
+  const present = rootFiles.filter((f) => existsSync23(join33(projectDir, f.path)));
   const width = Math.max(0, ...present.map((f) => f.path.length));
   return present.map(
     (f) => `    ${c.dim(padDisplay(f.path, width))}  ${c.dim(ROOT_FILE_CHANGE[f.change])}  ${c.dim(f.notes.join(" / "))}`
@@ -8662,9 +8895,9 @@ import {
   accessSync as accessSync2,
   existsSync as existsSync24,
   constants as fsConstants2,
-  lstatSync as lstatSync7,
+  lstatSync as lstatSync8,
   readdirSync as readdirSync7,
-  readFileSync as readFileSync25,
+  readFileSync as readFileSync26,
   readlinkSync as readlinkSync2,
   realpathSync as realpathSync4,
   rmdirSync as rmdirSync3,
@@ -8672,7 +8905,7 @@ import {
   statSync as statSync4,
   writeFileSync as writeFileSync8
 } from "fs";
-import { dirname as dirname8, join as join33, relative as relative9, resolve as resolve4, sep as sep9 } from "path";
+import { dirname as dirname8, join as join34, relative as relative9, resolve as resolve4, sep as sep9 } from "path";
 
 // src/track-removal.ts
 init_esm_shims();
@@ -10119,7 +10352,7 @@ function hintFor(asset) {
     case "plugin":
       return "claude plugin uninstall --scope project";
     case "skill":
-      return asset.files === void 0 ? 'files not on record (older install) \u2014 nothing removed; only "Remove everything" clears it' : `removes the ${asset.files.length} file(s) on record`;
+      return asset.files === void 0 ? 'files not on record (older install) \u2014 nothing removed; only "Remove everything" clears it' : asset.filesPartial === true ? `removes the ${asset.files.length} file(s) on record; files in other folders are not on record (older install) \u2014 left` : `removes the ${asset.files.length} file(s) on record`;
     case "npm":
       return "npm uninstall --save-dev";
     case "npx-run":
@@ -10381,10 +10614,10 @@ Proceed?`, initialValue: false });
 // src/commands/uninstall.ts
 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}). Nothing behind it is removed`;
+  const head = `  ${c.yellow("\u2298")} ${screenText(o.link)} \u2014 left as is: the link points outside the project (${screenText(o.link)} \u2192 ${screenText(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 ");
+  const shown = files.slice(0, KEPT_LINK_FILES_SHOWN).map(screenText).join(" \xB7 ");
   const more = files.length > KEPT_LINK_FILES_SHOWN ? ` +${files.length - KEPT_LINK_FILES_SHOWN} more` : "";
   return `${head}; harness files there on record: ${shown}${more} \u2014 clean them up by hand if intended.`;
 }
@@ -10535,6 +10768,7 @@ function uninstallAction(options, deps = {}) {
         if (d2.verdict === "restore") journal.push(`put back ${d2.path}`);
       }
       for (const line of displacedLines(onlyDisplaced, false)) log(line);
+      for (const line of byHandLines([], onlyDisplaced, projectDir, installLog)) log(line);
     } else {
       const done = removeHarnessFiles(installLog, projectDir, FULL_SCOPE, {
         rm: rmJ,
@@ -10611,7 +10845,7 @@ function unwritablePaths(ctx) {
   const project = ctx.targetAssets.filter((a) => a.scope === "project");
   if (project.some((a) => a.method === "npm")) need.add(".");
   const parentOf = (path) => {
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (!safeExists(abs)) return;
     const real = safeRealpath(abs);
     if (real !== null && isOutsideProject(projectDir, real)) return;
@@ -10623,7 +10857,7 @@ function unwritablePaths(ctx) {
     const recordedShared = new Set((installLog.portions ?? []).map((p2) => p2.path));
     const made = new Set((installLog.externalFiles ?? []).map((f) => f.path));
     for (const p2 of UNINSTALL_SHARED) {
-      if (recordedShared.has(p2) && existsSync24(join33(projectDir, p2))) need.add(p2);
+      if (recordedShared.has(p2) && existsSync24(join34(projectDir, p2))) need.add(p2);
       if (made.has(p2)) parentOf(p2);
     }
     for (const p2 of harnessCandidates(installLog)) parentOf(p2);
@@ -10633,7 +10867,7 @@ function unwritablePaths(ctx) {
   }
   return [...need].filter((p2) => {
     try {
-      accessSync2(join33(projectDir, p2), fsConstants2.W_OK);
+      accessSync2(join34(projectDir, p2), fsConstants2.W_OK);
       return false;
     } catch (e2) {
       return e2.code !== "ENOENT";
@@ -10642,7 +10876,7 @@ function unwritablePaths(ctx) {
 }
 function safeExists(abs) {
   try {
-    lstatSync7(abs);
+    lstatSync8(abs);
     return true;
   } catch {
     return false;
@@ -10700,7 +10934,8 @@ function executeReverse(plan, log, logSurvives, journal) {
       failedIds.push(step.assetId);
       failed++;
     }
-    for (const note of result.notes ?? []) log(c.dim(`    \u21B3 ${note}`));
+    for (const note of [...result.notes ?? [], ...step.hints ?? []])
+      log(c.dim(`    \u21B3 ${note}`));
   }
   for (const line of noReverseLines(plan, logSurvives || failed > 0)) log(line);
   return { succeeded, failed, removedIds, failedIds };
@@ -10736,15 +10971,15 @@ function settleLog(ctx, io) {
       return true;
     }
   } else {
-    const recordDir = join33(projectDir, INSTALL_LOG_DIR);
+    const recordDir = join34(projectDir, INSTALL_LOG_DIR);
     if (outsideLinkAt(projectDir, INSTALL_LOG_DIR) !== null) io.rm(recordDir);
     else {
-      for (const rel of RECORD_FILES) io.rm(join33(projectDir, rel));
+      for (const rel of RECORD_FILES) io.rm(join34(projectDir, rel));
       pruneEmptyDirsUpward(projectDir, recordDir);
     }
     if (outsideLinkAt(projectDir, LEGACY_INSTALL_LOG_DIR) === null) {
       io.rm(legacyInstallLogPath(projectDir));
-      pruneEmptyDirsUpward(projectDir, join33(projectDir, LEGACY_INSTALL_LOG_DIR));
+      pruneEmptyDirsUpward(projectDir, join34(projectDir, LEGACY_INSTALL_LOG_DIR));
     }
     io.log(`  ${status.success("install log removed")}`);
   }
@@ -10760,7 +10995,7 @@ function afterFullRemoval(next, done) {
   if (back.size === 0) return next;
   const out = { ...next, rootFiles: withoutRestored(next.rootFiles, done.displaced) };
   const stays = (prefix) => (f) => !back.has(`${prefix}${f.path}`);
-  if (out.policyFiles !== void 0) out.policyFiles = out.policyFiles.filter(stays(CLAUDE_DIR3));
+  if (out.policyFiles !== void 0) out.policyFiles = out.policyFiles.filter(stays(CLAUDE_DIR4));
   if (out.skillFiles !== void 0) out.skillFiles = out.skillFiles.filter(stays(SKILLS_DIR3));
   if (out.externalFiles !== void 0) out.externalFiles = out.externalFiles.filter(stays(""));
   const anchor = out.templates.rootClaudeMd;
@@ -10784,7 +11019,12 @@ function dryRunLines(plan, installLog, projectDir, assetsOnly, rootFiles, harnes
   if (plan.reverseSteps.length === 0 && copies.length === 0) {
     lines.push(c.dim("  (no project-scope assets to reverse)"));
   }
-  lines.push(...plan.reverseSteps.map((s) => `  \u25CB ${s.label}`));
+  lines.push(
+    ...plan.reverseSteps.flatMap((s) => [
+      `  \u25CB ${s.label}`,
+      ...(s.hints ?? []).map((hint) => c.dim(`    \u21B3 ${hint}`))
+    ])
+  );
   lines.push(...globalCopyLines(copies, true));
   lines.push(
     assetsOnly ? `  \u25CB install log updated (${installLog.assets.length - plannedAssets(plan, installLog).length} asset(s) remain)` : "  \u25CB remove install record (.uzys-agent-harness/ \u2014 \uC124\uCE58 \uAE30\uB85D\xB7\uCC28\uB2E8 \uB85C\uADF8\xB7update \uBC31\uC5C5 \uBAA9\uB85D)"
@@ -10808,7 +11048,10 @@ function dryRunLines(plan, installLog, projectDir, assetsOnly, rootFiles, harnes
       willBeGone: new Set(plannedAssetFiles(plan, installLog)),
       write: false
     });
-    lines.push(...displacedLines(preview, true));
+    lines.push(
+      ...displacedLines(preview, true),
+      ...byHandLines([], preview, projectDir, installLog)
+    );
   }
   lines.push(...advisoryLines(plan, projectDir, rootFiles, globalTrust), "");
   return lines;
@@ -10848,7 +11091,7 @@ function backupArtifactAdvisoryLines(projectDir) {
     }
   }
   for (const dir of BACKUP_SCAN_DIRS) {
-    const abs = join33(projectDir, dir);
+    const abs = join34(projectDir, dir);
     if (!existsSync24(abs) || outsideLinkAt(projectDir, dir) !== null) continue;
     for (const rel of listFilesRecursive(abs)) {
       if (BACKUP_SUFFIX.test(rel)) found.push(`${dir}/${rel}`);
@@ -10859,16 +11102,16 @@ function backupArtifactAdvisoryLines(projectDir) {
     c.yellow(
       `[BACKUPS] \uD558\uB124\uC2A4\uAC00 \uB0A8\uAE34 \uBC31\uC5C5 ${found.length}\uAC74 (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4 \u2014 \uB0B4\uC6A9 \uD655\uC778 \uD6C4 \uC0AD\uC81C):`
     ),
-    ...found.sort().map((f) => c.dim(`  ${f}`))
+    ...found.sort().map((f) => c.dim(`  ${screenText(f)}`))
   ];
 }
 function rootFileAdvisoryLines(rootFiles, projectDir) {
   const header = "[ROOT] `.claude/` \uBC16\uC5D0 \uB0A8\uB294 \uAC83 (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4):";
-  const present = rootFiles.filter((f) => existsSync24(join33(projectDir, f.path)));
+  const present = rootFiles.filter((f) => existsSync24(join34(projectDir, f.path)));
   if (present.length === 0) return [];
   const outside = /* @__PURE__ */ new Map();
   const inside = present.filter((f) => {
-    const o = outsideProjectTarget(projectDir, join33(projectDir, f.path));
+    const o = outsideProjectTarget(projectDir, join34(projectDir, f.path));
     if (o === null) return true;
     const group = outside.get(o.link) ?? { link: o, files: [] };
     group.files.push(f.path);
@@ -10880,13 +11123,13 @@ function rootFileAdvisoryLines(rootFiles, projectDir) {
     c.yellow(header),
     ...[...outside.values()].map(
       ({ link: o, files }) => c.dim(
-        `  \xB7 ${o.link} \u2014 left as is: the link points outside the project (${o.link} \u2192 ${o.linkTarget}); harness files there: ${files.join(" \xB7 ")} (other projects linked to it may use them)`
+        `  \xB7 ${screenText(o.link)} \u2014 left as is: the link points outside the project (${screenText(o.link)} \u2192 ${screenText(o.linkTarget)}); harness files there: ${files.map(screenText).join(" \xB7 ")} (other projects linked to it may use them)`
       )
     ),
     ...inside.flatMap((f) => [
-      c.dim(`  \xB7 ${f.path} \u2014 ${rootFileMeaning(f, projectDir)}`),
+      c.dim(`  \xB7 ${screenText(f.path)} \u2014 ${rootFileMeaning(f, projectDir)}`),
       // displaced 의 notes 는 백업 경로 하나 — 위 줄이 이미 댔다
-      ...f.change !== "displaced" && f.notes.length > 0 ? [c.dim(`      ${f.notes.join(" / ")}`)] : []
+      ...f.change !== "displaced" && f.notes.length > 0 ? [c.dim(`      ${f.notes.map(oneLine).join(" / ")}`)] : []
     ])
   ];
 }
@@ -10907,7 +11150,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 existsSync24(join33(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 existsSync24(join34(projectDir, backup)) ? `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC740 ${screenText(backup)} \uC5D0 \uC788\uB2E4` : `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC758 \uBC31\uC5C5(${screenText(backup)})\uC774 \uB354\uB294 \uC5C6\uB2E4`;
     }
   }
 }
@@ -10989,15 +11232,15 @@ 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 (!existsSync24(join33(projectDir, AGENTS_MD2))) return null;
-  if (!recorded2 && !isLegacyHarnessAgentsMd(readTextOrEmpty(join33(projectDir, AGENTS_MD2)))) {
+  if (!existsSync24(join34(projectDir, AGENTS_MD2))) return null;
+  if (!recorded2 && !isLegacyHarnessAgentsMd(readTextOrEmpty(join34(projectDir, AGENTS_MD2)))) {
     return null;
   }
   return set;
 }
 function readTextOrEmpty(abs) {
   try {
-    return readFileSync25(abs, "utf8");
+    return readFileSync26(abs, "utf8");
   } catch {
     return "";
   }
@@ -11067,7 +11310,7 @@ function settleCliLog(ctx, target, remaining, done, anchorRemoved) {
 function forgetRemoved(next, done) {
   const out = { ...next };
   const kept = (prefix) => (f) => !done.forgotten.has(`${prefix}${f.path}`);
-  if (out.policyFiles !== void 0) out.policyFiles = out.policyFiles.filter(kept(CLAUDE_DIR3));
+  if (out.policyFiles !== void 0) out.policyFiles = out.policyFiles.filter(kept(CLAUDE_DIR4));
   if (out.skillFiles !== void 0) out.skillFiles = out.skillFiles.filter(kept(SKILLS_DIR3));
   const survivors = (out.externalFiles ?? []).filter(kept(""));
   if (survivors.length > 0) out.externalFiles = survivors;
@@ -11121,9 +11364,9 @@ function runScopedRemoval(ctx, io, plan) {
   }
   for (const line of lines) io.log(line);
   const settled = plan.settle(done);
-  const agentsBefore = readTextOrEmpty(join33(projectDir, AGENTS_MD2));
+  const agentsBefore = readTextOrEmpty(join34(projectDir, AGENTS_MD2));
   const rerender = plan.rerenderSet === null ? null : rerenderAgentsMd(ctx, plan.rerenderSet, settled);
-  const rewrote = rerender !== null && readTextOrEmpty(join33(projectDir, AGENTS_MD2)) !== agentsBefore;
+  const rewrote = rerender !== null && readTextOrEmpty(join34(projectDir, AGENTS_MD2)) !== agentsBefore;
   if (rewrote) for (const line of rerenderLines(rerender)) io.log(line);
   const next = rerender === null ? settled : withRerender(settled, rerender);
   try {
@@ -11196,7 +11439,7 @@ function removeTrackAction(ctx, io) {
 }
 var TRACK_SCOPE = { shared: [], skeleton: [], folders: [], importBlock: false, anchor: false };
 function trackNotes(ctx, r, d2, write) {
-  const md = join33(ctx.projectDir, "CLAUDE.md");
+  const md = join34(ctx.projectDir, "CLAUDE.md");
   const block = rootBlockNext(ctx, new Set(d2.removed));
   if (write && block !== null) {
     backupIfLossyUtf8(md);
@@ -11224,11 +11467,11 @@ function previewTrackRemoval(ctx, target) {
 }
 function rootBlockNext({ installLog, projectDir }, gone) {
   const anchor = installLog.templates?.rootClaudeMd?.path;
-  const md = join33(projectDir, "CLAUDE.md");
+  const md = join34(projectDir, "CLAUDE.md");
   const text = safeExists(md) && outsideProjectTarget(projectDir, md) === null ? readTextOrEmpty(md) : "";
-  if (anchor === void 0 || !safeExists(join33(projectDir, anchor))) return null;
+  if (anchor === void 0 || !safeExists(join34(projectDir, anchor))) return null;
   if (stripHarnessImport(text) === null) return null;
-  const stays = (id) => listFilesRecursive(join33(projectDir, SKILLS_DIR3, id)).some(
+  const stays = (id) => listFilesRecursive(join34(projectDir, SKILLS_DIR3, id)).some(
     (f) => !gone.has(`${SKILLS_DIR3}${id}/${f}`)
   );
   const continuousSkills = CONTINUOUS_SKILLS.map((s) => s.id).filter(stays);
@@ -11239,8 +11482,8 @@ function settleTrackLog(ctx, target, remaining, done) {
   const { installLog, projectDir } = ctx;
   const tracks = installLog.spec.tracks.filter((t) => t !== target);
   const next = forgetRemoved({ ...installLog, spec: { ...installLog.spec, tracks } }, done);
-  const abs = join33(projectDir, INSTALLED_TRACKS);
-  const key = INSTALLED_TRACKS.slice(CLAUDE_DIR3.length);
+  const abs = join34(projectDir, INSTALLED_TRACKS);
+  const key = INSTALLED_TRACKS.slice(CLAUDE_DIR4.length);
   const prior = installLog.policyFiles?.find((f) => f.path === key)?.sha256 ?? hashContent(installedTracksText(installLog.spec.tracks.filter(isTrack)));
   const edited = safeExists(abs) && hashContent(readTextOrEmpty(abs)) !== prior;
   if (!installedClis(installLog).includes("claude")) return next;
@@ -11266,7 +11509,7 @@ 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) && existsSync24(join33(projectDir, SKILLS_LOCK))) {
+  if (skills && !out.some((f) => f.path === SKILLS_LOCK) && existsSync24(join34(projectDir, SKILLS_LOCK))) {
     out.push({ path: SKILLS_LOCK, change: "advisory", notes: [] });
   }
   return out;
@@ -11277,7 +11520,7 @@ function remnantFor(path, log, harnessRoot, projectDir, wiringGone = []) {
     const gone = (k2) => wiringGone.includes(`hooks/${k2.split("#")[1] ?? ""}`);
     return (disk) => {
       try {
-        const template = readFileSync25(join33(harnessRoot, "templates", "settings.json"), "utf8");
+        const template = readFileSync26(join34(harnessRoot, "templates", "settings.json"), "utf8");
         const render = renderSettingsPortion(template, () => true);
         return [...legacySettingsSeed(disk, render, projectDir, { edited: true }).keys()].filter(
           (k2) => !k2.endsWith("{}") && !gone(k2)
@@ -11415,12 +11658,27 @@ function noReverseHints(asset, ctx) {
     return [".claude/ \uBC16\uC5D0 \uB9CC\uB4E0 \uD30C\uC77C(\uC608: _bmad/ \xB7 _openspec/)\uC740 \uC9C1\uC811 \uD655\uC778 \uD6C4 \uC9C0\uC6B4\uB2E4 \u2014 \uAE30\uB85D\uC5D0 \uC5C6\uB2E4"];
   }
   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) => existsSync24(join33(ctx.projectDir, p2)));
+  const left = unlistedFoldersLeft(asset, ctx.projectDir);
   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"
   ];
 }
+function unlistedFoldersLeft(asset, projectDir) {
+  const name = asset.detail.skill;
+  if (!isSkillName(name) || !isPlainPath(name)) return [];
+  const listed = new Set((asset.files ?? []).map((f) => f.path.split("/").slice(0, 3).join("/")));
+  return [".claude/skills", ".agents/skills"].filter((root) => !listed.has(`${root}/${name}`)).map((root) => `${root}/${name}/`).filter((p2) => existsSync24(join34(projectDir, p2)));
+}
+function partialHints(asset, projectDir) {
+  const left = unlistedFoldersLeft(asset, projectDir);
+  if (left.length > 0) {
+    return [
+      `other 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)`
+    ];
+  }
+  const name = asset.detail.skill;
+  return name === void 0 || !isSkillName(name) || !isPlainPath(name) ? ["other files it put down are not on record (installed by an older version) \u2014 left as is"] : [];
+}
 function buildProjectReverseStep(asset, ctx) {
   const { spawn } = ctx;
   switch (asset.method) {
@@ -11444,10 +11702,12 @@ ${r.stdout || ""}`;
     case "skill": {
       const files = asset.files;
       if (files === void 0) return null;
+      const hints = asset.filesPartial === true ? partialHints(asset, ctx.projectDir) : [];
       return {
         assetId: asset.id,
         label: `remove ${asset.id} \u2014 ${files.length} file(s) on record`,
-        execute: () => removeToolFiles(files, ctx.projectDir, ctx.rm)
+        execute: () => removeToolFiles(files, ctx.projectDir, ctx.rm),
+        ...hints.length > 0 ? { hints } : {}
       };
     }
     case "npm": {
@@ -11498,7 +11758,7 @@ function buildGlobalAdvisoryCmd(asset) {
       return "(no standard reverse \u2014 manual)";
   }
 }
-var CLAUDE_DIR3 = ".claude/";
+var CLAUDE_DIR4 = ".claude/";
 var LEGACY_LOG = `${LEGACY_INSTALL_LOG_DIR}/${INSTALL_LOG_FILENAME}`;
 var SKILLS_DIR3 = ".claude/skills/";
 var CLI_FOLDERS2 = [".claude", ".codex", ".opencode"];
@@ -11543,7 +11803,7 @@ function removeHarnessFiles(log, projectDir, scope, io) {
   }
   const judged = new Set(candidates);
   for (const path of legacyFileCandidates()) {
-    if (judged.has(path) || !scope.has(path) || !safeExists(join33(projectDir, path))) continue;
+    if (judged.has(path) || !scope.has(path) || !safeExists(join34(projectDir, path))) continue;
     if (recorded(log, path, { isTarget }).state !== "none") continue;
     removeRecordedFile(path, { log, projectDir, io, out, isTarget, pruneFrom });
   }
@@ -11569,9 +11829,9 @@ function removeHarnessFiles(log, projectDir, scope, io) {
     write: io.write
   });
   if (io.write) {
-    for (const p2 of pruneFrom) pruneEmptyDirsUpward(projectDir, dirname8(join33(projectDir, p2)));
+    for (const p2 of pruneFrom) pruneEmptyDirsUpward(projectDir, dirname8(join34(projectDir, p2)));
     for (const d2 of scope.skeleton) {
-      const abs = join33(projectDir, d2);
+      const abs = join34(projectDir, d2);
       if (outsideProjectTarget(projectDir, abs) !== null) continue;
       pruneEmptyDirsUpward(projectDir, abs);
     }
@@ -11580,7 +11840,7 @@ function removeHarnessFiles(log, projectDir, scope, io) {
 }
 function harnessCandidates(log) {
   const paths = [
-    ...(log.policyFiles ?? []).map((f) => `${CLAUDE_DIR3}${f.path}`),
+    ...(log.policyFiles ?? []).map((f) => `${CLAUDE_DIR4}${f.path}`),
     ...(log.skillFiles ?? []).map((f) => `${SKILLS_DIR3}${f.path}`),
     ...(log.externalFiles ?? []).map((f) => f.path),
     // 헬퍼 — writer 기록은 `externalFiles` 에 sha 로 적지만 옛 기록(≤v26.161.0)엔 항목이 없다. `recorded()` 가 가른다
@@ -11607,17 +11867,17 @@ function helperSources() {
 function templateNext(harnessRoot, log, path) {
   if (path === INSTALLED_TRACKS) return installedTracksText(log.spec.tracks.filter(isTrack));
   const helper = helperSources().get(path);
-  if (helper === void 0 && !path.startsWith(CLAUDE_DIR3)) return null;
+  if (helper === void 0 && !path.startsWith(CLAUDE_DIR4)) return null;
   try {
-    const source = helper ?? path.slice(CLAUDE_DIR3.length);
-    return readFileSync25(join33(harnessRoot, "templates", source), "utf8");
+    const source = helper ?? path.slice(CLAUDE_DIR4.length);
+    return readFileSync26(join34(harnessRoot, "templates", source), "utf8");
   } catch {
     return null;
   }
 }
 function removeRecordedFile(path, ctx) {
   const { log, projectDir, io, out } = ctx;
-  const abs = join33(projectDir, path);
+  const abs = join34(projectDir, path);
   let foreign;
   try {
     foreign = foreignOwnedTarget(projectDir, path);
@@ -11641,7 +11901,7 @@ function removeRecordedFile(path, ctx) {
   }
   let st2;
   try {
-    st2 = lstatSync7(abs, { throwIfNoEntry: false });
+    st2 = lstatSync8(abs, { throwIfNoEntry: false });
   } catch {
     out.unjudged.push(path);
     return;
@@ -11659,7 +11919,7 @@ function removeRecordedFile(path, ctx) {
       return;
     }
     if (st2.isSymbolicLink()) effective = real;
-    disk = readFileSync25(effective, "utf8");
+    disk = readFileSync26(effective, "utf8");
   } catch {
     out.unjudged.push(path);
     return;
@@ -11706,11 +11966,11 @@ function mayReclaimLegacy(log, projectDir, path) {
 function removeLegacyHookWiring(log, projectDir, scope, io, removed) {
   if (!scope.has(SETTINGS_TARGET) || !installedClis(log).includes("claude")) return [];
   if ((log.portions ?? []).some((p2) => p2.path === SETTINGS_TARGET)) return [];
-  const abs = join33(projectDir, SETTINGS_TARGET);
+  const abs = join34(projectDir, SETTINGS_TARGET);
   if (!safeExists(abs) || outsideProjectTarget(projectDir, abs) !== null) return [];
-  const claudeDir = join33(projectDir, ".claude");
+  const claudeDir = join34(projectDir, ".claude");
   const gone = LEGACY_HOOK_REFS.filter(
-    (r) => !RETIRED_HOOK_WIRING_REFS.includes(r) && (removed.includes(`${CLAUDE_DIR3}${r}`) || !safeExists(join33(claudeDir, r)))
+    (r) => !RETIRED_HOOK_WIRING_REFS.includes(r) && (removed.includes(`${CLAUDE_DIR4}${r}`) || !safeExists(join34(claudeDir, r)))
   );
   return removeRetiredHookRefs(abs, claudeDir, gone, { evenIfScriptExists: true, write: io.write });
 }
@@ -11731,7 +11991,7 @@ function stripSharedFiles(log, projectDir, paths, io, out, pruneFrom) {
   };
   for (const path of paths) {
     if (!relevant(path)) continue;
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (safeExists(abs)) {
       const o = outsideProjectTarget(projectDir, abs);
       if (o !== null) {
@@ -11742,7 +12002,7 @@ function stripSharedFiles(log, projectDir, paths, io, out, pruneFrom) {
     if (path === SETTINGS_TARGET && safeExists(abs)) {
       out.retiredWiring = removeRetiredHookRefs(
         abs,
-        join33(projectDir, ".claude"),
+        join34(projectDir, ".claude"),
         RETIRED_HOOK_WIRING_REFS,
         { evenIfScriptExists: true, write: io.write }
       );
@@ -11770,7 +12030,7 @@ function stripSharedFiles(log, projectDir, paths, io, out, pruneFrom) {
   }
 }
 function removeHarnessMadeShared(path, sha, projectDir, io, out, pruneFrom) {
-  const abs = join33(projectDir, path);
+  const abs = join34(projectDir, path);
   if (!existsSync24(abs)) {
     out.forgotten.add(path);
     return true;
@@ -11783,8 +12043,8 @@ function removeHarnessMadeShared(path, sha, projectDir, io, out, pruneFrom) {
       out.unjudged.push(path);
       return true;
     }
-    if (lstatSync7(abs).isSymbolicLink()) effective = real;
-    current = readFileSync25(effective, "utf8");
+    if (lstatSync8(abs).isSymbolicLink()) effective = real;
+    current = readFileSync26(effective, "utf8");
   } catch {
     out.unjudged.push(path);
     return true;
@@ -11852,14 +12112,16 @@ function displacedLines(displaced, preview) {
   const restore = displaced.filter((d2) => d2.verdict === "restore");
   if (preview && restore.length > 0) {
     lines.push(
-      `  \u25CB put back ${restore.length} file(s) of yours (displaced): ${restore.map((d2) => d2.path).join(" \xB7 ")}`
+      `  \u25CB put back ${restore.length} file(s) of yours (displaced): ${restore.map((d2) => screenText(d2.path)).join(" \xB7 ")}`
     );
   }
   for (const d2 of displaced) {
     if (d2.verdict === "restore" && !preview) {
-      lines.push(`  ${status.success(`put back  ${d2.path} (from ${d2.backup})`)}`);
+      lines.push(
+        `  ${status.success(`put back  ${screenText(d2.path)} (from ${screenText(String(d2.backup))})`)}`
+      );
     } else if (d2.verdict === "advise") {
-      lines.push(`  ${c.yellow("\u2298")} ${d2.path} \u2014 ${d2.line}`);
+      lines.push(`  ${c.yellow("\u2298")} ${screenText(d2.path)} \u2014 ${d2.line}`);
     }
   }
   return lines;
@@ -11961,13 +12223,14 @@ function harnessRemovalLines(r, log, projectDir, scope, preview, alsoGone = [])
   }
   lines.push(...sharedStripLines(r.shared, preview));
   lines.push(...leftFolderLines(r, log, projectDir, scope, preview, alsoGone));
+  lines.push(...byHandLines(r.offSlot, r.displaced, projectDir, log));
   return lines;
 }
 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)
+    (o) => o.link === o.path ? `  ${c.yellow("\u2298")} ${screenText(o.path)} kept \u2014 link target is outside the project (${screenText(o.target)}). Not touched; remove manually if intended.` : keptOutsideLinkLine(o, log)
   );
 }
 function leftFolderLines(r, log, projectDir, scope, preview, alsoGone) {
@@ -12009,19 +12272,19 @@ function yoursUnder(projectDir, dir) {
     }
     for (const e2 of entries) {
       const name = `${prefix}${e2.name}`;
-      if (e2.isDirectory()) walk(join33(abs2, e2.name), `${name}/`);
+      if (e2.isDirectory()) walk(join34(abs2, e2.name), `${name}/`);
       else if (BACKUP_SUFFIX.test(e2.name)) continue;
       else if (e2.isSymbolicLink()) {
         let target = "?";
         try {
-          target = readlinkSync2(join33(abs2, e2.name));
+          target = readlinkSync2(join34(abs2, e2.name));
         } catch {
         }
         out.push({ name, shown: `${name} (your link \u2192 ${target})` });
       } else out.push({ name, shown: name });
     }
   };
-  const abs = join33(projectDir, dir);
+  const abs = join34(projectDir, dir);
   try {
     if (!statSync4(abs).isDirectory()) return [];
   } catch {
@@ -12033,7 +12296,7 @@ function yoursUnder(projectDir, dir) {
 function assetsLeftLines(log, projectDir, scope) {
   const lines = [];
   for (const a of log.assets) {
-    const here = (a.files ?? []).map((f) => f.path).filter((p2) => scope.has(p2) && safeExists(join33(projectDir, p2)));
+    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();
     lines.push(
@@ -12045,7 +12308,7 @@ function assetsLeftLines(log, projectDir, scope) {
 function removeAnchor(log, projectDir, io) {
   const rootMd = log.templates?.rootClaudeMd;
   if (!rootMd) return { removed: false, lines: [] };
-  const abs = join33(projectDir, rootMd.path);
+  const abs = join34(projectDir, rootMd.path);
   if (!existsSync24(abs)) return { removed: false, lines: [] };
   const outside = outsideProjectTarget(projectDir, abs);
   if (outside !== null) return { removed: false, lines: outsideLines([outside], log) };
@@ -12054,7 +12317,7 @@ function removeAnchor(log, projectDir, io) {
   }
   let disk;
   try {
-    disk = readFileSync25(abs, "utf8");
+    disk = readFileSync26(abs, "utf8");
   } catch {
     return {
       removed: false,
@@ -12099,7 +12362,7 @@ function removeAnchor(log, projectDir, io) {
 var AGENTS_MD2 = "AGENTS.md";
 function readAgentsMdTemplate(harnessRoot) {
   try {
-    return readFileSync25(join33(harnessRoot, AGENTS_MD_TEMPLATE), "utf8");
+    return readFileSync26(join34(harnessRoot, AGENTS_MD_TEMPLATE), "utf8");
   } catch {
     return null;
   }
@@ -12125,14 +12388,14 @@ function agentsMdRemainder(current, harnessRoot) {
   return { ok: true, remainder: strip.remainder, strip };
 }
 function removeUnrecordedLegacyAgentsMd(path, projectDir, io, out, pruneFrom) {
-  const abs = join33(projectDir, path);
+  const abs = join34(projectDir, path);
   let effective = abs;
   let current;
   try {
     const real = realpathSync4(abs);
     if (!statSync4(real).isFile()) return false;
-    if (lstatSync7(abs).isSymbolicLink()) effective = real;
-    current = readFileSync25(effective, "utf8");
+    if (lstatSync8(abs).isSymbolicLink()) effective = real;
+    current = readFileSync26(effective, "utf8");
   } catch {
     return false;
   }
@@ -12190,33 +12453,95 @@ function globalCopyLines(copies, preview) {
   });
 }
 var ASSET_SLOTS = skillFolders(SKILL_ROOTS);
-function offSlotLines(paths, projectDir) {
-  const lines = [];
+function offSlotGroups(paths, projectDir) {
+  const literal = [];
   const byLink = /* @__PURE__ */ new Map();
   for (const path of paths) {
     const link = linkOnPath(projectDir, path);
     if (link === null) {
-      lines.push(offSlotLine(path, "lists it"));
+      literal.push(path);
       continue;
     }
-    const g = byLink.get(link.link) ?? { target: link.target, n: 0 };
-    g.n += 1;
+    const g = byLink.get(link.link) ?? { target: link.target, files: [] };
+    g.files.push(path);
     byLink.set(link.link, g);
   }
-  for (const [link, g] of byLink) {
+  return { literal, byLink };
+}
+function offSlotLines(paths, projectDir) {
+  const { literal, byLink } = offSlotGroups(paths, projectDir);
+  return [
+    ...literal.map((path) => offSlotLine(path, "lists it")),
+    ...[...byLink].map(
+      ([link, g]) => `  ${c.yellow("\u2298")} ${screenText(link)} \u2014 your link (\u2192 ${screenText(g.target)}) leads outside the places this tool installs to; left ${g.files.length} file(s) on the install record under it. Not touched \u2014 remove by hand if intended.`
+    )
+  ];
+}
+function byHandLines(offSlot, displaced, projectDir, log) {
+  let hidden = 0;
+  let bundleTargets;
+  const stands = (path, confirmed) => {
+    if (isPlainPath(path) && confirmed()) return true;
+    hidden += 1;
+    return false;
+  };
+  const back = displaced.flatMap((d2) => d2.handBack === void 0 ? [] : [d2.handBack]);
+  const movable = back.filter((b2) => stands(b2.from, () => true) && stands(b2.to, () => b2.safe));
+  const links = [...offSlotGroups(offSlot, projectDir).byLink].flatMap(([link, g]) => {
+    const shown = g.files.filter((f) => f !== link).filter(
+      (f) => stands(f, () => {
+        bundleTargets ??= recordedTrackTargets(log);
+        return isPlainPath(link) && holdsHarnessBytes(log, projectDir, f, bundleTargets);
+      })
+    ).sort();
+    return shown.length > 0 ? [{ link, files: shown }] : [];
+  });
+  if (movable.length === 0 && links.length === 0 && hidden === 0) return [];
+  const yours = new Set(movable.map((b2) => b2.to));
+  const lines = [
+    `  ${c.yellow("\u2298")} left for you to finish by hand (nothing here was touched \u2014 run from the project folder):`
+  ];
+  if (movable.length > 0) {
     lines.push(
-      `  ${c.yellow("\u2298")} ${link} \u2014 your link (\u2192 ${g.target}) leads outside the places this tool installs to; left ${g.n} file(s) on the install record under it. Not touched \u2014 remove by hand if intended.`
+      c.dim(
+        "      your files this tool moved aside \u2014 put each back (only an empty place or a harness copy is overwritten):"
+      )
+    );
+    for (const b2 of movable) lines.push(c.dim(`        mv -i ${b2.from} ${b2.to}`));
+  }
+  for (const g of links) {
+    lines.push(
+      c.dim(
+        `      listed on the install record under your link ${g.link} \u2014 check, then remove if intended:`
+      )
+    );
+    for (const file of g.files) {
+      lines.push(
+        c.dim(
+          yours.has(file) ? `        ${file}  (your own file goes back here \u2014 do not delete)` : `        ${file}`
+        )
+      );
+    }
+  }
+  if (hidden > 0) {
+    lines.push(
+      c.dim(
+        `      not shown \u2014 ${hidden} entr${hidden === 1 ? "y" : "ies"} on the install record that this tool cannot confirm it wrote or cannot safely put back (a name it never writes, or contents that differ from what it installed): inspect the record, and look for *.backup-* files`
+      )
     );
   }
   return lines;
 }
+function isPlainPath(path) {
+  return path.split("/").every((seg) => /^[A-Za-z0-9._][A-Za-z0-9._-]*$/.test(seg) && seg !== "." && seg !== "..");
+}
 function linkOnPath(projectDir, path) {
   const parts = path.split("/");
   for (let i = 1; i <= parts.length; i++) {
     const rel = parts.slice(0, i).join("/");
     try {
-      if (lstatSync7(join33(projectDir, rel), { throwIfNoEntry: false })?.isSymbolicLink() === true) {
-        return { link: rel, target: readlinkSync2(join33(projectDir, rel)) };
+      if (lstatSync8(join34(projectDir, rel), { throwIfNoEntry: false })?.isSymbolicLink() === true) {
+        return { link: rel, target: readlinkSync2(join34(projectDir, rel)) };
       }
     } catch {
       return null;
@@ -12225,16 +12550,16 @@ function linkOnPath(projectDir, path) {
   return null;
 }
 function offSlotLine(path, what) {
-  return `  ${c.yellow("\u2298")} ${path} left \u2014 the install record ${what}, but it is (or leads) outside the places this tool installs to. Not touched.`;
+  return `  ${c.yellow("\u2298")} ${screenText(path)} left \u2014 the install record ${what}, but it is (or leads) outside the places this tool installs to. Not touched.`;
 }
 function removeToolFiles(files, projectDir, rm) {
   const notes = [];
   const removed = [];
   let failed = 0;
-  const pairs = new Set(files.filter((f) => isAppleDoublePath(join33(projectDir, f.path))));
+  const pairs = new Set(files.filter((f) => isAppleDoublePath(join34(projectDir, f.path))));
   for (const file of files) {
     const { path, sha256 } = file;
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (pairs.has(file)) {
       try {
         rm(abs);
@@ -12244,7 +12569,7 @@ function removeToolFiles(files, projectDir, rm) {
     }
     let isLink;
     try {
-      isLink = lstatSync7(abs).isSymbolicLink();
+      isLink = lstatSync8(abs).isSymbolicLink();
     } catch {
       continue;
     }
@@ -12264,7 +12589,7 @@ function removeToolFiles(files, projectDir, rm) {
       continue;
     }
     try {
-      if (hashContent(readFileSync25(abs, "utf8")) !== sha256) {
+      if (hashContent(readFileSync26(abs, "utf8")) !== sha256) {
         const backup = backupFile(abs);
         notes.push(`backed up ${path} \u2192 ${relative9(projectDir, backup)} (changed since install)`);
       }
@@ -12275,7 +12600,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, dirname8(join33(projectDir, path)));
+  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname8(join34(projectDir, path)));
   return failed > 0 ? { ok: false, message: `${failed} file(s) could not be removed`, notes } : { ok: true, notes };
 }
 function pruneEmptyDirsUpward(projectDir, startDir) {
@@ -12299,8 +12624,8 @@ function stripRootImport(projectDir) {
   if (withoutImport === null) return false;
   const stripped = neutralizeScaffoldBanner(withoutImport);
   try {
-    backupIfLossyUtf8(join33(projectDir, "CLAUDE.md"));
-    writeFileSync8(join33(projectDir, "CLAUDE.md"), stripped, "utf8");
+    backupIfLossyUtf8(join34(projectDir, "CLAUDE.md"));
+    writeFileSync8(join34(projectDir, "CLAUDE.md"), stripped, "utf8");
     return true;
   } catch {
     return false;
@@ -12322,13 +12647,13 @@ function importOutsideLine(o, anchorGone) {
   return `  ${c.yellow("\u2298")} CLAUDE.md kept \u2014 link target is outside the project (${o.target}). Not touched \u2014 its harness @import block (${HARNESS_IMPORT_LINE}) is left in it${pointing} \u2014 delete that block by hand.`;
 }
 function rootClaudeMdOutside(projectDir) {
-  return outsideProjectTarget(projectDir, join33(projectDir, "CLAUDE.md"));
+  return outsideProjectTarget(projectDir, join34(projectDir, "CLAUDE.md"));
 }
 function readRootClaudeMd(projectDir) {
-  const path = join33(projectDir, "CLAUDE.md");
+  const path = join34(projectDir, "CLAUDE.md");
   if (!existsSync24(path)) return null;
   try {
-    return readFileSync25(path, "utf8");
+    return readFileSync26(path, "utf8");
   } catch {
     return null;
   }