opencode-copilot-account-switcher 0.14.24 → 0.14.26

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/wechat/bridge.d.ts

@@ -23,6 +23,7 @@ type WechatBridgeClient = {
         } | string) => Promise<SdkReadResult<Todo[]>>;
         messages: (parameters: {
             sessionID: string;
+            limit?: number;
         } | string) => Promise<SdkReadResult<SessionMessages>>;
     };
     question: {
@@ -51,6 +52,7 @@ export type WechatBridgeInput = {
     directory: string;
     client: WechatBridgeClient;
     liveReadTimeoutMs?: number;
+    getActiveSessionID?: () => string | undefined;
     onDiagnosticEvent?: (event: WechatBridgeDiagnosticEvent) => Promise<void> | void;
 };
 export type WechatBridge = {
@@ -66,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");
         }
@@ -172,7 +200,7 @@ export function createWechatBridge(input) {
         const sessionDigests = await Promise.all(recentSessions.map(async (session) => {
             const [todoResult, messagesResult] = await Promise.allSettled([
                 wrapDiagnosticStage({ instanceID: input.instanceID, stage: `session.todo:${session.id}`, onDiagnosticEvent }, () => withTimeout(async () => unwrapSdkReadResult(await input.client.session.todo({ sessionID: session.id }), `session.todo:${session.id}`), liveReadTimeoutMs, `session.todo:${session.id}`)),
-                wrapDiagnosticStage({ instanceID: input.instanceID, stage: `session.messages:${session.id}`, onDiagnosticEvent }, () => withTimeout(async () => unwrapSdkReadResult(await input.client.session.messages({ sessionID: session.id }), `session.messages:${session.id}`), liveReadTimeoutMs, `session.messages:${session.id}`)),
+                wrapDiagnosticStage({ instanceID: input.instanceID, stage: `session.messages:${session.id}`, onDiagnosticEvent }, () => withTimeout(async () => unwrapSdkReadResult(await input.client.session.messages({ sessionID: session.id, limit: 1 }), `session.messages:${session.id}`), liveReadTimeoutMs, `session.messages:${session.id}`)),
             ]);
             const sessionUnavailable = [];
             const todos = todoResult.status === "fulfilled" ? todoResult.value : (sessionUnavailable.push("todo"), []);
@@ -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/package.json

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