@tiens.nguyen/gu-cli 1.0.876 → 1.0.877

package/gu-repl.mjs

@@ -547,6 +547,10 @@ const waitPaint = (n, s) => (REPL_COLOR ? color256(n, s) : white(s));
 // cyan only with `gu --color`.
 const thoughtPaint = (s) => (REPL_COLOR ? accent(s) : white(s));
 const orange = (s) => color256(208, s); // peak-token label (task #84)
+// A menu's ACTION rows (pick another model…, API keys…, add a provider…) in orange, apart from the
+// models above them (#248). \x1b[22m first: an unselected picker row is wrapped in dim, which would
+// turn the orange grey. Plain text when colour is off (NO_COLOR, TERM=dumb).
+const actionRow = (s) => (dim("x") === "x" ? s : `\x1b[22m${orange(s)}`);
 // Compact token count: 950 → "950", 12300 → "12.3k", 1500000 → "1.5M" (task #83).
 const fmtTokens = (n) => {
   if (n < 1000) return String(n);
@@ -6318,7 +6322,7 @@ async function manageCodingProviders({ back = false } = {}) {
         `${p.model || dim("(no model set)")}${dim(`  · ${p.host}`)}${p.enabled ? "" : dim("  · off")}`
     );
     const ADD = labels.length;
-    labels.push("add another provider — Claude API, OpenAI, Kimi…");
+    labels.push(actionRow("add another provider — Claude API, OpenAI, Kimi…"));
     console.log(dim(`   Providers — pick one to change it, or add another  (${PICK_HINT}):`));
     const idx = await pickFromList(labels, selAt, { back });
     if (idx === PICK_BACK) return BACK;
@@ -6355,11 +6359,12 @@ async function manageCodingProviders({ back = false } = {}) {
   }
 }
 
