offgrid-ai 0.6.2 → 0.6.3

package/package.json

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

package/src/benchmark.mjs

@@ -6,6 +6,8 @@ import { homedir } from "node:os";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { ensureDirs, loadConfig, saveConfig } from "./config.mjs";
+import { backendFor } from "./backends.mjs";
+import { serverMatchesProfile, serverReady } from "./process.mjs";
 import { pc, createPrompt, renderRows, renderSection } from "./ui.mjs";
 
 const execFileAsync = promisify(execFile);
@@ -137,11 +139,56 @@ export async function linkBenchmarkRepo(prompt) {
 
 // ── Create a benchmark run directory ──────────────────────────────────────
 
+function harnessDisplayName(id) {
+  if (id === "pi") return "Pi";
+  return String(id).replace(/[-_]+/gu, " ").replace(/\b\w/gu, (char) => char.toUpperCase());
+}
+
+function intendedRunnerForProfile(profile) {
+  if (!profile) return "your tool";
+  const harnessEntries = Object.entries(profile.harnesses ?? {}).filter(([, config]) => config?.enabled !== false);
+  const [id] = harnessEntries.find(([key]) => key === "pi") ?? harnessEntries[0] ?? ["pi"];
+  return harnessDisplayName(id);
+}
+
+async function profileServerStatus(profile) {
+  if (!profile) return null;
+  const ready = await serverReady(profile.baseUrl).catch(() => false);
+  if (!ready) return { running: false };
+  const match = await serverMatchesProfile(profile).catch(() => ({ matches: true, reason: "server responded" }));
+  return { running: match.matches, reason: match.reason };
+}
+
+function printBenchmarkNextSteps({ repoPath, profile, modelId, runnerLabel, serverStatus }) {
+  console.log("");
+  console.log(pc.bold("Next steps"));
+
+  let step = 1;
+  if (profile) {
+    const command = `offgrid-ai run ${profile.id}`;
+    if (serverStatus?.running) {
+      const reason = serverStatus.reason ? pc.dim(` (${serverStatus.reason})`) : "";
+      console.log(`  ${step++}. Model server is already running at ${pc.cyan(profile.baseUrl)}${reason}`);
+      console.log(`     ${pc.dim(`If you still need to open ${runnerLabel}, run: ${command}`)}`);
+    } else {
+      console.log(`  ${step++}. If the model server is not already running, run: ${pc.cyan(command)}`);
+    }
+  } else {
+    console.log(`  ${step++}. Open ${runnerLabel} for ${pc.bold(modelId)}`);
+  }
+
+  console.log(`  ${step++}. ${pc.cyan(`cd ${repoPath}`)}`);
+  console.log(`  ${step++}. ${pc.cyan("npm run dev")}`);
+  console.log(`  ${step}. In the gallery, find this run, copy the prompt, and paste it into ${runnerLabel}`);
+}
+
 async function prepareBenchmarkRun({ repoPath, benchmark, kind, modelId, modelSource, backendLabel, profile }) {
   const toolPrompt = buildToolPrompt(benchmark, kind);
   const now = new Date();
   const runId = createRunId(now);
   const modelSlug = slugModelId(modelId);
+  const runnerLabel = intendedRunnerForProfile(profile);
+  const serverStatus = await profileServerStatus(profile);
   const runsDir = join(repoPath, "runs");
   const benchmarkDirectory = join(runsDir, benchmark.id);
   const modelDirectory = join(benchmarkDirectory, modelSlug);
@@ -166,8 +213,8 @@ async function prepareBenchmarkRun({ repoPath, benchmark, kind, modelId, modelSo
       : { metadata: "metadata.json", prompt: "prompt.md", html: "index.html", preview: "preview.png", video: "preview.webm", rawResponse: "response.raw.txt" },
     runner: {
       mode: modelSource === "cloud" ? "manual" : "external",
-      intendedRunner: profile ? "Pi" : undefined,
-      ...(profile ? { tool: "pi" } : {}),
+      intendedRunner: profile ? runnerLabel : undefined,
+      ...(profile?.harnesses?.pi || runnerLabel === "Pi" ? { tool: "pi" } : {}),
       ...(modelSource ? { modelSource } : {}),
       ...(backendLabel ? { backendLabel } : {}),
       ...(profile?.baseUrl ? { baseUrl: profile.baseUrl } : {}),
@@ -190,12 +237,7 @@ async function prepareBenchmarkRun({ repoPath, benchmark, kind, modelId, modelSo
     ["Source", backendLabel || modelSource],
   ])));
 
-  console.log("");
-  console.log(pc.bold("Next steps"));
-  console.log(`  1. ${pc.cyan(`offgrid-ai run ${profile ? profile.id : "<profile>"}`)}`);
-  console.log(`  2. ${pc.cyan(`cd ${repoPath} && npm run dev`)}`);
-  console.log(`  3. In the gallery, find your run and copy the prompt from the run details`);
-  console.log("  4. In Pi, paste the prompt");
+  printBenchmarkNextSteps({ repoPath, profile, modelId, runnerLabel, serverStatus });
 
   return runDirectory;
 }
@@ -226,7 +268,6 @@ export async function benchmarkForProfile(profile) {
     const selectedBenchmark = benchmarks.find((b) => b.id === benchmarkId);
     if (!selectedBenchmark) return;
 
-    const { backendFor } = await import("./backends.mjs");
     const modelId = profile.modelAlias;
     const modelSource = profile.providerId === "llama-cpp-mtp" ? "llama-cpp-mtp" : profile.backend === "ollama" ? "ollama" : profile.backend === "omlx" ? "omlx" : "llama-cpp";
     const backendLabel = backendFor(profile.backend).label;
@@ -265,7 +306,6 @@ export async function benchmarkFlow() {
     if (!selectedBenchmark) return;
 
     const { loadProfiles } = await import("./profiles.mjs");
-    const { backendFor } = await import("./backends.mjs");
 
     const profiles = await loadProfiles();
     const source = await prompt.choice("Model source", [

package/src/cli.mjs

@@ -272,37 +272,88 @@ function buildCatalogItems(normalized) {
   ];
 }
 
-function modelSelectOption(item, { runningProfilesNow }) {
+const OPTION_SEPARATOR = pc.dim("  │  ");
+const OPTION_STATUS_WIDTH = 12;
+const OPTION_SOURCE_WIDTH = 14;
+
+function optionTag(text, color, width) {
+  const padded = String(text).padEnd(width);
+  return color ? color(padded) : padded;
+}
+
+function optionStatusTag(kind) {
+  const statuses = {
+    running: ["RUNNING", pc.green],
+    ready: ["SET UP", pc.green],
+    missing: ["FILE MISSING", pc.red],
+    setup: ["NEEDS SETUP", pc.yellow],
+  };
+  const [text, color] = statuses[kind] ?? [kind, pc.dim];
+  return optionTag(text, color, OPTION_STATUS_WIDTH);
+}
+
+function optionSourceTag(sourceId, label) {
+  const colors = {
+    "llama-cpp": pc.cyan,
+    "llama-cpp-mtp": pc.blue,
+    ollama: pc.green,
+    omlx: pc.magenta,
+    gguf: pc.cyan,
+  };
+  return optionTag(label, colors[sourceId] ?? pc.dim, OPTION_SOURCE_WIDTH);
+}
+
+function optionLabel({ status, source, name, details = [] }) {
+  return [status, source, pc.bold(name), ...details].filter(Boolean).join(OPTION_SEPARATOR);
+}
+
+function optionHint(parts) {
+  return parts.filter(Boolean).join(" · ");
+}
+
+function modelSelectOption(item, { runningProfilesNow, drafters }) {
   if (item.type === "profile") {
     const { profile } = item;
+    const backend = backendFor(profile.backend);
     const running = runningProfilesNow.some((r) => r.id === profile.id);
     const fileMissing = item.fileMissing;
-    let status;
-    if (fileMissing) status = pc.red("⚠ missing");
-    else if (running) status = pc.green("● running");
-    else status = pc.dim("● ready");
-    // MTP label: enabled vs available vs not available
+    const status = optionStatusTag(fileMissing ? "missing" : running ? "running" : "ready");
+    const source = optionSourceTag(profile.backend, backend.label);
+    const caps = profile.capabilities ?? {};
     let mtpLabel;
-    if (profile.drafterPath) mtpLabel = pc.green("MTP");
-    else if ((profile.capabilities?.architecture === "gemma4")) mtpLabel = pc.yellow("MTP available");
-    const ctxLabel = profile.flags?.ctxSize ? `${(profile.flags.ctxSize / 1000).toFixed(0)}k` : null;
-    const label = [profile.label, status, mtpLabel, ctxLabel].filter(Boolean).join(" ");
-    return { value: itemKey(item), label, hint: humanCapabilitySummary(profile.capabilities ?? {}) || profile.modelAlias };
+    if (profile.drafterPath) mtpLabel = pc.green("MTP on");
+    else if (drafters ? matchDrafter(profile.modelPath, drafters) : null) mtpLabel = pc.yellow("MTP available");
+    else if (caps.architecture === "gemma4") mtpLabel = pc.yellow("MTP needs drafter");
+    const ctxLabel = profile.flags?.ctxSize ? pc.dim(`${(profile.flags.ctxSize / 1000).toFixed(0)}k ctx`) : null;
+    const label = optionLabel({ status, source, name: profile.label, details: [ctxLabel, mtpLabel] });
+    return { value: itemKey(item), label, hint: optionHint([profile.modelAlias, humanCapabilitySummary(caps), profile.baseUrl]) };
   }
   if (item.type === "new") {
     const { model, drafter } = item;
     const caps = detectCapabilities(model.path, model.mmprojPath);
     const mtpAvailable = caps.mtp || Boolean(drafter);
     let mtpLabel;
-    if (mtpAvailable) mtpLabel = pc.green("MTP ✓");
-    else if (caps.architecture === "gemma4") mtpLabel = pc.yellow("MTP");
-    const label = [model.label, pc.yellow("needs setup"), mtpLabel, formatBytes(model.sizeBytes)].filter(Boolean).join(" ");
-    return { value: itemKey(item), label, hint: humanCapabilitySummary(caps) || model.quant };
+    if (mtpAvailable) mtpLabel = pc.green("MTP available");
+    else if (caps.architecture === "gemma4") mtpLabel = pc.yellow("MTP needs drafter");
+    const label = optionLabel({
+      status: optionStatusTag("setup"),
+      source: optionSourceTag("gguf", "GGUF file"),
+      name: model.label,
+      details: [pc.dim(formatBytes(model.sizeBytes)), mtpLabel],
+    });
+    return { value: itemKey(item), label, hint: optionHint([basename(model.path), humanCapabilitySummary(caps), model.quant]) };
   }
   // managed
   const { model, backendId } = item;
   const backend = BACKENDS[backendId];
-  return { value: itemKey(item), label: `${model.label} ${pc.dim(`via ${backend.label}`)}`, hint: model.id };
+  const details = [model.quant ? pc.dim(model.quant) : null, model.sizeBytes ? pc.dim(formatBytes(model.sizeBytes)) : null];
+  const label = optionLabel({
+    status: optionStatusTag("setup"),
+    source: optionSourceTag(backendId, backend.label),
+    name: model.label,
+    details,
+  });
+  return { value: itemKey(item), label, hint: optionHint([model.id, "available through local backend"]) };
 }
 
 function actionsForItem(item) {