@wu529778790/open-im 1.8.3-beta.3 → 1.8.3-beta.5

package/dist/setup.js

@@ -424,24 +424,64 @@ export async function runInteractiveSetup() {
     if (selectedPlatforms.includes("wechat")) {
         const wc = existing?.platforms?.wechat;
         const hasToken = !!(wc?.token && wc?.guid && wc?.userId);
+        const hasWbCreds = !!(wc?.workbuddyAccessToken && wc?.workbuddyRefreshToken);
         const wechatModeResp = await prompts({
             type: "select",
             name: "mode",
             message: "微信登录方式",
             choices: [
                 {
-                    title: "扫码登录（推荐）- 用微信扫描二维码，自动获取 token",
+                    title: "WorkBuddy OAuth - 在浏览器中完成 CodeBuddy 登录（推荐）",
+                    value: "workbuddy",
+                },
+                {
+                    title: "扫码登录 - 用微信扫描二维码获取 token（QClaw/AGP 协议）",
                     value: "qr",
                 },
                 {
-                    title: "使用已有配置" + (hasToken ? " ✓" : "（需已通过扫码登录获取）"),
+                    title: "使用已有配置" + (hasToken || hasWbCreds ? " ✓" : "（需已配置）"),
                     value: "keep",
-                    disabled: !hasToken,
+                    disabled: !hasToken && !hasWbCreds,
                 },
             ],
-            initial: hasToken ? 1 : 0,
+            initial: hasWbCreds ? 0 : (hasToken ? 1 : 0),
         }, { onCancel });
-        if (wechatModeResp.mode === "qr") {
+        if (wechatModeResp.mode === "workbuddy") {
+            console.log("\n正在启动 WorkBuddy OAuth 登录...\n");
+            try {
+                const { WorkBuddyOAuth } = await import("./workbuddy/oauth.js");
+                const oauth = new WorkBuddyOAuth();
+                console.log("步骤 1/3: 获取登录链接...");
+                const { authUrl, state } = await oauth.fetchAuthState();
+                console.log("\n请在浏览器中打开以下链接完成登录：");
+                console.log(authUrl);
+                console.log("\n等待登录完成（最长 5 分钟）...\n");
+                const tokenResult = await oauth.pollToken(state);
+                console.log("✅ 登录成功！ 正在获取账号信息...");
+                let accountInfo = {};
+                try {
+                    accountInfo = await oauth.getAccount(state);
+                }
+                catch {
+                    // account info is optional
+                }
+                const userId = accountInfo?.uid?.toString() ?? "";
+                config.platforms.wechat = {
+                    loginMode: 'workbuddy',
+                    enabled: true,
+                    workbuddyAccessToken: tokenResult.accessToken,
+                    workbuddyRefreshToken: tokenResult.refreshToken,
+                    userId,
+                };
+                console.log("\n✅ WorkBuddy 登录成功，配置已保存");
+            }
+            catch (err) {
+                console.error("\n❌ WorkBuddy 登录失败:", err instanceof Error ? err.message : String(err));
+                if (platform === "wechat")
+                    return false;
+            }
+        }
+        else if (wechatModeResp.mode === "qr") {
             console.log("\n正在启动微信扫码登录...\n");
             try {
                 const { performWeChatLogin } = await import("./wechat/auth/index.js");
@@ -468,7 +508,7 @@ export async function runInteractiveSetup() {
                     return false;
             }
         }
-        else if (hasToken) {
+        else if (hasToken || hasWbCreds) {
             config.platforms.wechat = {
                 ...wc,
                 enabled: true,

package/dist/wechat/workbuddy-transport.js

@@ -5,6 +5,9 @@
  * 订阅频道接收消息，通过 HTTP POST 发送回复。
  */
 import { randomUUID } from 'node:crypto';
+import { hostname } from 'node:os';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 import { createLogger } from '../logger.js';
 import { WorkBuddyCentrifugeClient } from '../workbuddy/centrifuge-client.js';
 import { WorkBuddyOAuth } from '../workbuddy/oauth.js';
@@ -29,13 +32,18 @@ export class WorkBuddyTransport {
             this.oauth.userId = this.config.userId;
             // Register workspace to get Centrifuge tokens
             log.info('Registering workspace for Centrifuge tokens...');
+            const hostId = this.config.hostId ?? hostname();
+            const workspaceId = randomUUID();
             const tokens = await this.oauth.registerWorkspace({
                 userId: this.config.userId,
-                hostId: this.config.hostId ?? randomUUID(),
-                workspaceId: randomUUID(),
+                hostId,
+                workspaceId,
                 workspaceName: 'open-im-wechat',
             });
             log.info(`Workspace registered: channel=${tokens.channel}`);
+            // Build workspaceSessionId for HTTP COPILOT_RESPONSE metadata
+            const workspacePath = this.config.workspacePath ?? join(homedir(), 'WorkBuddy', 'Claw');
+            const workspaceSessionId = `${this.config.userId}_${hostId}_${workspacePath}`;
             // Create Centrifuge client
             const clientConfig = {
                 url: tokens.url,
@@ -46,6 +54,7 @@ export class WorkBuddyTransport {
                 userId: this.config.userId,
                 httpBaseUrl: this.config.baseUrl ?? 'https://copilot.tencent.com',
                 httpAccessToken: this.config.accessToken,
+                workspaceSessionId,
             };
             const callbacks = {
                 onConnected: () => {

package/package.json

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