pudu-ai 0.2.18 → 0.2.19

package/dist/cli/index.js

@@ -29,7 +29,7 @@ function spawnTracked(file, args2 = [], options = {}) {
   installSignalHandlers();
   const subprocess = execa(file, args2, {
     reject: false,
-    timeout: options.timeout ?? 3e4,
+    timeout: options.timeout === void 0 ? 3e4 : options.timeout === 0 ? void 0 : options.timeout,
     ...options
   });
   children.add(subprocess);
@@ -71,7 +71,7 @@ var init_process = __esm({
 // src/shared/which.ts
 import { access } from "node:fs/promises";
 import { constants } from "node:fs";
-import path2 from "node:path";
+import path from "node:path";
 async function commandExists(name) {
   if (name.includes("/") || name.includes("\\")) {
     try {
@@ -82,9 +82,9 @@ async function commandExists(name) {
     }
   }
   const pathEnv = process.env.PATH ?? "";
-  const parts = pathEnv.split(path2.delimiter);
+  const parts = pathEnv.split(path.delimiter);
   for (const dir of parts) {
-    const candidate = path2.join(dir, name);
+    const candidate = path.join(dir, name);
     try {
       await access(candidate, constants.X_OK);
       return candidate;
@@ -238,31 +238,138 @@ function parseArgs(argv) {
   };
 }
 
+// src/adapters/ollama/index.ts
+init_process();
+init_which();
+
+// src/shared/bytes.ts
+var GiB = 1024 ** 3;
+var MiB = 1024 ** 2;
+function bytesToGiB(bytes) {
+  return bytes / GiB;
+}
+function parseSizeToBytes(input) {
+  const match = input.trim().match(/^([\d.]+)\s*(B|KB|MB|GB|TB|KiB|MiB|GiB|TiB)$/i);
+  if (!match) return void 0;
+  const value = Number(match[1]);
+  const unit = match[2].toLowerCase();
+  const map = {
+    b: 1,
+    kb: 1e3,
+    mb: 1e3 ** 2,
+    gb: 1e3 ** 3,
+    tb: 1e3 ** 4,
+    kib: 1024,
+    mib: 1024 ** 2,
+    gib: 1024 ** 3,
+    tib: 1024 ** 4
+  };
+  const factor = map[unit];
+  if (!factor || Number.isNaN(value)) return void 0;
+  return value * factor;
+}
+function formatBytes(bytes, digits = 1) {
+  if (!Number.isFinite(bytes)) return "N/A";
+  const abs = Math.abs(bytes);
+  if (abs >= GiB) return `${(bytes / GiB).toFixed(digits)} GB`;
+  if (abs >= MiB) return `${(bytes / MiB).toFixed(digits)} MB`;
+  if (abs >= 1024) return `${(bytes / 1024).toFixed(digits)} KB`;
+  return `${Math.round(bytes)} B`;
+}
+
+// src/adapters/ollama/parse.ts
+function parseOllamaList(output) {
+  const lines = output.split(/\r?\n/).map((l) => l.trimEnd()).filter(Boolean);
+  if (lines.length === 0) return [];
+  const header = lines[0] ?? "";
+  if (!/^NAME\s+/i.test(header)) {
+    return lines.flatMap((line) => parseDataLine(line));
+  }
+  return lines.slice(1).flatMap((line) => parseDataLine(line));
+}
+function parseDataLine(line) {
+  const parts = line.trim().split(/\s{2,}/);
+  if (parts.length < 2) return [];
+  const name = parts[0];
+  if (!name || /^NAME$/i.test(name)) return [];
+  const digest = parts[1];
+  const sizeRaw = parts[2];
+  const modified = parts.slice(3).join(" ") || void 0;
+  return [
+    {
+      id: name,
+      name,
+      source: "ollama",
+      digest,
+      sizeBytes: sizeRaw ? parseSizeToBytes(sizeRaw.replace(/([A-Z]+)$/i, " $1")) : void 0,
+      modifiedAt: modified
+    }
+  ];
+}
+function parseOllamaModelfile(modelfile) {
+  const match = modelfile.match(/^FROM\s+(.+)$/m);
+  return { from: match?.[1]?.trim() };
+}
+
+// src/adapters/ollama/index.ts
+var ollamaAdapter = {
+  id: "ollama",
+  label: "Ollama",
+  async detect() {
+    return Boolean(await commandExists("ollama"));
+  },
+  async version() {
+    const result = await runCommand("ollama", ["--version"], { timeout: 8e3 });
+    const text = `${result.stdout} ${result.stderr}`;
+    const match = text.match(/(\d+\.\d+\.\d+)/);
+    return match?.[1];
+  },
+  async listModels() {
+    if (!await this.detect()) return [];
+    const result = await runCommand("ollama", ["list"], { timeout: 15e3 });
+    return parseOllamaList(result.stdout);
+  },
+  async resolveModel(id) {
+    return resolveOllamaBlob(id);
+  },
+  async benchmarkCapabilities() {
+    return ["llama-bench"];
+  }
+};
+async function resolveOllamaBlob(id) {
+  const result = await runCommand("ollama", ["show", "--modelfile", id], { timeout: 15e3 });
+  if (result.exitCode !== 0) return void 0;
+  const { from } = parseOllamaModelfile(result.stdout);
+  if (!from) return void 0;
+  const format = from.endsWith(".gguf") || from.includes("sha256-") ? "gguf" : "unknown";
+  return { id, path: from, format };
+}
+
 // src/storage/config.ts
 import { readFile, writeFile } from "node:fs/promises";
 import { z } from "zod";
 
 // src/storage/paths.ts
 import os from "node:os";
-import path from "node:path";
+import path2 from "node:path";
 import { mkdir } from "node:fs/promises";
 function homeDir() {
-  return path.join(os.homedir(), ".pudu-ai");
+  return path2.join(os.homedir(), ".pudu-ai");
 }
 function configPath() {
-  return path.join(homeDir(), "config.json");
+  return path2.join(homeDir(), "config.json");
 }
 function benchmarksDir() {
-  return path.join(homeDir(), "benchmarks");
+  return path2.join(homeDir(), "benchmarks");
 }
 function telemetryDir() {
-  return path.join(homeDir(), "telemetry");
+  return path2.join(homeDir(), "telemetry");
 }
 function cacheDir() {
-  return path.join(homeDir(), "cache");
+  return path2.join(homeDir(), "cache");
 }
 function canirunCachePath() {
-  return path.join(cacheDir(), "canirun-models.json");
+  return path2.join(cacheDir(), "canirun-models.json");
 }
 async function ensureStorage() {
   await mkdir(benchmarksDir(), { recursive: true });
@@ -305,43 +412,6 @@ import os5 from "node:os";
 // src/platform/macos/hardware.ts
 init_process();
 import os2 from "node:os";
-
-// src/shared/bytes.ts
-var GiB = 1024 ** 3;
-var MiB = 1024 ** 2;
-function bytesToGiB(bytes) {
-  return bytes / GiB;
-}
-function parseSizeToBytes(input) {
-  const match = input.trim().match(/^([\d.]+)\s*(B|KB|MB|GB|TB|KiB|MiB|GiB|TiB)$/i);
-  if (!match) return void 0;
-  const value = Number(match[1]);
-  const unit = match[2].toLowerCase();
-  const map = {
-    b: 1,
-    kb: 1e3,
-    mb: 1e3 ** 2,
-    gb: 1e3 ** 3,
-    tb: 1e3 ** 4,
-    kib: 1024,
-    mib: 1024 ** 2,
-    gib: 1024 ** 3,
-    tib: 1024 ** 4
-  };
-  const factor = map[unit];
-  if (!factor || Number.isNaN(value)) return void 0;
-  return value * factor;
-}
-function formatBytes(bytes, digits = 1) {
-  if (!Number.isFinite(bytes)) return "N/A";
-  const abs = Math.abs(bytes);
-  if (abs >= GiB) return `${(bytes / GiB).toFixed(digits)} GB`;
-  if (abs >= MiB) return `${(bytes / MiB).toFixed(digits)} MB`;
-  if (abs >= 1024) return `${(bytes / 1024).toFixed(digits)} KB`;
-  return `${Math.round(bytes)} B`;
-}
-
-// src/platform/macos/hardware.ts
 function parseAppleSilicon(chip) {
   const match = chip.match(/Apple\s+(M\d+)(?:\s+(Pro|Max|Ultra))?/i);
   if (!match) return void 0;
@@ -515,85 +585,6 @@ async function detectHardware() {
 import os7 from "node:os";
 import path5 from "node:path";
 
-// src/adapters/ollama/index.ts
-init_process();
-init_which();
-
-// src/adapters/ollama/parse.ts
-function parseOllamaList(output) {
-  const lines = output.split(/\r?\n/).map((l) => l.trimEnd()).filter(Boolean);
-  if (lines.length === 0) return [];
-  const header = lines[0] ?? "";
-  if (!/^NAME\s+/i.test(header)) {
-    return lines.flatMap((line) => parseDataLine(line));
-  }
-  return lines.slice(1).flatMap((line) => parseDataLine(line));
-}
-function parseDataLine(line) {
-  const parts = line.trim().split(/\s{2,}/);
-  if (parts.length < 2) return [];
-  const name = parts[0];
-  if (!name || /^NAME$/i.test(name)) return [];
-  const digest = parts[1];
-  const sizeRaw = parts[2];
-  const modified = parts.slice(3).join(" ") || void 0;
-  return [
-    {
-      id: name,
-      name,
-      source: "ollama",
-      digest,
-      sizeBytes: sizeRaw ? parseSizeToBytes(sizeRaw.replace(/([A-Z]+)$/i, " $1")) : void 0,
-      modifiedAt: modified
-    }
-  ];
-}
-function parseOllamaModelfile(modelfile) {
-  const match = modelfile.match(/^FROM\s+(.+)$/m);
-  return { from: match?.[1]?.trim() };
-}
-
-// src/adapters/ollama/index.ts
-var ollamaAdapter = {
-  id: "ollama",
-  label: "Ollama",
-  async detect() {
-    return Boolean(await commandExists("ollama"));
-  },
-  async version() {
-    const result = await runCommand("ollama", ["--version"], { timeout: 8e3 });
-    const text = `${result.stdout} ${result.stderr}`;
-    const match = text.match(/(\d+\.\d+\.\d+)/);
-    return match?.[1];
-  },
-  async listModels() {
-    if (!await this.detect()) return [];
-    const result = await runCommand("ollama", ["list"], { timeout: 15e3 });
-    const models = parseOllamaList(result.stdout);
-    const resolved = await Promise.all(
-      models.map(async (model) => {
-        const artifact = await resolveOllamaBlob(model.id);
-        return { ...model, artifactPath: artifact?.path };
-      })
-    );
-    return resolved;
-  },
-  async resolveModel(id) {
-    return resolveOllamaBlob(id);
-  },
-  async benchmarkCapabilities() {
-    return ["llama-bench"];
-  }
-};
-async function resolveOllamaBlob(id) {
-  const result = await runCommand("ollama", ["show", "--modelfile", id], { timeout: 15e3 });
-  if (result.exitCode !== 0) return void 0;
-  const { from } = parseOllamaModelfile(result.stdout);
-  if (!from) return void 0;
-  const format = from.endsWith(".gguf") || from.includes("sha256-") ? "gguf" : "unknown";
-  return { id, path: from, format };
-}
-
 // src/adapters/lmstudio/index.ts
 import os6 from "node:os";
 import path4 from "node:path";
@@ -1632,7 +1623,7 @@ async function loadSession(options) {
   const [runtimes2, models, catalogState, history, llamaBench, agents] = await Promise.all([
     detectRuntimes(),
     discoverLocalModels(),
-    loadCatalog(options.network),
+    options.light ? Promise.resolve({ catalog: [], networkUsed: false }) : loadCatalog(options.network),
     listBenchmarks(),
     commandExists("llama-bench").then(Boolean),
     detectAgents()
@@ -1640,11 +1631,11 @@ async function loadSession(options) {
   const rows = [];
   for (const local of models) {
     const catalog = matchCatalog(catalogState.catalog, local);
-    const compatibility = catalog ? await compatibilityFor(hardware, catalog, options.network) : void 0;
+    const compatibility = catalog && !options.light ? await compatibilityFor(hardware, catalog, options.network) : void 0;
     const lastBenchmark = [...history].reverse().find((b) => b.model.id === local.id);
     rows.push({ local, catalog, compatibility, lastBenchmark });
   }
-  const recommendations = await recommendForMachine(hardware, catalogState.catalog, options.network);
+  const recommendations = options.light ? [] : await recommendForMachine(hardware, catalogState.catalog, options.network);
   return {
     hardware,
     runtimes: runtimes2,
@@ -2727,7 +2718,10 @@ ${pull.stderr || t("launchPullFail")}` };
   const args2 = ["launch", def.ollamaLaunch, "--model", decision.ollamaTag];
   if (def.id === "openclaw" || def.id === "claude") args2.push("--yes");
   lines.push(`ollama ${args2.join(" ")}`);
-  const launched = await runCommand("ollama", args2, { timeout: 12e4 });
+  const launched = await runCommand("ollama", args2, {
+    timeout: 0,
+    stdio: "inherit"
+  });
   if (launched.exitCode !== 0) {
     return {
       ok: false,
@@ -3565,7 +3559,10 @@ async function run(args2) {
     process.stderr.write(`${t("loading")}
 `);
   }
-  const session = await loadSession({ network: args2.network });
+  const session = await loadSession({
+    network: args2.network,
+    light: args2.command === "launch" || args2.command === "doctor" || args2.command === "hardware"
+  });
   switch (args2.command) {
     case "hardware":
       print(
@@ -3690,6 +3687,10 @@ ${runtimesText(session)}`),
         return 1;
       }
       const catalog = session.rows.find((r) => r.local.id === model.id)?.catalog;
+      if (!model.artifactPath && model.source === "ollama") {
+        const artifact = await ollamaAdapter.resolveModel(model.id);
+        model.artifactPath = artifact?.path;
+      }
       const result = await runBenchmark({
         model,
         hardware: session.hardware,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pudu-ai",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "description": "Pudu-AI — local AI hardware & benchmark lab for the terminal",
   "keywords": [
     "ai",