@sema-agent/server 7.134.0 → 7.135.0

package/dist/trace/redact.js

@@ -1,5 +1,5 @@
 import { displayUrlOf, stripFormatCharacters } from "@sema-agent/core";
-import { isHierarchicalUrl } from "@sema-agent/settings-schema";
+import { CONTROL_AND_BIDI_CHARS, isHierarchicalUrl } from "@sema-agent/settings-schema";
 import { recordFailOpen } from "../observability/fail-open.js";
 const normalizeForRedaction = stripFormatCharacters;
 export function mapNormalizedToOriginal(text, normalized) {
@@ -28,43 +28,91 @@ export function mapNormalizedToOriginal(text, normalized) {
     map[normalized.length] = text.length;
     return map;
 }
-function deleteSpelledFormatCharacters(s) {
+const SPELLED_FORMAT = 1, SPELLED_CONTROL = 2, RAW_CONTROL = 4, RAW_WHITESPACE = 8;
+const INVISIBLE_UNIT_CLASS = (() => {
+    const inSet = new RegExp(`[${CONTROL_AND_BIDI_CHARS}]`);
+    const table = new Uint8Array(0x10000);
+    for (let unit = 0; unit < table.length; unit++) {
+        const ch = String.fromCharCode(unit);
+        if (inSet.test(ch))
+            table[unit] = /\s/.test(ch) ? 2 : 1;
+    }
+    return table;
+})();
+const RAW_STRIP_SET_RE = (() => {
+    let body = "";
+    for (let unit = 0; unit < 0x10000; unit++) {
+        if (INVISIBLE_UNIT_CLASS[unit] === 0)
+            continue;
+        let last = unit;
+        while (last + 1 < 0x10000 && INVISIBLE_UNIT_CLASS[last + 1] !== 0)
+            last += 1;
+        const hex = (u) => `\\u${u.toString(16).padStart(4, "0")}`;
+        body += last === unit ? hex(unit) : `${hex(unit)}-${hex(last)}`;
+        unit = last;
+    }
+    return new RegExp(`[${body}]`, "g");
+})();
+function collectRawControlCuts(s, allowed) {
+    const cuts = [];
+    let present = 0;
+    if ((allowed & (RAW_CONTROL | RAW_WHITESPACE)) === 0)
+        return { cuts, present };
+    RAW_STRIP_SET_RE.lastIndex = 0;
+    for (let m = RAW_STRIP_SET_RE.exec(s); m !== null; m = RAW_STRIP_SET_RE.exec(s)) {
+        const cls = INVISIBLE_UNIT_CLASS[s.charCodeAt(m.index)] === 2 ? RAW_WHITESPACE : RAW_CONTROL;
+        if ((cls & allowed) === 0)
+            continue;
+        cuts.push(m.index, m.index + 1, cls);
+        present |= cls;
+    }
+    return { cuts, present };
+}
+function collectSpelledCuts(s) {
+    const cuts = [];
+    let present = 0;
     let i = s.indexOf("\\");
     if (i < 0)
-        return { text: s, at: undefined, cum: undefined };
+        return { cuts, present };
     const n = s.length;
     const read = { end: 0 };
-    let cuts;
     while (i >= 0) {
         let body = i + 1;
         while (body < n && s.charCodeAt(body) === CH_BACKSLASH)
             body += 1;
         const cp = readSpelledCodePoint(s, body, read);
-        if (cp >= 0 && isFormatCodePoint(cp)) {
-            (cuts ??= []).push(i, read.end);
+        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);
+            present |= cls;
             body = read.end;
         }
         i = s.indexOf("\\", body);
     }
-    if (cuts === undefined)
-        return { text: s, at: undefined, cum: undefined };
-    const count = cuts.length / 2;
-    const at = new Int32Array(count);
-    const cum = new Int32Array(count);
+    return { cuts, present };
+}
+function deleteInvisibleCharacters(s, all, mask) {
+    const atList = [];
+    const cumList = [];
     const parts = [];
     let from = 0;
     let removed = 0;
-    for (let k = 0; k < count; k++) {
-        const a = cuts[2 * k];
-        const b = cuts[2 * k + 1];
+    const { cuts } = all;
+    for (let k = 0; k < cuts.length; k += 3) {
+        if ((cuts[k + 2] & mask) === 0)
+            continue;
+        const a = cuts[k];
+        const b = cuts[k + 1];
         parts.push(s.slice(from, a));
-        at[k] = a - removed;
+        atList.push(a - removed);
         removed += b - a;
-        cum[k] = removed;
+        cumList.push(removed);
         from = b;
     }
+    if (atList.length === 0)
+        return { text: s, at: undefined, cum: undefined };
     parts.push(s.slice(from));
-    return { text: parts.join(""), at, cum };
+    return { text: parts.join(""), at: Int32Array.from(atList), cum: Int32Array.from(cumList) };
 }
 function viewIndexInInput(fold, v) {
     const at = fold.at;
@@ -413,8 +461,9 @@ let urlSegmentRuns = 0;
 let urlSegmentReplays = 0;
 let ssh2ScanBytes = 0;
 let mappedUnits = 0;
+let readings = 0;
 export function armPoolBudgetForTest() {
-    return { spanCount: poolSpanCount, coveredPositions, headScreenHits, fullYCalls, armCount: poolArmCount, boundaryArmCount: poolBoundaryArmCount, forensicLevels, forensicRuns, forensicSkips, urlSegmentRuns, urlSegmentReplays, ssh2ScanBytes, mappedUnits };
+    return { spanCount: poolSpanCount, coveredPositions, headScreenHits, fullYCalls, armCount: poolArmCount, boundaryArmCount: poolBoundaryArmCount, forensicLevels, forensicRuns, forensicSkips, urlSegmentRuns, urlSegmentReplays, ssh2ScanBytes, mappedUnits, readings };
 }
 export function resetArmPoolBudgetForTest() {
     poolSpanCount = 0;
@@ -428,6 +477,7 @@ export function resetArmPoolBudgetForTest() {
     urlSegmentReplays = 0;
     ssh2ScanBytes = 0;
     mappedUnits = 0;
+    readings = 0;
 }
 const unitBit = (t, c) => (t[c >>> 5] >>> (c & 31)) & 1;
 let codeUnitDomain;
@@ -794,6 +844,12 @@ const CREDENTIAL_NAME_ALT = (() => {
     }
     return [...CREDENTIAL_NAME_WORDS].sort((a, b) => b.length - a.length || (a < b ? -1 : 1)).join("|");
 })();
+const CREDENTIAL_NAME_MAX = Math.max(...CREDENTIAL_NAME_WORDS.map((w) => w.length));
+const asciiLower = (s) => s.replace(/[A-Z]/g, (c) => c.toLowerCase());
+function credentialNameAnchor(name) {
+    return CREDENTIAL_ANCHOR_OF.get(asciiLower(name));
+}
+const CREDENTIAL_ANCHOR_OF = new Map(Object.entries(CREDENTIAL_NAME_ANCHORS));
 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»"],
@@ -1386,9 +1442,11 @@ const isRegexSpace = (c) => c === 32 || (c >= 9 && c <= 13) || c === 0xa0 || c =
 const isLineTerminator = (c) => c === 10 || c === 13 || c === 0x2028 || c === 0x2029;
 const isControlCode = (c) => c < 0x20 || c === 0x7f;
 const TOKEN_UNIT_Y = new RegExp(REDACTION_TOKEN_RE_SRC, "y");
-const CREDENTIAL_PARAM_Y = new RegExp(`(?:${CREDENTIAL_NAME_ALT})=`, "iy");
-const CREDENTIAL_NAME_SET = new Set(CREDENTIAL_NAME_WORDS);
-const CREDENTIAL_NAME_SCAN_MAX = Math.max(...CREDENTIAL_NAME_WORDS.map((w) => w.length)) * 3 + 1;
+export const CREDENTIAL_PARAM_NAMES = Object.freeze([...CREDENTIAL_NAME_WORDS]);
+export function isCredentialParamName(decodedName) {
+    return credentialNameAnchor(decodedName) !== undefined;
+}
+const CREDENTIAL_NAME_SCAN_MAX = CREDENTIAL_NAME_MAX * 3 + 1;
 function decodeAsciiName(name) {
     let out = "";
     for (let i = 0; i < name.length; i++) {
@@ -1409,9 +1467,6 @@ function decodeAsciiName(name) {
     return out;
 }
 function credentialParamValueStart(text, p) {
-    CREDENTIAL_PARAM_Y.lastIndex = p;
-    if (CREDENTIAL_PARAM_Y.test(text))
-        return CREDENTIAL_PARAM_Y.lastIndex;
     const limit = Math.min(text.length, p + CREDENTIAL_NAME_SCAN_MAX);
     let hasPct = false;
     for (let i = p; i < limit; i++) {
@@ -1420,12 +1475,14 @@ function credentialParamValueStart(text, p) {
             hasPct = true;
             continue;
         }
-        if (c !== CH_EQ)
-            continue;
-        if (!hasPct)
+        if (c === CH_EQ) {
+            if (i === p)
+                return -1;
+            const name = hasPct ? decodeAsciiName(text.slice(p, i)) : text.slice(p, i);
+            return name !== undefined && credentialNameAnchor(name) !== undefined ? i + 1 : -1;
+        }
+        if (!(isAsciiAlnumCode(c) || c === CH_UNDERSCORE || c === CH_MINUS))
             return -1;
-        const decoded = decodeAsciiName(text.slice(p, i));
-        return decoded !== undefined && CREDENTIAL_NAME_SET.has(decoded.toLowerCase()) ? i + 1 : -1;
     }
     return -1;
 }
@@ -1834,24 +1891,19 @@ function collectUrlCredentialSpans(scan, text, json, span) {
     scan.footHi = armHi;
 }
 const JSON_FIELD_ANCHOR = '"';
-const CREDENTIAL_NAME_MAX = Math.max(...CREDENTIAL_NAME_WORDS.map((w) => w.length));
 function jsonSecretFieldValueQuoteAt(text, p) {
     const n = text.length;
-    let name = "";
     let i = p + 1;
     for (; i < n; i++) {
-        let c = text.charCodeAt(i);
+        const c = text.charCodeAt(i);
         if (c === CH_QUOTE)
             break;
         if (i - p > CREDENTIAL_NAME_MAX)
             return -1;
-        if (c >= CH_A && c <= CH_Z)
-            c += 32;
-        if (!((c >= CH_a && c <= CH_z) || (c >= CH_0 && c <= CH_9) || c === CH_UNDERSCORE || c === CH_MINUS))
+        if (!(isAsciiAlnumCode(c) || c === CH_UNDERSCORE || c === CH_MINUS))
             return -1;
-        name += String.fromCharCode(c);
     }
-    if (i >= n || !CREDENTIAL_NAME_SET.has(name))
+    if (i >= n || i === p + 1 || credentialNameAnchor(text.slice(p + 1, i)) === undefined)
         return -1;
     i += 1;
     while (i < n && isRegexSpace(text.charCodeAt(i)))
@@ -1896,7 +1948,6 @@ const STRONG_AUTH_SCHEMES = new Set(["basic", "bearer"]);
 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 CREDENTIAL_ANCHOR_OF = new Map(Object.entries(CREDENTIAL_NAME_ANCHORS));
 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;
@@ -2021,7 +2072,7 @@ function anchorHeadAt(text, op, json) {
             return undefined;
         before = j - openLen;
     }
-    const strength = CREDENTIAL_ANCHOR_OF.get(text.slice(nameStart, nameEnd).toLowerCase());
+    const strength = credentialNameAnchor(text.slice(nameStart, nameEnd));
     if (strength === undefined)
         return undefined;
     if (!afterEscape && runStart === j + 1 && quote === 0 && j >= 0 && text.charCodeAt(j) === CH_SLASH)
@@ -2256,7 +2307,7 @@ export function structuralScannerForTest(arm) {
 let ppkScanBytes = 0;
 export function ppkScanBytesForTest() { return ppkScanBytes; }
 export function resetPpkScanBytesForTest() { ppkScanBytes = 0; }
-function collectPpkContainerSpans(scan, text, record, span) {
+function collectPpkContainerSpans(scan, text, eat, span) {
     const HEAD = "PuTTY-User-Key-File-";
     const MAC = "Private-MAC: ";
     const HASH = "Private-Hash: ";
@@ -2342,8 +2393,10 @@ function collectPpkContainerSpans(scan, text, record, span) {
             end = ateToEnd ? text.length : hexEnd;
             break;
         }
-        if (ateToEnd && record)
-            recordFailOpen("server.redact.ppk-eat-to-end", `from=${at} len=${text.length}`);
+        if (ateToEnd && eat !== undefined && eat.from < 0) {
+            eat.from = at;
+            eat.len = text.length;
+        }
         span(at, end);
         at = end >= text.length ? Number.POSITIVE_INFINITY : nextVersionedHead(end);
     }
@@ -2376,8 +2429,8 @@ const armPool = (() => {
             phase: 1,
             lexical: LEXICAL_KEYWORD_ARMS.has(re),
             collect: boundary === undefined
-                ? (text, _json, _observe, out) => collectRegexSpans(arm, text, out)
-                : (text, _json, _observe, out) => collectValueArmSpans(boundary, text, out),
+                ? (text, _json, _eat, out) => collectRegexSpans(arm, text, out)
+                : (text, _json, _eat, out) => collectValueArmSpans(boundary, text, out),
             retry: boundary === undefined ? undefined : (text, at, out) => collectStickySpans(boundary, text, at, out),
             headSrc: boundary === undefined ? undefined : headSrc,
             headFirst: boundary === undefined ? undefined : headFirst,
@@ -2391,7 +2444,7 @@ const armPool = (() => {
             order,
             phase: 1,
             lexical,
-            collect: (text, json, observe, out) => arm(text, json, observe, (start, end) => out.push({ start, end, repl, rank, order })),
+            collect: (text, json, eat, out) => arm(text, json, eat, (start, end) => out.push({ start, end, repl, rank, order })),
             retry: undefined,
             headSrc: undefined,
             headFirst: undefined,
@@ -2406,7 +2459,7 @@ const armPool = (() => {
             order,
             phase: 2,
             lexical: false,
-            collect: (scan, text, json, observe, out) => arm(scan, text, json, observe, (start, end) => out.push({ start, end, repl, rank, order })),
+            collect: (scan, text, json, eat, out) => arm(scan, text, json, eat, (start, end) => out.push({ start, end, repl, rank, order })),
             retry: undefined,
             headSrc: undefined,
             headFirst: undefined,
@@ -2414,22 +2467,22 @@ const armPool = (() => {
     };
     const structuralScannerMember = (row, order) => {
         if (row === PEM_FENCE_PATTERN)
-            return scannerMember(row[1], order, (text, _json, _observe, span) => collectPemFenceSpans(text, span));
+            return scannerMember(row[1], order, (text, _json, _eat, span) => collectPemFenceSpans(text, span));
         if (row === SSH2_FENCE_PATTERN)
-            return forensicMember(row[1], order, (scan, text, _json, _observe, span) => collectSsh2FenceSpans(scan, text, span));
+            return forensicMember(row[1], order, (scan, text, _json, _eat, span) => collectSsh2FenceSpans(scan, text, span));
         if (row === URL_CREDENTIAL_PATTERN)
-            return forensicMember(row[1], order, (scan, text, json, _observe, span) => collectUrlCredentialSpans(scan, text, json, span));
+            return forensicMember(row[1], order, (scan, text, json, _eat, span) => collectUrlCredentialSpans(scan, text, json, span));
         if (row === JSON_SECRET_FIELD_PATTERN)
-            return scannerMember(row[1], order, (text, _json, _observe, span) => collectJsonSecretFieldSpans(text, span));
+            return scannerMember(row[1], order, (text, _json, _eat, span) => collectJsonSecretFieldSpans(text, span));
         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, observe, span) => collectPpkContainerSpans(scan, text, observe, span)));
-    members.push(forensicMember(PEM_FRAGMENT_TOKEN, members.length, (scan, text, json, _observe, span) => collectPemFragmentSpans(scan, text, json, span)));
-    members.push(forensicMember(HEADLESS_PPK_TOKEN, members.length, (scan, text, _json, _observe, span) => collectHeadlessPpkSpans(scan, text, span)));
-    members.push(scannerMember(ANCHORED_VALUE_TOKEN, members.length, (text, json, _observe, span) => collectAnchoredValueSpans(text, json, span), ARM_RANK.keyword, true));
+    members.push(forensicMember(PPK_CONTAINER_TOKEN, members.length, (scan, text, _json, eat, span) => collectPpkContainerSpans(scan, text, eat, span)));
+    members.push(forensicMember(PEM_FRAGMENT_TOKEN, members.length, (scan, text, json, _eat, span) => collectPemFragmentSpans(scan, text, json, span)));
+    members.push(forensicMember(HEADLESS_PPK_TOKEN, members.length, (scan, text, _json, _eat, span) => collectHeadlessPpkSpans(scan, text, span)));
+    members.push(scannerMember(ANCHORED_VALUE_TOKEN, members.length, (text, json, _eat, span) => collectAnchoredValueSpans(text, json, span), 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)
@@ -2460,7 +2513,8 @@ const armPool = (() => {
     const headFirstUnit = unionMembers(retryMembers.map((m) => m.headFirst)) ?? new Uint32Array(0x10000 >>> 5).fill(0xffffffff);
     poolArmCount = members.length;
     poolBoundaryArmCount = retryMembers.length;
-    return (text, wantCount, json, observe, scope) => {
+    return (text, wantCount, json, eat, scope) => {
+        readings += 1;
         const lane = LANES[scope];
         const spans = [];
         let tried;
@@ -2496,7 +2550,7 @@ const armPool = (() => {
             }
         };
         for (const m of lane.phase1)
-            m.collect(text, json, observe, spans);
+            m.collect(text, json, eat, spans);
         closeCoveragePositions(0);
         if (lane.phase2.length > 0) {
             const scan = buildForensicScan(credentialSpans(text), lane.phase2.length);
@@ -2513,7 +2567,7 @@ const armPool = (() => {
                     }
                     scan.footLo = FOOT_NONE;
                     scan.footHi = -1;
-                    lane.phase2[j].collect(scan, text, json, observe && level === 0, spans);
+                    lane.phase2[j].collect(scan, text, json, level === 0 ? eat : undefined, spans);
                     foot[2 * j] = scan.footLo;
                     foot[2 * j + 1] = scan.footHi;
                     forensicRuns += 1;
@@ -2559,8 +2613,8 @@ let onRedaction;
 export function setRedactionObserver(fn) {
     onRedaction = fn;
 }
-function applyRules(text, wantCount, json, observe, scope) {
-    return armPool(text, wantCount, json, observe, scope);
+function applyRules(text, wantCount, json, eat, scope) {
+    return armPool(text, wantCount, json, eat, scope);
 }
 function reportHits(hits) {
     if (onRedaction === undefined)
@@ -2573,24 +2627,59 @@ function reportHits(hits) {
         }
     }
 }
-function runRedaction(text, observe, json, wantHits, scope, muteCount = false) {
-    const wantCount = wantHits || (onRedaction !== undefined && observe && !muteCount);
-    const normalized = normalizeForRedaction(text);
-    const first = applyRules(normalized, wantCount, json, observe, scope);
-    forgetEscapedSeparatorTails();
-    let spans = spansInOriginal(text, normalized, undefined, first.kept);
-    let hits = first.hits;
-    const second = deleteSpelledFormatCharacters(normalized);
-    if (second.at !== undefined) {
-        const r2 = applyRules(second.text, wantCount, json, false, scope);
+function invisibleClassesOf(layout) {
+    switch (layout) {
+        case "multi-line":
+            return SPELLED_FORMAT | SPELLED_CONTROL | RAW_CONTROL;
+        case "single-line":
+            return SPELLED_FORMAT | SPELLED_CONTROL | RAW_CONTROL | RAW_WHITESPACE;
+        default: {
+            const unhandled = layout;
+            throw new Error(`redact: unhandled layout ${String(unhandled)}`);
+        }
+    }
+}
+function runRedaction(text, observe, json, wantHits, scope, layout) {
+    const wantCount = wantHits || (onRedaction !== undefined && observe);
+    const eat = observe ? { from: -1, len: 0 } : undefined;
+    let spans = [];
+    let hits = NO_HITS;
+    let readsSoFar = 0;
+    let unioned = false;
+    const read = (layers, view) => {
+        const r = applyRules(view, wantCount, json, eat, scope);
         forgetEscapedSeparatorTails();
-        const extra = spansInOriginal(text, normalized, second, r2.kept);
-        if (extra.length > 0) {
-            spans = resolveSpanOverlaps([...spans, ...extra]);
-            hits = wantCount ? hitsOfSpans(spans) : NO_HITS;
+        readsSoFar += 1;
+        if (readsSoFar === 1) {
+            spans = spansInOriginal(layers, r.kept);
+            hits = r.hits;
+            return;
         }
+        const extra = spansInOriginal(layers, r.kept);
+        if (extra.length === 0)
+            return;
+        spans = resolveSpanOverlaps([...spans, ...extra]);
+        unioned = true;
+    };
+    const raw = collectRawControlCuts(text, invisibleClassesOf(layout));
+    for (let rmask = 0;; rmask = (rmask - raw.present) & raw.present) {
+        const rfold = deleteInvisibleCharacters(text, raw, rmask);
+        const normalized = normalizeForRedaction(rfold.text);
+        const spelled = collectSpelledCuts(normalized);
+        for (let smask = 0;; smask = (smask - spelled.present) & spelled.present) {
+            const sfold = deleteInvisibleCharacters(normalized, spelled, smask);
+            read([{ fold: sfold }, { input: rfold.text, view: normalized }, { fold: rfold }], sfold.text);
+            if (smask === spelled.present)
+                break;
+        }
+        if (rmask === raw.present)
+            break;
     }
-    if (observe && !muteCount)
+    if (unioned && wantCount)
+        hits = hitsOfSpans(spans);
+    if (eat !== undefined && eat.from >= 0)
+        recordFailOpen("server.redact.ppk-eat-to-end", `from=${eat.from} len=${eat.len}`);
+    if (observe)
         reportHits(hits);
     return { text: applySpans(text, spans).out, hits, spans };
 }
@@ -2608,28 +2697,41 @@ function hitsOfSpans(spans) {
     }
     return [...by.values()].map(({ token, arm, count }) => ({ label: labelOfToken(token), count, arm }));
 }
-function spansInOriginal(text, normalized, fold, kept) {
-    if (kept.length === 0)
-        return kept;
-    const inNormalized = fold?.at === undefined ? kept : kept.map((s) => ({ ...s, start: viewIndexInInput(fold, s.start), end: viewIndexInInput(fold, s.end - 1) + 1 }));
-    if (normalized === text)
-        return inNormalized;
-    const map = mapNormalizedToOriginal(text, normalized);
-    return inNormalized.map((s) => ({ ...s, start: map[s.start], end: map[s.end - 1] + 1 }));
+function spansInOriginal(layers, kept) {
+    let out = kept;
+    for (const layer of layers) {
+        if (out.length === 0)
+            return out;
+        let at;
+        if ("fold" in layer) {
+            const fold = layer.fold;
+            if (fold.at === undefined)
+                continue;
+            at = (v) => viewIndexInInput(fold, v);
+        }
+        else {
+            if (layer.view === layer.input)
+                continue;
+            const map = mapNormalizedToOriginal(layer.input, layer.view);
+            at = (v) => map[v];
+        }
+        out = out.map((s) => ({ ...s, start: at(s.start), end: at(s.end - 1) + 1 }));
+    }
+    return out;
 }
 export function redactSecrets(text, opts) {
-    return runRedaction(text, opts?.observe ?? true, opts?.json === true, false, "free-text").text;
+    return runRedaction(text, opts?.observe ?? true, opts?.json === true, false, "free-text", "multi-line").text;
 }
 export function redactSecretsWithArms(text, opts) {
-    const r = runRedaction(text, opts?.observe ?? true, opts?.json === true, true, "free-text");
+    const r = runRedaction(text, opts?.observe ?? true, opts?.json === true, true, "free-text", "multi-line");
     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");
+    const r = runRedaction(text, false, opts?.json === true, false, "free-text", "multi-line");
     return { text: r.text, spans: r.spans.map((sp) => ({ start: sp.start, end: sp.end })) };
 }
-export function proposeRedactionSpans(text, scope, opts) {
-    return runRedaction(text, true, false, false, scope, opts?.countHits === false).spans.map((sp) => ({ start: sp.start, end: sp.end, repl: sp.repl }));
+export function proposeRedactionSpans(text, scope, layout) {
+    return runRedaction(text, true, false, false, scope, layout).spans.map((sp) => ({ start: sp.start, end: sp.end, repl: sp.repl }));
 }
 const REDACT_MAX_DEPTH = 64;
 export function redactDeep(value) {
@@ -2731,7 +2833,7 @@ function unitCarriesCredential(unit) {
         for (const v of armValueClassViews())
             views.add(boundedUnitView(spelling, v.inClass, v.filler));
     views.delete("");
-    const hit = [...views].some((view) => runRedaction(view, true, false, false, "bounded-unit").text !== view);
+    const hit = [...views].some((view) => runRedaction(view, true, false, false, "bounded-unit", "multi-line").text !== view);
     return { hit, unreadable: decoded.residue };
 }
 function displaySafePathname(pathname) {
@@ -2761,7 +2863,7 @@ function shapeLawCredentialInQueryOrFragment(canonical) {
     const boundary = canonical.indexOf("?");
     if (boundary < 0)
         return false;
-    if (runRedaction(canonical, false, false, false, "free-text").spans.some((sp) => sp.end > boundary))
+    if (runRedaction(canonical, false, false, false, "free-text", "multi-line").spans.some((sp) => sp.end > boundary))
         return true;
     for (const unit of canonical.slice(boundary + 1).split("&").flatMap((sg) => {
         const eq = sg.indexOf("=");

package/dist/trace/self-minted-wire.d.ts

@@ -8,7 +8,7 @@ export interface SelfMintedRetiredMember extends SelfMintedWireMember {
     readonly until: string;
 }
 export declare const SELF_MINTED_WIRE: {
-    /** [ref](7.55.0)起的终态成因注;S-929(7.108.0)+`shutdown_before_park`。 */
+    /** [ref](7.55.0)起的终态成因注;[ref](7.108.0)+`shutdown_before_park`。 */
     readonly crashConvergedCause: {
         readonly at: "GET /v1/approvals crashConverged[].cause";
         readonly members: {
@@ -23,7 +23,7 @@ export declare const SELF_MINTED_WIRE: {
         };
     };
     /**
-     * S-928(7.110.0):`engine_notice` `task.user_steer_undrained` 上**本仓铸**的那一臂。词表属主是 core(`USER_INPUT_UNDRAINED_CAUSES`,两族共用;
+     * [ref](7.110.0):`engine_notice` `task.user_steer_undrained` 上**本仓铸**的那一臂。词表属主是 core(`USER_INPUT_UNDRAINED_CAUSES`,两族共用;
      * `leg_end` 由引擎铸、逐字过境,不在本表);本表登记的是「这个值自哪一版起由本服务出现在 wire 上」。`satisfies Record<CrashedCause, …>`:
      * core 删掉 `crashed` ⇒ `CrashedCause` 成 never ⇒ 本行编译红。码按受理时的车道选(`user-input-ledger.ts` `acceptedInputKindOf`,车道 = core `injectionLaneOf`,码 = core `USER_INPUT_UNDRAINED_FAMILIES`):本行 = steer 车道。
      */
@@ -36,7 +36,7 @@ export declare const SELF_MINTED_WIRE: {
             };
         };
     };
-    /** S-1122(7.118.0,core 7.44.0 #1362):同一臂在 follow-up 车道(`later` 档)上的那一族。7.110.0–7.117.x 的这类丢失报在 steer 一族里。 */
+    /** [ref](7.118.0,core 7.44.0 [ref]):同一臂在 follow-up 车道(`later` 档)上的那一族。7.110.0–7.117.x 的这类丢失报在 steer 一族里。 */
     readonly userFollowupUndrainedServerCause: {
         readonly at: "engine_notice task.user_followup_undrained detail.cause(本服务铸的臂;`later` 档受理的崩溃丢失,下一条同会话 run 开通告口那一拍)";
         readonly members: {
@@ -47,7 +47,7 @@ export declare const SELF_MINTED_WIRE: {
         };
     };
     /**
-     * S-961(7.111.0):`wiring_manifest.instructions.selected[]` 的成员值 = 指令文件链的成员(相对 cwd 的拼写)。属主是 `project-memory.ts`
+     * [ref](7.111.0):`wiring_manifest.instructions.selected[]` 的成员值 = 指令文件链的成员(相对 cwd 的拼写)。属主是 `project-memory.ts`
      * 的 `INSTRUCTION_FILE_CHAIN`([ref] 序:CLAUDE 族先、AGENTS 族后,首中即选)—— 链加 / 删一员 ⇒ 本行 `satisfies` 编译红,登记跟着动。
      * 段本身(键)登记在 `wire-projection-faces.ts` 的 `wiring_manifest_tenant.minted`。
      */
@@ -73,7 +73,7 @@ export declare const SELF_MINTED_WIRE: {
         };
     };
     /**
-     * S-947(7.112.0):server 发起的中止在取消终局上留下的机读成因 —— `PersistedTaskResult.abortCause`,与 `cancelContext` 同住、同铸点、
+     * [ref](7.112.0):server 发起的中止在取消终局上留下的机读成因 —— `PersistedTaskResult.abortCause`,与 `cancelContext` 同住、同铸点、
      * 同在场闸(在场 ⇔ 这条终局就是 server 那次中止铸出来的取消终局)。逐词站点见契约 §5.0d。键本身是 run 结果上的 server 侧记键
      * (`store-contracts.ts` 的 `PersistedResultSideKeys`),不是事件投影面的键 ⇒ 不在 `wire-projection-faces.ts`。
      */
@@ -95,7 +95,7 @@ export declare const SELF_MINTED_WIRE: {
         };
     };
     /**
-     * 会话所有者自助抹除面的**已分类拒** → HTTP 状态(S-930 起与 operator 面 `POST /v1/memory/erase` 同一只映射;`since` 记的是**本面**
+     * 会话所有者自助抹除面的**已分类拒** → HTTP 状态([ref] 起与 operator 面 `POST /v1/memory/erase` 同一只映射;`since` 记的是**本面**
      * 自哪一版起这样答 —— 7.107.0 及以前本面只认前两只,其余落 500 `internal.error`)。
      */
     readonly sessionMemoryEraseStatus: {
@@ -492,7 +492,7 @@ export declare const SELF_MINTED_WIRE: {
         };
     };
     /**
-     * S-667(7.133.0):`GET /health` 的 `centerIdentityNotice.code` —— 中心凭证换人后的两态通告(最近一条)。词表属主 = `center-config-tier.ts` 的
+     * [ref](7.133.0):`GET /health` 的 `centerIdentityNotice.code` —— 中心凭证换人后的两态通告(最近一条)。词表属主 = `center-config-tier.ts` 的
      * `CENTER_IDENTITY_NOTICE_CODES`(`satisfies Record<…>`:加词而本行没跟 / 多一个词 ⇒ tsc 红);冻结句 `CENTER_IDENTITY_NOTICE_MESSAGE` 进
      * `test/api-notice-text-freeze.test.ts` §8。这两只码不在 core 的 `EngineNotice` 码册里(那是 core 的闭集)—— 它们是本服务自铸的 `/health` 值,契约 §0.4 成文。
      */
@@ -509,7 +509,7 @@ export declare const SELF_MINTED_WIRE: {
             };
         };
     };
-    /** S-667(7.133.0):`demoted` 通告上的 `retained[]` —— 降档没能降到底的组(世代账组闭集;`satisfies Record<ConfigApplyGroup, …>`)。 */
+    /** [ref](7.133.0):`demoted` 通告上的 `retained[]` —— 降档没能降到底的组(世代账组闭集;`satisfies Record<ConfigApplyGroup, …>`)。 */
     readonly centerIdentityNoticeRetained: {
         readonly at: "GET /health centerIdentityNotice.retained[]";
         readonly members: {
@@ -757,9 +757,25 @@ export declare const SELF_MINTED_WIRE: {
         };
     };
     /**
-     * S-527(7.133.0):`GET /v1/config/catalog` 行上**对 `effectiveValue` 的判词位**(闭集 `CatalogValueVerdict`,属主 `config-catalog.ts`;行接口经映射型声明,
+     * [ref](7.135.0):场景卡技能清单一条的来处(`factory` = 本部署技能目录 · `center` = 配置源交来的)。钉 test/scenario-skills-read-face.test.ts ②。
+     */
+    readonly scenarioSkillSource: {
+        readonly at: "GET /v1/capabilities/scenarios/:name#skills[].source";
+        readonly members: {
+            factory: {
+                attr: string;
+                since: string;
+            };
+            center: {
+                attr: string;
+                since: string;
+            };
+        };
+    };
+    /**
+     * [ref](7.133.0):`GET /v1/config/catalog` 行上**对 `effectiveValue` 的判词位**(闭集 `CatalogValueVerdict`,属主 `config-catalog.ts`;行接口经映射型声明,
      * 每一位只取 `true`)。属性 = 在场律 `present-iff`:只在为真时出键,恒不铸 `false`,缺席 = 没有这件事(老 server 上也缺席 —— 对消费方两者的下一步相同:按值原样渲染)。
-     * `satisfies Record<CatalogValueVerdict, …>`:判词位加一员而本表没跟 ⇒ 编译红。`effectiveValueInvalid` 自 7.70.0(S-100)在 wire 上、本版补登记;
+     * `satisfies Record<CatalogValueVerdict, …>`:判词位加一员而本表没跟 ⇒ 编译红。`effectiveValueInvalid` 自 7.70.0([ref])在 wire 上、本版补登记;
      * `effectiveValueWithheld`(url 型行:展示铸点扣下了一段)本版新上。
      */
     readonly configCatalogValueVerdict: {
@@ -778,8 +794,9 @@ export declare const SELF_MINTED_WIRE: {
     /**
      * `GET /v1/models` 应答体的顶层键(闭集;`src/http/routes/capabilities.ts` 的 `sendJson(res, 200, {…})` 字面量)。属性 = 在场律:`always` 恒在场(零条也出键),`present-iff` 条件成立才出键
      * (缺席不下「无」的结论——也可能是更早的 server)。`since` = 该键上 wire 的起始版本(`models` / `default` / `defaultModel` 在本仓首个 tag 就有)。
-     * 7.126.0:`candidateRejected`(S-1457,present-iff:当前生效的配置是因判官整拒了最近一份候选而回落的那一份;契约 §A.1d)。
-     * 7.133.0:`modelPlane`(S-1716,always:服务哪张表 / 最近一份目录候选的结局 / 起服路由判官的判决;契约 §A.1d)。
+     * 7.126.0:`candidateRejected`([ref],present-iff:当前生效的配置是因判官整拒了最近一份候选而回落的那一份;契约 §A.1d)。
+     * 7.133.0:`modelPlane`([ref],always:服务哪张表 / 最近一份目录候选的结局 / 起服路由判官的判决;契约 §A.1d)。
+     * 7.135.0:`aliases`([ref],always:选择面认、`models` 行不列的词 —— 受理口那一张可选目录的划分;契约 §A.1d)。
      */
     readonly modelsResponseKey: {
         readonly at: "GET /v1/models 应答体顶层键(<键> → 在场律)";
@@ -808,18 +825,22 @@ export declare const SELF_MINTED_WIRE: {
                 readonly attr: "always";
                 readonly since: "7.133.0";
             };
+            readonly aliases: {
+                readonly attr: "always";
+                readonly since: "7.135.0";
+            };
         };
     };
     /** 本仓在出口对 core 值做的变换(值变、键不变)。 */
     readonly wireValueRule: {
         readonly at: "出口值变换(<端点>#<键> → 变换)";
         readonly members: {
-            /** S-105(7.57.0):run 读面的终态错误文案脱敏(钉 test/run-failure-visibility.test.ts)。 */
+            /** [ref](7.57.0):run 读面的终态错误文案脱敏(钉 test/run-failure-visibility.test.ts)。 */
             readonly "GET /v1/runs/:id#result.errorMessage": {
                 readonly attr: "redactErrorMessage";
                 readonly since: "7.57.0";
             };
-            /** S-922(7.108.0):side-query 200 体 `errorMessage` 与任务面同一只脱敏口(钉 test/side-query-provider-echo.test.ts)。 */
+            /** [ref](7.108.0):side-query 200 体 `errorMessage` 与任务面同一只脱敏口(钉 test/side-query-provider-echo.test.ts)。 */
             readonly "POST /v1/side-query#errorMessage": {
                 readonly attr: "redactErrorMessage";
                 readonly since: "7.108.0";