@ijfw/install 1.6.0 → 1.6.2

package/dist/uninstall.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/uninstall.js
-import { existsSync as existsSync2, rmSync, cpSync, mkdtempSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, renameSync as renameSync2, unlinkSync as unlinkSync2, readdirSync } from "node:fs";
-import { resolve as resolve2, join as join2, dirname as dirname2 } from "node:path";
+import { existsSync as existsSync3, rmSync, cpSync, mkdtempSync, readFileSync as readFileSync3, writeFileSync as writeFileSync3, renameSync as renameSync2, unlinkSync as unlinkSync2, readdirSync as readdirSync2, realpathSync, statSync, chmodSync } from "node:fs";
+import { resolve as resolve2, join as join3, dirname as dirname2, basename } from "node:path";
 import { homedir as homedir2, tmpdir } from "node:os";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -95,6 +95,29 @@ function unmergeMarketplace(settingsPath = claudeSettingsPath()) {
   return settings;
 }
 
+// src/install-ledger.js
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, readdirSync } from "node:fs";
+import { join as join2 } from "node:path";
+function ledgerPath(ijfwHome) {
+  return join2(ijfwHome, "install-ledger.json");
+}
+function readLedger(ijfwHome) {
+  try {
+    const raw = readFileSync2(ledgerPath(ijfwHome), "utf8");
+    const doc = JSON.parse(raw);
+    if (doc && Array.isArray(doc.createdDirs)) return doc;
+  } catch {
+  }
+  return { version: 1, createdDirs: [] };
+}
+function isEmptyDir(p) {
+  try {
+    return existsSync2(p) && readdirSync(p).length === 0;
+  } catch {
+    return false;
+  }
+}
+
 // src/uninstall.js
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname2(__filename);
@@ -103,9 +126,9 @@ function resolveAiderTemplate(name, repoRoot) {
   const root = repoRoot || REPO_ROOT;
   const candidates = [
     // (a) git clone: top-level aider/ under the (injected) repo root.
-    join2(root, "aider", name),
+    join3(root, "aider", name),
     // (a') repo root with staged templates under installer/.
-    join2(root, "installer", "templates", "aider", name),
+    join3(root, "installer", "templates", "aider", name),
     // (b) tarball/dist fallback: templates staged next to the package root.
     //   dist/uninstall.js -> __dirname=<pkg>/dist -> <pkg>/templates/aider/<name>
     //   src/uninstall.js  -> __dirname=<pkg>/src  -> <pkg>/templates/aider/<name>
@@ -114,17 +137,26 @@ function resolveAiderTemplate(name, repoRoot) {
   ];
   for (const c of candidates) {
     try {
-      if (existsSync2(c)) return c;
+      if (existsSync3(c)) return c;
     } catch {
     }
   }
   return "";
 }
 function writeAtomic(target, content) {
+  let mode = 384;
+  try {
+    mode = statSync(target).mode & 511;
+  } catch {
+  }
   const tmp = `${target}.tmp.${process.pid}.${Date.now()}`;
-  writeFileSync2(tmp, content);
+  writeFileSync3(tmp, content, { mode });
   try {
     renameSync2(tmp, target);
+    try {
+      chmodSync(target, mode);
+    } catch {
+    }
   } catch (err) {
     try {
       unlinkSync2(tmp);
@@ -178,7 +210,7 @@ function confirm(question) {
 var HOME = homedir2();
 var TS = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").replace("T", "_").slice(0, 19);
 function backupFile(p) {
-  if (existsSync2(p)) {
+  if (existsSync3(p)) {
     const bak = p + ".bak." + TS;
     cpSync(p, bak);
     return bak;
@@ -212,10 +244,10 @@ function hasIjfwMarker(text) {
 }
 function stripMarkerFile(p, opts = {}) {
   try {
-    if (!existsSync2(p)) return null;
+    if (!existsSync3(p)) return null;
     let text;
     try {
-      text = readFileSync2(p, "utf8");
+      text = readFileSync3(p, "utf8");
     } catch {
       return null;
     }
@@ -229,35 +261,46 @@ function stripMarkerFile(p, opts = {}) {
     }
     writeAtomic(p, stripped);
     return `${opts.label || p}  (stripped IJFW marker regions, user content preserved)`;
-  } catch {
-    return null;
+  } catch (err) {
+    return `${opts.label || p}  (KEPT -- IJFW region strip FAILED: ${err && err.message ? err.message : err}; remove the IJFW marker regions manually)`;
   }
 }
 function removeTomlSection(p) {
-  if (!existsSync2(p)) return false;
-  backupFile(p);
-  const lines = readFileSync2(p, "utf8").split("\n");
+  if (!existsSync3(p)) return false;
+  const lines = readFileSync3(p, "utf8").split("\n");
   const out = [];
   let skip = false;
+  let changed = false;
   for (const line of lines) {
     if (/^\[mcp_servers\.ijfw-memory\]\s*$/.test(line)) {
       skip = true;
+      changed = true;
       continue;
     }
     if (skip && line.startsWith("[") && !line.startsWith("[mcp_servers.ijfw-memory]")) skip = false;
     if (!skip) out.push(line);
   }
-  writeAtomic(p, out.join("\n") + "\n");
+  if (!changed) return false;
+  backupFile(p);
+  let text = out.join("\n");
+  if (!text.endsWith("\n")) text += "\n";
+  writeAtomic(p, text);
   return true;
 }
 function removeJsonMcpEntry(p) {
-  if (!existsSync2(p)) return false;
-  let doc;
+  if (!existsSync3(p)) return false;
+  let raw;
   try {
-    doc = JSON.parse(readFileSync2(p, "utf8"));
+    raw = readFileSync3(p, "utf8");
   } catch {
     return false;
   }
+  let doc;
+  try {
+    doc = JSON.parse(raw);
+  } catch {
+    return /\bijfw-memory\b/.test(raw) ? "parse-failed" : false;
+  }
   if (!doc || typeof doc !== "object") return false;
   let changed = false;
   if (doc.mcpServers && doc.mcpServers["ijfw-memory"]) {
@@ -270,10 +313,10 @@ function removeJsonMcpEntry(p) {
 }
 function removeNestedMcpEntry(p, keyPath) {
   try {
-    if (!existsSync2(p)) return false;
+    if (!existsSync3(p)) return false;
     let doc;
     try {
-      doc = JSON.parse(readFileSync2(p, "utf8"));
+      doc = JSON.parse(readFileSync3(p, "utf8"));
     } catch {
       return false;
     }
@@ -294,43 +337,43 @@ function removeNestedMcpEntry(p, keyPath) {
 }
 function resolveClineSettingsPath(home) {
   const H = home;
-  const APPDATA = process.env.APPDATA || join2(H, "AppData", "Roaming");
+  const APPDATA = process.env.APPDATA || join3(H, "AppData", "Roaming");
   const ext = "saoudrizwan.claude-dev";
   let userDirs;
   if (process.platform === "darwin") {
     userDirs = [
-      join2(H, "Library", "Application Support", "Code", "User"),
-      join2(H, "Library", "Application Support", "Code - Insiders", "User"),
-      join2(H, "Library", "Application Support", "VSCodium", "User")
+      join3(H, "Library", "Application Support", "Code", "User"),
+      join3(H, "Library", "Application Support", "Code - Insiders", "User"),
+      join3(H, "Library", "Application Support", "VSCodium", "User")
     ];
   } else if (process.platform === "win32") {
     userDirs = [
-      join2(APPDATA, "Code", "User"),
-      join2(APPDATA, "Code - Insiders", "User"),
-      join2(APPDATA, "VSCodium", "User")
+      join3(APPDATA, "Code", "User"),
+      join3(APPDATA, "Code - Insiders", "User"),
+      join3(APPDATA, "VSCodium", "User")
     ];
   } else {
     userDirs = [
-      join2(H, ".config", "Code", "User"),
-      join2(H, ".config", "VSCodium", "User"),
-      join2(H, ".var", "app", "com.visualstudio.code", "config", "Code", "User"),
-      join2(H, "snap", "code", "current", ".config", "Code", "User")
+      join3(H, ".config", "Code", "User"),
+      join3(H, ".config", "VSCodium", "User"),
+      join3(H, ".var", "app", "com.visualstudio.code", "config", "Code", "User"),
+      join3(H, "snap", "code", "current", ".config", "Code", "User")
     ];
   }
   for (const d of userDirs) {
-    const settings = join2(d, "globalStorage", ext, "settings", "cline_mcp_settings.json");
-    if (existsSync2(settings)) return settings;
+    const settings = join3(d, "globalStorage", ext, "settings", "cline_mcp_settings.json");
+    if (existsSync3(settings)) return settings;
   }
   return null;
 }
 function removeAiderFileIfPristine(installedPath, templatePath) {
   try {
-    if (!existsSync2(installedPath)) return "absent";
-    if (!existsSync2(templatePath)) return "kept-modified";
+    if (!existsSync3(installedPath)) return "absent";
+    if (!existsSync3(templatePath)) return "kept-modified";
     let a, b;
     try {
-      a = readFileSync2(installedPath);
-      b = readFileSync2(templatePath);
+      a = readFileSync3(installedPath);
+      b = readFileSync3(templatePath);
     } catch {
       return "kept-modified";
     }
@@ -345,10 +388,10 @@ function removeAiderFileIfPristine(installedPath, templatePath) {
   }
 }
 function removeCodexHooks(p) {
-  if (!existsSync2(p)) return false;
+  if (!existsSync3(p)) return false;
   let doc;
   try {
-    doc = JSON.parse(readFileSync2(p, "utf8"));
+    doc = JSON.parse(readFileSync3(p, "utf8"));
   } catch {
     return false;
   }
@@ -389,9 +432,10 @@ function removeCodexHooks(p) {
   return false;
 }
 function removeYamlMcpEntry(p) {
-  if (!existsSync2(p)) return false;
-  const raw = readFileSync2(p, "utf8");
+  if (!existsSync3(p)) return false;
+  const raw = readFileSync3(p, "utf8");
   if (!/\bijfw-memory\b/.test(raw)) return false;
+  const bak = backupFile(p);
   const py = spawnSync("python3", ["-c", `
 import sys, yaml
 p = sys.argv[1]
@@ -404,12 +448,11 @@ del srv["ijfw-memory"]
 if not srv: del doc["mcp_servers"]
 with open(p + ".tmp", "w") as f:
     yaml.safe_dump(doc, f, sort_keys=False, default_flow_style=False)
-import os; os.replace(p + ".tmp", p)
+import os, stat
+os.chmod(p + ".tmp", stat.S_IMODE(os.stat(p).st_mode))
+os.replace(p + ".tmp", p)
 `, p], { encoding: "utf8" });
-  if (py.status === 0) {
-    backupFile(p);
-    return true;
-  }
+  if (py.status === 0) return true;
   const stripped = raw.replace(
     // eslint-disable-next-line security/detect-unsafe-regex -- raw is a small local YAML config file; pattern is line-anchored to the IJFW-owned block.
     /^  ijfw-memory:\n(?:    .*\n)*(?:# IJFW-MCP-END ijfw-memory\n)?/m,
@@ -419,17 +462,93 @@ import os; os.replace(p + ".tmp", p)
     /# IJFW-MCP-BEGIN ijfw-memory\n(?:.*\n)*?# IJFW-MCP-END ijfw-memory\n/,
     ""
   );
-  if (stripped === raw) return false;
-  backupFile(p);
+  if (stripped === raw) {
+    if (bak) {
+      try {
+        rmSync(bak, { force: true });
+      } catch {
+      }
+    }
+    return false;
+  }
   writeAtomic(p, stripped);
   return true;
 }
+function resolveShippedTemplate(rel, repoRoot) {
+  const root = repoRoot || REPO_ROOT;
+  const candidates = [
+    join3(root, rel),
+    join3(root, "installer", "templates", rel),
+    resolve2(__dirname, "..", "templates", rel)
+  ];
+  for (const c of candidates) {
+    try {
+      if (existsSync3(c)) return c;
+    } catch {
+    }
+  }
+  return "";
+}
+function removeHermesIjfwWiring(p) {
+  if (!existsSync3(p)) return false;
+  const raw = readFileSync3(p, "utf8");
+  if (!/\bijfw\b/i.test(raw)) return false;
+  const bak = backupFile(p);
+  const py = spawnSync("python3", ["-c", `
+import sys, yaml
+p = sys.argv[1]
+with open(p) as f: raw = f.read()
+doc = yaml.safe_load(raw) if raw.strip() else {}
+if not isinstance(doc, dict): sys.exit(2)
+changed = False
+srv = doc.get('mcp_servers')
+if isinstance(srv, dict) and 'ijfw-memory' in srv:
+    del srv['ijfw-memory']; changed = True
+    if not srv: del doc['mcp_servers']
+pl = doc.get('plugins')
+if isinstance(pl, dict) and isinstance(pl.get('enabled'), list) and 'ijfw' in pl['enabled']:
+    pl['enabled'] = [x for x in pl['enabled'] if x != 'ijfw']; changed = True
+    if not pl['enabled']: del pl['enabled']
+    if not pl: del doc['plugins']
+hk = doc.get('hooks')
+if isinstance(hk, dict):
+    for ev in list(hk.keys()):
+        items = hk[ev]
+        if isinstance(items, list):
+            new = [it for it in items if not (isinstance(it, dict) and 'ijfw' in str(it.get('script','')))]
+            if len(new) != len(items):
+                changed = True
+                if new: hk[ev] = new
+                else: del hk[ev]
+    if isinstance(doc.get('hooks'), dict) and not doc['hooks']: del doc['hooks']
+if not changed: sys.exit(3)
+with open(p + '.tmp', 'w') as f:
+    if doc: yaml.safe_dump(doc, f, sort_keys=False, default_flow_style=False)
+    else: f.write('')
+import os, stat
+os.chmod(p + '.tmp', stat.S_IMODE(os.stat(p).st_mode))
+os.replace(p + '.tmp', p)
+`, p], { encoding: "utf8" });
+  if (py.status === 0) return true;
+  const out = raw.replace(/# IJFW-MCP-BEGIN ijfw-memory\n[\s\S]*?# IJFW-MCP-END ijfw-memory\n/g, "").replace(/# IJFW-PLUGINS-BEGIN\n[\s\S]*?# IJFW-PLUGINS-END\n/g, "").replace(/# IJFW-HOOK-BEGIN pre_tool_use\n[\s\S]*?# IJFW-HOOK-END pre_tool_use\n/g, "").replace(/^[ \t]*-[ \t]+ijfw[ \t]*\n/gm, "").replace(/^[ \t]*-[ \t]+script:[ \t]*["']?plugins\/ijfw\/[^\n]*\n/gm, "");
+  if (out === raw) {
+    if (bak) {
+      try {
+        rmSync(bak, { force: true });
+      } catch {
+      }
+    }
+    return false;
+  }
+  writeAtomic(p, out);
+  return true;
+}
 function removeIjfwSkills(dir) {
-  if (!existsSync2(dir)) return 0;
+  if (!existsSync3(dir)) return 0;
   let count = 0;
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of readdirSync2(dir, { withFileTypes: true })) {
     if (entry.isDirectory() && entry.name.startsWith("ijfw-")) {
-      rmSync(join2(dir, entry.name), { recursive: true, force: true });
+      rmSync(join3(dir, entry.name), { recursive: true, force: true });
       count++;
     }
   }
@@ -460,109 +579,199 @@ var CODEX_COMMAND_FILES = [
   "workflow.md"
 ];
 function removeCodexCommands(dir) {
-  if (!existsSync2(dir)) return 0;
+  if (!existsSync3(dir)) return 0;
   let count = 0;
   for (const name of CODEX_COMMAND_FILES) {
-    const path = join2(dir, name);
-    if (existsSync2(path)) {
+    const path = join3(dir, name);
+    if (existsSync3(path)) {
       rmSync(path, { force: true });
       count++;
     }
   }
   return count;
 }
+function removeCodexHookFiles(hooksDir) {
+  if (!existsSync3(hooksDir)) return 0;
+  let count = 0;
+  const scriptsDir = join3(hooksDir, "scripts");
+  if (existsSync3(scriptsDir)) {
+    rmSync(scriptsDir, { recursive: true, force: true });
+    count++;
+  }
+  let entries = [];
+  try {
+    entries = readdirSync2(hooksDir, { withFileTypes: true });
+  } catch {
+    return count;
+  }
+  for (const e of entries) {
+    if (!e.isFile() || !e.name.endsWith(".sh")) continue;
+    const p = join3(hooksDir, e.name);
+    let body = "";
+    try {
+      body = readFileSync3(p, "utf8");
+    } catch {
+      continue;
+    }
+    const header = body.split("\n", 4).slice(0, 4);
+    if (header.some((l) => /^#\s*IJFW\b/.test(l))) {
+      backupFile(p);
+      rmSync(p, { force: true });
+      count++;
+    }
+  }
+  return count;
+}
+function removeKnownMarketplacesEntry(p) {
+  if (!existsSync3(p)) return false;
+  let doc;
+  try {
+    doc = JSON.parse(readFileSync3(p, "utf8"));
+  } catch {
+    return false;
+  }
+  if (!doc || typeof doc !== "object") return false;
+  let changed = false;
+  if (doc.ijfw) {
+    delete doc.ijfw;
+    changed = true;
+  }
+  if (doc.extraKnownMarketplaces && typeof doc.extraKnownMarketplaces === "object" && doc.extraKnownMarketplaces.ijfw) {
+    delete doc.extraKnownMarketplaces.ijfw;
+    if (Object.keys(doc.extraKnownMarketplaces).length === 0) delete doc.extraKnownMarketplaces;
+    changed = true;
+  }
+  if (!changed) return false;
+  backupFile(p);
+  writeAtomic(p, JSON.stringify(doc, null, 2) + "\n");
+  return true;
+}
 function cleanPlatforms(opts = {}) {
   const home = opts.home || HOME;
   const cwd = opts.cwd || process.cwd();
   const repoRoot = opts.repoRoot || REPO_ROOT;
   const removed = [];
-  if (removeTomlSection(join2(home, ".codex", "config.toml"))) {
+  const rmJsonEntry = (p, label) => {
+    const r = removeJsonMcpEntry(p);
+    if (r === "parse-failed") {
+      removed.push(`${label}  (KEPT -- file is not valid JSON but still references ijfw-memory; remove the entry manually)`);
+      return false;
+    }
+    return r === true;
+  };
+  if (rmJsonEntry(join3(home, ".claude", "settings.json"), "~/.claude/settings.json")) {
+    removed.push("~/.claude/settings.json  (removed ijfw-memory mcp entry)");
+  }
+  if (removeKnownMarketplacesEntry(join3(home, ".claude", "plugins", "known_marketplaces.json"))) {
+    removed.push("~/.claude/plugins/known_marketplaces.json  (removed ijfw entry)");
+  }
+  if (removeTomlSection(join3(home, ".codex", "config.toml"))) {
     removed.push("~/.codex/config.toml  (removed [mcp_servers.ijfw-memory])");
   }
-  if (removeCodexHooks(join2(home, ".codex", "hooks.json"))) {
+  if (removeCodexHooks(join3(home, ".codex", "hooks.json"))) {
     removed.push("~/.codex/hooks.json  (removed IJFW hook entries)");
   }
-  const codexSkills = removeIjfwSkills(join2(home, ".codex", "skills"));
+  const codexSkills = removeIjfwSkills(join3(home, ".codex", "skills"));
   if (codexSkills > 0) removed.push(`~/.codex/skills/ijfw-*  (removed ${codexSkills} skill dirs)`);
-  const codexCommands = removeCodexCommands(join2(home, ".codex", "commands"));
+  const codexCommands = removeCodexCommands(join3(home, ".codex", "commands"));
   if (codexCommands > 0) removed.push(`~/.codex/commands  (removed ${codexCommands} IJFW command aliases)`);
-  const codexMd = join2(home, ".codex", "IJFW.md");
-  if (existsSync2(codexMd)) {
+  const codexMd = join3(home, ".codex", "IJFW.md");
+  if (existsSync3(codexMd)) {
     rmSync(codexMd, { force: true });
     removed.push("~/.codex/IJFW.md");
   }
-  if (removeJsonMcpEntry(join2(home, ".gemini", "settings.json"))) {
+  const codexHookFiles = removeCodexHookFiles(join3(home, ".codex", "hooks"));
+  if (codexHookFiles > 0) removed.push(`~/.codex/hooks/  (removed ${codexHookFiles} IJFW hook scripts)`);
+  if (rmJsonEntry(join3(home, ".gemini", "settings.json"), "~/.gemini/settings.json")) {
     removed.push("~/.gemini/settings.json  (removed ijfw-memory)");
   }
-  const geminiExt = join2(home, ".gemini", "extensions", "ijfw");
-  if (existsSync2(geminiExt)) {
+  const geminiExt = join3(home, ".gemini", "extensions", "ijfw");
+  if (existsSync3(geminiExt)) {
     rmSync(geminiExt, { recursive: true, force: true });
     removed.push("~/.gemini/extensions/ijfw/");
   }
-  const cursorMcp = join2(cwd, ".cursor", "mcp.json");
-  if (removeJsonMcpEntry(cursorMcp)) removed.push(".cursor/mcp.json  (removed ijfw-memory)");
-  if (removeJsonMcpEntry(join2(home, ".codeium", "windsurf", "mcp_config.json"))) {
+  const cursorMcp = join3(cwd, ".cursor", "mcp.json");
+  if (rmJsonEntry(cursorMcp, ".cursor/mcp.json")) removed.push(".cursor/mcp.json  (removed ijfw-memory)");
+  if (rmJsonEntry(join3(home, ".codeium", "windsurf", "mcp_config.json"), "~/.codeium/windsurf/mcp_config.json")) {
     removed.push("~/.codeium/windsurf/mcp_config.json  (removed ijfw-memory)");
   }
-  const vscodeMcp = join2(cwd, ".vscode", "mcp.json");
-  if (removeJsonMcpEntry(vscodeMcp)) removed.push(".vscode/mcp.json  (removed ijfw-memory)");
-  if (removeYamlMcpEntry(join2(home, ".hermes", "config.yaml"))) {
-    removed.push("~/.hermes/config.yaml  (removed ijfw-memory)");
+  const vscodeMcp = join3(cwd, ".vscode", "mcp.json");
+  const vscodeLegacy = rmJsonEntry(vscodeMcp, ".vscode/mcp.json");
+  const vscodeServers = removeNestedMcpEntry(vscodeMcp, ["servers"]);
+  if (vscodeLegacy || vscodeServers) removed.push(".vscode/mcp.json  (removed ijfw-memory)");
+  if (removeHermesIjfwWiring(join3(home, ".hermes", "config.yaml"))) {
+    removed.push("~/.hermes/config.yaml  (removed ijfw-memory + plugin + hook wiring)");
   }
-  const hermesSkills = removeIjfwSkills(join2(home, ".hermes", "skills"));
+  const hermesSkills = removeIjfwSkills(join3(home, ".hermes", "skills"));
   if (hermesSkills > 0) removed.push(`~/.hermes/skills/ijfw-*  (removed ${hermesSkills} skill dirs)`);
-  const hermesMd = join2(home, ".hermes", "HERMES.md");
-  if (existsSync2(hermesMd)) {
+  const hermesMd = join3(home, ".hermes", "HERMES.md");
+  if (existsSync3(hermesMd)) {
     rmSync(hermesMd, { force: true });
     removed.push("~/.hermes/HERMES.md");
   }
-  const waylandPluginDir = join2(home, ".wayland", "plugins", "ijfw");
-  if (existsSync2(waylandPluginDir)) {
+  const hermesPlugin = join3(home, ".hermes", "plugins", "ijfw");
+  if (existsSync3(hermesPlugin)) {
+    rmSync(hermesPlugin, { recursive: true, force: true });
+    removed.push("~/.hermes/plugins/ijfw/  (removed plugin tree)");
+  }
+  const waylandPluginDir = join3(home, ".wayland", "plugins", "ijfw");
+  if (existsSync3(waylandPluginDir)) {
     rmSync(waylandPluginDir, { recursive: true, force: true });
     removed.push("~/.wayland/plugins/ijfw/  (removed plugin.toml + hooks + MCP)");
   }
-  if (removeYamlMcpEntry(join2(home, ".wayland", "config.yaml"))) {
+  if (removeYamlMcpEntry(join3(home, ".wayland", "config.yaml"))) {
     removed.push("~/.wayland/config.yaml  (removed legacy ijfw-memory)");
   }
-  const waylandSkills = removeIjfwSkills(join2(home, ".wayland", "skills"));
+  const waylandSkills = removeIjfwSkills(join3(home, ".wayland", "skills"));
   if (waylandSkills > 0) removed.push(`~/.wayland/skills/ijfw-*  (removed ${waylandSkills} skill dirs)`);
-  const waylandMd = join2(home, ".wayland", "WAYLAND.md");
-  if (existsSync2(waylandMd)) {
+  const waylandMd = join3(home, ".wayland", "WAYLAND.md");
+  if (existsSync3(waylandMd)) {
     rmSync(waylandMd, { force: true });
     removed.push("~/.wayland/WAYLAND.md");
   }
-  if (removeJsonMcpEntry(join2(home, ".qwen", "settings.json"))) {
+  if (rmJsonEntry(join3(home, ".qwen", "settings.json"), "~/.qwen/settings.json")) {
     removed.push("~/.qwen/settings.json  (removed ijfw-memory)");
   }
-  if (removeJsonMcpEntry(join2(home, ".kimi", "mcp.json"))) {
+  if (rmJsonEntry(join3(home, ".kimi", "mcp.json"), "~/.kimi/mcp.json")) {
     removed.push("~/.kimi/mcp.json  (removed ijfw-memory)");
   }
-  if (removeJsonMcpEntry(join2(home, ".gemini", "antigravity", "mcp_config.json"))) {
+  if (rmJsonEntry(join3(home, ".gemini", "antigravity", "mcp_config.json"), "~/.gemini/antigravity/mcp_config.json")) {
     removed.push("~/.gemini/antigravity/mcp_config.json  (removed ijfw-memory)");
   }
-  if (removeJsonMcpEntry(join2(home, ".gemini", "config", "mcp_config.json"))) {
+  if (rmJsonEntry(join3(home, ".gemini", "config", "mcp_config.json"), "~/.gemini/config/mcp_config.json")) {
     removed.push("~/.gemini/config/mcp_config.json  (removed ijfw-memory)");
   }
-  if (removeNestedMcpEntry(join2(home, ".config", "opencode", "opencode.json"), ["mcp"])) {
+  if (removeNestedMcpEntry(join3(home, ".config", "opencode", "opencode.json"), ["mcp"])) {
     removed.push("~/.config/opencode/opencode.json  (removed mcp.ijfw-memory)");
   }
-  if (removeNestedMcpEntry(join2(home, ".openclaw", "openclaw.json"), ["mcp", "servers"])) {
+  if (removeNestedMcpEntry(join3(home, ".openclaw", "openclaw.json"), ["mcp", "servers"])) {
     removed.push("~/.openclaw/openclaw.json  (removed mcp.servers.ijfw-memory)");
   }
-  const piStatus = stripMarkerFile(join2(home, ".pi", "agent", "AGENTS.md"), {
-    label: "~/.pi/agent/AGENTS.md"
-  });
-  if (piStatus) removed.push(piStatus);
+  const piPath = join3(home, ".pi", "agent", "AGENTS.md");
+  const piStatus = stripMarkerFile(piPath, { label: "~/.pi/agent/AGENTS.md" });
+  if (piStatus) {
+    removed.push(piStatus);
+  } else {
+    const piPristine = removeAiderFileIfPristine(
+      piPath,
+      resolveShippedTemplate(join3("pi", "AGENTS.md"), repoRoot)
+    );
+    if (piPristine === "removed") {
+      removed.push("~/.pi/agent/AGENTS.md  (removed -- matched shipped template)");
+    } else if (piPristine === "kept-modified") {
+      removed.push("~/.pi/agent/AGENTS.md  (KEPT -- differs from shipped template; remove manually if it is IJFW-only)");
+    }
+  }
   const clineSettings = resolveClineSettingsPath(home);
   if (clineSettings) {
-    if (removeJsonMcpEntry(clineSettings)) {
+    if (rmJsonEntry(clineSettings, clineSettings)) {
       removed.push(`${clineSettings}  (removed ijfw-memory)`);
     }
   } else {
     removed.push("Cline: no globalStorage found -- if you use Cline, remove the ijfw-memory MCP entry manually.");
   }
   const confResult = removeAiderFileIfPristine(
-    join2(home, ".aider.conf.yml"),
+    join3(home, ".aider.conf.yml"),
     resolveAiderTemplate("aider.conf.yml", repoRoot)
   );
   if (confResult === "removed") {
@@ -571,7 +780,7 @@ function cleanPlatforms(opts = {}) {
     removed.push("~/.aider.conf.yml  (KEPT -- differs from shipped template; remove manually if it is IJFW-only)");
   }
   const convResult = removeAiderFileIfPristine(
-    join2(home, "CONVENTIONS.md"),
+    join3(home, "CONVENTIONS.md"),
     resolveAiderTemplate("CONVENTIONS.md", repoRoot)
   );
   if (convResult === "removed") {
@@ -583,8 +792,8 @@ function cleanPlatforms(opts = {}) {
 }
 function parseRegistryPaths(registryPath) {
   try {
-    if (!existsSync2(registryPath)) return [];
-    const raw = readFileSync2(registryPath, "utf8");
+    if (!existsSync3(registryPath)) return [];
+    const raw = readFileSync3(registryPath, "utf8");
     const paths = [];
     for (const line of raw.split("\n")) {
       const trimmed = line.trim();
@@ -602,37 +811,37 @@ function parseRegistryPaths(registryPath) {
 function stripRegisteredProjectBlocks(opts = {}) {
   const home = opts.home || HOME;
   const cwd = opts.cwd || process.cwd();
-  const registryPath = opts.registryPath || join2(home, ".ijfw", "registry.md");
+  const registryPath = opts.registryPath || join3(home, ".ijfw", "registry.md");
   const results = [];
   for (const projPath of parseRegistryPaths(registryPath)) {
     let dirExists = false;
     try {
-      dirExists = existsSync2(projPath);
+      dirExists = existsSync3(projPath);
     } catch {
       dirExists = false;
     }
     if (!dirExists) continue;
     for (const name of ["CLAUDE.md", "AGENTS.md"]) {
-      const filePath = join2(projPath, name);
-      const status = stripMarkerFile(filePath, { label: join2(projPath, name) });
+      const filePath = join3(projPath, name);
+      const status = stripMarkerFile(filePath, { label: join3(projPath, name) });
       if (status) results.push(status);
     }
   }
   try {
-    const cursorRule = join2(cwd, ".cursor", "rules", "ijfw.mdc");
-    if (existsSync2(cursorRule)) {
+    const cursorRule = join3(cwd, ".cursor", "rules", "ijfw.mdc");
+    if (existsSync3(cursorRule)) {
       backupFile(cursorRule);
       rmSync(cursorRule, { force: true });
       results.push(".cursor/rules/ijfw.mdc  (removed -- wholly IJFW-authored)");
     }
   } catch {
   }
-  const windsurfStatus = stripMarkerFile(join2(cwd, ".windsurfrules"), {
+  const windsurfStatus = stripMarkerFile(join3(cwd, ".windsurfrules"), {
     label: ".windsurfrules",
     deleteIfEmpty: true
   });
   if (windsurfStatus) results.push(windsurfStatus);
-  const copilotStatus = stripMarkerFile(join2(cwd, ".github", "copilot-instructions.md"), {
+  const copilotStatus = stripMarkerFile(join3(cwd, ".github", "copilot-instructions.md"), {
     label: ".github/copilot-instructions.md",
     deleteIfEmpty: true
   });
@@ -642,17 +851,77 @@ function stripRegisteredProjectBlocks(opts = {}) {
 function resolveTarget(opt) {
   if (opt.dir) return resolve2(opt.dir);
   if (process.env.IJFW_HOME) return resolve2(process.env.IJFW_HOME);
-  return join2(homedir2(), ".ijfw");
+  return join3(homedir2(), ".ijfw");
+}
+function assertSafePurgeTarget(target) {
+  let real = target;
+  try {
+    real = realpathSync(target);
+  } catch {
+  }
+  let home = homedir2();
+  try {
+    home = realpathSync(home);
+  } catch {
+  }
+  const isFsRoot = (p) => p === "/" || /^[A-Za-z]:[\\/]?$/.test(p);
+  if (!real || isFsRoot(real) || real === home) {
+    throw new Error(`refusing to delete '${target}': it resolves to the home or filesystem root.`);
+  }
+  const segs = real.split(/[\\/]+/).filter((s) => s && !/^[A-Za-z]:$/.test(s));
+  if (segs.length < 2) {
+    throw new Error(`refusing to delete shallow path '${real}'.`);
+  }
+  const hasIjfwState = () => {
+    try {
+      const doc = JSON.parse(readFileSync3(join3(real, "state.json"), "utf8"));
+      return !!doc && typeof doc === "object" && ("install_method" in doc || "installed_version" in doc);
+    } catch {
+      return false;
+    }
+  };
+  const looksIjfw = basename(real) === ".ijfw" || existsSync3(join3(real, "install-method")) || existsSync3(join3(real, "install-ledger.json")) || hasIjfwState();
+  if (!looksIjfw) {
+    throw new Error(`refusing to delete '${target}': it does not look like an IJFW install (no .ijfw basename / install-method / install-ledger.json / IJFW state.json). Aborting.`);
+  }
+}
+function removeCreatedDirs(home, createdDirs) {
+  const removed = [];
+  for (const rel of createdDirs || []) {
+    const abs = join3(home, rel);
+    if (isEmptyDir(abs)) {
+      try {
+        rmSync(abs, { recursive: false, force: true });
+        removed.push(`~/${rel}  (IJFW-created, now empty)`);
+      } catch {
+      }
+    }
+  }
+  return removed;
 }
 async function main() {
   const opts = parseArgs(process.argv);
   const target = resolveTarget(opts);
+  const realOrSelf = (p) => {
+    try {
+      return realpathSync(p);
+    } catch {
+      return p;
+    }
+  };
+  const isCanonical = realOrSelf(target) === realOrSelf(join3(HOME, ".ijfw"));
+  const ledgerCreatedDirs = existsSync3(target) ? readLedger(target).createdDirs : [];
   console.log("This will remove IJFW configuration. Your memory at ~/.ijfw/memory/ will be preserved. Delete manually if desired.");
   if (opts.purge) {
     console.log("WARNING: --purge will also DELETE ~/.ijfw/memory/ (project memory cannot be recovered).");
   }
   console.log("");
-  if (!opts.yes && process.stdin.isTTY) {
+  if (!opts.yes) {
+    if (!process.stdin.isTTY) {
+      console.error("Refusing to proceed: stdin is not a TTY, so the confirmation prompt cannot be answered.");
+      console.error("Non-interactive uninstall requires an explicit --yes (or -y). Nothing was changed.");
+      process.exit(1);
+    }
     const ok = await confirm("Proceed with IJFW uninstall? [y/N] ");
     if (!ok) {
       console.log("Uninstall cancelled. Nothing was changed.");
@@ -660,16 +929,18 @@ async function main() {
     }
     console.log("");
   }
-  if (!existsSync2(target)) {
+  if (!existsSync3(target)) {
     console.log(`IJFW directory absent (${target}); platform cleanup only.`);
   } else if (opts.purge) {
+    assertSafePurgeTarget(target);
     rmSync(target, { recursive: true, force: true });
     console.log(`  removed ${target} (purged).`);
   } else {
-    const memDir = join2(target, "memory");
+    assertSafePurgeTarget(target);
+    const memDir = join3(target, "memory");
     let stash = null;
-    if (existsSync2(memDir)) {
-      stash = mkdtempSync(join2(tmpdir(), "ijfw-memory-"));
+    if (existsSync3(memDir)) {
+      stash = mkdtempSync(join3(tmpdir(), "ijfw-memory-"));
       cpSync(memDir, stash, { recursive: true });
     }
     rmSync(target, { recursive: true, force: true });
@@ -681,11 +952,9 @@ async function main() {
       console.log("  memory/ was not present; nothing to preserve");
     }
   }
-  const canonicalDir = join2(HOME, ".ijfw");
-  const isCanonical = target === canonicalDir;
   if (isCanonical && !opts.noMarketplace) {
     const settingsPath = claudeSettingsPath();
-    if (existsSync2(settingsPath)) {
+    if (existsSync3(settingsPath)) {
       unmergeMarketplace(settingsPath);
       console.log(`  marketplace removed from ${settingsPath}`);
     }
@@ -701,6 +970,13 @@ async function main() {
       console.log("  project blocks cleaned:");
       for (const line of projectCleaned) console.log(`    ${line}`);
     }
+    if (opts.purge) {
+      const dirsRemoved = removeCreatedDirs(HOME, ledgerCreatedDirs);
+      if (dirsRemoved.length > 0) {
+        console.log("  IJFW-created dirs removed:");
+        for (const line of dirsRemoved) console.log(`    ${line}`);
+      }
+    }
   } else {
     console.log(`  custom-dir uninstall (${target}) -- platform configs in your real home left untouched.`);
   }
@@ -715,10 +991,15 @@ if (isDirectRun) {
   });
 }
 export {
+  assertSafePurgeTarget,
   cleanPlatforms,
   parseRegistryPaths,
   removeAiderFileIfPristine,
+  removeCodexHookFiles,
+  removeJsonMcpEntry,
   removeNestedMcpEntry,
+  removeTomlSection,
+  removeYamlMcpEntry,
   resolveAiderTemplate,
   resolveClineSettingsPath,
   stripIjfwRegions,