@deepseek-harness-tui/dsh-tui 0.10.1 → 0.10.2

package/lib/types/dsh-adapter/sessions/digest.js

@@ -25,7 +25,7 @@ import { createHash } from 'node:crypto';
 import { open } from 'node:fs/promises';
 import { basename } from 'node:path';
 import { scheduler } from 'node:timers/promises';
-import { decodeFrame, decodeFrames, decodeTail, readWindow, resyncFrames, walkFrames } from './frames.js';
+import { decodeFrame, decodeTail, readWindow, resyncFrames, walkFrames } from './frames.js';
 /** Head window budget. Eight times the measured worst-case prompt offset. */
 export const HEAD_WINDOW_BYTES = 64 * 1024;
 /** Head frame ceiling — a cost bound independent of how the bytes compress. */
@@ -71,14 +71,14 @@ function isHumanSource(source) {
         return false;
     return source['kind'] === 'user';
 }
-/** The human prompt carried by one log line, in either of its two forms. */
+/** A human message is conversation evidence even when it has no title text. */
 function humanPrompt(line) {
     const data = line['data'];
     if (data === null || typeof data !== 'object')
         return undefined;
     const record = data;
     if (line['type'] === 'user/message') {
-        return isHumanSource(record['source']) ? textOfContent(record['content']) : undefined;
+        return isHumanSource(record['source']) ? { text: textOfContent(record['content']) } : undefined;
     }
     // The inbox splice precedes the durable user/message and reaches the log
     // several frames earlier, which is what keeps the head window small.
@@ -86,16 +86,20 @@ function humanPrompt(line) {
         const inserted = record['inserted'];
         if (!Array.isArray(inserted))
             return undefined;
+        let found = false;
         for (const message of inserted) {
             if (message === null || typeof message !== 'object')
                 continue;
             const entry = message;
             if (entry['role'] !== 'user' || !isHumanSource(entry['source']))
                 continue;
+            found = true;
             const text = textOfContent(entry['content']);
             if (text !== undefined)
-                return text;
+                return { text };
         }
+        if (found)
+            return { text: undefined };
     }
     return undefined;
 }
