@unlinearity/cli-wechat-bridge 1.1.4 → 1.1.5

package/dist/daemon/wechat-daemon.js

@@ -12,11 +12,11 @@ import { forwardWechatFinalReply } from "../bridge/bridge-final-reply.js";
 import { readBridgeLockFile, } from "../bridge/bridge-state.js";
 import { getProcessRecordByPid, isWechatDaemonCommandLine, killProcessTreeSync, listWechatDaemonProcesses, reapOrphanedOpencodeProcesses, reapPeerBridgeProcesses, } from "../bridge/bridge-process-reaper.js";
 import { buildOneTimeCode, buildWechatInboundPrompt, formatApprovalMessage, formatDuration, formatMirroredUserInputMessage, formatPendingApprovalReminder, formatPendingUserInputReminder, formatSessionSwitchMessage, formatTaskFailedMessage, formatUserInputRequestMessage, MESSAGE_START_GRACE_MS, nowIso, OutputBatcher, parsePendingUserInputAnswerCommand, parseWechatControlCommand, truncatePreview, } from "../bridge/bridge-utils.js";
+import { ResumeSessionCoordinator, isWechatResumeEnabled, shouldForwardSessionSwitchEvent, } from "../bridge/bridge-session-resume.js";
 import { WECHAT_SEND_MAX_ATTEMPTS, computeWechatSendRetryDelayMs, formatUserFacingBridgeFatalError, formatUserFacingInboundError, formatWechatContextTokenStaleLogEntry, formatWechatSendFailureLogEntry, isRetryableWechatSendError, shouldForwardBridgeEventToWechat, } from "../bridge/wechat-forwarding.js";
 import { BRIDGE_LOCK_FILE, BRIDGE_LOG_FILE, appendBoundedLog, ensureChannelDataDir, migrateLegacyChannelFiles, } from "../wechat/channel-config.js";
 import { ensureWechatCredentials } from "../wechat/setup.js";
 import { formatBindCommandUsage, formatBindingsListMessage, isBindCommandPrefix, listBindings, loadEmojiBindings, parseEmojiBindingsCommand, removeBinding, resolveEmojiCommand, setBinding, } from "./emoji-bindings.js";
-import { formatResumeSessionList } from "../bridge/bridge-utils.js";
 import { classifyWechatTransportError, DEFAULT_LONG_POLL_TIMEOUT_MS, describeWechatTransportError, isWechatContextTokenStaleError, WeChatTransport, } from "../wechat/wechat-transport.js";
 import { createRuntimeHost, } from "../runtime/create-runtime-host.js";
 import { clearLocalCompanionEndpoint, clearLocalCompanionOccupancy, readLocalCompanionEndpoint, } from "../companion/local-companion-link.js";
@@ -893,6 +893,10 @@ class WechatDaemon {
             }),
             pendingConfirmations: [],
             pendingUserInput: null,
+            resumeCoordinator: new ResumeSessionCoordinator({
+                adapter,
+                runtime,
+            }),
             activeTask: null,
             lastOutputAt: 0,
         };
@@ -1014,8 +1018,12 @@ class WechatDaemon {
                 }
                 break;
             case "session_switched":
+                if (event.source === "local") {
+                    slot.resumeCoordinator.clear();
+                }
                 appendDaemonLog(`session_switched: adapter=${slot.adapter} session=${event.sessionId} source=${event.source} reason=${event.reason}`);
