Commit Graph

2 Commits

Author SHA1 Message Date
Garry Tan fa7ced73a8
Merge origin/main into garrytan/trunk-land-skill
Reconcile VERSION (1.56.0.0 stays above main's 1.55.0.0), package.json, and
CHANGELOG (1.56.0.0 entry on top of main's 1.54/1.55 entries). Regenerated
all host SKILL.md against main's resolver changes.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-05-31 09:43:34 -07:00
Garry Tan 948f55d1ab
feat(land): new /land skill — land a PR through the right merge regime
Extracts the land half of /land-and-deploy into a standalone, composable
skill: pre-flight, CI wait, VERSION-drift, the pre-merge readiness gate
(with --fast), and a regime-aware merge that drives bin/gstack-merge.
Confirms landing (state==MERGED + commit on base, handling rebase-null oid)
and writes the last-land.json handoff. Carries the never-blind-retry
post-failure invariant (cli/cli#3442, cli/cli#13380).

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