offgrid-ai 0.3.4 → 0.3.6

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.4",
+  "version": "0.3.6",
   "description": "Privacy-first CLI for running local LLMs — discover, configure, run, benchmark",
   "author": "Eeshan Srivastava (https://eeshans.com)",
   "type": "module",
@@ -29,10 +29,12 @@
   "scripts": {
     "start": "node bin/offgrid-ai.mjs",
     "test": "node --test test/*.mjs",
+    "lint": "eslint src/*.mjs bin/*.mjs",
     "check:privacy": "node scripts/privacy-gate.mjs",
     "release:check": "bash scripts/release-check.sh",
     "release:check:fast": "bash scripts/release-check.sh --skip-install --skip-manual",
-    "prepack": "npm run check:privacy"
+    "prepack": "npm run check:privacy",
+    "pretest": "npm run lint"
   },
   "dependencies": {
     "@clack/prompts": "^1.4.0",
@@ -47,5 +49,10 @@
     "llm",
     "ai"
   ],
-  "license": "MIT"
-}
+  "license": "MIT",
+  "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.4.1",
+    "globals": "^17.6.0"
+  }
+}

package/src/cli.mjs

@@ -1,6 +1,5 @@
-import { homedir, totalmem } from "node:os";
+import { totalmem } from "node:os";
 import { existsSync, statSync, rmSync } from "node:fs";
-import { join } from "node:path";
 import { ensureDirs, findLlamaServer, hasHomebrew, DATA_DIR } from "./config.mjs";
 import { scanGgufModels } from "./scan.mjs";
 import { createProfileFromModel, normalizeProfile } from "./profiles.mjs";
@@ -145,9 +144,8 @@ export async function mainFlow() {
       console.log(pc.bold("\nSaved profiles"));
       for (const profile of profiles) {
         const backend = backendFor(profile.backend);
-        const running = await isProfileRunning(profile);
-        const idx = items.length;
         const colorMap = { "llama-cpp": pc.yellow, "llama-cpp-mtp": pc.blue, "ollama": pc.magenta, "omlx": pc.cyan };
+        const running = await isProfileRunning(profile);
         const c = colorMap[profile.backend] ?? pc.magenta;
         console.log(`  ${running ? pc.green("●") : pc.dim("○")} ${pc.bold(profile.label)} ${c(`[${backend.label}]`)} · ${pc.cyan(profile.modelAlias)}`);
       }
@@ -294,13 +292,22 @@ async function runProfile(profile, options = {}) {
       console.log(pc.dim("Use --reuse-existing to reuse this server."));
     } else if (!ready) {
       console.log(pc.dim(`Starting ${backend.label} for ${profile.label}...`));
-      const state = await startServer(profile);
-      const tail = state?.rawLogPath ? tailFriendly(state.rawLogPath, state.friendlyLogPath) : { stop() {} };
+      let state;
       try {
-        await waitForReady(profile, state?.pid, state?.rawLogPath);
-        console.log(pc.green(`[ready] ${profile.baseUrl}/models`));
-      } finally {
-        tail.stop();
+        state = await startServer(profile);
+        const tail = state?.rawLogPath ? tailFriendly(state.rawLogPath, state.friendlyLogPath) : { stop() {} };
+        try {
+          await waitForReady(profile, state?.pid, state?.rawLogPath);
+          console.log(pc.green(`[ready] ${profile.baseUrl}/models`));
+        } finally {
+          tail.stop();
+        }
+      } catch (err) {
+        // Clean up orphaned server process if startup failed
+        if (state?.pid) {
+          try { await stopProfile(profile); } catch { /* best effort */ }
+        }
+        throw err;
       }
     }
   }
@@ -420,7 +427,7 @@ async function removeProfileInteractive(id) {
 
 // ── Benchmark (stub) ────────────────────────────────────────────────────────
 
-async function benchmarkFlow(prompt, profiles) {
+async function benchmarkFlow() {
   console.log(pc.yellow("Benchmark support coming soon."));
   console.log(pc.dim("This will require the local-llm-visual-benchmark repo."));
   console.log(pc.dim("For now, start a model with offgrid-ai and run benchmarks manually."));
@@ -598,7 +605,7 @@ async function onboardFlow() {
             break;
           }
         }
-      } catch (err) {
+      } catch {
         console.log(pc.red(`✗ Homebrew installation failed.`));
         console.log(pc.dim("Install it manually from https://brew.sh, then run offgrid-ai again."));
         return;
@@ -775,8 +782,11 @@ async function onboardFlow() {
 // ── Uninstall ───────────────────────────────────────────────────────────────
 
 async function uninstallCommand(argv) {
-  if (!process.stdin.isTTY) {
-    // Non-interactive: remove everything
+  const { options } = parseOptions(argv);
+  const force = options.force || options.f;
+
+  if (!process.stdin.isTTY || force) {
+    // Non-interactive / forced: remove everything
     await removeDataDir();
     await removeSelf();
     return;

package/src/estimate.mjs

@@ -1,6 +1,5 @@
 import { existsSync, statSync } from "node:fs";
 import { readGgufMetadata } from "./gguf.mjs";
-import pc from "picocolors";
 
 export function estimateMemory(modelPath, mmprojPath, draftModelPath, flags) {
   const modelBytes = statSync(modelPath).size;

package/src/process.mjs

@@ -1,6 +1,6 @@
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
-import { existsSync, openSync } from "node:fs";
+import { openSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { LOG_DIR } from "./config.mjs";

package/src/profiles.mjs

@@ -1,6 +1,6 @@
-import { existsSync, statSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { mkdir, readdir, rm, unlink, writeFile, readFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { PROFILE_DIR, RUN_DIR, LOG_DIR } from "./config.mjs";
 import { backendFor } from "./backends.mjs";
 import { computeFlags } from "./autodetect.mjs";
@@ -113,7 +113,7 @@ export async function deleteProfile(id, options = {}) {
 
 // ── Normalize / auto-detect ────────────────────────────────────────────────
 
-export function normalizeProfile(profile, modelPath, mmprojPath) {
+export function normalizeProfile(profile) {
   const backend = backendFor(profile.backend);
   const flags = {
     host: "127.0.0.1",
@@ -152,7 +152,7 @@ export async function createProfileFromModel(model, backendId = "llama-cpp") {
     preset: null, // no presets — auto-detected
     flags,
     commandArgv: argv,
-  }, model.path, model.mmprojPath);
+  });
 }
 
 // ── State files (for running servers) ──────────────────────────────────────