@wu529778790/open-im 1.9.3-beta.1 → 1.9.3-beta.3

package/dist/adapters/claude-sdk-adapter.js

@@ -69,7 +69,13 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
                 process.chdir(workDir);
             }
             if (sessionId) {
-                // 尝试恢复已有会话
+                // 优先复用内存中已有的 SDKSession，避免每次都启动新进程
+                const existing = activeSessions.get(sessionId);
+                if (existing) {
+                    log.info(`Reusing existing in-memory session: ${sessionId}`);
+                    return { session: existing, sessionId };
+                }
+                // 内存中没有，尝试通过 resume 恢复（会启动新 CLI 进程）
                 try {
                     log.info(`Attempting to resume session: ${sessionId}`);
                     session = unstable_v2_resumeSession(sessionId, sessionOptions);
@@ -173,8 +179,10 @@ export class ClaudeSDKAdapter {
                             const newSessionId = msg.session_id;
                             if (newSessionId && newSessionId !== actualSessionId) {
                                 // 更新 sessionId 映射
-                                if (actualSessionId && actualSessionId.startsWith('pending-')) {
-                                    activeSessions.delete(actualSessionId);
+                                // 清理 pending 临时 ID（actualSessionId 尚未赋值时用 pendingTempId）
+                                const idToClean = actualSessionId ?? pendingTempId;
+                                if (idToClean?.startsWith('pending-')) {
+                                    activeSessions.delete(idToClean);
                                 }
                                 activeSessions.set(newSessionId, session);
                                 actualSessionId = newSessionId;

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

@@ -149,13 +149,23 @@ export class WorkBuddyCentrifugeClient {
             // The WorkBuddy server uses the registered channelId as the WeChat KF send_msg
             // `touser`.  Re-register the channel with the current WeChat user's externalUserId
             // so that the server sends the reply to the correct customer.
-            if (this.config.registerChannelFn && sessionId.includes('::')) {
-                const externalUserId = sessionId.split('::')[0];
-                try {
-                    await this.config.registerChannelFn(externalUserId);
-                }
-                catch (err) {
-                    log.warn(`${this.logPrefix} registerChannelFn failed (reply may go to wrong user):`, err);
+            const externalUserId = sessionId.includes('::') ? sessionId.split('::')[0] : null;
+            if (this.config.registerChannelFn && externalUserId) {
+                // Retry registerChannelFn up to 3 times on network failure
+                for (let attempt = 1; attempt <= 3; attempt++) {
+                    try {
+                        await this.config.registerChannelFn(externalUserId);
+                        break;
+                    }
+                    catch (err) {
+                        if (attempt < 3) {
+                            log.warn(`${this.logPrefix} registerChannelFn attempt ${attempt} failed, retrying in 2s:`, err);
+                            await new Promise((r) => setTimeout(r, 2000));
+                        }
+                        else {
+                            log.warn(`${this.logPrefix} registerChannelFn failed after 3 attempts (reply may go to wrong user):`, err);
+                        }
+                    }
                 }
             }
             const httpPayload = {
@@ -172,27 +182,44 @@ export class WorkBuddyCentrifugeClient {
             };
             const url = `${this.config.httpBaseUrl}/v2/backgroundagent/wecom/local-proxy/receive`;
             log.debug(`${this.logPrefix} HTTP COPILOT_RESPONSE → ${url} chatId=${sessionId} msgLen=${message.length}`);
-            try {
-                const res = await fetch(url, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                        Authorization: `Bearer ${this.config.httpAccessToken}`,
-                    },
-                    body: JSON.stringify(httpPayload),
-                    signal: AbortSignal.timeout(30_000),
-                });
-                const body = await res.text().catch(() => '');
-                if (!res.ok) {
-                    log.error(`${this.logPrefix} HTTP COPILOT_RESPONSE failed: ${res.status} ${body.substring(0, 300)}`);
+            // Retry COPILOT_RESPONSE up to 3 times on network failure
+            let sent = false;
+            for (let attempt = 1; attempt <= 3; attempt++) {
+                try {
+                    const res = await fetch(url, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                            Authorization: `Bearer ${this.config.httpAccessToken}`,
+                        },
+                        body: JSON.stringify(httpPayload),
+                        signal: AbortSignal.timeout(30_000),
+                    });
+                    const body = await res.text().catch(() => '');
+                    if (!res.ok) {
+                        log.error(`${this.logPrefix} HTTP COPILOT_RESPONSE failed: ${res.status} ${body.substring(0, 300)}`);
+                    }
+                    else {
+                        log.info(`${this.logPrefix} HTTP COPILOT_RESPONSE ok: ${res.status} ${body.substring(0, 200)}`);
+                    }
+                    sent = true;
+                    break;
                 }
-                else {
-                    log.info(`${this.logPrefix} HTTP COPILOT_RESPONSE ok: ${res.status} ${body.substring(0, 200)}`);
+                catch (err) {
+                    if (attempt < 3) {
+                        log.warn(`${this.logPrefix} HTTP COPILOT_RESPONSE attempt ${attempt} failed, retrying in 2s:`, err);
+                        await new Promise((r) => setTimeout(r, 2000));
+                    }
+                    else {
+                        log.error(`${this.logPrefix} HTTP COPILOT_RESPONSE error after 3 attempts:`, err);
+                    }
                 }
             }
-            catch (err) {
-                log.error(`${this.logPrefix} HTTP COPILOT_RESPONSE error:`, err);
+            if (!sent) {
+                log.error(`${this.logPrefix} Failed to send COPILOT_RESPONSE after retries`);
             }
+            // 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.1",
+  "version": "1.9.3-beta.3",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",