@phenx-inc/ctlsurf 0.1.8 → 0.1.10

package/out/main/index.js

@@ -3625,14 +3625,15 @@ function requireXtermHeadless() {
 var xtermHeadlessExports = requireXtermHeadless();
 class ConversationBridge {
   wsClient = null;
-  flushTimer = null;
-  flushIntervalMs = 3e3;
   sessionActive = false;
   inputBuffer = "";
+  bytesAccumulated = 0;
   // Virtual terminal for processing escape sequences into rendered text
   terminal;
-  lastSnapshotLines = 0;
-  pendingWrites = 0;
+  lastSnapshot = "";
+  // Flush after accumulating enough data or on a timer
+  FLUSH_BYTES = 2e3;
+  flushTimer = null;
   constructor() {
     this.terminal = new xtermHeadlessExports.Terminal({ cols: 120, rows: 50, scrollback: 1e4 });
   }
@@ -3641,10 +3642,12 @@ class ConversationBridge {
   }
   startSession() {
     this.terminal.reset();
-    this.lastSnapshotLines = 0;
-    this.pendingWrites = 0;
+    this.lastSnapshot = "";
+    this.bytesAccumulated = 0;
     this.inputBuffer = "";
     this.sessionActive = true;
+    if (this.flushTimer) clearInterval(this.flushTimer);
+    this.flushTimer = setInterval(() => this.flush(), 5e3);
     console.log("[bridge] Session started");
   }
   /**
@@ -3654,17 +3657,11 @@ class ConversationBridge {
    */
   feedOutput(data) {
     if (!this.sessionActive) return;
-    this.pendingWrites++;
-    this.terminal.write(data, () => {
-      this.pendingWrites--;
-      this.scheduleFlush();
-    });
-  }
-  scheduleFlush() {
-    if (this.flushTimer) {
-      clearTimeout(this.flushTimer);
+    this.terminal.write(data);
+    this.bytesAccumulated += data.length;
+    if (this.bytesAccumulated >= this.FLUSH_BYTES) {
+      this.flush();
     }
-    this.flushTimer = setTimeout(() => this.flush(), this.flushIntervalMs);
   }
   feedInput(data) {
     if (!this.sessionActive) return;
@@ -3685,23 +3682,25 @@ class ConversationBridge {
    * Only flushes when all pending writes have completed.
    */
   flush() {
-    if (this.pendingWrites > 0) {
-      this.scheduleFlush();
-      return;
-    }
     const buf = this.terminal.buffer.active;
-    const totalLines = buf.baseY + buf.cursorY + 1;
-    if (totalLines <= this.lastSnapshotLines) return;
-    const newLines = [];
-    for (let i = this.lastSnapshotLines; i < totalLines; i++) {
+    const totalLines = buf.baseY + this.terminal.rows;
+    const allLines = [];
+    for (let i = 0; i < totalLines; i++) {
       const line = buf.getLine(i);
       if (line) {
-        newLines.push(line.translateToString(true));
+        allLines.push(line.translateToString(true));
       }
     }
-    this.lastSnapshotLines = totalLines;
-    const content = newLines.join("\n");
-    const cleaned = content.replace(/\n{3,}/g, "\n\n").trim();
+    const currentSnapshot = allLines.join("\n");
+    let newContent;
+    if (currentSnapshot.startsWith(this.lastSnapshot)) {
+      newContent = currentSnapshot.slice(this.lastSnapshot.length);
+    } else {
+      newContent = currentSnapshot;
+    }
+    this.lastSnapshot = currentSnapshot;
+    const cleaned = newContent.replace(/\n{3,}/g, "\n\n").trim();
+    this.bytesAccumulated = 0;
     if (cleaned.length === 0) return;
     this.sendEntry("terminal_output", cleaned);
   }
@@ -3713,15 +3712,11 @@ class ConversationBridge {
       content
     });
   }
-  async endSession() {
+  endSession() {
     if (!this.sessionActive) return;
-    if (this.pendingWrites > 0) {
-      await new Promise((resolve) => setTimeout(resolve, 500));
-    }
-    this.pendingWrites = 0;
     this.flush();
     if (this.flushTimer) {
-      clearTimeout(this.flushTimer);
+      clearInterval(this.flushTimer);
       this.flushTimer = null;
     }
     this.sessionActive = false;
@@ -7850,7 +7845,7 @@ class Orchestrator {
   // ─── PTY & Agent ────────────────────────────────
   async spawnAgent(agent, cwd) {
     if (this.ptyManager) {
-      await this.bridge.endSession();
+      this.bridge.endSession();
       this.ptyManager.kill();
     }
     this.currentAgent = agent;
@@ -7868,7 +7863,7 @@ class Orchestrator {
     const thisPtyManager = this.ptyManager;
     this.ptyManager.onExit(async (exitCode) => {
       this.events.onPtyExit(exitCode);
-      await this.bridge.endSession();
+      this.bridge.endSession();
       if (thisPtyManager === this.ptyManager && this.currentAgent && isCodingAgent(this.currentAgent)) {
         this.workerWs.disconnect();
       }
@@ -7891,7 +7886,7 @@ class Orchestrator {
     this.workerWs.sendTerminalResize(cols, rows);
   }
   async killAgent() {
-    await this.bridge.endSession();
+    this.bridge.endSession();
     this.ptyManager?.kill();
     this.ptyManager = null;
     if (this.currentAgent && isCodingAgent(this.currentAgent)) {
@@ -7940,7 +7935,7 @@ class Orchestrator {
   }
   // ─── Shutdown ───────────────────────────────────
   async shutdown() {
-    await this.bridge.endSession();
+    this.bridge.endSession();
     this.ptyManager?.kill();
     this.ptyManager = null;
     this.workerWs.disconnect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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": {

package/src/main/bridge.ts

@@ -11,15 +11,17 @@ import { WorkerWsClient } from './workerWs'
  */
 export class ConversationBridge {
   private wsClient: WorkerWsClient | null = null
-  private flushTimer: ReturnType<typeof setTimeout> | null = null
-  private flushIntervalMs: number = 3000
   private sessionActive: boolean = false
   private inputBuffer: string = ''
+  private bytesAccumulated: number = 0
 
   // Virtual terminal for processing escape sequences into rendered text
   private terminal: Terminal
-  private lastSnapshotLines: number = 0
-  private pendingWrites: number = 0
+  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 })
@@ -31,10 +33,15 @@ export class ConversationBridge {
 
   startSession(): void {
     this.terminal.reset()
-    this.lastSnapshotLines = 0
-    this.pendingWrites = 0
+    this.lastSnapshot = ''
+    this.bytesAccumulated = 0
     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')
   }
 
@@ -46,18 +53,13 @@ export class ConversationBridge {
   feedOutput(data: string): void {
     if (!this.sessionActive) return
 
-    this.pendingWrites++
-    this.terminal.write(data, () => {
-      this.pendingWrites--
-      this.scheduleFlush()
-    })
-  }
+    this.terminal.write(data)
+    this.bytesAccumulated += data.length
 
-  private scheduleFlush(): void {
-    if (this.flushTimer) {
-      clearTimeout(this.flushTimer)
+    // Flush when enough data accumulated
+    if (this.bytesAccumulated >= this.FLUSH_BYTES) {
+      this.flush()
     }
-    this.flushTimer = setTimeout(() => this.flush(), this.flushIntervalMs)
   }
 
   feedInput(data: string): void {
@@ -82,29 +84,36 @@ export class ConversationBridge {
    * Only flushes when all pending writes have completed.
    */
   private flush(): void {
-    if (this.pendingWrites > 0) {
-      // Writes still processing — reschedule
-      this.scheduleFlush()
-      return
-    }
-
     const buf = this.terminal.buffer.active
-    const totalLines = buf.baseY + buf.cursorY + 1
-
-    if (totalLines <= this.lastSnapshotLines) return
+    // Read all lines: scrollback (baseY) + visible area (rows)
+    const totalLines = buf.baseY + this.terminal.rows
 
-    const newLines: string[] = []
-    for (let i = this.lastSnapshotLines; i < totalLines; i++) {
+    const allLines: string[] = []
+    for (let i = 0; i < totalLines; i++) {
       const line = buf.getLine(i)
       if (line) {
-        newLines.push(line.translateToString(true))
+        allLines.push(line.translateToString(true))
       }
     }
 
-    this.lastSnapshotLines = totalLines
+    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
+
+    const cleaned = newContent.replace(/\n{3,}/g, '\n\n').trim()
+
+    this.bytesAccumulated = 0
 
-    const content = newLines.join('\n')
-    const cleaned = content.replace(/\n{3,}/g, '\n\n').trim()
     if (cleaned.length === 0) return
 
     this.sendEntry('terminal_output', cleaned)
@@ -119,19 +128,14 @@ export class ConversationBridge {
     })
   }
 
-  async endSession(): Promise<void> {
+  endSession(): void {
     if (!this.sessionActive) return
 
-    // If writes are pending, give xterm a moment to process them
-    if (this.pendingWrites > 0) {
-      await new Promise<void>(resolve => setTimeout(resolve, 500))
-    }
-
-    this.pendingWrites = 0
+    // Give xterm a moment to process any remaining writes
     this.flush()
 
     if (this.flushTimer) {
-      clearTimeout(this.flushTimer)
+      clearInterval(this.flushTimer)
       this.flushTimer = null
     }
 

package/src/main/orchestrator.ts

@@ -284,7 +284,7 @@ export class Orchestrator {
 
   async spawnAgent(agent: AgentConfig, cwd: string): Promise<void> {
     if (this.ptyManager) {
-      await this.bridge.endSession()
+      this.bridge.endSession()
       this.ptyManager.kill()
     }
 
@@ -307,7 +307,7 @@ export class Orchestrator {
 
     this.ptyManager.onExit(async (exitCode: number) => {
       this.events.onPtyExit(exitCode)
-      await this.bridge.endSession()
+      this.bridge.endSession()
       if (thisPtyManager === this.ptyManager && this.currentAgent && isCodingAgent(this.currentAgent)) {
         this.workerWs.disconnect()
       }
@@ -335,7 +335,7 @@ export class Orchestrator {
   }
 
   async killAgent(): Promise<void> {
-    await this.bridge.endSession()
+    this.bridge.endSession()
     this.ptyManager?.kill()
     this.ptyManager = null
     if (this.currentAgent && isCodingAgent(this.currentAgent)) {
@@ -391,7 +391,7 @@ export class Orchestrator {
   // ─── Shutdown ───────────────────────────────────
 
   async shutdown(): Promise<void> {
-    await this.bridge.endSession()
+    this.bridge.endSession()
     this.ptyManager?.kill()
     this.ptyManager = null
     this.workerWs.disconnect()