opencode-copilot-account-switcher 0.14.25 → 0.14.27

package/dist/plugin-hooks.js

@@ -31,7 +31,44 @@ const TOUCH_WRITE_CACHE_IDLE_TTL_MS = 30 * 60 * 1000;
 const MAX_TOUCH_WRITE_CACHE_ENTRIES = 2048;
 const INTERNAL_DEBUG_LINK_HEADER = "x-opencode-debug-link-id";
 let wechatBridgeLifecycleState;
+let wechatBridgeSessionState;
 let wechatBridgeAutoCloseAttached = false;
+function isNonEmptyString(value) {
+    return typeof value === "string" && value.trim().length > 0;
+}
+function ensureWechatBridgeSessionState(key) {
+    if (wechatBridgeSessionState?.key === key) {
+        return wechatBridgeSessionState;
+    }
+    const state = { key };
+    wechatBridgeSessionState = state;
+    return state;
+}
+function trackWechatBridgeSelectedSession(state, sessionID) {
+    if (!state || !isNonEmptyString(sessionID)) {
+        return;
+    }
+    state.selectedSessionID = sessionID;
+}
+function trackWechatBridgeInteractedSession(state, sessionID) {
+    if (!state || !isNonEmptyString(sessionID)) {
+        return;
+    }
+    state.interactedSessionID = sessionID;
+}
+function getWechatBridgeActiveSessionID(state) {
+    return state?.selectedSessionID ?? state?.interactedSessionID;
+}
+function handleWechatBridgeEvent(state, event) {
+    if (!state || typeof event !== "object" || event === null) {
+        return;
+    }
+    const payload = event;
+    if (payload.type !== "tui.session.select") {
+        return;
+    }
+    trackWechatBridgeSelectedSession(state, payload.properties?.sessionID);
+}
 function buildWechatBridgeLifecycleKey(input) {
     const projectName = typeof input.project?.name === "string" ? input.project.name : "";
     const projectId = typeof input.project?.id === "string" ? input.project.id : "";
@@ -611,6 +648,16 @@ export function buildPluginHooks(input) {
     const ensureWechatBrokerStarted = input.ensureWechatBrokerStarted ?? (async () => connectOrSpawnBroker());
     const createWechatBridgeLifecycleImpl = input.createWechatBridgeLifecycleImpl ?? createWechatBridgeLifecycle;
     const wechatBridgeClient = toWechatBridgeClient(input.client);
+    const wechatBridgeLifecycleKey = input.serverUrl && wechatBridgeClient
+        ? buildWechatBridgeLifecycleKey({
+            directory: input.directory,
+            serverUrl: input.serverUrl,
+            project: input.project,
+        })
+        : undefined;
+    const wechatBridgeSessionContext = wechatBridgeLifecycleKey
+        ? ensureWechatBridgeSessionState(wechatBridgeLifecycleKey)
+        : undefined;
     if (wechatBridgeClient) {
         void showStatusToast({
             client: input.client,
@@ -624,15 +671,10 @@ export function buildPluginHooks(input) {
             .then(() => ensureWechatBrokerStarted())
             .catch(() => { });
     }
-    if (input.serverUrl && wechatBridgeClient) {
-        const lifecycleKey = buildWechatBridgeLifecycleKey({
-            directory: input.directory,
-            serverUrl: input.serverUrl,
-            project: input.project,
-        });
+    if (input.serverUrl && wechatBridgeClient && wechatBridgeLifecycleKey) {
         attachWechatBridgeAutoClose();
         void ensureWechatBridgeLifecycle({
-            key: lifecycleKey,
+            key: wechatBridgeLifecycleKey,
             create: async () => {
                 return createWechatBridgeLifecycleImpl({
                     client: wechatBridgeClient,
@@ -640,6 +682,7 @@ export function buildPluginHooks(input) {
                     directory: input.directory,
                     serverUrl: input.serverUrl,
                     statusCollectionEnabled: true,
+                    getActiveSessionID: () => getWechatBridgeActiveSessionID(wechatBridgeSessionContext),
                 });
             },
         }).catch(() => { });
@@ -1262,6 +1305,7 @@ export function buildPluginHooks(input) {
         })
         : Promise.resolve(async () => { });
     const chatHeaders = async (hookInput, output) => {
+        trackWechatBridgeInteractedSession(wechatBridgeSessionContext, hookInput.sessionID);
         if (enableCodexAuthLoader) {
             if (hookInput.model.providerID !== authProvider)
                 return;
@@ -1364,6 +1408,9 @@ export function buildPluginHooks(input) {
         output.headers["x-opencode-session-id"] = hookInput.sessionID;
     };
     return {
+        event: async ({ event }) => {
+            handleWechatBridgeEvent(wechatBridgeSessionContext, event);
+        },
         auth: {
             ...input.auth,
             provider: authProvider,
@@ -1407,6 +1454,7 @@ export function buildPluginHooks(input) {
             }
         },
         "command.execute.before": async (hookInput) => {
+            trackWechatBridgeInteractedSession(wechatBridgeSessionContext, hookInput.sessionID);
             const store = await loadMergedStore();
             if (hookInput.command === "copilot-inject") {
                 if (!enableCopilotAuthLoader)
@@ -1475,6 +1523,7 @@ export function buildPluginHooks(input) {
             }
         },
         "tool.execute.before": async (hookInput) => {
+            trackWechatBridgeInteractedSession(wechatBridgeSessionContext, hookInput.sessionID);
             if (!injectArmed)
                 return;
             if (hookInput.tool !== "question")
@@ -1482,6 +1531,7 @@ export function buildPluginHooks(input) {
             injectArmed = false;
         },
         "tool.execute.after": async (hookInput, output) => {
+            trackWechatBridgeInteractedSession(wechatBridgeSessionContext, hookInput.sessionID);
             if (hookInput.tool === "question") {
                 injectArmed = false;
                 return;

package/dist/providers/codex-menu-adapter.js

@@ -7,7 +7,6 @@ import { recoverInvalidCodexAccount } from "../codex-invalid-account.js";
 import { readAuth } from "../store.js";
 import { readCommonSettingsStore, writeCommonSettingsStore, } from "../common-settings-store.js";
 import { applyCommonSettingsAction } from "../common-settings-actions.js";
-import { runWechatBindFlow } from "../wechat/bind-flow.js";
 function pickName(input) {
     const accountId = input.accountId?.trim();
     if (accountId)
@@ -384,6 +383,7 @@ export function createCodexMenuAdapter(inputDeps) {
                 return false;
             }
             if (action.name === "wechat-bind" || action.name === "wechat-rebind") {
+                const { runWechatBindFlow } = await import("../wechat/bind-flow.js");
                 await runWechatBindFlow({
                     action: action.name,
                     readCommonSettings,

package/dist/providers/copilot-menu-adapter.js

@@ -5,7 +5,6 @@ import { getGitHubToken, normalizeDomain } from "../copilot-api-helpers.js";
 import { listAssignableAccountsForModel, listKnownCopilotModels, rewriteModelAccountAssignments, } from "../model-account-map.js";
 import { applyMenuAction, persistAccountSwitch } from "../plugin-actions.js";
 import { readCommonSettingsStore, writeCommonSettingsStore, } from "../common-settings-store.js";
-import { runWechatBindFlow } from "../wechat/bind-flow.js";
 import { select, selectMany } from "../ui/select.js";
 import { authPath, readAuth, readStore } from "../store.js";
 const CLIENT_ID = "Ov23li8tweQw6odWQebz";
@@ -742,6 +741,7 @@ export function createCopilotMenuAdapter(inputDeps) {
                 return false;
             }
             if (action.name === "wechat-bind" || action.name === "wechat-rebind") {
+                const { runWechatBindFlow } = await import("../wechat/bind-flow.js");
                 await runWechatBindFlow({
                     action: action.name,
                     readCommonSettings,

package/dist/wechat/bind-flow.js

@@ -1,8 +1,8 @@
 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 { loadQrCodeTerminal } from "./compat/qrcode-terminal-loader.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import qrcodeTerminal from "qrcode-terminal";
 const DEFAULT_QR_WAIT_TIMEOUT_MS = 480000;
 function pickFirstNonEmptyString(...values) {
     for (const value of values) {
@@ -41,6 +41,7 @@ function isSameOperatorBinding(left, right) {
     return left.wechatAccountId === right.wechatAccountId && left.userId === right.userId && left.boundAt === right.boundAt;
 }
 async function renderQrTerminalDefault(input) {
+    const qrcodeTerminal = loadQrCodeTerminal();
     return await new Promise((resolve) => {
         qrcodeTerminal.generate(input.value, { small: true }, (output) => {
             resolve(typeof output === "string" && output.trim().length > 0 ? output : undefined);

package/dist/wechat/bridge.d.ts

@@ -52,6 +52,7 @@ export type WechatBridgeInput = {
     directory: string;
     client: WechatBridgeClient;
     liveReadTimeoutMs?: number;
+    getActiveSessionID?: () => string | undefined;
     onDiagnosticEvent?: (event: WechatBridgeDiagnosticEvent) => Promise<void> | void;
 };
 export type WechatBridge = {
@@ -67,6 +68,7 @@ export type WechatBridgeLifecycleInput = {
     serverUrl?: URL;
     statusCollectionEnabled?: boolean;
     heartbeatIntervalMs?: number;
+    getActiveSessionID?: () => string | undefined;
 };
 export type WechatBridgeLifecycle = {
     close: () => Promise<void>;

package/dist/wechat/bridge.js

@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
 import path from "node:path";
 import { appendFile, mkdir } from "node:fs/promises";
 import { connect } from "./broker-client.js";
@@ -6,6 +7,7 @@ import { WECHAT_FILE_MODE, wechatBridgeDiagnosticsPath } from "./state-paths.js"
 import { buildSessionDigest, groupPermissionsBySession, groupQuestionsBySession, pickRecentSessions, } from "./session-digest.js";
 const DEFAULT_LIVE_READ_TIMEOUT_MS = 2_000;
 const DEFAULT_HEARTBEAT_INTERVAL_MS = 10_000;
+const PROCESS_INSTANCE_ID = toSafeInstanceID(`wechat-${process.pid}-${randomUUID().slice(0, 8)}`);
 function toSafeInstanceID(input) {
     const normalized = input.replace(/[^a-zA-Z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
     if (normalized.length === 0) {
@@ -13,6 +15,9 @@ function toSafeInstanceID(input) {
     }
     return normalized.slice(0, 64);
 }
+function isNonEmptyString(value) {
+    return typeof value === "string" && value.trim().length > 0;
+}
 function toProjectName(project) {
     if (typeof project?.name === "string" && project.name.trim().length > 0) {
         return project.name.trim();
@@ -149,6 +154,27 @@ export function createWechatBridge(input) {
             : DEFAULT_LIVE_READ_TIMEOUT_MS;
         const unavailable = new Set();
         const onDiagnosticEvent = input.onDiagnosticEvent;
+        const activeSessionID = input.getActiveSessionID?.();
+        if (input.getActiveSessionID && !isNonEmptyString(activeSessionID)) {
+            const snapshot = {
+                instanceID: input.instanceID,
+                instanceName: input.instanceName,
+                pid: input.pid,
+                projectName: input.projectName,
+                directory: input.directory,
+                collectedAt: Date.now(),
+                sessions: [],
+                unavailable: undefined,
+            };
+            void Promise.resolve(onDiagnosticEvent?.({
+                type: "collectStatusCompleted",
+                instanceID: input.instanceID,
+                durationMs: Date.now() - startedAt,
+                sessionCount: 0,
+                unavailable: snapshot.unavailable,
+            })).catch(() => { });
+            return snapshot;
+        }
         const [sessionListResult, statusResult, questionResult, permissionResult] = await Promise.allSettled([
             wrapDiagnosticStage({ instanceID: input.instanceID, stage: "session.list", onDiagnosticEvent }, () => withTimeout(async () => unwrapSdkReadResult(await input.client.session.list(), "session.list"), liveReadTimeoutMs, "session.list")),
             wrapDiagnosticStage({ instanceID: input.instanceID, stage: "session.status", onDiagnosticEvent }, () => withTimeout(async () => unwrapSdkReadResult(await input.client.session.status(), "session.status"), liveReadTimeoutMs, "session.status")),
@@ -156,7 +182,9 @@ export function createWechatBridge(input) {
             wrapDiagnosticStage({ instanceID: input.instanceID, stage: "permission.list", onDiagnosticEvent }, () => withTimeout(async () => unwrapSdkReadResult(await input.client.permission.list(), "permission.list"), liveReadTimeoutMs, "permission.list")),
         ]);
         const sessions = sessionListResult.status === "fulfilled" ? sessionListResult.value : [];
-        const recentSessions = pickRecentSessions(sessions, 3);
+        const recentSessions = isNonEmptyString(activeSessionID)
+            ? sessions.filter((session) => session.id === activeSessionID).slice(0, 1)
+            : pickRecentSessions(sessions, 3);
         if (sessionListResult.status === "rejected") {
             unavailable.add("sessionStatus");
         }
@@ -224,7 +252,7 @@ export async function createWechatBridgeLifecycle(input, deps = {}) {
     const clearIntervalImpl = deps.clearIntervalImpl ?? clearInterval;
     const directory = toDirectory(input.directory);
     const projectName = toProjectName(input.project);
-    const instanceID = toInstanceID(projectName, directory);
+    const instanceID = PROCESS_INSTANCE_ID;
     const bridge = createWechatBridge({
         instanceID,
         instanceName: toInstanceName(projectName, directory),
@@ -232,6 +260,7 @@ export async function createWechatBridgeLifecycle(input, deps = {}) {
         projectName,
         directory,
         client: input.client,
+        getActiveSessionID: input.getActiveSessionID,
         onDiagnosticEvent: createWechatBridgeDiagnosticsWriter(),
     });
     const broker = await connectOrSpawnBrokerImpl();

package/dist/wechat/compat/jiti-loader.d.ts

@@ -0,0 +1,11 @@
+export type JitiLoader = (path: string) => unknown;
+type CreateJiti = (id: string | URL, options?: Record<string, unknown>) => JitiLoader;
+type JitiNamespace = {
+    createJiti?: unknown;
+    default?: unknown;
+};
+export declare function resolveCreateJiti(namespace: JitiNamespace): CreateJiti;
+export declare function loadJiti(requireImpl?: NodeRequire): {
+    createJiti: CreateJiti;
+};
+export {};

package/dist/wechat/compat/jiti-loader.js

@@ -0,0 +1,27 @@
+import { createRequire } from "node:module";
+function isCreateJiti(value) {
+    return typeof value === "function";
+}
+export function resolveCreateJiti(namespace) {
+    if (isCreateJiti(namespace)) {
+        return namespace;
+    }
+    if (isCreateJiti(namespace.createJiti)) {
+        return namespace.createJiti;
+    }
+    if (isCreateJiti(namespace.default)) {
+        return namespace.default;
+    }
+    if (namespace.default &&
+        typeof namespace.default === "object" &&
+        isCreateJiti(namespace.default.createJiti)) {
+        return namespace.default.createJiti;
+    }
+    throw new Error("[wechat-compat] createJiti export unavailable");
+}
+export function loadJiti(requireImpl = createRequire(import.meta.url)) {
+    const namespace = requireImpl("jiti");
+    return {
+        createJiti: resolveCreateJiti(namespace),
+    };
+}

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

@@ -1,12 +1,12 @@
 import { createRequire } from "node:module";
-import { createJiti } from "jiti";
+import { loadJiti } from "./jiti-loader.js";
 const OPENCLAW_WEIXIN_ACCOUNTS_MODULE = "@tencent-weixin/openclaw-weixin/src/auth/accounts.ts";
 let accountJitiLoader = null;
 function getAccountJiti() {
     if (accountJitiLoader) {
         return accountJitiLoader;
     }
-    accountJitiLoader = createJiti(import.meta.url, {
+    accountJitiLoader = loadJiti().createJiti(import.meta.url, {
         interopDefault: true,
         extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
     });

package/dist/wechat/compat/openclaw-public-entry.js

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { createJiti } from "jiti";
+import { loadJiti } from "./jiti-loader.js";
 let publicJitiLoader = null;
 function requireField(condition, message) {
     if (!condition) {
@@ -12,7 +12,7 @@ function getPublicJiti() {
     if (publicJitiLoader) {
         return publicJitiLoader;
     }
-    publicJitiLoader = createJiti(import.meta.url, {
+    publicJitiLoader = loadJiti().createJiti(import.meta.url, {
         interopDefault: true,
         extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
     });

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

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { createJiti } from "jiti";
+import { loadJiti } from "./jiti-loader.js";
 const OPENCLAW_SYNC_BUF_MODULE = "@tencent-weixin/openclaw-weixin/src/storage/sync-buf.ts";
 const OPENCLAW_STATE_DIR_MODULE = "@tencent-weixin/openclaw-weixin/src/storage/state-dir.ts";
 let syncBufJitiLoader = null;
@@ -9,7 +9,7 @@ function getSyncBufJiti() {
     if (syncBufJitiLoader) {
         return syncBufJitiLoader;
     }
-    syncBufJitiLoader = createJiti(import.meta.url, {
+    syncBufJitiLoader = loadJiti().createJiti(import.meta.url, {
         interopDefault: true,
         extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
     });

package/dist/wechat/compat/openclaw-updates-send.js

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { createJiti } from "jiti";
+import { loadJiti } from "./jiti-loader.js";
 const OPENCLAW_UPDATES_MODULE = "@tencent-weixin/openclaw-weixin/src/api/api.ts";
 const OPENCLAW_SEND_MODULE = "@tencent-weixin/openclaw-weixin/src/messaging/send.ts";
 let updatesSendJitiLoader = null;
@@ -7,7 +7,7 @@ function getUpdatesSendJiti() {
     if (updatesSendJitiLoader) {
         return updatesSendJitiLoader;
     }
-    updatesSendJitiLoader = createJiti(import.meta.url, {
+    updatesSendJitiLoader = loadJiti().createJiti(import.meta.url, {
         interopDefault: true,
         extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
     });

package/dist/wechat/compat/qrcode-terminal-loader.d.ts

@@ -0,0 +1,12 @@
+type QrCodeTerminal = {
+    generate(input: string, opts: {
+        small?: boolean;
+    }, cb?: (output: string) => void): void;
+};
+type QrCodeTerminalNamespace = {
+    default?: unknown;
+    generate?: unknown;
+};
+export declare function resolveQrCodeTerminal(namespace: QrCodeTerminalNamespace): QrCodeTerminal;
+export declare function loadQrCodeTerminal(requireImpl?: NodeRequire): QrCodeTerminal;
+export {};

package/dist/wechat/compat/qrcode-terminal-loader.js

@@ -0,0 +1,16 @@
+import { createRequire } from "node:module";
+function isQrCodeTerminal(value) {
+    return Boolean(value && typeof value === "object" && typeof value.generate === "function");
+}
+export function resolveQrCodeTerminal(namespace) {
+    if (isQrCodeTerminal(namespace)) {
+        return namespace;
+    }
+    if (isQrCodeTerminal(namespace.default)) {
+        return namespace.default;
+    }
+    throw new Error("[wechat-compat] qrcode-terminal export unavailable");
+}
+export function loadQrCodeTerminal(requireImpl = createRequire(import.meta.url)) {
+    return resolveQrCodeTerminal(requireImpl("qrcode-terminal"));
+}

package/package.json

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