opencode-copilot-account-switcher 0.14.6 → 0.14.8

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 { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import qrcodeTerminal from "qrcode-terminal";
 const DEFAULT_QR_WAIT_TIMEOUT_MS = 480000;
 function pickFirstNonEmptyString(...values) {
@@ -21,7 +22,7 @@ function pickQrTerminal(value) {
     return pickFirstNonEmptyString(value?.qrTerminal);
 }
 function pickQrUrl(value) {
-    return pickFirstNonEmptyString(value?.qrDataUrl, value?.qrUrl);
+    return pickFirstNonEmptyString(value?.qrDataUrl);
 }
 function isTimeoutWaitResult(value) {
     return Boolean(value && typeof value === "object" && "status" in value && String(value.status) === "timeout");
@@ -33,6 +34,12 @@ async function rollbackBinding(action, previousOperatorBinding, persistOperatorR
     }
     await clearOperatorBinding().catch(() => { });
 }
+function isSameOperatorBinding(left, right) {
+    if (!left || !right) {
+        return false;
+    }
+    return left.wechatAccountId === right.wechatAccountId && left.userId === right.userId && left.boundAt === right.boundAt;
+}
 async function renderQrTerminalDefault(input) {
     return await new Promise((resolve) => {
         qrcodeTerminal.generate(input.value, { small: true }, (output) => {
@@ -81,49 +88,45 @@ export async function runWechatBindFlow(input) {
         if (waited && typeof waited === "object" && "connected" in waited && waited.connected === false) {
             throw new Error("qr login did not complete");
         }
-        const accountId = pickFirstNonEmptyString(waited?.accountId, helpers.latestAccountState?.accountId, (await helpers.accountHelpers.listAccountIds()).at(-1));
-        if (!accountId) {
+        const rawAccountId = pickFirstNonEmptyString(waited?.accountId);
+        if (!rawAccountId) {
             throw new Error("missing accountId after qr login");
         }
+        const accountId = normalizeAccountId(rawAccountId);
         const boundAt = now();
-        const userIdFromWait = pickFirstNonEmptyString(waited?.userId);
         const previousOperatorBinding = input.action === "wechat-rebind" ? await loadOperatorBinding() : undefined;
+        const userIdFromWait = pickFirstNonEmptyString(waited?.userId);
         let menuAccount;
         let boundUserId = "";
         let shouldRollbackBinding = false;
+        let attemptedOperatorBinding;
         try {
-            const menuAccountState = accountId
-                ? {
-                    ...(helpers.latestAccountState ?? {
-                        accountId,
-                        token: "",
-                        baseUrl: "https://ilinkai.weixin.qq.com",
-                    }),
-                    accountId,
-                    ...(userIdFromWait ? { userId: userIdFromWait } : {}),
-                    boundAt,
-                }
-                : helpers.latestAccountState;
+            const menuAccountState = {
+                accountId,
+                token: "",
+                baseUrl: "https://ilinkai.weixin.qq.com",
+            };
             menuAccount = await buildOpenClawMenuAccount({
                 latestAccountState: menuAccountState,
                 accountHelpers: helpers.accountHelpers,
             });
-            const userId = pickFirstNonEmptyString(userIdFromWait, menuAccount?.userId);
+            const userId = pickFirstNonEmptyString(menuAccount?.userId, userIdFromWait);
             if (!userId) {
                 throw new Error("missing userId after qr login");
             }
             boundUserId = userId;
-            const operatorBinding = {
+            attemptedOperatorBinding = {
                 wechatAccountId: accountId,
                 userId,
                 boundAt,
             };
-            shouldRollbackBinding = true;
             if (input.action === "wechat-rebind") {
-                await persistOperatorRebinding(operatorBinding);
+                shouldRollbackBinding = true;
+                await persistOperatorRebinding(attemptedOperatorBinding);
             }
             else {
-                await persistOperatorBinding(operatorBinding);
+                shouldRollbackBinding = true;
+                await persistOperatorBinding(attemptedOperatorBinding);
             }
             const settings = await input.readCommonSettings();
             const notifications = settings.wechat?.notifications ?? {
@@ -148,7 +151,15 @@ export async function runWechatBindFlow(input) {
         }
         catch (error) {
             if (shouldRollbackBinding) {
-                await rollbackBinding(input.action, previousOperatorBinding, persistOperatorRebinding, clearOperatorBinding);
+                if (input.action === "wechat-bind") {
+                    const currentOperatorBinding = await loadOperatorBinding().catch(() => undefined);
+                    if (isSameOperatorBinding(currentOperatorBinding, attemptedOperatorBinding)) {
+                        await rollbackBinding(input.action, previousOperatorBinding, persistOperatorRebinding, clearOperatorBinding);
+                    }
+                }
+                else {
+                    await rollbackBinding(input.action, previousOperatorBinding, persistOperatorRebinding, clearOperatorBinding);
+                }
             }
             throw error;
         }

package/dist/wechat/compat/openclaw-account-helpers.js

@@ -15,33 +15,11 @@ function getAccountJiti() {
 function asObject(value) {
     return value && typeof value === "object" ? value : {};
 }
-function toBoolean(value) {
-    if (typeof value === "boolean") {
-        return value;
-    }
-    if (value === 1) {
-        return true;
-    }
-    if (value === 0) {
-        return false;
-    }
-    return undefined;
-}
-function deriveEnabled(resolved, stored) {
-    const explicitEnabled = toBoolean(resolved.enabled) ?? toBoolean(resolved.isEnabled) ?? toBoolean(stored.enabled) ?? toBoolean(stored.isEnabled);
-    if (explicitEnabled !== undefined) {
-        return explicitEnabled;
-    }
-    if (resolved.disabled === true || stored.disabled === true) {
-        return false;
-    }
-    return true;
+function deriveEnabled(resolved) {
+    return resolved.enabled === true;
 }
-function isConfigured(resolved, stored) {
-    if (typeof resolved.configured === "boolean") {
-        return resolved.configured;
-    }
-    return typeof stored.token === "string" && stored.token.trim().length > 0;
+function isConfigured(resolved) {
+    return resolved.configured === true;
 }
 function toAccountId(input) {
     return typeof input === "string" ? input : input.accountId;
@@ -52,8 +30,8 @@ export function createOpenClawAccountHelpers(input) {
         const stored = asObject(await input.loadAccount(accountId));
         return {
             accountId,
-            enabled: deriveEnabled(resolved, stored),
-            configured: isConfigured(resolved, stored),
+            enabled: deriveEnabled(resolved),
+            configured: isConfigured(resolved),
             name: typeof resolved.name === "string" ? resolved.name : undefined,
             userId: typeof stored.userId === "string" ? stored.userId : undefined,
         };
@@ -81,6 +59,13 @@ export async function loadOpenClawAccountHelpers(options = {}) {
     return createOpenClawAccountHelpers({
         listAccountIds: () => accountsModule.listIndexedWeixinAccountIds(),
         loadAccount: (accountId) => accountsModule.loadWeixinAccount(accountId),
-        resolveAccount: (accountId) => ({ accountId }),
+        resolveAccount: async (accountId) => {
+            const stored = asObject(await accountsModule.loadWeixinAccount(accountId));
+            return {
+                accountId,
+                enabled: stored.enabled === false ? false : true,
+                configured: typeof stored.token === "string" && stored.token.trim().length > 0,
+            };
+        },
     });
 }

package/dist/wechat/compat/openclaw-guided-smoke.js

@@ -394,7 +394,7 @@ async function runQrLoginDefault(input) {
         verbose: false,
     }));
     const qrTerminal = pickFirstString(startResult, ["qrTerminal"]);
-    const qrUrl = pickFirstString(startResult, ["qrDataUrl", "qrUrl"]);
+    const qrUrl = pickFirstString(startResult, ["qrDataUrl"]);
     const sessionKey = pickFirstString(startResult, ["sessionKey"]);
     const qrStartMessage = pickFirstString(startResult, ["message", "detail", "reason"]);
     if (!sessionKey) {
@@ -695,23 +695,13 @@ function normalizeQrLoginResult(result) {
         return null;
     }
     if (candidate.status === "success") {
-        if (typeof candidate.connected === "boolean" && candidate.connected !== true) {
-            return {
-                status: "timeout",
-                qrPrinted: candidate.qrPrinted === true,
-                qrUrl: typeof candidate.qrDataUrl === "string" && candidate.qrDataUrl.trim().length > 0
-                    ? candidate.qrDataUrl
-                    : typeof candidate.qrUrl === "string"
-                        ? candidate.qrUrl
-                        : undefined,
-            };
+        if (candidate.connected !== true) {
+            return null;
         }
         const hasPrintedQr = candidate.qrPrinted === true;
         const qrUrl = typeof candidate.qrDataUrl === "string" && candidate.qrDataUrl.trim().length > 0
             ? candidate.qrDataUrl
-            : typeof candidate.qrUrl === "string" && candidate.qrUrl.trim().length > 0
-                ? candidate.qrUrl
-                : undefined;
+            : undefined;
         const hasQrUrl = Boolean(qrUrl);
         if (!hasPrintedQr && !hasQrUrl) {
             return null;
@@ -719,9 +709,7 @@ function normalizeQrLoginResult(result) {
     }
     const normalizedQrUrl = typeof candidate.qrDataUrl === "string" && candidate.qrDataUrl.trim().length > 0
         ? candidate.qrDataUrl
-        : typeof candidate.qrUrl === "string"
-            ? candidate.qrUrl
-            : undefined;
+        : undefined;
     return {
         status: candidate.status,
         connected: candidate.connected === true ? true : undefined,

package/dist/wechat/compat/openclaw-qr-gateway.js

@@ -34,12 +34,6 @@ export async function loadOpenClawQrGateway(payloads, options = {}) {
                 pluginId: resolvedPluginId,
             };
         }
-        if (hasQrLoginMethods(payloadPlugin)) {
-            return {
-                gateway: createOpenClawQrGateway(payloadPlugin),
-                pluginId: resolvedPluginId,
-            };
-        }
     }
     throw new Error("registerChannel did not expose weixin gateway loginWithQrStart/loginWithQrWait");
 }

package/dist/wechat/compat/openclaw-sync-buf.d.ts

@@ -11,7 +11,7 @@ export declare function createOpenClawSyncBufHelper(input: {
 export declare function loadOpenClawSyncBufHelper(options?: {
     syncBufModulePath?: string;
 }): Promise<{
-    persistGetUpdatesBuf?: PublicWeixinPersistGetUpdatesBuf;
+    persistGetUpdatesBuf: PublicWeixinPersistGetUpdatesBuf;
 }>;
 export declare function loadLatestWeixinAccountState(options?: {
     stateDirModulePath?: string;

package/dist/wechat/compat/openclaw-sync-buf.js

@@ -19,6 +19,9 @@ export function createOpenClawSyncBufHelper(input) {
     return {
         async persistGetUpdatesBuf({ accountId, getUpdatesBuf }) {
             const filePath = input.getSyncBufFilePath(accountId);
+            if (typeof filePath !== "string" || filePath.trim().length === 0) {
+                throw new Error("[wechat-compat] sync-buf helper returned invalid file path");
+            }
             input.saveGetUpdatesBuf(filePath, getUpdatesBuf);
         },
     };
@@ -28,7 +31,7 @@ export async function loadOpenClawSyncBufHelper(options = {}) {
     const syncBufModulePath = require.resolve(options.syncBufModulePath ?? OPENCLAW_SYNC_BUF_MODULE);
     const syncBufModule = getSyncBufJiti()(syncBufModulePath);
     if (typeof syncBufModule.getSyncBufFilePath !== "function" || typeof syncBufModule.saveGetUpdatesBuf !== "function") {
-        return {};
+        throw new Error("[wechat-compat] sync-buf source helper unavailable");
     }
     return createOpenClawSyncBufHelper({
         getSyncBufFilePath: syncBufModule.getSyncBufFilePath,

package/dist/wechat/openclaw-account-adapter.js

@@ -13,20 +13,6 @@ function toBoolean(value) {
     if (typeof value === "boolean") {
         return value;
     }
-    if (value === 1) {
-        return true;
-    }
-    if (value === 0) {
-        return false;
-    }
-    return undefined;
-}
-function firstNumber(...values) {
-    for (const value of values) {
-        if (typeof value === "number" && Number.isFinite(value)) {
-            return value;
-        }
-    }
     return undefined;
 }
 async function tryDescribeAccount(accountHelpers, accountId) {
@@ -55,13 +41,17 @@ export async function buildOpenClawMenuAccount(input) {
     }
     const resolvedRaw = asObject(await input.accountHelpers.resolveAccount(accountId));
     const describedRaw = asObject(await tryDescribeAccount(input.accountHelpers, accountId));
-    const enabled = toBoolean(resolvedRaw.enabled) ?? toBoolean(resolvedRaw.isEnabled) ?? toBoolean(describedRaw.enabled) ?? toBoolean(describedRaw.isEnabled) ?? false;
-    const configured = toBoolean(describedRaw.configured) ?? toBoolean(describedRaw.isConfigured) ?? toBoolean(resolvedRaw.configured) ?? toBoolean(resolvedRaw.isConfigured) ?? false;
-    const userId = firstNonEmptyString(input.latestAccountState?.userId, resolvedRaw.userId, resolvedRaw.user_id, describedRaw.userId, describedRaw.user_id);
-    const boundAt = firstNumber(input.latestAccountState?.boundAt, input.latestAccountState?.savedAt, resolvedRaw.boundAt, resolvedRaw.savedAt, describedRaw.boundAt, describedRaw.savedAt);
+    const enabled = toBoolean(resolvedRaw.enabled) ?? toBoolean(describedRaw.enabled) ?? false;
+    const configured = toBoolean(describedRaw.configured) ?? toBoolean(resolvedRaw.configured) ?? false;
+    const userId = firstNonEmptyString(input.latestAccountState?.userId, resolvedRaw.userId, describedRaw.userId);
+    const boundAt = [
+        input.latestAccountState?.boundAt,
+        resolvedRaw.boundAt,
+        describedRaw.boundAt,
+    ].find((value) => typeof value === "number" && Number.isFinite(value));
     return {
         accountId,
-        name: firstNonEmptyString(resolvedRaw.name, resolvedRaw.displayName, describedRaw.name, describedRaw.displayName),
+        name: firstNonEmptyString(resolvedRaw.name, describedRaw.name),
         enabled,
         configured,
         userId,

package/package.json

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