Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ These rules are for people and coding agents who change this repository. `CLAUDE
and its only trailer is the DCO `Signed-off-by` with that identity (`git commit -s`). No `Co-Authored-By` line for a
coding agent, and no "Generated with" line in a commit message or a pull request description.
- **Pull requests, landed by fast-forward.** `main` is protected; `scripts/setup-hooks.sh` installs hooks that refuse
commits and pushes on `main`. One change per pull request, one commit, rebased onto `main`; say what you ran and what
it printed. Never use GitHub's merge or squash button, which rewrites the commit's author and committer: once the
pull request's exact head is gated, a maintainer pushes that commit to `main` as a fast-forward.
commits and pushes on `main`. One change per pull request, against `staging`, one commit, rebased onto `staging`; say
what you ran and what it printed. Never use GitHub's merge or squash button, which rewrites the commit's author and
committer: once the pull request's exact head is gated, a maintainer pushes that commit to `staging` as a
fast-forward. Versions are bumped on `staging`, and `main` takes a fast-forward to it at each release.
- **Independent review for shared state.** A change to shared state (task or session records, locks, the install of a
return, choices) gets a review by Codex, or by a reviewer who did not write it, before or right after merge.
- **Delete dead code.** Remove code, exports, config and docs that nothing uses any more; replacing code deletes the old
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Questions and discussion: [Discord](https://discord.gg/jBRrXmQHT).

## Pull requests

- One change per pull request. Pull requests are squash-merged into `main`.
- One change per pull request, against `staging`. `main` moves to `staging` at each release.
- State what you ran and what it printed.

## Developer Certificate of Origin
Expand Down
Loading