mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-03 23:37:53 +01:00
* fix(ship): base merges, adjacent base edits, test-only and audit-requested fixes no longer force a second review loop (GST-407, GST-384, GST-391) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ship driver: trim two phrases for headroom with #3662 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ship driver: keep the Next steps heading phrase the handoff check reads; trim elsewhere Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: regenerate ship goldens Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes comparePath returns same only when every hunk sits where the base change puts it (patch-ids ignore positions) and treats a file-mode change as changed; the scoped-review packet says when a fence is truncated; --docs-result must be the posted audit's result; the --context-reviewed record goes beside the packet, outside the worktree. Negative controls for each. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pass-2 review fixes A test edit routes as tests= only when it adds lines with no gate tag; a removed or changed line or an unreadable test diff goes through the full loop. Diffs skip textconv. A hunkless patch (binary, empty, mode-only) is same when its patch-id matches. Without --reviewed-base test files route as before. finish's packet path and attempt's state directory have fallbacks. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: Step 11 review fixes; a version-only stamp_files edit after review is release metadata (GBRA-251) gateEditedPaths reads removed lines only inside hunks; carry refuses when a path listing fails; docs freshness stops on a failed listing; attempt counts an unreadable state file. releasePaths includes stamp_files paths whose edit is a version swap under stamp_patterns. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: no test edit skips review; guard packet writes; exclusive attempt state A test-only edit with no gate tag gets the scoped fix-check of its test hunks instead of a lanes-only rerun. Packet write failures print a STOP or RECEIPT_CARRY_REFUSED. attempt's allowance uses an exclusive create. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: attempt prints gstack's install command; carry checks the product diff outside context paths The attempt STOP no longer echoes the audit child's fix text. A scoped-review carry now requires the product patch-id without the context paths to match at both heads. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: oversized packets take the full loop; exact --docs-requested match; name-only test globs only in test dirs A scoped-review packet section over 200 lines sends that path to the full loop instead of a truncated packet. The docs-result path match is exact. test_*.py, *Test.java and similar count as test code only under a test directory. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(unattended): carry's scoped-review refusal and what it keeps Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: carry's scoped-review route in ship-policy, review-policy and troubleshooting (docs-a-1) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(windows): curate ship-rereview-triggers out of the Windows lane like ship-release (run 41193336209) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(review-log): record a notes-only /ship pass clean; name the cause and repair when a pass's tree moved (GST-430) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(receipt): carry and write handle PRs with thousands of files; tree receipt fails closed on a failed diff (GST-448) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(ship): preflight routes RECEIPT_CARRY_SCOPED_REVIEW to the scoped review; carry --dry-run writes no packet (GST-442) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(ship): Step 1.4 and Step 16 route the scoped-review refusal and the --docs-requested fix; trims keep the cap (GST-442, GST-444) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: /ship review pass 1: notes-only floor, scoped carry order, named temp and diff refusals - A notes-only pass is recorded clean only when every finding is fixed, or noted or deferred below the blocking floor (never CRITICAL or blocking), by its logger-stamped action, and the findings account for the claimed issue and critical counts (GST-430). - The preflight scoped carry route commits and pushes the base-merge fix before writing the packet (GST-442). - patchId refuses by name on an unwritable TMPDIR; the tree receipt names why its diff failed (GST-448). - Step 16 stage 3 spells out --docs-requested with its --docs-result (GST-444). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: pin the Step 16 --docs-requested route with its --docs-result Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: a claimed clean review row with a logger-stamped open gate finding reads UNVERIFIED (red-team, pass 1) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: Step 11 findings: gate rows from --findings are stamped, one open rule, stale patch-id dirs swept - deriveFromFindings stamps gate rows with the session kind before deriving status, so a findings file cannot dispose of a gate finding the unattended logger forces open (outside-voice#1). - reviewFreshness reads a claimed row's findings with isOpenByAction, the rule the notes-only rewrite uses; noted and deferred clear a finding only when it is marked blocking: false and is not CRITICAL. - patchId sweeps gstack-patch-id-* directories over an hour old that a killed carry left in TMPDIR. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: Step 11 round 2: stamped-open gates win over status and disposition; resolved gate, skipped and below-floor actions stay CURRENT - isOpenFinding treats action 'open' (the logger's forced-open stamp) as open before a row's status or disposition. - reviewFreshness flags a claimed clean row only for an 'open' action or a CRITICAL or blocking deferral or note, so interactive kept and restored gates, skipped advisories and INFORMATIONAL deferrals read CURRENT as before. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: carry dry run offers the scoped route last; patch-id diff under the git dir; changelog matches the review-log floor Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: a claimed clean review row with any unresolved non-gate CRITICAL finding reads UNVERIFIED (pass 2 red-team) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: carry dry-run scoped route, patch-id directory, tree-receipt refusal (docs-d-1 audit) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(ship): Step 3 names merge conflicts in its STOP sentence again (ship-workflow-clarity pin) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(tree-receipt): keep the gated-to-current diff at the file helper timeout (60 s); pregate literals check Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(carry): large-diff fixture sets core.longpaths so Git for Windows can add its long receipt paths (windows-free-shard 1, run 41210080055) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(review): a stale local base branch yields to its origin twin in gate-diff and diff-scope (GST-462) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(ship): Step 11 saves the targeted record and the receipt writes carry it; Step 9 clears it (GST-464) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * changelog: GST-464 and GST-462 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(review): pass 1: ahead and diverged labels, diff-scope needs shared history; preflight refreshes origin/<base> and stops on a diff far beyond the PR (GST-462, HARN-15) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pass-2 review fixes for base twin, prSized stop and targeted record Resolve the tracking twin by refs/remotes/<remote>/<ref> and only for a bare branch name, keep a local base that is ahead or diverged, quote the prSized stop's base and name the fork case, and have every Step 9 entry create, exclude and clear .gstack/tmp/targeted.json. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: origin's tracking base wins whenever related; prSized lower bound The fix-check found that keeping a local base ahead of origin left unpushed base commits out of the gate scan while review-plan listed them. The tracking branch now wins whenever it shares history with HEAD, an explicit origin/main reads refs/remotes/origin/main, the preflight also stops when the diff lists fewer files than the PR, and the Step 9 exclude line survives a missing .git/info and an exclude file without a final newline. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * changelog: the tracking-ref claim holds while the tracking branch exists Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: repin the two ship section briefs under no-loss replay GST-464 GST-464 brief-identity check: every reviewer brief lib/review-brief.ts cuts from ship/sections/review-army.md and adversarial.md stays byte-identical to the bodies the L and GST-257 replays admitted; only lead instructions outside the cut spans changed. The check is a test CI runs. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ship: keep Step 9's PASS_HEAD sentence whole; repin review-army under GST-464 The targeted-record line follows the PASS_HEAD/RANGE_BASE sentence instead of splitting it (test/review-fix-range.test.ts pins that sentence). The brief-body check still holds: every reviewer brief is byte-identical. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: restore bin/gstack-ship-receipt after the main merge The merge commitb10e2dbwrote a truncated copy of the file. This is the three-way merge of both sides with the refused() union: main's codes plus RECEIPT_CARRY_SCOPED_REVIEW. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-collect: narrow the consumer scan and give it one 300 s deadline (GST-544) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-collect: keep the consumer scan deadline under the 180 s plan timeout (review fix) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-collect: plain paths under --literal-pathspecs; whole-millisecond timeout override (review fix) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-collect: whole-tree grep for non-UTF-8 names, no argument spread, name spawn errors (review fix) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-collect: cap the consumer grep output at 256 MB across calls; per-scan deadline wording (review fix, cycle 4) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-collect: read a missing spawn status as null (Bun 1.4.2 returns undefined on ENOENT) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: review-collect whole-tree helper reads a null status as -1 (typecheck:test ratchet) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-bots: /review and /ship triage every configured review bot, not only Greptile (#3122) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes (gh before 2.48 pages without --slurp; driver routes Step 10; tests for guards, review-bot fence, REMOTE_SLUG owner) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: drop the review-bot fence test that could not fail (the tool-fence WARN degrade is unreachable: placeholder spans are skipped first) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: Step 11 review fixes (record by comment id so a filename never reaches a shell; lookup failures are errors; tojson pages; longest bot prefix wins) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pass-2 review fixes (record refuses * paths, colliding ids and a missing fetch dir; parent requires id and dir; botOwning doc) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review: classify the PR type and always check repo conventions (#356) The checklist now opens with a PR-type line (application, CI/infra, scripts/tooling, docs-only or mixed). Application and mixed diffs run every category; other types always run five categories, including the new Repo Conventions & Platform Fit, and report the rest as not applicable in one line instead of skipping silently. No-loss replay: GSTA-224 H1 preregistered no-loss run (run id gsta224-h1-20261031, Opus 5.5, 81 calls, $9.53) against main's checklist with a no-gstack arm; every preregistered bar passed. The review/checklist.md pin in test/review-packets-removed.test.ts moves to a32963ef with replay 'GSTA-224 H1'. Refs GSTA-224 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review-bots: allowlist the record placeholders and match Step 10's id rule in tests The record fence uses <comment-id>, <fix|fp|already-fixed> and <category>, each with an enum or numeric grammar; <greptile-dir> becomes <bot-dir>. review/greptile-triage.md also lists every REVIEW_BOTS skip reason. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: review-bot triage covers every configured bot (#3122) README, CONTRIBUTING, the contributor reference and standalone-binaries name gstack-review-bots and the review-bot fence; TODOS drops the #3122 item; the changelog fragment covers record-by-id and lookup errors. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: the PR-type test also pins the compose, Terraform and README/CHANGELOG phrases Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: follow the review-bot rename in the remote free tier's three reds The cross-skill consistency judge describes review-bot-history.md and its record helper; the tracker-guard exemption for the removed raw Greptile fetch in review/greptile-triage.md is dropped (the fetch now lives in gstack-review-bots, whose bodies still reach context only through gstack-issue-guard); the Step 10 PR-check test expects 'Review bots: not run'. HARNESS_VERSION stays 6: skill-fixture.ts and llm-judge.ts are recorded non-behavioral for every other case. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: keep the cross-skill judge's rubric to one renamed bullet Name review-bot-history.md beside the older greptile-history.md so the calibration corpus still matches, and keep the REMOTE_SLUG bullet. One live 3-sample panel at this tree: consistent 3/3, scores 4/4/4. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * changelog: H1 fragment passes prose lint Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * changelog: name the H1 fragment after its branch; TODOS drops #356 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: /review's PR type step in docs/skills.md (#356) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ship-policy: review_exclude_paths key and loadPolicyAt (GST-508) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * review: apply the base policy's review_exclude_paths and the reviewer diff ceiling (GST-508) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * receipt: bind review_exclude in write, carry and the queue (GST-508) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs, tests and changelog for review_exclude_paths (GST-508) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes (binary by bytes, links kept, untracked files out of the selection) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: keep binary files at code paths under review_exclude_paths Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: name the reasons that keep a binary file under review_exclude_paths Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: keep every review_exclude_paths candidate when the gate scan is unknown; docs example names its version Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: keep the NUL fixture clear of the sync-spawn tripwire Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * changelog: split the ceiling sentence Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: keep a live binary file whose bytes cannot be read; tests render outside voices from a clean checkout and read the ship fixture text Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(review-exclude): explicit +x for the census script; skip the chmod-000 read case on Windows and root Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * refactor: move loadPolicyAt to lib/ship-policy-at.ts so lib/ship-policy.ts stays under the 800-line module cap Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: refuse a base that contains HEAD; skip a self-pointing origin/HEAD (GST-774) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * chore: regenerate gstack-doctor-components.sh for BASE_CONTAINS_HEAD Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: land resumes a merged merge-only PR instead of refusing BASE_CONTAINS_HEAD (GST-774 review) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: changelog fragment for GST-774 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: troubleshooting names diff-scope base_contains_head and the self-pointing no_base case (GST-774 docs audit) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: repin the reviewer briefs to GST-508's no-loss-tested bytes ship/sections/review-army.md, ship/sections/adversarial.md and lib/review-depth.ts now pin the bytes the GST-508 preregistered no-loss replay ran atef2760f(handoffs/GSTA-202/noloss-results.md in the GStack Minder drive): Arm V 33/41 vs R 33/41, delta 4, exact sign flip, p_NI 0.0279 (pass). The merge of main83ae96eleaves these three files byte-identical toef2760f, and an Arm P unit (3593) renders byte-identical briefs atef2760fand at the merge. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: GST-774 review round 1 — merged resume depth, aliased and detached PR checkouts, develop/trunk defaults Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ship: Step 20 says a metrics row, keeping DRIVER.md at 12 KB after the main merge Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test: ship-parts resend case leaves room for the first phase-3 part after the Step 9 targeted-record sentence Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: /ship delivers review/checklist.md in two parts so checklist v1 fits the 24576-byte part cap (#3670) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * changelog: drop the GST-407 and GST-430 fragments, already released on main (stacked history) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * wave review-53cfb5bfe011: lib/ship-policy.ts back to 800 lines (module-size ratchet after merging #3744 and #3795) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * wave review-53cfb5bfe011: /ship pass 1 fixes - lib/ship-receipt-depth.ts: a merged resume (land after a true merge) no longer recomputes the review_exclude digest over the emptied range, so it lands instead of RECEIPT_INVALID (failing-first land test with review_exclude_paths active). - bin/gstack-review-dispatch render: a standalone targeted render under an active review_exclude_paths refuses and points at the pass manifest voices stage, instead of writing a brief with no selection that leaves verify dirty (failing-first test). - test/default-base.test.ts: #3795 expectations follow main R51 depth (light for an 80-line code diff; runtime_lines=80 still proves the real base). - test/review-dispatch.test.ts: the GST-897 fingerprint test renders from the clean checkout, like its neighbor, because CI rebuilds the tracked lib/diagram-render/dist/diagram-render.html and the reviewer diff ceiling refused the ROOT render. * wave review-53cfb5bfe011: /ship pass 2 fixes - lib/review-exclude.ts: binaryContent reads each blob's first 8,000 bytes (git cat-file blob, 8 KB buffer) instead of one --batch read capped at 256 MB, so head mode (receipt, carry, queue) and the plan agree past 256 MB of blobs; an unreadable blob is kept, as in live mode. Failing-first test with two 270 MB blobs. - lib/review-bots.ts: a file-level bot review comment (subject_type file, no line position) is triaged instead of read as outdated. Failing-first test. - test/ship-queue-land.test.ts: the merged-resume exclusion test runs its gate scan under the fixture state root, not the real home (CI free-suite 6 home containment). * fix: merge follow-ups for main3d99c22: origin/* stays qualified in diff-scope's twin step, retro skeleton back under its cap, combined no-loss pin GST-508+R51+GST-911 * fix(review): receipt write gate-scans whenever the base declares review_exclude_paths; collectLive never re-qualifies origin/<base> (#3852 /ship red-team#1, outside-voice#1) * test: the docs-only receipt digest test keeps its gate scan out of the real home (free-suite shard 5 FREE_SUBSHARD_REJECTED) * fix(mergefc292e22f): tentative REVIEW_EXCLUDE_KEY_VERSION, classify targeted.json, render main's new outside-voice test from a clean checkout - lib/ship-policy.ts: REVIEW_EXCLUDE_KEY_VERSION 1.93.0.0 -> 1.94.0.0, the next-minor tentative form stamp_paths moves (docs/ship-policy.md, #3512); 1.93.0.0 is a released heading that never names the key. - test/gstack-clean-producers.test.ts (new from main): KEPT gains targeted.json, the wave's --review-targeted input. - test/review-dispatch.test.ts: main's wrong-tree test rendered the outside voice from ROOT; a CI build that dirties ROOT pushes that diff past the wave's REVIEW_DIFF_MAX_BYTES ceiling, so render refused and verify saw no brief (exit 3). It now runs in cleanCheckout like the wave's other outside-voice tests. * test(merge68410828f): GST-967's brief-body pin carries the wave's GST-508 placeholders The merged sectionTexts differ from main's by exactly the wave's GST-508 exclude-pathspec lines (merged minus main equals wave minusfc292e22f); the 1,440-case plan grid still hashes to main's MAIN_PLANS. Checks: GStack Minder drive handoffs/GSTA-202/merge-6841-checks.md. * fix(mergee85005482): targeted classes since the read accept an empty range; the wave's receipt tests pass main's targeted record - lib/ship-receipt-depth.ts targetedClassesSince (main, GST-986) reads the range from the commit the targeted reader read to HEAD through headInputs, which since #3795 runs gstack-diff-scope's BASE_CONTAINS_HEAD check. When the reader read HEAD itself the range is empty, diff-scope reported base_contains_head, and every write with --review-targeted was refused (the product patch matched). It now passes merged=true (--merged), which skips only that check; an ancestor check already guards the range. - test/review-exclude.test.ts and test/review-targeted.test.ts: since #3887 write refuses a money head with no targeted record and requires the record's head, so the wave's two writes that must succeed pass one, as main's own tests do (targetedAtHead in test/ship-receipt-depth.test.ts). * test(mergee85005482): drop the wave's duplicate targeted.json KEPT entry Main (#3887) classified .gstack/tmp/targeted.json in KEPT too; the auto-merge kept both keys, which typecheck:test rejects (TS1117). Main's entry stays. * test(mergee85005482): ship size ledger entry for the merged tree (-232 B) Main's ship size ledger plus the wave's entries summed to 345,334 B; the merged tree measures 345,102 B because DRIVER.md takes main's shorter Step 19 line. Recorded with scripts/size-ledger.ts record ship. --------- Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
820 lines
33 KiB
TypeScript
820 lines
33 KiB
TypeScript
/**
|
||
* redact-engine — pure scanning + auto-redaction over the shared taxonomy.
|
||
*
|
||
* No I/O. Deterministic given its one ambient input: `scan()` reads the
|
||
* credential-named variables of `process.env` by value unless `processEnv` is
|
||
* passed (GSTA-104). The CLI shim (`bin/gstack-redact`), the pre-push hook
|
||
* (`bin/gstack-redact-prepush`), and tests all import from here.
|
||
*
|
||
* Key behaviors (locked in /plan-eng-review + two Codex passes):
|
||
* - Normalization BEFORE matching (NFKC + strip zero-width + decode a small
|
||
* set of HTML entities) so Unicode-confusable / zero-width evasion fails.
|
||
* Findings map back to ORIGINAL offsets via an index map.
|
||
* - ReDoS safety: a hard input-size cap that fails CLOSED (oversize input
|
||
* returns a single synthetic HIGH "input too large to scan safely" finding,
|
||
* so callers block rather than skip). Patterns are linear-time (lint-tested).
|
||
* - NO visibility-based tier mutation. `repoVisibility` is recorded on each
|
||
* finding (drives sterner AUQ wording in the skill) but never promotes a
|
||
* MEDIUM to HIGH. (TENSION-2-followup.)
|
||
* - Placeholder suppression is per-matched-span.
|
||
* - Tool-attributed fences (``` ```codex-review ``` / ``` ```review-bot ``` / ``` ```greptile ```)
|
||
* degrade credential findings to a non-blocking WARN — UNLESS the span is a
|
||
* live-format credential the doc-example heuristic can't excuse. No nonce,
|
||
* no trust exemption (the marker scheme was dropped as theater).
|
||
*/
|
||
|
||
import {
|
||
PATTERNS,
|
||
PATTERNS_BY_ID,
|
||
clearStringSpanCache,
|
||
isPlaceholderSpan,
|
||
type RedactPattern,
|
||
type Tier,
|
||
type Category,
|
||
} from "./redact-patterns";
|
||
|
||
export type RepoVisibility = "public" | "private" | "unknown";
|
||
|
||
/** A WARN is a finding that does not block but is surfaced (tool-fence degrade). */
|
||
export type Severity = Tier | "WARN";
|
||
|
||
export interface Finding {
|
||
id: string;
|
||
tier: Tier;
|
||
/** Effective severity after tool-fence degrade. HIGH/MEDIUM/LOW or WARN. */
|
||
severity: Severity;
|
||
category: Category;
|
||
description: string;
|
||
/** 1-based line in the ORIGINAL (un-normalized) text. */
|
||
line: number;
|
||
/** 1-based column in the ORIGINAL text. */
|
||
col: number;
|
||
/** Safe-masked preview (never more than 4 leading chars of the secret). */
|
||
preview: string;
|
||
/** Whether this finding offers one-keystroke auto-redact (PII subset). */
|
||
autoRedactable: boolean;
|
||
/** Repo visibility at scan time — drives sterner AUQ wording, not the tier. */
|
||
repoVisibility: RepoVisibility;
|
||
/** True when degraded to WARN because it sat in a tool-attributed fence. */
|
||
toolFenceDegraded?: boolean;
|
||
}
|
||
|
||
export interface ScanOptions {
|
||
repoVisibility?: RepoVisibility;
|
||
/** Extra allowlist entries (exact strings) that suppress a matched span. */
|
||
allowlist?: string[];
|
||
/** The invoking user's own email (from `git config user.email`) — allowlisted. */
|
||
selfEmail?: string;
|
||
/**
|
||
* Emails already public in the repo (git log authors, package.json, CODEOWNERS).
|
||
* Suppressed for `pii.email` since they're not a new leak.
|
||
*/
|
||
repoPublicEmails?: string[];
|
||
/** Hard byte cap. Oversize input fails CLOSED. Default 1 MiB. */
|
||
maxBytes?: number;
|
||
/**
|
||
* Path of the file the input came from, when known (the pre-push hook's
|
||
* `+++ b/` path, `--from-file`). Lets a pattern tell source syntax from a
|
||
* literal: in a TypeScript/JSX file `session: SessionState,` is a type.
|
||
*/
|
||
sourcePath?: string;
|
||
/**
|
||
* The environment whose credential-named variables (a name whose last
|
||
* `_`-separated word is KEY, TOKEN, SECRET, PASSWORD, PASSWD, PASS, PAT or
|
||
* APIKEY, or that ends in _PWD, any case, carrying no PUBLIC word; see
|
||
* `credentialEnvValues`) are scanned for BY VALUE: wherever one of those
|
||
* values appears in the text it is an `env.value` HIGH finding, whatever its
|
||
* shape, so a value that reached the text (a dumped environment in a tool
|
||
* output, GSTA-96) never reaches a PR body, receipt, report or Drive file.
|
||
* Defaults to `process.env`; pass `{}` to scan without one.
|
||
*/
|
||
processEnv?: Record<string, string | undefined>;
|
||
}
|
||
|
||
export interface ScanResult {
|
||
findings: Finding[];
|
||
counts: { HIGH: number; MEDIUM: number; LOW: number; WARN: number };
|
||
repoVisibility: RepoVisibility;
|
||
/** True when the input-size cap tripped (caller should BLOCK). */
|
||
oversize: boolean;
|
||
}
|
||
|
||
const DEFAULT_MAX_BYTES = 1024 * 1024; // 1 MiB
|
||
|
||
const EMAIL_ALLOW_DOMAINS = [/@example\.(com|org|net)$/i, /@example\.[a-z]{2,}$/i];
|
||
const EMAIL_ALLOW_LOCALPARTS = [/^noreply@/i, /^no-reply@/i, /^donotreply@/i];
|
||
/**
|
||
* Hosts whose `git@<host>` is a git transport endpoint, never a person's
|
||
* mailbox. Matched EXACTLY — a domain that merely starts with "git"
|
||
* (gitmail.com) is a normal domain and must keep firing.
|
||
*/
|
||
const SSH_GIT_HOSTS = new Set([
|
||
"github.com",
|
||
"gitlab.com",
|
||
"bitbucket.org",
|
||
"ssh.dev.azure.com",
|
||
]);
|
||
|
||
// ── Normalization ─────────────────────────────────────────────────────────────
|
||
|
||
const ZERO_WIDTH = /[]/g;
|
||
const HTML_ENTITIES: Record<string, string> = {
|
||
"&": "&",
|
||
"<": "<",
|
||
">": ">",
|
||
""": '"',
|
||
"'": "'",
|
||
"'": "'",
|
||
};
|
||
|
||
/**
|
||
* Normalize text for matching while producing an index map back to the original.
|
||
* Returns the normalized string and a function mapping a normalized offset to
|
||
* the corresponding original offset.
|
||
*
|
||
* Strategy: walk the original char-by-char, applying NFKC per char, dropping
|
||
* zero-width chars, and expanding a small fixed set of HTML entities. Each
|
||
* emitted normalized char records the original offset it came from. This keeps
|
||
* the map exact for the transformations we apply (which are all local).
|
||
*/
|
||
export function normalizeWithMap(input: string): {
|
||
normalized: string;
|
||
map: number[];
|
||
} {
|
||
return normalizeOriginal(input);
|
||
}
|
||
|
||
function normalizeOriginal(input: string, spanEnds?: number[]): { normalized: string; map: number[] } {
|
||
const out: string[] = [];
|
||
const map: number[] = [];
|
||
let i = 0;
|
||
while (i < input.length) {
|
||
// HTML entity expansion (fixed small set; longest first).
|
||
let matchedEntity = false;
|
||
for (const ent in HTML_ENTITIES) {
|
||
if (input.startsWith(ent, i)) {
|
||
const rep = HTML_ENTITIES[ent];
|
||
for (const ch of rep) {
|
||
out.push(ch);
|
||
map.push(i);
|
||
spanEnds?.push(i + ent.length);
|
||
}
|
||
i += ent.length;
|
||
matchedEntity = true;
|
||
break;
|
||
}
|
||
}
|
||
if (matchedEntity) continue;
|
||
|
||
const ch = input[i];
|
||
if (ZERO_WIDTH.test(ch)) {
|
||
ZERO_WIDTH.lastIndex = 0;
|
||
i += 1;
|
||
continue;
|
||
}
|
||
ZERO_WIDTH.lastIndex = 0;
|
||
|
||
const norm = ch.normalize("NFKC");
|
||
for (let j = 0; j < norm.length; j++) {
|
||
out.push(norm[j]);
|
||
map.push(i);
|
||
spanEnds?.push(i + 1);
|
||
}
|
||
i += 1;
|
||
}
|
||
// Sentinel so an offset == length maps to the original length.
|
||
map.push(input.length);
|
||
return { normalized: out.join(""), map };
|
||
}
|
||
|
||
// ── Offset → line/col on the ORIGINAL text ────────────────────────────────────
|
||
|
||
/** Start offset of every line, built once per scan and only when a finding needs it. */
|
||
function lineStarts(original: string): number[] {
|
||
const starts = [0];
|
||
for (let i = 0; i < original.length; i++) if (original[i] === "\n") starts.push(i + 1);
|
||
return starts;
|
||
}
|
||
|
||
/**
|
||
* Binary search over lineStarts: O(log lines) per finding. The previous walk
|
||
* from offset 0 per finding made a match-dense input (a pasted log full of
|
||
* emails and IPs) cost O(findings x bytes) — seconds for a few hundred KiB.
|
||
*/
|
||
function lineColAt(starts: number[], original: string, offset: number): { line: number; col: number } {
|
||
const at = Math.min(Math.max(0, offset), original.length);
|
||
let lo = 0;
|
||
let hi = starts.length - 1;
|
||
while (lo < hi) {
|
||
const mid = (lo + hi + 1) >> 1;
|
||
if (starts[mid] <= at) lo = mid;
|
||
else hi = mid - 1;
|
||
}
|
||
return { line: lo + 1, col: at - starts[lo] + 1 };
|
||
}
|
||
|
||
// ── Safe preview masking ──────────────────────────────────────────────────────
|
||
|
||
/** Show ≤4 leading chars, mask the rest. Never reconstructable. */
|
||
export function maskPreview(span: string): string {
|
||
const visible = span.slice(0, 4);
|
||
const masked = span.length > 4 ? "*".repeat(Math.min(span.length - 4, 8)) : "";
|
||
return `${visible}${masked}${span.length > 12 ? "…" : ""}`;
|
||
}
|
||
|
||
// ── Tool-attributed fence detection ───────────────────────────────────────────
|
||
|
||
const TOOL_FENCE_INFO = /^```(codex-review|review-bot|greptile|eval|codex|tool-output)\b/;
|
||
|
||
/**
|
||
* Returns a sorted list of [start, end) offset ranges (in normalized text) that
|
||
* sit inside a tool-attributed fenced code block. Credential findings inside
|
||
* these ranges degrade to WARN (unless the doc-example heuristic says the span
|
||
* is live-format and must still block).
|
||
*/
|
||
function toolFenceRanges(normalized: string): Array<[number, number]> {
|
||
const ranges: Array<[number, number]> = [];
|
||
const lines = normalized.split("\n");
|
||
let offset = 0;
|
||
let inFence = false;
|
||
let fenceStart = 0;
|
||
for (const ln of lines) {
|
||
const isFenceMarker = ln.startsWith("```");
|
||
if (isFenceMarker) {
|
||
if (!inFence && TOOL_FENCE_INFO.test(ln)) {
|
||
inFence = true;
|
||
fenceStart = offset + ln.length + 1; // content starts after this line
|
||
} else if (inFence) {
|
||
ranges.push([fenceStart, offset]); // up to start of closing fence
|
||
inFence = false;
|
||
}
|
||
}
|
||
offset += ln.length + 1; // +1 for the \n
|
||
}
|
||
if (inFence) ranges.push([fenceStart, normalized.length]); // unterminated → still degrade its own body
|
||
return ranges;
|
||
}
|
||
|
||
function inRanges(offset: number, ranges: Array<[number, number]>): boolean {
|
||
for (const [s, e] of ranges) if (offset >= s && offset < e) return true;
|
||
return false;
|
||
}
|
||
|
||
/**
|
||
* Doc-example heuristic: a credential span inside a tool fence still BLOCKS if
|
||
* it looks like a LIVE credential (not an obvious placeholder/example). We only
|
||
* downgrade-to-WARN spans that are clearly illustrative.
|
||
*/
|
||
function isObviousDocExample(span: string): boolean {
|
||
return isPlaceholderSpan(span);
|
||
}
|
||
|
||
// ── Proximity check ───────────────────────────────────────────────────────────
|
||
|
||
function hasNear(
|
||
normalized: string,
|
||
matchStart: number,
|
||
matchEnd: number,
|
||
nearRegex: RegExp,
|
||
window: number,
|
||
): boolean {
|
||
const from = Math.max(0, matchStart - window);
|
||
const to = Math.min(normalized.length, matchEnd + window);
|
||
const slice = normalized.slice(from, to);
|
||
const re = new RegExp(nearRegex.source, nearRegex.flags.replace(/g/g, ""));
|
||
return re.test(slice);
|
||
}
|
||
|
||
// ── Email allowlist ───────────────────────────────────────────────────────────
|
||
|
||
/**
|
||
* True when the matched "email" is really the user@host of a git SSH remote.
|
||
*
|
||
* `pii.email` matches the `git@github.com` inside
|
||
* `git@github.com:org/repo.git` — a transport identity, not PII. This keys on
|
||
* the surrounding URL SHAPE, not on the `git` local part: allowlisting `git@`
|
||
* outright would also suppress a genuine address at a domain that merely
|
||
* begins with "git" (e.g. git@gitmail.com), turning a false positive into a
|
||
* false negative.
|
||
*
|
||
* Two accepted shapes:
|
||
* - scp-like `<user>@<host>:<path>` where the path ends in `.git`, for any
|
||
* host — this covers self-hosted remotes.
|
||
* - `git@<known-host>` for the major forges, whose bare form appears in docs
|
||
* and in `ssh -T git@github.com` connectivity checks with no path at all.
|
||
*/
|
||
/** Lookahead window for the scp-path suffix check — long enough for any real
|
||
* remote path, bounded so a pathological unbroken line can't grow the scan. */
|
||
const SSH_REMOTE_PATH_LOOKAHEAD_CHARS = 512;
|
||
|
||
function isSshGitRemote(email: string, text: string, spanStart: number): boolean {
|
||
const at = email.lastIndexOf("@");
|
||
if (at < 0) return false;
|
||
const local = email.slice(0, at).toLowerCase();
|
||
const host = email.slice(at + 1).toLowerCase();
|
||
|
||
// Major forges: `git@host`, with or without a trailing path.
|
||
if (local === "git" && SSH_GIT_HOSTS.has(host)) return true;
|
||
|
||
// Any host in `<user>@<host>:<path>.git` position. The path stops at
|
||
// whitespace or a quote so a trailing delimiter never defeats the suffix.
|
||
const rest = text.slice(
|
||
spanStart + email.length,
|
||
spanStart + email.length + SSH_REMOTE_PATH_LOOKAHEAD_CHARS,
|
||
);
|
||
const scp = /^:(?!\/)([^\s'"`<>]*)/.exec(rest);
|
||
if (scp && /\.git\/?$/.test(scp[1])) return true;
|
||
|
||
// ssh:// URL form: ssh://<user>@<host>/<path>.git
|
||
const before = text.slice(Math.max(0, spanStart - 16), spanStart);
|
||
if (/(?:git\+)?ssh:\/\/$/i.test(before)) {
|
||
const slash = /^\/([^\s'"`<>]*)/.exec(rest);
|
||
if (slash && /\.git\/?$/.test(slash[1])) return true;
|
||
}
|
||
|
||
return false;
|
||
}
|
||
|
||
function emailAllowed(
|
||
email: string,
|
||
opts: ScanOptions,
|
||
text: string,
|
||
spanStart: number,
|
||
): boolean {
|
||
const lower = email.toLowerCase();
|
||
if (opts.selfEmail && lower === opts.selfEmail.toLowerCase()) return true;
|
||
if (opts.repoPublicEmails?.some((e) => e.toLowerCase() === lower)) return true;
|
||
if (EMAIL_ALLOW_DOMAINS.some((re) => re.test(email))) return true;
|
||
if (EMAIL_ALLOW_LOCALPARTS.some((re) => re.test(email))) return true;
|
||
if (isSshGitRemote(email, text, spanStart)) return true;
|
||
return false;
|
||
}
|
||
|
||
// ── The scan ──────────────────────────────────────────────────────────────────
|
||
|
||
export function scan(input: string, opts: ScanOptions = {}): ScanResult {
|
||
return scanInternal(input, opts);
|
||
}
|
||
|
||
type OriginalSpan = { start: number; end: number };
|
||
|
||
function scanInternal(input: string, opts: ScanOptions, spans?: Map<Finding, OriginalSpan>): ScanResult {
|
||
const repoVisibility: RepoVisibility = opts.repoVisibility ?? "unknown";
|
||
let starts: number[] | null = null; // line index, built on the first finding
|
||
// #1824: ?? only catches null/undefined, not NaN or <= 0. A bad value
|
||
// (NaN from a malformed --max-bytes, or a negative) would make `byteLen >
|
||
// maxBytes` always false and silently disable the fail-closed oversize guard.
|
||
// Guardrail: any non-finite or non-positive value falls back to the default
|
||
// cap. The CLI is the layer that rejects bad args; this is belt-and-suspenders
|
||
// so the engine never silently runs uncapped.
|
||
const maxBytes =
|
||
Number.isFinite(opts.maxBytes) && (opts.maxBytes as number) > 0
|
||
? (opts.maxBytes as number)
|
||
: DEFAULT_MAX_BYTES;
|
||
|
||
// Fail CLOSED on oversize input. Check byte length BEFORE heavy work.
|
||
const byteLen = Buffer.byteLength(input, "utf8");
|
||
if (byteLen > maxBytes) {
|
||
const finding: Finding = {
|
||
id: "engine.input_too_large",
|
||
tier: "HIGH",
|
||
severity: "HIGH",
|
||
category: "secret",
|
||
description: `Input too large to scan safely (${byteLen} > ${maxBytes} bytes) — blocking fail-closed`,
|
||
line: 1,
|
||
col: 1,
|
||
preview: "",
|
||
autoRedactable: false,
|
||
repoVisibility,
|
||
};
|
||
return {
|
||
findings: [finding],
|
||
counts: { HIGH: 1, MEDIUM: 0, LOW: 0, WARN: 0 },
|
||
repoVisibility,
|
||
oversize: true,
|
||
};
|
||
}
|
||
|
||
const spanEnds: number[] | undefined = spans ? [] : undefined;
|
||
const { normalized, map } = normalizeOriginal(input, spanEnds);
|
||
const fenceRanges = toolFenceRanges(normalized);
|
||
const allow = new Set(opts.allowlist ?? []);
|
||
|
||
const findings: Finding[] = [];
|
||
// Dedup by (id, original-offset) so overlapping global matches don't double-count.
|
||
const seen = new Set<string>();
|
||
|
||
for (const pat of PATTERNS) {
|
||
const re = new RegExp(pat.regex.source, withFlags(pat.regex.flags));
|
||
let m: RegExpExecArray | null;
|
||
while ((m = re.exec(normalized)) !== null) {
|
||
// Guard against zero-width matches looping forever.
|
||
if (m.index === re.lastIndex) re.lastIndex++;
|
||
|
||
const span = m[1] ?? m[0];
|
||
const normOffset = m.indices?.[1]?.[0] ?? m.index;
|
||
|
||
// Per-span placeholder suppression.
|
||
if (isPlaceholderSpan(span)) continue;
|
||
if (allow.has(span)) continue;
|
||
|
||
// Pattern-specific validators (Luhn, entropy, RFC1918, etc).
|
||
if (pat.validate && !pat.validate(span, m, opts)) continue;
|
||
|
||
// Proximity requirement.
|
||
if (
|
||
pat.nearRegex &&
|
||
!hasNear(normalized, m.index, m.index + m[0].length, pat.nearRegex, pat.nearWindow ?? 100)
|
||
) {
|
||
continue;
|
||
}
|
||
|
||
// Email allowlist (layered on top of the pattern).
|
||
if (pat.id === "pii.email" && emailAllowed(span, opts, normalized, normOffset))
|
||
continue;
|
||
|
||
const origOffset = map[Math.min(normOffset, map.length - 1)] ?? 0;
|
||
const key = `${pat.id}:${origOffset}`;
|
||
if (seen.has(key)) continue;
|
||
seen.add(key);
|
||
|
||
starts ??= lineStarts(input);
|
||
const { line, col } = lineColAt(starts, input, origOffset);
|
||
|
||
// Tool-fence degrade: only credential-category, only obvious doc examples.
|
||
let severity: Severity = pat.tier;
|
||
let toolFenceDegraded = false;
|
||
if (
|
||
pat.category === "secret" &&
|
||
inRanges(normOffset, fenceRanges) &&
|
||
isObviousDocExample(span)
|
||
) {
|
||
severity = "WARN";
|
||
toolFenceDegraded = true;
|
||
}
|
||
|
||
const finding: Finding = {
|
||
id: pat.id,
|
||
tier: pat.tier,
|
||
severity,
|
||
category: pat.category,
|
||
description: pat.description,
|
||
line,
|
||
col,
|
||
preview: maskPreview(span),
|
||
autoRedactable: !!pat.autoRedactable,
|
||
repoVisibility,
|
||
...(toolFenceDegraded ? { toolFenceDegraded } : {}),
|
||
};
|
||
findings.push(finding);
|
||
if (spans) {
|
||
const end = spanEnds?.[normOffset + span.length - 1];
|
||
if (end !== undefined && end > origOffset) spans.set(finding, { start: origOffset, end });
|
||
}
|
||
}
|
||
}
|
||
clearStringSpanCache();
|
||
|
||
// Environment values, by exact value: a credential that is already in the
|
||
// process environment needs no shape to be recognized.
|
||
for (const { name, value: raw } of credentialEnvValues(opts.processEnv ?? process.env)) {
|
||
// The text was normalized before matching; the value takes the same form,
|
||
// and the allowlist and placeholder rules see both forms.
|
||
const value = normalizeOriginal(raw).normalized;
|
||
if (allow.has(raw) || allow.has(value) || value.length < MIN_ENV_VALUE_LENGTH || isPlaceholderSpan(value)) continue;
|
||
let from = 0;
|
||
let normOffset: number;
|
||
while ((normOffset = normalized.indexOf(value, from)) !== -1) {
|
||
from = normOffset + value.length;
|
||
const origOffset = map[Math.min(normOffset, map.length - 1)] ?? 0;
|
||
// Keyed on the span, not the offset alone: when one credential's value is
|
||
// a prefix of another's, both findings exist and their spans coalesce.
|
||
const key = `env.value:${origOffset}:${value.length}`;
|
||
if (seen.has(key)) continue;
|
||
seen.add(key);
|
||
starts ??= lineStarts(input);
|
||
const { line, col } = lineColAt(starts, input, origOffset);
|
||
const finding: Finding = {
|
||
id: "env.value",
|
||
tier: "HIGH",
|
||
severity: "HIGH",
|
||
category: "secret",
|
||
description: `Value of the ${name} environment variable`,
|
||
line,
|
||
col,
|
||
// A live credential: the name already says what leaked; show no bytes.
|
||
preview: "********",
|
||
autoRedactable: false,
|
||
repoVisibility,
|
||
};
|
||
findings.push(finding);
|
||
if (spans) {
|
||
const end = spanEnds?.[normOffset + value.length - 1];
|
||
if (end !== undefined && end > origOffset) spans.set(finding, { start: origOffset, end });
|
||
}
|
||
}
|
||
}
|
||
|
||
// Stable order: by line, then col, then id.
|
||
findings.sort((a, b) => a.line - b.line || a.col - b.col || a.id.localeCompare(b.id));
|
||
|
||
const counts = { HIGH: 0, MEDIUM: 0, LOW: 0, WARN: 0 };
|
||
for (const f of findings) counts[f.severity] += 1;
|
||
|
||
return { findings, counts, repoVisibility, oversize: false };
|
||
}
|
||
|
||
const CREDENTIAL_ENV_NAME = /(^|_)(KEY|TOKEN|SECRET|PASSWORD|PASSWD|PASS|PAT|APIKEY)$|_PWD$/i;
|
||
/** Framework-public keys (NEXT_PUBLIC_*_KEY, VITE_PUBLIC_*, *_PUBLIC_KEY) are committed on purpose. */
|
||
const PUBLIC_ENV_NAME = /(^|_)PUBLIC(_|$)/i;
|
||
/** gstack's own credential-named variables whose values are not secrets (bin/gstack-brain-lock.sh sets the lock token). */
|
||
export const NON_SECRET_ENV_NAMES: ReadonlySet<string> = new Set(["GSTACK_BRAIN_LOCK_TOKEN"]);
|
||
const MIN_ENV_VALUE_LENGTH = 8;
|
||
|
||
/**
|
||
* The (name, value) pairs of `env` worth scanning for by value: credential-named
|
||
* variables (the last `_`-separated word is KEY, TOKEN, SECRET, PASSWORD, PASSWD,
|
||
* PASS, PAT or APIKEY, or the name ends in _PWD; names carrying a PUBLIC word and
|
||
* gstack's own non-secret tokens are exempt) whose trimmed value is long enough to
|
||
* be a credential and is not a placeholder. A short or placeholder value would
|
||
* match ordinary prose. There is no path exemption on purpose: a shape rule
|
||
* exempted base64 secrets that start with `/`, and an existence check let the
|
||
* scanned agent exempt a value by creating a path of that name; a path-valued
|
||
* SSL_KEY that must appear in a text goes through `allowlist` where a caller
|
||
* passes one (`gstack-redact`, the pre-push hook), else the variable is set
|
||
* empty for that one command. The value is
|
||
* trimmed, so a key read from a file with a trailing newline still matches its
|
||
* leaked form; it is matched against the normalized text in its own normalized
|
||
* form, so a value NFKC rewrites still finds its leaked bytes.
|
||
*/
|
||
export function credentialEnvValues(env: Record<string, string | undefined>): Array<{ name: string; value: string }> {
|
||
const out: Array<{ name: string; value: string }> = [];
|
||
for (const [name, raw] of Object.entries(env)) {
|
||
if (!CREDENTIAL_ENV_NAME.test(name) || PUBLIC_ENV_NAME.test(name) || NON_SECRET_ENV_NAMES.has(name)) continue;
|
||
const value = raw?.trim() ?? "";
|
||
if (value.length < MIN_ENV_VALUE_LENGTH) continue;
|
||
if (isPlaceholderSpan(value)) continue;
|
||
out.push({ name, value });
|
||
}
|
||
return out;
|
||
}
|
||
|
||
function withFlags(flags: string): string {
|
||
let f = flags;
|
||
if (!f.includes("g")) f += "g";
|
||
if (!f.includes("m")) f += "m";
|
||
if (!f.includes("d")) f += "d";
|
||
return f;
|
||
}
|
||
|
||
// ── Auto-redaction ────────────────────────────────────────────────────────────
|
||
|
||
export interface RedactResult {
|
||
body: string;
|
||
/** ASCII unified-diff preview of the substitutions. */
|
||
diff: string;
|
||
/** Findings that could NOT be auto-redacted (structural-corruption guard). */
|
||
skipped: Finding[];
|
||
}
|
||
|
||
/**
|
||
* Substitute redact tokens for the given finding ids, right-to-left so offsets
|
||
* stay valid. Refuses to redact a span that sits inside a structural token
|
||
* (markdown link target, JSON string value) — those fall back to `skipped` so
|
||
* the skill drops the user to manual edit rather than silently mangling output.
|
||
*/
|
||
export function applyRedactions(
|
||
input: string,
|
||
findingIds: string[],
|
||
opts: ScanOptions = {},
|
||
): RedactResult {
|
||
const ids = new Set(findingIds);
|
||
const spans = new Map<Finding, OriginalSpan>();
|
||
const { findings } = scanInternal(input, opts, spans);
|
||
const targets = findings
|
||
.filter((f) => ids.has(f.id) && f.autoRedactable)
|
||
.map((f) => ({ f, ...(spans.get(f) ?? { start: -1, end: -1 }) }))
|
||
.filter((t) => t.start >= 0);
|
||
|
||
// Right-to-left so earlier offsets remain valid after splicing.
|
||
targets.sort((a, b) => b.start - a.start);
|
||
|
||
const skipped: Finding[] = [];
|
||
const diffLines: string[] = [];
|
||
let body = input;
|
||
|
||
for (const t of targets) {
|
||
const pat = PATTERNS_BY_ID[t.f.id];
|
||
const token = pat?.redactToken ?? "<REDACTED>";
|
||
if (inStructuralToken(body, t.start, t.end)) {
|
||
skipped.push(t.f);
|
||
continue;
|
||
}
|
||
const before = lineContaining(body, t.start);
|
||
body = body.slice(0, t.start) + token + body.slice(t.end);
|
||
const after = lineContaining(body, t.start);
|
||
diffLines.push(`- ${before}`);
|
||
diffLines.push(`+ ${after}`);
|
||
}
|
||
|
||
return { body, diff: diffLines.reverse().join("\n"), skipped };
|
||
}
|
||
|
||
/**
|
||
* Patterns whose regex captures only a MARKER, not the secret payload itself
|
||
* (the PEM header line; the GCP JSON key prefix). Span replacement on these
|
||
* would redact the header and forward the key body — so redactFindingSpans
|
||
* drops the whole payload instead.
|
||
*/
|
||
const MARKER_ONLY_PATTERN_IDS = new Set(["pem.private_key", "gcp.service_account"]);
|
||
|
||
/**
|
||
* Replace EVERY finding's span with `<REDACTED-{id}>`, regardless of tier or
|
||
* autoRedactable. For machine egress surfaces (telemetry error_message,
|
||
* #1947) where structure preservation doesn't matter and fail-closed beats
|
||
* fidelity. Returns null — caller must drop the whole payload — when:
|
||
* - any finding's span cannot be located, or
|
||
* - any finding matched a marker-only pattern (PEM / GCP service-account
|
||
* JSON): their regexes capture the header, not the key material, so a
|
||
* span splice would leak the body that follows the marker.
|
||
* Overlapping spans (e.g. a Bearer token that is also a JWT) are coalesced
|
||
* before splicing so stale offsets never leave partial secret bytes behind.
|
||
* (Contrast applyRedactions, which is the interactive, autoRedactable-only,
|
||
* structure-preserving path.)
|
||
*/
|
||
export function redactFindingSpans(input: string, opts: ScanOptions = {}): string | null {
|
||
const merged = mergedFindingSpans(input, opts);
|
||
return merged && spliceEdits(input, merged.map((m) => ({ start: m.start, end: m.end, text: marker(m.ids) })));
|
||
}
|
||
|
||
/** One replacement on the original text: [start, end) becomes `text`. */
|
||
export interface RedactionEdit {
|
||
start: number;
|
||
end: number;
|
||
text: string;
|
||
}
|
||
|
||
/**
|
||
* redactFindingSpans for a stream declared as JSON (a scanner report: one
|
||
* document, several top-level values, or NDJSON), keeping it parseable. A span
|
||
* inside a string keeps the in-string marker, widened to whole escape
|
||
* sequences; a span inside a number replaces that whole number token with the
|
||
* quoted marker, so `{"max_memory_bytes":1145427776}` stays valid JSON
|
||
* (#3185). A span that touches more than one token, a structural character,
|
||
* whitespace, a literal or a string's quotes returns null (withhold). A
|
||
* stream that does not tokenize as JSON gets the plain splice. Returns the
|
||
* edits (sorted, disjoint, on the original offsets) so a caller can map
|
||
* interleaved runs onto the result.
|
||
*/
|
||
export function redactJsonFindingSpans(input: string, opts: ScanOptions = {}): { body: string; edits: RedactionEdit[] } | null {
|
||
const merged = mergedFindingSpans(input, opts);
|
||
if (!merged) return null;
|
||
const tokens = jsonTokens(input);
|
||
const spans: Array<{ start: number; end: number; ids: string[]; quote: boolean }> = [];
|
||
for (const m of merged) {
|
||
if (!tokens) {
|
||
spans.push({ ...m, quote: false });
|
||
continue;
|
||
}
|
||
let lo = 0, hi = tokens.length;
|
||
while (lo < hi) {
|
||
const mid = (lo + hi) >> 1;
|
||
if (tokens[mid].end <= m.start) lo = mid + 1; else hi = mid;
|
||
}
|
||
const t = tokens[lo];
|
||
if (!t || t.start > m.start || t.end < m.end) return null;
|
||
let span: { start: number; end: number; quote: boolean };
|
||
if (t.kind === "number") span = { start: t.start, end: t.end, quote: true };
|
||
else if (t.kind === "string" && m.start > t.start && m.end < t.end) {
|
||
span = { start: m.start, end: m.end, quote: false };
|
||
for (const [s, e] of t.escapes) {
|
||
if (s < span.start && span.start < e) span.start = s;
|
||
if (s < span.end && span.end < e) span.end = e;
|
||
}
|
||
} else return null;
|
||
const last = spans[spans.length - 1];
|
||
if (last && span.start < last.end) {
|
||
last.end = Math.max(last.end, span.end);
|
||
for (const id of m.ids) if (!last.ids.includes(id)) last.ids.push(id);
|
||
} else spans.push({ ...span, ids: [...m.ids] });
|
||
}
|
||
const edits = spans.map((x) => ({ start: x.start, end: x.end, text: x.quote ? `"${marker(x.ids)}"` : marker(x.ids) }));
|
||
return { body: spliceEdits(input, edits), edits };
|
||
}
|
||
|
||
const marker = (ids: string[]) => `<REDACTED-${ids.join("+")}>`;
|
||
|
||
function spliceEdits(input: string, edits: RedactionEdit[]): string {
|
||
// Right-to-left so earlier offsets remain valid after splicing.
|
||
let body = input;
|
||
for (let i = edits.length - 1; i >= 0; i--) body = body.slice(0, edits[i].start) + edits[i].text + body.slice(edits[i].end);
|
||
return body;
|
||
}
|
||
|
||
/** Every finding's span, coalesced; null when one cannot be located or is marker-only. */
|
||
function mergedFindingSpans(input: string, opts: ScanOptions): Array<{ start: number; end: number; ids: string[] }> | null {
|
||
const spans = new Map<Finding, OriginalSpan>();
|
||
const { findings } = scanInternal(input, opts, spans);
|
||
if (findings.some((f) => MARKER_ONLY_PATTERN_IDS.has(f.id))) return null;
|
||
const targets = findings.map((f) => ({ f, ...(spans.get(f) ?? { start: -1, end: -1 }) }));
|
||
if (targets.some((t) => t.start < 0)) return null;
|
||
|
||
// Coalesce overlapping/touching ranges — splicing two intersecting spans
|
||
// independently applies a stale end offset to already-modified text and
|
||
// can leave trailing secret bytes in place.
|
||
targets.sort((a, b) => a.start - b.start);
|
||
const merged: Array<{ start: number; end: number; ids: string[] }> = [];
|
||
for (const t of targets) {
|
||
const last = merged[merged.length - 1];
|
||
if (last && t.start <= last.end) {
|
||
last.end = Math.max(last.end, t.end);
|
||
if (!last.ids.includes(t.f.id)) last.ids.push(t.f.id);
|
||
} else {
|
||
merged.push({ start: t.start, end: t.end, ids: [t.f.id] });
|
||
}
|
||
}
|
||
return merged;
|
||
}
|
||
|
||
type JsonToken = { kind: "string" | "number" | "other"; start: number; end: number; escapes: Array<[number, number]> };
|
||
const JSON_NUMBER = /-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?/y;
|
||
const JSON_LITERAL = /true|false|null/y;
|
||
|
||
/** Lexical JSON tokens of one or more top-level values (NDJSON included); null when the text is not JSON. */
|
||
function jsonTokens(text: string): JsonToken[] | null {
|
||
const tokens: JsonToken[] = [];
|
||
for (let i = 0; i < text.length;) {
|
||
const c = text[i];
|
||
if (c === " " || c === "\t" || c === "\n" || c === "\r") { i++; continue; }
|
||
if ("{}[]:,".includes(c)) { tokens.push({ kind: "other", start: i, end: i + 1, escapes: [] }); i++; continue; }
|
||
if (c === '"') {
|
||
const escapes: Array<[number, number]> = [];
|
||
let j = i + 1;
|
||
for (;;) {
|
||
if (j >= text.length) return null;
|
||
if (text[j] === '"') break;
|
||
if (text[j] === "\\") {
|
||
const end = j + (text[j + 1] === "u" ? 6 : 2);
|
||
if (end > text.length) return null;
|
||
escapes.push([j, end]);
|
||
j = end;
|
||
} else j++;
|
||
}
|
||
tokens.push({ kind: "string", start: i, end: j + 1, escapes });
|
||
i = j + 1;
|
||
continue;
|
||
}
|
||
let matched = false;
|
||
for (const [kind, pattern] of [["number", JSON_NUMBER], ["other", JSON_LITERAL]] as const) {
|
||
pattern.lastIndex = i;
|
||
if (!pattern.test(text)) continue;
|
||
tokens.push({ kind, start: i, end: pattern.lastIndex, escapes: [] });
|
||
i = pattern.lastIndex;
|
||
matched = true;
|
||
break;
|
||
}
|
||
if (!matched) return null;
|
||
}
|
||
return tokens;
|
||
}
|
||
|
||
function inStructuralToken(body: string, start: number, end: number): boolean {
|
||
// Markdown link target: [text](...span...). The span may sit anywhere inside
|
||
// the parenthesized target (e.g. an email embedded in a URL). Walk backward
|
||
// from the span: if we reach `](` before hitting `)`/whitespace, and forward
|
||
// we reach `)` before whitespace, the span is inside a link target.
|
||
for (let i = start - 1; i >= 0; i--) {
|
||
const ch = body[i];
|
||
if (ch === ")" || ch === "\n" || ch === " " || ch === "\t") break;
|
||
if (ch === "(" && i > 0 && body[i - 1] === "]") {
|
||
for (let j = end; j < body.length; j++) {
|
||
const c = body[j];
|
||
if (c === " " || c === "\t" || c === "\n") break;
|
||
if (c === ")") return true;
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
// JSON string value: "key": "...span..." — span is inside a quoted value.
|
||
const before = body.slice(Math.max(0, start - 80), start);
|
||
const after = body.slice(end, Math.min(body.length, end + 4));
|
||
if (/:\s*"$/.test(before) && /^"/.test(after)) return true;
|
||
return false;
|
||
}
|
||
|
||
function lineContaining(body: string, offset: number): string {
|
||
const start = body.lastIndexOf("\n", offset - 1) + 1;
|
||
let end = body.indexOf("\n", offset);
|
||
if (end === -1) end = body.length;
|
||
return body.slice(start, end);
|
||
}
|
||
|
||
// ── Exit-code helper for the CLI shim ─────────────────────────────────────────
|
||
|
||
/** 0 clean, 2 MEDIUM present (no HIGH), 3 HIGH present. WARN does not gate. */
|
||
export function exitCodeFor(result: ScanResult): 0 | 2 | 3 {
|
||
if (result.counts.HIGH > 0) return 3;
|
||
if (result.counts.MEDIUM > 0) return 2;
|
||
return 0;
|
||
}
|