@wu529778790/open-im 1.8.3-beta.10 → 1.8.3-beta.12

package/dist/setup.js

@@ -461,9 +461,18 @@ export async function runInteractiveSetup() {
                 catch {
                     // account info is optional
                 }
-                const userId = accountInfo?.uid?.toString() ?? "";
+                const ai = accountInfo;
+                // Try multiple field names; fall back to tokenResult.userId, then existing config
+                const existingUserId = wb?.userId;
+                const userId = String(ai?.uid ?? ai?.userId ?? ai?.user_id ??
+                    tokenResult.userId ??
+                    existingUserId ?? "");
+                if (!userId) {
+                    console.warn("⚠️ 未能获取 WorkBuddy 用户 ID，sessionId 可能不正确，建议稍后重试");
+                }
                 // Set oauth.userId so buildSessionId() produces the correct sessionId.
                 oauth.userId = userId;
+                console.log(`   userId: ${userId || "(空)"}, sessionId 将为: ${oauth.buildSessionId()}`);
                 // Save credentials immediately — even if binding fails below
                 config.platforms.workbuddy = {
                     enabled: true,
@@ -473,22 +482,18 @@ export async function runInteractiveSetup() {
                 };
                 oauthOk = true;
                 console.log("\n✅ WorkBuddy 凭证已获取，正在生成微信客服绑定链接...");
-                // Phase 2: WeChat KF binding (non-fatal)
+                // Phase 2: WeChat KF binding link (non-fatal, no polling needed)
                 try {
-                    const sessionId = oauth.buildSessionId();
+                    const { join: pathJoin } = await import("node:path");
+                    const { homedir } = await import("node:os");
+                    const clawPath = pathJoin(homedir(), "WorkBuddy", "Claw");
+                    const sessionId = oauth.buildSessionId(clawPath);
                     const linkResult = await oauth.getWeChatKfLink(sessionId);
                     if (linkResult.success && linkResult.url) {
                         console.log("\n━━━ 微信客服绑定 ━━━");
-                        console.log("请复制以下链接，在微信中发给「文件传输助手」并点击打开：");
+                        console.log("请将以下链接发给微信「文件传输助手」并点击打开，即完成绑定：");
                         console.log(linkResult.url);
-                        console.log("\n等待绑定完成（最长 5 分钟）...\n");
-                        const bindResult = await oauth.pollBindStatus(sessionId);
-                        if (bindResult.bound) {
-                            console.log(`✅ 微信客服绑定成功！${bindResult.nickname ? ` 用户: ${bindResult.nickname}` : ""}`);
-                        }
-                        else {
-                            console.log("⚠️ 绑定超时，你可以稍后重新运行 open-im init 完成绑定");
-                        }
+                        console.log("\n绑定完成后运行 open-im start 启动服务即可收发消息。");
                     }
                     else {
                         console.log(`⚠️ 获取微信客服链接失败: ${linkResult.message ?? "未知错误"}`);
@@ -526,21 +531,17 @@ export async function runInteractiveSetup() {
                     userId: wb?.userId ?? '',
                 });
                 oauthKeep.userId = wb?.userId ?? '';
-                const sessionId = oauthKeep.buildSessionId();
+                const { join: pathJoin2 } = await import("node:path");
+                const { homedir: homedir2 } = await import("node:os");
+                const clawPath2 = pathJoin2(homedir2(), "WorkBuddy", "Claw");
+                const sessionId = oauthKeep.buildSessionId(clawPath2);
                 console.log(`\n正在获取微信客服绑定链接... (sessionId: ${sessionId})`);
                 const linkResult = await oauthKeep.getWeChatKfLink(sessionId);
                 if (linkResult.success && linkResult.url) {
                     console.log("\n━━━ 微信客服绑定 ━━━");
-                    console.log("请复制以下链接，在微信中发给「文件传输助手」并点击打开：");
+                    console.log("请将以下链接发给微信「文件传输助手」并点击打开，即完成绑定：");
                     console.log(linkResult.url);
-                    console.log("\n等待绑定完成（最长 5 分钟）...\n");
-                    const bindResult = await oauthKeep.pollBindStatus(sessionId);
-                    if (bindResult.bound) {
-                        console.log(`✅ 微信客服绑定成功！${bindResult.nickname ? ` 用户: ${bindResult.nickname}` : ""}`);
-                    }
-                    else {
-                        console.log("⚠️ 绑定超时，你可以稍后重新运行 open-im init 完成绑定");
-                    }
+                    console.log("\n绑定完成后运行 open-im start 启动服务即可收发消息。");
                 }
                 else {
                     console.log(`⚠️ 获取绑定链接失败: ${linkResult.message ?? "未知"}`);

package/dist/workbuddy/centrifuge-client.js

@@ -145,20 +145,20 @@ export class WorkBuddyCentrifugeClient {
         // WeChat KF messages: send via HTTP COPILOT_RESPONSE
         if (this.config.httpBaseUrl && this.config.httpAccessToken) {
             const message = payload.content?.map((c) => c.text).join('') || payload.error || '';
-            // chatId format: "<wechatUserId>::origin::wechatkfProxy"
-            // Extract user ID for toUser field; keep full chatId for routing.
+            // Incoming chatId format: "<wechatExternalUserId>::origin::wechatkfProxy"
+            // Server requires chatId = just the WeChat external user ID (the part before "::").
             const chatIdFull = payload.session_id;
-            const toUser = chatIdFull.includes('::') ? chatIdFull.split('::')[0] : chatIdFull;
+            const chatId = chatIdFull.includes('::') ? chatIdFull.split('::')[0] : chatIdFull;
             const httpPayload = {
                 type: 'COPILOT_RESPONSE',
                 msgId: payload.prompt_id,
-                chatId: chatIdFull,
-                toUser,
+                chatId, // WeChat external user ID only — server uses this as touser
                 success: payload.stop_reason === 'end_turn',
                 message,
                 metadata: {
                     sessionId: this.config.workspaceSessionId || payload.session_id,
-                    toUser,
+                    requestId: payload.prompt_id,
+                    state: payload.stop_reason === 'end_turn' ? 'completed' : payload.stop_reason,
                 },
             };
             const url = `${this.config.httpBaseUrl}/v2/backgroundagent/wecom/local-proxy/receive`;

package/dist/workbuddy/client.js

@@ -7,7 +7,7 @@
 import { randomUUID } from 'node:crypto';
 import { existsSync, mkdirSync } from 'node:fs';
 import { join } from 'node:path';
-import { hostname } from 'node:os';
+import { hostname, homedir } from 'node:os';
 import { createLogger } from '../logger.js';
 import { WorkBuddyOAuth } from './oauth.js';
 import { WorkBuddyCentrifugeClient } from './centrifuge-client.js';
@@ -62,27 +62,30 @@ async function connect() {
     const pc = platformConfig;
     const baseUrl = pc.baseUrl ?? 'https://copilot.tencent.com';
     const hostId = hostname();
-    const stableWorkspaceId = `${pc.userId}-open-im-workbuddy`;
-    log.info('Registering WorkBuddy workspace...');
+    // Claw workspace path — matches the plugin's WorkBuddy Claw installation path.
+    // The directory does NOT need to exist; the server uses it as a string identifier.
+    const clawPath = join(homedir(), 'WorkBuddy', 'Claw');
+    log.info('Registering WorkBuddy host workspace...');
     let tokens;
     try {
+        // Step 1: Register host workspace (workspaceId="") — gets the Centrifuge connection
         tokens = await oauth.registerWorkspace({
             userId: pc.userId ?? '',
             hostId,
-            workspaceId: stableWorkspaceId,
-            workspaceName: 'open-im-workbuddy',
+            workspaceId: '',
+            workspaceName: 'Host Channel',
         });
     }
     catch (err) {
-        log.error('Workspace registration failed:', err);
+        log.error('Host workspace registration failed:', err);
         scheduleReconnect();
         return;
     }
-    // sessionId ≤64 chars (WeChat KF uses it as `touser`)
-    const workspaceSessionId = oauth.buildSessionId();
+    // sessionId = userId_hostId_clawPath (matches plugin's buildSessionId format)
+    const workspaceSessionId = oauth.buildSessionId(clawPath);
     const channel = tokens.channel;
     const guid = pc.guid ?? randomUUID();
-    log.info(`Workspace registered: channel=${channel}, sessionId=${workspaceSessionId}`);
+    log.info(`Host workspace registered: channel=${channel}, clawSessionId=${workspaceSessionId}`);
     if (centrifugeClient) {
         centrifugeClient.stop();
         centrifugeClient = null;
@@ -100,25 +103,56 @@ async function connect() {
     }, {
         onConnected: () => {
             log.info('WorkBuddy Centrifuge connected');
-            log.info(`sessionId (must match WeChat KF binding): ${workspaceSessionId}`);
+            log.info(`WeChat KF sessionId: ${workspaceSessionId}`);
             reconnectAttempt = 0;
             updateState('connected');
-            const doRegister = () => {
-                if (stopped || channelState !== 'connected')
-                    return;
-                oauth.registerChannel({
-                    type: 'wechatkf',
-                    sessionId: workspaceSessionId,
-                    channelId: channel,
-                    userId: pc.userId ?? '',
-                })
-                    .then((res) => log.info(`WeChat KF channel registered (online): ${JSON.stringify(res)}`))
-                    .catch((err) => log.warn(`registerChannel failed: ${String(err)}`));
-            };
-            doRegister();
-            if (heartbeatTimer)
-                clearInterval(heartbeatTimer);
-            heartbeatTimer = setInterval(doRegister, CHANNEL_HEARTBEAT_MS);
+            // Step 2: Register Claw workspace to get WeChat KF routing channel + sessionId
+            oauth.registerWorkspace({
+                userId: pc.userId ?? '',
+                hostId,
+                workspaceId: clawPath,
+                workspaceName: 'Claw',
+            }).then((clawParams) => {
+                const clawSessionId = clawParams.sessionId ?? workspaceSessionId;
+                log.info(`Claw workspace registered: channel=${clawParams.channel}, sessionId=${clawSessionId}`);
+                // Subscribe to Claw channel — WeChat KF messages are published here
+                centrifugeClient?.subscribeChannel(clawParams.channel, clawParams.subscriptionToken);
+                const doRegister = () => {
+                    if (stopped || channelState !== 'connected')
+                        return;
+                    oauth.registerChannel({
+                        type: 'wechatkf',
+                        sessionId: clawSessionId,
+                        channelId: pc.userId ?? '', // plugin uses userId, not full channel name
+                        userId: pc.userId ?? '',
+                    })
+                        .then((res) => log.info(`WeChat KF channel registered (online): ${JSON.stringify(res)}`))
+                        .catch((err) => log.warn(`registerChannel failed: ${String(err)}`));
+                };
+                doRegister();
+                if (heartbeatTimer)
+                    clearInterval(heartbeatTimer);
+                heartbeatTimer = setInterval(doRegister, CHANNEL_HEARTBEAT_MS);
+            }).catch((err) => {
+                log.error('Claw workspace registration failed:', err);
+                // Fallback: register with host sessionId
+                const doRegister = () => {
+                    if (stopped || channelState !== 'connected')
+                        return;
+                    oauth.registerChannel({
+                        type: 'wechatkf',
+                        sessionId: workspaceSessionId,
+                        channelId: pc.userId ?? '',
+                        userId: pc.userId ?? '',
+                    })
+                        .then((res) => log.info(`WeChat KF channel registered (fallback): ${JSON.stringify(res)}`))
+                        .catch((e) => log.warn(`registerChannel failed: ${String(e)}`));
+                };
+                doRegister();
+                if (heartbeatTimer)
+                    clearInterval(heartbeatTimer);
+                heartbeatTimer = setInterval(doRegister, CHANNEL_HEARTBEAT_MS);
+            });
         },
         onDisconnected: (reason) => {
             log.info(`WorkBuddy Centrifuge disconnected: ${reason}`);

package/dist/workbuddy/oauth.d.ts

@@ -39,7 +39,7 @@ export declare class WorkBuddyOAuth {
     /**
      * Build sessionId for WorkBuddy workspace
      */
-    buildSessionId(_workspacePath?: string): string;
+    buildSessionId(workspacePath?: string): string;
     /**
      * Get WeChat KF binding link
      */

package/dist/workbuddy/oauth.js

@@ -174,10 +174,10 @@ export class WorkBuddyOAuth {
     /**
      * Build sessionId for WorkBuddy workspace
      */
-    buildSessionId(_workspacePath) {
-        // Keep session ID ≤64 chars: WeChat KF uses it as `touser` in send_msg.
-        // userId (36) + "_" + hostId (≤26) is always well under the 64-char limit.
-        return `${this.userId}_${this.hostId}`;
+    buildSessionId(workspacePath) {
+        // Must match the plugin's format: ${userId}_${hostId}_${workspacePath}
+        // The server uses this as the chatId/routing key for WeChat KF messages.
+        return `${this.userId}_${this.hostId}_${workspacePath ?? ''}`;
     }
     /**
      * Get WeChat KF binding link

package/package.json

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