offgrid-ai 0.3.5 → 0.3.7

package/install.sh

@@ -11,7 +11,8 @@
 #   1. Checks for Node.js
 #   2. If not found, installs it via nvm (no sudo needed)
 #   3. Installs offgrid-ai globally via npm
-#   4. Runs offgrid-ai
+#   4. Adds npm global bin to PATH if needed
+#   5. Runs offgrid-ai
 #
 # Flags:
 #   --dry-run    Show what would happen without making changes
@@ -108,7 +109,7 @@ echo ""
 printf "${BOLD}Installing offgrid-ai...${RESET}\n"
 dry npm install -g offgrid-ai
 
-# ── Verify ───────────────────────────────────────────────────────────────────
+# ── Dry-run early exit ──────────────────────────────────────────────────────
 
 if $DRY_RUN; then
   ok "offgrid-ai installed (dry-run)"
@@ -122,23 +123,52 @@ if $DRY_RUN; then
   exit 0
 fi
 
-if command -v offgrid-ai &>/dev/null; then
-  ok "offgrid-ai installed at $(command -v offgrid-ai)"
-else
-  echo ""
-  warn "offgrid-ai was installed but isn't on your PATH yet."
-  echo "  Restart your terminal and run: offgrid-ai"
-  echo "  Or run: source ~/.nvm/nvm.sh && offgrid-ai"
-  echo ""
-  printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
-  printf "${BOLD}${GREEN}  offgrid-ai is ready!${RESET}\n"
-  printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
-  echo ""
-  echo "  Run: offgrid-ai"
-  echo ""
-  exit 0
+# ── Add npm global bin to PATH if needed ────────────────────────────────────
+
+NPM_BIN="$(npm bin -g 2>/dev/null)"
+
+if ! command -v offgrid-ai &>/dev/null; then
+  if [[ -n "$NPM_BIN" && -x "$NPM_BIN/offgrid-ai" ]]; then
+    # Add to current session
+    export PATH="$NPM_BIN:$PATH"
+    ok "Added $NPM_BIN to PATH for this session"
+
+    # Add to shell config for future sessions (pick first existing or .zshrc)
+    ADDED_TO_RC=false
+    for RC_FILE in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile"; do
+      if [[ -f "$RC_FILE" || "$RC_FILE" == "$HOME/.zshrc" ]]; then
+        if ! grep -qF "$NPM_BIN" "$RC_FILE" 2>/dev/null; then
+          echo '' >> "$RC_FILE"
+          echo '# Added by offgrid-ai installer' >> "$RC_FILE"
+          echo "export PATH=\"$NPM_BIN:\$PATH\"" >> "$RC_FILE"
+          ok "Added $NPM_BIN to $RC_FILE"
+          ADDED_TO_RC=true
+          # Only add to one rc file to avoid duplicates
+          break
+        fi
+      fi
+    done
+
+    if ! $ADDED_TO_RC; then
+      warn "$NPM_BIN is already in a shell config file — restart your terminal to use offgrid-ai"
+    fi
+  else
+    echo ""
+    warn "offgrid-ai was installed but the binary wasn't found."
+    echo "  Restart your terminal and run: offgrid-ai"
+    echo ""
+    printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
+    printf "${BOLD}${GREEN}  offgrid-ai is ready!${RESET}\n"
+    printf "${BOLD}${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}\n"
+    echo ""
+    echo "  Run: offgrid-ai"
+    echo ""
+    exit 0
+  fi
 fi
 
+ok "offgrid-ai installed at $(command -v offgrid-ai)"
+
 # ── Done ─────────────────────────────────────────────────────────────────────
 
 echo ""
@@ -149,7 +179,12 @@ echo ""
 echo "  First run will walk you through setting up everything you need"
 echo "  (llama-server, model backends, Pi)."
 echo ""
-echo "  Run: offgrid-ai"
+if command -v offgrid-ai &>/dev/null; then
+  echo "  Run: offgrid-ai"
+else
+  echo "  Run: source ~/.zshrc && offgrid-ai"
+  echo "  (or open a new terminal)"
+fi
 echo ""
 
 if [[ -t 0 ]] && ! $SKIP_RUN; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "offgrid-ai",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "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