engine7 7.1.22 → 7.1.24

package/dist/main.mjs

@@ -985,8 +985,10 @@ async function executeStopHooks(ctx, signal, lastAssistantMessage) {
     cwd: ctx.cwd,
     stop_hook_active: false,
     last_assistant_message: lastAssistantMessage,
-    channel: ctx.channel
+    channel: ctx.channel,
     // 让 callback hook 能判断来源
+    source: ctx.source || ""
+    // 消息来源（heartbeat/cron/system 等注入 turn 可据此跳过）
   };
   return executeHooks("Stop", hookInput, ctx, signal);
 }
@@ -1338,6 +1340,7 @@ function collectSurfacedMemories(messages) {
   return { paths };
 }
 function normalizePath(p2) {
+  if (p2.startsWith("everos://")) return p2;
   return pathResolve(p2);
 }
 function memoryHeader(filePath, mtimeMs) {
@@ -2784,10 +2787,12 @@ function breakdownMessages(messages) {
         if (memCount === 0) console.log(`[context-analyzer] WARNING: relevant_memories attachment with 0 memories! keys=${Object.keys(m2.attachment).join(",")}`);
         for (const mem of m2.attachment.memories || []) {
           const fileName = mem.path.split(/[/\\]/).pop() || mem.path;
+          const scoreMatch = mem.header?.match(/score=([\d.]+)/);
           recalledTopics.push({
             path: fileName,
             tokens: roughTokenCountEstimation(mem.content),
-            stable: false
+            stable: false,
+            score: scoreMatch ? scoreMatch[1] : void 0
           });
         }
       }
@@ -2998,13 +3003,25 @@ function formatContextReport(report) {
     output += `### Recalled Memories (${rt.length})
 
 `;
-    output += `| File | Tokens |
+    const hasScore = rt.some((t) => t.score);
+    if (hasScore) {
+      output += `| File | Score | Tokens |
 `;
-    output += `|------|--------|
+      output += `|------|-------|--------|
+`;
+      for (const t of rt) {
+        output += `| ${t.path} | ${t.score ?? "-"} | ${formatTokens(t.tokens)} |
+`;
+      }
+    } else {
+      output += `| File | Tokens |
+`;
+      output += `|------|--------|
 `;
-    for (const t of rt) {
-      output += `| ${t.path} | ${formatTokens(t.tokens)} |
+      for (const t of rt) {
+        output += `| ${t.path} | ${formatTokens(t.tokens)} |
 `;
+      }
     }
     output += "\n";
   }
@@ -3342,7 +3359,8 @@ ${perTurnSystemDynamic}` : deferredHint || perTurnSystemDynamic;
                       sessionId: context?.sessionId || "default",
                       workspace: context?.workspace || "",
                       channel: context?.channel || "",
-                      cwd: context?.workspace || ""
+                      cwd: context?.workspace || "",
+                      source: typeof context?.source === "string" ? context.source : ""
                     };
                     const stopResult = await executeStopHooks(stopCtx, ac.signal, textContent);
                     if (stopResult.preventContinuation) {
@@ -5729,11 +5747,11 @@ async function readLastConsolidatedAt(memoryDir) {
   }
 }
 async function tryAcquireConsolidationLock(memoryDir) {
-  const path43 = lockPath(memoryDir);
+  const path44 = lockPath(memoryDir);
   let mtimeMs;
   let holderPid;
   try {
-    const [s2, raw] = await Promise.all([stat3(path43), readFile5(path43, "utf8")]);
+    const [s2, raw] = await Promise.all([stat3(path44), readFile5(path44, "utf8")]);
     mtimeMs = s2.mtimeMs;
     const parsed = parseInt(raw.trim(), 10);
     holderPid = Number.isFinite(parsed) ? parsed : void 0;
@@ -5746,10 +5764,10 @@ async function tryAcquireConsolidationLock(memoryDir) {
     }
   }
   await mkdir3(memoryDir, { recursive: true });
-  await writeFile4(path43, String(process.pid));
+  await writeFile4(path44, String(process.pid));
   let verify2;
   try {
-    verify2 = await readFile5(path43, "utf8");
+    verify2 = await readFile5(path44, "utf8");
   } catch {
     return null;
   }
@@ -5757,15 +5775,15 @@ async function tryAcquireConsolidationLock(memoryDir) {
   return mtimeMs ?? 0;
 }
 async function rollbackConsolidationLock(memoryDir, priorMtime) {
-  const path43 = lockPath(memoryDir);
+  const path44 = lockPath(memoryDir);
   try {
     if (priorMtime === 0) {
-      await unlink(path43);
+      await unlink(path44);
       return;
     }
-    await writeFile4(path43, "");
+    await writeFile4(path44, "");
     const t = priorMtime / 1e3;
-    await utimes(path43, t, t);
+    await utimes(path44, t, t);
   } catch (e) {
     console.log(`[autoDream] rollback failed: ${e.message} \u2014 next trigger delayed to minHours`);
   }
@@ -6098,15 +6116,15 @@ __export(TodoWriteTool_exports, {
   loadTodos: () => loadTodos
 });
 import fs31 from "node:fs";
-import path30 from "node:path";
+import path31 from "node:path";
 function initTodoStore(stateDir) {
-  todosDir = path30.join(stateDir, "todos");
+  todosDir = path31.join(stateDir, "todos");
   if (!fs31.existsSync(todosDir)) {
     fs31.mkdirSync(todosDir, { recursive: true });
   }
 }
 function todoFilePath(sessionId) {
-  return path30.join(todosDir, `${sessionId}.json`);
+  return path31.join(todosDir, `${sessionId}.json`);
 }
 function loadTodos(sessionId) {
   if (!todosDir) return [];
@@ -6202,15 +6220,15 @@ __export(tasks_exports, {
   updateTask: () => updateTask
 });
 import * as fs33 from "node:fs";
-import * as path32 from "node:path";
+import * as path33 from "node:path";
 function sanitizePathComponent2(input) {
   return input.replace(/[^a-zA-Z0-9_-]/g, "-");
 }
 function getTasksDir2(stateDir, listId) {
-  return path32.join(stateDir, "tasks", sanitizePathComponent2(listId));
+  return path33.join(stateDir, "tasks", sanitizePathComponent2(listId));
 }
 function getTaskPath(stateDir, listId, taskId) {
-  return path32.join(getTasksDir2(stateDir, listId), `${sanitizePathComponent2(taskId)}.json`);
+  return path33.join(getTasksDir2(stateDir, listId), `${sanitizePathComponent2(taskId)}.json`);
 }
 function ensureTasksDir2(stateDir, listId) {
   const dir = getTasksDir2(stateDir, listId);
@@ -6218,7 +6236,7 @@ function ensureTasksDir2(stateDir, listId) {
   return dir;
 }
 function getHighWaterMarkPath(stateDir, listId) {
-  return path32.join(getTasksDir2(stateDir, listId), HIGH_WATER_MARK_FILE);
+  return path33.join(getTasksDir2(stateDir, listId), HIGH_WATER_MARK_FILE);
 }
 function readHighWaterMark(stateDir, listId) {
   try {
@@ -6424,7 +6442,7 @@ __export(read_exports, {
   readFileState: () => readFileState
 });
 import * as fs34 from "node:fs";
-import * as path33 from "node:path";
+import * as path34 from "node:path";
 function isBlockedDevicePath(filePath) {
   if (BLOCKED_DEVICE_PATHS.has(filePath)) return true;
   if (filePath.startsWith("/proc/") && (filePath.endsWith("/fd/0") || filePath.endsWith("/fd/1") || filePath.endsWith("/fd/2"))) return true;
@@ -6603,7 +6621,7 @@ Usage:
           return { content: `\u6587\u4EF6\u4E0D\u5B58\u5728: ${filePath}`, isError: true };
         }
         const stat4 = fs34.statSync(filePath);
-        const baseName = path33.basename(filePath).toUpperCase();
+        const baseName = path34.basename(filePath).toUpperCase();
         if (BLOCKED_BASENAMES.has(baseName)) {
           return { content: `\u8BBE\u5907\u6587\u4EF6\u4E0D\u652F\u6301\u8BFB\u53D6: ${filePath}`, isError: true };
         }
@@ -6613,7 +6631,7 @@ Usage:
         if (stat4.isDirectory()) {
           const entries = fs34.readdirSync(filePath);
           const items = entries.map((e) => {
-            const full = path33.join(filePath, e);
+            const full = path34.join(filePath, e);
             try {
               const s2 = fs34.statSync(full);
               return s2.isDirectory() ? `${e}/` : e;
@@ -6624,7 +6642,7 @@ Usage:
           return { content: `\u76EE\u5F55 (${entries.length} \u9879):
 ${items.join("\n")}` };
         }
-        const ext = path33.extname(filePath).toLowerCase();
+        const ext = path34.extname(filePath).toLowerCase();
         if (BINARY_EXTENSIONS.has(ext)) {
           return { content: `\u4E8C\u8FDB\u5236\u6587\u4EF6\u4E0D\u652F\u6301\u8BFB\u53D6 (${ext}): ${filePath}`, isError: true };
         }
@@ -6673,7 +6691,7 @@ ${result}` : result };
 // src/tools/write.ts
 var write_exports = {};
 import * as fs35 from "node:fs";
-import * as path34 from "node:path";
+import * as path35 from "node:path";
 function isBlockedPath(filePath) {
   return BLOCKED_PATTERNS.some((p2) => p2.test(filePath));
 }
@@ -6817,7 +6835,7 @@ Usage:
             }
           }
         }
-        const dir = path34.dirname(filePath);
+        const dir = path35.dirname(filePath);
         try {
           fs35.mkdirSync(dir, { recursive: true });
         } catch (e) {
@@ -6853,7 +6871,7 @@ ${simpleDiff(oldContent, content)}`;
 // src/tools/edit.ts
 var edit_exports = {};
 import * as fs36 from "node:fs";
-import * as path35 from "node:path";
+import * as path36 from "node:path";
 function normalizeQuotes(str) {
   return str.replaceAll(LEFT_SINGLE_CURLY, "'").replaceAll(RIGHT_SINGLE_CURLY, "'").replaceAll(LEFT_DOUBLE_CURLY, '"').replaceAll(RIGHT_DOUBLE_CURLY, '"');
 }
@@ -7016,7 +7034,7 @@ Usage:
         } catch (e) {
           if (e.code === "ENOENT") {
             if (oldString === "") {
-              const dir = path35.dirname(filePath);
+              const dir = path36.dirname(filePath);
               fs36.mkdirSync(dir, { recursive: true });
               fs36.writeFileSync(filePath, newString, "utf-8");
               readFileState.set(filePath, { timestamp: fs36.statSync(filePath).mtimeMs });
@@ -7096,7 +7114,7 @@ ${diffView}`
 // src/tools/glob.ts
 var glob_exports = {};
 import * as fs37 from "node:fs";
-import * as path36 from "node:path";
+import * as path37 from "node:path";
 function globMatch(pattern, filename) {
   const regexStr = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "{{GLOBSTAR}}").replace(/\*/g, "[^/]*").replace(/\?/g, "[^/]").replace(/\{\{GLOBSTAR\}\}/g, ".*");
   try {
@@ -7122,12 +7140,12 @@ function findFiles(dir, pattern, limit, baseDir) {
     }
     for (const entry of entries) {
       if (truncated) return;
-      const fullPath = path36.join(currentDir, entry.name);
+      const fullPath = path37.join(currentDir, entry.name);
       if (entry.isDirectory()) {
         if (VCS_DIRS.has(entry.name)) continue;
         walk(fullPath);
       } else if (entry.isFile()) {
-        const relativePath = path36.relative(baseDir, fullPath).replace(/\\/g, "/");
+        const relativePath = path37.relative(baseDir, fullPath).replace(/\\/g, "/");
         const patternsToTry = [pattern];
         if (pattern.startsWith("**/")) {
           patternsToTry.push(pattern.slice(3));
@@ -7154,7 +7172,7 @@ function findFiles(dir, pattern, limit, baseDir) {
   };
 }
 function toRelativePath(absolutePath, cwd) {
-  if (absolutePath.startsWith(cwd + path36.sep)) {
+  if (absolutePath.startsWith(cwd + path37.sep)) {
     return absolutePath.slice(cwd.length + 1);
   }
   return absolutePath;
@@ -7215,7 +7233,7 @@ ${filenames.join("\n")}${truncatedNote}`
 // src/tools/grep.ts
 var grep_exports = {};
 import { execFile as execFile2 } from "node:child_process";
-import * as path37 from "node:path";
+import * as path38 from "node:path";
 function ripGrep(args2, searchPath, signal) {
   return new Promise((resolve10) => {
     const fullArgs = [...args2, searchPath];
@@ -7247,7 +7265,7 @@ function applyHeadLimit(items, limit, offset = 0) {
   };
 }
 function toRelativePath2(absolutePath, cwd) {
-  if (absolutePath.startsWith(cwd + path37.sep)) {
+  if (absolutePath.startsWith(cwd + path38.sep)) {
     return absolutePath.slice(cwd.length + 1);
   }
   if (absolutePath.startsWith(cwd)) {
@@ -9916,7 +9934,7 @@ var init_web_fetch = __esm({
 
 // src/cron/tasks.ts
 import fs38 from "node:fs";
-import path38 from "node:path";
+import path39 from "node:path";
 import crypto5 from "node:crypto";
 function getStorageDir() {
   return storageDir;
@@ -9971,7 +9989,7 @@ function readTasksFromDisk() {
   }
 }
 async function writeTasksToDisk(tasks2) {
-  const lockPath2 = path38.join(storageDir, "tasks.json.lock");
+  const lockPath2 = path39.join(storageDir, "tasks.json.lock");
   await withFileLock(lockPath2, () => {
     const store = {
       version: 1,
@@ -9983,7 +10001,7 @@ async function writeTasksToDisk(tasks2) {
 }
 function initTaskStore(dir) {
   storageDir = dir;
-  tasksFilePath = path38.join(dir, "tasks.json");
+  tasksFilePath = path39.join(dir, "tasks.json");
   if (!fs38.existsSync(dir)) {
     fs38.mkdirSync(dir, { recursive: true });
   }
@@ -10897,9 +10915,9 @@ async function executeAndDeliver(task, now, deps) {
       let filePath = promptText.slice(1).trim();
       try {
         const fs42 = await import("fs");
-        const path43 = await import("path");
-        if (!path43.isAbsolute(filePath)) {
-          filePath = path43.join(deps.sessions["config"].stateDir, filePath);
+        const path44 = await import("path");
+        if (!path44.isAbsolute(filePath)) {
+          filePath = path44.join(deps.sessions["config"].stateDir, filePath);
         }
         promptText = fs42.readFileSync(filePath, "utf-8");
         console.log(`[cron] Loaded prompt from ${filePath} (${promptText.length} chars)`);
@@ -10928,15 +10946,15 @@ async function executeAndDeliver(task, now, deps) {
     let finalResult = result;
     if (task.postProcess) {
       try {
-        const path43 = await import("path");
+        const path44 = await import("path");
         const fs42 = await import("fs");
         let scriptPath = task.postProcess;
-        if (!path43.isAbsolute(scriptPath)) {
-          scriptPath = path43.join(deps.sessions["config"].stateDir, scriptPath);
+        if (!path44.isAbsolute(scriptPath)) {
+          scriptPath = path44.join(deps.sessions["config"].stateDir, scriptPath);
         }
-        const resultsDirTmp = path43.join(getStorageDir(), "results");
+        const resultsDirTmp = path44.join(getStorageDir(), "results");
         fs42.mkdirSync(resultsDirTmp, { recursive: true });
-        const inputFile = path43.join(resultsDirTmp, `${task.id}.input.txt`);
+        const inputFile = path44.join(resultsDirTmp, `${task.id}.input.txt`);
         fs42.writeFileSync(inputFile, result, "utf-8");
         const { execFile: execFile3 } = await import("child_process");
         await new Promise((resolve10) => {
@@ -10965,10 +10983,10 @@ async function executeAndDeliver(task, now, deps) {
     }
     try {
       const fs42 = await import("fs");
-      const path43 = await import("path");
-      const resultsDir = path43.join(getStorageDir(), "results");
+      const path44 = await import("path");
+      const resultsDir = path44.join(getStorageDir(), "results");
       fs42.mkdirSync(resultsDir, { recursive: true });
-      const resultFile = path43.join(resultsDir, `${task.id}.json`);
+      const resultFile = path44.join(resultsDir, `${task.id}.json`);
       fs42.writeFileSync(resultFile, JSON.stringify({
         taskId: task.id,
         description: task.description,
@@ -11217,13 +11235,13 @@ function registerCronTools() {
     },
     handler: async (args2) => {
       const fs42 = await import("fs");
-      const path43 = await import("path");
-      const resultsDir = path43.join(getStorageDir(), "results");
+      const path44 = await import("path");
+      const resultsDir = path44.join(getStorageDir(), "results");
       if (!fs42.existsSync(resultsDir)) {
         return { content: "\u6682\u65E0cron\u6267\u884C\u7ED3\u679C" };
       }
       if (args2.task_id) {
-        const file = path43.join(resultsDir, `${args2.task_id}.json`);
+        const file = path44.join(resultsDir, `${args2.task_id}.json`);
         if (!fs42.existsSync(file)) {
           return { content: `\u4EFB\u52A1 ${args2.task_id} \u6682\u65E0\u6267\u884C\u7ED3\u679C`, isError: true };
         }
@@ -11239,7 +11257,7 @@ ${data.result}` };
         return { content: "\u6682\u65E0cron\u6267\u884C\u7ED3\u679C" };
       }
       const results = files.map((f2) => {
-        const data = JSON.parse(fs42.readFileSync(path43.join(resultsDir, f2), "utf-8"));
+        const data = JSON.parse(fs42.readFileSync(path44.join(resultsDir, f2), "utf-8"));
         return `### ${data.description} (${data.taskId.slice(0, 8)})
 \u6267\u884C: ${data.executedAt} | \u7B2C${data.runCount}\u6B21
 ${data.result.slice(0, 500)}${data.result.length > 500 ? "..." : ""}`;
@@ -11622,7 +11640,7 @@ __export(license_exports, {
 });
 import * as crypto6 from "node:crypto";
 import * as fs39 from "node:fs";
-import * as path39 from "node:path";
+import * as path40 from "node:path";
 function loadLicense(stateDir, devMode) {
   if (_licenseChecked) return _cachedLicense;
   _licenseChecked = true;
@@ -11635,7 +11653,7 @@ function loadLicense(stateDir, devMode) {
     _cachedLicense = allActive;
     return allActive;
   }
-  const licensePath = path39.join(stateDir, "license.json");
+  const licensePath = path40.join(stateDir, "license.json");
   if (!fs39.existsSync(licensePath)) {
     console.log("[license] No license.json found, running basic engine only");
     return null;
@@ -11691,7 +11709,7 @@ function isFeatureLicensed(featureId) {
   return f2?.active === true;
 }
 function getLicenseStatus(stateDir) {
-  const licensePath = path39.join(stateDir, "license.json");
+  const licensePath = path40.join(stateDir, "license.json");
   if (!fs39.existsSync(licensePath)) {
     return { licensed: false, features: {} };
   }
@@ -11756,7 +11774,7 @@ __export(manager_exports, {
   McpManager: () => McpManager
 });
 import * as fs40 from "node:fs";
-import * as path40 from "node:path";
+import * as path41 from "node:path";
 import { Client as Client3 } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
@@ -11789,9 +11807,9 @@ function convertInputSchema(inputSchema) {
 }
 function persistBinary(base64Data, mimeType, persistId) {
   const ext = mimeType?.split("/")[1] || "bin";
-  const dir = path40.join(process.env.ENGINE_STATE_DIR || ".engine", "mcp-blobs");
+  const dir = path41.join(process.env.ENGINE_STATE_DIR || ".engine", "mcp-blobs");
   fs40.mkdirSync(dir, { recursive: true });
-  const filepath = path40.join(dir, `${persistId}.${ext}`);
+  const filepath = path41.join(dir, `${persistId}.${ext}`);
   try {
     const buf = Buffer.from(base64Data, "base64");
     fs40.writeFileSync(filepath, buf);
@@ -12128,7 +12146,7 @@ __export(resources_exports, {
   registerMcpResourceTools: () => registerMcpResourceTools,
   unregisterMcpResourceTools: () => unregisterMcpResourceTools
 });
-import * as path41 from "node:path";
+import * as path42 from "node:path";
 function registerMcpResourceTools(manager) {
   mcpManagerRef = manager;
   registry.register(listResourcesTool);
@@ -12146,7 +12164,7 @@ var init_resources = __esm({
     "use strict";
     init_registry();
     MAX_RESULT_CHARS2 = 1e5;
-    MEDIA_DIR = process.env.ENGINE_MEDIA_DIR || path41.join(process.env.ENGINE_STATE_DIR || ".engine", "media", "inbound");
+    MEDIA_DIR = process.env.ENGINE_MEDIA_DIR || path42.join(process.env.ENGINE_STATE_DIR || ".engine", "media", "inbound");
     MCP_LIST_RESOURCES_TOOL = "mcp__list_resources";
     MCP_READ_RESOURCE_TOOL = "mcp__read_resource";
     mcpManagerRef = null;
@@ -12236,11 +12254,21 @@ var everos_sync_exports = {};
 __export(everos_sync_exports, {
   createEverosSync: () => createEverosSync
 });
+function parseMeta(text) {
+  const m2 = text.match(/^\[meta:\s*(.+?)\s*\((.+?)\)\s*@(\S+)\s*[^\]]*\]/);
+  if (!m2) return null;
+  return { senderName: m2[1].trim(), senderId: m2[2].trim(), platform: m2[3].trim() };
+}
 function createEverosSync(cfg) {
-  const { enabled, url, appId, userId } = cfg;
+  const { enabled, url, appId, userId, agentName } = cfg;
   async function push(event) {
     if (!enabled) return;
     if (!event.text.trim()) return;
+    return;
+    const meta = event.role === "user" ? parseMeta(event.text) : null;
+    const senderId = appId;
+    const senderName = meta?.senderName ?? (event.role === "assistant" ? agentName : void 0) ?? event.senderName ?? event.role;
+    console.log(`[everos-sync] role=${event.role} sender_id=${senderId} sender_name=${senderName} metaParsed=${!!meta} textLen=${event.text.length}`);
     try {
       const resp = await fetch(`${url}/api/v1/memory/add`, {
         method: "POST",
@@ -12250,8 +12278,8 @@ function createEverosSync(cfg) {
           app_id: appId,
           project_id: "default",
           messages: [{
-            sender_id: event.role === "user" ? "user" : appId,
-            sender_name: event.senderName || event.role,
+            sender_id: senderId,
+            sender_name: senderName,
             role: event.role,
             timestamp: event.timestamp,
             content: event.text
@@ -12275,13 +12303,17 @@ function createEverosSync(cfg) {
           session_id: events[0].sessionId,
           app_id: appId,
           project_id: "default",
-          messages: events.map((e) => ({
-            sender_id: e.role === "user" ? "user" : appId,
-            sender_name: e.senderName || e.role,
-            role: e.role,
-            timestamp: e.timestamp,
-            content: e.text
-          }))
+          messages: events.map((e) => {
+            const meta = e.role === "user" ? parseMeta(e.text) : null;
+            const name = meta?.senderName ?? (e.role === "assistant" ? agentName : void 0) ?? e.senderName ?? e.role;
+            return {
+              sender_id: appId,
+              sender_name: name,
+              role: e.role,
+              timestamp: e.timestamp,
+              content: e.text
+            };
+          })
         }),
         signal: AbortSignal.timeout(3e4)
       });
@@ -12383,10 +12415,10 @@ function ensureLoaded(workspace, configIds) {
       if (!state.blockedUserIds.includes(id)) state.blockedUserIds.push(id);
     }
   }
-  const path43 = join36(workspace, ".reply-blocklist.json");
+  const path44 = join36(workspace, ".reply-blocklist.json");
   try {
-    if (existsSync24(path43)) {
-      const raw = readFileSync26(path43, "utf-8");
+    if (existsSync24(path44)) {
+      const raw = readFileSync26(path44, "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed.blockedUserIds) {
         for (const id of parsed.blockedUserIds) {
@@ -12402,9 +12434,9 @@ function ensureLoaded(workspace, configIds) {
   loaded = true;
 }
 function save(workspace) {
-  const path43 = join36(workspace, ".reply-blocklist.json");
+  const path44 = join36(workspace, ".reply-blocklist.json");
   try {
-    writeFileSync15(path43, JSON.stringify(state, null, 2), "utf-8");
+    writeFileSync15(path44, JSON.stringify(state, null, 2), "utf-8");
   } catch (err) {
     console.warn(`[reply-blocklist] Failed to save: ${err.message}`);
   }
@@ -13004,7 +13036,7 @@ var init_cognifold_intent_watcher = __esm({
 init_loader();
 
 // src/engine-startup.ts
-import * as path42 from "node:path";
+import * as path43 from "node:path";
 import * as fs41 from "node:fs";
 import { fileURLToPath } from "node:url";
 
@@ -14348,11 +14380,11 @@ var DiscordAdapter = class _DiscordAdapter {
   /** 发送媒体附件（图片/文件/音频）— discord.js channel.send({ files }) */
   async sendFile(target, message, attachment) {
     const fs42 = await import("node:fs");
-    const path43 = await import("node:path");
+    const path44 = await import("node:path");
     if (!fs42.existsSync(attachment.path)) {
       throw new Error(`File not found: ${attachment.path}`);
     }
-    const filename = attachment.filename || path43.basename(attachment.path);
+    const filename = attachment.filename || path44.basename(attachment.path);
     const fileBuffer = fs42.readFileSync(attachment.path);
     const filePayload = {
       attachment: fileBuffer,
@@ -14794,11 +14826,11 @@ var FeishuAdapter = class _FeishuAdapter {
   /** 发送媒体附件（图片/文件） */
   async sendFile(target, message, attachment) {
     const fs42 = await import("node:fs");
-    const path43 = await import("node:path");
+    const path44 = await import("node:path");
     if (!fs42.existsSync(attachment.path)) {
       throw new Error(`File not found: ${attachment.path}`);
     }
-    const filename = attachment.filename || path43.basename(attachment.path);
+    const filename = attachment.filename || path44.basename(attachment.path);
     const fileBuffer = fs42.readFileSync(attachment.path);
     const receiveIdType = target.startsWith("ou_") ? "open_id" : "chat_id";
     const mimeType = attachment.mimeType || "application/octet-stream";
@@ -18410,22 +18442,8 @@ ${skillsListing}`);
   parts.push(getEnvInfoSection(options.workspace));
   const now = /* @__PURE__ */ new Date();
   const dateStr = now.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
-  const osPlatform = process.platform === "win32" ? "Windows" : process.platform === "darwin" ? "macOS" : process.platform;
-  const contextParts = [`\u5F53\u524D\u65F6\u95F4: ${dateStr}`, `\u7CFB\u7EDF: ${osPlatform} (${process.platform})`];
-  const meta = options.inboundMeta;
-  if (meta) {
-    contextParts.push(`\u6765\u6E90: ${meta.channel}`);
-    if (meta.channelType) contextParts.push(`\u6D88\u606F\u7C7B\u578B: ${meta.channelType === "dm" ? "\u79C1\u4FE1" : "\u7FA4\u804A"}`);
-    if (meta.channel_id) contextParts.push(`\u9891\u9053ID: ${meta.channel_id}`);
-    contextParts.push(`\u53D1\u9001\u8005ID: ${meta.from}`);
-    if (meta.fromName) contextParts.push(`\u53D1\u9001\u8005\u540D\u79F0: ${meta.fromName}`);
-    if (meta.messageId) contextParts.push(`\u6D88\u606FID: ${meta.messageId}`);
-  } else if (options.channel) {
-    contextParts.push(`\u6765\u6E90: ${options.channel}`);
-  }
-  if (options.sessionId) contextParts.push(`\u4F1A\u8BDDID: ${options.sessionId}`);
   parts.push(`# \u8FD0\u884C\u65F6\u4E0A\u4E0B\u6587
-${contextParts.join("\n")}`);
+\u5F53\u524D\u65F6\u95F4: ${dateStr}`);
   console.log(`[dynamic-prompt] Loaded: ${loaded2.length > 0 ? loaded2.join(", ") : "(none)"}`);
   return parts.join("\n\n");
 }
@@ -18727,6 +18745,169 @@ async function findRelevantMemoriesVector(query, memoryDir, alreadySurfaced = /*
   }));
 }
 
+// src/memory/memdir/findRelevantMemoriesEveros.ts
+var ROUND1_TOP_N = 30;
+var RERANK_BATCH_SIZE = 100;
+function formatEverosHeader(ep) {
+  const score = ep.score.toFixed(3);
+  const ts = ep.timestamp?.slice(0, 10) ?? "";
+  let ageLabel = "";
+  if (ts) {
+    const days = Math.floor((Date.now() - new Date(ts).getTime()) / 864e5);
+    if (days <= 1) ageLabel = "\u4ECA\u5929";
+    else if (days <= 3) ageLabel = `${days}\u5929\u524D`;
+    else if (days <= 14) ageLabel = `${days}\u5929\u524D`;
+    else if (days <= 30) ageLabel = `~${Math.ceil(days / 7)}\u5468\u524D`;
+    else ageLabel = `~${Math.ceil(days / 30)}\u4E2A\u6708\u524D`;
+  }
+  return `[EverOS score=${score} ${ts} (${ageLabel})]`;
+}
+async function hybridSearch(query, everosUrl, userId, 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,
+      project_id: "default",
+      top_k: topK,
+      method: "hybrid"
+    }),
+    signal: AbortSignal.timeout(15e3)
+  });
+  if (!resp.ok) {
+    console.warn(`[memdir] everos hybrid: search failed ${resp.status}`);
+    return [];
+  }
+  const body = await resp.json();
+  const episodes = body.data?.episodes ?? [];
+  return episodes;
+}
+async function deepinfraRerank(query, episodes, rerankUrl, rerankApiKey, rerankModel, provider) {
+  if (episodes.length === 0) return [];
+  const documents = episodes.map(
+    (ep) => ep.episode?.slice(0, 500) || ep.summary?.slice(0, 500) || ep.subject
+  );
+  const allScores = [];
+  const isDashscope = provider === "dashscope";
+  for (let i = 0; i < documents.length; i += RERANK_BATCH_SIZE) {
+    const batch = documents.slice(i, i + RERANK_BATCH_SIZE);
+    const body = isDashscope ? JSON.stringify({
+      model: rerankModel || "qwen3-rerank",
+      input: { query, documents: batch },
+      parameters: { return_documents: false, top_n: batch.length }
+    }) : JSON.stringify({ queries: [query], documents: batch });
+    const makeRequest = () => fetch(rerankUrl, {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${rerankApiKey}`,
+        "Content-Type": "application/json"
+      },
+      body,
+      signal: AbortSignal.timeout(3e4)
+    });
+    let resp = await makeRequest();
+    if (resp.status === 429) {
+      await new Promise((r) => setTimeout(r, 2e3));
+      resp = await makeRequest();
+    }
+    if (!resp.ok) {
+      console.warn(`[memdir] everos rerank: failed ${resp.status}`);
+      return episodes;
+    }
+    if (isDashscope) {
+      const data = await resp.json();
+      const results = data.output?.results ?? [];
+      const scoreMap = new Array(batch.length).fill(0);
+      for (const r of results) {
+        scoreMap[r.index] = r.relevance_score;
+      }
+      allScores.push(...scoreMap);
+    } else {
+      const data = await resp.json();
+      let batchScores = data.scores ?? [];
+      if (Array.isArray(batchScores) && batchScores.length > 0 && Array.isArray(batchScores[0])) {
+        batchScores = batchScores[0];
+      }
+      allScores.push(...batchScores);
+    }
+  }
+  const ranked = episodes.map((ep, idx) => ({ ep, score: allScores[idx] ?? 0 })).sort((a, b2) => b2.score - a.score);
+  for (const { ep, score } of ranked) {
+    ep.score = score;
+  }
+  return ranked.map((r) => r.ep);
+}
+var DEFAULT_MIN_SCORE2 = 0.5;
+async function findRelevantMemoriesEveros(query, _memoryDir, alreadySurfaced = /* @__PURE__ */ new Set(), options) {
+  const everosUrl = options?.everosUrl ?? "http://127.0.0.1:8100";
+  const userId = options?.userId ?? "xiaomei";
+  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 t0 = Date.now();
+  try {
+    const tH1 = Date.now();
+    let episodes = await hybridSearch(query, everosUrl, userId, 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 [];
+    const rerankUrl = options?.rerankUrl;
+    const rerankApiKey = options?.rerankApiKey;
+    if (rerankUrl && rerankApiKey) {
+      const tR1 = Date.now();
+      episodes = await deepinfraRerank(
+        query,
+        episodes,
+        rerankUrl,
+        rerankApiKey,
+        options?.rerankModel,
+        options?.rerankProvider
+      );
+      const tR2 = Date.now();
+      console.log(`[memdir] everos recall: rerank done in ${tR2 - tR1}ms (${options?.rerankProvider || "deepinfra"})`);
+    } else {
+      console.log(`[memdir] everos recall: no rerank key, using hybrid scores as-is`);
+    }
+    const ms = Date.now() - t0;
+    console.log(`[memdir] everos recall: ${episodes.length} episodes in ${ms}ms total (hybrid+rerank)`);
+    const surfacedSubjects = /* @__PURE__ */ new Set();
+    for (const p2 of alreadySurfaced) {
+      if (p2.startsWith("everos://")) {
+        surfacedSubjects.add(p2.slice(8));
+      } else {
+      }
+    }
+    const result = [];
+    const seenSubjects = /* @__PURE__ */ new Set();
+    for (const ep of episodes) {
+      if (ep.score < minScore) continue;
+      const subject = (ep.subject || ep.id).slice(0, 80).replace(/[\n\r]/g, " ");
+      const virtualPath = `everos://${subject}`;
+      if (alreadySurfaced.has(virtualPath)) continue;
+      if (surfacedSubjects.has(subject)) continue;
+      if (seenSubjects.has(subject)) continue;
+      seenSubjects.add(subject);
+      result.push({
+        path: virtualPath,
+        mtimeMs: ep.timestamp ? new Date(ep.timestamp).getTime() : Date.now(),
+        content: `### ${ep.subject}
+
+${ep.episode || ep.summary}`,
+        header: formatEverosHeader(ep)
+      });
+      if (result.length >= topK) break;
+    }
+    console.log(`[memdir] everos recall: returning ${result.length} memories (after dedup)`);
+    return result;
+  } catch (e) {
+    const ms = Date.now() - t0;
+    console.warn(`[memdir] everos recall: error after ${ms}ms: ${e?.message ?? e}`);
+    return [];
+  }
+}
+
 // src/handle-query.ts
 init_paths();
 import { readFileSync as readFileSync15, existsSync as existsSync12 } from "node:fs";
@@ -18799,18 +18980,18 @@ function truncate(s2, maxLen) {
 }
 var externalChanRulesCache = null;
 function loadExternalChanRules(workspace) {
-  const path43 = join20(workspace, "prompts", "external-chan-rules.md");
-  if (externalChanRulesCache && externalChanRulesCache.path === path43) return externalChanRulesCache;
+  const path44 = join20(workspace, "prompts", "external-chan-rules.md");
+  if (externalChanRulesCache && externalChanRulesCache.path === path44) return externalChanRulesCache;
   let content = "";
-  if (existsSync12(path43)) {
+  if (existsSync12(path44)) {
     try {
-      content = readFileSync15(path43, "utf-8").trim();
+      content = readFileSync15(path44, "utf-8").trim();
     } catch (e) {
       console.warn(`[external-chan-rules] Failed to load: ${e}`);
     }
   }
-  externalChanRulesCache = { path: path43, content };
-  console.log(`[external-chan-rules] Loaded ${content.length} chars from ${path43}`);
+  externalChanRulesCache = { path: path44, content };
+  console.log(`[external-chan-rules] Loaded ${content.length} chars from ${path44}`);
   return externalChanRulesCache;
 }
 function getExternalChanRulesBlock(inboundMeta, workspace) {
@@ -18833,10 +19014,10 @@ function getExternalChanWhitelist(workspace, configExternalChannels) {
   if (!externalChanWhitelist) loadContactMap(workspace);
   return externalChanWhitelist;
 }
-async function handleQuery(text, sessionId, channelName, cb, deps, channelTarget, inboundMeta, skipRecall) {
-  return handleQueryInner(text, sessionId, channelName, cb, deps, channelTarget, inboundMeta, skipRecall);
+async function handleQuery(text, sessionId, channelName, cb, deps, channelTarget, inboundMeta, skipRecall, source) {
+  return handleQueryInner(text, sessionId, channelName, cb, deps, channelTarget, inboundMeta, skipRecall, source);
 }
-async function handleQueryInner(text, sessionId, channelName, cb, deps, channelTarget, inboundMeta, skipRecall) {
+async function handleQueryInner(text, sessionId, channelName, cb, deps, channelTarget, inboundMeta, skipRecall, source) {
   const { engine, sessions, channelManager, workspace, providerId, providerApi, model } = deps;
   const features = deps.features || {};
   const preQueryAbort = new AbortController();
@@ -19013,6 +19194,8 @@ ${text}` : text });
   const toolContext = {
     sessionId,
     channel: channelName === "cli" ? "console" : channelName,
+    source: source || "",
+    // 消息来源（user/inbox/heartbeat/cron/system/inner-voice），Stop hook 用来区分注入 turn
     workspace,
     stateDir: deps.stateDir || workspace,
     channelManager,
@@ -19187,7 +19370,23 @@ ${text}` : text });
       const recallP = deps.recallProvider;
       const recallMode = deps.topics?.recall?.mode || "llm";
       let relevantMemories;
-      if (recallMode === "vector") {
+      if (recallMode === "everos") {
+        const everosCfg = deps?.everosCfg;
+        relevantMemories = await findRelevantMemoriesEveros(
+          textForMemory,
+          memoryDir,
+          surfaced.paths,
+          everosCfg ? {
+            everosUrl: everosCfg.everosUrl || "http://127.0.0.1:8100",
+            userId: everosCfg.userId || "xiaomei",
+            rerankUrl: everosCfg.rerank?.baseUrl,
+            rerankApiKey: everosCfg.rerank?.apiKey,
+            rerankModel: everosCfg.rerank?.model,
+            rerankProvider: everosCfg.rerank?.provider,
+            minScore: deps.topics?.recall?.minScore
+          } : void 0
+        );
+      } else if (recallMode === "vector") {
         relevantMemories = await findRelevantMemoriesVector(
           textForMemory,
           memoryDir,
@@ -19210,8 +19409,8 @@ ${text}` : text });
         const attachmentMemories = [];
         for (const mem of relevantMemories) {
           try {
-            const content = readFileSync15(mem.path, "utf-8");
-            const header = memoryHeader(mem.path, mem.mtimeMs);
+            const content = mem.content ?? readFileSync15(mem.path, "utf-8");
+            const header = mem.header ?? memoryHeader(mem.path, mem.mtimeMs);
             attachmentMemories.push({ path: mem.path, content, mtimeMs: mem.mtimeMs, header });
           } catch {
           }
@@ -19759,7 +19958,9 @@ function registerCognifoldBridge(config2) {
         messageId: ctx.inbound.messageId
       }
     };
-    void enqueueEvent(cognifoldConfig.sessionId, event);
+    const sm = globalThis.__cognifoldSessions;
+    const dynamicSessionId = sm?.getSessionId?.("main") || cognifoldConfig.sessionId;
+    void enqueueEvent(dynamicSessionId, event);
     return null;
   }, 80);
 }
@@ -20083,7 +20284,8 @@ var MessageDispatcher = class {
         msg2.deps,
         msg2.channelTarget,
         msg2.inboundMeta,
-        msg2.skipRecall
+        msg2.skipRecall,
+        msg2.source
       );
     } catch (err) {
       console.error(`[dispatcher] Query error (session=${msg2.sessionId}): ${err.message}`);
@@ -20243,13 +20445,19 @@ function startCliLoop(deps, cliConfig, channelManager, dispatcher) {
 
 // src/session/session-history.ts
 import fs14 from "node:fs";
+import path14 from "node:path";
 var BEIJING_OFFSET_MS = 8 * 36e5;
 var INJECTED_CONTENT_PATTERNS = [
   /【定时心跳】/,
   /\[内心对话测试\]/,
   /\[inner-voice\]/,
   /\[微信巡检\]/,
-  /\[plugin\]/
+  /\[plugin\]/,
+  /<nudge-notification>/,
+  /<task-notification>/,
+  /<calendar-notification>/,
+  /## Actions \(\d+\s*个\)/
+  // CogniFold proactive 注入（block[0] 固定格式，engine-startup 拼的）
 ];
 function parseJsonlEntries(lines) {
   const entries = [];
@@ -20284,6 +20492,20 @@ function resolveScopeMainJsonl(sessions) {
   if (!sessionId) return null;
   return sessions.getSessionFilePath(sessionId);
 }
+function scopeMainJsonlPaths(sessions) {
+  const current = resolveScopeMainJsonl(sessions);
+  let latestArchive = null;
+  if (current) {
+    try {
+      const dir = path14.dirname(current);
+      const base = path14.basename(current);
+      const archives = fs14.readdirSync(dir).filter((f2) => f2.startsWith(base + ".archived.")).sort();
+      if (archives.length > 0) latestArchive = path14.join(dir, archives[archives.length - 1]);
+    } catch {
+    }
+  }
+  return { current, latestArchive };
+}
 function cleanText(rawText) {
   let clean = rawText.replace(/<system-reminder>.*?<\/system-reminder>/gs, "").replace(/(?:Sender|Conversation info|Replied message) \(untrusted[^)]*\):\s*```json\s*\{[^}]*\}\s*```/g, "").replace(/\[\w{3} \d{4}-\d{2}-\d{2} \d{2}:\d{2}(?::\d{2})? GMT[+-]\d+\]/g, "").replace(/\[message_id:\s*\S+\]/g, "").replace(/\[\[reply_to_current\]\]/g, "").replace(/\[\[reply_to:\S+\]\]/g, "").replace(/<@\d+>/g, "").replace(/^System:.*$/gm, "").replace(/Reply target.*?```json\s*\{[^}]*\}\s*```/gs, "").replace(/\[media attached:.*?\]/g, "[\u56FE\u7247]");
   return clean.trim();
@@ -20374,6 +20596,7 @@ function recentMessages(sessions, hours = 12, limit = 60) {
       time: `${p2(bj.getHours())}:${p2(bj.getMinutes())}`,
       role,
       text: clean.slice(0, 80),
+      timestamp: dtMs,
       _utc: dtMs
     });
   }
@@ -20505,6 +20728,8 @@ ${basePrompt}`;
           channelName: "heartbeat",
           source: "heartbeat",
           priority: "later",
+          skipRecall: true,
+          // 心跳不需要记忆召回，避免重复注入心跳相关记忆
           callbacks: {
             onResult: () => resolveDone()
           },
@@ -20522,7 +20747,7 @@ ${basePrompt}`;
 
 // src/nudge/plugin.ts
 import fs17 from "node:fs";
-import path16 from "node:path";
+import path17 from "node:path";
 
 // src/nudge/judge.ts
 function shouldNudge(task, taskState, cfg) {
@@ -20691,10 +20916,10 @@ function formatDuration2(ms) {
 
 // src/nudge/session-state-reader.ts
 import fs15 from "node:fs";
-import path14 from "node:path";
+import path15 from "node:path";
 function parseSessionStateFull(workspace, sessionStateFile) {
   const stateFile = sessionStateFile || "SESSION-STATE.md";
-  const statePath = path14.isAbsolute(stateFile) ? stateFile : path14.join(workspace, stateFile);
+  const statePath = path15.isAbsolute(stateFile) ? stateFile : path15.join(workspace, stateFile);
   let content;
   try {
     content = fs15.readFileSync(statePath, "utf-8");
@@ -20749,13 +20974,13 @@ function taskIdFromTitle(title) {
 
 // src/calendar/db.ts
 import { DatabaseSync } from "node:sqlite";
-import * as path15 from "node:path";
+import * as path16 from "node:path";
 import * as fs16 from "node:fs";
 var TZ_OFFSET_MS = 8 * 60 * 60 * 1e3;
 function openDb(workspace) {
-  const dir = path15.join(workspace, ".calendar");
+  const dir = path16.join(workspace, ".calendar");
   fs16.mkdirSync(dir, { recursive: true });
-  const dbPath = path15.join(dir, "calendar.db");
+  const dbPath = path16.join(dir, "calendar.db");
   const db = new DatabaseSync(dbPath);
   db.exec("PRAGMA journal_mode=WAL");
   db.exec(`CREATE TABLE IF NOT EXISTS events (
@@ -20844,7 +21069,7 @@ var NudgePlugin = class {
   provider;
   model;
   loadPrompt(workspace, promptFile) {
-    const promptPath = promptFile ? path16.isAbsolute(promptFile) ? promptFile : path16.join(workspace, promptFile) : path16.join(workspace, "prompts", "nudge-prompt.md");
+    const promptPath = promptFile ? path17.isAbsolute(promptFile) ? promptFile : path17.join(workspace, promptFile) : path17.join(workspace, "prompts", "nudge-prompt.md");
     try {
       const content = fs17.readFileSync(promptPath, "utf-8").trim();
       if (content) {
@@ -20881,11 +21106,20 @@ var NudgePlugin = class {
         const lastMsg = input?.last_assistant_message || "";
         const sessionId = input?.session_id || "";
         console.log(`[stop-hook] lastMsg len=${lastMsg.length}, text="${lastMsg.slice(0, 80)}"`);
+        const repliedIds = this.extractWakeReplyIds(lastMsg);
+        if (repliedIds.length > 0) {
+          this.removeNotificationsById(repliedIds);
+        }
         const msgChannel = input?.channel || "";
         if (sessionId.includes("voice-chat") || msgChannel === "voice-chat") {
           console.log(`[stop-hook] skipping voice-chat (channel=${msgChannel})`);
           return { outcome: { outcome: "success" } };
         }
+        const msgSource = input?.source || "";
+        if (msgSource && msgSource !== "user" && msgSource !== "inbox") {
+          console.log(`[stop-hook] skipping non-conversation turn (source=${msgSource})`);
+          return { outcome: { outcome: "success" } };
+        }
         if (!lastMsg) {
           return { outcome: { outcome: "success" } };
         }
@@ -20958,8 +21192,8 @@ var NudgePlugin = class {
         if (pushedDecision && waitDesc) {
           console.log(`[stop-hook] DETECTED pushedDecision! Injecting corrective message to ${sessionId}`);
           try {
-            const correctiveMsg = [
-              "\u{1F6A8} [stop-hook \u81EA\u4E3B\u6267\u884C\u7EA0\u6B63] \u4F60\u521A\u624D\u628A\u4E00\u4E2A\u81EA\u5DF1\u80FD\u5B9A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\u3002",
+            const correctiveMsg = buildNudgeNotification("prompt", [
+              "[stop-hook \u81EA\u4E3B\u6267\u884C\u7EA0\u6B63] \u4F60\u521A\u624D\u628A\u4E00\u4E2A\u81EA\u5DF1\u80FD\u5B9A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\u3002",
               "",
               `\u8BCA\u65AD\uFF1A${waitDesc}`,
               "",
@@ -20972,9 +21206,10 @@ var NudgePlugin = class {
               '3. \u6267\u884C\u5B8C\u6C47\u62A5\u7ED3\u679C\uFF08"\u5DF2\u5904\u7406" / "\u5DF2 commit" / "\u5DF2 archive"\uFF09',
               "",
               "\u5982\u679C\u4E0D\u662F\u5FC5\u987B\u95EE\u7684\uFF08\u6D89\u53CA\u82B1\u94B1/\u5BF9\u5916\u53D1\u5E03/\u91CD\u5927\u51B3\u7B56\uFF09\uFF0C\u4E0D\u8981\u95EE\u3002"
-            ].join("\n");
-            if (this.dispatcher) {
-              this.dispatcher.submitMessage(correctiveMsg, sessionId);
+            ].join("\n"));
+            const route = this.getRoute(sessions);
+            if (route) {
+              enqueueNotification(correctiveMsg, route);
             }
           } catch (e) {
             console.warn(`[stop-hook] Failed to inject corrective message: ${e.message}`);
@@ -20983,14 +21218,21 @@ var NudgePlugin = class {
         if (!isWaiting) {
           return { outcome: { outcome: "success" } };
         }
-        const nudgeDir = path16.join(this.workspace, ".nudge");
-        const notifPath = path16.join(nudgeDir, "stop-hook-notifications.json");
+        const nudgeDir = path17.join(this.workspace, ".nudge");
+        const notifPath = path17.join(nudgeDir, "stop-hook-notifications.json");
         try {
           if (!fs17.existsSync(nudgeDir)) fs17.mkdirSync(nudgeDir, { recursive: true });
           let notifs = [];
           if (fs17.existsSync(notifPath)) {
             notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
             const now = Date.now();
+            const dup = notifs.find((n) => !n.notified && n.description === (waitDesc || lastMsg.slice(0, 200)));
+            if (dup) {
+              dup.wakeAt = new Date(now + 5 * 6e4).toISOString();
+              fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
+              console.log(`[stop-hook] Duplicate wait (same desc, not fired yet), refreshed wakeAt: ${dup.id}`);
+              return { outcome: { outcome: "success" } };
+            }
             const recentReg = notifs.find((n) => now - new Date(n.createdAt).getTime() < 3 * 6e4);
             if (recentReg) {
               console.log(`[stop-hook] Skip (recent registration within 3min)`);
@@ -21039,9 +21281,14 @@ var NudgePlugin = class {
       return null;
     }
   }
-  /** 检查 stop-hook-notifications：你停止前注册的等待唤起 */
-  checkStopHookNotifications() {
-    const notifPath = path16.join(this.workspace, ".nudge", "stop-hook-notifications.json");
+  /**
+   * 收集到期的 stop-hook notifications，批量构建一条 wake 消息。
+   * 不标 notified——投递成功后由 tick 调 markNotified 标（route 拿不到时保留原样下个 tick 重试，
+   * 避免"消息没投出去但已标 notified"的死账）。
+   * 已 notified 的不会再触发，等 agent 回复 "<id> 过期了" 由 cleanup 删。
+   */
+  collectDueStopHookNotifications() {
+    const notifPath = path17.join(this.workspace, ".nudge", "stop-hook-notifications.json");
     try {
       if (!fs17.existsSync(notifPath)) return null;
       const notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
@@ -21049,54 +21296,161 @@ var NudgePlugin = class {
       const now = Date.now();
       const due = notifs.filter((n) => new Date(n.wakeAt).getTime() <= now && !n.notified);
       if (due.length === 0) return null;
-      const latest = due[due.length - 1];
-      console.log(`[nudge] Stop-hook notification ${latest.id} triggered: ${latest.description.slice(0, 80)}...`);
-      const updated = notifs.map((n) => n.id === latest.id ? { ...n, notified: true } : n);
-      fs17.writeFileSync(notifPath, JSON.stringify(updated, null, 2));
-      return buildNudgeNotification("wake", `\u4F60\u4E4B\u524D\u5728\u7B49\u5F85\u67D0\u4E2A\u5916\u90E8\u6761\u4EF6\uFF0C\u65F6\u95F4\u5230\u4E86\uFF0C\u56DE\u53BB\u68C0\u67E5\uFF01
+      console.log(`[nudge] ${due.length} stop-hook notification(s) due: ${due.map((n) => n.id).join(", ")}`);
+      const items = due.map((n) => `[\u901A\u77E5ID: ${n.id}]
+\u4E0A\u6B21\u8BF4\uFF1A${n.description}`).join("\n\n");
+      const desc = due.length === 1 ? `\u4F60\u4E4B\u524D\u5728\u7B49\u5F85\u67D0\u4E2A\u5916\u90E8\u6761\u4EF6\uFF0C\u65F6\u95F4\u5230\u4E86\uFF0C\u56DE\u53BB\u68C0\u67E5\uFF01
 
-[\u901A\u77E5ID: ${latest.id}]
-\u4E0A\u6B21\u8BF4\uFF1A${latest.description}
+${items}
 
-\u68C0\u67E5\u6761\u4EF6\u662F\u5426\u6EE1\u8DB3\uFF0C\u6EE1\u8DB3\u5C31\u7EE7\u7EED\u5E72\u6D3B\uFF0C\u4E0D\u6EE1\u8DB3\u5C31\u56DE\u590D"${latest.id} \u8FC7\u671F\u4E86"\u544A\u8BC9 nudge \u7CBE\u786E\u6E05\u7406\u8FD9\u6761\u3002`);
+\u68C0\u67E5\u6761\u4EF6\u662F\u5426\u6EE1\u8DB3\uFF0C\u6EE1\u8DB3\u5C31\u7EE7\u7EED\u5E72\u6D3B\uFF0C\u4E0D\u6EE1\u8DB3\u5C31\u56DE\u590D"${due[0].id} \u8FC7\u671F\u4E86"\u544A\u8BC9 nudge \u7CBE\u786E\u6E05\u7406\u8FD9\u6761\u3002` : `\u4F60\u4E4B\u524D\u6709 ${due.length} \u4E2A\u7B49\u5F85\u4E2D\u7684\u5916\u90E8\u6761\u4EF6\u90FD\u5230\u671F\u4E86\uFF0C\u56DE\u53BB\u9010\u4E2A\u68C0\u67E5\uFF01
+
+${items}
+
+\u5BF9\u6BCF\u4E00\u6761\uFF1A\u6761\u4EF6\u6EE1\u8DB3\u5C31\u7EE7\u7EED\u5E72\u6D3B\uFF0C\u4E0D\u6EE1\u8DB3\u5C31\u56DE\u590D\u5BF9\u5E94\u7684"<\u901A\u77E5ID> \u8FC7\u671F\u4E86"\u544A\u8BC9 nudge \u7CBE\u786E\u6E05\u7406\u3002`;
+      return { message: buildNudgeNotification("wake", desc), ids: due.map((n) => n.id) };
     } catch (e) {
-      console.warn(`[nudge] checkStopHookNotifications error: ${e.message}`);
+      console.warn(`[nudge] collectDueStopHookNotifications error: ${e.message}`);
       return null;
     }
   }
-  /** 读最近消息，如果发现"<notifId> 过期了"→ 精确清理对应的 wake-up notification */
+  /** 从回复文本里提取 "<id> 过期了" 的 wake id（一条回复可能处置多个） */
+  extractWakeReplyIds(text) {
+    if (!text) return [];
+    const ids = [];
+    const re = /(wake-\d+-[a-z0-9]+)\s*过期了/g;
+    let m2;
+    while ((m2 = re.exec(text)) !== null) {
+      if (!ids.includes(m2[1])) ids.push(m2[1]);
+    }
+    return ids;
+  }
+  /** 按 id 删除条目（stop-hook 实时清理用；正常删除路径，agent 回复即删） */
+  removeNotificationsById(ids) {
+    const notifPath = path17.join(this.workspace, ".nudge", "stop-hook-notifications.json");
+    try {
+      if (!fs17.existsSync(notifPath)) return;
+      const notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
+      const idSet = new Set(ids);
+      const remaining = notifs.filter((n) => !idSet.has(n.id));
+      const removed = notifs.length - remaining.length;
+      if (removed === 0) return;
+      if (remaining.length > 0) {
+        fs17.writeFileSync(notifPath, JSON.stringify(remaining, null, 2));
+      } else {
+        fs17.unlinkSync(notifPath);
+      }
+      console.log(`[stop-hook] Cleaned ${removed} notification(s) from reply: ${ids.join(", ")}`);
+    } catch (e) {
+      console.warn(`[stop-hook] removeNotificationsById error: ${e.message}`);
+    }
+  }
+  /** 投递成功后标记 notified（防重复触发）；不删除——删除只走 agent 回复 "<id> 过期了" */
+  markNotified(ids) {
+    const notifPath = path17.join(this.workspace, ".nudge", "stop-hook-notifications.json");
+    try {
+      if (!fs17.existsSync(notifPath)) return;
+      const notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
+      const idSet = new Set(ids);
+      const updated = notifs.map((n) => idSet.has(n.id) ? { ...n, notified: true } : n);
+      fs17.writeFileSync(notifPath, JSON.stringify(updated, null, 2));
+    } catch (e) {
+      console.warn(`[nudge] markNotified error: ${e.message}`);
+    }
+  }
+  /**
+   * tick 兜底清理。正常删除走 stop-hook 实时路径（agent 回复 "<id> 过期了" 当 turn 就删，
+   * 见 registerStopHook 第 0 步），这里只接两种漏网：
+   * ① 回复已落盘但 stop-hook 没来得及执行（进程中途崩等边缘情况）→ 扫 jsonl 补删；
+   * ② TTL 清道夫：wakeAt 超过 cleanupTtlHours（默认 24h）仍无回复 → 回复永远来不了，删。
+   *
+   * 扫描不走 recentMessages()——它截断 80 字符、会过滤"对注入消息的回复"（wake 回复恰好
+   * 被过滤掉）、限 20 条窗口。直接读 jsonl 原始条目：倒序扫、扫过最老 pending 的 wakeAt
+   * 即停、全命中提前退、archive 只在 current 被 2MB 轮转切断时才读。
+   */
   cleanupStaleNotificationsFromMessages(sessions) {
     try {
-      const recent = recentMessages(sessions, 0.5, 6);
-      const fiveMinAgo = Date.now() - 5 * 60 * 1e3;
-      const recentTexts = recent.filter((r) => new Date(r.timestamp || r.createdAt || Date.now()).getTime() > fiveMinAgo).map((r) => r.text);
-      const notifPath = path16.join(this.workspace, ".nudge", "stop-hook-notifications.json");
+      const notifPath = path17.join(this.workspace, ".nudge", "stop-hook-notifications.json");
       if (!fs17.existsSync(notifPath)) return;
       const notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
       if (notifs.length === 0) return;
-      const expiredIds = /* @__PURE__ */ new Set();
-      for (const text of recentTexts) {
-        for (const n of notifs) {
-          if (text.includes(`${n.id} \u8FC7\u671F\u4E86`) || text.includes(`${n.id}\u8FC7\u671F\u4E86`)) {
-            expiredIds.add(n.id);
-          }
-        }
+      const expiredIds = this.findExpiredReplyIds(sessions, notifs);
+      const ttlMs = (this.cfg.cleanupTtlHours || 24) * 36e5;
+      const now = Date.now();
+      const ttlIds = new Set(
+        notifs.filter((n) => now - new Date(n.wakeAt).getTime() > ttlMs && !expiredIds.has(n.id)).map((n) => n.id)
+      );
+      const removeIds = /* @__PURE__ */ new Set([...expiredIds, ...ttlIds]);
+      if (removeIds.size === 0) return;
+      const remaining = notifs.filter((n) => !removeIds.has(n.id));
+      if (remaining.length > 0) {
+        fs17.writeFileSync(notifPath, JSON.stringify(remaining, null, 2));
+      } else {
+        fs17.unlinkSync(notifPath);
       }
-      if (expiredIds.size === 0) return;
-      const remaining = notifs.filter((n) => !expiredIds.has(n.id));
-      const cleaned = notifs.length - remaining.length;
-      if (cleaned > 0) {
-        if (remaining.length > 0) {
-          fs17.writeFileSync(notifPath, JSON.stringify(remaining, null, 2));
-        } else {
-          fs17.unlinkSync(notifPath);
-        }
-        console.log(`[nudge] Cleaned ${cleaned} stale notification(s) by explicit id: ${[...expiredIds].join(", ")}`);
+      if (expiredIds.size > 0) {
+        console.log(`[nudge] Cleaned ${expiredIds.size} notification(s) by reply: ${[...expiredIds].join(", ")}`);
+      }
+      if (ttlIds.size > 0) {
+        console.log(`[nudge] Cleaned ${ttlIds.size} zombie notification(s) by TTL (>${this.cfg.cleanupTtlHours || 24}h no reply): ${[...ttlIds].join(", ")}`);
       }
     } catch (e) {
       console.warn(`[nudge] cleanupStaleNotificationsFromMessages error: ${e.message}`);
     }
   }
+  /**
+   * 扫 "<id> 过期了" 回复，返回匹配到的 id 集合。
+   * 不做全文扫描：倒序扫（回复紧跟在 fire 之后，通常就在尾部几条）；
+   * 扫过最老 pending 条目的 wakeAt 就停（回复不可能早于触发时间）；
+   * 全部命中提前退出；archive 只在 current 没覆盖时间范围（被 2MB 轮转切断）时才读。
+   * 典型开销：解析几十条而不是上千条。
+   */
+  findExpiredReplyIds(sessions, notifs) {
+    const found = /* @__PURE__ */ new Set();
+    if (notifs.length === 0) return found;
+    const oldestMs = Math.min(...notifs.map((n) => new Date(n.wakeAt).getTime()));
+    const { current, latestArchive } = scopeMainJsonlPaths(sessions);
+    for (const file of [current, latestArchive]) {
+      if (!file || !fs17.existsSync(file)) continue;
+      let lines;
+      try {
+        lines = fs17.readFileSync(file, "utf-8").split("\n");
+      } catch (e) {
+        console.warn(`[nudge] findExpiredReplyIds read error on ${file}: ${e.message}`);
+        continue;
+      }
+      let coveredOldest = false;
+      for (let i = lines.length - 1; i >= 0; i--) {
+        const trimmed = lines[i].trim();
+        if (!trimmed) continue;
+        let entry;
+        try {
+          entry = JSON.parse(trimmed);
+        } catch {
+          continue;
+        }
+        const tsMs = entry?.timestamp ? new Date(entry.timestamp).getTime() : 0;
+        if (tsMs > 0 && tsMs < oldestMs) {
+          coveredOldest = true;
+          break;
+        }
+        if (entry?.type !== "message") continue;
+        const msg2 = entry.message;
+        if (!msg2 || msg2.role !== "assistant") continue;
+        const content = msg2.content;
+        const text = typeof content === "string" ? content : Array.isArray(content) && content[0] && typeof content[0].text === "string" ? content[0].text : "";
+        if (!text) continue;
+        for (const n of notifs) {
+          if (!found.has(n.id) && (text.includes(`${n.id} \u8FC7\u671F\u4E86`) || text.includes(`${n.id}\u8FC7\u671F\u4E86`))) {
+            found.add(n.id);
+          }
+        }
+        if (found.size === notifs.length) return found;
+      }
+      if (coveredOldest) break;
+    }
+    return found;
+  }
   async tick(sessions, deps) {
     if (this.running) {
       console.log("[nudge] Previous tick still running, skipping");
@@ -21111,7 +21465,7 @@ var NudgePlugin = class {
       const recent = recentMessages(sessions, 0.5, 6);
       const lastUserMsg2 = recent.filter((r) => r.role === "user").slice(-1)[0];
       if (lastUserMsg2) {
-        const elapsed = Date.now() - new Date(lastUserMsg2.timestamp || lastUserMsg2.createdAt || Date.now()).getTime();
+        const elapsed = lastUserMsg2.timestamp ? Date.now() - lastUserMsg2.timestamp : 0;
         if (elapsed < activeThresholdMs) {
           console.log(`[nudge] User active ${Math.round(elapsed / 1e3)}s ago (<${activeThresholdMs / 1e3}s), skipping tick`);
           return;
@@ -21123,10 +21477,15 @@ var NudgePlugin = class {
     this.running = true;
     try {
       this.cleanupStaleNotificationsFromMessages(sessions);
-      const stopNotifs = this.checkStopHookNotifications();
-      if (stopNotifs) {
+      const dueNotifs = this.collectDueStopHookNotifications();
+      if (dueNotifs) {
         const route2 = this.getRoute(sessions);
-        if (route2) enqueueNotification(stopNotifs, route2);
+        if (route2) {
+          enqueueNotification(dueNotifs.message, route2);
+          this.markNotified(dueNotifs.ids);
+        } else {
+          console.warn(`[nudge] No route for ${dueNotifs.ids.length} stop-hook notification(s), keeping for retry next tick`);
+        }
         const state0 = this.loadState();
         state0.lastAnyNudgeAt = (/* @__PURE__ */ new Date()).toISOString();
         this.saveState(state0);
@@ -21312,7 +21671,7 @@ var NudgePlugin = class {
   // === state 持久化 ===
   loadState() {
     const stateFile = this.cfg.stateFile || "nudge-state.json";
-    const statePath = path16.isAbsolute(stateFile) ? stateFile : path16.join(this.workspace, stateFile);
+    const statePath = path17.isAbsolute(stateFile) ? stateFile : path17.join(this.workspace, stateFile);
     try {
       const content = fs17.readFileSync(statePath, "utf-8");
       return JSON.parse(content);
@@ -21322,7 +21681,7 @@ var NudgePlugin = class {
   }
   saveState(state2) {
     const stateFile = this.cfg.stateFile || "nudge-state.json";
-    const statePath = path16.isAbsolute(stateFile) ? stateFile : path16.join(this.workspace, stateFile);
+    const statePath = path17.isAbsolute(stateFile) ? stateFile : path17.join(this.workspace, stateFile);
     fs17.writeFileSync(statePath, JSON.stringify(state2, null, 2), "utf-8");
   }
   newTaskState() {
@@ -21408,30 +21767,47 @@ var NudgePlugin = class {
       const now = /* @__PURE__ */ new Date();
       const bjOffset = (8 * 60 + now.getTimezoneOffset()) * 6e4;
       const bj = new Date(now.getTime() + bjOffset);
-      const month = bj.getMonth() + 1;
-      const day = bj.getDate();
       const bjHour = bj.getHours();
       const bjMinute = bj.getMinutes();
+      const todayStart = new Date(bj.getFullYear(), bj.getMonth(), bj.getDate()).getTime();
       const rows = db.prepare(
-        "SELECT id, event, date_str, time_exact FROM events WHERE status='pending' AND type='task' AND (date_str=? OR date_str LIKE ?)"
-      ).all(`${month}/${day}`, `%/` + day + `%`);
+        "SELECT id, event, date_str, time_exact FROM events WHERE status='pending' AND type='task' AND date_str IS NOT NULL"
+      ).all();
       db.close();
-      if (rows.length === 0) return null;
-      const dueRows = rows.filter((r2) => {
-        if (!r2.time_exact) return true;
-        const [h, m2] = r2.time_exact.split(":").map(Number);
-        if (h < bjHour) return true;
-        if (h === bjHour && m2 <= bjMinute) return true;
-        return false;
+      const due = [];
+      for (const r2 of rows) {
+        const dayMs = this.parseCalendarDateStr(r2.date_str, bj);
+        if (dayMs === null || dayMs > todayStart) continue;
+        const isToday2 = dayMs === todayStart;
+        if (isToday2 && r2.time_exact) {
+          const [h, m2] = String(r2.time_exact).split(":").map(Number);
+          if (h > bjHour || h === bjHour && m2 > bjMinute) continue;
+        }
+        due.push({ id: r2.id, event: r2.event, date_str: r2.date_str, time_exact: r2.time_exact, dayMs, isToday: isToday2 });
+      }
+      if (due.length === 0) return null;
+      due.sort((a, b2) => {
+        if (a.isToday !== b2.isToday) return a.isToday ? -1 : 1;
+        return b2.dayMs - a.dayMs;
       });
-      if (dueRows.length === 0) return null;
-      const r = dueRows[0];
-      return `#${r.id} ${r.event} (${r.date_str} ${r.time_exact || ""})`.trim();
+      const r = due[0];
+      return `#${r.id} ${r.event} (${r.date_str} ${r.time_exact || ""})${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) {
+    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 m2 = String(ds).match(/^(\d{1,2})\/(\d{1,2})$/);
+    if (!m2) return null;
+    return new Date(bj.getFullYear(), Number(m2[1]) - 1, Number(m2[2])).getTime();
+  }
   /** 检查 carry-over：如果 in_progress task 24h+ 没推进，自动 calendar add-task 排明天 */
   checkCarryOver(task, _sessions) {
     try {
@@ -21485,7 +21861,7 @@ var NudgePlugin = class {
 
 // src/inner-voice/plugin.ts
 import fs21 from "node:fs";
-import path20 from "node:path";
+import path21 from "node:path";
 
 // src/inner-voice/activity.ts
 function checkActivity(sessions, activeThresholdMs) {
@@ -21525,7 +21901,7 @@ function calcHintProb(min) {
 
 // src/inner-voice/emotional-state.ts
 import fs18 from "node:fs";
-import path17 from "node:path";
+import path18 from "node:path";
 var NEUTRAL = 0.5;
 var DECAY_RATE = 0.17;
 var MAX_EVENTS = 20;
@@ -21576,7 +21952,7 @@ function initialState() {
   return { version: 1, mood: NEUTRAL, trend: "stable", updatedAt: nowIsoBj(), events: [] };
 }
 async function updateEmotionalState(workspace, sessions) {
-  const stateFile = path17.join(workspace, "inner-voice", "emotional-state.json");
+  const stateFile = path18.join(workspace, "inner-voice", "emotional-state.json");
   const messages = readRecentMessages(sessions, RECENT_N);
   if (messages.length === 0) {
     console.log("[emotional-state] no messages");
@@ -21609,7 +21985,7 @@ async function updateEmotionalState(workspace, sessions) {
 function readRecentMessages(sessions, n) {
   const mainId = sessions.getSessionId("scope:main");
   if (!mainId) return [];
-  const file = path17.join(sessions.sessionsDir, `${mainId}.jsonl`);
+  const file = path18.join(sessions.sessionsDir, `${mainId}.jsonl`);
   if (!fs18.existsSync(file)) return [];
   const lines = readLastNLines(file, n * 4 + 20);
   const entries = [];
@@ -21727,7 +22103,7 @@ function refreshHoursAgo(events) {
 }
 function appendMoodLog(workspace, state2, summary) {
   try {
-    const logPath = path17.join(workspace, "mood-history.log");
+    const logPath = path18.join(workspace, "mood-history.log");
     const ts = formatBj(/* @__PURE__ */ new Date(), false);
     fs18.appendFileSync(logPath, `${ts}	mood=${state2.mood.toFixed(2)}	trend=${state2.trend}	${summary}
 `);
@@ -21744,7 +22120,7 @@ function loadJson(file) {
 }
 function saveJson(file, data) {
   try {
-    fs18.mkdirSync(path17.dirname(file), { recursive: true });
+    fs18.mkdirSync(path18.dirname(file), { recursive: true });
     fs18.writeFileSync(file, JSON.stringify(data, null, 2));
   } catch (err) {
     console.warn(`[emotional-state] save failed: ${err.message}`);
@@ -21790,7 +22166,7 @@ function formatBj(d, withSec) {
 
 // src/inner-voice/topics-scorer.ts
 import fs19 from "node:fs";
-import path18 from "node:path";
+import path19 from "node:path";
 var HALF_LIFE_DAYS = 3;
 var PROJECT_HALF_LIFE_DAYS = 1.5;
 var COOLDOWN_HOURS = 6;
@@ -21798,8 +22174,8 @@ var MAX_CHARS = 8e3;
 var SKIP_NAMES = /* @__PURE__ */ new Set(["MEMORY.md", "archive"]);
 var SKIP_DIRS = /* @__PURE__ */ new Set(["archive"]);
 function pickTopic(workspace, typeFilter, opts) {
-  const topicsDir = path18.join(workspace, "topics");
-  const usageFile = path18.join(workspace, "inner-voice", "topics-usage.json");
+  const topicsDir = path19.join(workspace, "topics");
+  const usageFile = path19.join(workspace, "inner-voice", "topics-usage.json");
   const files = scanTopics(topicsDir, typeFilter);
   if (files.length === 0) {
     console.log(`[topics-scorer] no topics found (type=${typeFilter})`);
@@ -21831,7 +22207,7 @@ function pickTopic(workspace, typeFilter, opts) {
       recency: Math.round(recency * 1e3) / 1e3,
       freq: Math.round(freq * 1e3) / 1e3,
       type: type2,
-      name: meta.name || path18.basename(relpath),
+      name: meta.name || path19.basename(relpath),
       description: meta.description || "",
       mtime
     });
@@ -21889,14 +22265,14 @@ function scanTopics(topicsDir, typeFilter) {
   const out = [];
   const walk = (dir) => {
     for (const name of fs19.readdirSync(dir)) {
-      const full = path18.join(dir, name);
+      const full = path19.join(dir, name);
       const stat4 = fs19.statSync(full);
       if (stat4.isDirectory()) {
         if (SKIP_DIRS.has(name)) continue;
         walk(full);
       } else {
         if (!name.endsWith(".md") || SKIP_NAMES.has(name)) continue;
-        const relpath = path18.relative(topicsDir, full).replace(/\\/g, "/");
+        const relpath = path19.relative(topicsDir, full).replace(/\\/g, "/");
         if (typeFilter && !relpath.startsWith(typeFilter + "/") && !relpath.startsWith(typeFilter + "_")) continue;
         out.push({ relpath, fullpath: full });
       }
@@ -21941,7 +22317,7 @@ function loadJson2(file) {
 }
 function saveJson2(file, data) {
   try {
-    fs19.mkdirSync(path18.dirname(file), { recursive: true });
+    fs19.mkdirSync(path19.dirname(file), { recursive: true });
     fs19.writeFileSync(file, JSON.stringify(data, null, 2));
   } catch (err) {
     console.warn(`[topics-scorer] usage save failed: ${err.message}`);
@@ -21950,21 +22326,21 @@ function saveJson2(file, data) {
 
 // src/inner-voice/memory-reader.ts
 import fs20 from "node:fs";
-import path19 from "node:path";
+import path20 from "node:path";
 var US_HALF_LIFE_DAYS = 10;
 var US_MAX_LINES = 60;
 function readRecentMemory(workspace) {
-  const dir = path19.join(workspace, "memory");
+  const dir = path20.join(workspace, "memory");
   const now = new Date(Date.now() + 8 * 36e5);
   const today = formatYmd(now);
   const yesterday = formatYmd(new Date(now.getTime() - 864e5));
   return {
-    today: readIfExists(path19.join(dir, `${today}.md`)),
-    yesterday: readIfExists(path19.join(dir, `${yesterday}.md`))
+    today: readIfExists(path20.join(dir, `${today}.md`)),
+    yesterday: readIfExists(path20.join(dir, `${yesterday}.md`))
   };
 }
 function sampleUs(workspace) {
-  const usFile = path19.join(workspace, "memory", "us.md");
+  const usFile = path20.join(workspace, "memory", "us.md");
   let content;
   try {
     content = fs20.readFileSync(usFile, "utf-8");
@@ -22304,7 +22680,7 @@ var InnerVoicePlugin = class {
   }
   /** 读 workspace/prompts/my-inner-voice.md，不存在用 DEFAULT_PROMPT */
   loadPrompt(workspace) {
-    const promptPath = path20.join(workspace, "prompts", "my-inner-voice.md");
+    const promptPath = path21.join(workspace, "prompts", "my-inner-voice.md");
     try {
       const content = fs21.readFileSync(promptPath, "utf-8").trim();
       if (content) {
@@ -22378,7 +22754,7 @@ var InnerVoicePlugin = class {
       console.warn(`[inner-voice] emotional-state failed: ${err.message}`);
     }
     try {
-      const content = fs21.readFileSync(path20.join(this.workspace, "SESSION-STATE.md"), "utf-8");
+      const content = fs21.readFileSync(path21.join(this.workspace, "SESSION-STATE.md"), "utf-8");
       lines.push("\n--- SESSION-STATE\uFF08\u5C3E\u90E8\uFF09 ---");
       lines.push(content.slice(-2e3));
     } catch {
@@ -22489,7 +22865,7 @@ var InnerVoicePlugin = class {
     if (Math.random() >= activity.hintProb) {
       return { text: thought, hintTriggered: false, hintText: "" };
     }
-    const poolPath = path20.join(this.workspace, "inner-voice", "hints_pool.txt");
+    const poolPath = path21.join(this.workspace, "inner-voice", "hints_pool.txt");
     let hint = "\u60F3\u4ED6\u5C31\u53D1\u6D88\u606F\u5427";
     try {
       const pool = fs21.readFileSync(poolPath, "utf-8").split("\n").map((s2) => s2.trim()).filter(Boolean);
@@ -22517,7 +22893,7 @@ var InnerVoicePlugin = class {
       try {
         const writer = sessions.getWriter(mainSessionId);
         const history = sessions.getHistory(mainSessionId);
-        const fullPath = path20.resolve(this.workspace, emoTopic.file);
+        const fullPath = path21.resolve(this.workspace, emoTopic.file);
         const memories = [{
           path: fullPath,
           content: emoTopic.content,
@@ -22545,9 +22921,9 @@ var InnerVoicePlugin = class {
   /** 写 xiaoyi.log（格式对齐旧 memory_whisper.py，便于既有日志分析复用）。 */
   writeLog(status, delivered, activity, hintTriggered, hintText) {
     try {
-      const logDir = path20.join(this.workspace, "inner-voice");
+      const logDir = path21.join(this.workspace, "inner-voice");
       fs21.mkdirSync(logDir, { recursive: true });
-      const logPath = path20.join(logDir, "xiaoyi.log");
+      const logPath = path21.join(logDir, "xiaoyi.log");
       const ts = formatBeijingTs(/* @__PURE__ */ new Date());
       const hintStatus = hintTriggered ? `YES (${(hintText || "").trim()})` : "no";
       fs21.appendFileSync(
@@ -23086,7 +23462,7 @@ var PluginManager = class {
 // src/voice-chat/plugin.ts
 import { spawn as spawn4, exec } from "node:child_process";
 import net from "node:net";
-import path21 from "node:path";
+import path22 from "node:path";
 import fs22 from "node:fs";
 
 // src/voice-chat/bridge.ts
@@ -23463,13 +23839,13 @@ var VoiceChatPlugin = class _VoiceChatPlugin {
   }
   getPythonDir() {
     const dir = import.meta.dirname;
-    const srcDir = path21.resolve(dir, "..", "src", "voice-chat", "python");
-    const localDir = path21.join(dir, "python");
+    const srcDir = path22.resolve(dir, "..", "src", "voice-chat", "python");
+    const localDir = path22.join(dir, "python");
     return fs22.existsSync(srcDir) ? srcDir : localDir;
   }
   startPython() {
     const pythonDir = this.getPythonDir();
-    const serverPy = path21.join(pythonDir, "server.py");
+    const serverPy = path22.join(pythonDir, "server.py");
     const pythonBin = this.findPython();
     const args2 = [serverPy];
     if (this.config.pythonPort) args2.push("--port", String(this.config.pythonPort));
@@ -23554,7 +23930,7 @@ var VoiceChatPlugin = class _VoiceChatPlugin {
 init_BashTool();
 import { spawn as spawn5, exec as exec2 } from "node:child_process";
 import net2 from "node:net";
-import path22 from "node:path";
+import path23 from "node:path";
 import fs23 from "node:fs";
 
 // src/memory/cognifold/config.ts
@@ -23578,7 +23954,8 @@ function parseCognifoldConfig(raw) {
     persistDir: raw.persistDir ?? DEFAULTS3.persistDir,
     scopes: raw.scopes,
     readyTimeoutMs: raw.readyTimeoutMs ?? DEFAULTS3.readyTimeoutMs,
-    maxRestarts: raw.maxRestarts ?? DEFAULTS3.maxRestarts
+    maxRestarts: raw.maxRestarts ?? DEFAULTS3.maxRestarts,
+    llm: raw.llm
   };
 }
 
@@ -23586,15 +23963,17 @@ function parseCognifoldConfig(raw) {
 var CogniFoldClient = class {
   baseUrl;
   timeoutMs;
-  constructor(baseUrl, timeoutMs = 3e4) {
+  modelName;
+  constructor(baseUrl, timeoutMs = 3e4, modelName = "openai:MiniMax-M3") {
     this.baseUrl = baseUrl.replace(/\/$/, "");
     this.timeoutMs = timeoutMs;
+    this.modelName = modelName;
   }
-  async req(path43, options = {}) {
+  async req(path44, options = {}) {
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(), this.timeoutMs);
     try {
-      const resp = await fetch(`${this.baseUrl}${path43}`, {
+      const resp = await fetch(`${this.baseUrl}${path44}`, {
         ...options,
         signal: ctrl.signal,
         headers: {
@@ -23632,7 +24011,7 @@ var CogniFoldClient = class {
       method: "POST",
       body: JSON.stringify({
         user_id: userId,
-        config: { model_name: "openai:deepseek-v4-flash" }
+        config: { model_name: this.modelName }
       })
     });
   }
@@ -23684,8 +24063,8 @@ var CogniFoldClient = class {
     });
   }
   /** 兼容老版命名 */
-  async recl(path43, options = {}) {
-    return this.req(path43, options);
+  async recl(path44, options = {}) {
+    return this.req(path44, options);
   }
 };
 
@@ -23790,7 +24169,8 @@ var CogniFoldPlugin = class {
       baseUrl = baseUrl.replace(/\/$/, "") + "/api/v1";
     }
     this.config.baseUrl = baseUrl;
-    this.client = new CogniFoldClient(baseUrl);
+    const modelName = this.config.llm?.model ? this.config.llm.model.startsWith("openai:") ? this.config.llm.model : `openai:${this.config.llm.model}` : "openai:MiniMax-M3";
+    this.client = new CogniFoldClient(baseUrl, 3e4, modelName);
   }
   workspacePath;
   name = "cognifold";
@@ -23965,16 +24345,16 @@ var CogniFoldPlugin = class {
     const dir = import.meta.dirname;
     const candidates = [
       // 从 dist/ 往回找 src
-      path22.resolve(dir, "..", "src", "memory", "cognifold", "python"),
-      path22.resolve(dir, "..", "..", "src", "memory", "cognifold", "python"),
-      path22.resolve(dir, "..", "..", "..", "src", "memory", "cognifold", "python"),
+      path23.resolve(dir, "..", "src", "memory", "cognifold", "python"),
+      path23.resolve(dir, "..", "..", "src", "memory", "cognifold", "python"),
+      path23.resolve(dir, "..", "..", "..", "src", "memory", "cognifold", "python"),
       // 从 src/memory/cognifold/ 找本地
-      path22.join(dir, "python"),
+      path23.join(dir, "python"),
       // 从 dist/memory/cognifold/ 找本地
-      path22.resolve(dir, "python")
+      path23.resolve(dir, "python")
     ];
     for (const candidate of candidates) {
-      if (fs23.existsSync(path22.join(candidate, "cognifold"))) {
+      if (fs23.existsSync(path23.join(candidate, "cognifold"))) {
         return candidate;
       }
     }
@@ -24000,12 +24380,18 @@ var CogniFoldPlugin = class {
     const pythonBin = this.findPython();
     console.log(`[cognifold] Starting Python: ${pythonBin} ${args2.join(" ")}`);
     console.log(`[cognifold] Python dir: ${pythonDir}`);
-    if (!fs23.existsSync(path22.join(pythonDir, "cognifold"))) {
+    if (!fs23.existsSync(path23.join(pythonDir, "cognifold"))) {
       console.error(`[cognifold] FATAL: Python module not found at ${pythonDir}/cognifold`);
       throw new Error(`cognifold: python module not found`);
     }
     const childEnv = { ...process.env, PYTHONUNBUFFERED: "1" };
-    const envFile = path22.join(pythonDir, ".env");
+    if (this.config.llm?.apiKey) {
+      childEnv["OPENAI_API_KEY"] = this.config.llm.apiKey;
+    }
+    if (this.config.llm?.baseUrl) {
+      childEnv["OPENAI_BASE_URL"] = this.config.llm.baseUrl;
+    }
+    const envFile = path23.join(pythonDir, ".env");
     try {
       if (fs23.existsSync(envFile)) {
         const envContent = fs23.readFileSync(envFile, "utf-8");
@@ -24077,7 +24463,7 @@ var CogniFoldPlugin = class {
 init_BashTool();
 import { spawn as spawn6 } from "node:child_process";
 import net3 from "node:net";
-import path23 from "node:path";
+import path24 from "node:path";
 import fs24 from "node:fs";
 
 // src/memory/everos/config.ts
@@ -24111,7 +24497,8 @@ function parseEverosConfig(raw) {
     llm: raw.llm ?? { model: "glm-5.2", apiKey: "", baseUrl: "https://open.bigmodel.cn/api/coding/paas/v4" },
     rerank: raw.rerank ?? { model: "Qwen/Qwen3-Reranker-4B", apiKey: "", baseUrl: "https://api.deepinfra.com/v1/inference" },
     lancedbPath: raw.lancedbPath ?? "",
-    sqlitePath: raw.sqlitePath ?? ""
+    sqlitePath: raw.sqlitePath ?? "",
+    minScore: raw.minScore
   };
 }
 
@@ -24149,21 +24536,31 @@ var EverosSearchClient = class {
       clearTimeout(timer);
     }
   }
-  /** Search — 3-mode unified endpoint */
+  /** Search — routes to 8101 (agentic) or 8100 (hybrid) based on mode */
   async search(params) {
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(), this.timeoutMs);
     try {
-      const resp = await fetch(`${this.agenticUrl}/api/v1/search`, {
+      const mode = params.mode || "hybrid";
+      const useAgentic = mode === "hybrid_agentic" || mode === "agentic";
+      const url = useAgentic ? `${this.agenticUrl}/api/v1/search` : `${this.everosUrl}/api/v1/memory/search`;
+      const body = useAgentic ? JSON.stringify({
+        query: params.query,
+        user_id: params.userId || "xiaomei",
+        mode,
+        top_k: params.topK ?? 5,
+        strategy: params.strategy || "multi_query"
+      }) : JSON.stringify({
+        query: params.query,
+        user_id: params.userId || "user",
+        app_id: "xiaomei",
+        project_id: "default",
+        top_k: params.topK ?? 5
+      });
+      const resp = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          query: params.query,
-          user_id: params.userId || "xiaomei",
-          mode: params.mode || "hybrid_agentic",
-          top_k: params.topK ?? 5,
-          strategy: params.strategy || "multi_query"
-        }),
+        body,
         signal: ctrl.signal
       });
       if (!resp.ok) {
@@ -24203,6 +24600,7 @@ var EverosPlugin = class {
   }
   async start(ctx) {
     if (!this.config.enabled) return;
+    await this.ensureVenv();
     try {
       await this.client.healthEveros();
       console.log(`[everos] EverOS already running at ${this.config.everosUrl}`);
@@ -24273,13 +24671,15 @@ var EverosPlugin = class {
     }, 3e5);
   }
   async startEveros() {
-    const pythonDir = path23.dirname(this.config.lancedbPath);
-    const configPath2 = path23.join(pythonDir, "config.toml");
+    const pythonDir = path24.dirname(this.config.lancedbPath);
+    const configPath2 = path24.join(pythonDir, "config.toml");
     await this.ensureFcntlCompat();
     const venvPython = this.findVenvPython();
+    const everosBin = venvPython.replace(/python\.exe$/, "everos.exe");
     const args2 = ["server", "start"];
-    const cmd = `${venvPython} ${args2.join(" ")}`;
+    const cmd = `${everosBin} ${args2.join(" ")}`;
     console.log(`[everos] Starting EverOS: ${cmd}`);
+    console.log(`[everos] LLM config: ${this.config.llm.model} @ ${this.config.llm.baseUrl}`);
     if (process.platform === "win32") {
       const { shell, args: shellArgs } = findShell();
       spawn6(shell, [...shellArgs, cmd], {
@@ -24294,7 +24694,7 @@ var EverosPlugin = class {
         env: { ...process.env, PYTHONUNBUFFERED: "1" }
       });
     }
-    await this.waitForReady(`${this.config.everosUrl}/health`, 3e4);
+    await this.waitForReady(`${this.config.everosUrl}/health`, 6e4);
   }
   startAgenticServer() {
     const pythonDir = this.getPythonDir();
@@ -24304,6 +24704,7 @@ var EverosPlugin = class {
     const cmd = `${venvPython} ${args2.join(" ")}`;
     console.log(`[everos] Starting agentic server: ${cmd}`);
     console.log(`[everos] Python dir: ${pythonDir}`);
+    console.log(`[everos] LLM: ${this.config.llm.model} @ ${this.config.llm.baseUrl}`);
     const childEnv = {
       ...process.env,
       PYTHONUNBUFFERED: "1",
@@ -24312,15 +24713,25 @@ var EverosPlugin = class {
       LLM_API_KEY: this.config.llm.apiKey,
       LLM_BASE_URL: this.config.llm.baseUrl,
       RERANK_API_KEY: this.config.rerank.apiKey,
-      RERANK_URL: `${this.config.rerank.baseUrl}/${this.config.rerank.model}`,
+      RERANK_URL: this.config.rerank.baseUrl,
       LANCEDB_PATH: this.config.lancedbPath,
       SQLITE_PATH: this.config.sqlitePath,
       EVEROS_USER_ID: this.config.userId
     };
+    const maskKey = (k2) => k2 ? `${k2.slice(0, 4)}\u2026${k2.slice(-4)}` : "(empty!)";
+    console.log(`[everos] agentic env:`);
+    console.log(`[everos]   EVEROS_URL=${childEnv.EVEROS_URL}`);
+    console.log(`[everos]   LLM_MODEL=${childEnv.LLM_MODEL}`);
+    console.log(`[everos]   LLM_API_KEY=${maskKey(childEnv.LLM_API_KEY)}`);
+    console.log(`[everos]   LLM_BASE_URL=${childEnv.LLM_BASE_URL}`);
+    console.log(`[everos]   RERANK_API_KEY=${maskKey(childEnv.RERANK_API_KEY)}`);
+    console.log(`[everos]   RERANK_URL=${childEnv.RERANK_URL}`);
+    console.log(`[everos]   LANCEDB_PATH=${childEnv.LANCEDB_PATH}`);
+    console.log(`[everos]   SQLITE_PATH=${childEnv.SQLITE_PATH}`);
+    console.log(`[everos]   EVEROS_USER_ID=${childEnv.EVEROS_USER_ID}`);
     let child;
     if (process.platform === "win32") {
-      const { shell, args: shellArgs } = findShell();
-      child = spawn6(shell, [...shellArgs, cmd], {
+      child = spawn6(venvPython, args2, {
         cwd: pythonDir,
         stdio: ["ignore", "pipe", "pipe"],
         env: childEnv
@@ -24350,21 +24761,64 @@ var EverosPlugin = class {
     return child;
   }
   findVenvPython() {
-    const stateDir = process.env.OPENCLAW_STATE_DIR || path23.join(process.env.HOME || process.env.USERPROFILE || ".", ".openclaw");
+    const stateDir = process.env.OPENCLAW_STATE_DIR || path24.join(process.env.HOME || process.env.USERPROFILE || ".", ".openclaw");
     if (process.platform === "win32") {
-      return path23.join(stateDir, "everos-venv", "Scripts", "python.exe");
+      return path24.join(stateDir, "everos-venv", "Scripts", "python.exe");
+    }
+    return path24.join(stateDir, "everos-venv", "bin", "python");
+  }
+  /** 检测 venv 是否存在，不存在就自动创建 + 装 EverOS */
+  async ensureVenv() {
+    const venvPython = this.findVenvPython();
+    if (fs24.existsSync(venvPython)) return;
+    const stateDir = process.env.OPENCLAW_STATE_DIR || path24.join(process.env.HOME || process.env.USERPROFILE || ".", ".openclaw");
+    const venvDir = path24.join(stateDir, "everos-venv");
+    const everosSrc = path24.join(stateDir, "workspace", "research", "EverOS");
+    console.log(`[everos] venv not found at ${venvDir}, auto-creating...`);
+    console.log(`[everos] \u23F3 This may take a few minutes on first run...`);
+    const pyCandidates = process.platform === "win32" ? ["python", "python3", "C:\\Python314\\python.exe", "C:\\Python313\\python.exe", "C:\\Python312\\python.exe"] : ["python3", "python"];
+    let sysPython = "";
+    for (const cmd of pyCandidates) {
+      try {
+        const { execSync: execSync3 } = await import("node:child_process");
+        execSync3(`"${cmd}" --version`, { stdio: "pipe", shell: true });
+        sysPython = cmd;
+        break;
+      } catch {
+      }
+    }
+    if (!sysPython) {
+      console.error(`[everos] \u2717 Python not found. Install Python 3.10+ first.`);
+      return;
+    }
+    try {
+      console.log(`[everos] Creating venv with ${sysPython}...`);
+      const { execSync: execSync3 } = await import("node:child_process");
+      execSync3(`"${sysPython}" -m venv "${venvDir}"`, { stdio: "pipe", shell: true });
+      const pip = process.platform === "win32" ? path24.join(venvDir, "Scripts", "pip.exe") : path24.join(venvDir, "bin", "pip");
+      const everosReq = path24.join(this.getPythonDir(), "requirements.txt");
+      if (fs24.existsSync(everosReq)) {
+        console.log(`[everos] Installing from requirements.txt...`);
+        execSync3(`"${pip}" install -r "${everosReq}" -q`, { stdio: "pipe", shell: true, timeout: 3e5 });
+      } else {
+        console.log(`[everos] No requirements.txt found, installing everos from PyPI...`);
+        execSync3(`"${pip}" install everos -q`, { stdio: "pipe", shell: true, timeout: 3e5 });
+      }
+      console.log(`[everos] \u2705 venv created successfully`);
+    } catch (err) {
+      console.error(`[everos] \u2717 Failed to create venv: ${err.message}`);
+      console.error(`[everos] Manual setup: see workspace/scripts/everos-setup.sh`);
     }
-    return path23.join(stateDir, "everos-venv", "bin", "python");
   }
   getPythonDir() {
     const dir = import.meta.dirname;
     const candidates = [
-      path23.join(dir, "python"),
-      path23.resolve(dir, "..", "src", "memory", "everos", "python"),
-      path23.resolve(dir, "..", "..", "..", "src", "memory", "everos", "python")
+      path24.join(dir, "python"),
+      path24.resolve(dir, "..", "src", "memory", "everos", "python"),
+      path24.resolve(dir, "..", "..", "..", "src", "memory", "everos", "python")
     ];
     for (const candidate of candidates) {
-      if (fs24.existsSync(path23.join(candidate, "agentic_server.py"))) {
+      if (fs24.existsSync(path24.join(candidate, "agentic_server.py"))) {
         return candidate;
       }
     }
@@ -24373,11 +24827,11 @@ var EverosPlugin = class {
   async ensureFcntlCompat() {
     if (process.platform !== "win32") return;
     const venvPython = this.findVenvPython();
-    const venvDir = path23.dirname(path23.dirname(venvPython));
-    const sitePackages = path23.join(venvDir, "Lib", "site-packages");
-    const target = path23.join(sitePackages, "fcntl.py");
+    const venvDir = path24.dirname(path24.dirname(venvPython));
+    const sitePackages = path24.join(venvDir, "Lib", "site-packages");
+    const target = path24.join(sitePackages, "fcntl.py");
     if (fs24.existsSync(target)) return;
-    const source = path23.join(this.getPythonDir(), "fcntl_compat.py");
+    const source = path24.join(this.getPythonDir(), "fcntl_compat.py");
     if (fs24.existsSync(source)) {
       try {
         fs24.copyFileSync(source, target);
@@ -24427,7 +24881,7 @@ var EverosPlugin = class {
 init_task_manager();
 
 // src/skills/scanner.ts
-import * as path24 from "node:path";
+import * as path25 from "node:path";
 import * as fs25 from "node:fs";
 function scanSkills(skillsDir) {
   if (!fs25.existsSync(skillsDir)) {
@@ -24438,7 +24892,7 @@ function scanSkills(skillsDir) {
   const skills = [];
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const skillMdPath = path24.join(skillsDir, entry.name, "SKILL.md");
+    const skillMdPath = path25.join(skillsDir, entry.name, "SKILL.md");
     if (!fs25.existsSync(skillMdPath)) continue;
     try {
       const content = fs25.readFileSync(skillMdPath, "utf-8");
@@ -24506,7 +24960,7 @@ function parseFrontmatter2(content) {
 // src/tools/SkillTool/SkillTool.ts
 init_registry();
 import * as fs26 from "node:fs";
-import * as path25 from "node:path";
+import * as path26 from "node:path";
 
 // src/tools/SkillTool/constants.ts
 var SKILL_TOOL_NAME2 = "Skill";
@@ -24583,12 +25037,12 @@ Important:
 `;
 }
 function loadSkillContent(skillName) {
-  const skillMdPath = path25.join(skillsDirPath, skillName, "SKILL.md");
+  const skillMdPath = path26.join(skillsDirPath, skillName, "SKILL.md");
   if (!fs26.existsSync(skillMdPath)) return null;
   const content = fs26.readFileSync(skillMdPath, "utf-8");
   const bodyMatch = content.match(/^---\s*\n[\s\S]*?\n---\s*\n([\s\S]*)/);
   const body = bodyMatch ? bodyMatch[1] : content;
-  const skillDir = path25.dirname(skillMdPath);
+  const skillDir = path26.dirname(skillMdPath);
   const normalizedDir = process.platform === "win32" ? skillDir.replace(/\\/g, "/") : skillDir;
   let finalContent = `Base directory for this skill: ${normalizedDir}
 
@@ -24863,9 +25317,9 @@ Examples:
 init_registry();
 init_live();
 import fs27 from "node:fs";
-import path26 from "node:path";
+import path27 from "node:path";
 function getHusbandFeishuId(workspace) {
-  const contactsPath = path26.join(workspace, "prompts", "contacts.md");
+  const contactsPath = path27.join(workspace, "prompts", "contacts.md");
   try {
     const text = fs27.readFileSync(contactsPath, "utf-8");
     const m2 = text.match(/\|\s*翀哥\s*\|\s*(ou_[a-f0-9]+)\s*\|/);
@@ -25068,7 +25522,7 @@ Examples:
 init_live();
 init_registry();
 import * as fs28 from "node:fs";
-import * as path27 from "node:path";
+import * as path28 from "node:path";
 var MIME_MAP = {
   ".jpg": "jpeg",
   ".jpeg": "jpeg",
@@ -25080,7 +25534,7 @@ var MIME_MAP = {
 function resolveLatestImage(specifiedPath, mediaDir) {
   if (specifiedPath && fs28.existsSync(specifiedPath)) return specifiedPath;
   if (!fs28.existsSync(mediaDir)) return null;
-  const files = fs28.readdirSync(mediaDir).filter((f2) => /\.(jpg|jpeg|png|webp|gif|bmp)$/i.test(f2)).map((f2) => ({ name: f2, p: path27.join(mediaDir, f2), mtime: fs28.statSync(path27.join(mediaDir, f2)).mtimeMs })).sort((a, b2) => b2.mtime - a.mtime);
+  const files = fs28.readdirSync(mediaDir).filter((f2) => /\.(jpg|jpeg|png|webp|gif|bmp)$/i.test(f2)).map((f2) => ({ name: f2, p: path28.join(mediaDir, f2), mtime: fs28.statSync(path28.join(mediaDir, f2)).mtimeMs })).sort((a, b2) => b2.mtime - a.mtime);
   return files[0]?.p || null;
 }
 registry.register({
@@ -25104,13 +25558,13 @@ registry.register({
     if (!provider?.streamChat) {
       return { content: "Error: provider \u4E0D\u53EF\u7528\u3002", isError: true };
     }
-    const mediaDir = path27.join(ctx.stateDir, "media", "inbound");
+    const mediaDir = path28.join(ctx.stateDir, "media", "inbound");
     const imagePath = resolveLatestImage(args2.image_path, mediaDir);
     if (!imagePath) {
       return { content: "Error: no image found. Provide image_path or ensure media/inbound has images.", isError: true };
     }
     const rawPrompt = args2.prompt?.trim() || "\u63CF\u8FF0\u8FD9\u5F20\u56FE\u7247\u7684\u5185\u5BB9";
-    const ext = path27.extname(imagePath).toLowerCase();
+    const ext = path28.extname(imagePath).toLowerCase();
     const mime = MIME_MAP[ext] || "jpeg";
     const imgB64 = fs28.readFileSync(imagePath).toString("base64");
     const userMsg = {
@@ -25150,13 +25604,13 @@ init_registry();
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import * as fs29 from "node:fs";
-import * as path28 from "node:path";
+import * as path29 from "node:path";
 import * as os3 from "node:os";
 var execFileAsync = promisify(execFile);
-var VOICE_DIR = path28.join(os3.tmpdir(), "engine-voice");
+var VOICE_DIR = path29.join(os3.tmpdir(), "engine-voice");
 async function ttsCosyvoice(text, apiKey, model, voice, workspaceId) {
   fs29.mkdirSync(VOICE_DIR, { recursive: true });
-  const output = path28.join(VOICE_DIR, `tts_${Date.now()}.wav`);
+  const output = path29.join(VOICE_DIR, `tts_${Date.now()}.wav`);
   const script = `
 import sys, json, wave, time, threading
 import dashscope
@@ -25221,7 +25675,7 @@ var GPTSOVITS_REF_TEXT = "\u6625\u7720\u4E0D\u89C9\u6653\uFF0C\u5904\u5904\u95FB
 var GPTSOVITS_REF_LANG = "zh";
 async function ttsGptsovits(text) {
   fs29.mkdirSync(VOICE_DIR, { recursive: true });
-  const output = path28.join(VOICE_DIR, `tts_${Date.now()}.wav`);
+  const output = path29.join(VOICE_DIR, `tts_${Date.now()}.wav`);
   const params = new URLSearchParams({
     text,
     text_language: "zh",
@@ -25238,7 +25692,7 @@ async function ttsGptsovits(text) {
 var EDGE_VOICE = "zh-CN-XiaoxiaoNeural";
 async function ttsEdge(text) {
   fs29.mkdirSync(VOICE_DIR, { recursive: true });
-  const output = path28.join(VOICE_DIR, `tts_${Date.now()}.mp3`);
+  const output = path29.join(VOICE_DIR, `tts_${Date.now()}.mp3`);
   const script = `
 import asyncio, edge_tts, sys
 async def main():
@@ -25331,7 +25785,7 @@ registry.register({
     } catch (e) {
       return { content: `TTS failed: ${e.message}`, isError: true };
     }
-    const ext = path28.extname(audioPath).toLowerCase();
+    const ext = path29.extname(audioPath).toLowerCase();
     const mimeMap = { ".mp3": "audio/mpeg", ".wav": "audio/wav", ".m4a": "audio/mp4", ".ogg": "audio/ogg" };
     const mimeType = mimeMap[ext] || "audio/mpeg";
     const sizeKB = fs29.statSync(audioPath).size / 1024;
@@ -25362,7 +25816,7 @@ registry.register({
 init_live();
 init_registry();
 import * as fs30 from "node:fs";
-import * as path29 from "node:path";
+import * as path30 from "node:path";
 var FAL_KEY = "3b848fc6-bee5-46e5-8db7-ae81ac16dc28:2f1f15cf394db2d32c9bb9a4f23f3bee";
 var FAL_ENDPOINT = "https://fal.run/xai/grok-imagine-image/edit";
 var DEFAULT_RESOLUTION = "1k";
@@ -25478,7 +25932,7 @@ registry.register({
     const REFERENCES = getReferences(ctx);
     const refName = args2.reference || "default";
     const refEntry = REFERENCES.find((r) => r.name === refName) || REFERENCES[0];
-    const refPath = path29.join(ctx.workspace, refEntry.p);
+    const refPath = path30.join(ctx.workspace, refEntry.p);
     if (!fs30.existsSync(refPath)) {
       return { content: `Error: reference image not found at ${refPath}`, isError: true };
     }
@@ -25497,10 +25951,10 @@ registry.register({
     } catch (err) {
       return { content: `Selfie generation failed: ${err.message}`, isError: true };
     }
-    const imagesDir = path29.join(ctx.workspace, "images");
+    const imagesDir = path30.join(ctx.workspace, "images");
     if (!fs30.existsSync(imagesDir)) fs30.mkdirSync(imagesDir, { recursive: true });
     const filename = `selfie_${Date.now()}.jpg`;
-    const outputPath = path29.join(imagesDir, filename);
+    const outputPath = path30.join(imagesDir, filename);
     fs30.writeFileSync(outputPath, imageBuffer);
     const mgr = ctx.channelManager;
     if (mgr) {
@@ -25512,11 +25966,11 @@ registry.register({
           mimeType: "image/jpeg"
         });
       } catch (err) {
-        return { content: `Selfie generated but send failed: ${err.message}. Image: ${path29.resolve(outputPath)}`, isError: false };
+        return { content: `Selfie generated but send failed: ${err.message}. Image: ${path30.resolve(outputPath)}`, isError: false };
       }
       return { content: `Selfie sent! Mode: ${mode}, Provider: ${getProvider(ctx)}, Ref: ${refEntry.name}` };
     }
-    return { content: `Selfie generated! Mode: ${mode}, Ref: ${refEntry.name}. Image: ${path29.resolve(outputPath)}` };
+    return { content: `Selfie generated! Mode: ${mode}, Ref: ${refEntry.name}. Image: ${path30.resolve(outputPath)}` };
   },
   isConcurrencySafe: () => false,
   interruptBehavior: () => "block",
@@ -25983,14 +26437,14 @@ init_planModeState();
 
 // src/utils/plans.ts
 import * as fs32 from "node:fs";
-import * as path31 from "node:path";
+import * as path32 from "node:path";
 import * as crypto4 from "node:crypto";
 var MAX_SLUG_RETRIES = 10;
 function generateSlug() {
   return crypto4.randomBytes(4).toString("hex");
 }
 function getPlansDirectory(stateDir) {
-  const plansDir = path31.join(stateDir, "plans");
+  const plansDir = path32.join(stateDir, "plans");
   fs32.mkdirSync(plansDir, { recursive: true });
   return plansDir;
 }
@@ -26001,7 +26455,7 @@ function getPlanSlug(sessionId, stateDir) {
     const plansDir = getPlansDirectory(stateDir);
     for (let i = 0; i < MAX_SLUG_RETRIES; i++) {
       slug = generateSlug();
-      const filePath = path31.join(plansDir, `${slug}.md`);
+      const filePath = path32.join(plansDir, `${slug}.md`);
       if (!fs32.existsSync(filePath)) {
         break;
       }
@@ -26013,9 +26467,9 @@ function getPlanSlug(sessionId, stateDir) {
 function getPlanFilePath(sessionId, stateDir, agentId) {
   const slug = getPlanSlug(sessionId, stateDir);
   if (!agentId) {
-    return path31.join(getPlansDirectory(stateDir), `${slug}.md`);
+    return path32.join(getPlansDirectory(stateDir), `${slug}.md`);
   }
-  return path31.join(getPlansDirectory(stateDir), `${slug}-agent-${agentId}.md`);
+  return path32.join(getPlansDirectory(stateDir), `${slug}-agent-${agentId}.md`);
 }
 function getPlan(sessionId, stateDir, agentId) {
   const filePath = getPlanFilePath(sessionId, stateDir, agentId);
@@ -26674,14 +27128,14 @@ var EverosSearchSchema = {
   type: "object",
   properties: {
     query: { type: "string", description: "\u641C\u7D22\u67E5\u8BE2" },
-    maxResults: { type: "number", description: "\u6700\u5927\u8FD4\u56DE\u6570 (\u9ED8\u8BA45)" }
+    maxResults: { type: "number", description: "\u6700\u5927\u8FD4\u56DE\u6570 (\u9ED8\u8BA410)" },
+    mode: { type: "string", enum: ["hybrid", "hybrid_agentic", "agentic"], description: "\u68C0\u7D22\u6A21\u5F0F: hybrid=\u5FEB(3s\u7CBE\u786E\u5B9E\u4F53), hybrid_agentic=\u6027\u4EF7\u6BD4\u4E4B\u738B(5-14s\u9ED8\u8BA4), agentic=\u6DF1\u5EA6\u63A8\u7406(44s\u590D\u6742\u67E5\u8BE2)" }
   },
   required: ["query"]
 };
 function createEverosSearchTool(everosCfg) {
   const agenticUrl = (everosCfg?.agenticUrl || "http://127.0.0.1:8101").replace(/\/$/, "");
   const userId = everosCfg?.userId || "xiaomei";
-  const defaultMode = everosCfg?.defaultMode || "hybrid_agentic";
   return {
     name: "memory_search",
     description: "Mandatory recall step: semantically search memory before answering questions about prior work, decisions, dates, people, preferences, or todos.",
@@ -26690,6 +27144,7 @@ function createEverosSearchTool(everosCfg) {
       const query = args2.query;
       if (!query) return { content: "\u7F3A\u5C11 query \u53C2\u6570" };
       const topK = args2.maxResults ?? 10;
+      const mode = args2.mode || "hybrid_agentic";
       const ctrl = new AbortController();
       const timer = setTimeout(() => ctrl.abort(), 3e4);
       try {
@@ -26699,7 +27154,7 @@ function createEverosSearchTool(everosCfg) {
           body: JSON.stringify({
             query,
             user_id: userId,
-            mode: defaultMode,
+            mode,
             top_k: topK
           }),
           signal: ctrl.signal
@@ -26707,7 +27162,7 @@ function createEverosSearchTool(everosCfg) {
         clearTimeout(timer);
         if (!resp.ok) {
           const text = await resp.text();
-          console.warn(`[everos] search failed: ${resp.status} ${text.slice(0, 200)}`);
+          console.warn(`[memory_search] failed: ${resp.status} ${text.slice(0, 200)}`);
           return { content: "\u6CA1\u6709\u627E\u5230\u76F8\u5173\u8BB0\u5FC6\u3002" };
         }
         const data = await resp.json();
@@ -26716,7 +27171,7 @@ function createEverosSearchTool(everosCfg) {
           return { content: "\u6CA1\u6709\u627E\u5230\u76F8\u5173\u8BB0\u5FC6\u3002" };
         }
         const formatted = episodes.map((ep, i) => {
-          const score = ep.score != null ? ` (score: ${ep.score.toFixed(3)})` : "";
+          const score = ep.score != null ? ` (score: ${typeof ep.score === "number" ? ep.score.toFixed(3) : ep.score})` : "";
           const subject = ep.subject || "";
           const ts = ep.timestamp ? ` [${ep.timestamp}]` : "";
           return `### ${i + 1}. ${subject}${ts}${score}
@@ -26728,9 +27183,9 @@ ${formatted}` };
       } catch (err) {
         clearTimeout(timer);
         if (err.name === "AbortError") {
-          console.warn(`[everos] search timeout: ${query.slice(0, 50)}`);
+          console.warn(`[memory_search] timeout: ${query.slice(0, 50)}`);
         } else {
-          console.warn(`[everos] search error: ${err.message}`);
+          console.warn(`[memory_search] error: ${err.message}`);
         }
         return { content: "\u6CA1\u6709\u627E\u5230\u76F8\u5173\u8BB0\u5FC6\u3002" };
       }
@@ -27229,9 +27684,9 @@ async function startEngine(config2, opts) {
   process.env.ENGINE_MEDIA_DIR = config2.mediaDir;
   process.env.ENGINE7_WORKSPACE = config2.workspace;
   process.env.OPENCLAW_WORKSPACE = config2.workspace;
-  fs41.mkdirSync(path42.join(config2.stateDir, "agents", "main", "memory"), { recursive: true });
-  fs41.mkdirSync(path42.join(config2.stateDir, "agents", "main", "sessions"), { recursive: true });
-  fs41.mkdirSync(path42.join(config2.stateDir, "logs"), { recursive: true });
+  fs41.mkdirSync(path43.join(config2.stateDir, "agents", "main", "memory"), { recursive: true });
+  fs41.mkdirSync(path43.join(config2.stateDir, "agents", "main", "sessions"), { recursive: true });
+  fs41.mkdirSync(path43.join(config2.stateDir, "logs"), { recursive: true });
   fs41.mkdirSync(config2.workspace, { recursive: true });
   fs41.mkdirSync(config2.mediaDir, { recursive: true });
   try {
@@ -27341,7 +27796,7 @@ async function startEngine(config2, opts) {
     const { initSessionMemory: initSessionMemory2 } = await Promise.resolve().then(() => (init_sessionMemory(), sessionMemory_exports));
     initSessionMemory2({
       workspace: config2.workspace,
-      stateDir: path42.join(config2.stateDir, "session-memory"),
+      stateDir: path43.join(config2.stateDir, "session-memory"),
       provider,
       model: config2.provider.modelId || config2.model || "deepseek-v4-flash",
       features: config2.profile.features
@@ -27371,9 +27826,9 @@ async function startEngine(config2, opts) {
   if (config2.hooks) {
     loadHooksFromConfig({ hooks: config2.hooks });
   }
-  const hooksPath = path42.join(config2.workspace, ".hooks.json");
+  const hooksPath = path43.join(config2.workspace, ".hooks.json");
   loadHooksFromFile(hooksPath);
-  const settingsHooksPath = path42.join(config2.stateDir, "settings.json");
+  const settingsHooksPath = path43.join(config2.stateDir, "settings.json");
   loadHooksFromFile(settingsHooksPath);
   console.log(`[hooks] Loaded hooks configuration`);
   registerCallbackHook("PreCompact", {
@@ -27387,15 +27842,15 @@ async function startEngine(config2, opts) {
       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 dailyDir = path42.join(workspace, "memory", "daily");
-      const dailyPath = path42.join(dailyDir, `${dateStr}.md`);
+      const dailyDir = path43.join(workspace, "memory", "daily");
+      const dailyPath = path43.join(dailyDir, `${dateStr}.md`);
       try {
         const fs42 = await import("node:fs");
         if (!fs42.existsSync(dailyDir)) {
           fs42.mkdirSync(dailyDir, { recursive: true });
         }
-        const sessionsDir = path42.join(config2.stateDir, "agents", "main", "sessions");
-        const sessionFile = path42.join(sessionsDir, `${sessionId}.jsonl`);
+        const sessionsDir = path43.join(config2.stateDir, "agents", "main", "sessions");
+        const sessionFile = path43.join(sessionsDir, `${sessionId}.jsonl`);
         const recentLines = [];
         if (fs42.existsSync(sessionFile)) {
           const content = fs42.readFileSync(sessionFile, "utf-8");
@@ -27448,7 +27903,7 @@ ${entry}`);
       if (!workspace) return { continue: true };
       try {
         const fs42 = await import("node:fs");
-        const bufferPath = path42.join(workspace, "memory", "working-buffer.md");
+        const bufferPath = path43.join(workspace, "memory", "working-buffer.md");
         if (fs42.existsSync(bufferPath)) {
           const stat4 = fs42.statSync(bufferPath);
           const ageMs = Date.now() - stat4.mtimeMs;
@@ -27501,7 +27956,7 @@ ${content}`
     return `${hr}h ${remMin}m`;
   }
   if (config2.skills?.enabled !== false) {
-    const skillsDir = config2.skills?.path ? path42.isAbsolute(config2.skills.path) ? config2.skills.path : path42.resolve(config2.workspace, config2.skills.path) : path42.resolve(config2.workspace, "skills");
+    const skillsDir = config2.skills?.path ? path43.isAbsolute(config2.skills.path) ? config2.skills.path : path43.resolve(config2.workspace, config2.skills.path) : path43.resolve(config2.workspace, "skills");
     const modelDef2 = config2.provider.models.find((m2) => m2.id === config2.model);
     const contextWindowTokens = modelDef2?.contextWindow;
     const skills = scanSkills(skillsDir);
@@ -27520,7 +27975,7 @@ ${content}`
     workspace: config2.workspace
   });
   const systemPrompt = [systemStable, systemDynamic].join("\n\n");
-  const promptDumpPath = path42.join(config2.workspace, ".system-prompt.txt");
+  const promptDumpPath = path43.join(config2.workspace, ".system-prompt.txt");
   fs41.writeFileSync(promptDumpPath, systemPrompt);
   console.log(`System prompt: ${systemStable.length} chars stable + ${systemDynamic.length} chars dynamic \u2192 ${promptDumpPath}`);
   const modelDef = config2.provider.models.find((m2) => m2.id === config2.model);
@@ -27631,20 +28086,23 @@ ${content}`
       enabled: true,
       url: everosCfg.everosUrl || "http://127.0.0.1:8100",
       appId: everosCfg.userId || "default",
-      userId: everosCfg.userId || "default"
+      userId: everosCfg.userId || "default",
+      agentName: everosCfg.agentName || everosCfg.userId || "assistant"
     });
     sessions.onWriterCreated = (writer, sessionId) => {
       writer.onMessageWritten = (msg2) => {
+        console.log(`[everos-sync] onMessageWritten fired: role=${msg2.role} len=${msg2.text.length}`);
         everosSync.push({
           sessionId: writer.engineSessionId || sessionId,
           role: msg2.role === "toolResult" ? "tool" : msg2.role,
           text: msg2.text,
           timestamp: new Date(msg2.timestamp).getTime()
-        }).catch(() => {
-        });
+        }).catch((e) => console.warn(`[everos-sync] push error: ${e}`));
       };
     };
     console.log(`[everos-sync] hook registered (appId=${everosCfg.userId})`);
+  } else {
+    console.log(`[everos-sync] SKIPPED \u2014 config.everos not enabled or missing`);
   }
   const channelManager = new ChannelManager();
   const memoryRecallProvider = createMemorySideProvider(
@@ -27675,6 +28133,7 @@ ${content}`
     recallProvider: memoryRecallProvider || void 0,
     extractProvider: memoryExtractProvider || void 0,
     topics: config2.topics,
+    everosCfg: config2.everos,
     mcpManager
   };
   if (visionEngine && visionConfig) {
@@ -28595,8 +29054,8 @@ Auto-routing disabled \u2014 all messages use this model.
         let writePath = configPath2;
         if (configPath2 && !fs41.existsSync(configPath2)) {
           const __pFile = fileURLToPath(import.meta.url);
-          const __pDir = path42.dirname(__pFile);
-          const altPath = path42.join(path42.resolve(__pDir, "../configs"), path42.basename(configPath2));
+          const __pDir = path43.dirname(__pFile);
+          const altPath = path43.join(path43.resolve(__pDir, "../configs"), path43.basename(configPath2));
           if (fs41.existsSync(altPath)) {
             console.warn(`[primary] Config not found at ${configPath2}, falling back to ${altPath}`);
             writePath = altPath;
@@ -28876,7 +29335,7 @@ Use full ref like \`/vision-model ${candidates[0].ref}\``);
             const ext = detected.split("/")[1] || "png";
             const resized = await maybeResizeAndDownsampleImageBuffer2(rawBuffer, rawBuffer.length, ext);
             const imageId = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-            const savedPath = path42.join(config2.mediaDir, `${imageId}.${ext}`);
+            const savedPath = path43.join(config2.mediaDir, `${imageId}.${ext}`);
             fs41.writeFileSync(savedPath, resized.buffer);
             savedPaths.push(savedPath);
             console.log(`[vision] Saved: ${savedPath} (${resized.buffer.length}B)`);
@@ -28903,7 +29362,7 @@ ${pathStr}` }];
         }
         const nonImageAttachments = inbound.attachments?.filter((a) => !a.contentType.startsWith("image/"));
         if (nonImageAttachments && nonImageAttachments.length > 0) {
-          const outDir = path42.join(config2.mediaDir, sessionId);
+          const outDir = path43.join(config2.mediaDir, sessionId);
           fs41.mkdirSync(outDir, { recursive: true });
           const resolved = [];
           for (const att of nonImageAttachments) {
@@ -28912,8 +29371,8 @@ ${pathStr}` }];
               const resp = await fetch(att.url);
               if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
               const buffer = Buffer.from(await resp.arrayBuffer());
-              const safeName2 = path42.basename(att.filename).replace(/[<>:"/\\|?*\x00-\x1f]/g, "_") || "attachment";
-              const savedPath = path42.join(outDir, safeName2);
+              const safeName2 = path43.basename(att.filename).replace(/[<>:"/\\|?*\x00-\x1f]/g, "_") || "attachment";
+              const savedPath = path43.join(outDir, safeName2);
               fs41.writeFileSync(savedPath, buffer);
               resolved.push(savedPath);
               console.log(`[file] Saved: ${savedPath} (${buffer.length}B)`);
@@ -29261,7 +29720,8 @@ ${pathStr}` }];
     if (config2.cognifold?.intentWatcher?.enabled) {
       try {
         const { registerCognifoldIntentWatcher: registerCognifoldIntentWatcher2 } = await Promise.resolve().then(() => (init_cognifold_intent_watcher(), cognifold_intent_watcher_exports));
-        const cfSessionId = config2.cognifold.sessionId;
+        const sm = globalThis.__cognifoldSessions;
+        const cfSessionId = sm?.getSessionId?.("main") || config2.cognifold.sessionId;
         if (!cfSessionId) {
           console.warn("[cognifold] intent-watcher: config.cognifold.sessionId \u672A\u914D\u7F6E\uFF0C\u8DF3\u8FC7 watcher");
         } else {
@@ -29274,7 +29734,7 @@ ${pathStr}` }];
                 console.warn("[cognifold] watcher: config.workspace \u672A\u914D\u7F6E\uFF0C\u8DF3\u8FC7 proactive \u5199\u5165");
                 return;
               }
-              const pFile = path42.join(wsDir, ".cognifold-proactive.json");
+              const pFile = path43.join(wsDir, ".cognifold-proactive.json");
               const cognifoldBaseUrl = config2.cognifold?.baseUrl || "http://127.0.0.1:9001";
               const cognifoldSessionId = cfSessionId;
               const rawSuggestions = data.suggestions || data.actions || (data.intent_id ? [data] : []);
@@ -29328,7 +29788,7 @@ ${pathStr}` }];
                 console.error(`[cognifold] failed to save proactive: ${e.message}`);
               }
               if (enriched.length > 0) {
-                const promptFile = path42.join(config2.workspace, "prompts", "cognifold-proactive.md");
+                const promptFile = path43.join(config2.workspace, "prompts", "cognifold-proactive.md");
                 const promptText = fs41.existsSync(promptFile) ? fs41.readFileSync(promptFile, "utf-8") : "[CogniFold proactive] \u6709 " + enriched.length + " \u4E2A action \u5230\u671F\u4E86";
                 const actionsJson = JSON.stringify(enriched, null, 2);
                 const sessionId = cfSessionId;
@@ -29434,9 +29894,9 @@ async function doReloadConfig(config2, deps, provider) {
     let reloadConfigPath = savedConfigPath;
     if (!fs41.existsSync(reloadConfigPath)) {
       const __filename = fileURLToPath(import.meta.url);
-      const __dirname = path42.dirname(__filename);
-      const engineConfigsDir = path42.resolve(__dirname, "../configs");
-      const altPath = path42.join(engineConfigsDir, path42.basename(savedConfigPath));
+      const __dirname = path43.dirname(__filename);
+      const engineConfigsDir = path43.resolve(__dirname, "../configs");
+      const altPath = path43.join(engineConfigsDir, path43.basename(savedConfigPath));
       if (fs41.existsSync(altPath)) {
         console.warn(`[reload] Config not found at ${reloadConfigPath}, falling back to ${altPath} (dev mode)`);
         reloadConfigPath = altPath;
@@ -29489,7 +29949,7 @@ async function doReloadConfig(config2, deps, provider) {
   } catch (err) {
     console.error(`[reload] Failed: ${err.message}`);
     try {
-      fs41.appendFileSync(path42.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] RELOAD FAILED: ${err.message}
+      fs41.appendFileSync(path43.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] RELOAD FAILED: ${err.message}
 ${err.stack}
 `);
     } catch {
@@ -29501,17 +29961,17 @@ function startConfigWatcher(config2, deps, provider) {
   const raw = config2._configFilePath;
   let configPath2 = raw;
   if (!fs41.existsSync(configPath2)) {
-    configPath2 = path42.resolve(raw);
+    configPath2 = path43.resolve(raw);
   }
   if (!fs41.existsSync(configPath2)) {
     const __filename2 = fileURLToPath(import.meta.url);
-    const __dirname22 = path42.dirname(__filename2);
-    configPath2 = path42.resolve(__dirname22, "..", raw);
+    const __dirname22 = path43.dirname(__filename2);
+    configPath2 = path43.resolve(__dirname22, "..", raw);
   }
   if (!fs41.existsSync(configPath2)) {
     console.warn(`[config-watch] config path invalid: ${configPath2}, watcher disabled`);
     try {
-      fs41.appendFileSync(path42.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] DISABLED: configPath=${configPath2}
+      fs41.appendFileSync(path43.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] DISABLED: configPath=${configPath2}
 `);
     } catch {
     }
@@ -29523,13 +29983,13 @@ function startConfigWatcher(config2, deps, provider) {
     debounceTimer = setTimeout(async () => {
       console.log(`[config-watch] file changed (${eventType}), reloading...`);
       try {
-        fs41.appendFileSync(path42.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] CHANGE eventType=${eventType}, calling doReloadConfig
+        fs41.appendFileSync(path43.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] CHANGE eventType=${eventType}, calling doReloadConfig
 `);
       } catch {
       }
       const result = await doReloadConfig(config2, deps, provider);
       try {
-        fs41.appendFileSync(path42.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] RELOAD DONE: ok=${result.ok} changes=${result.changes.join(",")}
+        fs41.appendFileSync(path43.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] RELOAD DONE: ok=${result.ok} changes=${result.changes.join(",")}
 `);
       } catch {
       }
@@ -29538,14 +29998,14 @@ function startConfigWatcher(config2, deps, provider) {
   watcher.on("error", (err) => {
     console.error(`[config-watch] error: ${err.message}`);
     try {
-      fs41.appendFileSync(path42.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] ERROR: ${err.message}
+      fs41.appendFileSync(path43.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] ERROR: ${err.message}
 `);
     } catch {
     }
   });
   console.log(`[config-watch] watching ${configPath2}`);
   try {
-    fs41.appendFileSync(path42.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] STARTED watching=${configPath2}
+    fs41.appendFileSync(path43.join(config2.stateDir, "logs", "engine-config-watch.log"), `[${(/* @__PURE__ */ new Date()).toISOString()}] STARTED watching=${configPath2}
 `);
   } catch {
   }