mirror of
https://github.com/garrytan/gstack.git
synced 2026-08-22 22:17:16 +02:00
* fix(plan-tune): reject never-ask on one-way ids at --write --check already ignored those prefs; --write still stored them and --stats counted them as a working NEVER_ASK. Refuse the write and count leftover on-disk prefs as INERT_ONE_WAY. Co-authored-by: Cursor <cursoragent@cursor.com> * Fix: gstack-config get returns "" with exit 0 for keys that have no default Skill preambles read configuration with VAR=$(gstack-config get <key> 2>/dev/null || echo "<default>") and that fallback only fires on a non-zero exit. lookup_default ended in a catch-all that echoed "" and returned 0, so for any key missing from the table VAR came back empty and the default written right there in the preamble was unreachable. The skill then branched on a value it never specified: "skip entirely if QUESTION_TUNING is false", reached with QUESTION_TUNING="". Four keys that skills actually read had no entry and took that path: question_tuning -> callers assume "false" repo_mode -> callers assume "unknown" team_mode -> callers assume "false" transcript_ingest_mode -> callers assume "off" Each default above is the value the call sites already substitute in their own `|| echo` fallback, so this only makes reachable what was already intended. The catch-all now returns non-zero. That is deliberately scoped to the unknown-key arm alone: keys whose default is intentionally empty still exit 0, because "" is their real answer and their callers depend on it -- cross_project_learnings ("unset triggers the first-time prompt"), redact_repo_visibility ("empty falls through to gh/glab detection"), salience_allowlist, user_slug_at_*. Making every empty answer an error would have broken those. test/gstack-config-defaults.test.ts pins the class rather than the four instances: it parses the case arms and asserts every `gstack-config get <key>` site in the tree is covered, so adding a read without a default fails CI. It also pins the exit-code contract in both directions. Verified failing against the pre-fix script, where it names exactly those four keys. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(redact): a typo'd subcommand no longer exits 0 having done nothing main() recognised exactly two subcommands and let everything else fall through to the stdin scan. On empty stdin that prints "(no findings)" and exits 0, so: $ gstack-redact install-prepush-hooks # plural typo gstack-redact scan — repo UNKNOWN (no findings) $ echo $? 0 No hook was installed, and the operator has every reason to believe the credential guard is armed. A guard that silently no-ops must never exit 0. Two smaller faults in the same dispatch, both of which lead people here: - There was no --help handler, so `gstack-redact --help` fell through to the scanner. Piping a credential to it scanned the secret and exited 3. - With no piped input and no --from-file, readInput() blocks on readSync(fd 0) until an EOF that an interactive terminal never sends. That prints nothing at all, so it reads as a hang rather than as "this is a filter, feed it". Now: --help/-h/help prints usage and exits 0; an unrecognised positional prints the offender and exits 1; a TTY with nothing piped in prints usage instead of blocking. "scan" stays accepted, because the human output header reads "gstack-redact scan — repo …" and that is what people type. Usage errors exit 1, deliberately not 2 or 3. Those mean MEDIUM and HIGH findings and callers gate dispatch on them, so a usage error exiting 2 would be read as "medium findings — prompt the user". A test pins that. Tests: 4 written failing first, then fixed. Full suite 7,722 pass / 0 fail. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(browse): one ambiguous ref no longer kills the whole annotated screenshot `snapshot -a` exits 1 with "Selector matched multiple elements" on most real pages, so /qa, /canary and /land-and-deploy silently produce reports whose screenshots do not exist. Plain `screenshot <path>` is unaffected. Refs are built as getByRole(role, {name}) and disambiguated with .nth() when role+name repeats. That disambiguation cannot fire for a node with NO accessible name: the locator degrades to getByRole(role) with no name filter, and the count driving .nth() is taken from the FILTERED aria snapshot while getByRole matches the unfiltered DOM. Measured on a live page: the tree surfaced 2 unnamed paragraphs, the DOM had 9. Landmarks (banner/main/contentinfo) and paragraphs are correctly unnamed per ARIA, so this is the common case rather than an edge case. boundingBox() then hits Playwright strict mode, and the catch allowlisted only timeout/closed/Target/Execution-context messages — so the strict-mode error was re-thrown and aborted every remaining annotation. Two changes: - `.first()` before boundingBox(), so an ambiguous ref draws a box on its first match instead of aborting. The heatmap path below has always tolerated this via a bare `catch {}`; annotate was the only path that could be killed outright. - the catch no longer re-throws on unrecognised messages. A box we cannot measure is a box we do not draw, never a reason to lose the rest of the page. Set BROWSE_DEBUG to see what was skipped. Also: `-o` passed without `-a`/`-H` was silently ignored (exit 0, no file), which reads as "screenshots are broken" rather than "you forgot a flag". It now warns and points at `browse screenshot <path>`. Verified by rebuilding both ways against the same page with 51 refs present: before — "Selector matched multiple elements", no file written after — exit 0, 229KB PNG Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(version-bump): missing or empty VERSION no longer repairs a fabricated 0.0.0.0 into package.json repair now fails with exit 2 when the VERSION file is absent or empty instead of folding to DEFAULT ("0.0.0.0") — which passed VERSION_RE and regressed package.json below where it started. classify gains an additive versionFileExists field so /ship can tell a real 0.0.0.0 from a fabricated one. Re-derived from PR #2612 under the generated-file screening rule. Fixes #2600 (repair half; the path-configurability half landed in v1.67 via #2531). Contributed by @Lockyer228 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(memory-ingest): --probe counts post-attribution, through the same gate --bulk uses probeMode previously stat'd every walked file, so setup-gbrain gated its silent bulk ingest on pre-filter counts that the write path would never ingest (#2394). The attribution decision now lives in ONE shared gate (sessionIsAttributable — cheap-parse: cwd extraction + memoized resolveGitRemote, never a full page build) used by BOTH probeMode and preparePages, so the two stages' post-attribution counts are structurally identical. ProbeReport gains skipped_unattributed; the probe prints what it excluded and --include-unattributed restores raw counts. The parity is pinned at the prepare stage (probe post-attribution == transcripts reaching import), deliberately NOT == final written. Re-derived from PR #2612 under the generated-file screening rule; the shared-gate design and the remote memo are additions from the plan review. Fixes #2394. Contributed by @Lockyer228 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(browse): allow CPU and network throttling for performance measurement Adds Emulation.setCPUThrottlingRate and Network.emulateNetworkConditions to CDP_ALLOWLIST. Motivation: diagnosing a real "uploads take 1-2 minutes" report, the only machine available was a fast developer workstation. Client-side processing measured 1.4s where the user experienced minutes, so the conclusion had to be reached arithmetically rather than observed. Throttling would have let the measurement reproduce the reporter's conditions directly. Both fit the existing posture rather than widening it: - Emulation already allows setDeviceMetricsOverride, clearDeviceMetricsOverride and setUserAgentOverride, which are equally mutating and scoped to the tab. - Neither method reads page content. setCPUThrottlingRate affects only timing; emulateNetworkConditions constrains traffic rather than inspecting it, so no request bodies, headers or cookies are exposed. Both are output: 'trusted' because they return no page-derived data. scope 'tab' for both, matching the surrounding Emulation entries. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(session-update): lock pidfile records the live holder; hard TTL bounds every wedge (#2613) echo $$ inside the backgrounded subshell recorded the PARENT hook's PID — which exits immediately — so every subsequent session judged the lock stale and rm -rf'd a LIVE holder's lock, letting concurrent updaters run over each other. The pidfile now records ${BASHPID:-$(sh -c 'echo $PPID')} (macOS bash 3.2 has no BASHPID; the sh child's PPID is exactly this subshell). Staleness is now two independent detectors: PID liveness (as before, but against the real holder), and a 30-minute hard TTL on the heartbeat mtime — reclaimed regardless of kill -0, so a recycled PID or hung holder can't wedge the lock forever. The holder touches the pidfile after the pull and after setup, so a legitimately-slow run keeps itself alive. Empty and missing pidfiles are respected inside the TTL window (the mkdir→echo race) and reclaimed past it. Fixes #2613. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore(browse): explicit windowsHide on every Bun.spawn site + census tripwire (#2575 residual) Bun.spawn sites were structurally outside the windowsHide census (it swept child_process bindings only). The runtime was already safe — native Bun hides consoles by default and bun-polyfill.cjs defaults windowsHide !== false since #2523/#2539 — but implicit defaults are exactly what regress silently. Every Bun.spawn/spawnSync in browse/src now carries the explicit flag (harmless on unix-only sites like Xvfb/xattr/open), and a second SWEEP in windows-spawn-hide.test.ts fails CI on any new flagless Bun.spawn site. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(gbrain): brain worktree advances on the daily sync — no more silently stale brains (#2516) The daily pull refreshed only ~/.gstack itself, never the detached worktree at ~/.gstack-brain-worktree that gbrain actually indexes — so after setup the brain served stale pages forever unless setup-gbrain/sync-gbrain happened to run. brain-sync --once now advances the worktree once per 24h behind an ATTEMPT stamp (.brain-worktree-last-advance — a persistently-failing advance warns once a day, not at every skill boundary), inside the existing run lock and before any ingest step touches the worktree. The new gstack-gbrain-source-wireup --advance-only is built for the unattended cadence: git-only (no gbrain prereqs), pins every operation to the managed worktree (refuses paths that are not worktrees of the artifacts repo), refuses dirty worktrees, and never runs the force-remove recovery — a cron path must not be able to delete local changes. A static pin keeps the force-remove out. docs/gbrain-sync.md stops overclaiming the old cadence. Fixes #2516. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(memory-ingest): honor the per-remote deny/read-only trust policy (#2392) Transcript ingest now respects the same trust store as code import — the gate existed only in gstack-gbrain-sync's runCodeImport, so memory-ingest happily ingested transcripts from deny-listed repos. preparePages filters prepared transcript pages through ONE batch policy lookup (new 'get --batch' verb on bin/gstack-gbrain-repo-policy — the script owns URL normalization; the client adds repoPolicyTierBatch, one spawn for all distinct remotes, so large corpora never pay a 10s-timeout subprocess per remote). Outcomes match code-import semantics: read-only → clean skip (skipped_policy_readonly), deny → counted refusal (skipped_policy_deny), corrupted/unreadable store → HARD ERROR before any write (state, staging, egress receipt, and import all untouched) with the recovery command named — policy corruption must never read as successful ingestion. Artifacts are never policy-filtered (their git_remote is a project slug, not a remote). Fixes #2392. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(config): repo_mode keeps its empty no-default semantics (#2611 follow-up) The ported defaults table synthesized repo_mode → "unknown", but EMPTY is load-bearing for that key: gstack-repo-mode treats any non-empty answer as a user override and skips its own repo classification — the synthesized default turned the classifier into dead code (REPO_MODE=unknown everywhere; caught by test/gstack-repo-mode.test.ts via the wave's cross-agent blame protocol). repo_mode joins the empty-is-real carve-outs (empty output, exit 0). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(pair-agent): consent before killing a healthy headless daemon The pair-agent headed switch spawned 'connect --force-restart' unconditionally — auto-killing a live headless daemon (open tabs, cookies, logins) in direct contradiction of the iron rule it sits beside ('only an explicit --force-restart may kill a live daemon'). The CLI now captures daemon liveness BEFORE ensureServer (which can itself boot a fresh daemon) and relaunches only when the user passed --force-restart to pair-agent; otherwise it prints the tab count and continues against the existing daemon. The /pair-agent skill gains a matching one-way-door consent question (template half rides the wave's template block). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(gbrain-status): MCP scoping is per-project, and project-local beats user scope hasRemoteOnlyGbrainMcp scanned EVERY project's mcpServers in ~/.claude.json, so one project's remote gbrain registration reclassified broken local engines as thin-client machine-wide. It now reads user scope plus only the cwd's nearest-ancestor project key. The precedence itself was verified empirically and hermetically (fake HOME + CLAUDE_CONFIG_DIR fixtures, claude 2.1.233): with both scopes defining gbrain, 'claude mcp get gbrain' reports Scope: Local config — PROJECT-LOCAL WINS. Both in-repo consumers assumed the opposite; brain-cache's endpoint resolution flips to nearest-ancestor-project-first, and the stale user-first pin in brain-cache-roundtrip now pins the verified precedence. (The user-first jq in the brain-sync preamble resolver gets the same swap in the template block.) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(slug): gstack-slug matches remote-slug's owner-repo canonical form (live misfile bug) Found live during this wave's CEO review: bin/gstack-slug emitted SLUG=garrytan for this garrytan/gstack worktree while remote-slug correctly gave garrytan-gstack — decisions, timeline, ceo-plans, and learnings were filing into the wrong project store (observed polluting Context Recovery with another repo's decisions). Root cause: a stray empty ~/.git directory made the walk-up crown $HOME as the outermost project root; the remote lookup ran only against that root, failed silently, and the basename fallback cached 'garrytan' sticky. NOT worktree-specific — any strong marker on a non-repo ancestor triggered it. Fix: the walk now finds the outermost ancestor whose .git actually resolves an origin remote and derives owner-repo with remote-slug's byte-identical parse; marker-only ancestors keep anchoring the basename fallback but can no longer shadow a real remote. A new cache self-heal recomputes the poisoned shape (cached == basename of a marker root while a remote-bearing repo exists below), preserving legit #2212 stickiness. Nested-repo walk-up, no-remote and non-git fallbacks, and the SLUG=/BRANCH= eval contract are unchanged, pinned by a 10-case parity suite. Store migration for pre-fix data is tracked in TODOS.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(brain-sync): per-record spool dir — the enqueue/drain race dies structurally Producers appended lines to .brain-queue.jsonl while the drain re-read and os.replace'd it; the in-code comment admitted a lockless append between the re-read and the replace was lost. Locks and rename-rotation designs were both reviewed and rejected (each retained a tail race); the shipped design is a maildir-style spool: one FILE per record in .brain-queue.d/ (tmp + atomic rename), the drain snapshots filenames, processes, and deletes exactly what it snapshotted. Writer and drainer never share an inode — nothing to race. Semantics: at-least-once (a crash between process and unlink re-drains; downstream content-hash dedup absorbs duplicates); retained (privacy-held) records keep their files; unparseable records are kept + warned, never destroyed. Legacy .brain-queue.jsonl migrates atomically on the next drain (crash-leftover .migrating files recovered too); status/drop-queue count both surfaces; discover-new writes spool records and advances its cursor per-record-written. The preamble's queue-depth line switches to spool count in this wave's template block. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(bin-context): native slug fallback walks up like bash gstack-slug slugFromEnvironment derived the slug from the INNERMOST repo's origin while bash gstack-slug walks to the outermost project root — nested/vendored repos split their stores across the bash/native boundary (win32 hits the native path constantly). The native fallback now ports _outermost_project_root faithfully (strong/weak markers, outermost-strong-wins, 64-depth cap, fixed-point termination) plus the full resolution order: env override → walk-up → sticky cache with the #1125 self-heal → remote get-url → basename. Twelve mirrored scenarios drive BOTH implementations against the same fixtures and pin identical slugs. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(next-version): git fallback queries the live remote, never mutates, and keeps 3-digit width The degraded path counted every remote-tracking ref on every remote — stale experiment branches and second remotes inflated version allocation, and a failed base read flipped 3-digit repos to 4-digit slots. Now: ls-remote --heads origin first (GIT_TERMINAL_PROMPT=0, 5s timeout, zero local ref mutation); on failure, local refs/remotes/origin ONLY with an explicit stale-refs warning; a failed base read zeroes at the LOCAL version file's width so a 3-digit repo allocates 0.0.1, not 0.0.1.0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(setup): hooks register the global-install path and re-point stale ones Registering hooks from a dev worktree baked that worktree's absolute path into settings.json — deleting the worktree left a dead hook erroring on every session stop, and the presence-only dedup (list-sources | grep) could never re-point it. setup's hook paths now route through _hook_install_path (global install preferred, source dir fallback), and the new ensure-event verb on gstack-settings-hook compares the registered command payload against canonical: identical → no write, different → single atomic replacement (never zero or two registrations). The plan-tune hooks had the same stale pattern and get the same fix without re-triggering their consent prompt. Also hardened: bun 1.3.13 turns an uncaught sync fs error in bun -e into a SILENT exit 0 — the registrar's write path now catches, prints, and exits 1, so a failed update can never report fake-green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(preamble): learnings capture is unconditional at completion (#2402) 43 of 44 learnings entries came from explicit /learn — the completion-status prose read 'if you discovered a durable project quirk... log it', which models treated as optional. The step now ALWAYS runs: review the session for durable learnings, log each one, and state 'No durable learnings this session' explicitly when the review comes up empty — an empty result, never a skipped step. Re-derived from PR #2612 under the generated-file screening rule. Fixes #2402. Contributed by @Lockyer228 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(scrape): untrusted-content warning on the page-fetching skills (#2441) /scrape and /skillify consumed page content with zero injection guidance — the CHANGELOG claimed coverage the skills didn't have. The warning now lives in ONE exported const (UNTRUSTED_CONTENT_WARNING in resolvers/browse.ts), embedded in the browse COMMAND_REFERENCE as before AND injected standalone into both skills via the new {{UNTRUSTED_CONTENT_WARNING}} token — single source, wording can never drift between surfaces. Re-derived from PR #2612 under the generated-file screening rule. (Structural isolation for skillify-generated code is tracked as its own TODO.) Fixes #2441. Contributed by @Lockyer228 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): checklist paths resolve from the installed skill root (#2518) /review Step 2 read .claude/skills/review/checklist.md — a path relative to the TARGET repo, which only resolves in gstack's own checkout. Every checklist/greptile-triage/TODOS-format reference (six across five templates — two more than the issue named, same class) now uses the installed-root form ~/.claude/skills/gstack/review/... that the templates' other references already use. The install-root class itself (non-default install dirs) is #1882, deliberately its own PR. Fixes #2518. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(pair-agent): one-way-door consent question before a daemon relaunch (template half) The skill flow now checks daemon liveness before Step 4 and asks an explicit one-way-door question (tabs/cookies/logins are lost) before passing --force-restart — never proceeding on a vague reply. Pairs with the CLI-half commit that stopped pair-agent auto-killing live daemons. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(codex): resume does not amortize the ~21K session prelude (#2387) Measured (#2387): every codex exec call pays Codex's session prelude, and a resumed call came in slightly ABOVE a fresh one — resume buys continuity, never token savings. The skill now says so where the resume flow lives: prefer one codex call per skill, batch questions into it. Fixes #2387. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(upgrade): fast-forward first; reset --hard only behind a proved-safe gate (#2517) /gstack-upgrade went straight to stash + reset --hard origin/main. Now it tries git pull --ff-only --autostash first (the same policy session-update's auto-upgrade uses). The destructive fallback runs unprompted ONLY when both git status --porcelain AND git rev-list origin/main..HEAD are empty — a clean tree with unpushed local commits is NOT safe, reset destroys them. Anything else requires an explicit one-way-door confirmation that lists every dirty file and unpushed commit being discarded. Fixes #2517. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(preamble): brain-sync block counts the spool queue and resolves MCP project-first Two resolver halves deferred from earlier wave commits: the queue-depth line counts .brain-queue.d/*.json spool records (plus legacy lines until the drain migrates them), and GBRAIN_MCP_ENTRY_JQ swaps its operands to nearest-ancestor-project-first — matching the empirically verified Claude Code precedence (project-local beats user scope) instead of the backwards user-first assumption. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: regenerate SKILL.md docs + golden fixtures (single regen for the template block) Pure generator output for the six template/resolver commits above (learnings capture, untrusted-content warning, review paths, pair-agent consent, codex resume note, upgrade ff-only, brain-sync block) — bun run gen:skill-docs + --host codex + --host factory, with the three ship golden fixtures refreshed per the documented procedure. The three sidecar-path pins in gen-skill-docs.test.ts move to the new installed-root/$GSTACK_ROOT contract (#2518). Restores template freshness; full suite green from here. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: TODOS.md — strike the six wave-fixed residuals, add two follow-ups The v1.67 adversarial-review residuals section shrinks to the one item the wave couldn't reach (iOS tap routing — needs real-device verification). New entries: skillify structural isolation (a prose warning is not a boundary for page-derived generated code) and the slug store migration (pre-fix sessions on stray-marker machines filed data under the degraded slug; post-fix reads go to the correct store, so history needs a merge/alias). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: align cross-cutting pins with the wave's contracts Three suites pinned pre-wave behavior: browse's gstack-config test asserted the old unknown-key ''/exit-0 shape (#2611 made it exit 1); the Windows-paths suite pinned O_APPEND enqueue atomicity (the spool design satisfies the same invariant via tmp + os.replace, one file per record — pinned in its new form); and nine carve-guard skeleton ceilings absorbed the #2402 unconditional-learnings prose (~450B per skill), bumped with measured values per the guard's own protocol. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: re-anchor the referenced-path scanner self-check to the gstack-rooted review refs The self-check pinned the review checklist as a class-1 alias-relative ref; #2518 moved those refs to the installed gstack root (class 2). The guard now proves the scanner sees them in their new class, so the class-2 assertion can't go vacuous. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: pin the wave's prose-tier behaviors (ship coverage-audit gap closure) The coverage audit found one regression-shaped gap: nothing pinned that the upgrade template's ff-only pull precedes the gated reset --hard (#2517) — a future template edit reverting to reset-first would fail nothing. Pinned: the ordering, the FF_OK gate, and the unpushed-commits check. Also pinned the two minor gaps: the {{UNTRUSTED_CONTENT_WARNING}} injection points in scrape/skillify (#2441) and brain-uninstall's spool-dir cleanup. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: pre-landing review round — 8 auto-fixes + 8 accepted findings hardened The ship review army (4 specialists + red-team + checklist, 29 findings) produced 8 mechanical auto-fixes and 11 decisions; the accepted set: - win32 slug parity completed: lib/bin-context.ts gains the remote-first outermost walk + degraded-cache self-heal the bash side got this wave — the two implementations now agree on the stray-marker live-bug shape, pinned by shared fixtures (multi-specialist 9/10 finding). - probe honors the plan's bounded-read decision: 256KB prefix, extraction semantics mirrored from parseTranscriptJsonl so probe/prepare can never diverge on the same file (>1MB transcript test). - policy normalize parity: bash normalize() now matches canonicalizeRemote on .git/-trailing and uppercase-.GIT shapes (7-shape corpus pinned two ways) — a deny for those shapes could previously slip the transcript gate. - session-update reclaim is TOCTOU-safe (atomic mv-aside on both branches). - settings-hook: unparseable settings.json errors instead of being replaced with {}; ensure-event keys on (event, source) so matcher changes update in place — never zero or two registrations. - dot-only slug guard at both parse sites (hostile 'url = ..' can't escape projects/); enqueue tmp-file janitor (1h TTL, inside the drain lock); brain-sync .migrating never clobbered; drop-queue/status count .migrating; snapshot -o warning correct + surfaced in diff mode; version-bump test order-dependence removed; uninstall clears the advance stamp. Deferred with record: slug heal-probe cost sentinel (P3 TODO), FF_OK conflation (noted, misdiagnosis-only). 270 pass / 0 fail across the 10 touched suites. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: adversarial round — the P0 finalize fail-safe and 12 hardened findings Three adversarial passes (Claude fresh-context, Codex chaos, Codex structured with P1 gate) on the full wave diff. Multi-source findings, all fixed: - P0: finalize_queue is now explicit-delete-only — a record is unlinked ONLY when classification proves it staged or dropped; a classifier crash, a missing class file, or a malformed pulled .brain-privacy-map.json (which previously nuked the whole snapshotted queue, remotely triggerable) now retains everything, warns, and re-drains next run. load_privacy_map treats corrupt maps as retain-all, never as empty. - next-version cannot silently drop a live claim: unreadable advertised refs get a targeted --depth=1 fetch + retry; still-unreadable claims surface as UNKNOWN warnings instead of duplicate-version silence. - session-update lock: ownership-checked EXIT trap (a TTL-reclaimed holder can no longer delete the new holder's lock) + a 5-min background heartbeat so a legitimately-slow pull/setup is never reclaimed while alive. - ensure-event collapses ALL same-(event,source) duplicates to one canonical entry; unique per-process tmp path; setup call sites surface (not swallow) the hardened refusals. - memory-ingest: --limit counts only policy-permitted pages (denied records no longer starve permitted ones); --probe applies the same policy filter as --bulk (skipped_policy_* fields on the report). - version-bump repair accepts a genuine literal 0.0.0.0 VERSION file. - slug heal restricted to the stray-.git shape — package.json-anchored wrapper roots keep their legit sticky identity (#2212 preserved). - brain-sync: idle fast path sees leftover .migrating records; unparseable spool records quarantine instead of warning forever; migration comment stops overclaiming the transition-window race. - CDP throttling justifications document override persistence (callers own restoration), pinned in the allowlist test. Deferred with record: deny retroactivity for already-ingested pages (P2 TODO, same semantics as the code-import gate); legacy-migration tail race (transition-window, requires pre-spool writers). 288 pass / 0 fail across the 10 touched suites. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: regenerate SKILL.md docs + goldens (Windows-separator jq fix) Pure generator output for the brain-sync block's jq ancestor match now accepting backslash-formed Windows project keys — previously project-scoped brains were invisible on Windows while the TS scope resolvers saw them. Golden ship fixtures refreshed per the documented procedure. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: codex verify-pass residuals — chunked cwd read, post-filter partial count, migrating depth The verify re-review passed the P1 gate (0 P1s) and left three residuals, all applied: transcriptCwdFromPrefix reads in chunks until one complete record (4MB cap) so a giant first prompt can't truncate mid-JSON and break probe/bulk parity; partial_pages derives from the FINAL prepared set instead of the whole scanned corpus; the preamble queue-depth line counts leftover .brain-queue.jsonl.migrating records like the status path does (regen + goldens included). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: bump version and changelog (v1.68.0.0) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: update project documentation for v1.68.0.0 BROWSER.md: fix the $B cdp example (positional JSON params, not --json; depth is the real CDP param) and add the new perf-throttling examples (Emulation.setCPUThrottlingRate, Network.emulateNetworkConditions) with their clear-override counterparts. USING_GBRAIN_WITH_GSTACK.md: the state-files table row for the sync queue now names the maildir-style spool dir .brain-queue.d/ that replaced .brain-queue.jsonl this release. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: align memory-pipeline probe pins with the #2394 stage-count contract The paid-tier E2E pinned the pre-fix contract (probe headline = raw discovered). Probe now counts post-attribution — the same gate --bulk uses — with an explicit unattributed-skip line. Adds the --include-unattributed companion pin so all 9 fixtures stay accounted for. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(next-version): batch missing-tip fetches — one bounded round trip, never a per-branch crawl The targeted-fetch retry for branches whose advertised tip has no local object ran ONE git fetch per branch (10s cap each). On a shallow clone against a busy remote that crawls the network for minutes — CI's shard deadline killed the free suite mid-file. Missing tips now collect into a single batched shallow fetch (15s cap); refs still missing after the batch (one unservable ref fails the whole transfer) get a capped per-branch retry, and anything past the cap warns as an UNKNOWN claim instead of fetching. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(next-version): pin the batched fetch + make the offline-contract tests hermetic Two new G2 pins: N unfetched claim branches resolve with exactly ONE fetch spawn (PATH-shimmed git counts invocations), and one unservable ref no longer poisons the batch — live claims resolve via the bounded retry while only the ghost warns UNKNOWN. The #2545 offline-contract tests now run the CLI in a local fixture repo instead of the repo's own checkout: the checkout path did a live ls-remote against the real origin (operator-network-dependent, and the CI shard-deadline hang). The online-contract test gains a succeeding gh stub, so fallback:null is asserted deterministically instead of only when the operator happens to be authed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(redact-cli): derive the synthetic AWS-key fixture — no contiguous credential literal in source The CI quality gate scans every ADDED diff line with the redact engine, so the #2610 port's raw fixture literals failed the very gate they exist to test. The fixture is now assembled at runtime; the scanner still receives the identical bytes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(next-version): pin the fixture's host via origin-URL sniff — kills the last environment dependence The hermetic offline-contract fixture had no origin remote, so detectHost() fell through to auth probes: a machine with glab authed passed via the gitlab path while a bare CI runner read host:unknown (offline stays false there) and failed. The fixture now pushes to a local bare origin at a path containing github.com — the URL sniff pins host:github identically everywhere, asserted explicitly in both tests, with every git call still local. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: y$un_ <forrest.sun527@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: benjamin beres <benjamin.beres@bienpreter.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Ricky <ricky@kinokostudio.com.hk> Co-authored-by: Connex Client Access <paul@paulkortman.com> Co-authored-by: henbima <henbima@gmail.com>
768 lines
31 KiB
TypeScript
Executable File
768 lines
31 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.
|
|
const lsRemote = spawnSync("git", ["ls-remote", "--heads", "origin"], {
|
|
encoding: "utf8",
|
|
timeout: 5000,
|
|
env: { ...process.env, GIT_TERMINAL_PROMPT: "0" },
|
|
});
|
|
const lsOk = lsRemote.status === 0 && !lsRemote.error;
|
|
|
|
// 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 (lsOk) {
|
|
for (const line of (lsRemote.stdout ?? "").split("\n")) {
|
|
const m = line.trim().match(/^([0-9a-f]{40,64})\trefs\/heads\/(.+)$/);
|
|
if (!m) continue;
|
|
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(
|
|
"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);
|
|
});
|
|
}
|