diff --git a/AGENTS.md b/AGENTS.md index 6c01a3ce0..c4063d8cd 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -100,12 +100,13 @@ People trust SolidCraft with their designs; a crash loses their work. **This out Keep them minimal; `cargo xtask web-offline-test` covers the service worker. - **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests, assets, layers). Commit after every feature arc that builds. -- **Publishing**: `origin` is github.com/bherbruck/solidcraft. Changes land through **pull requests**: - push a branch, open a PR, and let GitHub CI run. Maintainers (and agents working for them) may - merge their own PR as soon as CI is green (`gh pr merge --squash`); a trivial fix (docs, typos) - may be merged right away. Keep each PR to one topic, bring `main` into it only - when you push a change anyway or it conflicts, and never force-push `main`. Never commit `plan/`, build dirs (`target*/`) or - generated reference data; check `git ls-files` before pushing. +- **Publishing**: the repository is github.com/tangency-labs/solidcraft. Changes land through + **pull requests** and the **merge queue**: push a branch and open a PR. The heavy CI jobs start + when a maintainer adds `approved-for-ci` after reviewing the code. Approved PRs go into the queue + with `gh pr merge N -R tangency-labs/solidcraft --squash --auto`; the queue runs the full suite + on each group before it lands on `main`. Keep each PR to one topic and one issue, and never + force-push `main`. Never commit `plan/`, build dirs (`target*/`) or generated reference data; + check `git ls-files` before pushing. - **Never break wasm**: everything below the apps must build for `wasm32-unknown-unknown` (`cargo xtask wasm`, part of `cargo xtask ci`). @@ -128,15 +129,24 @@ People trust SolidCraft with their designs; a crash loses their work. **This out an open PR only to catch up with `main` (no merge of `main`, no Update branch, no rebase for that alone): every push restarts the whole CI run, and `main`'s own run catches what lands in between, to be fixed forward. When you push a change anyway, or GitHub reports a conflict, - rebase onto the latest `main` (push your own branch with `--force-with-lease`) or merge `main` - in once, and resolve conflicts without discarding others' work; never force-push `main`. + rebase onto the latest `main` (push your own branch with `--force-with-lease`); never merge + `main` into a PR. Resolve conflicts without discarding others' work; never force-push `main`. Don't re-run CI on an unchanged commit: a real failure fails again. Re-run only a job that runner trouble cancelled, with "Re-run failed jobs". Report the PR state you checked and any conflicts resolved. If a PR remains open, keep monitoring it while the task is active and make its pending status clear at handoff; do not claim it merged without checking. +## Before you start: look at what is already open +- Work with an authenticated GitHub CLI (`gh auth status`) and `git`; the checks below need both. +- Pull the whole list, not one search: `gh pr list -R tangency-labs/solidcraft --state open --limit 500` + (drafts included) and `gh issue list -R tangency-labs/solidcraft --state open --limit 500`. Look for + work on the same issue, the same feature under another number, and PRs that change the files + you are about to change (`gh pr list ... --json number,title,files`). +- If someone already has it, comment on their PR or issue instead of opening a second one. Two + PRs for one change can't both land, and one of them is wasted work and CI. + ## Claim = a draft PR -- Before working on issue #N, check nobody has it: `gh pr list -R bherbruck/solidcraft --state open --search "#N"`. +- Before working on issue #N, check nobody has it: `gh pr list -R tangency-labs/solidcraft --state open --search "#N"`. - If none, branch from the latest `origin/main`, `git commit --allow-empty -m "claim: #N"`, push, and open a **draft** PR titled ` (#N)` right away. **The lowest-numbered open PR for an issue wins**; if yours lost, close it. Opening the PR is the claim: the bot assigns you and