offgrid-ai 0.3.7 → 0.3.9

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.7",
+  "version": "0.3.9",
   "description": "Privacy-first CLI for running local LLMs — discover, configure, run, benchmark",
   "author": "Eeshan Srivastava (https://eeshans.com)",
   "type": "module",

package/src/logs.mjs

@@ -2,6 +2,7 @@ import { existsSync, statSync } from "node:fs";
 import { appendFile } from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import pc from "picocolors";
+import { stripVTControlCharacters } from "node:util";
 
 export function tailFriendly(rawLogPath, friendlyLogPath) {
   let offset = existsSync(rawLogPath) ? statSync(rawLogPath).size : 0;
@@ -21,7 +22,7 @@ export function tailFriendly(rawLogPath, friendlyLogPath) {
         if (!friendly || seen.has(friendly)) continue;
         seen.add(friendly);
         console.log(friendly);
-        await appendFile(friendlyLogPath, pc.strip(friendly) + "\n", "utf8");
+        await appendFile(friendlyLogPath, stripVTControlCharacters(friendly) + "\n", "utf8");
       }
     } catch { /* friendly logging must never crash */ }
   }, 300);

package/src/ui.mjs

@@ -1,5 +1,6 @@
 import { cancel, confirm, intro, isCancel, select, text } from "@clack/prompts";
 import pc from "picocolors";
+import { stripVTControlCharacters } from "node:util";
 
 export { pc };
 export { pc as colors };
@@ -50,9 +51,9 @@ function handleCancel(value) {
 }
 
 export function renderRows(rows) {
-  const width = Math.max(...rows.map(([key]) => pc.strip(String(key)).length));
+  const width = Math.max(...rows.map(([key]) => stripVTControlCharacters(String(key)).length));
   return rows.map(([key, value]) => {
-    const visible = pc.strip(String(key)).length;
+    const visible = stripVTControlCharacters(String(key)).length;
     return `${key}${" ".repeat(Math.max(1, width - visible + 2))}${value}`;
   }).join("\n");
 }