opencode-copilot-account-switcher 0.14.18 → 0.14.20

package/dist/plugin-hooks.js

@@ -1,6 +1,7 @@
 import { appendFileSync } from "node:fs";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash } from "node:crypto";
+import { OpencodeClient as OpencodeV2Client } from "@opencode-ai/sdk/v2/client";
 import { createCompactionLoopSafetyBypass, createLoopSafetySystemTransform, getLoopSafetyProviderScope, } from "./loop-safety-plugin.js";
 import { COPILOT_PROVIDER_DESCRIPTOR } from "./providers/descriptor.js";
 import { CODEX_PROVIDER_DESCRIPTOR } from "./providers/descriptor.js";
@@ -316,6 +317,17 @@ function getFinalSentRequestHeadersRecord(request, init) {
     return sanitizeLoggedRequestHeadersRecord(Object.fromEntries(headers.entries()));
 }
 function hasWechatBridgeClientShape(value) {
+    if (typeof value !== "object" || value === null)
+        return false;
+    const client = value;
+    return typeof client.session?.list === "function"
+        && typeof client.session?.status === "function"
+        && typeof client.session?.todo === "function"
+        && typeof client.session?.messages === "function"
+        && typeof client.question?.list === "function"
+        && typeof client.permission?.list === "function";
+}
+function hasWechatBridgeSessionShape(value) {
     if (typeof value !== "object" || value === null)
         return false;
     const client = value;
@@ -324,6 +336,20 @@ function hasWechatBridgeClientShape(value) {
         && typeof client.session?.todo === "function"
         && typeof client.session?.messages === "function";
 }
+function toWechatBridgeClient(value) {
+    if (hasWechatBridgeClientShape(value)) {
+        return value;
+    }
+    if (!hasWechatBridgeSessionShape(value)) {
+        return undefined;
+    }
+    const transport = value._client;
+    if (typeof transport !== "object" || transport === null) {
+        return undefined;
+    }
+    const wrapped = new OpencodeV2Client({ client: transport });
+    return hasWechatBridgeClientShape(wrapped) ? wrapped : undefined;
+}
 function sanitizeLoggedRequestHeadersRecord(headers) {
     const sanitized = { ...headers };
     if (typeof sanitized.authorization === "string" && sanitized.authorization.length > 0) {
@@ -584,7 +610,7 @@ export function buildPluginHooks(input) {
     const triggerBillingCompensation = input.triggerBillingCompensation ?? (async () => { });
     const ensureWechatBrokerStarted = input.ensureWechatBrokerStarted ?? (async () => connectOrSpawnBroker());
     const createWechatBridgeLifecycleImpl = input.createWechatBridgeLifecycleImpl ?? createWechatBridgeLifecycle;
-    const wechatBridgeClient = hasWechatBridgeClientShape(input.client) ? input.client : undefined;
+    const wechatBridgeClient = toWechatBridgeClient(input.client);
     if (wechatBridgeClient) {
         void showStatusToast({
             client: input.client,

package/dist/wechat/bridge.d.ts

@@ -14,11 +14,11 @@ type WechatBridgeClient = {
         todo: (sessionID: string) => Promise<Todo[]>;
         messages: (sessionID: string) => Promise<SessionMessages>;
     };
-    question?: {
-        list?: () => Promise<QuestionRequest[]>;
+    question: {
+        list: () => Promise<QuestionRequest[]>;
     };
-    permission?: {
-        list?: () => Promise<PermissionRequest[]>;
+    permission: {
+        list: () => Promise<PermissionRequest[]>;
     };
 };
 export type InstanceUnavailableKind = "sessionStatus" | "questionList" | "permissionList";

package/dist/wechat/bridge.js

@@ -72,17 +72,11 @@ export function createWechatBridge(input) {
             ? Math.max(1, Math.floor(input.liveReadTimeoutMs))
             : DEFAULT_LIVE_READ_TIMEOUT_MS;
         const unavailable = new Set();
-        const questionList = input.client.question?.list;
-        const permissionList = input.client.permission?.list;
         const [sessionListResult, statusResult, questionResult, permissionResult] = await Promise.allSettled([
             withTimeout(() => input.client.session.list(), liveReadTimeoutMs, "session.list"),
             withTimeout(() => input.client.session.status(), liveReadTimeoutMs, "session.status"),
-            typeof questionList === "function"
-                ? withTimeout(() => questionList(), liveReadTimeoutMs, "question.list")
-                : Promise.reject(new Error("question.list unavailable")),
-            typeof permissionList === "function"
-                ? withTimeout(() => permissionList(), liveReadTimeoutMs, "permission.list")
-                : Promise.reject(new Error("permission.list unavailable")),
+            withTimeout(() => input.client.question.list(), liveReadTimeoutMs, "question.list"),
+            withTimeout(() => input.client.permission.list(), liveReadTimeoutMs, "permission.list"),
         ]);
         const sessions = sessionListResult.status === "fulfilled" ? sessionListResult.value : [];
         const recentSessions = pickRecentSessions(sessions, 3);

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.18",
+  "version": "0.14.20",
   "description": "GitHub Copilot account switcher plugin for OpenCode",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",