@sema-agent/server 7.144.0 → 7.146.0

package/dist/trace/redact.js

@@ -73,7 +73,7 @@ function collectSpelledCuts(s) {
     let present = 0;
     let i = s.indexOf("\\");
     if (i < 0)
-        return { cuts, present };
+        return { cuts, present, open: -1 };
     const n = s.length;
     const read = { end: 0 };
     while (i >= 0) {
@@ -81,6 +81,8 @@ function collectSpelledCuts(s) {
         while (body < n && s.charCodeAt(body) === CH_BACKSLASH)
             body += 1;
         const cp = readSpelledCodePoint(s, body, read);
+        if (cp === ESCAPE_TRUNCATED)
+            return { cuts, present, open: i };
         const cls = cp < 0 ? 0 : isFormatCodePoint(cp) ? SPELLED_FORMAT : cp < 0x10000 && INVISIBLE_UNIT_CLASS[cp] === 1 ? SPELLED_CONTROL : 0;
         if (cls !== 0) {
             cuts.push(i, read.end, cls);
@@ -89,7 +91,7 @@ function collectSpelledCuts(s) {
         }
         i = s.indexOf("\\", body);
     }
-    return { cuts, present };
+    return { cuts, present, open: -1 };
 }
 function deleteInvisibleCharacters(s, all, mask) {
     const atList = [];
@@ -127,9 +129,12 @@ function viewIndexInInput(fold, v) {
     }
     return lo === 0 ? v : v + fold.cum[lo - 1];
 }
+const ESCAPE_TRUNCATED = -2;
 function readHexRun(s, at, count) {
     let v = 0;
     for (let k = at; k < at + count; k++) {
+        if (k >= s.length)
+            return ESCAPE_TRUNCATED;
         const d = hexDigitValue(s.charCodeAt(k));
         if (d < 0)
             return -1;
@@ -138,6 +143,8 @@ function readHexRun(s, at, count) {
     return v;
 }
 function readEscapeElement(s, at, out) {
+    if (at >= s.length)
+        return ESCAPE_TRUNCATED;
     const kind = s.charCodeAt(at);
     if (kind === CH_x) {
         out.end = at + 3;
@@ -145,6 +152,8 @@ function readEscapeElement(s, at, out) {
     }
     if (kind !== CH_u)
         return -1;
+    if (at + 1 >= s.length)
+        return ESCAPE_TRUNCATED;
     if (s.charCodeAt(at + 1) === CH_LBRACE) {
         let v = 0;
         let k = at + 2;
@@ -156,6 +165,8 @@ function readEscapeElement(s, at, out) {
             if (v > 0x10ffff)
                 return -1;
         }
+        if (k >= s.length)
+            return ESCAPE_TRUNCATED;
         if (k === at + 2 || s.charCodeAt(k) !== CH_RBRACE)
             return -1;
         out.end = k + 1;
@@ -171,13 +182,20 @@ function readSpelledCodePoint(s, at, out) {
     if (v > 0xdbff)
         return -1;
     let k = out.end;
+    if (k >= s.length)
+        return ESCAPE_TRUNCATED;
     if (s.charCodeAt(k) !== CH_BACKSLASH)
         return -1;
     while (s.charCodeAt(k) === CH_BACKSLASH)
         k += 1;
     const lo = readEscapeElement(s, k, out);
+    if (lo === ESCAPE_TRUNCATED)
+        return ESCAPE_TRUNCATED;
     return lo >= 0xdc00 && lo <= 0xdfff ? 0x10000 + ((v - 0xd800) << 10) + (lo - 0xdc00) : -1;
 }
+function isEscapeBodyUnit(c) {
+    return c === CH_BACKSLASH || c === CH_u || c === CH_x || c === CH_LBRACE || c === CH_RBRACE || hexDigitValue(c) >= 0;
+}
 const FORMAT_CODEPOINT_TABLE = (() => {
     const table = new Uint8Array(0x10000);
     const units = [];
@@ -463,9 +481,13 @@ let ssh2ScanBytes = 0;
 let mappedUnits = 0;
 let coverageVisits = 0;
 let rowVisits = 0;
+let scannedUnits = 0;
+let windowAdvances = 0;
+let windowRefusals = 0;
+let windowEvaluations = 0;
 let readings = 0;
 export function armPoolBudgetForTest() {
-    return { spanCount: poolSpanCount, coveredPositions, headScreenHits, fullYCalls, armCount: poolArmCount, boundaryArmCount: poolBoundaryArmCount, forensicLevels, forensicRuns, forensicSkips, urlSegmentRuns, urlSegmentReplays, ssh2ScanBytes, mappedUnits, readings, coverageVisits, rowVisits };
+    return { spanCount: poolSpanCount, coveredPositions, headScreenHits, fullYCalls, armCount: poolArmCount, boundaryArmCount: poolBoundaryArmCount, forensicLevels, forensicRuns, forensicSkips, urlSegmentRuns, urlSegmentReplays, ssh2ScanBytes, mappedUnits, readings, coverageVisits, rowVisits, scannedUnits, windowAdvances, windowRefusals, windowEvaluations };
 }
 export function resetArmPoolBudgetForTest() {
     poolSpanCount = 0;
@@ -482,6 +504,10 @@ export function resetArmPoolBudgetForTest() {
     readings = 0;
     coverageVisits = 0;
     rowVisits = 0;
+    scannedUnits = 0;
+    windowAdvances = 0;
+    windowRefusals = 0;
+    windowEvaluations = 0;
 }
 const unitBit = (t, c) => (t[c >>> 5] >>> (c & 31)) & 1;
 let codeUnitDomain;
@@ -1036,7 +1062,7 @@ function undecidedKeywordStart(text, t) {
 }
 const CREDENTIAL_NAME_ANCHORS = {
     api_key: "declarative", apikey: "declarative", "api-key": "declarative", key: "structure-only",
-    token: "structure-only", access_token: "declarative", refresh_token: "declarative", id_token: "declarative",
+    token: "assignment", access_token: "declarative", refresh_token: "declarative", id_token: "declarative",
     auth: "structure-only", authorization: "auth-scheme", "proxy-authorization": "auth-scheme",
     password: "declarative", passwd: "any-form", pwd: "any-form",
     secret: "declarative", client_secret: "declarative", private_key: "declarative",
@@ -1079,6 +1105,33 @@ function credentialNameAnchor(name) {
     return CREDENTIAL_ANCHOR_OF.get(asciiLower(name));
 }
 const CREDENTIAL_ANCHOR_OF = new Map(Object.entries(CREDENTIAL_NAME_ANCHORS));
+const BARE_WORD_READINGS = {
+    null: "absent-or-boolean", nil: "absent-or-boolean", none: "absent-or-boolean", undefined: "absent-or-boolean",
+    true: "absent-or-boolean", false: "absent-or-boolean", yes: "absent-or-boolean", no: "absent-or-boolean",
+    str: "type-name", string: "type-name", bytes: "type-name", int: "type-name", integer: "type-name", float: "type-name", number: "type-name",
+    bool: "type-name", boolean: "type-name", any: "type-name", object: "type-name", array: "type-name", secretstr: "type-name",
+};
+for (const w of Object.keys(BARE_WORD_READINGS)) {
+    if (!/^[a-z]+$/.test(w))
+        throw new Error(`redact: bare value word ${JSON.stringify(w)} must be lowercase ASCII letters (values are ASCII-lowercased before the lookup)`);
+}
+const BARE_WORD_OF = new Map(Object.entries(BARE_WORD_READINGS));
+const BARE_WORD_MAX = Math.max(...Object.keys(BARE_WORD_READINGS).map((w) => w.length));
+function bareWordIsValue(reading, bare) {
+    switch (reading) {
+        case "absent-or-boolean":
+            return false;
+        case "type-name":
+            return bare === "declared";
+        default: {
+            const unhandled = reading;
+            throw new Error(`redact: unhandled bare value word reading ${String(unhandled)}`);
+        }
+    }
+}
+export function lineKeyTypeNamesForTest() {
+    return Object.entries(BARE_WORD_READINGS).filter(([, r]) => r === "type-name").map(([w]) => w);
+}
 const STRUCTURAL_SECRET_PATTERNS = [
     [/-----BEGIN(?:[^-](?:[^-](?:[^-]|-(?!-))*)?)?PRIVATE KEY(?: BLOCK)?-----[\s\S]{0,8192}?-----END(?:[^-](?:[^-](?:[^-]|-(?!-))*)?)?PRIVATE KEY(?: BLOCK)?-----/g, "«redacted:private-key»"],
     [/---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----[\s\S]{0,8192}?---- END SSH2 ENCRYPTED PRIVATE KEY ----/g, "«redacted:private-key»"],
@@ -3100,8 +3153,6 @@ function isEngineMarkedCandidate(text, start, end, repl) {
     return end - start === lead.length + REDACTION_MARK.length + trail.length && text.startsWith(lead, start) && text.startsWith(REDACTION_MARK, start + lead.length) && text.startsWith(trail, end - trail.length);
 }
 const STRONG_AUTH_SCHEME_MAX = Math.max(...[...STRONG_AUTH_SCHEMES].map((w) => w.length));
-const ABSENT_OR_BOOLEAN_WORDS = new Set(["null", "nil", "none", "undefined", "true", "false", "yes", "no"]);
-const ABSENT_OR_BOOLEAN_MAX = Math.max(...[...ABSENT_OR_BOOLEAN_WORDS].map((w) => w.length));
 const CH_GRAVE = 96, CH_APOS = 39, CH_DOT = 46, CH_COMMA = 44, CH_SEMI = 59, CH_DOLLAR = 36;
 const CH_LPAREN = 40, CH_RPAREN = 41, CH_RBRACKET = 93, CH_LBRACE = 123, CH_RBRACE = 125, CH_LT = 60, CH_GT = 62;
 const CH_QMARK = 63, CH_AMP = 38, CH_HASH = 35;
@@ -3128,6 +3179,9 @@ const unitChOf = (unit) => (unit >> 3) - 1;
 const unitLenOf = (unit) => unit & 7;
 function readAnchorUnit(text, i, json) {
     anchoredScanUnits += 1;
+    return readTextUnit(text, i, json);
+}
+function readTextUnit(text, i, json) {
     const c = text.charCodeAt(i);
     if (!json)
         return packUnit(c, 1);
@@ -3169,7 +3223,7 @@ function anchorHeadAt(scan, text, op, json) {
         if (i < 0)
             return undefined;
         const c = text.charCodeAt(i);
-        if (c === CH_SPACE || c === CH_TAB) {
+        if (isInlineSpaceUnit(c)) {
             i -= 1;
             spacedLeft = true;
             anchoredScanUnits += 1;
@@ -3237,13 +3291,13 @@ function anchorHeadAt(scan, text, op, json) {
     let listSep = 0;
     if (!afterEscape) {
         let k = before;
-        while (k >= 0 && (text.charCodeAt(k) === CH_SPACE || text.charCodeAt(k) === CH_TAB))
+        while (k >= 0 && isInlineSpaceUnit(text.charCodeAt(k)))
             k -= 1;
         anchoredScanUnits += before - k;
         const left = k >= 0 ? text.charCodeAt(k) : 0;
         listSep = left === CH_QMARK || left === CH_AMP || left === CH_HASH ? CH_AMP : left === CH_SEMI ? CH_SEMI : left === CH_COMMA || left === CH_LPAREN || left === CH_LBRACKET || left === CH_LBRACE ? CH_COMMA : 0;
     }
-    return { strength, quotedName: quote !== 0, spacedLeft, listSep };
+    return { strength, quotedName: quote !== 0, spacedLeft, listSep, runStart };
 }
 function quotedValueEnd(text, cs, quote, json, isHead) {
     const n = text.length;
@@ -3356,7 +3410,7 @@ function bareValueEnd(text, s, json, listSep, memo) {
     }
     return e;
 }
-function literalValueAt(text, s, json, declaredIfBare, listSep, isHead, memo) {
+function literalValueAt(text, s, json, bare, listSep, isHead, memo) {
     const n = text.length;
     if (s >= n)
         return undefined;
@@ -3377,8 +3431,21 @@ function literalValueAt(text, s, json, declaredIfBare, listSep, isHead, memo) {
     }
     else if (!isAsciiAlnumCode(first))
         return undefined;
-    if (!declaredIfBare)
-        return undefined;
+    let lineKey;
+    switch (bare) {
+        case "never":
+            return undefined;
+        case "declared":
+            lineKey = false;
+            break;
+        case "line-key":
+            lineKey = true;
+            break;
+        default: {
+            const unhandled = bare;
+            throw new Error(`redact: unhandled bare literal form ${String(unhandled)}`);
+        }
+    }
     if (isProgramIdentStartCode(text.charCodeAt(vs))) {
         let k = vs;
         while (k < n && isProgramIdentCode(text.charCodeAt(k)))
@@ -3391,10 +3458,92 @@ function literalValueAt(text, s, json, declaredIfBare, listSep, isHead, memo) {
     const e = bareValueEnd(text, vs, json, listSep, memo);
     if (e <= vs)
         return undefined;
-    if (e - vs <= ABSENT_OR_BOOLEAN_MAX && ABSENT_OR_BOOLEAN_WORDS.has(text.slice(vs, e).toLowerCase()))
-        return undefined;
+    if (e - vs <= BARE_WORD_MAX) {
+        const reading = BARE_WORD_OF.get(asciiLower(text.slice(vs, e)));
+        if (reading !== undefined && !bareWordIsValue(reading, lineKey ? "line-key" : "declared"))
+            return undefined;
+    }
+    if (lineKey) {
+        const rest = lineKeyRestAt(text, e, json, isHead);
+        switch (rest) {
+            case "ends":
+                break;
+            case "goes-on":
+                return undefined;
+            case "undecided":
+                return { start: vs, end: text.length, quoted: false, open: true };
+            default: {
+                const unhandled = rest;
+                throw new Error(`redact: unhandled line-key rest ${String(unhandled)}`);
+            }
+        }
+    }
     return { start: vs, end: e, quoted: false };
 }
+function lineKeyRestAt(text, e, json, isHead) {
+    const n = text.length;
+    let i = e;
+    while (i < n) {
+        const unit = readAnchorUnit(text, i, json);
+        const ch = unitChOf(unit);
+        if (isInlineSpaceUnit(ch) || (ch >= 0 && INVISIBLE_UNIT_CLASS[ch] === 1)) {
+            i += unitLenOf(unit);
+            continue;
+        }
+        return ch === JSON_STRING_END || isLineTerminator(ch) || ch === CH_HASH ? "ends" : "goes-on";
+    }
+    return isHead ? "undecided" : "ends";
+}
+function unitEndingAt(text, end, json) {
+    const c = text.charCodeAt(end - 1);
+    anchoredScanUnits += 1;
+    if (!json)
+        return packUnit(c, 1);
+    if (end >= 6 && text.charCodeAt(end - 6) === CH_BACKSLASH && text.charCodeAt(end - 5) === CH_u && !escapedAt(text, end - 6)) {
+        const h0 = hexDigitValue(text.charCodeAt(end - 4));
+        const h1 = hexDigitValue(text.charCodeAt(end - 3));
+        const h2 = hexDigitValue(text.charCodeAt(end - 2));
+        const h3 = hexDigitValue(text.charCodeAt(end - 1));
+        if (h0 >= 0 && h1 >= 0 && h2 >= 0 && h3 >= 0)
+            return packUnit((h0 << 12) | (h1 << 8) | (h2 << 4) | h3, 6);
+    }
+    if (end >= 2 && text.charCodeAt(end - 2) === CH_BACKSLASH && escapedAt(text, end - 1)) {
+        const two = readTextUnit(text, end - 2, true);
+        if (unitLenOf(two) === 2)
+            return two;
+    }
+    return c === CH_QUOTE ? packUnit(JSON_STRING_END, 1) : packUnit(c, 1);
+}
+function lineHeadBefore(text, at, json) {
+    let i = at;
+    let blank = false;
+    for (;;) {
+        if (i <= 0)
+            return true;
+        const unit = unitEndingAt(text, i, json);
+        const ch = unitChOf(unit);
+        if (isInlineSpaceUnit(ch)) {
+            i -= unitLenOf(unit);
+            blank = true;
+            continue;
+        }
+        if (ch >= 0 && INVISIBLE_UNIT_CLASS[ch] === 1) {
+            i -= unitLenOf(unit);
+            continue;
+        }
+        if (ch === CH_MINUS && blank) {
+            i -= unitLenOf(unit);
+            blank = false;
+            continue;
+        }
+        return isLineTerminator(ch) || ch === JSON_STRING_END;
+    }
+}
+function declarativeBareAt(text, head, spacedRight, json) {
+    if (head.quotedName || (!head.spacedLeft && !spacedRight))
+        return "declared";
+    return spacedRight && lineHeadBefore(text, head.runStart, json) ? "line-key" : "never";
+}
 function schemeValueAt(text, s, json) {
     const n = text.length;
     let i = s;
@@ -3478,11 +3627,16 @@ function anchoredValueAt(scan, text, op, json, span, isHead, memo) {
         case "auth-scheme":
             v = schemeValueAt(text, s, json);
             break;
+        case "assignment":
+            if (text.charCodeAt(op) !== CH_EQ || head.quotedName || head.spacedLeft || spacedRight)
+                return;
+            v = literalValueAt(text, s, json, "declared", head.listSep, isHead, memo);
+            break;
         case "declarative":
-            v = literalValueAt(text, s, json, head.quotedName || (!head.spacedLeft && !spacedRight), head.listSep, isHead, memo);
+            v = literalValueAt(text, s, json, declarativeBareAt(text, head, spacedRight, json), head.listSep, isHead, memo);
             break;
         case "any-form":
-            v = literalValueAt(text, s, json, true, head.listSep, isHead, memo);
+            v = literalValueAt(text, s, json, "declared", head.listSep, isHead, memo);
             break;
         default: {
             const unhandled = head.strength;
@@ -3566,6 +3720,142 @@ function collectAnchoredValueSpans(scan, text, json, span, isHead) {
     scan.footLo = armLo;
     scan.footHi = armHi;
 }
+const isRegexWordCode = (c) => isAsciiAlnumCode(c) || c === CH_UNDERSCORE;
+const isDiagnosticNameCode = (c) => isRegexWordCode(c) || c === CH_MINUS;
+const isDiagnosticValueUnit = (ch) => ch !== JSON_STRING_END && !isRegexSpace(ch) && ch !== CH_QUOTE && ch !== CH_APOS && ch !== CH_COMMA && ch !== CH_RBRACE;
+const isAsciiLetterCode = (ch) => (ch >= 0x41 && ch <= 0x5a) || (ch >= 0x61 && ch <= 0x7a);
+const isDiagnosticSchemeValueUnit = (ch) => isAsciiAlnumCode(ch) || ch === CH_DOT || ch === CH_UNDERSCORE || ch === CH_TILDE || ch === CH_PLUS || ch === CH_SLASH || ch === CH_EQ || ch === CH_MINUS;
+function diagnosticNameSlot(tier) {
+    switch (tier) {
+        case "assignment":
+        case "declarative":
+        case "any-form":
+        case "auth-scheme":
+            return true;
+        case "structure-only":
+            return false;
+        default: {
+            const unhandled = tier;
+            throw new Error(`redact: unhandled free-text anchor strength ${String(unhandled)}`);
+        }
+    }
+}
+const DIAGNOSTIC_SCHEME_RE = new RegExp([...STRONG_AUTH_SCHEMES].sort((a, b) => b.length - a.length).join("|"), "gi");
+let diagnosticScanUnits = 0;
+export function diagnosticScanUnitsForTest() {
+    return diagnosticScanUnits;
+}
+export function resetDiagnosticScanUnitsForTest() {
+    diagnosticScanUnits = 0;
+}
+function collectDiagnosticValueSpans(text, json, span, isHead, deletedAt) {
+    const n = text.length;
+    const readRun = (from, isValue) => {
+        let i = from;
+        while (i < n) {
+            const unit = readTextUnit(text, i, json);
+            diagnosticScanUnits += 1;
+            if (!isValue(unitChOf(unit)))
+                break;
+            i += unitLenOf(unit);
+        }
+        return i;
+    };
+    const skipBlank = (from) => readRun(from, isRegexSpace);
+    let valueEnd = 0;
+    let nextEq = text.indexOf("=");
+    let nextColon = text.indexOf(":");
+    while (nextEq >= 0 || nextColon >= 0) {
+        let op;
+        if (nextColon < 0 || (nextEq >= 0 && nextEq < nextColon)) {
+            op = nextEq;
+            nextEq = text.indexOf("=", op + 1);
+        }
+        else {
+            op = nextColon;
+            nextColon = text.indexOf(":", op + 1);
+        }
+        if (op + 1 < valueEnd)
+            continue;
+        let e = op;
+        while (e > 0 && isRegexSpace(text.charCodeAt(e - 1)))
+            e -= 1;
+        diagnosticScanUnits += op - e;
+        if (e === 0 || !isRegexWordCode(text.charCodeAt(e - 1)))
+            continue;
+        const floor = Math.max(0, e - CREDENTIAL_NAME_MAX - 1);
+        let runStart = e;
+        while (runStart > floor && isDiagnosticNameCode(text.charCodeAt(runStart - 1)))
+            runStart -= 1;
+        diagnosticScanUnits += e - runStart;
+        const runOpen = runStart === floor && floor > 0 && isDiagnosticNameCode(text.charCodeAt(floor - 1));
+        let nameStart = -1;
+        let nameTier;
+        for (let q = runStart; q < e && nameStart < 0; q++) {
+            if (e - q > CREDENTIAL_NAME_MAX || !isRegexWordCode(text.charCodeAt(q)))
+                continue;
+            const bounded = (q === runStart && !runOpen) || text.charCodeAt(q - 1) === CH_MINUS || deletedAt(q) !== "none";
+            const tier = bounded ? credentialNameAnchor(text.slice(q, e)) : undefined;
+            if (tier !== undefined && diagnosticNameSlot(tier)) {
+                nameStart = q;
+                nameTier = tier;
+            }
+        }
+        if (nameStart < 0)
+            continue;
+        let s = skipBlank(op + 1);
+        if (s < n) {
+            const unit = readTextUnit(text, s, json);
+            if (unitChOf(unit) === CH_QUOTE)
+                s += unitLenOf(unit);
+        }
+        if (s >= n) {
+            if (isHead)
+                span(nameStart, n, op, NOT_CLOSED, true);
+            continue;
+        }
+        let end = readRun(s, isDiagnosticValueUnit);
+        if (end > s && nameTier === "auth-scheme" && readRun(s, isAsciiLetterCode) === end) {
+            const k = skipBlank(end);
+            if (k > end && k >= n && isHead) {
+                span(nameStart, n, op, NOT_CLOSED, true);
+                continue;
+            }
+            if (k > end && k < n) {
+                const credEnd = readRun(k, isDiagnosticSchemeValueUnit);
+                if (credEnd > k)
+                    end = credEnd;
+            }
+        }
+        if (end > s) {
+            span(s, end, op, NOT_CLOSED);
+            valueEnd = end;
+        }
+    }
+    let schemeEnd = 0;
+    DIAGNOSTIC_SCHEME_RE.lastIndex = 0;
+    for (let m = DIAGNOSTIC_SCHEME_RE.exec(text); m !== null; m = DIAGNOSTIC_SCHEME_RE.exec(text)) {
+        const at = m.index;
+        const q = at + m[0].length;
+        if (q < schemeEnd)
+            continue;
+        if (at > 0 && isRegexWordCode(text.charCodeAt(at - 1)) && deletedAt(at) === "none")
+            continue;
+        const k = skipBlank(q);
+        if (k === q && deletedAt(q) !== "blank")
+            continue;
+        if (k >= n) {
+            if (isHead)
+                span(at, n, at, NOT_CLOSED, true);
+            continue;
+        }
+        const end = readRun(k, isDiagnosticSchemeValueUnit);
+        if (end > k) {
+            span(k, end, at, NOT_CLOSED);
+            schemeEnd = end;
+        }
+    }
+}
 export function structuralScannerForTest(arm) {
     const collect = (scan) => (text) => {
         const out = [];
@@ -3695,6 +3985,7 @@ function collectPpkContainerSpans(scan, text, eat, span, isHead) {
     if (last >= 0 && isOpenHead(last) && !lineHeld(scan, last, text.length, readingKey(fam, last)))
         span(last, text.length, last, NOT_CLOSED, true);
 }
+const NO_GAP = (_unit) => false;
 const armPool = (() => {
     const spanRepl = (token) => {
         const body = token.startsWith("$1") ? token.slice(2) : token;
@@ -3723,6 +4014,7 @@ const armPool = (() => {
             order,
             phase: 1,
             lexical: LEXICAL_KEYWORD_ARMS.has(re),
+            diagnosticOnly: false,
             collect: (text, _json, _eat, out, isHead) => {
                 if (boundary === undefined)
                     collectRegexSpans(arm, text, out);
@@ -3739,26 +4031,28 @@ const armPool = (() => {
             headFirst: boundary === undefined ? undefined : headFirst,
             family: "prose",
             reach: regexDecisionReach(re, LEXICAL_KEYWORD_ARMS.has(re)),
+            prior: { kind: "bounded", gap: keywordTail === undefined ? NO_GAP : (c) => keywordTail.isSeparator(String.fromCharCode(c)) },
         };
     };
-    const scannerMember = (token, order, arm, reach, family) => {
+    const scannerMember = (token, order, arm, reach, family, prior, rank = ARM_RANK.structural, lexical = false, diagnosticOnly = false) => {
         const repl = spanRepl(token);
-        const rank = ARM_RANK.structural;
         return {
             token,
             rank,
             order,
             phase: 1,
-            lexical: false,
-            collect: (text, json, eat, out, isHead) => arm(text, json, eat, (start, end, anchor, closeAt, undecided, r = repl) => out.push(undecided === true ? { start, end, repl: r, rank, order, undecided, anchor, closeAt } : { start, end, repl: r, rank, order, anchor, closeAt }), isHead),
+            lexical,
+            diagnosticOnly,
+            collect: (text, json, eat, out, isHead, deletedAt) => arm(text, json, eat, (start, end, anchor, closeAt, undecided, r = repl) => out.push(undecided === true ? { start, end, repl: r, rank, order, undecided, anchor, closeAt } : { start, end, repl: r, rank, order, anchor, closeAt }), isHead, deletedAt),
             retry: undefined,
             headSrc: undefined,
             headFirst: undefined,
             family,
             reach,
+            prior,
         };
     };
-    const forensicMember = (token, order, arm, reach, family, rank = ARM_RANK.structural, lexical = false) => {
+    const forensicMember = (token, order, arm, reach, family, prior, rank = ARM_RANK.structural, lexical = false) => {
         const repl = spanRepl(token);
         return {
             token,
@@ -3766,6 +4060,7 @@ const armPool = (() => {
             order,
             phase: 2,
             lexical,
+            diagnosticOnly: false,
             collect: (scan, text, json, eat, out, isHead) => arm(scan, text, json, eat, (start, end, anchor, closeAt, undecided, r = repl) => out.push(undecided === true ? { start, end, repl: r, rank, order, undecided, anchor, closeAt } : { start, end, repl: r, rank, order, anchor, closeAt }), isHead),
             retry: undefined,
             headSrc: undefined,
@@ -3773,32 +4068,34 @@ const armPool = (() => {
             family,
             repl,
             reach,
+            prior,
         };
     };
     const structuralScannerMember = (row, order) => {
         if (row === PEM_FENCE_PATTERN)
-            return forensicMember(row[1], order, (scan, text, _json, _eat, span, isHead) => collectPemFenceSpans(scan, text, span, isHead), PEM_FENCE_OPEN.length, "pem-armor");
+            return forensicMember(row[1], order, (scan, text, _json, _eat, span, isHead) => collectPemFenceSpans(scan, text, span, isHead), PEM_FENCE_OPEN.length, "pem-armor", { kind: "anchored", anchors: [PEM_FENCE_OPEN, PEM_END_OPEN] });
         if (row === SSH2_FENCE_PATTERN)
-            return forensicMember(row[1], order, (scan, text, json, _eat, span, isHead) => collectSsh2FenceSpans(scan, text, json, span, isHead), SSH2_FENCE_OPEN.length, "ssh2-armor");
+            return forensicMember(row[1], order, (scan, text, json, _eat, span, isHead) => collectSsh2FenceSpans(scan, text, json, span, isHead), SSH2_FENCE_OPEN.length, "ssh2-armor", { kind: "anchored", anchors: [SSH2_FENCE_OPEN, SSH2_FENCE_CLOSE] });
         if (row === URL_CREDENTIAL_PATTERN)
-            return forensicMember(row[1], order, (scan, text, json, _eat, span, isHead) => collectUrlCredentialSpans(scan, text, json, span, isHead), "://".length, "url");
+            return forensicMember(row[1], order, (scan, text, json, _eat, span, isHead) => collectUrlCredentialSpans(scan, text, json, span, isHead), "://".length, "url", { kind: "bounded", gap: NO_GAP });
         if (row === JSON_SECRET_FIELD_PATTERN)
-            return scannerMember(row[1], order, (text, _json, _eat, span, isHead) => collectJsonSecretFieldSpans(text, span, isHead), JSON_FIELD_BACK, "json-field");
+            return scannerMember(row[1], order, (text, _json, _eat, span, isHead) => collectJsonSecretFieldSpans(text, span, isHead), JSON_FIELD_BACK, "json-field", { kind: "bounded", gap: isRegexSpace });
         throw new Error(`redact: structural row /${row[0].source}/ has no hand-written scanner — structural grammars are declared as regexes but never executed as one (S-102 / S-265)`);
     };
     const members = [];
     for (const row of STRUCTURAL_SECRET_PATTERNS)
         members.push(structuralScannerMember(row, members.length));
-    members.push(forensicMember(PPK_CONTAINER_TOKEN, members.length, (scan, text, _json, eat, span, isHead) => collectPpkContainerSpans(scan, text, eat, span, isHead), PPK_FILE_HEAD.length, "putty-ppk"));
-    members.push(forensicMember(PEM_FRAGMENT_TOKEN, members.length, (scan, text, json, _eat, span, isHead) => collectPemFragmentSpans(scan, text, json, span, isHead), PEM_FENCE_OPEN.length, "pem-armor"));
-    members.push(forensicMember(HEADLESS_PPK_TOKEN, members.length, (scan, text, _json, _eat, span, isHead) => collectHeadlessPpkSpans(scan, text, span, isHead), PPK_LINES_FIELD.length, "putty-ppk"));
-    members.push(forensicMember(ANCHORED_VALUE_TOKEN, members.length, (scan, text, json, _eat, span, isHead) => collectAnchoredValueSpans(scan, text, json, span, isHead), Math.max(BEARER_VALUE_MIN, ABSENT_OR_BOOLEAN_MAX + 1, STRONG_AUTH_SCHEME_MAX + 1), "anchor", ARM_RANK.keyword, true));
+    members.push(forensicMember(PPK_CONTAINER_TOKEN, members.length, (scan, text, _json, eat, span, isHead) => collectPpkContainerSpans(scan, text, eat, span, isHead), PPK_FILE_HEAD.length, "putty-ppk", { kind: "anchored", anchors: [PPK_FILE_HEAD] }));
+    members.push(forensicMember(PEM_FRAGMENT_TOKEN, members.length, (scan, text, json, _eat, span, isHead) => collectPemFragmentSpans(scan, text, json, span, isHead), PEM_FENCE_OPEN.length, "pem-armor", { kind: "anchored", anchors: [PEM_FENCE_OPEN, PEM_END_OPEN] }));
+    members.push(forensicMember(HEADLESS_PPK_TOKEN, members.length, (scan, text, _json, _eat, span, isHead) => collectHeadlessPpkSpans(scan, text, span, isHead), PPK_LINES_FIELD.length, "putty-ppk", { kind: "anchored", anchors: [PPK_LINES_FIELD] }));
+    members.push(forensicMember(ANCHORED_VALUE_TOKEN, members.length, (scan, text, json, _eat, span, isHead) => collectAnchoredValueSpans(scan, text, json, span, isHead), Math.max(BEARER_VALUE_MIN, BARE_WORD_MAX + 1, STRONG_AUTH_SCHEME_MAX + 1), "anchor", { kind: "bounded", gap: (c) => isInlineSpaceUnit(c) || isSchemeDelimiterCode(c) }, ARM_RANK.keyword, true));
     for (const row of KEYWORD_SECRET_PATTERNS)
         members.push(regexMember(row, ARM_RANK.keyword, members.length));
     for (const row of SHAPE_SECRET_PATTERNS)
         members.push(regexMember(row, ARM_RANK.shape, members.length));
     for (const row of FRAGMENT_SECRET_PATTERNS)
         members.push(regexMember(row, ARM_RANK.fragment, members.length));
+    members.push(scannerMember(ANCHORED_VALUE_TOKEN, members.length, (text, json, _eat, span, isHead, deletedAt) => collectDiagnosticValueSpans(text, json, span, isHead, deletedAt), Math.max(CREDENTIAL_NAME_MAX, STRONG_AUTH_SCHEME_MAX) + 2, "prose", { kind: "bounded", gap: isRegexSpace }, ARM_RANK.keyword, true, true));
     for (const [re] of KEYWORD_SECRET_PATTERNS) {
         if (!LEXICAL_KEYWORD_ARMS.has(re))
             throw new Error(`redact: keyword arm /${re.source}/ is not registered as lexical — build it with keywordArm() so the bounded-unit scope can exclude it`);
@@ -3810,8 +4107,9 @@ const armPool = (() => {
     const laneOf = (scope) => {
         const inScope = (m) => {
             switch (scope) {
-                case "free-text": return true;
-                case "bounded-unit": return !m.lexical;
+                case "free-text": return !m.diagnosticOnly;
+                case "bounded-unit": return !m.lexical && !m.diagnosticOnly;
+                case "diagnostic": return true;
             }
         };
         return {
@@ -3823,13 +4121,14 @@ const armPool = (() => {
     const LANES = {
         "free-text": laneOf("free-text"),
         "bounded-unit": laneOf("bounded-unit"),
+        diagnostic: laneOf("diagnostic"),
     };
     const headScreen = new RegExp(`(?:${retryMembers.map((m) => m.headSrc).join("|")})`, "y");
     const headFirstUnit = unionMembers(retryMembers.map((m) => m.headFirst)) ?? new Uint32Array(0x10000 >>> 5).fill(0xffffffff);
     poolArmCount = members.length;
     poolBoundaryArmCount = retryMembers.length;
     const reaches = members.map((m) => ({ token: m.token, order: m.order, reach: m.reach }));
-    const run = (text, wantCount, json, eat, scope, reach, engineMarked) => {
+    const run = (text, wantCount, json, eat, scope, reach, engineMarked, deletedAt) => {
         readings += 1;
         const isHead = reach !== undefined;
         const lane = LANES[scope];
@@ -3884,7 +4183,7 @@ const armPool = (() => {
             }
         };
         for (const m of lane.phase1)
-            m.collect(text, json, eat, spans, isHead);
+            m.collect(text, json, eat, spans, isHead, deletedAt);
         closeCoveragePositions(0);
         if (lane.phase2.length > 0) {
             const scan = buildForensicScan(tokenUnits(text), buildEvidenceRows(text), lane.phase2.length);
@@ -3963,14 +4262,14 @@ const armPool = (() => {
         }
         return { hits: [...byArmedToken.values()].map(({ token, arm, count }) => ({ label: labelOfToken(token), count, arm })), kept: stamped };
     };
-    return Object.assign(run, { reaches, pendingTailUnits: Math.max(...reaches.map((r) => r.reach)) });
+    return Object.assign(run, { reaches, pendingTailUnits: Math.max(...reaches.map((r) => r.reach)), priors: members.map((m) => m.prior) });
 })();
 let onRedaction;
 export function setRedactionObserver(fn) {
     onRedaction = fn;
 }
-function applyRules(text, wantCount, json, eat, scope, reach, engineMarked) {
-    return armPool(text, wantCount, json, eat, scope, reach, engineMarked);
+function applyRules(text, wantCount, json, eat, scope, reach, engineMarked, deletedAt) {
+    return armPool(text, wantCount, json, eat, scope, reach, engineMarked, deletedAt);
 }
 function reportHits(hits) {
     if (onRedaction === undefined)
@@ -3996,70 +4295,6 @@ function invisibleClassesOf(layout) {
         }
     }
 }
-function trailingPartialEscapeStart(s) {
-    const n = s.length;
-    const runStart = (end) => {
-        let k = end;
-        while (k > 0 && s.charCodeAt(k - 1) === CH_BACKSLASH)
-            k -= 1;
-        return k;
-    };
-    const highSurrogateEscapeStartBefore = (end) => {
-        let j = end;
-        let value = -1;
-        let bodyStart = -1;
-        if (j >= 1 && s.charCodeAt(j - 1) === CH_RBRACE) {
-            let k = j - 1;
-            while (k > 0 && hexDigitValue(s.charCodeAt(k - 1)) >= 0)
-                k -= 1;
-            if (k >= 2 && s.charCodeAt(k - 1) === CH_LBRACE && s.charCodeAt(k - 2) === CH_u && j - 1 - k >= 1) {
-                value = readHexRunValue(s, k, j - 1);
-                bodyStart = k - 2;
-            }
-        }
-        else if (j >= 5 && s.charCodeAt(j - 5) === CH_u) {
-            value = readHexRun(s, j - 4, 4);
-            bodyStart = j - 5;
-        }
-        if (value < 0xd800 || value > 0xdbff)
-            return -1;
-        const k = runStart(bodyStart);
-        return k < bodyStart ? k : -1;
-    };
-    let j = n;
-    while (j > 0 && hexDigitValue(s.charCodeAt(j - 1)) >= 0)
-        j -= 1;
-    const hexRun = n - j;
-    let element = -1;
-    if (j >= 2 && s.charCodeAt(j - 1) === CH_LBRACE && s.charCodeAt(j - 2) === CH_u)
-        element = j - 2;
-    else if (j >= 1 && s.charCodeAt(j - 1) === CH_u && hexRun <= 3)
-        element = j - 1;
-    else if (j >= 1 && s.charCodeAt(j - 1) === CH_x && hexRun <= 1)
-        element = j - 1;
-    else if (hexRun === 0 && n >= 1 && s.charCodeAt(n - 1) === CH_BACKSLASH)
-        element = n;
-    if (element >= 0) {
-        const k = runStart(element);
-        if (k >= element)
-            return -1;
-        const high = highSurrogateEscapeStartBefore(k);
-        return high >= 0 ? high : k;
-    }
-    return highSurrogateEscapeStartBefore(n);
-}
-function readHexRunValue(s, from, to) {
-    let v = 0;
-    for (let k = from; k < to; k++) {
-        const d = hexDigitValue(s.charCodeAt(k));
-        if (d < 0)
-            return -1;
-        v = v * 16 + d;
-        if (v > 0x10ffff)
-            return -1;
-    }
-    return v;
-}
 function shortestReading(text, layout) {
     const r = readShortest(text, layout);
     return { visible: r.visible, partial: r.partial };
@@ -4068,8 +4303,8 @@ function readShortest(text, layout) {
     const raw = collectRawControlCuts(text, invisibleClassesOf(layout));
     const rfold = deleteInvisibleCharacters(text, raw, raw.present);
     const normalized = normalizeForRedaction(rfold.text);
-    const open = trailingPartialEscapeStart(normalized);
     const spelled = collectSpelledCuts(normalized);
+    const open = spelled.open;
     const sfold = deleteInvisibleCharacters(normalized, spelled, spelled.present);
     const layers = [{ fold: sfold }, { input: rfold.text, view: normalized }, { fold: rfold }];
     return open < 0 ? { visible: sfold.text.length, partial: false, layers } : { visible: sfold.text.length - (normalized.length - open), partial: true, layers };
@@ -4095,6 +4330,7 @@ export function readingHeadEnd(text, layout, units, from = 0) {
     return text.length;
 }
 function runRedaction(text, observe, json, wantHits, scope, layout, extent, observeFrom = 0) {
+    scannedUnits += text.length;
     const wantCount = wantHits || (onRedaction !== undefined && observe);
     const eat = observe ? { from: -1, len: 0, capFrom: -1, capLen: 0 } : undefined;
     let spans = [];
@@ -4105,7 +4341,19 @@ function runRedaction(text, observe, json, wantHits, scope, layout, extent, obse
         const toOriginal = createViewToOriginal(layers);
         const reach = extent.kind === "head" ? (viewStart) => toOriginal.start(viewStart) < extent.emitEnd : undefined;
         const engineMarked = (viewStart, viewEnd, repl) => isEngineMarkedCandidate(text, toOriginal.start(viewStart), toOriginal.start(viewEnd - 1) + 1, repl);
-        const r = applyRules(view, wantCount, json, eat, scope, reach, engineMarked);
+        const deletedAt = (viewIndex) => {
+            if (viewIndex <= 0 || viewIndex > view.length)
+                return "none";
+            const lo = toOriginal.start(viewIndex - 1) + 1;
+            const hi = viewIndex === view.length ? text.length : toOriginal.start(viewIndex);
+            if (hi <= lo)
+                return "none";
+            for (let k = lo; k < hi; k++)
+                if (isRegexSpace(text.charCodeAt(k)))
+                    return "blank";
+            return "invisible";
+        };
+        const r = applyRules(view, wantCount, json, eat, scope, reach, engineMarked, deletedAt);
         forgetEscapedSeparatorTails();
         readsSoFar += 1;
         if (readsSoFar === 1) {
@@ -4187,7 +4435,7 @@ export function redactSecretsWithArms(text, opts) {
     return { text: r.text, arms: new Set(r.hits.map((h) => h.arm)) };
 }
 export function redactionSpansForTest(text, opts) {
-    const r = runRedaction(text, false, opts?.json === true, false, "free-text", "multi-line", WHOLE_EXTENT);
+    const r = runRedaction(text, false, opts?.json === true, false, opts?.scope ?? "free-text", "multi-line", WHOLE_EXTENT);
     return { text: r.text, spans: r.spans.map((sp) => ({ start: sp.start, end: sp.end })) };
 }
 export function proposeRedactionSpans(text, scope, layout, extent) {
@@ -4225,67 +4473,219 @@ function renderRange(text, spans, from, until) {
 }
 const STREAM_RESCAN_MIN = 64;
 const streamRescanStep = (n) => Math.max(STREAM_RESCAN_MIN, n >>> 5);
+const STREAM_WINDOW_HORIZON = 2;
+const STREAM_WINDOW_MIN = 2048;
+function deriveStreamWindowAlphabets(priors) {
+    const blank = new Uint8Array(0x10000);
+    const gaps = new Set();
+    const containerDelimiters = [];
+    for (const prior of priors) {
+        switch (prior.kind) {
+            case "bounded":
+                if (prior.gap !== NO_GAP)
+                    gaps.add(prior.gap);
+                break;
+            case "anchored":
+                if (prior.anchors.length === 0)
+                    throw new Error("redact: an anchored arm declares no anchor literal — the stream window cannot tell where its reading of prior text starts");
+                for (const anchor of prior.anchors) {
+                    if (anchor.length === 0)
+                        throw new Error("redact: an anchored arm declares an empty anchor literal");
+                    for (let i = 0; i < anchor.length; i++) {
+                        const c = anchor.charCodeAt(i);
+                        if (INVISIBLE_UNIT_CLASS[c] !== 0 || FORMAT_CODEPOINT_TABLE[c] === 1 || (c & 0xf800) === 0xd800 || c === CH_BACKSLASH) {
+                            throw new Error(`redact: anchor literal ${JSON.stringify(anchor)} holds a unit some reading deletes or reads as an escape (index ${i}) — its presence is not monotone under deletion, so the stream window's delimiter check on the most-deleted reading would be incomplete`);
+                        }
+                    }
+                    if (isEscapeBodyUnit(anchor.charCodeAt(0))) {
+                        throw new Error(`redact: anchor literal ${JSON.stringify(anchor)} starts with a unit an escape spelling's body can read — an escape begun just before it deletes that unit in the most-deleted reading, so its presence is not monotone under deletion and the stream window's delimiter check would be incomplete`);
+                    }
+                    if (!containerDelimiters.includes(anchor))
+                        containerDelimiters.push(anchor);
+                }
+                break;
+            default: {
+                const unhandled = prior;
+                throw new Error(`redact: unhandled prior reading ${JSON.stringify(unhandled)}`);
+            }
+        }
+    }
+    for (const gap of gaps)
+        for (let u = 0; u < 0x10000; u++)
+            if (gap(u))
+                blank[u] = 1;
+    return { blank, containerDelimiters };
+}
+const STREAM_WINDOW_ALPHABETS = deriveStreamWindowAlphabets(armPool.priors);
+export function streamWindowAlphabetsForTest(extra = []) {
+    const a = extra.length === 0 ? STREAM_WINDOW_ALPHABETS : deriveStreamWindowAlphabets([...armPool.priors, ...extra]);
+    return { isBlank: (unit) => a.blank[unit] === 1, containerDelimiters: a.containerDelimiters };
+}
+export function escapeGrammarForTest() {
+    return {
+        read: (s) => {
+            let body = 0;
+            while (body < s.length && s.charCodeAt(body) === CH_BACKSLASH)
+                body += 1;
+            const out = { end: -1 };
+            const value = readSpelledCodePoint(s, body, out);
+            return { value, end: value >= 0 ? out.end : -1 };
+        },
+        isBodyUnit: isEscapeBodyUnit,
+    };
+}
+function windowAdvancePoint(text, units, alphabets = STREAM_WINDOW_ALPHABETS) {
+    const r = readShortest(text, "multi-line");
+    if (r.partial)
+        return -1;
+    const view = r.layers[0].fold.text;
+    let k = r.visible;
+    let n = 0;
+    while (k > 0 && n < units) {
+        k -= 1;
+        if (alphabets.blank[view.charCodeAt(k)] !== 1)
+            n += 1;
+    }
+    if (n < units)
+        return 0;
+    for (const d of alphabets.containerDelimiters) {
+        const at = view.indexOf(d);
+        if (at >= 0 && at < k)
+            k = at;
+    }
+    const at = createViewToOriginal(r.layers).start(k);
+    return at <= 0 ? 0 : text.lastIndexOf("\n", at - 1) + 1;
+}
+function windowIndependentAt(text, q) {
+    const full = runRedaction(text, false, false, false, "free-text", "multi-line", { kind: "head", emitEnd: text.length }).spans;
+    if (full.some((s) => s.start < q && s.end > q))
+        return false;
+    const after = full.filter((s) => s.start >= q);
+    const tail = text.slice(q);
+    const alone = runRedaction(tail, false, false, false, "free-text", "multi-line", { kind: "head", emitEnd: tail.length }).spans;
+    if (after.length !== alone.length)
+        return false;
+    return after.every((a, i) => a.start - q === alone[i].start && a.end - q === alone[i].end && a.repl === alone[i].repl);
+}
+export function windowAdvancePointForTest(text, units, extra = []) {
+    return windowAdvancePoint(text, units, extra.length === 0 ? STREAM_WINDOW_ALPHABETS : deriveStreamWindowAlphabets([...armPool.priors, ...extra]));
+}
+export function windowIndependentAtForTest(text, q) {
+    return windowIndependentAt(text, q);
+}
 export function createRedactionStream() {
     return openRedactionStream(PENDING_TAIL_UNITS);
 }
+export function createRedactionStreamWithoutWindowForTest() {
+    return openRedactionStream(PENDING_TAIL_UNITS, false);
+}
+export function createRedactionStreamWithCertifierForTest(certify) {
+    return openRedactionStream(PENDING_TAIL_UNITS, true, certify);
+}
 export function createRedactionStreamWithTailForTest(units) {
     return openRedactionStream(units);
 }
-function openRedactionStream(pendingTail) {
-    let buf = "";
+function openRedactionStream(pendingTail, windowed = true, certify = windowIndependentAt) {
+    let past = [];
+    let total = 0;
+    let win = "";
+    let base = 0;
+    let blockFrom = 0;
     let released = 0;
     let deliveredFrom = 0;
     let sent = "";
     let scannedAt = 0;
+    let evaluatedAt = -1;
+    let retryAt = 0;
+    const whole = () => (past.length === 0 ? win : past.join("") + win);
+    const advanceWindow = () => {
+        if (!windowed || win.length < Math.max(STREAM_WINDOW_MIN, retryAt) || released < total || total === evaluatedAt)
+            return;
+        evaluatedAt = total;
+        retryAt = win.length + (win.length >> 1);
+        windowEvaluations += 1;
+        const q = windowAdvancePoint(win, STREAM_WINDOW_HORIZON * pendingTail);
+        if (q < 0) {
+            retryAt = 0;
+            return;
+        }
+        if (q === 0 || q * 2 < win.length)
+            return;
+        if (!certify(win, q)) {
+            windowRefusals += 1;
+            return;
+        }
+        past.push(win.slice(0, q));
+        win = win.slice(q);
+        base += q;
+        retryAt = 0;
+        windowAdvances += 1;
+    };
     return {
         feed(chunk) {
-            buf += chunk;
+            win += chunk;
+            total += chunk.length;
         },
         takeSettled() {
-            if (buf.length - released <= pendingTail)
+            if (total - released <= pendingTail)
                 return "";
-            if (buf.length - scannedAt < streamRescanStep(buf.length))
+            if (total - scannedAt < streamRescanStep(total))
                 return "";
-            scannedAt = buf.length;
-            const emitEnd = pendingTailStart(buf, pendingTail);
-            if (emitEnd <= released)
+            scannedAt = total;
+            const emitEnd = pendingTailStart(win, pendingTail);
+            const from = released - base;
+            if (emitEnd <= from)
                 return "";
-            const spans = runRedaction(buf, false, false, false, "free-text", "multi-line", { kind: "head", emitEnd }).spans;
+            const spans = runRedaction(win, false, false, false, "free-text", "multi-line", { kind: "head", emitEnd }).spans;
             let cut = emitEnd;
             for (const s of spans)
                 if (s.start < cut && s.end > cut)
                     cut = s.start;
-            if (cut > 0 && cut < buf.length && (buf.charCodeAt(cut - 1) & 0xfc00) === 0xd800 && (buf.charCodeAt(cut) & 0xfc00) === 0xdc00)
+            if (cut > 0 && cut < win.length && (win.charCodeAt(cut - 1) & 0xfc00) === 0xd800 && (win.charCodeAt(cut) & 0xfc00) === 0xdc00)
                 cut -= 1;
-            if (cut <= released)
+            if (cut <= from)
                 return "";
-            const out = renderRange(buf, spans, released, cut);
-            released = cut;
+            const out = renderRange(win, spans, from, cut);
+            released = base + cut;
             sent += out;
             return out;
         },
         takeAll() {
-            if (released === buf.length)
+            if (released === total)
                 return "";
-            const spans = runRedaction(buf, false, false, false, "free-text", "multi-line", WHOLE_EXTENT).spans;
-            const out = renderRange(buf, spans, released, buf.length);
-            released = scannedAt = buf.length;
+            const spans = runRedaction(win, false, false, false, "free-text", "multi-line", WHOLE_EXTENT).spans;
+            const out = renderRange(win, spans, released - base, win.length);
+            released = scannedAt = total;
             sent += out;
             return out;
         },
         flush() {
-            if (deliveredFrom === buf.length)
+            if (deliveredFrom === total)
                 return { rest: "", diverged: false };
+            const buf = whole();
             const spans = runRedaction(buf, false, false, false, "free-text", "multi-line", WHOLE_EXTENT).spans;
             const split = released > deliveredFrom && spans.some((s) => s.start < released && s.end > released);
             return { rest: renderRange(buf, spans, released, buf.length), diverged: split || renderRange(buf, spans, deliveredFrom, released) !== sent };
         },
         skip() {
-            released = deliveredFrom = scannedAt = buf.length;
+            released = deliveredFrom = scannedAt = total;
             sent = "";
         },
+        endBlock() {
+            blockFrom = total;
+            advanceWindow();
+        },
+        blockContext() {
+            return win.slice(0, blockFrom - base);
+        },
+        blockBytes() {
+            return win.slice(blockFrom - base);
+        },
         get fed() {
-            return buf;
+            return whole();
+        },
+        get length() {
+            return total;
         },
     };
 }