cli-jaw 2.17.61 → 2.17.62

package/dist/src/agent/spawn/line-buffer.js

@@ -9,21 +9,92 @@
  *
  * The cap is generous enough that a legitimately long JSON line still parses,
  * and it is only reached when no newline has been seen at all.
+ *
+ * ## Frame contract (#784)
+ *
+ * Two distinct limits share `maxChars`:
+ *
+ * - **Pending cap** — the memory bound on the in-flight partial frame. The
+ *   framer never retains more than `maxChars` of one frame's head, and while
+ *   draining a dropped frame it keeps only a fixed `OVERFLOW_HEAD_SAMPLE_CHARS`
+ *   diagnostic sample plus a counter.
+ * - **Frame cap** — the accept/reject rule for a completed frame. A frame is
+ *   dispatched iff its total length is ≤ `maxChars`. Because the pending cap
+ *   trips exactly when a frame exceeds `maxChars`, the verdict is identical no
+ *   matter how the payload is split across chunks: the same bytes always get
+ *   the same answer.
+ *
+ * Once a frame crosses the cap it is poisoned: the framer freezes a bounded,
+ * surrogate-safe head sample, counts the rest, and drains everything up to the
+ * frame's LF. The dropped frame surfaces as a `NdjsonDrop` — the truncated head
+ * is never spliced with a later suffix into a parseable-but-wrong message. The
+ * LF that ends the poisoned frame resyncs the stream, so following frames
+ * dispatch normally. EOF mid-overflow reports the drop too; no truncated
+ * payload is emitted.
  */
 import { sliceWithoutSplittingSurrogate } from '../stream-text.js';
 export const MAX_PENDING_LINE_CHARS = 8 * 1024 * 1024;
