@unlinearity/cli-wechat-bridge 1.0.3 → 1.0.5

package/dist/bridge/bridge-adapters.opencode.js

@@ -34,6 +34,9 @@ export class OpenCodeServerAdapter {
     localPromptNoticeSent = false;
     loggedUnknownEventTypes = new Set();
     emittedTextByPartId = new Map();
+    partTypeByPartId = new Map();
+    visibleReplyPartsByPartId = new Map();
+    visibleReplyMessageIds = new Set();
     observedOpenCodeMessages = new Map();
     observedUserTextByPartId = new Map();
     observedUserMessagePartIds = new Map();
@@ -71,7 +74,7 @@ export class OpenCodeServerAdapter {
         this.setStatus("starting", "Starting OpenCode companion...");
         try {
             this.serverPort = await reserveLocalPort();
-            await this.startServerProcess();
+            const serverProcess = await this.startServerProcess();
             await waitForTcpPort(OPENCODE_SERVER_HOST, this.serverPort, OPENCODE_SERVER_READY_TIMEOUT_MS);
             await this.createSdkClient();
             await this.checkHealth();
@@ -82,7 +85,7 @@ export class OpenCodeServerAdapter {
                 await this.syncVisibleSessionToShared({ force: true });
             }
             else {
-                this.state.pid = this.serverProcess?.pid;
+                this.state.pid = serverProcess.pid;
                 this.state.startedAt = nowIso();
             }
             this.setStatus("idle", "OpenCode adapter is ready.");
@@ -138,7 +141,9 @@ export class OpenCodeServerAdapter {
             this.settleTurnState();
             this.clearObservedMessageTracking();
             this.setStatus("idle");
-            throw new Error(`Failed to send prompt: ${describeUnknownError(err)}`);
+            throw new Error(`Failed to send prompt: ${describeUnknownError(err)}`, {
+                cause: err,
+            });
         }
     }
     async listResumeSessions(limit = 10) {
@@ -354,6 +359,7 @@ export class OpenCodeServerAdapter {
                 timestamp: nowIso(),
             });
         });
