pudu-ai 0.2.7 → 0.2.8

package/dist/cli/index.js

@@ -866,6 +866,7 @@ var en = {
   linkingTool: "Linking {tool} with {model}\u2026",
   modelPulled: "Pulled {model} with Ollama.",
   installNone: "No recommended model has grade S\u2013B to install.",
+  noOllamaTag: "No Ollama library tag for {model}. Catalog names like Agents-A1 are not pullable. Use qwen3:8b, gemma3:4b, qwen3.5:4b, llama3.1:8b.",
   credits: "Measured: llama-bench + OS telemetry. Estimated: CanIRun.ai by midudev (https://canirun.ai, https://github.com/midudev/canirun.ai, https://midu.dev). Labelled separately; never mixed.",
   noModels: "No local models detected",
   notTested: "Not tested",
@@ -1050,6 +1051,7 @@ var es = {
   linkingTool: "Vinculando {tool} con {model}\u2026",
   modelPulled: "Descargado {model} con Ollama.",
   installNone: "Ning\xFAn modelo recomendado tiene nota S\u2013B para instalar.",
+  noOllamaTag: "No hay tag de Ollama para {model}. Nombres de cat\xE1logo como Agents-A1 no se pueden descargar. Usa qwen3:8b, gemma3:4b, qwen3.5:4b, llama3.1:8b.",
   credits: "Medido: llama-bench + telemetr\xEDa del SO. Estimado: CanIRun.ai de midudev (https://canirun.ai, https://github.com/midudev/canirun.ai, https://midu.dev). Se etiquetan por separado; nunca se mezclan.",
   noModels: "No se detectaron modelos locales",
   notTested: "Sin probar",
@@ -1214,6 +1216,35 @@ function t(id, vars) {
   return text;
 }
 
+// src/integrations/ollama-tags.ts
+var RULES = [
+  { test: /qwen\s*3\.5\s*[-:]?\s*8b/i, tag: "qwen3.5:8b" },
+  { test: /qwen\s*3\.5\s*[-:]?\s*4b/i, tag: "qwen3.5:4b" },
+  { test: /qwen\s*3\s*[-:]?\s*14b/i, tag: "qwen3:14b" },
+  { test: /qwen\s*3\s*[-:]?\s*8b/i, tag: "qwen3:8b" },
+  { test: /qwen\s*3\s*[-:]?\s*4b/i, tag: "qwen3:4b" },
+  { test: /qwen\s*2\.5\s*[-:]?\s*coder\s*[-:]?\s*7b/i, tag: "qwen2.5-coder:7b" },
+  { test: /gemma\s*3\s*[-:]?\s*12b/i, tag: "gemma3:12b" },
+  { test: /gemma\s*3\s*[-:]?\s*4b/i, tag: "gemma3:4b" },
+  { test: /gemma\s*3\s*[-:]?\s*1b/i, tag: "gemma3:1b" },
+  { test: /llama\s*3\.2\s*[-:]?\s*3b/i, tag: "llama3.2:3b" },
+  { test: /llama\s*3\.2\s*[-:]?\s*1b/i, tag: "llama3.2:1b" },
+  { test: /llama\s*3\.1\s*[-:]?\s*8b/i, tag: "llama3.1:8b" },
+  { test: /deepseek[- ]r1\s*[-:]?\s*8b|deepseek-r1-distill.*8b/i, tag: "deepseek-r1:8b" },
+  { test: /deepseek[- ]r1\s*[-:]?\s*7b/i, tag: "deepseek-r1:7b" },
+  { test: /mistral\s*[-:]?\s*7b|mistral-nemo/i, tag: "mistral:7b" },
+  { test: /phi\s*4|phi-4/i, tag: "phi4" }
+];
+function resolveOllamaTag(...parts) {
+  const haystack = parts.filter(Boolean).join(" ");
+  if (!haystack.trim()) return void 0;
+  if (/^[a-z0-9._-]+:[a-z0-9._-]+$/i.test(haystack.trim())) return haystack.trim();
+  for (const rule of RULES) {
+    if (rule.test.test(haystack)) return rule.tag;
+  }
+  return void 0;
+}
+
 // src/compatibility/local.ts
 var GB_PER_BILLION_Q4 = 0.65;
 function estimateModelRamGb(model, quant = "Q4_K_M") {
@@ -1295,8 +1326,9 @@ async function recommendForMachine(hardware, catalog, network) {
     try {
       const rows = [];
       for (const useCase of useCases) {
-        const found = await fetchRecommendations(hardware, useCase, 1);
-        rows.push(...found.map((item) => ({ ...item, useCase: labelUseCase(useCase) })));
+        const found = await fetchRecommendations(hardware, useCase, 8);
+        const mapped = found.filter((item) => resolveOllamaTag(item.model.id, item.model.name)).slice(0, 1).map((item) => ({ ...item, useCase: labelUseCase(useCase) }));
+        rows.push(...mapped);
       }
       if (rows.length) return rows;
     } catch {
@@ -1308,6 +1340,7 @@ async function recommendForMachine(hardware, catalog, network) {
   for (const useCase of useCases) {
     const hit = ranked.find((row) => {
       if (used.has(row.model.id)) return false;
+      if (!resolveOllamaTag(row.model.id, row.model.name)) return false;
       if (useCase === "chat") return row.model.useCase?.includes("chat") ?? true;
       return row.model.useCase?.some((u) => u.includes(useCase)) ?? false;
     });
@@ -2345,13 +2378,6 @@ var INTEGRATION_IDS = ["opencode", "openclaw", "hermes", "claude"];
 
 // src/integrations/decide.ts
 var GRADE_RANK = { S: 5, A: 4, B: 3, C: 2, D: 1, F: 0 };
-function toOllamaTag(id) {
-  const compact = id.toLowerCase().replace(/_/g, "-");
-  const match = compact.match(/^([a-z0-9.]+(?:-[a-z0-9.]+)*)-(\d+(?:\.\d+)?b)$/i);
-  if (match) return `${match[1]}:${match[2]}`;
-  if (compact.includes(":")) return compact;
-  return compact;
-}
 function useCaseOk(useCases, needed) {
   if (!useCases?.length) return needed.includes("chat");
   return useCases.some((u) => needed.some((n) => u.includes(n)));
@@ -2365,10 +2391,12 @@ function decideLaunch(session, id) {
   for (const row of session.rows) {
     const useCases = row.catalog?.useCase ?? ["chat", "code"];
     if (!useCaseOk(useCases, def.useCases)) continue;
+    const tag = resolveOllamaTag(row.local.id, row.local.name, row.catalog?.id, row.catalog?.name);
+    if (!tag) continue;
     const tps = row.lastBenchmark?.benchmark.generationTokensPerSecond;
     candidates.push({
       modelId: row.local.id,
-      ollamaTag: row.local.id.includes(":") ? row.local.id : toOllamaTag(row.local.id),
+      ollamaTag: tag,
       installed: true,
       origin: row.lastBenchmark ? "measured" : "estimated",
       grade: row.compatibility?.grade,
@@ -2380,9 +2408,11 @@ function decideLaunch(session, id) {
       if (!useCaseOk(model.useCase, def.useCases)) continue;
       const fit = localCompatibility(session.hardware, model);
       if (!def.allowedGrades.includes(fit.grade)) continue;
+      const tag = resolveOllamaTag(model.id, model.name);
+      if (!tag) continue;
       candidates.push({
         modelId: model.id,
-        ollamaTag: toOllamaTag(model.id),
+        ollamaTag: tag,
         installed: false,
         origin: "estimated",
         grade: fit.grade
@@ -2482,8 +2512,11 @@ var INSTALLABLE = ["S", "A", "B"];
 function canInstallGrade(grade) {
   return Boolean(grade && INSTALLABLE.includes(grade));
 }
-async function pullOllamaModel(modelId) {
-  const tag = toOllamaTag(modelId);
+async function pullOllamaModel(modelId, extraName) {
+  const tag = resolveOllamaTag(modelId, extraName);
+  if (!tag) {
+    return { ok: false, log: t("noOllamaTag", { model: extraName ?? modelId }), tag: modelId };
+  }
   const result = await runCommand("ollama", ["pull", tag], { timeout: 30 * 6e4 });
   if (result.exitCode !== 0) {
     return { ok: false, log: result.stderr || t("launchPullFail"), tag };
@@ -2515,8 +2548,8 @@ function RecommendView({ session }) {
         return;
       }
       setBusy(true);
-      setLog(t("launchPulling", { model: rec.model.id }));
-      void pullOllamaModel(rec.model.id).then((result) => {
+      setLog(t("launchPulling", { model: rec.model.name }));
+      void pullOllamaModel(rec.model.id, rec.model.name).then((result) => {
         setLog(result.log);
         setBusy(false);
       });
@@ -2551,7 +2584,9 @@ function RecommendView({ session }) {
       " ",
       /* @__PURE__ */ jsx4(Text4, { color: gradeColor(item.grade), bold: true, children: item.grade }),
       " ",
-      GRADE_MEANING[item.grade]
+      GRADE_MEANING[item.grade],
+      " ",
+      /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: resolveOllamaTag(item.model.id, item.model.name) ?? t("noOllamaTag", { model: item.model.name }) })
     ] }, `${item.useCase}-${item.model.id}`)),
     /* @__PURE__ */ jsxs4(Box4, { marginTop: 1, flexDirection: "column", children: [
       /* @__PURE__ */ jsx4(Text4, { bold: true, color: "green", children: t("setupStep2") }),
@@ -3062,45 +3097,37 @@ import { Box as Box9, Text as Text9 } from "ink";
 import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
 function Welcome({ compact = false }) {
   if (compact) {
-    return /* @__PURE__ */ jsxs8(Box9, { marginBottom: 1, children: [
-      /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "\u{1F98C} " }),
+    return /* @__PURE__ */ jsxs8(Box9, { marginBottom: 1, borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
       /* @__PURE__ */ jsx9(Text9, { bold: true, color: "cyan", children: t("appTitle") }),
-      /* @__PURE__ */ jsxs8(Text9, { color: "magenta", children: [
-        "  ",
-        t("byline")
-      ] })
+      /* @__PURE__ */ jsx9(Text9, { color: "gray", children: " \xB7 " }),
+      /* @__PURE__ */ jsx9(Text9, { color: "magenta", children: t("byline") })
     ] });
   }
-  return /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "        \\/      \\/" }),
-    /* @__PURE__ */ jsxs8(Text9, { children: [
-      /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "       " }),
-      /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: " (\\_   _/)" })
-    ] }),
-    /* @__PURE__ */ jsxs8(Text9, { children: [
-      /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "        / " }),
-      /* @__PURE__ */ jsx9(Text9, { color: "white", children: "o   o" }),
-      /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: " \\" }),
-      /* @__PURE__ */ jsx9(Text9, { children: "     " }),
-      /* @__PURE__ */ jsx9(Text9, { bold: true, color: "green", children: t("appTitle") })
-    ] }),
-    /* @__PURE__ */ jsxs8(Text9, { children: [
-      /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "        \\  " }),
-      /* @__PURE__ */ jsx9(Text9, { color: "red", children: "^" }),
-      /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "  /" }),
-      /* @__PURE__ */ jsx9(Text9, { children: "      " }),
-      /* @__PURE__ */ jsx9(Text9, { color: "white", children: t("appSubtitle") })
-    ] }),
-    /* @__PURE__ */ jsxs8(Text9, { children: [
-      /* @__PURE__ */ jsx9(Text9, { color: "green", children: "       /|     |\\" }),
-      /* @__PURE__ */ jsx9(Text9, { children: "     " }),
-      /* @__PURE__ */ jsx9(Text9, { bold: true, color: "magenta", children: t("byline") })
+  return /* @__PURE__ */ jsxs8(Box9, { flexDirection: "row", marginBottom: 1, children: [
+    /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", marginRight: 2, children: [
+      /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "    \u2572" }),
+      /* @__PURE__ */ jsxs8(Text9, { children: [
+        /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "   \u256D\u2500" }),
+        /* @__PURE__ */ jsx9(Text9, { color: "white", children: "\u25CF \u25CF" }),
+        /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "\u2500\u256E" })
+      ] }),
+      /* @__PURE__ */ jsxs8(Text9, { children: [
+        /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "   \u2502  " }),
+        /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "\u25BD" }),
+        /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "  \u2502" })
+      ] }),
+      /* @__PURE__ */ jsx9(Text9, { color: "cyan", children: "   \u2570\u252C\u2500\u2500\u2500\u252C\u256F" }),
+      /* @__PURE__ */ jsx9(Text9, { color: "green", children: "    uu uu" })
     ] }),
