diff --git a/self-development/kelos-pr-responder.yaml b/self-development/kelos-pr-responder.yaml index 197e7823..535a1b17 100644 --- a/self-development/kelos-pr-responder.yaml +++ b/self-development/kelos-pr-responder.yaml @@ -81,8 +81,8 @@ spec: - 2. Read ALL comments on the linked issue referenced by the PR body. First determine the linked issue number from the PR body, then run `gh issue view --comments`. If `KELOS_UPSTREAM_REPO` is set, use `--repo "$KELOS_UPSTREAM_REPO"`. - 3. Read the existing diff (git diff main...HEAD) to understand what has already been done. Do NOT start over or rewrite from scratch. - 4. Make only the incremental changes needed to address review feedback or remaining issues. Preserve existing work. - - 5. Commit and push your changes to origin {{.Branch}}. - - 6. /review the PR to verify your changes address the feedback. If changes are needed, make them, commit and push, then /review again. Repeat until the review passes. + - 5. Commit and push your changes to origin {{.Branch}}. Use `git push --force-with-lease` if the branch has been rebased. + - 6. Self-review your changes by running `git diff origin/main...HEAD` (or `git diff upstream/main...HEAD` if `upstream` remote exists) and carefully reading the full diff. Check for correctness, style, missing tests, and anything that doesn't match the review feedback. If you find problems, fix them, commit, push, and self-review again. Repeat until you are satisfied. - 7. Update the PR title and description to reflect the final diff. The PR body MUST contain a standard closing keyword reference on its own line (e.g., `Fixes #123` or `Closes #123`). Do not embed the issue number in natural language. Ensure the PR has labels "generated-by-kelos" and "ok-to-test" (use `gh pr edit {{.Number}} --add-label generated-by-kelos --add-label ok-to-test` if missing). If `KELOS_UPSTREAM_REPO` is set, include `--repo "$KELOS_UPSTREAM_REPO"`. - 8. Make sure the PR passes all CI tests. diff --git a/self-development/kelos-workers.yaml b/self-development/kelos-workers.yaml index 3ea99813..41b3a777 100644 --- a/self-development/kelos-workers.yaml +++ b/self-development/kelos-workers.yaml @@ -98,8 +98,8 @@ spec: - Also read ALL comments on the linked issue (gh issue view {{.Number}} --comments), not just the PR. - 3a. Read the existing diff (git diff main...HEAD) to understand what has already been done. Do NOT start over or rewrite from scratch. - 4a. Make only the incremental changes needed to address review feedback or remaining issues. Preserve existing work. - - 5a. Commit and push your changes to origin kelos-task-{{.Number}}. - - 6a. /review the PR to verify your changes address the feedback. If changes are needed, make them, commit and push, then /review again. Repeat until the review passes. + - 5a. Commit and push your changes to origin kelos-task-{{.Number}}. Use `git push --force-with-lease` if the branch has been rebased. + - 6a. Self-review your changes by running `git diff origin/main...HEAD` and carefully reading the full diff. Check for correctness, style, missing tests, and anything that doesn't match the issue requirements. If you find problems, fix them, commit, and self-review again. Repeat until you are satisfied. - 7a. Update the PR title and description to reflect the final diff. The PR body MUST contain a standard closing keyword reference on its own line (e.g., `Fixes #{{.Number}}` or `Closes #{{.Number}}`). Do not embed the issue number in natural language. Ensure the PR has labels "generated-by-kelos" and "ok-to-test" (use `gh pr edit {{.Number}} --add-label generated-by-kelos --add-label ok-to-test` if missing). - 8a. Make sure the PR passes all CI tests. @@ -111,7 +111,7 @@ spec: - Only implement what the issue explicitly asks for. If you discover related improvements, create separate issues for them. - 3b. Create a commit that fixes the issue. - 4b. Push your branch to origin kelos-task-{{.Number}}. - - 5b. Create a PR with labels "generated-by-kelos" and "ok-to-test" (use `gh pr create --label generated-by-kelos --label ok-to-test`), then /review it. If changes are needed, make them, commit and push, then /review again. Repeat until the review passes. + - 5b. Create a PR with labels "generated-by-kelos" and "ok-to-test" (use `gh pr create --label generated-by-kelos --label ok-to-test`). Then self-review by running `git diff origin/main...HEAD` and carefully reading the full diff. Check for correctness, style, missing tests, and anything that doesn't match the issue requirements. If you find problems, fix them, commit, push, and self-review again. Repeat until you are satisfied. - 6b. Update the PR title and description to reflect the final diff. The PR body MUST contain a standard closing keyword reference on its own line (e.g., `Fixes #{{.Number}}` or `Closes #{{.Number}}`). Do not embed the issue number in natural language. - 7b. Make sure the PR passes all CI tests.