opencode-copilot-account-switcher 0.14.9 → 0.14.11

package/dist/plugin-hooks.d.ts

@@ -88,6 +88,7 @@ export declare function buildPluginHooks(input: {
     };
     directory?: CopilotRetryContext["directory"];
     serverUrl?: CopilotRetryContext["serverUrl"];
+    ensureWechatBrokerStarted?: () => Promise<unknown>;
     createWechatBridgeLifecycleImpl?: (input: WechatBridgeLifecycleInput) => Promise<{
         close: () => Promise<void>;
     }>;

package/dist/plugin-hooks.js

@@ -20,6 +20,7 @@ import { handleCodexStatusCommand } from "./codex-status-command.js";
 import { handleCompactCommand, handleStopToolCommand, } from "./session-control-command.js";
 import { appendRoutingEvent, appendRouteDecisionEvent, appendSessionTouchEvent, buildCandidateAccountLoads, isAccountRateLimitCooledDown, readRoutingState, routingStatePath, } from "./routing-state.js";
 import { createWechatBridgeLifecycle, } from "./wechat/bridge.js";
+import { connectOrSpawnBroker } from "./wechat/broker-launcher.js";
 const SESSION_BINDING_IDLE_TTL_MS = 30 * 60 * 1000;
 const RATE_LIMIT_WINDOW_MS = 5 * 60 * 1000;
 const RATE_LIMIT_HIT_THRESHOLD = 3;
@@ -583,6 +584,7 @@ export function buildPluginHooks(input) {
     const appendRouteDecisionEventImpl = input.appendRouteDecisionEventImpl ?? appendRouteDecisionEvent;
     const readRoutingStateImpl = input.readRoutingStateImpl ?? readRoutingState;
     const triggerBillingCompensation = input.triggerBillingCompensation ?? (async () => { });
+    const ensureWechatBrokerStarted = input.ensureWechatBrokerStarted ?? (async () => connectOrSpawnBroker());
     const createWechatBridgeLifecycleImpl = input.createWechatBridgeLifecycleImpl ?? createWechatBridgeLifecycle;
     if (input.serverUrl && hasWechatBridgeClientShape(input.client)) {
         const wechatBridgeClient = input.client;
@@ -594,13 +596,18 @@ export function buildPluginHooks(input) {
         attachWechatBridgeAutoClose();
         void ensureWechatBridgeLifecycle({
             key: lifecycleKey,
-            create: () => createWechatBridgeLifecycleImpl({
-                client: wechatBridgeClient,
-                project: input.project,
-                directory: input.directory,
-                serverUrl: input.serverUrl,
-                statusCollectionEnabled: true,
-            }),
+            create: async () => {
+                void Promise.resolve()
+                    .then(() => ensureWechatBrokerStarted())
+                    .catch(() => { });
+                return createWechatBridgeLifecycleImpl({
+                    client: wechatBridgeClient,
+                    project: input.project,
+                    directory: input.directory,
+                    serverUrl: input.serverUrl,
+                    statusCollectionEnabled: true,
+                });
+            },
         }).catch(() => { });
     }
     const loadCandidateAccountLoads = input.loadCandidateAccountLoads ?? (async (ctx) => {

package/dist/wechat/broker-launcher.d.ts

@@ -15,6 +15,7 @@ type LaunchOptions = {
     launchLockPath?: string;
     backoffMs?: number;
     maxAttempts?: number;
+    expectedVersion?: string;
     endpointFactory?: () => string;
     spawnImpl?: (endpoint: string, stateRoot: string) => {
         pid?: number | undefined;

package/dist/wechat/broker-launcher.js

@@ -17,6 +17,17 @@ function isFiniteNumber(value) {
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+async function readCurrentPackageVersion() {
+    try {
+        const packageJsonPath = new URL("../../package.json", import.meta.url);
+        const raw = await readFile(packageJsonPath, "utf8");
+        const parsed = JSON.parse(raw);
+        return isNonEmptyString(parsed.version) ? parsed.version : "unknown";
+    }
+    catch {
+        return "unknown";
+    }
+}
 function isProcessAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -118,11 +129,14 @@ async function acquireLaunchLock(filePath) {
         return null;
     }
 }
-async function isBrokerAlive(brokerFilePath, pingImpl) {
+async function isBrokerAlive(brokerFilePath, pingImpl, expectedVersion) {
     const metadata = await readBrokerMetadata(brokerFilePath);
     if (!metadata) {
         return null;
     }
+    if (isNonEmptyString(expectedVersion) && metadata.version !== expectedVersion) {
+        return null;
+    }
     const ok = await pingImpl(metadata.endpoint);
     if (!ok) {
         return null;
@@ -145,6 +159,7 @@ export async function connectOrSpawnBroker(options = {}) {
     const launchLockFile = options.launchLockPath ?? path.join(stateRoot, "launch.lock");
     const backoffMs = options.backoffMs ?? DEFAULT_BACKOFF_MS;
     const maxAttempts = options.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
+    const expectedVersion = options.expectedVersion ?? await readCurrentPackageVersion();
     const pingImpl = options.pingImpl ?? defaultPingImpl;
     const spawnImpl = options.spawnImpl ?? defaultSpawnImpl;
     const endpointFactory = options.endpointFactory ?? (() => {
@@ -156,7 +171,7 @@ export async function connectOrSpawnBroker(options = {}) {
     });
     await mkdir(stateRoot, { recursive: true, mode: 0o700 });
     for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-        const running = await isBrokerAlive(brokerJsonFile, pingImpl);
+        const running = await isBrokerAlive(brokerJsonFile, pingImpl, expectedVersion);
         if (running) {
             return running;
         }
@@ -167,7 +182,7 @@ export async function connectOrSpawnBroker(options = {}) {
         }
         options.onLockAcquired?.(lock);
         try {
-            const secondCheck = await isBrokerAlive(brokerJsonFile, pingImpl);
+            const secondCheck = await isBrokerAlive(brokerJsonFile, pingImpl, expectedVersion);
             if (secondCheck) {
                 return secondCheck;
             }
@@ -176,7 +191,7 @@ export async function connectOrSpawnBroker(options = {}) {
             void child?.unref?.();
             for (let n = 0; n < 20; n += 1) {
                 await delay(100);
-                const spawned = await isBrokerAlive(brokerJsonFile, pingImpl);
+                const spawned = await isBrokerAlive(brokerJsonFile, pingImpl, expectedVersion);
                 if (spawned) {
                     return spawned;
                 }

package/package.json

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