@tiens.nguyen/gu-cli 1.0.700 → 1.0.702

package/agent-model-command.mjs

@@ -416,3 +416,53 @@ export function describeNotOllama(host, role) {
         "for an OpenAI-compatible coder use /model → add or change an OpenAI-compatible provider — or type 'no' to skip.",
       ];
 }
+
+// ---------------------------------------------------------------------------------------------
+// #44 — WHAT TO CHANGE comes first.
+// ---------------------------------------------------------------------------------------------
+
+/**
+ * The first screen of /agent-model: what to change, before any model list.
+ *
+ * Reported (#44): client mode, agent on api.openai.com — /agent-model opened straight onto "130 on
+ * https://api.openai.com/v1" with the current model selected, and the ways to use an Ollama server
+ * or another provider sat after all 130 rows. Enter said "already using gpt-4.1-mini — nothing
+ * changed", and the only thing the screen seemed to allow was another OpenAI model. First-time setup
+ * worked; changing it afterwards did not look possible.
+ *
+ * So the choice of WHAT to change is its own short list, in the order it is most often wanted. The
+ * key entry appears only where a key applies. Returns [{ action, label }].
+ */
+export function agentMenuOptions({ host = "", modelCount = 0, needsKey = false } = {}) {
+  const where = host || "this server";
+  return [
+    { action: "models", label: `pick another model on ${where}${modelCount ? `  (${modelCount})` : ""}` },
+    { action: "ollama", label: "use an Ollama server for the agent…" },
+    { action: "provider", label: "use another OpenAI-compatible provider…" },
+    ...(needsKey ? [{ action: "key", label: `enter a new API key for ${where}…` }] : []),
+  ];
+}
+
+/**
+ * The providers already saved on this machine that the agent could switch to — OpenAI-compatible
+ * 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 }].
+ */
+export function agentProviderChoices(settings) {
+  const rows = Array.isArray(settings?.agentCodingBackends) ? settings.agentCodingBackends : [];
+  const current = ensureV1Root(String(settings?.agentModelUrl ?? "")).toLowerCase();
+  const out = [];
+  for (const row of rows) {
+    if (!row || row.kind !== "openai" || !row.url) continue;
+    let host = String(row.url);
+    try {
+      host = new URL(String(row.url)).host;
+    } catch {
+      /* keep the raw url */
+    }
+    const isCurrent = ensureV1Root(String(row.url)).toLowerCase() === current;
+    out.push({ action: "row", row, label: `${host}${isCurrent ? "  (current)" : ""}` });
+  }
+  out.push({ action: "add", label: "add a new OpenAI-compatible provider…" });
+  return out;
+}

package/gonext_agent_chat.py

@@ -9694,22 +9694,25 @@ def run_agent_chat(cfg):
                                     f"{_host} refused: "
                                     + (_why or "the account is out of credit")
                                     + ". Nothing ran — top up the account, or switch the "
-                                    "coding model in Settings → Agent."
+                                    "coding model (in gu: /model; on the web: Settings → Agent)."
                                 ) from e
+                            # THE TERMINAL WAY FIRST (#44): a client-mode machine has no web app,
+                            # so "Settings → Agent" alone was advice it could not follow.
                             if coding_api_key:
                                 raise _AgentConfigError(
                                     f"The agent coding backend ({_host}) REJECTED the "
-                                    "coding API key. Nothing ran. Re-enter 'Agent coding "
-                                    "model API key' in Settings → Agent (the stored key is "
-                                    "write-only, so a stale one can't be inspected — just "
-                                    "save a fresh one)."
+                                    "coding API key. Nothing ran. Enter a fresh key — in gu: "
+                                    "press ctrl+k (or /model → the provider); on the web: "
+                                    "Settings → Agent. The stored key is write-only, so a "
+                                    "stale one can't be inspected — just save a fresh one."
                                 ) from e
                             raise _AgentConfigError(
                                 f"The agent coding backend ({_host}) rejected the request: "
                                 "NO coding API key was sent, so the local agent key was "
-                                "used instead. Enter the API key in Settings → Agent for "
-                                "this coding backend (OpenAI-compatible, or Ollama with an "
-                                "https://ollama.com URL — local Ollama needs no key)."
+                                "used instead. Enter the API key for this coding backend — in "
+                                "gu: press ctrl+k; on the web: Settings → Agent "
+                                "(OpenAI-compatible, or Ollama with an https://ollama.com URL — "
+                                "local Ollama needs no key)."
                             ) from e
                         if "404" in emsg and "not found" in emsg.lower():
                             # Probe with the CODING key when there is one: using the agent

package/gu-repl.mjs

@@ -6119,6 +6119,29 @@ async function pointAgentAtProvider(row, host) {
   await saveAgentModel(url, model, host);
 }
 
+/**
+ * #44: switch the agent to a provider already saved on this machine, or add a new one.
+ */
+async function chooseAgentProvider() {
+  const am = await import("./agent-model-command.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 choices = am.agentProviderChoices(settings);
+  if (choices.length === 1) return addCodingProvider("agent");
+  console.log(dim(`  Which OpenAI-compatible provider should the agent use?  (${PICK_HINT})`));
+  const idx = await pickFromList(choices.map((c) => c.label), 0);
+  if (idx < 0) {
+    console.log(dim("  (cancelled)\n"));
+    return;
+  }
+  const pick = choices[idx];
+  if (pick.action === "add") return addCodingProvider("agent");
+  await pointAgentAtProvider(pick.row, hostOf(String(pick.row.url ?? "")));
+}
+
 /**
  * #41: the agent model on an OLLAMA server — this machine's, a LAN box, or the Ollama cloud.
  *
@@ -6334,6 +6357,21 @@ async function chooseAgentModel() {
     return;
   }
 
+  // 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);
+  const firstAction = first >= 0 ? menu[first].action : "cancel";
+  if (firstAction === "cancel") {
+    console.log(dim("  (cancelled)\n"));
+    return;
+  }
+  if (firstAction === "ollama") return addOllamaAgent();
+  if (firstAction === "provider") return chooseAgentProvider();
+  if (firstAction === "key") return enterAgentProviderKey(source.row, listHost);
+
   const rows = am.agentModelRows(models, current);
   console.log(dim(`  Agent model — the one that TALKS  (currently ${current || "unset"})`));
   // Strip whichever list endpoint was asked, so the header names the SERVER rather than the path.
@@ -6360,28 +6398,13 @@ async function chooseAgentModel() {
       (r.current ? accent("  (current)") : "")
     );
   });
-  // APPENDED LAST, after every model, for the reason #223 records: a new entry must never shift
-  // an index someone already has muscle memory for. Offered even when the list is healthy,
-  // because "which model on the box I am pointed at" and "I want a different provider" are
-  // different questions, and only the first is answered by the rows above.
-  labels.push("add an OpenAI-compatible provider for the agent…");
-  // #41, appended AFTER the provider entry so no existing index moves.
-  labels.push("use an Ollama server for the agent…");
+  // 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)));
   if (idx < 0) {
     console.log(dim("  (cancelled)\n"));
     return;
   }
-  // labels is now TWO LONGER than rows. Reading rows[idx] for an appended entry would
-  // dereference undefined and take the picker down, so they are answered before rows is touched.
-  if (idx === rows.length) {
-    await addCodingProvider("agent");
-    return;
-  }
-  if (idx === rows.length + 1) {
-    await addOllamaAgent();
-    return;
-  }
   const chosen = rows[idx].model;
   if (chosen === current) {
     console.log(dim(`  already using ${current} — nothing changed.\n`));

package/package.json

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