-                if (shouldForwardBridgeEventToWechat(slot.adapter, event.type)) {
+                if (shouldForwardSessionSwitchEvent(event.reason) &&
+                    shouldForwardBridgeEventToWechat(slot.adapter, event.type)) {
                     this.trackWechatForwardTask(slot.outputBatcher.flushNow().then(async () => {
                         await this.queueWechatMessage(this.authorizedUserId, prefixDaemonAdapterMessage(slot.adapter, formatSessionSwitchMessage({
                             adapter: slot.adapter,
@@ -1027,8 +1035,12 @@ class WechatDaemon {
                 }
                 break;
             case "thread_switched":
+                if (event.source === "local") {
+                    slot.resumeCoordinator.clear();
+                }
                 appendDaemonLog(`thread_switched: adapter=${slot.adapter} thread=${event.threadId} source=${event.source} reason=${event.reason}`);
-                if (shouldForwardBridgeEventToWechat(slot.adapter, event.type)) {
+                if (shouldForwardSessionSwitchEvent(event.reason) &&
+                    shouldForwardBridgeEventToWechat(slot.adapter, event.type)) {
                     this.trackWechatForwardTask(slot.outputBatcher.flushNow().then(async () => {
                         await this.queueWechatMessage(this.authorizedUserId, prefixDaemonAdapterMessage(slot.adapter, formatSessionSwitchMessage({
                             adapter: slot.adapter,
@@ -1207,29 +1219,33 @@ class WechatDaemon {
                 await this.queueWechatMessage(message.senderId, formatDaemonStatus(this.getStatus()));
                 return;
             case "resume": {
-                if (activeSlot.adapter !== "opencode") {
+                if (!isWechatResumeEnabled(activeSlot.adapter)) {
                     await this.queueWechatMessage(message.senderId, `WeChat /resume is disabled for ${activeSlot.adapter} in daemon mode. Use /resume directly inside the visible terminal; WeChat will follow that local session.`);
                     return;
                 }
-                if (command.type !== "resume") {
-                    return;
-                }
                 try {
+                    let resumeSlot = activeSlot;
+                    if (activeSlot.adapter === "codex" && command.target) {
+                        const visible = await this.ensureSlot("codex", {
+                            openVisible: true,
+                            reuseExistingVisible: true,
+                        });
+                        if (!visible.activated) {
+                            throw new Error(formatDaemonSwitchResultDetail(visible));
+                        }
+                        resumeSlot = this.slots.get("codex") ?? activeSlot;
+                    }
                     if (command.target) {
-                        await activeSlot.runtime.resumeSession(command.target);
-                        await this.queueWechatMessage(message.senderId, prefixDaemonAdapterMessage(activeSlot.adapter, `Resumed OpenCode session ${command.target}.`));
+                        await resumeSlot.outputBatcher.flushNow();
                     }
-                    else {
-                        const candidates = await activeSlot.runtime.listResumeSessions(8);
-                        await this.queueWechatMessage(message.senderId, prefixDaemonAdapterMessage(activeSlot.adapter, formatResumeSessionList({
-                            adapter: activeSlot.adapter,
-                            candidates,
-                            currentSessionId: activeSlot.runtime.getState().sharedSessionId,
-                        })));
+                    const result = await resumeSlot.resumeCoordinator.execute(command.target);
+                    if (result.kind === "resumed") {
+                        resumeSlot.activeTask = null;
                     }
+                    await this.queueWechatMessage(message.senderId, prefixDaemonAdapterMessage(resumeSlot.adapter, result.message));
                 }
                 catch (error) {
-                    await this.queueWechatMessage(message.senderId, prefixDaemonAdapterMessage(activeSlot.adapter, `Failed to resume OpenCode session: ${error instanceof Error ? error.message : String(error)}`));
+                    await this.queueWechatMessage(message.senderId, prefixDaemonAdapterMessage(activeSlot.adapter, error instanceof Error ? error.message : String(error)));
                 }
                 return;
             }
@@ -1242,6 +1258,7 @@ class WechatDaemon {
                 activeSlot.outputBatcher.clear();
                 activeSlot.pendingConfirmations = [];
                 activeSlot.pendingUserInput = null;
+                activeSlot.resumeCoordinator.clear();
                 await activeSlot.runtime.createSession();
                 appendDaemonLog(`new_session: adapter=${activeSlot.adapter}`);
                 return;
@@ -1257,6 +1274,7 @@ class WechatDaemon {
                 activeSlot.outputBatcher.clear();
                 activeSlot.pendingConfirmations = [];
                 activeSlot.pendingUserInput = null;
+                activeSlot.resumeCoordinator.clear();
                 await activeSlot.runtime.reset();
                 appendDaemonLog(`reset: adapter=${activeSlot.adapter}`);
                 await this.queueWechatMessage(message.senderId, prefixDaemonAdapterMessage(activeSlot.adapter, "Worker session has been reset."));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unlinearity/cli-wechat-bridge",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "CLI WeChat Bridge for Codex, Claude Code, OpenCode, and Pi over WeChat",
   "type": "module",
   "files": [
@@ -35,13 +35,9 @@
   },
   "bin": {
     "wechat-codex": "bin/wechat-codex.mjs",
-    "wechat-codex-start": "bin/wechat-codex-start.mjs",
     "wechat-claude": "bin/wechat-claude.mjs",
-    "wechat-claude-start": "bin/wechat-claude-start.mjs",
     "wechat-opencode": "bin/wechat-opencode.mjs",
-    "wechat-opencode-start": "bin/wechat-opencode-start.mjs",
     "wechat-pi": "bin/wechat-pi.mjs",
-    "wechat-pi-start": "bin/wechat-pi-start.mjs",
     "wechat-daemon": "bin/wechat-daemon.mjs",
     "wechat-setup": "bin/wechat-setup.mjs",
     "wechat-check-update": "bin/wechat-check-update.mjs"

package/bin/wechat-claude-start.mjs

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-import { runDeprecatedJsEntry } from "./_run-entry.mjs";
-
-runDeprecatedJsEntry(
-  "wechat-claude-start",
-  "wechat-claude",
-  "dist/companion/local-companion-start.js",
-  ["--adapter", "claude"],
-);

package/bin/wechat-codex-start.mjs

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-import { runDeprecatedJsEntry } from "./_run-entry.mjs";
-
-runDeprecatedJsEntry(
-  "wechat-codex-start",
-  "wechat-codex",
-  "dist/companion/local-companion-start.js",
-  ["--adapter", "codex"],
-);

package/bin/wechat-opencode-start.mjs

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-import { runDeprecatedJsEntry } from "./_run-entry.mjs";
-
-runDeprecatedJsEntry(
-  "wechat-opencode-start",
-  "wechat-opencode",
-  "dist/companion/local-companion-start.js",
-  ["--adapter", "opencode"],
-);

package/bin/wechat-pi-start.mjs

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-import { runDeprecatedJsEntry } from "./_run-entry.mjs";
-
-runDeprecatedJsEntry(
-  "wechat-pi-start",
-  "wechat-pi",
-  "dist/companion/local-companion-start.js",
-  ["--adapter", "pi"],
-);