agent-relay-orchestrator 0.10.26 → 0.10.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.10.26",
+  "version": "0.10.27",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {

package/src/spawn.ts

@@ -962,20 +962,14 @@ export function captureTerminal(name: string, config: OrchestratorConfig): Termi
   }
 
   const size = tmuxPaneSize(name, socketName);
-  const cursor = tmuxCursorPos(name, socketName);
-  const result = Bun.spawnSync(tmuxCommand(socketName, "capture-pane", "-p", "-e", "-S", "-1000", "-t", name), {
-    stdin: "ignore",
-    stdout: "pipe",
-    stderr: "pipe",
-  });
-  if (result.exitCode !== 0) {
-    const stderr = result.stderr.toString().trim();
-    throw new Error(stderr || `tmux capture-pane failed with exit code ${result.exitCode}`);
-  }
+  const { content, cursor } = captureConsistent(
+    () => captureContent(name, socketName),
+    () => tmuxCursorPos(name, socketName),
+  );
 
   return {
     session: name,
-    content: result.stdout.toString(),
+    content,
     running: true,
     agentAlive,
     ...size,
@@ -984,6 +978,42 @@ export function captureTerminal(name: string, config: OrchestratorConfig): Termi
   };
 }
 
+// Capture cursor and content *consistently*. They come from separate tmux invocations,
+// so if the pane scrolls between them (e.g. tool output streaming while the agent
+// "thinks"), cursorY ends up off-by-one against the captured grid — the parked cursor
+// then lands a row off and the TUI's next relative redraw stacks a stale statusline row
+// (bottom-box ghost). Read content, then cursor, then content again; accept only when the
+// two content reads bracket the cursor read unchanged, which proves the cursor reflects
+// that exact grid. Fall through with the latest capture if the pane never holds still.
+export function captureConsistent(
+  readContent: () => string,
+  readCursor: () => { cursorX?: number; cursorY?: number },
+  maxAttempts = 4,
+): { content: string; cursor: { cursorX?: number; cursorY?: number } } {
+  let content = readContent();
+  let cursor = readCursor();
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    const recheck = readContent();
+    if (recheck === content) break;
+    content = recheck;
+    cursor = readCursor();
+  }
+  return { content, cursor };
+}
+
+function captureContent(name: string, socketName?: string): string {
+  const result = Bun.spawnSync(tmuxCommand(socketName, "capture-pane", "-p", "-e", "-S", "-1000", "-t", name), {
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+  if (result.exitCode !== 0) {
+    const stderr = result.stderr.toString().trim();
+    throw new Error(stderr || `tmux capture-pane failed with exit code ${result.exitCode}`);
+  }
+  return result.stdout.toString();
+}
+
 export function terminalInputTokens(data: string): TerminalInputToken[] {
   const tokens: TerminalInputToken[] = [];
   let literal = "";