engine7 7.1.54 → 7.1.56

package/dist/cli.mjs

@@ -1831,9 +1831,14 @@ async function ask(rl, question, defaultValue) {
     });
   });
 }
-async function askChoice(rl, question, choices, defaultIdx = 0) {
+async function askChoice(rl, question, choices, defaultIdx = 0, current) {
+  let currentIdx = -1;
+  if (current) {
+    currentIdx = choices.findIndex((c) => c === current || c.split(" ")[0] === current || current.startsWith(c.split(" ")[0]));
+  }
+  if (currentIdx >= 0) defaultIdx = currentIdx;
   console.log(question);
-  choices.forEach((c, i) => console.log(`  ${i + 1}. ${c}`));
+  choices.forEach((c, i) => console.log(`  ${i + 1}. ${c}${i === currentIdx ? "  \u2190\uFF08\u4E0A\u6B21\u5DF2\u9009\uFF09" : ""}`));
   const answer = await ask(rl, `\u9009\u62E9 (1-${choices.length})`, String(defaultIdx + 1));
   const idx = parseInt(answer, 10) - 1;
   return choices[idx >= 0 && idx < choices.length ? idx : defaultIdx];
@@ -1861,6 +1866,7 @@ function getDefaultValues(stateDir) {
     customBaseUrl: existing.customBaseUrl || "",
     customModelId: existing.customModelId || "",
     customApi: existing.customApi || "anthropic",
+    customProviderId: existing.customProviderId || "",
     tavilyKey: existing.tavilyKey || "",
     apiPort: existing.apiPort || 16990
   };
@@ -1875,7 +1881,13 @@ function loadExistingValues(stateDir) {
     const providers = j.models?.providers || {};
     const firstId = Object.keys(providers)[0];
     if (firstId) {
-      out.primaryProvider = firstId;
+      const builtin = ["dashscope", "minimax", "zhipu", "deepseek"];
+      if (builtin.includes(firstId)) {
+        out.primaryProvider = firstId;
+      } else {
+        out.primaryProvider = "custom";
+        out.customProviderId = firstId;
+      }
       const p = providers[firstId];
       const keyRef = typeof p?.apiKey === "string" ? p.apiKey : "";
       if (keyRef.startsWith("env:")) {
@@ -1950,22 +1962,21 @@ async function interactiveConfig(rl, defaults) {
     "deepseek (DeepSeek)": "deepseek",
     "custom (\u81EA\u5B9A\u4E49/\u5176\u4ED6 Anthropic \u517C\u5BB9\u7AEF\u70B9)": "custom"
   };
-  const chosenProvider = await askChoice(rl, "\u4E3B\u6A21\u578B Provider:", providers, 0);
+  const chosenProvider = await askChoice(rl, "\u4E3B\u6A21\u578B Provider:", providers, 0, defaults.primaryProvider);
   v.primaryProvider = providerMap[chosenProvider] || "dashscope";
   v.zhipuPlan = "";
   if (v.primaryProvider === "zhipu") {
     const planOptions = ["coding-plan (GLM Coding \u8BA2\u9605\uFF0C\u5305\u6708)", "api-pay (API \u6309\u91CF\u4ED8\u8D39)"];
-    const chosenPlan = await askChoice(rl, "\u667A\u8C31\u8BA2\u9605\u7C7B\u578B:", planOptions, 0);
+    const chosenPlan = await askChoice(rl, "\u667A\u8C31\u8BA2\u9605\u7C7B\u578B:", planOptions, 0, defaults.zhipuPlan === "token" ? "api-pay" : defaults.zhipuPlan === "coding" ? "coding-plan" : void 0);
     v.zhipuPlan = chosenPlan.startsWith("coding") ? "coding" : "token";
   }
   v.customBaseUrl = "";
   v.customModelId = "";
   v.customApi = "anthropic";
   if (v.primaryProvider === "custom") {
-    const isKnownCustom = defaults.primaryProvider !== "dashscope" && defaults.primaryProvider !== "minimax" && defaults.primaryProvider !== "zhipu" && defaults.primaryProvider !== "deepseek";
-    v.primaryProvider = await ask(rl, "Provider ID\uFF08\u5C0F\u5199\u5B57\u6BCD\uFF0C\u5982 kimi / moonshot / openrouter / zai\uFF09", isKnownCustom ? defaults.primaryProvider : "custom");
+    v.primaryProvider = await ask(rl, "Provider ID\uFF08\u5C0F\u5199\u5B57\u6BCD\uFF0C\u5982 kimi / moonshot / openrouter / zai\uFF09", defaults.customProviderId || "custom");
     const apiOptions = ["anthropic (Anthropic \u517C\u5BB9\uFF0C\u63A8\u8350)", "openai-completions (OpenAI \u517C\u5BB9 /v1/chat/completions)"];
-    const chosenApi = await askChoice(rl, "API \u7C7B\u578B:", apiOptions, 0);
+    const chosenApi = await askChoice(rl, "API \u7C7B\u578B:", apiOptions, 0, defaults.customApi || void 0);
     v.customApi = chosenApi.startsWith("anthropic") ? "anthropic" : "openai-completions";
     const baseUrlExample = v.customApi === "anthropic" ? "\uFF08\u5982 https://api.moonshot.cn/anthropic\uFF09" : "\uFF08\u5982 https://api.deepinfra.com/v1/openai\uFF09";
     v.customBaseUrl = await ask(rl, `baseUrl ${baseUrlExample}`, defaults.customBaseUrl || "");
@@ -1999,7 +2010,7 @@ async function interactiveConfig(rl, defaults) {
     v.primaryModel = v.primaryProvider + "/" + v.customModelId;
   } else if (modelMap[v.primaryProvider]) {
     const models = modelMap[v.primaryProvider];
-    v.primaryModel = await askChoice(rl, "\u4E3B\u6A21\u578B:", models, 0);
+    v.primaryModel = await askChoice(rl, "\u4E3B\u6A21\u578B:", models, 0, defaults.primaryModel || void 0);
   } else {
     console.log("\u26A0\uFE0F \u8FD8\u7F3A\u6A21\u578B ID\uFF0C\u8865\u4E00\u4E0B\uFF1A");
     v.customModelId = await ask(rl, "\u6A21\u578B ID\uFF08\u5982 glm-5.3 / kimi-k2-turbo-preview\uFF09");

package/dist/engine-startup.mjs

@@ -13167,7 +13167,7 @@ var AnthropicProvider = class {
     this.config = config;
     let u = (config.baseUrl || "https://api.anthropic.com").trim();
     while (u.endsWith("/")) u = u.slice(0, -1);
-    this.baseUrl = u + "/";
+    this.baseUrl = u;
     this.sessionId = randomUUID3();
   }
   config;

package/dist/main.mjs

@@ -13541,7 +13541,7 @@ var AnthropicProvider = class {
     this.config = config2;
     let u = (config2.baseUrl || "https://api.anthropic.com").trim();
     while (u.endsWith("/")) u = u.slice(0, -1);
-    this.baseUrl = u + "/";
+    this.baseUrl = u;
     this.sessionId = randomUUID3();
   }
   config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engine7",
-  "version": "7.1.54",
+  "version": "7.1.56",
   "type": "module",
   "description": "Engine 7 — 给助手一个家 / A home for your AI assistant",
   "main": "dist/main.mjs",