opencode-copilot-account-switcher 0.14.3 → 0.14.5

package/dist/wechat/bind-flow.d.ts

@@ -20,6 +20,9 @@ type WechatBindFlowInput = {
     readCommonSettings: () => Promise<CommonSettingsStore>;
     writeCommonSettings: (settings: CommonSettingsStore) => Promise<void>;
     writeLine?: (line: string) => Promise<void>;
+    renderQrTerminal?: (input: {
+        value: string;
+    }) => Promise<string | undefined>;
     now?: () => number;
 };
 export declare function runWechatBindFlow(input: WechatBindFlowInput): Promise<WechatBindFlowResult>;

package/dist/wechat/bind-flow.js

@@ -1,6 +1,7 @@
 import { bindOperator, readOperatorBinding, rebindOperator, resetOperatorBinding } from "./operator-store.js";
 import { loadOpenClawWeixinPublicHelpers } from "./compat/openclaw-public-helpers.js";
 import { buildOpenClawMenuAccount } from "./openclaw-account-adapter.js";
+import qrcodeTerminal from "qrcode-terminal";
 const DEFAULT_QR_WAIT_TIMEOUT_MS = 480000;
 function pickFirstNonEmptyString(...values) {
     for (const value of values) {
@@ -32,6 +33,13 @@ async function rollbackBinding(action, previousOperatorBinding, persistOperatorR
     }
     await clearOperatorBinding().catch(() => { });
 }
+async function renderQrTerminalDefault(input) {
+    return await new Promise((resolve) => {
+        qrcodeTerminal.generate(input.value, { small: true }, (output) => {
+            resolve(typeof output === "string" && output.trim().length > 0 ? output : undefined);
+        });
+    });
+}
 export async function runWechatBindFlow(input) {
     const now = input.now ?? Date.now;
     const loadPublicHelpers = input.loadPublicHelpers ?? loadOpenClawWeixinPublicHelpers;
@@ -39,6 +47,7 @@ export async function runWechatBindFlow(input) {
     const persistOperatorRebinding = input.rebindOperator ?? rebindOperator;
     const loadOperatorBinding = input.readOperatorBinding ?? readOperatorBinding;
     const clearOperatorBinding = input.resetOperatorBinding ?? resetOperatorBinding;
+    const renderQrTerminal = input.renderQrTerminal ?? renderQrTerminalDefault;
     const writeLine = input.writeLine ?? (async (line) => {
         process.stdout.write(`${line}\n`);
     });
@@ -53,6 +62,10 @@ export async function runWechatBindFlow(input) {
             await writeLine(qrTerminal);
         }
         else if (qrUrl) {
+            const renderedQr = await renderQrTerminal({ value: qrUrl }).catch(() => undefined);
+            if (renderedQr) {
+                await writeLine(renderedQr);
+            }
             await writeLine(`QR URL fallback: ${qrUrl}`);
         }
         else {
@@ -66,28 +79,16 @@ export async function runWechatBindFlow(input) {
             throw new Error("qr login did not complete");
         }
         const accountId = pickFirstNonEmptyString(waited?.accountId, helpers.latestAccountState?.accountId, (await helpers.accountHelpers.listAccountIds()).at(-1));
-        const userId = pickFirstNonEmptyString(waited?.userId, waited?.openid, waited?.uid);
         if (!accountId) {
             throw new Error("missing accountId after qr login");
         }
-        if (!userId) {
-            throw new Error("missing userId after qr login");
-        }
         const boundAt = now();
-        const operatorBinding = {
-            wechatAccountId: accountId,
-            userId,
-            boundAt,
-        };
+        const userIdFromWait = pickFirstNonEmptyString(waited?.userId, waited?.openid, waited?.uid);
         const previousOperatorBinding = input.action === "wechat-rebind" ? await loadOperatorBinding() : undefined;
         let menuAccount;
+        let boundUserId = "";
+        let shouldRollbackBinding = false;
         try {
-            if (input.action === "wechat-rebind") {
-                await persistOperatorRebinding(operatorBinding);
-            }
-            else {
-                await persistOperatorBinding(operatorBinding);
-            }
             const menuAccountState = accountId
                 ? {
                     ...(helpers.latestAccountState ?? {
@@ -96,7 +97,7 @@ export async function runWechatBindFlow(input) {
                         baseUrl: "https://ilinkai.weixin.qq.com",
                     }),
                     accountId,
-                    userId,
+                    ...(userIdFromWait ? { userId: userIdFromWait } : {}),
                     boundAt,
                 }
                 : helpers.latestAccountState;
@@ -104,6 +105,23 @@ export async function runWechatBindFlow(input) {
                 latestAccountState: menuAccountState,
                 accountHelpers: helpers.accountHelpers,
             });
+            const userId = pickFirstNonEmptyString(userIdFromWait, menuAccount?.userId);
+            if (!userId) {
+                throw new Error("missing userId after qr login");
+            }
+            boundUserId = userId;
+            const operatorBinding = {
+                wechatAccountId: accountId,
+                userId,
+                boundAt,
+            };
+            shouldRollbackBinding = true;
+            if (input.action === "wechat-rebind") {
+                await persistOperatorRebinding(operatorBinding);
+            }
+            else {
+                await persistOperatorBinding(operatorBinding);
+            }
             const settings = await input.readCommonSettings();
             const notifications = settings.wechat?.notifications ?? {
                 enabled: true,
@@ -126,12 +144,14 @@ export async function runWechatBindFlow(input) {
             await input.writeCommonSettings(settings);
         }
         catch (error) {
-            await rollbackBinding(input.action, previousOperatorBinding, persistOperatorRebinding, clearOperatorBinding);
+            if (shouldRollbackBinding) {
+                await rollbackBinding(input.action, previousOperatorBinding, persistOperatorRebinding, clearOperatorBinding);
+            }
             throw error;
         }
         return {
             accountId,
-            userId,
+            userId: boundUserId,
             name: menuAccount?.name,
             enabled: menuAccount?.enabled,
             configured: menuAccount?.configured,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-copilot-account-switcher",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "description": "GitHub Copilot account switcher plugin for OpenCode",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",