engine7 7.1.52 → 7.1.54

package/dist/cli.mjs

@@ -1839,31 +1839,105 @@ async function askChoice(rl, question, choices, defaultIdx = 0) {
   return choices[idx >= 0 && idx < choices.length ? idx : defaultIdx];
 }
 function getDefaultValues(stateDir) {
+  const existing = loadExistingValues(stateDir);
   return {
     stateDir,
-    agentName: "Agent",
-    primaryProvider: "dashscope",
-    zhipuPlan: "",
-    primaryApiKey: "",
-    primaryModel: "dashscope/qwen3.7-max",
-    visionModel: "dashscope/qwen3.7-max",
-    discordEnabled: false,
-    discordToken: "",
-    discordUserId: "",
-    feishuEnabled: false,
-    feishuAppId: "",
-    feishuAppSecret: "",
-    feishuOpenId: "",
-    wechatEnabled: false,
-    wechatToken: "",
-    wechatAccountId: "",
-    customBaseUrl: "",
-    customModelId: "",
-    customApi: "anthropic",
-    tavilyKey: "",
-    apiPort: 16990
+    agentName: existing.agentName || "Agent",
+    primaryProvider: existing.primaryProvider || "dashscope",
+    zhipuPlan: existing.zhipuPlan || "",
+    primaryApiKey: existing.primaryApiKey || "",
+    primaryModel: existing.primaryModel || "dashscope/qwen3.7-max",
+    visionModel: existing.visionModel || "dashscope/qwen3.7-max",
+    discordEnabled: existing.discordEnabled ?? false,
+    discordToken: existing.discordToken || "",
+    discordUserId: existing.discordUserId || "",
+    feishuEnabled: existing.feishuEnabled ?? false,
+    feishuAppId: existing.feishuAppId || "",
+    feishuAppSecret: existing.feishuAppSecret || "",
+    feishuOpenId: existing.feishuOpenId || "",
+    wechatEnabled: existing.wechatEnabled ?? false,
+    wechatToken: existing.wechatToken || "",
+    wechatAccountId: existing.wechatAccountId || "",
+    customBaseUrl: existing.customBaseUrl || "",
+    customModelId: existing.customModelId || "",
+    customApi: existing.customApi || "anthropic",
+    tavilyKey: existing.tavilyKey || "",
+    apiPort: existing.apiPort || 16990
   };
 }
