offgrid-ai 0.14.3 → 0.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "offgrid-ai",
-  "version": "0.14.3",
+  "version": "0.15.1",
   "description": "Privacy-first CLI for running local LLMs — discover, configure, run, benchmark",
   "author": "Eeshan Srivastava (https://eeshans.com)",
   "type": "module",
@@ -42,10 +42,10 @@
     "pretest": "npm run lint"
   },
   "dependencies": {
-    "@clack/prompts": "^1.4.0",
     "@earendil-works/pi-agent-core": "^0.80.3",
     "@earendil-works/pi-ai": "^0.80.3",
     "@earendil-works/pi-coding-agent": "^0.80.3",
+    "@inquirer/prompts": "^8.5.2",
     "picocolors": "^1.1.0"
   },
   "keywords": [

package/src/commands/models.mjs

@@ -4,9 +4,9 @@ import { createProfileFromModel, readProfile, saveProfile, deleteProfile, profil
 import { isProfileRunning, isProfileServerUp, modelAvailableOnServer, stopProfile } from "../process.mjs";
 import { syncPiConfig, removeFromPiConfig } from "../harness-pi.mjs";
 import { configureLocalProfile } from "../profile-setup.mjs";
-import { pc, startInteractive, createPrompt } from "../ui.mjs";
+import { pc, startInteractive, createPrompt, modelSelect } from "../ui.mjs";
 import { buildCatalogItems, createManagedProfile, itemKey, loadModelCatalog, normalizeCatalog } from "../model-catalog.mjs";
-import { modelSelectOption, modelNameWidth, printGgufModelDetails, printMlxModelDetails, printManagedModelDetails, printWorkspaceHeader, printBenchmarkLine, printProfileDetails } from "../model-presenters.mjs";
+import { modelSelectOption, modelNameWidth, inferBackendId, formatSourceLabel, discoverySourceForItem, printGgufModelDetails, printMlxModelDetails, printManagedModelDetails, printWorkspaceHeader, printBenchmarkLine, printProfileDetails } from "../model-presenters.mjs";
 import { runProfile } from "./run.mjs";
 
 const { stripVTControlCharacters } = await import("node:util");
@@ -65,23 +65,47 @@ export async function modelCommandCenter(initialCatalog) {
     return "setup";
   };
 
-  const groupOrder = ["running", "ready", "setup", "missing"];
-  const grouped = new Map(groupOrder.map((key) => [key, []]));
-  for (const item of allItems) grouped.get(statusFor(item)).push(item);
-
-  const choices = [];
-  for (const group of groupOrder) {
-    const bucket = grouped.get(group);
-    if (!bucket || bucket.length === 0) continue;
-    for (const item of bucket) {
-      const opt = modelSelectOption(item, { runningProfilesNow, modelMissingIds, nameWidth });
-      choices.push({ value: opt.value, label: opt.label, hint: opt.hint });
+  // Group ready/running/missing profiles by backend, setup items separate
+  const byBackend = new Map();
+  const setupItems = [];
+  for (const item of allItems) {
+    const s = statusFor(item);
+    if (s === "setup") {
+      setupItems.push(item);
+    } else {
+      const backendId = inferBackendId(item);
+      const sourceId = discoverySourceForItem(item) ?? "unknown";
+      const key = `${backendId}:${sourceId}`;
+      if (!byBackend.has(key)) byBackend.set(key, { backendId, sourceId, items: [] });
+      byBackend.get(key).items.push(item);
     }
   }
 
+  const groups = [];
+  for (const { backendId, sourceId, items } of byBackend.values()) {
+    const backendLabel = backendFor(backendId)?.label ?? backendId;
+    const sourceLabel = formatSourceLabel(sourceId);
+    const sep = sourceLabel && sourceLabel !== backendLabel
+      ? `${backendLabel} · ${sourceLabel} (${items.length})`
+      : `${backendLabel} (${items.length})`;
+    const groupItems = items.map((item) => {
+      const opt = modelSelectOption(item, { runningProfilesNow, modelMissingIds, nameWidth, compact: true });
+      return { value: opt.value, label: opt.label, description: opt.description };
+    });
+    groups.push({ separator: `  ${sep}`, items: groupItems });
+  }
+
+  if (setupItems.length > 0) {
+    const groupItems = setupItems.map((item) => {
+      const opt = modelSelectOption(item, { runningProfilesNow, modelMissingIds, nameWidth, compact: true });
+      return { value: opt.value, label: opt.label, description: opt.description };
+    });
+    groups.push({ separator: `  Needs setup (${setupItems.length})`, items: groupItems });
+  }
+
   const prompt = createPrompt();
   try {
-    const selected = await prompt.choice("Select a model", choices);
+    const selected = await modelSelect("Select a model", groups, { pageSize: 20 });
     if (!selected) return;
     const item = allItems.find((candidate) => itemKey(candidate) === selected);
     if (!item) return;

package/src/model-presenters.mjs

@@ -62,7 +62,7 @@ function optionBackendTag(backendId) {
   return optionPad(label, colors[backendId] ?? pc.dim, OPTION_BACKEND_WIDTH);
 }
 
-function formatSourceLabel(sourceId) {
+export function formatSourceLabel(sourceId) {
   if (!sourceId) return "unknown";
   const map = {
     huggingface: "HuggingFace",
@@ -95,7 +95,7 @@ function discoverySourceForProfile(profile) {
   return inferSourceFromPath(profile.modelPath);
 }
 
-function discoverySourceForItem(item) {
+export function discoverySourceForItem(item) {
   if (item.type === "profile") return discoverySourceForProfile(item.profile);
   return item.model?.source ?? null;
 }
@@ -132,9 +132,10 @@ function optionLabel({ status, backend, source, name, quant, ctx, size, nameWidt
   return [status, backend, source, pc.bold(optionPad(name, null, nameWidth)), quant, ctx, pc.dim(size)].join(OPTION_SEPARATOR);
 }
 
-export function modelSelectOption(item, { runningProfilesNow, modelMissingIds, nameWidth }) {
+export function modelSelectOption(item, { runningProfilesNow, modelMissingIds, nameWidth, compact = false }) {
   const sourceId = discoverySourceForItem(item) ?? "unknown";
   const backendId = inferBackendId(item);
+
   if (item.type === "profile") {
     const backend = backendFor(item.profile.backend);
     const running = runningProfilesNow.some((profile) => profile.id === item.profile.id);
@@ -144,6 +145,16 @@ export function modelSelectOption(item, { runningProfilesNow, modelMissingIds, n
     const hint = drafterMissing ? "MTP drafter missing — reconfigure"
       : modelMissing ? `${backend.label} model no longer available`
       : undefined;
+
+    if (compact) {
+      const indicator = status === "running" ? pc.green("●") : status === "missing" ? pc.red("✗") : pc.dim("○");
+      return {
+        value: itemKey(item),
+        label: [indicator, pc.bold(optionPad(item.label, null, nameWidth)), optionQuantLabel(item), optionCtxLabel(item), pc.dim(optionSizeLabel(item))].join(OPTION_SEPARATOR),
+        ...(hint ? { description: pc.red(hint) } : {}),
+      };
+    }
+
     return {
       value: itemKey(item),
       label: optionLabel({
@@ -159,6 +170,17 @@ export function modelSelectOption(item, { runningProfilesNow, modelMissingIds, n
       ...(hint ? { hint: pc.red(hint) } : {}),
     };
   }
+
+  // Setup item (new model or managed without profile)
+  if (compact) {
+    const backendLabel = backendFor(backendId)?.label ?? backendId;
+    const full = `${item.label} · ${backendLabel}`;
+    return {
+      value: itemKey(item),
+      label: [pc.yellow(pc.bold(optionPad(full, null, nameWidth))), optionQuantLabel(item), optionCtxLabel(item), pc.dim(optionSizeLabel(item))].join(OPTION_SEPARATOR),
+    };
+  }
+
   return {
     value: itemKey(item),
     label: optionLabel({
@@ -174,7 +196,7 @@ export function modelSelectOption(item, { runningProfilesNow, modelMissingIds, n
   };
 }
 
-function inferBackendId(item) {
+export function inferBackendId(item) {
   if (item.type === "profile") return item.profile.backend;
   if (item.type === "managed") return item.backendId;
   // new model: derive from format

package/src/ui.mjs

@@ -1,8 +1,12 @@
-import { box, cancel, confirm, intro, isCancel, select, text } from "@clack/prompts";
+import { select as inquirerSelect, input, confirm, number, Separator } from "@inquirer/prompts";
 import pc from "picocolors";
 import { stripVTControlCharacters } from "node:util";
 
 export { pc };
+export { Separator };
+
+// ── Formatting helpers (no prompt dependency) ───────────────────────────────
+
 export function formatBytes(bytes) {
   if (!Number.isFinite(bytes)) return "unknown";
   const units = ["B", "KB", "MB", "GB", "TB"];
@@ -12,42 +16,6 @@ export function formatBytes(bytes) {
   return `${size.toFixed(unit === 0 ? 0 : 2)} ${units[unit]}`;
 }
 
-export function startInteractive(title = "offgrid-ai") {
-  if (process.stdin.isTTY) console.clear();
-  intro(title);
-}
-
-export function createPrompt() {
-  return {
-    async text(label, defaultValue) {
-      const value = await text({ message: label, initialValue: defaultValue === undefined ? undefined : String(defaultValue) });
-      return handleCancel(value)?.trim() || String(defaultValue ?? "");
-    },
-    async number(label, defaultValue, min, max) {
-      const value = await text({
-        message: label, initialValue: String(defaultValue),
-        validate(input) { const n = Number(input); if (!Number.isFinite(n) || n < min || n > max) return `Enter a number from ${min} to ${max}.`; },
-      });
-      return Number(handleCancel(value));
-    },
-    async yesNo(label, defaultValue) {
-      return handleCancel(await confirm({ message: label, initialValue: defaultValue }));
-    },
-    async choice(label, choices, defaultValue) {
-      return handleCancel(await select({
-        message: label, initialValue: defaultValue,
-        options: choices.map((c) => ({ value: c.value, label: c.label ?? c.value, hint: c.hint, disabled: c.disabled })),
-      }));
-    },
-    close() {},
-  };
-}
-
-function handleCancel(value) {
-  if (isCancel(value)) { cancel("Cancelled."); process.exit(0); }
-  return value;
-}
-
 export function renderRows(rows) {
   if (rows.length === 0) return "";
   const width = Math.max(...rows.map(([key]) => stripVTControlCharacters(String(key)).length));
@@ -57,26 +25,45 @@ export function renderRows(rows) {
   }).join("\n");
 }
 
+// ── Box renderer ────────────────────────────────────────────────────────────
+
+function visibleLen(text) {
+  return stripVTControlCharacters(String(text)).length;
+}
+
+function padVisible(text, width) {
+  const pad = Math.max(0, width - visibleLen(text));
+  return text + " ".repeat(pad);
+}
+
 export function renderCard(title, body, options = {}) {
-  let output = "";
-  box(String(body ?? ""), title, {
-    output: captureOutput((chunk) => { output += chunk; }, options.columns),
-    withGuide: false,
-    width: "auto",
-    contentPadding: options.contentPadding ?? 1,
-    titlePadding: options.titlePadding ?? 1,
-    rounded: options.rounded ?? true,
-    titleAlign: options.titleAlign ?? "left",
-    contentAlign: options.contentAlign ?? "left",
-    formatBorder: options.formatBorder ?? pc.magenta,
-  });
-  return output.trimEnd();
+  const borderColor = options.formatBorder ?? pc.magenta;
+  const maxCols = options.columns ?? process.stdout.columns ?? 88;
+  const lines = String(body ?? "").split("\n");
+  const titleStr = title ? ` ${title} ` : "";
+  const innerWidth = Math.max(
+    visibleLen(titleStr),
+    ...lines.map(visibleLen),
+  );
+  const width = Math.min(innerWidth + 2, maxCols - 2);
+
+  const topTitle = title ? `╭${pc.reset(titleStr)}` : "╭";
+  const topFill = "─".repeat(Math.max(0, width + 2 - visibleLen(titleStr)));
+  const top = `${topTitle}${topFill}╮`;
+
+  const middle = lines.map((line) => `│ ${padVisible(line, width)} │`);
+
+  const bottom = `╰${"─".repeat(width + 2)}╯`;
+
+  return [top, ...middle, bottom].map((l) => borderColor(l)).join("\n");
 }
 
 export function renderSection(title, body, options = {}) {
   return renderCard(title, body, { formatBorder: pc.magenta, ...options });
 }
 
+// ── Status / capability helpers ─────────────────────────────────────────────
+
 export function humanCapabilitySummary(caps = {}) {
   const parts = [];
   if (caps.thinking) parts.push(pc.magenta("Reasoning"));
@@ -97,13 +84,93 @@ export function statusText(kind, text) {
   return color(text);
 }
 
-function captureOutput(write, columns) {
+// ── Interactive prompt factory ──────────────────────────────────────────────
+
+export function startInteractive(title = "offgrid-ai") {
+  if (process.stdin.isTTY) console.clear();
+  console.log(pc.magenta(`◆ ${title}`));
+}
+
+export function createPrompt() {
   return {
-    columns: Math.min(columns ?? process.stdout.columns ?? 88, 120),
-    write,
+    async text(label, defaultValue) {
+      const value = await input({
+        message: label,
+        default: defaultValue === undefined ? undefined : String(defaultValue),
+      });
+      return value?.trim() || String(defaultValue ?? "");
+    },
+
+    async number(label, defaultValue, min, max) {
+      const value = await number({
+        message: label,
+        default: defaultValue,
+        validate(input) {
+          if (!Number.isFinite(input) || input < min || input > max) {
+            return `Enter a number from ${min} to ${max}.`;
+          }
+        },
+      });
+      return Number(value);
+    },
+
+    async yesNo(label, defaultValue) {
+      return await confirm({ message: label, default: defaultValue });
+    },
+
+    async choice(label, choices, defaultValue) {
+      const mapped = choices.map((c) => {
+        if (c instanceof Separator) return c;
+        return {
+          value: c.value,
+          name: c.label ?? c.value,
+          description: c.hint,
+          disabled: c.disabled || undefined,
+        };
+      });
+      return await inquirerSelect({
+        message: label,
+        default: defaultValue,
+        choices: mapped,
+        pageSize: 20,
+      });
+    },
+
+    close() {},
   };
 }
 
+// ── Model picker with grouped select ────────────────────────────────────────
+
+export async function modelSelect(label, groups, { defaultKey, pageSize = 20 } = {}) {
+  const choices = [];
+  for (const group of groups) {
+    if (group.separator) {
+      choices.push(new Separator(group.separator));
+    }
+    for (const item of group.items) {
+      if (item.separator) {
+        choices.push(new Separator(item.separator));
+        continue;
+      }
+      choices.push({
+        value: item.value,
+        name: item.label ?? item.value,
+        description: item.description,
+        disabled: item.disabled || undefined,
+      });
+    }
+  }
+  return await inquirerSelect({
+    message: label,
+    default: defaultKey,
+    choices,
+    pageSize,
+  });
+}
+
+// ── Option parsing (no prompt dependency) ────────────────────────────────────
+
 export function parseOptions(argv) {
   const positional = [];
   const options = {};
@@ -126,4 +193,4 @@ export function parseOptions(argv) {
     }
   }
   return { positional, options };
-}
+}