-    /* @__PURE__ */ jsx9(Text9, { color: "green", children: "        U     U" })
+    /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", justifyContent: "center", children: [
+      /* @__PURE__ */ jsx9(Text9, { bold: true, color: "cyan", children: t("appTitle") }),
+      /* @__PURE__ */ jsx9(Text9, { color: "white", children: t("appSubtitle") }),
+      /* @__PURE__ */ jsx9(Text9, { color: "magenta", children: t("byline") })
+    ] })
   ] });
 }
 function ColorNav() {
-  return /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsxs8(Text9, { children: [
+  return /* @__PURE__ */ jsx9(Box9, { marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsxs8(Text9, { children: [
     /* @__PURE__ */ jsx9(Text9, { color: "yellow", bold: true, children: "[S]" }),
     /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: " Setup " }),
     /* @__PURE__ */ jsx9(Text9, { color: "green", bold: true, children: "[B]" }),
@@ -3241,7 +3268,7 @@ ${runtimesText(session)}`),
           print(t("installNone"), args2.json);
           return 1;
         }
-        const pulled = await pullOllamaModel(rec.model.id);
+        const pulled = await pullOllamaModel(rec.model.id, rec.model.name);
         print(args2.json ? pulled : explained("aboutRecommend", pulled.log), args2.json);
         return pulled.ok ? 0 : 1;
       }

package/package.json

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