engine7 7.1.94 → 7.1.96

package/dist/cli.mjs

@@ -18320,7 +18320,8 @@ function buildLightHistory(history, opts) {
 function buildLightStablePrompt(workspace, mode, opts) {
   const lp = liveConfig.get(`channels.${mode}.liveSystemPrompt`);
   const parts = [];
-  for (const f of lp?.files ?? ["SOUL.md"]) {
+  const files = lp?.files ?? (mode === "emotion" ? ["SOUL.md", "EMOTION.md"] : ["SOUL.md"]);
+  for (const f of files) {
     try {
       parts.push(readFileSync22(join29(workspace, f), "utf-8").trim());
     } catch {
@@ -18343,7 +18344,7 @@ function buildLightStablePrompt(workspace, mode, opts) {
     ].join("\n"));
   }
   const built = parts.join("\n\n");
-  console.log(`[light-stable] mode=${mode} files=[${(lp?.files ?? ["SOUL.md"]).join(",")}] ~${Math.round(built.length / 3)} tokens`);
+  console.log(`[light-stable] mode=${mode} files=[${files.join(",")}] ~${Math.round(built.length / 3)} tokens`);
   return built;
 }
 var init_light_mode = __esm({
@@ -27228,12 +27229,17 @@ var init_cli_doctor = __esm({
 var provision_free_exports = {};
 __export(provision_free_exports, {
   loadOrCreateInstallIdentity: () => loadOrCreateInstallIdentity,
-  provisionFreeToken: () => provisionFreeToken
+  provisionFreeToken: () => provisionFreeToken,
+  readInstallIdentity: () => readInstallIdentity,
+  writeIdentityContactEmail: () => writeIdentityContactEmail
 });
 import { randomBytes as randomBytes6, randomUUID as randomUUID9 } from "node:crypto";
 import { chmodSync as chmodSync2, existsSync as existsSync31, mkdirSync as mkdirSync19, readFileSync as readFileSync39, writeFileSync as writeFileSync20 } from "node:fs";
 import { dirname as dirname12, join as join49 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
+function readContactEmailOf(parsed) {
+  return typeof parsed?.contactEmail === "string" ? parsed.contactEmail.trim() : "";
+}
 function loadOrCreateInstallIdentity(stateDir) {
   const file2 = join49(stateDir, IDENTITY_FILE);
   if (existsSync31(file2)) {
@@ -27248,7 +27254,12 @@ function loadOrCreateInstallIdentity(stateDir) {
     if (typeof parsed?.installId !== "string" || typeof parsed?.installSecret !== "string") {
       throw new Error(`${IDENTITY_FILE} \u7F3A installId / installSecret \u5B57\u6BB5`);
     }
-    return { installId: parsed.installId, installSecret: parsed.installSecret };
+    const email = readContactEmailOf(parsed);
+    return {
+      installId: parsed.installId,
+      installSecret: parsed.installSecret,
+      ...email ? { contactEmail: email } : {}
+    };
   }
   const identity = {
     // 服务端校验 installId 长度为 8..36、只允许字母数字和连字符；uuid 正好符合
@@ -27264,6 +27275,32 @@ function loadOrCreateInstallIdentity(stateDir) {
   }
   return identity;
 }
+function readInstallIdentity(stateDir) {
+  try {
+    const parsed = JSON.parse(readFileSync39(join49(stateDir, IDENTITY_FILE), "utf8"));
+    if (typeof parsed?.installId !== "string" || typeof parsed?.installSecret !== "string") return null;
+    const email = readContactEmailOf(parsed);
+    return {
+      installId: parsed.installId,
+      installSecret: parsed.installSecret,
+      ...email ? { contactEmail: email } : {}
+    };
+  } catch {
+    return null;
+  }
+}
+function writeIdentityContactEmail(stateDir, email) {
+  const identity = loadOrCreateInstallIdentity(stateDir);
+  const trimmed = email.trim();
+  const next = { ...identity, contactEmail: trimmed };
+  const file2 = join49(stateDir, IDENTITY_FILE);
+  mkdirSync19(stateDir, { recursive: true });
+  writeFileSync20(file2, JSON.stringify(next, null, 2) + "\n", { mode: 384 });
+  try {
+    chmodSync2(file2, 384);
+  } catch {
+  }
+}
 function readEngineVersion() {
   try {
     return JSON.parse(readFileSync39(join49(dirname12(__filename), "..", "package.json"), "utf8")).version || "unknown";
@@ -27278,7 +27315,14 @@ async function provisionFreeToken(opts) {
   const res = await doFetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ ...identity, engineVersion: readEngineVersion() })
+    // 显式列字段，**不要用 `...identity` 展开**：InstallIdentity 加了 contactEmail
+    // 之后，展开会把邮箱也发到发号端点——协议悄悄变了，而服务端只认这三个字段。
+    // （provision-free.test.ts 里有一条断言守这个。）
+    body: JSON.stringify({
+      installId: identity.installId,
+      installSecret: identity.installSecret,
+      engineVersion: readEngineVersion()
+    })
   });
   const text = await res.text();
   let body;
@@ -28165,6 +28209,13 @@ import * as fs2 from "node:fs";
 // src/cli-init-config.ts
 import * as path2 from "node:path";
 var SCHEMA_VERSION = 1;
+var FREE_TIER_RELAY_URL = "https://www.twinsun.top:8866";
+function isFreeTier(v) {
+  return v.freeTier === true || v.primaryProvider === "7yi";
+}
+function resolveRelayUrl(relayArg, env = process.env) {
+  return (relayArg || "").trim() || (env.E7_RELAY_URL || "").trim() || FREE_TIER_RELAY_URL;
+}
 var DEFAULT_PRIMARY_MODEL = {
   dashscope: "dashscope/qwen3.8-max",
   minimax: "minimax/MiniMax-M3",
@@ -28245,7 +28296,13 @@ var PROVIDER_DEFS = {
     // 引擎免费档的中转站。baseUrl 是兜底值——真正的权威值来自领号响应
     // （服务端按请求 Host 自报地址），由安装器作为 customBaseUrl 下发。
     // 这样挪机器、换域名只改服务端，不用重发安装包。
-    baseUrl: "https://www.twinsun.top/v1",
+    //
+    // ⚠️ 0921 修：这里原本写的是 `https://www.twinsun.top/v1`（443），而 **443 上不是
+    // 中转站**（实测回的是另一个服务的 FastAPI 404）。安装器那条路每次都会下发
+    // customBaseUrl 把它盖掉，所以正式装机撞不到；但**终端向导选 7yi 时不问 baseUrl**，
+    // 直接落到这个兜底值——于是命令行用户拿到的是「号领到了、引擎起来了、一发消息就废」。
+    // 用常量拼，别再手写一遍（漏端口就是这个坑）。
+    baseUrl: `${FREE_TIER_RELAY_URL}/v1`,
     api: "anthropic",
     models: [
       // ⚠️ contextWindow **不能照抄 1000000**。
@@ -28365,9 +28422,9 @@ function generateConfig(v) {
       // 自拍（§4.3）：免费档必须显式写 provider:'relay'。不写的话 getProvider()
       // 会落回默认值 'fal'，而免费装机没有 fal key——第一次自拍就失败。
       // 非免费档只在用户真给了形象时才写这个块，且不替他决定 provider。
-      ...v.freeTier || v.selfiePhotoRelPath || v.selfiePortraitDesc ? {
+      ...isFreeTier(v) || v.selfiePhotoRelPath || v.selfiePortraitDesc ? {
         my_selfie: {
-          ...v.freeTier ? { provider: "relay" } : {},
+          ...isFreeTier(v) ? { provider: "relay" } : {},
           ...v.selfiePhotoRelPath ? { references: [{ name: "portrait", path: v.selfiePhotoRelPath }] } : {},
           // 只在没有照片时才写描述——两个都给的话以照片为准，写进去会让人以为
           // 描述也生效了（冷启读的就是这个键）
@@ -28415,7 +28472,7 @@ function generateConfig(v) {
           debounceMs: 5e3,
           // 免费档的装机目标是「能对话、能看图、能自拍」，这两个 flag 默认 false
           // （src/config/features.ts）。显式打开，它们是声明这两件事的地方。
-          ...v.freeTier ? { selfie: true, eyes: true } : {}
+          ...isFreeTier(v) ? { selfie: true, eyes: true } : {}
         }
       }
     },
@@ -28581,6 +28638,13 @@ function validate(a) {
   if (a.timezone !== void 0 && !isValidTimezone(a.timezone)) {
     throw new Error(`timezone \u975E\u6CD5: ${a.timezone}\uFF08\u8981 IANA \u540D\uFF0C\u5982 Asia/Shanghai\u3001Europe/Malta\uFF09`);
   }
+  if (a.contactEmail !== void 0 && a.contactEmail !== null && a.contactEmail !== "") {
+    if (typeof a.contactEmail !== "string") throw new Error("contactEmail \u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
+    const t = a.contactEmail.trim();
+    if (t && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(t)) {
+      throw new Error(`contactEmail \u4E0D\u662F\u5408\u6CD5\u90AE\u7BB1: ${t}`);
+    }
+  }
   if (a.feishu?.mode !== void 0 && !VALID_CHANNEL_MODES.includes(a.feishu.mode)) {
     throw new Error(`feishu.mode \u975E\u6CD5: ${a.feishu.mode}\uFF08\u53EF\u9009: ${VALID_CHANNEL_MODES.join(" / ")}\uFF09`);
   }
@@ -28609,6 +28673,11 @@ function loadInitAnswers(filePath) {
     throw new Error(`answers \u6587\u4EF6\u4E0D\u662F\u5408\u6CD5 JSON: ${e.message}`);
   }
   validate(parsed);
+  if (typeof parsed.contactEmail === "string") {
+    const t = parsed.contactEmail.trim();
+    if (t) parsed.contactEmail = t;
+    else delete parsed.contactEmail;
+  }
   return parsed;
 }
 function buildConfigValuesFromAnswers(stateDir, a, existing = {}) {
@@ -29399,16 +29468,16 @@ async function main() {
   }
   if (subcommand === "provision-free") {
     let relay = "";
+    let relayFromArg = false;
     let stateDir = "";
     for (let i = 1; i < args.length; i++) {
-      if (args[i] === "--relay" && args[i + 1]) relay = args[++i].trim();
-      else if (args[i] === "--state-dir" && args[i + 1]) stateDir = args[++i].trim();
-    }
-    if (!relay) {
-      console.error("\u7528\u6CD5\uFF1Aengine7 provision-free --relay <\u4E2D\u8F6C\u7AD9\u5730\u5740> --state-dir <\u76EE\u5F55>");
-      console.error("  --relay \u662F\u5B89\u88C5\u5668\u4E0B\u53D1\u7684\u9886\u53F7\u5730\u5740\uFF0C\u4E0D\u662F\u6A21\u578B baseUrl\uFF08\u540E\u8005\u4EE5\u9886\u53F7\u54CD\u5E94\u4E3A\u51C6\uFF09");
-      process.exit(1);
+      if (args[i] === "--relay" && args[i + 1]) {
+        relay = args[++i].trim();
+        relayFromArg = true;
+      } else if (args[i] === "--state-dir" && args[i + 1]) stateDir = args[++i].trim();
     }
+    relay = resolveRelayUrl(relay, process.env);
+    if (!relayFromArg) console.error(`   \u4E2D\u8F6C\u7AD9: ${relay}\uFF08\u8981\u6362\u5730\u5740\u7528 --relay <\u5730\u5740>\uFF09`);
     const { resolveStateDirFromArgs: resolveStateDirFromArgs2 } = await Promise.resolve().then(() => (init_cli_doctor(), cli_doctor_exports));
     stateDir = stateDir ? path33.resolve(stateDir) : resolveStateDirFromArgs2(args.slice(1));
     try {
@@ -30225,11 +30294,17 @@ WantedBy=default.target`;
     values = await interactiveConfig(rl, getDefaultValues(opts.stateDir));
     rl.close();
   }
-  if (values.freeTier) {
+  {
+    const { loadOrCreateInstallIdentity: loadOrCreateInstallIdentity2, writeIdentityContactEmail: writeIdentityContactEmail2 } = await Promise.resolve().then(() => (init_provision_free(), provision_free_exports));
+    loadOrCreateInstallIdentity2(opts.stateDir);
+    const contactEmail = (answers?.contactEmail || "").trim();
+    if (contactEmail) writeIdentityContactEmail2(opts.stateDir, contactEmail);
+  }
+  if (isFreeTier(values)) {
     const envName = values.primaryProvider.toUpperCase().replace(/[^A-Z0-9_]/g, "_") + "_API_KEY";
     if (!readSecretsValue(opts.stateDir, envName)) {
       throw new Error(
-        `\u514D\u8D39\u6863\u7F3A\u5C11\u4EE4\u724C\uFF1Asecrets \u91CC\u6CA1\u6709 ${envName}\u3002\u8BF7\u5148\u6267\u884C engine7 provision-free --relay <\u4E2D\u8F6C\u7AD9\u5730\u5740> --state-dir ${opts.stateDir} \u9886\u53F7\uFF0C\u518D\u8DD1 init\u3002`
+        `\u514D\u8D39\u6863\u7F3A\u5C11\u4EE4\u724C\uFF1Asecrets \u91CC\u6CA1\u6709 ${envName}\u3002\u8BF7\u5148\u6267\u884C engine7 provision-free --state-dir ${opts.stateDir} \u9886\u53F7\uFF0C\u518D\u8DD1 init\u3002`
       );
     }
   }