@wu529778790/open-im 1.9.3-beta.0 → 1.9.3-beta.2

package/dist/index.js

@@ -1,5 +1,6 @@
 import { createServer } from "node:http";
 import { writeFileSync, existsSync, mkdirSync, unlinkSync } from "node:fs";
+import { randomUUID } from "node:crypto";
 import { dirname, join } from "node:path";
 import { getConfiguredAiCommands, loadConfig, needsSetup, resolvePlatformAiCommand } from "./config.js";
 import { runInteractiveSetup, runClaudeApiSetup } from "./setup.js";
@@ -22,6 +23,7 @@ import { initDingTalk, stopDingTalk, formatDingTalkInitError } from "./dingtalk/
 import { setupDingTalkHandlers } from "./dingtalk/event-handler.js";
 import { initWorkBuddy, stopWorkBuddy } from "./workbuddy/client.js";
 import { setupWorkBuddyHandlers } from "./workbuddy/event-handler.js";
+import { sendTextReply as sendWorkBuddyTextReply } from "./workbuddy/message-sender.js";
 import { initAdapters, cleanupAdapters } from "./adapters/registry.js";
 import { SessionManager } from "./session/session-manager.js";
 import { loadActiveChats, getActiveChatId, flushActiveChats, } from "./shared/active-chats.js";
@@ -33,13 +35,14 @@ const require = createRequire(import.meta.url);
 const { version: APP_VERSION } = require("../package.json");
 const log = createLogger("Main");
 async function sendLifecycleNotification(platform, message) {
-    // DingTalk 和 WorkBuddy 不支持主动发消息（OpenAPI 需 robotCode 等，易报 robot 不存在），跳过启动/关闭通知
-    if (platform === "dingtalk" || platform === "workbuddy")
+    // DingTalk 不支持主动发消息（OpenAPI 需 robotCode 等，易报 robot 不存在），跳过启动/关闭通知
+    if (platform === "dingtalk")
         return;
     const telegramChatId = getActiveChatId("telegram");
     const feishuChatId = getActiveChatId("feishu");
     const qqChatId = getActiveChatId("qq");
     const weworkChatId = getActiveChatId("wework");
+    const workbuddyChatId = getActiveChatId("workbuddy");
     const sendPromises = [];
     if (platform === "telegram" && telegramChatId) {
         sendPromises.push(sendTelegramTextReply(telegramChatId, message).catch((err) => {
@@ -61,6 +64,11 @@ async function sendLifecycleNotification(platform, message) {
             log.debug("Failed to send WeWork notification:", err);
         }));
     }
+    if (platform === "workbuddy" && workbuddyChatId) {
+        sendPromises.push(sendWorkBuddyTextReply(null, workbuddyChatId, message, randomUUID()).catch((err) => {
+            log.debug("Failed to send WorkBuddy notification:", err);
+        }));
+    }
     await Promise.all(sendPromises);
 }
 function buildStartupMessage(platform, appVersion, aiCommand, defaultWorkDir, sessionManager) {

package/dist/workbuddy/centrifuge-client.d.ts

@@ -17,9 +17,14 @@ export interface CentrifugeClientConfig {
      * Called before sending a WeChat KF reply to update the channel's channelId
      * to the current WeChat user's externalUserId.  The WorkBuddy server uses the
      * registered channelId as the WeChat send_msg `touser`, so this must match the
-     * customer we are replying to.
+     * customer we are replying to.  Also locks the heartbeat to prevent race conditions.
      */
     registerChannelFn?: (externalUserId: string) => Promise<void>;
+    /**
+     * Called after the COPILOT_RESPONSE is sent (success or failure) to release
+     * the reply lock, allowing the heartbeat to resume.
+     */
+    releaseChannelLockFn?: () => void;
 }
 /** Client callbacks */
 export interface CentrifugeCallbacks {

package/dist/workbuddy/centrifuge-client.js

@@ -193,6 +193,10 @@ export class WorkBuddyCentrifugeClient {
             catch (err) {
                 log.error(`${this.logPrefix} HTTP COPILOT_RESPONSE error:`, err);
             }
+            finally {
+                // Release the heartbeat lock so the periodic registration can resume
+                this.config.releaseChannelLockFn?.();
+            }
             return;
         }
         this.sendEnvelope('session.promptResponse', payload, _guid, _userId);

package/dist/workbuddy/client.js

@@ -90,11 +90,16 @@ async function connect() {
         centrifugeClient.stop();
         centrifugeClient = null;
     }
+    // Mutex flag: prevents the heartbeat from overriding channelId while a reply is in flight.
+    let replyLock = false;
     // Re-registers the WeChat KF channel with the given externalUserId as channelId.
     // The WorkBuddy server uses channelId as the WeChat send_msg `touser`, so this
     // must be called with the customer's external_userid before sending each reply.
+    // Sets replyLock=true to block the heartbeat from overriding while we send.
     const registerChannelFn = async (externalUserId) => {
+        replyLock = true;
         const clawSessionId = oauth.buildSessionId(clawPath);
+        log.debug(`registerChannelFn: registering channelId=${externalUserId} (heartbeat paused)`);
         await oauth.registerChannel({
             type: 'wechatkf',
             sessionId: clawSessionId,
@@ -102,6 +107,10 @@ async function connect() {
             userId: pc.userId ?? '',
         });
     };
+    const releaseChannelLockFn = () => {
+        replyLock = false;
+        log.debug('registerChannelFn: reply sent, heartbeat resumed');
+    };
     centrifugeClient = new WorkBuddyCentrifugeClient({
         url: tokens.url,
         connectionToken: tokens.connectionToken,
@@ -113,6 +122,7 @@ async function connect() {
         httpAccessToken: pc.accessToken ?? '',
         workspaceSessionId,
         registerChannelFn,
+        releaseChannelLockFn,
     }, {
         onConnected: () => {
             log.info('WorkBuddy Centrifuge connected');
@@ -133,6 +143,10 @@ async function connect() {
                 const doRegister = () => {
                     if (stopped || channelState !== 'connected')
                         return;
+                    if (replyLock) {
+                        log.debug('Heartbeat skipped (reply in progress)');
+                        return;
+                    }
                     oauth.registerChannel({
                         type: 'wechatkf',
                         sessionId: clawSessionId,
@@ -152,6 +166,10 @@ async function connect() {
                 const doRegister = () => {
                     if (stopped || channelState !== 'connected')
                         return;
+                    if (replyLock) {
+                        log.debug('Heartbeat skipped (reply in progress, fallback path)');
+                        return;
+                    }
                     oauth.registerChannel({
                         type: 'wechatkf',
                         sessionId: workspaceSessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.9.3-beta.0",
+  "version": "1.9.3-beta.2",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",