diff --git a/AGENTS.md b/AGENTS.md index 0a47fdd3172..e01ca473cb2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -20,6 +20,7 @@ This file is split into nested `AGENTS.md` files based on the language/situation - Keep the PR focused. No unrelated refactors, formatting churn, or drive-by changes; split when in doubt. - Refactor aggressively for long-term maintainability, but re-evaluate the direction as you learn. - Propose a course change, even suggest abandoning a PR, rather than finish a half-solution. +- Be adversarial: attack your own approach, reports, reviews, and other PRs as hard as anyone else's, and argue for the best approach over the first one that works. - When a decision is the maintainer's (API shape, naming, scope), ask with 2-3 options and a recommendation. - All tests need to be wired into CI, at least a nightly. - Never edit an `AGENTS.md`, `CONTRIBUTING.md`, or skill without being prompted, and read `PROMPTING.md` first. @@ -44,7 +45,6 @@ This file is split into nested `AGENTS.md` files based on the language/situation - Suggest follow up sessions and quests when finished, interactively prompting the user. - Prefer the simple solution. - Say it once, in the fewest words that hold up. -- Critically think, and decide if the complexity is worth it. Simple is better. - Prefer a quest over a GitHub issue for work needing durable scope. - Use interactive prompts when possible. - Try to do stuff asynchronously. ex. ask about follow-ups while tests run. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 14e909b40ae..809edb6ef38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -83,7 +83,7 @@ For an advisory against noq or Quinn, compare the pinned release's `PARENT` with `main` is the trunk; `release` is what ships, and release-plz and every branch-triggered publish run only there. - A release is cut by hand: a PR merging `main` into `release`, with a merge commit. -- Consider a backport for any critical bug fix (crash, security, data loss, broken interop): land it on `main` first, then cherry-pick it onto `release` as a separate PR. +- Suggest a `release` backport for any serious bug fix (crash, security, data loss, broken interop), whether found on `main` or reported against a release. Land it on `main` first, then port it onto `release` as a separate PR that keeps the published API, so it ships as a patch. - Nothing merges `release` into `main` automatically. Before cutting a minor or breaking release, the maintainer merges `release` into `main` once, so trunk carries the published versions, CHANGELOGs, and any `release`-only commits. It lands as a merge commit with `--admin`, never squashed, so the cut starts from an advanced merge base. # Versions