deepseeker-code 1.0.68 → 1.0.70

package/dist/cli.mjs

@@ -3858,7 +3858,7 @@ var init_approval = __esm({
 // ../core/src/batch/feishu/reconcile.ts
 import fs16 from "fs/promises";
 import path17 from "path";
-var cursorPath, FIRST_RUN_WINDOW_MS, loadCursor, saveCursor, p2pChatsPath, loadP2pChats, recordP2pChat, RECONCILE_MSG, msg5, runReconcile;
+var cursorPath, FIRST_RUN_WINDOW_MS, loadCursor, saveCursor, knownChatsPath, legacyP2pChatsPath, readChatsFile, loadKnownChats, recordKnownChat, RECONCILE_MSG, msg5, runReconcile;
 var init_reconcile = __esm({
   "../core/src/batch/feishu/reconcile.ts"() {
     "use strict";
@@ -3881,23 +3881,29 @@ var init_reconcile = __esm({
       await fs16.writeFile(tmp, JSON.stringify(value, null, 2), "utf-8");
       await fs16.rename(tmp, cursorPath());
     };
-    p2pChatsPath = () => path17.join(batchQueueRoot(), "feishu-p2p-chats.json");
-    loadP2pChats = async () => {
+    knownChatsPath = () => path17.join(batchQueueRoot(), "feishu-known-chats.json");
+    legacyP2pChatsPath = () => path17.join(batchQueueRoot(), "feishu-p2p-chats.json");
+    readChatsFile = async (p) => {
       try {
-        const raw = JSON.parse(await fs16.readFile(p2pChatsPath(), "utf-8"));
+        const raw = JSON.parse(await fs16.readFile(p, "utf-8"));
         return Array.isArray(raw?.chats) ? raw.chats.filter((x) => typeof x === "string") : [];
       } catch {
         return [];
       }
     };
-    recordP2pChat = async (chatId) => {
-      const chats = await loadP2pChats();
+    loadKnownChats = async () => {
+      const known = await readChatsFile(knownChatsPath());
+      if (known.length > 0) return known;
+      return readChatsFile(legacyP2pChatsPath());
+    };
+    recordKnownChat = async (chatId) => {
+      const chats = await loadKnownChats();
       if (chats.includes(chatId)) return false;
       const next = { chats: [...chats, chatId], updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-      await fs16.mkdir(path17.dirname(p2pChatsPath()), { recursive: true });
-      const tmp = `${p2pChatsPath()}.tmp-${process.pid}-${Math.random().toString(36).slice(2, 8)}`;
+      await fs16.mkdir(path17.dirname(knownChatsPath()), { recursive: true });
+      const tmp = `${knownChatsPath()}.tmp-${process.pid}-${Math.random().toString(36).slice(2, 8)}`;
       await fs16.writeFile(tmp, JSON.stringify(next, null, 2), "utf-8");
-      await fs16.rename(tmp, p2pChatsPath());
+      await fs16.rename(tmp, knownChatsPath());
       return true;
     };
     RECONCILE_MSG = {
@@ -4554,7 +4560,7 @@ var init_listen = __esm({
         botInfoFail: (e) => `\u26A0\uFE0F \u83B7\u53D6\u673A\u5668\u4EBA open_id \u5931\u8D25\uFF08${e}\uFF09\uFF1AmentionOnlyInGroup=true \u4E0B\u7FA4\u6D88\u606F\u5C06\u5168\u90E8\u62D2\u6536\uFF0C\u8BF7\u68C0\u67E5\u5E94\u7528\u6743\u9650\u6216\u628A mentionOnlyInGroup \u914D\u4E3A false\u3002`,
         msgSkip: (why) => `\u23ED\uFE0F [feishu] \u8DF3\u8FC7\u6D88\u606F\uFF1A${why}`,
         msgFail: (e) => `\u274C [feishu] \u6D88\u606F\u5904\u7406\u5F02\u5E38\uFF08\u4E0D\u4E2D\u65AD\u76D1\u542C\uFF09\uFF1A${e}`,
-        p2pLearned: (chatId) => `\u{1F4AC} \u79C1\u804A\u4F1A\u8BDD\u5DF2\u7EB3\u5165\u65AD\u7EBF\u5BF9\u8D26\uFF08${chatId.slice(0, 12)}\u2026\uFF09\uFF1A\u6B64\u540E\u65AD\u7EBF\u7A97\u53E3\u5185\u8BE5\u4F1A\u8BDD\u6F0F\u7968\u53EF\u56DE\u8865`,
+        chatLearned: (chatId) => `\u{1F4AC} \u4F1A\u8BDD\u5DF2\u7EB3\u5165\u65AD\u7EBF\u5BF9\u8D26\uFF08${chatId.slice(0, 12)}\u2026\uFF09\uFF1A\u6B64\u540E\u65AD\u7EBF\u7A97\u53E3\u5185\u8BE5\u4F1A\u8BDD\u6F0F\u7968\u53EF\u56DE\u8865`,
         cardDenied: (who) => `\u{1F6AB} \u70B9\u5361\u4EBA\u4E0D\u5728 users \u767D\u540D\u5355\uFF0C\u62D2\u7EDD\u5BA1\u6279\uFF1A${who}`,
         cardOk: (id, d) => `\u{1F3B4} \u5BA1\u6279\u51B3\u5B9A\u5DF2\u843D\u76D8 [${id.slice(0, 8)}\u2026] ${d}`,
         cardFail: (e) => `\u26A0\uFE0F \u5361\u7247\u51B3\u5B9A\u5199\u5165\u5931\u8D25\uFF1A${e}`,
@@ -4573,7 +4579,7 @@ var init_listen = __esm({
         botInfoFail: (e) => `\u26A0\uFE0F Failed to fetch bot open_id (${e}): with mentionOnlyInGroup=true all group messages will be rejected \u2014 check app permissions or set mentionOnlyInGroup=false.`,
         msgSkip: (why) => `\u23ED\uFE0F [feishu] message skipped: ${why}`,
         msgFail: (e) => `\u274C [feishu] message handling error (listener keeps running): ${e}`,
-        p2pLearned: (chatId) => `\u{1F4AC} direct chat registered for reconcile backfill (${chatId.slice(0, 12)}\u2026): missed tickets in this chat are now recoverable after reconnects`,
+        chatLearned: (chatId) => `\u{1F4AC} chat registered for reconcile backfill (${chatId.slice(0, 12)}\u2026): missed tickets in this chat are now recoverable after reconnects`,
         cardDenied: (who) => `\u{1F6AB} clicker not in the users whitelist, approval refused: ${who}`,
         cardOk: (id, d) => `\u{1F3B4} approval decision recorded [${id.slice(0, 8)}\u2026] ${d}`,
         cardFail: (e) => `\u26A0\uFE0F failed to write the approval decision: ${e}`,
@@ -4589,7 +4595,10 @@ var init_listen = __esm({
       const spec = SDK_SPECIFIER;
       return await import(spec);
     };
-    defaultSleep2 = (ms) => new Promise((res) => setTimeout(res, ms));
+    defaultSleep2 = (ms) => new Promise((res) => {
+      const t = setTimeout(res, ms);
+      if (typeof t?.unref === "function") t.unref();
+    });
     makeDefaultLog = () => {
       const file = path19.join(batchQueueRoot(), "feishu-listen.log");
       return (line) => {
@@ -4768,8 +4777,24 @@ var init_listen = __esm({
         return { code: 1 };
       }
       let stopReason = null;
+      const sleepers = /* @__PURE__ */ new Set();
+      const sleepInterruptible = async (ms) => {
+        let mine;
+        try {
+          await Promise.race([
+            sleep2(ms),
+            new Promise((res) => {
+              mine = res;
+              sleepers.add(res);
+            })
+          ]);
+        } finally {
+          if (mine) sleepers.delete(mine);
+        }
+      };
       const requestStop = (why) => {
         if (stopReason === null) stopReason = why;
+        for (const res of [...sleepers]) res();
       };
       let wsExitCode = 0;
       const wsHooks = {
@@ -4799,8 +4824,8 @@ var init_listen = __esm({
         log(msg6(locale2, "alreadyRunning", lock.holderPid));
         return { code: 1 };
       }
-      const learnedP2pChats = /* @__PURE__ */ new Set();
-      for (const c of await loadP2pChats()) learnedP2pChats.add(c);
+      const learnedChats = /* @__PURE__ */ new Set();
+      for (const c of await loadKnownChats()) learnedChats.add(c);
       const handleDeps = {
         botOpenId,
         download: deps?.download ?? makeSdkDownload(client),
@@ -4820,11 +4845,11 @@ var init_listen = __esm({
               log(msg6(locale2, "msgSkip", `\u7C7B\u578B\u4E0D\u652F\u6301\u6216\u5F62\u6001\u5F02\u5E38\uFF08${type}\uFF09`));
               return;
             }
-            if (candidate.chatType === "p2p" && candidate.chatId && fcfg.users.includes(candidate.senderOpenId)) {
-              const learned = await recordP2pChat(candidate.chatId).catch(() => false);
+            if (candidate.chatId && fcfg.users.includes(candidate.senderOpenId)) {
+              const learned = await recordKnownChat(candidate.chatId).catch(() => false);
               if (learned) {
-                learnedP2pChats.add(candidate.chatId);
-                log(msg6(locale2, "p2pLearned", candidate.chatId));
+                learnedChats.add(candidate.chatId);
+                log(msg6(locale2, "chatLearned", candidate.chatId));
               }
             }
             const r = await handleFeishuMessage(candidate, fcfg, handleDeps);
@@ -4868,10 +4893,10 @@ var init_listen = __esm({
         process.once("SIGTERM", () => onSignal("SIGTERM"));
       }
       const reconcileLoop = async () => {
-        const pull = makeSdkPull(client, fcfg, log, locale2, () => [...learnedP2pChats]);
+        const pull = makeSdkPull(client, fcfg, log, locale2, () => [...learnedChats]);
         let first = true;
         for (; ; ) {
-          if (!first) await sleep2(reconcileMs);
+          if (!first) await sleepInterruptible(reconcileMs);
           first = false;
           if (shouldStop() || stopReason !== null) return;
           await runReconcile({
@@ -4908,7 +4933,7 @@ var init_listen = __esm({
             }
           } catch {
           }
-          await sleep2(scanMs);
+          await sleepInterruptible(scanMs);
         }
       };
       await Promise.all([scanLoop(), reconcileLoop()]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "deepseeker-code",
-    "version": "1.0.68",
+    "version": "1.0.70",
     "description": "DeepSeeker-Code 终端客户端（React Ink，in-process 直驱 runAgent）",
     "homepage": "https://github.com/xknk/deepSeekCode#readme",
     "repository": {