offgrid-ai 0.15.0 → 0.15.2

package/package.json

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

package/src/commands/models.mjs

@@ -6,7 +6,7 @@ import { syncPiConfig, removeFromPiConfig } from "../harness-pi.mjs";
 import { configureLocalProfile } from "../profile-setup.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,25 +65,40 @@ export async function modelCommandCenter(initialCatalog) {
     return "setup";
   };
 
-  const groupOrder = ["running", "ready", "setup", "missing"];
-  const groupLabels = {
-    running: "Running now",
-    ready: "Ready",
-    setup: "Needs setup",
-    missing: "Missing files",
-  };
-  const grouped = new Map(groupOrder.map((key) => [key, []]));
-  for (const item of allItems) grouped.get(statusFor(item)).push(item);
+  // 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 group of groupOrder) {
-    const bucket = grouped.get(group);
-    if (!bucket || bucket.length === 0) continue;
-    const items = bucket.map((item) => {
-      const opt = modelSelectOption(item, { runningProfilesNow, modelMissingIds, nameWidth });
-      return { value: opt.value, label: opt.label, description: opt.hint };
+  for (const { backendId, sourceId, items } of byBackend.values()) {
+    const backendLabel = backendFor(backendId)?.label ?? backendId;
+    const sourceLabel = formatSourceLabel(sourceId);
+    const sep = `Inference: ${backendLabel} via Download Source: ${sourceLabel} (${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: `  ${groupLabels[group]} (${bucket.length})`, items });
+    groups.push({ separator: `  Needs setup (${setupItems.length})`, items: groupItems });
   }
 
   const prompt = createPrompt();

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.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

@@ -144,7 +144,10 @@ export function createPrompt() {
 
 export async function modelSelect(label, groups, { defaultKey, pageSize = 20 } = {}) {
   const choices = [];
-  for (const group of groups) {
+  for (let i = 0; i < groups.length; i++) {
+    const group = groups[i];
+    // Add blank line before each group (except the first)
+    if (i > 0) choices.push(new Separator(""));
     if (group.separator) {
       choices.push(new Separator(group.separator));
     }