SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Contributing: catch up with main only when pushing anyway or on a conflict
jyvikofd5795b5ad5d
diff --git a/AGENTS.md b/AGENTS.mdindex 7c47f78332..6c01a3ce0d 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -103,8 +103,8 @@ People trust SolidCraft with their designs; a crash loses their work. **This out- **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) maymerge 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, merge `main` into it only when it- conflicts, and never force-push `main`. Never commit `plan/`, build dirs (`target*/`) or+ 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*/`) orgenerated 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`).@@ -124,15 +124,16 @@ People trust SolidCraft with their designs; a crash loses their work. **This out- Use a small public-safe example and check for private designs, paths, account details orother sensitive content before sharing. Attach media to the issue/PR or link to an accessiblerecording; do not commit generated screenshots or videos just to provide review evidence.-- Throughout the work and before handoff, check the relevant PR's merge status. Don't bring- `main` into an open PR to keep it current (no merge of `main`, no Update branch, no rebase):- CI already tests the PR merged with the latest `main`, and every update restarts the whole- run. Only when GitHub reports a conflict, merge `main` in once and resolve it without- discarding others' work; never force-push. 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.+- Throughout the work and before handoff, check the relevant PR's merge status. Don't push to+ 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`.+ 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.## Claim = a draft PR- Before working on issue #N, check nobody has it: `gh pr list -R bherbruck/solidcraft --state open --search "#N"`.diff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex b490d3bbc8..d3b01c62ca 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -316,14 +316,15 @@ Changes with no useful observable behavior do not need screenshot or video evidesmall example without private designs or sensitive details; attach the media or link to anaccessible recording rather than committing generated review artifacts.-Keep an eye on your PR's status, but don't bring `main` into it to keep it current: no merge of-`main`, no Update branch button, no rebase. CI already tests your PR merged with the latest-`main`, and every update restarts the whole run for everyone waiting behind it. Only when GitHub-reports a conflict, merge `main` in once and resolve it without losing others' changes; never-force-push. Don't re-run CI on an unchanged commit either: a real failure fails again. Re-run-only a job that runner trouble cancelled, with "Re-run failed jobs". While a task remains active,-follow an open PR through its status changes; at handoff, clearly identify anything still-awaiting merge.+Keep an eye on your PR's status, but don't push to it only to catch up with `main` (no merge of+`main`, no Update branch button, no rebase for that alone): every push restarts the whole CI+run for everyone waiting behind it, and `main`'s own run catches what lands in between. When you+push a change anyway, or GitHub reports a conflict, rebase onto the latest `main` (push your+branch with `--force-with-lease`) or merge `main` in once, and resolve conflicts without losing+others' changes. Don't re-run CI on an unchanged commit either: a real failure fails again.+Re-run only a job that runner trouble cancelled, with "Re-run failed jobs". While a task remains+active, follow an open PR through its status changes; at handoff, clearly identify anything+still awaiting merge.Much of SolidCraft so far was written by AI coding agents (Claude) working in parallel, eachowning one area, with a human setting direction and reporting bugs. Their working notes are in