@phenx-inc/ctlsurf 0.1.7 → 0.1.9

package/out/headless/index.mjs

@@ -3647,8 +3647,8 @@ var ConversationBridge = class {
   inputBuffer = "";
   // Virtual terminal for processing escape sequences into rendered text
   terminal;
-  lastSnapshotLines = 0;
-  // how many lines we've already sent
+  lastSnapshot = "";
+  pendingWrites = 0;
   constructor() {
     this.terminal = new import_headless.Terminal({ cols: 120, rows: 50, scrollback: 1e4 });
   }
@@ -3657,19 +3657,26 @@ var ConversationBridge = class {
   }
   startSession() {
     this.terminal.reset();
-    this.lastSnapshotLines = 0;
+    this.lastSnapshot = "";
+    this.pendingWrites = 0;
     this.inputBuffer = "";
     this.sessionActive = true;
     console.log("[bridge] Session started");
   }
   /**
    * Feed terminal output data into the bridge.
-   * The headless terminal processes all escape sequences (cursor moves,
-   * line clears, color codes) so the buffer contains clean rendered text.
+   * xterm.write() is async — we track pending writes and only flush
+   * when all writes have been processed into the buffer.
    */
   feedOutput(data) {
     if (!this.sessionActive) return;
-    this.terminal.write(data);
+    this.pendingWrites++;
+    this.terminal.write(data, () => {
+      this.pendingWrites--;
+      this.scheduleFlush();
+    });
+  }
+  scheduleFlush() {
     if (this.flushTimer) {
       clearTimeout(this.flushTimer);
     }
@@ -3686,29 +3693,36 @@ var ConversationBridge = class {
       this.inputBuffer = "";
     }
   }
-  /**
-   * Resize the virtual terminal to match the actual PTY dimensions.
-   */
   resize(cols, rows) {
     this.terminal.resize(cols, rows);
   }
   /**
    * Read new content from the terminal buffer since the last flush.
+   * 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();
     if (cleaned.length === 0) return;
     this.sendEntry("terminal_output", cleaned);
   }
@@ -3720,8 +3734,12 @@ var ConversationBridge = class {
       content
     });
   }
-  endSession() {
+  async 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);
@@ -4223,7 +4241,7 @@ var Orchestrator = class {
   // ─── PTY & Agent ────────────────────────────────
   async spawnAgent(agent, cwd) {
     if (this.ptyManager) {
-      this.bridge.endSession();
+      await this.bridge.endSession();
       this.ptyManager.kill();
     }
     this.currentAgent = agent;
@@ -4239,9 +4257,9 @@ var Orchestrator = class {
       this.streamTerminalData(data);
     });
     const thisPtyManager = this.ptyManager;
-    this.ptyManager.onExit((exitCode) => {
+    this.ptyManager.onExit(async (exitCode) => {
       this.events.onPtyExit(exitCode);
-      this.bridge.endSession();
+      await this.bridge.endSession();
       if (thisPtyManager === this.ptyManager && this.currentAgent && isCodingAgent(this.currentAgent)) {
         this.workerWs.disconnect();
       }
@@ -4264,7 +4282,7 @@ var Orchestrator = class {
     this.workerWs.sendTerminalResize(cols, rows);
   }
   async killAgent() {
-    this.bridge.endSession();
+    await this.bridge.endSession();
     this.ptyManager?.kill();
     this.ptyManager = null;
     if (this.currentAgent && isCodingAgent(this.currentAgent)) {
@@ -4313,7 +4331,7 @@ var Orchestrator = class {
   }
   // ─── Shutdown ───────────────────────────────────
   async shutdown() {
-    this.bridge.endSession();
+    await this.bridge.endSession();
     this.ptyManager?.kill();
     this.ptyManager = null;
     this.workerWs.disconnect();