engine7 7.1.43 → 7.1.44

package/dist/cli.mjs

@@ -138,6 +138,32 @@ var init_feishu_quick_register = __esm({
   }
 });
 
+// src/qr-render.ts
+var qr_render_exports = {};
+__export(qr_render_exports, {
+  renderQrTerminal: () => renderQrTerminal
+});
+import { createRequire } from "node:module";
+async function renderQrTerminal(url, options) {
+  return new Promise((resolve2, reject) => {
+    try {
+      const qt = require2("qrcode-terminal");
+      qt.generate(url, { small: options?.small ?? true }, (output) => {
+        resolve2(output);
+      });
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+var require2;
+var init_qr_render = __esm({
+  "src/qr-render.ts"() {
+    "use strict";
+    require2 = createRequire(import.meta.url);
+  }
+});
+
 // src/channels/wechat.ts
 var wechat_exports = {};
 __export(wechat_exports, {
@@ -425,20 +451,35 @@ async function wechatQrLogin(options) {
     console.error("[wechat] QR response missing qrcode field");
     return null;
   }
+  let pollQrValue = qrcodeValue;
   const qrScanData = qrcodeUrl || qrcodeValue;
-  console.log("\n========== \u5FAE\u4FE1\u626B\u7801\u767B\u5F55 ==========");
-  if (qrcodeUrl) {
-    console.log(`\u626B\u7801\u94FE\u63A5: ${qrcodeUrl}`);
+  try {
+    const { renderQrTerminal: renderQrTerminal2 } = await Promise.resolve().then(() => (init_qr_render(), qr_render_exports));
+    const qrBlock = await renderQrTerminal2(qrScanData);
+    console.log("\n========== \u5FAE\u4FE1\u626B\u7801\u767B\u5F55 ==========");
+    if (qrcodeUrl) {
+      console.log(`\u626B\u7801\u94FE\u63A5: ${qrcodeUrl}`);
+    }
+    if (qrBlock) {
+      console.log("\u8BF7\u7528\u5FAE\u4FE1\u626B\u63CF\u4EE5\u4E0B\u4E8C\u7EF4\u7801:");
+      console.log(qrBlock);
+    } else {
+      console.log("\u4E8C\u7EF4\u7801\u6E32\u67D3\u5931\u8D25\uFF0C\u8BF7\u7528\u5FAE\u4FE1\u300C\u626B\u4E00\u626B\u300D\u6253\u5F00\u4E0A\u9762\u7684\u94FE\u63A5:");
+    }
+    console.log("===================================\n");
+  } catch {
+    console.log("\n========== \u5FAE\u4FE1\u626B\u7801\u767B\u5F55 ==========");
+    if (qrcodeUrl) console.log(`\u626B\u7801\u94FE\u63A5: ${qrcodeUrl}`);
+    console.log("\u8BF7\u7528\u5FAE\u4FE1\u626B\u63CF\u4E8C\u7EF4\u7801\uFF08\u6216\u6253\u5F00\u4E0A\u9762\u7684\u94FE\u63A5\uFF09:");
+    console.log("===================================\n");
   }
-  console.log("\u8BF7\u7528\u5FAE\u4FE1\u626B\u63CF\u4E8C\u7EF4\u7801\uFF08\u6216\u6253\u5F00\u4E0A\u9762\u7684\u94FE\u63A5\uFF09:");
-  console.log("===================================\n");
   const deadline = Date.now() + timeoutSeconds * 1e3;
   let currentBaseUrl = ILINK_BASE_URL;
   let refreshCount = 0;
   while (Date.now() < deadline) {
     let statusResp;
     try {
-      statusResp = await apiGet(currentBaseUrl, `${EP_GET_QR_STATUS}?qrcode=${qrcodeValue}`, "", QR_TIMEOUT_MS);
+      statusResp = await apiGet(currentBaseUrl, `${EP_GET_QR_STATUS}?qrcode=${pollQrValue}`, "", QR_TIMEOUT_MS);
     } catch {
       await sleep2(1e3);
       continue;
@@ -463,7 +504,17 @@ async function wechatQrLogin(options) {
         qrResp = await apiGet(ILINK_BASE_URL, `${EP_GET_BOT_QR}?bot_type=${botType}`, "", QR_TIMEOUT_MS);
         const newQrValue = String(qrResp?.qrcode || "");
         const newQrUrl = String(qrResp?.qrcode_img_content || "");
-        if (newQrUrl) console.log(`\u65B0\u626B\u7801\u94FE\u63A5: ${newQrUrl}`);
+        if (!newQrValue) throw new Error("refresh response missing qrcode");
+        pollQrValue = newQrValue;
+        console.log("\u65B0\u626B\u7801\u94FE\u63A5:" + (newQrUrl ? ` ${newQrUrl}` : " (\u89C1\u4E0A\u65B9\u4E8C\u7EF4\u7801\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u626B)"));
+        if (newQrUrl) {
+          try {
+            const { renderQrTerminal: renderQrTerminal2 } = await Promise.resolve().then(() => (init_qr_render(), qr_render_exports));
+            const qrBlock = await renderQrTerminal2(newQrUrl);
+            if (qrBlock) console.log(qrBlock);
+          } catch {
+          }
+        }
       } catch (err) {
         console.error(`[wechat] QR refresh failed: ${err.message}`);
         return null;
@@ -484,15 +535,6 @@ async function wechatQrLogin(options) {
 \u2705 \u5FAE\u4FE1\u767B\u5F55\u6210\u529F!`);
       console.log(`   accountId: ${accountId}`);
       console.log(`   \u51ED\u8BC1\u5DF2\u4FDD\u5B58: ${credFile}`);
-      console.log(`
-\u8BF7\u5C06\u4EE5\u4E0B\u914D\u7F6E\u6DFB\u52A0\u5230 xiaoke.json:`);
-      console.log(JSON.stringify({
-        wechat: {
-          token,
-          accountId,
-          baseUrl: baseUrl !== ILINK_BASE_URL ? baseUrl : void 0
-        }
-      }, null, 2));
       return { accountId, token, baseUrl, userId };
     }
     await sleep2(1e3);
@@ -1083,32 +1125,6 @@ var init_wechat = __esm({
   }
 });
 
-// src/qr-render.ts
-var qr_render_exports = {};
-__export(qr_render_exports, {
-  renderQrTerminal: () => renderQrTerminal
-});
-import { createRequire } from "node:module";
-async function renderQrTerminal(url, options) {
-  return new Promise((resolve2, reject) => {
-    try {
-      const qt = require2("qrcode-terminal");
-      qt.generate(url, { small: options?.small ?? true }, (output) => {
-        resolve2(output);
-      });
-    } catch (err) {
-      reject(err);
-    }
-  });
-}
-var require2;
-var init_qr_render = __esm({
-  "src/qr-render.ts"() {
-    "use strict";
-    require2 = createRequire(import.meta.url);
-  }
-});
-
 // src/cli-travel.ts
 var cli_travel_exports = {};
 __export(cli_travel_exports, {
@@ -1860,7 +1876,7 @@ async function interactiveConfig(rl, defaults) {
   v.primaryProvider = providerMap[chosenProvider] || "dashscope";
   v.zhipuPlan = "";
   if (v.primaryProvider === "zhipu") {
-    const planOptions = ["coding-plan (GLM Coding \u8BA2\u9605)", "token-plan (\u666E\u901A\u6309\u91CF/TokenPlan)"];
+    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);
     v.zhipuPlan = chosenPlan.startsWith("coding") ? "coding" : "token";
   }
@@ -1874,7 +1890,7 @@ async function interactiveConfig(rl, defaults) {
   const modelMap = {
     dashscope: ["dashscope/qwen3.7-max", "dashscope/qwen3.7-plus"],
     minimax: ["minimax/MiniMax-M3", "minimax/MiniMax-M2.7"],
-    zhipu: ["zhipu/glm-5.1", "zhipu/glm-5v-turbo"],
+    zhipu: ["zhipu/glm-5.3", "zhipu/glm-5v-turbo"],
     deepseek: ["deepseek/deepseek-v4-pro", "deepseek/deepseek-v4-flash"]
   };
   const models = modelMap[v.primaryProvider] || ["dashscope/qwen3.7-max"];
@@ -1884,7 +1900,7 @@ async function interactiveConfig(rl, defaults) {
     "dashscope/qwen3.7-plus": true,
     "minimax/MiniMax-M3": true,
     "zhipu/glm-5v-turbo": true,
-    "zhipu/glm-5.1": false,
+    "zhipu/glm-5.3": false,
     "deepseek/deepseek-v4-pro": false,
     "deepseek/deepseek-v4-flash": false
   };
@@ -2107,8 +2123,8 @@ function generateConfig(v) {
       baseUrl: "https://open.bigmodel.cn/api/coding/paas/v4",
       api: "openai-completions",
       models: [
-        { id: "glm-5.1", name: "GLM-5.1", reasoning: true, input: ["text"], contextWindow: 204800, maxTokens: 131072 },
-        { id: "glm-5v-turbo", name: "GLM-5V-Turbo", reasoning: true, input: ["text", "image"], contextWindow: 2e5, maxTokens: 128e3 }
+        { id: "glm-5.3", name: "GLM-5.3 (\u6700\u65B0\u4E3B\u529B)", reasoning: true, input: ["text"], contextWindow: 204800, maxTokens: 131072 },
+        { id: "glm-5v-turbo", name: "GLM-5V-Turbo (\u89C6\u89C9)", reasoning: true, input: ["text", "image"], contextWindow: 2e5, maxTokens: 128e3 }
       ]
     },
     deepseek: {
@@ -2128,7 +2144,8 @@ function generateConfig(v) {
     }
     config.models.providers[v.primaryProvider] = {
       ...def,
-      apiKey: v.primaryApiKey
+      apiKey: v.primaryApiKey.trim(),
+      ...def.baseUrl ? { baseUrl: def.baseUrl.trim() } : {}
     };
   }
   return config;
@@ -2298,8 +2315,8 @@ async function main() {
     let stateDir = "";
     let configName = "";
     for (let i = 1; i < args.length; i++) {
-      if (args[i] === "--state-dir" && args[i + 1]) stateDir = args[++i];
-      else if (args[i] === "--config" && args[i + 1]) configName = args[++i];
+      if (args[i] === "--state-dir" && args[i + 1]) stateDir = args[++i].trim();
+      else if (args[i] === "--config" && args[i + 1]) configName = args[++i].trim();
     }
     if (!stateDir) stateDir = path3.resolve(process.cwd());
     if (!target && !isLegacyAddchannel) {

package/dist/engine-startup.mjs

@@ -2226,9 +2226,19 @@ var init_compact2 = __esm({
 // src/config/live.ts
 var live_exports = {};
 __export(live_exports, {
-  liveConfig: () => liveConfig
+  consumeSelfWrite: () => consumeSelfWrite,
+  liveConfig: () => liveConfig,
+  markSelfWrite: () => markSelfWrite
 });
-var LiveConfigClass, liveConfig;
+function markSelfWrite() {
+  selfWrite.pending = true;
+}
+function consumeSelfWrite() {
+  const was = selfWrite.pending;
+  selfWrite.pending = false;
+  return was;
+}
+var LiveConfigClass, liveConfig, selfWrite;
 var init_live = __esm({
   "src/config/live.ts"() {
     "use strict";
@@ -2289,6 +2299,7 @@ var init_live = __esm({
           o[keys[keys.length - 1]] = val;
           fs48.writeFileSync(cfgPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
           console.log(`[liveConfig] persisted ${dotPath} = ${JSON.stringify(val)} to ${cfgPath}`);
+          markSelfWrite();
         } catch (e) {
           console.warn(`[liveConfig] persist failed (${dotPath}): ${e.message}`);
         }
@@ -2299,6 +2310,7 @@ var init_live = __esm({
       }
     };
     liveConfig = new LiveConfigClass();
+    selfWrite = { pending: false };
   }
 });
 
@@ -31890,6 +31902,7 @@ function createMemorySideProvider(sideConfig, mainProvider, providers) {
   console.log(`[memory] Side provider: ${sideConfig.provider}/${sideConfig.model} (thinking=${sideConfig.thinking || "default"})`);
   return { provider: sideProvider, model: sideConfig.model, disableThinking };
 }
+var lastLoadedConfigRaw = null;
 async function doReloadConfig(config, deps, provider) {
   try {
     const savedConfigPath = config._configFilePath;
@@ -31904,7 +31917,17 @@ async function doReloadConfig(config, deps, provider) {
         reloadConfigPath = altPath;
       }
     }
+    let configRaw = "";
+    try {
+      configRaw = fs47.readFileSync(reloadConfigPath, "utf-8");
+    } catch {
+    }
+    if (lastLoadedConfigRaw !== null && configRaw.trim() === lastLoadedConfigRaw) {
+      console.log(`[reload] config content unchanged, skipping reload`);
+      return { ok: true, changes: ["unchanged (skipped)"] };
+    }
     const newConfig = loadConfig(reloadConfigPath);
+    lastLoadedConfigRaw = configRaw.trim();
     const changes = [];
     const oldProviderKey = JSON.stringify({
       providers: config.providers,
@@ -32055,9 +32078,22 @@ function startConfigWatcher(config, deps, provider) {
     return null;
   }
   let debounceTimer = null;
+  try {
+    lastLoadedConfigRaw = fs47.readFileSync(configPath, "utf-8").trim();
+  } catch {
+  }
   const watcher = fs47.watch(configPath, { persistent: true }, (eventType) => {
     if (debounceTimer) clearTimeout(debounceTimer);
     debounceTimer = setTimeout(async () => {
+      if (consumeSelfWrite()) {
+        console.log(`[config-watch] self-write (liveConfig.set, memory already synced), skipping reload`);
+        try {
+          fs47.appendFileSync(path49.join(config.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] SELF-WRITE SKIP (liveConfig.set, memory synced)
+`);
+        } catch {
+        }
+        return;
+      }
       console.log(`[config-watch] file changed (${eventType}), reloading...`);
       try {
         fs47.appendFileSync(path49.join(config.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] CHANGE eventType=${eventType}, calling doReloadConfig

package/dist/main.mjs

@@ -34,9 +34,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/config/live.ts
 var live_exports = {};
 __export(live_exports, {
-  liveConfig: () => liveConfig
+  consumeSelfWrite: () => consumeSelfWrite,
+  liveConfig: () => liveConfig,
+  markSelfWrite: () => markSelfWrite
 });
-var LiveConfigClass, liveConfig;
+function markSelfWrite() {
+  selfWrite.pending = true;
+}
+function consumeSelfWrite() {
+  const was = selfWrite.pending;
+  selfWrite.pending = false;
+  return was;
+}
+var LiveConfigClass, liveConfig, selfWrite;
 var init_live = __esm({
   "src/config/live.ts"() {
     "use strict";
@@ -97,6 +107,7 @@ var init_live = __esm({
           o[keys[keys.length - 1]] = val;
           fs48.writeFileSync(cfgPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
           console.log(`[liveConfig] persisted ${dotPath} = ${JSON.stringify(val)} to ${cfgPath}`);
+          markSelfWrite();
         } catch (e) {
           console.warn(`[liveConfig] persist failed (${dotPath}): ${e.message}`);
         }
@@ -107,6 +118,7 @@ var init_live = __esm({
       }
     };
     liveConfig = new LiveConfigClass();
+    selfWrite = { pending: false };
   }
 });
 
@@ -31974,6 +31986,7 @@ function createMemorySideProvider(sideConfig, mainProvider, providers) {
   console.log(`[memory] Side provider: ${sideConfig.provider}/${sideConfig.model} (thinking=${sideConfig.thinking || "default"})`);
   return { provider: sideProvider, model: sideConfig.model, disableThinking };
 }
+var lastLoadedConfigRaw = null;
 async function doReloadConfig(config2, deps, provider) {
   try {
     const savedConfigPath = config2._configFilePath;
@@ -31988,7 +32001,17 @@ async function doReloadConfig(config2, deps, provider) {
         reloadConfigPath = altPath;
       }
     }
+    let configRaw = "";
+    try {
+      configRaw = fs47.readFileSync(reloadConfigPath, "utf-8");
+    } catch {
+    }
+    if (lastLoadedConfigRaw !== null && configRaw.trim() === lastLoadedConfigRaw) {
+      console.log(`[reload] config content unchanged, skipping reload`);
+      return { ok: true, changes: ["unchanged (skipped)"] };
+    }
     const newConfig = loadConfig(reloadConfigPath);
+    lastLoadedConfigRaw = configRaw.trim();
     const changes = [];
     const oldProviderKey = JSON.stringify({
       providers: config2.providers,
@@ -32139,9 +32162,22 @@ function startConfigWatcher(config2, deps, provider) {
     return null;
   }
   let debounceTimer = null;
+  try {
+    lastLoadedConfigRaw = fs47.readFileSync(configPath2, "utf-8").trim();
+  } catch {
+  }
   const watcher = fs47.watch(configPath2, { persistent: true }, (eventType) => {
     if (debounceTimer) clearTimeout(debounceTimer);
     debounceTimer = setTimeout(async () => {
+      if (consumeSelfWrite()) {
+        console.log(`[config-watch] self-write (liveConfig.set, memory already synced), skipping reload`);
+        try {
+          fs47.appendFileSync(path49.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] SELF-WRITE SKIP (liveConfig.set, memory synced)
+`);
+        } catch {
+        }
+        return;
+      }
       console.log(`[config-watch] file changed (${eventType}), reloading...`);
       try {
         fs47.appendFileSync(path49.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] CHANGE eventType=${eventType}, calling doReloadConfig

package/package.json

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