v1.59.0.0 feat: /land skill + trunk.io merge-queue integration by garrytan · Pull Request #1815 · garrytan/gstack

garrytan · 2026-05-31T16:44:15Z

What this adds

A standalone /land skill that takes a green PR and merges it through the right regime, and a trunk.io merge-queue integration that rides on top of it. /land-and-deploy now composes /land (via {{INVOKE_SKILL:land}}) and then deploys, so the merge path lives in exactly one place.

Three regimes, auto-detected:

none — gh pr merge --squash
github — GitHub native merge queue (gh pr merge --auto)
trunk — the trunk.io merge queue, comment-first (gh pr comment "/trunk merge", zero new auth — works the moment Trunk's GitHub App is installed), with the trunk CLI and REST API picked up automatically when present for priority/queue position.

The insight that keeps it cheap

The submit command differs by regime, but the "did it land" signal is uniform: all three end with the PR MERGED and a commit on the base branch. So one poll (plus the Trunk Merge Queue (<branch>) status check for ejection) covers every regime, and Trunk is a thin submit shim rather than a second engine. Detection reads that status check, not the .trunk/ directory (the trunk linter uses the same dir), so a trunk check-only repo is correctly read as "no queue."

Architecture

lib/merge.ts — pure regime logic (detect / submit-plan / classify-land / handoff schema + validation), unit-tested.
bin/gstack-merge — thin CLI (detect / submit / wait / write-state / read-state). The same detect powers /land, /land-and-deploy's dry-run, and /setup-deploy, so they never disagree.
Handoff contract: {{INVOKE_SKILL}} returns nothing structured, so /land writes a validated last-land.json (right PR/repo, recent, non-null SHA) that the deploy half consumes for revert + deploy-workflow matching. Rebase-merge (null mergeCommit.oid) is handled by also checking the commit is on the base branch.
## Merge Configuration is a separate CLAUDE.md section (/setup-deploy writes it) so /land has zero deploy coupling.

Tests

bun test green. 30 unit tests (lib/merge.ts) + 11 CLI integration tests (real binary, fake gh, temp HOME), a gen-skill-docs composition assertion, an H9 generated-doc scrub guard (fails CI if /land grows deploy/canary machinery), and the relocated PR #1620 never-blind-retry post-failure invariant. Coverage matrix, all-host freshness, and touchfiles updated.

Process

Designed via /office-hours (builder mode), locked via /plan-eng-review, and pressure-tested with /codex (18 findings: 12 folded as hardening H1–H12, 2 cross-model tensions accepted). All of trunk's merge-queue docs were read end-to-end; the detection-via-status-check approach came out of that read.

Versioning

origin/main merged in; this lands as v1.56.0.0 (MINOR on top of main's v1.55.0.0). CHANGELOG entry on top.

Before merge

Run bun run test:evals (paid gate-tier E2E) — the composition path is exercised by the existing land-and-deploy-* gate E2E, now dependency-linked to land/** + the merge helper.

🤖 Generated with Claude Code

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>

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>

The merge half moves out: /land-and-deploy now runs the deploy dry-run (calling gstack-merge detect so the table is truthful), composes {{INVOKE_SKILL:land}}, then consumes the validated last-land.json handoff, verifies the merge SHA is on the base branch, and deploys. Revert goes PR-first on merge-queue/protected branches. Net -292 lines; merge logic now lives in one place. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Detects the merge regime via gstack-merge detect and persists 'Merge queue: none|github|trunk' in its own CLAUDE.md section, distinct from Deploy Configuration so /land reads merge config with zero deploy coupling. Notes the optional trunk REST token without storing it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

… touchfiles - gen-skill-docs: assert land-and-deploy composes {{INVOKE_SKILL:land}} and /land carries no deploy/canary machinery (H9 generated-doc scrub) - relocate the PR #1620 post-failure invariant test to /land (where the merge now lives), preserving every pinned invariant - register /land in the skill coverage matrix - link land/**, bin/gstack-merge, lib/merge.ts into the land-and-deploy and setup-deploy E2E touchfiles so the composition path re-runs on change Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

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>

github-actions · 2026-05-31T17:00:00Z

E2E Evals: ✅ PASS

71/71 tests passed | $13.45 total cost | 12 parallel runners

Suite	Result	Status	Cost
e2e-browse	7/7	✅	$0.39
e2e-deploy	6/6	✅	$1.54
e2e-design	4/4	✅	$0.82
e2e-plan	8/8	✅	$2.79
e2e-qa-workflow	3/3	✅	$1.52
e2e-review	6/6	✅	$2.07
e2e-workflow	4/4	✅	$1.03
llm-judge	25/25	✅	$0.5
e2e-plan	8/8	✅	$2.79

12x ubicloud-standard-8 (Docker: pre-baked toolchain + deps) | wall clock ≈ slowest suite

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>

On a merge queue, /land now enqueues the PR and returns by default, so you can /land a stack of ready PRs and walk away while the queue lands them. --watch opts into the blocking poll (and is what /land-and-deploy uses, since it deploys the result). No-queue repos still merge synchronously. Also: /land explains in plain English what a merge queue is and what it'll do before submitting (teacher mode on first encounter), and when no queue is configured it offers to set trunk.io up and hand-holds the whole flow. The onboarding lives in one shared {{MERGE_QUEUE_SETUP}} resolver included by both /land and /setup-deploy (DRY). Atomic .tmpl + gen:skill-docs regen. The postfail-ordering test is updated in the same commit because 4.3 was renamed (Wait -> enqueue/watch); it now matches the section number so the rename stays bisect-clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Asserts the queue default is enqueue-and-return with a --watch opt-in, land-and-deploy forces --watch, the teacher-mode explainer is present, the shared {{MERGE_QUEUE_SETUP}} onboarding resolves in BOTH /land and /setup-deploy, and bin/gstack-merge exposes confirm-enqueue. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…rding Reframes the v1.56.0.0 entry around the fire-and-forget workflow (queue a stack, walk away) and the first-time trunk.io handholding. No version bump — folds into the open PR's existing entry. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

Bumps VERSION, package.json, and the CHANGELOG header. Leaves 1.57/1.58 free for PRs that land first; this branch claims 1.59.0.0 to land later. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

… keys The two section-loading E2E tests (from #1849) declared slash-form testNames ('/ship section-loading') while their E2E_TOUCHFILES and E2E_TIERS keys are hyphenated ('ship-section-loading'). The TOUCHFILES completeness test requires testName === key (the repo convention), so it failed. Hyphenate the two testNames to match their keys; this also fixes tier matching. Describe-block labels stay human-readable. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

…rule) #1909 added the always-loaded PR/MR-title-version invariant to the ship skill and regenerated ship/SKILL.md, but did not regenerate the golden fixtures, so the golden-file regression test was red on main. Refresh the three ship baselines (claude/codex/factory) from the current generated output. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

…-gate Base VERSION advanced to 1.58.1.0, level with this branch, so the version gate failed its 'VERSION must be greater than base' rule. Bump VERSION and package.json to 1.59.1.0 — the next free slot above the queued 1.59.0.0 (garrytan#1815). The diff ^9.0.0 dependency bump is unchanged; the only consumer (Diff.diffLines in browse) is API-compatible with jsdiff v9.

…/gstack-merge (garrytan#1815)

…(codex review) Codex second-opinion findings on the wave diff, both in garrytan#1815's bin/gstack-merge: - P1: the rebase-null edge recorded origin/<base> tip as the landed SHA, which can belong to a LATER change — deploy-matching and reverts could target the wrong commit. Now resolves the rebased commit by patch-id among the 50 newest base commits; when no unique match exists, the state records sha_exact:false, read-state emits LAND_SHA_EXACT=0, and land-and-deploy refuses SHA-based deploy-matching and reverts. - P2: landing state read/wrote ~/.gstack unconditionally; now honors GSTACK_HOME like every other gstack state tool. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

time-attack · 2026-07-15T22:16:25Z

@garrytan pls remove hardcoded version, then i can merge

time-attack · 2026-07-15T22:39:32Z

@garrytan Please rewrite this to resolve main conflicts, enforce trusted policy, avoid direct mutation after unrelated API failures, keep tokens out of process arguments, and record the correct landed commit.

@mvann

… community PRs absorbed) (#2472) * fix(careful): warn on chained rm even when the last target is safe The safe-exception block whitelisted rm -rf of build artifacts by extracting targets with a single greedy match (.*rm ...), which only ever inspects the LAST rm in the command. A chain like 'rm -rf /; rm -rf node_modules' was therefore judged solely by its trailing safe target and allowed without warning, waving through the destructive 'rm -rf /'. Gate the shortcut to single rm invocations: when any shell separator (; | & newline, incl. JSON-escaped \n/\r from the grep extraction path) is present, fall through to the destructive-pattern check, which warns on any recursive rm. Single-command artifact cleanups still allow. Adds 3 regression tests covering semicolon and && chains in both orders. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * harden(careful): substitution separators + capital -R recursive flag (#2039) Two residual fail-opens in the same guard PR #2040 hardened, both verified by executing the script pre-fix: - rm -rf $(./wipe-all)/node_modules silently allowed: the substitution token ends in a whitelisted suffix and the safe-exception early exit skipped ALL downstream checks. $( and backtick now count as chain separators; plain $VAR expansion stays allowed. - rm -R / silently allowed: both greps required a lowercase r in the flag cluster; capital -R is the documented BSD/macOS recursive flag. Both greps now match -[a-zA-Z]*[rR]. Six new tests: substitution x2 -> ask, capital-R x2 -> ask, rm -Rf node_modules single-command -> still allowed, escaped-newline branch (existing code, previously untested), and a pinned deliberate FP (cd app && rm -rf node_modules -> ask) documenting the fail-closed direction on chains. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(context-restore): prefer the current branch's own checkpoint (#2052) All worktrees of a repo share one origin-derived slug, so they share one `~/.gstack/projects/<slug>/checkpoints/` dir. `/context-restore` loaded the newest checkpoint across the whole dir, so in one worktree it could silently restore a *sibling worktree's* newer checkpoint. Step 1 now orders candidates current-branch-first (read from each file's `branch:` frontmatter), keeping other branches as a fallback. A branch is checked out in at most one worktree, so this stops cross-worktree contamination while preserving Conductor cross-branch handoff: when the current branch has no checkpoint of its own, the full newest-first set is still used. - scan the 200 newest before partitioning so a current-branch checkpoint sitting below a burst of sibling saves is still found; output still capped at 20 - non-git / detached HEAD / branchless legacy saves fall back to the old newest-first behavior (back-compat) - +5 regression tests in context-save-hardening.test.ts (the #2052 bug case fails on the old pipeline); regenerated SKILL.md + proactive-suggestions.json Fixes #2052 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(gbrain): pass --confirm-destructive on drift re-register (#1985) ensureSourceRegistered() handles match-but-different-path by removing the old source then re-adding it at the new path. The remove was issued as `gbrain sources remove <id> --yes`, but gbrain >= 0.42 gates `sources remove` behind `--confirm-destructive` (`--yes` alone no longer suppresses the data-loss prompt). The remove therefore fails with "To proceed, pass --confirm-destructive", which ensureSourceRegistered surfaces as "source registration failed" — aborting the entire /sync-gbrain code stage for any already-registered source whose path has drifted. The memory and brain-sync stages still pass, so the code index silently stops refreshing. The orchestrator's own safeSourcesRemove() already passes --confirm-destructive; this brings the lib helper in line with that convention. Keeps --yes for older gbrain. Tests: extend the fake gbrain shim in gbrain-sources.test.ts to simulate the gbrain >= 0.42 guard (remove without --confirm-destructive exits 1), update the drift re-register assertion, and add a regression test that proves the drift path no longer throws. Both fail on main with the exact "To proceed, pass --confirm-destructive" error and pass with the fix. Fixes #1985 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * harden(gbrain-sources): route drift remove through #1734 guards + realpath drift check Absorbing #2031 un-blocked a destructive remove that bypassed the #1734 data-loss guards: ensureSourceRegistered's drift path issued `gbrain sources remove` directly, without the detectAutopilot + decideSourceRemove checks every other remove routes through via safeSourcesRemove. gbrain >= 0.42's own prompt was accidentally blocking that path; with --confirm-destructive passed it is live again. - Drift remove now refuses LOUDLY (throws, actionable message) while an autopilot is active or when decideSourceRemove disallows; a silent changed=false would hide the drifted registration. - decideSourceRemove's extraArgs (--keep-storage when supported) propagate to the remove call, matching safeSourcesRemove. - Drift is realpath-normalized before being declared: a symlink alias of the same directory (macOS /tmp -> /private/tmp) is a match, not drift — the probable cause of #1985's reporter hitting the remove on an unmoved repo. - Drift fires a loud stderr line (old -> new path); perpetual drift in logs is the trigger for promoting #1985's reindex-in-place design. Tests: autopilot-active refusal (no remove in call log), fail-closed refusal on unreadable sources list, --keep-storage propagation, symlink-alias no-drift; existing drift tests pin the guard probes so a live autopilot on the dev machine can't flip them. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(developer-profile): exclude mode:resources rows from SESSION_COUNT, TIER, NUDGE_ELIGIBLE (#2067) Every /office-hours run appends a mode:"resources" bookkeeping row alongside the real session row, so --read double-counted sessions (~2x): tiers promoted early and the builder-to-founder nudge armed prematurely. The file already filtered resources rows for LAST_*/CROSS_PROJECT; the same realSessions filter now feeds SESSION_COUNT/TIER, and the nudge predicate is the faithful allowlist (mode === 'builder') so a future mode #4 fails closed instead of re-opening this bug. 8 regression tests: count vs resources noise, tier boundaries both sides, nudge false-with-noise / true-at-3-builders, cross-project trailing row. Absorbed from PR #1991 by @mvann (fix + tests commits; the PR's version-bump commit is superseded by this wave's consolidated release commit). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(hooks): passThrough() two-branch contract — never emit permissionDecision:'defer' (#2035, #2006) Every AskUserQuestion died with "Tool result missing due to internal error" on current Claude Code builds (Desktop 1.14271.0, CC 2.1.177). Root cause: the question-preference-hook emitted permissionDecision:'defer' on every pass-through path. 'defer' is a real PreToolUse value, but since CC v2.1.89 its semantics are "pause this tool call for external resumption" (headless resume) — never "abstain". Interactive sessions have nothing to resume the paused call, so the tool orphaned. Pre-2.1.89 builds ignored the unknown value, which is why the hook worked when it shipped and broke later. The fix is the two-branch pass-through contract: - no context -> exit 0 with EXACTLY empty stdout - memory nuggets present -> hookSpecificOutput with hookEventName + additionalContext ONLY (the documented shape; plan-tune Layer 8 memory injection ships through this branch and keeps working) defer() is renamed passThrough() so the function says what it does, and docs/spikes/claude-code-hook-mutation.md's protocol contract (cited by the hook header) is corrected in the same commit — it taught '"defer" — let permission flow continue' and was the reintroduction vector. Test contract rewritten in the same commit (13 assertions across 3 files, verified fail-first against the unfixed hook): pass-through paths assert exact-empty stdout (a garbage/partial write cannot slip past an optional-chained parse), the nugget path asserts permissionDecision is ABSENT while additionalContext survives, and a new tripwire asserts no non-deny path ever puts the string "permissionDecision" on stdout. The deny (auto-decide) and Conductor prose-redirect paths are unchanged. Deployment: no migration needed — settings.json points at the absolute bash shim which execs the .ts live; /gstack-upgrade delivers the fix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(one-way-doors): unify credential noun net + wire it into the runtime (#2024) Library fix: revoke/reset/rotate now share ONE noun alternation (api key, token, secret, credential, access key, password) with optional plural s?. Pre-fix leaks: "reset my secret", "reset my access key", "revoke my secret" (mismatched per-verb lists) and every plural form ("rotate the credentials", "revoke all tokens" — \b(...)\b cannot match a trailing s). Runtime wiring — the regexes could never fire in production before: - gstack-question-preference --check gains --summary-stdin: the question text pipes via stdin (never argv — summaries carry quotes/newlines/shell metacharacters) and feeds isOneWayDoor alongside the id, so an ad-hoc destructive question with a stored never-ask preference now forces ASK_NORMALLY. Empty/absent stdin keeps exact id-only semantics. - question-preference-hook falls back to classifyQuestion(question text) when the registry lookup misses, so unregistered destructive questions pass through to a human instead of auto-deciding. - question-tuning resolver prose shows the piped form (SKILL.md regen lands in the wave's release commit). Tripwires (verified fail-first): full verbs x nouns x singular/plural matrix with the #2024 repro rows, benign-summary no-over-match rows, stdin transport survival (quotes/newlines), empty-stdin fail-safe, and hook fallback both directions (destructive -> pass-through, benign -> deny). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(design): loud integer-flag contract for --count/--retry/--timeout (#2032) design variants --count abc silently generated ZERO variants and exited 0: parseInt(NaN) flowed through Math.min into the generation loop bound. The same NaN class was live on the two sibling flags in the same file: --retry abc made generate() a silent no-op (attempt <= NaN never true, null output, exit 0) and --timeout abc killed the serve board ~immediately (setTimeout(NaN)). New design/src/flag-utils.ts: parseIntFlag (pure, unit-testable) + normalizeIntFlag (CLI wrapper). Contract matches the --viewports precedent (error loudly on nonsense — these commands spend real image-API money, a silent fixup hides typos from calling agents): undefined -> default; bare flag/empty/non-integer ("3.7" rejected, not truncated)/below-min -> exit 1 with usage hint; above-max -> clamp with stderr warning. --count normalizes at the variants() consumption site so programmatic callers are covered, with the ceiling derived from STYLE_VARIATIONS.length instead of a magic 7; the CLI passes the raw flag through (a pre-parseInt would truncate "3.7"). Tripwires live in test/design-flag-utils.test.ts — deliberately under test/, not design/test/, which is invisible to the bun test glob, TEST_ROOTS, and every workflow (wiring design/test/ into CI is a captured TODO). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(gbrain): thin-client state — remote-MCP brains no longer classify as broken-config (#2051) A thin client (remote-HTTP MCP brain, no local engine by design) probed `gbrain sources list`, which gbrain's dispatch guard REFUSES on thin clients (exit 1, no recognized error string), so the classifier fell to its defensive broken-config default and every suppression gate silently hid brain-aware blocks from exactly the users on a shared team brain. New 'thin-client' state, detected PRE-probe from gbrain's own remote_mcp config marker via the existing gbrainConfigPath() helper (mirrors gbrain's isThinClient(); honors GBRAIN_HOME; zero network, immune to error-string drift), with a /thin[- ]client/ stderr backstop in the probe catch. Remote reachability is deliberately NOT probed by the classifier — that is the #1964 pathology; gbrain calls degrade gracefully at use time, and the detect JSON says so honestly (gbrain_thin_client: {probed: false}). The state is admitted at every suppression gate — gstack-gbrain-detect --is-ok (drives setup + gbrain-refresh), gen-skill-docs' detection override, gstack-config gbrain-refresh — while the sync stages (code/memory/dream) SKIP with an accurate reason: code indexing runs on the brain server, memory syncs via the remote brain's artifacts pull. The two consumer classes need opposite answers, which is why this is a distinct state and not a skip-the-probe special case. sync-gbrain Step 1.5 and setup-gbrain prose route thin-client to proceed, never into broken-config remediation. detectMcpMode secondary generalization: url-match against the config's remote_mcp.mcp_url (deterministic — gbrain mounts at the generic /mcp path) -> name pattern gbrain[-_]* -> stdio command token; gbrain_mcp_mode stays a 3-value enum. Tripwires: end-to-end --is-ok exits 0 on a thin-client fixture AND still exits 1 on broken-config (the gate didn't widen); pre-probe + stderr-fallback classifier paths; 4 detectMcpMode identification cases incl. a non-matching url that must NOT false-positive. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * release: v1.60.0.0 — regen SKILL.md, VERSION, CHANGELOG, TODOS follow-ups - Regenerate all SKILL.md from templates (question-tuning --summary-stdin prose from #2024, context-restore branch preference from PR #2054, sync-gbrain/setup-gbrain thin-client prose from #2051) + llms.txt. - VERSION + package.json -> 1.60.0.0 (bin/gstack-next-version, queue-aware: #1815 claims 1.59.0.0, #2213 claims 1.59.1.0). - CHANGELOG release summary + itemized entry crediting @jbetala7 (x3) and @mvann. - TODOS.md: three eng-review follow-ups (design/test CI wiring + documented pre-existing retry-after flake, /context-save worktree identity, gbrain reindex-in-place conditional on the new drift log). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(resolvers): compress --summary-stdin preamble prose to fit parity budget; re-bless ship goldens The v1.57.7.0 parity suite caps investigate's generated size at 1.09x baseline; the #2024 question-tuning prose (duplicated into every tier->=2 skill) tipped it to 1.092. Compressed to a single inline command + short pointer (the full rationale lives in bin/gstack-question-preference's header and the one-way-doors module docs). Ship goldens re-blessed against the final resolver text (conscious template-change acknowledgment, per the golden-file regression contract). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(e2e): office-hours-spec-review turn budget fits the carved skill layout (#2473) The test failed deterministically with error_max_turns at 9 turns on main and this branch alike (CI attempt logs + local main repro). Root cause from the failing transcript: the Spec Review Loop content is carved out of office-hours/SKILL.md into office-hours/sections/, so the agent needs discovery hops (grep SKILL.md -> ls sections/ -> read the section) before it can write — 8 tool turns + the closing text turn = 9 > the 8-turn budget, which predates the carve. Observed failures wrote a CORRECT summary on tool turn 8 and died on the closing turn. maxTurns 8 -> 12. Verified: PASS locally post-fix (7 turns this run — the extra headroom absorbs discovery-path nondeterminism). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(e2e): review-dashboard-via session budget survives runner contention (#2473) The test failed on CI (and its baseline run) with the timeout signature: 0 turns, $0.00, exactly 183s, 3/3 attempts — the spawned claude -p session never emitted a single stream event before the 180s inner timeout. The file's tests run concurrently on one runner; session startup queues behind sibling sessions, and this test had the tightest budget in the file (the 240s-budget tests in the same job passed). A clean local run takes 270s wall for 4 turns, confirming 180s was too tight even without contention. Inner timeout 180s -> 300s; outer bun timeout 240s -> 360s to keep headroom over the inner budget. Verified: PASS locally post-fix (4 turns, 270s). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(e2e): retro-base-branch session budget survives runner contention (#2473) Same class as review-dashboard-via, one test over in the same file: /retro is a long multi-step flow whose clean pass measures 225-239s — a coin flip against the 240s inner budget. First CI run passed at 225s; the rerun timed out at the 240s line on all 3 attempts (exitReason "timeout"); the local verification run passed at 239s, ONE second under the old cap. Inner timeout 240s -> 360s; outer bun timeout 300s -> 480s for headroom. Verified: PASS locally post-fix (17 turns, 239s). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Jayesh Betala <jayesh.betala7@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Michael Vann <9221873+mvann@users.noreply.github.com>

capy-ai · 2026-10-08T14:50:26Z

Thank you for this, @garrytan, and for the work that went into it. We reviewed it against current main and decided not to take it: Native merge queues are already covered, and only trunk.io support is new. If trunk support is wanted, close this and re-scope it as a trunk submit shim inside the sectioned land-and-deploy, not a new skill. Closing it with thanks; if the underlying problem still bites you, an issue describing it is very welcome.

garrytan and others added 7 commits May 31, 2026 09:13

chore: v1.56.0.0 + CHANGELOG for /land + merge-queue integration

24edb65

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

garrytan and others added 6 commits June 1, 2026 08:34

Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-s…

d3f2b60

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

chore: renumber v1.56.0.0 -> v1.59.0.0 (reserve a later landing slot)

f54d69d

Bumps VERSION, package.json, and the CHANGELOG header. Leaves 1.57/1.58 free for PRs that land first; this branch claims 1.59.0.0 to land later. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

garrytan changed the title ~~v1.56.0.0 feat: /land skill + trunk.io merge-queue integration~~ v1.59.0.0 feat: /land skill + trunk.io merge-queue integration Jun 3, 2026

garrytan and others added 6 commits June 7, 2026 06:54

Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-s…

0f39f15

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-s…

be5b463

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-s…

6c7402a

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-s…

e0bb11d

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

ljodea mentioned this pull request Jun 16, 2026

v1.59.1.0 feat: add /grok skill for xAI second opinion from Claude Code #2016

Closed

3 tasks done

Merge remote-tracking branch 'origin/main' into garrytan/trunk-land-s…

2e10223

…kill # Conflicts: # CHANGELOG.md # VERSION # package.json

cathrynlavery mentioned this pull request Jul 9, 2026

v1.59.1.0 codex: refresh model docs to GPT-5.6 family (+ max reasoning level) #2211

Closed

garrytan mentioned this pull request Jul 10, 2026

v1.59.1.0 codex: refresh model docs to GPT-5.6 family (+ max reasoning level) #2213

Closed

time-attack pushed a commit to time-attack/gstack that referenced this pull request Jul 14, 2026

feat(land): /land skill + trunk.io/GitHub merge-queue support via bin…

4ab6d83

…/gstack-merge (garrytan#1815)

This was referenced Jul 15, 2026

feat: configurable merge method for /land-and-deploy #726

Closed

feat: reviewer discipline gate for free-tier private repos (ship + land-and-deploy) #884

Closed

capy-ai Bot closed this Oct 8, 2026

Navigation Menu

Repository navigation

v1.59.0.0 feat: /land skill + trunk.io merge-queue integration - #1815

v1.59.0.0 feat: /land skill + trunk.io merge-queue integration#1815
garrytan wants to merge 20 commits into
mainfrom
garrytan/trunk-land-skill

garrytan commented May 31, 2026

Uh oh!

github-actions Bot commented May 31, 2026 •

edited

Loading

Uh oh!

time-attack commented Jul 15, 2026

Uh oh!

time-attack commented Jul 15, 2026 •

edited

Loading

Uh oh!

capy-ai Bot commented Oct 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

garrytan commented May 31, 2026

What this adds

The insight that keeps it cheap

Architecture

Tests

Process

Versioning

Before merge

Uh oh!

github-actions Bot commented May 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E Evals: ✅ PASS

Uh oh!

time-attack commented Jul 15, 2026

Uh oh!

time-attack commented Jul 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

capy-ai Bot commented Oct 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions Bot commented May 31, 2026 •

edited

Loading

time-attack commented Jul 15, 2026 •

edited

Loading