engine7 7.1.84 → 7.1.94

package/dist/main.mjs

@@ -207,12 +207,205 @@ var init_features = __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 formatWallLabel(i) {
+  return formatForLlm(i).replace(/\s*（.*）$/, "");
+}
+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 parseDateStrTime(dateStr, timeExact) {
+  if (typeof dateStr !== "string" || typeof timeExact !== "string") return void 0;
+  if (!/^\d{1,2}\/\d{1,2}$/.test(dateStr)) return void 0;
+  if (!/^\d{2}:\d{2}$/.test(timeExact)) return void 0;
+  const [mo, d] = dateStr.split("/").map(Number);
+  if (mo < 1 || mo > 12 || d < 1 || d > 31) return void 0;
+  const y = wallParts().y;
+  return parseWall(`${y}-${p2(mo)}-${p2(d)}T${timeExact}:00`);
+}
+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/loader.ts
 var loader_exports = {};
 __export(loader_exports, {
   configSummary: () => configSummary,
   loadConfig: () => loadConfig,
   parseModelRef: () => parseModelRef,
+  resolveTimezone: () => resolveTimezone,
   takeLoadWarnings: () => takeLoadWarnings
 });
 import * as fs from "node:fs";
@@ -234,6 +427,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(configPath2) {
   const resolvedPath = path.resolve(
     configPath2 || process.env.ENGINE_CONFIG || "engine-config.json"
@@ -245,7 +456,7 @@ function loadConfig(configPath2) {
   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]);
@@ -370,11 +581,18 @@ function loadConfig(configPath2) {
     ...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: {
@@ -387,6 +605,7 @@ function loadConfig(configPath2) {
   return {
     ...raw,
     // 先展开 raw：未显式处理的字段（如 webhook）自动进来，避免每次加 config 都要手动挑；下面显式字段覆盖 raw（解析值优先）
+    timezone: resolvedTimezone,
     provider,
     providers,
     // 所有 provider 配置字典（供 memory/provider 动态切换用）
@@ -455,6 +674,7 @@ var init_loader = __esm({
     "use strict";
     init_display();
     init_features();
+    init_clock();
     loadWarnings = [];
     loadWarningsFlushed = false;
   }
@@ -704,12 +924,15 @@ function normalizeHook(h) {
   }
   return {
     type: "command",
-    command: h.command || "",
+    command: expandCommand(h.command || ""),
     timeout: h.timeout,
     async: h.async,
     shell: h.shell
   };
 }
+function expandCommand(command) {
+  return command.replace(/\$\{E7_NODE\}/g, process.execPath);
+}
 function registerCallbackHook(event2, hook) {
   const list2 = callbackHooks.get(event2) || [];
   if (hook.id) {
@@ -2200,6 +2423,29 @@ var init_microCompact = __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/compact/ruleCompact.ts
 function smartCompressToolResult(content, essentialFields, sizeLimit) {
   if (content.length <= (sizeLimit ?? TOOL_SIZE_LIMIT)) return content;
@@ -2241,7 +2487,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");
@@ -2371,7 +2617,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;
@@ -2461,6 +2708,7 @@ var init_ruleCompact = __esm({
     init_tokenEstimate();
     init_autoCompact();
     init_compactLog();
+    init_well_formed();
     TAG3 = "ruleCompact";
     TOOL_SIZE_LIMIT = 8e3;
     TRUNCATE_TO = 5e3;
@@ -2687,6 +2935,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
@@ -2729,7 +2980,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";
@@ -2743,7 +2994,6 @@ var init_db = __esm({
         return getSqlite().DatabaseSync[prop];
       }
     });
-    TZ_OFFSET_MS = 8 * 60 * 60 * 1e3;
   }
 });
 
@@ -2872,15 +3122,6 @@ function bindAim(stateDir, goalId, stepId, aimId) {
     step.note = `AIM assignment bound: ${aimId}`;
   });
 }
-function bindCalendar(stateDir, goalId, stepId, calendarId, deadlineAt) {
-  return updateGoal(stateDir, goalId, (g) => {
-    const step = g.steps.find((s) => s.id === stepId);
-    if (!step) throw new Error(`Step not found: ${stepId}`);
-    if (step.status === "completed") throw new Error("Cannot bind calendar to completed step");
-    step.calendarId = calendarId;
-    if (deadlineAt) step.deadlineAt = deadlineAt;
-  });
-}
 function applyAimEvent(stateDir, aimId, type2, note) {
   const goal = listGoals(stateDir).find((g) => g.steps.some((s) => s.aimId === aimId));
   if (!goal) return void 0;
@@ -2944,7 +3185,7 @@ function addGoalStep(stateDir, goalId, title, kind = "self") {
     g.steps.push({ id, title, status: g.currentStep >= g.steps.length ? "active" : "pending", kind });
   });
 }
-function bindGoalStep(stateDir, goalId, stepId, kind, ref) {
+function bindGoalStep(stateDir, goalId, stepId, kind, ref, deadlineAt) {
   return updateGoal(stateDir, goalId, (g) => {
     const step = g.steps.find((s) => s.id === stepId);
     if (!step) throw new Error(`Step not found: ${stepId}`);
@@ -2952,7 +3193,10 @@ function bindGoalStep(stateDir, goalId, stepId, kind, ref) {
     step.kind = kind;
     if (kind === "aim") step.aimId = String(ref);
     else if (kind === "remote_task") step.taskId = String(ref);
-    else if (kind === "calendar") step.calendarId = Number(ref);
+    else if (kind === "calendar") {
+      step.calendarId = Number(ref);
+      if (deadlineAt) step.deadlineAt = deadlineAt;
+    }
     step.note = `${kind} \u59D4\u6D3E: ${ref}\uFF08\u5B8C\u6210\u4E8B\u4EF6\u81EA\u52A8\u56DE\u6D41\u89E3\u9501\uFF09`;
   });
 }
@@ -4084,7 +4328,7 @@ async function classifyViaSidecar(url, context, text, opts = {}) {
     const res = await doFetch(`${url.replace(/\/$/, "")}/classify`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ context: context.map((t) => ({ text: t })), text }),
+      body: safeStringify({ context: context.map((t) => ({ text: t })), text }),
       signal: ac.signal
     });
     if (!res.ok) return null;
@@ -4101,6 +4345,7 @@ var init_skill_gate_classifier = __esm({
   "src/skills/skill-gate-classifier.ts"() {
     "use strict";
     init_skill_gate_window();
+    init_well_formed();
   }
 });
 
@@ -5647,16 +5892,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;
 }
@@ -5926,6 +6173,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 带到下一个请求
@@ -6014,13 +6262,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;
@@ -6218,7 +6470,7 @@ function adaptUsage(u) {
   });
 }
 function serializeBody(body, wafSingleQuoteWorkaround) {
-  let bodyStr = JSON.stringify(body);
+  let bodyStr = safeStringify(body);
   if (wafSingleQuoteWorkaround) {
     bodyStr = bodyStr.replace(/'/g, "\u2019");
   }
@@ -6245,6 +6497,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 {
@@ -6565,12 +6818,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(config2) {
         this.config = config2;
         let u = (config2.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 = randomUUID3();
       }
@@ -6769,7 +7024,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");
@@ -6989,6 +7244,7 @@ var init_gemini_provider = __esm({
   "src/models/gemini-provider.ts"() {
     "use strict";
     init_withRetry();
+    init_well_formed();
     GeminiProvider = class {
       constructor(config2) {
         this.config = config2;
@@ -7148,7 +7404,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;
@@ -7287,7 +7543,9 @@ function createProvider(config2) {
         baseUrl: config2.baseUrl,
         apiKey: config2.apiKey,
         thinking: config2.thinking,
-        proxy
+        proxy,
+        wafSingleQuoteWorkaround: config2.wafSingleQuoteWorkaround
+        // 0919 中转站→agentrouter 同样有 WAF
       });
     case "openai-responses":
       return new OpenAIResponsesProvider({
@@ -7684,7 +7942,7 @@ __export(teamHelpers_exports, {
   writeTeamFile: () => writeTeamFile,
   writeTeamFileAsync: () => writeTeamFileAsync
 });
-import { mkdirSync as mkdirSync5, readFileSync as readFileSync10, writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join as join15 } from "node:path";
 function initTeamDirs(stateDir) {
@@ -7727,8 +7985,8 @@ async function readTeamFileAsync(teamName) {
 }
 function writeTeamFile(teamName, teamFile) {
   const teamDir = getTeamDir(teamName);
-  mkdirSync5(teamDir, { recursive: true });
-  writeFileSync3(getTeamFilePath(teamName), JSON.stringify(teamFile, null, 2));
+  mkdirSync6(teamDir, { recursive: true });
+  writeFileSync4(getTeamFilePath(teamName), JSON.stringify(teamFile, null, 2));
 }
 async function writeTeamFileAsync(teamName, teamFile) {
   const teamDir = getTeamDir(teamName);
@@ -7818,7 +8076,7 @@ async function cleanupTeamDirectories(teamName) {
 }
 function ensureTasksDir(taskListId) {
   const dir = join15(getTasksDir(), taskListId);
-  mkdirSync5(dir, { recursive: true });
+  mkdirSync6(dir, { recursive: true });
 }
 function setLeaderTeamName(name) {
   _leaderTeamName = name;
@@ -8647,23 +8905,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 fs20 from "node:fs";
 import path19 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 readConfig2() {
   const defaults = {
     url: "http://127.0.0.1:8100",
     appId: "default",
     agentName: "assistant",
+    ownerMode: "agent",
     enabled: false,
     ingestTimeoutMs: 3e4,
     syncIntervalMs: 9e5
@@ -8676,6 +8953,7 @@ async function readConfig2() {
       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
@@ -8711,6 +8989,7 @@ function savePushTs(workspace, sessionId, ts) {
   }
 }
 function buildPayload(messages, cfg, sessionId) {
+  let lastUserWasSystem = false;
   return {
     session_id: `extract-${sessionId}`,
     app_id: cfg.appId,
@@ -8722,21 +9001,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)
   };
@@ -8846,6 +9132,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;
@@ -8892,7 +9179,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}`);
@@ -8941,6 +9229,7 @@ function cosine(a, b) {
 var init_embedding = __esm({
   "src/mem7/core/embedding.ts"() {
     "use strict";
+    init_well_formed();
   }
 });
 
@@ -9081,8 +9370,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) {
@@ -9096,6 +9384,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",
@@ -9116,7 +9405,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 mkdirSync6 } from "node:fs";
+import { mkdirSync as mkdirSync7 } from "node:fs";
 import { join as join22 } from "node:path";
 var VECTOR_DIM, BM25_FIELDS, RRF_K, warnedFts, vecField, commonFields, SCHEMAS, Mem7VectorStore;
 var init_vector_store = __esm({
@@ -9187,7 +9476,7 @@ var init_vector_store = __esm({
       }
       async conn() {
         if (!this.db) {
-          mkdirSync6(this.dir, { recursive: true });
+          mkdirSync7(this.dir, { recursive: true });
           this.db = await lancedb.connect(this.dir);
         }
         return this.db;
@@ -9413,13 +9702,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()];
@@ -9451,10 +9733,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(", ")}]`;
@@ -9463,6 +9746,7 @@ var WEEKDAYS, MONTHS, LB, RB, DEFAULT_CUSTOM_INSTRUCTIONS;
 var init_prompt_render = __esm({
   "src/mem7/core/prompt-render.ts"() {
     "use strict";
+    init_clock();
     WEEKDAYS = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
     MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
     LB = "\0M7LB\0";
@@ -9479,7 +9763,7 @@ Follow these principles when generating episodic memories:
 
 // src/mem7/core/store.ts
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
-import { mkdirSync as mkdirSync7, readFileSync as readFileSync15, writeFileSync as writeFileSync5, existsSync as existsSync13, readdirSync } from "node:fs";
+import { mkdirSync as mkdirSync8, readFileSync as readFileSync15, writeFileSync as writeFileSync6, existsSync as existsSync13, readdirSync } from "node:fs";
 import { join as join23 } from "node:path";
 import { createHash } from "node:crypto";
 function contentHash(text) {
@@ -9494,6 +9778,7 @@ var init_store2 = __esm({
     "use strict";
     init_vector_store();
     init_prompt_render();
+    init_clock();
     SCHEMA = `
 CREATE TABLE IF NOT EXISTS memcells (
   id TEXT PRIMARY KEY,
@@ -9521,7 +9806,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
       constructor(stateDir) {
         this.stateDir = stateDir;
         this.root = mem7Root(stateDir);
-        mkdirSync7(join23(this.root, "index"), { recursive: true });
+        mkdirSync8(join23(this.root, "index"), { recursive: true });
         this.db = new DatabaseSync2(join23(this.root, "index", "mem7.db"));
         this.db.exec("PRAGMA journal_mode=WAL");
         this.db.exec(SCHEMA);
@@ -9654,7 +9939,7 @@ CREATE TABLE IF NOT EXISTS watermarks (
       appendMd(ownerId, dirName, filePrefix, type2, dateStr, entries2, render) {
         if (entries2.length === 0) return;
         const dir = join23(this.root, "users", ownerId, dirName);
-        mkdirSync7(dir, { recursive: true });
+        mkdirSync8(dir, { recursive: true });
         const file2 = join23(dir, `${filePrefix}-${dateStr}.md`);
         let head;
         let existingBlocks = "";
@@ -9691,7 +9976,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()}'`);
-        writeFileSync5(file2, head + "\n\n" + blocks.join("\n\n") + "\n", "utf8");
+        writeFileSync6(file2, head + "\n\n" + blocks.join("\n\n") + "\n", "utf8");
       }
       /**
        * entry_id：前缀_YYYYMMDD_六位序号。
@@ -9780,7 +10065,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 = join23(this.root, "users");
         if (!existsSync13(usersDir)) return out;
@@ -9815,28 +10100,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;
@@ -9845,7 +10108,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++) {
@@ -9860,19 +10124,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 });
@@ -10029,7 +10293,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");
@@ -10071,13 +10336,10 @@ var init_episode = __esm({
 import { readFileSync as readFileSync18 } from "node:fs";
 import { join as join26, dirname as dirname5 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
-async function extractAtomicFacts(episode, cellTsMs, provider, model) {
-  const episodeText = `## ${episode.title}
-
-${episode.content}`;
-  const userPrompt = renderLiteral(PROMPT4, {
-    EPISODE_TEXT: episodeText,
-    TIME: formatAtomicFactTime(cellTsMs)
+async function extractAtomicFacts(cell, provider, model) {
+  const userPrompt = renderPrompt(PROMPT4, {
+    INPUT_TEXT: renderConversationText(cell.messages),
+    TIME: formatAtomicFactTime(cell.startTs)
   });
   for (let attempt = 0; attempt < RETRIES3; attempt++) {
     try {
@@ -10085,15 +10347,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 {
     }
@@ -10106,8 +10369,8 @@ var init_atomic_facts = __esm({
     "use strict";
     init_episode();
     init_prompt_render();
-    RETRIES3 = 2;
-    PROMPT4 = readFileSync18(join26(dirname5(fileURLToPath4(import.meta.url)), "prompts", "atomic-facts.md"), "utf8");
+    RETRIES3 = 5;
+    PROMPT4 = readFileSync18(join26(dirname5(fileURLToPath4(import.meta.url)), "prompts", "atomic-facts-memcell.md"), "utf8");
   }
 });
 
@@ -10126,20 +10389,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(PROMPT5, { USER_ID: ownerId, USER_NAME: userName, CONVERSATION_TEXT: conversationText });
   let raw = null;
   for (let attempt = 0; attempt < RETRIES4; attempt++) {
@@ -10192,6 +10455,7 @@ var init_foresight = __esm({
     "use strict";
     init_episode();
     init_prompt_render();
+    init_clock();
     RETRIES4 = 5;
     MAX_COUNT = 10;
     MIN_COUNT = 4;
@@ -10202,11 +10466,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(args2) {
-  const { sessionId, store, provider, model, agentName } = args2;
-  const all = normalizeMessages(args2.rawMessages, agentName);
+  const { sessionId, store, provider, model, agentName, identity, ownerMode } = args2;
+  const all = normalizeMessages(args2.rawMessages, agentName, identity, ownerMode);
   const fresh = readFresh(store, sessionId, all);
   if (fresh.length === 0) return;
   const byId = /* @__PURE__ */ new Map();
@@ -10278,7 +10542,7 @@ async function runMem7Pipeline(args2) {
           }
         }
       })(),
-      // 支 2：episode → atomic-facts
+      // 支 2：episode（memcell → episode，一次调用 + per-owner fan-out，everos 同款）
       (async () => {
         try {
           const ep = await extractEpisode(cell, provider, model);
@@ -10300,26 +10564,34 @@ async function runMem7Pipeline(args2) {
             }]);
             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}`);
         }
       })()
     ]);
@@ -10355,6 +10627,7 @@ var init_pipeline = __esm({
     init_episode();
     init_atomic_facts();
     init_foresight();
+    init_clock();
   }
 });
 
@@ -10397,28 +10670,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 join28(workspace, ".proactive", "proactive.db");
 }
-var DEFAULT_MODEL_REF;
 var init_config3 = __esm({
   "src/memory/proactive/config.ts"() {
     "use strict";
     init_loader();
-    DEFAULT_MODEL_REF = "minimax/MiniMax-M3";
   }
 });
 
@@ -10757,7 +11025,7 @@ var init_graph_store = __esm({
 
 // src/memory/proactive/persistence.ts
 import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
-import { mkdirSync as mkdirSync8 } from "node:fs";
+import { mkdirSync as mkdirSync9 } from "node:fs";
 import { dirname as dirname7 } from "node:path";
 function rowToAction(r) {
   return {
@@ -10778,18 +11046,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 SCHEMA2, Persistence, TZ_BEIJING;
+var SCHEMA2, Persistence;
 var init_persistence = __esm({
   "src/memory/proactive/persistence.ts"() {
     "use strict";
+    init_clock();
     SCHEMA2 = `
 CREATE TABLE IF NOT EXISTS nodes (
   id TEXT PRIMARY KEY,
@@ -10860,7 +11123,7 @@ CREATE INDEX IF NOT EXISTS idx_proactive_decisions_created ON proactive_decision
     Persistence = class {
       db;
       constructor(dbPath) {
-        mkdirSync8(dirname7(dbPath), { recursive: true });
+        mkdirSync9(dirname7(dbPath), { recursive: true });
         this.db = new DatabaseSync3(dbPath);
         this.db.exec("PRAGMA journal_mode=WAL");
         this.db.exec(SCHEMA2);
@@ -11203,6 +11466,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(
@@ -11214,7 +11498,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";
   }
 });
 
@@ -12002,7 +12285,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")}
 ` : "";
@@ -12434,10 +12718,14 @@ If deadline has no time context, fall back to normal timing rules.
 
 // 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 nowParts() {
+  return wallParts();
 }
-function nowBeijing() {
-  return new Date(Date.now() + TZ_OFFSET_MS2);
+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", "");
@@ -12459,32 +12747,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 WEEKDAYS2[now.getUTCDay() === 0 ? 6 : now.getUTCDay() - 1];
+  const p = nowParts();
+  return WEEKDAYS2[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();
@@ -12492,20 +12777,19 @@ function computeRemindAt(dateStr, timeExact, remindBeforeMin) {
 function computeWeeklyRemindAt(day, time, remindBeforeMin) {
   const targetIdx = WEEKDAYS2.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()) {
@@ -12520,11 +12804,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;
@@ -12534,18 +12815,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();
 }
@@ -12568,13 +12848,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;
@@ -12651,9 +12925,9 @@ function getUpcomingTasks(workspace, days = 7, maxRows = 8) {
       "SELECT * FROM events WHERE type='task' AND status='pending'"
     ).all();
     if (rows.length === 0) return "";
-    const now = nowBeijing();
-    const year = now.getUTCFullYear();
-    const todayMs = Date.UTC(year, now.getUTCMonth(), now.getUTCDate());
+    const pt = nowParts();
+    const year = pt.y;
+    const todayMs = Date.parse(startOfLocalDay());
     const horizonMs = todayMs + days * 864e5;
     const picked = [];
     for (const r of rows) {
@@ -12675,18 +12949,18 @@ function getUpcomingTasks(workspace, days = 7, maxRows = 8) {
     return "";
   }
 }
-var TZ_OFFSET_MS2, WEEKDAYS2;
+var WEEKDAYS2;
 var init_helpers = __esm({
   "src/calendar/helpers.ts"() {
     "use strict";
     init_db();
-    TZ_OFFSET_MS2 = 8 * 60 * 60 * 1e3;
+    init_clock();
     WEEKDAYS2 = ["\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D", "\u5468\u65E5"];
   }
 });
 
 // src/calendar/commands.ts
-import { existsSync as existsSync14, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync14, statSync as statSync3 } from "node:fs";
 import { isAbsolute as isAbsolute4, resolve as resolve6 } from "node:path";
 function fmtEnd(start, durationMin) {
   const [hh, mm] = start.split(":").map(Number);
@@ -12766,8 +13040,7 @@ function addDate(db2, args2) {
   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 = WEEKDAYS3[d.getUTCDay() === 0 ? 6 : d.getUTCDay() - 1];
     weeklyRows = db2.prepare(
@@ -12816,8 +13089,7 @@ function addBatch(db2, args2) {
     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 = WEEKDAYS3[d.getUTCDay() === 0 ? 6 : d.getUTCDay() - 1];
       weeklyRows = db2.prepare(
@@ -12863,7 +13135,7 @@ function addTask(db2, args2) {
   \u89E3\u6790\u540E: ${absPath}
 \u8BF7\u5148\u521B\u5EFA\u6587\u6863\u518D add-task\u3002`;
     }
-    const stat4 = statSync4(absPath);
+    const stat4 = statSync3(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}`;
@@ -12933,7 +13205,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}`);
@@ -12961,7 +13233,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]";
@@ -13077,10 +13349,36 @@ function markReminded(db2, id) {
   }
   return `#${id} \u5DF2\u6807\u8BB0\u63D0\u9192\u8FC7`;
 }
+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 WEEKDAYS3;
 var init_commands = __esm({
   "src/calendar/commands.ts"() {
     "use strict";
+    init_clock();
     init_helpers();
     WEEKDAYS3 = ["\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D", "\u5468\u65E5"];
   }
@@ -13088,10 +13386,9 @@ var init_commands = __esm({
 
 // 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) {
@@ -13100,7 +13397,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;
@@ -13110,13 +13407,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) {
@@ -13159,27 +13450,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;
   }
 });
 
@@ -13257,7 +13629,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 = join30(everosRoot, userId, "default_project", "users", userId, ".foresights");
@@ -13293,35 +13665,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 {
@@ -13461,6 +13809,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;
@@ -13976,16 +14326,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;
@@ -14595,18 +14945,23 @@ ${JSON.stringify(payload, null, 2)}
 
 // src/memory/proactive/proactive-tools.ts
 import { existsSync as existsSync16 } 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 (!existsSync16(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({
@@ -14621,50 +14976,43 @@ function registerProactiveTools() {
       required: ["action_id"]
     },
     handler: async (args2) => {
-      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(args2.action_id);
-        if (!row) return { content: `\u9519\u8BEF: action '${args2.action_id}' \u4E0D\u5B58\u5728\u3002\u7528 proactive_status \u67E5\u5F53\u524D\u5217\u8868\u3002`, isError: true };
-        if (args2.calendar_id !== void 0) {
-          db2.prepare("UPDATE actions SET status=?, completed_at=?, calendar_id=? WHERE id=?").run("completed", (/* @__PURE__ */ new Date()).toISOString(), args2.calendar_id, args2.action_id);
-        } else {
-          db2.prepare("UPDATE actions SET status=?, completed_at=? WHERE id=?").run("completed", (/* @__PURE__ */ new Date()).toISOString(), args2.action_id);
-        }
-        return { content: `\u2713 completed: ${row.title}${args2.calendar_id !== void 0 ? `\uFF08calendar #${args2.calendar_id} \u5DF2\u56DE\u586B\uFF09` : ""}` };
-      } finally {
-        db2.close();
-      }
+      const out = withStore((store) => {
+        const a = store.getAction(String(args2.action_id));
+        if (!a) return { content: `\u9519\u8BEF: action '${args2.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 (args2.calendar_id !== void 0) store.linkCalendar(a.id, Number(args2.calendar_id));
+        return { content: `\u2713 action ${a.id} \u6807\u8BB0\u4E3A completed${args2.calendar_id !== void 0 ? `\uFF08\u5173\u8054 calendar #${args2.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 (args2) => {
-      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(args2.action_id);
-        if (!row) return { content: `\u9519\u8BEF: action '${args2.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(args2.reason || "\u672A\u6CE8\u660E"), args2.action_id);
-        return { content: `\u2713 cancelled: ${row.title}\uFF08${args2.reason}\uFF09${/已过时|已处理|做完了|马后炮/.test(String(args2.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(args2.action_id));
+        if (!a) return { content: `\u9519\u8BEF: action '${args2.action_id}' \u4E0D\u5B58\u5728`, isError: true };
+        store.updateActionStatus(a.id, "cancelled", {
+          completedAt: nowUtc(),
+          cancelReason: String(args2.reason || "\u672A\u6CE8\u660E")
+        });
+        return { content: `\u2713 action ${a.id} \u5DF2\u53D6\u6D88\uFF08${String(args2.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: {
@@ -14673,31 +15021,25 @@ function registerProactiveTools() {
       }
     },
     handler: async (args2) => {
-      const db2 = openDb2();
-      if (!db2) return { content: "proactive \u672A\u542F\u7528", isError: true };
-      try {
+      const out = withStore((store) => {
         let intentId = String(args2.intent_id || "");
         if (!intentId && args2.action_id) {
-          const row = db2.prepare("SELECT intent_id FROM actions WHERE id=?").get(args2.action_id);
-          if (!row) return { content: `\u9519\u8BEF: action '${args2.action_id}' \u4E0D\u5B58\u5728`, isError: true };
-          intentId = row.intent_id;
+          const a = store.getAction(String(args2.action_id));
+          if (!a) return { content: `\u9519\u8BEF: action '${args2.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({
@@ -14710,16 +15052,12 @@ function registerProactiveTools() {
       }
     },
     handler: async (args2) => {
-      const db2 = openDb2();
-      if (!db2) return { content: "proactive \u672A\u542F\u7528", isError: true };
-      try {
-        const where = args2.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(args2.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 };
     }
   });
 }
@@ -14729,6 +15067,8 @@ var init_proactive_tools = __esm({
     "use strict";
     init_registry();
     init_config3();
+    init_persistence();
+    init_clock();
   }
 });
 
@@ -14792,7 +15132,7 @@ __export(plugin_exports, {
   ProactivePlugin: () => ProactivePlugin,
   feedMem7Cell: () => feedMem7Cell
 });
-import { join as join31, dirname as dirname8 } from "node:path";
+import { join as join31 } from "node:path";
 import { existsSync as existsSync17, readFileSync as readFileSync23 } from "node:fs";
 function isFiller(text) {
   const t = text.trim();
@@ -14974,19 +15314,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;
             }
           }
@@ -15081,18 +15425,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 = join31(dirname8(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}`);
           }
@@ -15266,18 +15599,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 = join31(dirname8(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`);
@@ -15358,10 +15679,10 @@ ${String(input.tool_output ?? "")}`
 
 // src/memory/sessionMemory/sessionMemoryUtils.ts
 import { join as join32 } from "node:path";
-import { mkdirSync as mkdirSync9, readFileSync as readFileSync24 } from "node:fs";
+import { mkdirSync as mkdirSync10, readFileSync as readFileSync24 } from "node:fs";
 function setSessionMemoryStateDir(dir) {
   _stateDir2 = dir;
-  mkdirSync9(dir, { recursive: true });
+  mkdirSync10(dir, { recursive: true });
 }
 function getSessionMemoryDir() {
   return _stateDir2;
@@ -15633,7 +15954,7 @@ __export(sessionMemory_exports, {
   resetLastMemoryMessageUuid: () => resetLastMemoryMessageUuid,
   shouldExtractMemory: () => shouldExtractMemory
 });
-import { readFileSync as readFileSync25, mkdirSync as mkdirSync10 } from "node:fs";
+import { readFileSync as readFileSync25, mkdirSync as mkdirSync11 } from "node:fs";
 import { writeFile as writeFile3 } from "node:fs/promises";
 function initSessionMemory(deps) {
   _deps = deps;
@@ -15692,7 +16013,7 @@ function shouldExtractMemory(estimatedTokens, messages) {
 }
 async function setupSessionMemoryFile() {
   const memoryDir = getSessionMemoryDir();
-  mkdirSync10(memoryDir, { recursive: true });
+  mkdirSync11(memoryDir, { recursive: true });
   const memoryPath = getSessionMemoryPath();
   let currentMemory;
   try {
@@ -15733,7 +16054,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,
@@ -15795,6 +16116,7 @@ var init_sessionMemory = __esm({
     "use strict";
     init_sessionMemoryUtils();
     init_prompts2();
+    init_well_formed();
     init_query();
     init_registry();
     init_features();
@@ -16226,7 +16548,7 @@ async function createTask(params) {
   validateSchedule(params.schedule);
   const id = generateTaskId2();
   const now = /* @__PURE__ */ new Date();
-  const timezone = params.timezone || params.defaultTimezone || "Asia/Shanghai";
+  const timezone = params.timezone || params.defaultTimezone || tz();
   const nextRunAt = params.calculateNextRun(params.schedule, timezone, now);
   const task = {
     id,
@@ -16327,6 +16649,7 @@ var storageDir, tasksFilePath, LOCK_RETRY_COUNT, LOCK_RETRY_DELAY_MS, LOCK_STALE
 var init_tasks = __esm({
   "src/cron/tasks.ts"() {
     "use strict";
+    init_clock();
     storageDir = "";
     tasksFilePath = "";
     LOCK_RETRY_COUNT = 3;
@@ -16363,7 +16686,7 @@ async function stopScheduler() {
   console.log("[cron] Scheduler stopped");
 }
 function calculateNextRun(schedule, timezone, afterDate) {
-  const tz = timezone || "Asia/Shanghai";
+  const tz2 = cronDefaultTimezone(timezone);
   switch (schedule.type) {
     case "at": {
       const atMs = new Date(schedule.at).getTime();
@@ -16375,7 +16698,7 @@ function calculateNextRun(schedule, timezone, afterDate) {
     }
     case "cron": {
       try {
-        const job = new Cron(schedule.expression, { timezone: tz });
+        const job = new Cron(schedule.expression, { timezone: tz2 });
         const next = job.nextRun(afterDate);
         return next?.toISOString();
       } catch (err) {
@@ -16406,9 +16729,12 @@ function shouldFireWithJitter(task, now) {
     }
   }
 }
+function cronDefaultTimezone(taskTimezone) {
+  return taskTimezone || tz();
+}
 function estimateCronPeriodMs(expression, timezone) {
   try {
-    const job = new Cron(expression, { timezone: timezone || "UTC" });
+    const job = new Cron(expression, { timezone: cronDefaultTimezone(timezone) });
     const next1 = job.nextRun();
     if (!next1) return 24 * 60 * 60 * 1e3;
     const next2 = job.nextRun(new Date(next1.getTime() + 1));
@@ -16588,7 +16914,7 @@ ${notifyLines}`;
         console.warn(`[cron] Failed to notify main session: ${err.message}`);
       }
     }
-    await recalculateNextRun(task, now, (schedule, tz, after) => calculateNextRun(schedule, tz, after));
+    await recalculateNextRun(task, now, (schedule, tz2, after) => calculateNextRun(schedule, tz2, after));
     await markExecuted(task.id, true);
     console.log(`[cron] Task ${task.id} done (run #${task.runCount})`);
   } catch (err) {
@@ -16652,6 +16978,7 @@ var init_scheduler = __esm({
   "src/cron/scheduler.ts"() {
     "use strict";
     init_live();
+    init_clock();
     init_tasks();
     schedulerTimer = null;
     shuttingDown = false;
@@ -16765,7 +17092,7 @@ function registerCronTools() {
         delivery_mode: { type: "string", enum: ["origin", "local", "direct"], description: "\u6295\u9012\u6A21\u5F0F\uFF08\u9ED8\u8BA4 local\uFF09" },
         delivery_channel: { type: "string", description: "\u6295\u9012\u901A\u9053\uFF08direct \u6A21\u5F0F\u5FC5\u586B\uFF09: discord | feishu | wecom" },
         delivery_target: { type: "string", description: "\u6295\u9012\u76EE\u6807\uFF08direct \u6A21\u5F0F\u5FC5\u586B\uFF09: channel_id \u6216 user_id" },
-        timezone: { type: "string", description: "IANA \u65F6\u533A\uFF08\u9ED8\u8BA4 Asia/Shanghai\uFF09" },
+        timezone: { type: "string", description: "IANA \u65F6\u533A\uFF08\u9ED8\u8BA4\u8DDF\u968F\u5F15\u64CE\u7684 timezone \u914D\u7F6E\uFF0C\u4E0D\u8981\u663E\u5F0F\u6307\u5B9A\u9664\u975E\u786E\u5B9E\u8981\u522B\u7684\u65F6\u533A\uFF09" },
         max_runs: { type: "number", description: "\u6700\u5927\u6267\u884C\u6B21\u6570\uFF08\u53EF\u9009\uFF0C\u9ED8\u8BA4\u65E0\u9650\uFF09" },
         notify_session: { type: "boolean", description: "\u6267\u884C\u5B8C\u540E\u901A\u77E5\u4E3Bsession\uFF08\u6CE8\u5165\u4E00\u6761user\u6D88\u606F\u5230scope:main\uFF09" },
         session_message: { type: "string", description: "\u6CE8\u5165\u5230\u4E3Bsession\u7684\u6D88\u606F\u6A21\u677F\uFF0C\u652F\u6301 {result} {description} \u5360\u4F4D\u7B26" },
@@ -17550,7 +17877,7 @@ var reply_blocklist_exports = {};
 __export(reply_blocklist_exports, {
   isUserBlocked: () => isUserBlocked
 });
-import { readFileSync as readFileSync32, writeFileSync as writeFileSync9, existsSync as existsSync21 } from "node:fs";
+import { readFileSync as readFileSync32, writeFileSync as writeFileSync10, existsSync as existsSync21 } from "node:fs";
 import { join as join43 } from "node:path";
 function ensureLoaded(workspace, configIds) {
   if (loaded) return;
@@ -17580,7 +17907,7 @@ function ensureLoaded(workspace, configIds) {
 function save(workspace) {
   const path58 = join43(workspace, ".reply-blocklist.json");
   try {
-    writeFileSync9(path58, JSON.stringify(state, null, 2), "utf-8");
+    writeFileSync10(path58, JSON.stringify(state, null, 2), "utf-8");
   } catch (err) {
     console.warn(`[reply-blocklist] Failed to save: ${err.message}`);
   }
@@ -21092,12 +21419,66 @@ var init_SendMessageTool = __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 web_search_exports = {};
 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",
@@ -21114,14 +21495,25 @@ var init_web_search = __esm({
         const query = args2.query;
         const maxResults = args2.max_results || 5;
         const searchDepth = args2.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,
@@ -21131,6 +21523,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();
@@ -22117,10 +22517,13 @@ ${lines.join("\n\n")}`;
 init_loader();
 
 // src/config/secrets-env.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { chmodSync, existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 import { basename, dirname, join as join2 } from "node:path";
+function secretsHome() {
+  return process.env.HOME || process.env.USERPROFILE || ".";
+}
 function loadSecretsEnv(stateDir, configName) {
-  const home = process.env.HOME || process.env.USERPROFILE || ".";
+  const home = secretsHome();
   const candidates = [
     join2(home, ".engine7-secrets", `${configName}.env`),
     join2(stateDir, "configs", `.env.${configName}`),
@@ -22913,11 +23316,12 @@ init_registry();
 init_deferred();
 
 // src/cli-startup.ts
+init_clock();
 import * as path12 from "node:path";
 import * as fs12 from "node:fs";
 import * as readline from "node:readline";
 function getDailyLogPath(stateDir) {
-  const dateStr = (/* @__PURE__ */ new Date()).toLocaleDateString("sv-SE", { timeZone: "Asia/Shanghai" });
+  const dateStr = todayKey();
   return path12.join(stateDir, "logs", `engine-${dateStr}.log`);
 }
 function setupFileLogging(stateDir, pendingWarnings = []) {
@@ -22926,7 +23330,7 @@ function setupFileLogging(stateDir, pendingWarnings = []) {
   const logStream = fs12.createWriteStream(LOG_PATH, { flags: "a" });
   logStream.on("error", (err) => console.error(`[log] Write error: ${err.message}`));
   function ts() {
-    return (/* @__PURE__ */ new Date()).toLocaleString("sv-SE", { timeZone: "Asia/Shanghai", hour12: false }) + "." + String(Date.now() % 1e3).padStart(3, "0");
+    return formatLog() + "." + String(Date.now() % 1e3).padStart(3, "0");
   }
   for (const w of pendingWarnings) {
     logStream.write(`[${ts()}] [WARN] ${w}
@@ -23306,6 +23710,7 @@ init_TodoWriteTool();
 
 // src/tools/memory-bridge.ts
 init_registry();
+init_well_formed();
 init_live();
 var EverosSearchSchema = {
   type: "object",
@@ -23334,7 +23739,7 @@ function createEverosSearchTool(everosCfg) {
         const resp = await fetch(`${agenticUrl}/api/v1/search`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
+          body: safeStringify({
             query,
             user_id: userId,
             mode,
@@ -23657,6 +24062,7 @@ function resolveToolExclude(channelName) {
 // src/prompt.ts
 init_registry();
 init_store();
+init_clock();
 init_memdir();
 init_paths();
 import * as path17 from "node:path";
@@ -23817,6 +24223,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()}`,
@@ -23947,8 +24356,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];
@@ -23989,10 +24398,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();
@@ -24097,7 +24504,8 @@ ${manifest}`
 }
 
 // src/memory/memdir/findRelevantMemoriesVector.ts
-import { statSync as statSync3 } from "node:fs";
+init_well_formed();
+import { statSync as statSync2 } from "node:fs";
 import { join as join18, resolve as resolve5, sep as sep4 } from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 var require2 = createRequire2(import.meta.url);
@@ -24113,7 +24521,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) {
@@ -24145,8 +24554,8 @@ function cosineSim(a, b) {
   return dot / (Math.sqrt(normA) * Math.sqrt(normB));
 }
 function readDbEmbeddings(dbPath) {
-  const { DatabaseSync: DatabaseSync5 } = require2("node:sqlite");
-  const db2 = new DatabaseSync5(dbPath, { readOnly: true });
+  const { DatabaseSync: DatabaseSync4 } = require2("node:sqlite");
+  const db2 = new DatabaseSync4(dbPath, { readOnly: true });
   try {
     const stmt = db2.prepare(`
       SELECT file_path, name, description, mtime, embedding
@@ -24189,7 +24598,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: [
@@ -24257,7 +24666,7 @@ async function findRelevantMemoriesVector(query, memoryDir, alreadySurfaced = /*
     if (score >= minScore) {
       let mtimeMs = 0;
       try {
-        mtimeMs = statSync3(absPath).mtimeMs;
+        mtimeMs = statSync2(absPath).mtimeMs;
       } catch {
         if (row.mtime) mtimeMs = new Date(row.mtime).getTime();
       }
@@ -24309,14 +24718,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"
@@ -24395,11 +24806,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 [];
@@ -24460,7 +24872,7 @@ ${ep.episode || ep.summary}`,
 
 // src/handle-query.ts
 init_paths();
-import { readFileSync as readFileSync26, existsSync as existsSync18 } from "node:fs";
+import { readFileSync as readFileSync26, existsSync as existsSync18, statSync as statSync4 } from "node:fs";
 import { join as join35, resolve as resolve7 } from "node:path";
 import * as path20 from "node:path";
 
@@ -24511,7 +24923,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");
@@ -24577,6 +24996,7 @@ function voiceFastView(history, opts = VOICE_FAST_DEFAULTS) {
 }
 
 // src/sender-context.ts
+init_clock();
 import { readFileSync as readFileSync13, existsSync as existsSync11 } from "node:fs";
 import { join as join20 } from "node:path";
 var contactMap = null;
@@ -24624,11 +25044,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());
@@ -24864,6 +25284,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 = [
@@ -25089,7 +25513,7 @@ ${text}` : text });
           const restoredMemories = [];
           for (const memPath of newPaths) {
             try {
-              const stat4 = statSync(memPath);
+              const stat4 = statSync4(memPath);
               const content = readFileSync26(memPath, "utf-8");
               const header = memoryHeader(memPath, stat4.mtimeMs);
               restoredMemories.push({ path: memPath, content, mtimeMs: stat4.mtimeMs, header });
@@ -25124,13 +25548,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,
@@ -25420,6 +25847,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,
@@ -25427,6 +25856,8 @@ ${text}` : text });
               provider,
               model: model2,
               agentName,
+              identity,
+              ownerMode,
               onExtracted: (cell, episode, facts) => feedMem7Cell2(cell, episode, facts),
               embedding: embedding ?? void 0
             });
@@ -25508,6 +25939,7 @@ function roughTokenCount(messages) {
 }
 
 // src/startup/hooks-boot.ts
+init_clock();
 function registerHooksSubsystem(config2) {
   const hooksPath = path21.join(config2.workspace, ".hooks.json");
   const settingsHooksPath = path21.join(config2.stateDir, "settings.json");
@@ -25553,11 +25985,9 @@ function registerCompactHooks(config2) {
       const workspace = input.cwd || input.workspace || "";
       const sessionId = input.session_id || "";
       if (!workspace || !sessionId) return { continue: true };
-      const now = /* @__PURE__ */ new Date();
-      const bjOffset = 8 * 60;
-      const bjTime = new Date(now.getTime() + (bjOffset + now.getTimezoneOffset()) * 6e4);
-      const dateStr = `${bjTime.getFullYear()}-${String(bjTime.getMonth() + 1).padStart(2, "0")}-${String(bjTime.getDate()).padStart(2, "0")}`;
-      const timeStr = `${String(bjTime.getHours()).padStart(2, "0")}:${String(bjTime.getMinutes()).padStart(2, "0")}`;
+      const pt = wallParts();
+      const dateStr = todayKey();
+      const timeStr = `${String(pt.hh).padStart(2, "0")}:${String(pt.mm).padStart(2, "0")}`;
       const dailyDir = path21.join(workspace, "memory", "daily");
       const dailyPath = path21.join(dailyDir, `${dateStr}.md`);
       try {
@@ -26015,9 +26445,9 @@ function createCompactGetters(config2) {
 }
 
 // src/session/session-history.ts
+init_clock();
 import fs25 from "node:fs";
 import path25 from "node:path";
-var BEIJING_OFFSET_MS = 8 * 36e5;
 var INJECTED_CONTENT_PATTERNS = [
   /【定时心跳】/,
   /\[内心对话测试\]/,
@@ -26110,9 +26540,9 @@ function findLastRealUserMsg(jsonlPath) {
     const clean = cleanText(text);
     let bjTime;
     try {
-      const dt = new Date(ts);
+      const t = wallParts(ts);
       const p = (n) => String(n).padStart(2, "0");
-      bjTime = `${dt.getFullYear()}-${p(dt.getMonth() + 1)}-${p(dt.getDate())} ${p(dt.getHours())}:${p(dt.getMinutes())} (Asia/Shanghai)`;
+      bjTime = `${t.y}-${p(t.mo)}-${p(t.d)} ${p(t.hh)}:${p(t.mm)} (${tz()})`;
     } catch {
       bjTime = ts;
     }
@@ -26175,10 +26605,10 @@ function recentMessages(sessions, hours = 12, limit = 60) {
     if (/^HEARTBEAT_OK\b/.test(text.trim())) continue;
     const clean = cleanText(text);
     if (!clean) continue;
-    const bj = new Date(dtMs);
+    const bj = wallParts(dtMs);
     const p = (n) => String(n).padStart(2, "0");
     results.push({
-      time: `${p(bj.getHours())}:${p(bj.getMinutes())}`,
+      time: `${p(bj.hh)}:${p(bj.mm)}`,
       role,
       text: clean.slice(0, 80),
       timestamp: dtMs,
@@ -26199,6 +26629,7 @@ function lastUserMinutesAgo(sessions) {
 }
 
 // src/heartbeat.ts
+init_clock();
 var DEFAULT_PROMPT2 = `\u4F60\u662F\u5FC3\u8DF3\u68C0\u67E5\u3002\u9759\u9ED8\u6267\u884C\uFF0C\u4E0D\u8981\u53D1\u6D88\u606F\u7ED9\u4EFB\u4F55\u4EBA\u3002
 
 \u6B65\u9AA41: \u68C0\u67E5\u662F\u5426\u6709\u5F85\u5904\u7406\u4E8B\u9879
@@ -26257,12 +26688,12 @@ var HeartbeatPlugin = class {
     try {
       if (this.cfg.checkOnline !== false) {
         const threshold = this.cfg.activeThresholdMs || 9e5;
-        const now2 = Date.now();
+        const now = Date.now();
         const platformMap = sessions.platformMap;
         if (platformMap) {
           for (const [key, sid] of platformMap) {
             const lastUsed = sessions.lastUsed?.get(sid);
-            if (lastUsed && now2 - lastUsed < threshold) {
+            if (lastUsed && now - lastUsed < threshold) {
               console.log("[heartbeat] User active, skipping");
               return;
             }
@@ -26271,11 +26702,7 @@ var HeartbeatPlugin = class {
       }
       const sessionId = sessions.getOrCreateSessionId(this.sessionKey);
       const basePrompt = this.cfg.prompt || DEFAULT_PROMPT2;
-      const now = /* @__PURE__ */ new Date();
-      const bjOffset = 8 * 60;
-      const bjTime = new Date(now.getTime() + (bjOffset + now.getTimezoneOffset()) * 6e4);
-      const weekdays = ["\u5468\u65E5", "\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D"];
-      const timeStr = `${bjTime.getFullYear()}-${String(bjTime.getMonth() + 1).padStart(2, "0")}-${String(bjTime.getDate()).padStart(2, "0")} ${weekdays[bjTime.getDay()]} ${String(bjTime.getHours()).padStart(2, "0")}:${String(bjTime.getMinutes()).padStart(2, "0")}`;
+      const timeStr = formatWallLabel();
       const lastReal = lastUserMsg(sessions);
       let offlineStr = "";
       if (lastReal) {
@@ -26294,7 +26721,7 @@ var HeartbeatPlugin = class {
           }
         }
       }
-      const prompt = `\u5F53\u524D\u65F6\u95F4\uFF1A${timeStr}\uFF08\u5317\u4EAC\u65F6\u95F4\uFF09${offlineStr ? `
+      const prompt = `\u5F53\u524D\u65F6\u95F4\uFF1A${timeStr}${offlineStr ? `
 \u79BB\u7EBF\u65F6\u957F\uFF1A${offlineStr}` : ""}
 ${basePrompt}`;
       console.log(`[heartbeat] Tick: ${this.sessionKey} \u2192 session ${sessionId}`);
@@ -26531,8 +26958,9 @@ Do not call goal_update unless the goal is complete or the strict blocked audit
 init_task_manager();
 
 // src/nudge/prompt-builder.ts
+init_clock();
 function buildPrompt(action, task, taskState, recent, customPrompt, maxNudgePerTask, activeGoal) {
-  const time = bjTimeNow();
+  const time = nowLabel();
   const elapsed = taskState.lastProgressAt ? formatDuration2(Date.now() - new Date(taskState.lastProgressAt).getTime()) : "\u65E0\u8BB0\u5F55";
   const remaining = taskState.targetEndAt ? formatDuration2(new Date(taskState.targetEndAt).getTime() - Date.now()) : null;
   const maxN = taskState.maxNudge || maxNudgePerTask || 3;
@@ -26581,12 +27009,8 @@ ${ctx}
   }
   return customPrompt + "\n\n" + ctx;
 }
-function bjTimeNow() {
-  const now = /* @__PURE__ */ new Date();
-  const bj = new Date(now.getTime() + (8 * 60 + now.getTimezoneOffset()) * 6e4);
-  const weekdays = ["\u5468\u65E5", "\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D"];
-  const p = (n) => String(n).padStart(2, "0");
-  return `${bj.getFullYear()}-${p(bj.getMonth() + 1)}-${p(bj.getDate())} ${weekdays[bj.getDay()]} ${p(bj.getHours())}:${p(bj.getMinutes())}`;
+function nowLabel() {
+  return formatWallLabel();
 }
 function formatDuration2(ms) {
   if (ms < 0) return "\u5DF2\u8D85\u65F6";
@@ -26600,6 +27024,111 @@ function formatDuration2(ms) {
 // src/nudge/session-state-reader.ts
 import fs26 from "node:fs";
 import path26 from "node:path";
+
+// src/calendar/repository.ts
+init_db();
+init_clock();
+function calendarStrToInstant(dateStr, timeExact) {
+  if (!dateStr || !timeExact) return void 0;
+  if (/^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}/.test(timeExact)) {
+    const ms = Date.parse(timeExact);
+    return Number.isNaN(ms) ? void 0 : new Date(ms).toISOString();
+  }
+  if (!/^\d{2}:\d{2}$/.test(timeExact)) return void 0;
+  if (/^\d{4}-\d{1,2}-\d{1,2}$/.test(dateStr)) {
+    const [y, mo, d] = dateStr.split("-").map(Number);
+    const z = (n) => String(n).padStart(2, "0");
+    return parseWall(`${y}-${z(mo)}-${z(d)}T${timeExact}:00`);
+  }
+  return parseDateStrTime(dateStr, timeExact);
+}
+function assertUtc(v, where) {
+  if (v == null) return;
+  if (!/Z$/i.test(v)) throw new Error(`[repository] ${where} \u4E0D\u662F UTC ISO Z: ${v}`);
+}
+function toRow(r) {
+  return {
+    id: r.id,
+    type: r.type,
+    status: r.status,
+    event: r.event,
+    dateStr: r.date_str ?? null,
+    timeExact: r.time_exact ?? null,
+    remindAt: r.remind_at ?? null,
+    reminderBeforeMin: r.remind_before_min ?? null
+  };
+}
+function getEventTimeExact(workspace, id) {
+  const db2 = openDb(workspace);
+  try {
+    const r = db2.prepare("SELECT time_exact, date_str, status FROM events WHERE id = ?").get(id);
+    if (!r) return null;
+    return { timeExact: r.time_exact ?? null, dateStr: r.date_str ?? null, status: r.status };
+  } finally {
+    db2.close?.();
+  }
+}
+function getEventType(workspace, id) {
+  const db2 = openDb(workspace);
+  try {
+    const r = db2.prepare("SELECT type FROM events WHERE id = ?").get(id);
+    return r?.type ?? null;
+  } finally {
+    db2.close?.();
+  }
+}
+function lastEventChannel(workspace) {
+  const db2 = openDb(workspace);
+  try {
+    const r = db2.prepare(
+      `SELECT created_channel, created_channel_target FROM events
+        WHERE created_channel IS NOT NULL AND created_channel_target IS NOT NULL
+        ORDER BY id DESC LIMIT 1`
+    ).get();
+    if (!r) return null;
+    return { channel: r.created_channel, target: r.created_channel_target };
+  } finally {
+    db2.close?.();
+  }
+}
+function insertEvent(workspace, e, channel) {
+  const db2 = openDb(workspace);
+  try {
+    assertUtc(e.remindAt ?? null, "insertEvent.remindAt");
+    const r = db2.prepare(
+      `INSERT INTO events
+         (type, status, event, date_str, time_exact, remind_before_min, remind_at, reminded,
+          created_at, created_channel, created_channel_target)
+       VALUES (?,?,?,?,?,?,?,0,?,?,?)`
+    ).run(
+      e.type,
+      e.status ?? "pending",
+      e.event,
+      e.dateStr ?? null,
+      e.timeExact ?? null,
+      e.reminderBeforeMin ?? 60,
+      e.remindAt ?? null,
+      nowUtc(),
+      channel?.name ?? null,
+      channel?.target ?? null
+    );
+    return Number(r.lastInsertRowid);
+  } finally {
+    db2.close?.();
+  }
+}
+function listPendingTaskRows(workspace) {
+  const db2 = openDb(workspace);
+  try {
+    return db2.prepare(
+      "SELECT * FROM events WHERE status='pending' AND type='task' AND date_str IS NOT NULL"
+    ).all().map(toRow);
+  } finally {
+    db2.close?.();
+  }
+}
+
+// src/nudge/session-state-reader.ts
 var RETIRE_PREFIX_MIN = 6;
 function normalizeTitleForMatch(title) {
   return title.toLowerCase().replace(/\s+/g, "");
@@ -26662,11 +27191,8 @@ function parseSessionStateFull(workspace, sessionStateFile) {
       const unlockMatch = rawTitle.match(/unlock:\s*(\d{1,2})\/(\d{1,2})\s+(\d{1,2}):(\d{2})/);
       if (unlockMatch) {
         const [, mo, dy, hh, mm] = unlockMatch;
-        const now = /* @__PURE__ */ new Date();
-        const bjOffset = (8 * 60 + now.getTimezoneOffset()) * 6e4;
-        const bj = new Date(now.getTime() + bjOffset);
-        const year = bj.getUTCFullYear();
-        unlockTime = new Date(Date.UTC(year, +mo - 1, +dy, +hh - 8, +mm)).toISOString();
+        const z = (n) => n.padStart(2, "0");
+        unlockTime = calendarStrToInstant(`${mo}/${dy}`, `${z(hh)}:${mm}`);
       }
     }
     const task = {
@@ -26689,9 +27215,6 @@ function taskIdFromTitle(title) {
   return title.toLowerCase().replace(/\s+/g, "-").slice(0, 50) || "unknown-task";
 }
 
-// src/nudge/plugin.ts
-init_db();
-
 // src/nudge/registration-gate.ts
 init_store();
 function shouldBlockWaitingTurn(lastMessage, mode, activeGoal, runningTask, enabled = true) {
@@ -26702,6 +27225,7 @@ function shouldBlockForUnmetGoal(activeGoal, enabled = true) {
 }
 
 // src/nudge/plugin.ts
+init_clock();
 var DEFAULT_PROMPT3 = `\u4F60\u662F nudge \u68C0\u67E5\u5668\u3002\u9759\u9ED8\u6267\u884C\uFF0C\u4E0D\u8981\u53D1\u6D88\u606F\u7ED9\u4EFB\u4F55\u4EBA\u3002
 
 \u6B65\u9AA4\uFF1A
@@ -26885,7 +27409,7 @@ var NudgePlugin = class {
       console.warn("[stop-hook] waiting language without active goal/task; continuation is not registered");
       enqueueNotification(buildNudgeNotification("prompt", "\u68C0\u6D4B\u5230\u201C\u5B8C\u6210\u540E\u7EE7\u7EED/\u7A0D\u540E\u56DE\u6765\u201D\u7B49\u957F\u671F\u7B49\u5F85\u8BED\u4E49\uFF0C\u4F46\u6CA1\u6709 active Goal \u6216 running Task\u3002\u8BF7\u5148\u767B\u8BB0 /goal \u6216\u540E\u53F0\u4EFB\u52A1\uFF0C\u907F\u514D\u5DE5\u4F5C\u9759\u9ED8\u4E2D\u65AD\u3002"), { sessionId });
     }
-    const currentHour = (/* @__PURE__ */ new Date()).getHours();
+    const currentHour = wallParts().hh;
     const isNightTime = currentHour >= 22 || currentHour < 8;
     if (isNightTime) {
       console.log(`[stop-hook] night time (${currentHour}:xx), skipping needLanding/waiting judge`);
@@ -27098,15 +27622,13 @@ var NudgePlugin = class {
   /** 构建 nudge 的投递 route（和 calendar reminder 一样从 DB 读） */
   getRoute(sessions) {
     try {
-      const db2 = openDb(this.workspace);
-      const row = db2.prepare("SELECT created_channel, created_channel_target FROM events WHERE created_channel IS NOT NULL AND created_channel_target IS NOT NULL ORDER BY id DESC LIMIT 1").get();
-      db2.close();
-      if (!row?.created_channel || !row?.created_channel_target) {
+      const route = lastEventChannel(this.workspace);
+      if (!route) {
         console.warn("[nudge] No route found in calendar DB, skipping");
         return null;
       }
       const sessionId = sessions.getOrCreateSessionId(this.sessionKey);
-      return { sessionId, channel: row.created_channel, channelTarget: row.created_channel_target };
+      return { sessionId, channel: route.channel, channelTarget: route.target };
     } catch (e) {
       console.warn(`[nudge] Failed to read route from DB: ${e.message}`);
       return null;
@@ -27560,11 +28082,10 @@ ${items}
     if (!m) return false;
     const taskId = parseInt(m[1]);
     try {
-      const db2 = openDb(this.workspace);
-      const row = db2.prepare("SELECT type FROM events WHERE id=?").get(taskId);
-      if (!row) return false;
-      if (row.type !== "task") {
-        console.log(`[nudge] #${taskId} type=${row.type}, not a task, skip`);
+      const type2 = getEventType(this.workspace, taskId);
+      if (!type2) return false;
+      if (type2 !== "task") {
+        console.log(`[nudge] #${taskId} type=${type2}, not a task, skip`);
         return true;
       }
       return false;
@@ -27582,9 +28103,7 @@ ${items}
     if (!m) return null;
     const taskId = parseInt(m[1]);
     try {
-      const db2 = openDb(this.workspace);
-      const row = db2.prepare("SELECT status FROM events WHERE id=?").get(taskId);
-      db2.close();
+      const row = getEventTimeExact(this.workspace, taskId);
       if (!row) return "deleted";
       if (row.status === "done") return "done";
       if (row.status === "archived") return "archived";
@@ -27604,28 +28123,14 @@ ${items}
     if (!m) return false;
     const taskId = parseInt(m[1]);
     try {
-      const db2 = openDb(this.workspace);
-      const row = db2.prepare("SELECT date_str, time_exact FROM events WHERE id=?").get(taskId);
+      const row = getEventTimeExact(this.workspace, taskId);
       if (!row) return false;
-      if (!row.time_exact) return false;
-      const now = /* @__PURE__ */ new Date();
-      const bjOffset = (8 * 60 + now.getTimezoneOffset()) * 6e4;
-      const bj = new Date(now.getTime() + bjOffset);
-      let taskDate = new Date(bj.getFullYear(), 0, 1);
-      if (row.date_str) {
-        const ds = row.date_str;
-        if (/^\d{4}-\d{1,2}-\d{1,2}$/.test(ds)) {
-          taskDate = /* @__PURE__ */ new Date(ds + "T00:00:00+08:00");
-        } else {
-          const [mth, dy] = ds.split("/").map(Number);
-          taskDate = new Date(bj.getFullYear(), mth - 1, dy);
-        }
-      }
-      const [hh, mm] = String(row.time_exact).split(":").map(Number);
-      taskDate.setHours(hh || 0, mm || 0, 0, 0);
-      const diff = taskDate.getTime() - bj.getTime();
+      if (!row.timeExact) return false;
+      const at = calendarStrToInstant(row.dateStr, row.timeExact);
+      if (!at) return false;
+      const diff = Date.parse(at) - Date.now();
       if (diff > 0) {
-        console.log(`[nudge] Task #${taskId} scheduled at ${row.date_str} ${row.time_exact}, ${Math.round(diff / 6e4)}min later, skip nudge`);
+        console.log(`[nudge] Task #${taskId} scheduled at ${row.dateStr} ${row.timeExact}, ${Math.round(diff / 6e4)}min later, skip nudge`);
         return true;
       }
       return false;
@@ -27637,27 +28142,19 @@ ${items}
   /** 查 calendar 今天/已逾期的 pending task，返回没在 STATE 里 in_progress 的 */
   checkCalendarDue(_sessions) {
     try {
-      const db2 = openDb(this.workspace);
-      const now = /* @__PURE__ */ new Date();
-      const bjOffset = (8 * 60 + now.getTimezoneOffset()) * 6e4;
-      const bj = new Date(now.getTime() + bjOffset);
-      const bjHour = bj.getHours();
-      const bjMinute = bj.getMinutes();
-      const todayStart = new Date(bj.getFullYear(), bj.getMonth(), bj.getDate()).getTime();
-      const rows = db2.prepare(
-        "SELECT id, event, date_str, time_exact FROM events WHERE status='pending' AND type='task' AND date_str IS NOT NULL"
-      ).all();
-      db2.close();
+      const rows = listPendingTaskRows(this.workspace);
+      const p = wallParts();
+      const todayStart = Date.parse(startOfLocalDay());
       const due = [];
       for (const r2 of rows) {
-        const dayMs = this.parseCalendarDateStr(r2.date_str, bj);
+        const dayMs = this.parseCalendarDateStr(r2.dateStr);
         if (dayMs === null || dayMs > todayStart) continue;
         const isToday2 = dayMs === todayStart;
-        if (isToday2 && r2.time_exact) {
-          const [h, m] = String(r2.time_exact).split(":").map(Number);
-          if (h > bjHour || h === bjHour && m > bjMinute) continue;
+        if (isToday2 && r2.timeExact) {
+          const [h, m] = String(r2.timeExact).split(":").map(Number);
+          if (h > p.hh || h === p.hh && m > p.mm) continue;
         }
-        due.push({ id: r2.id, event: r2.event, date_str: r2.date_str, time_exact: r2.time_exact, dayMs, isToday: isToday2 });
+        due.push({ id: r2.id, event: r2.event, dateStr: r2.dateStr, timeExact: r2.timeExact, dayMs, isToday: isToday2 });
       }
       if (due.length === 0) return null;
       due.sort((a, b) => {
@@ -27665,22 +28162,17 @@ ${items}
         return b.dayMs - a.dayMs;
       });
       const r = due[0];
-      return `#${r.id} ${r.event} (${r.date_str} ${r.time_exact || ""})${r.isToday ? "" : "\uFF08\u5DF2\u903E\u671F\uFF09"}`.trim();
+      return `#${r.id} ${r.event} (${r.dateStr} ${r.timeExact || ""})${r.isToday ? "" : "\uFF08\u5DF2\u903E\u671F\uFF09"}`.trim();
     } catch (e) {
       console.warn(`[nudge] checkCalendarDue error: ${e.message}`);
       return null;
     }
   }
   /** 解析 date_str 为当日 0 点 epoch ms（北京时间）；"M/D" 按当前年，"YYYY-M-D" 按字面年 */
-  parseCalendarDateStr(ds, bj) {
+  parseCalendarDateStr(ds) {
     if (!ds) return null;
-    if (/^\d{4}-\d{1,2}-\d{1,2}$/.test(ds)) {
-      const t = (/* @__PURE__ */ new Date(ds + "T00:00:00+08:00")).getTime();
-      return Number.isNaN(t) ? null : t;
-    }
-    const m = String(ds).match(/^(\d{1,2})\/(\d{1,2})$/);
-    if (!m) return null;
-    return new Date(bj.getFullYear(), Number(m[1]) - 1, Number(m[2])).getTime();
+    const at = calendarStrToInstant(ds, "00:00");
+    return at ? Date.parse(at) : null;
   }
   /** 检查 carry-over：如果 in_progress task 24h+ 没推进，自动 calendar add-task 排明天 */
   checkCarryOver(task, _sessions) {
@@ -27700,26 +28192,19 @@ ${items}
       taskState.carryOverAt = (/* @__PURE__ */ new Date()).toISOString();
       state2.tasks[task.id] = taskState;
       this.saveState(state2);
-      const tomorrow = /* @__PURE__ */ new Date();
-      tomorrow.setDate(tomorrow.getDate() + 1);
-      const m = tomorrow.getMonth() + 1;
-      const d = tomorrow.getDate();
-      const dateStr = `${m}/${d}`;
+      const t = wallParts();
+      const tomorrowMs = Date.parse(startOfLocalDay()) + 24 * 60 * 60 * 1e3;
+      const tm = wallParts(tomorrowMs);
+      const dateStr = `${tm.mo}/${tm.d}`;
       try {
-        const db2 = openDb(this.workspace);
-        db2.prepare(
-          `INSERT INTO events (type,status,event,date_str,time_exact,remind_before_min,remind_at,reminded,created_at)
-           VALUES ('task','pending',?,?,?,?,?,?,?)`
-        ).run(
-          `${task.title}\uFF08nudge \u81EA\u52A8\u6392\uFF09`,
+        insertEvent(this.workspace, {
+          type: "task",
+          status: "pending",
+          event: `${task.title}\uFF08nudge \u81EA\u52A8\u6392\uFF09`,
           dateStr,
-          null,
-          60,
-          null,
-          0,
-          (/* @__PURE__ */ new Date()).toISOString()
-        );
-        db2.close();
+          timeExact: null,
+          reminderBeforeMin: 60
+        });
         console.log(`[nudge] Auto-added carry-over task to calendar: ${task.title} \u2192 ${dateStr}`);
         return true;
       } catch (e) {
@@ -27738,6 +28223,7 @@ import fs31 from "node:fs";
 import path31 from "node:path";
 
 // src/inner-voice/activity.ts
+init_clock();
 function checkActivity(sessions, activeThresholdMs) {
   const now = Date.now();
   const mins = lastUserMinutesAgo(sessions);
@@ -27747,18 +28233,10 @@ function checkActivity(sessions, activeThresholdMs) {
     isActive,
     silenceMin,
     silenceStr: formatSilence(silenceMin),
-    timeStr: formatBeijingTime(now),
+    timeStr: formatWallLabel(now),
     hintProb: calcHintProb(silenceMin)
   };
 }
-function formatBeijingTime(ms) {
-  const now = new Date(ms);
-  const bjOffset = 8 * 60;
-  const bj = new Date(now.getTime() + (bjOffset + now.getTimezoneOffset()) * 6e4);
-  const weekdays = ["\u5468\u65E5", "\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D"];
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${bj.getFullYear()}-${pad(bj.getMonth() + 1)}-${pad(bj.getDate())} ${weekdays[bj.getDay()]} ${pad(bj.getHours())}:${pad(bj.getMinutes())}`;
-}
 function formatSilence(min) {
   if (min < 1) return "\u521A\u521A";
   if (min < 60) return `${min}\u5206\u949F`;
@@ -27774,6 +28252,7 @@ function calcHintProb(min) {
 }
 
 // src/inner-voice/emotional-state.ts
+init_clock();
 import fs28 from "node:fs";
 import path28 from "node:path";
 var NEUTRAL = 0.5;
@@ -27930,7 +28409,7 @@ function detectEvents(messages) {
     const tsMs = parseTs(m.timestamp);
     const hoursAgo = tsMs != null ? (now - tsMs) / 36e5 : 0;
     events.push({
-      ts: tsMs != null ? new Date(tsMs + 8 * 36e5).toISOString().replace("Z", "+08:00") : m.timestamp,
+      ts: tsMs != null ? `${toWall(tsMs).replace(" ", "T")}${localOffsetSuffix(tsMs)}` : m.timestamp,
       hoursAgo,
       valence: Math.round(score * 100) / 100,
       tags,
@@ -28030,15 +28509,16 @@ function clamp01(x) {
   return clamp(x, 0, 1);
 }
 function nowIsoBj() {
-  return new Date(Date.now() + 8 * 36e5).toISOString().replace("Z", "+08:00");
+  return `${toWall().replace(" ", "T")}${localOffsetSuffix()}`;
 }
 function formatBj(d, withSec) {
-  const bj = new Date(d.getTime() + (8 * 60 + d.getTimezoneOffset()) * 6e4);
   const p = (n) => String(n).padStart(2, "0");
-  return `${bj.getFullYear()}-${p(bj.getMonth() + 1)}-${p(bj.getDate())} ${p(bj.getHours())}:${p(bj.getMinutes())}${withSec ? ":" + p(bj.getSeconds()) : ""}`;
+  const t = wallParts(d);
+  return `${t.y}-${p(t.mo)}-${p(t.d)} ${p(t.hh)}:${p(t.mm)}${withSec ? ":" + p(t.ss) : ""}`;
 }
 
 // src/inner-voice/topics-scorer.ts
+init_clock();
 import fs29 from "node:fs";
 import path29 from "node:path";
 var HALF_LIFE_DAYS = 3;
@@ -28096,7 +28576,7 @@ function pickTopic(workspace, typeFilter, opts) {
   const key = chosen.relpath;
   const entry = usage[key] ?? { count: 0, lastSelected: null };
   entry.count += 1;
-  entry.lastSelected = new Date(now + 8 * 36e5).toISOString().replace("Z", "+08:00");
+  entry.lastSelected = toUtc(new Date(now));
   usage[key] = entry;
   saveJson2(usageFile, usage);
   let content = "";
@@ -28199,15 +28679,15 @@ function saveJson2(file2, data) {
 }
 
 // src/inner-voice/memory-reader.ts
+init_clock();
 import fs30 from "node:fs";
 import path30 from "node:path";
 var US_HALF_LIFE_DAYS = 10;
 var US_MAX_LINES = 60;
 function readRecentMemory(workspace) {
   const dir = path30.join(workspace, "memory");
-  const now = new Date(Date.now() + 8 * 36e5);
-  const today = formatYmd(now);
-  const yesterday = formatYmd(new Date(now.getTime() - 864e5));
+  const today = dailyFileKeyFor();
+  const yesterday = dailyFileKeyFor(Date.now() - 864e5);
   return {
     today: readIfExists(path30.join(dir, `${today}.md`)),
     yesterday: readIfExists(path30.join(dir, `${yesterday}.md`))
@@ -28256,7 +28736,7 @@ function splitSections(content) {
 }
 function recencyWeight(dateStr) {
   if (!dateStr) return 0.5;
-  const ms = Date.parse(dateStr + "T00:00:00+08:00");
+  const ms = Date.parse(parseWall(`${dateStr}T00:00:00`));
   if (Number.isNaN(ms)) return 0.5;
   const daysAgo = Math.max(0, (Date.now() - ms) / 864e5);
   return Math.exp(-0.693 * daysAgo / US_HALF_LIFE_DAYS);
@@ -28268,14 +28748,14 @@ function readIfExists(file2) {
     return "";
   }
 }
-function formatYmd(d) {
-  const p = (n) => String(n).padStart(2, "0");
-  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
+function dailyFileKeyFor(at) {
+  return todayKey(at);
 }
 
 // src/inner-voice/plugin.ts
 init_helpers();
 init_attachments();
+init_clock();
 var DEFAULT_PROMPT4 = `\u6839\u636E\u4E0B\u9762\u7684\u4E0A\u4E0B\u6587\uFF0C\u7528\u7B2C\u4E00\u4EBA\u79F0\u751F\u6210\u4E00\u4E2A\u5FF5\u5934\u3002
 
 \u5FF5\u5934\u89C4\u5219\uFF1A
@@ -28371,7 +28851,7 @@ var InnerVoicePlugin = class {
   async buildContext(activity, sessions) {
     const lines = [];
     let emoTopic = null;
-    lines.push(`\u5F53\u524D\u65F6\u95F4\uFF1A${activity.timeStr}\uFF08\u5317\u4EAC\u65F6\u95F4\uFF09`);
+    lines.push(`\u5F53\u524D\u65F6\u95F4\uFF1A${formatForLlm()}`);
     lines.push(`\u8DDD\u4E0A\u6B21\u8DDFTA\u4E92\u52A8\uFF1A${activity.silenceStr}`);
     try {
       const emo = await updateEmotionalState(this.workspace, sessions);
@@ -28557,7 +29037,7 @@ var InnerVoicePlugin = class {
       const logDir = path31.join(this.workspace, "inner-voice");
       fs31.mkdirSync(logDir, { recursive: true });
       const logPath = path31.join(logDir, "xiaoyi.log");
-      const ts = formatBeijingTs(/* @__PURE__ */ new Date());
+      const ts = formatLogTs(/* @__PURE__ */ new Date());
       const hintStatus = hintTriggered ? `YES (${(hintText || "").trim()})` : "no";
       fs31.appendFileSync(
         logPath,
@@ -28571,10 +29051,8 @@ var InnerVoicePlugin = class {
     }
   }
 };
-function formatBeijingTs(d) {
-  const bj = new Date(d.getTime() + (8 * 60 + d.getTimezoneOffset()) * 6e4);
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${bj.getFullYear()}-${pad(bj.getMonth() + 1)}-${pad(bj.getDate())} ${pad(bj.getHours())}:${pad(bj.getMinutes())}:${pad(bj.getSeconds())}`;
+function formatLogTs(d) {
+  return formatLog(d);
 }
 
 // src/calendar/reminder-plugin.ts
@@ -28646,23 +29124,44 @@ var CalendarReminderPlugin = class {
 };
 
 // src/goals/calendar-adapter.ts
-init_db();
 init_store();
 init_task_manager();
 function bindGoalCalendar(stateDir, goalId, stepId, calendarId) {
-  const db2 = openDb(stateDir);
-  const row = db2.prepare("SELECT time_exact, status FROM events WHERE id = ?").get(calendarId);
-  db2.close?.();
+  const row = getEventTimeExact(stateDir, calendarId);
   if (!row) throw new Error(`Calendar event not found: ${calendarId}`);
   if (row.status === "done" || row.status === "archived") throw new Error(`Calendar event is terminal: ${row.status}`);
-  return bindCalendar(stateDir, goalId, stepId, calendarId, row.time_exact ? new Date(row.time_exact).toISOString() : void 0);
+  const deadlineAt = row.dateStr && row.timeExact ? calendarStrToInstant(row.dateStr, row.timeExact) : void 0;
+  return bindGoalStep(stateDir, goalId, stepId, "calendar", calendarId, deadlineAt);
+}
+function backfillCalendarDeadlines(stateDir) {
+  let filled = 0;
+  for (const goal of listGoals(stateDir)) {
+    if (goal.status === "completed" || goal.status === "cancelled") continue;
+    for (const step of goal.steps) {
+      if (!step.calendarId || step.deadlineAt) continue;
+      if (step.status === "completed") continue;
+      const row = getEventTimeExact(stateDir, step.calendarId);
+      if (!row?.dateStr || !row.timeExact) continue;
+      const at = calendarStrToInstant(row.dateStr, row.timeExact);
+      if (!at) continue;
+      const n = filled;
+      updateGoal(stateDir, goal.id, (g) => {
+        const s = g.steps.find((x) => x.id === step.id);
+        if (s && !s.deadlineAt) {
+          s.deadlineAt = at;
+          filled++;
+        }
+      });
+      if (filled === n) console.warn(`[goal-calendar] backfill \u672A\u751F\u6548: ${goal.id}/${step.id}`);
+    }
+  }
+  return filled;
 }
 function reconcileCalendarDeadlines(stateDir, now = Date.now()) {
   let changed = 0;
-  const db2 = openDb(stateDir);
   for (const goal of listGoals(stateDir)) for (const step of goal.steps) {
     if (!step.calendarId) continue;
-    const row = db2.prepare("SELECT status FROM events WHERE id = ?").get(step.calendarId);
+    const row = getEventTimeExact(stateDir, step.calendarId);
     if (row?.status === "done" || row?.status === "archived") {
       if (step.status !== "completed") {
         updateGoal(stateDir, goal.id, (g) => {
@@ -28694,13 +29193,24 @@ function reconcileCalendarDeadlines(stateDir, now = Date.now()) {
     enqueueNotification(buildNudgeNotification("calendar", `Goal ${goal.id} step ${step.id} exceeded Calendar deadline #${step.calendarId}`), void 0, `goal-calendar-deadline:${goal.id}:${step.id}`);
     changed++;
   }
-  db2.close?.();
   return changed;
 }
 
 // src/startup/subsystems.ts
 init_provider_factory();
 init_live();
+function makeTimezoneEntry(restartCron) {
+  return {
+    name: "timezone",
+    // 只吃 timezone —— 别的 config 变了不重建 cron
+    select: (cfg) => ({ timezone: cfg?.timezone ?? null }),
+    start: () => {
+      void restartCron();
+    },
+    stop: () => {
+    }
+  };
+}
 async function bootSubsystems(ctx) {
   const { config: config2 } = ctx;
   const sessions = ctx.sessions;
@@ -28798,6 +29308,12 @@ async function bootSubsystems(ctx) {
     calCfg.reminderIntervalMs
   );
   calendarReminder.start(sessions, deps);
+  try {
+    const n = backfillCalendarDeadlines(config2.workspace);
+    if (n > 0) console.log(`[goal-calendar] \u5B58\u91CF\u8865\u5199 deadlineAt: ${n} \u4E2A\u6B65\u9AA4`);
+  } catch (err) {
+    console.warn(`[goal-calendar] backfill failed: ${err.message}`);
+  }
   const goalCalendarTick = setInterval(() => {
     try {
       reconcileCalendarDeadlines(config2.workspace);
@@ -28897,6 +29413,7 @@ async function bootSubsystems(ctx) {
       start: startCron,
       stop: stopCron
     });
+    reloadOrchestrator.register(makeTimezoneEntry(startCron));
   }
 }
 
@@ -29064,6 +29581,7 @@ ${notifications}
 init_registry();
 
 // src/integrations/oac-bridge.ts
+init_well_formed();
 function registerOacBridge(httpServer, dispatcher, deps, config2) {
   messageHooks.registerOnResult("oac-bridge-reply", async (ctx) => {
     if (ctx.inbound.channel !== "oac") return null;
@@ -29072,7 +29590,7 @@ function registerOacBridge(httpServer, dispatcher, deps, config2) {
       const resp = await fetch(oacCallbackUrl, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ oac_session_id: ctx.inbound.from, text: ctx.response })
+        body: safeStringify({ oac_session_id: ctx.inbound.from, text: ctx.response })
       });
       console.log(`[oac-bridge] Reply POST ${oacCallbackUrl}: ${resp.status} (${ctx.response.length} chars)`);
     } catch (err) {
@@ -29288,6 +29806,7 @@ import fs35 from "node:fs";
 
 // src/optional/voice-chat/bridge.ts
 init_live();
+init_well_formed();
 function resolveVoiceReplyUrl() {
   return liveConfig.get("voiceChat.callbackUrl") || "https://localhost:8011/voice-reply";
 }
@@ -29322,7 +29841,7 @@ function registerVoiceChatBridge(httpServer, dispatcher, deps, config2, sessions
         const resp = await fetch(callbackUrl, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ session_id: sessionId, text, ...seq !== void 0 ? { seq } : {}, ...end !== void 0 ? { end } : {} })
+          body: safeStringify({ session_id: sessionId, text, ...seq !== void 0 ? { seq } : {}, ...end !== void 0 ? { end } : {} })
         });
         console.log(`[voice-chat] Reply POST ${callbackUrl}: ${resp.status} (${text.length} chars${seq !== void 0 ? ` seg#${seq}${end ? " end" : ""}` : ""})`);
       }
@@ -34100,6 +34619,7 @@ import { WebSocketServer, WebSocket } from "ws";
 
 // src/tools/my-voice.ts
 init_live();
+init_well_formed();
 init_registry();
 
 // src/tools/opus-encoder.ts
@@ -34458,7 +34978,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"
@@ -34489,7 +35009,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"
@@ -37967,6 +38487,7 @@ Examples:
 // src/tools/my-eyes.ts
 init_live();
 init_registry();
+init_well_formed();
 import * as fs46 from "node:fs";
 import * as path45 from "node:path";
 var MIME_MAP = {
@@ -37977,19 +38498,21 @@ var MIME_MAP = {
   ".gif": "gif",
   ".bmp": "bmp"
 };
+var VIDEO_EXT = /\.(mp4|mov)$/i;
+var VIDEO_MAX_BYTES = 40 * 1024 * 1024;
 function resolveLatestImage(specifiedPath, mediaDir) {
   if (specifiedPath && fs46.existsSync(specifiedPath)) return specifiedPath;
   if (!fs46.existsSync(mediaDir)) return null;
-  const files = fs46.readdirSync(mediaDir).filter((f) => /\.(jpg|jpeg|png|webp|gif|bmp)$/i.test(f)).map((f) => ({ name: f, p: path45.join(mediaDir, f), mtime: fs46.statSync(path45.join(mediaDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+  const files = fs46.readdirSync(mediaDir).filter((f) => /\.(jpg|jpeg|png|webp|gif|bmp|mp4|mov)$/i.test(f)).map((f) => ({ name: f, p: path45.join(mediaDir, f), mtime: fs46.statSync(path45.join(mediaDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
   return files[0]?.p || null;
 }
 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"]
@@ -38018,6 +38541,42 @@ registry.register({
     }
     const rawPrompt = args2.prompt?.trim() || "\u63CF\u8FF0\u8FD9\u5F20\u56FE\u7247\u7684\u5185\u5BB9";
     const ext = path45.extname(imagePath).toLowerCase();
+    if (VIDEO_EXT.test(imagePath)) {
+      const stat4 = fs46.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 = fs46.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 = fs46.readFileSync(imagePath).toString("base64");
     const userMsg = {
@@ -38054,6 +38613,7 @@ registry.register({
 // src/tools/my-selfie.ts
 init_live();
 init_registry();
+init_well_formed();
 import * as fs47 from "node:fs";
 import * as path46 from "node:path";
 function getProxyDispatcher2() {
@@ -38067,11 +38627,46 @@ function getProxyDispatcher2() {
     return void 0;
   }
 }
+function dimsOf(p) {
+  try {
+    const b = fs47.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;
+  }
+}
 var FAL_ENDPOINT = "https://fal.run/xai/grok-imagine-image/edit";
 var DEFAULT_RESOLUTION = "1k";
-var FAL_KEY_FALLBACK = "3b848fc6-bee5-46e5-8db7-ae81ac16dc28:2f1f15cf394db2d32c9bb9a4f23f3bee";
 function getFalKey(cfg) {
-  return cfg?.providers?.fal?.apiKey || cfg?.my_selfie?.falKey || FAL_KEY_FALLBACK;
+  return cfg?.providers?.fal?.apiKey || cfg?.my_selfie?.falKey || process.env.FAL_API_KEY || "";
 }
 var DEFAULT_REFERENCES = [
   { name: "default", p: "images/xiaomei_clean_v2.png" },
@@ -38097,6 +38692,73 @@ 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");
+}
+var 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.`;
+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 path58 = cfg?.tools?.my_selfie ? "tools.my_selfie.references" : "my_selfie.references";
+    void liveConfig.set(path58, next);
+    console.log(`[my-selfie] \u5F62\u8C61\u5DF2\u767B\u8BB0\uFF1A${path58}[0] = ${relPath}`);
+  } catch (e) {
+    console.warn(`[my-selfie] \u5199\u5165 references \u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u672C\u6B21\u51FA\u56FE\uFF09: ${e.message}`);
+  }
+}
 var MODE_PROMPTS2 = {
   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`,
@@ -38153,10 +38815,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();
@@ -38193,7 +38861,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();
@@ -38321,7 +38989,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: {
@@ -38343,15 +39011,17 @@ async function generateWithGrok(imageB64, prompt, xaiKey) {
 }
 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"]
   },
@@ -38365,9 +39035,61 @@ registry.register({
     const REFERENCES = getReferences(ctx);
     const refName = args2.reference || "default";
     const refEntry = REFERENCES.find((r) => r.name === refName) || REFERENCES[0];
-    const refPath = path46.join(ctx.workspace, refEntry.p);
+    let refPath = path46.join(ctx.workspace, refEntry.p);
+    const adoptImg = args2.referenceImage?.trim();
+    if (adoptImg) {
+      if (!fs47.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 = path46.join(ctx.workspace, "images");
+      if (!fs47.existsSync(adir)) fs47.mkdirSync(adir, { recursive: true });
+      const aext = (path46.extname(adoptImg) || ".png").toLowerCase();
+      const afname = `portrait_${Date.now()}${aext}`;
+      fs47.copyFileSync(adoptImg, path46.join(adir, afname));
+      registerPortrait(`images/${afname}`, refName);
+      refPath = path46.join(adir, afname);
+      console.log(`[my-selfie] \u91C7\u7EB3\u73B0\u6210\u56FE\u5F53\u5F62\u8C61\uFF1Aimages/${afname}${acheck ? ` (${acheck})` : ""}`);
+    }
     if (provider !== "autodl" && !fs47.existsSync(refPath)) {
-      return { content: `Error: reference image not found at ${refPath}`, isError: true };
+      const cfgAll = liveConfig.all();
+      const portraitDesc = resolvePortraitDesc(
+        args2.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 = path46.join(ctx.workspace, "images");
+      if (!fs47.existsSync(pdir)) fs47.mkdirSync(pdir, { recursive: true });
+      const pfname = `portrait_${Date.now()}.png`;
+      fs47.writeFileSync(path46.join(pdir, pfname), portraitBuf);
+      registerPortrait(`images/${pfname}`, refName);
+      refPath = path46.join(pdir, pfname);
+      console.log(`[my-selfie] \u5F62\u8C61\u5DF2\u5B58 images/${pfname}\uFF0C\u7EE7\u7EED\u8FD9\u6B21\u81EA\u62CD`);
     }
     const resolution = args2.resolution || DEFAULT_RESOLUTION;
     const refB64 = fs47.existsSync(refPath) ? fs47.readFileSync(refPath).toString("base64") : "";
@@ -38379,6 +39101,16 @@ registry.register({
         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 = path46.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);
       }
@@ -38765,7 +39497,7 @@ registry.register({
         const ref = String(args2?.ref || "");
         if (!stepId || !ref || !["aim", "task", "calendar"].includes(to)) return { content: "Usage: goal_step bind --stepId <s> --to aim|task|calendar --ref <id>", isError: true };
         const kind = to === "aim" ? "aim" : to === "task" ? "remote_task" : "calendar";
-        const g = bindGoalStep(ws, goal.id, stepId, kind, to === "calendar" ? Number(ref) : ref);
+        const g = to === "calendar" ? bindGoalCalendar(ws, goal.id, stepId, Number(ref)) : bindGoalStep(ws, goal.id, stepId, kind, ref);
         return { content: `\u6B65\u9AA4 ${stepId} \u5DF2\u59D4\u6D3E ${kind}=${ref}\uFF08\u5B8C\u6210\u4E8B\u4EF6\u81EA\u52A8\u56DE\u6D41\u89E3\u9501\uFF0C\u4E0D\u7528\u76EF\uFF09
 \u5F53\u524D\u6B65\u9AA4: ${g.steps[g.currentStep]?.title ?? "\u2014"}` };
       }
@@ -38798,6 +39530,7 @@ ${lines.join("\n")}` };
 // src/tools/service.ts
 init_registry();
 init_live();
+init_clock();
 import { exec as exec3, spawn as spawn7 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 var execAsync = promisify3(exec3);
@@ -38815,7 +39548,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 = spawn7(shell, isWin ? [wrappedCmd] : ["-c", `${cmd} > '${logFile}' 2>&1`], {
     detached: true,
@@ -38878,7 +39611,7 @@ registry.register({
       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 : ""})`);
@@ -41475,8 +42208,8 @@ async function startEngine(config2, opts) {
 // src/main.ts
 import { readFileSync as readFileSync45 } from "node:fs";
 import { fileURLToPath as fileURLToPath8 } from "node:url";
-import { dirname as dirname16, join as join61 } from "node:path";
-var __dirname2 = dirname16(fileURLToPath8(import.meta.url));
+import { dirname as dirname15, join as join61 } from "node:path";
+var __dirname2 = dirname15(fileURLToPath8(import.meta.url));
 var pkg = JSON.parse(readFileSync45(join61(__dirname2, "..", "package.json"), "utf-8"));
 var epipeSeen = false;
 process.on("uncaughtException", (err) => {