@ijfw/install 1.2.9 → 1.3.0

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.9",
+  "version": "1.3.0",
   "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"
 }
 
@@ -43,8 +50,8 @@ function Invoke-Preflight {
   if (-not $node -or ([int]($node -replace 'v(\d+)\..*','$1') -lt 18)) {
     $issues += "Node 18+ unlocks IJFW (found $node). Grab it from https://nodejs.org and we'll pick up where you left off."
   }
-  if (-not (Test-Command git))  { $issues += "Install Git for Windows (https://git-scm.com) and rerun -- it bundles everything we need." }
-  if (-not (Resolve-GitBash)) { $issues += "IJFW needs Git Bash (ships with Git for Windows). Install Git for Windows and rerun -- takes 60 seconds." }
+  if (-not (Test-Command git))  { $issues += "IJFW needs git (used to clone the source repo). Install: winget install --id Git.Git -e --source winget" }
+  # Bash is no longer required (v1.3.0 -- installer is Node-native).
   return $issues
 }
 
@@ -129,25 +136,18 @@ function Invoke-CloneOrPull($target, $branch) {
 }
 
 function Invoke-InstallScript($target) {
-  $script = Join-Path $target "scripts\install.sh"
-  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.
+  # v1.3.0: hand off to the Node-native installer (installer/src/install.js).
+  # No more bash dependency. Identical code path on every platform.
+  $entry = Join-Path $target "installer\src\install.js"
+  if (-not (Test-Path $entry)) { throw "The installer entry is not at $entry. Run the full install from a fresh clone." }
   $priorIjfwHome = $env:IJFW_HOME
   $env:IJFW_HOME = $target
   Push-Location $target
   try {
     $env:IJFW_NONINTERACTIVE = if ($env:CI -or $Yes) { "1" } else { "" }
-    # Let the PS wrapper own the final closer so Merge-Marketplace output
-    # lands above it. Bash skips its "Full log" line when this is set.
     $env:IJFW_SKIP_CLOSER = "1"
-    & $gitBash "./scripts/install.sh"
-    if ($LASTEXITCODE -ne 0) { throw "scripts/install.sh exited $LASTEXITCODE." }
+    & node $entry
+    if ($LASTEXITCODE -ne 0) { throw "Node installer exited $LASTEXITCODE." }
   } finally {
     Pop-Location
     Remove-Item Env:\IJFW_SKIP_CLOSER -ErrorAction SilentlyContinue
@@ -271,7 +271,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 {
@@ -298,6 +320,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 = @"
@@ -348,14 +373,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*\[)([^\]]*)\]'
@@ -398,7 +424,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 {