+        return server;
     }
     async startNativeClient() {
         if (this.nativeProcess) {
@@ -395,7 +401,7 @@ export class OpenCodeServerAdapter {
             const detail = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
             this.emit({
                 type: "shutdown_requested",
-                reason: "companion_disconnected",
+                reason: "companion_closed",
                 message: `OpenCode companion exited (${detail}).`,
                 exitCode: typeof code === "number" ? code : 0,
                 timestamp: nowIso(),
@@ -421,7 +427,7 @@ export class OpenCodeServerAdapter {
             });
         }
         catch (err) {
-            throw new Error(`Failed to load @opencode-ai/sdk. Make sure it is installed: ${describeUnknownError(err)}`);
+            throw new Error(`Failed to load @opencode-ai/sdk. Make sure it is installed: ${describeUnknownError(err)}`, { cause: err });
         }
     }
     async checkHealth() {
@@ -730,15 +736,16 @@ export class OpenCodeServerAdapter {
             this.state.activeTurnOrigin = undefined;
             this.hasAcceptedInput = false;
             const completedPreview = this.currentPreview;
+            const turnStartedAtMs = this.lastBusyAtMs;
             void this.outputBatcher.flushNow()
                 .catch(() => undefined)
-                .then(() => {
-                const summary = this.outputBatcher.getRecentSummary(500);
+                .then(async () => {
+                const finalReplyText = await this.resolveFinalReplyText(sessionId, turnStartedAtMs);
                 this.setStatus("idle");
-                if (summary && summary !== "(no output)") {
+                if (finalReplyText) {
                     this.emit({
                         type: "final_reply",
-                        text: summary,
+                        text: finalReplyText,
                         timestamp: nowIso(),
                     });
                 }
@@ -904,7 +911,7 @@ export class OpenCodeServerAdapter {
         if (!messageId) {
             return;
         }
-        const observed = this.getOrCreateObservedOpenCodeMessage(messageId, sessionId);
+        const observed = this.getOrCreateObservedOpenCodeMessage(messageId, sessionId ?? undefined);
         observed.updatedAtMs = Date.now();
         observed.sessionId = sessionId ?? observed.sessionId;
         observed.role = role;
@@ -919,11 +926,15 @@ export class OpenCodeServerAdapter {
             return;
         }
         const part = isRecord(properties.part) ? properties.part : undefined;
+        const partId = this.extractPartId(properties, part);
+        if (partId && typeof part?.type === "string") {
+            this.partTypeByPartId.set(partId, part.type);
+        }
         if (this.isVisibleTextPart(part)) {
             this.trackObservedOpenCodeMessagePart({
                 messageId: part.messageID,
                 sessionId: part.sessionID,
-                partId: part.id,
+                partId: partId ?? part.id,
                 snapshotText: typeof part.text === "string" ? part.text : undefined,
                 deltaText: typeof properties.delta === "string" ? properties.delta : undefined,
             });
@@ -940,7 +951,6 @@ export class OpenCodeServerAdapter {
         if (!this.syncTrackedSessionFromEvent(part.sessionID)) {
             return;
         }
-        const partId = this.extractPartId(properties, part);
         if (!partId) {
             return;
         }
@@ -958,11 +968,26 @@ export class OpenCodeServerAdapter {
         const observedText = typeof part.messageID === "string"
             ? this.observedOpenCodeMessages.get(part.messageID)?.text
             : undefined;
+        const observedRole = typeof part.messageID === "string"
+            ? this.observedOpenCodeMessages.get(part.messageID)?.role
+            : undefined;
+        if (observedRole !== "assistant" &&
+            this.matchesRecentLocalPromptMirror(observedText || partText || delta || text, {
+                allowPrefix: true,
+            })) {
+            return;
+        }
         if (this.matchesRecentWechatPromptMirror(part.sessionID, observedText || partText || delta || text, {
             allowPrefix: true,
         })) {
             return;
         }
+        if (partText) {
+            this.recordVisibleReplyPartSnapshot(partId, part.sessionID, part.messageID, partText);
+        }
+        else if (text) {
+            this.recordVisibleReplyPartDelta(partId, part.sessionID, part.messageID, text);
+        }
         this.pushVisibleOutput(text);
     }
     handleMessagePartDelta(properties) {
@@ -984,16 +1009,20 @@ export class OpenCodeServerAdapter {
             }
             return;
         }
+        const sessionId = typeof properties.sessionID === "string"
+            ? properties.sessionID
+            : undefined;
+        const partId = this.extractPartId(properties);
+        const knownPartType = partId ? this.partTypeByPartId.get(partId) : undefined;
+        if (knownPartType && knownPartType !== "text") {
+            return;
+        }
         if (properties.field !== "text") {
             return;
         }
         const delta = typeof properties.delta === "string"
             ? properties.delta
             : undefined;
-        const sessionId = typeof properties.sessionID === "string"
-            ? properties.sessionID
-            : undefined;
-        const partId = this.extractPartId(properties);
         if (typeof properties.messageID === "string" && partId && delta) {
             this.trackObservedOpenCodeMessagePart({
                 messageId: properties.messageID,
@@ -1012,11 +1041,21 @@ export class OpenCodeServerAdapter {
         const observedText = typeof properties.messageID === "string"
             ? this.observedOpenCodeMessages.get(properties.messageID)?.text
             : undefined;
+        const observedRole = typeof properties.messageID === "string"
+            ? this.observedOpenCodeMessages.get(properties.messageID)?.role
+            : undefined;
+        if (observedRole !== "assistant" &&
+            this.matchesRecentLocalPromptMirror(observedText || delta || text, {
+                allowPrefix: true,
+            })) {
+            return;
+        }
         if (this.matchesRecentWechatPromptMirror(sessionId, observedText || delta || text, {
             allowPrefix: true,
         })) {
             return;
         }
+        this.recordVisibleReplyPartDelta(partId, sessionId, properties.messageID, text);
         this.pushVisibleOutput(text);
     }
     handleMessagePartRemoved(properties) {
@@ -1028,6 +1067,156 @@ export class OpenCodeServerAdapter {
             return;
         }
         this.emittedTextByPartId.delete(partId);
+        this.partTypeByPartId.delete(partId);
+        this.visibleReplyPartsByPartId.delete(partId);
+    }
+    recordVisibleReplyPartSnapshot(partId, sessionId, messageId, text) {
+        const normalizedText = normalizeOutput(text);
+        if (!normalizedText) {
+            return;
+        }
+        const resolvedSessionId = sessionId ?? this.activeSessionId ?? undefined;
+        if (!resolvedSessionId) {
+            return;
+        }
+        const resolvedMessageId = typeof messageId === "string" ? messageId : undefined;
+        this.visibleReplyPartsByPartId.set(partId, {
+            sessionId: resolvedSessionId,
+            messageId: resolvedMessageId,
+            text: normalizedText,
+        });
+        if (resolvedMessageId) {
+            this.visibleReplyMessageIds.add(resolvedMessageId);
+        }
+    }
+    recordVisibleReplyPartDelta(partId, sessionId, messageId, delta) {
+        const normalizedDelta = normalizeOutput(delta);
+        if (!normalizedDelta) {
+            return;
+        }
+        const previous = this.visibleReplyPartsByPartId.get(partId);
+        this.recordVisibleReplyPartSnapshot(partId, sessionId ?? previous?.sessionId, messageId ?? previous?.messageId, `${previous?.text ?? ""}${normalizedDelta}`);
+    }
+    async resolveFinalReplyText(sessionId, turnStartedAtMs) {
+        const sessionReply = sessionId
+            ? await this.fetchLatestAssistantVisibleReply(sessionId, turnStartedAtMs)
+            : "";
+        if (sessionReply.trim()) {
+            return sessionReply.trim();
+        }
+        const streamedReply = this.getBufferedVisibleReplyText(sessionId ?? undefined);
+        if (streamedReply.trim()) {
+            return streamedReply.trim();
+        }
+        const summary = this.outputBatcher.getRecentSummary(500);
+        return summary && summary !== "(no output)" ? summary : "";
+    }
+    getBufferedVisibleReplyText(sessionId) {
+        const chunks = [];
+        for (const part of this.visibleReplyPartsByPartId.values()) {
+            if (sessionId && part.sessionId !== sessionId) {
+                continue;
+            }
+            if (part.text) {
+                chunks.push(part.text);
+            }
+        }
+        return normalizeOutput(chunks.join(""));
+    }
+    async fetchLatestAssistantVisibleReply(sessionId, turnStartedAtMs) {
+        const sessionClient = this.client?.session;
+        if (!sessionClient?.messages) {
+            return "";
+        }
+        const queryVariants = this.activeWorkspaceId
+            ? [
+                {
+                    sessionID: sessionId,
+                    directory: this.options.cwd,
+                    workspace: this.activeWorkspaceId,
+                    limit: 20,
+                },
+                {
+                    sessionID: sessionId,
+                    directory: this.options.cwd,
+                    limit: 20,
+                },
+            ]
+            : [
+                {
+                    sessionID: sessionId,
+                    directory: this.options.cwd,
+                    limit: 20,
+                },
+            ];
+        for (const query of queryVariants) {
+            try {
+                const result = await sessionClient.messages(query);
+                if (result.error !== undefined || !Array.isArray(result.data)) {
+                    continue;
+                }
+                const text = this.extractLatestAssistantVisibleReply(result.data, turnStartedAtMs, this.visibleReplyMessageIds);
+                if (text) {
+                    return text;
+                }
+            }
+            catch {
+                // Fall back to the streamed visible text buffer.
+            }
+        }
+        return "";
+    }
+    extractLatestAssistantVisibleReply(messages, turnStartedAtMs, expectedMessageIds) {
+        let best = null;
+        const minTimeMs = turnStartedAtMs > 0 ? turnStartedAtMs - 5_000 : 0;
+        for (const [index, message] of messages.entries()) {
+            if (!isRecord(message) || !isRecord(message.info)) {
+                continue;
+            }
+            if (message.info.role !== "assistant") {
+                continue;
+            }
+            const messageId = typeof message.info.id === "string" ? message.info.id : "";
+            if (expectedMessageIds.size > 0 && !expectedMessageIds.has(messageId)) {
+                continue;
+            }
+            const timeMs = this.extractMessageTimeMs(message.info);
+            if (expectedMessageIds.size === 0 && (!timeMs || timeMs < minTimeMs)) {
+                continue;
+            }
+            const text = this.extractVisibleTextFromParts(message.parts);
+            if (!text.trim()) {
+                continue;
+            }
+            const candidate = { text, timeMs: timeMs ?? 0, index };
+            if (!best ||
+                candidate.timeMs > best.timeMs ||
+                (candidate.timeMs === best.timeMs && candidate.index > best.index)) {
+                best = candidate;
+            }
+        }
+        return best?.text ?? "";
+    }
+    extractVisibleTextFromParts(parts) {
+        if (!Array.isArray(parts)) {
+            return "";
+        }
+        return normalizeOutput(parts
+            .filter((part) => this.isVisibleTextPart(isRecord(part) ? part : undefined))
+            .map((part) => part.text ?? "")
+            .join(""));
+    }
+    extractMessageTimeMs(info) {
+        const time = isRecord(info.time) ? info.time : undefined;
+        const rawTime = typeof time?.completed === "number"
+            ? time.completed
+            : typeof time?.created === "number"
+                ? time.created
+                : undefined;
+        if (typeof rawTime !== "number" || !Number.isFinite(rawTime) || rawTime <= 0) {
+            return null;
+        }
+        return rawTime < 1_000_000_000_000 ? rawTime * 1_000 : rawTime;
     }
     handleTuiPromptAppend(properties) {
         if (!isRecord(properties)) {
@@ -1284,7 +1473,10 @@ export class OpenCodeServerAdapter {
         }
     }
     wasRecentlyMirroredLocalPrompt(text) {
-        const normalizedText = normalizeOutput(text).trim();
+        return this.matchesRecentLocalPromptMirror(text);
+    }
+    matchesRecentLocalPromptMirror(text, options = {}) {
+        const normalizedText = normalizeOutput(text ?? "").trim();
         if (!normalizedText) {
             return false;
         }
@@ -1292,7 +1484,9 @@ export class OpenCodeServerAdapter {
             this.hasAcceptedInput &&
             this.lastMirroredLocalPrompt &&
             this.lastMirroredLocalPrompt.createdAtMs >= Date.now() - OPENCODE_RECENT_LOCAL_PROMPT_TTL_MS &&
-            this.lastMirroredLocalPrompt.text === normalizedText) {
+            (this.lastMirroredLocalPrompt.text === normalizedText ||
+                (options.allowPrefix === true &&
+                    this.lastMirroredLocalPrompt.text.startsWith(normalizedText)))) {
             return true;
         }
         return false;
@@ -1483,7 +1677,7 @@ export class OpenCodeServerAdapter {
             return true;
         }
         if (options.allowLocalTurnFollow !== false && this.shouldFollowLocalTurnSession(sessionId)) {
-            this.switchSharedSession(session, {
+            this.switchSharedSession(session ?? sessionId, {
                 source: "local",
                 reason: "local_turn",
                 notify: true,
@@ -1497,7 +1691,7 @@ export class OpenCodeServerAdapter {
         if (typeof properties.sessionID === "string" || typeof properties.sessionId === "string") {
             const id = typeof properties.sessionID === "string"
                 ? properties.sessionID
-                : properties.sessionId;
+                : String(properties.sessionId);
             return {
                 id,
                 workspaceID: this.extractWorkspaceId(properties) ?? undefined,
@@ -1653,8 +1847,9 @@ export class OpenCodeServerAdapter {
     }
     matchesCurrentDirectoryEvent(event) {
         const payload = this.extractEventPayload(event);
-        const wrappedDirectory = typeof event.directory === "string"
-            ? event.directory
+        const eventRecord = event;
+        const wrappedDirectory = typeof eventRecord.directory === "string"
+            ? eventRecord.directory
             : undefined;
         if (wrappedDirectory) {
             const matchesWrappedDirectory = this.normalizeDirectory(wrappedDirectory) === this.normalizeDirectory(this.options.cwd);
@@ -1820,6 +2015,9 @@ export class OpenCodeServerAdapter {
     }
     clearStreamedPartState() {
         this.emittedTextByPartId.clear();
+        this.partTypeByPartId.clear();
+        this.visibleReplyPartsByPartId.clear();
+        this.visibleReplyMessageIds.clear();
     }
     cleanupObservedOpenCodeMessage(messageId) {
         this.observedOpenCodeMessages.delete(messageId);

package/dist/bridge/bridge-adapters.shared.js

@@ -8,6 +8,8 @@ import { attachLocalCompanionMessageListener, buildLocalCompanionToken, clearLoc
 import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
 import { buildClaudeFailureMessage, buildClaudeHookSettings, buildClaudePermissionDecisionHookOutput, buildClaudePermissionApprovalRequest, extractClaudeResumeConversationId, findInjectedClaudePromptIndex, normalizeClaudeAssistantMessage, parseClaudeHookPayload, } from "./claude-hooks.js";
 import { detectCliApproval, isHighRiskShellCommand, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
+import { coerceWebSocketMessageData, describeUnknownError, getCodexRpcRequestId, getLocalCompanionCommandName, getNotificationThreadId, getNotificationTurnId, getSharedSessionIdFromAdapterState, isRecentIsoTimestamp, isRecord, normalizeCodexRpcError, quotePosixCommandArg, quoteWindowsCommandArg, } from "./bridge-adapter-common.js";
+export { coerceWebSocketMessageData, describeUnknownError, getCodexRpcRequestId, getLocalCompanionCommandName, getNotificationThreadId, getNotificationTurnId, getSharedSessionIdFromAdapterState, isRecentIsoTimestamp, isRecord, normalizeCodexRpcError, quotePosixCommandArg, quoteWindowsCommandArg, } from "./bridge-adapter-common.js";
 export const DEFAULT_COLS = 120;
 export const DEFAULT_ROWS = 30;
 export const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
@@ -39,101 +41,6 @@ export const OPENCODE_SERVER_READY_TIMEOUT_MS = 10_000;
 export const OPENCODE_SSE_RECONNECT_DELAY_MS = 2_000;
 export const OPENCODE_SESSION_IDLE_SETTLE_MS = 1_500;
 export const OPENCODE_WECHAT_WORKING_NOTICE_DELAY_MS = 12_000;
-export function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-export function getCodexRpcRequestId(value) {
-    return typeof value === "string" || typeof value === "number" ? value : null;
-}
-export function getNotificationThreadId(params) {
-    if (!isRecord(params)) {
-        return null;
-    }
-    if (typeof params.threadId === "string") {
-        return params.threadId;
-    }
-    if (isRecord(params.thread) && typeof params.thread.id === "string") {
-        return params.thread.id;
-    }
-    return null;
-}
-export function getNotificationTurnId(params) {
-    if (!isRecord(params)) {
-        return null;
-    }
-    if (typeof params.turnId === "string") {
-        return params.turnId;
-    }
-    if (isRecord(params.turn) && typeof params.turn.id === "string") {
-        return params.turn.id;
-    }
-    return null;
-}
-export function describeUnknownError(error) {
-    if (error instanceof Error && error.message) {
-        return error.message;
-    }
-    return String(error);
-}
-export function normalizeCodexRpcError(error) {
-    if (isRecord(error)) {
-        const message = typeof error.message === "string"
-            ? error.message
-            : typeof error.code === "number"
-                ? `RPC error ${error.code}`
-                : "";
-        const data = typeof error.data === "string"
-            ? error.data
-            : typeof error.details === "string"
-                ? error.details
-                : "";
-        const combined = [message, data].filter(Boolean).join(": ");
-        if (combined) {
-            return combined;
-        }
-    }
-    return describeUnknownError(error);
-}
-export function getLocalCompanionCommandName(kind) {
-    switch (kind) {
-        case "codex":
-            return "wechat-codex";
-        case "claude":
-            return "wechat-claude";
-        case "opencode":
-            return "wechat-opencode";
-        default:
-            return "local companion";
-    }
-}
-export function getSharedSessionIdFromAdapterState(state) {
-    return state.sharedSessionId ?? state.sharedThreadId;
-}
-export function quoteWindowsCommandArg(value) {
-    return `"${value.replace(/"/g, '""')}"`;
-}
-export function quotePosixCommandArg(value) {
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-export function isRecentIsoTimestamp(timestamp, maxAgeMs) {
-    const parsedMs = Date.parse(timestamp);
-    if (!Number.isFinite(parsedMs)) {
-        return false;
-    }
-    return parsedMs >= Date.now() - maxAgeMs;
-}
-export function coerceWebSocketMessageData(data) {
-    if (typeof data === "string") {
-        return data;
-    }
-    if (data instanceof ArrayBuffer) {
-        return Buffer.from(data).toString("utf8");
-    }
-    if (ArrayBuffer.isView(data)) {
-        return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString("utf8");
-    }
-    return null;
-}
 export function buildCodexCliArgs(remoteUrl, options = {}) {
     assertNoReservedExtraCliArgs(options.extraCliArgs ?? [], ["--remote", "--remote-auth-token-env"], "Codex remote connection");
     const args = [];
@@ -196,7 +103,7 @@ export function shouldIncludeClaudeNoAltScreen(command) {
     if (cached !== undefined) {
         return cached;
     }
-    let supported = false;
+    let supported;
     try {
         const probe = spawnSync(spawnTarget.file, [...spawnTarget.args, "--help"], {
             cwd: process.cwd(),
@@ -660,7 +567,7 @@ export function escapePowerShellString(text) {
     return text.replace(/`/g, "``").replace(/"/g, '`"');
 }
 export function escapePosixShellString(text) {
-    return `'${text.replace(/'/g, `'\"'\"'`)}'`;
+    return `'${text.replace(/'/g, `'"'"'`)}'`;
 }
 export function buildShellProfileCommand(profilePath, family) {
     const resolved = path.resolve(profilePath);

package/dist/bridge/bridge-controller.js

@@ -17,7 +17,9 @@ export class BridgeController {
             this.clearLocalClientEndpoint();
             return;
         }
-        const existing = readLocalCompanionEndpoint(this.cwd);
+        const existing = readLocalCompanionEndpoint(this.cwd, {
+            adapter: endpoint.kind,
+        });
         const adapterState = this.adapter.getState();
         const nextEndpoint = existing?.instanceId === endpoint.instanceId
             ? {
@@ -38,7 +40,9 @@ export class BridgeController {
         writeLocalCompanionEndpoint(nextEndpoint);
     }
     clearLocalClientEndpoint() {
-        clearLocalCompanionEndpoint(this.cwd, this.endpointInstanceId ?? undefined);
+        clearLocalCompanionEndpoint(this.cwd, this.endpointInstanceId ?? undefined, {
+            adapter: this.adapter.getState().kind,
+        });
         this.endpointInstanceId = null;
     }
 }

package/dist/bridge/bridge-final-reply.js

@@ -1,10 +1,25 @@
 import { formatFinalReplyMessage, parseWechatFinalReply, sanitizeWechatFinalReplyText, } from "./bridge-utils.js";
+export const OPENCODE_EMPTY_VISIBLE_REPLY_MESSAGE = "OpenCode 没有产生可发送到微信的可见回复。请查看本地终端输出，或重试这条消息。";
 export async function forwardWechatFinalReply(params) {
-    const { adapter, rawText, sender } = params;
+    const { adapter, rawText, sender, onEmptyVisibleReply } = params;
     const parsed = parseWechatFinalReply(rawText);
-    const visibleText = formatFinalReplyMessage(adapter, sanitizeWechatFinalReplyText(adapter, parsed.visibleText)).trim();
+    const sanitizedText = sanitizeWechatFinalReplyText(adapter, parsed.visibleText);
+    const visibleText = formatFinalReplyMessage(adapter, sanitizedText).trim();
     if (visibleText) {
-        await sender.sendText(visibleText);
+        const sent = await sender.sendText(visibleText);
+        if (sent === false) {
+            return;
+        }
+    }
+    else if (adapter === "opencode" && parsed.visibleText.trim()) {
+        onEmptyVisibleReply?.({
+            adapter,
+            rawVisibleText: parsed.visibleText,
+        });
+        const sent = await sender.sendText(OPENCODE_EMPTY_VISIBLE_REPLY_MESSAGE);
+        if (sent === false) {
+            return;
+        }
     }
     for (const attachment of parsed.attachments) {
         try {

package/dist/bridge/bridge-state.js

@@ -3,6 +3,14 @@ import { BRIDGE_LOCK_FILE, BRIDGE_LOG_FILE, ensureWorkspaceChannelDir, ensureCha
 import { buildInstanceId } from "./bridge-utils.js";
 const ORPHAN_LOCK_RECLAIM_TIMEOUT_MS = 2_000;
 const ORPHAN_LOCK_RECLAIM_POLL_MS = 100;
+export function resolveRestorableSharedSessionId(persisted, options) {
+    if (!persisted ||
+        persisted.cwd !== options.cwd ||
+        persisted.adapter !== options.adapter) {
+        return undefined;
+    }
+    return persisted.sharedSessionId ?? persisted.sharedThreadId;
+}
 function cloneState(state) {
     return JSON.parse(JSON.stringify(state));
 }
@@ -162,9 +170,7 @@ export class BridgeStateStore {
         };
         this.acquireLock();
         const persisted = this.readStateFile();
-        const persistedSharedSessionId = persisted?.cwd === options.cwd
-            ? persisted.sharedSessionId ?? persisted.sharedThreadId
-            : undefined;
+        const persistedSharedSessionId = resolveRestorableSharedSessionId(persisted, options);
         const persistedResumeConversationId = options.adapter === "claude" &&
             persisted?.cwd === options.cwd &&
             typeof persisted.resumeConversationId === "string"