@tiens.nguyen/gu-cli 1.0.869 → 1.0.871

package/agent-model-command.mjs

@@ -355,73 +355,6 @@ export function agentRecoveryOptions({ keyProblem = false, host = "" } = {}) {
   ];
 }
 
-// ---------------------------------------------------------------------------------------------
-// #43 — /model's "change the Ollama server" flow, when the agent is NOT on an Ollama.
-// ---------------------------------------------------------------------------------------------
-
-/**
- * Is this machine's agent model on an OpenAI-compatible PROVIDER rather than an Ollama?
- *
- * Reported (#43): client mode, /model → change the Ollama server offered the agent's URL —
- * https://api.openai.com — as the "agent + embedding server", probed it for Ollama's /api/tags, got
- * 404, said "check that Ollama is listening", and asked again, with no way forward but typing "no".
- * A provider is known two ways: a provider row for that URL says so, or the URL is one of the hosted
- * APIs everyone knows is not an Ollama.
- */
-const KNOWN_PROVIDER_HOSTS = [
-  "api.openai.com",
-  "openrouter.ai",
-  "api.together.xyz",
-  "api.moonshot.ai",
-  "api.groq.com",
-  "api.deepseek.com",
-  "api.mistral.ai",
-  "generativelanguage.googleapis.com",
-];
-
-export function agentIsOnProvider(settings) {
-  const source = agentListSource(settings);
-  if (!source.url) return false;
-  if (source.dialect === "openai") return true;
-  let host = "";
-  try {
-    host = new URL(String(settings?.agentModelUrl ?? "")).hostname.toLowerCase();
-  } catch {
-    return false;
-  }
-  return KNOWN_PROVIDER_HOSTS.some((h) => host === h || host.endsWith(`.${h}`));
-}
-
-/**
- * The address to offer for the CODING server: the coder's own URL when it is not a known provider,
- * else this machine's Ollama. Never the agent's provider URL — that is what put api.openai.com in an
- * Ollama prompt.
- */
-export function coderServerDefault(settings) {
-  const coder = String(settings?.agentCodingModelUrl ?? "").trim();
-  if (coder && !agentIsOnProvider({ ...settings, agentModelUrl: coder })) return coder;
-  const agent = String(settings?.agentModelUrl ?? "").trim();
-  if (agent && !agentIsOnProvider(settings)) return agent;
-  return "http://127.0.0.1:11434";
-}
-
-/**
- * A server that ANSWERED but has no /api/tags is not an Ollama — an OpenAI-compatible API answers 404
- * there. That is a different fix from "not listening", and saying the wrong one sends people to check
- * a server that is working fine.
- */
-export function describeNotOllama(host, role) {
-  return role === "agent"
-    ? [
-        `${host} answers, but it is not an Ollama server (no /api/tags).`,
-        "an OpenAI-compatible agent is changed with /agent-model — or type 'no' to skip this role.",
-      ]
-    : [
-        `${host} answers, but it is not an Ollama server (no /api/tags).`,
-        "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.
 // ---------------------------------------------------------------------------------------------

package/client-expert-api.mjs

@@ -1138,39 +1138,3 @@ export async function saveSetupKeys({ apiBase = LOCAL_API_BASE, workerKey, model
   return out;
 }
 
-/**
- * THE NEW OLLAMA SERVER'S ROWS, MERGED INTO WHAT IS ALREADY THERE — never replacing it (#43).
- *
- * Found while fixing #43: choosing a coding server in /model → "change the Ollama server" saved
- * codingBackendsForClientExpert(...) AS the whole list — one Ollama row and the Kimi row — deleting
- * every provider the user had added: an api.openai.com row the AGENT's key is found through, an
- * ollama.com cloud row. Their keys, bound to those row ids, were orphaned.
- *
- * Replaced: the local/LAN Ollama row(s) — that is what "the Ollama server this machine uses" means —
- * with the new one, which keeps the first replaced row's id so anything bound to it still resolves.
- * Kept, ids and all: every OpenAI-compatible row, and any Ollama CLOUD row (a paid provider, not
- * "this machine's server"). The template's default provider row is added only when no row already
- * has its URL.
- */
-export function mergeOllamaServerBackends(existing, fresh, { isCloud } = {}) {
-  const cloud = typeof isCloud === "function" ? isCloud : () => false;
-  const norm = (u) => String(u ?? "").trim().replace(/\/+$/, "").toLowerCase();
-  const rows = Array.isArray(existing) ? existing.filter(Boolean) : [];
-  const freshOllama = (Array.isArray(fresh) ? fresh : []).filter((f) => f.kind === "ollama");
-  const newUrls = new Set(freshOllama.map((f) => norm(f.url)));
-  // A row already at the NEW server's URL is the same provider — the new server takes it over, id and
-  // all, so a key bound to it (the Ollama cloud's own key) keeps working and no twin row appears.
-  const sameServer = rows.filter((b) => newUrls.has(norm(b.url)));
-  const replaced = [...sameServer, ...rows.filter((b) => b.kind === "ollama" && !cloud(b.url) && !sameServer.includes(b))];
-  const kept = rows.filter((b) => !replaced.includes(b));
-  const out = [];
-  for (const f of freshOllama) {
-    const id = (sameServer.find((b) => b.id && norm(b.url) === norm(f.url)) ?? replaced.find((b) => b.id))?.id;
-    out.push(id ? { ...f, id } : f);
-  }
-  out.push(...kept);
-  for (const f of Array.isArray(fresh) ? fresh : []) {
-    if (f.kind !== "ollama" && !out.some((b) => norm(b.url) === norm(f.url))) out.push(f);
-  }
-  return out;
-}

package/doctor-check.mjs

@@ -220,6 +220,13 @@ export async function runDoctor(settings, opts = {}) {
   return { results, ok: results.every((r) => r.status === "ok") };
 }
 
+/** Where an unset role is set from the terminal. */
+const SET_WITH = {
+  chat: "/agent-model",
+  code: "/model → add a provider",
+  embed: "/embed-model",
+};
+
 /** One line per role, for the terminal. Pure, so the wording is testable. */
 export function doctorLines(results) {
   const mark = { ok: "✓", unset: "·", timeout: "✗", unreachable: "✗", error: "✗" };
@@ -233,7 +240,8 @@ export function doctorLines(results) {
       out.push("    could not be scheduled. This is not a network problem.");
       if (r.busy?.hint) out.push(`    ${r.busy.hint}`);
     }
-    if (r.status === "unset") out.push("    set it with /model → change the Ollama server");
+    // Each role has its own command since #412 removed /model's all-in-one Ollama flow.
+    if (r.status === "unset") out.push(`    set it with ${SET_WITH[r.role] ?? "/model"}`);
   }
   return out;
 }

package/gonext_agent_chat.py

@@ -10442,10 +10442,7 @@ def run_agent_chat(cfg):
         # wrong python" — indistinguishable, and both were hit while getting a client working.
         import platform as _plat  # noqa: PLC0415
         _where = f"{_plat.node()} · {sys.executable}"
-        _emit({"type": "final",
-               "text": f"[smolagents not installed on {_where}: {e}]\n"
-                       f"Fix on THAT machine: {sys.executable} -m pip install -U smolagents openai\n"
-                       f"then: gu stop && gu start"})
+        _emit({"type": "final", "text": _smolagents_missing_text(_where, e, sys.executable, sys.version_info)})
         _log(f"smolagents import FAILED on {_where}: {e}")
         return
     _patch_dotted_imports()
@@ -17077,6 +17074,27 @@ def _request_dump_range(n_msgs: int) -> tuple:
 _EMIT_LOCK = threading.Lock()
 
 
+def _smolagents_missing_text(where, err, exe, ver):
+    """The turn's message when `import smolagents` fails (reported on a Windows 11 customer, #232).
+
+    Names the exception TYPE (a missing module and a broken dependency need different fixes), says
+    when this Python is too new for prebuilt wheels (> 3.14: pip then tries to compile PyYAML and
+    fails without Visual C++), and leads with `gu doctor`, which installs into the interpreter the
+    background worker actually uses and pins it - a bare pip line can put the packages somewhere
+    else."""
+    kind = type(err).__name__
+    lines = [f"[smolagents could not be loaded on {where}: {kind}: {err}]"]
+    if (ver[0], ver[1]) > (3, 14):
+        lines.append(f"This Python is {ver[0]}.{ver[1]}: too new for the packages' prebuilt wheels, so pip "
+                     f"cannot install them. Install Python 3.13 (Windows: winget install Python.Python.3.13), "
+                     f"open a new terminal, then run: gu doctor")
+    else:
+        lines.append("Fix: run `gu doctor` (it installs smolagents + openai into the Python the worker uses), "
+                     "then: gu stop && gu start")
+        lines.append(f"By hand, on THAT machine: {exe} -m pip install -U smolagents openai")
+    return "\n".join(lines)
+
+
 def _emit(obj):
     """Write one NDJSON line to the real stdout and flush immediately.
 

package/gu-cli.mjs

@@ -1799,6 +1799,25 @@ if (args[0] === "mongo") {
   process.exit(0);
 }
 
+/** The gu-service check (#413), as lines — shared by `gu doctor` and the terminal's /doctor. */
+async function guServiceLines() {
+  const sc = await import("./service-check.mjs");
+  const { hostedApiBase } = await import("./client-expert-api.mjs");
+  const { isLocalApiBase } = await import("./terminal-layout.mjs");
+  const { loadProxy } = await import("./proxy-store.mjs");
+  const { dispatcherFor } = await import("./proxy-dispatcher.mjs");
+  const apiBase = String(process.env.GONEXT_API_BASE ?? "").trim();
+  const { lines } = await sc.checkGuService({
+    hostedBase: hostedApiBase(),
+    apiBase,
+    workerKey: String(process.env.GONEXT_WORKER_KEY ?? "").trim(),
+    localApi: isLocalApiBase(apiBase),
+    proxy: await loadProxy().catch(() => null),
+    dispatcherFor,
+  });
+  return lines;
+}
+
 if (args[0] === "doctor") {
   // Task #304: a Mac whose MongoDB runs in Docker is told the native option, once, up front —
   // a working Docker MongoDB is left alone (it is a choice), a silent one is named as stuck.
@@ -2001,6 +2020,15 @@ if (args[0] === "doctor") {
         console.log(`  (local stack check skipped: ${e.message})`);
       }
     }
+    // CAN A CODING TURN START? (#413) Last, after the local API: its instructions come from the
+    // gu service, through that API. Reported on a Windows VM where doctor passed everything, "hi"
+    // worked, and every coding turn failed — this was the one thing doctor never looked at.
+    try {
+      console.log("\n  Checking the gu service (a coding turn needs it)…");
+      for (const l of await guServiceLines()) console.log(`  ${l}`);
+    } catch (e) {
+      console.log(`  (gu service check skipped: ${e?.message ?? e})`);
+    }
   } finally {
     rl0.close();
   }