@tiens.nguyen/gu-cli 1.0.872 → 1.0.874

package/agent-model-command.mjs

@@ -350,8 +350,8 @@ export function agentRecoveryOptions({ keyProblem = false, host = "" } = {}) {
   return [
     { action: "leave", label: "leave it" },
     ...(keyProblem ? [{ action: "key", label: `enter the API key for ${host || "this provider"}…` }] : []),
-    { action: "ollama", label: "use an Ollama server for the agent…" },
-    { action: "provider", label: "add a provider for the agent — Claude API, OpenAI, Kimi…" },
+    // #244: no separate Ollama row — Ollama is one of the providers on the add screen.
+    { action: "provider", label: "add a provider for the agent — Claude API, OpenAI, Kimi, Ollama…" },
   ];
 }
 
@@ -375,8 +375,9 @@ 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 provider — Claude API, OpenAI, Kimi…" },
+    // #244: "use an Ollama server for the agent…" was a second way to the same add screen, left from
+    // when Ollama had its own setup (#41). Ollama, ollama.com included, is one provider among the rest.
+    { action: "provider", label: "use another provider — Claude API, OpenAI, Kimi, Ollama…" },
     // Task #245: the SAME key manager /model's ctrl+k and /embed-model open — switch, add, make
     // default, delete — for this server's keys only.
     ...(needsKey ? [{ action: "key", label: `API keys for ${where} — switch, add or remove…` }] : []),
@@ -393,7 +394,8 @@ export function agentProviderChoices(settings) {
   const current = ensureV1Root(String(settings?.agentModelUrl ?? "")).toLowerCase();
   const out = [];
   for (const row of rows) {
-    if (!row || row.kind !== "openai" || !row.url) continue;
+    // Ollama rows too (#244): ollama.com or a box saved earlier is a provider like any other.
+    if (!row || (row.kind !== "openai" && row.kind !== "ollama") || !row.url) continue;
     let host = String(row.url);
     try {
       host = new URL(String(row.url)).host;
@@ -403,7 +405,7 @@ export function agentProviderChoices(settings) {
     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 provider — Claude API, OpenAI, Kimi…" });
+  out.push({ action: "add", label: "add a new provider — Claude API, OpenAI, Kimi, Ollama…" });
   return out;
 }
 

package/coding-provider-setup.mjs

@@ -614,20 +614,24 @@ export function providerHost(url) {
  * KIND, so a second openai row is not even visible there. Add-only was a dead end and this is the
  * exit from it.
  *
- * OPENAI ROWS ONLY. An Ollama or MLX row is owned by its own flow ("change the Ollama server this
- * machine uses…"), which sets URL, models and roles together; editing one field of it from here
- * would half-configure a thing that has its own notion of complete.
+ * OPENAI AND OLLAMA ROWS (#243). Ollama rows — ollama.com, or a box added with "another URL…" —
+ * used to be left to "change the Ollama server this machine uses…"; #412 removed that menu, which
+ * left them with no editor at all: an ollama.com coder worked but could not be found here to change
+ * or remove. They are listed with `dialect: "ollama"`, and their model list and URL are handled in
+ * that dialect (/api/tags, serverTarget). MLX / "local" rows stay out: they are set up by gu itself.
  */
 export function manageableProviders(rows) {
   const out = [];
   const taken = new Set();
   for (const b of Array.isArray(rows) ? rows : []) {
     if (!b || typeof b !== "object") continue;
-    if (String(b.kind ?? "") !== "openai") continue;
+    const kind = String(b.kind ?? "");
+    if (kind !== "openai" && kind !== "ollama") continue;
     const url = String(b.url ?? "").trim();
     if (!url) continue;
-    // The same identity rule the API uses, so an id shown here is the id it will patch.
-    const id = String(b.id ?? "").trim() || (taken.has("openai") ? "" : "openai");
+    // The same identity rule the API uses, so an id shown here is the id it will patch: an id-less
+    // row is known by its kind, and only the first of each kind can be.
+    const id = String(b.id ?? "").trim() || (taken.has(kind) ? "" : kind);
     if (!id || taken.has(id)) continue;
     taken.add(id);
     out.push({
@@ -636,6 +640,7 @@ export function manageableProviders(rows) {
       model: String(b.defaultModel ?? "").trim(),
       host: providerHost(url),
       enabled: b.enabled !== false,
+      dialect: kind === "ollama" ? "ollama" : "openai",
     });
   }
   return out;

package/embed-model-command.mjs

@@ -106,8 +106,8 @@ export function embedMenuOptions({ current = DEFAULT_EMBED_MODEL, host = "", key
   const where = host || "this server";
   return [
     { action: "model", label: `switch the embedder model  (currently ${current})` },
-    { action: "ollama", label: "use an Ollama server for embedding…" },
-    { action: "provider", label: "use another OpenAI-compatible provider…" },
+    // #244: one row for every server — Ollama (this machine, the network) is a choice on the add screen.
+    { action: "provider", label: "use another provider — OpenAI, Ollama…" },
     ...(keyRequired ? [{ action: "key", label: `enter a new API key for ${where}…` }] : []),
   ];
 }