@sema-agent/core 7.50.2 → 7.51.1

package/dist/core/allow-entry.js

@@ -3,7 +3,7 @@ import { isNamespacedCoveringRuleName, namespacedRuleNameCovers, parsePermission
 import { judgeRuleToolName, splitNamespacedName } from "./tool-name-aliases.js";
 import { catalogToolNames, isShellFaceToolName } from "./tool-registry.js";
 import { ALLOW_RULE_MEMBERS } from "./allow-rule-shadow.js";
-import { COMMAND_RULE_TOOL, adjudicatePersistedDomainRules, adjudicatePersistedNameRules, domainRuleSubjectOf, findAdmittingRule, laneToolNamesOf, nameRuleSubjectOf, parseRuleText, programRunReachOf, ruleToolGrammarOf } from "./permission-rule-model.js";
+import { COMMAND_RULE_TOOL, adjudicatePersistedDomainRules, adjudicatePersistedNameRules, commandCoverageOf, domainRuleSubjectOf, laneToolNamesOf, nameRuleSubjectOf, parseRuleText, programRunReachOf, ruleToolGrammarOf } from "./permission-rule-model.js";
 import { pathRuleLaneAnswer } from "./runner/permission-rule-lanes.js";
 import { callTargetReadingOf } from "./effective-path-target.js";
 import { splitShellCompoundSegments } from "../tools/fs/bash-readonly-classifier.js";
@@ -31,20 +31,21 @@ function mountedSpellingOf(name, roster) {
 }
 function toolNameReading(name, roster) {
     const verdict = judgeRuleToolName(name, roster);
+    if (verdict.kind === "unprefixed_namespace")
+        return { kind: "inert", reason: "tool_name", verdict: verdict.kind };
     if (verdict.kind !== "current") {
-        const currentName = verdict.kind === "unprefixed_namespace" ? undefined : verdict.currentName;
-        return { inert: "tool_name", detail: { verdict: verdict.kind, ...(currentName !== undefined ? { currentName } : {}) } };
+        return { kind: "inert", reason: "tool_name", verdict: verdict.kind, guidance: verdict.guidance, ...(verdict.currentName !== undefined ? { currentName: verdict.currentName } : {}) };
     }
     if (roster.has(name) || catalogToolNames().has(name) || splitNamespacedName(name) !== undefined)
         return undefined;
     const mounted = mountedSpellingOf(name, roster);
-    return mounted === undefined ? undefined : { inert: "near_miss", detail: { currentName: mounted } };
+    return mounted === undefined ? undefined : { kind: "inert", reason: "near_miss", currentName: mounted };
 }
-function readAllowEntry(raw, behavior, roster) {
-    const inert = (reason) => ({ inert: reason });
-    const row = (compiled) => ({ compiled });
+export function readRuleEntry(raw, behavior, roster) {
+    const inert = (reason) => ({ kind: "inert", reason });
+    const row = (compiled) => ({ kind: "row", compiled });
     if (typeof raw !== "string")
-        return { inert: "grammar", detail: { valueType: valueTypeLabel(raw) } };
+        return { kind: "inert", reason: "grammar", valueType: valueTypeLabel(raw) };
     if (raw !== raw.trim())
         return inert("grammar");
     const parsed = parsePermissionRule(raw);
@@ -82,26 +83,39 @@ function readAllowEntry(raw, behavior, roster) {
     }
     return inert(inertReasonOf(read.reject.code));
 }
+export function compiledEntryName(compiled) {
+    switch (compiled.kind) {
+        case "tool":
+        case "shell":
+            return compiled.name;
+        case "namespace":
+            return compiled.pattern;
+        default:
+            return compiled.rule.tool;
+    }
+}
 function inertReasonOf(code) {
     return code === "unsupported.tool" ? "content_unsupported" : "grammar";
 }
-export function compileAllowEntry(raw, behavior, roster) {
-    const read = readAllowEntry(raw, behavior, roster);
-    return "compiled" in read ? read.compiled : read.inert;
-}
 export function compileAllowList(entries, behavior, roster) {
-    const voided = behavior === "allow" && entries.some((e) => compileAllowEntry(e, behavior) === "wildcard_all");
+    const voided = behavior === "allow" && entries.some((e) => isWildcardAll(readRuleEntry(e, behavior)));
     const rows = [];
     const inert = [];
     for (const entry of entries) {
-        const read = typeof entry !== "string" || !voided ? readAllowEntry(entry, behavior, roster) : { inert: "wildcard_all" };
-        if ("compiled" in read)
+        const read = typeof entry !== "string" || !voided ? readRuleEntry(entry, behavior, roster) : { kind: "inert", reason: "wildcard_all" };
+        if (read.kind === "row")
             rows.push({ entry, compiled: read.compiled });
-        else
-            inert.push({ entry: typeof entry === "string" ? entry : nonStringMemberLabel(entry), reason: read.inert, ...read.detail });
+        else {
+            const { kind: _kind, ...why } = read;
+            void _kind;
+            inert.push({ entry: typeof entry === "string" ? entry : nonStringMemberLabel(entry), ...why });
+        }
     }
     return { rows, inert };
 }
+function isWildcardAll(read) {
+    return read.kind === "inert" && read.reason === "wildcard_all";
+}
 function answersTo(req, has) {
     return heldBy("allowEntry.names", { has }, req);
 }
@@ -164,7 +178,18 @@ function commandOf(req) {
     const command = req.args?.command;
     return tool !== undefined && typeof command === "string" ? { tool, command } : undefined;
 }
-export function judgeAllowEntries(rows, req, behavior, ctx) {
+function admissionCallOf(call, ctx, liveCwd, posture) {
+    return { tool: call.tool, command: call.command, cwd: ctx.root, ...(ctx.sessionId !== undefined ? { sessionId: ctx.sessionId } : {}), ...(liveCwd !== undefined ? { execCwd: liveCwd } : {}), posture };
+}
+export function uncoveredCommandSegment(rows, req, ctx, posture) {
+    const call = commandOf(req);
+    if (call === undefined)
+        return undefined;
+    const rules = rows.flatMap((r) => (r.behavior === "allow" && r.compiled.kind === "command" ? [r.compiled.rule] : []));
+    const coverage = commandCoverageOf(rules, admissionCallOf(call, ctx, ctx.liveCwd(), posture));
+    return "uncovered" in coverage ? coverage.uncovered : undefined;
+}
+export function judgeAllowEntries(rows, req, behavior, ctx, posture = "grant") {
     const live = rows.filter((r) => r.behavior === behavior);
     if (live.length === 0)
         return undefined;
@@ -179,8 +204,8 @@ export function judgeAllowEntries(rows, req, behavior, ctx) {
             if (r.compiled.kind === "command")
                 byRule.set(r.compiled.rule, r);
         if (behavior === "allow") {
-            const covering = findAdmittingRule([...byRule.keys()], { tool: call.tool, command: call.command, cwd: ctx.root, ...(ctx.sessionId !== undefined ? { sessionId: ctx.sessionId } : {}), ...(liveCwd !== undefined ? { execCwd: liveCwd } : {}) });
-            const hits = (covering ?? []).flatMap((rule) => byRule.get(rule) ?? []);
+            const coverage = commandCoverageOf([...byRule.keys()], admissionCallOf(call, ctx, liveCwd, posture));
+            const hits = ("covering" in coverage ? coverage.covering : []).flatMap((rule) => byRule.get(rule) ?? []);
             if (hits.length > 0)
                 return hits;
         }
@@ -319,7 +344,7 @@ export function readAllowRuleShadows(value) {
         return undefined;
     }
 }
-const SHADOW_REASON = {
+export const SHADOW_REASON = Object.freeze({
     content_question: "the call is the engine's own question to a person",
     hook: "a PreToolUse hook asks about this call — the deployment's own screening is answered by a person",
     ancestor: "the task that delegated this one owns this question",
@@ -328,8 +353,7 @@ const SHADOW_REASON = {
     unverifiable_shell_text: "the text this shell will run cannot be read by the engine — it is cleared by confirming this call, never by an allow rule",
     transcript_write: "this write targets the session transcript — it is cleared by confirming this call, never by an allow rule",
     org_rule: "an organization policy rule requires approval for this call",
-    governance_unavailable: "a source of governance for this call cannot currently be read (this deployment's organization policy, or a partition of the person's standing rules), so whether it forbids the call is unknown",
-    rule_unreadable: "this call could not be read against a deny or ask rule, so whether one forbids it is unknown",
+    rule_unreadable: "a rule that may govern this call cannot currently be read (this deployment's organization policy, a partition of the person's standing rules, or this call against a deny or ask rule), so whether one forbids it is unknown",
     ask_rule: mandateDisclosureOf(undefined),
     denial_limit_fallback: "the auto-mode classifier refused too many calls in a row, so a person decides",
     classifier_no_ruling: "the auto-mode classifier could not judge this call, so a person decides",
@@ -346,7 +370,7 @@ const SHADOW_REASON = {
     mode: "the permission mode puts this question to a person",
     unstated: "this call arrived already marked as requiring confirmation (an earlier layer of this run, or the task that delegated it, judged it so) — it is cleared by confirming this call, never by a standing allow rule",
     ordinary: "this call arrived already marked as requiring confirmation (an earlier layer of this run, or the task that delegated it, judged it so) — it is cleared by confirming this call, never by a standing allow rule",
-};
+});
 function memberPhrase(s) {
     const listed = `${s.entries.join(", ")}${s.omitted !== undefined ? ` and ${s.omitted} more` : ""}`;
     switch (s.member) {

package/dist/core/arg-summary.d.ts

@@ -1,88 +1,11 @@
-import { type RedactionConfidence, type RedactionSource, type ValueFamilyRow } from "./credential-vocabulary.js";
-export type { RedactionConfidence, RedactionSource } from "./credential-vocabulary.js";
-/** One redaction hit: what was detected, where (ORIGINAL-input coordinates), how confidently, the marker
- *  literal written in its place, which rule table minted it, and — present when a vocabulary row minted it — the
- *  value family (the row's stable id; a host-leak hit such as a URL or a path names none). */
-export interface RedactionFinding {
-    kind: string;
-    span: readonly [number, number];
-    confidence: RedactionConfidence;
-    marker: string;
-    source: RedactionSource;
-    family?: string;
-}
-/** The minimum a finding must declare to be summarizable. Both text findings ({@link RedactionFinding})
- *  and the env arm's entry findings satisfy it, so {@link summarizeRedactions} is ONE helper rather than
- *  one per material kind. */
-export interface SummarizableFinding {
-    kind: string;
-    confidence: RedactionConfidence;
-}
-/** ANG-3 (envelope declaration) — render findings as ONE human-readable line, e.g.
- *  `"3 redactions: prefixed-token (high) x1, url (medium) x1, fs-path (low) x1"`, so an upper layer can
- *  declare to its consumer how much was removed and how confidently.
- *
- *  PURE, and deliberately only that: it reads the array, returns a string, and injects nothing anywhere.
- *  Attaching this line to an output is the caller's decision — a redaction pipeline that silently
- *  appended prose to the very text it was asked to bound would break both the size contract
- *  (`boundedString`) and the byte-invariance the whole channel is built on.
- *
- *  Grouping is by kind AND confidence together: collapsing on kind alone would report whichever
- *  confidence happened to arrive first for the rest of that group, which is exactly the silent
- *  mis-statement ANG-4 exists to prevent. */
-export declare function summarizeRedactions(findings: readonly SummarizableFinding[]): string;
-/** The optional collector every redaction entry point accepts. `preexistingMarkers` (ANG-11) counts
- *  marker-shaped literals ALREADY present in the input before any pass ran — a nonzero value means the
- *  text arrived pre-redacted or carries caller-declared markers, either way "marker present" is not proof this
- *  pipeline ran. Caller-owned: pass `{ findings: [] }` and read it back after the call. */
-export interface RedactionReport {
-    findings: RedactionFinding[];
-    preexistingMarkers?: number;
-}
-/** A declared redaction pass — the unit {@link runRedactionPasses} executes and reports on. */
-export interface RedactionPass {
-    kind: string;
-    confidence: RedactionConfidence;
-    marker: string;
-    /** The rule table that owns this pass's rule — copied verbatim onto every finding it mints (ANG-11), whoever
-     *  runs the pass. */
-    source: RedactionSource;
-    re: RegExp;
-    /** A literal replacement (only `$1` substitution is used by these passes) or a replacer fn. */
-    replace: string | ((match: string, ...groups: string[]) => string);
-    /** The value family a hit belongs to: one id, or — for a pass joining several rows — the id of the row that
-     *  matches at the hit's offset in the pass input. Absent = the pass is no vocabulary row. */
-    family?: string | ((input: string, at: number) => string);
-}
-/**
- * Run the declared passes in order, collecting findings (original-input spans) when a report is given.
- *
- * FORMAT CHARACTERS (#532): the passes scan a VIEW of the input with every `\p{Cf}` removed, so a
- * credential split by a zero-width character is one token to the scanner, not two fragments of which
- * only the first (or neither) matches. The OUTPUT keeps every format character that sits OUTSIDE a
- * replaced span — a joiner in an emoji sequence, a non-joiner in Persian text, a soft hyphen in a word
- * — and drops only those INSIDE the span the marker replaces (they were part of the secret). A
- * format-free input takes the exact historical path (byte-identical output). The view's replacements and
- * every boundary scan's are taken as disjoint spans of their input (a later pass that matched across an
- * earlier pass's inserted text is rendered from the removals instead), so the spans always map back
- * exactly and no scan is skipped.
- */
-export declare function runRedactionPasses(input: string, passes: readonly RedactionPass[], report?: RedactionReport): string;
-/**
- * The egress view rendered as passes, in the vocabulary's order: one pass per group (a group of several rows is ONE
- * leftmost alternation, its hits attributed to the row that matches at the hit's offset). A row whose wide form
- * captures a label keeps it ahead of the marker; `replacers` renders a kind whose marker placement is a policy (the
- * URL userinfo).
- */
-export declare function egressPasses(groups: ReadonlyArray<readonly ValueFamilyRow[]>, replacers?: Readonly<Record<string, (match: string, ...groups: string[]) => string>>): RedactionPass[];
-export declare function scrubSecrets(s: string, report?: RedactionReport): string;
-/** A SHORT, SECRET-SCRUBBED primary-arg summary. Abbreviation REDUCES the surface; a final {@link scrubSecrets}
- *  pass is the leak boundary (the value is PERSISTED + SSE-forwarded and may be read by a platform operator in a
- *  multi-tenant deployment). Rules:
+import { type Egress } from "./untrusted-egress.js";
+/** A SHORT, SECRET-SCRUBBED primary-arg summary. Abbreviation REDUCES the surface; the `same-principal` tier's pass
+ *  is the leak boundary, on whichever field the summary came from (the value is PERSISTED + SSE-forwarded and may be
+ *  read by a platform operator in a multi-tenant deployment). Rules:
  *   • command → the command NAME (skip leading `VAR=val` env-prefixes; bail to `undefined` on a quoted assignment
  *     or a lone assignment; basename a path-form command; `+ …` if it had args).
  *   • file path → BASENAME only (no host directory layout).
- *   • url → `new URL` origin+pathname (strips `user:pass@` userinfo + query/fragment).
- *   • else → pattern/query/description, else the first NON-sensitively-named string field.
- *  Then scrub-secrets + code-point-truncate. */
-export declare function primaryActivityArg(args: unknown): string | undefined;
+ *   • url → `new URL` origin+pathname (drops `user:pass@` userinfo + query/fragment).
+ *   • else → pattern/query/description, else the first string field whose name is no credential name.
+ *  Then the tier's pass, then a code-point cut. */
+export declare function primaryActivityArg(args: unknown): Egress<"same-principal"> | undefined;

package/dist/core/arg-summary.js

@@ -1,389 +1,7 @@
 import { writtenAssignmentPrefix } from "../tools/fs/bash-program-position.js";
-import { CREDENTIAL_VOCABULARY, egressPassGroups } from "./credential-vocabulary.js";
+import { isSensitiveRecordKey } from "./credential-vocabulary.js";
+import { egressText } from "./untrusted-egress.js";
 const ACTIVITY_ARG_MAX = 80;
-const SENSITIVE_KEY = /token|secret|key|password|passwd|credential|auth/i;
-export function summarizeRedactions(findings) {
-    if (findings.length === 0)
-        return "no redactions";
-    const counts = new Map();
-    for (const f of findings) {
-        const label = `${f.kind} (${f.confidence})`;
-        counts.set(label, (counts.get(label) ?? 0) + 1);
-    }
-    const parts = [...counts].map(([label, n]) => `${label} x${n}`);
-    return `${findings.length} redaction${findings.length === 1 ? "" : "s"}: ${parts.join(", ")}`;
-}
-function passZeroMapper(batches) {
-    const cursors = batches.map(() => ({ i: 0, delta: 0 }));
-    return (pos) => {
-        let p = pos;
-        for (let b = batches.length - 1; b >= 0; b--) {
-            const edits = batches[b];
-            const c = cursors[b];
-            let mapped;
-            while (mapped === undefined && c.i < edits.length) {
-                const e = edits[c.i];
-                const outStart = e.at + c.delta;
-                if (p < outStart)
-                    mapped = p - c.delta;
-                else if (p < outStart + e.insertedLen)
-                    mapped = e.at;
-                else {
-                    c.delta += e.insertedLen - e.removedLen;
-                    c.i++;
-                }
-            }
-            p = mapped ?? p - c.delta;
-        }
-        return p;
-    };
-}
-const PREEXISTING_MARKER_RE = /\[redacted(?:-[a-z]+)?\]/g;
-const FORMAT_CHAR_RE = /\p{Cf}/u;
-const MAX_FORMAT_SLOT_SCANS = 64;
-const REDACTED_WHOLE = "[redacted]";
-function finding(pass, span, family) {
-    const f = { kind: pass.kind, confidence: pass.confidence, span, marker: pass.marker, source: pass.source };
-    if (family !== undefined)
-        f.family = family;
-    return f;
-}
-function insertedFor(pass, match, groups) {
-    return typeof pass.replace === "string"
-        ? pass.replace.replace(/\$(\d)/g, (_m, d) => groups[Number(d) - 1] ?? "")
-        : pass.replace(match, ...groups);
-}
-function removedRegion(pass, match, groups, inserted) {
-    if (typeof pass.replace === "string") {
-        const parts = pass.replace.split(/(\$\d)/).filter((p) => p !== "");
-        const isRef = (p) => /^\$\d$/.test(p);
-        const refText = (p) => groups[Number(p[1]) - 1] ?? "";
-        let head = "";
-        for (const p of parts) {
-            if (!isRef(p))
-                break;
-            head += refText(p);
-        }
-        let tail = "";
-        for (let i = parts.length - 1; i >= 0 && isRef(parts[i]); i--)
-            tail = refText(parts[i]) + tail;
-        if (parts.every(isRef))
-            return [0, match.length];
-        if (!match.startsWith(head))
-            head = "";
-        if (!match.endsWith(tail) || head.length + tail.length > match.length)
-            tail = "";
-        return [head.length, match.length - tail.length];
-    }
-    const markerAt = pass.marker === "" ? -1 : inserted.lastIndexOf(pass.marker);
-    const headStop = markerAt < 0 ? inserted.length : markerAt;
-    const tailStop = markerAt < 0 ? inserted.length : inserted.length - markerAt - pass.marker.length;
-    let head = 0;
-    while (head < match.length && head < headStop && match[head] === inserted[head])
-        head++;
-    let tail = 0;
-    while (tail < match.length - head && tail < inserted.length - head && tail < tailStop && match[match.length - 1 - tail] === inserted[inserted.length - 1 - tail])
-        tail++;
-    return [head, match.length - tail];
-}
-const SOLO_SCAN_WORK_PER_CHAR = 8;
-const SOLO_SCAN_WORK_FLOOR = 1 << 17;
-function soloHits(input, passes) {
-    const hits = [];
-    passes.forEach((pass, i) => {
-        const re = new RegExp(pass.re.source, pass.re.flags.includes("g") ? pass.re.flags : `${pass.re.flags}g`);
-        const rescans = pass.family !== undefined;
-        let work = Math.max(SOLO_SCAN_WORK_PER_CHAR * input.length, SOLO_SCAN_WORK_FLOOR);
-        for (let m = re.exec(input); m !== null; m = re.exec(input)) {
-            const at = m.index;
-            const familyAt = () => (typeof pass.family === "function" ? pass.family(input, at) : pass.family);
-            if (rescans) {
-                work -= m[0].length;
-                if (work < 0) {
-                    hits.push({ start: at, end: input.length, marker: pass.marker === "" ? REDACTED_WHOLE : pass.marker, pass: i, family: familyAt(), matchStart: at, matchEnd: input.length });
-                    break;
-                }
-                re.lastIndex = at + 1;
-            }
-            else
-                re.lastIndex = at + Math.max(m[0].length, 1);
-            const inserted = insertedFor(pass, m[0], m.slice(1));
-            if (inserted === m[0])
-                continue;
-            const [a, b] = removedRegion(pass, m[0], m.slice(1), inserted);
-            if (b <= a)
-                continue;
-            const family = familyAt();
-            hits.push({ start: at + a, end: at + b, marker: inserted.slice(a, inserted.length - (m[0].length - b)), pass: i, family, matchStart: at, matchEnd: at + m[0].length });
-        }
-    });
-    return hits;
-}
-function unremovedHits(hits, removals) {
-    const gone = [];
-    for (const r of [...removals].filter((x) => x.end > x.start).sort((x, y) => x.start - y.start || y.end - x.end)) {
-        const last = gone[gone.length - 1];
-        if (last !== undefined && r.start <= last[1])
-            last[1] = Math.max(last[1], r.end);
-        else
-            gone.push([r.start, r.end]);
-    }
-    return hits.filter((h) => {
-        let lo = 0;
-        let hi = gone.length - 1;
-        let at = -1;
-        while (lo <= hi) {
-            const mid = (lo + hi) >> 1;
-            if (gone[mid][0] <= h.start) {
-                at = mid;
-                lo = mid + 1;
-            }
-            else
-                hi = mid - 1;
-        }
-        return at === -1 || gone[at][1] < h.end;
-    });
-}
-function sequentialRemovals(batches) {
-    const removals = [];
-    for (let j = 0; j < batches.length; j++) {
-        const toPassZero = passZeroMapper(batches.slice(0, j));
-        for (const e of batches[j]) {
-            const start = toPassZero(e.at + e.head);
-            const end = toPassZero(e.at + e.removedLen - e.tail);
-            removals.push({ start, end: Math.max(start, end), marker: e.inserted.slice(e.head, e.insertedLen - e.tail), pass: e.pass, family: e.family });
-        }
-    }
-    return removals;
-}
-function renderRemovals(input, removals) {
-    const sorted = removals.filter((r) => r.end > r.start || r.marker !== "").sort((x, y) => x.start - y.start || y.end - x.end);
-    const edits = [];
-    let out = "";
-    let cursor = 0;
-    for (let i = 0; i < sorted.length;) {
-        const start = sorted[i].start;
-        let end = sorted[i].end;
-        let widest;
-        for (; i < sorted.length && (sorted[i].start < end || sorted[i].start === start || (sorted[i].marker === "" && sorted[i].start === end)); i++) {
-            const r = sorted[i];
-            if (r.end > end)
-                end = r.end;
-            if (r.marker !== "" && (widest === undefined || r.end - r.start > widest.end - widest.start))
-                widest = r;
-        }
-        const marker = widest?.marker ?? REDACTED_WHOLE;
-        out += input.slice(cursor, start) + marker;
-        cursor = end;
-        edits.push({ at: start, removedLen: end - start, insertedLen: marker.length, inserted: marker, family: widest?.family, head: 0, tail: 0, pass: widest?.pass ?? sorted[i - 1].pass });
-    }
-    return { out: out + input.slice(cursor), edits };
-}
-function runPasses(input, passes, findings, toOriginal) {
-    const batches = [];
-    let cur = input;
-    passes.forEach((pass, passIndex) => {
-        const edits = [];
-        const passInput = cur;
-        const toPassZero = passZeroMapper(batches.slice());
-        cur = cur.replace(pass.re, (...args) => {
-            const match = args[0];
-            const offset = args[args.length - 2];
-            const groups = args.slice(1, -2);
-            const inserted = insertedFor(pass, match, groups);
-            if (inserted === match)
-                return inserted;
-            const family = typeof pass.family === "function" ? pass.family(passInput, offset) : pass.family;
-            if (findings !== undefined)
-                findings.push({ pass: passIndex, f: finding(pass, [toOriginal(toPassZero(offset)), toOriginal(toPassZero(offset + match.length))], family) });
-            const [a, b] = removedRegion(pass, match, groups, inserted);
-            edits.push({ at: offset, removedLen: match.length, insertedLen: inserted.length, inserted, family, head: a, tail: match.length - b, pass: passIndex });
-            return inserted;
-        });
-        batches.push(edits);
-    });
-    return { out: cur, batches };
-}
-function applyPasses(input, passes, report, toOriginal, disjoint = false) {
-    const found = report === undefined ? undefined : [];
-    const plain = runPasses(input, passes, found, toOriginal);
-    const solo = soloHits(input, passes);
-    const sequential = solo.length === 0 ? [] : sequentialRemovals(plain.batches);
-    const outer = unremovedHits(solo, sequential);
-    const mappable = !disjoint || replacedSpans(plain.batches) !== undefined;
-    const whole = outer.length === 0 && mappable ? undefined : renderRemovals(input, [...sequential, ...outer]);
-    if (whole === undefined || (whole.out === plain.out && mappable)) {
-        if (report !== undefined)
-            report.findings.push(...found.map((x) => x.f));
-        return plain;
-    }
-    if (report !== undefined) {
-        const seen = new Set(found.map((x) => `${x.pass}:${x.f.span[0]}:${x.f.span[1]}`));
-        for (const h of outer) {
-            const span = [toOriginal(h.matchStart), toOriginal(h.matchEnd)];
-            const key = `${h.pass}:${span[0]}:${span[1]}`;
-            if (seen.has(key))
-                continue;
-            seen.add(key);
-            found.push({ pass: h.pass, f: finding(passes[h.pass], span, h.family) });
-        }
-        found.sort((x, y) => x.pass - y.pass || x.f.span[0] - y.f.span[0]);
-        report.findings.push(...found.map((x) => x.f));
-    }
-    return { out: whole.out, batches: [whole.edits] };
-}
-function replacedSpans(batches) {
-    const spans = [];
-    for (let j = 0; j < batches.length; j++) {
-        const toPassZero = passZeroMapper(batches.slice(0, j));
-        for (const e of batches[j]) {
-            const s0 = toPassZero(e.at);
-            const e0 = toPassZero(e.at + e.removedLen);
-            if (e0 - s0 !== e.removedLen)
-                return undefined;
-            spans.push({ start: s0, end: e0, inserted: e.inserted, pass: e.pass, family: e.family });
-        }
-    }
-    spans.sort((a, b) => a.start - b.start);
-    for (let i = 1; i < spans.length; i++)
-        if (spans[i].start < spans[i - 1].end)
-            return undefined;
-    return spans;
-}
-export function runRedactionPasses(input, passes, report) {
-    if (report !== undefined && report.preexistingMarkers === undefined) {
-        report.preexistingMarkers = input.match(PREEXISTING_MARKER_RE)?.length ?? 0;
-    }
-    if (!FORMAT_CHAR_RE.test(input))
-        return applyPasses(input, passes, report, (pos) => pos).out;
-    const viewChars = [];
-    const viewToOriginal = [];
-    const formatAtSlot = [];
-    const charStartOffsets = [];
-    {
-        let orig = 0;
-        let viewOff = 0;
-        let slotBuf = "";
-        for (const ch of input) {
-            if (FORMAT_CHAR_RE.test(ch)) {
-                slotBuf += ch;
-            }
-            else {
-                formatAtSlot.push(slotBuf);
-                slotBuf = "";
-                viewToOriginal.push(orig);
-                charStartOffsets.push(viewOff);
-                viewChars.push(ch);
-                viewOff += ch.length;
-            }
-            orig += ch.length;
-        }
-        formatAtSlot.push(slotBuf);
-        viewToOriginal.push(input.length);
-        charStartOffsets.push(viewOff);
-    }
-    const view = viewChars.join("");
-    const offsetToCharIndex = new Map();
-    charStartOffsets.forEach((off, idx) => offsetToCharIndex.set(off, idx));
-    const toOriginal = (pos) => {
-        const idx = offsetToCharIndex.get(pos);
-        return idx === undefined ? input.length : viewToOriginal[idx];
-    };
-    const { batches } = applyPasses(view, passes, report, toOriginal, true);
-    const viewSpans = replacedSpans(batches);
-    if (viewSpans === undefined)
-        return REDACTED_WHOLE;
-    const spans = viewSpans.map((sp) => {
-        const startIdx = offsetToCharIndex.get(sp.start) ?? viewChars.length;
-        const endIdx = offsetToCharIndex.get(sp.end) ?? viewChars.length;
-        const lastIdx = endIdx - 1;
-        const endOrig = lastIdx >= startIdx && lastIdx < viewChars.length ? viewToOriginal[lastIdx] + viewChars[lastIdx].length : viewToOriginal[startIdx];
-        return { start: viewToOriginal[startIdx], end: endOrig, inserted: sp.inserted };
-    });
-    const viewOffsetToOriginal = (viewStart, viewEnd) => {
-        const startIdx = offsetToCharIndex.get(viewStart) ?? viewChars.length;
-        const endIdx = offsetToCharIndex.get(viewEnd) ?? viewChars.length;
-        const lastIdx = endIdx - 1;
-        const endOrig = lastIdx >= startIdx && lastIdx < viewChars.length ? viewToOriginal[lastIdx] + viewChars[lastIdx].length : viewToOriginal[startIdx];
-        return { start: viewToOriginal[startIdx], end: endOrig };
-    };
-    const cutOffsets = [];
-    for (let k = 1; k < viewChars.length; k++)
-        if (formatAtSlot[k] !== "")
-            cutOffsets.push(charStartOffsets[k]);
-    if (cutOffsets.length > MAX_FORMAT_SLOT_SCANS)
-        return REDACTED_WHOLE;
-    const extra = [];
-    const rawSpans = replacedSpans(applyPasses(input, passes, undefined, (pos) => pos, true).batches);
-    if (rawSpans !== undefined)
-        extra.push(...rawSpans);
-    for (const cut of cutOffsets) {
-        const cutSpans = replacedSpans(applyPasses(view.slice(cut), passes, undefined, (pos) => pos, true).batches);
-        if (cutSpans === undefined)
-            continue;
-        for (const c of cutSpans) {
-            const o = viewOffsetToOriginal(c.start + cut, c.end + cut);
-            extra.push({ ...c, start: o.start, end: o.end });
-        }
-    }
-    extra.sort((a, b) => a.start - b.start);
-    const firstEndingAfter = (pos) => {
-        let lo = 0;
-        let hi = spans.length;
-        while (lo < hi) {
-            const mid = (lo + hi) >> 1;
-            if (spans[mid].end > pos)
-                hi = mid;
-            else
-                lo = mid + 1;
-        }
-        return lo;
-    };
-    for (const r of extra) {
-        const at = firstEndingAfter(r.start);
-        const hit = spans[at];
-        if (hit !== undefined && hit.start < r.end) {
-            if (r.start < hit.start)
-                hit.start = r.start;
-            if (r.end > hit.end)
-                hit.end = r.end;
-            let next = at + 1;
-            while (next < spans.length && spans[next].start < hit.end)
-                hit.end = Math.max(hit.end, spans[next++].end);
-            if (next > at + 1)
-                spans.splice(at + 1, next - at - 1);
-            continue;
-        }
-        spans.splice(at, 0, { start: r.start, end: r.end, inserted: r.inserted });
-        if (report !== undefined)
-            report.findings.push(finding(passes[r.pass], [r.start, r.end], r.family));
-    }
-    let result = "";
-    let cursor = 0;
-    for (const sp of spans) {
-        result += input.slice(cursor, sp.start) + sp.inserted;
-        cursor = sp.end;
-    }
-    result += input.slice(cursor);
-    return result;
-}
-const BRACKET_MARKER = { "url-credentials": "[redacted-credentials]" };
-const bracketMarker = (kind) => BRACKET_MARKER[kind] ?? "[redacted]";
-const capturesLabel = (re) => new RegExp(`${re.source}|`).exec("").length > 1;
-export function egressPasses(groups, replacers = {}) {
-    return groups.map((rows) => {
-        const head = rows[0];
-        const marker = bracketMarker(head.kind);
-        const re = rows.length === 1 ? head.match : new RegExp(rows.map((r) => `(?:${r.match.source})`).join("|"), head.match.flags);
-        const sticky = rows.map((r) => ({ id: r.id, re: new RegExp(r.match.source, r.match.flags.replace("g", "") + "y") }));
-        const family = rows.length === 1 ? head.id : (input, at) => sticky.find((s) => ((s.re.lastIndex = at), s.re.test(input)))?.id ?? head.id;
-        return { kind: head.kind, confidence: head.confidence, marker, source: head.source, re, replace: replacers[head.kind] ?? (capturesLabel(head.match) ? `$1${marker}` : marker), family };
-    });
-}
-const SHAPE_PASSES = egressPasses(egressPassGroups(CREDENTIAL_VOCABULARY).filter((rows) => rows[0].source === "arg-summary"));
-export function scrubSecrets(s, report) {
-    return runRedactionPasses(s, SHAPE_PASSES, report);
-}
 function truncCodePoints(s) {
     const cp = Array.from(s);
     return cp.length > ACTIVITY_ARG_MAX ? cp.slice(0, ACTIVITY_ARG_MAX).join("") + "…" : s;
@@ -437,7 +55,7 @@ export function primaryActivityArg(args) {
         val = str("pattern") ?? str("query") ?? str("description");
         if (val === undefined) {
             for (const k of Object.keys(a)) {
-                if (SENSITIVE_KEY.test(k))
+                if (isSensitiveRecordKey(k))
                     continue;
                 const v = a[k];
                 if (typeof v === "string" && v.length > 0) {
@@ -449,5 +67,5 @@ export function primaryActivityArg(args) {
     }
     if (val === undefined)
         return undefined;
-    return truncCodePoints(scrubSecrets(val));
+    return truncCodePoints(egressText("same-principal", val));
 }