-/**
- * Clamp a pending (newline-free) line buffer.
- *
- * Keeps the HEAD rather than the tail: for a stream that never terminates a
- * line, the beginning is what identifies the malformed payload, and discarding
- * the head would leave an unparseable fragment either way.
- */
-export function clampPendingLine(buffer, maxChars = MAX_PENDING_LINE_CHARS) {
-    if (buffer.length <= maxChars)
-        return { buffer, overflowed: false };
-    // Slice on a code-point boundary: a bare slice can cut between a high and low
-    // surrogate and emit half an emoji at the cap (#372).
-    return { buffer: sliceWithoutSplittingSurrogate(buffer, maxChars), overflowed: true };
+/** Bounded head of a dropped frame, kept so the drop can be identified. */
+export const OVERFLOW_HEAD_SAMPLE_CHARS = 512;
+export function createNdjsonFramer(maxChars = MAX_PENDING_LINE_CHARS) {
+    let pending = '';
+    let overflowing = false;
+    let frameChars = 0;
+    let headSample = '';
+    return {
+        push(text) {
+            const lines = [];
+            const drops = [];
+            let offset = 0;
+            while (offset <= text.length) {
+                const nl = text.indexOf('\n', offset);
+                const end = nl === -1 ? text.length : nl;
+                const segLen = end - offset;
+                if (overflowing) {
+                    frameChars += segLen;
+                }
+                else if (pending.length + segLen > maxChars) {
+                    // One extra code unit: slicing exactly at the bound would
+                    // skip the surrogate check and could keep half a pair.
+                    const headSource = pending.length > OVERFLOW_HEAD_SAMPLE_CHARS
+                        ? pending
+                        : pending + text.slice(offset, offset + OVERFLOW_HEAD_SAMPLE_CHARS + 1);
+                    headSample = sliceWithoutSplittingSurrogate(headSource, OVERFLOW_HEAD_SAMPLE_CHARS);
+                    frameChars = pending.length + segLen;
+                    pending = '';
+                    overflowing = true;
+                }
+                else {
+                    pending += text.slice(offset, end);
+                }
+                if (nl === -1)
+                    break;
+                if (overflowing) {
+                    drops.push({ frameChars, headSample });
+                    overflowing = false;
+                    frameChars = 0;
+                    headSample = '';
+                }
+                else {
+                    lines.push(pending);
+                    pending = '';
+                }
+                offset = nl + 1;
+            }
+            return { lines, drops };
+        },
+        end() {
+            if (overflowing) {
+                const drop = { frameChars, headSample };
+                overflowing = false;
+                frameChars = 0;
+                headSample = '';
+                return { tail: '', drop };
+            }
+            const tail = pending;
+            pending = '';
+            return { tail, drop: null };
+        },
+    };
 }
 //# sourceMappingURL=line-buffer.js.map

package/dist/src/agent/spawn/line-buffer.js.map

@@ -1 +1 @@
-{"version":3,"file":"line-buffer.js","sourceRoot":"","sources":["../../../../src/agent/spawn/line-buffer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAStD;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC5B,MAAc,EACd,WAAmB,sBAAsB;IAEzC,IAAI,MAAM,CAAC,MAAM,IAAI,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACpE,8EAA8E;IAC9E,sDAAsD;IACtD,OAAO,EAAE,MAAM,EAAE,8BAA8B,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AAC1F,CAAC"}
+{"version":3,"file":"line-buffer.js","sourceRoot":"","sources":["../../../../src/agent/spawn/line-buffer.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/spawn.js

@@ -180,7 +180,7 @@ import { stopCauseFromKillReason } from './spawn/stop-cause.js';
 import { buildSteerStartedEvent } from './spawn/steer-event.js';
 import { armExitSettle, captureExitSettler, settleCapturedExit, settleExit, waitForExitSettled, } from './spawn/exit-settle.js';
 import { releaseChildOutputAfterExit } from './spawn/exit-drain.js';
-import { clampPendingLine } from './spawn/line-buffer.js';
+import { createNdjsonFramer, MAX_PENDING_LINE_CHARS } from './spawn/line-buffer.js';
 import { appendBoundedFullText } from './events/fulltext-bound.js';
 /** No provider turn was dispatched; preserve the captured cancellation receipt. */
 function stoppedBeforeStart(reason, traceRunId) {
@@ -3710,7 +3710,16 @@ export function spawnAgent(prompt, opts = {}) {
             },
         });
     }
-    let buffer = '';
+    const ndjsonFramer = createNdjsonFramer();
+    const reportNdjsonDrop = (drop) => {
+        console.warn(`[jaw:${agentLabel}] stdout frame exceeded the ${MAX_PENDING_LINE_CHARS}-char limit — dropping the frame and draining to its newline`);
+        appendTraceEvent({
+            runId: ctx.traceRunId,
+            source: 'cli_raw',
+            eventType: 'ndjson_overflow',
+            raw: { droppedFrameChars: drop.frameChars, headSample: drop.headSample },
+        });
+    };
     const recordOpencodeEvent = (line, event) => {
         if (cli !== 'opencode')
             return;
@@ -3865,15 +3874,10 @@ export function spawnAgent(prompt, opts = {}) {
             }
             return;
         }
-        buffer += stdoutReader.write(chunk);
-        const lines = buffer.split('\n');
-        buffer = lines.pop() ?? '';
-        const clampedPending = clampPendingLine(buffer);
-        if (clampedPending.overflowed) {
-            console.warn(`[jaw:${agentLabel}] stdout line exceeded the pending-line cap without a newline — truncating`);
-            buffer = clampedPending.buffer;
-        }
-        for (const line of lines) {
+        const framed = ndjsonFramer.push(stdoutReader.write(chunk));
+        for (const drop of framed.drops)
+            reportNdjsonDrop(drop);
+        for (const line of framed.lines) {
             if (!line.trim())
                 continue;
             dispatchNdjsonLine(line);
@@ -3921,7 +3925,12 @@ export function spawnAgent(prompt, opts = {}) {
                 emitKiroStreamEvents(processKiroStdoutChunk(ctx, stdoutResidual), ctx, agentLabel, cli, empTag, traceAudience);
             }
             else {
-                buffer += stdoutResidual;
+                const framed = ndjsonFramer.push(stdoutResidual);
+                for (const drop of framed.drops)
+                    reportNdjsonDrop(drop);
+                for (const line of framed.lines)
+                    if (line.trim())
+                        dispatchNdjsonLine(line);
             }
         }
         const stderrEnd = stderrReader.end();
@@ -3930,9 +3939,11 @@ export function spawnAgent(prompt, opts = {}) {
             ctx.stderrBuf = sliceWithoutSplittingSurrogate(ctx.stderrBuf + stderrResidual, STDERR_BUF_CAP);
         }
         // Flush residual NDJSON buffer — last event may lack a trailing newline
-        if (buffer.trim()) {
-            dispatchNdjsonLine(buffer);
-            buffer = '';
+        const ndjsonTail = ndjsonFramer.end();
+        if (ndjsonTail.drop)
+            reportNdjsonDrop(ndjsonTail.drop);
+        if (ndjsonTail.tail.trim()) {
+            dispatchNdjsonLine(ndjsonTail.tail);
         }
         flushClaudeBuffers(ctx, agentLabel, empTag); // flush any pending thinking/input buffers
         if (cli === 'opencode')