@phenx-inc/ctlsurf 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Agent-agnostic terminal and desktop app for ctlsurf — run Claude Code, Codex, or any coding agent with live session logging and remote control",
   "main": "out/main/index.js",
   "bin": {
@@ -46,7 +46,6 @@
     "@monaco-editor/react": "^4.7.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/addon-web-links": "^0.11.0",
-    "@xterm/headless": "^5.5.0",
     "@xterm/xterm": "^5.5.0",
     "electron-store": "^10.0.0",
     "esbuild": "^0.27.4",

package/src/main/bridge.ts

@@ -1,63 +1,38 @@
-import { Terminal } from '@xterm/headless'
 import { WorkerWsClient } from './workerWs'
 
 /**
  * Conversation Bridge
  *
- * Uses a headless xterm terminal emulator to process raw PTY output
- * (cursor movements, overwrites, clears) into clean rendered text.
- * Periodically diffs the terminal buffer and sends new content
- * to the backend via WebSocket for S3-backed chat logging.
+ * Captures PTY output, strips ANSI codes and terminal artifacts,
+ * and sends cleaned text to the backend via WebSocket for chat logging.
+ * Uses a simple buffer + byte threshold approach (no timers, since
+ * setTimeout/setInterval don't reliably fire under TUI raw mode).
  */
 export class ConversationBridge {
   private wsClient: WorkerWsClient | null = null
   private sessionActive: boolean = false
   private inputBuffer: string = ''
-  private bytesAccumulated: number = 0
+  private outputBuffer: string = ''
 
-  // Virtual terminal for processing escape sequences into rendered text
-  private terminal: Terminal
-  private lastSnapshot: string = ''
-
-  // Flush after accumulating enough data or on a timer
-  private readonly FLUSH_BYTES = 2000
-  private flushTimer: ReturnType<typeof setInterval> | null = null
-
-  constructor() {
-    this.terminal = new Terminal({ cols: 120, rows: 50, scrollback: 10000, allowProposedApi: true })
-  }
+  private readonly FLUSH_BYTES = 500
 
   setWsClient(ws: WorkerWsClient): void {
     this.wsClient = ws
   }
 
   startSession(): void {
-    this.terminal.reset()
-    this.lastSnapshot = ''
-    this.bytesAccumulated = 0
+    this.outputBuffer = ''
     this.inputBuffer = ''
     this.sessionActive = true
-
-    // Periodic flush via setInterval (setTimeout may not fire under raw-mode TUI)
-    if (this.flushTimer) clearInterval(this.flushTimer)
-    this.flushTimer = setInterval(() => this.flush(), 5000)
-
     console.log('[bridge] Session started')
   }
 
-  /**
-   * Feed terminal output data into the bridge.
-   * xterm.write() is async — we track pending writes and only flush
-   * when all writes have been processed into the buffer.
-   */
   feedOutput(data: string): void {
     if (!this.sessionActive) return
 
-    this.terminal.write(data)
-    this.bytesAccumulated += data.length
+    this.outputBuffer += data
 
-    // Flush when enough data accumulated
-    if (this.bytesAccumulated >= this.FLUSH_BYTES) {
+    if (this.outputBuffer.length >= this.FLUSH_BYTES) {
       this.flush()
     }
   }
@@ -75,45 +50,17 @@ export class ConversationBridge {
     }
   }
 
-  resize(cols: number, rows: number): void {
-    this.terminal.resize(cols, rows)
+  resize(_cols: number, _rows: number): void {
+    // no-op now (was used for xterm)
   }
 
-  /**
-   * Read new content from the terminal buffer since the last flush.
-   * Only flushes when all pending writes have completed.
-   */
   private flush(): void {
-    const buf = this.terminal.buffer.active
-    // Read all lines: scrollback (baseY) + visible area (rows)
-    const totalLines = buf.baseY + this.terminal.rows
-
-    const allLines: string[] = []
-    for (let i = 0; i < totalLines; i++) {
-      const line = buf.getLine(i)
-      if (line) {
-        allLines.push(line.translateToString(true))
-      }
-    }
-
-    const currentSnapshot = allLines.join('\n')
-
-    // Diff: find new content since last snapshot
-    let newContent: string
-    if (currentSnapshot.startsWith(this.lastSnapshot)) {
-      // Common case: new content appended
-      newContent = currentSnapshot.slice(this.lastSnapshot.length)
-    } else {
-      // Screen was cleared/rewritten — send full current state
-      newContent = currentSnapshot
-    }
-
-    this.lastSnapshot = currentSnapshot
+    if (this.outputBuffer.length === 0) return
 
-    const cleaned = newContent.replace(/\n{3,}/g, '\n\n').trim()
-
-    this.bytesAccumulated = 0
+    const raw = this.outputBuffer
+    this.outputBuffer = ''
 
+    const cleaned = cleanOutput(raw)
     if (cleaned.length === 0) return
 
     this.sendEntry('terminal_output', cleaned)
@@ -131,16 +78,11 @@ export class ConversationBridge {
   endSession(): void {
     if (!this.sessionActive) return
 
-    // Give xterm a moment to process any remaining writes
     this.flush()
 
-    if (this.flushTimer) {
-      clearInterval(this.flushTimer)
-      this.flushTimer = null
-    }
-
     this.sessionActive = false
     this.inputBuffer = ''
+    this.outputBuffer = ''
     console.log('[bridge] Session ended')
   }
 }
@@ -150,9 +92,15 @@ export class ConversationBridge {
  */
 function stripAnsi(str: string): string {
   return str
+    // CSI sequences (e.g. \x1b[0m, \x1b[?2004h, \x1b[1;32m, \x1b[38;2;r;g;bm)
     .replace(/\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g, '')
+    // OSC sequences (e.g. \x1b]0;title\x07, \x1b]...\x1b\\)
     .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, '')
-    .replace(/\x1b[^[\]](.|$)/g, '')
+    // DCS/PM/APC sequences
+    .replace(/\x1b[PX^_][^\x1b]*\x1b\\/g, '')
+    // Other escape sequences (charset, keypad mode, etc.)
+    .replace(/\x1b[^[\]PX^_](.|$)/g, '')
+    // Remaining single ESC
     .replace(/\x1b/g, '')
 }
 
@@ -181,3 +129,20 @@ function cleanInput(str: string): string {
   cleaned = cleaned.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, '')
   return cleaned.trim()
 }
+
+/**
+ * Clean terminal output: strip ANSI, remove control chars, collapse noise.
+ */
+function cleanOutput(str: string): string {
+  let cleaned = stripAnsi(str)
+  // Remove carriage returns
+  cleaned = cleaned.replace(/\r/g, '')
+  // Remove control characters except newline/tab
+  // eslint-disable-next-line no-control-regex
+  cleaned = cleaned.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, '')
+  // Collapse 3+ consecutive newlines into 2
+  cleaned = cleaned.replace(/\n{3,}/g, '\n\n')
+  // Remove lines that are only whitespace
+  cleaned = cleaned.split('\n').filter(line => line.trim().length > 0).join('\n')
+  return cleaned.trim()
+}