botmux 2.3.2 → 2.4.0

package/dist/utils/terminal-renderer.js

@@ -2,89 +2,43 @@
  * Headless terminal renderer: feeds PTY data into an xterm-headless instance
  * and periodically snapshots the rendered screen for Feishu card updates.
  *
- * Filters out TUI chrome and preamble (logo, version, prompt echo, system
- * instructions) so only the CLI's actual work output appears in the card.
+ * Minimal pipeline:
+ *   - baseline tracking (turnBaselineY + baselineDeferred) isolates the current
+ *     turn so previous-turn content never leaks into the streaming card
+ *   - read from baseline to end, clamp per-line width at SNAPSHOT_COLS
+ *   - strip box-drawing chars, drop the bare prompt line and input echo,
+ *     trim blank head/tail
  *
- * Supports two rendering styles:
- *   - CLI-style (Claude Code, Aiden): output appends to scrollback. Baseline
- *     tracking isolates current-turn content. Phase 1 (OUTPUT_MARKER_RE) gates
- *     content detection.
- *   - TUI-style (CoCo, Codex): cursor-positioned full-screen UI. Content can
- *     be overwritten when the TUI redraws (e.g. response → idle prompt).
- *     Viewport fallback + peak retention ensure response content is captured.
- *
- * Timer overlay avoidance: The PTY is intentionally wider than normal so that
- * right-aligned TUI overlays (elapsed time, timeout counters) are rendered
- * far to the right. Snapshots only read the first `contentCols` columns,
- * cleanly excluding the overlay area — no fragile regex stripping needed.
+ * The card's text is a best-effort preview — PNG screenshot is the
+ * authoritative view. Keep this path cheap.
  */
 import xtermHeadless from '@xterm/headless';
 const { Terminal } = xtermHeadless;
 import { createHash } from 'node:crypto';
-// ─── Box-Drawing Cleanup ─────────────────────────────────────────────────────
-// Claude Code TUI renders panel borders with box-drawing characters.
-// The headless terminal captures them overlapping with content text.
-/** Strip box-drawing horizontal/vertical/corner characters, collapse spaces. */
+/** Strip box-drawing characters and collapse runs of spaces. */
 function cleanBoxDrawing(line) {
     return line
         .replace(/[─━│┌┐└┘├┤┬┴┼╭╮╯╰]/g, ' ')
         .replace(/  +/g, ' ')
         .trimEnd();
 }
-// ─── Line Filters ────────────────────────────────────────────────────────────
 /** Bare prompt line: ❯ (Claude) or > (Aiden) with optional trailing whitespace */
 const BARE_PROMPT_RE = /^[❯>]\s*$/;
 /** Input echo: ❯ or > followed by user text */
 const INPUT_ECHO_RE = /^[❯>]\s+\S/;
-/** Status bar: Claude ("bypass permissions", "⏵⏵", "/model"), Aiden ("agent full mode"),
- *  CoCo ("accept all tools", "shell mode") */
-const STATUS_BAR_RE = /bypass permissions|⏵⏵|shift\+tab|\/model|auto-update|agent full mode|IDE: \w+|accept all tools/;
-/** CLI logo — block drawing characters used in ASCII art splash screens.
- *  Includes Claude Code (▐▛█▜▝▘) and CoCo (▄▀◆) character sets. */
-const LOGO_RE = /[▐▛█▜▝▘▄▀◆]{2,}/;
-/** CLI version / banner info lines */
-const VERSION_RE = /Claude Code v\d|^\s*(Opus|Sonnet|Haiku)\s+\d|>_ Aiden \(v[\d.]+\)|Trae CLI \d|Formerly Coco/;
-/** CoCo TUI chrome: input placeholder, mode/keyboard hints, welcome screen */
-const COCO_CHROME_RE = /Ask anything|shell mode.*command mode|Ctrl\+J new line|Codebase Copilot|Did you know|Welcome back,|Use \/status|Announcements|code\.byted\.org/;
 /** Empty or whitespace-only */
 const BLANK_RE = /^\s*$/;
