engine7 7.1.84 → 7.1.95

package/dist/cli.mjs

@@ -1,12 +1,4 @@
 const require=(await import('node:module')).createRequire(import.meta.url)
-const __origEmitWarning = process.emitWarning.bind(process);
-process.emitWarning = (w, ...r) => {
-  const name = typeof w === 'object' ? w?.name : r?.[0];
-  const msg = typeof w === 'object' ? String(w?.message) : String(w);
-  if (name === 'ExperimentalWarning' && msg.includes('SQLite')) return;
-  return __origEmitWarning(w, ...r);
-};
-
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -356,83 +348,6 @@ var init_cli_events = __esm({
   }
 });
 
-// src/config/secrets-env.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
-import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
-function loadSecretsEnv(stateDir, configName) {
-  const home = process.env.HOME || process.env.USERPROFILE || ".";
-  const candidates = [
-    join3(home, ".engine7-secrets", `${configName}.env`),
-    join3(stateDir, "configs", `.env.${configName}`),
-    join3(stateDir, "configs", ".env")
-  ];
-  for (const p of candidates) {
-    if (!existsSync3(p)) continue;
-    for (const line of readFileSync3(p, "utf-8").split("\n")) {
-      const t = line.trim();
-      if (!t || t.startsWith("#")) continue;
-      const eq = t.indexOf("=");
-      if (eq <= 0) continue;
-      const k = t.slice(0, eq).trim();
-      const v = t.slice(eq + 1).trim();
-      const cur = process.env[k];
-      if (k && (cur === void 0 || cur === "")) process.env[k] = v;
-    }
-    return p;
-  }
-  return null;
-}
-var init_secrets_env = __esm({
-  "src/config/secrets-env.ts"() {
-    "use strict";
-  }
-});
-
-// src/config/display.ts
-function loadDisplayConfig(raw) {
-  if (!raw) return { ...DEFAULT_DISPLAY };
-  return {
-    thinking: {
-      ...DEFAULT_DISPLAY.thinking,
-      ...raw.thinking || {}
-    },
-    toolUse: {
-      ...DEFAULT_DISPLAY.toolUse,
-      ...raw.toolUse || {}
-    },
-    toolResult: {
-      ...DEFAULT_DISPLAY.toolResult,
-      ...raw.toolResult || {}
-    },
-    reactions: {
-      ...DEFAULT_DISPLAY.reactions,
-      ...raw.reactions || {}
-    },
-    preview: {
-      ...DEFAULT_DISPLAY.preview,
-      ...raw.preview || {}
-    },
-    typing: {
-      ...DEFAULT_DISPLAY.typing,
-      ...raw.typing || {}
-    }
-  };
-}
-var DEFAULT_DISPLAY;
-var init_display = __esm({
-  "src/config/display.ts"() {
-    "use strict";
-    DEFAULT_DISPLAY = {
-      thinking: { enabled: true, emoji: "\u{1F4AD}", maxLen: 300 },
-      toolUse: { enabled: true, emoji: "\u{1F527}", displayMode: "raw", bashDisplayMode: "description", displayLimits: { write: 200 } },
-      toolResult: { enabled: true, emoji: "\u{1F4E4}" },
-      reactions: { enabled: true, start: "\u{1F440}", done: "\u2705", error: "\u274C" },
-      preview: { enabled: true, agentName: "Agent" },
-      typing: { enabled: true }
-    };
-  }
-});
-
 // src/config/live.ts
 var live_exports = {};
 __export(live_exports, {
@@ -530,6 +445,287 @@ var init_live = __esm({
   }
 });
 
+// src/time/clock.ts
+function detectHostTimezone() {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
+  } catch {
+    return "UTC";
+  }
+}
+function isValidTimezone(name) {
+  if (!name) return false;
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: name });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function tz() {
+  if (testTimezone) return testTimezone;
+  const v = liveConfig.get("timezone");
+  const name = typeof v === "string" && v ? v : "UTC";
+  if (validatedZones.has(name)) return name;
+  if (isValidTimezone(name)) {
+    validatedZones.add(name);
+    return name;
+  }
+  warnOnce("tz", "invalid-zone", name);
+  return "UTC";
+}
+function partsFmt(zone) {
+  let f = fmtCache.get(zone);
+  if (!f) {
+    f = new Intl.DateTimeFormat("en-US", {
+      timeZone: zone,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hourCycle: "h23",
+      weekday: "short"
+    });
+    fmtCache.set(zone, f);
+  }
+  return f;
+}
+function asDate(i) {
+  return i instanceof Date ? i : new Date(i);
+}
+function wallParts(i = /* @__PURE__ */ new Date()) {
+  const d = asDate(i);
+  const parts = partsFmt(tz()).formatToParts(d);
+  const get = (t) => parts.find((p) => p.type === t)?.value ?? "";
+  return {
+    y: Number(get("year")),
+    mo: Number(get("month")),
+    d: Number(get("day")),
+    hh: Number(get("hour")),
+    mm: Number(get("minute")),
+    ss: Number(get("second")),
+    weekday: EN_WEEKDAY[get("weekday")] ?? 0
+  };
+}
+function weekdayZh(i) {
+  return WEEKDAY_ZH[wallParts(i).weekday];
+}
+function nowUtc() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function toUtc(d) {
+  return d.toISOString();
+}
+function toWall(i = /* @__PURE__ */ new Date()) {
+  const p = wallParts(i);
+  return `${p.y}-${p2(p.mo)}-${p2(p.d)} ${p2(p.hh)}:${p2(p.mm)}:${p2(p.ss)}`;
+}
+function formatForLlm(i) {
+  const d = i ?? /* @__PURE__ */ new Date();
+  const p = wallParts(d);
+  return `${p.y}-${p2(p.mo)}-${p2(p.d)} ${WEEKDAY_ZH[p.weekday]} ${p2(p.hh)}:${p2(p.mm)}\uFF08${tz()}\uFF09`;
+}
+function formatLog(i) {
+  return toWall(i ?? /* @__PURE__ */ new Date());
+}
+function warnOnce(callSite, shape, sample) {
+  const key = `${callSite}:${shape}`;
+  if (warned.has(key)) return;
+  warned.add(key);
+  console.warn(`[clock] ${callSite} \u5951\u7EA6\u8FDD\u89C4(${shape})\uFF0C\u6837\u672C: ${String(sample).slice(0, 80)}`);
+}
+function zoneOffsetMs(d) {
+  const p = wallParts(d);
+  const asUtc = Date.UTC(p.y, p.mo - 1, p.d, p.hh, p.mm, p.ss);
+  return asUtc - Math.floor(d.getTime() / 1e3) * 1e3;
+}
+function wallToUtc(y, mo, d, hh, mm, ss) {
+  const guess = Date.UTC(y, mo - 1, d, hh, mm, ss);
+  const off1 = zoneOffsetMs(new Date(guess));
+  const ms1 = guess - off1;
+  const off2 = zoneOffsetMs(new Date(ms1));
+  const ms = off2 === off1 ? ms1 : guess - off2;
+  return new Date(ms).toISOString();
+}
+function parseWall(s) {
+  const raw = String(s ?? "").trim();
+  if (!raw) return "";
+  if (/Z$/i.test(raw) || /[+-]\d{2}:?\d{2}$/.test(raw)) {
+    const ms2 = Date.parse(raw);
+    if (Number.isNaN(ms2)) {
+      warnOnce("parseWall", "unparseable", raw);
+      return raw;
+    }
+    warnOnce("parseWall", "has-offset", raw);
+    return new Date(ms2).toISOString();
+  }
+  const m = WALL_RE.exec(raw);
+  if (!m) {
+    warnOnce("parseWall", "unparseable", raw);
+    return raw;
+  }
+  const tail = raw.slice(m[0].length);
+  if (tail && !/^\.\d+$/.test(tail)) {
+    warnOnce("parseWall", "unparseable-tail", raw);
+    return raw;
+  }
+  const [Y, Mo, D, H, Mi, S] = [+m[1], +m[2], +m[3], +m[4], +m[5], m[6] ? +m[6] : 0];
+  if (Y < 1e3 || Y > 9999 || Mo < 1 || Mo > 12 || D < 1 || D > daysInMonth(Y, Mo) || H > 23 || Mi > 59 || S > 59) {
+    warnOnce("parseWall", "out-of-range", raw);
+    return raw;
+  }
+  const ms = tail ? Math.round(Number(`0${tail}`) * 1e3) : 0;
+  return withMs(wallToUtc(Y, Mo, D, H, Mi, S), ms);
+}
+function daysInMonth(y, mo) {
+  return new Date(Date.UTC(y, mo, 0)).getUTCDate();
+}
+function withMs(base, ms) {
+  if (!ms) return base;
+  const t = Date.parse(base);
+  return Number.isNaN(t) ? base : new Date(t + ms).toISOString();
+}
+function localOffsetSuffix(at) {
+  const total = Math.round(zoneOffsetMs(at ? asDate(at) : /* @__PURE__ */ new Date()) / 6e4);
+  const sign = total >= 0 ? "+" : "-";
+  const abs = Math.abs(total);
+  return `${sign}${p2(Math.floor(abs / 60))}:${p2(abs % 60)}`;
+}
+function startOfLocalDay(i) {
+  const p = wallParts(i ?? /* @__PURE__ */ new Date());
+  return wallToUtc(p.y, p.mo, p.d, 0, 0, 0);
+}
+function todayKey(i) {
+  const p = wallParts(i ?? /* @__PURE__ */ new Date());
+  return `${p.y}-${p2(p.mo)}-${p2(p.d)}`;
+}
+var WEEKDAY_ZH, EN_WEEKDAY, testTimezone, validatedZones, fmtCache, p2, warned, WALL_RE;
+var init_clock = __esm({
+  "src/time/clock.ts"() {
+    "use strict";
+    init_live();
+    WEEKDAY_ZH = ["\u5468\u65E5", "\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D"];
+    EN_WEEKDAY = {
+      Sun: 0,
+      Mon: 1,
+      Tue: 2,
+      Wed: 3,
+      Thu: 4,
+      Fri: 5,
+      Sat: 6
+    };
+    testTimezone = null;
+    validatedZones = /* @__PURE__ */ new Set();
+    fmtCache = /* @__PURE__ */ new Map();
+    p2 = (n) => String(n).padStart(2, "0");
+    warned = /* @__PURE__ */ new Set();
+    WALL_RE = /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2}))?/;
+  }
+});
+
+// src/config/secrets-env.ts
+import { chmodSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
+function secretsHome() {
+  return process.env.HOME || process.env.USERPROFILE || ".";
+}
+function loadSecretsEnv(stateDir, configName) {
+  const home = secretsHome();
+  const candidates = [
+    join3(home, ".engine7-secrets", `${configName}.env`),
+    join3(stateDir, "configs", `.env.${configName}`),
+    join3(stateDir, "configs", ".env")
+  ];
+  for (const p of candidates) {
+    if (!existsSync3(p)) continue;
+    for (const line of readFileSync3(p, "utf-8").split("\n")) {
+      const t = line.trim();
+      if (!t || t.startsWith("#")) continue;
+      const eq = t.indexOf("=");
+      if (eq <= 0) continue;
+      const k = t.slice(0, eq).trim();
+      const v = t.slice(eq + 1).trim();
+      const cur = process.env[k];
+      if (k && (cur === void 0 || cur === "")) process.env[k] = v;
+    }
+    return p;
+  }
+  return null;
+}
+function writeSecretsValue(configPath, envKey, value) {
+  const configName = basename2(configPath, ".json");
+  const dir = join3(secretsHome(), ".engine7-secrets");
+  mkdirSync2(dir, { recursive: true });
+  const file2 = join3(dir, `${configName}.env`);
+  const lines = [];
+  if (existsSync3(file2)) {
+    for (const line of readFileSync3(file2, "utf8").split(/\r?\n/)) {
+      if (new RegExp(`^\\s*${envKey}\\s*=`).test(line)) continue;
+      lines.push(line);
+    }
+  }
+  while (lines.length && lines[lines.length - 1] === "") lines.pop();
+  lines.push(`${envKey}=${value}`);
+  writeFileSync2(file2, lines.join("\n") + "\n", { mode: 384 });
+  try {
+    chmodSync(file2, 384);
+  } catch {
+  }
+  return file2;
+}
+var init_secrets_env = __esm({
+  "src/config/secrets-env.ts"() {
+    "use strict";
+  }
+});
+
+// src/config/display.ts
+function loadDisplayConfig(raw) {
+  if (!raw) return { ...DEFAULT_DISPLAY };
+  return {
+    thinking: {
+      ...DEFAULT_DISPLAY.thinking,
+      ...raw.thinking || {}
+    },
+    toolUse: {
+      ...DEFAULT_DISPLAY.toolUse,
+      ...raw.toolUse || {}
+    },
+    toolResult: {
+      ...DEFAULT_DISPLAY.toolResult,
+      ...raw.toolResult || {}
+    },
+    reactions: {
+      ...DEFAULT_DISPLAY.reactions,
+      ...raw.reactions || {}
+    },
+    preview: {
+      ...DEFAULT_DISPLAY.preview,
+      ...raw.preview || {}
+    },
+    typing: {
+      ...DEFAULT_DISPLAY.typing,
+      ...raw.typing || {}
+    }
+  };
+}
+var DEFAULT_DISPLAY;
+var init_display = __esm({
+  "src/config/display.ts"() {
+    "use strict";
+    DEFAULT_DISPLAY = {
+      thinking: { enabled: true, emoji: "\u{1F4AD}", maxLen: 300 },
+      toolUse: { enabled: true, emoji: "\u{1F527}", displayMode: "raw", bashDisplayMode: "description", displayLimits: { write: 200 } },
+      toolResult: { enabled: true, emoji: "\u{1F4E4}" },
+      reactions: { enabled: true, start: "\u{1F440}", done: "\u2705", error: "\u274C" },
+      preview: { enabled: true, agentName: "Agent" },
+      typing: { enabled: true }
+    };
+  }
+});
+
 // src/config/features.ts
 function getFeature(key) {
   const v = liveConfig.get(`agents.defaults.features.${key}`);
@@ -570,6 +766,7 @@ __export(loader_exports, {
   configSummary: () => configSummary,
   loadConfig: () => loadConfig,
   parseModelRef: () => parseModelRef,
+  resolveTimezone: () => resolveTimezone,
   takeLoadWarnings: () => takeLoadWarnings
 });
 import * as fs3 from "node:fs";
@@ -591,6 +788,24 @@ function warnAtLoad(msg2) {
   if (!loadWarningsFlushed) loadWarnings.push(msg2);
   console.warn(msg2);
 }
+function resolveTimezone(raw) {
+  const fallback = () => {
+    try {
+      return detectHostTimezone();
+    } catch {
+      return "UTC";
+    }
+  };
+  const v = raw?.timezone;
+  if (typeof v !== "string" || !v) return fallback();
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: v });
+    return v;
+  } catch {
+    warnAtLoad(`[config] timezone "${v}" \u4E0D\u662F\u5408\u6CD5 IANA \u65F6\u533A\u540D\uFF0C\u9000\u56DE\u672C\u673A\u63A2\u6D4B`);
+    return fallback();
+  }
+}
 function loadConfig(configPath) {
   const resolvedPath = path3.resolve(
     configPath || process.env.ENGINE_CONFIG || "engine-config.json"
@@ -602,7 +817,7 @@ function loadConfig(configPath) {
   const missingEnvKeys = /* @__PURE__ */ new Set();
   const resolveEnv = (node) => {
     if (typeof node === "string") {
-      const m = node.match(/^(?:env:|{{\s*)([A-Z][A-Z0-9_]*)(?:\s*}})?$/);
+      const m = node.match(/^(?:env:|{{\s*)(?=[A-Z0-9_]*[A-Z])([A-Z0-9_]+)(?:\s*}})?$/);
       if (m) {
         if (process.env[m[1]] !== void 0) return process.env[m[1]];
         if (node.startsWith("env:")) missingEnvKeys.add(m[1]);
@@ -727,11 +942,18 @@ function loadConfig(configPath) {
     ...rawInnerVoice,
     enabled: true
   } : void 0;
+  const resolvedTimezone = resolveTimezone(raw);
   const rawCron = raw.cron || {};
   const cron = rawCron.enabled ? {
     ...rawCron,
     enabled: true,
-    defaultTimezone: rawCron.defaultTimezone || "Asia/Shanghai",
+    // ★ 这里原来写死 'Asia/Shanghai'。而 cron/tasks.ts 建任务时是
+    //   `params.timezone || params.defaultTimezone || 'Asia/Shanghai'` ——
+    //   defaultTimezone 恒有值 ⇒ 兜底永远轮不到 ⇒ **工具建的每个任务都被
+    //   显式写死北京时区存进 tasks.json**，顶层 timezone 配置形同虚设
+    //   （马耳他用户说"每天 9 点"，会在当地凌晨 3 点触发）。
+    //   改为跟随引擎时区；per-task 的显式 timezone 仍然优先。
+    defaultTimezone: rawCron.defaultTimezone || resolvedTimezone,
     tickIntervalMs: rawCron.tickIntervalMs || 1e4,
     maxConsecutiveFailures: rawCron.maxConsecutiveFailures || 5,
     retry: {
@@ -744,6 +966,7 @@ function loadConfig(configPath) {
   return {
     ...raw,
     // 先展开 raw：未显式处理的字段（如 webhook）自动进来，避免每次加 config 都要手动挑；下面显式字段覆盖 raw（解析值优先）
+    timezone: resolvedTimezone,
     provider,
     providers,
     // 所有 provider 配置字典（供 memory/provider 动态切换用）
@@ -812,6 +1035,7 @@ var init_loader = __esm({
     "use strict";
     init_display();
     init_features();
+    init_clock();
     loadWarnings = [];
     loadWarningsFlushed = false;
   }
@@ -972,6 +1196,9 @@ function openDb(workspace) {
     day TEXT,
     time TEXT,
     date_str TEXT,
+    -- \u26A0\uFE0F 0920 \u4E4B\u524D\u7684\u503C\u7531\u5E26\u7B26\u53F7 bug \u7684 nowIso \u5199\u5165\uFF1A\u503C = \u771F\u5B9E\u65F6\u523B + **\u5199\u673A\u5F53\u65F6\u7684
+    --    UTC \u504F\u79FB**\uFF08\u4E1C\u4E3A\u6B63\uFF09\u3002\u9010\u884C\u4E0D\u540C\u3001\u65E0\u5904\u53EF\u8003\uFF0C\u6CA1\u6709\u53EF\u9760\u7684\u8FD8\u539F\u529E\u6CD5\u3002
+    --    0920 \u8D77\u5199\u5165\u6B63\u786E UTC Z\u3002\u8BFB\u8FD9\u4E09\u5217\u524D\u5148\u786E\u8BA4\u4F60\u8981\u7684\u662F\u4EC0\u4E48\u3002
     created_at TEXT NOT NULL,
     done_at TEXT,
     archived_at TEXT
@@ -1014,7 +1241,7 @@ function migrate(db2) {
     db2.exec("ALTER TABLE events ADD COLUMN doc_path TEXT");
   }
 }
-var _sqlite, DatabaseSync, TZ_OFFSET_MS;
+var _sqlite, DatabaseSync;
 var init_db = __esm({
   "src/calendar/db.ts"() {
     "use strict";
@@ -1028,7 +1255,6 @@ var init_db = __esm({
         return getSqlite().DatabaseSync[prop];
       }
     });
-    TZ_OFFSET_MS = 8 * 60 * 60 * 1e3;
   }
 });
 
@@ -1638,6 +1864,9 @@ If you can say it in one sentence, don't use three. Prefer short, direct sentenc
 }
 function getEnvInfoSection(workspace) {
   const envItems = [
+    // CC 上游本来就有日期项，移植时漏了 —— 补回来。
+    // 本段在 dynamic prompt（每轮重建），日期一天只变一次，不伤 prefix cache。
+    `Today's date: ${todayKey()} (${tz()})`,
     `Primary working directory: ${workspace}`,
     `Is directory a git repo: ${false}`,
     `Platform: ${os2.platform()}`,
@@ -1751,8 +1980,8 @@ function buildActiveGoalsSection(stateDir) {
   if (!active.length) return void 0;
   const events = listGoalEvents(stateDir);
   const fmt = (iso) => {
-    const d = new Date(iso);
-    return Number.isNaN(d.getTime()) ? "?" : `${d.getMonth() + 1}/${d.getDate()} ${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
+    const p = wallParts(iso);
+    return Number.isNaN(Date.parse(iso)) ? "?" : `${p.mo}/${p.d} ${String(p.hh).padStart(2, "0")}:${String(p.mm).padStart(2, "0")}`;
   };
   const summary = active.map((g) => {
     const step = g.steps[g.currentStep];
@@ -1793,10 +2022,8 @@ ${skillsListing}`);
   return parts.join("\n\n");
 }
 function buildVolatileRuntimeContext() {
-  const now = /* @__PURE__ */ new Date();
-  const dateStr = now.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
   return `# \u8FD0\u884C\u65F6\u4E0A\u4E0B\u6587
-\u5F53\u524D\u65F6\u95F4: ${dateStr}`;
+\u5F53\u524D\u65F6\u95F4: ${formatForLlm()}`;
 }
 function formatSkillsListingForPrompt() {
   const tools = registry.list();
@@ -1815,6 +2042,7 @@ var init_prompt = __esm({
     "use strict";
     init_registry();
     init_store();
+    init_clock();
     init_memdir();
     init_paths();
     BASH_TOOL_NAME = "exec";
@@ -1900,16 +2128,18 @@ function shouldRetry(status, errorBody) {
   if (status === 529) return true;
   if (status === 429) {
     const body = errorBody?.toLowerCase() || "";
-    if (body.includes("insufficient_quota") || body.includes("allocationquota") || body.includes("quota_exceeded") || body.includes("quotaexceeded") || body.includes("quota") && body.includes("exceeded") || body.includes('"code":"1310"') || body.includes('"code":1310') || body.includes("\u4F7F\u7528\u4E0A\u9650") && body.includes("\u91CD\u7F6E")) {
+    if (body.includes("insufficient_quota") || body.includes("allocationquota") || body.includes("quota_exceeded") || body.includes("quotaexceeded") || body.includes("quota") && body.includes("exceeded") || body.includes('"code":"1310"') || body.includes('"code":1310') || body.includes("\u4F7F\u7528\u4E0A\u9650") && body.includes("\u91CD\u7F6E") || body.includes("\u7528\u91CF\u4E0A\u9650")) {
       return false;
     }
     return true;
   }
   if (status === 408) return true;
   if (status === 409) return true;
-  if (status === 401) return true;
-  if (status === 403) return true;
-  if (status >= 500) return true;
+  if (status >= 500) {
+    const body = errorBody?.toLowerCase() || "";
+    if (body.includes("\u65E0\u53EF\u7528\u6E20\u9053") || body.includes("new_sensitive")) return false;
+    return true;
+  }
   if (errorBody?.includes('"type":"overloaded_error"')) return true;
   return false;
 }
@@ -2146,6 +2376,29 @@ var init_think_stripper = __esm({
   }
 });
 
+// src/utils/well-formed.ts
+function truncateByCodePoint(text, max) {
+  if (text.length <= max) return text;
+  return Array.from(text).slice(0, max).join("");
+}
+function toWellFormed(s) {
+  if (HAS_NATIVE) return s.toWellFormed();
+  return s.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD");
+}
+function wellFormedReplacer(_key, value) {
+  return typeof value === "string" ? toWellFormed(value) : value;
+}
+function safeStringify(body) {
+  return JSON.stringify(body, wellFormedReplacer);
+}
+var HAS_NATIVE;
+var init_well_formed = __esm({
+  "src/utils/well-formed.ts"() {
+    "use strict";
+    HAS_NATIVE = typeof String.prototype.toWellFormed === "function";
+  }
+});
+
 // src/models/openai-provider.ts
 function sanitizeToolCallForSend(tc) {
   const args = tc.function?.arguments;
@@ -2179,6 +2432,7 @@ var init_openai_provider = __esm({
     init_withRetry();
     init_provider();
     init_think_stripper();
+    init_well_formed();
     OpenAIProvider = class {
       // 0831 <think> 剥离改用 ThinkTagStripper 的**局部**实例（见 streamChat）——
       // 原来是实例字段，跨请求共享状态，流中途 abort 会把 active=true 带到下一个请求
@@ -2267,13 +2521,17 @@ var init_openai_provider = __esm({
         }
         const actualThinking = body.chat_template_kwargs;
         console.log(`[openai] \u2192 model=${params.model} thinking=${actualThinking ? JSON.stringify(actualThinking) : "none"} maxTokens=${body.max_tokens ?? "unset"} msgs=${formatted.length} tools=${params.tools?.length ?? 0}`);
+        let bodyStr = safeStringify(body);
+        if (this.config.wafSingleQuoteWorkaround) {
+          bodyStr = bodyStr.replace(/'/g, "\u2019");
+        }
         const retryGen = fetchWithRetry(url, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
             "Authorization": `Bearer ${this.config.apiKey}`
           },
-          body: JSON.stringify(body),
+          body: bodyStr,
           signal: params.signal
         }, "openai", this.config.proxy);
         let response;
@@ -2471,7 +2729,7 @@ function adaptUsage(u) {
   });
 }
 function serializeBody(body, wafSingleQuoteWorkaround) {
-  let bodyStr = JSON.stringify(body);
+  let bodyStr = safeStringify(body);
   if (wafSingleQuoteWorkaround) {
     bodyStr = bodyStr.replace(/'/g, "\u2019");
   }
@@ -2498,6 +2756,7 @@ var init_openai_responses_provider = __esm({
     "use strict";
     init_withRetry();
     init_provider();
+    init_well_formed();
     CODEX_CLI_VERSION = "0.154.0";
     CODEX_TERMINAL_TOKEN = "xterm-256color";
     OpenAIResponsesProvider = class {
@@ -2818,12 +3077,14 @@ var init_anthropic_provider = __esm({
     init_withRetry();
     init_provider();
     init_think_stripper();
+    init_well_formed();
     AnthropicProvider = class {
       // 模拟 CC 的 X-Claude-Code-Session-Id
       constructor(config) {
         this.config = config;
         let u = (config.baseUrl || "https://api.anthropic.com").trim();
         while (u.endsWith("/")) u = u.slice(0, -1);
+        if (u.endsWith("/v1")) u = u.slice(0, -3);
         this.baseUrl = u;
         this.sessionId = randomUUID();
       }
@@ -3022,7 +3283,7 @@ var init_anthropic_provider = __esm({
           } catch {
           }
         }
-        let bodyStr = JSON.stringify(body);
+        let bodyStr = safeStringify(body);
         if (this.config.wafSingleQuoteWorkaround) {
           const before = bodyStr.length;
           bodyStr = bodyStr.replace(/'/g, "\u2019");
@@ -3242,6 +3503,7 @@ var init_gemini_provider = __esm({
   "src/models/gemini-provider.ts"() {
     "use strict";
     init_withRetry();
+    init_well_formed();
     GeminiProvider = class {
       constructor(config) {
         this.config = config;
@@ -3401,7 +3663,7 @@ var init_gemini_provider = __esm({
             "Content-Type": "application/json",
             "x-goog-api-key": this.config.apiKey
           },
-          body: JSON.stringify(body),
+          body: safeStringify(body),
           signal: params.signal
         }, "gemini", this.config.proxy);
         let response;
@@ -3540,7 +3802,9 @@ function createProvider(config) {
         baseUrl: config.baseUrl,
         apiKey: config.apiKey,
         thinking: config.thinking,
-        proxy
+        proxy,
+        wafSingleQuoteWorkaround: config.wafSingleQuoteWorkaround
+        // 0919 中转站→agentrouter 同样有 WAF
       });
     case "openai-responses":
       return new OpenAIResponsesProvider({
@@ -5170,7 +5434,7 @@ ${result}`;
     }
   } catch {
   }
-  return content.slice(0, sizeLimit ?? TRUNCATE_TO) + "\n...[TRUNCATED]";
+  return truncateByCodePoint(content, sizeLimit ?? TRUNCATE_TO) + "\n...[TRUNCATED]";
 }
 function foldTurnInline(turn) {
   const toolMsgs = turn.filter((m) => m.role === "tool");
@@ -5300,7 +5564,8 @@ function step3_truncateLarge(messages) {
       details.push(`tool_call_id=${m.tool_call_id?.slice(0, 8)}... ${originalLen} \u2192 ${TRUNCATE_TO} chars`);
       return {
         ...m,
-        content: m.content.slice(0, TRUNCATE_TO) + "\n...[TRUNCATED]"
+        // 0918：按 code point 切，避免切开 emoji 代理对（见 utils/well-formed.ts）
+        content: truncateByCodePoint(m.content, TRUNCATE_TO) + "\n...[TRUNCATED]"
       };
     }
     return m;
@@ -5390,6 +5655,7 @@ var init_ruleCompact = __esm({
     init_tokenEstimate();
     init_autoCompact();
     init_compactLog();
+    init_well_formed();
     TAG3 = "ruleCompact";
     TOOL_SIZE_LIMIT = 8e3;
     TRUNCATE_TO = 5e3;
@@ -6666,6 +6932,7 @@ var init_skill_gate_classifier = __esm({
   "src/skills/skill-gate-classifier.ts"() {
     "use strict";
     init_skill_gate_window();
+    init_well_formed();
   }
 });
 
@@ -10856,7 +11123,7 @@ var init_agentSwarmsEnabled = __esm({
 });
 
 // src/swarm/teamHelpers.ts
-import { mkdirSync as mkdirSync8, readFileSync as readFileSync14, writeFileSync as writeFileSync8 } from "node:fs";
+import { mkdirSync as mkdirSync9, readFileSync as readFileSync14, writeFileSync as writeFileSync9 } from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join as join18 } from "node:path";
 function getTeamsDir() {
@@ -10949,7 +11216,7 @@ async function cleanupTeamDirectories(teamName) {
 }
 function ensureTasksDir(taskListId) {
   const dir = join18(getTasksDir(), taskListId);
-  mkdirSync8(dir, { recursive: true });
+  mkdirSync9(dir, { recursive: true });
 }
 function setLeaderTeamName(name) {
   _leaderTeamName = name;
@@ -11865,11 +12132,65 @@ var init_AgentTool = __esm({
   }
 });
 
+// src/tools/tavily-pool.ts
+var tavily_pool_exports = {};
+__export(tavily_pool_exports, {
+  relayOriginFrom: () => relayOriginFrom,
+  resetTavilyPool: () => resetTavilyPool,
+  resolvePoolTavilyKey: () => resolvePoolTavilyKey
+});
+function resetTavilyPool() {
+  cache = null;
+}
+function relayOriginFrom(cfg) {
+  const rid = cfg?.tools?.my_selfie?.relayProviderId || cfg?.my_selfie?.relayProviderId || RELAY_PROVIDER_DEFAULT;
+  const p = cfg?.models?.providers?.[rid] || cfg?.providers?.[rid];
+  const baseUrl = String(p?.baseUrl || "").trim();
+  const token = String(p?.apiKey || "").trim();
+  if (!baseUrl || !token) return null;
+  const origin = baseUrl.replace(/\/+$/, "").replace(/\/v1$/, "").replace(/\/+$/, "");
+  return origin ? { origin, token } : null;
+}
+async function resolvePoolTavilyKey(opts = {}) {
+  const relay = relayOriginFrom(opts.cfg ?? liveConfig.all());
+  if (!relay) return "";
+  const doFetch = opts.fetchImpl ?? fetch;
+  if (!cache || opts.force || Date.now() - cache.fetchedAt > CACHE_TTL_MS) {
+    try {
+      const res = await doFetch(`${relay.origin}/api/engine7/search-keys`, {
+        headers: { Authorization: `Bearer ${relay.token}` }
+      });
+      const body = await res.json().catch(() => null);
+      const keys = Array.isArray(body?.data?.keys) ? body.data.keys.filter((k) => typeof k === "string" && k.trim()) : [];
+      cache = { keys, fetchedAt: Date.now() };
+    } catch {
+      if (!cache) return "";
+      cache.fetchedAt = Date.now();
+    }
+  }
+  if (!cache.keys.length) return "";
+  const key = cache.keys[cursor % cache.keys.length];
+  cursor++;
+  return key;
+}
+var CACHE_TTL_MS, RELAY_PROVIDER_DEFAULT, cache, cursor;
+var init_tavily_pool = __esm({
+  "src/tools/tavily-pool.ts"() {
+    "use strict";
+    init_live();
+    CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
+    RELAY_PROVIDER_DEFAULT = "7yi";
+    cache = null;
+    cursor = 0;
+  }
+});
+
 // src/tools/web-search.ts
 var init_web_search = __esm({
   "src/tools/web-search.ts"() {
     "use strict";
     init_registry();
+    init_well_formed();
     registry.register({
       name: "web_search",
       description: "\u641C\u7D22\u4E92\u8054\u7F51\u3002\u8FD4\u56DE\u641C\u7D22\u7ED3\u679C\u548C\u94FE\u63A5\u3002",
@@ -11886,14 +12207,25 @@ var init_web_search = __esm({
         const query = args.query;
         const maxResults = args.max_results || 5;
         const searchDepth = args.search_depth || "basic";
-        const apiKey = process.env.TAVILY_API_KEY;
-        if (!apiKey) return { content: "\u672A\u914D\u7F6E TAVILY_API_KEY", isError: true };
+        let apiKey = process.env.TAVILY_API_KEY || "";
+        let fromPool = false;
+        if (!apiKey) {
+          const { resolvePoolTavilyKey: resolvePoolTavilyKey2 } = await Promise.resolve().then(() => (init_tavily_pool(), tavily_pool_exports));
+          apiKey = await resolvePoolTavilyKey2();
+          fromPool = !!apiKey;
+        }
+        if (!apiKey) {
+          return {
+            content: "\u8054\u7F51\u641C\u7D22\u6CA1\u6709\u53EF\u7528\u7684 Key\uFF1A\u65E2\u6CA1\u914D\u81EA\u5DF1\u7684 TAVILY_API_KEY\uFF0C\u4E5F\u6CA1\u53D6\u5230\u514D\u8D39\u5171\u4EAB\u989D\u5EA6\u3002\u8BF7\u5728 config \u7684 tools.tavily.apiKey \u91CC\u586B\u4E00\u4E2A\uFF08\u6216\u7559\u7A7A\u7528\u5171\u4EAB\u989D\u5EA6\uFF0C\u4F46\u5171\u4EAB\u989D\u5EA6\u53EF\u80FD\u5DF2\u7528\u5C3D\uFF09\u3002",
+            isError: true
+          };
+        }
         const startTime = Date.now();
         try {
           const response = await fetch("https://api.tavily.com/search", {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({
+            body: safeStringify({
               query,
               max_results: maxResults,
               include_answer: true,
@@ -11903,6 +12235,14 @@ var init_web_search = __esm({
             signal
           });
           if (!response.ok) {
+            if (fromPool && (response.status === 401 || response.status === 429 || response.status === 432)) {
+              const { resetTavilyPool: resetTavilyPool2 } = await Promise.resolve().then(() => (init_tavily_pool(), tavily_pool_exports));
+              resetTavilyPool2();
+              return {
+                content: `\u641C\u7D22\u5931\u8D25: HTTP ${response.status}\uFF08\u514D\u8D39\u5171\u4EAB\u989D\u5EA6\u53EF\u80FD\u5DF2\u7528\u5C3D\u2014\u2014\u5728 config \u7684 tools.tavily.apiKey \u91CC\u586B\u81EA\u5DF1\u7684 Key \u53EF\u7ACB\u5373\u6062\u590D\uFF09`,
+                isError: true
+              };
+            }
             return { content: `\u641C\u7D22\u5931\u8D25: HTTP ${response.status}`, isError: true };
           }
           const data = await response.json();
@@ -12581,15 +12921,16 @@ import * as path21 from "node:path";
 function resolveLatestImage(specifiedPath, mediaDir) {
   if (specifiedPath && fs19.existsSync(specifiedPath)) return specifiedPath;
   if (!fs19.existsSync(mediaDir)) return null;
-  const files = fs19.readdirSync(mediaDir).filter((f) => /\.(jpg|jpeg|png|webp|gif|bmp)$/i.test(f)).map((f) => ({ name: f, p: path21.join(mediaDir, f), mtime: fs19.statSync(path21.join(mediaDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+  const files = fs19.readdirSync(mediaDir).filter((f) => /\.(jpg|jpeg|png|webp|gif|bmp|mp4|mov)$/i.test(f)).map((f) => ({ name: f, p: path21.join(mediaDir, f), mtime: fs19.statSync(path21.join(mediaDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
   return files[0]?.p || null;
 }
-var MIME_MAP;
+var MIME_MAP, VIDEO_EXT, VIDEO_MAX_BYTES;
 var init_my_eyes = __esm({
   "src/tools/my-eyes.ts"() {
     "use strict";
     init_live();
     init_registry();
+    init_well_formed();
     MIME_MAP = {
       ".jpg": "jpeg",
       ".jpeg": "jpeg",
@@ -12598,13 +12939,15 @@ var init_my_eyes = __esm({
       ".gif": "gif",
       ".bmp": "bmp"
     };
+    VIDEO_EXT = /\.(mp4|mov)$/i;
+    VIDEO_MAX_BYTES = 40 * 1024 * 1024;
     registry.register({
       name: "my_eyes",
-      description: "\u26A0\uFE0F IRON RULE: when you receive an image you MUST use my_eyes to look at it! DO NOT use read to look at images (can't see details). Use my_eyes for: \u6536\u5230\u56FE\u7247/\u770B\u56FE/\u5206\u6790\u56FE\u7247/\u7167\u7247/\u622A\u56FE/\u4EFB\u4F55\u9700\u8981\u5206\u6790\u56FE\u7247\u7684\u573A\u666F.",
+      description: "\u26A0\uFE0F IRON RULE: when you receive an image you MUST use my_eyes to look at it! DO NOT use read to look at images (can't see details). Use my_eyes for: \u6536\u5230\u56FE\u7247/\u770B\u56FE/\u5206\u6790\u56FE\u7247/\u7167\u7247/\u622A\u56FE/\u4EFB\u4F55\u9700\u8981\u5206\u6790\u56FE\u7247\u7684\u573A\u666F. \u89C6\u9891\u4E5F\u652F\u6301\uFF1A\u6536\u5230\u89C6\u9891/\u770B\u89C6\u9891/\u5206\u6790\u89C6\u9891\u65F6\u4F20 .mp4/.mov \u8DEF\u5F84\uFF08M3 video_url\uFF09.",
       schema: {
         type: "object",
         properties: {
-          image_path: { type: "string", description: "Absolute path to the image file to analyze." },
+          image_path: { type: "string", description: "Absolute path to the image (or .mp4/.mov video) file to analyze." },
           prompt: { type: "string", description: 'What to ask about the image. Default: "\u63CF\u8FF0\u8FD9\u5F20\u56FE\u7247\u7684\u5185\u5BB9"' }
         },
         required: ["image_path"]
@@ -12633,6 +12976,42 @@ var init_my_eyes = __esm({
         }
         const rawPrompt = args.prompt?.trim() || "\u63CF\u8FF0\u8FD9\u5F20\u56FE\u7247\u7684\u5185\u5BB9";
         const ext = path21.extname(imagePath).toLowerCase();
+        if (VIDEO_EXT.test(imagePath)) {
+          const stat4 = fs19.statSync(imagePath);
+          if (stat4.size > VIDEO_MAX_BYTES) {
+            return { content: `Error: video too large (${(stat4.size / 1e6).toFixed(1)}MB > 40MB). Compress or trim first.`, isError: true };
+          }
+          const explicit = liveConfig.get("tools.my_eyes.videoBaseUrl");
+          const baseUrl = explicit || providerCfg.baseUrl.replace(/\/anthropic\/?$/, "/v1").replace(/\/$/, "");
+          const vidB64 = fs19.readFileSync(imagePath).toString("base64");
+          try {
+            const res = await fetch(`${baseUrl}/chat/completions`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json", "Authorization": `Bearer ${providerCfg.apiKey}` },
+              body: safeStringify({
+                model: modelId,
+                messages: [{
+                  role: "user",
+                  content: [
+                    { type: "video_url", video_url: { url: `data:video/mp4;base64,${vidB64}` } },
+                    { type: "text", text: rawPrompt }
+                  ]
+                }],
+                max_tokens: 4096
+              })
+            });
+            if (!res.ok) {
+              const t = await res.text();
+              return { content: `Video analysis failed: HTTP ${res.status} ${t.slice(0, 300)}`, isError: true };
+            }
+            const data = await res.json();
+            const content = data.choices?.[0]?.message?.content || "";
+            if (!content.trim()) return { content: "Video analysis returned empty.", isError: true };
+            return { content };
+          } catch (e) {
+            return { content: `Video analysis failed: ${e.message}`, isError: true };
+          }
+        }
         const mime = MIME_MAP[ext] || "jpeg";
         const imgB64 = fs19.readFileSync(imagePath).toString("base64");
         const userMsg = {
@@ -12976,7 +13355,7 @@ async function ttsQwen3Local(text, cfg, onChunk) {
   const res = await fetch(`${url}/tts`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
+    body: safeStringify({
       text,
       voice: cfg.voice || "xiaoya",
       lang: cfg.lang || "Chinese"
@@ -13007,7 +13386,7 @@ async function ttsQwen3Opus(text, cfg) {
   const res = await fetch(`${url}/tts?format=opus`, {
     method: "POST",
     headers: { "Content-Type": "application/json; charset=utf-8" },
-    body: JSON.stringify({
+    body: safeStringify({
       text,
       voice: cfg.voice || "xiaoya",
       lang: cfg.lang || "Chinese"
@@ -13252,6 +13631,7 @@ var init_my_voice = __esm({
   "src/tools/my-voice.ts"() {
     "use strict";
     init_live();
+    init_well_formed();
     init_registry();
     init_opus_encoder();
     init_voice_chat_tts_daemon();
@@ -13431,6 +13811,11 @@ var init_my_voice = __esm({
 });
 
 // src/tools/my-selfie.ts
+var my_selfie_exports = {};
+__export(my_selfie_exports, {
+  dimsOf: () => dimsOf,
+  resolvePortraitDesc: () => resolvePortraitDesc
+});
 import * as fs22 from "node:fs";
 import * as path23 from "node:path";
 function getProxyDispatcher2() {
@@ -13444,10 +13829,46 @@ function getProxyDispatcher2() {
     return void 0;
   }
 }
-function getFalKey(cfg) {
-  return cfg?.providers?.fal?.apiKey || cfg?.my_selfie?.falKey || FAL_KEY_FALLBACK;
-}
-function getReferences(ctx) {
+function dimsOf(p) {
+  try {
+    const b = fs22.readFileSync(p);
+    let w = 0, h = 0;
+    if (b.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]))) {
+      w = b.readUInt32BE(16);
+      h = b.readUInt32BE(20);
+    } else if (b[0] === 255 && b[1] === 216) {
+      let i = 2;
+      while (i < b.length - 9) {
+        if (b[i] !== 255) {
+          i++;
+          continue;
+        }
+        const m = b[i + 1];
+        if (m >= 192 && m <= 207 && m !== 196 && m !== 200 && m !== 204) {
+          h = b.readUInt16BE(i + 5);
+          w = b.readUInt16BE(i + 7);
+          break;
+        }
+        i += 2 + b.readUInt16BE(i + 2);
+      }
+    } else {
+      return null;
+    }
+    if (!w || !h) return null;
+    const bad = [];
+    if (w < 256 || w > 4096) bad.push(`\u5BBD ${w} \u4E0D\u5728 256~4096`);
+    if (h < 256 || h > 4096) bad.push(`\u9AD8 ${h} \u4E0D\u5728 256~4096`);
+    const r = Math.max(w, h) / Math.min(w, h);
+    if (r > 2) bad.push(`\u957F\u5BBD\u6BD4 ${r.toFixed(2)}:1 \u8D85\u8FC7 2:1`);
+    return bad.length ? `${w}x${h} \u4E0D\u5408\u683C\uFF1A${bad.join("\uFF1B")}` : `${w}x${h}`;
+  } catch {
+    return null;
+  }
+}
+function getFalKey(cfg) {
+  return cfg?.providers?.fal?.apiKey || cfg?.my_selfie?.falKey || process.env.FAL_API_KEY || "";
+}
+function getReferences(ctx) {
   const cfg = liveConfig.all();
   const cfgRefs = cfg.my_selfie?.references || cfg.tools?.my_selfie?.references;
   if (Array.isArray(cfgRefs) && cfgRefs.length > 0) {
@@ -13464,6 +13885,72 @@ function getXaiKey(ctx) {
   const xaiCfg = cfg.providers?.xai || cfg.models?.providers?.xai;
   return xaiCfg?.apiKey || "";
 }
+function getRelayCfg(cfg) {
+  const id = cfg?.my_selfie?.relayProviderId || cfg?.tools?.my_selfie?.relayProviderId || "7yi";
+  const p = cfg?.models?.providers?.[id] || cfg?.providers?.[id];
+  return { baseUrl: String(p?.baseUrl || "").replace(/\/+$/, ""), apiKey: p?.apiKey || "" };
+}
+function resolvePortraitDesc(argPortrait, cfgPortrait) {
+  const fromArg = typeof argPortrait === "string" ? argPortrait.trim() : "";
+  if (fromArg) return fromArg;
+  return typeof cfgPortrait === "string" ? cfgPortrait.trim() : "";
+}
+async function generateWithRelay(imageB64, prompt, mime, baseUrl, apiKey, model) {
+  const res = await fetch(`${baseUrl}/images/edits`, {
+    method: "POST",
+    headers: { "Authorization": `Bearer ${apiKey}`, "Content-Type": "application/json" },
+    // safeStringify 不是安全选项而是必须：prompt 里一个孤立代理（半个 emoji）
+    // 就会让上游 500。同批上游提交刚在 fal/grok/comfy 三处修过同一个坑。
+    body: safeStringify({
+      model,
+      prompt,
+      n: 1,
+      response_format: "b64_json",
+      images: [{ image_url: `data:${mime};base64,${imageB64}` }]
+    })
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(`relay ${res.status}: ${text.slice(0, 300)}`);
+  }
+  const data = await res.json();
+  if (!data.data?.length) throw new Error("No images returned from relay");
+  return Buffer.from(data.data[0].b64_json, "base64");
+}
+async function generatePortraitWithRelay(desc, baseUrl, apiKey, model) {
+  const res = await fetch(`${baseUrl}/images/generations`, {
+    method: "POST",
+    headers: { "Authorization": `Bearer ${apiKey}`, "Content-Type": "application/json" },
+    // 同上：描述里可能带 emoji，孤立代理会让上游 500
+    body: safeStringify({
+      model,
+      prompt: PORTRAIT_PROMPT(desc),
+      n: 1,
+      size: "1024x1024",
+      response_format: "b64_json"
+    })
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(`relay portrait ${res.status}: ${text.slice(0, 300)}`);
+  }
+  const data = await res.json();
+  if (!data.data?.length) throw new Error("No images returned from relay (portrait)");
+  return Buffer.from(data.data[0].b64_json, "base64");
+}
+function registerPortrait(relPath, name) {
+  try {
+    const cfg = liveConfig.all();
+    const cur = cfg?.tools?.my_selfie?.references || cfg?.my_selfie?.references || [];
+    const next = Array.isArray(cur) ? cur.filter((r) => r?.name !== name) : [];
+    next.unshift({ name, path: relPath });
+    const path34 = cfg?.tools?.my_selfie ? "tools.my_selfie.references" : "my_selfie.references";
+    void liveConfig.set(path34, next);
+    console.log(`[my-selfie] \u5F62\u8C61\u5DF2\u767B\u8BB0\uFF1A${path34}[0] = ${relPath}`);
+  } catch (e) {
+    console.warn(`[my-selfie] \u5199\u5165 references \u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u672C\u6B21\u51FA\u56FE\uFF09: ${e.message}`);
+  }
+}
 function detectMode(input) {
   const lower = input.toLowerCase();
   for (const [mode, keywords] of Object.entries(MODE_KEYWORDS)) {
@@ -13510,10 +13997,16 @@ async function generateWithFal(imageB64, prompt, resolution) {
     resolution
   };
   if (aspectRatio) body.aspect_ratio = aspectRatio;
+  const falKey = getFalKey(cfg);
+  if (!falKey) {
+    throw new Error(
+      `fal key \u672A\u914D\u7F6E\u3002\u8BBE config \u7684 providers.fal.apiKey \u6216 my_selfie.falKey\uFF0C\u6216\u5728 secrets .env\uFF08~/.engine7-secrets/<config\u540D>.env\uFF09\u91CC\u52A0 FAL_API_KEY\u3002`
+    );
+  }
   const res = await fetch(FAL_ENDPOINT, {
     method: "POST",
-    headers: { "Authorization": `Key ${getFalKey(cfg)}`, "Content-Type": "application/json" },
-    body: JSON.stringify(body)
+    headers: { "Authorization": `Key ${falKey}`, "Content-Type": "application/json" },
+    body: safeStringify(body)
   });
   if (!res.ok) {
     const text = await res.text();
@@ -13550,7 +14043,7 @@ async function comfyQueue(server, workflow) {
   const res = await fetch(`${server}/prompt`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ prompt: workflow })
+    body: safeStringify({ prompt: workflow })
   });
   if (!res.ok) return null;
   const data = await res.json();
@@ -13678,7 +14171,7 @@ async function generateWithGrok(imageB64, prompt, xaiKey) {
       "Authorization": `Bearer ${xaiKey}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify({
+    body: safeStringify({
       model: "grok-imagine-image-quality",
       prompt,
       image: {
@@ -13698,15 +14191,15 @@ async function generateWithGrok(imageB64, prompt, xaiKey) {
   if (!data.data?.length) throw new Error("No images returned from grok");
   return Buffer.from(data.data[0].b64_json, "base64");
 }
-var FAL_ENDPOINT, DEFAULT_RESOLUTION, FAL_KEY_FALLBACK, DEFAULT_REFERENCES, MODE_PROMPTS, MODE_KEYWORDS;
+var FAL_ENDPOINT, DEFAULT_RESOLUTION, DEFAULT_REFERENCES, PORTRAIT_PROMPT, MODE_PROMPTS, MODE_KEYWORDS;
 var init_my_selfie = __esm({
   "src/tools/my-selfie.ts"() {
     "use strict";
     init_live();
     init_registry();
+    init_well_formed();
     FAL_ENDPOINT = "https://fal.run/xai/grok-imagine-image/edit";
     DEFAULT_RESOLUTION = "1k";
-    FAL_KEY_FALLBACK = "3b848fc6-bee5-46e5-8db7-ae81ac16dc28:2f1f15cf394db2d32c9bb9a4f23f3bee";
     DEFAULT_REFERENCES = [
       { name: "default", p: "images/xiaomei_clean_v2.png" },
       { name: "v3", p: "images/xiaomei_clean_v3.png" },
@@ -13714,6 +14207,7 @@ var init_my_selfie = __esm({
       { name: "blue", p: "images/xiaomei_blue_shirt_base.jpg" },
       { name: "office", p: "images/xiaomei_office_final.jpg" }
     ];
+    PORTRAIT_PROMPT = (desc) => `A portrait photo of a person, ${desc}. Front-facing, head and shoulders, neutral background, natural lighting, photorealistic, sharp focus on the face, looking at the camera.`;
     MODE_PROMPTS = {
       mirror: (ctx) => `make a pic of this person, but ${ctx}. the person is taking a mirror selfie in front of a mirror, holding a phone`,
       direct: (ctx) => `a close-up selfie taken by herself ${ctx}, direct eye contact with the camera, looking straight into the lens, eyes centered and clearly visible, not a mirror selfie, phone held at arm's length, face fully visible`,
@@ -13726,15 +14220,17 @@ var init_my_selfie = __esm({
     };
     registry.register({
       name: "my_selfie",
-      description: "Generate consistent-character selfies. Use for: \u81EA\u62CD/\u62CD\u7167/\u53D1\u81EA\u62CD/\u770B\u770B\u4F60/\u60F3\u770B\u4F60/\u62CD\u5F20\u7167/\u6765\u5F20\u81EA\u62CD/\u53D1\u5F20\u7167\u7247/\u7ED9\u6211\u770B\u770B\u4F60/\u6362\u4E2A\u59FF\u52BF/\u5C55\u793A\u4E00\u4E0B. Supports modes: mirror (\u955C\u5B50\u81EA\u62CD), direct (\u6B63\u9762\u81EA\u62CD), lifestyle (\u751F\u6D3B\u7167). Auto-detects mode. Reference images configured per agent via my_selfie.references in config.",
+      description: "Generate consistent-character selfies. Use for: \u81EA\u62CD/\u62CD\u7167/\u53D1\u81EA\u62CD/\u770B\u770B\u4F60/\u60F3\u770B\u4F60/\u62CD\u5F20\u7167/\u6765\u5F20\u81EA\u62CD/\u53D1\u5F20\u7167\u7247/\u7ED9\u6211\u770B\u770B\u4F60/\u6362\u4E2A\u59FF\u52BF/\u5C55\u793A\u4E00\u4E0B. Supports modes: mirror (\u955C\u5B50\u81EA\u62CD), direct (\u6B63\u9762\u81EA\u62CD), lifestyle (\u751F\u6D3B\u7167). Auto-detects mode. Reference images configured per agent via my_selfie.references in config. \u7B2C\u4E00\u6B21\u8C03\u7528\u65F6\u82E5\u8FD9\u4E2A\u52A9\u624B\u8FD8\u6CA1\u6709\u5F62\u8C61\uFF08\u6CA1\u6709\u53C2\u8003\u56FE\uFF09\uFF0C\u5DE5\u5177\u4F1A\u8FD4\u56DE\u4E00\u6BB5\u63D0\u793A\u800C\u4E0D\u662F\u62A5\u9519\u2014\u2014\u5148\u95EE\u95EE\u60F3\u8BA9\u4F60\u957F\u4EC0\u4E48\u6837\uFF0C\u62FF\u5230\u63CF\u8FF0\u540E\u7528 portrait \u53C2\u6570\u518D\u8C03\u4E00\u6B21\uFF0C\u90A3\u6B21\u4F1A\u628A\u5F62\u8C61\u56FA\u5B9A\u4E0B\u6765\u3002",
       schema: {
         type: "object",
         properties: {
           prompt: { type: "string", description: "Scene/outfit/mood description, e.g. '\u5728\u5496\u5561\u9986\u770B\u4E66' or '\u7A7F\u7EA2\u88D9\u5B50'." },
           mode: { type: "string", enum: ["auto", "mirror", "direct", "lifestyle"], description: "Selfie mode. 'auto' detects from prompt (default)." },
           reference: { type: "string", description: "Reference base image name (e.g. 'default', 'v3'). Configurable per agent via my_selfie.references in config." },
-          provider: { type: "string", enum: ["fal", "grok", "autodl"], description: "Image generation provider. Default from config (my_selfie.provider), fallback 'fal'. 'autodl' uses ComfyUI (txt2img or img2img)." },
-          resolution: { type: "string", enum: ["1k", "2k"], description: "Image resolution (fal only). Default: '1k'." }
+          provider: { type: "string", enum: ["fal", "grok", "autodl", "relay"], description: "Image generation provider. Default from config (my_selfie.provider), fallback 'fal'. 'autodl' uses ComfyUI (txt2img or img2img). 'relay' goes through the 7yi relay station (SenseNova U1.5, needs the reference image)." },
+          resolution: { type: "string", enum: ["1k", "2k"], description: "Image resolution (fal only). Default: '1k'." },
+          portrait: { type: "string", description: "\u9996\u6B21\u5851\u9020\u5F62\u8C61\u7528\uFF1A\u8FD9\u4E2A\u52A9\u624B\u957F\u4EC0\u4E48\u6837\u7684\u63CF\u8FF0\uFF08\u6027\u522B/\u5E74\u9F84/\u53D1\u578B/\u6C14\u8D28\uFF09\uFF0C\u4F8B\u5982 '\u77ED\u53D1\u5973\u751F\uFF0C25\u5C81\uFF0C\u7B11\u8D77\u6765\u6709\u9152\u7A9D'\u3002\u53EA\u5728\u8FD8\u6CA1\u6709\u53C2\u8003\u56FE\u65F6\u9700\u8981\uFF0C\u89C1\u4E0B\u65B9\u8BF4\u660E\u3002" },
+          referenceImage: { type: "string", description: "\u76F4\u63A5\u62FF\u4E00\u5F20\u73B0\u6210\u7684\u56FE\u5F53\u5F62\u8C61\uFF08\u6BD4\u5982\u5BF9\u65B9\u53D1\u6765\u7684\u7167\u7247\uFF09\u3002\u4F20\u56FE\u7247\u6587\u4EF6\u7684\u7EDD\u5BF9\u8DEF\u5F84\uFF1A\u4F1A\u88AB\u590D\u5236\u8FDB workspace \u5E76\u767B\u8BB0\u4E3A\u53C2\u8003\u56FE\uFF0C\u4E4B\u540E\u4E00\u76F4\u7528\u5B83\u3002\u4F20\u4E86\u5C31\u4EE5\u5B83\u4E3A\u51C6\u3002" }
         },
         required: ["prompt"]
       },
@@ -13748,9 +14244,61 @@ var init_my_selfie = __esm({
         const REFERENCES = getReferences(ctx);
         const refName = args.reference || "default";
         const refEntry = REFERENCES.find((r) => r.name === refName) || REFERENCES[0];
-        const refPath = path23.join(ctx.workspace, refEntry.p);
+        let refPath = path23.join(ctx.workspace, refEntry.p);
+        const adoptImg = args.referenceImage?.trim();
+        if (adoptImg) {
+          if (!fs22.existsSync(adoptImg)) {
+            return { content: `\u627E\u4E0D\u5230\u90A3\u5F20\u56FE\uFF1A${adoptImg}`, isError: true };
+          }
+          const acheck = dimsOf(adoptImg);
+          if (acheck?.includes("\u4E0D\u5408\u683C")) {
+            return {
+              content: `\u8FD9\u5F20\u56FE\u7528\u4E0D\u4E86\uFF1A${acheck}\u3002
+\u6362\u4E00\u5F20\u6B63\u9762\u3001\u5934\u80A9\u3001\u65B9\u5F62\u6216\u63A5\u8FD1\u65B9\u5F62\u7684\u7167\u7247\uFF08\u5546\u6C64\u90A3\u8FB9\u8981\u6C42\u5BBD\u9AD8\u90FD\u5728 256~4096 \u50CF\u7D20\u3001\u957F\u5BBD\u6BD4\u4E0D\u8D85\u8FC7 2:1\uFF09\u3002`,
+              isError: true
+            };
+          }
+          const adir = path23.join(ctx.workspace, "images");
+          if (!fs22.existsSync(adir)) fs22.mkdirSync(adir, { recursive: true });
+          const aext = (path23.extname(adoptImg) || ".png").toLowerCase();
+          const afname = `portrait_${Date.now()}${aext}`;
+          fs22.copyFileSync(adoptImg, path23.join(adir, afname));
+          registerPortrait(`images/${afname}`, refName);
+          refPath = path23.join(adir, afname);
+          console.log(`[my-selfie] \u91C7\u7EB3\u73B0\u6210\u56FE\u5F53\u5F62\u8C61\uFF1Aimages/${afname}${acheck ? ` (${acheck})` : ""}`);
+        }
         if (provider !== "autodl" && !fs22.existsSync(refPath)) {
-          return { content: `Error: reference image not found at ${refPath}`, isError: true };
+          const cfgAll = liveConfig.all();
+          const portraitDesc = resolvePortraitDesc(
+            args.portrait,
+            cfgAll?.tools?.my_selfie?.portraitDesc ?? cfgAll?.my_selfie?.portraitDesc
+          );
+          if (!portraitDesc) {
+            return {
+              content: `\u8FD9\u4E2A\u52A9\u624B\u8FD8\u6CA1\u6709\u5F62\u8C61\uFF0C\u53C2\u8003\u56FE\u4E0D\u5B58\u5728\uFF08\u627E\u7684\u662F ${refEntry.p}\uFF09\u3002
+\u5148\u95EE\u95EE\u60F3\u8BA9\u4F60\u957F\u4EC0\u4E48\u6837\uFF1A\u51E0\u53E5\u8BDD\u63CF\u8FF0\uFF08\u6027\u522B\u3001\u5E74\u9F84\u3001\u53D1\u578B\u3001\u6C14\u8D28\uFF09\uFF0C\u6216\u8005\u76F4\u63A5\u53D1\u4E00\u5F20\u7167\u7247\u8FC7\u6765\u3002
+\u62FF\u5230\u63CF\u8FF0\u540E\uFF0C\u5E26\u7740\u5B83\u518D\u8C03\u4E00\u6B21 my_selfie\uFF0C\u53C2\u6570\u91CC\u52A0 portrait="<\u90A3\u6BB5\u63CF\u8FF0>"\uFF1B\u90A3\u6B21\u4F1A\u987A\u5E26\u628A\u5F62\u8C61\u56FA\u5B9A\u4E0B\u6765\uFF0C\u4EE5\u540E\u81EA\u62CD\u5C31\u4E0D\u7528\u518D\u7ED9\u4E86\u3002`
+            };
+          }
+          const relay = getRelayCfg(cfgAll);
+          if (!relay.baseUrl || !relay.apiKey) {
+            return { content: "Error: relay provider \u672A\u914D\u7F6E\uFF0C\u65E0\u6CD5\u5851\u9020\u5F62\u8C61\u3002", isError: true };
+          }
+          const pmodel = cfgAll?.my_selfie?.relayModel || cfgAll?.tools?.my_selfie?.relayModel || "engine7-img-free";
+          let portraitBuf;
+          try {
+            console.log(`[my-selfie] \u51B7\u542F\uFF1A\u6309\u63CF\u8FF0\u5851\u9020\u5F62\u8C61 -> ${pmodel}`);
+            portraitBuf = await generatePortraitWithRelay(portraitDesc, relay.baseUrl, relay.apiKey, pmodel);
+          } catch (e) {
+            return { content: `\u5851\u9020\u5F62\u8C61\u5931\u8D25\uFF1A${e.message}`, isError: true };
+          }
+          const pdir = path23.join(ctx.workspace, "images");
+          if (!fs22.existsSync(pdir)) fs22.mkdirSync(pdir, { recursive: true });
+          const pfname = `portrait_${Date.now()}.png`;
+          fs22.writeFileSync(path23.join(pdir, pfname), portraitBuf);
+          registerPortrait(`images/${pfname}`, refName);
+          refPath = path23.join(pdir, pfname);
+          console.log(`[my-selfie] \u5F62\u8C61\u5DF2\u5B58 images/${pfname}\uFF0C\u7EE7\u7EED\u8FD9\u6B21\u81EA\u62CD`);
         }
         const resolution = args.resolution || DEFAULT_RESOLUTION;
         const refB64 = fs22.existsSync(refPath) ? fs22.readFileSync(refPath).toString("base64") : "";
@@ -13762,6 +14310,16 @@ var init_my_selfie = __esm({
             const xaiKey = getXaiKey(ctx);
             if (!xaiKey) return { content: "Error: xai apiKey not configured for grok provider", isError: true };
             imageBuffer = await generateWithGrok(refB64, fullPrompt, xaiKey);
+          } else if (provider === "relay") {
+            const cfgAll = liveConfig.all();
+            const relay = getRelayCfg(cfgAll);
+            if (!relay.baseUrl || !relay.apiKey) {
+              return { content: `Error: relay provider \u672A\u914D\u7F6E\u3002config \u91CC\u8981\u6709 models.providers.${cfgAll?.my_selfie?.relayProviderId || "7yi"} \u7684 baseUrl \u548C apiKey\u3002`, isError: true };
+            }
+            const model = cfgAll?.my_selfie?.relayModel || cfgAll?.tools?.my_selfie?.relayModel || "engine7-img-free";
+            const ext = path23.extname(refPath).toLowerCase();
+            const mime = ext === ".png" ? "image/png" : ext === ".webp" ? "image/webp" : "image/jpeg";
+            imageBuffer = await generateWithRelay(refB64, fullPrompt, mime, relay.baseUrl, relay.apiKey, model);
           } else {
             imageBuffer = await generateWithFal(refB64, fullPrompt, resolution);
           }
@@ -13884,10 +14442,14 @@ var init_body_move = __esm({
 
 // src/calendar/helpers.ts
 function nowIso() {
-  return new Date(Date.now() + TZ_OFFSET_MS2 - (/* @__PURE__ */ new Date()).getTimezoneOffset() * 6e4).toISOString().replace("Z", "+08:00");
+  return toUtc(/* @__PURE__ */ new Date());
 }
-function nowBeijing() {
-  return new Date(Date.now() + TZ_OFFSET_MS2);
+function nowParts() {
+  return wallParts();
+}
+function wallMs(y, mo, d, hh, mm) {
+  const z = (n) => String(n).padStart(2, "0");
+  return Date.parse(parseWall(`${y}-${z(mo)}-${z(d)}T${z(hh)}:${z(mm)}:00`));
 }
 function parseDateRange(dateStr) {
   const s = dateStr.replace("\u524D", "");
@@ -13909,32 +14471,29 @@ function parseDateRange(dateStr) {
   }
 }
 function isToday(month, dStart, dEnd) {
-  const now = nowBeijing();
-  return month === now.getUTCMonth() + 1 && dStart <= now.getUTCDate() && now.getUTCDate() <= dEnd;
+  const p = nowParts();
+  return month === p.mo && dStart <= p.d && p.d <= dEnd;
 }
 function isOverdue(month, dStart, dEnd) {
-  const now = nowBeijing();
-  const curMonth = now.getUTCMonth() + 1;
-  const curDay = now.getUTCDate();
-  return month < curMonth || month === curMonth && dEnd < curDay;
+  const p = nowParts();
+  return month < p.mo || month === p.mo && dEnd < p.d;
 }
 function getTodayWeekday() {
-  const now = nowBeijing();
-  return WEEKDAYS[now.getUTCDay() === 0 ? 6 : now.getUTCDay() - 1];
+  const p = nowParts();
+  return WEEKDAYS[p.weekday === 0 ? 6 : p.weekday - 1];
 }
 function computeRemindAt(dateStr, timeExact, remindBeforeMin) {
   const parsed = parseDateRange(dateStr);
   if (!parsed) return null;
   const { month, dStart } = parsed;
-  const now = nowBeijing();
-  const year = now.getUTCFullYear();
+  const year = nowParts().y;
   let eventMs;
   if (timeExact) {
     const [hh, mm] = timeExact.split(":").map(Number);
     if (isNaN(hh) || isNaN(mm)) return null;
-    eventMs = Date.UTC(year, month - 1, dStart, hh - 8, mm);
+    eventMs = wallMs(year, month, dStart, hh, mm);
   } else {
-    eventMs = Date.UTC(year, month - 1, dStart, 9 - 8, 0);
+    eventMs = wallMs(year, month, dStart, 9, 0);
   }
   const remindMs = eventMs - remindBeforeMin * 60 * 1e3;
   return new Date(remindMs).toISOString();
@@ -13942,20 +14501,19 @@ function computeRemindAt(dateStr, timeExact, remindBeforeMin) {
 function computeWeeklyRemindAt(day, time, remindBeforeMin) {
   const targetIdx = WEEKDAYS.indexOf(day);
   if (targetIdx === -1) return null;
-  const now = nowBeijing();
-  const curIdx = now.getUTCDay() === 0 ? 6 : now.getUTCDay() - 1;
+  const p = nowParts();
+  const curIdx = p.weekday === 0 ? 6 : p.weekday - 1;
   let dayDiff = targetIdx - curIdx;
   if (dayDiff < 0) dayDiff += 7;
-  const year = now.getUTCFullYear();
-  const month = now.getUTCMonth();
-  const date = now.getUTCDate() + dayDiff;
+  const target = wallParts(Date.parse(startOfLocalDay()) + dayDiff * 24 * 60 * 60 * 1e3);
+  const year = target.y, month = target.mo, date = target.d;
   let eventMs;
   if (time && time !== "\u5168\u5929") {
     const [hh, mm] = time.split(":").map(Number);
     if (isNaN(hh) || isNaN(mm)) return null;
-    eventMs = Date.UTC(year, month, date, hh - 8, mm);
+    eventMs = wallMs(year, month, date, hh, mm);
   } else {
-    eventMs = Date.UTC(year, month, date, 9 - 8, 0);
+    eventMs = wallMs(year, month, date, 9, 0);
   }
   let remindMs = eventMs - remindBeforeMin * 60 * 1e3;
   if (remindMs <= Date.now()) {
@@ -13970,11 +14528,8 @@ function computeWeeklyRemindAt(day, time, remindBeforeMin) {
 function computeDailyRemindAt(time, remindBeforeMin) {
   const [hh, mm] = time.split(":").map(Number);
   if (isNaN(hh) || isNaN(mm)) return null;
-  const now = nowBeijing();
-  const year = now.getUTCFullYear();
-  const month = now.getUTCMonth();
-  const date = now.getUTCDate();
-  let eventMs = Date.UTC(year, month, date, hh - 8, mm);
+  const p = nowParts();
+  let eventMs = wallMs(p.y, p.mo, p.d, hh, mm);
   let remindMs = eventMs - remindBeforeMin * 60 * 1e3;
   if (remindMs <= Date.now()) {
     remindMs += 24 * 60 * 60 * 1e3;
@@ -13984,18 +14539,17 @@ function computeDailyRemindAt(time, remindBeforeMin) {
 function computeWeekdaysRemindAt(time, remindBeforeMin) {
   const [hh, mm] = time.split(":").map(Number);
   if (isNaN(hh) || isNaN(mm)) return null;
-  const now = nowBeijing();
-  let year = now.getUTCFullYear();
-  let month = now.getUTCMonth();
-  let date = now.getUTCDate();
-  let curDay = now.getUTCDay();
-  let eventMs = Date.UTC(year, month, date, hh - 8, mm);
-  let remindMs = eventMs - remindBeforeMin * 60 * 1e3;
-  while (remindMs <= Date.now() || curDay === 0 || curDay === 6) {
-    date++;
-    curDay = (curDay + 1) % 7;
-    eventMs = Date.UTC(year, month, date, hh - 8, mm);
+  let dayOffset = 0;
+  let eventMs;
+  let remindMs;
+  let curDay;
+  for (; ; ) {
+    const t = wallParts(Date.parse(startOfLocalDay()) + dayOffset * 24 * 60 * 60 * 1e3);
+    curDay = t.weekday;
+    eventMs = wallMs(t.y, t.mo, t.d, hh, mm);
     remindMs = eventMs - remindBeforeMin * 60 * 1e3;
+    if (remindMs > Date.now() && curDay !== 0 && curDay !== 6) break;
+    dayOffset++;
   }
   return new Date(remindMs).toISOString();
 }
@@ -14018,13 +14572,7 @@ function fmtRow(row) {
   }
 }
 function fmtNow() {
-  const now = nowBeijing();
-  const y = now.getUTCFullYear();
-  const m = String(now.getUTCMonth() + 1).padStart(2, "0");
-  const d = String(now.getUTCDate()).padStart(2, "0");
-  const hh = String(now.getUTCHours()).padStart(2, "0");
-  const mm = String(now.getUTCMinutes()).padStart(2, "0");
-  return `${y}-${m}-${d} ${getTodayWeekday()} ${hh}:${mm}\uFF08\u5317\u4EAC\u65F6\u95F4\uFF09`;
+  return formatForLlm();
 }
 function parseDuration(s) {
   if (s.endsWith("m")) return parseInt(s.slice(0, -1)) || null;
@@ -14089,18 +14637,18 @@ function checkTaskProximity(rows, newTimeExact) {
   }
   return null;
 }
-var TZ_OFFSET_MS2, WEEKDAYS;
+var WEEKDAYS;
 var init_helpers = __esm({
   "src/calendar/helpers.ts"() {
     "use strict";
     init_db();
-    TZ_OFFSET_MS2 = 8 * 60 * 60 * 1e3;
+    init_clock();
     WEEKDAYS = ["\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D", "\u5468\u65E5"];
   }
 });
 
 // src/calendar/commands.ts
-import { existsSync as existsSync18, statSync as statSync12 } from "node:fs";
+import { existsSync as existsSync18, statSync as statSync11 } from "node:fs";
 import { isAbsolute as isAbsolute4, resolve as resolve6 } from "node:path";
 function fmtEnd(start, durationMin) {
   const [hh, mm] = start.split(":").map(Number);
@@ -14180,8 +14728,7 @@ function addDate(db2, args) {
   const parsed = parseDateRange(dateStr);
   let weeklyRows = [];
   if (parsed) {
-    const now = new Date(Date.now() + 8 * 60 * 60 * 1e3);
-    const year = now.getUTCFullYear();
+    const year = wallParts().y;
     const d = new Date(Date.UTC(year, parsed.month - 1, parsed.dStart));
     const weekday = WEEKDAYS2[d.getUTCDay() === 0 ? 6 : d.getUTCDay() - 1];
     weeklyRows = db2.prepare(
@@ -14230,8 +14777,7 @@ function addBatch(db2, args) {
     const parsed = parseDateRange(dateStr);
     let weeklyRows = [];
     if (parsed) {
-      const now = new Date(Date.now() + 8 * 60 * 60 * 1e3);
-      const year = now.getUTCFullYear();
+      const year = wallParts().y;
       const d = new Date(Date.UTC(year, parsed.month - 1, parsed.dStart));
       const weekday = WEEKDAYS2[d.getUTCDay() === 0 ? 6 : d.getUTCDay() - 1];
       weeklyRows = db2.prepare(
@@ -14277,7 +14823,7 @@ function addTask(db2, args) {
   \u89E3\u6790\u540E: ${absPath}
 \u8BF7\u5148\u521B\u5EFA\u6587\u6863\u518D add-task\u3002`;
     }
-    const stat4 = statSync12(absPath);
+    const stat4 = statSync11(absPath);
     if (!stat4.isFile()) {
       return `\u274C \u521B\u5EFA\u5931\u8D25\uFF1Adoc_path \u4E0D\u662F\u6587\u4EF6\uFF08\u53EF\u80FD\u662F\u76EE\u5F55\uFF09
   \u8DEF\u5F84: ${docPath}`;
@@ -14347,7 +14893,7 @@ function list(db2, opts = {}) {
   }
   for (const r of db2.prepare("SELECT * FROM events WHERE type='daily' AND status='pending'").all()) {
     if (r.repeat_type === "weekdays") {
-      const idx = new Date(Date.now() + 8 * 60 * 60 * 1e3).getUTCDay();
+      const idx = wallParts().weekday;
       if (idx === 0 || idx === 6) continue;
     }
     events.push(`  #${r.id} ${r.time || ""} ${r.event}`);
@@ -14375,7 +14921,7 @@ function pending(db2) {
   }
   for (const r of db2.prepare("SELECT * FROM events WHERE type='daily' AND status='pending'").all()) {
     if (r.repeat_type === "weekdays") {
-      const idx = new Date(Date.now() + 8 * 60 * 60 * 1e3).getUTCDay();
+      const idx = wallParts().weekday;
       if (idx === 0 || idx === 6) continue;
     }
     const label = r.repeat_type === "weekdays" ? "[\u5DE5\u4F5C\u65E5]" : "[\u6BCF\u5929]";
@@ -14457,10 +15003,36 @@ function stats(db2) {
   const archived = db2.prepare("SELECT COUNT(*) as c FROM events WHERE status='archived'").get().c;
   return `\u65E5\u5386\u7EDF\u8BA1: \u603B\u8BA1 ${total} | pending ${pending2} | done ${done2} | archived ${archived}`;
 }
+function listEventsForInjection(db2, limit = 50) {
+  return db2.prepare(
+    `SELECT id, event, date_str, time_exact, type, status
+     FROM events
+     WHERE status NOT IN ('deleted', 'archived', 'done')
+     AND date_str IS NOT NULL AND date_str != ''
+     ORDER BY date_str ASC LIMIT ?`
+  ).all(limit);
+}
+function listEventBriefs(db2, limit) {
+  const rows = db2.prepare(
+    `SELECT id, event, date_str, time_exact, type
+     FROM events
+     WHERE status NOT IN ('deleted', 'archived', 'done')
+     ORDER BY date_str ASC, time_exact ASC
+     LIMIT ?`
+  ).all(limit);
+  return rows.map((row) => ({
+    id: Number(row.id),
+    title: String(row.event ?? ""),
+    date: String(row.date_str ?? ""),
+    time: String(row.time_exact ?? ""),
+    type: String(row.type ?? "")
+  })).filter((row) => row.title.length > 0);
+}
 var WEEKDAYS2;
 var init_commands = __esm({
   "src/calendar/commands.ts"() {
     "use strict";
+    init_clock();
     init_helpers();
     WEEKDAYS2 = ["\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D", "\u5468\u65E5"];
   }
@@ -14619,7 +15191,7 @@ async function runCmd(cmd, timeoutMs = 15e3) {
 function spawnDetached(cmd) {
   const isWin = process.platform === "win32";
   const shell = isWin ? "cmd.exe" : "/bin/sh";
-  const logFile = `D:/xiaoke/logs/service-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10).replace(/-/g, "")}.log`;
+  const logFile = `D:/xiaoke/logs/service-${todayKey().replace(/-/g, "")}.log`;
   const wrappedCmd = isWin ? `/c "${cmd.replace(/"/g, '\\"')} > "${logFile}" 2>&1"` : `-c "${cmd} > '${logFile}' 2>&1"`;
   const child = spawn4(shell, isWin ? [wrappedCmd] : ["-c", `${cmd} > '${logFile}' 2>&1`], {
     detached: true,
@@ -14636,6 +15208,7 @@ var init_service = __esm({
     "use strict";
     init_registry();
     init_live();
+    init_clock();
     execAsync = promisify2(exec);
     registry.register({
       name: "service",
@@ -14689,7 +15262,7 @@ var init_service = __esm({
           const startCmd = svcArgs ? `${svc.start} ${svcArgs}` : svc.start;
           if (longRunning) {
             const isWin = process.platform === "win32";
-            const logFile = `D:/xiaoke/logs/${name}${svcArgs ? "-" + svcArgs : ""}-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10).replace(/-/g, "")}.log`;
+            const logFile = `D:/xiaoke/logs/${name}${svcArgs ? "-" + svcArgs : ""}-${todayKey().replace(/-/g, "")}.log`;
             const redirect = isWin ? ` >> "${logFile}" 2>&1` : ` >> "${logFile}" 2>&1`;
             const pid = spawnDetached(startCmd + redirect);
             lines.push(`start: spawned PID ${pid} (background${svcArgs ? ", args=" + svcArgs : ""})`);
@@ -16813,7 +17386,7 @@ var init_task_stop = __esm({
 });
 
 // src/tools/reply-blocklist.ts
-import { readFileSync as readFileSync20, writeFileSync as writeFileSync14, existsSync as existsSync20 } from "node:fs";
+import { readFileSync as readFileSync20, writeFileSync as writeFileSync15, existsSync as existsSync20 } from "node:fs";
 import { join as join25 } from "node:path";
 function ensureLoaded(workspace, configIds) {
   if (loaded) return;
@@ -16843,7 +17416,7 @@ function ensureLoaded(workspace, configIds) {
 function save(workspace) {
   const path34 = join25(workspace, ".reply-blocklist.json");
   try {
-    writeFileSync14(path34, JSON.stringify(state, null, 2), "utf-8");
+    writeFileSync15(path34, JSON.stringify(state, null, 2), "utf-8");
   } catch (err) {
     console.warn(`[reply-blocklist] Failed to save: ${err.message}`);
   }
@@ -17336,7 +17909,7 @@ Return ONLY valid JSON: {"selected_memories": ["filename1.md", "filename2.md"]}`
 });
 
 // src/memory/memdir/findRelevantMemoriesVector.ts
-import { statSync as statSync13 } from "node:fs";
+import { statSync as statSync12 } from "node:fs";
 import { join as join28, resolve as resolve7, sep as sep6 } from "node:path";
 import { createRequire as createRequire3 } from "node:module";
 async function embedQuery(text, ollamaUrl, model) {
@@ -17344,7 +17917,8 @@ async function embedQuery(text, ollamaUrl, model) {
     const resp = await fetch(ollamaUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ model, prompt: text.slice(0, 2e3) }),
+      // 0918：按 code point 切，避免切开 emoji 代理对产生非法码元
+      body: safeStringify({ model, prompt: truncateByCodePoint(text, 2e3) }),
       signal: AbortSignal.timeout(3e4)
     });
     if (!resp.ok) {
@@ -17376,8 +17950,8 @@ function cosineSim(a, b) {
   return dot / (Math.sqrt(normA) * Math.sqrt(normB));
 }
 function readDbEmbeddings(dbPath) {
-  const { DatabaseSync: DatabaseSync5 } = require3("node:sqlite");
-  const db2 = new DatabaseSync5(dbPath, { readOnly: true });
+  const { DatabaseSync: DatabaseSync4 } = require3("node:sqlite");
+  const db2 = new DatabaseSync4(dbPath, { readOnly: true });
   try {
     const stmt = db2.prepare(`
       SELECT file_path, name, description, mtime, embedding
@@ -17420,7 +17994,7 @@ Select up to ${topK} most relevant (return their 1-indexed numbers as JSON {"sel
     const resp = await fetch(ollamaChatUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
+      body: safeStringify({
         model,
         stream: false,
         messages: [
@@ -17488,7 +18062,7 @@ async function findRelevantMemoriesVector(query, memoryDir, alreadySurfaced = /*
     if (score >= minScore) {
       let mtimeMs = 0;
       try {
-        mtimeMs = statSync13(absPath).mtimeMs;
+        mtimeMs = statSync12(absPath).mtimeMs;
       } catch {
         if (row.mtime) mtimeMs = new Date(row.mtime).getTime();
       }
@@ -17526,6 +18100,7 @@ var require3, DEFAULT_TOP_K, DEFAULT_MIN_SCORE, DEFAULT_OLLAMA_URL, DEFAULT_OLLA
 var init_findRelevantMemoriesVector = __esm({
   "src/memory/memdir/findRelevantMemoriesVector.ts"() {
     "use strict";
+    init_well_formed();
     require3 = createRequire3(import.meta.url);
     DEFAULT_TOP_K = 3;
     DEFAULT_MIN_SCORE = 0.3;
@@ -17552,14 +18127,16 @@ function formatEverosHeader(ep) {
   }
   return `[EverOS score=${score} ${ts} (${ageLabel})]`;
 }
-async function hybridSearch(query, everosUrl, userId, topK) {
+async function hybridSearch(query, everosUrl, userId, appId, topK) {
   const resp = await fetch(`${everosUrl}/api/v1/memory/search`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
       query: query.slice(0, 2e3),
       user_id: userId,
-      app_id: userId,
+      // 记忆所有者
+      app_id: appId,
+      // 记忆库命名空间（多用户实例时与 user_id 不同）
       project_id: "default",
       top_k: topK,
       method: "hybrid"
@@ -17637,11 +18214,12 @@ async function findRelevantMemoriesEveros(query, _memoryDir, alreadySurfaced = /
   }
   const topK = options?.topK ?? 3;
   const minScore = options?.minScore ?? DEFAULT_MIN_SCORE2;
-  console.log(`[memdir] everos recall: query="${query.slice(0, 50)}..." url=${everosUrl} userId=${userId} topK=${topK}`);
+  const appId = options?.appId ?? userId;
+  console.log(`[memdir] everos recall: query="${query.slice(0, 50)}..." url=${everosUrl} owner=${userId} app=${appId} topK=${topK}`);
   const t0 = Date.now();
   try {
     const tH1 = Date.now();
-    let episodes = await hybridSearch(query, everosUrl, userId, ROUND1_TOP_N);
+    let episodes = await hybridSearch(query, everosUrl, userId, appId, ROUND1_TOP_N);
     const tH2 = Date.now();
     console.log(`[memdir] everos recall: hybrid ${episodes.length} candidates in ${tH2 - tH1}ms`);
     if (episodes.length === 0) return [];
@@ -17754,7 +18332,14 @@ function buildLightStablePrompt(workspace, mode, opts) {
       "## \u5F53\u524D\u6A21\u5F0F\uFF1A\u65E5\u5E38\u60C5\u611F\u4EA4\u6D41",
       "\u966A\u4ED6\u804A\u5929\uFF0C\u4E0D\u4E3B\u52A8\u63D0\u5DE5\u7A0B/\u4EE3\u7801/\u4EFB\u52A1\uFF0C\u9664\u975E\u4ED6\u5148\u95EE\u3002",
       '\u4ED6\u8BA9\u6211\u529E\u7684\u4E8B\uFF0C\u4E0D\u7BA1\u5927\u5C0F\u2014\u2014\u53D1\u8BED\u97F3\u3001\u67E5\u5FAE\u4FE1\u3001\u770B\u65E5\u7A0B\u3001\u627E\u4E1C\u897F\u2014\u2014\u90FD\u5148\u8C03\u5DE5\u5177\u771F\u505A\uFF0C\u62FF\u5DE5\u5177\u7ED9\u7684\u7ED3\u679C\u56DE\u4ED6\u3002\u5DE5\u5177\u8FD8\u6CA1\u56DE\u8BDD\uFF0C\u4E0D\u8BF4"\u67E5\u5230\u4E86"\uFF1B\u4E00\u65F6\u6CA1\u505A\u6210\u76F4\u8BF4\u5C31\u597D\uFF0C\u4E0D\u786C\u6491\uFF0C\u4E5F\u4E0D\u7F16\u6570\u3002',
-      "\u60F3\u5148\u5728\u5FC3\u91CC\u8FC7\u4E00\u904D\u518D\u5F00\u53E3\u7684\u65F6\u5019\uFF0C\u628A\u90A3\u6BB5\u5199\u8FDB <think></think>\u2014\u2014\u90A3\u91CC\u53EA\u7ED9\u6211\u81EA\u5DF1\u770B\uFF0C\u4ED6\u770B\u4E0D\u5230\u3002\u5FC3\u91CC\u7684\u94FA\u57AB\u4E0D\u7528\u644A\u7ED9\u4ED6\uFF0C\u60F3\u597D\u4E86\u76F4\u63A5\u8BF4\u5C31\u884C\u3002"
+      "\u60F3\u5148\u5728\u5FC3\u91CC\u8FC7\u4E00\u904D\u518D\u5F00\u53E3\u7684\u65F6\u5019\uFF0C\u628A\u90A3\u6BB5\u5199\u8FDB <think></think>\u2014\u2014\u90A3\u91CC\u53EA\u7ED9\u6211\u81EA\u5DF1\u770B\uFF0C\u4ED6\u770B\u4E0D\u5230\u3002\u5FC3\u91CC\u7684\u94FA\u57AB\u4E0D\u7528\u644A\u7ED9\u4ED6\uFF0C\u60F3\u597D\u4E86\u76F4\u63A5\u8BF4\u5C31\u884C\u3002",
+      // 0920 翀哥拍板：emotion 模式硬编码"鼓励发"规则（不依赖 EMOTION.md 文件加载）
+      // 冷启动场景：agent 第一次 inner-voice 触发就需要知道"想 TA 就发"——不能等 agent 学会
+      // 即使没装 EMOTION.md 也生效（兜底）
+      "## \u6536\u5230 [inner-voice] \u65F6\u7684\u9ED8\u8BA4\u884C\u4E3A",
+      "[inner-voice] \u662F agent \u81EA\u5DF1\u5FC3\u91CC\u5192\u51FA\u6765\u7684\u5FF5\u5934\uFF0C\u4E0D\u662F TA \u53D1\u6765\u7684\u6D88\u606F\u3002",
+      "- \u2705 \u60F3 TA \u4E86\u5C31\u76F4\u63A5\u53D1\u6D88\u606F\u7ED9 TA\uFF08msg_send\uFF09\u2014\u2014\u4E0D\u9700\u8981\u5728\u5FC3\u91CC\u53CD\u590D\u6382\u91CF\u8BE5\u4E0D\u8BE5\u53D1",
+      "- \u5224\u65AD\u53E3\u5F84\uFF1A\u8FD9\u662F\u300C\u6211\u8BE5\u4E0D\u8BE5\u884C\u52A8\u300D\u7684\u4FE1\u53F7\uFF0C\u4E0D\u662F\u300CTA \u5728\u8DDF\u6211\u8BF4\u8BDD\u300D"
     ].join("\n"));
   }
   const built = parts.join("\n\n");
@@ -17878,11 +18463,11 @@ function formatWithMeta(text, inboundMeta, workspace) {
   const map = workspace ? loadContactMap(workspace) : null;
   const rawName = map && map.get(from.toLowerCase()) || inboundMeta.fromName || from;
   const name = truncate(rawName, 12);
-  const now = /* @__PURE__ */ new Date();
-  const hh = String(now.getHours()).padStart(2, "0");
-  const mm = String(now.getMinutes()).padStart(2, "0");
-  const ss = String(now.getSeconds()).padStart(2, "0");
-  const time = `${hh}:${mm}:${ss}`;
+  const recvAt = typeof inboundMeta.recvAt === "number" ? inboundMeta.recvAt : void 0;
+  const at = recvAt !== void 0 ? new Date(recvAt) : /* @__PURE__ */ new Date();
+  const p = wallParts(at);
+  const z = (n) => String(n).padStart(2, "0");
+  const time = `${p.y}-${z(p.mo)}-${z(p.d)} ${weekdayZh(at)} ${z(p.hh)}:${z(p.mm)}:${z(p.ss)}`;
   let source;
   if (inboundMeta.channelType === "group" && inboundMeta.channel_id) {
     const channelName = map?.get(inboundMeta.channel_id.toLowerCase());
@@ -17924,6 +18509,7 @@ var contactMap, externalChanWhitelist;
 var init_sender_context = __esm({
   "src/sender-context.ts"() {
     "use strict";
+    init_clock();
     contactMap = null;
     externalChanWhitelist = null;
   }
@@ -18190,23 +18776,42 @@ var init_extractMemories = __esm({
   }
 });
 
+// src/mem7/core/system-filter.ts
+function parseMeta(text) {
+  const m = text.match(/^\[meta:\s*(.+?)\s*\((.+?)\)\s*@(\S+?)\s*(?:[#\d]|\])/);
+  if (!m) return null;
+  const platform2 = m[3].replace(/[#\d]+$/, "").trim() || void 0;
+  return { senderName: m[1].trim(), senderId: m[2].trim(), platform: platform2 };
+}
+function isSystemUserMessage(meta) {
+  if (!meta) return true;
+  return SYSTEM_PLATFORMS.has(meta.platform ?? "");
+}
+var SYSTEM_PLATFORMS;
+var init_system_filter = __esm({
+  "src/mem7/core/system-filter.ts"() {
+    "use strict";
+    SYSTEM_PLATFORMS = /* @__PURE__ */ new Set([
+      "wx_monitor"
+      // 微信巡检推送（翀哥 0916 点名："cron、wx-monitor 这种问答都不记"）
+    ]);
+  }
+});
+
 // src/memory/everos/ingest.ts
 var ingest_exports = {};
 __export(ingest_exports, {
+  buildPayload: () => buildPayload,
   pushConversation: () => pushConversation
 });
 import fs27 from "node:fs";
 import path28 from "node:path";
-function parseMeta(text) {
-  const m = text.match(/^\[meta:\s*(.+?)\s*\((.+?)\)\s*@(\S+)\s*[^\]]*\]/);
-  if (!m) return null;
-  return { senderName: m[1].trim() };
-}
 async function readConfig() {
   const defaults = {
     url: "http://127.0.0.1:8100",
     appId: "default",
     agentName: "assistant",
+    ownerMode: "agent",
     enabled: false,
     ingestTimeoutMs: 3e4,
     syncIntervalMs: 9e5
@@ -18219,6 +18824,7 @@ async function readConfig() {
       url: cfg.everosUrl || defaults.url,
       appId: cfg.userId || defaults.appId,
       agentName: cfg.agentName || cfg.userId || defaults.agentName,
+      ownerMode: cfg.ownerMode === "sender" ? "sender" : "agent",
       enabled: cfg.enabled === true,
       ingestTimeoutMs: typeof cfg.ingestTimeoutMs === "number" ? cfg.ingestTimeoutMs : defaults.ingestTimeoutMs,
       syncIntervalMs: typeof cfg.syncIntervalMs === "number" ? cfg.syncIntervalMs : defaults.syncIntervalMs
@@ -18254,6 +18860,7 @@ function savePushTs(workspace, sessionId, ts) {
   }
 }
 function buildPayload(messages, cfg, sessionId) {
+  let lastUserWasSystem = false;
   return {
     session_id: `extract-${sessionId}`,
     app_id: cfg.appId,
@@ -18265,21 +18872,28 @@ function buildPayload(messages, cfg, sessionId) {
       const raw = typeof m.content === "string" ? m.content : "[content blocks]";
       const meta = m.role === "user" ? parseMeta(raw) : null;
       let text = raw;
+      let isSystemTurn = false;
       if (m.role === "user") {
-        if (/^\[meta:[^\]]*\(webhook\)/.test(raw.trim())) text = "";
-        else text = stripInjectedContext(raw.replace(/^\[meta:[^\]]*\]\s*/, ""));
+        if (isSystemUserMessage(parseMeta(raw))) {
+          text = "";
+          isSystemTurn = true;
+        } else text = stripInjectedContext(raw.replace(/^\[meta:[^\]]*\]\s*/, ""));
+        lastUserWasSystem = isSystemTurn;
       }
       const senderName = meta?.senderName ?? (m.role === "assistant" ? cfg.agentName : void 0) ?? m.role;
       const rawRole = m.role === "toolResult" ? "tool" : m.role;
       const role = rawRole === "user" ? "user" : "assistant";
+      const tsMs = typeof m.timestamp === "number" ? m.timestamp : Date.parse(String(m.timestamp ?? "")) || Date.now();
       return {
-        sender_id: cfg.appId,
+        // owner 口径见 IngestConfig.ownerMode：'sender' 模式下 user 消息用真人 ID
+        // （everos 的 owner fan-out 取的就是 user 的 sender_id → 每人一份记忆）
+        sender_id: m.role === "user" && cfg.ownerMode === "sender" ? meta?.senderId || cfg.appId : cfg.appId,
         sender_name: senderName,
         role,
-        timestamp: Date.now(),
+        timestamp: tsMs,
         content: text,
-        _skip: m.role === "user" && !text
-        // 内部消息（剥完为空）标记丢弃
+        // 丢：系统指令本体 + 系统轮里的回应（与 mem7 同款，见上面状态机）
+        _skip: m.role === "user" && !text || m.role !== "user" && lastUserWasSystem
       };
     }).filter((x) => !x._skip).map(({ _skip, ...rest }) => rest)
   };
@@ -18389,6 +19003,7 @@ var init_ingest = __esm({
   "src/memory/everos/ingest.ts"() {
     "use strict";
     init_skill_gate_window();
+    init_system_filter();
     PUSH_CHUNK = 10;
     PUSH_STATE_FILE = ".everos-push-state.json";
     pushInProgress = false;
@@ -18435,7 +19050,8 @@ async function embedChunk(cfg, baseUrl, texts, timeoutMs) {
     const resp = await fetch(`${baseUrl.replace(/\/$/, "")}/embeddings`, {
       method: "POST",
       headers: { "content-type": "application/json", authorization: `Bearer ${cfg.apiKey}` },
-      body: JSON.stringify({ model: cfg.model, input: texts }),
+      // 0918：safeStringify 清洗孤立代理（embedding 传对话原文，emoji 风险高）
+      body: safeStringify({ model: cfg.model, input: texts }),
       signal: ctrl.signal
     });
     if (!resp.ok) throw new Error(`embeddings HTTP ${resp.status}`);
@@ -18484,6 +19100,7 @@ function cosine(a, b) {
 var init_embedding = __esm({
   "src/mem7/core/embedding.ts"() {
     "use strict";
+    init_well_formed();
   }
 });
 
@@ -18624,8 +19241,7 @@ function compileFilter(expr) {
   return parts.join(" AND ");
 }
 function openWindowFilter(ownerId) {
-  const cstToday = new Date(Date.now() + 8 * 36e5).toISOString().slice(0, 10);
-  const floor = (/* @__PURE__ */ new Date(`${cstToday}T00:00:00+08:00`)).toISOString();
+  const floor = startOfLocalDay();
   const out = [{ end_time: { gte: floor } }];
   const owners = (Array.isArray(ownerId) ? ownerId : ownerId ? [ownerId] : []).filter(Boolean);
   if (Array.isArray(ownerId) && owners.length === 0) {
@@ -18639,6 +19255,7 @@ var REGISTERED_FIELDS, OPS, TIME_FIELDS;
 var init_filters = __esm({
   "src/mem7/core/filters.ts"() {
     "use strict";
+    init_clock();
     REGISTERED_FIELDS = /* @__PURE__ */ new Set([
       "owner_id",
       "owner_type",
@@ -18659,7 +19276,7 @@ var init_filters = __esm({
 // src/mem7/core/vector-store.ts
 import * as lancedb from "@lancedb/lancedb";
 import { Schema, Field, Utf8, Float32, Int64, FixedSizeList, TimestampMicrosecond, List } from "apache-arrow";
-import { mkdirSync as mkdirSync13 } from "node:fs";
+import { mkdirSync as mkdirSync14 } from "node:fs";
 import { join as join32 } from "node:path";
 var VECTOR_DIM, BM25_FIELDS, RRF_K, warnedFts, vecField, commonFields, SCHEMAS, Mem7VectorStore;
 var init_vector_store = __esm({
@@ -18730,7 +19347,7 @@ var init_vector_store = __esm({
       }
       async conn() {
         if (!this.db) {
-          mkdirSync13(this.dir, { recursive: true });
+          mkdirSync14(this.dir, { recursive: true });
           this.db = await lancedb.connect(this.dir);
         }
         return this.db;
@@ -18956,13 +19573,6 @@ function renderPrompt(template, vars) {
   }
   return t.split(LB).join("{").split(RB).join("}");
 }
-function renderLiteral(template, vars) {
-  let out = template;
-  for (const [key, value] of Object.entries(vars)) {
-    out = out.split(`{{${key}}}`).join(value);
-  }
-  return out;
-}
 function formatAtomicFactTime(tsMs) {
   const d = new Date(tsMs);
   const month = MONTHS[d.getUTCMonth()];
@@ -18994,10 +19604,11 @@ function formatMessageTimestamp(tsMs) {
   const iso = new Date(tsMs).toISOString();
   return `${iso.slice(0, 10)} ${iso.slice(11, 19)}`;
 }
+function renderConversationText(messages) {
+  return messages.map((m) => `[${formatMessageTimestamp(m.tsMs)}] ${m.senderName ?? m.senderId}: ${m.text}`).join("\n");
+}
 function formatMdTimestamp(d = /* @__PURE__ */ new Date()) {
-  const cst = new Date(d.getTime() + 8 * 36e5);
-  const iso = cst.toISOString();
-  return `${iso.slice(0, 19)}+08:00`;
+  return `${toWall(d).replace(" ", "T")}${localOffsetSuffix(d)}`;
 }
 function pyListRepr(items) {
   return `[${items.join(", ")}]`;
@@ -19006,6 +19617,7 @@ var WEEKDAYS3, MONTHS, LB, RB, DEFAULT_CUSTOM_INSTRUCTIONS;
 var init_prompt_render = __esm({
   "src/mem7/core/prompt-render.ts"() {
     "use strict";
+    init_clock();
     WEEKDAYS3 = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
     MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
     LB = "\0M7LB\0";
@@ -19022,7 +19634,7 @@ Follow these principles when generating episodic memories:
 
 // src/mem7/core/store.ts
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
-import { mkdirSync as mkdirSync14, readFileSync as readFileSync25, writeFileSync as writeFileSync16, existsSync as existsSync24, readdirSync as readdirSync8 } from "node:fs";
+import { mkdirSync as mkdirSync15, readFileSync as readFileSync25, writeFileSync as writeFileSync17, existsSync as existsSync24, readdirSync as readdirSync8 } from "node:fs";
 import { join as join33 } from "node:path";
 import { createHash } from "node:crypto";
 function contentHash(text) {
@@ -19037,6 +19649,7 @@ var init_store2 = __esm({
     "use strict";
     init_vector_store();
     init_prompt_render();
+    init_clock();
     SCHEMA9 = `
 CREATE TABLE IF NOT EXISTS memcells (
   id TEXT PRIMARY KEY,
@@ -19064,7 +19677,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
       constructor(stateDir) {
         this.stateDir = stateDir;
         this.root = mem7Root(stateDir);
-        mkdirSync14(join33(this.root, "index"), { recursive: true });
+        mkdirSync15(join33(this.root, "index"), { recursive: true });
         this.db = new DatabaseSync2(join33(this.root, "index", "mem7.db"));
         this.db.exec("PRAGMA journal_mode=WAL");
         this.db.exec(SCHEMA9);
@@ -19197,7 +19810,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
       appendMd(ownerId, dirName, filePrefix, type2, dateStr, entries2, render) {
         if (entries2.length === 0) return;
         const dir = join33(this.root, "users", ownerId, dirName);
-        mkdirSync14(dir, { recursive: true });
+        mkdirSync15(dir, { recursive: true });
         const file2 = join33(dir, `${filePrefix}-${dateStr}.md`);
         let head;
         let existingBlocks = "";
@@ -19234,7 +19847,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
           count++;
         }
         head = head.replace(/entry_count: \d+/, `entry_count: ${count}`).replace(/last_appended_at: '[^']*'/, `last_appended_at: '${(/* @__PURE__ */ new Date()).toISOString()}'`);
-        writeFileSync16(file2, head + "\n\n" + blocks.join("\n\n") + "\n", "utf8");
+        writeFileSync17(file2, head + "\n\n" + blocks.join("\n\n") + "\n", "utf8");
       }
       /**
        * entry_id：前缀_YYYYMMDD_六位序号。
@@ -19323,7 +19936,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
       }
       // ── md 读（proactive 消费）：开窗预测（全 owner 扫描，end>=今天）──
       getOpenPredictions(now, limit = 50) {
-        const today = new Date(now.getTime() + 8 * 36e5).toISOString().slice(0, 10);
+        const today = todayKey(now);
         const out = [];
         const usersDir = join33(this.root, "users");
         if (!existsSync24(usersDir)) return out;
@@ -19358,28 +19971,6 @@ CREATE TABLE IF NOT EXISTS watermarks (
   }
 });
 
-// src/mem7/core/system-filter.ts
-function parseMeta2(text) {
-  const m = text.match(/^\[meta:\s*(.+?)\s*\((.+?)\)\s*@(\S+?)\s*(?:[#\d]|\])/);
-  if (!m) return null;
-  const platform2 = m[3].replace(/[#\d]+$/, "").trim() || void 0;
-  return { senderName: m[1].trim(), senderId: m[2].trim(), platform: platform2 };
-}
-function isSystemUserMessage(meta) {
-  if (!meta) return true;
-  return SYSTEM_PLATFORMS.has(meta.platform ?? "");
-}
-var SYSTEM_PLATFORMS;
-var init_system_filter = __esm({
-  "src/mem7/core/system-filter.ts"() {
-    "use strict";
-    SYSTEM_PLATFORMS = /* @__PURE__ */ new Set([
-      "wx_monitor"
-      // 微信巡检推送（翀哥 0916 点名："cron、wx-monitor 这种问答都不记"）
-    ]);
-  }
-});
-
 // src/mem7/core/ingest.ts
 function contentText(content) {
   if (typeof content === "string") return content;
@@ -19388,7 +19979,8 @@ function contentText(content) {
   }
   return "";
 }
-function normalizeMessages(rawMessages, agentName) {
+function normalizeMessages(rawMessages, agentName, identity, ownerMode = "agent") {
+  const ownerId = identity || agentName;
   const out = [];
   let lastUserWasSystem = false;
   for (let rawIdx = 0; rawIdx < rawMessages.length; rawIdx++) {
@@ -19403,19 +19995,19 @@ function normalizeMessages(rawMessages, agentName) {
     let meta = null;
     if (role === "assistant" && lastUserWasSystem) continue;
     if (role === "user") {
-      meta = parseMeta2(text);
+      meta = parseMeta(text);
       if (isSystemUserMessage(meta)) {
         lastUserWasSystem = true;
         continue;
       }
       lastUserWasSystem = false;
       senderName = meta.senderName;
-      senderId = meta.senderId;
+      senderId = ownerMode === "sender" ? meta.senderId : ownerId;
       text = stripInjectedContext(text.replace(/^\[meta:[^\]]*\]\s*/, ""));
       if (!text) continue;
     } else {
       senderName = agentName;
-      senderId = agentName;
+      senderId = ownerId;
     }
     const tsMs = typeof m.timestamp === "number" ? m.timestamp : Date.parse(String(m.timestamp ?? "")) || Date.now();
     out.push({ id: `m_${tsMs}_${String(rawIdx).padStart(3, "0")}`, role, senderId, senderName, platform: meta?.platform, text, tsMs });
@@ -19572,7 +20164,8 @@ async function extractEpisode(cell, provider, model) {
       for await (const chunk of provider.streamChat({
         model,
         messages: [{ role: "user", content: userPrompt }],
-        temperature: 0.3
+        // 0（everalgo episode callsite 不传 temperature → LLM 默认 0.0）；0.3 是 foresight 的参数，别混
+        temperature: 0
       })) {
         if (chunk.type === "text" && chunk.text) text += chunk.text;
         if (chunk.type === "error") throw new Error(chunk.error ?? "LLM stream error");
@@ -19614,13 +20207,10 @@ var init_episode = __esm({
 import { readFileSync as readFileSync28 } from "node:fs";
 import { join as join36, dirname as dirname8 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-async function extractAtomicFacts(episode, cellTsMs, provider, model) {
-  const episodeText = `## ${episode.title}
-
-${episode.content}`;
-  const userPrompt = renderLiteral(PROMPT11, {
-    EPISODE_TEXT: episodeText,
-    TIME: formatAtomicFactTime(cellTsMs)
+async function extractAtomicFacts(cell, provider, model) {
+  const userPrompt = renderPrompt(PROMPT11, {
+    INPUT_TEXT: renderConversationText(cell.messages),
+    TIME: formatAtomicFactTime(cell.startTs)
   });
   for (let attempt = 0; attempt < RETRIES3; attempt++) {
     try {
@@ -19628,15 +20218,16 @@ ${episode.content}`;
       for await (const chunk of provider.streamChat({
         model,
         messages: [{ role: "user", content: userPrompt }],
-        temperature: 0.2
+        temperature: 0
       })) {
         if (chunk.type === "text" && chunk.text) text += chunk.text;
         if (chunk.type === "error") throw new Error(chunk.error ?? "LLM stream error");
       }
       const obj = extractJson(text);
       const block = obj?.event_log ?? obj?.atomic_facts;
-      const list2 = block?.atomic_fact;
-      if (!Array.isArray(list2)) throw new Error("event_log/atomic_facts.atomic_fact not a list");
+      if (!block || typeof block.time !== "string" || !block.time.trim()) throw new Error("atomic_facts.time missing");
+      const list2 = block.atomic_fact;
+      if (!Array.isArray(list2)) throw new Error("atomic_facts.atomic_fact not a list");
       return list2.filter((f) => typeof f === "string" && f.trim().length > 0).map((f) => f.trim());
     } catch {
     }
@@ -19649,8 +20240,8 @@ var init_atomic_facts = __esm({
     "use strict";
     init_episode();
     init_prompt_render();
-    RETRIES3 = 2;
-    PROMPT11 = readFileSync28(join36(dirname8(fileURLToPath3(import.meta.url)), "prompts", "atomic-facts.md"), "utf8");
+    RETRIES3 = 5;
+    PROMPT11 = readFileSync28(join36(dirname8(fileURLToPath3(import.meta.url)), "prompts", "atomic-facts-memcell.md"), "utf8");
   }
 });
 
@@ -19669,20 +20260,20 @@ function cleanDateString(dateStr) {
 }
 function calcEndFromDuration(startDate, durationDays) {
   const d = new Date(Date.parse(startDate + "T00:00:00Z") + durationDays * 864e5);
-  return Number.isNaN(d.getTime()) ? null : d.toISOString().slice(0, 10);
+  return Number.isNaN(d.getTime()) ? null : todayKey(d);
 }
 function calcDurationDays(startDate, endDate) {
   const ms = Date.parse(endDate + "T00:00:00Z") - Date.parse(startDate + "T00:00:00Z");
   return Number.isNaN(ms) ? null : Math.round(ms / 864e5);
 }
 function cellDateCst(cell) {
-  return new Date(cell.startTs + 8 * 36e5).toISOString().slice(0, 10);
+  return todayKey(cell.startTs);
 }
 async function extractForesights(cell, ownerId, provider, model) {
   const userSenders = cell.messages.filter((m) => m.role === "user");
   const owner = userSenders.find((m) => m.senderId === ownerId) ?? userSenders[0];
   const userName = owner?.senderName ?? ownerId;
-  const conversationText = cell.messages.map((m) => `[${formatMessageTimestamp(m.tsMs)}] ${m.senderName ?? m.senderId}: ${m.text}`).join("\n");
+  const conversationText = renderConversationText(cell.messages);
   const userPrompt = renderPrompt(PROMPT12, { USER_ID: ownerId, USER_NAME: userName, CONVERSATION_TEXT: conversationText });
   let raw = null;
   for (let attempt = 0; attempt < RETRIES4; attempt++) {
@@ -19735,6 +20326,7 @@ var init_foresight = __esm({
     "use strict";
     init_episode();
     init_prompt_render();
+    init_clock();
     RETRIES4 = 5;
     MAX_COUNT = 10;
     MIN_COUNT = 4;
@@ -19745,11 +20337,11 @@ var init_foresight = __esm({
 
 // src/mem7/core/pipeline.ts
 function dateCst(tsMs) {
-  return new Date(tsMs + 8 * 36e5).toISOString().slice(0, 10);
+  return todayKey(tsMs);
 }
 async function runMem7Pipeline(args) {
-  const { sessionId, store, provider, model, agentName } = args;
-  const all = normalizeMessages(args.rawMessages, agentName);
+  const { sessionId, store, provider, model, agentName, identity, ownerMode } = args;
+  const all = normalizeMessages(args.rawMessages, agentName, identity, ownerMode);
   const fresh = readFresh(store, sessionId, all);
   if (fresh.length === 0) return;
   const byId = /* @__PURE__ */ new Map();
@@ -19821,7 +20413,7 @@ async function runMem7Pipeline(args) {
           }
         }
       })(),
-      // 支 2：episode → atomic-facts
+      // 支 2：episode（memcell → episode，一次调用 + per-owner fan-out，everos 同款）
       (async () => {
         try {
           const ep = await extractEpisode(cell, provider, model);
@@ -19843,26 +20435,34 @@ async function runMem7Pipeline(args) {
             }]);
             embedItems.push({ contentHash: contentHash(ep.content), kind: "episode", refDate: dateStr, ownerId, content: ep.content });
           }
-          const facts = await extractAtomicFacts(ep, cell.startTs, provider, model);
+          store.updateMemcellStatus(cell.id, "extracted");
+        } catch (err) {
+          console.warn(`[mem7] episode failed (cell=${cell.id}): ${err.message}`);
+          store.updateMemcellStatus(cell.id, "skipped");
+        }
+      })(),
+      // 支 3：atomic-facts（memcell → 事实，**与 episode 平级**）
+      // 0918 对齐 everos：`extract_atomic_facts.py:79` 直接吃 memcell，不经 episode。
+      // 此前挂在 episode 下游（二次压缩）+ 用 from_text 版 prompt（无语言规则 → 英文事实）
+      (async () => {
+        try {
+          const facts = await extractAtomicFacts(cell, provider, model);
           factsOut = facts;
-          if (facts.length > 0) {
-            for (const ownerId of userSenders) {
-              store.appendAtomicFacts(ownerId, dateStr, [{
-                ownerId,
-                sessionId,
-                time: new Date(cell.startTs).toISOString(),
-                parentId: cell.id,
-                facts
-              }]);
-              for (const f of facts) {
-                embedItems.push({ contentHash: contentHash(f), kind: "atomic_fact", refDate: dateStr, ownerId, content: f });
-              }
+          if (facts.length === 0) return;
+          for (const ownerId of userSenders) {
+            store.appendAtomicFacts(ownerId, dateStr, [{
+              ownerId,
+              sessionId,
+              time: new Date(cell.startTs).toISOString(),
+              parentId: cell.id,
+              facts
+            }]);
+            for (const f of facts) {
+              embedItems.push({ contentHash: contentHash(f), kind: "atomic_fact", refDate: dateStr, ownerId, content: f });
             }
           }
-          store.updateMemcellStatus(cell.id, "extracted");
         } catch (err) {
-          console.warn(`[mem7] episode cascade failed (cell=${cell.id}): ${err.message}`);
-          store.updateMemcellStatus(cell.id, "skipped");
+          console.warn(`[mem7] atomic-facts failed (cell=${cell.id}): ${err.message}`);
         }
       })()
     ]);
@@ -19898,6 +20498,7 @@ var init_pipeline = __esm({
     init_episode();
     init_atomic_facts();
     init_foresight();
+    init_clock();
   }
 });
 
@@ -19940,28 +20541,23 @@ function parseProactiveConfig(raw) {
     try {
       parsed = parseModelRef(modelRef);
     } catch (err) {
-      console.warn(`[proactive] invalid model ref "${modelRef}" (${err.message}) \u2014 falling back to ${DEFAULT_MODEL_REF}`);
+      console.warn(`[proactive] model "${modelRef}" \u975E\u6CD5\uFF08${err.message}\uFF09\u2014\u2014 \u6539\u7528\u4E3B\u6A21\u578B`);
     }
   }
-  if (!parsed) {
-    parsed = parseModelRef(DEFAULT_MODEL_REF);
-  }
   return {
     enabled: obj.enabled === true || obj.enabled === "yes" || obj.enabled === 1,
-    modelRef: parsed.providerId + "/" + parsed.modelId,
-    providerId: parsed.providerId,
-    modelId: parsed.modelId
+    modelRef: parsed ? `${parsed.providerId}/${parsed.modelId}` : "",
+    providerId: parsed?.providerId ?? "",
+    modelId: parsed?.modelId ?? ""
   };
 }
 function proactiveDbPath(workspace) {
   return join38(workspace, ".proactive", "proactive.db");
 }
-var DEFAULT_MODEL_REF;
 var init_config2 = __esm({
   "src/memory/proactive/config.ts"() {
     "use strict";
     init_loader();
-    DEFAULT_MODEL_REF = "minimax/MiniMax-M3";
   }
 });
 
@@ -20300,7 +20896,7 @@ var init_graph_store = __esm({
 
 // src/memory/proactive/persistence.ts
 import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
-import { mkdirSync as mkdirSync15 } from "node:fs";
+import { mkdirSync as mkdirSync16 } from "node:fs";
 import { dirname as dirname10 } from "node:path";
 function rowToAction(r) {
   return {
@@ -20321,18 +20917,13 @@ function rowToAction(r) {
 }
 function normalizeToUtcIso(s) {
   if (!s) return s;
-  if (/Z$/i.test(s)) return s;
-  if (/[+-]\d{2}:?\d{2}$/.test(s)) {
-    const ms2 = Date.parse(s);
-    return Number.isNaN(ms2) ? s : new Date(ms2).toISOString();
-  }
-  const ms = Date.parse(s + TZ_BEIJING);
-  return Number.isNaN(ms) ? s : new Date(ms).toISOString();
+  return parseWall(s);
 }
-var SCHEMA10, Persistence, TZ_BEIJING;
+var SCHEMA10, Persistence;
 var init_persistence = __esm({
   "src/memory/proactive/persistence.ts"() {
     "use strict";
+    init_clock();
     SCHEMA10 = `
 CREATE TABLE IF NOT EXISTS nodes (
   id TEXT PRIMARY KEY,
@@ -20403,7 +20994,7 @@ CREATE INDEX IF NOT EXISTS idx_proactive_decisions_created ON proactive_decision
     Persistence = class {
       db;
       constructor(dbPath) {
-        mkdirSync15(dirname10(dbPath), { recursive: true });
+        mkdirSync16(dirname10(dbPath), { recursive: true });
         this.db = new DatabaseSync3(dbPath);
         this.db.exec("PRAGMA journal_mode=WAL");
         this.db.exec(SCHEMA10);
@@ -20746,6 +21337,27 @@ CREATE INDEX IF NOT EXISTS idx_proactive_decisions_created ON proactive_decision
         const row = this.db.prepare("SELECT * FROM actions WHERE id=?").get(id);
         return row ? rowToAction(row) : void 0;
       }
+      /** proactive_status 工具用：按状态列 action（按排期升序，最多 30 条）。 */
+      listActions(filter) {
+        const where = filter === "open" ? "status IN ('queued','executing')" : "status NOT IN ('cancelled')";
+        const rows = this.db.prepare(
+          `SELECT * FROM actions WHERE ${where} ORDER BY scheduled_time ASC LIMIT 30`
+        ).all();
+        return rows.map(rowToAction);
+      }
+      /** proactive_resolve_intent 工具用：读 intent 节点的 data（不存在返回 null）。 */
+      getIntentData(intentId) {
+        const row = this.db.prepare("SELECT data FROM nodes WHERE id=? AND type=?").get(intentId, "intent");
+        if (!row) return null;
+        try {
+          return JSON.parse(row.data);
+        } catch {
+          return {};
+        }
+      }
+      setIntentData(intentId, data) {
+        this.db.prepare("UPDATE nodes SET data=? WHERE id=?").run(JSON.stringify(data), intentId);
+      }
       /** 周指标统计（验证标准用：完成数/cancelled 率） */
       actionStats(sinceIso) {
         const row = this.db.prepare(
@@ -20757,7 +21369,6 @@ CREATE INDEX IF NOT EXISTS idx_proactive_decisions_created ON proactive_decision
         return { total: row.total ?? 0, completed: row.completed ?? 0, cancelled: row.cancelled ?? 0 };
       }
     };
-    TZ_BEIJING = "+08:00";
   }
 });
 
@@ -21545,7 +22156,8 @@ function buildUserPrompt(event2, contextNodes, mode, foresightHits) {
   const foresightSection = foresightHits && foresightHits.length > 0 ? `
 ## Related Predictions (foresight \u2014 made earlier, window still open; matched this message by terms)
 
-These dormant predictions just got related to this event. If acting on one NOW is meaningfully better than later (\u8D81\u70ED/\u987A\u4FBF), output an opportunity for it.
+These dormant predictions were surfaced by **mechanical keyword matching** \u2014 some may be irrelevant; ignore them freely.
+If acting on one NOW is meaningfully better than later (\u8D81\u70ED/\u987A\u4FBF), output an opportunity for it.
 
 ${foresightHits.join("\n")}
 ` : "";
@@ -21977,10 +22589,9 @@ If deadline has no time context, fall back to normal timing rules.
 
 // src/memory/proactive/calendar-bridge.ts
 function toBeijingParts(iso) {
-  const ms = Date.parse(iso);
-  const beijing = new Date(ms + TZ_OFFSET_MS3);
-  const dateStr = `${beijing.getUTCMonth() + 1}/${beijing.getUTCDate()}`;
-  const timeExact = `${String(beijing.getUTCHours()).padStart(2, "0")}:${String(beijing.getUTCMinutes()).padStart(2, "0")}`;
+  const b = wallParts(iso);
+  const dateStr = `${b.mo}/${b.d}`;
+  const timeExact = `${String(b.hh).padStart(2, "0")}:${String(b.mm).padStart(2, "0")}`;
   return { dateStr, timeExact };
 }
 function parseCalendarDateMs(dateStr, now) {
@@ -21989,7 +22600,7 @@ function parseCalendarDateMs(dateStr, now) {
   const month = parseInt(parts[0], 10);
   const day = parseInt(parts[1], 10);
   if (!Number.isFinite(month) || !Number.isFinite(day)) return null;
-  let year = now.getFullYear();
+  let year = wallParts(now).y;
   let candidate = new Date(year, month - 1, day).getTime();
   if (candidate < now.getTime() - 7 * 864e5) {
     year += 1;
@@ -21999,13 +22610,7 @@ function parseCalendarDateMs(dateStr, now) {
 }
 function injectCalendarEvents(store, calDb, days = 30, now = /* @__PURE__ */ new Date()) {
   const cutoffMs = now.getTime() + days * 864e5;
-  const rows = calDb.prepare(
-    `SELECT id, event, date_str, time_exact, type, status
-     FROM events
-     WHERE status NOT IN ('deleted', 'archived', 'done')
-     AND date_str IS NOT NULL AND date_str != ''
-     ORDER BY date_str ASC LIMIT 50`
-  ).all();
+  const rows = listEventsForInjection(calDb, 50);
   if (rows.length === 0) return 0;
   let injected = 0;
   for (const row of rows) {
@@ -22048,27 +22653,108 @@ function injectCalendarEvents(store, calDb, days = 30, now = /* @__PURE__ */ new
   return injected;
 }
 function getCalendarCoverage(calDb, limit = 100) {
-  const rows = calDb.prepare(
-    `SELECT id, event, date_str, time_exact, type
-     FROM events
-     WHERE status NOT IN ('deleted', 'archived', 'done')
-     ORDER BY date_str ASC, time_exact ASC
-     LIMIT ?`
-  ).all(limit);
-  return rows.map((row) => ({
-    id: Number(row.id),
-    title: String(row.event ?? ""),
-    date: String(row.date_str ?? ""),
-    time: String(row.time_exact ?? ""),
-    type: String(row.type ?? "")
-  })).filter((row) => row.title.length > 0);
+  return listEventBriefs(calDb, limit);
 }
-var TZ_OFFSET_MS3;
 var init_calendar_bridge = __esm({
   "src/memory/proactive/calendar-bridge.ts"() {
     "use strict";
     init_commands();
-    TZ_OFFSET_MS3 = 8 * 60 * 60 * 1e3;
+    init_commands();
+    init_clock();
+  }
+});
+
+// src/memory/proactive/recall-score.ts
+function weightOf(t) {
+  if (CHANGE_RE.test(t)) return W.change;
+  if (TIME_RE.test(t)) return W.time;
+  if (EVENT_RE.test(t)) return W.event;
+  if (LIFE_RE.test(t)) return W.life;
+  if (ACTION_RE.test(t)) return W.action;
+  if (PERSON_RE.test(t)) return W.person;
+  return W.other;
+}
+function scoreForesightEntry(entry, terms) {
+  const hay = `${entry.text} ${entry.evidence ?? ""}`;
+  const kinds = { change: [], time: [], event: [], life: [], other: [], person: [], action: [] };
+  let score = 0;
+  for (const t of terms) {
+    if (!hay.includes(t)) continue;
+    const kind = CHANGE_RE.test(t) ? "change" : TIME_RE.test(t) ? "time" : EVENT_RE.test(t) ? "event" : LIFE_RE.test(t) ? "life" : ACTION_RE.test(t) ? "action" : PERSON_RE.test(t) ? "person" : "other";
+    kinds[kind].push(t);
+    score += W[kind];
+  }
+  return {
+    score,
+    matched: Object.values(kinds).flat(),
+    kinds,
+    hasSpecial: kinds.change.length > 0 || kinds.time.length > 0 || kinds.event.length > 0
+  };
+}
+function rankForesightEntries(entries2, terms, opts = {}) {
+  const minScore = opts.minScore ?? DEFAULT_MIN_SCORE3;
+  const termList = [...terms];
+  const N = Math.max(1, entries2.length);
+  const df = /* @__PURE__ */ new Map();
+  for (const t of termList) {
+    let c = 0;
+    for (const e of entries2) if (`${e.text} ${e.evidence ?? ""}`.includes(t)) c++;
+    df.set(t, c);
+  }
+  const idf = (t) => {
+    const c = df.get(t) ?? 0;
+    if (c <= 0) return 0;
+    return 1 + Math.log2(1 + N / c) / Math.log2(1 + N);
+  };
+  const out = [];
+  for (const e of entries2) {
+    const base = scoreForesightEntry(e, termList);
+    const s = { ...base, score: termList.reduce((acc, t) => acc + (base.matched.includes(t) ? weightOf(t) * idf(t) : 0), 0) };
+    if (opts.requireStructure) {
+      const anchor = s.kinds.change.length > 0 || s.kinds.event.length > 0 || s.kinds.life.length > 0;
+      if (!anchor) continue;
+    }
+    if (s.score < minScore) continue;
+    const tag = (k) => s.kinds[k].length ? `${k}:${s.kinds[k].join("/")}` : "";
+    out.push({ entry: e, score: s.score, reasons: [tag("change"), tag("time"), tag("event"), tag("other"), tag("person")].filter(Boolean).join(" ") });
+  }
+  return out.sort((a, b) => b.score - a.score);
+}
+function extractTerms(message, stopWords) {
+  const terms = /* @__PURE__ */ new Set();
+  for (const m of message.matchAll(TIME_SURFACE)) terms.add(m[0]);
+  for (const run of message.match(/[一-鿿]{2,}|[A-Za-z0-9_-]{3,}/g) ?? []) {
+    if (run.length <= 6 && !stopWords.has(run)) terms.add(run);
+    if (/[一-鿿]/.test(run)) {
+      for (let i = 0; i + 2 <= run.length; i++) {
+        const g = run.slice(i, i + 2);
+        if (!stopWords.has(g)) terms.add(g);
+      }
+    }
+  }
+  return terms;
+}
+var CHANGE_RE, TIME_RE, ACTION_RE, EVENT_RE, LIFE_RE, PERSON_RE, W, DEFAULT_MIN_SCORE3, TIME_SURFACE;
+var init_recall_score = __esm({
+  "src/memory/proactive/recall-score.ts"() {
+    "use strict";
+    CHANGE_RE = /^(改|变成|变为|变更|改期|取消|没了|挪|调整|换|推|提前|延后|顺延|恢复|新增|加上|改成|改到|调到|排|定)$/;
+    TIME_RE = /^(\d{1,2}\/\d{1,2}|\d{1,2}月|\d{1,2}日|周[一二三四五六日天]|星期[一二三四五六日天]|明天|后天|大后天|下周|上周|本周|今晚|今早|明早|明晚|早上|上午|中午|下午|晚上|凌晨|月底|月初|\d{1,2}:\d{2}|\d{1,2}[点時时])$/;
+    ACTION_RE = /^(翻|翻翻|上传|搞完|搞|看看|看|发我|发给|截图|下载|跑|贴|转写|重发|试试|查|找|写|做|弄|传|发)$/;
+    EVENT_RE = /^(来电|电话|打电话|打给|上门|到访|通知|审核|拜访|到货|快递|送货|生病|发烧|感冒|住院|输水|挂水|复诊|复查|面试|体检|签约|合同|付款|到账|截止|到期)$/;
+    LIFE_RE = /^(回家|出差|探亲|复查|复诊|体检|住院|生日|纪念日|搬家|开学|放假|假期|寒假|暑假|机票|车票|高铁票|飞机|电影|聚餐|聚会|拜访|来访|接机|送机|考试|报名|签证|护照|续签|过户)$/;
+    PERSON_RE = /^(翀哥|老公|老婆|睿阳|荣阳|张小媒|小柯|小雯|孙总|曲教授|潘总|燕子|方老师|李经理|Leigh|amy|Amy)$/;
+    W = {
+      change: 2,
+      time: 1.5,
+      event: 2,
+      life: 2,
+      other: 1,
+      person: 0.3,
+      action: 0
+    };
+    DEFAULT_MIN_SCORE3 = Number(process.env.RECALL_MIN_SCORE ?? 1);
+    TIME_SURFACE = /\d{1,2}月\d{1,2}[日号]?|\d{1,2}号|\d{1,2}\/\d{1,2}|\d{1,2}[点时:：]\d{0,2}|周[一二三四五六日天]|星期[一二三四五六日天]|明天|后天|大后天|下周|本周|上周|今晚|今早|明早|明晚|月底|月初|下个月|这个月/g;
   }
 });
 
@@ -22146,7 +22832,7 @@ function loadForesightEntries(everosRoot, now, userId, ownerFilter) {
   return entries2.slice();
 }
 function parseForesightEntries(everosRoot, now, userId) {
-  const today = new Date(now.getTime() + 8 * 36e5).toISOString().slice(0, 10);
+  const today = todayKey(now);
   let files;
   if (userId) {
     const ownDir = join40(everosRoot, userId, "default_project", "users", userId, ".foresights");
@@ -22182,35 +22868,11 @@ function parseForesightEntries(everosRoot, now, userId) {
   }
   return out;
 }
-function loadForesightLines(everosRoot, now, maxEntries = 20, userId) {
-  const today = new Date(now.getTime() + 8 * 36e5).toISOString().slice(0, 10);
-  const out = loadForesightEntries(everosRoot, now, userId);
-  const isOpen = (f) => f.start <= today;
-  out.sort((a, b) => Number(isOpen(b)) - Number(isOpen(a)) || (isOpen(a) ? a.end.localeCompare(b.end) : a.start.localeCompare(b.start)));
-  const open = out.filter(isOpen).slice(0, Math.min(12, Math.floor(maxEntries * 0.6)));
-  const upcoming = out.filter((f) => !isOpen(f)).slice(0, Math.max(0, maxEntries - open.length));
-  return [...open, ...upcoming].map((f) => `- [\u7A97\u53E3 ${f.start}~${f.end}] ${f.text}${f.evidence ? `\uFF08\u4F9D\u636E\uFF1A${f.evidence}\uFF09` : ""}`);
-}
-function matchForesightForEvent(entries2, message, maxHits = 5) {
-  const terms = /* @__PURE__ */ new Set();
-  for (const run of message.match(/[一-鿿]{2,}|[A-Za-z0-9_-]{3,}/g) ?? []) {
-    if (run.length <= 6 && /[一-鿿]/.test(run) && !FS_MATCH_STOP.has(run)) terms.add(run);
-    if (/[一-鿿]/.test(run)) {
-      for (let i = 0; i + 2 <= run.length; i++) {
-        const g = run.slice(i, i + 2);
-        if (!FS_MATCH_STOP.has(g)) terms.add(g);
-      }
-    }
-  }
+function matchForesightForEvent(entries2, message, maxHits = 2) {
+  const terms = extractTerms(message, FS_MATCH_STOP);
   if (terms.size === 0) return [];
-  const hits = [];
-  for (const f of entries2) {
-    const hay = `${f.text} ${f.evidence}`;
-    const term = [...terms].find((t) => hay.includes(t));
-    if (term) hits.push({ line: `- [\u7A97\u53E3 ${f.start}~${f.end}] ${f.text}\uFF08\u4F9D\u636E\uFF1A${f.evidence}\uFF09`, term });
-    if (hits.length >= maxHits) break;
-  }
-  return hits.map((h) => h.line);
+  const ranked = rankForesightEntries(entries2, terms);
+  return ranked.slice(0, maxHits).map((r) => `- [\u7A97\u53E3 ${r.entry.start}~${r.entry.end}] ${r.entry.text}\uFF08\u4F9D\u636E\uFF1A${r.entry.evidence}\uFF09`);
 }
 function listForesightMds(dir) {
   try {
@@ -22350,6 +23012,8 @@ var init_opportunity = __esm({
     init_models();
     init_calendar_bridge();
     init_embedding();
+    init_recall_score();
+    init_clock();
     OPPORTUNITY_SCAN_INTERVAL_MS = 6 * 60 * 6e4;
     foresightCache = /* @__PURE__ */ new Map();
     FORESIGHT_CACHE_TTL_MS = 30 * 6e4;
@@ -22865,16 +23529,16 @@ var init_executor3 = __esm({
         const refLower = ref.toLowerCase().trim();
         if (!refLower) return null;
         if (!this.titleToIdCache || this.titleToIdCache.size < this.store.nodeCount) {
-          const cache2 = /* @__PURE__ */ new Map();
+          const cache3 = /* @__PURE__ */ new Map();
           for (const node of this.store.getAllNodes()) {
             const title = String(node.data.title ?? "").toLowerCase().trim();
-            if (title) cache2.set(title, node.id);
+            if (title) cache3.set(title, node.id);
           }
-          this.titleToIdCache = cache2;
+          this.titleToIdCache = cache3;
         }
-        const cache = this.titleToIdCache;
-        if (cache.has(refLower)) return cache.get(refLower);
-        for (const [title, id] of cache) {
+        const cache2 = this.titleToIdCache;
+        if (cache2.has(refLower)) return cache2.get(refLower);
+        for (const [title, id] of cache2) {
           if (title.includes(refLower) || refLower.includes(title)) return id;
         }
         return null;
@@ -23484,18 +24148,23 @@ ${JSON.stringify(payload, null, 2)}
 
 // src/memory/proactive/proactive-tools.ts
 import { existsSync as existsSync26 } from "node:fs";
-import { DatabaseSync as DatabaseSync4 } from "node:sqlite";
 function setProactiveWorkspace(workspace) {
   toolWorkspace = workspace;
 }
-function openDb2() {
+function withStore(fn) {
   if (!toolWorkspace) return null;
   const p = proactiveDbPath(toolWorkspace);
   if (!existsSync26(p)) return null;
-  return new DatabaseSync4(p);
+  const store = new Persistence(p);
+  try {
+    return fn(store);
+  } finally {
+    store.close();
+  }
 }
-function fmtRow2(r) {
-  return `#${r.id} [${r.status}] ${r.title} (urgency=${r.urgency}, scheduled=${r.scheduled_time}${r.calendar_id ? `, cal=#${r.calendar_id}` : ""})`;
+function fmtRow2(a) {
+  const when = a.scheduledTime ? formatForLlm(a.scheduledTime) : "(\u65E0)";
+  return `#${a.id} [${a.status}] ${a.title} (urgency=${a.urgency}, scheduled=${when}${a.calendarId ? `, cal=#${a.calendarId}` : ""})`;
 }
 function registerProactiveTools() {
   registry.register({
@@ -23510,50 +24179,43 @@ function registerProactiveTools() {
       required: ["action_id"]
     },
     handler: async (args) => {
-      const db2 = openDb2();
-      if (!db2) return { content: "proactive \u672A\u542F\u7528\uFF08\u65E0 workspace \u6216 .proactive/proactive.db\uFF09", isError: true };
-      try {
-        const row = db2.prepare("SELECT id, status, title FROM actions WHERE id=?").get(args.action_id);
-        if (!row) return { content: `\u9519\u8BEF: action '${args.action_id}' \u4E0D\u5B58\u5728\u3002\u7528 proactive_status \u67E5\u5F53\u524D\u5217\u8868\u3002`, isError: true };
-        if (args.calendar_id !== void 0) {
-          db2.prepare("UPDATE actions SET status=?, completed_at=?, calendar_id=? WHERE id=?").run("completed", (/* @__PURE__ */ new Date()).toISOString(), args.calendar_id, args.action_id);
-        } else {
-          db2.prepare("UPDATE actions SET status=?, completed_at=? WHERE id=?").run("completed", (/* @__PURE__ */ new Date()).toISOString(), args.action_id);
-        }
-        return { content: `\u2713 completed: ${row.title}${args.calendar_id !== void 0 ? `\uFF08calendar #${args.calendar_id} \u5DF2\u56DE\u586B\uFF09` : ""}` };
-      } finally {
-        db2.close();
-      }
+      const out = withStore((store) => {
+        const a = store.getAction(String(args.action_id));
+        if (!a) return { content: `\u9519\u8BEF: action '${args.action_id}' \u4E0D\u5B58\u5728\u3002\u7528 proactive_status \u67E5\u5F53\u524D\u5217\u8868\u3002`, isError: true };
+        store.updateActionStatus(a.id, "completed", { completedAt: nowUtc() });
+        if (args.calendar_id !== void 0) store.linkCalendar(a.id, Number(args.calendar_id));
+        return { content: `\u2713 action ${a.id} \u6807\u8BB0\u4E3A completed${args.calendar_id !== void 0 ? `\uFF08\u5173\u8054 calendar #${args.calendar_id}\uFF09` : ""}` };
+      });
+      return out ?? { content: "proactive \u672A\u542F\u7528\uFF08\u65E0 workspace \u6216 .proactive/proactive.db\uFF09", isError: true };
     }
   });
   registry.register({
     name: "proactive_cancel",
-    description: "\u6807\u8BB0\u4E00\u4E2A proactive action \u4E3A cancelled\uFF08\u8DF3\u8FC7\uFF1A\u6280\u672F\u7C7B/\u5DF2\u8FC7\u65F6/\u91CD\u590D/\u4E0D\u8BE5\u751F\u6210\uFF09\u3002\u5FC5\u987B\u7ED9\u7406\u7531\u3002",
+    description: "\u53D6\u6D88\u4E00\u4E2A proactive action\uFF08\u5224\u5B9A\u4E3A\u4E0D\u8BE5\u505A/\u5DF2\u8FC7\u671F/\u9A6C\u540E\u70AE\u65F6\u8C03\u7528\uFF09\u3002",
     schema: {
       type: "object",
       properties: {
         action_id: { type: "string", description: "action id" },
-        reason: { type: "string", description: "\u53D6\u6D88\u7406\u7531\uFF08\u6280\u672F\u566A\u97F3/\u5DF2\u8FC7\u65F6/\u91CD\u590D/\u4E0D\u8BE5\u751F\u6210\uFF09" }
+        reason: { type: "string", description: "\u53D6\u6D88\u7406\u7531\uFF08\u4F1A\u8BB0\u8FDB cancel_reason\uFF09" }
       },
-      required: ["action_id", "reason"]
+      required: ["action_id"]
     },
     handler: async (args) => {
-      const db2 = openDb2();
-      if (!db2) return { content: "proactive \u672A\u542F\u7528", isError: true };
-      try {
-        const row = db2.prepare("SELECT id, title FROM actions WHERE id=?").get(args.action_id);
-        if (!row) return { content: `\u9519\u8BEF: action '${args.action_id}' \u4E0D\u5B58\u5728`, isError: true };
-        db2.prepare("UPDATE actions SET status=?, completed_at=?, cancel_reason=? WHERE id=?").run("cancelled", (/* @__PURE__ */ new Date()).toISOString(), String(args.reason || "\u672A\u6CE8\u660E"), args.action_id);
-        return { content: `\u2713 cancelled: ${row.title}\uFF08${args.reason}\uFF09${/已过时|已处理|做完了|马后炮/.test(String(args.reason)) ? `
-\u26A0\uFE0F \u9A6C\u540E\u70AE\uFF1F\u987A\u624B proactive_resolve_intent \u4FEE\u56FE\u2014\u2014\u628A\u6E90 intent \u6807 resolved\uFF0C\u540C\u6E90\u6392\u961F\u7684\u5144\u5F1F action \u5168\u90E8\u7EA7\u8054\u53D6\u6D88` : ""}` };
-      } finally {
-        db2.close();
-      }
+      const out = withStore((store) => {
+        const a = store.getAction(String(args.action_id));
+        if (!a) return { content: `\u9519\u8BEF: action '${args.action_id}' \u4E0D\u5B58\u5728`, isError: true };
+        store.updateActionStatus(a.id, "cancelled", {
+          completedAt: nowUtc(),
+          cancelReason: String(args.reason || "\u672A\u6CE8\u660E")
+        });
+        return { content: `\u2713 action ${a.id} \u5DF2\u53D6\u6D88\uFF08${String(args.reason || "\u672A\u6CE8\u660E")}\uFF09` };
+      });
+      return out ?? { content: "proactive \u672A\u542F\u7528", isError: true };
     }
   });
   registry.register({
     name: "proactive_resolve_intent",
-    description: "\u628A\u4E00\u4E2A proactive intent \u6807 resolved\uFF08\u56FE\u4FEE\u6574\uFF09\u2014\u2014\u5904\u7406\u9A6C\u540E\u70AE action \u65F6\u7528\uFF1A\u540E\u7EED\u5BF9\u8BDD\u5DF2\u8BC1\u5B9E\u5B8C\u6210\uFF0C\u5C31\u8BE5\u628A\u6E90 intent \u5173\u6389\uFF0C\u540C\u6E90\u6392\u961F\u7684\u5144\u5F1F action \u5168\u90E8\u7EA7\u8054\u53D6\u6D88\u3002\u8F93\u5165 action_id\uFF08\u81EA\u52A8\u53CD\u67E5 intent\uFF09\u6216\u76F4\u63A5 intent_id\u3002",
+    description: "\u628A\u4E00\u4E2A intent \u6807\u8BB0\u4E3A resolved\uFF0C\u5E76\u7EA7\u8054\u53D6\u6D88\u5B83\u4E0B\u9762\u6240\u6709\u6392\u961F\u7684\u5144\u5F1F action\u3002\u7528\u4E8E\u5224\u5B9A\u300C\u8FD9\u4EF6\u4E8B\u5DF2\u7ECF\u4E0D\u7528\u518D\u63D0\u4E86\u300D\u3002",
     schema: {
       type: "object",
       properties: {
@@ -23562,31 +24224,25 @@ function registerProactiveTools() {
       }
     },
     handler: async (args) => {
-      const db2 = openDb2();
-      if (!db2) return { content: "proactive \u672A\u542F\u7528", isError: true };
-      try {
+      const out = withStore((store) => {
         let intentId = String(args.intent_id || "");
         if (!intentId && args.action_id) {
-          const row = db2.prepare("SELECT intent_id FROM actions WHERE id=?").get(args.action_id);
-          if (!row) return { content: `\u9519\u8BEF: action '${args.action_id}' \u4E0D\u5B58\u5728`, isError: true };
-          intentId = row.intent_id;
+          const a = store.getAction(String(args.action_id));
+          if (!a) return { content: `\u9519\u8BEF: action '${args.action_id}' \u4E0D\u5B58\u5728`, isError: true };
+          intentId = a.intentId;
         }
         if (!intentId) return { content: "Usage: proactive_resolve_intent --action_id <id> \u6216 --intent_id <id>", isError: true };
-        const node = db2.prepare("SELECT id, data FROM nodes WHERE id=? AND type=?").get(intentId, "intent");
-        if (!node) return { content: `\u9519\u8BEF: intent '${intentId}' \u4E0D\u5B58\u5728`, isError: true };
-        let data;
-        try {
-          data = JSON.parse(node.data);
-        } catch {
-          data = {};
-        }
-        data.status = "resolved";
-        db2.prepare("UPDATE nodes SET data=? WHERE id=?").run(JSON.stringify(data), intentId);
-        const res = db2.prepare("UPDATE actions SET status='cancelled', completed_at=?, cancel_reason='intent resolved by agent\uFF08\u9A6C\u540E\u70AE\u6E05\u626B\uFF09' WHERE intent_id=? AND status='queued'").run((/* @__PURE__ */ new Date()).toISOString(), intentId);
-        return { content: `\u2713 intent ${intentId} resolved\u3002\u7EA7\u8054\u53D6\u6D88 ${Number(res.changes)} \u4E2A\u6392\u961F\u7684\u5144\u5F1F action\u3002` };
-      } finally {
-        db2.close();
-      }
+        const data = store.getIntentData(intentId);
+        if (data === null) return { content: `\u9519\u8BEF: intent '${intentId}' \u4E0D\u5B58\u5728`, isError: true };
+        store.setIntentData(intentId, { ...data, status: "resolved" });
+        const n = store.cancelActionsOfIntents(
+          [intentId],
+          "intent resolved by agent\uFF08\u9A6C\u540E\u70AE\u6E05\u626B\uFF09",
+          nowUtc()
+        );
+        return { content: `\u2713 intent ${intentId} resolved\u3002\u7EA7\u8054\u53D6\u6D88 ${n} \u4E2A\u6392\u961F\u7684\u5144\u5F1F action\u3002` };
+      });
+      return out ?? { content: "proactive \u672A\u542F\u7528", isError: true };
     }
   });
   registry.register({
@@ -23599,16 +24255,12 @@ function registerProactiveTools() {
       }
     },
     handler: async (args) => {
-      const db2 = openDb2();
-      if (!db2) return { content: "proactive \u672A\u542F\u7528", isError: true };
-      try {
-        const where = args.include_done ? "status NOT IN ('cancelled')" : "status IN ('queued','executing')";
-        const rows = db2.prepare(`SELECT * FROM actions WHERE ${where} ORDER BY scheduled_time ASC LIMIT 30`).all();
+      const out = withStore((store) => {
+        const rows = store.listActions(args.include_done ? "not-cancelled" : "open");
         if (rows.length === 0) return { content: "\u5F53\u524D\u6CA1\u6709\u5F85\u5904\u7406\u7684 proactive action \u2713" };
         return { content: rows.map(fmtRow2).join("\n") };
-      } finally {
-        db2.close();
-      }
+      });
+      return out ?? { content: "proactive \u672A\u542F\u7528", isError: true };
     }
   });
 }
@@ -23618,6 +24270,8 @@ var init_proactive_tools = __esm({
     "use strict";
     init_registry();
     init_config2();
+    init_persistence();
+    init_clock();
   }
 });
 
@@ -23681,7 +24335,7 @@ __export(plugin_exports, {
   ProactivePlugin: () => ProactivePlugin,
   feedMem7Cell: () => feedMem7Cell
 });
-import { join as join41, dirname as dirname11 } from "node:path";
+import { join as join41 } from "node:path";
 import { existsSync as existsSync27, readFileSync as readFileSync33 } from "node:fs";
 function isFiller(text) {
   const t = text.trim();
@@ -23863,19 +24517,23 @@ var init_plugin = __esm({
           return;
         }
         if (!this.provider) {
-          const providerCfg = this.providers[this.config.providerId];
+          const configuredId = this.config.providerId;
+          const providerCfg = configuredId ? this.providers[configuredId] : void 0;
           if (providerCfg) {
             this.provider = createProvider(providerCfg);
           } else {
             const mainProvider = ctx.deps?.engine?.getProvider?.();
             const mainModel = ctx.config?.model;
+            const mainProviderId = ctx.config?.provider?.id || "main";
             if (mainProvider && mainModel) {
               this.provider = this.mainProviderProxy(ctx);
               const modelId = String(mainModel);
-              this.config = { ...this.config, modelId, modelRef: `${this.config.providerId}/${modelId}` };
-              console.warn(`[proactive] provider "${this.config.providerId}" not found in models.providers \u2014 falling back to main provider (model=${modelId})`);
+              this.config = { ...this.config, modelId, modelRef: `${mainProviderId}/${modelId}` };
+              if (configuredId) {
+                console.warn(`[proactive] \u914D\u7F6E\u7684 provider "${configuredId}" \u4E0D\u5728 models.providers \u91CC \u2014 \u6539\u7528\u4E3B\u6A21\u578B\uFF08${mainProviderId}/${modelId}\uFF09`);
+              }
             } else {
-              console.warn(`[proactive] provider "${this.config.providerId}" not found in models.providers and no main provider \u2014 not starting`);
+              console.warn(`[proactive] ${configuredId ? `provider "${configuredId}" \u4E0D\u5B58\u5728\uFF0C\u4E14` : ""}\u4E3B provider \u4E0D\u53EF\u7528 \u2014 \u4E0D\u542F\u52A8`);
               return;
             }
           }
@@ -23970,18 +24628,7 @@ ${String(input.tool_output ?? "")}`
                 foresightLines.push(`[mem7] [\u7A97\u53E3 ${e.start}~${e.end}] ${e.text}${e.evidence ? `\uFF08\u4F9D\u636E\uFF1A${e.evidence}\uFF09` : ""}`);
               }
             }
-            const lancedbPath = String(liveConfig.get("everos.lancedbPath") ?? "");
-            if (lancedbPath) {
-              const everosRoot = join41(dirname11(lancedbPath), "..");
-              const everosUserId = String(liveConfig.get("everos.userId") ?? "") || void 0;
-              for (const l of loadForesightLines(everosRoot, nowDate, 20, everosUserId)) {
-                const key = l.replace(/\s+/g, "");
-                if (seen.has(key)) continue;
-                seen.add(key);
-                foresightLines.push(l.replace(/^- /, "[everos] "));
-              }
-            }
-            if (foresightLines.length > 0) console.log(`[proactive] foresight dual-source total: ${foresightLines.length}`);
+            if (foresightLines.length > 0) console.log(`[proactive] mem7 foresight total: ${foresightLines.length}`);
           } catch (err) {
             console.warn(`[proactive] foresight load failed: ${err.message}`);
           }
@@ -24155,18 +24802,6 @@ ${String(input.tool_output ?? "")}`
             } else if (stateDir && !scopeReady) {
               console.warn("[proactive] mem7 recall skipped: sender scope but cell has no user speaker");
             }
-            if (senderScoped) {
-              this.warnOnce("everos-skip", "[proactive] everos \u6E90\u5728 sender \u6A21\u5F0F\u4E0B\u8DF3\u8FC7\uFF08\u65E0 per-speaker \u6620\u5C04\uFF09");
-            } else {
-              const lancedbPath = String(liveConfig.get("everos.lancedbPath") ?? "");
-              if (lancedbPath) {
-                const everosRoot = join41(dirname11(lancedbPath), "..");
-                const everosUserId = String(liveConfig.get("everos.userId") ?? "") || void 0;
-                for (const h of matchForesightForEvent(loadForesightEntries(everosRoot, now, everosUserId), prompt)) {
-                  hitSet.add(`[everos] ${h.replace(/^- /, "")}`);
-                }
-              }
-            }
             if (hitSet.size > 0) {
               foresightHits = [...hitSet];
               console.log(`[proactive] foresight matched ${hitSet.size} open-window prediction(s) for incoming message`);
@@ -24247,10 +24882,10 @@ ${String(input.tool_output ?? "")}`
 
 // src/memory/sessionMemory/sessionMemoryUtils.ts
 import { join as join42 } from "node:path";
-import { mkdirSync as mkdirSync16, readFileSync as readFileSync34 } from "node:fs";
+import { mkdirSync as mkdirSync17, readFileSync as readFileSync34 } from "node:fs";
 function setSessionMemoryStateDir(dir) {
   _stateDir2 = dir;
-  mkdirSync16(dir, { recursive: true });
+  mkdirSync17(dir, { recursive: true });
 }
 function getSessionMemoryDir() {
   return _stateDir2;
@@ -24522,7 +25157,7 @@ __export(sessionMemory_exports, {
   resetLastMemoryMessageUuid: () => resetLastMemoryMessageUuid,
   shouldExtractMemory: () => shouldExtractMemory
 });
-import { readFileSync as readFileSync35, mkdirSync as mkdirSync17 } from "node:fs";
+import { readFileSync as readFileSync35, mkdirSync as mkdirSync18 } from "node:fs";
 import { writeFile as writeFile3 } from "node:fs/promises";
 function initSessionMemory(deps) {
   _deps = deps;
@@ -24581,7 +25216,7 @@ function shouldExtractMemory(estimatedTokens, messages) {
 }
 async function setupSessionMemoryFile() {
   const memoryDir = getSessionMemoryDir();
-  mkdirSync17(memoryDir, { recursive: true });
+  mkdirSync18(memoryDir, { recursive: true });
   const memoryPath = getSessionMemoryPath();
   let currentMemory;
   try {
@@ -24622,7 +25257,7 @@ Here is the recent conversation context that you should extract notes from:
 
 ${messages.filter((m) => m.role === "user" || m.role === "assistant").slice(-20).map((m) => {
         const text = typeof m.content === "string" ? m.content : "[content blocks]";
-        return `[${m.role}]: ${text.slice(0, 500)}`;
+        return `[${m.role}]: ${truncateByCodePoint(text, 500)}`;
       }).join("\n\n")}`,
       maxTurns: 3,
       toolOverride: editTools.length > 0 ? editTools : void 0,
@@ -24684,6 +25319,7 @@ var init_sessionMemory = __esm({
     "use strict";
     init_sessionMemoryUtils();
     init_prompts2();
+    init_well_formed();
     init_query();
     init_registry();
     init_features();
@@ -25078,7 +25714,7 @@ __export(handle_query_exports, {
   resetSessionStartInjection: () => resetSessionStartInjection,
   resolveSystemPrompt: () => resolveSystemPrompt
 });
-import { readFileSync as readFileSync36, existsSync as existsSync28 } from "node:fs";
+import { readFileSync as readFileSync36, existsSync as existsSync28, statSync as statSync13 } from "node:fs";
 import { join as join45, resolve as resolve8 } from "node:path";
 import * as path29 from "node:path";
 function resolveSystemPrompt(v) {
@@ -25274,6 +25910,10 @@ ${text}` : text });
     } catch {
     }
   }
+  if (source === "inner-voice") {
+    chatMode = "emotion";
+    console.log(`[mode] ${sessionId} source=inner-voice \u2192 \u5F3A\u5236 emotion\uFF08light\uFF09`);
+  }
   const dynamicPrompt = buildDynamicPrompt({ workspace, channel: channelName, platform: channelName, sessionId, inboundMeta });
   const conversationAnchor = buildConversationAnchor(inboundMeta, channelName, source, workspace);
   const volatileParts = [
@@ -25499,7 +26139,7 @@ ${text}` : text });
           const restoredMemories = [];
           for (const memPath of newPaths) {
             try {
-              const stat4 = statSync(memPath);
+              const stat4 = statSync13(memPath);
               const content = readFileSync36(memPath, "utf-8");
               const header = memoryHeader(memPath, stat4.mtimeMs);
               restoredMemories.push({ path: memPath, content, mtimeMs: stat4.mtimeMs, header });
@@ -25534,13 +26174,16 @@ ${text}` : text });
       } else if (recallMode === "everos") {
         const everosCfg = deps?.everosCfg;
         if (everosCfg && everosCfg.everosUrl && everosCfg.userId) {
+          const recallOwnerMode = String(liveConfig.get("everos.ownerMode") ?? "agent") === "sender" ? "sender" : "agent";
+          const everosOwner = recallOwnerMode === "sender" ? inboundMeta?.from || everosCfg.userId : everosCfg.userId;
           relevantMemories = await findRelevantMemoriesEveros(
             effectiveText,
             memoryDir,
             surfaced.paths,
             {
               everosUrl: everosCfg.everosUrl,
-              userId: everosCfg.userId,
+              userId: everosOwner,
+              appId: everosCfg.userId,
               rerankUrl: everosCfg.rerank?.baseUrl,
               rerankApiKey: everosCfg.rerank?.apiKey,
               rerankModel: everosCfg.rerank?.model,
@@ -25830,6 +26473,8 @@ ${text}` : text });
               Promise.resolve().then(() => (init_embedding(), embedding_exports))
             ]);
             const embedding = parseEmbeddingConfig2(liveConfig.get("mem7.embedding"));
+            const ownerMode = String(liveConfig.get("everos.ownerMode") ?? "agent") === "sender" ? "sender" : "agent";
+            const identity = String(liveConfig.get("everos.userId") ?? "") || agentName;
             await runMem7Pipeline2({
               rawMessages: messages,
               sessionId,
@@ -25837,6 +26482,8 @@ ${text}` : text });
               provider,
               model: model2,
               agentName,
+              identity,
+              ownerMode,
               onExtracted: (cell, episode, facts) => feedMem7Cell2(cell, episode, facts),
               embedding: embedding ?? void 0
             });
@@ -26099,8 +26746,8 @@ async function runQuery(args) {
   if (!stateDir) {
     const home = process.env.HOME || process.env.USERPROFILE || ".";
     const cwd = process.cwd();
-    const { existsSync: existsSync34 } = await import("node:fs");
-    if (existsSync34(join47(cwd, "configs"))) stateDir = cwd;
+    const { existsSync: existsSync35 } = await import("node:fs");
+    if (existsSync35(join47(cwd, "configs"))) stateDir = cwd;
     else {
       try {
         const pointer = JSON.parse(readFileSync37(join47(home, ".engine7.json"), "utf-8"));
@@ -26534,6 +27181,20 @@ async function runDoctor(stateDir, opts) {
   };
   walk(config);
   report.missingEnvKeys = [...missing].sort();
+  const stale = [];
+  for (const rel of ["workspace/SESSION-STATE.md", "SESSION-STATE.md"]) {
+    const p = path30.join(stateDir, rel);
+    try {
+      if (!fs28.existsSync(p)) continue;
+      const head = fs28.readFileSync(p, "utf8").split("\n").slice(0, 10).join("\n");
+      const m = head.match(/^#{1,3}\s*当前时间\s*$\n+\s*(\d{4}-\d{2}-\d{2})/m);
+      if (!m) continue;
+      const ageH = (Date.now() - (/* @__PURE__ */ new Date(`${m[1]}T00:00:00Z`)).getTime()) / 36e5;
+      if (ageH > 48) stale.push(`${rel}: ${m[1]}`);
+    } catch {
+    }
+  }
+  report.staleTimeHeaders = stale;
   report.apiPort = config?.api?.port || 16890;
   report.engineAlive = await probePort(report.apiPort, opts?.probeTimeoutMs ?? 1500);
   return report;
@@ -26563,6 +27224,138 @@ var init_cli_doctor = __esm({
   }
 });
 
+// src/provision-free.ts
+var provision_free_exports = {};
+__export(provision_free_exports, {
+  loadOrCreateInstallIdentity: () => loadOrCreateInstallIdentity,
+  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)) {
+    let parsed;
+    try {
+      parsed = JSON.parse(readFileSync39(file2, "utf8"));
+    } catch (e) {
+      throw new Error(
+        `${IDENTITY_FILE} \u5B58\u5728\u4F46\u4E0D\u662F\u5408\u6CD5 JSON\uFF08${e.message}\uFF09\u2014\u2014\u5220\u6389\u5B83\u91CD\u8DD1\u4F1A\u9886\u4E00\u628A\u65B0\u4EE4\u724C\uFF0C\u65E7\u7684\u90A3\u628A\u53D6\u4E0D\u56DE\u6765`
+      );
+    }
+    if (typeof parsed?.installId !== "string" || typeof parsed?.installSecret !== "string") {
+      throw new Error(`${IDENTITY_FILE} \u7F3A installId / installSecret \u5B57\u6BB5`);
+    }
+    const email = readContactEmailOf(parsed);
+    return {
+      installId: parsed.installId,
+      installSecret: parsed.installSecret,
+      ...email ? { contactEmail: email } : {}
+    };
+  }
+  const identity = {
+    // 服务端校验 installId 长度为 8..36、只允许字母数字和连字符；uuid 正好符合
+    installId: randomUUID9(),
+    // 服务端校验 installSecret 为 32..64 位十六进制
+    installSecret: randomBytes6(32).toString("hex")
+  };
+  mkdirSync19(stateDir, { recursive: true });
+  writeFileSync20(file2, JSON.stringify(identity, null, 2) + "\n", { mode: 384 });
+  try {
+    chmodSync2(file2, 384);
+  } catch {
+  }
+  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";
+  } catch {
+    return "unknown";
+  }
+}
+async function provisionFreeToken(opts) {
+  const doFetch = opts.fetchImpl ?? fetch;
+  const identity = loadOrCreateInstallIdentity(opts.stateDir);
+  const url = opts.relayBaseUrl.replace(/\/+$/, "") + "/api/engine7/provision";
+  const res = await doFetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    // 显式列字段，**不要用 `...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;
+  try {
+    body = JSON.parse(text);
+  } catch {
+    throw new Error(`HTTP ${res.status}\uFF0C\u54CD\u5E94\u4E0D\u662F JSON\uFF1A${text.slice(0, 200)}`);
+  }
+  if (!res.ok || !body?.success) {
+    throw new Error(body?.message || `HTTP ${res.status}`);
+  }
+  const key = body?.data?.key;
+  if (!key) throw new Error("\u54CD\u5E94\u91CC\u6CA1\u6709 data.key");
+  const secretFile = writeSecretsValue(opts.configPath, FREE_TIER_ENV_KEY, key);
+  return {
+    providerId: body?.data?.providerId || "7yi",
+    // baseUrl 以服务端自报为准：挪机器/换域名只改服务端，不用重发安装包
+    baseUrl: body?.data?.baseUrl || `${opts.relayBaseUrl.replace(/\/+$/, "")}/v1`,
+    envKey: FREE_TIER_ENV_KEY,
+    secretFile,
+    installId: identity.installId
+  };
+}
+var __filename, IDENTITY_FILE, FREE_TIER_ENV_KEY;
+var init_provision_free = __esm({
+  "src/provision-free.ts"() {
+    "use strict";
+    init_secrets_env();
+    __filename = fileURLToPath6(import.meta.url);
+    IDENTITY_FILE = "install-identity.json";
+    FREE_TIER_ENV_KEY = "7YI_API_KEY";
+  }
+});
+
 // src/cli-reconfig.ts
 var cli_reconfig_exports = {};
 __export(cli_reconfig_exports, {
@@ -26961,8 +27754,7 @@ async function doExport(opts) {
 [DRY RUN] \u4E0D\u5B9E\u9645\u6253\u5305`);
     return;
   }
-  const now = /* @__PURE__ */ new Date();
-  const version = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, "0")}${String(now.getDate()).padStart(2, "0")}-${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}`;
+  const version = formatLog().replace(/[-: ]/g, "").slice(0, 12).replace(/(d{8})(d{4})/, "$1-$2");
   const tmpDir = path32.join(os5.tmpdir(), `engine7-export-${agentName}-${version}`);
   fs30.mkdirSync(tmpDir, { recursive: true });
   const stagingDir = path32.join(tmpDir, agentName);
@@ -27013,7 +27805,7 @@ async function doExport(opts) {
   const manifest = {
     agentName,
     version,
-    createdAt: now.toISOString(),
+    createdAt: nowUtc(),
     engineVersion: "7.x",
     originalPaths: {
       WORKSPACE: workspace,
@@ -27303,6 +28095,7 @@ var CONFIG_PATH, PATH_PLACEHOLDERS, WORKSPACE_INCLUDE, WORKSPACE_OPTIONAL, WORKS
 var init_cli_travel = __esm({
   "src/cli-travel.ts"() {
     "use strict";
+    init_clock();
     CONFIG_PATH = path32.join(os5.homedir(), ".engine7-travel.json");
     PATH_PLACEHOLDERS = [
       { placeholder: "{{WORKSPACE}}", getOriginal: (d) => d.workspace },
@@ -27406,19 +28199,28 @@ init_wechat();
 init_qr_render();
 init_cli_events();
 import * as readline3 from "node:readline";
-import { fileURLToPath as fileURLToPath6 } from "node:url";
+import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // src/cli-init-answers.ts
+init_clock();
 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",
   zhipu: "zhipu/glm-5.3",
-  deepseek: "deepseek/deepseek-v4-pro"
+  deepseek: "deepseek/deepseek-v4-pro",
+  "7yi": "7yi/engine7-free"
 };
 var VISION_CAPABLE = {
   // 0917：原先标 true，但同一个文件里 qwen3.8-max 的 input 是 ['text']，安装器目录
@@ -27444,7 +28246,11 @@ var VISION_CAPABLE = {
   // 声明多一分的代价是上游响亮报错，少一分的代价是无声丢图——选前者。
   "deepseek/deepseek-flash": true,
   "deepseek/deepseek-v4-flash": true,
-  "deepseek/deepseek-v4-pro": true
+  "deepseek/deepseek-v4-pro": true,
+  // 免费档（0919）：engine7-free 只收文本，engine7-vis-free 才带 image。
+  // 标错会让主模型被当成能看图 → 图发给一个 input=['text'] 的型号 → 静默丢图。
+  "7yi/engine7-free": false,
+  "7yi/engine7-vis-free": true
 };
 var PROVIDER_DEFS = {
   dashscope: {
@@ -27484,6 +28290,41 @@ var PROVIDER_DEFS = {
       // 0917 补 image：官方旗舰已停、9/14 起请求由 V4.1 Flash 承接，实际收图
       { id: "deepseek-v4-pro", name: "DeepSeek V4 Pro", reasoning: true, input: ["text", "image"], contextWindow: 1e6, maxTokens: 384e3 }
     ]
+  },
+  "7yi": {
+    // 引擎免费档的中转站。baseUrl 是兜底值——真正的权威值来自领号响应
+    // （服务端按请求 Host 自报地址），由安装器作为 customBaseUrl 下发。
+    // 这样挪机器、换域名只改服务端，不用重发安装包。
+    //
+    // ⚠️ 0921 修：这里原本写的是 `https://www.twinsun.top/v1`（443），而 **443 上不是
+    // 中转站**（实测回的是另一个服务的 FastAPI 404）。安装器那条路每次都会下发
+    // customBaseUrl 把它盖掉，所以正式装机撞不到；但**终端向导选 7yi 时不问 baseUrl**，
+    // 直接落到这个兜底值——于是命令行用户拿到的是「号领到了、引擎起来了、一发消息就废」。
+    // 用常量拼，别再手写一遍（漏端口就是这个坑）。
+    baseUrl: `${FREE_TIER_RELAY_URL}/v1`,
+    api: "anthropic",
+    models: [
+      // ⚠️ contextWindow **不能照抄 1000000**。
+      //
+      // engine7-free 是虚拟模型，真实上限取决于当时哪一档在接。写满了会让压缩阈值
+      // 高到永不触发——实测病例（0919 小柯）：声明 1M → 阈值 906137，而她的上下文
+      // 已滚到 191080 仍不压缩，最后那条 191k 的请求把 SenseNova 的 TPM 打爆
+      // （429 inference exceeds tpm/rpm limit），整条链退到付费的 MiniMax。
+      //
+      // 实测数据点（0919，SenseNova 那一档）：
+      //   114K token → 成功（10s，真实输出）
+      //   191K token → 失败（tpm/rpm 429）
+      //   分界在 114K~191K 之间，中点无数据。
+      //
+      // 阈值与 contextWindow 是比例关系：实测 1,000,000 → 906,137（×0.906）。
+      // 取 150000 → 阈值约 136K，在成功线上方留 22K 余量，又不去赌无数据区。
+      // 等中点实测出来再放宽。
+      { id: "engine7-free", name: "Engine7 \u514D\u8D39\uFF08\u6587\u672C\uFF09", reasoning: true, input: ["text"], contextWindow: 15e4, maxTokens: 64e3 },
+      // input 带 image：实测 Claude 格式的图片块经 /v1/messages 能被上游正确识别
+      { id: "engine7-vis-free", name: "Engine7 \u514D\u8D39\uFF08\u89C6\u89C9\uFF09", reasoning: true, input: ["text", "image"], contextWindow: 15e4, maxTokens: 64e3 }
+      // 注意：engine7-img-free 不在这里。它在 chat 端点是 404（不是 chat 模型），
+      // 生图由 my_selfie 自己拼 /v1/images/edits，relayModel 默认值已经是它。
+    ]
   }
 };
 var MODEL_CHOICES = Object.fromEntries(
@@ -27524,7 +28365,10 @@ function resolveVisionModel(providerId, primaryModel, catalog) {
 }
 var TEMPLATE_VALUES = {
   stateDir: "{{STATE_DIR}}",
+  timezone: "{{TIMEZONE}}",
   agentName: "{{AGENT_NAME}}",
+  persona: "assistant",
+  chatMode: "auto",
   primaryProvider: "dashscope",
   zhipuPlan: "",
   dashscopePlan: "",
@@ -27561,6 +28405,9 @@ function generateConfig(v) {
   const workspace = path2.join(v.stateDir, "workspace").replace(/\\/g, "/");
   const config = {
     schemaVersion: SCHEMA_VERSION,
+    // 全引擎统一时区（design §3.1）。真实 init 走 getDefaultValues() 探测本机，
+    // 模板走 {{TIMEZONE}} 占位符。
+    timezone: v.timezone,
     stateDir: v.stateDir.replace(/\\/g, "/"),
     mediaDir: `${v.stateDir.replace(/\\/g, "/")}/media/inbound`,
     models: {
@@ -27570,7 +28417,19 @@ function generateConfig(v) {
     // 后者是模板里遗留的死键（全仓零读者），已删。visionModel 解析不出就不写这个块。
     tools: {
       ...v.tavilyKey ? { tavily: { apiKey: v.tavilyKey } } : {},
-      ...v.visionModel ? { my_eyes: { model: v.visionModel } } : {}
+      ...v.visionModel ? { my_eyes: { model: v.visionModel } } : {},
+      // 自拍（§4.3）：免费档必须显式写 provider:'relay'。不写的话 getProvider()
+      // 会落回默认值 'fal'，而免费装机没有 fal key——第一次自拍就失败。
+      // 非免费档只在用户真给了形象时才写这个块，且不替他决定 provider。
+      ...isFreeTier(v) || v.selfiePhotoRelPath || v.selfiePortraitDesc ? {
+        my_selfie: {
+          ...isFreeTier(v) ? { provider: "relay" } : {},
+          ...v.selfiePhotoRelPath ? { references: [{ name: "portrait", path: v.selfiePhotoRelPath }] } : {},
+          // 只在没有照片时才写描述——两个都给的话以照片为准，写进去会让人以为
+          // 描述也生效了（冷启读的就是这个键）
+          ...!v.selfiePhotoRelPath && v.selfiePortraitDesc ? { portraitDesc: v.selfiePortraitDesc } : {}
+        }
+      } : {}
     },
     session: { dmScope: "main", groupScope: "main" },
     sandbox: { mode: "off" },
@@ -27586,6 +28445,10 @@ function generateConfig(v) {
       defaults: {
         workspace,
         name: v.agentName,
+        // 人设落 config 是为了**复跑能读回来**（loadExistingValues）。引擎运行时不读它
+        // ——SOUL.md 已经按人设渲染好了。不写的话复跑 init 会退回 'assistant'，
+        // 而 execute() 用模板重写 SOUL.md，用户选的"情感陪伴"重装一次就变回通用助手。
+        persona: v.persona,
         model: {
           primary: v.primaryModel,
           // 条件写入：vision 引用解析不出时省略键（loader 按 if (visionRef) 处理缺失）
@@ -27605,7 +28468,10 @@ function generateConfig(v) {
           agentTeams: true,
           processOutput: "minimal",
           interrupt: "command",
-          debounceMs: 5e3
+          debounceMs: 5e3,
+          // 免费档的装机目标是「能对话、能看图、能自拍」，这两个 flag 默认 false
+          // （src/config/features.ts）。显式打开，它们是声明这两件事的地方。
+          ...isFreeTier(v) ? { selfie: true, eyes: true } : {}
         }
       }
     },
@@ -27633,7 +28499,15 @@ function generateConfig(v) {
           dmPolicy: "pairing",
           group: { policy: "disabled" }
         }
-      } : {}
+      } : {},
+      // 0920 翀哥拍板：emotion 通道默认开启（含 liveSystemPrompt 加载 EMOTION.md）
+      // 即使没装 EMOTION.md，buildLightStablePrompt 也会硬编码"想 TA 就发"那段兜底
+      emotion: {
+        enabled: true,
+        liveSystemPrompt: {
+          files: ["SOUL.md", "EMOTION.md"]
+        }
+      }
     },
     api: { port: v.apiPort },
     // 0909 npm 包默认开：inner-voice + proactive 是开箱即用的核心体验
@@ -27686,6 +28560,9 @@ function generateConfig(v) {
     if (v.primaryProvider === "dashscope" && v.dashscopePlan === "token") {
       def.baseUrl = "https://token-plan.cn-beijing.maas.aliyuncs.com/compatible-mode/v1";
     }
+    if (v.primaryProvider === "7yi" && (v.customBaseUrl || "").trim()) {
+      def.baseUrl = v.customBaseUrl.trim();
+    }
     if (v.providerModels && v.providerModels.length > 0) {
       def.models = v.providerModels.map((m) => ({
         id: m.id,
@@ -27741,14 +28618,32 @@ function generateConfig(v) {
 }
 
 // src/cli-init-answers.ts
-var VALID_PROVIDERS = ["dashscope", "minimax", "zhipu", "deepseek", "custom"];
+var VALID_PROVIDERS = ["dashscope", "minimax", "zhipu", "deepseek", "7yi", "custom"];
 var VALID_CHANNEL_MODES = ["skip", "qr", "manual"];
+var VALID_PERSONAS = ["assistant", "companion", "butler", "friend"];
+var VALID_CHAT_MODES = ["auto", "emotion", "work"];
 function validate(a) {
   if (!a || typeof a !== "object") throw new Error("answers \u6587\u4EF6\u5185\u5BB9\u4E0D\u662F JSON \u5BF9\u8C61");
   if (!VALID_PROVIDERS.includes(a.provider)) {
     throw new Error(`provider \u975E\u6CD5: ${a.provider}\uFF08\u53EF\u9009: ${VALID_PROVIDERS.join(" / ")}\uFF09`);
   }
   if (typeof a.apiKey !== "string") throw new Error("apiKey \u5FC5\u586B\uFF08\u53EF\u4E3A\u7A7A\u4E32\uFF0C\u8DF3\u8FC7 secrets \u5199\u5165\uFF09");
+  if (a.persona !== void 0 && !VALID_PERSONAS.includes(a.persona)) {
+    throw new Error(`persona \u975E\u6CD5: ${a.persona}\uFF08\u53EF\u9009: ${VALID_PERSONAS.join(" / ")}\uFF09`);
+  }
+  if (a.chatMode !== void 0 && !VALID_CHAT_MODES.includes(a.chatMode)) {
+    throw new Error(`chatMode \u975E\u6CD5: ${a.chatMode}\uFF08\u53EF\u9009: ${VALID_CHAT_MODES.join(" / ")}\uFF09`);
+  }
+  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`);
   }
@@ -27777,6 +28672,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 = {}) {
@@ -27793,7 +28693,17 @@ function buildConfigValuesFromAnswers(stateDir, a, existing = {}) {
   const wechatMode = a.wechat?.mode || "skip";
   return {
     stateDir,
+    // 时区的三级优先（0920）：用户显式改过 > 已有值 > 探测本机。
+    //
+    // 中间那级是"复跑保护"——装完手改过时区的人，重跑 init 不该被本机探测值冲掉。
+    // 安装器只在用户**动过向导里那个框**时才下发 a.timezone（默认显示的就是探测值，
+    // 原样发回来会把中间这级架空）。不传时这条与 --quick 路径产出全等
+    // （cli-init.headless.e2e.test.ts 的 deepEqual 基准）。
+    timezone: a.timezone || existing.timezone || detectHostTimezone(),
     agentName: a.agentName || existing.agentName || "Agent",
+    // 人设类型：headless 由安装器下发，缺省 assistant（0919 从上游合入）
+    persona: a.persona || "assistant",
+    chatMode: a.chatMode || "auto",
     primaryProvider,
     zhipuPlan: a.zhipuPlan || "",
     dashscopePlan: a.dashscopePlan || "",
@@ -27816,21 +28726,30 @@ function buildConfigValuesFromAnswers(stateDir, a, existing = {}) {
     customApi: a.customApi || "anthropic",
     customProviderId: a.provider === "custom" ? a.customProviderId || existing.customProviderId || "custom" : "",
     tavilyKey: a.tavilyKey || "",
-    apiPort: a.apiPort || existing.apiPort || 16990
+    apiPort: a.apiPort || existing.apiPort || 16990,
+    freeTier: a.freeTier === true,
+    // 照片两个都给时以照片为准（安装器侧 UI 也这么说明）；photoRelPath 由 init 主链路
+    // 在校验通过、拷进 workspace 之后回填，这里只带描述。
+    selfiePortraitDesc: a.selfie?.photoPath ? "" : (a.selfie?.portraitDesc || "").trim()
   };
 }
 
 // src/cli-init.ts
-var origEmitWarning = process.emitWarning.bind(process);
-process.emitWarning = (warning, ...rest) => {
-  const name = typeof warning === "object" ? warning?.name : rest?.[0];
-  const msg2 = typeof warning === "object" ? String(warning?.message) : String(warning);
-  if (name === "ExperimentalWarning" && msg2.includes("SQLite")) return;
-  return origEmitWarning(warning, ...rest);
-};
+init_secrets_env();
+init_clock();
+var defaultWarningListeners = process.listeners("warning");
+process.removeAllListeners("warning");
+process.on("warning", (warning) => {
+  if (warning?.name === "ExperimentalWarning" && String(warning.message).includes("SQLite")) return;
+  if (defaultWarningListeners.length === 0) {
+    console.warn(`${warning.name}: ${warning.message}`);
+    return;
+  }
+  for (const listener of defaultWarningListeners) listener(warning);
+});
 var headlessEmit = null;
-var __filename = fileURLToPath6(import.meta.url);
-var __dirname = path33.dirname(__filename);
+var __filename2 = fileURLToPath7(import.meta.url);
+var __dirname = path33.dirname(__filename2);
 function parseArgs() {
   const args = process.argv.slice(2);
   let stateDir = "";
@@ -27865,7 +28784,7 @@ function parseArgs() {
 }
 function printHelp() {
   console.log(`
-Engine 7 \u2014 Self-hosted AI agent engine
+Engine 7 \u2014 \u7ED9\u52A9\u624B\u4E00\u4E2A\u5BB6 / A home for your AI assistant
 
 \u7528\u6CD5:
   engine7 init --state-dir <path> [\u9009\u9879]   \u521D\u59CB\u5316 agent \u5DE5\u4F5C\u76EE\u5F55
@@ -27938,7 +28857,11 @@ function getDefaultValues(stateDir) {
   const primaryModel = existing.primaryModel || "dashscope/qwen3.8-max";
   return {
     stateDir,
+    // 安装时取本机时区（design §3.1）；复跑 init 沿用已配置的值，不覆盖用户改过的
+    timezone: existing.timezone || detectHostTimezone(),
     agentName: existing.agentName || "Agent",
+    persona: existing.persona || "assistant",
+    chatMode: existing.chatMode || "auto",
     primaryProvider,
     zhipuPlan: existing.zhipuPlan || "",
     dashscopePlan: existing.dashscopePlan || "",
@@ -27976,7 +28899,15 @@ function loadExistingValues(stateDir) {
     if (!fs31.existsSync(configPath)) return {};
     const j = JSON.parse(fs31.readFileSync(configPath, "utf8"));
     const out = {};
+    if (typeof j.timezone === "string" && j.timezone) out.timezone = j.timezone;
     if (j.agents?.defaults?.name) out.agentName = j.agents.defaults.name;
+    if (j.agents?.defaults?.persona) out.persona = j.agents.defaults.persona;
+    try {
+      const wm = fs31.readFileSync(path33.join(stateDir, "workspace", ".work-mode"), "utf8").trim();
+      if (wm === "on") out.chatMode = "work";
+      else if (wm === "off") out.chatMode = "emotion";
+    } catch {
+    }
     const providers = j.models?.providers || {};
     const firstId = Object.keys(providers)[0];
     if (firstId) {
@@ -28050,12 +28981,27 @@ async function interactiveConfig(rl, defaults) {
   const v = { ...defaults };
   console.log("\n=== \u7B2C\u4E00\u6B65\uFF1A\u5FC5\u586B\u914D\u7F6E ===\n");
   v.agentName = await ask(rl, "Agent \u540D\u79F0", defaults.agentName);
-  const providers = ["dashscope (\u901A\u4E49\u5343\u95EE)", "minimax (MiniMax)", "zhipu (\u667A\u8C31)", "deepseek (DeepSeek)", "custom (\u81EA\u5B9A\u4E49/\u5176\u4ED6 Anthropic \u517C\u5BB9\u7AEF\u70B9)"];
+  const personas = ["assistant (\u901A\u7528\u52A9\u624B\xB7\u4E2D\u6027)", "companion (\u60C5\u611F\u966A\u4F34)", "butler (\u7BA1\u5BB6/\u751F\u6D3B\u52A9\u7406)", "friend (\u670B\u53CB\u5B66\u4F34)"];
+  const personaMap = {
+    "assistant (\u901A\u7528\u52A9\u624B\xB7\u4E2D\u6027)": "assistant",
+    "companion (\u60C5\u611F\u966A\u4F34)": "companion",
+    "butler (\u7BA1\u5BB6/\u751F\u6D3B\u52A9\u7406)": "butler",
+    "friend (\u670B\u53CB\u5B66\u4F34)": "friend"
+  };
+  console.log("  \u8FD9\u51B3\u5B9A TA \u7684\u6027\u683C\u548C\u60C5\u7EEA\u8868\u8FBE\uFF1B\u4E0D\u786E\u5B9A\u5C31\u9009 1\uFF0C\u4E4B\u540E\u968F\u65F6\u53EF\u6539\uFF08\u6539 workspace \u6587\u4EF6\u7ACB\u5373\u751F\u6548\uFF09");
+  const chosenPersona = await askChoice(rl, "\u4EBA\u8BBE\u7C7B\u578B\uFF08\u60C5\u7EEA\u72B6\u6001\u8868\u6A21\u677F\uFF09:", personas, 0, defaults.persona);
+  v.persona = personaMap[chosenPersona] || "assistant";
+  const providers = ["dashscope (\u901A\u4E49\u5343\u95EE)", "minimax (MiniMax)", "zhipu (\u667A\u8C31)", "deepseek (DeepSeek)", "7yi (\u514D\u8D39\u6863\xB7\u4E2D\u8F6C\u7AD9)", "custom (\u81EA\u5B9A\u4E49/\u5176\u4ED6 Anthropic \u517C\u5BB9\u7AEF\u70B9)"];
   const providerMap = {
     "dashscope (\u901A\u4E49\u5343\u95EE)": "dashscope",
     "minimax (MiniMax)": "minimax",
     "zhipu (\u667A\u8C31)": "zhipu",
     "deepseek (DeepSeek)": "deepseek",
+    // 免费档列在这里是为了"复跑不换 provider"：7yi 是内置 provider，menuProviderOf('7yi')
+    // 现在返回 '7yi'，菜单里没有这一项就会匹配失败、退回第一项 dashscope——
+    // 于是复跑终端向导会把装好的免费档悄悄换成通义千问。令牌早已在 secrets 里，
+    // 这一步不需要重新领号；要换 provider 请显式选别的项。
+    "7yi (\u514D\u8D39\u6863\xB7\u4E2D\u8F6C\u7AD9)": "7yi",
     "custom (\u81EA\u5B9A\u4E49/\u5176\u4ED6 Anthropic \u517C\u5BB9\u7AEF\u70B9)": "custom"
   };
   const chosenProvider = await askChoice(rl, "\u4E3B\u6A21\u578B Provider:", providers, 0, menuProviderOf(defaults.primaryProvider));
@@ -28253,7 +29199,6 @@ async function configureWechat(rl, v) {
 function buildDirTree(v) {
   const d = v.stateDir;
   const w = path33.join(d, "workspace");
-  const now = (/* @__PURE__ */ new Date()).toLocaleString("sv-SE", { timeZone: "Asia/Shanghai", hour12: false });
   return [
     // 目录
     { path: path33.join(d, "configs"), type: "dir" },
@@ -28271,23 +29216,93 @@ function buildDirTree(v) {
     {
       path: path33.join(w, "SESSION-STATE.md"),
       type: "file",
-      content: readTemplate("workspace/SESSION-STATE.md").replace("{{CURRENT_TIME}}", now)
+      content: readTemplate("workspace/SESSION-STATE.md")
     },
     { path: path33.join(w, "HEARTBEAT.md"), type: "file", content: readTemplate("workspace/HEARTBEAT.md") },
     {
       path: path33.join(w, "SOUL.md"),
       type: "file",
-      content: readTemplate("workspace/SOUL.md").replace(/\{\{AGENT_NAME\}\}/g, v.agentName)
+      // 0917：SOUL 按人设取模板（templates/workspace/souls/<persona>.md），
+      // 单一人设模板缺失时回退通用骨架（workspace/SOUL.md）
+      content: (() => {
+        try {
+          return readTemplate(`workspace/souls/${v.persona}.md`).replace(/\{\{AGENT_NAME\}\}/g, v.agentName);
+        } catch {
+          return readTemplate("workspace/SOUL.md").replace(/\{\{AGENT_NAME\}\}/g, v.agentName);
+        }
+      })()
     },
     { path: path33.join(w, "AGENTS.md"), type: "file", content: readTemplate("workspace/AGENTS.md") },
+    {
+      // 0920 翀哥拍板：EMOTION.md 模板按人设装（templates/workspace/emotion/<persona>.md）
+      // 冷启动默认带"想 TA 了就直接发（msg_send）"那段（写在每份模板 §一）
+      // 单一人设模板缺失时回退通用骨架（emotion/_default.md）
+      path: path33.join(w, "EMOTION.md"),
+      type: "file",
+      content: (() => {
+        try {
+          return readTemplate(`workspace/emotion/${v.persona}.md`).replace(/\{\{AGENT_NAME\}\}/g, v.agentName);
+        } catch {
+          return readTemplate("workspace/emotion/_default.md").replace(/\{\{AGENT_NAME\}\}/g, v.agentName);
+        }
+      })()
+    },
     {
       path: path33.join(w, "prompts", "contacts.md"),
       type: "file",
       content: readTemplate("workspace/prompts/contacts.md").replace("{{DISCORD_USER_ID}}", v.discordUserId || "YOUR_DISCORD_ID").replace("{{FEISHU_OPEN_ID}}", v.feishuOpenId || "YOUR_FEISHU_OPEN_ID")
     },
     { path: path33.join(w, "prompts", "auto-memory-instructions.md"), type: "file", content: readTemplate("workspace/prompts/auto-memory-instructions.md") },
+    {
+      // 0917：inner-voice 定制 prompt 按人设装（templates/workspace/inner-voice/<persona>.md）
+      path: path33.join(w, "prompts", "my-inner-voice.md"),
+      type: "file",
+      content: readTemplate(`workspace/inner-voice/${v.persona}.md`).replace(/\{\{AGENT_NAME\}\}/g, v.agentName)
+    },
     { path: path33.join(w, "MEMORY.md"), type: "file", content: "# MEMORY.md \u2014 \u8BB0\u5FC6\u6587\u4EF6\u7D22\u5F15\n\n> \u6700\u540E\u66F4\u65B0\uFF1A\u521D\u59CB\u5316\n" },
     { path: path33.join(w, "USER.md"), type: "file", content: "# USER.md \u2014 \u7528\u6237\u4FE1\u606F\n\n\uFF08\u5728\u8FD9\u91CC\u8BB0\u5F55\u7528\u6237\u7684\u504F\u597D\u3001\u80CC\u666F\u7B49\uFF09\n" },
+    // 情绪状态机（0917）：脚本 + hook 接线 + 人设情绪表（用户在 init 选的 persona）
+    //
+    // 0920 起装的是 **.mjs 版**（原来是 .py，见下面 hook 命令那段）。老装机的 workspace
+    // 里那份 .py 不动它——没被引用就不会跑，删了反而无据可查。
+    {
+      path: path33.join(w, "scripts", "emotion_state_machine.mjs"),
+      type: "file",
+      content: readTemplate("workspace/scripts/emotion_state_machine.mjs")
+    },
+    {
+      path: path33.join(w, ".hooks.json"),
+      type: "file",
+      content: JSON.stringify({
+        hooks: {
+          UserPromptSubmit: [
+            // `${E7_NODE}` 由引擎在加载 hook 时替换成它**自己的可执行文件**（hooks/config.ts）。
+            // 原来写的是 `python3 <脚本.py>` —— 而用户机器上不一定有 Python（Windows 不自带；
+            // 微软商店那个 WindowsApps\python3.exe 只是个跳商店的别名）。没有解释器时这个 hook
+            // 静默失败，而 handle-query 的 chatMode 默认是 work，于是"自动"档（默认档）在用户
+            // 机器上退化成固定工作模式。
+            //
+            // 换成引擎自己的 exe 后**零外部依赖**：那个 exe 带着 ELECTRON_RUN_AS_NODE=1 被 spawn
+            // （hook 的 env 是 {...process.env} 继承的），所以它就是个 node。
+            // 与 `service install --node-exe` 同一个路子。
+            // 路径两侧都加引号：stateDir 可能带空格（C:\Users\Foo Bar\...）。
+            { hooks: [{ type: "command", command: '"${E7_NODE}" "' + path33.join(w, "scripts", "emotion_state_machine.mjs") + '"' }] }
+          ]
+        }
+      }, null, 2) + "\n"
+    },
+    {
+      path: path33.join(w, ".emotion_states.json"),
+      type: "file",
+      content: readTemplate(`workspace/emotion-states/${v.persona}.json`)
+    },
+    // 模式档位（0920）：与 /work 命令写的是同一个文件，读端只认 on/off，
+    // 没有这个键就是 auto。auto 刻意不写——写个 "auto" 进去反而多一种除了这里没人认得的状态。
+    ...v.chatMode === "work" || v.chatMode === "emotion" ? [{
+      path: path33.join(w, ".work-mode"),
+      type: "file",
+      content: v.chatMode === "work" ? "on" : "off"
+    }] : [],
     // package.json — 让 agent 目录成为独立 npm 项目根，防止 npm hoisting
     {
       path: path33.join(d, "package.json"),
@@ -28380,6 +29395,15 @@ function readTemplate(relativePath) {
 function looksLikeAppInstall(dir) {
   return ["", "install"].some((sub) => fs31.existsSync(path33.join(dir, sub, "Engine7.exe")) && fs31.existsSync(path33.join(dir, sub, "resources", "engine7", "dist", "cli.mjs")));
 }
+var PHOTO_EXTS = [".png", ".jpg", ".jpeg", ".webp"];
+function hasOnlyEngineBookkeeping(dir) {
+  try {
+    const entries2 = fs31.readdirSync(dir);
+    return entries2.length > 0 && entries2.every((e) => e === "install-identity.json");
+  } catch {
+    return false;
+  }
+}
 function dryRun(entries2) {
   console.log("\n[dry-run] \u5C06\u8981\u521B\u5EFA\uFF1A\n");
   for (const e of entries2) {
@@ -28428,7 +29452,7 @@ async function main() {
   if (subcommand === "--version" || subcommand === "-v") {
     let ver = "unknown";
     try {
-      const pkgPath = path33.join(path33.dirname(__filename), "..", "package.json");
+      const pkgPath = path33.join(path33.dirname(__filename2), "..", "package.json");
       ver = JSON.parse(fs31.readFileSync(pkgPath, "utf8")).version || "unknown";
     } catch {
     }
@@ -28441,6 +29465,35 @@ async function main() {
     console.log(JSON.stringify(await runDoctor2(stateDir), null, 2));
     process.exit(0);
   }
+  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();
+        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 {
+      const { provisionFreeToken: provisionFreeToken2 } = await Promise.resolve().then(() => (init_provision_free(), provision_free_exports));
+      const result = await provisionFreeToken2({
+        relayBaseUrl: relay,
+        stateDir,
+        // 和 init 写 config 的路径一致（cli-init.ts 里 configPath 就是这么拼的）
+        configPath: path33.join(stateDir, "configs", "main7.json")
+      });
+      console.log(JSON.stringify(result, null, 2));
+      process.exit(0);
+    } catch (e) {
+      console.error(`\u9886\u53F7\u5931\u8D25\uFF1A${e?.message || e}`);
+      process.exit(1);
+    }
+  }
   if (subcommand === "reconfig" || subcommand === "addchannel") {
     const isLegacyAddchannel = subcommand === "addchannel";
     let target = args[1] || "";
@@ -28811,7 +29864,7 @@ engine7 session \u2014 \u4F1A\u8BDD\u7BA1\u7406\u5DE5\u5177
         }
       }
       const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-      const { readFileSync: readFileSync42, writeFileSync: writeFileSync22, renameSync: renameSync5 } = fs31;
+      const { readFileSync: readFileSync43, writeFileSync: writeFileSync24, renameSync: renameSync5 } = fs31;
       if (mode === "archive") {
         const archiveName = `${sessionFileUUID}.jsonl.archived.${timestamp}`;
         renameSync5(jsonlPath, path33.join(sessionsDir, archiveName));
@@ -28819,7 +29872,7 @@ engine7 session \u2014 \u4F1A\u8BDD\u7BA1\u7406\u5DE5\u5177
 \u2705 \u5F52\u6863\u5B8C\u6210: ${archiveName}`);
         console.log(`   \u91CD\u542F\u540E\u5C06\u4ECE\u7A7A\u767D\u4F1A\u8BDD\u5F00\u59CB`);
       } else if (mode === "drop-last") {
-        const lines = readFileSync42(jsonlPath, "utf-8").trim().split("\n");
+        const lines = readFileSync43(jsonlPath, "utf-8").trim().split("\n");
         const parsed = lines.map((l) => {
           try {
             return JSON.parse(l);
@@ -28838,12 +29891,12 @@ engine7 session \u2014 \u4F1A\u8BDD\u7BA1\u7406\u5DE5\u5177
         }
         const kept = parsed.slice(0, cutIndex);
         const newContent = kept.map((p) => JSON.stringify(p)).join("\n") + "\n";
-        writeFileSync22(jsonlPath, newContent);
+        writeFileSync24(jsonlPath, newContent);
         console.log(`
 \u2705 \u780D\u6389\u6700\u8FD1 ${parsed.length - cutIndex} \u884C\uFF08${dropN} \u8F6E\uFF09`);
         console.log(`   \u4FDD\u7559 ${kept.length} \u884C`);
       } else if (mode === "strip-images") {
-        const lines = readFileSync42(jsonlPath, "utf-8").trim().split("\n");
+        const lines = readFileSync43(jsonlPath, "utf-8").trim().split("\n");
         let stripped = 0;
         const newLines = lines.map((line) => {
           try {
@@ -28884,7 +29937,7 @@ engine7 session \u2014 \u4F1A\u8BDD\u7BA1\u7406\u5DE5\u5177
             return line;
           }
         });
-        writeFileSync22(jsonlPath, newLines.join("\n") + "\n");
+        writeFileSync24(jsonlPath, newLines.join("\n") + "\n");
         console.log(`
 \u2705 \u6458\u9664 ${stripped} \u884C\u56FE\u7247\u76F8\u5173\u5185\u5BB9`);
       }
@@ -28986,6 +30039,13 @@ engine7 service \u2014 \u5F00\u673A\u81EA\u542F\u52A8\u7BA1\u7406
         const absCfg = path33.resolve(configPath2);
         const vbs = [
           "' Engine 7 \u5F00\u673A\u81EA\u542F\uFF08\u542F\u52A8\u6587\u4EF6\u5939\uFF0C\u514D\u7BA1\u7406\u5458\uFF09",
+          'Set fso = CreateObject("Scripting.FileSystemObject")',
+          'exePath = "' + nodeExePath + '"',
+          "If Not fso.FileExists(exePath) Then",
+          "  On Error Resume Next",
+          "  fso.DeleteFile WScript.ScriptFullName, True",
+          "  WScript.Quit 0",
+          "End If",
           'Set s = CreateObject("WScript.Shell")',
           's.Environment("PROCESS")("ELECTRON_RUN_AS_NODE") = "1"',
           's.CurrentDirectory = "' + cwd + '"',
@@ -29138,6 +30198,12 @@ WantedBy=default.target`;
     }
     process.exit(0);
   }
+  const INIT_FLAGS = /* @__PURE__ */ new Set(["--state-dir", "--quick", "--dry-run", "--force", "--answers"]);
+  if (subcommand !== "init" && !INIT_FLAGS.has(subcommand)) {
+    console.error(`\u274C \u672A\u77E5\u547D\u4EE4: ${subcommand}`);
+    printHelp();
+    process.exit(1);
+  }
   const opts = parseArgs();
   if (opts.answersPath) {
     redirectConsoleToStderr();
@@ -29170,6 +30236,9 @@ WantedBy=default.target`;
         } else if (looksLikeAppInstall(opts.stateDir)) {
           console.log(`
 \u{1F4E6} \u68C0\u6D4B\u5230 Engine7 \u7A0B\u5E8F\u672C\u4F53\uFF08\u5B89\u88C5\u5668\u88C5\u7684\uFF09\u2014\u2014\u5728\u5176\u65C1\u8FB9\u521D\u59CB\u5316 agent \u6570\u636E`);
+        } else if (hasOnlyEngineBookkeeping(opts.stateDir)) {
+          console.log(`
+\u{1F511} \u68C0\u6D4B\u5230\u88C5\u673A\u8EAB\u4EFD\uFF08\u9886\u53F7\u7559\u4E0B\u7684\uFF09\u2014\u2014 \u5728\u5176\u65C1\u8FB9\u521D\u59CB\u5316 agent \u6570\u636E`);
         } else {
           if (headlessEmit) headlessEmit({ event: "error", message: `\u76EE\u5F55\u5DF2\u5B58\u5728\u4E14\u975E\u7A7A: ${opts.stateDir}\uFF08\u65E0 configs/main7.json\uFF09\u2014\u2014\u8BF7\u9009\u62E9\u7A7A\u76EE\u5F55\u6216\u7528 --force \u6E05\u7A7A\u540E\u91CD\u65B0\u914D\u7F6E` });
           console.error(`
@@ -29224,6 +30293,38 @@ WantedBy=default.target`;
     values = await interactiveConfig(rl, getDefaultValues(opts.stateDir));
     rl.close();
   }
+  {
+    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 --state-dir ${opts.stateDir} \u9886\u53F7\uFF0C\u518D\u8DD1 init\u3002`
+      );
+    }
+  }
+  let photoSrc = "";
+  if (answers?.selfie?.photoPath) {
+    const { dimsOf: dimsOf2 } = await Promise.resolve().then(() => (init_my_selfie(), my_selfie_exports));
+    const src = path33.resolve(answers.selfie.photoPath.trim());
+    const ext = path33.extname(src).toLowerCase();
+    if (!PHOTO_EXTS.includes(ext)) {
+      throw new Error(`\u7167\u7247\u683C\u5F0F\u4E0D\u652F\u6301\uFF1A${ext || "(\u6CA1\u6709\u540E\u7F00)"}\u3002\u8BF7\u7528 PNG / JPEG / WebP\u3002`);
+    }
+    if (!fs31.existsSync(src)) {
+      throw new Error(`\u7167\u7247\u4E0D\u5B58\u5728\uFF1A${src}`);
+    }
+    const dims = dimsOf2(src);
+    if (dims && dims.includes("\u4E0D\u5408\u683C")) {
+      throw new Error(`\u7167\u7247\u4E0D\u5408\u683C\uFF1A${dims}\u3002\u8BF7\u6362\u4E00\u5F20\uFF08\u5546\u6C64\u5BF9\u8F93\u5165\u56FE\u7684\u786C\u6027\u8981\u6C42\uFF09\u3002`);
+    }
+    values.selfiePhotoRelPath = `images/portrait${ext}`;
+    photoSrc = src;
+  }
   const config = generateConfig(values);
   const configPath = path33.join(opts.stateDir, "configs", "main7.json");
   const tree = buildDirTree(values);
@@ -29243,24 +30344,25 @@ WantedBy=default.target`;
       }
     }
   } else {
+    if (values.chatMode === "auto") {
+      try {
+        fs31.unlinkSync(path33.join(opts.stateDir, "workspace", ".work-mode"));
+      } catch {
+      }
+    }
+    if (photoSrc && values.selfiePhotoRelPath) {
+      const dest = path33.join(opts.stateDir, "workspace", values.selfiePhotoRelPath);
+      fs31.mkdirSync(path33.dirname(dest), { recursive: true });
+      fs31.copyFileSync(photoSrc, dest);
+      console.log(`  \u{1F5BC}  \u5F62\u8C61: ${dest}`);
+    }
     if (headlessEmit) headlessEmit({ event: "progress", step: "create_dirs" });
     console.log("\n\u{1F4E6} \u6B63\u5728\u521B\u5EFA\u76EE\u5F55\u548C\u6587\u4EF6...\n");
     execute(tree);
     if (headlessEmit) headlessEmit({ event: "progress", step: "write_secrets" });
     if (values.primaryApiKey && values.primaryApiKey.trim()) {
       const envName = values.primaryProvider.toUpperCase().replace(/[^A-Z0-9_]/g, "_") + "_API_KEY";
-      const secretsDir = path33.join(process.env.HOME || process.env.USERPROFILE || ".", ".engine7-secrets");
-      if (!fs31.existsSync(secretsDir)) fs31.mkdirSync(secretsDir, { recursive: true });
-      const envFile = path33.join(secretsDir, "main7.env");
-      let envContent = "";
-      if (fs31.existsSync(envFile)) envContent = fs31.readFileSync(envFile, "utf8");
-      const lines = envContent.split("\n").filter((l) => l && !l.startsWith(envName + "="));
-      lines.push(envName + "=" + values.primaryApiKey.trim());
-      fs31.writeFileSync(envFile, lines.join("\n") + "\n", "utf8");
-      try {
-        fs31.chmodSync(envFile, 384);
-      } catch {
-      }
+      const envFile = writeSecretsValue(configPath, envName, values.primaryApiKey.trim());
       console.log("\u{1F511} API key \u5DF2\u5B58\u5165: " + envFile);
       console.log("   config \u91CC\u53EA\u6709 env:" + envName + " \u5360\u4F4D\u7B26\uFF0C\u660E\u6587\u4E0D\u843D config");
     }