@wu529778790/open-im 1.8.3-beta.7 → 1.8.3-beta.8

package/dist/setup.js

@@ -460,6 +460,10 @@ export async function runInteractiveSetup() {
                     // account info is optional
                 }
                 const userId = accountInfo?.uid?.toString() ?? "";
+                // Set oauth.userId so buildSessionId() produces the correct sessionId.
+                // Without this, the binding sessionId has an empty userId prefix, which
+                // won't match the sessionId the transport uses at runtime.
+                oauth.userId = userId;
                 config.platforms.wechat = {
                     enabled: true,
                     workbuddyAccessToken: tokenResult.accessToken,

package/dist/wechat/workbuddy-transport.d.ts

@@ -20,10 +20,16 @@ export declare class WorkBuddyTransport implements WeChatTransport {
     private state;
     private centrifugeClient;
     private oauth;
+    private stopped;
+    private reconnectAttempt;
+    private reconnectTimer;
+    private heartbeatTimer;
     private messageHandler;
     private stateChangeHandler;
     constructor(config: WorkBuddyTransportConfig);
     start(): Promise<void>;
+    private connect;
+    private scheduleReconnect;
     stop(): void;
     send(method: string, payload: unknown, replyTo?: string): void;
     onMessage(handler: MessageHandler): void;

package/dist/wechat/workbuddy-transport.js

@@ -12,28 +12,43 @@ import { createLogger } from '../logger.js';
 import { WorkBuddyCentrifugeClient } from '../workbuddy/centrifuge-client.js';
 import { WorkBuddyOAuth } from '../workbuddy/oauth.js';
 const log = createLogger('WeChat:WorkBuddy');
+const RECONNECT_DELAYS_MS = [3000, 5000, 10000, 20000, 30000];
+const CHANNEL_HEARTBEAT_MS = 30_000;
 export class WorkBuddyTransport {
     config;
     state = 'disconnected';
     centrifugeClient = null;
     oauth = null;
+    stopped = false;
+    reconnectAttempt = 0;
+    reconnectTimer = null;
+    heartbeatTimer = null;
     messageHandler = null;
     stateChangeHandler = null;
     constructor(config) {
         this.config = config;
     }
     async start() {
+        this.stopped = false;
+        await this.connect();
+    }
+    async connect() {
+        if (this.stopped)
+            return;
         this.updateState('connecting');
         try {
-            // Initialize OAuth
-            this.oauth = new WorkBuddyOAuth(this.config.baseUrl ?? 'https://copilot.tencent.com');
-            this.oauth.accessToken = this.config.accessToken;
-            this.oauth.refreshToken = this.config.refreshToken;
-            this.oauth.userId = this.config.userId;
-            // Register workspace to get Centrifuge tokens
-            log.info('Registering workspace for Centrifuge tokens...');
+            // Initialize (or reuse) OAuth
+            if (!this.oauth) {
+                this.oauth = new WorkBuddyOAuth(this.config.baseUrl ?? 'https://copilot.tencent.com');
+                this.oauth.accessToken = this.config.accessToken;
+                this.oauth.refreshToken = this.config.refreshToken;
+                this.oauth.userId = this.config.userId;
+            }
+            // Use a stable workspaceId so the server maintains a consistent channel
+            // across restarts — otherwise WeChat KF loses the routing association.
             const hostId = this.config.hostId ?? hostname();
-            const workspaceId = randomUUID();
+            const workspaceId = `${hostId}-open-im-wechat`;
+            log.info('Registering workspace for Centrifuge tokens...');
             const tokens = await this.oauth.registerWorkspace({
                 userId: this.config.userId,
                 hostId,
@@ -41,15 +56,21 @@ export class WorkBuddyTransport {
                 workspaceName: 'open-im-wechat',
             });
             log.info(`Workspace registered: channel=${tokens.channel}`);
-            // Build workspaceSessionId for HTTP COPILOT_RESPONSE metadata
+            // workspaceSessionId must match the sessionId used when the WeChat KF was bound
             const workspacePath = this.config.workspacePath ?? join(homedir(), 'WorkBuddy', 'Claw');
             const workspaceSessionId = `${this.config.userId}_${hostId}_${workspacePath}`;
-            // Create Centrifuge client
+            const channel = tokens.channel;
+            const oauth = this.oauth;
+            // Tear down previous client before creating a new one
+            if (this.centrifugeClient) {
+                this.centrifugeClient.stop();
+                this.centrifugeClient = null;
+            }
             const clientConfig = {
                 url: tokens.url,
                 connectionToken: tokens.connectionToken,
                 subscriptionToken: tokens.subscriptionToken,
-                channel: tokens.channel,
+                channel,
                 guid: this.config.guid ?? randomUUID(),
                 userId: this.config.userId,
                 httpBaseUrl: this.config.baseUrl ?? 'https://copilot.tencent.com',
@@ -59,18 +80,43 @@ export class WorkBuddyTransport {
             const callbacks = {
                 onConnected: () => {
                     log.info('WorkBuddy Centrifuge connected');
+                    log.info(`WorkBuddy sessionId (must match binding): ${workspaceSessionId}`);
+                    this.reconnectAttempt = 0;
                     this.updateState('connected');
+                    const doRegister = () => {
+                        if (this.stopped || this.state !== 'connected')
+                            return;
+                        oauth.registerChannel({
+                            type: 'wechatkf',
+                            sessionId: workspaceSessionId,
+                            channelId: channel,
+                            userId: this.config.userId,
+                        }).then((res) => {
+                            log.info(`Channel registered (WeChat KF online): ${JSON.stringify(res)}`);
+                        }).catch((err) => {
+                            log.warn(`registerChannel heartbeat failed: ${String(err)}`);
+                        });
+                    };
+                    // Register immediately and then keep heartbeat alive.
+                    doRegister();
+                    if (this.heartbeatTimer)
+                        clearInterval(this.heartbeatTimer);
+                    this.heartbeatTimer = setInterval(doRegister, CHANNEL_HEARTBEAT_MS);
                 },
                 onDisconnected: (reason) => {
                     log.info(`WorkBuddy Centrifuge disconnected: ${reason}`);
+                    if (this.heartbeatTimer) {
+                        clearInterval(this.heartbeatTimer);
+                        this.heartbeatTimer = null;
+                    }
                     this.updateState('disconnected');
+                    this.scheduleReconnect();
                 },
                 onError: (error) => {
                     log.error('WorkBuddy Centrifuge error:', error);
                     this.updateState('error');
                 },
                 onMessage: async (chatId, msgId, content) => {
-                    // Normalize WeChat KF or AGP message to AGPEnvelope
                     const envelope = {
                         msg_id: msgId,
                         guid: this.config.guid,
@@ -90,14 +136,37 @@ export class WorkBuddyTransport {
             this.centrifugeClient = new WorkBuddyCentrifugeClient(clientConfig, callbacks);
             this.centrifugeClient.start();
             log.info('WorkBuddy transport initialized');
+            this.reconnectAttempt = 0;
         }
         catch (err) {
             log.error('Failed to start WorkBuddy transport:', err);
             this.updateState('error');
-            throw err;
+            this.scheduleReconnect();
         }
     }
+    scheduleReconnect() {
+        if (this.stopped)
+            return;
+        if (this.reconnectTimer)
+            return;
+        const delayMs = RECONNECT_DELAYS_MS[Math.min(this.reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)];
+        this.reconnectAttempt++;
+        log.info(`WorkBuddy transport reconnecting in ${delayMs}ms (attempt ${this.reconnectAttempt})...`);
+        this.reconnectTimer = setTimeout(() => {
+            this.reconnectTimer = null;
+            void this.connect();
+        }, delayMs);
+    }
     stop() {
+        this.stopped = true;
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = null;
+        }
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
         if (this.centrifugeClient) {
             this.centrifugeClient.stop();
             this.centrifugeClient = null;

package/package.json

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