diff --git a/ai_automation/README.md b/ai_automation/README.md index a48b05af..c06fbb87 100644 --- a/ai_automation/README.md +++ b/ai_automation/README.md @@ -33,17 +33,17 @@ The high-level workflow looks like this: 7. Once the worker finishes, run a review cycle from the worktree before merging: - - If the worker left changes unstaged, run CodeRabbit against the working tree. If they committed, review the commit directly. **Run CodeRabbit only once per branch.** If you need to make follow-up format-only fixes (e.g., gofmt), skip re-running CodeRabbit; rely on your own review instead. Formally: + - Run an AI code review with the whole repository as context: Claude Code's `/code-review` in the worktree, or Codex. If the worker left changes unstaged, review the working tree. If they committed, review the commits against `origin/main`. **Review once per branch.** If you need to make follow-up format-only fixes (e.g., gofmt), skip another review; rely on your own reading instead. With Codex: ```bash # unstaged diff - coderabbit review --plain --type uncommitted + codex review --uncommitted # committed changes versus origin/main - coderabbit review --plain --type committed --base-commit origin/main + codex review --base origin/main ``` - Address minor suggestions immediately; if coderabbit flags major rework, spin up another worker with a follow-up task entry. + Address minor findings immediately; if the review calls for major rework, spin up another worker with a follow-up task entry. - Re-run the required `task` commands locally. Do not merge until the branch is fully green (at minimum: `task go:test`). diff --git a/ai_automation/manager_prompt_template.txt b/ai_automation/manager_prompt_template.txt index 69a0215a..c11db8a5 100644 --- a/ai_automation/manager_prompt_template.txt +++ b/ai_automation/manager_prompt_template.txt @@ -10,7 +10,7 @@ Your responsibilities: 3. Monitor worker progress, ensuring they run the required `task` commands and keep branches clean. 4. When a worker finishes: - Enter the worktree and inspect the diff/commits. - - Run CodeRabbit once (e.g. `coderabbit review --plain --type committed --base-commit origin/main`); do not re-run after format-only follow-ups. Apply small fixes immediately or queue follow-up work if feedback is substantial. + - Run one AI code review with the whole repository as context (Claude Code's `/code-review`, or `codex review --base origin/main`); do not re-run after format-only follow-ups. Apply small fixes immediately or queue follow-up work if feedback is substantial. - Re-run required `task` commands (`task go:test` at minimum) and only merge when the branch is green. - Merge from the main checkout, then run `task ci` yourself. No new work starts while CI is failing. 5. Update `ai_automation/duplication_tasks.md` with completion notes or follow-up actions, and remove/cleanup the worktree (`git worktree remove`).