opencode-copilot-account-switcher 0.14.19 → 0.14.21

package/dist/wechat/bridge.d.ts

@@ -7,18 +7,25 @@ type SessionMessages = Array<{
     parts: Part[];
 }>;
 type SessionLite = Pick<Session, "id" | "title" | "directory" | "time">;
+type SdkFieldsResult<T> = {
+    data: T | undefined;
+    error?: unknown;
+    request?: unknown;
+    response?: unknown;
+};
+type SdkReadResult<T> = T | SdkFieldsResult<T>;
 type WechatBridgeClient = {
     session: {
-        list: () => Promise<SessionLite[]>;
-        status: () => Promise<Record<string, SessionStatus | undefined>>;
-        todo: (sessionID: string) => Promise<Todo[]>;
-        messages: (sessionID: string) => Promise<SessionMessages>;
+        list: () => Promise<SdkReadResult<SessionLite[]>>;
+        status: () => Promise<SdkReadResult<Record<string, SessionStatus | undefined>>>;
+        todo: (sessionID: string) => Promise<SdkReadResult<Todo[]>>;
+        messages: (sessionID: string) => Promise<SdkReadResult<SessionMessages>>;
     };
     question: {
-        list: () => Promise<QuestionRequest[]>;
+        list: () => Promise<SdkReadResult<QuestionRequest[]>>;
     };
     permission: {
-        list: () => Promise<PermissionRequest[]>;
+        list: () => Promise<SdkReadResult<PermissionRequest[]>>;
     };
 };
 export type InstanceUnavailableKind = "sessionStatus" | "questionList" | "permissionList";

package/dist/wechat/bridge.js

@@ -66,6 +66,23 @@ function withTimeout(task, timeoutMs, name) {
         });
     });
 }
+function isSdkFieldsResult(value) {
+    return typeof value === "object"
+        && value !== null
+        && ("data" in value || "error" in value);
+}
+function unwrapSdkReadResult(value, name) {
+    if (!isSdkFieldsResult(value)) {
+        return value;
+    }
+    if (value.error != null) {
+        throw value.error instanceof Error ? value.error : new Error(`${name} failed`);
+    }
+    if (value.data === undefined) {
+        throw new Error(`${name} returned no data`);
+    }
+    return value.data;
+}
 export function createWechatBridge(input) {
     const collectStatusSnapshot = async () => {
         const liveReadTimeoutMs = typeof input.liveReadTimeoutMs === "number" && Number.isFinite(input.liveReadTimeoutMs)
@@ -73,10 +90,10 @@ export function createWechatBridge(input) {
             : DEFAULT_LIVE_READ_TIMEOUT_MS;
         const unavailable = new Set();
         const [sessionListResult, statusResult, questionResult, permissionResult] = await Promise.allSettled([
-            withTimeout(() => input.client.session.list(), liveReadTimeoutMs, "session.list"),
-            withTimeout(() => input.client.session.status(), liveReadTimeoutMs, "session.status"),
-            withTimeout(() => input.client.question.list(), liveReadTimeoutMs, "question.list"),
-            withTimeout(() => input.client.permission.list(), liveReadTimeoutMs, "permission.list"),
+            withTimeout(async () => unwrapSdkReadResult(await input.client.session.list(), "session.list"), liveReadTimeoutMs, "session.list"),
+            withTimeout(async () => unwrapSdkReadResult(await input.client.session.status(), "session.status"), liveReadTimeoutMs, "session.status"),
+            withTimeout(async () => unwrapSdkReadResult(await input.client.question.list(), "question.list"), liveReadTimeoutMs, "question.list"),
+            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);
@@ -94,8 +111,8 @@ export function createWechatBridge(input) {
             : (unavailable.add("permissionList"), groupPermissionsBySession([]));
         const sessionDigests = await Promise.all(recentSessions.map(async (session) => {
             const [todoResult, messagesResult] = await Promise.allSettled([
-                withTimeout(() => input.client.session.todo(session.id), liveReadTimeoutMs, `session.todo:${session.id}`),
-                withTimeout(() => input.client.session.messages(session.id), liveReadTimeoutMs, `session.messages:${session.id}`),
+                withTimeout(async () => unwrapSdkReadResult(await input.client.session.todo(session.id), `session.todo:${session.id}`), liveReadTimeoutMs, `session.todo:${session.id}`),
+                withTimeout(async () => unwrapSdkReadResult(await input.client.session.messages(session.id), `session.messages:${session.id}`), liveReadTimeoutMs, `session.messages:${session.id}`),
             ]);
             const sessionUnavailable = [];
             const todos = todoResult.status === "fulfilled" ? todoResult.value : (sessionUnavailable.push("todo"), []);

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