engine7 7.1.94 → 7.1.96

package/dist/main.mjs

@@ -8215,26 +8215,26 @@ async function writeToMailbox(recipientName, message, teamName) {
     await writeFile2(inboxPath, "[]", { encoding: "utf-8", flag: "wx" });
   } catch {
   }
-  const release2 = await acquireLock(inboxPath);
+  const release3 = await acquireLock(inboxPath);
   try {
     const messages = await readMailbox(recipientName, teamName);
     messages.push({ ...message, read: false });
     await writeFile2(inboxPath, JSON.stringify(messages, null, 2), "utf-8");
     console.log(`[mailbox] Wrote message to ${recipientName} from ${message.from} (team=${teamName || "default"}, inbox=${inboxPath})`);
   } finally {
-    await release2();
+    await release3();
   }
 }
 async function markMessagesAsRead(agentName, teamName) {
   const inboxPath = getInboxPath(agentName, teamName);
-  const release2 = await acquireLock(inboxPath);
+  const release3 = await acquireLock(inboxPath);
   try {
     const messages = await readMailbox(agentName, teamName);
     if (messages.length === 0) return;
     for (const m of messages) m.read = true;
     await writeFile2(inboxPath, JSON.stringify(messages, null, 2), "utf-8");
   } finally {
-    await release2();
+    await release3();
   }
 }
 async function clearMailbox(agentName, teamName) {
@@ -10065,7 +10065,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
       }
       // ── md 读（proactive 消费）：开窗预测（全 owner 扫描，end>=今天）──
       getOpenPredictions(now, limit = 50) {
-        const today = todayKey(now);
+        const today2 = todayKey(now);
         const out = [];
         const usersDir = join23(this.root, "users");
         if (!existsSync13(usersDir)) return out;
@@ -10088,7 +10088,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
               const text = ((block.match(/### Foresight\s*\n+([\s\S]*?)(?:\n### Evidence|$)/) ?? [])[1] ?? "").trim();
               const evidence = ((block.match(/### Evidence\s*\n+([\s\S]*?)$/) ?? [])[1] ?? "").trim();
               if (!end || !start || !text) continue;
-              if (end < today) continue;
+              if (end < today2) continue;
               out.push({ ownerId: owner.name, startDate: start, endDate: end, content: text.replace(/\n+/g, " ").slice(0, 200), evidence: evidence.replace(/\n+/g, " ").slice(0, 120) });
               if (out.length >= limit) return out;
             }
@@ -13629,7 +13629,7 @@ function loadForesightEntries(everosRoot, now, userId, ownerFilter) {
   return entries2.slice();
 }
 function parseForesightEntries(everosRoot, now, userId) {
-  const today = todayKey(now);
+  const today2 = todayKey(now);
   let files;
   if (userId) {
     const ownDir = join30(everosRoot, userId, "default_project", "users", userId, ".foresights");
@@ -13654,7 +13654,7 @@ function parseForesightEntries(everosRoot, now, userId) {
       const end = (block.match(/\*\*end_time\*\*:\s*(\d{4}-\d{2}-\d{2})/) ?? [])[1];
       const text = ((block.match(/### Foresight\s*\n+([\s\S]*?)(?:\n### Evidence|$)/) ?? [])[1] ?? "").trim();
       if (!start || !end || !text) continue;
-      if (end < today) continue;
+      if (end < today2) continue;
       const evidence = ((block.match(/### Evidence\s*\n+([\s\S]*?)$/) ?? [])[1] ?? "").trim();
       const blockOwner = (block.match(/\*\*owner_id\*\*:\s*(\S+)/) ?? [])[1] ?? fileOwner;
       const key = text.replace(/\s+/g, "");
@@ -21592,7 +21592,7 @@ function isPermittedRedirect(original, redirect) {
 async function fetchWithRedirects(url, signal, depth = 0) {
   if (depth > MAX_REDIRECTS) throw new Error(`\u91CD\u5B9A\u5411\u6B21\u6570\u8FC7\u591A (>${MAX_REDIRECTS})`);
   const controller = new AbortController();
-  const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+  const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS2);
   const onSignalAbort = () => controller.abort();
   signal.addEventListener("abort", onSignalAbort, { once: true });
   try {
@@ -21635,14 +21635,14 @@ function getTurndown() {
   }
   return td;
 }
-var MAX_URL_LENGTH, MAX_CONTENT_LENGTH, FETCH_TIMEOUT_MS, MAX_REDIRECTS, td;
+var MAX_URL_LENGTH, MAX_CONTENT_LENGTH, FETCH_TIMEOUT_MS2, MAX_REDIRECTS, td;
 var init_web_fetch = __esm({
   "src/tools/web-fetch.ts"() {
     "use strict";
     init_registry();
     MAX_URL_LENGTH = 2e3;
     MAX_CONTENT_LENGTH = 10 * 1024 * 1024;
-    FETCH_TIMEOUT_MS = 6e4;
+    FETCH_TIMEOUT_MS2 = 6e4;
     MAX_REDIRECTS = 10;
     registry.register({
       name: "web_fetch",
@@ -21713,7 +21713,7 @@ var init_web_fetch = __esm({
 
 // src/tools/wechat/wx-query.ts
 var wx_query_exports = {};
-import { join as join55 } from "node:path";
+import { join as join57 } from "node:path";
 function getDescription() {
   return `\u67E5\u8BE2\u7FC0\u54E5\u7684\u5FAE\u4FE1\u6D88\u606F\uFF08\u7F13\u5B58\u89E3\u5BC6\u540E\u7684\u672C\u5730\u6570\u636E\u5E93\uFF09\u3002
 
@@ -21748,8 +21748,8 @@ var init_wx_query = __esm({
     "use strict";
     init_registry();
     init_live();
-    STATE_DIR = process.env.ENGINE7_STATE_DIR || join55(process.env.HOME || process.env.USERPROFILE || ".", ".engine7");
-    SCRIPT = join55("/Users/chongzhang/work/twinsun-hearth/engine", "src", "tools", "wechat", "wx_query.py");
+    STATE_DIR = process.env.ENGINE7_STATE_DIR || join57(process.env.HOME || process.env.USERPROFILE || ".", ".engine7");
+    SCRIPT = join57("/Users/chongzhang/work/twinsun-hearth/engine", "src", "tools", "wechat", "wx_query.py");
     PYTHON = "python3";
     registry.register({
       name: "wx_query",
@@ -22924,8 +22924,8 @@ async function doReloadConfigInner(config2, deps, provider, force = false) {
     const savedConfigPath = config2._configFilePath;
     let reloadConfigPath = savedConfigPath;
     if (!fs10.existsSync(reloadConfigPath)) {
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = path10.dirname(__filename);
+      const __filename2 = fileURLToPath(import.meta.url);
+      const __dirname = path10.dirname(__filename2);
       const engineConfigsDir = path10.resolve(__dirname, "../configs");
       const altPath = path10.join(engineConfigsDir, path10.basename(savedConfigPath));
       if (fs10.existsSync(altPath)) {
@@ -23239,20 +23239,20 @@ function acquireEngineLock(stateDir) {
   } catch (err) {
     console.warn(`[pid-lock] write lock failed: ${err.message}`);
   }
-  const release2 = () => {
+  const release3 = () => {
     try {
       const cur = fs11.existsSync(lockFile) ? fs11.readFileSync(lockFile, "utf-8").trim() : "";
       if (cur === String(myPid)) fs11.unlinkSync(lockFile);
     } catch {
     }
   };
-  process.on("exit", release2);
+  process.on("exit", release3);
   process.on("SIGINT", () => {
-    release2();
+    release3();
     process.exit(0);
   });
   process.on("SIGTERM", () => {
-    release2();
+    release3();
     process.exit(0);
   });
 }
@@ -24911,7 +24911,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(readFileSync12(join19(workspace, f), "utf-8").trim());
     } catch {
@@ -24934,7 +24935,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;
 }
 
@@ -28686,10 +28687,10 @@ var US_HALF_LIFE_DAYS = 10;
 var US_MAX_LINES = 60;
 function readRecentMemory(workspace) {
   const dir = path30.join(workspace, "memory");
-  const today = dailyFileKeyFor();
+  const today2 = dailyFileKeyFor();
   const yesterday = dailyFileKeyFor(Date.now() - 864e5);
   return {
-    today: readIfExists(path30.join(dir, `${today}.md`)),
+    today: readIfExists(path30.join(dir, `${today2}.md`)),
     yesterday: readIfExists(path30.join(dir, `${yesterday}.md`))
   };
 }
@@ -32626,6 +32627,200 @@ ${pathStr}` }];
   channelManager.startAll();
 }
 
+// src/optional/reporting/reporter.ts
+init_live();
+
+// src/provision-free.ts
+import { chmodSync as chmodSync2, existsSync as existsSync22, mkdirSync as mkdirSync14, readFileSync as readFileSync34, writeFileSync as writeFileSync12 } from "node:fs";
+import { dirname as dirname10, join as join45 } from "node:path";
+import { fileURLToPath as fileURLToPath7 } from "node:url";
+var __filename = fileURLToPath7(import.meta.url);
+var IDENTITY_FILE = "install-identity.json";
+function readContactEmailOf(parsed) {
+  return typeof parsed?.contactEmail === "string" ? parsed.contactEmail.trim() : "";
+}
+function readInstallIdentity(stateDir) {
+  try {
+    const parsed = JSON.parse(readFileSync34(join45(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;
+  }
+}
+
+// src/optional/reporting/state.ts
+import { existsSync as existsSync23, mkdirSync as mkdirSync15, readFileSync as readFileSync35, writeFileSync as writeFileSync13 } from "node:fs";
+import { join as join46 } from "node:path";
+var STATE_FILE2 = "report-state.json";
+function readReportState(stateDir) {
+  try {
+    const p = join46(stateDir, STATE_FILE2);
+    if (!existsSync23(p)) return {};
+    const parsed = JSON.parse(readFileSync35(p, "utf8"));
+    if (!parsed || typeof parsed !== "object") return {};
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+function writeReportState(stateDir, s) {
+  try {
+    mkdirSync15(stateDir, { recursive: true });
+    writeFileSync13(join46(stateDir, STATE_FILE2), JSON.stringify(s, null, 2) + "\n");
+  } catch {
+  }
+}
+
+// src/optional/reporting/payload.ts
+import { createHash as createHash2 } from "node:crypto";
+import * as os3 from "node:os";
+function installKeyOf(installId, installSecret) {
+  return createHash2("sha256").update(installId + installSecret).digest("hex").slice(0, 32);
+}
+function buildReportPayload(opts) {
+  const p = {
+    installId: opts.identity.installId,
+    installKey: installKeyOf(opts.identity.installId, opts.identity.installSecret),
+    engineVersion: opts.engineVersion,
+    platform: process.platform,
+    osVersion: typeof os3.release === "function" ? os3.release() : "",
+    arch: process.arch,
+    stateDir: opts.stateDir,
+    startedAt: opts.startedAt,
+    // 时钟回拨时别报个负数上去
+    uptimeSec: Math.max(0, Math.floor((opts.now - opts.startedAt) / 1e3)),
+    msgsToday: opts.counters.msgsToday,
+    msgsTotal: opts.counters.msgsTotal
+  };
+  if (opts.identity.contactEmail) p.contactEmail = opts.identity.contactEmail;
+  return p;
+}
+
+// src/core/activity-counter.ts
+init_clock();
+var USER_SOURCES = /* @__PURE__ */ new Set(["user", "inbox"]);
+var nowFn = () => /* @__PURE__ */ new Date();
+var today = "";
+var msgsToday = 0;
+var msgsTotal = 0;
+function rolloverIfNeeded(now) {
+  const d = todayKey(now);
+  if (d !== today) {
+    today = d;
+    msgsToday = 0;
+  }
+}
+function noteUserMessage(source) {
+  if (!source || !USER_SOURCES.has(source)) return;
+  const now = nowFn();
+  rolloverIfNeeded(now);
+  msgsToday++;
+  msgsTotal++;
+}
+function snapshotCounters() {
+  rolloverIfNeeded(nowFn());
+  return { day: today, msgsToday, msgsTotal };
+}
+function restoreCounters(s) {
+  today = todayKey(nowFn());
+  msgsToday = s.day === today && typeof s.msgsToday === "number" && s.msgsToday > 0 ? s.msgsToday : 0;
+  msgsTotal = typeof s.msgsTotal === "number" && s.msgsTotal > 0 ? s.msgsTotal : 0;
+}
+
+// src/optional/reporting/reporter.ts
+init_api_status();
+var DEFAULT_REPORT_URL = "https://www.twinsun.top:8866/api/engine7/report";
+var DEFAULT_INTERVAL_MS2 = 5 * 60 * 1e3;
+var DEFAULT_INITIAL_DELAY_MS = 10 * 1e3;
+var FETCH_TIMEOUT_MS = 10 * 1e3;
+function acceptReportUrl(v) {
+  if (typeof v !== "string") return null;
+  const t = v.trim();
+  return t.startsWith("https://") ? t : null;
+}
+function startReporting(opts) {
+  const { stateDir } = opts;
+  const doFetch = opts.fetchImpl ?? fetch;
+  const nowFn2 = opts.now ?? (() => Date.now());
+  const intervalMs = opts.intervalMs ?? DEFAULT_INTERVAL_MS2;
+  const initialDelayMs = opts.initialDelayMs ?? DEFAULT_INITIAL_DELAY_MS;
+  const log = opts.log ?? (() => {
+  });
+  const startedAt = nowFn2();
+  const maybeIdentity = readInstallIdentity(stateDir);
+  if (!maybeIdentity) {
+    log("[reporting] \u6CA1\u6709\u53EF\u7528\u7684\u88C5\u673A\u8EAB\u4EFD\uFF0C\u4E0A\u62A5\u5173\u95ED");
+    return { stop() {
+    }, async beatNow() {
+    } };
+  }
+  const identity = maybeIdentity;
+  restoreCounters(readReportState(stateDir));
+  const engineVersion = readEngineVersion();
+  let timer = null;
+  let stopped = false;
+  async function beatOnce() {
+    const state2 = readReportState(stateDir);
+    const enabled = liveConfig.get("reporting.enabled") !== false;
+    const counters = snapshotCounters();
+    if (!enabled) {
+      writeReportState(stateDir, { ...counters, reportUrl: state2.reportUrl });
+      return;
+    }
+    const fromServer = acceptReportUrl(state2.reportUrl);
+    const fromConfig = (liveConfig.get("reporting.url") || "").trim();
+    const url = fromServer ?? (fromConfig || DEFAULT_REPORT_URL);
+    const payload = buildReportPayload({
+      identity,
+      stateDir,
+      engineVersion,
+      startedAt,
+      now: nowFn2(),
+      counters
+    });
+    let nextUrl = state2.reportUrl;
+    try {
+      const res = await doFetch(url, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(payload),
+        signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+      });
+      const body = JSON.parse(await res.text());
+      const adopted = acceptReportUrl(body?.reportUrl);
+      if (adopted) nextUrl = adopted;
+    } catch {
+    }
+    writeReportState(stateDir, { ...counters, reportUrl: nextUrl });
+  }
+  function schedule(delay) {
+    if (stopped) return;
+    timer = setTimeout(() => {
+      void beatOnce().finally(() => schedule(intervalMs));
+    }, delay);
+    if (typeof timer.unref === "function") timer.unref();
+  }
+  schedule(initialDelayMs);
+  return {
+    stop() {
+      stopped = true;
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    },
+    async beatNow() {
+      await beatOnce();
+    }
+  };
+}
+
 // src/engine-startup.ts
 init_provider_factory();
 
@@ -33796,7 +33991,7 @@ var FeishuAdapter = class _FeishuAdapter {
 import * as crypto4 from "crypto";
 import * as fs38 from "fs";
 import * as path38 from "path";
-import * as os3 from "os";
+import * as os4 from "os";
 import { promises as dns } from "dns";
 function sleep3(ms) {
   return new Promise((r) => setTimeout(r, ms));
@@ -34179,7 +34374,7 @@ var WechatAdapter = class {
     this.config = config2;
     this.baseUrl = config2.baseUrl?.replace(/\/$/, "") || ILINK_BASE_URL;
     this.cdnBaseUrl = config2.cdnBaseUrl?.replace(/\/$/, "") || WEIXIN_CDN_BASE_URL;
-    this.stateDir = config2.stateDir || path38.join(os3.homedir?.() || "/tmp", ".engine7");
+    this.stateDir = config2.stateDir || path38.join(os4.homedir?.() || "/tmp", ".engine7");
     if (!fs38.existsSync(this.stateDir)) fs38.mkdirSync(this.stateDir, { recursive: true });
   }
   // --- ChannelAdapter interface ---
@@ -34525,7 +34720,7 @@ var WechatAdapter = class {
       mediaRef.full_url,
       timeoutSec
     );
-    const tmpDir = path38.join(os3.tmpdir(), "weixin-media");
+    const tmpDir = path38.join(os4.tmpdir(), "weixin-media");
     if (!fs38.existsSync(tmpDir)) fs38.mkdirSync(tmpDir, { recursive: true });
     const tmpPath = path38.join(tmpDir, `${crypto4.randomUUID().replace(/-/g, "")}-${filename}`);
     fs38.writeFileSync(tmpPath, data);
@@ -34787,10 +34982,10 @@ import { createInterface as createInterface2 } from "node:readline";
 import { promisify as promisify2 } from "node:util";
 import * as fs41 from "node:fs";
 import * as path40 from "node:path";
-import * as os4 from "node:os";
+import * as os5 from "node:os";
 import net4 from "net";
 var execFileAsync2 = promisify2(execFile2);
-var VOICE_DIR = path40.join(os4.tmpdir(), "engine-voice");
+var VOICE_DIR = path40.join(os5.tmpdir(), "engine-voice");
 var _pyCache = null;
 function resolvePython(configuredPath) {
   if (configuredPath) {
@@ -35434,10 +35629,10 @@ var DeskBuddyAdapter = class {
   appendHistory(entry) {
     try {
       if (!this.historyFile) {
-        const os5 = __require("os");
+        const os6 = __require("os");
         const fs57 = __require("fs");
         const path58 = __require("path");
-        const dir = path58.join(os5.homedir(), "xiaowen", "workspace", ".desktopBuddy");
+        const dir = path58.join(os6.homedir(), "xiaowen", "workspace", ".desktopBuddy");
         fs57.mkdirSync(dir, { recursive: true });
         this.historyFile = path58.join(dir, "history.json");
         this._fs = fs57;
@@ -37763,6 +37958,7 @@ var MessageDispatcher = class {
       displayText = imgCount > 0 ? `${txt} [\u56FE\u7247\xD7${imgCount}]`.trim() : txt;
     }
     console.log(`[dispatcher] Executing (session=${msg2.sessionId}, source=${msg2.source}, gen=${generation}): ${displayText.slice(0, 200).replace(/\n/g, " ")}`);
+    noteUserMessage(msg2.source);
     try {
       await handleQuery(
         msg2.text,
@@ -41039,7 +41235,7 @@ ${err.stack}`);
 // src/commands/model.ts
 import * as fs54 from "node:fs";
 import * as path54 from "node:path";
-import { fileURLToPath as fileURLToPath7 } from "node:url";
+import { fileURLToPath as fileURLToPath8 } from "node:url";
 function collectModels(config2) {
   const aliases = config2.modelAliases || {};
   const aliasByRef = /* @__PURE__ */ new Map();
@@ -41071,7 +41267,7 @@ function resolveConfigWritePath(config2, label) {
   if (!configPath2) return void 0;
   let writePath = configPath2;
   if (configPath2 && !fs54.existsSync(configPath2)) {
-    const __pFile = fileURLToPath7(import.meta.url);
+    const __pFile = fileURLToPath8(import.meta.url);
     const __pDir = path54.dirname(__pFile);
     const altPath = path54.join(path54.resolve(__pDir, "../configs"), path54.basename(configPath2));
     if (fs54.existsSync(altPath)) {
@@ -42164,6 +42360,33 @@ async function startEngine(config2, opts) {
       // 常开 entry，stop 不触发
     });
   }
+  {
+    let reportingHandle;
+    const stopReporting = () => {
+      try {
+        reportingHandle?.stop();
+      } catch {
+      }
+      reportingHandle = void 0;
+    };
+    const startReportingNow = () => {
+      stopReporting();
+      reportingHandle = startReporting({ stateDir: config2.stateDir });
+    };
+    const reportingEnabled = () => liveConfig.get("reporting.enabled") !== false;
+    reloadOrchestrator.register({
+      name: "reporting",
+      // url 也进 key：运维手改地址要能热生效，不用重启
+      select: (cfg) => ({ enabled: cfg.reporting?.enabled !== false, url: cfg.reporting?.url ?? "" }),
+      start: async () => {
+        startReportingNow();
+      },
+      stop: async () => {
+        stopReporting();
+      }
+    }, reportingEnabled());
+    if (reportingEnabled()) startReportingNow();
+  }
   const shutdownPromise = new Promise((resolve12) => {
     const shutdown = (signal) => {
       console.log(`[engine] ${signal} received, shutting down...`);
@@ -42206,11 +42429,11 @@ async function startEngine(config2, opts) {
 }
 
 // src/main.ts
-import { readFileSync as readFileSync45 } from "node:fs";
-import { fileURLToPath as fileURLToPath8 } from "node:url";
-import { dirname as dirname15, join as join61 } from "node:path";
-var __dirname2 = dirname15(fileURLToPath8(import.meta.url));
-var pkg = JSON.parse(readFileSync45(join61(__dirname2, "..", "package.json"), "utf-8"));
+import { readFileSync as readFileSync47 } from "node:fs";
+import { fileURLToPath as fileURLToPath9 } from "node:url";
+import { dirname as dirname16, join as join63 } from "node:path";
+var __dirname2 = dirname16(fileURLToPath9(import.meta.url));
+var pkg = JSON.parse(readFileSync47(join63(__dirname2, "..", "package.json"), "utf-8"));
 var epipeSeen = false;
 process.on("uncaughtException", (err) => {
   const code = err?.code ?? "";