buck2-stack-maintainer

name	buck2-stack-maintainer
description	Maintain the Buck2 BuildBuddy patch stack in a local Buck2 checkout by rebasing fork/stack onto origin/main, publishing bazel-rbe-style merge commits to fork/main with origin/main as first parent, triggering or polling BuildBuddy Workflows, and fixing failed stack commits.

Buck2 Stack Maintainer

Use this skill for the Buck2 fork stack in a local Buck2 checkout, usually ${BUCK2_CHECKOUT:-$HOME/work/facebook/buck2}. The durable stack branch is fork/stack. The public CI branch is fork/main. The retired fork/sluongng/codex-bes branch is not part of normal maintenance.

Invariants

• origin/main is the upstream source of truth.
• fork/stack is the linear review stack rebased onto origin/main.
• fork/main is a merge-commit branch. Its HEAD must be a non-FF merge commit where HEAD^1 == origin/main and HEAD^2 == fork/stack.
• Do not delete or rewrite old branches without an explicit backup ref and a lease. Preserve unrelated dirty or untracked files.
• Validate stack prefixes in order. If prefix N fails, fix the corresponding stack commit with fixup/autosquash, then rerun from that prefix.

Standard Workflow

1. Inspect state before mutating anything:

   git status --short --branch
   git remote -v
   git ls-remote --heads fork main stack
   

   In automation worktrees, ensure only .buckconfig.local is linked from the primary checkout before using --wait-buildbuddy:

   primary="${BUCK2_CHECKOUT:-$HOME/work/facebook/buck2}"
   ln -s "$primary/.buckconfig.local" .buckconfig.local
   

2. Dry-run the maintainer script from the Buck2 checkout. Use --source-ref HEAD only when the source should be the current local stack tip instead of fork/stack.

   skill_root="${BUCK2_STACK_SKILL_DIR:-<path-to-this-skill>}"
   python3 "$skill_root/scripts/sync_stack.py" \
     --dry-run \
     --source-ref HEAD
   

3. Check BuildBuddy setup before any branch rewriting. This verifies the current fork/main merge-parent invariant and tries the workflow preflight against the current merge commit:

   skill_root="${BUCK2_STACK_SKILL_DIR:-<path-to-this-skill>}"
   python3 "$skill_root/scripts/sync_stack.py" \
     --check-buildbuddy-setup \
     --attempt-buildbuddy-link
   

   If this reports that sluongng/buck2 is not known to BuildBuddy, stop and complete the GitHub App / Workflows setup from references/buildbuddy-workflows.md before pushing more merge commits. After GitHub App access has been granted, use scripts/buildbuddy_link_repo_browser.py to link the repo through the logged-in BuildBuddy browser session, then rerun the setup check.

4. Apply locally in an isolated automation worktree or a deliberately prepared checkout. Use the bootstrap flag only until fork/stack exists: Use --source-ref <sha-or-ref> whenever the source should be an explicit local stack tip rather than the current fork/stack remote branch.

   skill_root="${BUCK2_STACK_SKILL_DIR:-<path-to-this-skill>}"
   python3 "$skill_root/scripts/sync_stack.py" \
     --apply \
     --source-ref HEAD
   

5. Publish only after reviewing the plan and local invariants. This pushes stack-prefix merge commits to fork/main sequentially and updates fork/stack at the end:

   skill_root="${BUCK2_STACK_SKILL_DIR:-<path-to-this-skill>}"
   python3 "$skill_root/scripts/sync_stack.py" \
     --apply --push --wait-buildbuddy --attempt-buildbuddy-link \
     --source-ref HEAD
   

   If the checked-in BuildBuddy workflow harness changed, add --revalidate-all --skip-buildbuddy-preflight so every prefix is tested with the new workflow and the old workflow is not started by the unpolled preflight.

6. On failure, inspect the BuildBuddy invocation and the stack commit that introduced it. Prefer the existing Buck2 validation helpers: When sync_stack.py --push --wait-buildbuddy observes a polled BuildBuddy failure, it restores fork/main to the previous head by default before exiting. Use --leave-failed-main only when deliberately keeping the public branch on the failing prefix for manual debugging.

   buildbuddy/run_stack_test_matrix.sh --from origin/main --to HEAD --mode remote --matrix app-rust
   buildbuddy/run_buck2_test_matrix.sh --mode both --matrix app-rust --clean-output
   

References

• Read references/merge-commit-strategy.md before changing the branch model or force-pushing fork/main.
• Read references/buildbuddy-workflows.md before changing workflow trigger or polling behavior.