@agfpd/iapeer 0.2.88 → 0.2.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agfpd/iapeer",
-  "version": "0.2.88",
+  "version": "0.2.89",
   "description": "Foundation core for the iapeer multi-agent ecosystem: identity, registry, storage, codec.",
   "license": "Apache-2.0",
   "author": "agfpd",

package/src/shadow/render.ts

@@ -30,22 +30,19 @@ export function modelToPlainText(term: Terminal, cols: number, rows: number): st
 }
 
 /**
- * ATTACH SNAPSHOT (scrollback fix): the FULL model buffer — scrollback (`0..baseY`) + live viewport
- * (`baseY..baseY+rows`) — as PHYSICAL rows of plain text. This is the resolved-buffer reconstruction:
- * the @xterm model has already flattened claude's thousands of relative-cursor in-place redraws
- * (no DECSTBM, no alt-screen — see the daemon census) into final COMMITTED lines, so emitting these
- * rows as `line\r\n` into a fresh terminal reproduces native scrollback with NO duplication. Replaying
- * the child's RAW frame bytes can't do this (relative cursor-up can't reach scrolled-off lines on a
- * linear dump → overlap), and SerializeAddon re-emits escapes that the no-scroll-region redraws turn
- * into duplicate scrollback. Trailing blank rows are dropped so a fresh/short session emits no wall of
- * blanks. SGR colour is a deliberate follow-up — plain text first kills the mush without colour as a
- * second source of truth.
+ * ATTACH HISTORY rows — the model's SCROLLBACK ONLY (rows `0..baseY`, the committed history ABOVE the
+ * live viewport), as physical rows of plain text. The LIVE viewport (`baseY..`) is DELIBERATELY EXCLUDED:
+ * claude paints the current screen itself (its live render, forwarded right after attach), so including
+ * the viewport here would DOUBLE-PAINT it — the snapshot's copy collides with claude's live repaint →
+ * smeared overlap (the recurring bug). So on attach we ONLY prepend the history; claude shows the current
+ * screen. The @xterm model has already flattened claude's relative-cursor redraws into committed lines, so
+ * these rows render as native scrollback with no duplication. Trailing blank rows are dropped. SGR colour
+ * is a deliberate follow-up — plain text first.
  */
-export function modelAttachSnapshotRows(term: Terminal, cols: number, rows: number): string[] {
+export function modelAttachSnapshotRows(term: Terminal, cols: number): string[] {
   const b = term.buffer.active
   const out: string[] = []
-  const end = b.baseY + rows
-  for (let y = 0; y < end; y++) {
+  for (let y = 0; y < b.baseY; y++) {
     const l = b.getLine(y)
     out.push(l ? l.translateToString(true, 0, cols) : '')
   }

package/src/supervisor/daemon.ts

@@ -311,13 +311,14 @@ export function runSupervisorDaemon(opts: SupervisorDaemonOptions): void {
   // scrollback for claude's relative-cursor, no-scroll-region TUI. Scrollback rows are spinner-stripped, the
   // viewport is verbatim. NO clears (\x1b[2J/3J): a fresh window needs none; Apple Terminal mishandles them.
   const sendSnapshot = (s: { write(b: Buffer): number }): void => {
-    const rowsArr = modelAttachSnapshotRows(xterm, cols, rows)
-    if (rowsArr.length > 0) {
-      const cleaned = stripSpinnerScrollback(rowsArr.join('\r\n'), rows) // dechrome scrollback, viewport verbatim
-      const body = '\x1b[0m' + terminalModesPrefix(xterm) + cleaned + '\r\n'
-      sendClient(s, frame(FRAME_DATA, Buffer.from(body, 'utf8'))) // UTF-8: rows carry real glyphs (❯, box chars)
-    }
-    initializing.delete(s as object) // snapshot sent → resume live forwarding for this client
+    const historyRows = modelAttachSnapshotRows(xterm, cols) // SCROLLBACK only — claude paints the viewport live
+    const cleaned = stripSpinnerScrollback(historyRows.join('\r\n'), 0) // strip spinner remnants from ALL of history
+    // Prepend the committed HISTORY above the screen claude is about to repaint, after a modes-restore prefix.
+    // NO viewport rows — that is claude's job (forwarded live), which avoids the snapshot↔live double-paint
+    // overlap. Always send at least the modes prefix (restores bracketed-paste / app-cursor for a fresh session).
+    const body = '\x1b[0m' + terminalModesPrefix(xterm) + (cleaned ? cleaned + '\r\n' : '')
+    sendClient(s, frame(FRAME_DATA, Buffer.from(body, 'utf8'))) // UTF-8: rows carry real glyphs (❯, box chars)
+    initializing.delete(s as object) // history sent → resume live forwarding (claude's viewport repaint)
   }
 
   // Resize the model + child pty to (c, r). Shared by LATER client resizes and the last-detach restore.
@@ -356,16 +357,16 @@ export function runSupervisorDaemon(opts: SupervisorDaemonOptions): void {
       cols = c
       rows = r
     }
-    sendSnapshot(s) // synchronous: build + send + lift gate (no await before the child resize below)
-    // CHILD resize only when the size actually CHANGED. A reattach at the SAME geometry must NOT SIGWINCH the
-    // child — a gratuitous SIGWINCH makes claude re-render on-screen content, which (if taller than the
-    // viewport) scrolls a DUPLICATE copy into the model. Same-size reattach = pure snapshot, zero pollution.
-    if (changed) {
-      try {
-        child.terminal.resize(c, r) // SIGWINCH the child → live reflow (post-snapshot, forwarded live)
-      } catch {
-        /* transient */
-      }
+    sendSnapshot(s) // prepend the scrollback HISTORY (no viewport) + lift gate — synchronous, no interleave
+    // Force claude to repaint its CURRENT viewport BELOW the prepended history. A SIGWINCH triggers a full
+    // redraw; the (r-1)→r nudge guarantees it fires even on a SAME-size reattach (else an idle claude would
+    // leave the viewport blank until its next frame). Safe now: the snapshot carries NO viewport, so claude's
+    // repaint has nothing to collide with — the smeared-overlap class is gone at its source.
+    try {
+      child.terminal.resize(c, Math.max(1, r - 1))
+      child.terminal.resize(c, r)
+    } catch {
+      /* transient */
     }
   }
   // Restore the serve geometry when the last client detaches, so the unattached session never sticks at