@@ -152,24 +156,36 @@ function timeOf(line) {
 export function digestSession(path, cwd) {
     const head = readWindow(path, HEAD_WINDOW_BYTES);
     if (head === undefined) {
-        return { title: undefined, hasPrompt: false, model: undefined, label: undefined };
+        return { title: undefined, hasPrompt: true, model: undefined, label: undefined };
     }
-    const headLines = decodeFrames(head.buffer, walkFrames(head.buffer, 0, HEAD_MAX_FRAMES));
+    const headFrames = walkFrames(head.buffer, 0, HEAD_MAX_FRAMES);
+    const headLines = [];
+    let completeHead = head.whole && headFrames.at(-1)?.end === head.buffer.length;
+    for (const frame of headFrames) {
+        const lines = decodeFrame(head.buffer, frame);
+        if (lines === undefined)
+            completeHead = false;
+        else
+            headLines.push(...lines);
+    }
+    completeHead &&= headLines[0]?.['type'] === 'session';
     let prompt;
+    let hasHumanMessage = false;
     let headTitle;
     let label;
     for (const line of headLines) {
-        prompt ??= humanPrompt(line);
+        const human = humanPrompt(line);
+        hasHumanMessage ||= human !== undefined;
+        prompt ??= human?.text;
         headTitle ??= titleOf(line);
         label ??= labelOf(line);
     }
-    // Absence of a prompt only means "empty" when the window actually saw the
-    // whole log. A log too large for the window has a conversation in it by
-    // construction, and erring toward listing it is the safe direction: hiding
-    // a real session is a defect, showing a boot artifact is a nuisance.
-    const hasPrompt = prompt !== undefined || !head.whole;
-    // A head window that already covered the whole log IS the tail.
-    const tail = head.whole ? undefined : readWindow(path, TAIL_WINDOW_BYTES, true);
+    // The byte window, frame limit, decoding and parsing must ALL cover the
+    // log before absence proves emptiness. Unknown is visible, never eligible
+    // for destructive cleanup; title text is not required for image-only input.
+    const hasPrompt = hasHumanMessage || !completeHead;
+    // Only a completely decoded head can stand in for the tail.
+    const tail = completeHead ? undefined : readWindow(path, TAIL_WINDOW_BYTES, true);
     const tailLines = tail === undefined ? headLines : decodeTail(tail);
     let tailTitle;
     let model;
@@ -189,7 +205,7 @@ export function digestSession(path, cwd) {
         hasPrompt,
         model,
         label,
-        ...(!head.whole && tailTitle === undefined ? {} : { titleComplete: true }),
+        ...(!completeHead && tailTitle === undefined ? {} : { titleComplete: true }),
     };
 }
 /** Read exactly one stable range from an already-open snapshot. */
@@ -341,6 +357,7 @@ async function recoverFirstPrompt(path, bytes, signal) {
     }
     try {
         let position = 0;
+        let hasPrompt = false;
         while (position < bytes) {
             signal?.throwIfAborted();
             const page = await forwardPage(handle, position, bytes, signal);
@@ -350,10 +367,14 @@ async function recoverFirstPrompt(path, bytes, signal) {
                 const lines = decodeFrame(page.buffer, frame);
                 if (lines === undefined)
                     return { prompt: undefined, complete: false };
+                if (position === 0 && frame.start === 0 && lines[0]?.['type'] !== 'session') {
+                    return { prompt: undefined, complete: false };
+                }
                 for (const line of lines) {
                     const prompt = humanPrompt(line);
-                    if (prompt !== undefined)
-                        return { prompt, complete: true };
+                    hasPrompt ||= prompt !== undefined;
+                    if (prompt?.text !== undefined)
+                        return { prompt: prompt.text, complete: true, hasPrompt: true };
                 }
             }
             const consumed = page.frames[page.frames.length - 1].end;
@@ -362,7 +383,7 @@ async function recoverFirstPrompt(path, bytes, signal) {
             position += consumed;
             await scheduler.yield();
         }
-        return { prompt: undefined, complete: true };
+        return { prompt: undefined, complete: bytes > 0, ...(bytes > 0 ? { hasPrompt } : {}) };
     }
     finally {
         await handle.close().catch(() => { });
@@ -381,7 +402,7 @@ export async function recoverSessionTitle(path, bytes, signal) {
     return {
         title: opening.prompt === undefined ? undefined : { text: opening.prompt, source: 'prompt' },
         complete: opening.complete,
-        ...(opening.complete ? { hasPrompt: opening.prompt !== undefined } : {}),
+        ...(opening.hasPrompt === undefined ? {} : { hasPrompt: opening.hasPrompt }),
     };
 }
 /** Hash the previous EOF neighborhood before carrying title evidence forward. */

package/lib/types/dsh-adapter/sessions/frames.js

@@ -174,6 +174,8 @@ export function decodeFrame(buffer, frame) {
             if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) {
                 lines.push(parsed);
             }
+            else
+                return undefined;
         }
         catch {
             return undefined;

package/lib/types/dsh-adapter/sessions/list.js

@@ -157,13 +157,15 @@ export async function listSummaries(source, signal) {
         else if (path !== undefined && token !== undefined) {
             const digest = digestSession(path, header.cwd ?? '');
             let title = digest.title;
-            let hasPrompt = digest.hasPrompt;
+            const hasPrompt = digest.hasPrompt;
             let titleComplete = digest.titleComplete === true;
             const previous = cached?.derived;
             // Across an append-only revision, validate the old EOF neighborhood then
             // scan only the new frames. This preserves an older authoritative title
             // without trusting file size alone, and still observes a newly appended
             // rename even when later output pushed it outside the cheap tail window.
+            // Only title evidence carries forward: a formerly empty session can
+            // have acquired its first human message in the appended suffix.
             if (!titleComplete &&
                 previous !== undefined &&
                 facts !== undefined &&
@@ -177,7 +179,6 @@ export async function listSummaries(source, signal) {
                         title = previous.title.length === 0
                             ? undefined
                             : { text: previous.title, source: previous.titleSource };
-                        hasPrompt = previous.hasPrompt;
                         titleComplete = true;
                     }
                     else if (facts.bytes > previous.bytes) {
@@ -190,7 +191,6 @@ export async function listSummaries(source, signal) {
                                     ? undefined
                                     : { text: previous.title, source: previous.titleSource };
                             }
-                            hasPrompt = previous.hasPrompt;
                             titleComplete = true;
                         }
                     }

package/lib/types/dsh-adapter/sessions/store.d.ts

@@ -26,8 +26,8 @@ export interface IndexEntry {
 export type SessionIndex = Map<string, IndexEntry>;
 /**
  * Load the cache.
- * @returns The parsed index; an unreadable, malformed, or stale-schema file
- *   yields an empty one, which costs a rebuild and never an error.
+ * @returns The parsed index; old derived facts are discarded for a rebuild.
+ *   Version 2 retains branch notes; unrecognized files yield an empty index.
  */
 export declare function readIndex(): SessionIndex;
 /**

package/lib/types/dsh-adapter/sessions/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/store.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAW7C,gDAAgD;AAChD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,wFAAwF;IACxF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,mFAAmF;IACnF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,8EAA8E;IAC9E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC;AAED,gFAAgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,CAAA;IAC1C,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CACpC;AAED,2CAA2C;AAC3C,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAsDlD;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,YAAY,CAkBxC;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAwBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAO9E"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/store.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAW7C,gDAAgD;AAChD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,wFAAwF;IACxF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,mFAAmF;IACnF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,8EAA8E;IAC9E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC;AAED,gFAAgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,CAAA;IAC1C,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CACpC;AAED,2CAA2C;AAC3C,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAuDlD;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,YAAY,CAkBxC;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAwBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAO9E"}

package/lib/types/dsh-adapter/sessions/store.js

@@ -31,11 +31,11 @@ import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node
 import { join } from 'node:path';
 import { DATA_DIR } from '../../utils/paths.js';
 /**
- * Bumped when an entry's shape changes. A mismatch drops the whole file
- * rather than migrating it — re-deriving is cheap and bounded, whereas a
- * migration path is code that runs once and is never exercised again.
+ * Bumped when derived facts change shape or meaning. Version 2 could cache
+ * incomplete reads as empty: discard those derivations, retaining only the
+ * branch notes that cannot be recovered from the session log.
  */
-const SCHEMA_VERSION = 2;
+const SCHEMA_VERSION = 3;
 const INDEX_FILE = join(DATA_DIR, 'session-index.json');
 /** A title source as written to disk, or undefined for anything unexpected. */
 function readTitleSource(value) {
@@ -44,12 +44,12 @@ function readTitleSource(value) {
         : undefined;
 }
 /** Narrow one persisted entry; an unrecognizable record is simply absent. */
-function readEntry(value) {
+function readEntry(value, derivedValid) {
     if (value === null || typeof value !== 'object')
         return undefined;
     const record = value;
     const branch = typeof record['branch'] === 'string' ? record['branch'] : undefined;
-    const raw = record['derived'];
+    const raw = derivedValid ? record['derived'] : undefined;
     if (raw === null || typeof raw !== 'object')
         return { derived: undefined, branch };
     const derived = raw;
@@ -68,7 +68,8 @@ function readEntry(value) {
         (anchor !== undefined && typeof anchor !== 'string') ||
         typeof title !== 'string' ||
         titleSource === undefined ||
-        typeof titleComplete !== 'boolean') {
+        typeof titleComplete !== 'boolean' ||
+        typeof derived['hasPrompt'] !== 'boolean') {
         return { derived: undefined, branch };
     }
     return {
@@ -89,8 +90,8 @@ function readEntry(value) {
 }
 /**
  * Load the cache.
- * @returns The parsed index; an unreadable, malformed, or stale-schema file
- *   yields an empty one, which costs a rebuild and never an error.
+ * @returns The parsed index; old derived facts are discarded for a rebuild.
+ *   Version 2 retains branch notes; unrecognized files yield an empty index.
  */
 export function readIndex() {
     const index = new Map();
@@ -104,13 +105,13 @@ export function readIndex() {
     if (parsed === null || typeof parsed !== 'object')
         return index;
     const file = parsed;
-    if (file['version'] !== SCHEMA_VERSION)
+    if (file['version'] !== SCHEMA_VERSION && file['version'] !== 2)
         return index;
     const entries = file['entries'];
     if (entries === null || typeof entries !== 'object')
         return index;
     for (const [id, value] of Object.entries(entries)) {
-        const entry = readEntry(value);
+        const entry = readEntry(value, file['version'] === SCHEMA_VERSION);
         if (entry !== undefined)
             index.set(id, entry);
     }

package/lib/types/dsh-adapter/sessions/types.d.ts

@@ -9,6 +9,8 @@ export type { SessionSummary, SessionKind, SessionTitle, TitleSource, PreviewEnt
  */
 export interface SessionDigest {
     readonly title: SessionTitle | undefined;
+    /** False only after a complete successful scan proves no human message;
+     * true also keeps inconclusive reads visible and out of empty cleanup. */
     readonly hasPrompt: boolean;
     readonly model: string | undefined;
     readonly label: string | undefined;

package/lib/types/dsh-adapter/sessions/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,YAAY,EAA6B,MAAM,wCAAwC,CAAA;AAClI,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAGlI;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC;mEAC+D;IAC/D,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;CAC9B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,YAAY,EAA6B,MAAM,wCAAwC,CAAA;AAClI,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAGlI;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAA;IACxC;8EAC0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC;mEAC+D;IAC/D,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;CAC9B"}

package/lib/types/ink/components/ScrollBox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollBox.d.ts","sourceRoot":"","sources":["../../../../src/ink/components/ScrollBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAE,KAAK,GAAG,EAAsD,MAAM,OAAO,CAAC;AACpH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAM5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B;;;;;;OAMG;IACH,eAAe,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B;;;;;OAKG;IACH,oBAAoB,EAAE,MAAM,MAAM,CAAC;IACnC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC;;;OAGG;IACH,cAAc,EAAE,MAAM,MAAM,CAAC;IAC7B;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB;;;;;OAKG;IACH,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAChD;;;;;;;OAOG;IACH,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAC5E,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC,GAAG;IACjG,GAAG,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC3B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;;;;GASG;AACH,iBAAS,SAAS,CAAC,EACjB,QAAQ,EACR,GAAG,EACH,YAAY,EACZ,GAAG,KAAK,EACT,EAAE,iBAAiB,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,SAAS,CAsRrD;AACD,eAAe,SAAS,CAAC"}
+{"version":3,"file":"ScrollBox.d.ts","sourceRoot":"","sources":["../../../../src/ink/components/ScrollBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAE,KAAK,GAAG,EAAsD,MAAM,OAAO,CAAC;AACpH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAM5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B;;;;;;OAMG;IACH,eAAe,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B;;;;;OAKG;IACH,oBAAoB,EAAE,MAAM,MAAM,CAAC;IACnC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC;;;OAGG;IACH,cAAc,EAAE,MAAM,MAAM,CAAC;IAC7B;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB;;;;;OAKG;IACH,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAChD;;;;;;;OAOG;IACH,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAC5E,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC,GAAG;IACjG,GAAG,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC3B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;;;;GASG;AACH,iBAAS,SAAS,CAAC,EACjB,QAAQ,EACR,GAAG,EACH,YAAY,EACZ,GAAG,KAAK,EACT,EAAE,iBAAiB,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,SAAS,CAkRrD;AACD,eAAe,SAAS,CAAC"}

package/lib/types/ink/components/ScrollBox.js

@@ -89,6 +89,9 @@ function ScrollBox({ children, ref, stickyScroll, ...style }) {
         markDirty(el);
         markCommitStart();
         notifyCoalesced();
+        queueRender(el);
+    }
+    function queueRender(el) {
         if (renderQueuedRef.current)
             return;
         renderQueuedRef.current = true;
@@ -181,32 +184,13 @@ function ScrollBox({ children, ref, stickyScroll, ...style }) {
                 el.scrollAnchor = undefined;
                 const viewportH = el.scrollViewportHeight ?? 0;
                 const maxScroll = Math.max(0, (el.scrollHeight ?? 0) - viewportH);
-                const distance = maxScroll - (el.scrollTop ?? 0);
-                if (distance > viewportH && viewportH > 0) {
-                    // FAR jump: drain instead of teleport. The viewport would land on
-                    // rows that were never mounted — their spacer heights are
-                    // DEFAULT_ROW_HEIGHT estimates, so the topPad swallows the view
-                    // (blank transcript) AND it is a fixed point: unmounted rows never
-                    // measure, nothing retried until the next wheel event. The drain
-                    // walks the exact wheel path instead: proportional steps, the
-                    // virtualization window follows per commit (it mounts the union of
-                    // committed + pending), the visual clamp pins to the mounted edge
-                    // while rows measure as they enter — no blank at any distance. The
-                    // renderer's at-bottom re-pin restores sticky when it lands
-                    // (stickyScroll=false + pending undefined + scrollTop >= maxScroll).
-                    el.stickyScroll = false;
-                    el.pendingScrollDelta = (el.pendingScrollDelta ?? 0) + distance;
-                    scrollMutated(el);
-                    return;
-                }
                 el.pendingScrollDelta = undefined;
                 el.stickyScroll = true;
-                // DOM-direct pre-write of the target (near jumps only): the notify
-                // below triggers MessageList's window recompute, and its React commit
-                // must read the NEW scrollTop — the old order (notify first, renderer
-                // moves scrollTop later) left the window one commit behind. The
-                // renderer's sticky branch re-pins scrollTop to the exact fresh
-                // maxScroll next frame, so a stale cached height costs one frame.
+                // Jump intent is not wheel debt: mounting the union of the current
+                // position and a far pending delta defeats virtualization. MessageList's
+                // sticky tail walk mounts the destination directly, even with estimated
+                // heights. Publish sticky + target before notifying; the renderer then
+                // pins to the fresh maxScroll as those tail rows are measured.
                 el.scrollTop = maxScroll;
                 scrollMutated(el);
                 forceRender(n => n + 1);
@@ -247,8 +231,17 @@ function ScrollBox({ children, ref, stickyScroll, ...style }) {
                 const el = domRef.current;
                 if (!el)
                     return;
+                if (el.scrollClampMin === min && el.scrollClampMax === max)
+                    return;
                 el.scrollClampMin = min;
                 el.scrollClampMax = max;
+                // Layout effects publish the new mount window AFTER resetAfterCommit
+                // may have painted with the previous bounds. Warm rows need no measure
+                // tick, so that paint can otherwise remain on blank spacer indefinitely.
+                // Invalidate the blit and schedule a paint, without notifying React
+                // subscribers (the window is already committed).
+                markDirty(el);
+                queueRender(el);
             }
         };
         handleRef.current = handle;
@@ -267,6 +260,18 @@ function ScrollBox({ children, ref, stickyScroll, ...style }) {
         if (e.deltaY !== 0)
             handleRef.current?.scrollBy(e.deltaY);
     }, []);
+    // Keep the host ref attached across updates. A new callback would detach
+    // it before children's layout effects publish their clamp bounds, making
+    // setClampBounds silently miss the commit (child effects run first).
+    const attachNode = useCallback((el) => {
+        domRef.current = el;
+        if (el) {
+            el.scrollTop ??= 0;
+            el.onStickyRestore = notify;
+        }
+        // notify only closes over refs, like the imperative handle above.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     // Structure: outer viewport (overflow:scroll, constrained height) >
     // inner content (flexGrow:1, flexShrink:0 — fills at least the viewport
     // but grows beyond it for tall content). flexGrow:1 lets children use
@@ -278,15 +283,7 @@ function ScrollBox({ children, ref, stickyScroll, ...style }) {
     // stickyScroll is passed as a DOM attribute (via ink-box directly) so it's
     // available on the first render — ref callbacks fire after the initial
     // commit, which is too late for the first frame.
-    return _jsx("ink-box", { ref: el => {
-            domRef.current = el;
-            if (el) {
-                el.scrollTop ??= 0;
-                // Renderer-side sticky restores (positional re-pin at the bottom)
-                // must reach React subscribers too — see dom.ts onStickyRestore.
-                el.onStickyRestore = notify;
-            }
-        }, onWheel: handleWheel, style: {
+    return _jsx("ink-box", { ref: attachNode, onWheel: handleWheel, style: {
             flexWrap: 'nowrap',
             flexDirection: style.flexDirection ?? 'row',
             flexGrow: style.flexGrow ?? 0,

package/lib/types/ink/dom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../../../src/ink/dom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAKlD,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAIrD,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,EAAE,UAAU,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAA;AAC9B;;GAEG;AACH,MAAM,MAAM,YAAY,GACpB,UAAU,GACV,SAAS,GACT,UAAU,GACV,kBAAkB,GAClB,UAAU,GACV,cAAc,GACd,WAAW,GACX,cAAc,CAAA;AAElB;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAA;AAE/C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,YAAY,CAAA;IACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC5C,UAAU,EAAE,OAAO,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,UAAU,CAAA;IAGvB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;IAC5B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAE9B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAG5B,KAAK,EAAE,OAAO,CAAA;IAEd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAMxC,SAAS,CAAC,EAAE,MAAM,CAAA;IAKlB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAQ3B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAO1B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,OAAO,CAAA;IAOtB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;IAO5B,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IAGjD,YAAY,CAAC,EAAE,YAAY,CAAA;IAK3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B,GAAG,OAAO,CAAA;AAEX;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB,GAAG,OAAO,CAAA;AAEX;;;GAGG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,IAAI,CAAC,SAAS;IAC3D,QAAQ,EAAE,MAAM,CAAC,CAAA;CAClB,GACG,CAAC,SAAS,OAAO,GACf,QAAQ,GACR,UAAU,GACZ,KAAK,CAAA;AAET;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;AAEjF;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GAAI,UAAU,YAAY,KAAG,UAsBnD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,UAAU,EAChB,WAAW,UAAU,KACpB,IAgBF,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,UAAU,EAChB,cAAc,OAAO,EACrB,iBAAiB,OAAO,KACvB,IA2CF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,UAAU,EAChB,YAAY,OAAO,KAClB,IAgBF,CAAA;AAwBD;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,UAAU,EAChB,KAAK,MAAM,EACX,OAAO,gBAAgB,KACtB,IAaF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GAAI,MAAM,OAAO,EAAE,OAAO,MAAM,KAAG,IAQvD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GACxB,MAAM,UAAU,EAChB,YAAY,UAAU,KACrB,IAUF,CAAA;AA6BD;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,QAY7C,CAAA;AAoJD;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,OAAO,KAAG,IAoB1C,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,IAiB9C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,IAInD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,QAAQ,EAAE,MAAM,MAAM,KAAG,IAY/D,CAAA;AAMD;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,MAAM,UAAU,GAAG,QAAQ,KAAG,IAOrE,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAmBzE"}
+{"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../../../src/ink/dom.ts"],"names":[],"mappings":"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"}

package/lib/types/ink/dom.js

@@ -1,7 +1,7 @@
 import { createLayoutNode } from './layout/engine.js';
 import { LayoutDisplay, LayoutMeasureMode } from './layout/node.js';
 import measureText from './measure-text.js';
-import { addPendingClear, nodeCache } from './node-cache.js';
+import { addPendingClear, nodeCache, textPaintCache } from './node-cache.js';
 import squashTextNodes from './squash-text-nodes.js';
 import { expandTabs } from './tabstops.js';
 import wrapText from './wrap-text.js';
@@ -219,12 +219,31 @@ export const createTextNode = (text) => {
     setTextNodeValue(node, text);
     return node;
 };
-const measureWrapCache = new WeakMap();
+const textMeasureCache = new WeakMap();
+// Yoga probes several widths/modes repeatedly in one layout. Retain only
+// the current text's results so streaming cannot accumulate old snapshots.
+const TEXT_MEASURE_CACHE_SIZE = 8;
 const measureTextNode = function (node, width, widthMode) {
     const rawText = node.nodeName === '#text' ? node.nodeValue : squashTextNodes(node);
-    // Expand tabs for measurement (worst case: 8 spaces each).
-    // Actual tab expansion happens in output.ts based on screen position.
-    const text = expandTabs(rawText);
+    const textWrap = node.style.textWrap ?? 'wrap';
+    let cache = textMeasureCache.get(node);
+    if (cache === undefined || cache.rawText !== rawText || cache.wrap !== textWrap) {
+        // Tabs use the same measurement expansion as the uncached path.
+        cache = { rawText, text: expandTabs(rawText), wrap: textWrap, entries: [] };
+        textMeasureCache.set(node, cache);
+    }
+    for (const entry of cache.entries) {
+        if (Object.is(entry.width, width) && entry.widthMode === widthMode)
+            return entry.result;
+    }
+    // Check above before measureText walks every line, even on a wrap-cache hit.
+    const result = measureTextDimensions(cache.text, width, widthMode, textWrap);
+    if (cache.entries.length === TEXT_MEASURE_CACHE_SIZE)
+        cache.entries.shift();
+    cache.entries.push({ width, widthMode, result });
+    return result;
+};
+function measureTextDimensions(text, width, widthMode, textWrap) {
     const dimensions = measureText(text, width);
     // Text fits into container, no need to wrap
     if (dimensions.width <= width) {
@@ -247,66 +266,11 @@ const measureTextNode = function (node, width, widthMode) {
         const effectiveWidth = Math.max(width, dimensions.width);
         return measureText(text, effectiveWidth);
     }
-    const textWrap = node.style.textWrap ?? 'wrap';
-    // Incremental path: same node, same width/wrap, text grew by append.
-    const cached = measureWrapCache.get(node);
-    if (cached !== undefined && cached.width === width && cached.wrap === textWrap) {
-        if (cached.text === text) {
-            // Same-frame repeat measure (yoga min/max probing) — free.
-            return cached.result;
-        }
-        if (text.startsWith(cached.text)) {
-            const tail = text.slice(cached.tailStart);
-            const tailWrapped = wrapText(tail, width, textWrap);
-            const tailDim = measureText(tailWrapped, width);
-            // Commit fully-terminated logical lines into the head so the tail
-            // stays bounded at one line of source text.
-            const lastNewline = tail.lastIndexOf('\n');
-            let { headHeight, tailStart } = cached;
-            let tailHeight = tailDim.height;
-            if (lastNewline > 0) {
-                const committed = wrapText(tail.slice(0, lastNewline + 1), width, textWrap);
-                headHeight += measureText(committed, width).height;
-                tailStart += lastNewline + 1;
-                tailHeight = measureText(wrapText(tail.slice(lastNewline + 1), width, textWrap), width).height;
-            }
-            const result = {
-                width: Math.max(cached.result.width, tailDim.width),
-                height: headHeight + tailHeight,
-            };
-            measureWrapCache.set(node, {
-                text,
-                width,
-                wrap: textWrap,
-                headHeight,
-                tailStart,
-                tailHeight,
-                result,
-            });
-            return result;
-        }
-        // Text replaced or shrunk (node reuse for a different message): fall
-        // through to the full path and overwrite the cache below.
-    }
     const wrappedText = wrapText(text, width, textWrap);
-    const fullResult = measureText(wrappedText, width);
-    // Seed the incremental cache: commit everything before the last newline.
-    const lastNewline = text.lastIndexOf('\n');
-    const tailStart = lastNewline === -1 ? 0 : lastNewline + 1;
-    const headHeight = tailStart === 0
-        ? 0
-        : measureText(wrapText(text.slice(0, tailStart), width, textWrap), width).height;
-    measureWrapCache.set(node, {
-        text,
-        width,
-        wrap: textWrap,
-        headHeight,
-        tailStart,
-        tailHeight: fullResult.height - headHeight,
-        result: fullResult,
-    });
-    return fullResult;
-};
+    // The wrapper has already chosen physical rows. Reapplying width-based
+    // row counting here double-counts trailing spaces at fractional widths.
+    return measureText(wrappedText, Infinity);
+}
 // ink-raw-ansi nodes hold pre-rendered ANSI strings with known dimensions.
 // No stringWidth, no wrapping, no tab expansion — the producer (e.g. ColorDiff)
 // already wrapped to the target width and each line is exactly one terminal row.
@@ -328,6 +292,9 @@ export const markDirty = (node) => {
         if (current.nodeName !== '#text') {
             ;
             (current).dirty = true;
+            // Culling can clear the paint dirty bit without preparing changed text.
+            // Invalidate at mutation time so re-entry cannot reuse stale content.
+            textPaintCache.delete(current);
             // Only mark yoga dirty on leaf nodes that have measure functions
             if (!markedYoga &&
                 (current.nodeName === 'ink-text' ||
@@ -362,6 +329,7 @@ export const markTreeDirty = (node) => {
             continue;
         const element = current;
         element.dirty = true;
+        textPaintCache.delete(element);
         // markDirty() is only legal on yoga nodes that carry a measure function;
         // those are exactly the two text node kinds (see createNode).
         if ((current.nodeName === 'ink-text' || current.nodeName === 'ink-raw-ansi') &&

package/lib/types/ink/get-max-width.d.ts

@@ -1,19 +1,11 @@
-import { type LayoutNode } from './layout/node.js';
+import type { LayoutNode } from './layout/node.js';
 /**
- * Returns the yoga node's content width (computed width minus padding and
- * border).
- *
- * Warning: can return a value WIDER than the parent container. In a
- * column-direction flex parent, width is the cross axis — align-items:
- * stretch never shrinks children below their intrinsic size, so the text
- * node overflows (standard CSS behavior). Yoga measures leaf nodes in two
- * passes: the AtMost pass determines width, the Exactly pass determines
- * height. getComputedWidth() reflects the wider AtMost result while
- * getComputedHeight() reflects the narrower Exactly result. Callers that
- * use this for wrapping should clamp to actual available screen space so
- * the rendered line count stays consistent with the layout height.
- * @param yogaNode - the laid-out node to measure.
- * @returns the node's content width: computed width minus padding and border.
+ * Return the text constraint that produced the laid-out height. Pixel-grid
+ * rounding can widen the painted box; wrapping at that rounded width would
+ * produce fewer rows than Yoga reserved and leave blank space at the bottom.
+ * The layout engine retains this constraint through its cache-hit paths.
+ * @param yogaNode - a laid-out text node with a measure function.
+ * @returns content width, already excluding padding and border.
  */
 declare const getMaxWidth: (yogaNode: LayoutNode) => number;
 export default getMaxWidth;

package/lib/types/ink/get-max-width.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-max-width.d.ts","sourceRoot":"","sources":["../../../src/ink/get-max-width.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE9D;;;;;;;;;;;;;;;GAeG;AACH,QAAA,MAAM,WAAW,GAAI,UAAU,UAAU,KAAG,MAQ3C,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"get-max-width.d.ts","sourceRoot":"","sources":["../../../src/ink/get-max-width.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD;;;;;;;GAOG;AACH,QAAA,MAAM,WAAW,GAAI,UAAU,UAAU,KAAG,MAE3C,CAAA;AAED,eAAe,WAAW,CAAA"}

package/lib/types/ink/get-max-width.js

@@ -1,25 +1,12 @@
-import { LayoutEdge } from './layout/node.js';
 /**
- * Returns the yoga node's content width (computed width minus padding and
- * border).
- *
- * Warning: can return a value WIDER than the parent container. In a
- * column-direction flex parent, width is the cross axis — align-items:
- * stretch never shrinks children below their intrinsic size, so the text
- * node overflows (standard CSS behavior). Yoga measures leaf nodes in two
- * passes: the AtMost pass determines width, the Exactly pass determines
- * height. getComputedWidth() reflects the wider AtMost result while
- * getComputedHeight() reflects the narrower Exactly result. Callers that
- * use this for wrapping should clamp to actual available screen space so
- * the rendered line count stays consistent with the layout height.
- * @param yogaNode - the laid-out node to measure.
- * @returns the node's content width: computed width minus padding and border.
+ * Return the text constraint that produced the laid-out height. Pixel-grid
+ * rounding can widen the painted box; wrapping at that rounded width would
+ * produce fewer rows than Yoga reserved and leave blank space at the bottom.
+ * The layout engine retains this constraint through its cache-hit paths.
+ * @param yogaNode - a laid-out text node with a measure function.
+ * @returns content width, already excluding padding and border.
  */
 const getMaxWidth = (yogaNode) => {
-    return (yogaNode.getComputedWidth() -
-        yogaNode.getComputedPadding(LayoutEdge.Left) -
-        yogaNode.getComputedPadding(LayoutEdge.Right) -
-        yogaNode.getComputedBorder(LayoutEdge.Left) -
-        yogaNode.getComputedBorder(LayoutEdge.Right));
+    return yogaNode.getComputedMeasureWidth();
 };
 export default getMaxWidth;

package/lib/types/ink/ink.d.ts

@@ -67,6 +67,7 @@ export default class Ink {
     private altScreenMouseTracking;
     private mainScreenFrameState;
     private prevFrameContaminated;
+    private needsSurfaceRepaint;
     private needsEraseBeforePaint;
     private cursorDeclaration;
     private displayCursor;