@ijfw/install 1.6.1 → 1.6.2

package/dist/uninstall.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/uninstall.js
-import { existsSync as existsSync3, rmSync, cpSync, mkdtempSync, readFileSync as readFileSync3, writeFileSync as writeFileSync3, renameSync as renameSync2, unlinkSync as unlinkSync2, readdirSync as readdirSync2, realpathSync } from "node:fs";
+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";
@@ -144,10 +144,19 @@ function resolveAiderTemplate(name, repoRoot) {
   return "";
 }
 function writeAtomic(target, content) {
+  let mode = 384;
+  try {
+    mode = statSync(target).mode & 511;
+  } catch {
+  }
   const tmp = `${target}.tmp.${process.pid}.${Date.now()}`;
-  writeFileSync3(tmp, content);
+  writeFileSync3(tmp, content, { mode });
   try {
     renameSync2(tmp, target);
+    try {
+      chmodSync(target, mode);
+    } catch {
+    }
   } catch (err) {
     try {
       unlinkSync2(tmp);
@@ -252,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 (!existsSync3(p)) return false;
-  backupFile(p);
   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 (!existsSync3(p)) return false;
-  let doc;
+  let raw;
   try {
-    doc = JSON.parse(readFileSync3(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"]) {
@@ -415,6 +435,7 @@ function removeYamlMcpEntry(p) {
   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]
@@ -427,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,
@@ -442,8 +462,15 @@ 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;
 }
@@ -466,6 +493,7 @@ 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]
@@ -497,15 +525,21 @@ 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; 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 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) return false;
-  backupFile(p);
+  if (out === raw) {
+    if (bak) {
+      try {
+        rmSync(bak, { force: true });
+      } catch {
+      }
+    }
+    return false;
+  }
   writeAtomic(p, out);
   return true;
 }
@@ -579,7 +613,9 @@ function removeCodexHookFiles(hooksDir) {
     } catch {
       continue;
     }
-    if (/\bIJFW\b/.test(body) || /\bijfw\b/.test(body)) {
+    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++;
     }
@@ -615,7 +651,15 @@ function cleanPlatforms(opts = {}) {
   const cwd = opts.cwd || process.cwd();
   const repoRoot = opts.repoRoot || REPO_ROOT;
   const removed = [];
-  if (removeJsonMcpEntry(join3(home, ".claude", "settings.json"))) {
+  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"))) {
@@ -638,7 +682,7 @@ function cleanPlatforms(opts = {}) {
   }
   const codexHookFiles = removeCodexHookFiles(join3(home, ".codex", "hooks"));
   if (codexHookFiles > 0) removed.push(`~/.codex/hooks/  (removed ${codexHookFiles} IJFW hook scripts)`);
-  if (removeJsonMcpEntry(join3(home, ".gemini", "settings.json"))) {
+  if (rmJsonEntry(join3(home, ".gemini", "settings.json"), "~/.gemini/settings.json")) {
     removed.push("~/.gemini/settings.json  (removed ijfw-memory)");
   }
   const geminiExt = join3(home, ".gemini", "extensions", "ijfw");
@@ -647,12 +691,14 @@ function cleanPlatforms(opts = {}) {
     removed.push("~/.gemini/extensions/ijfw/");
   }
   const cursorMcp = join3(cwd, ".cursor", "mcp.json");
-  if (removeJsonMcpEntry(cursorMcp)) removed.push(".cursor/mcp.json  (removed ijfw-memory)");
-  if (removeJsonMcpEntry(join3(home, ".codeium", "windsurf", "mcp_config.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 = join3(cwd, ".vscode", "mcp.json");
-  if (removeJsonMcpEntry(vscodeMcp)) removed.push(".vscode/mcp.json  (removed ijfw-memory)");
+  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)");
   }
@@ -683,16 +729,16 @@ function cleanPlatforms(opts = {}) {
     rmSync(waylandMd, { force: true });
     removed.push("~/.wayland/WAYLAND.md");
   }
-  if (removeJsonMcpEntry(join3(home, ".qwen", "settings.json"))) {
+  if (rmJsonEntry(join3(home, ".qwen", "settings.json"), "~/.qwen/settings.json")) {
     removed.push("~/.qwen/settings.json  (removed ijfw-memory)");
   }
-  if (removeJsonMcpEntry(join3(home, ".kimi", "mcp.json"))) {
+  if (rmJsonEntry(join3(home, ".kimi", "mcp.json"), "~/.kimi/mcp.json")) {
     removed.push("~/.kimi/mcp.json  (removed ijfw-memory)");
   }
-  if (removeJsonMcpEntry(join3(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(join3(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(join3(home, ".config", "opencode", "opencode.json"), ["mcp"])) {
@@ -718,7 +764,7 @@ function cleanPlatforms(opts = {}) {
   }
   const clineSettings = resolveClineSettingsPath(home);
   if (clineSettings) {
-    if (removeJsonMcpEntry(clineSettings)) {
+    if (rmJsonEntry(clineSettings, clineSettings)) {
       removed.push(`${clineSettings}  (removed ijfw-memory)`);
     }
   } else {
@@ -818,15 +864,25 @@ function assertSafePurgeTarget(target) {
     home = realpathSync(home);
   } catch {
   }
-  if (!real || real === "/" || real === home) {
+  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.`);
   }
-  if (real.split("/").filter(Boolean).length < 2) {
+  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 looksIjfw = basename(real) === ".ijfw" || existsSync3(join3(real, "state.json")) || existsSync3(join3(real, "install-method")) || existsSync3(join3(real, "install-ledger.json")) || existsSync3(join3(real, "mcp-server")) || existsSync3(join3(real, "memory"));
+  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 state.json / install-method / mcp-server). Aborting.`);
+    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) {
@@ -846,13 +902,26 @@ function removeCreatedDirs(home, createdDirs) {
 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.");
@@ -883,8 +952,6 @@ async function main() {
       console.log("  memory/ was not present; nothing to preserve");
     }
   }
-  const canonicalDir = join3(HOME, ".ijfw");
-  const isCanonical = target === canonicalDir;
   if (isCanonical && !opts.noMarketplace) {
     const settingsPath = claudeSettingsPath();
     if (existsSync3(settingsPath)) {
@@ -924,10 +991,15 @@ if (isDirectRun) {
   });
 }
 export {
+  assertSafePurgeTarget,
   cleanPlatforms,
   parseRegistryPaths,
   removeAiderFileIfPristine,
+  removeCodexHookFiles,
+  removeJsonMcpEntry,
   removeNestedMcpEntry,
+  removeTomlSection,
+  removeYamlMcpEntry,
   resolveAiderTemplate,
   resolveClineSettingsPath,
   stripIjfwRegions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ijfw/install",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "One-command installer for IJFW -- the AI efficiency layer. One install, every AI coding agent, zero config.",
   "type": "module",
   "bin": {
@@ -23,7 +23,7 @@
   ],
   "scripts": {
     "build": "node scripts/build.js",
-    "test": "node --test test.js test/uninstall-completeness.test.mjs test/project-write-guard.test.mjs",
+    "test": "node --test test.js test/*.test.mjs",
     "test:hub-extension": "node --test test/test-pack-hub-extension.js",
     "test:uninstall-completeness": "node --test test/uninstall-completeness.test.mjs",
     "preflight": "node dist/ijfw.js preflight",

package/src/install.ps1

@@ -95,7 +95,7 @@ function Invoke-CloneOrPull($target, $branch) {
       # Self-heal stale origin URLs across host migrations (1.2.9 parity with install.js).
       # Without this, Windows users on the pre-GitLab origin still 404 on every upgrade.
       # V155-012: only rewrite ORIGINS THAT MATCH KNOWN STALE PATTERNS. Previously
-      # this clobbered SSH remotes, forks, and any user-customized origin — anyone
+      # this clobbered SSH remotes, forks, and any user-customized origin -- anyone
       # working on the IJFW source itself ended up silently retargeted to upstream.
       # Port the install.js STALE_PATTERNS allowlist verbatim (case-insensitive).
       $currentOrigin = ($currentOriginRaw | Out-String).Trim()