@tiens.nguyen/gu-cli 1.0.874 → 1.0.876

package/agent-model-command.mjs

@@ -389,6 +389,54 @@ export function agentMenuOptions({ host = "", modelCount = 0, needsKey = false }
  * rows, current one marked — then "add a new one". Switching to a provider you already set up must
  * not mean typing its URL again. Returns [{ action: "row" | "add", row?, label }].
  */
+/**
+ * EVERY MODEL ALREADY SET UP ON THIS MACHINE, for the agent (#246) — what /model offers the coder.
+ *
+ * Reported: /model listed several providers and models, and /agent-model showed none of them —
+ * it asked to add a provider or enter a key. They are the same servers with the same keys: a key
+ * belongs to its server, and the API finds the agent's key by matching agentModelUrl to a saved row
+ * (resolveKeyForRole). So a pick here saves that row's URL and the model, and its key comes along.
+ *
+ * Rows: OpenAI-compatible and Ollama, enabled, with a URL; their default model, then the extra
+ * models offered in /model. Embedding models are left out — as the agent they answer nonsense.
+ * → [{ rowId, kind, url, host, model, label, current }]
+ */
+export function savedAgentChoices(settings) {
+  const rows = Array.isArray(settings?.agentCodingBackends) ? settings.agentCodingBackends : [];
+  const currentUrl = ensureV1Root(String(settings?.agentModelUrl ?? "")).toLowerCase();
+  const currentModel = currentAgentModel(settings);
+  const out = [];
+  const seen = new Set();
+  const takenKinds = new Set();
+  for (const row of rows) {
+    if (!row || typeof row !== "object" || row.enabled === false) continue;
+    const kind = String(row.kind ?? "");
+    if (kind !== "openai" && kind !== "ollama") continue;
+    const url = ensureV1Root(String(row.url ?? "").trim());
+    if (!url) continue;
+    // The API's identity rule: an id-less row is known by its kind, the first of each only.
+    const rowId = String(row.id ?? "").trim() || (takenKinds.has(kind) ? "" : kind);
+    if (!rowId) continue;
+    takenKinds.add(kind);
+    let host = url;
+    try {
+      host = new URL(url).host;
+    } catch {
+      /* keep the url */
+    }
+    const models = [String(row.defaultModel ?? "").trim(), ...(Array.isArray(row.models) ? row.models.map((m) => String(m ?? "").trim()) : [])];
+    for (const model of models) {
+      if (!model || isLikelyEmbedder({ model })) continue;
+      const key = `${url.toLowerCase()}\n${model}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      const current = url.toLowerCase() === currentUrl && model === currentModel;
+      out.push({ rowId, kind, url, host, model, label: `${host}/${model}`, current });
+    }
+  }
+  return out;
+}
+
 export function agentProviderChoices(settings) {
   const rows = Array.isArray(settings?.agentCodingBackends) ? settings.agentCodingBackends : [];
   const current = ensureV1Root(String(settings?.agentModelUrl ?? "")).toLowerCase();

package/gu-repl.mjs

@@ -8957,6 +8957,78 @@ async function chooseAgentProvider({ back = false } = {}) {
  * The decisions live in agent-model-command.mjs; this is the terminal half only.
  */
 async function chooseAgentModel() {
+  const am = await import("./agent-model-command.mjs");
+  const settings = await withPendingStatus("reading your agent model", fetchWorkerSettings);
+  if (!settings) {
+    console.log(red("   couldn't reach the API to read your current agent model.\n"));
+    return;
+  }
+  // WHAT /model ALREADY HAS, FIRST (#246). The providers and models added for the coder are the
+  // same servers with the same keys; listing them here means switching the agent to one of them is
+  // one pick, not "add a provider" or "enter the API key" for something already set up.
+  const saved = am.savedAgentChoices(settings);
+  if (!saved.length) return agentModelOnServer();
+  const current = am.currentAgentModel(settings);
+  const curHost = settings.agentModelUrl ? hostOf(String(settings.agentModelUrl)) : "";
+  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 ADD = labels.length;
+    labels.push("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}):`;
+    const cols = Math.max(20, process.stdout.columns || 80);
+    console.log(dim(head.length + 2 + hint.length < cols ? `${head}  ${hint}` : `${head}\n   ${hint}`));
+    const idx = await pickFromList(labels, Math.max(0, saved.findIndex((c) => c.current)));
+    if (idx < 0) {
+      console.log(dim("   (cancelled)\n"));
+      return;
+    }
+    if (idx === MORE) {
+      if ((await agentModelOnServer({ back: true })) === BACK) continue;
+      return;
+    }
+    if (idx === ADD) {
+      if ((await addServer({ role: "agent", dialect: "openai", back: true })) === BACK) continue;
+      return;
+    }
+    await useSavedAgentChoice(saved[idx]);
+    return;
+  }
+}
+
+/**
+ * Point the agent at a model already set up for /model (#246): that row's URL and the model. The
+ * API finds the key by the URL (resolveKeyForRole), so nothing is re-entered — unless the server
+ * needs a key and has none, which is asked here rather than failing on the next question.
+ */
+async function useSavedAgentChoice(c) {
+  if (c.current) {
+    console.log(dim(`   already using ${c.model} on ${c.host} — nothing changed.\n`));
+    return;
+  }
+  const as = await import("./add-server.mjs");
+  const target = as.serverTarget(c.kind === "ollama" ? "ollama" : "openai", c.url);
+  const keys = (await withPendingStatus(`reading the keys for ${c.host}`, () => fetchServerKeys(c.rowId))) ?? [];
+  if (target.ok && as.keyRequirement(target) === "required" && !keys.length) {
+    console.log(GUTTER + dim(`${c.host} needs an API key and none is saved for it — enter one.`));
+    await addServer({ role: "agent", dialect: target.dialect, url: c.url, newKey: true });
+    return;
+  }
+  // A folder pick of ANOTHER server's key would be sent to this one: this folder follows the
+  // server's own key from now on.
+  if (sessionAgentKeyId && !keys.some((k) => k.id === sessionAgentKeyId)) await saveFolderKeyPick("agent", "");
+  await saveAgentModel(c.url, c.model, c.host);
+}
+
+/**
+ * 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".
+ */
+async function agentModelOnServer({ back = false } = {}) {
   const am = await import("./agent-model-command.mjs");
   const settings = await withPendingStatus("reading your agent model", fetchWorkerSettings);
   if (!settings) {
@@ -9033,12 +9105,16 @@ async function chooseAgentModel() {
     const options = am.agentRecoveryOptions({ keyProblem, host: listHost });
     const go = await pickFromList(
       options.map((o, i) => (i === 0 ? dim(o.label) : o.label)),
-      keyProblem ? 1 : 0
+      keyProblem ? 1 : 0,
+      { back }
     );
+    if (go === PICK_BACK) return BACK;
     const action = go >= 0 ? options[go].action : "leave";
     if (action === "key") await enterAgentProviderKey(source.row, listHost);
-    else if (action === "provider") await addServer({ role: "agent", dialect: "openai" });
-    else console.log("");
+    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 });
+    } else console.log("");
     return;
   }
 
@@ -9047,7 +9123,8 @@ async function chooseAgentModel() {
   // 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);
+  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";
   if (firstAction === "cancel") {
     console.log(dim("   (cancelled)\n"));
@@ -9055,7 +9132,7 @@ async function chooseAgentModel() {
   }
   // "← 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 chooseAgentModel();
+    if ((await chooseAgentProvider({ back: true })) === BACK) return agentModelOnServer({ back });
     return;
   }
   if (firstAction === "key") {
@@ -9063,7 +9140,7 @@ async function chooseAgentModel() {
     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 chooseAgentModel();
+    if (r === BACK) return agentModelOnServer({ back });
     return;
   }
 
@@ -9096,7 +9173,7 @@ async function chooseAgentModel() {
   // 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 chooseAgentModel();
+  if (idx === PICK_BACK) return agentModelOnServer({ back });
   if (idx < 0) {
     console.log(dim("   (cancelled)\n"));
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.874",
+  "version": "1.0.876",
   "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",