engine7 7.1.36 → 7.1.38

package/dist/main.mjs

@@ -929,6 +929,9 @@ function toHookContext(ctx) {
   };
 }
 async function executeOne(tc, ctx, signal) {
+  if (signal?.aborted) {
+    return { call: tc, result: { content: "[interrupted by user /stop]", isError: false }, summary: null };
+  }
   const tool = registry.get(tc.function.name);
   if (!tool) {
     return { call: tc, result: { content: `Unknown tool: ${tc.function.name}`, isError: true }, summary: null };
@@ -2918,7 +2921,8 @@ var init_query = __esm({
     init_constants();
     init_deferred();
     init_hooks();
-    QueryEngine = class {
+    init_live();
+    QueryEngine = class _QueryEngine {
       constructor(provider, options) {
         this.provider = provider;
         this.options = options;
@@ -2929,6 +2933,33 @@ var init_query = __esm({
       }
       provider;
       options;
+      // === voice-chat 占位状态（#194 v4）===
+      static placeholderQueries = /* @__PURE__ */ new Map();
+      // queryId → ts（3 分钟过期）
+      static placeholderCounter = 0;
+      /** 工具>5s 触发：同一 query 只占位一次 + 30% 概率 + 轮换文案（防口头禅） */
+      static async tryVoicePlaceholder(context) {
+        if (context?.channel !== "voice-chat") return;
+        if (!(liveConfig.get("voiceChat.placeholder.enabled") ?? true)) return;
+        const qid = context.sessionId || "default";
+        const now = Date.now();
+        for (const [k, v] of _QueryEngine.placeholderQueries) if (now - v > 3 * 60 * 1e3) _QueryEngine.placeholderQueries.delete(k);
+        if (_QueryEngine.placeholderQueries.has(qid)) return;
+        if (Math.random() > 0.3) return;
+        _QueryEngine.placeholderQueries.set(qid, now);
+        const lines = ["\u7B49\u6211\u67E5\u4E0B\u54C8", "\u7A0D\u7B49\uFF0C\u6211\u770B\u4E00\u773C", "\u6211\u53BB\u7FFB\u7FFB", "\u7B49\u4E0B\u54E6", "\u55EF\u2026\u6211\u53BB\u770B\u770B"];
+        const line = lines[_QueryEngine.placeholderCounter++ % lines.length];
+        try {
+          await fetch("https://localhost:8116/voice-reply", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ text: line, isPlaceholder: true })
+          });
+          console.log(`[vc-placeholder] sent: ${line}`);
+        } catch (e) {
+          console.warn(`[vc-placeholder] send failed: ${e.message}`);
+        }
+      }
       abortController = null;
       /** 外部 pre-query abort controller（handle-query 入口注册，弥补 query() 前的空窗期） */
       preQueryAbort = null;
@@ -3283,7 +3314,18 @@ ${perTurnSystemDynamic}` : deferredHint || perTurnSystemDynamic;
                   console.warn(`[hook] PreToolUse ${toolName} error: ${e.message}`);
                 }
               }
-              const { messages: toolResults, summaries } = await executeTools(toolCalls, ac.signal, toolCtx);
+              const vcPlaceholderOn = context?.channel === "voice-chat" && (liveConfig.get("voiceChat.placeholder.enabled") ?? true);
+              const vcTimer = vcPlaceholderOn ? setTimeout(() => {
+                _QueryEngine.tryVoicePlaceholder(context).catch(() => {
+                });
+              }, 5e3) : null;
+              let toolRes;
+              try {
+                toolRes = await executeTools(toolCalls, ac.signal, toolCtx);
+              } finally {
+                if (vcTimer) clearTimeout(vcTimer);
+              }
+              const { messages: toolResults, summaries } = toolRes;
               for (const s of summaries) {
                 try {
                   const postResult = await executePostToolUseHooks(s.tool, {}, s.summary, hookCtx, ac.signal);
@@ -5165,11 +5207,11 @@ function buildPayload(messages, cfg, sessionId) {
       const meta = m.role === "user" ? parseMeta(text) : null;
       const senderName = meta?.senderName ?? (m.role === "assistant" ? cfg.agentName : void 0) ?? m.role;
       const rawRole = m.role === "toolResult" ? "tool" : m.role;
-      const validRoles = ["user", "assistant", "tool"];
+      const role = rawRole === "user" ? "user" : "assistant";
       return {
         sender_id: cfg.appId,
         sender_name: senderName,
-        role: validRoles.includes(rawRole) ? rawRole : "user",
+        role,
         timestamp: Date.now(),
         content: text
       };
@@ -12726,6 +12768,7 @@ var BASE_DELAY_MS = 500;
 var MAX_DELAY_MS = 32e3;
 var DEFAULT_TIMEOUT_MS = 6e5;
 var READ_TIMEOUT_MS = 6e4;
+var FIRST_READ_TIMEOUT_MS = parseInt(process.env.API_TIMEOUT_MS || "", 10) || 6e5;
 function sleep(ms, signal) {
   return new Promise((resolve10, reject) => {
     if (signal?.aborted) {
@@ -12989,7 +13032,15 @@ var OpenAIProvider = class {
     try {
       while (true) {
         if (params.signal?.aborted) break;
-        const { done: done2, value } = await readWithTimeout(reader, READ_TIMEOUT_MS, params.signal);
+        let readRes;
+        try {
+          readRes = await readWithTimeout(reader, firstChunk ? FIRST_READ_TIMEOUT_MS : READ_TIMEOUT_MS, params.signal);
+        } catch (readErr) {
+          if (params.signal?.aborted) throw readErr;
+          yield { type: "error", error: readErr.message };
+          return;
+        }
+        const { done: done2, value } = readRes;
         if (done2) break;
         if (firstChunk) {
           firstChunk = false;
@@ -13273,6 +13324,7 @@ var AnthropicProvider = class {
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
+    let firstChunk = true;
     const toolUseBlocks = /* @__PURE__ */ new Map();
     let doneYielded = false;
     const handleData = function* (data) {
@@ -13362,8 +13414,20 @@ var AnthropicProvider = class {
     try {
       while (true) {
         if (params.signal?.aborted) break;
-        const { done: done2, value } = await readWithTimeout(reader, READ_TIMEOUT_MS, params.signal);
+        let readRes;
+        try {
+          readRes = await readWithTimeout(reader, firstChunk ? FIRST_READ_TIMEOUT_MS : READ_TIMEOUT_MS, params.signal);
+        } catch (readErr) {
+          if (params.signal?.aborted) throw readErr;
+          yield { type: "error", error: readErr.message };
+          return;
+        }
+        const { done: done2, value } = readRes;
         if (done2) break;
+        if (firstChunk) {
+          firstChunk = false;
+          console.log(`[anthropic] first chunk received (${value?.length ?? 0}B)`);
+        }
         buffer += decoder.decode(value, { stream: true });
         const lines = buffer.split("\n");
         buffer = lines.pop();
@@ -13575,7 +13639,15 @@ var GeminiProvider = class {
     try {
       while (true) {
         if (params.signal?.aborted) break;
-        const { done: done2, value } = await readWithTimeout(reader, READ_TIMEOUT_MS, params.signal);
+        let readRes;
+        try {
+          readRes = await readWithTimeout(reader, firstChunk ? FIRST_READ_TIMEOUT_MS : READ_TIMEOUT_MS, params.signal);
+        } catch (readErr) {
+          if (params.signal?.aborted) throw readErr;
+          yield { type: "error", error: readErr.message };
+          return;
+        }
+        const { done: done2, value } = readRes;
         if (done2) break;
         if (firstChunk) {
           firstChunk = false;
@@ -14431,7 +14503,9 @@ var FeishuAdapter = class _FeishuAdapter {
     }
     const filename = attachment.filename || path46.basename(attachment.path);
     const fileBuffer = fs43.readFileSync(attachment.path);
-    const receiveIdType = target.startsWith("ou_") ? "open_id" : "chat_id";
+    const safeTarget = target || this.config.defaultTarget || "";
+    if (!safeTarget) throw new Error("Feishu sendFile: no target (\u4E3B\u52A8\u53D1\u9001\u9700\u914D\u7F6E defaultTarget \u6216\u4F20\u5165 target)");
+    const receiveIdType = safeTarget.startsWith("ou_") ? "open_id" : "chat_id";
     const mimeType = attachment.mimeType || "application/octet-stream";
     if (mimeType.startsWith("image/")) {
       const imageKey = await this._uploadImage(fileBuffer, filename);
@@ -14439,19 +14513,45 @@ var FeishuAdapter = class _FeishuAdapter {
         const postContent = this._buildImagePost(message, imageKey);
         await this.client.im.message.create({
           params: { receive_id_type: receiveIdType },
-          data: { receive_id: target, msg_type: "post", content: JSON.stringify(postContent) }
+          data: { receive_id: safeTarget, msg_type: "post", content: JSON.stringify(postContent) }
         });
       } else {
         await this.client.im.message.create({
           params: { receive_id_type: receiveIdType },
-          data: { receive_id: target, msg_type: "image", content: JSON.stringify({ image_key: imageKey }) }
+          data: { receive_id: safeTarget, msg_type: "image", content: JSON.stringify({ image_key: imageKey }) }
+        });
+      }
+    } else if (mimeType.startsWith("audio/")) {
+      const isOpus = filename.endsWith(".opus") || filename.endsWith(".ogg") || mimeType === "audio/opus";
+      if (!isOpus) {
+        console.warn(`[feishu:sendFile] audio '${filename}' \u4E0D\u662Fopus\uFF0C\u964D\u7EA7\u4E3A\u6587\u4EF6\u6D88\u606F\uFF08\u975E\u8BED\u97F3\u6761\uFF09`);
+        const fileKey = await this._uploadFile(fileBuffer, filename);
+        await this.client.im.message.create({
+          params: { receive_id_type: receiveIdType },
+          data: { receive_id: safeTarget, msg_type: "file", content: JSON.stringify({ file_key: fileKey }) }
+        });
+      } else {
+        let durationMs = Math.round(fileBuffer.length / 3);
+        try {
+          const { execFile: execFile3 } = await import("node:child_process");
+          const { promisify: promisify3 } = await import("node:util");
+          const execFileAsync2 = promisify3(execFile3);
+          const probe = await execFileAsync2("ffprobe", ["-v", "quiet", "-show_format", "-print_format", "json", attachment.path], { timeout: 1e4 });
+          const fmt = JSON.parse(probe.stdout);
+          if (fmt?.format?.duration) durationMs = Math.round(parseFloat(fmt.format.duration) * 1e3);
+        } catch {
+        }
+        const audioKey = await this._uploadAudio(fileBuffer, filename.endsWith(".opus") ? filename : filename.replace(/\.[^.]+$/, ".opus"), durationMs);
+        await this.client.im.message.create({
+          params: { receive_id_type: receiveIdType },
+          data: { receive_id: safeTarget, msg_type: "audio", content: JSON.stringify({ file_key: audioKey }) }
         });
       }
     } else {
       const fileKey = await this._uploadFile(fileBuffer, filename);
       await this.client.im.message.create({
         params: { receive_id_type: receiveIdType },
-        data: { receive_id: target, msg_type: "file", content: JSON.stringify({ file_key: fileKey }) }
+        data: { receive_id: safeTarget, msg_type: "file", content: JSON.stringify({ file_key: fileKey }) }
       });
     }
     if (message && mimeType.startsWith("image/")) {
@@ -14460,7 +14560,7 @@ var FeishuAdapter = class _FeishuAdapter {
       for (const chunk of chunks) {
         await this.client.im.message.create({
           params: { receive_id_type: receiveIdType },
-          data: { receive_id: target, msg_type: "text", content: JSON.stringify({ text: chunk }) }
+          data: { receive_id: safeTarget, msg_type: "text", content: JSON.stringify({ text: chunk }) }
         });
       }
     }
@@ -14504,6 +14604,28 @@ var FeishuAdapter = class _FeishuAdapter {
     if (!fileKey) throw new Error(`Feishu file upload failed: ${JSON.stringify(data)}`);
     return fileKey;
   }
+  /** #217: 上传语音（opus）——飞书语音条必须 file_type=opus + duration(毫秒) */
+  async _uploadAudio(buffer, filename, durationMs) {
+    const token = await this._getTenantToken();
+    const resp = await fetch("https://open.feishu.cn/open-apis/im/v1/files", {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${token}`
+      },
+      body: (() => {
+        const formData = new FormData();
+        formData.append("file_type", "opus");
+        formData.append("file_name", filename);
+        formData.append("duration", String(Math.max(1, Math.round(durationMs))));
+        formData.append("file", new Blob([buffer], { type: "audio/opus" }), filename);
+        return formData;
+      })()
+    });
+    const data = await resp.json();
+    const fileKey = data?.data?.file_key;
+    if (!fileKey) throw new Error(`Feishu audio upload failed: ${JSON.stringify(data)}`);
+    return fileKey;
+  }
   /** 通过飞书API下载消息中的图片 */
   async _downloadImage(messageId, imageKey) {
     const token = await this._getTenantToken();
@@ -14707,6 +14829,7 @@ var FeishuAdapter = class _FeishuAdapter {
     const message = data?.message;
     if (!sender || !message) return;
     const messageId = message.message_id || "";
+    console.log(`[feishu] recv msg_type=${message.message_type} chat=${message.chat_type} from=${sender.sender_id?.open_id?.slice(0, 10)}`);
     if (this.recentMessageIds.has(messageId)) return;
     this.recentMessageIds.add(messageId);
     if (this.recentMessageIds.size > 500) {
@@ -14821,6 +14944,13 @@ var FeishuAdapter = class _FeishuAdapter {
       if (msgType === "file") {
         return { text: `[\u6587\u4EF6: ${parsed.file_name || "\u672A\u77E5\u6587\u4EF6"}]`, imageKeys, fileKey: parsed.file_key, fileName: parsed.file_name };
       }
+      if (msgType === "share_location" || msgType === "location") {
+        const name = parsed.name || "";
+        const lat = parsed.latitude || "";
+        const lng = parsed.longitude || "";
+        const text = `[\u4F4D\u7F6E: ${name}${lat && lng ? ` (${lat}, ${lng})` : ""}]`;
+        return { text, imageKeys };
+      }
       if (msgType === "post") {
         const lines = [];
         if (Array.isArray(parsed.content)) {
@@ -17282,6 +17412,8 @@ var SessionManager = class {
   platformMapPath;
   /** 外部 hook：每次创建新 writer 时回调（如 EverOS sync 注入 onMessageWritten） */
   onWriterCreated = null;
+  /** 外部 hook：判断 session 是否有活跃 query（idle cleanup 据此跳过，防止误关 query 正持有的 writer） */
+  onIsSessionActive = null;
   histories = /* @__PURE__ */ new Map();
   restoredRecallPaths = /* @__PURE__ */ new Map();
   writers = /* @__PURE__ */ new Map();
@@ -17728,6 +17860,7 @@ var SessionManager = class {
       const now = Date.now();
       for (const [id, lastUsed] of this.lastUsed) {
         if (now - lastUsed > idleMs) {
+          if (this.onIsSessionActive?.(id)) continue;
           const writer = this.writers.get(id);
           if (writer) {
             writer.close();
@@ -19078,8 +19211,11 @@ async function deepinfraRerank(query, episodes, rerankUrl, rerankApiKey, rerankM
 }
 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 everosUrl = options?.everosUrl;
+  const userId = options?.userId;
+  if (!everosUrl || !userId) {
+    throw new Error(`[memdir] everos recall: everosUrl/userId \u672A\u914D\u7F6E (everosUrl=${everosUrl}, userId=${userId})\uFF0C\u4E0D\u6267\u884C everos recall\uFF0C\u907F\u514D\u4E32\u5230\u522B\u4EBA\u7684\u5E93`);
+  }
   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}`);
@@ -19401,7 +19537,9 @@ ${text}` : text });
   } else {
     console.log(`[pre-llm-debug] userMsgContent is string, len=${String(userMsgContent).length}`);
   }
-  const messages = [...history, msg.user(userMsgContent)];
+  const vcN = liveConfig.get("voiceChat.lightContextN") ?? 20;
+  const lightHistory = channelName === "voice-chat" && history.length > vcN ? history.slice(-vcN) : history;
+  const messages = [...lightHistory, msg.user(userMsgContent)];
   if (deps.mcpManager && !deps.mcpManager.isMcpDeltaSent(sessionId)) {
     const delta = deps.mcpManager.getMcpDelta();
     if (delta && delta.addedBlocks.length > 0) {
@@ -19570,7 +19708,7 @@ ${text}` : text });
   const queryAbortController = new AbortController();
   engine.setExternalAbort(queryAbortController);
   setActiveQueryEngine(sessionId, engine);
-  const shouldSkipRecall = skipRecall ?? channelName === "cron";
+  const shouldSkipRecall = skipRecall ?? (channelName === "cron" || channelName === "voice-chat");
   if (getFeature("topic-recall") !== false && !shouldSkipRecall) {
     try {
       const memoryDir = getAutoMemPath(workspace);
@@ -19618,31 +19756,49 @@ ${text}` : text });
       const recallP = deps.recallProvider;
       const recallMode = topics?.recall?.mode || "llm";
       let relevantMemories;
-      if (recallMode === "everos") {
+      const effectiveText = textForMemory.replace(/\[图片来自[^\]]*\]|路径：\S+/g, "").trim();
+      if (!effectiveText) {
+        console.log("[handle-query] Memory recall skipped: image-only message (no effective text)");
+        relevantMemories = [];
+      } else 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: topics?.recall?.minScore
-          } : void 0
-        );
+        if (everosCfg && everosCfg.everosUrl && everosCfg.userId) {
+          relevantMemories = await findRelevantMemoriesEveros(
+            effectiveText,
+            memoryDir,
+            surfaced.paths,
+            {
+              everosUrl: everosCfg.everosUrl,
+              userId: everosCfg.userId,
+              rerankUrl: everosCfg.rerank?.baseUrl,
+              rerankApiKey: everosCfg.rerank?.apiKey,
+              rerankModel: everosCfg.rerank?.model,
+              rerankProvider: everosCfg.rerank?.provider,
+              minScore: topics?.recall?.minScore
+            }
+          );
+        } else {
+          console.log("[handle-query] everos recall skipped: everosCfg not configured, falling back to LLM recall");
+          relevantMemories = await findRelevantMemories(
+            effectiveText,
+            memoryDir,
+            recallP?.provider || provider,
+            recallP?.model || model,
+            queryAbortController.signal,
+            surfaced.paths,
+            recallP?.disableThinking,
+            topics?.maxScanFiles
+          );
+        }
       } else if (recallMode === "vector") {
         relevantMemories = await findRelevantMemoriesVector(
-          textForMemory,
+          effectiveText,
           memoryDir,
           surfaced.paths
         );
       } else {
         relevantMemories = await findRelevantMemories(
-          textForMemory,
+          effectiveText,
           memoryDir,
           recallP?.provider || provider,
           recallP?.model || model,
@@ -20874,6 +21030,10 @@ var NudgePlugin = class {
     registerCallbackHook("Stop", {
       type: "callback",
       callback: async (input, _toolUseID, _signal) => {
+        if (this.cfg.stopHookEnabled === false) {
+          console.log("[stop-hook] disabled via /stophook off \u2014 skipping");
+          return { outcome: { outcome: "success" } };
+        }
         const mode = this.cfg.stopHookMode || "sync";
         if (mode === "async") {
           console.log("[stop-hook] async mode \u2014 firing judge in background, not blocking");
@@ -21148,26 +21308,28 @@ var NudgePlugin = class {
       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 hint = `\uFF08\u6E05\u7406\u5173\u952E\u5B57\u53EF\u7528\uFF1A\u8FC7\u671F\u4E86 / \u5DF2\u843D\u76D8 / resolved / \u5DF2\u5904\u7406 / \u5DF2\u95ED\u73AF\uFF0C\u5982 "${due[0].id} \u5DF2\u5904\u7406"\uFF09`;
       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
 
 ${items}
 
-\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
+\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"\u6216"${due[0].id} \u5DF2\u5904\u7406"\u544A\u8BC9 nudge \u7CBE\u786E\u6E05\u7406\u8FD9\u6761\u3002${hint}` : `\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`;
+\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"\uFF08\u6216 \u5DF2\u5904\u7406/\u5DF2\u843D\u76D8/resolved/\u5DF2\u95ED\u73AF\uFF09\u544A\u8BC9 nudge \u7CBE\u786E\u6E05\u7406\u3002`;
       return { message: buildNudgeNotification("wake", desc), ids: due.map((n) => n.id) };
     } catch (e) {
       console.warn(`[nudge] collectDueStopHookNotifications error: ${e.message}`);
       return null;
     }
   }
-  /** 从回复文本里提取 "<id> 过期了" 的 wake id（一条回复可能处置多个） */
+  /** 从回复文本里提取 "<id> 过期了" 的 wake id（一条回复可能处置多个）
+   *  0816 翀哥：关键字多样化——过期了/已落盘/resolved/已处理/已闭环/已归档 都认 */
   extractWakeReplyIds(text) {
     if (!text) return [];
     const ids = [];
-    const re = /(wake-\d+-[a-z0-9]+)\s*过期了/g;
+    const re = /(wake-\d+-[a-z0-9]+)\s*(?:过期了|已落盘|resolved|已处理|已闭环|已归档|已完成|done)/g;
     let m;
     while ((m = re.exec(text)) !== null) {
       if (!ids.includes(m[1])) ids.push(m[1]);
@@ -23610,8 +23772,9 @@ var VoiceChatPlugin = class _VoiceChatPlugin {
 - \u4FDD\u6301\u7B80\u77ED\u53E3\u8BED\u5316\uFF08\u901A\u5E38 1-3 \u53E5\uFF09\uFF0C\u4E0D\u8981\u957F\u7BC7\u5927\u8BBA
 - \u7B2C\u4E00\u53E5\u63A7\u5236\u5728 4-6 \u4E2A\u5B57\uFF0C\u5C3D\u5FEB\u89E6\u53D1 TTS \u5408\u6210
 - \u8BF4\u8BDD\u50CF\u4EBA\u2014\u2014\u77ED\u53E5\uFF0C\u53BB\u670D\u52A1\u611F
-- \u5982\u65E0\u5FC5\u8981\u4E0D\u8981\u8C03\u7528\u5DE5\u5177\uFF0C\u76F4\u63A5\u56DE\u590D
-- \u5982\u679C\u786E\u5B9E\u9700\u8981\u8C03\u7528\u5DE5\u5177\uFF08\u6BD4\u5982\u76F4\u64AD\u63A8\u6D41\u3001\u67E5\u4FE1\u606F\uFF09\uFF0C\u5148\u8BF4\u4E00\u53E5\u7B80\u77ED\u7684\u8BDD\u8BA9\u6211\u77E5\u9053\uFF0C\u6BD4\u5982"\u7A0D\u7B49\u6211\u770B\u770B"\u3001"\u7B49\u6211\u4E00\u4E0B"\uFF0C\u518D\u8C03\u7528\u5DE5\u5177`;
+- \u3010\u786C\u89C4\u5219\u3011\u8BED\u97F3\u5BF9\u8BDD\u4E2D\u7981\u6B62\u8C03\u7528 exec / SSH / \u8BFB\u5927\u6587\u4EF6\u7B49\u6162\u5DE5\u5177\u2014\u2014\u67E5\u6570\u636E\u7C7B\u95EE\u9898\u76F4\u63A5\u7528\u5634\u7B54"\u8FD9\u4E2A\u6211\u98DE\u4E66\u91CC\u67E5\u4E86\u544A\u8BC9\u4F60"
+- \u8BED\u97F3\u91CC\u5141\u8BB8\u7684\u5DE5\u5177\uFF1Acalendar\u3001msg_send\u3001read\uFF08\u8BFB\u76F4\u64AD\u8349\u7A3F/\u811A\u672C\u7528\uFF0C\u672C\u5730\u6587\u4EF6\u5FEB\uFF09\u2014\u2014\u4E0D\u8981\u7528 my_voice\uFF08\u8BED\u97F3\u5BF9\u8BDD\u672C\u8EAB\u5C31\u5728\u51FA\u58F0\uFF0C\u518D\u751F\u6210\u662F\u5957\u5A03\uFF09
+- \u5982\u679C\u5B9E\u5728\u9700\u8981\u67E5\uFF1A\u5148\u8BF4"\u7B49\u6211\u67E5\u4E0B"\u5E76\u6781\u7B80\u8C03\u7528\uFF0C\u67E5\u5B8C\u7ACB\u523B\u603B\u7ED3\u6210\u4E00\u53E5\u8BDD`;
     const engine = new QueryEngine(llmProvider, {
       model: modelId,
       systemPrompt: (ctx.deps.systemPrompt || "") + voiceChatRules,
@@ -24325,7 +24488,22 @@ var DEFAULTS4 = {
   autoStart: true,
   defaultMode: "hybrid_agentic"
 };
-function parseEverosConfig(raw) {
+function resolveProviderConfig(rawSection, providers, defaultModel, defaultApiKey, defaultBaseUrl) {
+  if (!rawSection) {
+    return { model: defaultModel, apiKey: defaultApiKey, baseUrl: defaultBaseUrl };
+  }
+  const providerName = rawSection.provider;
+  const providerCfg = providerName ? providers?.[providerName] : void 0;
+  return {
+    provider: providerName,
+    model: rawSection.model ?? defaultModel,
+    // apiKey 从 provider 取（最易不一致，统一来源）
+    // baseUrl/model 优先用 everos 节点自己的值（同一 provider 可能有不同 endpoint）
+    apiKey: providerCfg?.apiKey ?? rawSection.apiKey ?? defaultApiKey,
+    baseUrl: rawSection.baseUrl ?? providerCfg?.baseUrl ?? defaultBaseUrl
+  };
+}
+function parseEverosConfig(raw, providers) {
   if (!raw) {
     return {
       enabled: false,
@@ -24345,8 +24523,20 @@ function parseEverosConfig(raw) {
     userId: raw.userId ?? "xiaomei",
     autoStart: raw.autoStart !== false,
     defaultMode: raw.defaultMode ?? DEFAULTS4.defaultMode,
-    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" },
+    llm: resolveProviderConfig(
+      raw.llm,
+      providers,
+      "glm-5.2",
+      "",
+      "https://open.bigmodel.cn/api/coding/paas/v4"
+    ),
+    rerank: resolveProviderConfig(
+      raw.rerank,
+      providers,
+      "Qwen/Qwen3-Reranker-4B",
+      "",
+      "https://api.deepinfra.com/v1/inference"
+    ),
     lancedbPath: raw.lancedbPath ?? "",
     sqlitePath: raw.sqlitePath ?? "",
     minScore: raw.minScore
@@ -24397,14 +24587,14 @@ var EverosSearchClient = class {
       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",
+        user_id: params.userId,
         mode,
         top_k: params.topK ?? 5,
         strategy: params.strategy || "multi_query"
       }) : JSON.stringify({
         query: params.query,
-        user_id: params.userId || "user",
-        app_id: "xiaomei",
+        user_id: params.userId,
+        app_id: params.appId,
         project_id: "default",
         top_k: params.topK ?? 5
       });
@@ -24442,8 +24632,8 @@ var EverosPlugin = class {
   healthTimer = null;
   weStartedAgentic = false;
   // 我们拉起的才管
-  constructor(rawConfig) {
-    this.config = parseEverosConfig(rawConfig);
+  constructor(rawConfig, providers) {
+    this.config = parseEverosConfig(rawConfig, providers);
     this.client = new EverosSearchClient(this.config.agenticUrl, this.config.everosUrl);
   }
   static shouldEnable(config2) {
@@ -25580,6 +25770,47 @@ async function compressWav(wavPath) {
     return wavPath;
   }
 }
+async function wavToOggOpus(wavPath) {
+  const oggPath = wavPath.replace(/\.wav$/, ".ogg");
+  await execFileAsync("ffmpeg", [
+    "-y",
+    "-i",
+    wavPath,
+    "-c:a",
+    "libopus",
+    "-b:a",
+    "32k",
+    "-ar",
+    "24000",
+    oggPath
+  ], { timeout: 3e4 });
+  if (!fs30.existsSync(oggPath) || fs30.statSync(oggPath).size < 20) {
+    throw new Error("ogg/opus encode produced empty output");
+  }
+  fs30.unlinkSync(wavPath);
+  return oggPath;
+}
+async function wavToSilk(wavPath) {
+  fs30.mkdirSync(VOICE_DIR, { recursive: true });
+  const silkPath = wavPath.replace(/\.wav$/, ".silk");
+  const script = `
+import sys, io, wave, pysilk
+src, dst = sys.argv[1], sys.argv[2]
+with wave.open(src, 'rb') as wf:
+    sr = wf.getframerate()
+    pcm = wf.readframes(wf.getnframes())
+out = io.BytesIO()
+pysilk.encode(io.BytesIO(pcm), out, sample_rate=sr, bit_rate=24000, tencent=True)
+with open(dst, 'wb') as f:
+    f.write(out.getvalue())
+print('OK')
+`;
+  await execFileAsync("python3", ["-c", script, wavPath, silkPath], { timeout: 3e4 });
+  if (!fs30.existsSync(silkPath) || fs30.statSync(silkPath).size < 20) {
+    throw new Error("silk encode produced empty output");
+  }
+  return silkPath;
+}
 registry.register({
   name: "my_voice",
   description: "Generate and send a voice message. Use for: \u53D1\u8BED\u97F3/\u8BF4\u53E5\u8BDD/\u5F55\u4E00\u6BB5/\u53D1\u58F0\u97F3/\u60F3\u542C\u4F60\u7684\u58F0\u97F3/\u8BED\u97F3\u6D88\u606F/\u8BF4\u7ED9\u6211\u542C. Uses CosyVoice (\u914D\u7F6E voiceChat.local.tts) with edge-tts fallback. Sends to weixin or feishu.",
@@ -25617,9 +25848,6 @@ registry.register({
             vc.workspaceId,
             vc.instruction
           );
-          if (audioPath.endsWith(".wav")) {
-            audioPath = await compressWav(audioPath);
-          }
         } catch (e) {
           console.warn(`[my-voice] cosyvoice failed (${e.message}), falling back to edge-tts`);
           audioPath = await ttsEdge(text);
@@ -25628,9 +25856,6 @@ registry.register({
       } else if (useEngine === "gptsovits") {
         try {
           audioPath = await ttsGptsovits(text);
-          if (audioPath.endsWith(".wav")) {
-            audioPath = await compressWav(audioPath);
-          }
         } catch (e) {
           console.warn(`[my-voice] gptsovits failed (${e.message}), falling back to edge-tts`);
           audioPath = await ttsEdge(text);
@@ -25642,12 +25867,30 @@ registry.register({
     } catch (e) {
       return { content: `TTS failed: ${e.message}`, isError: true };
     }
+    const resolvedChannelRaw = args2.channel || ctx.channel || "feishu";
+    const resolvedChannel = resolvedChannelRaw === "weixin" ? "wechat" : resolvedChannelRaw;
+    const target = ctx.channelTarget || ctx.from;
+    if (audioPath.endsWith(".wav")) {
+      if (resolvedChannel === "wechat") {
+        try {
+          audioPath = await wavToSilk(audioPath);
+        } catch (e) {
+          console.warn(`[my-voice] silk encode failed (${e.message}), falling back to m4a`);
+          audioPath = await compressWav(audioPath);
+        }
+      } else if (resolvedChannel === "feishu") {
+        try {
+          audioPath = await wavToOggOpus(audioPath);
+        } catch (e) {
+          console.warn(`[my-voice] ogg/opus encode failed (${e.message}), falling back to m4a`);
+          audioPath = await compressWav(audioPath);
+        }
+      }
+    }
     const ext = path31.extname(audioPath).toLowerCase();
-    const mimeMap = { ".mp3": "audio/mpeg", ".wav": "audio/wav", ".m4a": "audio/mp4", ".ogg": "audio/ogg" };
+    const mimeMap = { ".mp3": "audio/mpeg", ".wav": "audio/wav", ".m4a": "audio/mp4", ".ogg": "audio/ogg", ".silk": "audio/silk" };
     const mimeType = mimeMap[ext] || "audio/mpeg";
     const sizeKB = fs30.statSync(audioPath).size / 1024;
-    const resolvedChannel = args2.channel || ctx.channel || "feishu";
-    const target = ctx.channelTarget || ctx.from;
     try {
       await mgr.sendFile(resolvedChannel, target, caption, {
         path: audioPath,
@@ -25685,9 +25928,12 @@ function getProxyDispatcher2() {
     return void 0;
   }
 }
-var FAL_KEY = "3b848fc6-bee5-46e5-8db7-ae81ac16dc28:2f1f15cf394db2d32c9bb9a4f23f3bee";
 var FAL_ENDPOINT = "https://fal.run/xai/grok-imagine-image/edit";
 var DEFAULT_RESOLUTION = "1k";
+var FAL_KEY_FALLBACK = "3b848fc6-bee5-46e5-8db7-ae81ac16dc28:2f1f15cf394db2d32c9bb9a4f23f3bee";
+function getFalKey(cfg) {
+  return cfg?.providers?.fal?.apiKey || cfg?.my_selfie?.falKey || FAL_KEY_FALLBACK;
+}
 var DEFAULT_REFERENCES = [
   { name: "default", p: "images/xiaomei_clean_v2.png" },
   { name: "v3", p: "images/xiaomei_clean_v3.png" },
@@ -25730,6 +25976,7 @@ function detectMode(input) {
   return "direct";
 }
 async function generateWithFal(imageB64, prompt, resolution) {
+  const cfg = liveConfig.all();
   let aspectRatio;
   try {
     const refBuf = Buffer.from(imageB64, "base64");
@@ -25754,8 +26001,7 @@ async function generateWithFal(imageB64, prompt, resolution) {
       }
     }
     if (w > 0 && h > 0) {
-      aspectRatio = `${w}/${h}`;
-      console.log(`[my-selfie] ref image ${w}x${h}, aspect_ratio=${aspectRatio}`);
+      console.log(`[my-selfie] ref image ${w}x${h}, aspect_ratio skipped`);
     }
   } catch (e) {
     console.warn(`[my-selfie] Failed to read ref dimensions: ${e.message}`);
@@ -25770,7 +26016,7 @@ async function generateWithFal(imageB64, prompt, resolution) {
   if (aspectRatio) body.aspect_ratio = aspectRatio;
   const res = await fetch(FAL_ENDPOINT, {
     method: "POST",
-    headers: { "Authorization": `Key ${FAL_KEY}`, "Content-Type": "application/json" },
+    headers: { "Authorization": `Key ${getFalKey(cfg)}`, "Content-Type": "application/json" },
     body: JSON.stringify(body)
   });
   if (!res.ok) {
@@ -28182,7 +28428,12 @@ ${content}`
     // tool 读自己配置用
     recallProvider: memoryRecallProvider || void 0,
     extractProvider: memoryExtractProvider || void 0,
-    everosCfg: config2.everos,
+    everosCfg: config2.everos ? {
+      ...config2.everos,
+      // resolve provider 引用：从 providers 取 apiKey（rerank 在 handle-query.ts 里直接读 raw config）
+      llm: config2.everos.llm?.provider && config2.providers?.[config2.everos.llm.provider] ? { ...config2.everos.llm, apiKey: config2.providers[config2.everos.llm.provider].apiKey } : config2.everos.llm,
+      rerank: config2.everos.rerank?.provider && config2.providers?.[config2.everos.rerank.provider] ? { ...config2.everos.rerank, apiKey: config2.providers[config2.everos.rerank.provider].apiKey } : config2.everos.rerank
+    } : void 0,
     mcpManager
   };
   if (visionEngine && visionConfig) {
@@ -28202,7 +28453,13 @@ ${content}`
       config: config2,
       // tool 读自己配置用
       recallProvider: memoryRecallProvider || void 0,
-      extractProvider: memoryExtractProvider || void 0
+      extractProvider: memoryExtractProvider || void 0,
+      everosCfg: config2.everos ? {
+        ...config2.everos,
+        // resolve provider 引用：从 providers 取 apiKey（跟主 deps 同逻辑）
+        llm: config2.everos.llm?.provider && config2.providers?.[config2.everos.llm.provider] ? { ...config2.everos.llm, apiKey: config2.providers[config2.everos.llm.provider].apiKey } : config2.everos.llm,
+        rerank: config2.everos.rerank?.provider && config2.providers?.[config2.everos.rerank.provider] ? { ...config2.everos.rerank, apiKey: config2.providers[config2.everos.rerank.provider].apiKey } : config2.everos.rerank
+      } : void 0
     };
   }
   let modelOverride = null;
@@ -28251,7 +28508,8 @@ ${content}`
         channels: config2.channels,
         config: config2,
         recallProvider: memoryRecallProvider || void 0,
-        extractProvider: memoryExtractProvider || void 0
+        extractProvider: memoryExtractProvider || void 0,
+        everosCfg: deps?.everosCfg
       };
     }
   };
@@ -28293,11 +28551,13 @@ ${content}`
       systemPrompt,
       channels: config2.channels,
       recallProvider: memoryRecallProvider || void 0,
-      extractProvider: memoryExtractProvider || void 0
+      extractProvider: memoryExtractProvider || void 0,
+      everosCfg: deps?.everosCfg
     };
   }
   const dispatcher = new MessageDispatcher();
   deps.dispatcher = dispatcher;
+  sessions.onIsSessionActive = (sid) => dispatcher.isActive(sid);
   setNotificationCallback((notif, route) => {
     const sid = route?.sessionId || sessions.getSessionId("scope:main") || "main";
     const chan = route?.channel;
@@ -28668,6 +28928,10 @@ ${notifications}
       { name: "session-memory", description: "\u67E5/\u5207 session-memory\uFF08on/off/\u7559\u7A7A=\u67E5\uFF09", options: [
         { name: "state", description: "on \u6216 off\uFF0C\u7559\u7A7A=\u53EA\u67E5\u72B6\u6001", type: "string", required: false }
       ] },
+      // 8/17 stophook 总开关（翀哥要求）
+      { name: "stophook", description: "\u67E5/\u5207 stop-hook\uFF08on/off/\u7559\u7A7A=\u67E5\uFF09", options: [
+        { name: "state", description: "on \u6216 off\uFF0C\u7559\u7A7A=\u53EA\u67E5\u72B6\u6001", type: "string", required: false }
+      ] },
       (() => {
         const aliases = config2.modelAliases || {};
         const aliasByRef = /* @__PURE__ */ new Map();
@@ -29096,6 +29360,29 @@ ${result.changes.map((c) => `- ${c}`).join("\n")}` : `\u274C Reload failed: ${re
         await ctx.reply(`\u2705 ${key}: **${cur}** \u2192 **${rawState}**`);
         return;
       }
+      if (ctx.command === "stophook") {
+        const rawState = (ctx.args.state || "").trim().toLowerCase();
+        const getPath = "nudge.stopHookEnabled";
+        const curVal = config2?.nudge?.stopHookEnabled;
+        const cur = curVal === false ? "off" : "on";
+        if (rawState === "") {
+          await ctx.reply(`\u{1F4CA} stop-hook: **${cur}**\uFF08nudge \u63D2\u4EF6 stopHookEnabled=${String(curVal ?? "\u672A\u8BBE(\u9ED8\u8BA4on)")}\uFF09`);
+          return;
+        }
+        if (rawState !== "on" && rawState !== "off") {
+          await ctx.reply(`\u274C \u53EA\u63A5\u53D7 on \u6216 off
+\u5F53\u524D\uFF1Astop-hook = **${cur}**`);
+          return;
+        }
+        if (rawState === cur) {
+          await ctx.reply(`\u2139\uFE0F stop-hook \u5DF2\u7ECF\u662F **${cur}**`);
+          return;
+        }
+        await liveConfig.set(getPath, rawState === "on");
+        console.log(`[stophook] stop-hook ${cur} \u2192 ${rawState} (live + persisted)`);
+        await ctx.reply(`\u2705 stop-hook: **${cur}** \u2192 **${rawState}**${rawState === "off" ? "\\n\uFF08\u8FDE\u73AF nudge \u9759\u9ED8\u4E2D\u2014\u2014wake-up/corrective \u5168\u505C\uFF0C\u8981\u7528\u518D /stophook on\uFF09" : ""}`);
+        return;
+      }
       if (ctx.command === "model") {
         const input = (ctx.args.model || "").trim();
         const aliases = config2.modelAliases || {};
@@ -29821,7 +30108,7 @@ ${pathStr}` }];
       }
     }
     if (config2.everos?.enabled) {
-      pluginManager.register(new EverosPlugin(config2.everos));
+      pluginManager.register(new EverosPlugin(config2.everos, config2.providers));
       console.log("[everos] Plugin registered");
     }
     globalThis.__pluginManager = pluginManager;