@henryxiaoyang/wechat-access-unqclawed 1.0.7 → 1.0.9

package/README.md

@@ -16,13 +16,19 @@ openclaw config set channels.wechat-access-unqclawed.enabled true
 
 ## 首次登录
 
-安装并启用后，在终端执行扫码登录：
+```bash
+openclaw channels login --channel wechat-access-unqclawed
+```
+
+终端会显示微信二维码（或浏览器链接），用微信扫码并确认后，浏览器会跳转到新页面。
+
+在**另一个终端窗口**中，将浏览器地址栏的完整 URL 或 `code` 参数值写入临时文件：
 
 ```bash
-openclaw wechat login
+echo "粘贴的URL或code" > ~/.openclaw/wechat-auth-code.tmp
 ```
 
-终端会显示微信二维码，扫码授权后 token 自动保存。然后重启 Gateway：
+原窗口会自动检测并完成登录，token 自动保存。然后重启 Gateway：
 
 ```bash
 openclaw gateway restart
@@ -36,22 +42,6 @@ openclaw gateway restart
 - 邀请码验证（可配置跳过）
 - 支持生产/测试环境切换
 
-## 命令
-
-### CLI 命令（终端）
-
-| 命令 | 说明 |
-|------|------|
-| `openclaw wechat login` | 交互式微信扫码登录 |
-| `openclaw wechat logout` | 清除已保存的登录态 |
-
-### 聊天命令（渠道内）
-
-| 命令 | 说明 |
-|------|------|
-| `/wechat-login` | 触发扫码登录（QR 码输出到 Gateway 日志） |
-| `/wechat-logout` | 清除已保存的登录态 |
-
 ## 配置
 
 在 OpenClaw 配置文件的 `channels.wechat-access-unqclawed` 下：
@@ -83,7 +73,7 @@ openclaw gateway restart
 
 1. 读取配置中的 `token` — 如果有，直接使用
 2. 读取本地保存的登录态（`~/.openclaw/wechat-access-auth.json`）
-3. 以上都没有 — 运行 `openclaw wechat login` 手动登录
+3. 以上都没有 — 运行 `openclaw channels login --channel wechat-access-unqclawed` 手动登录
 
 ## 项目结构
 
@@ -95,7 +85,8 @@ auth/
   device-guid.ts         # 设备 GUID 生成（随机，持久化）
   qclaw-api.ts           # QClaw JPRX 网关 API 客户端
   state-store.ts         # Token 持久化
-  wechat-login.ts        # 扫码登录流程编排
+  wechat-login.ts        # 扫码登录流程编排（交互式）
+  wechat-qr-poll.ts      # QR 码生成与轮询
 websocket/
   types.ts               # AGP 协议类型
   websocket-client.ts    # WebSocket 客户端（连接、心跳、重连）

package/index.ts

@@ -2,7 +2,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { WechatAccessWebSocketClient, handlePrompt, handleCancel } from "./websocket/index.js";
 // import { handleSimpleWecomWebhook } from "./http/webhook.js";
-import { setWecomRuntime } from "./common/runtime.js";
+import { setWecomRuntime, getWecomRuntime } from "./common/runtime.js";
 import { performLogin, loadState, clearState, saveState, getDeviceGuid, getEnvironment, QClawAPI, buildAuthUrl, fetchQrUuid, fetchQrImageDataUrl, pollQrStatus } from "./auth/index.js";
 import type { QClawEnvironment, PersistedAuthState } from "./auth/index.js";
 import { nested } from "./auth/utils.js";
@@ -181,34 +181,46 @@ const tencentAccessPlugin = {
         const channelToken = (loginData.openclaw_channel_token as string) || "";
         const userInfo = (loginData.user_info as Record<string, unknown>) || {};
 
-        // 保存登录态
-        const persistedState: PersistedAuthState = {
-          jwtToken,
-          channelToken,
-          apiKey: "",
-          guid,
-          userInfo,
-          savedAt: Date.now(),
-        };
-        saveState(persistedState, authStatePath);
+        // 更新 loginKey（服务端可能返回新值，后续 API 调用需要）
+        const loginKey = userInfo.loginKey as string | undefined;
+        if (loginKey) api.loginKey = loginKey;
 
         // 创建 API Key（非致命）
         api.jwtToken = jwtToken;
         api.userId = String(userInfo.user_id ?? "");
+        let apiKey = "";
         try {
           const keyResult = await api.createApiKey();
           if (keyResult.success) {
-            const apiKey =
+            apiKey =
               (nested(keyResult.data, "key") as string) ??
               (nested(keyResult.data, "resp", "data", "key") as string) ??
               "";
-            if (apiKey) {
-              persistedState.apiKey = apiKey;
-              saveState(persistedState, authStatePath);
-            }
           }
         } catch { /* non-fatal */ }
 
+        // 写入 openclaw.json（统一存储）
+        try {
+          const fullCfg = runtime.config?.loadConfig?.() ?? cfg;
+          const channels = { ...(fullCfg.channels ?? {}) } as Record<string, any>;
+          channels["wechat-access-unqclawed"] = {
+            ...(channels["wechat-access-unqclawed"] ?? {}),
+            token: channelToken,
+          };
+          const nextCfg: Record<string, unknown> = { ...fullCfg, channels };
+          if (apiKey) {
+            const models = { ...(fullCfg.models ?? {}) } as Record<string, any>;
+            const providers = { ...(models.providers ?? {}) } as Record<string, any>;
+            providers.qclaw = { ...(providers.qclaw ?? {}), apiKey };
+            models.providers = providers;
+            nextCfg.models = models;
+          }
+          await runtime.config.writeConfigFile(nextCfg);
+        } catch { /* non-fatal: fallback to state file */ }
+
+        // 备份到独立文件（兜底）
+        saveState({ jwtToken, channelToken, apiKey, guid, userInfo, savedAt: Date.now() }, authStatePath);
+
         const nickname = (userInfo.nickname as string) ?? "用户";
         runtime.log(`[wechat-access] 登录成功! 欢迎 ${nickname}，token 已保存。请重启 Gateway 生效。`);
         return;
@@ -272,7 +284,7 @@ const tencentAccessPlugin = {
           token = savedState.channelToken;
           log?.info(`[wechat-access] 使用已保存的 token: ${token.substring(0, 6)}...`);
         } else {
-          log?.warn(`[wechat-access] 未找到 token，请在终端运行 "openclaw wechat-login" 完成扫码登录，然后重启 Gateway`);
+          log?.warn(`[wechat-access] 未找到 token，请运行 "openclaw channels login --channel wechat-access-unqclawed" 完成扫码登录，然后重启 Gateway`);
           return;
         }
       }
@@ -426,34 +438,47 @@ const tencentAccessPlugin = {
           const channelToken = (loginData.openclaw_channel_token as string) || "";
           const userInfo = (loginData.user_info as Record<string, unknown>) || {};
 
-          // 保存登录态
-          const persistedState: PersistedAuthState = {
-            jwtToken,
-            channelToken,
-            apiKey: "",
-            guid,
-            userInfo,
-            savedAt: Date.now(),
-          };
-          saveState(persistedState, authStatePath);
+          // 更新 loginKey（服务端可能返回新值，后续 API 调用需要）
+          const loginKey = userInfo.loginKey as string | undefined;
+          if (loginKey) api.loginKey = loginKey;
 
           // 创建 API Key（非致命）
           api.jwtToken = jwtToken;
           api.userId = String(userInfo.user_id ?? "");
+          let apiKey = "";
           try {
             const keyResult = await api.createApiKey();
             if (keyResult.success) {
-              const apiKey =
+              apiKey =
                 (nested(keyResult.data, "key") as string) ??
                 (nested(keyResult.data, "resp", "data", "key") as string) ??
                 "";
-              if (apiKey) {
-                persistedState.apiKey = apiKey;
-                saveState(persistedState, authStatePath);
-              }
             }
           } catch { /* non-fatal */ }
 
+          // 写入 openclaw.json（统一存储）
+          try {
+            const wRuntime = getWecomRuntime();
+            const fullCfg = wRuntime.config.loadConfig();
+            const channels = { ...(fullCfg.channels ?? {}) } as Record<string, any>;
+            channels["wechat-access-unqclawed"] = {
+              ...(channels["wechat-access-unqclawed"] ?? {}),
+              token: channelToken,
+            };
+            const nextCfg: Record<string, unknown> = { ...fullCfg, channels };
+            if (apiKey) {
+              const models = { ...(fullCfg.models ?? {}) } as Record<string, any>;
+              const providers = { ...(models.providers ?? {}) } as Record<string, any>;
+              providers.qclaw = { ...(providers.qclaw ?? {}), apiKey };
+              models.providers = providers;
+              nextCfg.models = models;
+            }
+            await wRuntime.config.writeConfigFile(nextCfg);
+          } catch { /* non-fatal */ }
+
+          // 备份到独立文件（兜底）
+          saveState({ jwtToken, channelToken, apiKey, guid, userInfo, savedAt: Date.now() }, authStatePath);
+
           pendingQrLogin = null;
           const nickname = (userInfo.nickname as string) ?? "用户";
           return { connected: true, message: `登录成功! 欢迎 ${nickname}，请重启 Gateway 生效。` };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryxiaoyang/wechat-access-unqclawed",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "type": "module",
   "description": "OpenClaw 微信通路插件 — 扫码登录 + AGP WebSocket 双向通信",
   "author": "HenryXiaoYang",