botmux 2.64.0 → 2.65.0

package/dist/worker.js

@@ -31,6 +31,7 @@ import { baselineJsonlCursor } from './services/jsonl-cursor.js';
 import { dirname } from 'node:path';
 import { createServer as createHttpServer } from 'node:http';
 import { WebSocketServer, WebSocket } from 'ws';
+import { listenWebTerminalWithFallback } from './utils/web-terminal-listen.js';
 import { TerminalRenderer } from './utils/terminal-renderer.js';
 import { DEFAULT_RENDER_COLS, DEFAULT_RENDER_ROWS, MAX_RENDER_COLS, MAX_RENDER_ROWS, MIN_RENDER_COLS, MIN_RENDER_ROWS, clamp, resolveRenderDimensions, } from './utils/render-dimensions.js';
 import { createCliAdapterSync, locateOnPath } from './adapters/cli/registry.js';
@@ -107,6 +108,17 @@ const pendingMessages = [];
 /** Alternate submit-confirmation signals. Some CLIs can consume PTY input and
  *  start work before their history/transcript submit marker is observable. */
 let lastPtyActivityAtMs = 0;
+let currentBotmuxTurnId;
+function writeCliPidMarker() {
+    if (!cliPidMarker || !sessionId)
+        return;
+    try {
+        writeFileSync(cliPidMarker, JSON.stringify({ sessionId, turnId: currentBotmuxTurnId ?? null }));
+    }
+    catch (err) {
+        log(`Failed to update CLI PID marker: ${err?.message ?? err}`);
+    }
+}
 let lastStructuredBridgeActivityAtMs = 0;
 // Per-turn usage-limit state machine. Owns the turn counter plus the
 // "did this turn hit a limit" / "suppress a stale retry-ready banner" flags, so
