ragent-cli 1.11.14 → 1.11.15

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "ragent-cli",
-      version: "1.11.14",
+      version: "1.11.15",
       description: "CLI agent for rAgent Live \u2014 browser-first terminal control plane for AI coding agents",
       main: "dist/index.js",
       bin: {
@@ -10738,13 +10738,14 @@ var MAX_CONCURRENT_STREAMS = 20;
 var MAX_SESSION_BUFFER_BYTES = 64 * 1024;
 var PRIVATE_MODE_SEQUENCE_RE = /\x1b\[\?([0-9;]*)([hl])/g;
 var ALT_SCREEN_PARAMS = /* @__PURE__ */ new Set(["47", "1047", "1048", "1049"]);
+var MOUSE_MODE_PARAMS = /* @__PURE__ */ new Set(["9", "1000", "1002", "1003", "1005", "1006", "1015", "1016"]);
 function stripAlternateScreenModeSwitches(data) {
   return data.replace(
     PRIVATE_MODE_SEQUENCE_RE,
     (full, params, action) => {
       if (!params) return full;
       const parts = params.split(";");
-      const filtered = parts.filter((p) => !ALT_SCREEN_PARAMS.has(p));
+      const filtered = parts.filter((p) => !ALT_SCREEN_PARAMS.has(p) && !MOUSE_MODE_PARAMS.has(p));
       if (filtered.length === parts.length) return full;
       if (filtered.length === 0) return "";
       return `\x1B[?${filtered.join(";")}${action}`;
@@ -10769,6 +10770,18 @@ var AlternateScreenModeStripper = class {
     return stripAlternateScreenModeSwitches(pending);
   }
 };
+function buildRelativeCursorSync(lineCount, x, y) {
+  if (lineCount <= 0) return "";
+  let seq = "";
+  if (y <= lineCount - 1) {
+    const up = lineCount - 1 - y;
+    if (up > 0) seq += `\x1B[${up}A`;
+  } else {
+    seq += "\r\n".repeat(y - (lineCount - 1));
+  }
+  seq += `\x1B[${x + 1}G`;
+  return seq;
+}
 function parsePaneTarget(sessionId) {
   if (!sessionId.startsWith("tmux:")) return null;
   const rest = sessionId.slice("tmux:".length);
@@ -10824,6 +10837,7 @@ var SessionStreamer = class {
   pendingStops = /* @__PURE__ */ new Map();
   sendFn;
   onStreamStopped;
+  sendResetFn;
   /**
    * Per-session ring buffer for output captured while the WebSocket is disconnected.
    * Each entry is a string chunk; oldest entries are evicted when the total byte
@@ -10837,9 +10851,10 @@ var SessionStreamer = class {
   lastSeenDroppedFrames = 0;
   /** Sessions whose viewers need a capture-pane resync after frame drops. */
   pendingDropResync = /* @__PURE__ */ new Set();
-  constructor(sendFn, onStreamStopped) {
+  constructor(sendFn, onStreamStopped, sendResetFn) {
     this.sendFn = sendFn;
     this.onStreamStopped = onStreamStopped;
+    this.sendResetFn = sendResetFn;
     this.cleanupStaleStreams();
     this.startBackpressureResumeTimer();
   }
@@ -11123,84 +11138,141 @@ var SessionStreamer = class {
   }
   /**
    * Re-send capture-pane data for an already-active tmux stream.
-   * Used when a viewer missed the initial burst (e.g. joinGroup race)
-   * or reconnected ("Retry stream"). Does NOT restart pipe-pane.
+   * Used when a viewer missed the initial burst (e.g. joinGroup race),
+   * reconnected, resized, or after backpressure frame drops corrupted the
+   * stream. Does NOT restart pipe-pane.
+   *
+   * Default is a LEAN repaint: visible pane + cursor only. Replaying
+   * scrollback mid-session shoved thousands of lines of old output into
+   * live viewers ("ghost text") on every resize/heal. Pass
+   * `{ scrollback: true }` only for viewer (re)attach, where the replay is
+   * prefixed with ED3 (`\x1b[3J`) so the viewer's existing scrollback is
+   * cleared first instead of duplicated.
    */
-  resyncStream(sessionId, viewerId) {
+  resyncStream(sessionId, viewerId, opts) {
     const stream = this.active.get(sessionId);
     if (!stream || stream.stopped || stream.streamType !== "tmux-pipe") return false;
     const { paneTarget, cleanEnv } = stream;
     if (!paneTarget || !cleanEnv) return false;
     const targetViewerId = viewerId?.trim() || void 0;
-    const send = (data) => {
-      if (targetViewerId) {
-        this.sendFn(sessionId, data, targetViewerId);
-      } else {
-        this.sendFn(sessionId, data);
-      }
-    };
+    const withScrollback = opts?.scrollback === true;
+    if (stream.initializing) {
+      const pending = stream.pendingResyncs ??= [];
+      const duplicate = pending.some(
+        (p) => p.viewerId === targetViewerId && p.scrollback === withScrollback
+      );
+      if (!duplicate) pending.push({ viewerId: targetViewerId, scrollback: withScrollback });
+      return true;
+    }
+    stream.initBuffer = [];
     stream.initializing = true;
-    try {
-      let alternateScreen = false;
-      try {
-        const altFlag = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          ["display-message", "-t", paneTarget, "-p", "#{alternate_on}"],
-          { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
-        ).trim();
-        alternateScreen = altFlag === "1";
-      } catch {
+    setImmediate(() => {
+      if (stream.stopped) {
+        stream.initializing = false;
+        stream.initBuffer = [];
+        return;
       }
+      const send = (data) => {
+        if (targetViewerId) {
+          this.sendFn(sessionId, data, targetViewerId);
+        } else {
+          this.sendFn(sessionId, data);
+        }
+      };
       try {
-        const scrollback = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          ["capture-pane", "-t", paneTarget, "-p", "-e", "-S", "-5000", "-E", "-1"],
-          { env: cleanEnv, timeout: 1e4, encoding: "utf-8" }
-        );
-        if (scrollback && scrollback.length > 0) {
-          send(scrollback.replace(/\n/g, "\r\n"));
+        this.sendResetFn?.(sessionId, withScrollback ? "full" : "repaint", targetViewerId);
+        const alternateScreen = this.detectAlternateScreen(paneTarget, cleanEnv);
+        if (withScrollback) {
+          send("\x1B[3J");
+          try {
+            const scrollback = (0, import_node_child_process2.execFileSync)(
+              "tmux",
+              ["capture-pane", "-t", paneTarget, "-p", "-e", "-S", "-5000", "-E", "-1"],
+              { env: cleanEnv, timeout: 1e4, encoding: "utf-8" }
+            );
+            if (scrollback && scrollback.length > 0) {
+              send(scrollback.replace(/\n/g, "\r\n"));
+            }
+          } catch {
+          }
+        }
+        send("\x1B[?1049l\x1B[0m\x1B[2J\x1B[H");
+        const lineCount = this.sendVisiblePane(send, paneTarget, cleanEnv, alternateScreen);
+        this.sendCursorSync(send, paneTarget, cleanEnv, lineCount);
+        log17.info("resync capture", { sessionId, mode: withScrollback ? "full" : "repaint" });
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        log17.warn("failed to resync stream", { sessionId, error: message });
+      } finally {
+        stream.initializing = false;
+        stream.initBuffer = [];
+        const next = stream.pendingResyncs?.shift();
+        if (next && !stream.stopped) {
+          this.resyncStream(sessionId, next.viewerId, { scrollback: next.scrollback });
         }
-      } catch {
       }
-      send("\x1B[?1049l\x1B[0m\x1B[2J\x1B[H");
-      try {
-        const captureArgs = alternateScreen ? ["capture-pane", "-a", "-t", paneTarget, "-p", "-e"] : ["capture-pane", "-t", paneTarget, "-p", "-e"];
-        const initial = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          captureArgs,
-          { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
+    });
+    return true;
+  }
+  /** Detect whether the pane is using the alternate screen buffer. */
+  detectAlternateScreen(paneTarget, cleanEnv) {
+    try {
+      const altFlag = (0, import_node_child_process2.execFileSync)(
+        "tmux",
+        ["display-message", "-t", paneTarget, "-p", "#{alternate_on}"],
+        { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
+      ).trim();
+      return altFlag === "1";
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Capture and send the visible pane content. Converts bare \n to \r\n for
+   * xterm.js and strips the trailing \r\n to prevent an extra scroll that
+   * would shift the viewport by 1 row. Returns the number of lines sent
+   * (0 when the capture failed or was empty) for relative cursor sync.
+   */
+  sendVisiblePane(send, paneTarget, cleanEnv, alternateScreen) {
+    try {
+      const captureArgs = alternateScreen ? ["capture-pane", "-a", "-t", paneTarget, "-p", "-e"] : ["capture-pane", "-t", paneTarget, "-p", "-e"];
+      const initial = (0, import_node_child_process2.execFileSync)(
+        "tmux",
+        captureArgs,
+        { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
+      );
+      if (initial) {
+        const converted = stripAlternateScreenModeSwitches(
+          initial.replace(/\n/g, "\r\n").replace(/\r\n$/, "")
         );
-        if (initial) {
-          send(stripAlternateScreenModeSwitches(initial.replace(/\n/g, "\r\n").replace(/\r\n$/, "")));
+        if (converted) {
+          send(converted);
+          return converted.split("\r\n").length;
         }
-      } catch {
       }
-      try {
-        const cursorInfo = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          ["display-message", "-t", paneTarget, "-p", "#{cursor_x} #{cursor_y}"],
-          { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
-        ).trim();
-        const parts = cursorInfo.split(" ");
-        if (parts.length === 2) {
-          const x = parseInt(parts[0], 10);
-          const y = parseInt(parts[1], 10);
-          if (!isNaN(x) && !isNaN(y)) {
-            send(`\x1B[${y + 1};${x + 1}H`);
-          }
+    } catch {
+    }
+    return 0;
+  }
+  /** Query the tmux cursor position and send a relative cursor sync. */
+  sendCursorSync(send, paneTarget, cleanEnv, lineCount) {
+    if (lineCount <= 0) return;
+    try {
+      const cursorInfo = (0, import_node_child_process2.execFileSync)(
+        "tmux",
+        ["display-message", "-t", paneTarget, "-p", "#{cursor_x} #{cursor_y}"],
+        { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
+      ).trim();
+      const parts = cursorInfo.split(" ");
+      if (parts.length === 2) {
+        const x = parseInt(parts[0], 10);
+        const y = parseInt(parts[1], 10);
+        if (!isNaN(x) && !isNaN(y)) {
+          const seq = buildRelativeCursorSync(lineCount, x, y);
+          if (seq) send(seq);
         }
-      } catch {
       }
-      stream.initializing = false;
-      stream.initBuffer = [];
-      log17.info("resync capture", { sessionId });
-      return true;
-    } catch (error) {
-      stream.initializing = false;
-      stream.initBuffer = [];
-      const message = error instanceof Error ? error.message : String(error);
-      log17.warn("failed to resync stream", { sessionId, error: message });
-      return false;
+    } catch {
     }
   }
   // ---------------------------------------------------------------------------
@@ -11285,17 +11357,10 @@ var SessionStreamer = class {
           this.onStreamStopped?.(sessionId);
         }
       });
-      let alternateScreen = false;
-      try {
-        const altFlag = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          ["display-message", "-t", paneTarget, "-p", "#{alternate_on}"],
-          { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
-        ).trim();
-        alternateScreen = altFlag === "1";
-      } catch {
-      }
+      this.sendResetFn?.(sessionId, "full");
+      const alternateScreen = this.detectAlternateScreen(paneTarget, cleanEnv);
       stream.alternateScreen = alternateScreen;
+      this.sendFn(sessionId, "\x1B[3J");
       try {
         const scrollback = (0, import_node_child_process2.execFileSync)(
           "tmux",
@@ -11308,34 +11373,9 @@ var SessionStreamer = class {
       } catch {
       }
       this.sendFn(sessionId, "\x1B[?1049l\x1B[0m\x1B[2J\x1B[H");
-      try {
-        const captureArgs = alternateScreen ? ["capture-pane", "-a", "-t", paneTarget, "-p", "-e"] : ["capture-pane", "-t", paneTarget, "-p", "-e"];
-        const initial = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          captureArgs,
-          { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
-        );
-        if (initial) {
-          this.sendFn(sessionId, stripAlternateScreenModeSwitches(initial.replace(/\n/g, "\r\n").replace(/\r\n$/, "")));
-        }
-      } catch {
-      }
-      try {
-        const cursorInfo = (0, import_node_child_process2.execFileSync)(
-          "tmux",
-          ["display-message", "-t", paneTarget, "-p", "#{cursor_x} #{cursor_y}"],
-          { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
-        ).trim();
-        const parts = cursorInfo.split(" ");
-        if (parts.length === 2) {
-          const x = parseInt(parts[0], 10);
-          const y = parseInt(parts[1], 10);
-          if (!isNaN(x) && !isNaN(y)) {
-            this.sendFn(sessionId, `\x1B[${y + 1};${x + 1}H`);
-          }
-        }
-      } catch {
-      }
+      const sendBroadcast = (data) => this.sendFn(sessionId, data);
+      const lineCount = this.sendVisiblePane(sendBroadcast, paneTarget, cleanEnv, alternateScreen);
+      this.sendCursorSync(sendBroadcast, paneTarget, cleanEnv, lineCount);
       stream.initializing = false;
       stream.initBuffer = [];
       log17.info("started streaming (tmux)", { sessionId, pane: paneTarget });
@@ -11697,6 +11737,11 @@ var ANSI_KEY_SEQUENCES = /* @__PURE__ */ new Map([
   ["\x1B[6~", "PageDown"]
 ]);
 var ANSI_KEY_ENTRIES = Array.from(ANSI_KEY_SEQUENCES.entries());
+var MOUSE_OR_FOCUS_REPORT_RE = /\x1b\[(?:<\d+;\d+;\d+[Mm]|\d+;\d+;\d+M|M[\x20-\xFF]{3}|[IO])/g;
+function sanitizeRemoteInput(data) {
+  if (!data.includes("\x1B[")) return data;
+  return data.replace(MOUSE_OR_FOCUS_REPORT_RE, "");
+}
 function controlKeyName(charCode) {
   if (charCode >= 1 && charCode <= 26) {
     return `C-${String.fromCharCode(charCode + 96)}`;
@@ -11727,7 +11772,8 @@ function appendLiteralSegment(segments, value) {
     segments.push({ kind: "literal", value });
   }
 }
-function encodeTmuxInput(data) {
+function encodeTmuxInput(rawData) {
+  const data = sanitizeRemoteInput(rawData);
   const segments = [];
   let literal = "";
   const flushLiteral = () => {
@@ -13310,7 +13356,9 @@ var ControlDispatcher = class {
     this.handleInput(writtenPath, sessionId);
   }
   /** Handle input routing to the correct target. */
-  handleInput(data, sessionId) {
+  handleInput(rawData, sessionId) {
+    const data = sanitizeRemoteInput(rawData);
+    if (!data) return;
     if (!sessionId || sessionId.startsWith("pty:")) {
       this.shell.write(data);
     } else if (sessionId.startsWith("tmux:")) {
@@ -13689,12 +13737,11 @@ var ControlDispatcher = class {
     const viewerKey = viewerId?.trim() || "";
     if (sessionId.startsWith("tmux:") || sessionId.startsWith("screen:") || sessionId.startsWith("zellij:") || sessionId.startsWith("process:")) {
       const alreadyStreaming = this.streamer.isStreaming(sessionId);
-      const viewerAlreadyAttached = alreadyStreaming && this.streamer.hasViewer(sessionId, viewerKey);
       const started = this.streamer.startStream(sessionId, viewerId ?? void 0);
       if (ws && ws.readyState === import_ws4.default.OPEN && group) {
         if (started) {
-          if (alreadyStreaming && !viewerAlreadyAttached) {
-            this.streamer.resyncStream(sessionId, viewerKey);
+          if (alreadyStreaming) {
+            this.streamer.resyncStream(sessionId, viewerKey, { scrollback: true });
           }
           const dims = this.queryPaneDimensions(sessionId);
           sendToGroup(ws, group, { type: "stream-started", sessionId, ...dims });
@@ -14308,6 +14355,24 @@ async function runAgent(rawOptions) {
       }
       if (!conn.isReady()) return;
       sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "stream-stopped", sessionId });
+    },
+    (sessionId, mode, viewerId) => {
+      if (!conn.isReady()) return;
+      const tail = flushStreamingRedaction(sessionId);
+      if (tail) {
+        if (conn.sessionKey) {
+          const { enc, iv, seq } = encryptPayload(tail, conn.sessionKey, conn.txSeq.next());
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, seq, sessionId });
+        } else {
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", data: tail, sessionId });
+        }
+      }
+      sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, {
+        type: "stream-reset",
+        sessionId,
+        mode,
+        ...viewerId ? { viewerId } : {}
+      });
     }
   );
   const conn = new ConnectionManager(sessionStreamer, outputBuffer);

package/dist/sbom.json

@@ -1299,8 +1299,8 @@
     {
       "type": "library",
       "name": "ragent-cli",
-      "version": "1.11.14",
-      "bom-ref": "ragent-live|ragent-cli@1.11.14",
+      "version": "1.11.15",
+      "bom-ref": "ragent-live|ragent-cli@1.11.15",
       "author": "Intellimetrics",
       "description": "CLI agent for rAgent Live — browser-first terminal control plane for AI coding agents",
       "licenses": [
@@ -1311,7 +1311,7 @@
           }
         }
       ],
-      "purl": "pkg:npm/ragent-cli@1.11.14",
+      "purl": "pkg:npm/ragent-cli@1.11.15",
       "externalReferences": [
         {
           "url": "https://github.com/chadlindell/ragent-live/issues",
@@ -1436,7 +1436,7 @@
         "ragent-live|@emnapi/wasi-threads@1.2.1",
         "ragent-live|@pkgjs/parseargs@0.11.0",
         "ragent-live|@tybys/wasm-util@0.10.1",
-        "ragent-live|ragent-cli@1.11.14"
+        "ragent-live|ragent-cli@1.11.15"
       ]
     },
     {
@@ -1584,7 +1584,7 @@
       ]
     },
     {
-      "ref": "ragent-live|ragent-cli@1.11.14",
+      "ref": "ragent-live|ragent-cli@1.11.15",
       "dependsOn": [
         "ragent-live|@azure/web-pubsub-client@1.0.4",
         "ragent-live|@openai/codex-sdk@0.130.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ragent-cli",
-  "version": "1.11.14",
+  "version": "1.11.15",
   "description": "CLI agent for rAgent Live — browser-first terminal control plane for AI coding agents",
   "main": "dist/index.js",
   "bin": {