-/** Point a provider at a different model. */
-async function changeProviderModel(ps, rows, p) {
-  const md = await import("./model-doctor.mjs");
+/**
+ * What provider `p` offers, asked with ITS OWN key (#266) — its problems printed as it goes.
+ * Shared by "change the model…" and /model's "pick another model on <host>…" (#248). → [ids]
+ */
+async function listProviderModels(ps, p) {
   const { proxyFetch } = await import("./proxy-dispatcher.mjs");
-
   // LISTED WITH THIS PROVIDER'S OWN KEY (#266). This used to probe with NO key, on purpose: the
   // only key the terminal could fetch was the ACCOUNT DEFAULT, which may belong to another provider.
   // Since #245 a key belongs to its server, so the key used is the one bound to THIS row — the same
@@ -6407,6 +6412,13 @@ async function changeProviderModel(ps, rows, p) {
     }
   }
 
+  return models;
+}
+
+/** Point a provider at a different model. */
+async function changeProviderModel(ps, rows, p) {
+  const md = await import("./model-doctor.mjs");
+  const models = await listProviderModels(ps, p);
   let model = "";
   if (models.length) {
     model = await chooseCodingModelFrom(ps, models, `Which model should ${p.host} use?`, p.model, { back: true });
@@ -7118,17 +7130,28 @@ async function chooseModel() {
   // OpenAI-compatible providers are both "OpenAI-compatible", so the kind names neither.
   const { labels, tags, showTag } = codingChoiceLabels(choices, def);
   const activeIdx = choices.findIndex((c) => c.id === active);
+  // THE CURRENT CODER'S KEYS, ON THIS LIST (#248) — the manager ctrl+k opens, for a provider that
+  // takes a key (OpenAI-compatible, ollama.com). Before the add row, so no model row moves.
+  const activeChoice = choices[activeIdx >= 0 ? activeIdx : choices.findIndex((c) => c.id === def)];
+  const activeUrl = String(activeChoice?.url ?? "");
+  const keyHost = activeChoice && ((activeChoice.kind ?? "") === "openai" || /(^|\.)ollama\.com$/i.test(hostOf(activeUrl))) ? hostOf(activeUrl) : "";
+  // …and the rest of that server's models, the same row /agent-model has (#248). Not for local MLX.
+  const modelsHost = activeChoice && ["openai", "ollama"].includes(activeChoice.kind ?? "") && activeUrl ? hostOf(activeUrl) : "";
+  const MODELS = modelsHost ? labels.length : -1;
+  if (modelsHost) labels.push(actionRow(`pick another model on ${modelsHost}…`));
+  const KEYS = keyHost ? labels.length : -1;
+  if (keyHost) labels.push(actionRow(`API keys for ${keyHost} — switch, add or remove…`));
   // Task #223. Appended LAST, after the models: a new row must never shift an index someone
   // already has muscle memory for.
   //
   // "add or change" rather than "add", because add-only was a one-way door: a model id typed
   // wrong could not be corrected from anywhere, here or in web Settings. The entry leads to the
   // add flow directly when there is nothing to change, so it costs a word and no extra step.
-  labels.push(
+  labels.push(actionRow(
     choices.some((c) => (c.kind ?? "") === "openai")
       ? "add or change a provider — Claude API, OpenAI, Kimi…"
       : "add a provider — Claude API, OpenAI, Kimi…"
-  );
+  ));
   // THREE MODELS ARE IN PLAY AND THIS COMMAND ONLY CHANGES ONE (task #169 req 5). "/model" has
   // meant the CODING model since task #44, but "agent model" and "agent coding model" are close
   // enough in name to have already been mixed up. The fix is to say which one THIS is — not to
@@ -7140,7 +7163,15 @@ async function chooseModel() {
     console.log(dim("   (cancelled)\n"));
     return;
   }
-  // The one appended entry sits past the last model.
+  if (idx === MODELS) {
+    if ((await pickModelOnCoderServer(activeChoice, def)) === BACK) return chooseModel();
+    return;
+  }
+  if (idx === KEYS) {
+    if ((await replaceCodingKey({ back: true })) === BACK) return chooseModel();
+    return;
+  }
+  // The add entry sits past the last model (and the keys row).
   if (idx >= choices.length) {
     if ((await manageCodingProviders({ back: true })) === BACK) return chooseModel();
     return;
@@ -7148,6 +7179,62 @@ async function chooseModel() {
   await applyChosenCoder(choices[idx], { def, tag: showTag ? tags[idx] : "" });
 }
 
+/**
+ * /model's "pick another model on <host>…" (#248): the current coder's server, asked for everything
+ * it has (with its own key). The pick is ADDED to that provider's models — its main model stays —
+ * and becomes the coder. `← back` returns BACK to /model.
+ */
+async function pickModelOnCoderServer(active, def) {
+  const ps = await import("./coding-provider-setup.mjs");
+  const settings = await withPendingStatus("reading your providers", fetchWorkerSettings);
+  if (!settings) {
+    console.log(red("   couldn't reach the API to read your providers.\n"));
+    return;
+  }
+  const rows = ps.existingBackendRows(settings);
+  const same = (u) => ps.ensureV1Root(String(u ?? "")).toLowerCase();
+  const p = ps.manageableProviders(rows).find((x) => same(x.url) === same(active.url));
+  // No saved row behind this coder (an account default from elsewhere): the provider manager.
+  if (!p) return manageCodingProviders({ back: true });
+  const models = await listProviderModels(ps, p);
+  let model;
+  if (models.length) {
+    model = await chooseCodingModelFrom(ps, models, `Which model on ${p.host}?`, active.model, { back: true });
+    if (model === BACK) return BACK;
+  } else {
+    // Not listed (no key, refused, down) — the lines above said so: the name is typed instead.
+    model = (await ask("   model name (Enter to cancel): ")).trim() || null;
+  }
+  if (model === null) {
+    console.log(dim("   (nothing changed)\n"));
+    return;
+  }
+  const row = rows.find((b) => (b.id ?? b.kind) === p.id);
+  const extras = Array.isArray(row?.models) ? row.models : [];
+  if (model !== p.model && !extras.includes(model)) {
+    const md = await import("./model-doctor.mjs");
+    const saved = await withPendingStatus("saving", () =>
+      md.saveWorkerSettings(apiBase, workerKey, {
+        agentCodingBackends: rows.map((b) => ((b.id ?? b.kind) === p.id ? { ...b, models: [...extras, model] } : b)),
+      })
+    );
+    if (!saved) {
+      console.log(red("   couldn't save that — nothing changed.\n"));
+      return;
+    }
+  }
+  // The choice as the API now lists it — its id is the API's to make, not this side's.
+  const probe = await withPendingStatus("loading models", () => fetchAgentPayload([{ role: "user", content: "ping" }])).catch(() => null);
+  const chosen = (Array.isArray(probe?.codingChoices) ? probe.codingChoices : []).find(
+    (c) => c.model === model && same(c.url) === same(p.url)
+  );
+  if (!chosen) {
+    console.log(accent(` ✓ ${model} added to ${p.host}`) + dim("  ·  pick it in /model\n"));
+    return;
+  }
+  await applyChosenCoder(chosen, { def: String(probe?.codingDefault ?? def ?? "").trim() });
+}
+
 /**
  * Make `chosen` ({ id, model, kind, url }) the coding model: session state, saved choice, the key
  * check and the lifetime token total. The tail of /model, extracted so /quick-models' ← / → (#233)
@@ -8746,25 +8833,6 @@ async function confirmEmbedSwitch(ec, current, chosen) {
   return { changed: true, plan };
 }
 
-// WHICH EMBEDDER, ASKED ONCE. The model sub-flow of /embed-model: the curated picker, then the
-// shared recognition step. Returns { changed, chosen, plan }.
-async function pickEmbedModel(ec, current, { back = false } = {}) {
-  const rows = ec.embedChoiceRows(current);
-  console.log(dim(`   Choose the embedder (${PICK_HINT}):`));
-  const labels = rows.map(
-    (r) => `${r.model}${r.dims ? dim(` · ${r.dims}d`) : ""}${dim(` · ${r.note}`)}` + (r.current ? accent(" (current)") : "")
-  );
-  const idx = await pickFromList(labels, Math.max(0, rows.findIndex((r) => r.current)), { back });
-  if (idx === PICK_BACK) return BACK;
-  if (idx < 0) {
-    console.log(dim("   (cancelled)\n"));
-    return { changed: false, chosen: "", plan: null };
-  }
-  const chosen = rows[idx].model;
-  const sw = await confirmEmbedSwitch(ec, current, chosen);
-  return { changed: sw.changed, chosen: sw.changed ? chosen : "", plan: sw.plan };
-}
-
 // WHAT A SAVED CHANGE SOUNDS LIKE. Success lines used to live at the end of one long function;
 // four exit paths now say them, so they are said once here: the embedder line, the rebuild note
 // that only a REAL model change earns, and the pull hint — Ollama serves the embedder itself, so
@@ -8791,31 +8859,57 @@ async function chooseEmbedModel() {
   const current = ec.currentEmbedModel(settings);
   const currentUrl = String(settings.ragEmbedUrl || "").trim() || "http://127.0.0.1:11434";
   const host = hostOf(currentUrl);
-  // WHEN TO SHOW THE KEY ROW (embedMenuOptions' keyRequired): a key is clearly the question when
+  // WHEN TO SHOW THE KEY ROW (keyRequired): a key is clearly the question when
   // the server is ollama.com (it rejects anonymous calls) or already looks OpenAI-compatible (the
   // /v1 shape), or when one is already bound — replacing the key people can no longer read is the
   // very thing they come back for. A keyless localhost Ollama sees three rows instead.
   const keyRequired = isOllamaCloudUrl(currentUrl) || /\/v1\/?$/i.test(currentUrl) ||
     Boolean(String(settings.ragEmbedKeyId ?? "").trim());
-  const menu = ec.embedMenuOptions({ current, host, keyRequired });
-  console.log(dim(`   Embedding model (currently ${current} on ${host || currentUrl})`));
-  const mi = await pickFromList(menu.map((o) => o.label), 0);
-  const action = mi >= 0 ? menu[mi].action : "cancel";
-  if (action === "cancel") {
+  // ONE LIST, THE SHAPE OF /model AND /agent-model (#248): the embedders, the current one marked,
+  // then this server's own rows in orange — its other models, its keys — and add a provider. It was
+  // a three-row menu first ("switch the embedder model…", "use another provider…", the key), one
+  // step more than the other two commands.
+  // "(current)" only for an embedder that was SET — nothing set means the default, which its own
+  // note already says. Right after the name: at the end of the row an 80-column clip cut it off.
+  const isSet = Boolean(String(settings.ragEmbedModel ?? "").trim());
+  const rows = ec.embedChoiceRows(isSet ? current : "");
+  const labels = rows.map(
+    (r) => `${r.model}${r.current ? accent(" (current)") : ""}${r.dims ? dim(` · ${r.dims}d`) : ""}${dim(` · ${r.note}`)}`
+  );
+  const MODELS = labels.length;
+  labels.push(actionRow(`pick another model on ${host || currentUrl}…`));
+  const KEYS = keyRequired ? labels.length : -1;
+  if (keyRequired) labels.push(actionRow(`API keys for ${host || currentUrl} — switch, add or remove…`));
+  const ADD = labels.length;
+  labels.push(actionRow("add a provider — OpenAI, Ollama…"));
+  const head = `   Embedding model (now ${current} on ${host || currentUrl})`;
+  const hint = `(${PICK_HINT}):`;
+  const cols = Math.max(20, process.stdout.columns || 80);
+  console.log(dim(head.length + 2 + hint.length < cols ? `${head}  ${hint}` : `${head}\n   ${hint}`));
+  // The cursor starts on the one in use: the set one, else the default.
+  const inUse = rows.findIndex((r) => ec.sameEmbedModel(r.model, current));
+  const mi = await pickFromList(labels, Math.max(0, inUse));
+  if (mi < 0) {
     console.log(dim("   (cancelled)\n"));
     return;
   }
+  const action = mi === MODELS ? "server" : mi === KEYS ? "key" : mi === ADD ? "provider" : "model";
 
   // EVERY ARM IS THE ONE ADD-SERVER SCREEN (task #245) — the same URL → key → models → save as
-  // /model and /agent-model. The curated arm has already chosen the model (and passed the
+  // /model and /agent-model. A listed embedder has been chosen already (and passed the
   // recognition wall), so it only asks WHERE; the other two list what the server has.
-  // "← back" in any arm returns to this menu (#242).
+  // "← back" in any arm returns to this list (#242).
   if (action === "model") {
-    const picked = await pickEmbedModel(ec, current, { back: true });
-    if (picked === BACK) return chooseEmbedModel();
-    const { changed, chosen, plan } = picked;
-    if (!changed) return;
-    await addServer({ role: "embed", dialect: "ollama", model: chosen, plan });
+    const chosen = rows[mi].model;
+    const sw = await confirmEmbedSwitch(ec, current, chosen);
+    if (!sw.changed) return;
+    await addServer({ role: "embed", dialect: "ollama", model: chosen, plan: sw.plan });
+    return;
+  }
+  if (action === "server") {
+    // That server's own list, with its key — the add-server screen with the URL known.
+    const dialect = /\/v1\/?$/i.test(currentUrl) ? "openai" : "ollama";
+    if ((await addServer({ role: "embed", dialect, url: currentUrl, back: true })) === BACK) return chooseEmbedModel();
     return;
   }
   if (action === "provider") {
@@ -8970,12 +9064,18 @@ async function chooseAgentModel() {
   if (!saved.length) return agentModelOnServer();
   const current = am.currentAgentModel(settings);
   const curHost = settings.agentModelUrl ? hostOf(String(settings.agentModelUrl)) : "";
+  // THE CURRENT PROVIDER'S OWN ROWS, ON THIS LIST (#248). They were one step down, behind "other
+  // models, providers and API keys…" — which read like the "add a provider" row under it.
+  const source = am.agentListSource(settings);
+  const needsKey = am.agentSourceNeedsKey(source);
   for (;;) {
     const labels = saved.map((c) => c.label + (c.current ? accent("  (current)") : ""));
-    const MORE = labels.length;
-    labels.push("other models, providers and API keys…");
+    const MODELS = curHost ? labels.length : -1;
+    if (curHost) labels.push(actionRow(`pick another model on ${curHost}…`));
+    const KEYS = curHost && needsKey ? labels.length : -1;
+    if (KEYS >= 0) labels.push(actionRow(`API keys for ${curHost} — switch, add or remove…`));
     const ADD = labels.length;
-    labels.push("add a provider — Claude API, OpenAI, Kimi, Ollama…");
+    labels.push(actionRow("add a provider — Claude API, OpenAI, Kimi, Ollama…"));
     // The hint drops to its own row when the header would wrap (80 columns over SSH).
     const head = `   Agent model — the one that TALKS (now ${current || "unset"}${curHost ? ` on ${curHost}` : ""})`;
     const hint = `(${PICK_HINT}):`;
@@ -8986,8 +9086,15 @@ async function chooseAgentModel() {
       console.log(dim("   (cancelled)\n"));
       return;
     }
-    if (idx === MORE) {
-      if ((await agentModelOnServer({ back: true })) === BACK) continue;
+    if (idx === MODELS) {
+      // Straight to that server's full list; when it can't be listed, its recovery menu instead.
+      if ((await agentModelOnServer({ back: true, start: "models" })) === BACK) continue;
+      return;
+    }
+    if (idx === KEYS) {
+      const rowId = String(source.row?.id ?? "").trim() || String(source.row?.kind ?? "").trim();
+      if (!rowId) return enterAgentProviderKey(source.row, curHost);
+      if ((await manageServerKeys({ role: "agent", backendId: rowId, host: curHost, model: current, back: true })) === BACK) continue;
       return;
     }
     if (idx === ADD) {
@@ -9025,10 +9132,12 @@ async function useSavedAgentChoice(c) {
 
 /**
  * One server's view: its full model list, other providers, its keys — what /agent-model was before
- * #246, now behind "other models, providers and API keys…" when something is already set up.
- * `back`: opened from that list, so its first menu offers "← back".
+ * #246. With models already set up, /agent-model's list opens it as "pick another model on <host>…"
+ * (#248): `start: "models"` skips the what-to-change menu and goes to the model list.
+ * `back`: opened from that list, so its first screen offers "← back" and returns BACK.
  */
-async function agentModelOnServer({ back = false } = {}) {
+async function agentModelOnServer({ back = false, start = "menu" } = {}) {
+  const again = () => agentModelOnServer({ back, start });
   const am = await import("./agent-model-command.mjs");
   const settings = await withPendingStatus("reading your agent model", fetchWorkerSettings);
   if (!settings) {
@@ -9113,7 +9222,7 @@ async function agentModelOnServer({ back = false } = {}) {
     if (action === "key") await enterAgentProviderKey(source.row, listHost);
     else if (action === "provider") {
       // "← back" on "Which provider?" returns to this menu (#247).
-      if ((await addServer({ role: "agent", dialect: "openai", back: true })) === BACK) return agentModelOnServer({ back });
+      if ((await addServer({ role: "agent", dialect: "openai", back: true })) === BACK) return again();
     } else console.log("");
     return;
   }
@@ -9121,18 +9230,21 @@ async function agentModelOnServer({ back = false } = {}) {
   // WHAT TO CHANGE, FIRST (#44). The ways to use an Ollama server or another provider used to sit
   // after every model on this one — 130 rows down on api.openai.com — which read as "OpenAI models
   // are all you can choose". A short menu of what to change comes before any list.
-  console.log(dim(`   Agent model — the one that TALKS: ${current || "unset"} on ${listHost}`));
-  const menu = am.agentMenuOptions({ host: listHost, modelCount: models.length, needsKey });
-  const first = await pickFromList(menu.map((o) => o.label), 0, { back });
-  if (first === PICK_BACK) return BACK;
-  const firstAction = first >= 0 ? menu[first].action : "cancel";
+  let firstAction = "models";
+  if (start !== "models") {
+    console.log(dim(`   Agent model — the one that TALKS: ${current || "unset"} on ${listHost}`));
+    const menu = am.agentMenuOptions({ host: listHost, modelCount: models.length, needsKey });
+    const first = await pickFromList(menu.map((o) => o.label), 0, { back });
+    if (first === PICK_BACK) return BACK;
+    firstAction = first >= 0 ? menu[first].action : "cancel";
+  }
   if (firstAction === "cancel") {
     console.log(dim("   (cancelled)\n"));
     return;
   }
   // "← back" in any of these returns to this menu (#242) — read again, as on a first open.
   if (firstAction === "provider") {
-    if ((await chooseAgentProvider({ back: true })) === BACK) return agentModelOnServer({ back });
+    if ((await chooseAgentProvider({ back: true })) === BACK) return again();
     return;
   }
   if (firstAction === "key") {
@@ -9140,7 +9252,7 @@ async function agentModelOnServer({ back = false } = {}) {
     const rowId = String(source.row?.id ?? "").trim() || String(source.row?.kind ?? "").trim();
     if (!rowId) return enterAgentProviderKey(source.row, listHost);
     const r = await manageServerKeys({ role: "agent", backendId: rowId, host: listHost, model: am.currentAgentModel(settings), back: true });
-    if (r === BACK) return agentModelOnServer({ back });
+    if (r === BACK) return again();
     return;
   }
 
@@ -9173,7 +9285,8 @@ async function agentModelOnServer({ back = false } = {}) {
   // No other entries here any more (#44): the ways to change the provider are on the menu above,
   // where they can be seen, rather than after every model.
   const idx = await pickFromList(labels, Math.max(0, rows.findIndex((r) => r.current)), { back: true });
-  if (idx === PICK_BACK) return agentModelOnServer({ back });
+  // Opened as "pick another model on <host>…", back is /agent-model's list; else this menu.
+  if (idx === PICK_BACK) return start === "models" ? BACK : again();
   if (idx < 0) {
     console.log(dim("   (cancelled)\n"));
     return;
@@ -10356,7 +10469,7 @@ async function promptNewCodingKey(backendId = "", provider = "") {
   return id;
 }
 
-async function replaceCodingKey() {
+async function replaceCodingKey({ back = false } = {}) {
   const ks = await withPendingStatus("checking the coding model", () =>
     coderKeyState(sessionCodingModel)
   );
@@ -10391,8 +10504,7 @@ async function replaceCodingKey() {
   const keys = allKeys ? ps.keysForBackend(allKeys, ks.backendId) : null;
   if (keys && keys.length >= 1) {
     // ONE SERVER'S KEYS (task #245): the same picker /agent-model and /embed-model open.
-    await manageServerKeys({ role: "coding", backendId: ks.backendId, host: ks.provider || ks.backendId || "this server", model: ks.model });
-    return;
+    return manageServerKeys({ role: "coding", backendId: ks.backendId, host: ks.provider || ks.backendId || "this server", model: ks.model, back });
   }
 
   // NO KEYS YET, BUT AN API THAT UNDERSTANDS NAMES — so ask for one.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.876",
+  "version": "1.0.877",
   "description": "Gu CLI — the gu terminal plus the local worker that runs agent / OCR / PDF / embedding jobs on your Mac (Ollama / MLX / OpenAI-compatible).",
   "type": "module",
   "license": "MIT",