@@ -389,6 +401,7 @@ function maybeEmitAdoptPreamble(events) {
     bridgePreambleSent = true;
     send({
         type: 'adopt_preamble',
+        turnId: currentBotmuxTurnId,
         userText: truncatePreambleText(turn.userText, PREAMBLE_USER_MAX),
         assistantText: truncatePreambleText(turn.assistantText, PREAMBLE_ASSISTANT_MAX),
     });
@@ -413,6 +426,7 @@ function maybeEmitCodexAdoptPreamble(history) {
     codexBridgePreambleSent = true;
     send({
         type: 'adopt_preamble',
+        turnId: currentBotmuxTurnId,
         userText: truncatePreambleText(turn.userText, PREAMBLE_USER_MAX),
         assistantText: truncatePreambleText(turn.assistantText, PREAMBLE_ASSISTANT_MAX),
     });
@@ -1298,7 +1312,7 @@ function stopBridgeWatcher() {
  * no jsonl line will ever match, and `maybeSwitchBridgeJsonl` burns 99%
  * CPU scanning all sibling jsonls for it on every poll tick.
  */
-function bridgeMarkPendingTurn(messageText) {
+function bridgeMarkPendingTurn(messageText, preferredTurnId) {
     if (!bridgeJsonlPath)
         return undefined;
     if (!bridgeBaselineDone) {
@@ -1314,7 +1328,7 @@ function bridgeMarkPendingTurn(messageText) {
     // pane to false-match than the 30-char substring fingerprint.
     const normalised = normaliseForFingerprint(messageText);
     const contentNormalized = normalised.length > 0 ? normalised : undefined;
-    const turnId = randomBytes(8).toString('hex');
+    const turnId = preferredTurnId ?? randomBytes(8).toString('hex');
     bridgeQueue.mark(turnId, fingerprint, Date.now(), contentNormalized);
     return turnId;
 }
@@ -1853,10 +1867,10 @@ function codexBridgeIngest() {
 /** Mark a pending Lark turn for Codex. Crucially this works even before a
  *  rollout path is known — the queue is path-agnostic, and ingest after
  *  late-attach picks up the user_message and matches the fingerprint. */
-function codexBridgeMarkPendingTurn(messageText) {
+function codexBridgeMarkPendingTurn(messageText, preferredTurnId) {
     if (!codexBridgeFallbackActive())
         return false;
-    const turnId = `codex-${randomBytes(8).toString('hex')}`;
+    const turnId = preferredTurnId ?? `codex-${randomBytes(8).toString('hex')}`;
     codexBridgeQueue.mark(turnId, messageText);
     return true;
 }
@@ -2115,7 +2129,7 @@ function maybeEmitWorkflowTranscriptOutput() {
         type: 'final_output',
         content: workflowTranscript,
         lastUuid: `workflow-pty-${Date.now()}`,
-        turnId: `workflow-pty-${sessionId || 'unknown'}`,
+        turnId: currentBotmuxTurnId ?? `workflow-pty-${sessionId || 'unknown'}`,
     });
     log('Workflow PTY transcript final_output emitted');
 }
@@ -2145,7 +2159,7 @@ function startScreenAnalyzer() {
         onAnalyzing: () => { },
         onTuiPrompt: (description, options, multiSelect) => {
             tuiPromptBlocking = true;
-            send({ type: 'tui_prompt', description, options, multiSelect });
+            send({ type: 'tui_prompt', description, options, multiSelect, turnId: currentBotmuxTurnId });
         },
         onTuiPromptResolved: (selectedText) => {
             tuiPromptBlocking = false;
@@ -2513,7 +2527,7 @@ function handleCodexAppMarker(body) {
                 return;
             }
         }
-        const turnId = typeof payload.turnId === 'string' ? payload.turnId : `${lastInitConfig?.cliId ?? 'app'}-${Date.now()}`;
+        const turnId = typeof payload.turnId === 'string' ? payload.turnId : (currentBotmuxTurnId ?? `${lastInitConfig?.cliId ?? 'app'}-${Date.now()}`);
         send({
             type: 'final_output',
             content: payload.content,
@@ -2637,7 +2651,7 @@ function markPromptReady() {
     // (where the initial prompt is queued before the CLI becomes idle).
     if (renderer && pendingMessages.length === 0 && !isFlushing) {
         const { content } = renderer.snapshot();
-        send({ type: 'screen_update', content, ...usageLimitTracker.classify(content, 'idle') });
+        send({ type: 'screen_update', content, ...usageLimitTracker.classify(content, 'idle'), turnId: currentBotmuxTurnId });
     }
     flushPending();
 }
@@ -2700,6 +2714,7 @@ function scheduleSubmitFailureNotify(msg, recheck, transcriptLabel, bridgeTurnId
         log(`writeInput: submit impossible — notifying user immediately. reason="${reason}" preview="${preview}"`);
         send({
             type: 'user_notify',
+            turnId: currentBotmuxTurnId,
             message: `⚠️ 刚才那条消息没有写入 ${cliName()}，因为当前按键配置无法从终端自动提交。\n原因：${reason}\n请调整 Claude Code Chat keybinding 后重发。\n开头：${preview}`,
         });
         return;
@@ -2754,6 +2769,7 @@ function scheduleSubmitFailureNotify(msg, recheck, transcriptLabel, bridgeTurnId
         log(`Deferred recheck still missing — notifying user. preview="${preview}"`);
         send({
             type: 'user_notify',
+            turnId: currentBotmuxTurnId,
             message: `⚠️ 刚才那条消息发给 ${cliName()} 后没能确认提交（重试 Enter 后等了 ${Math.round(SUBMIT_DEFERRED_RECHECK_MS / 1000)}s 仍未在${transcriptLabel}里看到新记录）。可能卡在输入框里——请去 Web 终端看一下，手动按 Enter 或重发。\n开头：${preview}`,
         });
     }, SUBMIT_DEFERRED_RECHECK_MS);
@@ -2807,7 +2823,10 @@ async function flushPending() {
     }
     try {
         while (pendingMessages.length > 0 && backend && cliAdapter) {
-            const msg = pendingMessages.shift();
+            const item = pendingMessages.shift();
+            const msg = item.content;
+            currentBotmuxTurnId = item.turnId;
+            writeCliPidMarker();
             const turnSeq = usageLimitTracker.beginTurn(currentUsageLimitSnapshot());
             // Bridge fallback: mark immediately before writeInput. Doing it here
             // (instead of at enqueue time) means markTimeMs anchors to the
@@ -2822,14 +2841,14 @@ async function flushPending() {
                     bridgeIngest();
                 }
                 catch { /* best-effort */ }
-                bridgeTurnId = bridgeMarkPendingTurn(msg);
+                bridgeTurnId = bridgeMarkPendingTurn(msg, item.turnId);
             }
             else if (codexBridgeActive) {
                 // Codex mark works even before the rollout path is known: the
                 // queue is path-agnostic, and the late-attach below will start
                 // ingest from offset 0 so the user_message that lands shortly
                 // after still fingerprint-matches this turn.
-                codexBridgeMarkPendingTurn(msg);
+                codexBridgeMarkPendingTurn(msg, item.turnId);
             }
             log(`Writing to PTY (flush): "${msg.substring(0, 80)}"`);
             // Defense in depth: TmuxPipeBackend's send methods no longer throw on a
@@ -2884,10 +2903,10 @@ async function flushPending() {
         isFlushing = false;
     }
 }
-function sendToPty(content) {
+function sendToPty(content, turnId) {
     if (!backend || !cliAdapter)
         return;
-    pendingMessages.push(content);
+    pendingMessages.push({ content, turnId });
     // User-override semantics: a fresh Lark message while a TUI prompt is "active"
     // takes precedence over the AI-detected prompt. The screen analyzer can be
     // wrong (false positive on a question that has no rendered options) and a
@@ -2966,7 +2985,7 @@ function startScreenUpdates() {
             const usageAware = usageLimitTracker.classify(content, status);
             if (changed || usageAware.status !== lastSentStatus) {
                 lastSentStatus = usageAware.status;
-                send({ type: 'screen_update', content, ...usageAware });
+                send({ type: 'screen_update', content, ...usageAware, turnId: currentBotmuxTurnId });
             }
         })();
     }, SCREEN_UPDATE_INTERVAL_MS);
@@ -3360,6 +3379,7 @@ function spawnCli(cfg) {
             const probe = isAbsolute(wantBin) ? `ls -l ${wantBin}` : `which ${wantBin}`;
             send({
                 type: 'user_notify',
+                turnId: currentBotmuxTurnId,
                 message: `无法启动 ${cliName()}：找不到可执行文件「${wantBin}」。\n` +
                     `请在运行 botmux daemon 的这台机器上确认它已安装并在 PATH 中（自查：${probe}），然后重发消息重试。\n` +
                     `当前 daemon PATH=${process.env.PATH ?? '(空)'}`,
@@ -3385,6 +3405,9 @@ function spawnCli(cfg) {
     childEnv.BOTMUX_CHAT_ID = cfg.chatId;
     childEnv.BOTMUX_LARK_APP_ID = cfg.larkAppId;
     childEnv.BOTMUX_ROOT_MESSAGE_ID = cfg.rootMessageId;
+    // Initial value only; long-lived panes get the latest turn via the JSON pid marker.
+    if (cfg.turnId)
+        childEnv.BOTMUX_TURN_ID = cfg.turnId;
     if (injectClaudeSandbox)
         childEnv.IS_SANDBOX = '1';
     if (claudeResumeTokenThreshold)
@@ -3410,7 +3433,7 @@ function spawnCli(cfg) {
         try {
             mkdirSync(markersDir, { recursive: true });
             cliPidMarker = join(markersDir, String(cliPid));
-            writeFileSync(cliPidMarker, cfg.sessionId);
+            writeCliPidMarker();
             log(`CLI PID marker written: ${cliPid}`);
         }
         catch (err) {
@@ -3448,7 +3471,7 @@ function spawnCli(cfg) {
                         const markersDir = join(process.env.SESSION_DATA_DIR, '.botmux-cli-pids');
                         mkdirSync(markersDir, { recursive: true });
                         cliPidMarker = join(markersDir, String(pid));
-                        writeFileSync(cliPidMarker, cfg.sessionId);
+                        writeCliPidMarker();
                         log(`CLI PID marker written (async): ${pid}`);
                     }
                     catch (err) {
@@ -3882,28 +3905,13 @@ function startWebServer(host, preferredPort) {
                 });
             }
         });
-        const listenPort = preferredPort ?? 0;
-        httpServer.listen(listenPort, host, () => {
-            const addr = httpServer.address();
-            const port = typeof addr === 'object' && addr ? addr.port : 0;
-            log(`HTTP listening on ${host}:${port}`);
-            resolve(port);
-        });
-        httpServer.on('error', (err) => {
-            if (preferredPort && err.code === 'EADDRINUSE') {
-                // Preferred port in use — fall back to random
-                log(`Preferred port ${preferredPort} in use, falling back to random`);
-                httpServer.listen(0, host, () => {
-                    const addr = httpServer.address();
-                    const port = typeof addr === 'object' && addr ? addr.port : 0;
-                    log(`HTTP listening on ${host}:${port} (fallback)`);
-                    resolve(port);
-                });
-            }
-            else {
-                reject(err);
-            }
-        });
+        // Bind + EADDRINUSE→random-port fallback live in a shared helper that also
+        // attaches the load-bearing wss 'error' listener: `new WebSocketServer({
+        // server })` makes ws proxy the http server's 'error' onto the wss, so a
+        // busy port would otherwise emit an UNHANDLED 'error' on the wss and crash
+        // the worker before this fallback can run. See web-terminal-listen.ts.
+        listenWebTerminalWithFallback({ httpServer: httpServer, wss: wss, host, preferredPort, log })
+            .then(resolve, reject);
     });
 }
 function getTerminalHtml(hasWrite) {
@@ -4194,6 +4202,10 @@ process.on('message', async (raw) => {
             renderRows = dims.rows;
             log(`Init: session=${sessionId}, cwd=${msg.workingDir}, render=${renderCols}x${renderRows}${msg.adoptMode ? ' (adopt-pane)' : ''}`);
             try {
+                if (msg.turnId) {
+                    currentBotmuxTurnId = msg.turnId;
+                    writeCliPidMarker();
+                }
                 let port = 0;
                 if (!isWorkflowWorker()) {
                     port = await startWebServer(config.web.workerHost, msg.webPort);
@@ -4215,9 +4227,9 @@ process.on('message', async (raw) => {
                 // Bridge mark is deferred to flushPending — see flushPending
                 // comment for why marking at enqueue is wrong.
                 if (msg.prompt && !cliAdapter?.passesInitialPromptViaArgs) {
-                    pendingMessages.push(msg.prompt);
+                    pendingMessages.push({ content: msg.prompt, turnId: msg.turnId });
                 }
-                send({ type: 'ready', port, token: writeToken });
+                send({ type: 'ready', port, token: writeToken, turnId: currentBotmuxTurnId });
             }
             catch (err) {
                 send({ type: 'error', message: `init failed: ${err.message}` });
@@ -4233,6 +4245,8 @@ process.on('message', async (raw) => {
             if (tmuxScrolledHalfPages > 0)
                 exitTmuxScrollMode();
             const content = msg.content;
+            currentBotmuxTurnId = msg.turnId;
+            writeCliPidMarker();
             if (lastInitConfig?.adoptMode) {
                 // Bridge mode: capture transcript baseline BEFORE writing to the pane,
                 // so any assistant uuids appended after this point are attributed to
@@ -4244,7 +4258,7 @@ process.on('message', async (raw) => {
                         bridgeIngest();
                     }
                     catch { /* best effort */ }
-                    bridgeMarkPendingTurn(content);
+                    bridgeMarkPendingTurn(content, msg.turnId);
                 }
                 else if (codexBridgeFallbackActive()) {
                     // Codex adopt: same idea, different bridge. ingest first so any
@@ -4256,7 +4270,7 @@ process.on('message', async (raw) => {
                         // before this IPC message is handled. Mark first so that preexisting
                         // current-line can still fingerprint-match instead of being marked
                         // seen as an unmatched event.
-                        codexBridgeMarkPendingTurn(content);
+                        codexBridgeMarkPendingTurn(content, msg.turnId);
                         try {
                             codexBridgeIngest();
                         }
@@ -4267,7 +4281,7 @@ process.on('message', async (raw) => {
                             codexBridgeIngest();
                         }
                         catch { /* best effort */ }
-                        codexBridgeMarkPendingTurn(content);
+                        codexBridgeMarkPendingTurn(content, msg.turnId);
                     }
                 }
                 // Adopt mode write:
@@ -4326,7 +4340,7 @@ process.on('message', async (raw) => {
                 // arrival. Marking now would race with a still-running previous
                 // turn whose `botmux send` could sneak its sentAtMs past this
                 // turn's markTimeMs and falsely suppress its fallback.
-                sendToPty(content);
+                sendToPty(content, msg.turnId);
             }
             break;
         }
@@ -4430,6 +4444,19 @@ process.on('message', async (raw) => {
             cleanup();
             process.exit(0);
         }
+        case 'suspend': {
+            log('Suspend requested');
+            stopScreenshotLoop();
+            stopBridgeWatcher();
+            try {
+                backend?.kill();
+            }
+            catch { /* detach best-effort */ }
+            backend = null;
+            isPromptReady = false;
+            cleanup();
+            process.exit(0);
+        }
     }
 });
 // ─── Cleanup ─────────────────────────────────────────────────────────────────