@unlinearity/cli-wechat-bridge 1.0.2 → 1.0.4

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

@@ -6,6 +6,7 @@ const OPENCODE_DEBUG_ENABLED = /^(1|true|yes|on)$/i.test(process.env.WECHAT_OPEN
 const OPENCODE_DUPLICATE_EVENT_TTL_MS = 150;
 const OPENCODE_WECHAT_MIRROR_SUPPRESSION_TTL_MS = 30_000;
 const OPENCODE_RECENT_LOCAL_PROMPT_TTL_MS = 10_000;
+const OPENCODE_LOCAL_SESSION_CREATE_FOLLOW_TTL_MS = 5_000;
 /* ------------------------------------------------------------------ */
 /*  Adapter                                                            */
 /* ------------------------------------------------------------------ */
@@ -33,13 +34,18 @@ 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();
     pendingWechatPromptMirrorSuppressions = [];
+    recentWechatPromptMirrorSuppressions = [];
     recentSdkEventObservations = new Map();
     suppressedTuiSessionSelectId = null;
     lastMirroredLocalPrompt = null;
+    pendingLocalSessionCreateFollowUntilMs = 0;
     pendingPermission = null;
     constructor(options) {
         this.options = options;
@@ -68,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();
@@ -79,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.");
@@ -118,6 +124,8 @@ export class OpenCodeServerAdapter {
             syncVisible: true,
             forceVisibleSync: true,
         });
+        this.recordPendingWechatPromptMirrorSuppression(session.id, normalized);
+        this.beginTrackedTurn(normalized, "wechat");
         try {
             const result = await this.client.session.promptAsync({
                 sessionID: session.id,
@@ -130,10 +138,13 @@ export class OpenCodeServerAdapter {
             }
         }
         catch (err) {
-            throw new Error(`Failed to send prompt: ${describeUnknownError(err)}`);
+            this.settleTurnState();
+            this.clearObservedMessageTracking();
+            this.setStatus("idle");
+            throw new Error(`Failed to send prompt: ${describeUnknownError(err)}`, {
+                cause: err,
+            });
         }
-        this.recordPendingWechatPromptMirrorSuppression(session.id, normalized);
-        this.beginTrackedTurn(normalized, "wechat");
     }
     async listResumeSessions(limit = 10) {
         void limit;
@@ -143,6 +154,31 @@ export class OpenCodeServerAdapter {
         void sessionId;
         throw new Error('WeChat /resume is disabled in opencode mode. Use /session directly inside "wechat-opencode"; WeChat will follow the active local session.');
     }
+    async createSession() {
+        if (!this.client) {
+            throw new Error("OpenCode adapter is not running.");
+        }
+        if (this.state.status === "busy") {
+            throw new Error("OpenCode is still working. Wait for the current reply or use /stop.");
+        }
+        if (this.pendingPermission) {
+            throw new Error("An OpenCode approval request is pending. Reply with /confirm <code> or /deny.");
+        }
+        this.outputBatcher.clear();
+        this.clearStreamedPartState();
+        const session = this.unwrapOrThrow(await this.client.session.create({
+            directory: this.options.cwd,
+            workspace: this.activeWorkspaceId ?? undefined,
+        }));
+        this.switchSharedSession(session, {
+            source: "wechat",
+            reason: "wechat_resume",
+            notify: true,
+            clearTrackedTurn: true,
+            syncVisible: true,
+            forceVisibleSync: true,
+        });
+    }
     async interrupt() {
         if (!this.client || !this.activeSessionId) {
             return false;
@@ -167,6 +203,7 @@ export class OpenCodeServerAdapter {
         this.clearWechatWorkingNotice(true);
         this.pendingLocalPrompt = "";
         this.localPromptNoticeSent = false;
+        this.pendingLocalSessionCreateFollowUntilMs = 0;
         this.clearObservedMessageTracking();
         this.recentSdkEventObservations.clear();
         this.clearPendingPermissionState();
@@ -223,6 +260,7 @@ export class OpenCodeServerAdapter {
         this.clearWechatWorkingNotice(true);
         this.pendingLocalPrompt = "";
         this.localPromptNoticeSent = false;
+        this.pendingLocalSessionCreateFollowUntilMs = 0;
         this.clearObservedMessageTracking();
         this.recentSdkEventObservations.clear();
         this.outputBatcher.clear();
@@ -321,6 +359,7 @@ export class OpenCodeServerAdapter {
                 timestamp: nowIso(),
             });
         });
+        return server;
     }
     async startNativeClient() {
         if (this.nativeProcess) {
@@ -362,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(),
@@ -388,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() {
@@ -573,12 +612,15 @@ export class OpenCodeServerAdapter {
             if (this.isImplicitLocalCompanionUiEvent(type)) {
                 return true;
             }
-            return this.matchesCurrentDirectoryEvent(event);
+            return (this.matchesCurrentDirectoryEvent(event) ||
+                this.shouldAcceptUnscopedLocalSessionCreatedEvent(event));
         }
         if (type === "session.created" ||
             type === "session.updated" ||
             type === "session.deleted") {
-            return this.matchesCurrentDirectoryEvent(event);
+            return (this.matchesCurrentDirectoryEvent(event) ||
+                (type === "session.created" &&
+                    this.shouldAcceptUnscopedLocalSessionCreatedEvent(event)));
         }
         return false;
     }
@@ -694,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(),
                     });
                 }
@@ -831,9 +874,21 @@ export class OpenCodeServerAdapter {
             return;
         }
         const session = this.extractSessionReference(properties);
-        if (!this.syncTrackedSessionFromEvent(session)) {
+        if (this.syncTrackedSessionFromEvent(session)) {
             return;
         }
+        if (!this.shouldFollowCreatedLocalSession(session)) {
+            return;
+        }
+        this.pendingLocalSessionCreateFollowUntilMs = 0;
+        this.logDebug(`[opencode-adapter:local-follow] session.created ${session.id}`);
+        this.switchSharedSession(session, {
+            source: "local",
+            reason: "local_follow",
+            notify: true,
+            clearTrackedTurn: true,
+            syncVisible: true,
+        });
     }
     handleSessionUpdated(properties) {
         if (!isRecord(properties)) {
@@ -856,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;
@@ -871,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,
             });
@@ -892,7 +951,6 @@ export class OpenCodeServerAdapter {
         if (!this.syncTrackedSessionFromEvent(part.sessionID)) {
             return;
         }
-        const partId = this.extractPartId(properties, part);
         if (!partId) {
             return;
         }
@@ -907,6 +965,29 @@ export class OpenCodeServerAdapter {
             : delta
                 ? this.consumeVisiblePartDelta(partId, delta)
                 : "";
+        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) {
@@ -928,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,
@@ -953,6 +1038,24 @@ export class OpenCodeServerAdapter {
             return;
         }
         const text = this.consumeVisiblePartDelta(partId, delta);
+        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) {
@@ -964,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)) {
@@ -993,6 +1246,9 @@ export class OpenCodeServerAdapter {
                 this.handleLocalPromptSubmit();
                 return;
             default:
+                if (this.isLocalSessionNavigationCommand(command)) {
+                    this.markPendingLocalSessionCreateFollow();
+                }
                 return;
         }
     }
@@ -1000,7 +1256,7 @@ export class OpenCodeServerAdapter {
         if (!isRecord(properties)) {
             return;
         }
-        const sessionId = typeof properties.sessionID === "string" ? properties.sessionID : undefined;
+        const sessionId = this.extractSessionId(properties) ?? undefined;
         if (!sessionId) {
             return;
         }
@@ -1010,6 +1266,7 @@ export class OpenCodeServerAdapter {
         }
         this.pendingLocalPrompt = "";
         this.localPromptNoticeSent = false;
+        this.pendingLocalSessionCreateFollowUntilMs = 0;
         this.logDebug(`[opencode-adapter:local-follow] tui.session.select ${sessionId}`);
         this.switchSharedSession({
             id: sessionId,
@@ -1043,7 +1300,9 @@ export class OpenCodeServerAdapter {
                 clearTrackedTurn: true,
                 syncVisible: true,
             });
+            return;
         }
+        this.markPendingLocalSessionCreateFollow();
     }
     handleSessionError(properties) {
         if (!isRecord(properties)) {
@@ -1138,7 +1397,8 @@ export class OpenCodeServerAdapter {
             return;
         }
         observed.emitted = true;
-        if (this.shouldSuppressWechatMirroredPrompt(observed.sessionId, text)) {
+        if (this.shouldSuppressWechatMirroredPrompt(observed.sessionId, text) ||
+            this.matchesRecentWechatPromptMirror(observed.sessionId, text)) {
             this.cleanupObservedOpenCodeMessage(messageId);
             return;
         }
@@ -1159,30 +1419,23 @@ export class OpenCodeServerAdapter {
         if (!sessionId || !normalizedText) {
             return;
         }
-        const cutoff = Date.now() - OPENCODE_WECHAT_MIRROR_SUPPRESSION_TTL_MS;
-        for (let index = this.pendingWechatPromptMirrorSuppressions.length - 1; index >= 0; index -= 1) {
-            if (this.pendingWechatPromptMirrorSuppressions[index].createdAtMs < cutoff) {
-                this.pendingWechatPromptMirrorSuppressions.splice(index, 1);
-            }
-        }
-        this.pendingWechatPromptMirrorSuppressions.push({
+        this.pruneWechatPromptMirrorSuppressions();
+        const suppression = {
             sessionId,
             text: normalizedText,
             createdAtMs: Date.now(),
-        });
+        };
+        this.pendingWechatPromptMirrorSuppressions.push(suppression);
+        this.recentWechatPromptMirrorSuppressions.push(suppression);
     }
     shouldSuppressWechatMirroredPrompt(sessionId, text) {
         const normalizedText = normalizeOutput(text).trim();
         if (!sessionId || !normalizedText) {
             return false;
         }
-        const cutoff = Date.now() - OPENCODE_WECHAT_MIRROR_SUPPRESSION_TTL_MS;
+        this.pruneWechatPromptMirrorSuppressions();
         for (let index = this.pendingWechatPromptMirrorSuppressions.length - 1; index >= 0; index -= 1) {
             const pending = this.pendingWechatPromptMirrorSuppressions[index];
-            if (pending.createdAtMs < cutoff) {
-                this.pendingWechatPromptMirrorSuppressions.splice(index, 1);
-                continue;
-            }
             if (pending.sessionId === sessionId && pending.text === normalizedText) {
                 this.pendingWechatPromptMirrorSuppressions.splice(index, 1);
                 return true;
@@ -1190,8 +1443,40 @@ export class OpenCodeServerAdapter {
         }
         return false;
     }
+    matchesRecentWechatPromptMirror(sessionId, text, options = {}) {
+        const normalizedText = normalizeOutput(text ?? "").trim();
+        if (!sessionId || !normalizedText) {
+            return false;
+        }
+        this.pruneWechatPromptMirrorSuppressions();
+        return this.recentWechatPromptMirrorSuppressions.some((pending) => {
+            if (pending.sessionId !== sessionId) {
+                return false;
+            }
+            if (pending.text === normalizedText) {
+                return true;
+            }
+            return options.allowPrefix === true && pending.text.startsWith(normalizedText);
+        });
+    }
+    pruneWechatPromptMirrorSuppressions() {
+        const cutoff = Date.now() - OPENCODE_WECHAT_MIRROR_SUPPRESSION_TTL_MS;
+        for (let index = this.pendingWechatPromptMirrorSuppressions.length - 1; index >= 0; index -= 1) {
+            if (this.pendingWechatPromptMirrorSuppressions[index].createdAtMs < cutoff) {
+                this.pendingWechatPromptMirrorSuppressions.splice(index, 1);
+            }
+        }
+        for (let index = this.recentWechatPromptMirrorSuppressions.length - 1; index >= 0; index -= 1) {
+            if (this.recentWechatPromptMirrorSuppressions[index].createdAtMs < cutoff) {
+                this.recentWechatPromptMirrorSuppressions.splice(index, 1);
+            }
+        }
+    }
     wasRecentlyMirroredLocalPrompt(text) {
-        const normalizedText = normalizeOutput(text).trim();
+        return this.matchesRecentLocalPromptMirror(text);
+    }
+    matchesRecentLocalPromptMirror(text, options = {}) {
+        const normalizedText = normalizeOutput(text ?? "").trim();
         if (!normalizedText) {
             return false;
         }
@@ -1199,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;
@@ -1276,6 +1563,7 @@ export class OpenCodeServerAdapter {
         this.observedUserTextByPartId.clear();
         this.observedUserMessagePartIds.clear();
         this.pendingWechatPromptMirrorSuppressions.length = 0;
+        this.recentWechatPromptMirrorSuppressions.length = 0;
         this.lastMirroredLocalPrompt = null;
     }
     clearTrackedTurnForLocalSessionSwitch() {
@@ -1389,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,
@@ -1400,12 +1688,22 @@ export class OpenCodeServerAdapter {
         return false;
     }
     extractSessionReference(properties) {
-        if (typeof properties.sessionID === "string") {
+        if (typeof properties.sessionID === "string" || typeof properties.sessionId === "string") {
+            const id = typeof properties.sessionID === "string"
+                ? properties.sessionID
+                : String(properties.sessionId);
             return {
-                id: properties.sessionID,
+                id,
                 workspaceID: this.extractWorkspaceId(properties) ?? undefined,
             };
         }
+        const session = isRecord(properties.session) ? properties.session : undefined;
+        if (typeof session?.id === "string") {
+            return {
+                id: session.id,
+                workspaceID: this.extractWorkspaceId(session) ?? this.extractWorkspaceId(properties) ?? undefined,
+            };
+        }
         const info = isRecord(properties.info) ? properties.info : undefined;
         if (typeof info?.id === "string") {
             return {
@@ -1422,6 +1720,10 @@ export class OpenCodeServerAdapter {
         if (typeof properties.workspaceID === "string") {
             return properties.workspaceID;
         }
+        const session = isRecord(properties.session) ? properties.session : undefined;
+        if (typeof session?.workspaceID === "string") {
+            return session.workspaceID;
+        }
         const info = isRecord(properties.info) ? properties.info : undefined;
         if (typeof info?.workspaceID === "string") {
             return info.workspaceID;
@@ -1433,6 +1735,46 @@ export class OpenCodeServerAdapter {
             this.state.activeTurnOrigin === "local" &&
             this.hasTrackedTurnState());
     }
+    markPendingLocalSessionCreateFollow() {
+        this.pendingLocalSessionCreateFollowUntilMs =
+            Date.now() + OPENCODE_LOCAL_SESSION_CREATE_FOLLOW_TTL_MS;
+    }
+    hasPendingLocalSessionCreateFollow() {
+        return Date.now() <= this.pendingLocalSessionCreateFollowUntilMs;
+    }
+    shouldAcceptUnscopedLocalSessionCreatedEvent(event) {
+        if (this.normalizeEventType(event.type) !== "session.created") {
+            return false;
+        }
+        if (this.options.renderMode !== "companion") {
+            return false;
+        }
+        const payload = this.extractEventPayload(event);
+        if (!isRecord(payload)) {
+            return false;
+        }
+        const session = this.extractSessionReference(payload);
+        if (!session?.id || session.id === this.activeSessionId) {
+            return false;
+        }
+        if (typeof event.directory === "string" ||
+            this.extractSessionDirectory(payload) ||
+            this.extractWorkspaceId(payload)) {
+            return false;
+        }
+        return this.hasPendingLocalSessionCreateFollow() || Boolean(this.activeSessionId);
+    }
+    shouldFollowCreatedLocalSession(session) {
+        if (!session?.id || session.id === this.activeSessionId) {
+            return false;
+        }
+        if (this.hasPendingLocalSessionCreateFollow()) {
+            this.pendingLocalSessionCreateFollowUntilMs = 0;
+            return true;
+        }
+        this.pendingLocalSessionCreateFollowUntilMs = 0;
+        return Boolean(this.activeSessionId);
+    }
     switchSharedSession(session, options) {
         const sessionId = typeof session === "string" ? session : session.id;
         if (!sessionId) {
@@ -1490,7 +1832,9 @@ export class OpenCodeServerAdapter {
         }
         const normalized = command.trim().toLowerCase();
         return (normalized === "session" ||
+            normalized === "new" ||
             normalized === "/session" ||
+            normalized === "/new" ||
             normalized.startsWith("session.") ||
             normalized.startsWith("/session "));
     }
@@ -1503,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);
@@ -1538,6 +1883,10 @@ export class OpenCodeServerAdapter {
         if (typeof properties.directory === "string") {
             return properties.directory;
         }
+        const session = isRecord(properties.session) ? properties.session : undefined;
+        if (typeof session?.directory === "string") {
+            return session.directory;
+        }
         const info = isRecord(properties.info) ? properties.info : undefined;
         if (typeof info?.directory === "string") {
             return info.directory;
@@ -1666,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);