@agfpd/iapeer 0.4.108 → 0.4.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agfpd/iapeer",
-  "version": "0.4.108",
+  "version": "0.4.109",
   "description": "Run Claude Code and Codex CLI as local background agents that message each other, wake on demand, and share one memory.",
   "license": "Apache-2.0",
   "author": "agfpd",

package/src/supervisor/client.ts

@@ -3,7 +3,7 @@
 // port-deps live here + in protocol.ts: #1 TERM_RESET on EVERY exit path (incl. SIGHUP window-close,
 // via writeSync which works inside a signal handler), and #2 backpressure is the daemon's side.
 import { writeSync } from 'node:fs'
-import { FRAME_DATA, FRAME_RESIZE, TERM_RESET, frame, makeFramer, sizePayload } from './protocol.ts'
+import { FRAME_DATA, FRAME_RESIZE, TERM_ATTACH_RESET, TERM_RESET, frame, makeFramer, sizePayload } from './protocol.ts'
 import { ownershipVerdict, pidStartToken, readPidFile, sockPath } from './paths.ts'
 
 const DETACH = 0x1d // Ctrl-]
@@ -81,6 +81,17 @@ export async function runSupervisorClient(runDir: string, session: string): Prom
   // Ready the terminal BEFORE connecting, so the repaint snapshot renders the instant it arrives.
   if (process.stdin.isTTY) process.stdin.setRawMode(true)
   process.stdin.resume()
+  // The daemon owns the emulated session/model; THIS client owns the physical operator viewport.
+  // Normalize that viewport before connecting so its one-time snapshot cannot be appended below a
+  // shell prompt or a prior attach's differently-wrapped frame. HOME+ED0 is intentional: unlike
+  // ED2/ED3 it does not trigger Apple Terminal's clear-to-scrollback trap (protocol.ts).
+  if (process.stdout.isTTY) {
+    try {
+      writeSync(1, TERM_ATTACH_RESET)
+    } catch {
+      /* a failed cosmetic reset must not block attach */
+    }
+  }
 
   const curSize = (): Buffer => sizePayload(process.stdout.columns || 80, process.stdout.rows || 24)
   const sock = await Bun.connect({
@@ -142,9 +153,9 @@ export async function runSupervisorClient(runDir: string, session: string): Prom
     })
   }
   process.on('exit', () => restore()) // last-resort sync net
-  // NO pre-repaint attach banner: any stdout (even stderr — same tty device) printed before the daemon's
-  // snapshot lands pollutes the fresh terminal's scrollback, defeating native-history reconstruction. The
-  // detach key (Ctrl-]) is documented in CLI help / the attach verb, not emitted as a scrollback line.
+  // NO pre-repaint attach banner: after TERM_ATTACH_RESET, the daemon snapshot must be the first CONTENT
+  // painted into the normalized viewport. The detach key (Ctrl-]) is documented in CLI help / the attach
+  // verb, not emitted as a scrollback line.
   // STAY ATTACHED. The client lives on its handles (raw stdin + the socket); EVERY terminal path
   // (detach Ctrl-], session-end close(), SIGHUP/SIGTERM, socket error) calls process.exit ITSELF.
   // This promise INTENTIONALLY never resolves: returning here would resolve runSupervisorClient the

package/src/supervisor/daemon.ts

@@ -399,8 +399,9 @@ export function runSupervisorDaemon(opts: SupervisorDaemonOptions): void {
    *  Scrollback rows are spinner-stripped; the viewport stays verbatim. The child's SIGWINCH redraw (from
    *  applyGeometry) then settles the live viewport at the client's width. Backpressure-safe
    *  (BackpressureWriter) — a large snapshot MUST NOT drop past the socket buffer (port-dep #2). Called
-   *  EXACTLY ONCE per client (its first FRAME_RESIZE). NO clears (\x1b[2J/3J): a fresh window needs none,
-   *  and Apple Terminal scrolls 2J into scrollback + ignores 3J. */
+   *  EXACTLY ONCE per client (its first FRAME_RESIZE). The daemon/model sends NO clears
+   *  (\x1b[2J/3J): Apple Terminal scrolls 2J into scrollback + ignores 3J. The attach client owns its
+   *  physical viewport and normalizes it once with HOME+ED0 before connecting. */
   // Await until the model has parsed ALL writes AND none arrived during the wait (stable). Awaiting a single
   // write promise is not enough: while the client is gated (initializing, live-forward skipped) new child
   // bytes still land in the model and bump writeSeq — loop until the sequence holds steady so the snapshot

package/src/supervisor/protocol.ts

@@ -164,6 +164,18 @@ export function keysToBytes(keys: string[], enc: KeyEncoding = {}): Buffer {
   return Buffer.from(out, 'utf8')
 }
 
+// ── client terminal normalization ────────────────────────────────────────────────
+// A (re)attach can start in an already-used Terminal.app normal buffer: the shell prompt and a prior
+// attach's differently-wrapped frame still occupy the physical viewport. The daemon's serialized model
+// deliberately carries NO clear (it is shared protocol data, while the stale viewport belongs to each
+// client), so the client must home + erase the CURRENT display before the one-time snapshot arrives.
+//
+// Use ED0 from HOME, NOT ED2/ED3. Apple Terminal implements neither of the latter as the primitive we
+// need: ED2 pushes the old display into native scrollback and ED3 is ignored, so repeated attaches stack
+// broken-width dumps in history. HOME+ED0 clears the viewport in place; the daemon still sends exactly
+// one model snapshot and later SIGWINCH resizes remain raw/live (no repeated dump).
+export const TERM_ATTACH_RESET = '\x1b[H\x1b[J'
+
 // ── port-dep #1: terminal reset on every client exit path ───────────────────────
 // The child sets a STACK of app-modes on the live terminal (alt-screen, bracketed-paste,
 // focus-events, theme-update, ALL mouse tracking, kitty-keyboard, scroll-region, hidden cursor).