mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-03 15:27:56 +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>
321 lines
21 KiB
TypeScript
321 lines
21 KiB
TypeScript
/**
|
|
* GST-774: a Capy machine checked out at a PR branch has refs/remotes/origin/HEAD naming that branch and
|
|
* no local main. The default base must not be the checked-out branch (lib/default-base.ts, the GST-511
|
|
* rule), and every base-relative step refuses a base that is HEAD or already contains it while the
|
|
* branch has commits its real base lacks (BASE_CONTAINS_HEAD) instead of reporting no changes. The
|
|
* control is a normal clone on the same feature branch with origin/HEAD naming main and a local main.
|
|
*/
|
|
import { afterAll, beforeAll, describe, expect, test } from 'bun:test';
|
|
import { spawnSync } from 'node:child_process';
|
|
import * as fs from 'node:fs';
|
|
import * as os from 'node:os';
|
|
import * as path from 'node:path';
|
|
import { baseContainsHead, defaultBaseBranch } from '../lib/default-base';
|
|
import { buildContext } from '../lib/pregate/context';
|
|
import { runScriptSync } from '../lib/script-invocation';
|
|
import { extractReceipt } from '../lib/ship-receipt';
|
|
import { bindShippedReceipt } from '../lib/ship-receipt-depth';
|
|
import { resolveBaseBranch } from '../lib/ship-policy';
|
|
|
|
const ROOT = path.resolve(import.meta.dir, '..');
|
|
const BIN = (name: string) => path.join(ROOT, 'bin', name);
|
|
const big = Array.from({ length: 80 }, (_, i) => `exports.f${i} = () => ${i};`).join('\n') + '\n';
|
|
|
|
interface Fx { root: string; origin: string; clone: string; control: string; noMain: string; alias: string; trunk: string; develop: string; home: string; failGh: string; releaseGh: string; env: Record<string, string> }
|
|
let fx: Fx;
|
|
|
|
function run(cmd: string, args: string[], cwd: string, env: Record<string, string> = fx.env) {
|
|
const r = spawnSync(cmd, args, { cwd, encoding: 'utf8', timeout: 60_000, env: { ...process.env, ...env } });
|
|
if (r.status !== 0) throw new Error(`${cmd} ${args.join(' ')} failed in ${cwd}: ${r.stderr}`);
|
|
return (r.stdout ?? '').trim();
|
|
}
|
|
const git = (cwd: string, ...args: string[]) => run('git', args, cwd);
|
|
function bin(name: string, args: string[], cwd: string, extra: Record<string, string> = {}) {
|
|
const r = runScriptSync(BIN(name), args, { cwd, encoding: 'utf8', timeout: 120_000, maxBuffer: 64 * 1024 * 1024, env: { ...process.env, ...fx.env, ...extra } });
|
|
return { status: r.status, out: r.stdout ?? '', err: r.stderr ?? '' };
|
|
}
|
|
function withEnv<T>(env: Record<string, string>, fn: () => T): T {
|
|
const saved = Object.fromEntries(Object.keys(env).map(k => [k, process.env[k]]));
|
|
Object.assign(process.env, env);
|
|
try { return fn(); } finally { for (const [k, v] of Object.entries(saved)) { if (v === undefined) delete process.env[k]; else process.env[k] = v; } }
|
|
}
|
|
const stub = (dir: string, body: string) => { fs.mkdirSync(dir, { recursive: true }); fs.writeFileSync(path.join(dir, 'gh'), `#!/bin/sh\n${body}\n`, { mode: 0o755 }); return dir; };
|
|
|
|
beforeAll(() => {
|
|
const root = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'gst774-')));
|
|
expect(spawnSync('git', ['rev-parse', '--show-toplevel'], { cwd: root, encoding: 'utf8', timeout: 10_000 }).status).not.toBe(0);
|
|
const home = path.join(root, 'home');
|
|
fs.mkdirSync(home);
|
|
const gitconfig = path.join(root, 'gitconfig');
|
|
fs.writeFileSync(gitconfig, '[user]\n\tname = fixture\n\temail = fixture@test\n[commit]\n\tgpgsign = false\n[init]\n\tdefaultBranch = main\n');
|
|
const failGh = stub(path.join(root, 'gh-fail'), 'exit 1');
|
|
const releaseGh = stub(path.join(root, 'gh-release'), 'echo release');
|
|
const env = { HOME: home, GSTACK_STATE_ROOT: home, GSTACK_HOME: home, GIT_CONFIG_GLOBAL: gitconfig, GIT_CONFIG_NOSYSTEM: '1', PATH: `${failGh}${path.delimiter}${process.env.PATH}` };
|
|
fx = { root, origin: path.join(root, 'origin.git'), clone: path.join(root, 'clone'), control: path.join(root, 'control'), noMain: path.join(root, 'nomain'), alias: path.join(root, 'alias'), trunk: path.join(root, 'trunk'), develop: path.join(root, 'develop'), home, failGh, releaseGh, env };
|
|
const seed = path.join(root, 'seed');
|
|
run('git', ['init', '-q', '--bare', '-b', 'main', fx.origin], root);
|
|
run('git', ['init', '-q', '-b', 'main', seed], root);
|
|
fs.mkdirSync(path.join(seed, 'lib'));
|
|
fs.writeFileSync(path.join(seed, 'README.md'), '# fixture\n');
|
|
fs.writeFileSync(path.join(seed, 'lib', 'app.js'), 'exports.app = () => 1;\n');
|
|
git(seed, 'add', '-A');
|
|
git(seed, 'commit', '-qm', 'seed');
|
|
expect(git(seed, 'log', '-1', '--format=%an <%ae>')).toBe('fixture <fixture@test>');
|
|
git(seed, 'remote', 'add', 'origin', fx.origin);
|
|
git(seed, 'push', '-q', 'origin', 'main', 'main:release');
|
|
git(seed, 'checkout', '-q', '-b', 'pr-branch');
|
|
fs.writeFileSync(path.join(seed, 'lib', 'big.js'), big);
|
|
git(seed, 'add', '-A');
|
|
git(seed, 'commit', '-qm', 'pr change');
|
|
git(seed, 'push', '-q', 'origin', 'pr-branch');
|
|
|
|
run('git', ['clone', '-q', '--branch', 'pr-branch', fx.origin, fx.clone], root);
|
|
git(fx.clone, 'symbolic-ref', 'refs/remotes/origin/HEAD', 'refs/remotes/origin/pr-branch');
|
|
run('git', ['clone', '-q', fx.origin, fx.control], root);
|
|
git(fx.control, 'checkout', '-q', '-b', 'pr-branch', 'origin/pr-branch');
|
|
|
|
const nomainOrigin = path.join(root, 'nomain.git');
|
|
run('git', ['clone', '-q', '--bare', fx.origin, nomainOrigin], root);
|
|
git(nomainOrigin, 'branch', '-m', 'main', 'trunk');
|
|
git(nomainOrigin, 'symbolic-ref', 'HEAD', 'refs/heads/trunk');
|
|
run('git', ['clone', '-q', '--branch', 'pr-branch', nomainOrigin, fx.noMain], root);
|
|
git(fx.noMain, 'symbolic-ref', 'refs/remotes/origin/HEAD', 'refs/remotes/origin/pr-branch');
|
|
git(fx.noMain, 'remote', 'set-url', 'origin', path.join(root, 'offline.git'));
|
|
run('git', ['clone', '-q', nomainOrigin, fx.trunk], root);
|
|
|
|
run('git', ['clone', '-q', fx.origin, fx.alias], root);
|
|
git(fx.alias, 'checkout', '-q', '-b', 'work', '--track', 'origin/pr-branch');
|
|
git(fx.alias, 'symbolic-ref', 'refs/remotes/origin/HEAD', 'refs/remotes/origin/pr-branch');
|
|
|
|
const developOrigin = path.join(root, 'develop.git');
|
|
run('git', ['clone', '-q', '--bare', fx.origin, developOrigin], root);
|
|
git(developOrigin, 'branch', 'develop', 'pr-branch');
|
|
git(developOrigin, 'symbolic-ref', 'HEAD', 'refs/heads/develop');
|
|
run('git', ['clone', '-q', developOrigin, fx.develop], root);
|
|
});
|
|
afterAll(() => { if (fx) fs.rmSync(fx.root, { recursive: true, force: true }); });
|
|
|
|
describe('the fixture is the reported checkout', () => {
|
|
// Value: protects=every case below reads the GST-774 shape, outside any checkout and with its own state root; fails_when=the
|
|
// clone has a local main or origin/HEAD names main, or state resolves into the operator's root; seam=none
|
|
test('the clone is on the PR branch, origin/HEAD names it, there is no local main, and state resolves into the fixture', () => {
|
|
expect(git(fx.clone, 'symbolic-ref', '--short', 'HEAD')).toBe('pr-branch');
|
|
expect(git(fx.clone, 'symbolic-ref', 'refs/remotes/origin/HEAD')).toBe('refs/remotes/origin/pr-branch');
|
|
expect(spawnSync('git', ['rev-parse', '--verify', '--quiet', 'refs/heads/main'], { cwd: fx.clone, timeout: 10_000 }).status).not.toBe(0);
|
|
expect(git(fx.clone, 'rev-parse', 'origin/main')).toBe(git(fx.control, 'rev-parse', 'main'));
|
|
expect(git(fx.control, 'symbolic-ref', 'refs/remotes/origin/HEAD')).toBe('refs/remotes/origin/main');
|
|
expect(git(fx.clone, 'rev-parse', '--show-toplevel')).toBe(fx.clone);
|
|
expect(bin('gstack-paths', ['--get', 'GSTACK_STATE_ROOT'], fx.clone).out.trim()).toBe(fx.home);
|
|
const slug = bin('gstack-slug', ['--get', 'SLUG'], fx.clone);
|
|
expect(slug.status).toBe(0);
|
|
expect(slug.out.trim()).not.toBe('');
|
|
});
|
|
});
|
|
|
|
describe('resolveBaseBranch skips an origin/HEAD that names the checked-out branch', () => {
|
|
// Value: protects=ship-queue, pregate and the receipt writer default to the PR's real base, never the branch itself; fails_when=
|
|
// origin/HEAD naming the PR branch is taken as the base; seam=lib/default-base.ts
|
|
test('origin/main on the bug checkout, the PR base when gh names one, explicit --base as given; the control is unchanged', () => {
|
|
withEnv(fx.env, () => {
|
|
expect(resolveBaseBranch(fx.clone)).toBe('main');
|
|
expect(resolveBaseBranch(fx.clone, 'pr-branch')).toBe('pr-branch');
|
|
expect(resolveBaseBranch(fx.control)).toBe('main');
|
|
git(fx.control, 'checkout', '-q', 'main');
|
|
try { expect(resolveBaseBranch(fx.control)).toBe('main'); } finally { git(fx.control, 'checkout', '-q', 'pr-branch'); }
|
|
});
|
|
withEnv({ ...fx.env, PATH: `${fx.releaseGh}${path.delimiter}${process.env.PATH}` }, () => expect(resolveBaseBranch(fx.clone)).toBe('release'));
|
|
});
|
|
});
|
|
|
|
describe('the review depth ship-queue ready binds', () => {
|
|
// Value: protects=a READY on the bug checkout binds the 80-line diff's real depth inputs (light under R51, runtime_lines=80);
|
|
// fails_when=the queue compares the PR head with itself and reports runtime_lines=0; seam=bindShippedReceipt
|
|
test('origin/<PR branch> refuses BASE_CONTAINS_HEAD; the resolved default base binds runtime_lines=80; the control binds the same', () => {
|
|
const body = path.join(fx.root, 'body.md');
|
|
const w = bin('gstack-ship-receipt', ['write', '--pr', '7', '--base', 'main', '--version', '1.0.0', '--session-kind', 'unattended', '--body', body], fx.clone);
|
|
expect(w.status, w.err).toBe(0);
|
|
const text = fs.readFileSync(body, 'utf8');
|
|
expect(extractReceipt(text).receipt!.review_depth).toMatchObject({ depth: 'light', runtime_lines: 80 });
|
|
const head = git(fx.clone, 'rev-parse', 'HEAD');
|
|
withEnv(fx.env, () => {
|
|
const self = bindShippedReceipt(fx.clone, 'origin/pr-branch', text, '7', [head]);
|
|
expect(self.ok).toBe(false);
|
|
if (self.ok) return;
|
|
expect(self.code as string).toBe('BASE_CONTAINS_HEAD');
|
|
expect(self.message).toContain(head.slice(0, 12));
|
|
const real = bindShippedReceipt(fx.clone, `origin/${resolveBaseBranch(fx.clone)}`, text, '7', [head]);
|
|
expect(real.ok && real.depthLine).toContain('receipt=light required=light runtime_lines=80 class=code');
|
|
const control = bindShippedReceipt(fx.control, `origin/${resolveBaseBranch(fx.control)}`, text, '7', [head]);
|
|
expect(control.ok && control.depthLine).toContain('receipt=light required=light runtime_lines=80 class=code');
|
|
});
|
|
}, 120_000);
|
|
});
|
|
|
|
describe('gstack-review-plan', () => {
|
|
// Value: protects=/ship's review plan never plans light for a diff it compared with itself; fails_when=--base <PR branch> plans
|
|
// REVIEW_DEPTH light runtime_lines=0; seam=bin/gstack-review-plan
|
|
test('--base <PR branch> refuses; --base main plans the same depth on the bug checkout and the control; main itself plans an empty diff', () => {
|
|
const self = bin('gstack-review-plan', ['--base', 'pr-branch'], fx.clone);
|
|
expect(self.status).toBe(1);
|
|
expect(self.err).toContain('(BASE_CONTAINS_HEAD)');
|
|
const depth = (out: string) => /^REVIEW_DEPTH: .*$/m.exec(out)?.[0];
|
|
const real = bin('gstack-review-plan', ['--base', 'main'], fx.clone);
|
|
expect(real.status, real.err).toBe(0);
|
|
expect(depth(real.out)).toContain('REVIEW_DEPTH: light runtime_lines=80');
|
|
const control = bin('gstack-review-plan', ['--base', 'main'], fx.control);
|
|
expect(depth(control.out)).toBe(depth(real.out));
|
|
git(fx.control, 'checkout', '-q', 'main');
|
|
try {
|
|
const onMain = bin('gstack-review-plan', ['--base', 'main'], fx.control);
|
|
expect(onMain.status, onMain.err).toBe(0);
|
|
expect(depth(onMain.out)).toContain('runtime_lines=0');
|
|
} finally { git(fx.control, 'checkout', '-q', 'pr-branch'); }
|
|
}, 120_000);
|
|
});
|
|
|
|
describe('the pregate base and the sealed policy base', () => {
|
|
// Value: protects=the pregate selects the PR's files and reads the base branch's policy, never the PR branch's; fails_when=the
|
|
// default base is the PR branch, so 0 files are touched and the policy is the PR's own; seam=buildContext, cmdSealed
|
|
const load = (cwd: string, base: string) => buildContext({ repoRoot: cwd, base, policyFrom: 'base', allowRepoCommands: false, cores: 64, testBackend: 'local', env: { ...process.env, ...fx.env }, progress: () => {} });
|
|
test('the default base is main with the PR file touched; an explicit PR-branch base refuses; the control and main itself are unchanged', () => {
|
|
withEnv(fx.env, () => {
|
|
const bug = load(fx.clone, resolveBaseBranch(fx.clone));
|
|
expect('ctx' in bug && { base: bug.ctx.base, touched: bug.ctx.touched.map(t => t.path) }).toEqual({ base: 'main', touched: ['lib/big.js'] });
|
|
const self = load(fx.clone, 'pr-branch');
|
|
expect('refused' in self && (self.refused.code as string)).toBe('BASE_CONTAINS_HEAD');
|
|
const control = load(fx.control, resolveBaseBranch(fx.control));
|
|
expect('ctx' in control && { base: control.ctx.base, touched: control.ctx.touched.map(t => t.path) }).toEqual({ base: 'main', touched: ['lib/big.js'] });
|
|
git(fx.control, 'checkout', '-q', 'main');
|
|
try {
|
|
const onMain = load(fx.control, resolveBaseBranch(fx.control));
|
|
expect('ctx' in onMain && onMain.ctx.touched).toEqual([]);
|
|
} finally { git(fx.control, 'checkout', '-q', 'pr-branch'); }
|
|
});
|
|
}, 120_000);
|
|
|
|
test('sealed reads the policy from origin/main by default and refuses an explicit PR-branch base', () => {
|
|
const bug = bin('gstack-pregate', ['sealed'], fx.clone);
|
|
expect(bug.status, bug.err).toBe(0);
|
|
expect(bug.out).toContain('policy=no sealed key on refs/remotes/origin/main or HEAD');
|
|
const self = bin('gstack-pregate', ['sealed', '--base', 'pr-branch'], fx.clone);
|
|
expect(self.status).not.toBe(0);
|
|
expect(self.err).toContain('(BASE_CONTAINS_HEAD)');
|
|
const control = bin('gstack-pregate', ['sealed'], fx.control);
|
|
expect(control.out).toBe(bug.out);
|
|
}, 120_000);
|
|
});
|
|
|
|
describe('gstack-gate-diff and gstack-diff-scope defaults', () => {
|
|
// Value: protects=the gate scan and the scope flags read the PR's diff on the bug checkout; fails_when=the default base is the
|
|
// PR branch, so the scan lists nothing and every scope flag is false with exit 0; seam=lib/gate-diff/git.ts, bin/gstack-diff-scope
|
|
test('gate-diff: the default diffs against origin/main like the control; the PR branch refuses; no resolvable default fails closed', () => {
|
|
const summary = (out: string) => /^GATE_SUMMARY: .*$/m.exec(out)?.[0];
|
|
const bug = bin('gstack-gate-diff', [], fx.clone);
|
|
expect(bug.status, bug.out + bug.err).toBe(0);
|
|
const control = bin('gstack-gate-diff', [], fx.control);
|
|
expect(control.status, control.out + control.err).toBe(0);
|
|
expect(summary(bug.out)).toBe(summary(control.out));
|
|
expect(summary(bug.out)).toContain('unmatched=1');
|
|
const self = bin('gstack-gate-diff', ['pr-branch'], fx.clone);
|
|
expect(self.status).toBe(2);
|
|
expect(self.out).toStartWith('GATE_ERROR=base_contains_head ref=pr-branch');
|
|
const none = bin('gstack-gate-diff', [], fx.noMain);
|
|
expect(none.status).toBe(2);
|
|
expect(none.out).toStartWith('GATE_ERROR=no_base ref=origin/HEAD target=origin/pr-branch');
|
|
}, 120_000);
|
|
|
|
test('diff-scope: the default reads the PR file like the control; the PR branch refuses; main and a fresh branch keep today\'s output', () => {
|
|
const bug = bin('gstack-diff-scope', [], fx.clone);
|
|
expect(bug.status, bug.out + bug.err).toBe(0);
|
|
expect(bug.out).toContain('SCOPE_BACKEND=true');
|
|
const control = bin('gstack-diff-scope', [], fx.control);
|
|
expect(control.out).toBe(bug.out);
|
|
const self = bin('gstack-diff-scope', ['pr-branch'], fx.clone);
|
|
expect(self.status).toBe(2);
|
|
expect(self.out).toContain('SCOPE_ERROR=base_contains_head');
|
|
const none = bin('gstack-diff-scope', [], fx.noMain);
|
|
expect(none.status).toBe(2);
|
|
expect(none.out).toContain('SCOPE_ERROR=no_base');
|
|
git(fx.control, 'checkout', '-q', 'main');
|
|
try {
|
|
const onMain = bin('gstack-diff-scope', [], fx.control);
|
|
expect(onMain.status).toBe(0);
|
|
expect(onMain.out).not.toContain('=true');
|
|
git(fx.control, 'checkout', '-q', '-b', 'fresh');
|
|
fs.writeFileSync(path.join(fx.control, 'lib', 'app.js'), 'exports.app = () => 2;\n');
|
|
const fresh = bin('gstack-diff-scope', ['main'], fx.control);
|
|
expect(fresh.status, fresh.out).toBe(0);
|
|
expect(fresh.out).toContain('SCOPE_BACKEND=true');
|
|
} finally { git(fx.control, 'checkout', '-q', '--', 'lib/app.js'); git(fx.control, 'checkout', '-q', 'pr-branch'); }
|
|
}, 120_000);
|
|
});
|
|
|
|
describe('the docs-audit base', () => {
|
|
// Value: protects=/ship's documentation audit selects the PR's files; fails_when=the snapshot's base is the PR head, so it
|
|
// selects nothing and every later freshness check passes; seam=bin/gstack-docs-candidate snapshot
|
|
test('snapshot refuses a base that is HEAD; the merge base with origin/main selects the PR file like the control', () => {
|
|
const snap = (cwd: string, base: string, name: string) => bin('gstack-docs-candidate', ['snapshot', '--out', path.join(fx.root, `${name}.json`), '--audit-id', name, '--mode', 'read-only', '--base', base], cwd);
|
|
const self = snap(fx.clone, git(fx.clone, 'rev-parse', 'origin/pr-branch'), 'self');
|
|
expect(self.status).not.toBe(0);
|
|
expect(self.err).toContain('(BASE_CONTAINS_HEAD)');
|
|
const real = snap(fx.clone, git(fx.clone, 'merge-base', 'origin/main', 'HEAD'), 'real');
|
|
expect(real.status, real.err).toBe(0);
|
|
expect(real.out).toContain('committed: "lib/big.js"');
|
|
const control = snap(fx.control, git(fx.control, 'merge-base', 'origin/main', 'HEAD'), 'control');
|
|
expect(control.out.split('\n').slice(2).join('\n')).toBe(real.out.split('\n').slice(2).join('\n'));
|
|
}, 120_000);
|
|
});
|
|
|
|
describe('baseContainsHead keeps today\'s result where the branch is not compared with itself', () => {
|
|
// Value: protects=the guard refuses only a self-comparison and never the base branch, a detached checkout or a fresh branch;
|
|
// fails_when=the refusal fires on main, on a CI-style detached HEAD or on a branch with only uncommitted work; seam=lib/default-base.ts
|
|
test('null on main, detached at the PR head and on a fresh branch; a PR head the base contains refuses; no default resolves past a skipped origin/HEAD', () => {
|
|
withEnv(fx.env, () => {
|
|
const head = git(fx.clone, 'rev-parse', 'HEAD');
|
|
expect(baseContainsHead(fx.clone, 'origin/pr-branch')).toContain('on pr-branch, whose commits origin/main lacks; the real base is main');
|
|
expect(baseContainsHead(fx.clone, 'origin/main')).toBeNull();
|
|
expect(baseContainsHead(fx.clone, 'origin/pr-branch', head)).toContain(`the head ${head.slice(0, 12)}`);
|
|
expect(baseContainsHead(fx.clone, 'origin/main', head)).toBeNull();
|
|
git(fx.clone, 'checkout', '-q', '--detach', head);
|
|
try { expect(baseContainsHead(fx.clone, 'origin/pr-branch')).toBeNull(); } finally { git(fx.clone, 'checkout', '-q', 'pr-branch'); }
|
|
git(fx.control, 'checkout', '-q', 'main');
|
|
try {
|
|
expect(baseContainsHead(fx.control, 'origin/main')).toBeNull();
|
|
git(fx.control, 'checkout', '-q', '-b', 'fresh-2');
|
|
expect(baseContainsHead(fx.control, 'origin/main')).toBeNull();
|
|
expect(bin('gstack-review-plan', ['--base', 'main'], fx.control).status).toBe(0);
|
|
} finally { git(fx.control, 'checkout', '-q', 'pr-branch'); }
|
|
expect(defaultBaseBranch(fx.noMain)).toEqual({ branch: null, skipped: { remote: 'origin', branch: 'pr-branch' } });
|
|
expect(defaultBaseBranch(fx.control)).toEqual({ branch: 'main', remote: 'origin' });
|
|
});
|
|
}, 120_000);
|
|
});
|
|
|
|
describe('a remote HEAD naming the branch under another name is skipped; a real default branch is kept', () => {
|
|
// Value: protects=a local branch tracking the PR branch, one cut from its tip, and a detached checkout of it never take the PR
|
|
// branch as their base, while a repository whose default is develop or trunk keeps it; fails_when=the skip compares names only,
|
|
// so a differently named checkout reads the PR against itself (an empty diff with exit 0), or the skip falls through to a
|
|
// stale main or to no base on the default branch itself; why_new=the outside voice and the adversarial pass reproduced both;
|
|
// seam=lib/default-base.ts
|
|
test('upstream, same commit and detached checkouts resolve main; develop and trunk resolve from the remote\'s live HEAD', () => {
|
|
withEnv(fx.env, () => {
|
|
expect(defaultBaseBranch(fx.alias).branch).toBe('main');
|
|
expect(baseContainsHead(fx.alias, 'origin/pr-branch')).toContain('on work, whose commits origin/main lacks; the real base is main');
|
|
const aliased = bin('gstack-diff-scope', [], fx.alias);
|
|
expect(aliased.status, aliased.out).toBe(0);
|
|
expect(aliased.out).toContain('SCOPE_BACKEND=true');
|
|
git(fx.alias, 'checkout', '-q', '--no-track', '-b', 'work-2', 'origin/pr-branch');
|
|
try { expect(defaultBaseBranch(fx.alias).branch).toBe('main'); } finally { git(fx.alias, 'checkout', '-q', 'work'); }
|
|
git(fx.alias, 'checkout', '-q', '--detach', 'origin/pr-branch');
|
|
try { expect(defaultBaseBranch(fx.alias).branch).toBe('main'); } finally { git(fx.alias, 'checkout', '-q', 'work'); }
|
|
expect(defaultBaseBranch(fx.trunk)).toEqual({ branch: 'trunk', remote: 'origin', skipped: { remote: 'origin', branch: 'trunk' } });
|
|
expect(defaultBaseBranch(fx.develop).branch).toBe('develop');
|
|
for (const cwd of [fx.trunk, fx.develop]) {
|
|
const onDefault = bin('gstack-diff-scope', [], cwd);
|
|
expect(onDefault.status, onDefault.out).toBe(0);
|
|
expect(onDefault.out).not.toContain('=true');
|
|
}
|
|
});
|
|
}, 120_000);
|
|
});
|