@tiens.nguyen/gu-cli 1.0.816 → 1.0.817

package/client-expert-run.mjs

@@ -40,7 +40,15 @@ import {
   LOCAL_MONGO_URI,
 } from "./client-expert-api.mjs";
 import { askOllamaSetup, localOllamaDefault } from "./ollama-setup.mjs";
-import { SKIP_ALL, createHinter, modelSetupMenu, parseModelSetupChoice } from "./model-setup-ui.mjs";
+import {
+  SKIP_ALL,
+  createHinter,
+  modelSetupMenu,
+  parseModelSetupChoice,
+  providerChoiceMenu,
+  parseProviderChoice,
+} from "./model-setup-ui.mjs";
+import { providerPresets } from "./coding-provider-setup.mjs";
 import { presetFilesIn } from "./presets-transfer.mjs";
 import { readdirSync, statSync, readFileSync } from "node:fs";
 import { parseOllamaTags, formatSize } from "./agent-model-command.mjs";
@@ -1324,6 +1332,33 @@ export async function runClientExpertSetup({
       chosenModels = { skipped: true, keys: [], loadPreset: path === "preset" };
       throw new SkipModelQuestion();
     }
+    // WHICH PROVIDER (#132 follow-up): Ollama is still the Enter default, but a hosted provider can be
+    // picked from the preset list or typed. That pick is HANDED to gu's own add-provider flow, which
+    // asks the key and then the model once gu starts — the terminal that flow needs does not exist yet.
+    const provPresets = providerPresets("coding");
+    console.log("");
+    const [ptitle, ...prows] = providerChoiceMenu(provPresets);
+    console.log("  " + bold(ptitle));
+    for (const r of prows) console.log(dim("  " + r));
+    let provider = null;
+    for (let t = 0; t < 3 && !provider; t++) {
+      provider = parseProviderChoice(await askStep("  choose [1]: "), provPresets);
+    }
+    provider = provider ?? { kind: "ollama" };
+    if (provider.kind === "skip") {
+      chosenModels = { skipped: true, keys: [], loadPreset: false };
+      throw new SkipModelQuestion();
+    }
+    if (provider.kind === "preset" || provider.kind === "url") {
+      chosenModels = {
+        skipped: true,
+        keys: [],
+        addProvider: provider.kind === "preset"
+          ? { name: provider.preset.name, url: provider.preset.url, dialect: provider.preset.dialect ?? "openai" }
+          : { name: "", url: "", dialect: "openai" },
+      };
+      throw new SkipModelQuestion();
+    }
     console.log("");
     console.log("  " + bold("Which Ollama server should this machine use?"));
     // THIS MACHINE FIRST, when it has one. Client Expert is the mode whose whole promise is
@@ -1371,6 +1406,7 @@ export async function runClientExpertSetup({
   // #301: skipped on purpose (up front, "s" at both servers, or Esc) → no model field is written.
   const skipModels = Boolean(chosenModels?.skipped);
   const loadPreset = Boolean(chosenModels?.loadPreset);
+  const addProvider = chosenModels?.addProvider ?? null;
 
   try {
     const written = await seedSettings({
@@ -1391,7 +1427,9 @@ export async function runClientExpertSetup({
     }
     if (skipModels) {
       console.log("");
-      console.log("  " + cyan("✓ Model setup skipped") + dim(loadPreset
+      console.log("  " + cyan("✓ Model setup skipped") + dim(addProvider
+        ? ` — ${addProvider.name || "the provider list"}: its key and model are asked as soon as gu starts`
+        : loadPreset
         ? " — the preset picker opens as soon as gu starts"
         : " — set them any time with /model (or /use-presets)"));
     } else if (Object.keys(written).length === 0) {
@@ -1443,5 +1481,5 @@ export async function runClientExpertSetup({
   );
   // #301: the caller opens /use-presets once the terminal exists — the picker, the plan and the
   // confirmation are that command's, not rebuilt here.
-  return { complete: true, stoppedAt: null, ...(loadPreset ? { loadPreset: true } : {}) };
+  return { complete: true, stoppedAt: null, ...(loadPreset ? { loadPreset: true } : {}), ...(addProvider ? { addProvider } : {}) };
 }

package/coding-provider-setup.mjs

@@ -260,6 +260,12 @@ export function providerPresets(role = "coding") {
     { name: "Claude API (Anthropic)", url: CLAUDE_API_URL, roles: ["coding", "agent"] },
     { name: "OpenAI", url: DEFAULT_PROVIDER_URL, roles: ["coding", "agent", "embed"] },
     { name: "Kimi (Moonshot)", url: "https://api.moonshot.ai/v1", roles: ["coding", "agent"] },
+    // #132. Ollama's cloud speaks Ollama's own API (/api/tags), so the preset names its dialect.
+    { name: "Ollama cloud", url: "https://ollama.com", dialect: "ollama", roles: ["coding", "agent"] },
+    // Qwen's two plans take DIFFERENT keys (Token Plan sk-sp-..., pay-as-you-go sk-ws-...), so the
+    // plan is in the name. Both are OpenAI-compatible and already carry their /compatible-mode/v1 path.
+    { name: "Qwen Token Plan (OpenAI-compatible)", url: "https://token-plan.maas.qwencloudapi.com/compatible-mode/v1", roles: ["coding", "agent"] },
+    { name: "Qwen pay-as-you-go (OpenAI-compatible)", url: "https://maas.qwencloudapi.com/compatible-mode/v1", roles: ["coding", "agent"] },
   ];
   return all.filter((p) => p.roles.includes(role));
 }

package/gonext_agent_chat.py

@@ -4574,6 +4574,8 @@ def _strip_tool_tags(text: str) -> str:
     """Remove the internal hint tags we append to tool output (e.g. '[SUCCESS …]',
     '[NOTE: …]', 'Note: This URL failed …') so they never leak into the user reply."""
     out = []
+    # DeepSeek tool_calls/invoke markup must never reach the user as the answer (#133).
+    text = _strip_toolcall_markup(text)
     for ln in (text or "").splitlines():
         s = ln.strip()
         if s.startswith("[SUCCESS") or s.startswith("[NOTE:") or s.startswith("Note: This URL failed"):
@@ -4905,6 +4907,62 @@ def _dsml_to_code_block(text):
     return (prose + "\n" if prose else "") + "<code>\n" + body + "\n</code>"
 
 
+# DeepSeek plain tool-call markup (issue #133). Besides the DSML form above, DeepSeek-family
+# models answer with <tool_calls><invoke name="X"><parameter name="k" string="true">v</parameter>
+# </invoke></tool_calls>. That matched nothing, so it reached the user as the FINAL answer (an
+# unexecuted run_command and no recap). Read it as a code block so the call runs, and strip any
+# leftover from the final text so it is never shown.
+_TC_INVOKE = re.compile(r"<invoke\s+name\s*=\s*[\x22\x27]([A-Za-z_]\w*)[\x22\x27]\s*>([\s\S]*?)(?:</invoke\s*>|(?=<invoke\b)|$)")
+_TC_PARAM = re.compile(r"<parameter\s+name\s*=\s*[\x22\x27]([A-Za-z_]\w*)[\x22\x27]"
+                       r"(?:\s+string\s*=\s*[\x22\x27](true|false)[\x22\x27])?\s*>([\s\S]*?)(?:</parameter\s*>|(?=<parameter\b)|$)")
+_TC_BLOCK = re.compile(r"<\s*tool_calls\s*>[\s\S]*?(?:<\s*/\s*tool_calls\s*>|$)", re.I)
+_TC_STRAY = re.compile(r"</?\s*tool_calls\s*>|</?\s*invoke\b[^<>]*>|</?\s*parameter\b[^<>]*>", re.I)
+_TC_JSON_WORDS = {"true": "True", "false": "False", "null": "None"}
+
+
+def _strip_toolcall_markup(text):
+    """Remove tool_calls/invoke/parameter markup from text that is shown to the user."""
+    if not text or ("<tool_calls" not in text and "<invoke" not in text and "<parameter" not in text):
+        return text
+    return _TC_STRAY.sub("", _TC_BLOCK.sub("", text)).strip()
+
+
+def _toolcalls_to_code_block(text):
+    """Rewrite tool_calls/invoke/parameter markup into a code block that calls the tools, or
+    return the text unchanged (only when there is no code tag already and the result COMPILES)."""
+    if not text or "<invoke" not in text or re.search(r"<\s*/?\s*code\b", text, re.I):
+        return text
+    calls = []
+    for m in _TC_INVOKE.finditer(text):
+        args = []
+        for pm in _TC_PARAM.finditer(m.group(2)):
+            val = pm.group(3).strip("\n")
+            lit = repr(val)
+            if pm.group(2) == "false":
+                if val in _TC_JSON_WORDS:
+                    lit = _TC_JSON_WORDS[val]
+                else:
+                    try:
+                        json.loads(val)
+                        lit = val
+                    except Exception:  # noqa: BLE001
+                        lit = repr(val)
+            args.append(pm.group(1) + "=" + lit)
+        calls.append("print(" + m.group(1) + "(" + ", ".join(args) + "))")
+    if not calls:
+        return text
+    body = "\n".join(calls)
+    try:
+        compile(body, "<gu-code>", "exec")
+    except Exception:  # noqa: BLE001
+        return text
+    first = text.find("<tool_calls")
+    if first < 0:
+        first = text.find("<invoke")
+    prose = text[:first].rstrip()
+    return (prose + "\n" if prose else "") + "<code>\n" + body + "\n</code>"
+
+
 def _code_block_readings(text):
     """Every plausible reading of where the code block is, CHEAPEST FIRST.
 
@@ -4969,6 +5027,10 @@ def _canonicalise_code_reply(text):
     if _dsml != text:
         _log("DSML tool-call markup converted to a code block (#119)")
         return _dsml
+    _tc = _toolcalls_to_code_block(text)
+    if _tc != text:
+        _log("tool_calls/invoke markup converted to a code block (#133)")
+        return _tc
     if not text or not _CODE_ANY_TAGGISH.search(text):
         return text
     fallback = None

package/gu-repl.mjs

@@ -676,6 +676,8 @@ let clientExpertRanThisProcess = false;
 // Declared HERE, above the first-run block: that block runs at module top level, before any
 // declaration further down exists.
 let openPresetsAtStart = false;
+// #132 follow-up: a hosted provider picked in first-run setup; its key and model are asked once the terminal exists.
+let addProviderAtStart = null;
 
 if (!workerKey || !apiBase) {
   if (process.stdin.isTTY && process.stdout.isTTY) {
@@ -800,6 +802,7 @@ if (!workerKey || !apiBase) {
           const sp = setupPrompts(rl0, { style: accent });
           const setup = await runClientExpertSetup({ ask: ask0, askStep: sp.askStep, askSecret: sp.askSecret });
           if (setup.loadPreset) openPresetsAtStart = true;
+          if (setup.addProvider) addProviderAtStart = setup.addProvider;
           // STOP when setup cannot go further.
           //
           // This used to fall through to the hosted sign-in, on the theory that "this machine
@@ -6527,8 +6530,24 @@ async function changeProviderModel(ps, rows, p) {
 /** Point a provider at a different URL, keeping its id so saved picks still resolve. */
 async function changeProviderUrl(ps, rows, p) {
   const md = await import("./model-doctor.mjs");
-  console.log("\n" + GUTTER + dim(`Enter keeps ${p.url}`));
-  const typed = (await ask("   provider URL: ")).trim();
+  // THE SAME PRESET LIST AS ADDING (#132), OpenAI-compatible ones only: an Ollama row has another
+  // kind, and this flow keeps the row's id and kind. "type a URL…" is the default row, so Enter
+  // still gets the old free-text question.
+  const urlPresets = ps.providerPresets("coding").filter((x) => (x.dialect ?? "openai") === "openai");
+  const urlRows = [...urlPresets.map((x) => `${x.name}${dim(`  · ${x.url}`)}`), "type a URL…"];
+  console.log("\n" + GUTTER + dim(`Which provider?  (${PICK_HINT})`));
+  const upi = await pickFromList(urlRows, urlRows.length - 1);
+  if (upi < 0) {
+    console.log(GUTTER + dim("(nothing changed)\n"));
+    return;
+  }
+  let typed;
+  if (upi < urlPresets.length) {
+    typed = urlPresets[upi].url;
+  } else {
+    console.log(GUTTER + dim(`Enter keeps ${p.url}`));
+    typed = (await ask("   provider URL: ")).trim();
+  }
   if (!typed || typed === p.url) {
     console.log(GUTTER + dim("(nothing changed)\n"));
     return;
@@ -6682,13 +6701,14 @@ async function addServer({ role = "coding", dialect = "openai", url: presetUrl =
     // without Claude, which serves no embeddings).
     const presets = ps.providerPresets(role);
     const rowsShown = [...presets.map((p) => `${p.name}${dim(`  · ${p.url}`)}`), "another URL…"];
+    // A preset names its own dialect (Ollama cloud is "ollama"); the rest are OpenAI-compatible.
     console.log(dim(`   Which provider?  (${PICK_HINT})`));
     const pi = await pickFromList(rowsShown, 0);
     if (pi < 0) {
       console.log(dim("   (nothing saved)\n"));
       return;
     }
-    if (pi < presets.length) target = as.serverTarget("openai", presets[pi].url);
+    if (pi < presets.length) target = as.serverTarget(presets[pi].dialect ?? "openai", presets[pi].url);
   }
   if (!target && !presetUrl) {
     const dflt = as.defaultServerUrl(role, dialect, settings, existing);
@@ -10238,6 +10258,16 @@ let forgetActiveStatus = null;
 let toggleActiveThought = null;
 /** #324: the screen under the Yes/No picker when it opened — the list picker's bookkeeping (#321). */
 let approvalOpenedOver = null;
+// #135: deadline (epoch ms) of the auto-"No" for the Yes/No prompt and for a timed list picker, 0 = none.
+// The remaining time is drawn next to the option that will be chosen, and ticks once a second.
+let approvalDeadline = 0;
+let listDeadline = 0;
+let listTimeoutIndex = -1;
+/** "2:49" above a minute, "45s" below; never negative. */
+function countdownLabel(msLeft) {
+  const s = Math.max(0, Math.ceil(msLeft / 1000));
+  return s >= 60 ? Math.floor(s / 60) + ":" + String(s % 60).padStart(2, "0") : s + "s";
+}
 function drawApprovalOptions(redraw) {
   // Two option lines, redrawn in place. On redraw the cursor sits one row below "No";
   // step up 2 rows, clear+rewrite both, landing back where we started.
@@ -10246,16 +10276,19 @@ function drawApprovalOptions(redraw) {
   // Both rows are a handful of columns wide, so they survive any resize on ONE physical row
   // each and the \x1b[2A count stays exact — which is why a resize can simply redraw here.
   const yes = approvalSel === 0 ? accent("▸ Yes") : dim("  Yes");
-  const no = approvalSel === 1 ? accent("▸ No") : dim("  No");
+  const tail = approvalDeadline ? "  (auto-No in " + countdownLabel(approvalDeadline - Date.now()) + ")" : "";
+  const no = approvalSel === 1 ? accent("▸ No" + tail) : dim("  No" + tail);
+  const noRow = clipVisible(GUTTER + no, Math.max(20, process.stdout.columns || 80) - 1);
   if (!redraw && barPinned() && !scrolledBack()) {
     const content = displayRows(transcript.lines(), Math.max(20, process.stdout.columns || 80) - 1).length;
     approvalOpenedOver = { content, pad: currentPad(content), height: viewportHeight() };
   }
-  regionUi((redraw ? "\x1b[2A" : "") + "\x1b[K" + GUTTER + yes + "\n\x1b[K" + GUTTER + no + "\n");
+  regionUi((redraw ? "\x1b[2A" : "") + "\x1b[K" + GUTTER + yes + "\n\x1b[K" + noRow + "\n");
 }
-function finishApproval(allow) {
+function finishApproval(allow, timedOut = false) {
   if (!approvalActive) return;
   approvalActive = false;
+  approvalDeadline = 0;
   // #324: on a full screen the two option rows SCROLLED the conversation up by two, and the one
   // result line below takes only one of them back — the content now ends a row above the region's
   // bottom. Unrecorded, every row put back from the transcript afterwards (the slash menu, a
@@ -10266,7 +10299,7 @@ function finishApproval(allow) {
     setPad(blockClosedPad({ contentRows: over.content, pad: over.pad, height: over.height, blockRows: 2 }), over.content);
   }
   // Settle the picker: overwrite the two option lines with a single result line.
-  process.stdout.write("\x1b[2A\x1b[J" + GUTTER + (allow ? accent("▸ Yes — running it") : red("▸ No — skipped")) + "\n");
+  process.stdout.write("\x1b[2A\x1b[J" + GUTTER + (allow ? accent("▸ Yes — running it") : red(timedOut ? "▸ No — no answer in time, skipped" : "▸ No — skipped")) + "\n");
   const r = approvalResolve;
   approvalResolve = null;
   if (r) r(!!allow);
@@ -10423,11 +10456,17 @@ async function approvalPrompt(command) {
     approvalSel = 0;
     approvalResolve = resolve;
     approvalActive = true;
+    approvalDeadline = Date.now() + 170000;
     drawApprovalOptions(false);
-    const t = setTimeout(() => finishApproval(false), 170000);
+    const t = setTimeout(() => finishApproval(false, true), 170000);
+    // #135: redraw the two option rows once a second so the countdown on "No" ticks down.
+    const tick = setInterval(() => {
+      if (approvalActive) drawApprovalOptions(true);
+    }, 1000);
     const orig = resolve;
     approvalResolve = (v) => {
       clearTimeout(t);
+      clearInterval(tick);
       orig(v);
     };
   });
@@ -10492,7 +10531,8 @@ function drawList(redraw) {
     // and "this is where you are" — and collapsing them into one marker is what makes a
     // multi-select feel like it forgot what you chose.
     const box = listMulti ? (listChecked.has(i) ? "[x] " : "[ ] ") : "";
-    const body = box + listItems[i];
+    const left = listDeadline && i === listTimeoutIndex ? "  (auto in " + countdownLabel(listDeadline - Date.now()) + ")" : "";
+    const body = box + listItems[i] + left;
     return clipVisible(GUTTER + (i === listSel ? accent("▸ " + body) : dim("  " + body)), width - 1);
   };
   const marker = (text) => clipVisible(GUTTER + dim(text), width - 1);
@@ -10681,6 +10721,12 @@ function pickFromList(items, initialSel = 0, opts = {}) {
     listSel = Math.max(0, Math.min(initialSel, items.length - 1));
     listResolve = resolve;
     listPickerActive = true;
+    listDeadline = 0;
+    listTimeoutIndex = -1;
+    if (opts && opts.timeoutMs > 0 && (opts.timeoutIndex ?? -1) >= 0) {
+      listDeadline = Date.now() + opts.timeoutMs;
+      listTimeoutIndex = opts.timeoutIndex;
+    }
     drawList(false);
     // Optional auto-resolve after opts.timeoutMs (task #81 time-budget prompt): if the
     // user doesn't choose in time, finish with opts.timeoutIndex (default -1). Wrap
@@ -10690,9 +10736,18 @@ function pickFromList(items, initialSel = 0, opts = {}) {
         () => finishList(opts.timeoutIndex ?? -1),
         opts.timeoutMs
       );
+      // #135: tick the countdown on the row that will be auto-chosen.
+      const tick = listDeadline
+        ? setInterval(() => {
+            if (listPickerActive) drawList(true);
+          }, 1000)
+        : null;
       const orig = listResolve;
       listResolve = (v) => {
         clearTimeout(to);
+        if (tick) clearInterval(tick);
+        listDeadline = 0;
+        listTimeoutIndex = -1;
         orig(v);
       };
     }
@@ -10999,6 +11054,8 @@ const answerFrom = (s) =>
 
 // Word-wrap a plain (ANSI-free) string into at most `maxLines` lines of width ≤ `width`,
 // appending an ellipsis to the last line when text was dropped (task #96 expand view).
+const THOUGHT_PREVIEW_LINES = 3; // #134: dim lines always shown under the cut purple thought
+const THOUGHT_OPEN_LINES = 8; // …and after a click / Ctrl+T
 const wrapThought = (s, width, maxLines) => {
   const words = String(s || "").split(/\s+/).filter(Boolean);
   const lines = [];
@@ -11020,7 +11077,13 @@ const wrapThought = (s, width, maxLines) => {
   if (truncated && lines.length) {
     const last = lines[maxLines - 1] ?? lines[lines.length - 1];
     const room = Math.max(1, width - 1);
-    lines[lines.length - 1] = (last.length > room ? last.slice(0, room) : last).replace(/\s+$/, "") + "…";
+    let kept = last;
+    if (last.length > room) {
+      // Cut at a word boundary (#134) so the "…" never lands inside a half word like "lim…".
+      const sp = last.lastIndexOf(" ", room);
+      kept = sp >= Math.floor(room * 0.5) ? last.slice(0, sp) : last.slice(0, room);
+    }
+    lines[lines.length - 1] = kept.replace(/\s+$/, "") + "…";
   }
   return lines;
 };
@@ -11702,12 +11765,9 @@ async function runAgentTurn(history, { attachJobId = "", ownJob = false } = {})
     // to reveal). Line 1 (what's happening now): a live command > the model's current Thought >
     // "almost done" > "Thinking". When clickable we drive line 1 from the SAME fuller string, so
     // the grey expansion CONTINUES where line 1 was cut off instead of repeating the head.
-    const clickable = !!fullLiveThought && !runningCmd && fullLiveThought.length > max;
-    // #350: the click and Ctrl+T ask the SAME question the highlight does. They used to accept
-    // any thought at all, so a line that was already whole took the click and redrew for nothing.
-    liveExpandable = clickable;
+    const split = !!fullLiveThought && !runningCmd && fullLiveThought.length > max;
     let label, rest;
-    if (clickable) {
+    if (split) {
       // Split at a WORD boundary near the line-1 width so nothing is cut mid-word: the last
       // space at/before max-1 (unless that snaps back too far into the line — then hard-cut).
       // Line 1 shows the head; the grey expansion CONTINUES from the same point (no dup, no
@@ -11727,7 +11787,15 @@ async function runAgentTurn(history, { attachJobId = "", ownJob = false } = {})
     }
     // When clicked, unfold the remainder as up to 4 wrapped GREY lines BETWEEN the thought and
     // the playful-word line.
-    const expLines = thoughtExpanded && rest ? wrapThought(rest, max, 4) : [];
+    // #134: the rest of a cut thought is ALWAYS visible as THOUGHT_PREVIEW_LINES dim lines under
+    // the purple one (ending in "…" when more was dropped); a click / Ctrl+T opens it up to
+    // THOUGHT_OPEN_LINES. #350: the click and Ctrl+T ask the SAME question the highlight does —
+    // they only count when opening actually shows more rows than the preview already does.
+    const previewLines = rest ? wrapThought(rest, max, THOUGHT_PREVIEW_LINES) : [];
+    const openLines = rest ? wrapThought(rest, max, THOUGHT_OPEN_LINES) : [];
+    const clickable = split && previewLines.join("\n") !== openLines.join("\n");
+    liveExpandable = clickable;
+    const expLines = thoughtExpanded ? openLines : previewLines;
     // WHAT IS RUNNING, under the label (task #177). Capped at two rows and clipped, because
     // this block is redrawn by walking the caret over PHYSICAL rows — a wrapped row here is
     // the #109/#138 failure mode.
@@ -12863,6 +12931,7 @@ async function main() {
       if (setup?.stoppedAt === "node") process.exit(1); // GitHub #126, as above
       if (setup?.complete) reloadWorkerEnv();
       if (setup?.loadPreset) openPresetsAtStart = true;
+      if (setup?.addProvider) addProviderAtStart = setup.addProvider;
     }
   } catch {
     /* never block the REPL on the mode question — the banner still shows what is configured */
@@ -13717,6 +13786,17 @@ async function main() {
       console.log(GUTTER + dim(`(could not open the presets: ${e?.message ?? e} — run /use-presets)`));
     }
   }
+  // #132 follow-up: the provider chosen in first-run setup — the URL (or the preset list when none was
+  // chosen), then the key, then the model, all by the same flow as "add another provider".
+  if (addProviderAtStart) {
+    const pick = addProviderAtStart;
+    addProviderAtStart = null;
+    try {
+      await addServer({ role: "coding", dialect: pick.dialect || "openai", ...(pick.url ? { url: pick.url } : {}) });
+    } catch (e) {
+      console.log(GUTTER + dim(`(could not add the provider: ${e?.message ?? e} — run /model → add another provider)`));
+    }
+  }
 
   for (;;) {
     // #307: a held question whose turn ended without printing anything (and was not a quick

package/model-setup-ui.mjs

@@ -103,6 +103,34 @@ export function modelSetupMenu({ presets = 0 } = {}) {
   ];
 }
 
+/**
+ * The provider question inside "Guided" (#132 follow-up): Ollama stays the Enter default, then every
+ * preset (OpenAI, Claude, Kimi, Qwen...), then "another URL". `presets` = providerPresets().
+ */
+export function providerChoiceMenu(presets = []) {
+  return [
+    "Which provider do you want to use?",
+    "  1  Ollama server — this machine or your own   (Enter)",
+    ...presets.map((p, i) => `  ${i + 2}  ${p.name}  · ${p.url}`),
+    `  ${presets.length + 2}  Another provider — type its URL`,
+  ];
+}
+
+/** An answer to providerChoiceMenu → {kind:"ollama"|"preset"|"url"|"skip", preset?}, or null to ask again. */
+export function parseProviderChoice(raw, presets = []) {
+  if (raw === SKIP_ALL) return { kind: "skip" };
+  const t = String(raw ?? "").trim().toLowerCase();
+  if (t === "" || t === "1" || t === "ollama") return { kind: "ollama" };
+  if (t === "s" || t === "skip" || t === "n" || t === "no" || t === "-") return { kind: "skip" };
+  if (t === "u" || t === "url") return { kind: "url" };
+  if (/^\d+$/.test(t)) {
+    const n = Number(t);
+    if (n >= 2 && n <= presets.length + 1) return { kind: "preset", preset: presets[n - 2] };
+    if (n === presets.length + 2) return { kind: "url" };
+  }
+  return null;
+}
+
 /** An answer to the up-front question → "guided" | "preset" | "skip", or null to ask again. */
 export function parseModelSetupChoice(raw) {
   if (raw === SKIP_ALL) return "skip";

package/package.json

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