mirror of
https://github.com/garrytan/gstack.git
synced 2026-08-31 10:20:42 +02:00
* feat(autoplan): eng review always runs last — the gate reviews the final amended plan Reorder the pipeline to CEO -> Design (if UI scope) -> DX (if developer-facing scope) -> Eng. The old order (CEO -> Design -> Eng -> DX) let DX findings land AFTER the required gate signed off, so eng validated a stale plan. Accept-all semantics made explicit: every AskUserQuestion resolves to the recommended option; premises no longer pause the pipeline mid-run (clearly-wrong ones queue as User-Challenge items at the single Final Approval Gate). Eng's Codex voice now sees the DX consensus summary. New free static test pins the order; the chain E2E gains DX-between and Eng-terminal assertions. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(review): simplification specialist — advisory over-engineering lens with ponytail's tag vocabulary New 8th Review Army specialist (DIFF_LINES > 100, --simplification force flag) hunting unrequested STRUCTURE only: delete/stdlib/native/speculative/shrink closed tags, one-line findings, lines_removable field. speculative: replaces ponytail's yagni: tag — we import the lens, not the posture; coverage stays sacred (Completeness Gaps owns it, suppressions inlined, shrink needs >=5 lines). Advisory carve-out in the merge step: advisory findings are excluded from quality_score and the findings-count header, render with an [ADVISORY] label, and are ASK-only in Fix-First. Zero-findings case prints the lens-scoped 'Simplification: lean already — nothing to cut.' from the PARENT (the specialist keeps the exact NO FINDINGS contract); with findings, the parent prints 'net: -N lines possible' summed from lines_removable. Tests: static pins for the carve-out + early-out contract (gen-skill-docs), two periodic e2e cases with planted fixtures — activation (over-build traps: hand-rolled Intl, one-impl abstract, dead config) and false-flag precision (a lean ETHOS 'choose A' diff must yield NO FINDINGS). Inspired by dietrichgebert/ponytail's /ponytail-review. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(preamble): reuse ladder in Search Before Building — rungs 2-5 of ponytail's ladder, completeness kept Tier-3+ skills gain a per-edit reflex the section only stated as research discipline: before writing new code, stop at the first rung that holds — repo helper, stdlib, native platform feature, installed dependency — then build the COMPLETE version of what remains. The closing clause is the explicit reconciliation with Boil the Ocean: the ladder governs structure, never coverage. Rungs 1/6/7 (YAGNI / one line / minimum that works) are deliberately NOT imported. Also ports ponytail's root-cause rule: one guard in the shared function beats a guard in every caller. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(preamble): bounded-closer output rule for tier-2+ skills After completing work, skills report in a few short lines — what changed, what was skipped, what to watch — and cut any explanation that outgrows the change. Explicit exemptions protect every mandated output: decision briefs, completion-status blocks, user-requested explanations, and report-shaped skills' report formats (the report IS the work in /qa-only, /plan-*-review, /retro, /document-generate). Rationale is signal-to-noise, not tokens: ponytail's own benchmark shows terse prose alone doesn't cut cost (caveman arm: -20% LOC, +7% tokens), and independent replications found its 'skipped on purpose' essays ate the code savings. Includes a good/bad closer example pair per the model-overlay guidance that a positive example beats a 'don't be verbose' instruction. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(resolvers): terse-mode savings claim matches measurement — 2.6KB, not 3-5KB Measured on the v1.71 render: --explain-level=terse saves exactly 2,611 bytes per tier-2+ skill. The old ~3-5KB claim predated the preamble restructuring. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(retro,preamble): gstack-shortcut debt ledger — accepted shortcuts leave a joined trail When the user accepts an option that is BOTH Completeness <= 7 AND a durable-scope call, the decision ledger entry (gstack-decision-log, ceiling + upgrade trigger in the rationale) is the source of truth, and the agent marks each cut corner in code with gstack-shortcut(dec-<id>): <ceiling>, upgrade when <trigger> — same edit, no follow-up question, never agent-initiated. /retro Step 11.5 harvests markers into a debt ledger (grep || true — zero matches is the healthy case; skill installs and docs excluded), joins on the decision id so nothing double-counts, tags unlinked and no-trigger rot risks, and closes with 'N markers, M with no trigger.' /review suppressions: a marker with ceiling+trigger downgrades a would-be Completeness Gaps finding to acknowledged debt. Redaction test pins that the marker ships untouched (the ledger is the point) — it does not match the TODO(owner) hygiene shape. Format from dietrichgebert/ponytail's ponytail-debt; store inverted to gstack's existing decision ledger. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: refresh golden ship baselines after preamble additions (reuse ladder + bounded closer) The golden-file regression test pins the rendered ship skill byte-for-byte; the WS3/WS7 preamble sections are deliberate changes, so the baselines re-capture per the goldens' own update protocol. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(hosts): instruction-only tier — a 2KB committed rules digest any agent host can read New agents-digest/gstack-AGENTS.md (1,765 bytes, hard 2,048-byte budget): gstack's ethos one-liners, the reuse ladder, and voice rules for hosts with no install arm — Zed, Amp, Jules, or any AGENTS.md-reading agent. Generated by scripts/gen-agents-digest.ts, auto-refreshed by gen:skill-docs, committed like llms.txt so setup's explainer arms can point at it before any toolchain exists. First line carries the gstack version as its own staleness nudge. Delivery is print-path + user-performed copy ONLY: setup never writes or overwrites a user's AGENTS.md (a test pins this — no cp/ln/mv/redirect into AGENTS.md anywhere in setup). openclaw and hermes explainer arms print the path; slate keeps routing to the full Claude install and gbrain ships from its own repo. HostConfig gains the optional install.instructionTier slot, declared by both instruction-tier hosts. README host table now matches what setup actually does. Inspired by dietrichgebert/ponytail's instruction-tier AGENTS.md fallback — one generated source, never per-host hand copies. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(preamble): AskUserQuestion repetition cut — gated, passed NOT-WORSE A/B Removes the duplicate statements v1.71's compaction left in the AskUserQuestion Format section: the completeness rule restated in the prose triad, the auto-decide marker syntax stated twice, the Conductor-flakiness explanation stated twice, and the self-check's full triad restatement. Every verbosity floor and all 14 format pins stay (Layer 0 green). The gate this decision rested on ran before landing (new periodic skill-e2e-auq-repetition-cut-ab.test.ts, pre-cut ref3263fffevs this render, same harness as auq-verbose-vs-carved-ab): POST 7/7 format elements, substance 5 — identical to PRE. No degradation; the load-bearing-repetition hypothesis did not hold for these duplicates. Net: -236 bytes per tier-2+ skill (~9.7KB corpus). Golden ship baselines re-captured for the deliberate change. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(evals): with-skill vs without-skill arm benchmark — measures whether gstack's behavioral layer earns its tokens Ponytail's honest-benchmark method pointed at gstack itself: 3 build-shaped tasks (native-platform over-build trap, CRUD endpoint, bug fix with planted decoys) x 2 arms, real claude -p sessions, scored on the git diff left behind. A research instrument, not a release gate — no assertion compares arm scores. Arms use the PROVEN project-scope pattern: the with-arm installs a build-discipline skill (extracted reuse-ladder + bounded-closer content, not whole-file copies) into the fixture's .claude/skills/ with a CLAUDE.md routing line and an explicit invocation; a live spike confirmed claude -p discovers and invokes project-scope skills via the Skill tool (3 turns, exact-output probe). Fixtures are git init + local bare origin; diff capture is three lines of git, no worktree machinery. Failure taxonomy: zero-diff arms are VALID scored cells (deterministic 0/none, no API call), harvest failures record harvest:null, judge_error cells are excluded from aggregates but named in the report — nothing drops silently. armJudge: fixed sonnet judge, 0-3 unrequested-structure rubric, must name the construct or say none, bounded retry-on-malformed; callJudge gains optional temperature/max_tokens (defaults unchanged). recordE2E now populates tokens_used for every E2E. Eval schema v2: harvest gains {insertions, deletions, net}, tolerant reads keep v1 runs comparable. Registered periodic in E2E_TIERS + touchfiles (with the auq-repetition-cut A/B); periodic detach timeout raised to the new shard-census floor. Free selftest (8 tests, zero API) pins fixtures, extraction, arm asymmetry, diff capture, judge plumbing, and the retry bound. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: absorb the ponytail-import wave into the guard fixtures — ceilings, schema pin, triad phrasing Skeleton ceilings re-captured for the 17 carved skills the wave deliberately grew (reuse ladder + bounded closer + shortcut trail, net of the gated -236B AUQ cut), each with its measured size in the comment per the carve-guards protocol. eval-store schema pin updated to v2 (harvest gains insertions/deletions/net). The AUQ prose-triad keeps its pinned per-choice phrasing ('explicit on EACH choice') while still deferring the score scale to the canonical Format rule — the shipped cut is strictly closer to the pre-cut text than the render that already passed the NOT-WORSE gate. Autoplan carve anchors follow the Phase 2.5 renumbering. Golden ship baselines re-captured. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: observability partial-file pin follows eval-store schema v2 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(test-runner): GSTACK_FREE_JOBS + opt-in flaky-retry pass for syscall-supervised sandboxes GSTACK_FREE_JOBS overrides the computed shard count (the free runner's analogue of the paid runner's EVALS_JOBS). On Vercel sandboxes, PID 1 installs a seccomp filter whose supervisor spuriously fails access(2) for busy processes — measured: 200/200 git-init probes fail 'Cannot access work tree: Permission denied' while the suite runs at 6 shards, 0/200 idle; statx succeeds while access fails on the same path in the same process. One serial mega-shard maximizes per-process pressure and fails too; 2 shards is the measured sweet spot. GSTACK_FREE_RETRY_FLAKY=1 (default OFF — dev boxes should see flakes) re-runs attributed failures once, serially, capped at 5 files; a clean retry downgrades to a loud FLAKY-PASS naming the offenders, a repeat failure stays red, timeouts and unattributed failures never retry. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(browse): portable temp paths — TEMP_DIRS allowlist, tmpdir()-based test files Local path validation now accepts os.tmpdir() alongside the classic /tmp (new TEMP_DIRS in platform.ts): on macOS os.tmpdir() is /var/folders/..., and TMPDIR-honoring CI/sandbox environments point it elsewhere entirely — both are legitimate scratch space. Remote file serving (TEMP_ONLY) stays pinned to TEMP_DIR alone; no change to the exfil boundary. commands.test.ts drops 41 hardcoded /tmp literals for a tmpp() helper on os.tmpdir() (two message assertions now reference the same variable), and path-validation's symlink-escape test targets /etc/hosts instead of /etc/crontab — the target must EXIST for realpath to resolve the link (a dangling target falls back to the link's own path and passes vacuously), and /etc/crontab is absent on Amazon Linux. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(config): portable sha256 — Linux ships sha256sum, not shasum resolve-user-slug and endpoint hashing exited 127 on Amazon Linux (shasum is a macOS/perl tool). New _sha256_hex helper prefers sha256sum and falls back to shasum, matching gstack-verify-gate's existing pattern; both call sites converted. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(next-version): only trust ls-remote when origin is actually configured Without the guard, git DWIMs the literal 'origin' as an ssh host/path; on hosts whose transport launders exit codes the probe 'succeeds' with zero branches and the allocator silently sees an empty queue — the exact duplicate-allocation failure (#2545) fetchGitClaimed exists to prevent. git remote get-url origin gates the probe; absence falls through to the existing local-refs path with its staleness warning. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(testing): sandbox-doctor — one command makes a cloud sandbox run the suite green Measured failure taxonomy for Vercel/Conductor sandboxes (missing /dev/fd, 64M /dev/shm, seccomp-supervisor access(2) EACCES under load, uid-1000 processes with FULL capabilities defeating chmod-denial tests, no X server, no git identity, Conductor git-shim exit-code laundering) plus the idempotent script that treats all of it and seeds the run recipe. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(config): converge on main's self-contained sha8_of — its tests extract the function standalone The merge kept a branch-local _sha256_hex helper; main's v1.72 landed the same portability fix inline WITH tests that extract sha8_of()'s text and run it under a shim-only PATH — a helper call can't satisfy that shape. Adopt the landed implementation at both hash sites. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: coverage for GSTACK_FREE_JOBS override and failingFiles attribution Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: coverage for TEMP_DIRS widening and remote-serving TEMP_ONLY asymmetry Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: coverage for gstack-shortcut marker grammar and retro harvest joint Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: coverage for sandbox-doctor shell syntax and idempotency guards Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(test-runner): empty-shard outcome carries failingFiles; harden flaky-retry list The empty-shard early return omitted the (required) failingFiles field — tsc TS2741 — feeding undefined into the flaky-retry flatMap. Also drop the dead 'else if (worst !== 0)' guard (the enclosing if already pins it). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(release): version-bump write regenerates the version-stamped agents digest agents-digest/gstack-AGENTS.md embeds VERSION in its first line and is byte-freshness-gated (test/agents-digest.test.ts + Skill Docs Freshness CI), but nothing in the release path regenerated it — every version-bumping ship of this repo would land red. write now spawns the repo's own generator when present (agentsDigest true/false/null in the output JSON), and ship's evidence gate allow-lists the digest alongside VERSION/package.json. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(setup): instruction-tier explainer prints the script-anchored digest path $(pwd) printed a nonexistent path when setup ran from any other directory; both arms now share one print_instruction_tier() using SOURCE_GSTACK_DIR. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(digest): broaden AGENTS.md writer tripwire; pin digest-resolver ladder lockstep The print-path-only guard now catches tee/install/rsync/dd/truncate, >> appends, and laundered variable-destination writes. New test ties the digest's hand-rendered reuse-ladder text to the preamble resolver so an edit to either fails CI instead of shipping drift. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(retro): shortcut harvest drops placeholder markers and convention docs The Step 11.5 grep matched documentation mentions (dec-<id>, dec-*) in checklists, resolver sources, and convention tests, reporting phantom debt rows on gstack itself. A trailing filter kills placeholder forms; prose tells the agent to discard convention-quoting hits. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): advisory findings count in per-specialist stats Without this, simplification (all-advisory by construction) would log findings:0 every run and auto-gate itself into permanent silence after 10 dispatches. The advisory carve-out governs score and header only. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(evals): arm-benchmark harvest and judge hardening - Harvest diffs against the recorded seed SHA (origin/main is movable by an agent that commits AND pushes; a recorded SHA is not). - Fixtures get a node_modules .gitignore and the git wrapper a 64MB maxBuffer, so a vendored-dependency arm is scored instead of killing the cell. - The judge diff cap is a named constant with loud truncation (log + judge_reasoning suffix). - Judge prompt block markers carry a per-call random sentinel, so a diff containing a faked closing marker cannot escape the data block. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(evals): AUQ A/B vendored pre-cut arm + judge-error inconclusive taxonomy - The PRE arm read a branch-local SHA (3263fffe) that becomes unreachable on fresh clones after the squash-merge; the pre-cut render is now a vendored fixture. - A judge failure on one side no longer coerces substance to 0 (which fabricated DEGRADATION on POST-side failures and masked regressions on PRE-side failures): null substance = inconclusive, format still gates. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: regression pin for the originConfigured guard vs laundering git shims On healthy hosts the guarded and unguarded paths behave identically, so a revert passes the suite; only a shim that makes 'git ls-remote' exit 0 with empty output (the Conductor wrapper's observed behavior) exposes it. Pins that the empty 'successful' probe is never trusted as an empty queue. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(sandbox-doctor): missing /dev/shm no longer aborts the doctor under set -eu Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore(touchfiles): close dep-list gaps for the new evals - arm-benchmark entries gain ship/SKILL.md (buildBehavioralSkill extracts sections from the rendered ship skill) - review-army-simplification entries gain their planted fixtures + test file - auq-repetition-cut-ab gains llm-judge.ts and the vendored PRE fixture Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: re-capture context-budget fixture — lock the WS6-3 reduction and Step 9 deltas Per the ratchet protocol: the AUQ repetition cut shrank per-skill eager tokens but the fixture was never re-captured, leaving the win unlocked. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(release): digest regen is an explicit --regen-digest opt-in, not presence-sniffed code exec Review (security) caught the cycle-1 fix executing any repo's scripts/gen-agents-digest.ts on plain 'write' — arbitrary code exec from a hostile clone on a routine bump, contradicting the binary's own containment posture. The regen still runs the TARGET repo's generator (a 'trusted' copy beside the binary would false-red the freshness gate on version drift), but only under the flag: /ship passes it deliberately, in a repo whose code the operator already executes (its test suite). Plain write is side-effect-free again. Also: uniform output shape (agentsDigest: null on the JSON-manifest branch), a REAL generator round-trip test replacing the misnamed lockstep check, and land-and-deploy's evidence gate gets the same digest allow-path as ship so the two grading surfaces agree. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(test-runner): flaky-retry vetoes on ANY unattributable failure evidence The gate equated 'some failure attributed' with 'all failures attributed': a shard with one attributed failure plus a headerless failure, an unhandled error between tests, or a truncated run (no terminal summary) qualified for retry — re-running only failingFiles and masking the rest as FLAKY-PASS, re-opening the silent-truncation hole the strict classifier closes. FreeShardOutcome now carries unattributedFailures; nonzero vetoes the retry. Pins: mixed shard, truncated-with-attributed shard, empty-shard field values. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(next-version): a configured origin advertising zero heads is never trusted The originConfigured guard covered only the no-origin laundering case. With origin configured (the normal Conductor worktree state), the laundering shim makes a failed ls-remote exit 0 with empty stdout — read as 'the queue is empty', the exact duplicate-allocation bug (#2545) one layer up. A reachable remote always advertises at least its default branch, so an exit-0 zero-head probe now falls back to local refs/remotes/origin with a laundering-specific warning. Regression test shims git for both configurations. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(sandbox-doctor): loud on git-shim patch drift; document the retry-contract override - The /conductor/bin/git patch was a silent no-op if the shim's bytes drift from the exact pattern — now warns that laundering is NOT fixed. - The bashrc block documents why GSTACK_FREE_RETRY_FLAKY=1 deliberately overrides the runner's default-OFF contract on this sandbox, and how to undo it. - Test pins the guarded shm form (missing /dev/shm must not abort set -eu). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(digest): pin the script-anchored explainer path; catch declaration-prefixed writers - Asserts $SOURCE_GSTACK_DIR/agents-digest path and forbids $(pwd)/agents-digest (the cycle-1 fix was revertible without failing anything). - The laundered-assignment arm now matches local/export/declare/readonly/typeset prefixed assignments — the likeliest in-function writer shape in setup. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(evals): arm-benchmark selftest runs FREE on every PR The selftest lived inside the paid skill-e2e-* file, so fixture-integrity and plumbing pins executed weekly at best — a broken fixture would ship past every gating check and be discovered when the periodic run burned money on a dead instrument. Harness extracted to test/helpers/arm-benchmark-harness.ts, selftest to test/arm-benchmark-selftest.test.ts (free suite). Touchfiles: harness added to the three benchmark dep lists; the auq-repetition-cut-ab tier comment now states the MANUAL re-run obligation honestly (periodic runs force EVALS_ALL, so dep lists cannot auto-trigger it). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: re-capture context-budget fixture after cycle-2 template deltas Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(sandbox-doctor): keep both heredoc bodies under the 512B pipe-deadlock window The cycle-2 additions pushed the python-patch and bashrc heredocs into the 512-65536B window test/heredoc-pipe-deadlock.test.ts guards (sh scripts get no BASH_COMPAT escape hatch). Same content, tighter prose; the drift warning now reuses the patch pattern variable instead of a second literal. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): a gstack-shortcut marker only suppresses findings when its decision id resolves in the ledger Cross-model catch (Claude adversarial + Codex agreed): any diff author could fabricate a marker and silence Completeness review of that gap. Reviewers now resolve the dec-id via gstack-decision-search; an orphan marker is reported as a forged suppression, not honored as debt. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(autoplan): define the B2 gate path — accepted premise challenges amend the plan and re-run Eng The final gate offered B2 (respond to User Challenges) but the option handler table omitted it, leaving accepted challenges with no amendment or Eng re-review path. B2 now walks challenges one at a time; an accepted one amends the plan and re-runs Eng (the gate always reviews the final plan), sharing D's 3-cycle cap. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(evals): arm benchmark runs each fixture's functional oracle — correctness before LOC The plan's metric order is diff-quality FIRST, but cells never ran the fixtures' own run-tests.js, so a refusal, a broken implementation, and working code were indistinguishable in aggregates (Codex adversarial catch). Tasks with an oracle declare checkCmd; every cell records checks=pass|fail|none in the report line and eval store. Selftest pins the oracle declarations and that the planted bug fails its own check pre-fix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ship): check the bump's agentsDigest result; state the --regen-digest trust envelope honestly A failed digest regen warned and moved on — ship now instructs re-running the generator and staging the digest with the bump (the freshness check stays red otherwise). The 'no-op everywhere else' phrasing oversold safety: the step now names what executes and why that is inside the envelope Step 5 already opened (the repo's own test suite). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(test-runner): GSTACK_FREE_JOBS accepts digits only — parseInt truncation defeated the loud-failure contract '2abc' silently became 2 and '3.7' became 3 despite the error text claiming a positive-integer requirement. Strict /^\d+$/ pre-check; both shapes pinned. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(sandbox-doctor): atomic git-shim patch, :99-socket Xvfb check, dnf gate, non-interactive sudo - The /conductor/bin/git patch writes tmp-then-rename with a .orig backup — a concurrently spawned git can never exec a truncated shim. - Xvfb running-check looks for the :99 socket, not any-display pgrep. - Xvfb install is dnf-gated so non-dnf distros degrade to a warning instead of aborting the remaining fixes under set -eu. - The bashrc /dev/fd restore uses sudo -n || true — no password prompt at every shell start on non-passwordless machines. - BASH_COMPAT=50 keeps heredoc bodies off the bash pipe window. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(build): a failed agents-digest regen fails gen-skill-docs instead of deferring the red to CI Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(browse): an untrustable TMPDIR (/, $HOME, a cwd ancestor) never widens the local allowlist TEMP_DIRS honors os.tmpdir() at daemon start; a daemon launched with TMPDIR=/ would have trusted the whole filesystem for local path validation for its lifetime. Subprocess pins cover /, $HOME, cwd-ancestor rejection and that a benign distinct TMPDIR (the sandbox recipe's $HOME/tmp) stays honored. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: zero-heads warning names the benign cause too; digest path declaration made load-bearing; ratchet re-capture - The ls-remote zero-heads warning no longer accuses an empty remote of running a laundering shim. - instructionTier.rulesFile now must equal the generator's DIGEST_RELPATH (and setup must print it) — the declaration fails with the real path instead of lying silently. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: file ship-time follow-ups in TODOS skillify HOME-override gate red (pre-existing, proven on main), the auq-verbose-vs-carved-ab branch-local ref, eval-store harvest union, evidence digest allow-path scoping, and the WS6-2 dead-frontmatter live-host verification deferral. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * v1.73.0.0 chore: version bump + CHANGELOG — ponytail import wave Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: raise ship skeleton parity ceiling — measured 75,592 after the v1.73 release-step prose The --regen-digest trust-envelope paragraph (Step 12) and the evidence-gate digest note (Step 16) grew the ship skeleton past the previous 75,420 ceiling. Re-measured per the deliberate-change protocol. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: update project documentation for v1.73.0.0 - README.md, docs/skills.md, AGENTS.md: /autoplan phase order corrected to CEO → design → DX → eng (eng always last); /review rows note the advisory simplification lens - docs/PROJECT_STRUCTURE.md: add agents-digest/, gen-agents-digest.ts, sandbox-doctor.sh, test-free-shards.ts to the annotated tree - CONTRIBUTING.md: document GSTACK_FREE_JOBS, GSTACK_FREE_RETRY_FLAKY, and the sandbox-doctor one-command fixer in the Tier 1 test section Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: apply cross-model doc-review fixes for v1.73.0.0 - README.md: host table gains the OpenClaw explainer arm row (setup has the arm; the table claimed to match setup) - docs/skills.md: /review completeness-gaps section documents the gstack-shortcut(dec-<id>) acknowledged-debt suppression and orphan-marker flagging; /autoplan deep-dive states the recommended-option default with the 6 principles as tie-breakers - CONTRIBUTING.md: host count 8 -> 10 (Hermes, GBrain), supported-hosts list completed - docs/TESTING_INTERNALS.md: sandbox recipe says to source ~/.bashrc after the doctor seeds it; GSTACK_FREE_JOBS wording fixed from "caps" to "overrides in either direction" (matches the un-clamped runner) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(test): temp-dirs asymmetry pins are topology-aware; TMPDIR probes are POSIX-only CI exposed two wrong assumptions in the new temp-dirs tests, neither a product bug: - The remote-serving asymmetry test assumed a distinct os.tmpdir() lies OUTSIDE TEMP_DIR, but the free-shard runner nests each child's TMPDIR inside /tmp on CI — a file there is under TEMP_DIR, so serving it remotely is legitimate. The test now pins the actual exfil boundary on every topology (a cwd project file is locally readable, never remotely servable) and branches the os.tmpdir() case on nested-vs-outside. Reproduced locally with TMPDIR=/tmp/nested-tmp before fixing. - The untrustable-TMPDIR subprocess probes set TMPDIR, which Windows os.tmpdir() ignores (reads TEMP/TMP) — and on Windows TEMP_DIR is DEFINED as os.tmpdir(), so the fixed+movable two-dir topology the guard filters does not exist there. Probes now skip on Windows with that rationale; the benign-TMPDIR assertion compares realpaths. Verified under all three POSIX topologies: TMPDIR=$HOME/tmp (outside), TMPDIR=/tmp/nested-tmp (CI shard shape), TMPDIR unset (identical). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(build): DIGEST_RELPATH is a forward-slash literal on every platform path.join built it with backslashes on Windows, so the wiring test's string comparisons against setup and hosts/*.ts (which carry the forward-slash literal) could never match there — windows-free-tests red. path.join(root, DIGEST_RELPATH) at the write site normalizes fine. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(sandbox-doctor): bashrc block re-heals the /dev/shm remount on sandbox restart The 4G remount does not survive restarts; a reverted 64M shm made the multi-tab browse handoff test fail consistently under suite concurrency (observed live: two consecutive full-run failures, green in isolation, green again after remounting). Same guarded arithmetic as the doctor body. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(test): close the cross-shard porcelain race that failed Windows CI Two-part fix for the gen-skill-docs-out-dir isolation-pin failure: - cookie-import-browser built its scratch cookie DBs inside the TRACKED browse/test/fixtures/ dir (created in beforeAll, deleted in afterAll), so they flash as untracked files mid-run — a concurrent shard's porcelain snapshot caught the window on Windows. The DBs now live in a per-run tmpdir; zero source-tree writes. - gen-skill-docs-out-dir is the free suite's only LIVE porcelain-snapshot test, so it joins TREE_MUTATING (the serial quiet window): any concurrent transient tree-write can race it, and its own spawned render rewrites llms.txt/agents-digest in place (idempotent on a fresh tree). The race is pre-existing; this branch's +5 test files reshuffled shard composition and exposed it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * v1.75.0.0 chore: queue-advance rebump — perth-v2 landed v1.74.0.0 on main The v1.73.0.0 slot this branch claimed was superseded when #2721 merged; same MINOR level relative to main per the versioning invariant. CHANGELOG entry renumbered (1.73.0.0 was branch-internal and never landed on main), digest restamped via --regen-digest. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(test-runner): duration-packed walls keep the per-file floor — predictions don't transfer across machines The committed duration seed is recorded on fast CI; a syscall-supervised sandbox replays the same files 2-4x slower. Observed post-merge: a 253-file shard predicted ~242s was wall-killed at its predicted-x3 725s wall while genuinely progressing (the old count heuristic guaranteed 1265s). Packed walls may be looser than the count floor, never tighter. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
798 lines
32 KiB
TypeScript
Executable File
798 lines
32 KiB
TypeScript
Executable File
#!/usr/bin/env bun
|
|
// gstack-next-version — host-aware VERSION allocator for /ship.
|
|
//
|
|
// Queries the PR queue (GitHub or GitLab), fetches each open PR's VERSION,
|
|
// scans configurable Conductor sibling worktrees, picks the next free version
|
|
// slot at the requested bump level, and emits the whole picture as JSON.
|
|
//
|
|
// Contract: util NEVER writes files or mutates state. Pure reader + reporter.
|
|
// /ship consumes the JSON and decides what to do.
|
|
//
|
|
// Usage:
|
|
// gstack-next-version --base <branch> --bump <major|minor|patch|micro> \
|
|
// --current-version <X.Y.Z.W> [--workspace-root <path>|null] \
|
|
// [--version-path <path>] [--json]
|
|
//
|
|
// VERSION path resolution (monorepo support):
|
|
// 1. --version-path <path> CLI flag (highest priority)
|
|
// 2. .gstack/version-path file at the repo root (single-line relative path,
|
|
// committed so all collaborators benefit)
|
|
// 3. "VERSION" at the repo root (default, backward-compatible)
|
|
//
|
|
// The pinned path may be a package.json (any depth) rather than a plain-text
|
|
// VERSION file: a path ending in .json is read as JSON and its .version taken.
|
|
// 3-digit semver is accepted as well as 4-digit, and stays 3-digit through
|
|
// bumping. See lib/version-source.ts for why both mattered — each used to fail
|
|
// closed, which silently disabled the queue-collision check this CLI exists to
|
|
// provide (#2501).
|
|
//
|
|
// Exit codes:
|
|
// 0 — emitted JSON successfully (may include "offline":true or "host":"unknown")
|
|
// 2 — invalid arguments
|
|
// 3 — util bug (unexpected exception)
|
|
|
|
import { execFileSync, spawnSync } from "node:child_process";
|
|
import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
|
|
import { homedir } from "node:os";
|
|
import { join, resolve } from "node:path";
|
|
import {
|
|
parseVersion,
|
|
versionWidth,
|
|
fmtVersion,
|
|
bumpVersion,
|
|
cmpVersion,
|
|
bumpWasCoerced,
|
|
extractVersion,
|
|
type Bump,
|
|
type Version,
|
|
type VersionWidth,
|
|
} from "../lib/version-source";
|
|
|
|
type ClaimedPR = {
|
|
pr: number;
|
|
branch: string;
|
|
version: string;
|
|
url?: string;
|
|
};
|
|
|
|
type Sibling = {
|
|
path: string;
|
|
branch: string;
|
|
version: string;
|
|
last_commit_ts: number;
|
|
has_open_pr: boolean;
|
|
is_active: boolean;
|
|
};
|
|
|
|
type Output = {
|
|
version: string;
|
|
current_version: string;
|
|
base_version: string;
|
|
version_path: string;
|
|
bump: Bump;
|
|
host: "github" | "gitlab" | "unknown";
|
|
offline: boolean;
|
|
fallback: "git" | null;
|
|
claimed: ClaimedPR[];
|
|
siblings: Sibling[];
|
|
active_siblings: Sibling[];
|
|
reason: string;
|
|
warnings: string[];
|
|
};
|
|
|
|
const ACTIVE_SIBLING_MAX_AGE_S = 24 * 60 * 60;
|
|
const GH_API_CONCURRENCY = 10;
|
|
|
|
// Collision resolution: bump past the highest claimed within the same level.
|
|
// Semantics: if my bump is MINOR and the queue claims 1.7.0.0, I advance to
|
|
// 1.8.0.0 (still a MINOR relative to main). Preserves ship-time intent.
|
|
// `width` keeps a 3-digit repo 3-digit (see lib/version-source.ts); it
|
|
// defaults to 4 so existing callers and tests are unaffected.
|
|
function pickNextSlot(base: Version, claimed: Version[], level: Bump, width: VersionWidth = 4): { version: Version; reason: string } {
|
|
let candidate = bumpVersion(base, level, width);
|
|
const sortedClaimed = [...claimed].sort(cmpVersion);
|
|
const highest = sortedClaimed[sortedClaimed.length - 1];
|
|
if (highest && cmpVersion(highest, base) > 0) {
|
|
// Queue already advanced past base; bump past the highest claim.
|
|
const bumpedPastHighest = bumpVersion(highest, level, width);
|
|
if (cmpVersion(bumpedPastHighest, candidate) > 0) {
|
|
return { version: bumpedPastHighest, reason: `bumped past claimed ${fmtVersion(highest, width)}` };
|
|
}
|
|
}
|
|
return { version: candidate, reason: "no collision; clean bump from base" };
|
|
}
|
|
|
|
function runCommand(cmd: string, args: string[], timeoutMs = 15000): { ok: boolean; stdout: string; stderr: string } {
|
|
const r = spawnSync(cmd, args, { encoding: "utf8", timeout: timeoutMs });
|
|
return {
|
|
ok: r.status === 0 && !r.error,
|
|
stdout: r.stdout ?? "",
|
|
stderr: r.stderr ?? (r.error ? String(r.error) : ""),
|
|
};
|
|
}
|
|
|
|
// VERSION-path resolution for monorepos. Priority: CLI flag > .gstack/version-path
|
|
// at repo root > "VERSION". Pure function; takes the repo root as an argument so
|
|
// tests can drive it with a fixture dir without mocking git.
|
|
function resolveVersionPath(override: string | undefined, repoRoot: string): string {
|
|
if (override) return override.trim();
|
|
const configFile = join(repoRoot, ".gstack", "version-path");
|
|
if (existsSync(configFile)) {
|
|
try {
|
|
const firstLine = readFileSync(configFile, "utf8").split("\n")[0]?.trim() ?? "";
|
|
if (firstLine) return firstLine;
|
|
} catch {
|
|
// fall through to default
|
|
}
|
|
}
|
|
return "VERSION";
|
|
}
|
|
|
|
function repoToplevel(): string {
|
|
const r = runCommand("git", ["rev-parse", "--show-toplevel"]);
|
|
return r.ok ? r.stdout.trim() : process.cwd();
|
|
}
|
|
|
|
function detectHost(): "github" | "gitlab" | "unknown" {
|
|
const remote = runCommand("git", ["remote", "get-url", "origin"]);
|
|
if (remote.ok) {
|
|
const url = remote.stdout.trim();
|
|
if (url.includes("github.com")) return "github";
|
|
if (url.includes("gitlab")) return "gitlab";
|
|
}
|
|
const gh = runCommand("gh", ["auth", "status"]);
|
|
if (gh.ok) return "github";
|
|
const glab = runCommand("glab", ["auth", "status"]);
|
|
if (glab.ok) return "gitlab";
|
|
return "unknown";
|
|
}
|
|
|
|
// When the base-version read fails we assume a zero base — but a literal
|
|
// "0.0.0.0" is 4-digit, which flips versionWidth() to 4 and hands a 3-digit
|
|
// repo a 4-digit slot (the exact width class of bug #2501 fixed in parsing).
|
|
// The LOCAL version file at versionPath knows the repo's own width; shape the
|
|
// zero from it. No local file either → keep the 4-digit default.
|
|
function zeroBaseAtLocalWidth(versionPath: string, repoRoot: string): string {
|
|
try {
|
|
const local = extractVersion(readFileSync(join(repoRoot, versionPath), "utf8"), versionPath);
|
|
if (local && parseVersion(local) && versionWidth(local) === 3) return "0.0.0";
|
|
} catch {
|
|
// unreadable/absent local version file — 4-digit default below
|
|
}
|
|
return "0.0.0.0";
|
|
}
|
|
|
|
function readBaseVersion(base: string, versionPath: string, repoRoot: string, warnings: string[]): string {
|
|
// git fetch is best-effort; we tolerate failure and fall back to whatever
|
|
// origin/<base> currently points at.
|
|
runCommand("git", ["fetch", "origin", base, "--quiet"], 10000);
|
|
const r = runCommand("git", ["show", `origin/${base}:${versionPath}`]);
|
|
if (!r.ok) {
|
|
const assumed = zeroBaseAtLocalWidth(versionPath, repoRoot);
|
|
warnings.push(`could not read ${versionPath} at origin/${base}; assuming ${assumed}`);
|
|
return assumed;
|
|
}
|
|
const v = extractVersion(r.stdout, versionPath);
|
|
if (!v) {
|
|
const assumed = zeroBaseAtLocalWidth(versionPath, repoRoot);
|
|
warnings.push(`${versionPath} at origin/${base} has no readable version; assuming ${assumed}`);
|
|
return assumed;
|
|
}
|
|
return v;
|
|
}
|
|
|
|
async function fetchGithubClaimed(base: string, versionPath: string, excludePR: number | null, warnings: string[]): Promise<{ claimed: ClaimedPR[]; offline: boolean }> {
|
|
const list = runCommand("gh", [
|
|
"pr",
|
|
"list",
|
|
"--state",
|
|
"open",
|
|
"--base",
|
|
base,
|
|
"--limit",
|
|
"200",
|
|
"--json",
|
|
"number,headRefName,headRepositoryOwner,url,isDraft",
|
|
]);
|
|
if (!list.ok) {
|
|
warnings.push(`gh pr list failed: ${list.stderr.trim().slice(0, 200)}`);
|
|
return { claimed: [], offline: true };
|
|
}
|
|
let prs: {
|
|
number: number;
|
|
headRefName: string;
|
|
headRepositoryOwner?: { login: string };
|
|
url: string;
|
|
isDraft: boolean;
|
|
}[];
|
|
try {
|
|
prs = JSON.parse(list.stdout);
|
|
} catch (e) {
|
|
warnings.push(`gh pr list returned invalid JSON`);
|
|
return { claimed: [], offline: true };
|
|
}
|
|
// Determine our repo owner to filter out fork PRs. `gh api contents?ref=<branch>`
|
|
// resolves to OUR repo regardless of where the PR originated, so fork PRs would
|
|
// otherwise return our main's VERSION as a phantom claim.
|
|
const viewer = runCommand("gh", ["repo", "view", "--json", "owner", "-q", ".owner.login"]);
|
|
const myOwner = viewer.ok ? viewer.stdout.trim() : "";
|
|
const sameRepoPRs = (myOwner
|
|
? prs.filter((p) => (p.headRepositoryOwner?.login ?? "") === myOwner)
|
|
: prs
|
|
).filter((p) => excludePR === null || p.number !== excludePR);
|
|
// Fetch each PR's VERSION at its head in parallel (bounded concurrency).
|
|
const results: ClaimedPR[] = [];
|
|
const queue = [...sameRepoPRs];
|
|
const workers = Array.from({ length: Math.min(GH_API_CONCURRENCY, sameRepoPRs.length) }, async () => {
|
|
while (queue.length) {
|
|
const pr = queue.shift();
|
|
if (!pr) return;
|
|
// gh passes branch name via argv, not shell — safe.
|
|
// encodeURI handles spaces in subproject paths (e.g. "Tinas Second Brain/...")
|
|
// while leaving "/" untouched so the GitHub Contents API gets the path intact.
|
|
const content = runCommand("gh", [
|
|
"api",
|
|
`repos/{owner}/{repo}/contents/${encodeURI(versionPath)}?ref=${encodeURIComponent(pr.headRefName)}`,
|
|
"-q",
|
|
".content",
|
|
]);
|
|
if (!content.ok) {
|
|
warnings.push(
|
|
`PR #${pr.number}: could not fetch ${versionPath} (fork, private, or wrong path — try --version-path or .gstack/version-path)`,
|
|
);
|
|
continue;
|
|
}
|
|
let versionStr: string;
|
|
try {
|
|
versionStr = extractVersion(Buffer.from(content.stdout.trim(), "base64").toString("utf8"), versionPath);
|
|
} catch {
|
|
warnings.push(`PR #${pr.number}: VERSION is not valid base64`);
|
|
continue;
|
|
}
|
|
if (!parseVersion(versionStr)) {
|
|
warnings.push(`PR #${pr.number}: VERSION is malformed (${versionStr})`);
|
|
continue;
|
|
}
|
|
results.push({ pr: pr.number, branch: pr.headRefName, version: versionStr, url: pr.url });
|
|
}
|
|
});
|
|
await Promise.all(workers);
|
|
return { claimed: results, offline: false };
|
|
}
|
|
|
|
async function fetchGitlabClaimed(base: string, versionPath: string, excludePR: number | null, warnings: string[]): Promise<{ claimed: ClaimedPR[]; offline: boolean }> {
|
|
const list = runCommand("glab", [
|
|
"mr",
|
|
"list",
|
|
"--opened",
|
|
"--target-branch",
|
|
base,
|
|
"--output",
|
|
"json",
|
|
"--per-page",
|
|
"200",
|
|
]);
|
|
if (!list.ok) {
|
|
warnings.push(`glab mr list failed: ${list.stderr.trim().slice(0, 200)}`);
|
|
return { claimed: [], offline: true };
|
|
}
|
|
let mrs: { iid: number; source_branch: string; web_url: string }[];
|
|
try {
|
|
mrs = JSON.parse(list.stdout);
|
|
} catch {
|
|
warnings.push(`glab mr list returned invalid JSON`);
|
|
return { claimed: [], offline: true };
|
|
}
|
|
if (excludePR !== null) {
|
|
mrs = mrs.filter((mr) => mr.iid !== excludePR);
|
|
}
|
|
const results: ClaimedPR[] = [];
|
|
for (const mr of mrs) {
|
|
// GitLab files API takes the full path URL-encoded (slashes become %2F).
|
|
const content = runCommand("glab", [
|
|
"api",
|
|
`projects/:id/repository/files/${encodeURIComponent(versionPath)}?ref=${encodeURIComponent(mr.source_branch)}`,
|
|
]);
|
|
if (!content.ok) {
|
|
warnings.push(
|
|
`MR !${mr.iid}: could not fetch ${versionPath} (wrong path? — try --version-path or .gstack/version-path)`,
|
|
);
|
|
continue;
|
|
}
|
|
try {
|
|
const j = JSON.parse(content.stdout);
|
|
const versionStr = extractVersion(Buffer.from(j.content, "base64").toString("utf8"), versionPath);
|
|
if (!parseVersion(versionStr)) {
|
|
warnings.push(`MR !${mr.iid}: VERSION malformed (${versionStr})`);
|
|
continue;
|
|
}
|
|
results.push({ pr: mr.iid, branch: mr.source_branch, version: versionStr, url: mr.web_url });
|
|
} catch {
|
|
warnings.push(`MR !${mr.iid}: unexpected glab api response`);
|
|
}
|
|
}
|
|
return { claimed: results, offline: false };
|
|
}
|
|
|
|
function resolveWorkspaceRoot(override?: string): string | null {
|
|
if (override === "null") return null;
|
|
if (override) return override;
|
|
const r = runCommand(join(__dirname, "gstack-config"), ["get", "workspace_root"]);
|
|
const configured = r.ok ? r.stdout.trim() : "";
|
|
if (configured === "null") return null;
|
|
if (configured) return configured;
|
|
// Default: $HOME/conductor/workspaces/
|
|
return join(homedir(), "conductor", "workspaces");
|
|
}
|
|
|
|
function currentRepoSlug(): string {
|
|
const r = runCommand("git", ["remote", "get-url", "origin"]);
|
|
if (!r.ok) return "";
|
|
// Extract "owner/repo" from URL like git@github.com:owner/repo.git
|
|
const m = r.stdout.trim().match(/[:/]([^/]+\/[^/]+?)(?:\.git)?$/);
|
|
return m ? m[1] : "";
|
|
}
|
|
|
|
function scanSiblings(root: string | null, versionPath: string, claimed: ClaimedPR[], warnings: string[]): Sibling[] {
|
|
if (!root || !existsSync(root)) return [];
|
|
const mySlug = currentRepoSlug();
|
|
if (!mySlug) {
|
|
warnings.push("could not determine current repo slug; skipping sibling scan");
|
|
return [];
|
|
}
|
|
const repoName = mySlug.split("/").pop() ?? "";
|
|
// Conductor layout: <root>/<repo>/<workspace>/
|
|
const repoDir = join(root, repoName);
|
|
if (!existsSync(repoDir)) return [];
|
|
const myAbsPath = resolve(process.cwd());
|
|
const results: Sibling[] = [];
|
|
for (const name of readdirSync(repoDir)) {
|
|
const p = join(repoDir, name);
|
|
if (resolve(p) === myAbsPath) continue;
|
|
try {
|
|
const s = statSync(p);
|
|
if (!s.isDirectory()) continue;
|
|
} catch {
|
|
continue;
|
|
}
|
|
if (!existsSync(join(p, ".git")) && !existsSync(join(p, ".git/HEAD"))) continue;
|
|
const versionFile = join(p, versionPath);
|
|
if (!existsSync(versionFile)) continue;
|
|
let version: string;
|
|
try {
|
|
version = extractVersion(readFileSync(versionFile, "utf8"), versionPath);
|
|
if (!parseVersion(version)) continue;
|
|
} catch {
|
|
continue;
|
|
}
|
|
const branchR = runCommand("git", ["-C", p, "rev-parse", "--abbrev-ref", "HEAD"]);
|
|
if (!branchR.ok) continue;
|
|
const branch = branchR.stdout.trim();
|
|
const commitTsR = runCommand("git", ["-C", p, "log", "-1", "--format=%ct"]);
|
|
const last_commit_ts = commitTsR.ok ? Number(commitTsR.stdout.trim()) : 0;
|
|
const has_open_pr = claimed.some((c) => c.branch === branch);
|
|
results.push({
|
|
path: p,
|
|
branch,
|
|
version,
|
|
last_commit_ts,
|
|
has_open_pr,
|
|
is_active: false,
|
|
});
|
|
}
|
|
return results;
|
|
}
|
|
|
|
function markActiveSiblings(siblings: Sibling[], baseVersion: Version): Sibling[] {
|
|
const now = Math.floor(Date.now() / 1000);
|
|
return siblings.map((s) => {
|
|
const v = parseVersion(s.version);
|
|
const isAhead = v ? cmpVersion(v, baseVersion) > 0 : false;
|
|
const isFresh = s.last_commit_ts > 0 && now - s.last_commit_ts < ACTIVE_SIBLING_MAX_AGE_S;
|
|
const is_active = isAhead && isFresh && !s.has_open_pr;
|
|
return { ...s, is_active };
|
|
});
|
|
}
|
|
|
|
function parseArgs(argv: string[]): { base: string; bump: Bump; current: string; workspaceRoot?: string; excludePR: number | null; versionPath?: string; help: boolean } {
|
|
let base = "";
|
|
let bump: Bump | "" = "";
|
|
let current = "";
|
|
let workspaceRoot: string | undefined;
|
|
let excludePR: number | null = null;
|
|
let versionPath: string | undefined;
|
|
let help = false;
|
|
for (let i = 0; i < argv.length; i++) {
|
|
const a = argv[i];
|
|
if (a === "--base") base = argv[++i] ?? "";
|
|
else if (a === "--bump") bump = (argv[++i] ?? "") as Bump;
|
|
else if (a === "--current-version") current = argv[++i] ?? "";
|
|
else if (a === "--workspace-root") workspaceRoot = argv[++i];
|
|
else if (a === "--version-path") versionPath = argv[++i];
|
|
else if (a === "--exclude-pr") {
|
|
const n = Number(argv[++i]);
|
|
excludePR = Number.isFinite(n) && n > 0 ? n : null;
|
|
}
|
|
else if (a === "-h" || a === "--help") help = true;
|
|
}
|
|
if (help) return { base: "", bump: "micro", current: "", excludePR: null, help: true };
|
|
if (!base) {
|
|
// Detect the default branch instead of assuming main (local-only repos
|
|
// on trunk/master work like GitHub repos on main). Same probe order as
|
|
// the canonical chain in bin/gstack-diff-scope and {{BASE_BRANCH_DETECT}}
|
|
// (scripts/resolvers/utility.ts): origin/HEAD -> origin/main ->
|
|
// origin/master -> literal "main". origin/HEAD is unset on plain clones
|
|
// that never ran `git remote set-head`, so the rev-parse probes matter.
|
|
try {
|
|
const head = execFileSync("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
|
|
base = head.replace("refs/remotes/origin/", "");
|
|
} catch {
|
|
// fall through to the rev-parse probes
|
|
}
|
|
if (!base) {
|
|
for (const candidate of ["main", "master"]) {
|
|
try {
|
|
execFileSync("git", ["rev-parse", "--verify", "-q", `origin/${candidate}`], { stdio: ["ignore", "ignore", "ignore"] });
|
|
base = candidate;
|
|
break;
|
|
} catch {
|
|
// probe failed; try the next candidate
|
|
}
|
|
}
|
|
}
|
|
if (!base) base = "main";
|
|
}
|
|
if (!bump) {
|
|
console.error("Error: --bump is required (major|minor|patch|micro)");
|
|
process.exit(2);
|
|
}
|
|
if (!["major", "minor", "patch", "micro"].includes(bump)) {
|
|
console.error(`Error: --bump must be major|minor|patch|micro (got ${bump})`);
|
|
process.exit(2);
|
|
}
|
|
return { base, bump: bump as Bump, current, workspaceRoot, excludePR, versionPath, help: false };
|
|
}
|
|
|
|
// Auto-detect: if --exclude-pr wasn't passed, check whether the current branch
|
|
// already has an open PR and exclude it by default. This prevents the self-
|
|
// reference bug where /ship's own PR inflates the queue on rerun.
|
|
function autoDetectExcludePR(): number | null {
|
|
const r = runCommand("gh", ["pr", "view", "--json", "number", "-q", ".number"]);
|
|
if (!r.ok) return null;
|
|
const n = Number(r.stdout.trim());
|
|
return Number.isFinite(n) && n > 0 ? n : null;
|
|
}
|
|
|
|
// ── git-only fallback (#2545) ────────────────────────────────────────────
|
|
//
|
|
// When the host query fails this util used to return `offline:true` with an
|
|
// EMPTY claim set, and /ship's instruction was "fall back to local BUMP_LEVEL
|
|
// arithmetic". Local arithmetic cannot see a sibling's claim, so the fallback
|
|
// allocated a version another open PR already held.
|
|
//
|
|
// That is not hypothetical. On 2026-08-12 in a downstream repo, `gh pr list`
|
|
// failed during a ship, this util reported offline, the bump fell back to
|
|
// local arithmetic, and 0.1.57.0 was allocated to a second PR while an open
|
|
// one already claimed it — both merged, and main carries two commits reading
|
|
// v0.1.57.0. Auditing that repo's history found FOUR such pairs going back
|
|
// three weeks, so the silent fallback had been mis-allocating for a while.
|
|
//
|
|
// Git already knows what the API was asked for. `git ls-remote --heads origin`
|
|
// returns the remote's LIVE branch list with zero local mutation (no fetch, no
|
|
// ref updates), each branch's VERSION file is readable from the local object
|
|
// store, and the base's own history records every version already shipped.
|
|
// None of it needs a token or a working `gh`. So "offline" degrades the QUEUE
|
|
// VIEW (no PR numbers, no draft status) without degrading the ALLOCATION.
|
|
function fetchGitClaimed(
|
|
base: string,
|
|
versionPath: string,
|
|
warnings: string[],
|
|
): ClaimedPR[] {
|
|
const claims: ClaimedPR[] = [];
|
|
const baseShort = base.replace(/^origin\//, "");
|
|
|
|
// 1. The version-claim branches. FIRST try `git ls-remote --heads origin`:
|
|
// fresh remote data, zero local mutation. This scopes claims to branches
|
|
// that actually EXIST on origin right now — the previous implementation
|
|
// counted every remote-tracking ref on EVERY remote, so stale local refs
|
|
// (deleted PR branches, an unrelated `upstream` remote) inflated the
|
|
// claim set and pushed the allocation further than the real queue.
|
|
// GIT_TERMINAL_PROMPT=0 + a 5s timeout keep a dead/credential-prompting
|
|
// remote from hanging the allocator.
|
|
// Guard: only consult ls-remote when a remote named `origin` is actually
|
|
// CONFIGURED. Without the guard, git DWIMs the literal `origin` as an
|
|
// ssh host/path — and on hosts whose ssh launders exit codes (observed:
|
|
// Vercel sandboxes' ssh exits 0 on "Could not resolve hostname"), the
|
|
// probe "succeeds" with zero branches and the allocator silently sees an
|
|
// empty queue: the exact duplicate-allocation failure (#2545) this
|
|
// function exists to prevent.
|
|
const originConfigured =
|
|
spawnSync("git", ["remote", "get-url", "origin"], {
|
|
encoding: "utf8",
|
|
timeout: 5000,
|
|
}).status === 0;
|
|
const lsRemote = originConfigured
|
|
? spawnSync("git", ["ls-remote", "--heads", "origin"], {
|
|
encoding: "utf8",
|
|
timeout: 5000,
|
|
env: { ...process.env, GIT_TERMINAL_PROMPT: "0" },
|
|
})
|
|
: null;
|
|
const lsOk = lsRemote !== null && lsRemote.status === 0 && !lsRemote.error;
|
|
|
|
// A configured origin that "successfully" advertises ZERO heads is a
|
|
// contradiction — every reachable remote advertises at least its default
|
|
// branch. It means the exit code was laundered (observed: the Conductor
|
|
// /conductor/bin/git shim exits 0 on every network failure), so an exit-0
|
|
// empty probe must NOT be believed as "the queue is empty" — that is the
|
|
// duplicate-allocation bug (#2545) again, one layer up from the
|
|
// originConfigured guard. Parse first; trust only a non-empty head list.
|
|
const parsedHeads = lsOk
|
|
? (lsRemote.stdout ?? "")
|
|
.split("\n")
|
|
.map((line) => line.trim().match(/^([0-9a-f]{40,64})\trefs\/heads\/(.+)$/))
|
|
.filter((m): m is RegExpMatchArray => m !== null)
|
|
: [];
|
|
const lsTrusted = lsOk && parsedHeads.length > 0;
|
|
|
|
// Each candidate carries the LIVE tip sha when it came from ls-remote, so
|
|
// the VERSION read prefers the fresh commit (present locally after any
|
|
// prior fetch/clone) and only falls back to the local remote-tracking ref.
|
|
const candidates: { branch: string; sha?: string }[] = [];
|
|
if (lsTrusted) {
|
|
for (const m of parsedHeads) {
|
|
if (m[2] === baseShort) continue;
|
|
candidates.push({ branch: m[2], sha: m[1] });
|
|
}
|
|
} else {
|
|
// Degraded twice over: no host API AND no reachable remote. Fall back to
|
|
// the LOCAL refs/remotes/origin snapshot ONLY (never other remotes — an
|
|
// `upstream` remote's branches are not claims against OUR queue).
|
|
warnings.push(
|
|
lsOk
|
|
? "git ls-remote origin exited 0 but advertised zero heads (an empty remote, or an exit-code-laundering git shim); " +
|
|
"using stale local refs/remotes/origin — branches deleted on the remote may still be counted as claims (run `git fetch --prune origin` to refresh)"
|
|
: "git ls-remote origin failed; using stale local refs/remotes/origin — " +
|
|
"branches deleted on the remote may still be counted as claims (run `git fetch --prune origin` to refresh)",
|
|
);
|
|
const refs = runCommand("git", [
|
|
"for-each-ref",
|
|
"--format=%(refname:short)",
|
|
"refs/remotes/origin",
|
|
]);
|
|
if (refs.ok) {
|
|
for (const ref of refs.stdout.split("\n").map((r) => r.trim()).filter(Boolean)) {
|
|
if (ref.endsWith("/HEAD")) continue;
|
|
const branch = ref.replace(/^origin\//, "");
|
|
if (branch === baseShort) continue;
|
|
candidates.push({ branch });
|
|
}
|
|
} else {
|
|
warnings.push("git for-each-ref failed; branch claims unavailable");
|
|
}
|
|
}
|
|
|
|
// Read each candidate's VERSION through extractVersion so a JSON
|
|
// version-path (#2501) resolves on remote refs too, and the branch's own
|
|
// width is preserved in the claim. Reads are LOCAL-first; branches whose
|
|
// advertised tip has no local object are collected and resolved with ONE
|
|
// batched shallow fetch below. A per-branch fetch loop here once crawled
|
|
// a busy remote for minutes on a shallow CI clone (dozens of sequential
|
|
// network fetches, 10s cap each) — the total network budget must be one
|
|
// bounded round trip regardless of branch count.
|
|
const readClaim = (branch: string, sha?: string): "claimed" | "not-a-claim" | "object-missing" => {
|
|
let show = sha ? runCommand("git", ["show", `${sha}:${versionPath}`]) : { ok: false, stdout: "", stderr: "" };
|
|
if (!show.ok) {
|
|
// Live tip not fetched yet (or no sha in the fallback path): best-effort
|
|
// read from the local remote-tracking ref.
|
|
show = runCommand("git", ["show", `refs/remotes/origin/${branch}:${versionPath}`]);
|
|
}
|
|
if (!show.ok) {
|
|
if (!sha) return "not-a-claim";
|
|
// Distinguish "object missing" from "branch has no VERSION file".
|
|
return runCommand("git", ["cat-file", "-e", sha]).ok ? "not-a-claim" : "object-missing";
|
|
}
|
|
const raw = extractVersion(show.stdout, versionPath);
|
|
if (!raw || !parseVersion(raw)) return "not-a-claim";
|
|
claims.push({ pr: 0, branch: `origin/${branch}`, version: raw });
|
|
return "claimed";
|
|
};
|
|
|
|
const pending: { branch: string; sha?: string }[] = [];
|
|
for (const { branch, sha } of candidates) {
|
|
if (readClaim(branch, sha) === "object-missing") pending.push({ branch, sha });
|
|
}
|
|
if (pending.length > 0) {
|
|
// ls-remote advertises SHAs without objects: a branch pushed after our
|
|
// last fetch has NO local object. The pre-#2545 `continue` silently
|
|
// dropped a LIVE claim — the exact duplicate-allocation this fallback
|
|
// exists to prevent. One shallow batched fetch (no prompts, no tags,
|
|
// bounded) brings every missing tip local in a single round trip.
|
|
spawnSync(
|
|
"git",
|
|
["fetch", "origin", ...pending.map((p) => `refs/heads/${p.branch}`), "--depth=1", "--no-tags"],
|
|
{ encoding: "utf8", timeout: 15000, env: { ...process.env, GIT_TERMINAL_PROMPT: "0" } },
|
|
);
|
|
// One unservable ref (dangling sha on the server) fails the WHOLE batch
|
|
// transfer, so refs still missing get a bounded per-branch retry — that
|
|
// isolates a poisoned ref without reopening the unbounded fetch crawl
|
|
// (per-branch-only fetching once ground a shallow CI clone against a
|
|
// busy remote for minutes). Anything past the cap is warned, not fetched.
|
|
const RETRY_CAP = 8;
|
|
let retries = 0;
|
|
for (const { branch, sha } of pending) {
|
|
let outcome = readClaim(branch, sha);
|
|
if (outcome === "object-missing" && retries < RETRY_CAP) {
|
|
retries++;
|
|
spawnSync(
|
|
"git",
|
|
["fetch", "origin", `refs/heads/${branch}`, "--depth=1", "--no-tags"],
|
|
{ encoding: "utf8", timeout: 5000, env: { ...process.env, GIT_TERMINAL_PROMPT: "0" } },
|
|
);
|
|
outcome = readClaim(branch, sha);
|
|
}
|
|
if (outcome === "object-missing") {
|
|
// STILL unreadable (fetch failed, retry cap hit, or the tip moved
|
|
// between ls-remote and fetch) — never skip silently. Surface it as
|
|
// an UNKNOWN claim so the caller knows the allocation may be unsafe.
|
|
warnings.push(
|
|
`origin/${branch}: VERSION unreadable even after a targeted fetch — ` +
|
|
`counted as an UNKNOWN claim; allocation may collide with this branch. ` +
|
|
`Run \`git fetch origin ${branch}\` and re-run to verify.`,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
// 2. Versions already shipped, read from the base's commit subjects. Catches
|
|
// the case the VERSION file cannot: a number that merged and was then
|
|
// re-picked. Bounded, and it says so rather than implying full history.
|
|
const SUBJECT_SCAN = 400;
|
|
const log = runCommand("git", ["log", `-n${SUBJECT_SCAN}`, "--format=%s", base]);
|
|
if (log.ok) {
|
|
for (const subject of log.stdout.split("\n")) {
|
|
const m = subject.trim().match(/^v(\d+\.\d+\.\d+(?:\.\d+)?)\b/);
|
|
if (!m) continue;
|
|
if (!parseVersion(m[1])) continue;
|
|
claims.push({ pr: 0, branch: `(shipped on ${base})`, version: m[1] });
|
|
}
|
|
// A cap that does not announce itself reads as "checked all history".
|
|
// Only fires when the log came back exactly full, which is the only
|
|
// observable signal that older commits went unread.
|
|
if (log.stdout.trim().split("\n").length >= SUBJECT_SCAN) {
|
|
warnings.push(
|
|
`shipped-version scan stopped at ${SUBJECT_SCAN} commits on ${base}; ` +
|
|
`a version shipped before that is not counted as claimed`,
|
|
);
|
|
}
|
|
} else {
|
|
warnings.push(`git log ${base} failed; shipped-version scan unavailable`);
|
|
}
|
|
|
|
return claims;
|
|
}
|
|
|
|
async function main() {
|
|
const args = parseArgs(process.argv.slice(2));
|
|
if (args.help) {
|
|
console.log(
|
|
"Usage: gstack-next-version --base <branch> --bump <level> --current-version <X.Y.Z.W> [--workspace-root <path|null>] [--version-path <path>]",
|
|
);
|
|
process.exit(0);
|
|
}
|
|
const warnings: string[] = [];
|
|
const host = detectHost();
|
|
const repoRoot = repoToplevel();
|
|
const versionPath = resolveVersionPath(args.versionPath, repoRoot);
|
|
const baseVersion = args.current || readBaseVersion(args.base, versionPath, repoRoot, warnings);
|
|
const baseParsed = parseVersion(baseVersion);
|
|
if (!baseParsed) {
|
|
console.error(`Error: could not parse base version '${baseVersion}'`);
|
|
process.exit(2);
|
|
}
|
|
// The repo's own width governs everything downstream: a 3-digit repo must
|
|
// not be handed a 4-digit slot, or /ship writes a version the repo's tooling
|
|
// can't read back (#2501).
|
|
const width = versionWidth(baseVersion);
|
|
if (bumpWasCoerced(args.bump, width)) {
|
|
warnings.push(`--bump micro has no component to move in a ${width}-digit version; treated as patch`);
|
|
}
|
|
|
|
const excludePR = args.excludePR ?? autoDetectExcludePR();
|
|
if (excludePR !== null && args.excludePR === null) {
|
|
warnings.push(`auto-excluded PR #${excludePR} (current branch's own PR)`);
|
|
}
|
|
|
|
let claimed: ClaimedPR[] = [];
|
|
let offline = false;
|
|
if (host === "github") {
|
|
({ claimed, offline } = await fetchGithubClaimed(args.base, versionPath, excludePR, warnings));
|
|
} else if (host === "gitlab") {
|
|
({ claimed, offline } = await fetchGitlabClaimed(args.base, versionPath, excludePR, warnings));
|
|
} else {
|
|
warnings.push("host unknown; queue-awareness unavailable");
|
|
}
|
|
|
|
// Degraded host query → fall back to git, which needs no API. Additive: it
|
|
// only runs when the host told us nothing, so the online path is untouched.
|
|
let fallback: "git" | null = null;
|
|
if (offline || host === "unknown") {
|
|
const gitClaims = fetchGitClaimed(args.base, versionPath, warnings);
|
|
if (gitClaims.length) {
|
|
claimed = [...claimed, ...gitClaims];
|
|
fallback = "git";
|
|
warnings.push(
|
|
`host queue unavailable — allocated from git instead ` +
|
|
`(${gitClaims.length} claim(s) from remote refs + shipped subjects). ` +
|
|
`PR numbers and draft status are unavailable, but the version is safe.`,
|
|
);
|
|
} else {
|
|
warnings.push(
|
|
"host queue unavailable AND git found no claims — the pick rests on " +
|
|
"the base VERSION alone. Verify no sibling branch holds it before " +
|
|
"shipping.",
|
|
);
|
|
}
|
|
}
|
|
|
|
// Only count PRs that actually bumped VERSION past base as real "claims".
|
|
// A PR whose VERSION equals base's VERSION hasn't claimed anything.
|
|
const realClaims = claimed.filter((c) => {
|
|
const v = parseVersion(c.version);
|
|
return v !== null && cmpVersion(v, baseParsed) > 0;
|
|
});
|
|
const claimedVersions = realClaims
|
|
.map((c) => parseVersion(c.version))
|
|
.filter((v): v is Version => v !== null);
|
|
|
|
const { version: picked, reason } = pickNextSlot(baseParsed, claimedVersions, args.bump, width);
|
|
|
|
const workspaceRoot = resolveWorkspaceRoot(args.workspaceRoot);
|
|
const siblings = markActiveSiblings(scanSiblings(workspaceRoot, versionPath, claimed, warnings), baseParsed);
|
|
const activeSiblings = siblings.filter((s) => s.is_active);
|
|
|
|
// If an active sibling outranks our pick, bump past it (same bump level).
|
|
let finalVersion = picked;
|
|
let finalReason = reason;
|
|
const activeAhead = activeSiblings
|
|
.map((s) => parseVersion(s.version))
|
|
.filter((v): v is Version => v !== null)
|
|
.filter((v) => cmpVersion(v, finalVersion) >= 0);
|
|
if (activeAhead.length) {
|
|
const highest = activeAhead.sort(cmpVersion)[activeAhead.length - 1];
|
|
finalVersion = bumpVersion(highest, args.bump, width);
|
|
finalReason = `bumped past active sibling ${fmtVersion(highest, width)}`;
|
|
}
|
|
|
|
const out: Output = {
|
|
version: fmtVersion(finalVersion, width),
|
|
current_version: args.current || baseVersion,
|
|
base_version: baseVersion,
|
|
version_path: versionPath,
|
|
bump: args.bump,
|
|
host,
|
|
offline,
|
|
fallback,
|
|
claimed: realClaims,
|
|
siblings,
|
|
active_siblings: activeSiblings,
|
|
reason: finalReason,
|
|
warnings,
|
|
};
|
|
process.stdout.write(JSON.stringify(out, null, 2) + "\n");
|
|
}
|
|
|
|
// Pure-function exports for testing. The version primitives are re-exported
|
|
// from lib/version-source so existing importers of this module keep working
|
|
// unchanged.
|
|
export { parseVersion, fmtVersion, bumpVersion, cmpVersion, versionWidth, extractVersion };
|
|
export { pickNextSlot, markActiveSiblings, resolveVersionPath, fetchGitClaimed };
|
|
|
|
// Only run main() when invoked as a script, not when imported by tests.
|
|
if (import.meta.main) {
|
|
main().catch((e) => {
|
|
console.error("Unexpected error:", e?.stack ?? e);
|
|
process.exit(3);
|
|
});
|
|
}
|