@ijfw/install 1.1.0 → 1.1.2

package/dist/install.js

@@ -216,7 +216,14 @@ function cloneOrPull(dir, branch) {
 function runInstallScript(dir) {
   const script = join2(dir, "scripts", "install.sh");
   if (!existsSync2(script)) throw new Error(`IJFW install script not found at ${script} -- re-run the installer to restore it.`);
-  const env = { ...process.env, IJFW_NONINTERACTIVE: process.env.CI ? "1" : process.env.IJFW_NONINTERACTIVE ?? "" };
+  const canonicalDir = join2(homedir2(), ".ijfw");
+  const isCustomDir = resolve(dir) !== canonicalDir ? "1" : "0";
+  const env = {
+    ...process.env,
+    IJFW_NONINTERACTIVE: process.env.CI ? "1" : process.env.IJFW_NONINTERACTIVE ?? "",
+    IJFW_HOME: dir,
+    IJFW_CUSTOM_DIR: isCustomDir
+  };
   const r = spawnSync("bash", ["scripts/install.sh"], { cwd: dir, stdio: "inherit", env });
   if (r.status !== 0) throw new Error(`IJFW platform config step did not complete (exit ${r.status}) -- run ijfw doctor to see what to fix.`);
 }
@@ -253,7 +260,7 @@ async function main() {
     console.log(`  marketplace registered in ${settingsPath}`);
   }
   console.log("");
-  console.log("IJFW now active across 7 platforms -- one memory layer, all your AIs, zero config.");
+  console.log("IJFW now active across 8 platforms -- one memory layer, all your AIs, zero config.");
   console.log("  Run `ijfw demo` to see the Trident in action.");
   console.log("  Run `ijfw doctor` to confirm which auditors are reachable.");
   console.log("  Privacy: everything stays local. See NO_TELEMETRY.md.");

package/dist/uninstall.js

@@ -4,6 +4,7 @@
 import { existsSync as existsSync2, rmSync, cpSync, mkdtempSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, readdirSync } from "node:fs";
 import { resolve, join as join2 } from "node:path";
 import { homedir as homedir2, tmpdir } from "node:os";
+import { spawnSync } from "node:child_process";
 
 // src/marketplace.js
 import { readFileSync, writeFileSync, renameSync, existsSync, mkdirSync } from "node:fs";
@@ -156,12 +157,74 @@ function removeCodexHooks(p) {
   } catch {
     return false;
   }
-  if (!Array.isArray(doc.hooks)) return false;
-  const before = doc.hooks.length;
-  doc.hooks = doc.hooks.filter((h) => !h._ijfw);
-  if (doc.hooks.length === before) return false;
+  if (Array.isArray(doc)) {
+    const before = doc.length;
+    const after = doc.filter((h) => !(h && h._ijfw));
+    if (after.length === before) return false;
+    backupFile(p);
+    writeFileSync2(p, JSON.stringify(after, null, 2) + "\n");
+    return true;
+  }
+  if (!doc || typeof doc !== "object" || !doc.hooks) return false;
+  if (doc.hooks && typeof doc.hooks === "object" && !Array.isArray(doc.hooks)) {
+    let changed = false;
+    for (const ev of Object.keys(doc.hooks)) {
+      const groups = doc.hooks[ev];
+      if (!Array.isArray(groups)) continue;
+      const before = groups.length;
+      doc.hooks[ev] = groups.filter((g) => {
+        if (!g || !Array.isArray(g.hooks)) return true;
+        return !g.hooks.some((h) => h && h._ijfw);
+      });
+      if (doc.hooks[ev].length !== before) changed = true;
+    }
+    if (!changed) return false;
+    backupFile(p);
+    writeFileSync2(p, JSON.stringify(doc, null, 2) + "\n");
+    return true;
+  }
+  if (Array.isArray(doc.hooks)) {
+    const before = doc.hooks.length;
+    doc.hooks = doc.hooks.filter((h) => !(h && h._ijfw));
+    if (doc.hooks.length === before) return false;
+    backupFile(p);
+    writeFileSync2(p, JSON.stringify(doc, null, 2) + "\n");
+    return true;
+  }
+  return false;
+}
+function removeYamlMcpEntry(p) {
+  if (!existsSync2(p)) return false;
+  const raw = readFileSync2(p, "utf8");
+  if (!/\bijfw-memory\b/.test(raw)) return false;
+  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)
+srv = doc.get("mcp_servers")
+if not isinstance(srv, dict) or "ijfw-memory" not in srv: sys.exit(3)
+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)
+`, p], { encoding: "utf8" });
+  if (py.status === 0) {
+    backupFile(p);
+    return true;
+  }
+  const stripped = raw.replace(
+    /^  ijfw-memory:\n(?:    .*\n)*(?:# IJFW-MCP-END ijfw-memory\n)?/m,
+    ""
+  ).replace(
+    /# IJFW-MCP-BEGIN ijfw-memory\n(?:.*\n)*?# IJFW-MCP-END ijfw-memory\n/,
+    ""
+  );
+  if (stripped === raw) return false;
   backupFile(p);
-  writeFileSync2(p, JSON.stringify(doc, null, 2) + "\n");
+  writeFileSync2(p, stripped);
   return true;
 }
 function removeIjfwSkills(dir) {
@@ -205,6 +268,26 @@ function cleanPlatforms() {
   }
   const vscodeMcp = join2(".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 hermesSkills = removeIjfwSkills(join2(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)) {
+    rmSync(hermesMd, { force: true });
+    removed.push("~/.hermes/HERMES.md");
+  }
+  if (removeYamlMcpEntry(join2(HOME, ".wayland", "config.yaml"))) {
+    removed.push("~/.wayland/config.yaml  (removed ijfw-memory)");
+  }
+  const waylandSkills = removeIjfwSkills(join2(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)) {
+    rmSync(waylandMd, { force: true });
+    removed.push("~/.wayland/WAYLAND.md");
+  }
   return removed;
 }
 function resolveTarget(opt) {
@@ -238,17 +321,23 @@ async function main() {
       console.log("  memory/ was not present; nothing to preserve");
     }
   }
-  if (!opts.noMarketplace) {
+  const canonicalDir = join2(HOME, ".ijfw");
+  const isCanonical = target === canonicalDir;
+  if (isCanonical && !opts.noMarketplace) {
     const settingsPath = claudeSettingsPath();
     if (existsSync2(settingsPath)) {
       unmergeMarketplace(settingsPath);
       console.log(`  marketplace removed from ${settingsPath}`);
     }
   }
-  const cleaned = cleanPlatforms();
-  if (cleaned.length > 0) {
-    console.log("  platform configs cleaned:");
-    for (const line of cleaned) console.log(`    ${line}`);
+  if (isCanonical) {
+    const cleaned = cleanPlatforms();
+    if (cleaned.length > 0) {
+      console.log("  platform configs cleaned:");
+      for (const line of cleaned) console.log(`    ${line}`);
+    }
+  } else {
+    console.log(`  custom-dir uninstall (${target}) -- platform configs in your real home left untouched.`);
   }
   console.log("\nIJFW uninstalled. Thanks for trying it.");
   process.exit(0);