Commit Graph

2 Commits

Author SHA1 Message Date
Garry Tan f05e61a0bf
feat(merge): confirm-enqueue subcommand for enqueue-and-return
gstack-merge gains confirm-enqueue: for a queue regime, confirm the PR was
actually picked up (Trunk Merge Queue (<base>) check appeared, or GitHub
auto-merge enabled) then RETURN, instead of blocking on the landing poll.
Writes a lightweight last-enqueue.json marker (no merge SHA). This is the
building block for /land's enqueue-and-return default; wait stays for --watch.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-01 08:34:03 -07:00
Garry Tan e7741d9841
feat(merge): gstack-merge regime-aware merge helper + tests
Pure regime logic in lib/merge.ts (detect/submit-plan/classify-land/handoff
schema+validation) behind a thin bin/gstack-merge CLI (detect/submit/wait/
write-state/read-state). Supports none, GitHub native merge queue, and the
trunk.io merge queue with a comment-first submit chain. 41 deterministic
tests (30 unit + 11 CLI).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-05-31 09:13:16 -07:00