offgrid-ai 0.3.6 → 0.3.8

package/install.sh

@@ -123,15 +123,38 @@ if $DRY_RUN; then
   exit 0
 fi
 
+# ── Determine npm global bin directory ──────────────────────────────────────
+# npm bin -g was removed in npm v10+. Fall back to $(npm prefix -g)/bin.
+
+NPM_BIN=""
+if command -v npm &>/dev/null; then
+  # Try the modern way first, then legacy
+  NPM_PREFIX="$(npm prefix -g 2>/dev/null || true)"
+  if [[ -n "$NPM_PREFIX" ]]; then
+    NPM_BIN="${NPM_PREFIX}/bin"
+  fi
+  # Validate: the binary should exist there
+  if [[ ! -d "$NPM_BIN" ]]; then
+    NPM_BIN=""
+  fi
+fi
+
 # ── Add npm global bin to PATH if needed ────────────────────────────────────
 
-NPM_BIN="$(npm bin -g 2>/dev/null)"
+INSTALLED_VERSION=""
+
+if [[ -n "$NPM_BIN" && -x "$NPM_BIN/offgrid-ai" ]]; then
+  # Get version
+  INSTALLED_VERSION="$(OFFGRID_NO_UPDATE_CHECK=1 "$NPM_BIN/offgrid-ai" version 2>/dev/null || echo "")"
 
-if ! command -v offgrid-ai &>/dev/null; then
-  if [[ -n "$NPM_BIN" && -x "$NPM_BIN/offgrid-ai" ]]; then
-    # Add to current session
+  if command -v offgrid-ai &>/dev/null; then
+    # Already on PATH — nothing to do
+    ok "offgrid-ai ${INSTALLED_VERSION:+v${INSTALLED_VERSION} }installed at $(command -v offgrid-ai)"
+  else
+    # Not on PATH — add it
     export PATH="$NPM_BIN:$PATH"
     ok "Added $NPM_BIN to PATH for this session"
+    ok "offgrid-ai ${INSTALLED_VERSION:+v${INSTALLED_VERSION} }installed"
 
     # Add to shell config for future sessions (pick first existing or .zshrc)
     ADDED_TO_RC=false
@@ -152,13 +175,20 @@ if ! command -v offgrid-ai &>/dev/null; then
     if ! $ADDED_TO_RC; then
       warn "$NPM_BIN is already in a shell config file — restart your terminal to use offgrid-ai"
     fi
+  fi
+else
+  # Fallback: try to find it anywhere on PATH after install
+  if command -v offgrid-ai &>/dev/null; then
+    INSTALLED_VERSION="$(offgrid-ai version 2>/dev/null || echo "")"
+    ok "offgrid-ai ${INSTALLED_VERSION:+v${INSTALLED_VERSION} }installed at $(command -v offgrid-ai)"
   else
     echo ""
-    warn "offgrid-ai was installed but the binary wasn't found."
+    warn "offgrid-ai was installed but could not be found."
     echo "  Restart your terminal and run: offgrid-ai"
+    echo "  Or run: npx offgrid-ai"
     echo ""
     printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
-    printf "${BOLD}${GREEN}  offgrid-ai is ready!${RESET}\n"
+    printf "${BOLD}${GREEN}  offgrid-ai is installed!${RESET}\n"
     printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
     echo ""
     echo "  Run: offgrid-ai"
@@ -167,13 +197,11 @@ if ! command -v offgrid-ai &>/dev/null; then
   fi
 fi
 
-ok "offgrid-ai installed at $(command -v offgrid-ai)"
-
 # ── Done ─────────────────────────────────────────────────────────────────────
 
 echo ""
 printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
-printf "${BOLD}${GREEN}  offgrid-ai is ready!${RESET}\n"
+printf "${BOLD}${GREEN}  offgrid-ai ${INSTALLED_VERSION:+v${INSTALLED_VERSION} }is ready!${RESET}\n"
 printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
 echo ""
 echo "  First run will walk you through setting up everything you need"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "offgrid-ai",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "Privacy-first CLI for running local LLMs — discover, configure, run, benchmark",
   "author": "Eeshan Srivastava (https://eeshans.com)",
   "type": "module",

package/src/cli.mjs

@@ -789,6 +789,7 @@ async function uninstallCommand(argv) {
     // Non-interactive / forced: remove everything
     await removeDataDir();
     await removeSelf();
+    await removeShellPath();
     return;
   }
 
@@ -825,7 +826,8 @@ async function uninstallCommand(argv) {
     // Remove the npm package
     const confirmUninstall = await prompt.yesNo("Uninstall offgrid-ai npm package?", true);
     if (confirmUninstall) {
-      removeSelf();
+      await removeSelf();
+      await removeShellPath();
     } else {
       console.log(pc.dim("Cancelled."));
     }
@@ -849,6 +851,51 @@ async function removeDataDir() {
   }
 }
 
+async function removeShellPath() {
+  const { readFile, writeFile } = await import("node:fs/promises");
+  const { homedir } = await import("node:os");
+  const { promisify } = await import("node:util");
+  const { execFile } = await import("node:child_process");
+  let npmBin;
+  try {
+    const { stdout } = await promisify(execFile)("npm", ["bin", "-g"]);
+    npmBin = stdout.trim();
+  } catch { return; }
+  if (!npmBin) return;
+
+  const marker = "# Added by offgrid-ai installer";
+  const pathLine = `export PATH="${npmBin}:$PATH"`;
+  const rcFiles = [`${homedir()}/.zshrc`, `${homedir()}/.bashrc`, `${homedir()}/.bash_profile`];
+  let cleaned = false;
+
+  for (const rcFile of rcFiles) {
+    if (!existsSync(rcFile)) continue;
+    let content;
+    try { content = await readFile(rcFile, "utf8"); } catch { continue; }
+    if (!content.includes(npmBin) && !content.includes(marker)) continue;
+
+    const lines = content.split("\n");
+    const filtered = lines.filter((line, i) => {
+      // Remove the marker comment line
+      if (line.trim() === marker) return false;
+      // Remove the PATH export line added by the installer
+      if (line.trim() === pathLine) return false;
+      // Also remove a blank line that immediately precedes the marker (formatter)
+      if (i + 1 < lines.length && lines[i + 1].trim() === marker && line.trim() === "") return false;
+      return true;
+    });
+
+    if (filtered.length !== lines.length) {
+      await writeFile(rcFile, filtered.join("\n").replace(/\n{3,}/g, "\n\n") + "\n", "utf8");
+      console.log(pc.green(`✓ Cleaned PATH from ${rcFile}`));
+      cleaned = true;
+    }
+  }
+  if (!cleaned) {
+    console.log(pc.dim("No offgrid-ai PATH entries found in shell configs."));
+  }
+}
+
 async function removeSelf() {
   console.log(pc.cyan("\nUninstalling offgrid-ai..."));
   const { spawn: spawnUninstall } = await import("node:child_process");
@@ -932,7 +979,7 @@ Usage:
   offgrid-ai            Pick a model and run it
   offgrid-ai status     Show running local models
   offgrid-ai stop       Stop a running server (or: offgrid-ai stop <id>)
-  offgrid-ai uninstall  Remove offgrid-ai (optionally keep profiles)
+  offgrid-ai uninstall  Remove offgrid-ai, clean up PATH, optionally keep profiles
   offgrid-ai help       Show this help
   offgrid-ai version    Show version