+function loadExistingValues(stateDir) {
+  const configPath = path3.join(stateDir, "configs", "main7.json");
+  try {
+    if (!fs3.existsSync(configPath)) return {};
+    const j = JSON.parse(fs3.readFileSync(configPath, "utf8"));
+    const out = {};
+    if (j.agents?.defaults?.name) out.agentName = j.agents.defaults.name;
+    const providers = j.models?.providers || {};
+    const firstId = Object.keys(providers)[0];
+    if (firstId) {
+      out.primaryProvider = firstId;
+      const p = providers[firstId];
+      const keyRef = typeof p?.apiKey === "string" ? p.apiKey : "";
+      if (keyRef.startsWith("env:")) {
+        const envName = keyRef.slice(4);
+        out.primaryApiKey = readSecretsValue(stateDir, envName) || "";
+      } else if (keyRef && !keyRef.startsWith("env:")) {
+        out.primaryApiKey = keyRef;
+      }
+      if (p?.baseUrl && !["dashscope", "minimax", "zhipu", "deepseek"].includes(firstId)) {
+        out.customBaseUrl = p.baseUrl;
+        out.customApi = p.api || "anthropic";
+      }
+      const firstModel = p?.models?.[0]?.id;
+      if (firstModel) {
+        out.primaryModel = `${firstId}/${firstModel}`;
+        out.customModelId = ["dashscope", "minimax", "zhipu", "deepseek"].includes(firstId) ? "" : firstModel;
+      }
+      if (j.agents?.defaults?.model?.vision) out.visionModel = j.agents.defaults.model.vision;
+    }
+    if (j.channels?.discord) {
+      out.discordEnabled = !!j.channels.discord.enabled;
+      out.discordToken = j.channels.discord.accounts?.default?.token || "";
+    }
+    if (j.channels?.feishu) {
+      out.feishuEnabled = !!j.channels.feishu.enabled;
+      out.feishuAppId = j.channels.feishu.appId || "";
+      out.feishuAppSecret = j.channels.feishu.appSecret || "";
+    }
+    if (j.channels?.wechat) {
+      out.wechatEnabled = !!j.channels.wechat.enabled;
+      out.wechatToken = j.channels.wechat.token || "";
+      out.wechatAccountId = j.channels.wechat.accountId || "";
+    }
+    if (j.tools?.tavily?.apiKey) out.tavilyKey = j.tools.tavily.apiKey;
+    if (j.api?.port) out.apiPort = j.api.port;
+    return out;
+  } catch {
+    return {};
+  }
+}
+function readSecretsValue(stateDir, envName) {
+  try {
+    const secretsDir = path3.join(process.env.HOME || process.env.USERPROFILE || ".", ".engine7-secrets");
+    const cfgBase = path3.basename(stateDir) === ".engine7" ? "main7" : path3.basename(stateDir);
+    const candidates = [
+      path3.join(secretsDir, `${cfgBase}.env`),
+      path3.join(stateDir, "configs", `.env.${cfgBase}`)
+    ];
+    for (const p of candidates) {
+      if (fs3.existsSync(p)) {
+        for (const line of fs3.readFileSync(p, "utf8").split("\n")) {
+          const eq = line.indexOf("=");
+          if (eq > 0 && line.slice(0, eq).trim() === envName) {
+            return line.slice(eq + 1).trim();
+          }
+        }
+      }
+    }
+  } catch {
+  }
+  return "";
+}
 async function interactiveConfig(rl, defaults) {
   const v = { ...defaults };
   console.log("\n=== \u7B2C\u4E00\u6B65\uFF1A\u5FC5\u586B\u914D\u7F6E ===\n");
@@ -1888,13 +1962,23 @@ async function interactiveConfig(rl, defaults) {
   v.customModelId = "";
   v.customApi = "anthropic";
   if (v.primaryProvider === "custom") {
-    v.primaryProvider = await ask(rl, "Provider ID\uFF08\u5C0F\u5199\u5B57\u6BCD\uFF0C\u5982 kimi / moonshot / openrouter / zai\uFF09", "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");
     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);
     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);
-    v.customModelId = await ask(rl, "\u6A21\u578B ID\uFF08\u5982 kimi-k2-turbo-preview\uFF09");
+    v.customBaseUrl = await ask(rl, `baseUrl ${baseUrlExample}`, defaults.customBaseUrl || "");
+    while (v.customBaseUrl) {
+      try {
+        new URL(v.customBaseUrl);
+        break;
+      } catch {
+        console.log(`\u26A0\uFE0F \u65E0\u6548 URL\uFF1A\u300C${v.customBaseUrl}\u300D\u2014\u2014\u68C0\u67E5\u62FC\u5199\u3001\u534F\u8BAE\u5934\uFF08https://\uFF09\u3001\u6709\u6CA1\u6709\u591A\u4F59\u7A7A\u683C\u6216\u659C\u6760`);
+        v.customBaseUrl = await ask(rl, `baseUrl ${baseUrlExample}`, "");
+      }
+    }
+    v.customModelId = await ask(rl, "\u6A21\u578B ID\uFF08\u5982 kimi-k2-turbo-preview\uFF09", defaults.customModelId || "");
   }
   const keyMap = {
     dashscope: "DashScope API Key",
@@ -1902,7 +1986,9 @@ async function interactiveConfig(rl, defaults) {
     zhipu: "\u667A\u8C31 API Key",
     deepseek: "DeepSeek API Key"
   };
-  v.primaryApiKey = await ask(rl, keyMap[v.primaryProvider] || v.primaryProvider + " API Key");
+  const existingKeyHint = defaults.primaryApiKey ? `(\u5F53\u524D: ${defaults.primaryApiKey.slice(0, 8)}...${defaults.primaryApiKey.slice(-4)}\uFF0C\u56DE\u8F66\u4FDD\u7559)` : "";
+  const keyAns = await ask(rl, `${keyMap[v.primaryProvider] || v.primaryProvider + " API Key"} ${existingKeyHint}`, defaults.primaryApiKey || "");
+  v.primaryApiKey = keyAns || defaults.primaryApiKey || "";
   const modelMap = {
     dashscope: ["dashscope/qwen3.7-max", "dashscope/qwen3.7-plus"],
     minimax: ["minimax/MiniMax-M3", "minimax/MiniMax-M2.7"],
@@ -1939,101 +2025,132 @@ async function interactiveConfig(rl, defaults) {
       console.log(`   \u6CE8\u610F\uFF1AVision \u6A21\u578B\u7528\u4E86\u4E0D\u540C provider\uFF0C\u9700\u8981\u5728 config \u91CC\u8865\u5145\u5BF9\u5E94\u7684 API key`);
     }
   }
-  console.log("\n=== \u7B2C\u4E8C\u6B65\uFF1A\u53EF\u9009\u914D\u7F6E\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF09===\n");
-  const discordAns = await ask(rl, "\u542F\u7528 Discord? (y/n)", "n");
+  console.log("\n=== \u7B2C\u4E8C\u6B65\uFF1A\u53EF\u9009\u914D\u7F6E\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF0C\u5DF2\u542F\u7528\u7684\u56DE\u8F66\u4FDD\u7559\uFF09===\n");
+  const discordAns = await ask(rl, "\u542F\u7528 Discord? (y/n)", defaults.discordEnabled ? "y" : "n");
   v.discordEnabled = discordAns.toLowerCase() === "y";
   if (v.discordEnabled) {
-    v.discordToken = await ask(rl, "Discord Bot Token");
-    v.discordUserId = await ask(rl, "\u4F60\u7684 Discord User ID");
+    v.discordToken = await ask(rl, `Discord Bot Token${defaults.discordToken ? ` (\u5F53\u524D: ${defaults.discordToken.slice(0, 12)}...\uFF0C\u56DE\u8F66\u4FDD\u7559)` : ""}`, defaults.discordToken || "");
+    v.discordUserId = await ask(rl, "\u4F60\u7684 Discord User ID", defaults.discordUserId || "");
   }
-  const feishuAns = await ask(rl, "\u542F\u7528\u98DE\u4E66? (y/n)", "n");
+  const feishuAns = await ask(rl, "\u542F\u7528\u98DE\u4E66? (y/n)", defaults.feishuEnabled ? "y" : "n");
   v.feishuEnabled = feishuAns.toLowerCase() === "y";
   if (v.feishuEnabled) {
-    console.log("\n  \u98DE\u4E66\u914D\u7F6E\u65B9\u5F0F\uFF1A");
-    console.log("  1. \u626B\u7801\u81EA\u52A8\u521B\u5EFA\uFF08\u63A8\u8350\uFF0C30\u79D2\u641E\u5B9A\uFF09");
-    console.log("  2. \u624B\u52A8\u8F93\u5165 App ID / App Secret");
-    const feishuMode = await ask(rl, "\u9009\u62E9 (1/2)", "1");
-    if (feishuMode === "1") {
-      console.log("\n\u{1F4DD} \u6B63\u5728\u751F\u6210\u98DE\u4E66\u4E8C\u7EF4\u7801...\n");
-      const result = await registerFeishuApp({
-        onLog: (msg) => console.log(`  ${msg}`),
-        onQrCode: async (url) => {
-          try {
-            const qr = await renderQrTerminal(url, { small: true });
-            console.log(qr);
-          } catch {
-            console.log(`
+    if (defaults.feishuAppId && defaults.feishuAppSecret) {
+      console.log(`
+  \u5F53\u524D\u5DF2\u914D\u7F6E\u98DE\u4E66: App ID ${defaults.feishuAppId}`);
+      const keep = await ask(rl, "\u4FDD\u7559\u73B0\u6709\u98DE\u4E66\u914D\u7F6E? (y=\u4FDD\u7559\u56DE\u8F66\u9ED8\u8BA4/n=\u91CD\u65B0\u626B\u7801)", "y");
+      if (keep.toLowerCase() !== "n") {
+        v.feishuAppId = defaults.feishuAppId;
+        v.feishuAppSecret = defaults.feishuAppSecret;
+        v.feishuOpenId = defaults.feishuOpenId || "";
+        console.log("  \u2705 \u4FDD\u7559\u73B0\u6709\u98DE\u4E66\u914D\u7F6E");
+      } else {
+        await configureFeishu(rl, v);
+      }
+    } else {
+      await configureFeishu(rl, v);
+    }
+  }
+  const wechatAns = await ask(rl, "\u542F\u7528\u5FAE\u4FE1? (y/n)", defaults.wechatEnabled ? "y" : "n");
+  v.wechatEnabled = wechatAns.toLowerCase() === "y";
+  if (v.wechatEnabled) {
+    if (defaults.wechatToken && defaults.wechatAccountId) {
+      console.log(`
+  \u5F53\u524D\u5DF2\u914D\u7F6E\u5FAE\u4FE1: ${defaults.wechatAccountId}`);
+      const keep = await ask(rl, "\u4FDD\u7559\u73B0\u6709\u5FAE\u4FE1\u914D\u7F6E? (y=\u4FDD\u7559/n=\u91CD\u65B0\u626B\u7801)", "y");
+      if (keep.toLowerCase() !== "n") {
+        v.wechatToken = defaults.wechatToken;
+        v.wechatAccountId = defaults.wechatAccountId;
+        console.log("  \u2705 \u4FDD\u7559\u73B0\u6709\u5FAE\u4FE1\u914D\u7F6E");
+      } else {
+        await configureWechat(rl, v);
+      }
+    } else {
+      await configureWechat(rl, v);
+    }
+  }
+  const tavilyKey = await ask(rl, `Tavily API Key\uFF08\u8054\u7F51\u641C\u7D22${defaults.tavilyKey ? `\uFF0C\u5F53\u524D: ${defaults.tavilyKey.slice(0, 8)}...\uFF0C\u56DE\u8F66\u4FDD\u7559` : "\uFF0C\u56DE\u8F66\u8DF3\u8FC7"}\uFF09`, defaults.tavilyKey || "");
+  v.tavilyKey = tavilyKey;
+  const portAns = await ask(rl, "API \u7AEF\u53E3", String(defaults.apiPort));
+  v.apiPort = parseInt(portAns, 10) || defaults.apiPort;
+  return v;
+}
+async function configureFeishu(rl, v) {
+  console.log("\n  \u98DE\u4E66\u914D\u7F6E\u65B9\u5F0F\uFF1A");
+  console.log("  1. \u626B\u7801\u81EA\u52A8\u521B\u5EFA\uFF08\u63A8\u8350\uFF0C30\u79D2\u641E\u5B9A\uFF09");
+  console.log("  2. \u624B\u52A8\u8F93\u5165 App ID / App Secret");
+  const feishuMode = await ask(rl, "\u9009\u62E9 (1/2)", "1");
+  if (feishuMode === "1") {
+    console.log("\n\u{1F4DD} \u6B63\u5728\u751F\u6210\u98DE\u4E66\u4E8C\u7EF4\u7801...\n");
+    const result = await registerFeishuApp({
+      onLog: (msg) => console.log(`  ${msg}`),
+      onQrCode: async (url) => {
+        try {
+          const qr = await renderQrTerminal(url, { small: true });
+          console.log(qr);
+        } catch {
+          console.log(`
   \u8BF7\u5728\u624B\u673A\u6D4F\u89C8\u5668\u6253\u5F00\u6B64\u94FE\u63A5\u626B\u7801\uFF1A
   ${url}
 `);
-          }
         }
-      });
-      if (result) {
-        v.feishuAppId = result.appId;
-        v.feishuAppSecret = result.appSecret;
-        v.feishuOpenId = result.openId || "";
-        console.log(`
-  \u2705 App ID: ${result.appId}`);
-        console.log(`  \u2705 App Secret: ${result.appSecret.slice(0, 6)}...`);
-        if (result.openId) {
-          console.log(`  \u2705 Open ID: ${result.openId}`);
-        }
-      } else {
-        console.log("\n  \u26A0\uFE0F \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u8F93\u5165");
-        v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
-        v.feishuAppSecret = await ask(rl, "\u98DE\u4E66 App Secret");
-        v.feishuOpenId = await ask(rl, "\u4F60\u7684\u98DE\u4E66 open_id\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
       }
+    });
+    if (result) {
+      v.feishuAppId = result.appId;
+      v.feishuAppSecret = result.appSecret;
+      v.feishuOpenId = result.openId || "";
+      console.log(`
+  \u2705 App ID: ${result.appId}`);
+      console.log(`  \u2705 App Secret: ${result.appSecret.slice(0, 6)}...`);
+      if (result.openId) console.log(`  \u2705 Open ID: ${result.openId}`);
     } else {
+      console.log("\n  \u26A0\uFE0F \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u8F93\u5165");
       v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
       v.feishuAppSecret = await ask(rl, "\u98DE\u4E66 App Secret");
       v.feishuOpenId = await ask(rl, "\u4F60\u7684\u98DE\u4E66 open_id\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
     }
-  }
-  const wechatAns = await ask(rl, "\u542F\u7528\u5FAE\u4FE1? (y/n)", "n");
-  v.wechatEnabled = wechatAns.toLowerCase() === "y";
-  if (v.wechatEnabled) {
-    console.log("\n  \u5FAE\u4FE1\u63A5\u5165\u65B9\u5F0F\uFF1A");
-    console.log("  1. \u626B\u7801\u7ED1\u5B9A\uFF08\u63A8\u8350\uFF0C\u7528\u4F60\u81EA\u5DF1\u7684\u5FAE\u4FE1\u626B\u4E00\u4E0B\u5C31\u884C\uFF09");
-    console.log("  2. \u624B\u52A8\u8F93\u5165 token\uFF08\u5DF2\u6709\u51ED\u8BC1\u65F6\uFF09");
-    const wechatMode = await ask(rl, "\u9009\u62E9 (1/2)", "1");
-    if (wechatMode === "1") {
-      console.log("\n\u{1F4DD} \u6B63\u5728\u751F\u6210\u5FAE\u4FE1\u4E8C\u7EF4\u7801...\n");
-      console.log("  \u63D0\u793A\uFF1A\u4E00\u4E2A\u5FAE\u4FE1\u53F7\u53EA\u80FD\u7ED1\u4E00\u4E2A bot\uFF1Bbot \u4E0D\u8FDB\u7FA4\uFF08\u817E\u8BAF\u9650\u5236\uFF09\uFF0C\u79C1\u804A 1v1");
-      const cred = await wechatQrLogin({ timeoutSeconds: 300, stateDir: v.stateDir });
-      if (cred) {
-        v.wechatToken = cred.token;
-        v.wechatAccountId = cred.accountId;
-        console.log(`
+  } else {
+    v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
+    v.feishuAppSecret = await ask(rl, "\u98DE\u4E66 App Secret");
+    v.feishuOpenId = await ask(rl, "\u4F60\u7684\u98DE\u4E66 open_id\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
+  }
+}
+async function configureWechat(rl, v) {
+  console.log("\n  \u5FAE\u4FE1\u63A5\u5165\u65B9\u5F0F\uFF1A");
+  console.log("  1. \u626B\u7801\u7ED1\u5B9A\uFF08\u63A8\u8350\uFF0C\u7528\u4F60\u81EA\u5DF1\u7684\u5FAE\u4FE1\u626B\u4E00\u4E0B\u5C31\u884C\uFF09");
+  console.log("  2. \u624B\u52A8\u8F93\u5165 token\uFF08\u5DF2\u6709\u51ED\u8BC1\u65F6\uFF09");
+  const wechatMode = await ask(rl, "\u9009\u62E9 (1/2)", "1");
+  if (wechatMode === "1") {
+    console.log("\n\u{1F4DD} \u6B63\u5728\u751F\u6210\u5FAE\u4FE1\u4E8C\u7EF4\u7801...\n");
+    console.log("  \u63D0\u793A\uFF1A\u4E00\u4E2A\u5FAE\u4FE1\u53F7\u53EA\u80FD\u7ED1\u4E00\u4E2A bot\uFF1Bbot \u4E0D\u8FDB\u7FA4\uFF08\u817E\u8BAF\u9650\u5236\uFF09\uFF0C\u79C1\u804A 1v1");
+    const cred = await wechatQrLogin({ timeoutSeconds: 300, stateDir: v.stateDir });
+    if (cred) {
+      v.wechatToken = cred.token;
+      v.wechatAccountId = cred.accountId;
+      console.log(`
   \u2705 accountId: ${cred.accountId}`);
-        console.log(`  \u2705 \u51ED\u8BC1\u5DF2\u81EA\u52A8\u4FDD\u5B58\uFF0Cconfig \u5C06\u81EA\u52A8\u5199\u5165`);
-      } else {
-        console.log("\n  \u26A0\uFE0F \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25");
-        const retry = await ask(rl, "\u91CD\u8BD5\u626B\u7801? (y/n)", "y");
-        if (retry.toLowerCase() === "y") {
-          const cred2 = await wechatQrLogin({ timeoutSeconds: 300, stateDir: v.stateDir });
-          if (cred2) {
-            v.wechatToken = cred2.token;
-            v.wechatAccountId = cred2.accountId;
-          } else {
-            console.log("\n  \u26A0\uFE0F \u518D\u6B21\u5931\u8D25\uFF0C\u8DF3\u8FC7\u5FAE\u4FE1\uFF08\u4E4B\u540E\u53EF\u624B\u52A8\u914D\u7F6E\uFF09");
-            v.wechatEnabled = false;
-          }
+      console.log(`  \u2705 \u51ED\u8BC1\u5DF2\u81EA\u52A8\u4FDD\u5B58\uFF0Cconfig \u5C06\u81EA\u52A8\u5199\u5165`);
+    } else {
+      console.log("\n  \u26A0\uFE0F \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25");
+      const retry = await ask(rl, "\u91CD\u8BD5\u626B\u7801? (y/n)", "y");
+      if (retry.toLowerCase() === "y") {
+        const cred2 = await wechatQrLogin({ timeoutSeconds: 300, stateDir: v.stateDir });
+        if (cred2) {
+          v.wechatToken = cred2.token;
+          v.wechatAccountId = cred2.accountId;
         } else {
+          console.log("\n  \u26A0\uFE0F \u518D\u6B21\u5931\u8D25\uFF0C\u8DF3\u8FC7\u5FAE\u4FE1\uFF08\u4E4B\u540E\u53EF\u624B\u52A8\u914D\u7F6E\uFF09");
           v.wechatEnabled = false;
         }
+      } else {
+        v.wechatEnabled = false;
       }
-    } else {
-      v.wechatToken = await ask(rl, "\u5FAE\u4FE1 token");
-      v.wechatAccountId = await ask(rl, "\u5FAE\u4FE1 accountId");
     }
+  } else {
+    v.wechatToken = await ask(rl, "\u5FAE\u4FE1 token");
+    v.wechatAccountId = await ask(rl, "\u5FAE\u4FE1 accountId");
   }
-  const tavilyKey = await ask(rl, "Tavily API Key\uFF08\u8054\u7F51\u641C\u7D22\uFF0C\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
-  v.tavilyKey = tavilyKey;
-  const portAns = await ask(rl, "API \u7AEF\u53E3", String(defaults.apiPort));
-  v.apiPort = parseInt(portAns, 10) || defaults.apiPort;
-  return v;
 }
 function generateConfig(v) {
   const workspace = path3.join(v.stateDir, "workspace").replace(/\\/g, "/");
@@ -2658,7 +2775,8 @@ engine7 start \u2014 \u542F\u52A8 Engine
           if (eq > 0) {
             const k = trimmed.slice(0, eq).trim();
             const v = trimmed.slice(eq + 1).trim();
-            if (k && !(k in envForChild)) envForChild[k] = v;
+            const cur = envForChild[k];
+            if (k && (cur === void 0 || cur === "")) envForChild[k] = v;
           }
         }
         console.log(`[start] Loaded API keys from ${secretPath}`);
@@ -3096,11 +3214,18 @@ WantedBy=default.target`;
 \u26A0\uFE0F --force: \u6E05\u7A7A\u5DF2\u6709\u76EE\u5F55 ${opts.stateDir}`);
         fs3.rmSync(opts.stateDir, { recursive: true, force: true });
       } else {
-        console.error(`
+        const existingConfig = path3.join(opts.stateDir, "configs", "main7.json");
+        if (fs3.existsSync(existingConfig)) {
+          console.log(`
+\u267B\uFE0F \u68C0\u6D4B\u5230\u5DF2\u6709\u914D\u7F6E: ${existingConfig}`);
+          console.log(`   \u2192 \u590D\u8DD1\u6A21\u5F0F\uFF1A\u663E\u793A\u73B0\u6709\u914D\u7F6E\uFF0C\u56DE\u8F66\u4FDD\u7559\uFF0C\u6539\u4E86\u624D\u751F\u6548\uFF08\u4E0D\u4F1A\u6E05\u7A7A\u76EE\u5F55\uFF09`);
+        } else {
+          console.error(`
 \u274C \u76EE\u5F55\u5DF2\u5B58\u5728\u4E14\u975E\u7A7A: ${opts.stateDir}`);
-        console.error(`   \u8BF7\u9009\u62E9\u7A7A\u76EE\u5F55\uFF0C\u6216\u7528 --force \u6E05\u7A7A\u540E\u91CD\u65B0\u914D\u7F6E`);
-        console.error(`   \u4F8B: engine7 init --force`);
-        process.exit(1);
+          console.error(`   \u8BF7\u9009\u62E9\u7A7A\u76EE\u5F55\uFF0C\u6216\u7528 --force \u6E05\u7A7A\u540E\u91CD\u65B0\u914D\u7F6E`);
+          console.error(`   \u4F8B: engine7 init --force`);
+          process.exit(1);
+        }
       }
     }
   }

package/dist/engine-startup.mjs

@@ -12755,7 +12755,15 @@ function loadConfig(configPath) {
     };
   }
   const agentDefaults = raw.agents?.defaults || {};
-  const modelRef = process.env.ENGINE_MODEL || agentDefaults.model?.primary || "zai/glm-5.1";
+  let defaultFallbackModel;
+  if (Object.keys(providers).length > 0) {
+    const firstProviderId = Object.keys(providers)[0];
+    const firstProvider = providers[firstProviderId];
+    if (firstProvider?.models?.length) {
+      defaultFallbackModel = `${firstProviderId}/${firstProvider.models[0].id}`;
+    }
+  }
+  const modelRef = process.env.ENGINE_MODEL || agentDefaults.model?.primary || defaultFallbackModel || Object.keys(providers)[0];
   const modelAliases = {};
   if (agentDefaults.models) {
     for (const [ref, spec] of Object.entries(agentDefaults.models)) {

package/dist/main.mjs

@@ -12994,7 +12994,15 @@ function loadConfig(configPath2) {
     };
   }
   const agentDefaults = raw.agents?.defaults || {};
-  const modelRef = process.env.ENGINE_MODEL || agentDefaults.model?.primary || "zai/glm-5.1";
+  let defaultFallbackModel;
+  if (Object.keys(providers).length > 0) {
+    const firstProviderId = Object.keys(providers)[0];
+    const firstProvider = providers[firstProviderId];
+    if (firstProvider?.models?.length) {
+      defaultFallbackModel = `${firstProviderId}/${firstProvider.models[0].id}`;
+    }
+  }
+  const modelRef = process.env.ENGINE_MODEL || agentDefaults.model?.primary || defaultFallbackModel || Object.keys(providers)[0];
   const modelAliases = {};
   if (agentDefaults.models) {
     for (const [ref, spec] of Object.entries(agentDefaults.models)) {

package/package.json

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