@guangnao/agent-cli 1.1.4 → 1.1.6

package/README.md

@@ -26,9 +26,11 @@ npm i -g @guangnao/agent-cli      # 全局安装，得到 gcli 命令（别名 a
 
 ```sh
 gcli
-# → 选服务商（Guangnao / DeepSeek / OpenAI / Anthropic / Gemini）→ 贴 Key → 自动列模型并选 → 进入交互
+# → 选服务商（Guangnao / DeepSeek / OpenAI / Anthropic / Gemini / Custom）→ 贴 Key → 自动列模型并选 → 进入交互
 ```
 
+> 选 **Custom** 可接任意自建端点：先选协议（OpenAI 兼容 / Anthropic 兼容）→ 填 baseURL + Key + 模型即可。
+
 配置存到 `~/.agentos/config.json`，下次直接进，无需重填。
 
 **方式二：环境变量** —— 适合脚本 / CI / 固定配置（**环境变量优先于已保存配置**）：

package/dist/cli.js

@@ -2950,27 +2950,44 @@ function parseImageUrl(url) {
 var isDataImage = (r) => "base64" in r;
 
 // src/llm/anthropic.ts
+var noTemperature = /* @__PURE__ */ new Set();
+var TEMP_DEPRECATED = /temperature.{0,40}deprecated|deprecated.{0,40}temperature/i;
 var anthropic = (cfg2) => {
   const base2 = (cfg2.baseUrl ?? "https://api.anthropic.com/v1").replace(/\/$/, "");
   const headers = { "content-type": "application/json", "x-api-key": cfg2.apiKey, "anthropic-version": "2023-06-01" };
   return async (req) => {
     const system = req.messages.filter((m) => m.role === "system").map((m) => m.content).join("\n");
-    const body = {
+    const mkBody = (withTemp) => ({
       model: cfg2.model,
       max_tokens: req.maxTokens ?? 4096,
       // Anthropic requires this
-      temperature: cfg2.temperature ?? 0,
+      ...withTemp ? { temperature: cfg2.temperature ?? 0 } : {},
+      // newest models deprecated it → omit (see below)
       ...system ? { system } : {},
       messages: toMsgs(req.messages),
       ...req.tools?.length ? { tools: req.tools.map(toTool2) } : {}
+    });
+    const run2 = (withTemp) => {
+      const body = mkBody(withTemp);
+      if (req.onDelta) return stream2(base2, headers, body, req.onDelta, req.signal);
+      return blocking(base2, headers, body, req.signal);
     };
-    if (req.onDelta) return stream2(base2, headers, body, req.onDelta, req.signal);
-    const res = await fetch(`${base2}/messages`, { method: "POST", headers, body: JSON.stringify(body), signal: req.signal });
-    if (!res.ok) throw new Error(`llm ${res.status}: ${(await res.text()).slice(0, 300)}`);
-    const data = await res.json();
-    return fromReply(data);
+    try {
+      return await run2(!noTemperature.has(cfg2.model));
+    } catch (e) {
+      if (!noTemperature.has(cfg2.model) && TEMP_DEPRECATED.test(String(e.message))) {
+        noTemperature.add(cfg2.model);
+        return await run2(false);
+      }
+      throw e;
+    }
   };
 };
+async function blocking(base2, headers, body, signal) {
+  const res = await fetch(`${base2}/messages`, { method: "POST", headers, body: JSON.stringify(body), signal });
+  if (!res.ok) throw new Error(`llm ${res.status}: ${(await res.text()).slice(0, 300)}`);
+  return fromReply(await res.json());
+}
 function fromReply(data) {
   const blocks = data.content ?? [];
   const text2 = blocks.filter((b) => b.type === "text").map((b) => b.text).join("") || void 0;
@@ -3175,6 +3192,22 @@ var PROVIDER_LABEL = {
   google: "Gemini"
 };
 var labelOf = (provider2) => PROVIDER_LABEL[provider2.toLowerCase()] ?? provider2;
+var VENDOR_PREFIX = [
+  ["claude", "Anthropic"],
+  ["gpt", "OpenAI"],
+  ["codex", "OpenAI"],
+  ["chatgpt", "OpenAI"],
+  ["o1", "OpenAI"],
+  ["o3", "OpenAI"],
+  ["o4", "OpenAI"],
+  ["gemini", "Gemini"],
+  ["deepseek", "DeepSeek"]
+];
+function modelProviderLabel(modelId, fallbackProvider) {
+  const id = modelId.toLowerCase();
+  for (const [prefix, vendor] of VENDOR_PREFIX) if (id.startsWith(prefix)) return vendor;
+  return labelOf(fallbackProvider);
+}
 var defaultModel = {
   gapi: "gmodel-pro",
   gmodel: "gmodel-pro",
@@ -3247,7 +3280,9 @@ async function listModels(provider2, cfg2) {
       return (d2.models ?? []).filter((m) => m.supportedGenerationMethods?.includes("generateContent")).map((m) => (m.name ?? "").replace(/^models\//, "")).filter(Boolean);
     }
     if (p === "anthropic" || p === "claude") {
-      const r2 = await fetch("https://api.anthropic.com/v1/models", { headers: { "x-api-key": cfg2.apiKey, "anthropic-version": "2023-06-01" } });
+      const base3 = cfg2.baseUrl?.replace(/\/$/, "");
+      const url = base3 ? `${base3}/models` : "https://api.anthropic.com/v1/models";
+      const r2 = await fetch(url, { headers: { "x-api-key": cfg2.apiKey, authorization: `Bearer ${cfg2.apiKey}`, "anthropic-version": "2023-06-01" } });
       if (!r2.ok) return [];
       const d2 = await r2.json();
       return (d2.data ?? []).map((m) => m.id ?? "").filter(Boolean);
@@ -9128,6 +9163,45 @@ var PromptCancelledError = class extends Error {
 
 // ../agent-ui/src/prompt/text.ts
 init_color();
+import { createInterface } from "readline";
+async function textPrompt(question, opts = {}) {
+  const { default: defaultVal, placeholder, validate, transform } = opts;
+  const hint = defaultVal ? c.meta(` [${defaultVal}]`) : placeholder ? c.meta(` (${placeholder})`) : "";
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  let _cancelReject;
+  const cancelPromise = new Promise((_, reject) => {
+    _cancelReject = reject;
+  });
+  rl.on("SIGINT", () => {
+    rl.close();
+    process.stdout.write("\n");
+    _cancelReject(new PromptCancelledError());
+  });
+  try {
+    for (; ; ) {
+      const answer = await Promise.race([
+        new Promise((res) => rl.question(`${c.user("?")} ${question}${hint}: `, res)),
+        cancelPromise
+      ]);
+      const raw = answer.trim() || (defaultVal ?? "");
+      const value = transform ? transform(raw) : raw;
+      if (validate) {
+        const result = validate(value);
+        if (result !== true) {
+          const msg = typeof result === "string" ? result : "\u8F93\u5165\u65E0\u6548\uFF0C\u8BF7\u91CD\u8BD5";
+          process.stdout.write(`  ${c.fail("\u2717")} ${c.dim(msg)}
+`);
+          continue;
+        }
+      }
+      rl.close();
+      return value;
+    }
+  } catch (e) {
+    rl.close();
+    throw e;
+  }
+}
 
 // ../agent-ui/src/prompt/select.ts
 init_color();
@@ -9913,7 +9987,7 @@ import { statSync as statSync6, readFileSync as readFileSync14, unlinkSync as un
 // package.json
 var package_default = {
   name: "@guangnao/agent-cli",
-  version: "1.1.4",
+  version: "1.1.6",
   description: "AgentOS terminal CLI \u2014 drive a real LLM agent on the microkernel; strongest-UX shell, advanced agent core",
   type: "module",
   bin: {
@@ -11636,7 +11710,10 @@ ${c.dim(cut(p.system, 300))}`);
       return;
     }
     const choice = await this.dock.requestSplitSelect(
-      opts.map((o) => ({ label: o.model, hint: labelOf(o.provider), value: `${o.provider}|${o.model}`, detail: `provider: ${labelOf(o.provider)}${`${labelOf(o.provider)} \xB7 ${o.model}` === m.current ? "   (current)" : ""}` })),
+      opts.map((o) => {
+        const vendor = modelProviderLabel(o.model, o.provider);
+        return { label: o.model, hint: vendor, value: `${o.provider}|${o.model}`, detail: `provider: ${vendor}${`${vendor} \xB7 ${o.model}` === m.current ? "   (current)" : ""}` };
+      }),
       "switch model"
     );
     if (choice) this.switchModel(choice);
@@ -11644,12 +11721,13 @@ ${c.dim(cut(p.system, 300))}`);
   switchModel(v) {
     const sep = v.indexOf("|"), provider2 = v.slice(0, sep), model2 = v.slice(sep + 1);
     this.chat = this.opts.modelMenu.build(provider2, model2);
-    this.opts.modelMenu.current = `${labelOf(provider2)} \xB7 ${model2}`;
+    this.opts.modelMenu.persist?.(provider2, model2);
+    this.opts.modelMenu.current = `${modelProviderLabel(model2, provider2)} \xB7 ${model2}`;
     const history = this.convo?.dump();
     this.convo?.close();
     this.convo = void 0;
     if (history?.length) this.ensureConvo(history);
-    this.note(`${c.done("model")} ${c.dim("\u2192")} ${c.bold(model2)} ${c.dim("(" + labelOf(provider2) + ")")}`);
+    this.note(`${c.done("model")} ${c.dim("\u2192")} ${c.bold(model2)} ${c.dim("(" + modelProviderLabel(model2, provider2) + ")")}`);
     this.dock.setStatusLine(this.statusLine());
   }
   /** /login — re-run the first-run setup wizard (pick provider → paste key → pick model), exactly the flow a
@@ -12063,7 +12141,8 @@ var PROVIDERS = [
   { label: "DeepSeek", value: "deepseek", hint: "api.deepseek.com \xB7 cheap & capable" },
   { label: "OpenAI", value: "openai", hint: "api.openai.com" },
   { label: "Anthropic \xB7 Claude", value: "anthropic", hint: "api.anthropic.com" },
-  { label: "Google \xB7 Gemini", value: "gemini", hint: "generativelanguage.googleapis.com" }
+  { label: "Google \xB7 Gemini", value: "gemini", hint: "generativelanguage.googleapis.com" },
+  { label: "Custom", value: "custom", hint: "your own baseURL + key \xB7 OpenAI- or Anthropic-compatible" }
 ];
 var KEY_URL = {
   guangnao: "https://guangnao.com",
@@ -12089,9 +12168,24 @@ ${c.dim("  Connect an LLM provider to begin \u2014 your key is saved to ~/.agent
 
 `);
   try {
-    const provider2 = await selectPrompt("Provider  \u2191\u2193 select \xB7 Enter", { options: PROVIDERS });
-    if (provider2 == null) return null;
-    const label2 = PROVIDERS.find((p) => p.value === provider2).label;
+    const choice = await selectPrompt("Provider  \u2191\u2193 select \xB7 Enter", { options: PROVIDERS });
+    if (choice == null) return null;
+    let provider2 = choice;
+    let baseUrl2;
+    if (choice === "custom") {
+      const proto = await selectPrompt("Wire protocol  \u2191\u2193 select \xB7 Enter", { options: [
+        { label: "OpenAI-compatible", value: "openai", hint: "POST {baseURL}/chat/completions" },
+        { label: "Anthropic-compatible", value: "anthropic", hint: "POST {baseURL}/messages" }
+      ] });
+      if (proto == null) return null;
+      provider2 = proto;
+      baseUrl2 = (await textPrompt("Base URL", {
+        placeholder: "https://host/v1",
+        transform: (v) => v.trim(),
+        validate: (v) => /^https?:\/\/.+/.test(v.trim()) || "enter a full URL, e.g. https://host/v1"
+      })).trim();
+    }
+    const label2 = choice === "custom" ? `Custom \xB7 ${provider2}` : PROVIDERS.find((p) => p.value === provider2).label;
     if (KEY_URL[provider2]) out(`${c.dim("  Get a key at " + KEY_URL[provider2])}
 `);
     for (; ; ) {
@@ -12104,7 +12198,7 @@ ${c.dim("  Connect an LLM provider to begin \u2014 your key is saved to ~/.agent
       const fallback = defaultModel[provider2] ?? "";
       let models = [];
       try {
-        models = await listModels(provider2, { apiKey: apiKey2, model: fallback });
+        models = await listModels(provider2, { apiKey: apiKey2, model: fallback, baseUrl: baseUrl2 });
       } catch {
       }
       if (!models.length) out(`${c.warning("  Could not list models")} ${c.dim("(unverified key or no catalog \u2014 saving anyway; switch later with /models).")}
@@ -12119,9 +12213,11 @@ ${c.dim("  Connect an LLM provider to begin \u2014 your key is saved to ~/.agent
         });
         if (sel == null) return null;
         model2 = sel;
+      } else if (baseUrl2) {
+        model2 = (await textPrompt("Model name", { transform: (v) => v.trim(), validate: (v) => !!v.trim() || "model name required" })).trim();
       }
-      saveConfig({ provider: provider2, apiKey: apiKey2, model: model2 });
-      out(`${c.done("  \u2713 Saved")} ${c.dim("\xB7 " + provider2 + " \xB7 " + model2)}
+      saveConfig({ provider: provider2, apiKey: apiKey2, model: model2, baseUrl: baseUrl2 });
+      out(`${c.done("  \u2713 Saved")} ${c.dim("\xB7 " + provider2 + " \xB7 " + model2 + (baseUrl2 ? " \xB7 " + baseUrl2 : ""))}
 
 `);
       return { provider: provider2, apiKey: apiKey2, model: model2 };
@@ -12200,8 +12296,14 @@ var keyOf = (p) => ({
 function modelMenu() {
   const keyed = ["gapi", "deepseek", "openai", "openai-responses", "gemini", "anthropic"].filter((p) => keyOf(p));
   return {
-    current: `${labelOf(provider)} \xB7 ${model}`,
+    current: `${modelProviderLabel(model, provider)} \xB7 ${model}`,
     build: (p, m) => makeChat(p, { apiKey: keyOf(p) ?? apiKey, model: m, baseUrl }),
+    persist: (p, m) => {
+      provider = p;
+      model = m;
+      saveConfig({ provider: p, model: m });
+    },
+    // /models choice survives restart (apiKey/baseUrl already saved)
     async list() {
       const lists = await Promise.all(keyed.map(async (p) => {
         const ids = await listModels(p, { apiKey: keyOf(p) ?? apiKey, model: defaultModel[p] ?? model, baseUrl });
@@ -12220,7 +12322,7 @@ async function relogin() {
   model = r.model;
   baseUrl = process.env.LLM_BASE_URL ?? loadConfig().baseUrl;
   buildChats();
-  return { chat: rawChat, cheapChat, label: `${labelOf(provider)} \xB7 ${model}` };
+  return { chat: rawChat, cheapChat, label: `${modelProviderLabel(model, provider)} \xB7 ${model}` };
 }
 async function main() {
   if (!apiKey && !process.env.AGENTOS_OFFLINE) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guangnao/agent-cli",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "AgentOS terminal CLI — drive a real LLM agent on the microkernel; strongest-UX shell, advanced agent core",
   "type": "module",
   "bin": {