@tiens.nguyen/gu-cli 1.0.735 → 1.0.737

package/coding-provider-setup.mjs

@@ -233,6 +233,24 @@ export function modelListRequest(url, key = "") {
   return { url: modelsUrlFor(url), headers: keyed ? { Authorization: `Bearer ${k}` } : {} };
 }
 
+/**
+ * Why a provider's model list could not be shown, and what to type instead (#266). Reported:
+ * "did not list its models without a key — type the id … what id?". The line now says WHY
+ * (no key saved / key refused / unreachable) and WHAT to type: the model's exact name as that
+ * provider calls it, with the current one as the example.
+ *   reason: "no-key" | "refused" | "failed"
+ */
+export function describeListFailure({ host = "", reason = "failed", status = 0, keyName = "", example = "" } = {}) {
+  const what = `type the model's name exactly as ${host} calls it${example ? ` (e.g. ${example})` : ""}`;
+  if (reason === "no-key") {
+    return [`no API key is saved for ${host}, so it cannot list its models —`, `${what}, or add a key with ctrl+k first.`];
+  }
+  if (reason === "refused") {
+    return [`${host} refused the key${keyName ? ` "${keyName}"` : ""}${status ? ` (HTTP ${status})` : ""} when listing its models —`, `${what}, or fix the key with ctrl+k.`];
+  }
+  return [`couldn't list ${host}'s models${status ? ` (HTTP ${status})` : " (no answer)"} —`, `${what}.`];
+}
+
 /**
  * The hosted providers offered by name when adding one (#261), before "another URL". Claude has
  * no embedding models (Anthropic points to Voyage AI), so it is not offered for the embedder.

package/gu-repl.mjs

@@ -5356,7 +5356,7 @@ async function chooseCodingModelFrom(ps, all, question, current) {
   let list = coders;
   let showingAll = filtered === 0;
   for (;;) {
-    const rows = [...list, "type a model id…"];
+    const rows = [...list, "type a model name…"];
     // The row that lifts the filter, offered only while it is on and only when it hides something.
     if (!showingAll) rows.push(`show all ${all.length} models…`);
     // Opens on the CURRENT model where there is one — a long list that opens at the top tells the
@@ -5369,7 +5369,7 @@ async function chooseCodingModelFrom(ps, all, question, current) {
     const idx = await pickFromList(rows, at >= 0 ? at : 0);
     if (idx < 0) return null;
     if (idx === list.length) {
-      const typed = (await ask("  model id: ")).trim();
+      const typed = (await ask("  model name: ")).trim();
       return typed || null;
     }
     if (idx === list.length + 1) {
@@ -5395,13 +5395,13 @@ async function chooseCodingModelFrom(ps, all, question, current) {
  * unlisted one may be exactly right.
  */
 async function chooseFromModelList(all, question, current = 0) {
-  const rows = [...all, "type a model id…"];
+  const rows = [...all, "type a model name…"];
   const at = typeof current === "string" ? all.indexOf(current) : Number(current) || 0;
   console.log(dim(`  ${question}  (${PICK_HINT})`));
   const idx = await pickFromList(rows, at >= 0 ? at : 0);
   if (idx < 0) return null;
   if (idx === all.length) {
-    const typed = (await ask("  model id: ")).trim();
+    const typed = (await ask("  model name: ")).trim();
     return typed || null;
   }
   return all[idx];
@@ -5459,15 +5459,22 @@ async function changeProviderModel(ps, rows, p) {
   const md = await import("./model-doctor.mjs");
   const { proxyFetch } = await import("./proxy-dispatcher.mjs");
 
-  // PROBED WITHOUT A KEY, DELIBERATELY. The terminal does not hold this provider's secret, and
-  // the one key it could fetch is the ACCOUNT DEFAULT — which may belong to a different provider
-  // entirely. Sending it here to be helpful would be the exact leak this task spent a phase
-  // preventing. Many servers (Ollama, vLLM, LM Studio) list models unauthenticated; a hosted one
-  // will refuse, and then the id is typed, which always works.
+  // LISTED WITH THIS PROVIDER'S OWN KEY (#266). This used to probe with NO key, on purpose: the
+  // only key the terminal could fetch was the ACCOUNT DEFAULT, which may belong to another provider.
+  // Since #245 a key belongs to its server, so the key used is the one bound to THIS row — the same
+  // check addServer makes — and never another provider's. Keyed providers (Claude, OpenAI, Kimi,
+  // ollama.com) can finally list their models here instead of asking for an id.
+  const sk = await import("./server-keys.mjs");
+  const own = await withPendingStatus(`reading the key for ${p.host}`, async () => {
+    const keys = await fetchServerKeys(p.id);
+    const inUse = sk.keyInUse(keys ?? [], p.id, sessionCodingKeyId);
+    if (!inUse || inUse.backendId !== p.id) return { key: "", name: "" };
+    const r = await fetchCodingKey(p.id);
+    return r.keyId && r.keyId !== inUse.id ? { key: "", name: "" } : { key: r.key, name: String(inUse.name ?? "") };
+  });
   const probe = await withPendingStatus(`asking ${p.host} what it has`, async () => {
     try {
-      // Keyless, as above — but in the list's own dialect (the Claude API's headers, #261).
-      const lr = ps.modelListRequest(p.url);
+      const lr = ps.modelListRequest(p.url, own.key); // the list's own dialect too (Claude's headers, #261)
       const res = await proxyFetch(lr.url, { headers: lr.headers, signal: AbortSignal.timeout(10_000) });
       if (!res.ok) return { status: res.status };
       return { body: await res.json().catch(() => null) };
@@ -5487,7 +5494,11 @@ async function changeProviderModel(ps, rows, p) {
     const rn = ps.retiredNote(parsed.retired, p.host);
     if (rn) console.log(GUTTER + dim(rn));
   } else {
-    console.log(GUTTER + dim(`${p.host} did not list its models without a key — type the id.`));
+    const refused = probe.status === 401 || probe.status === 403;
+    const reason = refused ? (own.key ? "refused" : "no-key") : "failed";
+    for (const l of ps.describeListFailure({ host: p.host, reason, status: probe.status, keyName: own.name, example: p.model })) {
+      console.log(GUTTER + dim(l));
+    }
   }
 
   let model = "";
@@ -5499,7 +5510,7 @@ async function changeProviderModel(ps, rows, p) {
     }
   } else {
     console.log(GUTTER + dim(`Enter keeps ${p.model || "it unset"}`));
-    model = (await ask("  model id: ")).trim();
+    model = (await ask("  model name: ")).trim();
   }
   if (!model) {
     console.log(GUTTER + dim("(nothing changed)\n"));
@@ -5837,7 +5848,7 @@ async function addServer({ role = "coding", dialect = "openai", url: presetUrl =
         return;
       }
     } else {
-      model = String((await ask("  model id: ")) ?? "").trim();
+      model = String((await ask("  model name: ")) ?? "").trim();
     }
     if (!model) {
       console.log(GUTTER + dim("(cancelled — nothing was saved)\n"));
@@ -6125,10 +6136,12 @@ async function chooseModel() {
   // Task #125: remember the chosen backend's coding URL so the GLOBAL output-token total is
   // keyed to it. Default pick → "" so activeCodingUrl() falls back to defaultCodingUrl.
   sessionCodingUrl = chosen.id === def ? "" : (chosen.url ?? "");
+  // The server goes WITH the model, before any await (#263): set after the save below, the bar
+  // could repaint in between and show the NEW model under the OLD server for a moment.
+  activeCoderWhere = coderWhere(chosen.kind, chosen.url);
   // WRITTEN NOW, not at the end of the next turn: `/model` then `/exit` is how the choice is
   // made and then tested, and that path never reaches saveSession.
   await saveSessionCoding(resolve(process.cwd()));
-  activeCoderWhere = coderWhere(chosen.kind, chosen.url);
   const where = showTag && !activeCoderWhere ? ` (${tags[idx]})` : "";
   console.log(
     accent(

package/package.json

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