-function shouldSkipLine(line) {
-    return (BARE_PROMPT_RE.test(line) ||
-        INPUT_ECHO_RE.test(line) ||
-        STATUS_BAR_RE.test(line) ||
-        LOGO_RE.test(line) ||
-        VERSION_RE.test(line) ||
-        COCO_CHROME_RE.test(line));
-}
-/** CLI output markers — lines starting with these indicate real work output.
- *  Includes CoCo spinner chars (❇❋✢) alongside Claude Code's markers. */
-const OUTPUT_MARKER_RE = /^\s*[●·⎿✓⚠★☐☑⏵✽✻❇❋✢]/;
-/**
- * How many columns to read from each line for the Feishu card snapshot.
- * Content beyond this is ignored — this is where TUI overlays (timer, timeout)
- * live when the PTY is wider than this value.
- */
+/** Safety clamp — even if the xterm is resized wider, don't read past this. */
 const SNAPSHOT_COLS = 160;
 export class TerminalRenderer {
     terminal;
     lastHash = '';
     /** Absolute line index where the current turn starts. */
     turnBaselineY = 0;
-    /** Best content seen this turn — prevents TUI redraws from wiping output. */
-    peakContent = '';
-    /** Whether peakContent was set from Strategy 2 (viewport fallback) rather than
-     *  Strategy 1 (baseline).  When Strategy 1 first returns content, it unconditionally
-     *  replaces a fallback peak — even if shorter — because the fallback may include
-     *  stale content from the previous turn's viewport. */
-    peakFromFallback = false;
-    /**
-     * When true, the baseline has not yet been established for this turn.
-     * Snapshots return empty until the first write() arrives after markNewTurn(),
-     * which sets the baseline at the exact cursor position before new data flows in.
-     * This prevents old terminal content from leaking into the new turn's card —
-     * regardless of whether the terminal buffer state is accurate (e.g. after
-     * tmux re-attach where the buffer may not match expectations).
-     */
+    /** Baseline not yet established — snapshots return empty until the first
+     *  write() arrives after markNewTurn(), which sets the baseline at the
+     *  cursor position right before new data flows in. Prevents previous-turn
+     *  content from leaking into the new turn's card. */
     baselineDeferred = true;
     constructor(cols, rows) {
         this.terminal = new Terminal({ cols, rows, allowProposedApi: true });
@@ -92,145 +46,54 @@ export class TerminalRenderer {
     /** Feed raw PTY data into the virtual terminal. */
     write(data) {
         if (this.baselineDeferred) {
-            // Set baseline at the cursor position RIGHT BEFORE new data arrives.
-            // This is the exact boundary between old content and new-turn content.
             const buffer = this.terminal.buffer.active;
             this.turnBaselineY = buffer.baseY + buffer.cursorY;
             this.baselineDeferred = false;
         }
         this.terminal.write(data);
     }
-    /**
-     * Mark the start of a new conversation turn.
-     * Subsequent snapshots will return empty until new PTY data arrives,
-     * at which point the baseline is set at the cursor position.
-     */
+    /** Mark the start of a new conversation turn. */
     markNewTurn() {
-        this.peakContent = '';
-        this.peakFromFallback = false;
         this.lastHash = '';
         this.baselineDeferred = true;
     }
-    /**
-     * Snapshot the current screen content.
-     *
-     * Strategy:
-     *   1. Try from turn baseline with Phase 1 marker gating (Claude Code style).
-     *   2. If empty, fall back to full viewport without Phase 1 (CoCo/TUI style).
-     *      TUI apps redraw the entire screen, so content may appear anywhere.
-     *   3. Peak retention: save the best content seen this turn. When the TUI
-     *      redraws to idle (empty screen), return the saved peak instead.
-     */
+    /** Snapshot the current screen from baseline to end, with basic filtering. */
     snapshot() {
-        // Baseline not yet established — no new data since markNewTurn().
-        // Return empty to avoid capturing old content.
-        if (this.baselineDeferred) {
-            const hash = createHash('md5').update('').digest('hex');
-            const changed = hash !== this.lastHash;
-            this.lastHash = hash;
-            return { content: '', changed };
-        }
-        const buffer = this.terminal.buffer.active;
-        const baseY = buffer.baseY;
-        // Strategy 1: baseline read with Phase 1 marker gating (CLI-style output)
-        let content = this.extractContent(this.turnBaselineY, false);
-        const fromBaseline = !!content;
-        // Strategy 2: full viewport without Phase 1 (TUI-style — content anywhere on screen)
-        if (!content) {
-            content = this.extractContent(baseY, true);
-        }
-        // Peak retention — TUI redraws can wipe response from the terminal buffer.
-        // Save non-empty content; return saved peak when current screen is empty.
-        //
-        // Strategy-aware: Strategy 2 can read the full viewport which may include
-        // content from the previous turn (before turnBaselineY).  If Strategy 1 later
-        // returns shorter but *correct* content, it must replace the contaminated peak.
-        if (content) {
-            if (fromBaseline) {
-                // Strategy 1 (authoritative): always use the latest snapshot.
-                // CLI output uses cursor repositioning for temporary content (thinking
-                // animations, spinners) that gets overwritten by shorter final output.
-                // Length-based retention would preserve stale temporary content.
-                this.peakContent = content;
-                this.peakFromFallback = false;
-            }
-            else {
-                // Strategy 2 (fallback): only grow peak if no baseline peak exists yet.
-                if (!this.peakFromFallback && this.peakContent) {
-                    // Baseline peak already set — don't let fallback override it.
-                    content = this.peakContent;
-                }
-                else if (content.length >= this.peakContent.length) {
-                    this.peakContent = content;
-                    this.peakFromFallback = true;
-                }
-                else {
-                    content = this.peakContent;
-                }
-            }
-        }
-        else {
-            content = this.peakContent;
-        }
-        // Hash-based change detection
+        const content = this.baselineDeferred ? '' : this.extractContent(this.turnBaselineY);
         const hash = createHash('md5').update(content).digest('hex');
         const changed = hash !== this.lastHash;
         this.lastHash = hash;
         return { content, changed };
     }
-    /**
-     * Read and filter terminal content starting from `startY`.
-     * @param skipPhase1 When true, include all non-chrome lines (no marker gating).
-     *                   Used for TUI viewport fallback where output markers differ.
-     */
-    extractContent(startY, skipPhase1) {
+    extractContent(startY) {
         const buffer = this.terminal.buffer.active;
-        const baseY = buffer.baseY;
-        const rows = this.terminal.rows;
         const readCols = Math.min(SNAPSHOT_COLS, this.terminal.cols);
-        const endY = baseY + rows;
-        const rawLines = [];
+        const endY = buffer.baseY + this.terminal.rows;
+        const lines = [];
         for (let y = startY; y < endY; y++) {
             const line = buffer.getLine(y);
             if (!line)
                 continue;
-            rawLines.push(cleanBoxDrawing(line.translateToString(true, 0, readCols)));
-        }
-        let foundOutput = skipPhase1;
-        const filtered = [];
-        for (const line of rawLines) {
-            if (!foundOutput) {
-                // Phase 1: skip lines until we see an output marker
-                if (OUTPUT_MARKER_RE.test(line)) {
-                    foundOutput = true;
-                    filtered.push(line);
-                }
-                continue;
-            }
-            // Phase 2: filter TUI chrome but keep content
-            if (shouldSkipLine(line))
+            const s = cleanBoxDrawing(line.translateToString(true, 0, readCols));
+            if (BARE_PROMPT_RE.test(s) || INPUT_ECHO_RE.test(s))
                 continue;
-            filtered.push(line);
+            lines.push(s);
         }
-        // Trim leading and trailing empty lines
-        while (filtered.length > 0 && BLANK_RE.test(filtered[0])) {
-            filtered.shift();
-        }
-        while (filtered.length > 0 && BLANK_RE.test(filtered[filtered.length - 1])) {
-            filtered.pop();
-        }
-        return filtered.join('\n');
+        while (lines.length > 0 && BLANK_RE.test(lines[0]))
+            lines.shift();
+        while (lines.length > 0 && BLANK_RE.test(lines[lines.length - 1]))
+            lines.pop();
+        return lines.join('\n');
     }
     /**
-     * Raw viewport snapshot — no filtering, no phase gating, no chrome removal.
+     * Raw viewport snapshot — no filtering, no baseline gating.
      * Used by ScreenAnalyzer which needs the full screen including ❯ cursor lines.
      */
     rawSnapshot() {
         const buffer = this.terminal.buffer.active;
-        const baseY = buffer.baseY;
-        const rows = this.terminal.rows;
         const readCols = Math.min(SNAPSHOT_COLS, this.terminal.cols);
-        const endY = baseY + rows;
+        const baseY = buffer.baseY;
+        const endY = baseY + this.terminal.rows;
         const lines = [];
         for (let y = baseY; y < endY; y++) {
             const line = buffer.getLine(y);
@@ -238,10 +101,8 @@ export class TerminalRenderer {
                 continue;
             lines.push(cleanBoxDrawing(line.translateToString(true, 0, readCols)));
         }
-        // Trim trailing blank lines only
-        while (lines.length > 0 && BLANK_RE.test(lines[lines.length - 1])) {
+        while (lines.length > 0 && BLANK_RE.test(lines[lines.length - 1]))
             lines.pop();
-        }
         return lines.join('\n');
     }
     resize(cols, rows) {

package/dist/utils/terminal-renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-renderer.js","sourceRoot":"","sources":["../../src/utils/terminal-renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-renderer.js","sourceRoot":"","sources":["../../src/utils/terminal-renderer.ts"],"names":[],"mappings":"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"}

package/dist/worker.js

@@ -53,10 +53,9 @@ const pendingMessages = [];
 /** Suppress screen updates until first prompt detected (avoids history replay in card on --resume) */
 let awaitingFirstPrompt = true;
 // ─── PTY Dimensions ──────────────────────────────────────────────────────────
-// Wide PTY so CLI positions right-aligned TUI overlays (timer, timeout)
-// far to the right. The snapshot reader only reads the first 160 columns,
-// cleanly excluding overlays without any regex hacking.
-const PTY_COLS = 300;
+// Matches SNAPSHOT_COLS / SHOT_COLS (160). Narrow enough for the web terminal
+// to render comfortably; the card PNG crops at this width anyway.
+const PTY_COLS = 160;
 const PTY_ROWS = 50;
 // ─── Headless Terminal for Screen Capture ────────────────────────────────────
 let renderer = null;
@@ -65,6 +64,15 @@ const SCREEN_UPDATE_INTERVAL_MS = 2_000;
 // ─── Scrollback Buffer (replay to late-connecting WS clients) ───────────────
 const MAX_SCROLLBACK = 1_000_000; // chars (~1MB)
 let scrollback = '';
+/** Tracks whether the CLI is currently in the alt screen buffer. Updated by
+ *  scanning PTY output for DECSET 1049/47/1047 toggles. Used when trimming
+ *  scrollback at cap so replay always starts with the correct buffer mode —
+ *  otherwise a cap-time slice can drop the alt-buffer-enter and every
+ *  subsequent TUI redraw lands in the *normal* buffer, producing the
+ *  "scrolling up shows several duplicated screens" bug. */
+let altBufferActive = false;
+const ALT_ENTER_RE = /\x1b\[\?(1049|1047|47)h/g;
+const ALT_EXIT_RE = /\x1b\[\?(1049|1047|47)l/g;
 // ─── Screen Analyzer (AI-based TUI prompt detection) ────────────────────────
 let screenAnalyzer = null;
 /** When true, user messages are queued because a TUI prompt is active */
@@ -263,6 +271,16 @@ function handleTermAction(key) {
     else if (PTY_SEQ_MAP[key]) {
         backend.write(PTY_SEQ_MAP[key]);
     }
+    // ESC/Ctrl-C/Enter likely ends an active TUI prompt. The analyzer
+    // won't re-analyze while promptActive=true, so un-wedge both flags here.
+    // Without this, dismissing an AskUserQuestion dialog via the quick-key
+    // button leaves tuiPromptBlocking=true forever and silently queues every
+    // subsequent user message.
+    if (tuiPromptBlocking && (key === 'esc' || key === 'ctrlc' || key === 'enter')) {
+        tuiPromptBlocking = false;
+        screenAnalyzer?.notifySelection(`term_action:${key}`);
+        void flushPending();
+    }
     log(`Term action: ${key}`);
     scheduleOneShotAfterAction();
 }
@@ -361,9 +379,35 @@ function onPtyData(data) {
     // In tmux mode, web clients have their own tmux attach — no relay needed.
     // In non-tmux mode, broadcast to all WS clients via shared scrollback.
     if (!isTmuxMode) {
+        // Track alt-buffer state so we can restore it in the scrollback prefix.
+        // Scan for the *last* toggle in this chunk — that's the current state.
+        let lastToggleIdx = -1;
+        let lastToggleActive = altBufferActive;
+        ALT_ENTER_RE.lastIndex = 0;
+        ALT_EXIT_RE.lastIndex = 0;
+        for (let m; (m = ALT_ENTER_RE.exec(data));) {
+            if (m.index > lastToggleIdx) {
+                lastToggleIdx = m.index;
+                lastToggleActive = true;
+            }
+        }
+        for (let m; (m = ALT_EXIT_RE.exec(data));) {
+            if (m.index > lastToggleIdx) {
+                lastToggleIdx = m.index;
+                lastToggleActive = false;
+            }
+        }
+        altBufferActive = lastToggleActive;
         scrollback += data;
         if (scrollback.length > MAX_SCROLLBACK) {
-            scrollback = scrollback.slice(-MAX_SCROLLBACK);
+            // Slice at an escape-sequence boundary so the replay never starts
+            // mid-sequence. Then re-inject a full reset + alt-buffer-enter so
+            // the receiving xterm lands in the right buffer, matching the CLI.
+            let cut = scrollback.length - MAX_SCROLLBACK;
+            const escAt = scrollback.indexOf('\x1b', cut);
+            cut = escAt >= 0 ? escAt : cut;
+            const prefix = altBufferActive ? '\x1bc\x1b[?1049h' : '\x1bc';
+            scrollback = prefix + scrollback.slice(cut);
         }
         for (const ws of wsClients) {
             if (ws.readyState === WebSocket.OPEN)
@@ -603,6 +647,7 @@ function killCli() {
     isPromptReady = false;
     pendingMessages.length = 0;
     scrollback = '';
+    altBufferActive = false;
     trustHandled = false;
 }
 // ─── HTTP + WebSocket Server ─────────────────────────────────────────────────
@@ -628,27 +673,54 @@ function startWebServer(host, preferredPort) {
                 // Each WS client gets its own `tmux attach-session` PTY.
                 // Scrollback is handled natively by tmux (history-limit).
                 // In adopt mode, attach to the user's original pane; otherwise use bmx-* session.
+                //
+                // Spawn is DEFERRED until the client sends its first 'resize'.  If we
+                // spawned at a default size (e.g. 80×24) first and then resized, tmux
+                // would render at the old size, send those bytes, and then only
+                // diff-update the rows that changed.  Rows that happen to match
+                // byte-for-byte (empty, separators, etc.) are not retransmitted, so
+                // the earlier frame "bleeds through" — visible as a second
+                // banner/prompt stacked above the new layout when scrolling up.
                 const tmuxTarget = lastInitConfig?.adoptTmuxTarget ?? TmuxBackend.sessionName(sessionId);
-                const cp = pty.spawn('tmux', ['attach-session', '-t', tmuxTarget], {
-                    name: 'xterm-256color',
-                    cols: 80,
-                    rows: 24,
-                });
-                clientPtys.set(ws, cp);
-                cp.onData((d) => {
-                    if (ws.readyState === WebSocket.OPEN)
-                        ws.send(d);
-                });
-                cp.onExit(() => {
-                    clientPtys.delete(ws);
-                    if (ws.readyState === WebSocket.OPEN)
-                        ws.close();
-                });
+                let cp = null;
+                const pendingInput = [];
+                const startAttach = (cols, rows) => {
+                    if (cp)
+                        return;
+                    cp = pty.spawn('tmux', ['attach-session', '-t', tmuxTarget], {
+                        name: 'xterm-256color',
+                        cols,
+                        rows,
+                    });
+                    clientPtys.set(ws, cp);
+                    cp.onData((d) => {
+                        if (ws.readyState === WebSocket.OPEN)
+                            ws.send(d);
+                    });
+                    cp.onExit(() => {
+                        clientPtys.delete(ws);
+                        if (ws.readyState === WebSocket.OPEN)
+                            ws.close();
+                    });
+                    // Replay any input that arrived during the spawn window.
+                    for (const data of pendingInput)
+                        cp.write(data);
+                    pendingInput.length = 0;
+                };
+                // Safety net: if no resize arrives (very old client?), start the
+                // attach at a reasonable default after a short delay.
+                const spawnTimer = setTimeout(() => startAttach(150, 40), 500);
                 ws.on('message', (raw) => {
                     try {
                         const msg = JSON.parse(String(raw));
                         if (msg.type === 'resize' && msg.cols > 0 && msg.rows > 0) {
-                            cp.resize(msg.cols, msg.rows);
+                            if (!cp) {
+                                clearTimeout(spawnTimer);
+                                startAttach(msg.cols, msg.rows);
+                            }
+                            else {
+                                cp.resize(msg.cols, msg.rows);
+                            }
                         }
                         else if (msg.type === 'input' && typeof msg.data === 'string') {
                             if (!authedClients.has(ws)) {
@@ -658,12 +730,16 @@ function startWebServer(host, preferredPort) {
                                 if (!/^\x1b\[([<M])/.test(msg.data))
                                     return;
                             }
-                            cp.write(msg.data);
+                            if (cp)
+                                cp.write(msg.data);
+                            else
+                                pendingInput.push(msg.data);
                         }
                     }
                     catch { /* ignore non-JSON or bad messages */ }
                 });
                 ws.on('close', () => {
+                    clearTimeout(spawnTimer);
                     wsClients.delete(ws);
                     const existing = clientPtys.get(ws);
                     if (existing) {
@@ -1005,6 +1081,29 @@ process.on('message', async (raw) => {
             }
             break;
         }
+        case 'raw_input': {
+            // Slash-command passthrough (e.g. /compact, /model, /usage). Write the
+            // literal string + Enter without bracketed paste — otherwise Claude Code
+            // treats `/…` as pasted prompt text and the slash-command parser never
+            // fires. Also skip adapter.writeInput() / pendingMessages queueing so
+            // the prompt wrapping (Session ID, mention hints) is not prepended.
+            renderer?.markNewTurn();
+            if (tmuxScrolledHalfPages > 0)
+                exitTmuxScrollMode();
+            if (backend) {
+                if ('sendText' in backend && 'sendSpecialKeys' in backend) {
+                    backend.sendText(msg.content);
+                    backend.sendSpecialKeys('Enter');
+                }
+                else {
+                    backend.write(msg.content + '\r');
+                }
+                isPromptReady = false;
+                idleDetector?.reset();
+                log(`Passthrough slash command: ${msg.content}`);
+            }
+            break;
+        }
         case 'restart': {
             if (lastInitConfig?.adoptMode) {
                 log('Restart ignored in adopt mode');
@@ -1040,6 +1139,18 @@ process.on('message', async (raw) => {
             handleTermAction(msg.key);
             break;
         }
+        case 'refresh_screen': {
+            if (displayMode !== 'screenshot')
+                break;
+            lastShotHash = '';
+            if (screenshotTimer) {
+                clearInterval(screenshotTimer);
+                screenshotTimer = setInterval(() => { void captureAndUpload(); }, SCREENSHOT_INTERVAL_MS);
+            }
+            void captureAndUpload();
+            log('Manual screenshot refresh');
+            break;
+        }
         case 'close': {
             log('Close requested');
             stopScreenshotLoop();