opencode-copilot-account-switcher 0.14.19 → 0.14.20

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

@@ -22,6 +22,7 @@ type LaunchOptions = {
         pid?: number | undefined;
         unref?: (() => void) | undefined;
     };
+    retireBrokerImpl?: (metadata: BrokerMetadata) => Promise<void> | void;
     pingImpl?: (endpoint: string) => Promise<boolean>;
     onLockAcquired?: (lock: LaunchLockContent) => void;
 };

package/dist/wechat/broker-launcher.js

@@ -154,6 +154,47 @@ async function isBrokerAlive(brokerFilePath, pingImpl, expectedVersion) {
     }
     return metadata;
 }
+async function readVersionMismatchedBroker(brokerFilePath, expectedVersion) {
+    const metadata = await readBrokerMetadata(brokerFilePath);
+    if (!metadata) {
+        return null;
+    }
+    if (!isNonEmptyString(expectedVersion) || metadata.version === expectedVersion) {
+        return null;
+    }
+    return metadata;
+}
+async function defaultRetireBrokerImpl(metadata, pingImpl) {
+    if (metadata.pid === process.pid) {
+        return;
+    }
+    const reachable = await pingImpl(metadata.endpoint);
+    if (!reachable) {
+        return;
+    }
+    if (!isProcessAlive(metadata.pid)) {
+        return;
+    }
+    try {
+        process.kill(metadata.pid, "SIGTERM");
+    }
+    catch {
+        return;
+    }
+    const startedAt = Date.now();
+    while (Date.now() - startedAt < 5000) {
+        if (!isProcessAlive(metadata.pid)) {
+            return;
+        }
+        await delay(50);
+    }
+    try {
+        process.kill(metadata.pid, "SIGKILL");
+    }
+    catch {
+        // process already exited
+    }
+}
 function defaultSpawnImpl(endpoint, stateRoot) {
     const entry = fileURLToPath(new URL("./broker-entry.js", import.meta.url));
     const child = spawn(resolveBrokerSpawnCommand(), [entry, `--endpoint=${endpoint}`, `--state-root=${stateRoot}`], {
@@ -174,6 +215,7 @@ export async function connectOrSpawnBroker(options = {}) {
     const expectedVersion = options.expectedVersion ?? await readCurrentPackageVersion();
     const pingImpl = options.pingImpl ?? defaultPingImpl;
     const spawnImpl = options.spawnImpl ?? defaultSpawnImpl;
+    const retireBrokerImpl = options.retireBrokerImpl ?? ((metadata) => defaultRetireBrokerImpl(metadata, pingImpl));
     const endpointFactory = options.endpointFactory ?? (() => createDefaultBrokerEndpoint({ stateRoot }));
     await mkdir(stateRoot, { recursive: true, mode: 0o700 });
     for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
@@ -192,6 +234,10 @@ export async function connectOrSpawnBroker(options = {}) {
             if (secondCheck) {
                 return secondCheck;
             }
+            const versionMismatchedBroker = await readVersionMismatchedBroker(brokerJsonFile, expectedVersion);
+            if (versionMismatchedBroker) {
+                await retireBrokerImpl(versionMismatchedBroker);
+            }
             const endpoint = endpointFactory();
             const child = spawnImpl(endpoint, stateRoot);
             void child?.unref?.();

package/package.json

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