@ijfw/install 1.2.8 → 1.2.10

package/dist/ijfw.js

@@ -483,7 +483,7 @@ async function run5(ctx) {
   const res = spawnSync5(
     "npx",
     ["--yes", `publint@${ver}`, "--strict"],
-    { encoding: "utf8", cwd: ctx.repoRoot + "/installer", timeout: 3e4 }
+    { encoding: "utf8", cwd: ctx.repoRoot + "/installer", timeout: 9e4 }
   );
   const durationMs = Date.now() - t0;
   const output = (res.stdout || "") + (res.stderr || "");
@@ -727,7 +727,7 @@ __export(pack_smoke_exports, {
   severity: () => severity10
 });
 import { spawnSync as spawnSync10 } from "node:child_process";
-import { mkdtempSync as mkdtempSync2, rmSync as rmSync2, mkdirSync, writeFileSync as writeFileSync2, readdirSync as readdirSync3 } from "node:fs";
+import { mkdtempSync as mkdtempSync2, rmSync as rmSync2, mkdirSync, writeFileSync as writeFileSync2, readdirSync as readdirSync3, existsSync } from "node:fs";
 import { join as join6, resolve } from "node:path";
 import { tmpdir as tmpdir2 } from "node:os";
 async function run10(ctx) {
@@ -803,13 +803,9 @@ async function run10(ctx) {
     ];
     let binPath = null;
     for (const c2 of binCandidates) {
-      try {
-        const r = spawnSync10("ls", [c2], { encoding: "utf8" });
-        if (r.status === 0) {
-          binPath = c2;
-          break;
-        }
-      } catch {
+      if (existsSync(c2)) {
+        binPath = c2;
+        break;
       }
     }
     if (!binPath) {
@@ -883,7 +879,7 @@ __export(upgrade_smoke_exports, {
   severity: () => severity11
 });
 import { spawnSync as spawnSync11 } from "node:child_process";
-import { mkdtempSync as mkdtempSync3, rmSync as rmSync3, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3, readFileSync, existsSync } from "node:fs";
+import { mkdtempSync as mkdtempSync3, rmSync as rmSync3, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3, readFileSync, existsSync as existsSync2 } from "node:fs";
 import { join as join7, resolve as resolve2 } from "node:path";
 import { tmpdir as tmpdir3 } from "node:os";
 async function run11(ctx) {
@@ -952,8 +948,7 @@ async function run11(ctx) {
     ];
     let installerBin = null;
     for (const c2 of binCandidates) {
-      const check = spawnSync11("ls", [c2], { encoding: "utf8" });
-      if (check.status === 0) {
+      if (existsSync2(c2)) {
         installerBin = c2;
         break;
       }
@@ -968,7 +963,7 @@ async function run11(ctx) {
       };
     }
     const settingsPath = join7(claudeDir, "settings.json");
-    if (existsSync(settingsPath)) {
+    if (existsSync2(settingsPath)) {
       let settings;
       try {
         settings = JSON.parse(readFileSync(settingsPath, "utf8"));
@@ -993,7 +988,7 @@ async function run11(ctx) {
       }
     }
     const marketplaceSrc = join7(installerDir, "src", "marketplace.js");
-    if (existsSync(marketplaceSrc)) {
+    if (existsSync2(marketplaceSrc)) {
       const src = readFileSync(marketplaceSrc, "utf8");
       const registersCorrectKey = src.includes("'ijfw@ijfw'") || src.includes('"ijfw@ijfw"');
       const registersWrongKey = /enabledPlugins\[['"]ijfw-core@ijfw['"]\]\s*=\s*true/.test(src);
@@ -1049,7 +1044,7 @@ var preflight_exports = {};
 __export(preflight_exports, {
   runPreflightCommand: () => runPreflightCommand
 });
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "node:fs";
+import { readFileSync as readFileSync2, existsSync as existsSync3 } from "node:fs";
 import { join as join8, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 function printHelp() {
@@ -1091,7 +1086,7 @@ function loadVersions(repoRoot2) {
     join8(repoRoot2, ".ijfw", "preflight-versions.json")
   ];
   for (const f of candidates) {
-    if (existsSync2(f)) {
+    if (existsSync3(f)) {
       try {
         return JSON.parse(readFileSync2(f, "utf8"));
       } catch {
@@ -2419,14 +2414,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
 // src/ijfw.js
 import { dirname as dirname2, join as join9, resolve as resolve3, basename } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, copyFileSync, readdirSync as readdirSync4, rmSync as rmSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, copyFileSync, readdirSync as readdirSync4, rmSync as rmSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir, platform as platform2 } from "node:os";
 import { spawnSync as spawnSync12 } from "node:child_process";
 var __dirname2 = dirname2(fileURLToPath2(import.meta.url));
 function repoRoot() {
   let dir = __dirname2;
   for (let i = 0; i < 6; i++) {
-    if (existsSync3(join9(dir, "package.json")) && existsSync3(join9(dir, ".git"))) return dir;
+    if (existsSync4(join9(dir, "package.json")) && existsSync4(join9(dir, ".git"))) return dir;
     dir = resolve3(dir, "..");
   }
   return process.cwd();
@@ -2442,7 +2437,7 @@ COMMANDS
   install     Install IJFW into your AI coding agents
   uninstall   Remove IJFW from your AI coding agents
   help        Open the full IJFW guide (terminal, or --browser for rendered)
-  preflight   Run 11-gate quality pipeline before publishing
+  preflight   Run 12-gate quality pipeline before publishing
   dashboard   Start / stop / check the local observability dashboard
   design      Manage the visual design companion
   doctor      Diagnose IJFW installation health
@@ -2453,19 +2448,21 @@ COMMANDS
 }
 function doctorCheck(cmd, args) {
   const r = spawnSync12(cmd, args, { encoding: "utf8" });
-  return r.status === 0 ? r.stdout.split("\n")[0].trim() : "not found";
+  if (r.status === 0) return r.stdout.split("\n")[0].trim();
+  if (r.status === 127 || r.error && r.error.code === "ENOENT") return "not found";
+  return `exit ${r.status} (may be transient)`;
 }
 function findCli() {
   const candidates = [
     join9(repoRoot(), "mcp-server", "src", "cross-orchestrator-cli.js"),
     join9(homedir(), ".ijfw", "mcp-server", "src", "cross-orchestrator-cli.js")
   ];
-  return candidates.find((p) => existsSync3(p)) || null;
+  return candidates.find((p) => existsSync4(p)) || null;
 }
 function delegateToCli(argTail) {
   const cli = findCli();
   if (!cli) return false;
-  const r = spawnSync12("node", [cli, ...argTail], { stdio: "inherit" });
+  const r = spawnSync12(process.execPath, [cli, ...argTail], { stdio: "inherit" });
   process.exit(r.status ?? 1);
 }
 async function main() {
@@ -2516,16 +2513,21 @@ async function main() {
     case "dashboard": {
       const dashSub = argv[3];
       const root = repoRoot();
+      const ijfwHome = join9(homedir(), ".ijfw");
+      const findInTree = (...rel) => {
+        const candidates = [join9(root, ...rel), join9(ijfwHome, ...rel)];
+        return candidates.find((p) => existsSync4(p)) || null;
+      };
       if (dashSub === "start" || dashSub === "stop" || dashSub === "status") {
-        const dashBin = join9(root, "mcp-server", "bin", "ijfw-dashboard");
-        if (existsSync3(dashBin)) {
+        const dashBin = findInTree("mcp-server", "bin", "ijfw-dashboard");
+        if (dashBin) {
           const r = spawnSync12("node", [dashBin, dashSub, ...argv.slice(4)], { stdio: "inherit" });
           process.exit(r.status ?? 0);
         } else {
-          const serverJs = join9(root, "mcp-server", "src", "dashboard-server.js");
-          if (dashSub === "start" && existsSync3(serverJs)) {
+          const serverJs = findInTree("mcp-server", "src", "dashboard-server.js");
+          if (dashSub === "start" && serverJs) {
             const { spawn } = await import("node:child_process");
-            const child = spawn(process.execPath, [serverJs, "--daemon"], {
+            const child = spawn(process.execPath, [serverJs, "start", "--daemon"], {
               detached: true,
               stdio: "ignore"
             });
@@ -2533,12 +2535,12 @@ async function main() {
             console.log("Dashboard starting... (check: ijfw dashboard status)");
             process.exit(0);
           }
-          console.log("[ijfw] Dashboard bin not found. Run from the IJFW repo root.");
+          console.log("[ijfw] Dashboard not found. Try `ijfw-install` to deploy ~/.ijfw/, or run from the IJFW repo root.");
           process.exit(1);
         }
       } else if (dashSub === "render" || !dashSub) {
-        const binJs = join9(root, "scripts", "dashboard", "bin.js");
-        if (existsSync3(binJs)) {
+        const binJs = findInTree("scripts", "dashboard", "bin.js");
+        if (binJs) {
           const r = spawnSync12("node", [binJs, ...argv.slice(dashSub ? 4 : 3)], { stdio: "inherit" });
           process.exit(r.status ?? 0);
         } else {
@@ -2562,7 +2564,7 @@ async function main() {
           process.exit(1);
         }
         const abs = resolve3(filePath);
-        if (!existsSync3(abs)) {
+        if (!existsSync4(abs)) {
           console.error(`File not found: ${abs}`);
           process.exit(1);
         }
@@ -2588,7 +2590,7 @@ async function main() {
         resolve3(__dirname2, "..", "docs", "GUIDE.md"),
         join9(homedir(), ".ijfw", "docs", "GUIDE.md")
       ];
-      const guidePath = candidates.find((p) => existsSync3(p));
+      const guidePath = candidates.find((p) => existsSync4(p));
       if (!guidePath) {
         console.error("[ijfw] Guide not found. Run `ijfw install` to fetch the full guide, or visit https://gitlab.com/therealseandonahoe/ijfw/-/blob/main/docs/GUIDE.md");
         process.exit(1);
@@ -2598,7 +2600,7 @@ async function main() {
         const assetsSrc = join9(dirname2(guidePath), "guide", "assets");
         const outDir = join9(homedir(), ".ijfw", "guide");
         mkdirSync3(join9(outDir, "assets"), { recursive: true });
-        if (existsSync3(assetsSrc)) {
+        if (existsSync4(assetsSrc)) {
           for (const f of readdirSync4(assetsSrc)) {
             copyFileSync(join9(assetsSrc, f), join9(outDir, "assets", f));
           }
@@ -2630,7 +2632,10 @@ async function main() {
       }
       const hasLess = spawnSync12("less", ["-V"], { stdio: "ignore" }).status === 0;
       if (hasLess) {
-        spawnSync12("less", ["-R", guidePath], { stdio: "inherit" });
+        const lessRes = spawnSync12("less", ["-R", guidePath], { stdio: "inherit" });
+        if (lessRes.status !== 0 && lessRes.status !== null) {
+          process.stdout.write(readFileSync3(guidePath, "utf8"));
+        }
       } else {
         process.stdout.write(readFileSync3(guidePath, "utf8"));
       }

package/dist/install.js

@@ -8,9 +8,23 @@ import { homedir as homedir2, platform } from "node:os";
 import { fileURLToPath } from "node:url";
 
 // src/marketplace.js
-import { readFileSync, writeFileSync, renameSync, existsSync, mkdirSync } from "node:fs";
+import { readFileSync, writeFileSync, renameSync, unlinkSync, existsSync, mkdirSync } from "node:fs";
+import { randomBytes } from "node:crypto";
 import { dirname, join, resolve } from "node:path";
 import { homedir } from "node:os";
+function atomicWriteJson(path, data) {
+  const tmp = `${path}.tmp.${process.pid}.${randomBytes(4).toString("hex")}`;
+  writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n");
+  try {
+    renameSync(tmp, path);
+  } catch (err) {
+    try {
+      unlinkSync(tmp);
+    } catch {
+    }
+    throw new Error(`atomic write failed for ${path}: ${err.message}`);
+  }
+}
 function claudeSettingsPath() {
   return join(homedir(), ".claude", "settings.json");
 }
@@ -92,9 +106,7 @@ function mergeMarketplace(settingsPath = claudeSettingsPath(), options = {}) {
     delete settings.enabledPlugins["ijfw-core@ijfw"];
   }
   settings.enabledPlugins["ijfw@ijfw"] = true;
-  const tmp = settingsPath + ".tmp";
-  writeFileSync(tmp, JSON.stringify(settings, null, 2) + "\n");
-  renameSync(tmp, settingsPath);
+  atomicWriteJson(settingsPath, settings);
   return settings;
 }
 
@@ -178,8 +190,10 @@ function preflight() {
   return issues;
 }
 function hasBin(bin) {
-  const res = spawnSync(bin, ["--version"], { stdio: "ignore" });
-  return res.status === 0 || res.status === null ? res.error ? false : true : false;
+  const res = spawnSync(bin, ["--version"], { stdio: "ignore", timeout: 3e3 });
+  if (res.error && res.error.code === "ENOENT") return false;
+  if (res.status === 0) return true;
+  return res.error == null;
 }
 function findBash() {
   if (hasBin("bash") && platform() !== "win32") return "bash";
@@ -214,7 +228,7 @@ function resolveTarget(opt) {
 }
 function runCheck(cmd, args, opts) {
   const r = spawnSync(cmd, args, { encoding: "utf8", ...opts });
-  return { status: r.status, stdout: r.stdout || "" };
+  return { status: r.status, stdout: r.stdout || "", stderr: r.stderr || "", spawnError: r.error?.code, signal: r.signal };
 }
 function cloneOrPull(dir, branch) {
   if (!existsSync2(dir)) {
@@ -225,12 +239,25 @@ function cloneOrPull(dir, branch) {
   }
   const hasGit = existsSync2(join2(dir, ".git"));
   if (hasGit) {
-    const { status: remoteStatus, stdout } = runCheck("git", ["-C", dir, "remote", "get-url", "origin"]);
+    const { status: remoteStatus, stdout, stderr: remoteStderr, spawnError: remoteSpawnError, signal: remoteSignal } = runCheck("git", ["-C", dir, "remote", "get-url", "origin"]);
+    if (remoteSpawnError) console.warn(`  git spawn error (${remoteSpawnError}) -- check git is on PATH`);
+    else if (remoteSignal) console.warn(`  git exited on signal ${remoteSignal}`);
+    else if (remoteStatus !== 0 && remoteStderr) console.warn(`  git remote get-url: ${remoteStderr.slice(0, 120).trim()}`);
     if (remoteStatus === 0) {
+      const STALE_ORIGINS = [
+        "https://github.com/seandonahoe/ijfw.git",
+        "https://github.com/seandonahoe/ijfw",
+        "https://github.com/seandonahoe/ijfw/",
+        "https://github.com/seandonahoe/ijfw.git/"
+      ];
       const currentOrigin = (stdout || "").trim();
-      if (currentOrigin && currentOrigin !== DEFAULT_REPO) {
-        console.log(`  origin migration: ${currentOrigin} -> ${DEFAULT_REPO}`);
-        spawnSync("git", ["-C", dir, "remote", "set-url", "origin", DEFAULT_REPO], { stdio: "inherit" });
+      if (STALE_ORIGINS.includes(currentOrigin)) {
+        const setUrl = spawnSync("git", ["-C", dir, "remote", "set-url", "origin", DEFAULT_REPO], { stdio: "inherit" });
+        if (setUrl.status !== 0) {
+          console.warn(`  [!] origin migration failed -- could not repoint ${currentOrigin} to ${DEFAULT_REPO}`);
+        } else {
+          console.log(`  origin migration: ${currentOrigin} -> ${DEFAULT_REPO}`);
+        }
       }
       const fetch = spawnSync("git", ["-C", dir, "fetch", "--depth", "1", "origin", branch], { stdio: "inherit" });
       if (fetch.status !== 0) throw new Error(`IJFW fetch did not complete (exit ${fetch.status}) -- check network access and retry.`);

package/dist/uninstall.js

@@ -1,15 +1,29 @@
 #!/usr/bin/env node
 
 // src/uninstall.js
-import { existsSync as existsSync2, rmSync, cpSync, mkdtempSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, readdirSync } from "node:fs";
+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 } 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";
+import { readFileSync, writeFileSync, renameSync, unlinkSync, existsSync, mkdirSync } from "node:fs";
+import { randomBytes } from "node:crypto";
 import { dirname, join, resolve } from "node:path";
 import { homedir } from "node:os";
+function atomicWriteJson(path, data) {
+  const tmp = `${path}.tmp.${process.pid}.${randomBytes(4).toString("hex")}`;
+  writeFileSync(tmp, JSON.stringify(data, null, 2) + "\n");
+  try {
+    renameSync(tmp, path);
+  } catch (err) {
+    try {
+      unlinkSync(tmp);
+    } catch {
+    }
+    throw new Error(`atomic write failed for ${path}: ${err.message}`);
+  }
+}
 function claudeSettingsPath() {
   return join(homedir(), ".claude", "settings.json");
 }
@@ -76,13 +90,24 @@ function unmergeMarketplace(settingsPath = claudeSettingsPath()) {
     if ("ijfw-core@ijfw" in settings.enabledPlugins) delete settings.enabledPlugins["ijfw-core@ijfw"];
     if ("ijfw@ijfw" in settings.enabledPlugins) delete settings.enabledPlugins["ijfw@ijfw"];
   }
-  const tmp = settingsPath + ".tmp";
-  writeFileSync(tmp, JSON.stringify(settings, null, 2) + "\n");
-  renameSync(tmp, settingsPath);
+  atomicWriteJson(settingsPath, settings);
   return settings;
 }
 
 // src/uninstall.js
+function writeAtomic(target, content) {
+  const tmp = `${target}.tmp.${process.pid}.${Date.now()}`;
+  writeFileSync2(tmp, content);
+  try {
+    renameSync2(tmp, target);
+  } catch (err) {
+    try {
+      unlinkSync2(tmp);
+    } catch {
+    }
+    throw new Error(`atomic write failed for ${target}: ${err.message}`);
+  }
+}
 function parseArgs(argv) {
   const out = { dir: null, purge: false, noMarketplace: false };
   for (let i = 2; i < argv.length; i++) {
@@ -128,7 +153,7 @@ function removeTomlSection(p) {
     if (skip && line.startsWith("[") && !line.startsWith("[mcp_servers.ijfw-memory]")) skip = false;
     if (!skip) out.push(line);
   }
-  writeFileSync2(p, out.join("\n"));
+  writeAtomic(p, out.join("\n") + "\n");
   return true;
 }
 function removeJsonMcpEntry(p) {
@@ -144,7 +169,7 @@ function removeJsonMcpEntry(p) {
   if (doc.mcpServers && doc.mcpServers["ijfw-memory"]) {
     backupFile(p);
     delete doc.mcpServers["ijfw-memory"];
-    writeFileSync2(p, JSON.stringify(doc, null, 2) + "\n");
+    writeAtomic(p, JSON.stringify(doc, null, 2) + "\n");
     changed = true;
   }
   return changed;
@@ -162,7 +187,7 @@ function removeCodexHooks(p) {
     const after = doc.filter((h) => !(h && h._ijfw));
     if (after.length === before) return false;
     backupFile(p);
-    writeFileSync2(p, JSON.stringify(after, null, 2) + "\n");
+    writeAtomic(p, JSON.stringify(after, null, 2) + "\n");
     return true;
   }
   if (!doc || typeof doc !== "object" || !doc.hooks) return false;
@@ -180,7 +205,7 @@ function removeCodexHooks(p) {
     }
     if (!changed) return false;
     backupFile(p);
-    writeFileSync2(p, JSON.stringify(doc, null, 2) + "\n");
+    writeAtomic(p, JSON.stringify(doc, null, 2) + "\n");
     return true;
   }
   if (Array.isArray(doc.hooks)) {
@@ -188,7 +213,7 @@ function removeCodexHooks(p) {
     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");
+    writeAtomic(p, JSON.stringify(doc, null, 2) + "\n");
     return true;
   }
   return false;
@@ -224,7 +249,7 @@ import os; os.replace(p + ".tmp", p)
   );
   if (stripped === raw) return false;
   backupFile(p);
-  writeFileSync2(p, stripped);
+  writeAtomic(p, stripped);
   return true;
 }
 function removeIjfwSkills(dir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ijfw/install",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "One-command installer for IJFW -- the AI efficiency layer. One install, every AI coding agent, zero config.",
   "type": "module",
   "bin": {

package/src/install.ps1

@@ -30,10 +30,17 @@ function Test-Command($cmd) {
 
 function Get-Target {
   if ($Dir) {
-    $resolved = Resolve-Path -LiteralPath $Dir -ErrorAction SilentlyContinue
-    if ($resolved) { return $resolved.Path } else { return $Dir }
+    # Expand %APPDATA%-style env vars and leading ~ before resolving.
+    $path = [System.Environment]::ExpandEnvironmentVariables($Dir)
+    if ($path -like '~*') { $path = $path -replace '^~', $env:USERPROFILE }
+    $resolved = Resolve-Path -LiteralPath $path -ErrorAction SilentlyContinue
+    if ($resolved) { return $resolved.Path } else { return $path }
+  }
+  if ($env:IJFW_HOME) {
+    $path = [System.Environment]::ExpandEnvironmentVariables($env:IJFW_HOME)
+    if ($path -like '~*') { $path = $path -replace '^~', $env:USERPROFILE }
+    return $path
   }
-  if ($env:IJFW_HOME) { return $env:IJFW_HOME }
   return Join-Path $env:USERPROFILE ".ijfw"
 }
 
@@ -83,8 +90,15 @@ function Invoke-CloneOrPull($target, $branch) {
   # Upgrade path.
   $hasGit = Test-Path (Join-Path $target ".git")
   if ($hasGit) {
-    & git -C $target remote get-url origin 2>$null | Out-Null
+    $currentOriginRaw = & git -C $target remote get-url origin 2>$null
     if ($LASTEXITCODE -eq 0) {
+      # 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.
+      $currentOrigin = ($currentOriginRaw | Out-String).Trim()
+      if ($currentOrigin -and $currentOrigin -ne $DEFAULT_REPO) {
+        Write-Host "  origin migration: $currentOrigin -> $DEFAULT_REPO"
+        & git -C $target remote set-url origin $DEFAULT_REPO
+      }
       # fetch + hard checkout avoids ff-only failures from local divergence.
       & git -C $target fetch --depth 1 origin $branch
       if ($LASTEXITCODE -ne 0) { throw "Could not reach the IJFW repo (exit $LASTEXITCODE). Check your network connection and retry." }
@@ -95,9 +109,12 @@ function Invoke-CloneOrPull($target, $branch) {
   }
 
   # Broken repo or no origin: backup user data, re-clone, restore.
+  # Rename-Item -NewName requires a leaf name; Move-Item -Destination accepts an
+  # absolute path. Using Rename-Item with an absolute path silently lost user data
+  # on Windows pre-1.2.9 because PowerShell rejected the call.
   $ts = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()
   $backupDir = "$target.bak.$ts"
-  Rename-Item -LiteralPath $target -NewName $backupDir
+  Move-Item -LiteralPath $target -Destination $backupDir -Force
   try {
     & git clone --depth 1 --branch $branch $DEFAULT_REPO $target
     if ($LASTEXITCODE -ne 0) { throw "Could not reach the IJFW repo (exit $LASTEXITCODE). Check your network connection and retry." }
@@ -106,14 +123,14 @@ function Invoke-CloneOrPull($target, $branch) {
       if (Test-Path $src) {
         $dst = Join-Path $target $item
         if (Test-Path $dst) { Remove-Item -Recurse -Force -LiteralPath $dst }
-        Move-Item -LiteralPath $src -Destination $dst
+        Move-Item -LiteralPath $src -Destination $dst -Force
       }
     }
     Remove-Item -Recurse -Force -LiteralPath $backupDir
     return "updated"
   } catch {
     if (Test-Path $target) { Remove-Item -Recurse -Force -LiteralPath $target }
-    Rename-Item -LiteralPath $backupDir -NewName $target
+    Move-Item -LiteralPath $backupDir -Destination $target -Force
     throw
   }
 }
@@ -123,6 +140,13 @@ function Invoke-InstallScript($target) {
   if (-not (Test-Path $script)) { throw "The installer script is not at $script yet. Run the full install from a fresh clone." }
   $gitBash = Resolve-GitBash
   if (-not $gitBash) { throw "IJFW needs Git Bash to complete setup. Install Git for Windows (includes bash.exe) and rerun." }
+  # Propagate IJFW_HOME into the bash sub-call so a custom -Dir target lands
+  # platform configs / sentinels under the user's chosen tree instead of the
+  # default ~/.ijfw. Without this, .\install.ps1 -Dir D:\custom would scribble
+  # MCP entries into the user's real ~/.codex / ~/.gemini / ~/.claude pointing
+  # at the scratch dir.
+  $priorIjfwHome = $env:IJFW_HOME
+  $env:IJFW_HOME = $target
   Push-Location $target
   try {
     $env:IJFW_NONINTERACTIVE = if ($env:CI -or $Yes) { "1" } else { "" }
@@ -134,6 +158,7 @@ function Invoke-InstallScript($target) {
   } finally {
     Pop-Location
     Remove-Item Env:\IJFW_SKIP_CLOSER -ErrorAction SilentlyContinue
+    if ($priorIjfwHome) { $env:IJFW_HOME = $priorIjfwHome } else { Remove-Item Env:\IJFW_HOME -ErrorAction SilentlyContinue }
   }
 }
 
@@ -253,7 +278,29 @@ function Provision-Plugin {
     return
   }
   New-Item -ItemType Directory -Force -Path $Dst | Out-Null
-  Copy-Item -Recurse -Force -Path (Join-Path $srcPath "*") -Destination $Dst
+  foreach ($srcItem in (Get-ChildItem -LiteralPath $srcPath -Recurse -File)) {
+    $rel = $srcItem.FullName.Substring($srcPath.Length).TrimStart('\','/')
+    $dstItem = Join-Path $Dst $rel
+    $dstDir = Split-Path -Parent $dstItem
+    if (-not (Test-Path $dstDir)) { New-Item -ItemType Directory -Force -Path $dstDir | Out-Null }
+    $srcMtime = $null
+    $dstMtime = $null
+    try {
+      if (Test-Path $srcItem.FullName) { $srcMtime = (Get-Item $srcItem.FullName -ErrorAction Stop).LastWriteTime }
+      if (Test-Path $dstItem)          { $dstMtime = (Get-Item $dstItem          -ErrorAction Stop).LastWriteTime }
+    } catch {
+      # File watcher race / lock / OneDrive offline -- treat as new install
+      $dstMtime = $null
+    }
+    if ($null -ne $dstMtime -and $null -ne $srcMtime -and $dstMtime -gt $srcMtime) {
+      # User has modified the destination; back it up before overwriting.
+      $ts = Get-Date -Format 'yyyyMMdd-HHmmss'
+      Copy-Item $dstItem "$dstItem.user-bak.$ts" -Force -ErrorAction SilentlyContinue
+    }
+    Copy-Item $srcItem.FullName $dstItem -Force
+    # Preserve source mtime so next install doesn't mistake our copy for a user edit.
+    try { (Get-Item $dstItem -ErrorAction Stop).LastWriteTime = $srcItem.LastWriteTime } catch {}
+  }
 }
 
 function Merge-PluginsEnabled {
@@ -280,6 +327,9 @@ function Merge-PluginsEnabled {
   # Strategy: try python3 first (has real YAML support); fall back to sentinel-anchored
   # regex that appends to a plugins.enabled: block or creates one.
 
+  # Sentinel: only run the regex fallback when Python was unavailable or failed.
+  $pythonAllSucceeded = $false
+
   $python = Get-Command python3 -ErrorAction SilentlyContinue
   if ($python) {
     $pyScript = @"
@@ -330,14 +380,15 @@ sys.exit(0)
     [System.IO.File]::WriteAllText($tmp, $pyScript)
     try {
       & python3 $tmp $ConfigPath $pluginName
-      $ok = ($LASTEXITCODE -eq 0)
+      $pythonAllSucceeded = ($LASTEXITCODE -eq 0)
     } finally {
       Remove-Item -LiteralPath $tmp -ErrorAction SilentlyContinue
     }
-    if ($ok) { return $true }
+    if ($pythonAllSucceeded) { return $true }
   }
 
   # Fallback: pure PowerShell sentinel-anchored regex approach.
+  # Only runs when Python was unavailable or exited non-zero.
   # If the file has a plugins.enabled: [...] line, splice in the name.
   # Otherwise append a plugins.enabled block.
   $enabledRe = [regex]'(?m)^([ \t]+enabled\s*:\s*\[)([^\]]*)\]'
@@ -380,7 +431,10 @@ function Merge-Marketplace {
     $raw = Get-Content -Raw -LiteralPath $settingsPath
     $cleaned = ConvertFrom-Jsonc $raw
     try {
-      $parsed = ConvertFrom-Json $cleaned -ErrorAction Stop
+      # -Depth is PS 6+; PS 5.1 ignores it safely via splatting.
+      $cfjArgs = @{ InputObject = $cleaned; ErrorAction = 'Stop' }
+      if ($PSVersionTable.PSVersion.Major -ge 6) { $cfjArgs['Depth'] = 32 }
+      $parsed = ConvertFrom-Json @cfjArgs
       $settings = ConvertTo-Hashtable $parsed
       if ($null -eq $settings) { $settings = @{} }
     } catch {