botmux 2.46.1 → 2.47.0

package/dist/worker.js

@@ -22,7 +22,6 @@ import { shouldRunQuietRotation, evaluatePidResolverPullback, decideFingerprintS
 import { CodexBridgeQueue } from './services/codex-bridge-queue.js';
 import { drainCodexRollout, findCodexRolloutBySessionId, findCodexRolloutByPid, splitCodexEventsByCutoff, extractLastCodexTurn } from './services/codex-transcript.js';
 import { cocoEventsPathForSession, drainCocoEvents, findCocoSessionByPid } from './services/coco-transcript.js';
-import { currentHermesStateOffset, drainHermesStateDb } from './services/hermes-transcript.js';
 import { baselineJsonlCursor } from './services/jsonl-cursor.js';
 import { dirname } from 'node:path';
 import { createServer as createHttpServer } from 'node:http';
@@ -64,7 +63,7 @@ const clientPtys = new Map();
 const writeToken = randomBytes(16).toString('hex');
 let sessionId = '';
 let lastInitConfig = null;
-const CLI_DISPLAY_NAMES = { 'claude-code': 'Claude', aiden: 'Aiden', coco: 'CoCo', codex: 'Codex', 'codex-app': 'Codex App', cursor: 'Cursor', gemini: 'Gemini', opencode: 'OpenCode', antigravity: 'Antigravity', mtr: 'MTR', hermes: 'Hermes', mira: 'Mira' };
+const CLI_DISPLAY_NAMES = { 'claude-code': 'Claude', aiden: 'Aiden', coco: 'CoCo', codex: 'Codex', cursor: 'Cursor', gemini: 'Gemini', opencode: 'OpenCode', antigravity: 'Antigravity' };
 function cliName() { return CLI_DISPLAY_NAMES[lastInitConfig?.cliId ?? ''] ?? 'CLI'; }
 let isPromptReady = false;
 /** Mutex for async flushPending — prevents concurrent flush loops. */
@@ -200,8 +199,6 @@ let codexBridgeBaselineDone = false;
 const codexBridgeQueue = new CodexBridgeQueue();
 let codexBridgeWatcher = null;
 let codexBridgeTimer = null;
-let hermesBridgeOffset = 0;
-let hermesBridgeBaselineDone = false;
 /** Codex sessionId we received via writeInput but haven't yet resolved a
  *  rollout file for. The poller keeps retrying — the file appears on
  *  Codex's first user submit, but with some race delay after our submit
@@ -265,11 +262,6 @@ function formatHeadlessLocalTurnContent(assistantText) {
 // needed. Append-only over a shared file (instead of a per-turn marker) is
 // type-ahead safe: type-ahead'd turns each have their own [markTimeMs,
 // nextTurn.markTimeMs) window, and a stray send only fills its own bucket.
-// This relies on each turn's markTimeMs reflecting when it ACTUALLY started
-// processing, not when the worker marked it — the structured queue overrides
-// markTimeMs to the dequeue-time transcript event (CodexBridgeQueue.ingest)
-// and emitReadyCodexTurns only treats a STARTED next turn as a boundary, so
-// the early back-to-back marks type-ahead produces don't collapse the windows.
 function bridgeMarkerPath() {
     if (!process.env.SESSION_DATA_DIR || !sessionId)
         return undefined;
@@ -1331,23 +1323,18 @@ function drainPathInto(path, fromOffset) {
 // shared with the Claude path.
 function codexBridgeFallbackActive() {
     // True for transcript-backed CLIs whose final output can be harvested
-    // when the model forgets to call `botmux send`.
-    return lastInitConfig?.cliId === 'codex' || lastInitConfig?.cliId === 'coco' || lastInitConfig?.cliId === 'hermes';
+    // from append-only JSONL when the model forgets to call `botmux send`.
+    // Codex uses ~/.codex rollouts; CoCo uses ~/.cache/coco events. Both
+    // work in adopt mode now that CoCo's PID→sessionId discovery is wired.
+    return lastInitConfig?.cliId === 'codex' || lastInitConfig?.cliId === 'coco';
 }
 function structuredBridgeIsCodex() {
     return lastInitConfig?.cliId === 'codex';
 }
-function structuredBridgeIsHermes() {
-    return lastInitConfig?.cliId === 'hermes';
-}
 function structuredBridgeIngestPath(path, offset) {
-    if (structuredBridgeIsCodex())
-        return drainCodexRollout(path, offset);
-    if (structuredBridgeIsHermes()) {
-        const result = drainHermesStateDb(offset);
-        return { events: result.events, newOffset: result.newOffset, pendingTail: '' };
-    }
-    return drainCocoEvents(path, offset);
+    return structuredBridgeIsCodex()
+        ? drainCodexRollout(path, offset)
+        : drainCocoEvents(path, offset);
 }
 function codexBridgeStartTimer() {
     if (codexBridgeTimer)
@@ -1365,14 +1352,6 @@ function codexBridgeStartTimer() {
     // publish a half-streamed response.
     codexBridgeTimer = setInterval(() => {
         try {
-            if (structuredBridgeIsHermes()) {
-                if (!hermesBridgeBaselineDone)
-                    hermesBridgeAttach(lastInitConfig?.resume ? 'baseline-existing' : 'fresh-empty');
-                hermesBridgeIngest();
-                if (isPromptReady)
-                    emitReadyCodexTurns();
-                return;
-            }
             if (!codexBridgeRolloutPath) {
                 // Two discovery paths, in order: cliSessionId (known via writeInput
                 // result for non-adopt or daemon-side probe for adopt) → exact
@@ -1426,22 +1405,6 @@ function codexBridgeStartTimer() {
         }
     }, 1000);
 }
-function hermesBridgeAttach(mode) {
-    hermesBridgeOffset = currentHermesStateOffset();
-    hermesBridgeBaselineDone = true;
-    log(`Hermes bridge ${mode}: state.db offset=${hermesBridgeOffset}`);
-    codexBridgeStartTimer();
-}
-function hermesBridgeIngest() {
-    if (!hermesBridgeBaselineDone)
-        return;
-    const result = drainHermesStateDb(hermesBridgeOffset);
-    hermesBridgeOffset = result.newOffset;
-    codexBridgeQueue.ingest(result.events);
-    if (result.events.some(e => e.kind === 'assistant_final')) {
-        idleDetector?.fireIdle();
-    }
-}
 function codexBridgeAttach(rolloutPath, mode) {
     codexBridgeRolloutPath = rolloutPath;
     if (mode === 'fresh-empty') {
@@ -1536,10 +1499,6 @@ function codexBridgeNotifyCliSessionId(cliSessionId) {
     }
 }
 function codexBridgeIngest() {
-    if (structuredBridgeIsHermes()) {
-        hermesBridgeIngest();
-        return;
-    }
     if (!codexBridgeRolloutPath || !codexBridgeBaselineDone)
         return;
     const result = structuredBridgeIngestPath(codexBridgeRolloutPath, codexBridgeOffset);
@@ -1569,7 +1528,7 @@ function codexBridgeMarkPendingTurn(messageText) {
 function codexBridgeDrainAndMaybeEmit() {
     if (!codexBridgeFallbackActive())
         return;
-    if (structuredBridgeIsHermes() || (codexBridgeRolloutPath && codexBridgeBaselineDone)) {
+    if (codexBridgeRolloutPath && codexBridgeBaselineDone) {
         try {
             codexBridgeIngest();
         }
@@ -1589,17 +1548,7 @@ function emitReadyCodexTurns() {
     // should reach the thread. Skip marker IO entirely.
     const markers = adoptMode ? [] : readSendMarkers();
     const remaining = codexBridgeQueue.peek();
-    // Only a STARTED pending turn can bound the last ready turn's send window.
-    // An unstarted turn hasn't been dequeued yet (its user event hasn't landed),
-    // so it has produced no sends to leak backwards — and under type-ahead its
-    // markTimeMs is still the early flush-time mark, which would prematurely
-    // (often invalidly, lower>upper) close the ready turn's window and let its
-    // own send escape suppression → duplicate. A started-but-not-final turn
-    // (model mid-tool-use for N+1) keeps its real overridden markTimeMs as the
-    // boundary, preserving the original leak guard.
-    const nextPendingMarkTimeMs = remaining.length > 0 && remaining[0].started
-        ? remaining[0].markTimeMs
-        : undefined;
+    const nextPendingMarkTimeMs = remaining.length > 0 ? remaining[0].markTimeMs : undefined;
     for (let i = 0; i < ready.length; i++) {
         const turn = ready[i];
         if (!turn.finalText)
@@ -1646,8 +1595,6 @@ function stopCodexBridge() {
     codexBridgeOffset = 0;
     codexBridgePendingTail = '';
     codexBridgeBaselineDone = false;
-    hermesBridgeOffset = 0;
-    hermesBridgeBaselineDone = false;
     codexBridgeQueue.clearPending();
     codexBridgeQueue.setLocalTurns(false);
     codexBridgePendingSessionId = undefined;
@@ -2179,88 +2126,8 @@ async function handleTuiTextInput(keys, text) {
 //               in a single PTY chunk)
 const TRUST_DIALOG_PATTERN = /Yes, I trust this folder|Yes, continue/;
 let trustHandled = false;
-// Codex App runner sends botmux control messages as OSC sequences so they do
-// not pollute the visible terminal. Strip them before xterm rendering and
-// translate them back into worker IPC.
-const CODEX_APP_OSC_PREFIX = '\x1b]777;botmux:';
-const APP_RUNNER_OSC_CLI_IDS = new Set(['codex-app', 'mira']);
-let codexAppOscPending = '';
-function decodeCodexAppPayload(payload) {
-    try {
-        return JSON.parse(Buffer.from(payload, 'base64').toString('utf8'));
-    }
-    catch {
-        return undefined;
-    }
-}
-function handleCodexAppMarker(body) {
-    const sep = body.indexOf(':');
-    if (sep < 0)
-        return;
-    const kind = body.slice(0, sep);
-    const payload = decodeCodexAppPayload(body.slice(sep + 1));
-    if (!payload || typeof payload !== 'object')
-        return;
-    if (kind === 'thread' && typeof payload.threadId === 'string') {
-        persistCliSessionId(payload.threadId);
-        return;
-    }
-    if (kind === 'final' && typeof payload.content === 'string') {
-        const startedAtMs = typeof payload.startedAtMs === 'number' ? payload.startedAtMs : undefined;
-        const completedAtMs = typeof payload.completedAtMs === 'number' ? payload.completedAtMs : Date.now();
-        if (startedAtMs !== undefined) {
-            const sentByModel = readSendMarkers().some(m => m.sentAtMs >= startedAtMs && m.sentAtMs <= completedAtMs + 5_000);
-            if (sentByModel) {
-                log(`${cliName()} final_output suppressed (model already called botmux send)`);
-                return;
-            }
-        }
-        const turnId = typeof payload.turnId === 'string' ? payload.turnId : `${lastInitConfig?.cliId ?? 'app'}-${Date.now()}`;
-        send({
-            type: 'final_output',
-            content: payload.content,
-            lastUuid: turnId,
-            turnId,
-        });
-    }
-}
-function splitCodexAppControl(data) {
-    if (!APP_RUNNER_OSC_CLI_IDS.has(lastInitConfig?.cliId ?? '') && codexAppOscPending.length === 0)
-        return data;
-    const input = codexAppOscPending + data;
-    codexAppOscPending = '';
-    let out = '';
-    let cursor = 0;
-    for (;;) {
-        const start = input.indexOf(CODEX_APP_OSC_PREFIX, cursor);
-        if (start < 0) {
-            let tailStart = input.length;
-            const tail = input.slice(cursor);
-            for (let n = Math.min(CODEX_APP_OSC_PREFIX.length - 1, tail.length); n > 0; n--) {
-                if (CODEX_APP_OSC_PREFIX.startsWith(tail.slice(tail.length - n))) {
-                    tailStart = input.length - n;
-                    break;
-                }
-            }
-            out += input.slice(cursor, tailStart);
-            codexAppOscPending = input.slice(tailStart);
-            return out;
-        }
-        out += input.slice(cursor, start);
-        const end = input.indexOf('\x07', start + CODEX_APP_OSC_PREFIX.length);
-        if (end < 0) {
-            codexAppOscPending = input.slice(start);
-            return out;
-        }
-        handleCodexAppMarker(input.slice(start + CODEX_APP_OSC_PREFIX.length, end));
-        cursor = end + 1;
-    }
-}
 // ─── Prompt Detection ────────────────────────────────────────────────────────
 function onPtyData(data) {
-    data = splitCodexAppControl(data);
-    if (data.length === 0)
-        return;
     captureWorkflowTranscript(data);
     renderer?.write(data);
     // In tmux-attach mode, each web client has its own tmux attach PTY —
@@ -2446,23 +2313,10 @@ async function flushPending() {
     // Lark message. Now that the queue handles queued_command identically to
     // role:user (and overrides markTimeMs to the dequeue-time event timestamp
     // so the gate window is correct), Claude bridge can run with type-ahead
-    // again.
-    //
-    // CoCo (0.120.32+) also tolerates type-ahead, but for a different reason
-    // than Claude: it parks a submit-while-busy message in its own TUI queue
-    // ("↑ Press up to edit queued messages") and only writes the user event to
-    // events.jsonl when it DEQUEUES and starts processing it — i.e. AFTER the
-    // previous turn's assistant_final. So the transcript stays strictly
-    // interleaved (user1 → asst1 → user2 → asst2) and CodexBridgeQueue's
-    // single-`collecting` attribution stays correct without the queued_command
-    // upgrade Claude needed. (The submit log history.jsonl, which the adapter's
-    // writeInput verification polls, IS written at submit time even for a queued
-    // message, so verification doesn't spuriously fail either.) Only the Codex
-    // rollout bridge stays serial — its queue hasn't been validated for the
-    // back-to-back user_message ordering that type-ahead can produce there.
+    // again. Codex bridge stays serial because its queue hasn't been upgraded.
     const claudeBridgeActive = !!bridgeJsonlPath && !lastInitConfig?.adoptMode;
     const codexBridgeActive = codexBridgeFallbackActive();
-    const typeAheadAllowed = cliAdapter.supportsTypeAhead && !structuredBridgeIsCodex();
+    const typeAheadAllowed = cliAdapter.supportsTypeAhead && !codexBridgeActive;
     if (!isPromptReady && !typeAheadAllowed)
         return;
     isFlushing = true;
@@ -2535,18 +2389,16 @@ async function flushPending() {
             if (result && result.submitted === false && backend) {
                 scheduleSubmitFailureNotify(msg, result.recheck, '会话 JSONL', bridgeTurnId, result.failureReason, turnSeq);
             }
-            // Codex rollout bridge: stop after one writeInput per idle cycle.
-            // Codex's bridge queue doesn't yet attribute queued_command-equivalents,
-            // so type-ahead'd submits would have their assistant text dropped or
+            // Codex bridge: stop after one writeInput per idle cycle. Codex's
+            // bridge queue doesn't yet attribute queued_command-equivalents, so
+            // type-ahead'd submits would have their assistant text dropped or
             // mis-attributed. We resume on the next idle, by which point Codex
             // has finished and the next message can be a normal user_message
-            // submit. Claude bridge and CoCo no longer take this break — Claude's
+            // submit. Claude bridge no longer takes this break — its
             // BridgeTurnQueue handles `attachment(queued_command)` events
-            // identically to `role:user`, and CoCo parks queued submits in its own
-            // TUI queue (writing the events.jsonl user event only at dequeue time),
-            // so both keep the transcript interleaved and attribute correctly. We
-            // WANT CoCo to drain all pending here so they land in its TUI queue.
-            if (structuredBridgeIsCodex() && pendingMessages.length > 0)
+            // identically to `role:user`, so type-ahead'd turns are correctly
+            // attributed and no longer need the serial-per-idle guard.
+            if (codexBridgeActive && pendingMessages.length > 0)
                 break;
         }
     }
@@ -2571,12 +2423,12 @@ function sendToPty(content) {
         // Tear down the prompt card so the user doesn't see stale options.
         send({ type: 'tui_prompt_resolved', selectedText: 'user-override' });
     }
-    // See flushPending: only the Codex rollout bridge still serialises
-    // type-ahead. Claude attributes `attachment(queued_command)` events
-    // identically to `role:user`, and CoCo parks queued submits in its own TUI
-    // queue, so both land type-ahead'd submits in the right turn — only Codex
-    // needs the entry path gated.
-    const typeAheadAllowed = cliAdapter.supportsTypeAhead && !structuredBridgeIsCodex();
+    // See flushPending: only Codex bridge still serialises type-ahead.
+    // Claude bridge now attributes `attachment(queued_command)` events
+    // identically to `role:user`, so type-ahead'd submits land in the right
+    // turn and we no longer need to gate the entry path on claudeBridgeActive.
+    const codexBridgeActive = codexBridgeFallbackActive();
+    const typeAheadAllowed = cliAdapter.supportsTypeAhead && !codexBridgeActive;
     if (isPromptReady || isFlushing || typeAheadAllowed) {
         log(`Writing to PTY: "${content.substring(0, 80)}"`);
         flushPending(); // fire-and-forget async; no-op if already flushing
@@ -2857,7 +2709,6 @@ function spawnCli(cfg) {
         botName: cfg.botName,
         botOpenId: cfg.botOpenId,
         locale: cfg.locale,
-        model: cfg.model,
     });
     // Extra args from env (CLI_DISABLE_DEFAULT_ARGS is removed — adapters own their defaults)
     const extra = (process.env.CLI_EXTRA_ARGS ?? '').trim();
@@ -2872,15 +2723,6 @@ function spawnCli(cfg) {
     if (injectClaudeSandbox) {
         log('Detected root user — injecting IS_SANDBOX=1 for Claude Code');
     }
-    // Claude Code 2.1.x：`--resume` 一个「空闲 >70min 且累计 >10 万 token」的会话会弹
-    // 交互式菜单（Resume from summary / full / Don't ask again），botmux 无法导航 →
-    // 进程卡死（issue #62）。把 token 阈值顶到极大让触发门永远命中 `tokens < threshold`
-    // 而 return null → 菜单不弹、按 full session 原样续（走 summary 会触发 /compact，
-    // 破坏 bridge 的会话连续性追踪）。用户显式设了就尊重。注意：该 key 必须同时进
-    // BOTMUX_INJECTED_ENV_KEYS 白名单，否则 tmux backend 不会把它透传进 pane。
-    const claudeResumeTokenThreshold = cfg.cliId === 'claude-code'
-        ? process.env.CLAUDE_CODE_RESUME_TOKEN_THRESHOLD ?? '2147483647'
-        : undefined;
     // Predict reattach vs fresh so the log line tells the truth. When a bmx-*
     // tmux session is still alive, TmuxBackend.spawn ignores the bin/args and
     // just `tmux attach-session`s — logging `Spawning: <new bin>` in that case
@@ -2900,15 +2742,7 @@ function spawnCli(cfg) {
         env: {
             ...process.env,
             CLAUDECODE: undefined,
-            // §5 of botmux ask v0.1.7 — `botmux ask buttons` reads these to find
-            // the daemon socket, route the card back to this thread, and resolve
-            // the approver allowlist against session.owner. Missing env → exit 2.
-            BOTMUX_SESSION_ID: cfg.sessionId,
-            BOTMUX_CHAT_ID: cfg.chatId,
-            BOTMUX_LARK_APP_ID: cfg.larkAppId,
-            BOTMUX_ROOT_MESSAGE_ID: cfg.rootMessageId,
             ...(injectClaudeSandbox ? { IS_SANDBOX: '1' } : {}),
-            ...(claudeResumeTokenThreshold ? { CLAUDE_CODE_RESUME_TOKEN_THRESHOLD: claudeResumeTokenThreshold } : {}),
         },
     });
     // Write CLI PID marker so agent-facing subcommands (`botmux send`, etc.)
@@ -2963,12 +2797,8 @@ function spawnCli(cfg) {
     // calling `botmux send`, harvest the final answer from the CLI transcript
     // and post it to Lark. Codex needs late attach because its rollout id is
     // discovered after the first submit; CoCo's events path is deterministic
-    // from botmux sessionId. Hermes uses a global SQLite store, so baseline its
-    // row id at spawn and poll for rows after each queued prompt is flushed.
-    if (cfg.cliId === 'hermes') {
-        hermesBridgeAttach(cfg.resume ? 'baseline-existing' : 'fresh-empty');
-    }
-    else if (cfg.cliId === 'codex') {
+    // from botmux sessionId.
+    if (cfg.cliId === 'codex') {
         if (cfg.cliSessionId) {
             const rolloutPath = findCodexRolloutBySessionId(cfg.cliSessionId);
             if (rolloutPath) {
@@ -3070,7 +2900,6 @@ function killCli() {
     scrollback = '';
     altBufferActive = false;
     trustHandled = false;
-    codexAppOscPending = '';
 }
 // ─── HTTP + WebSocket Server ─────────────────────────────────────────────────
 function startWebServer(host, preferredPort) {