Skip to content
Closed
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
4 changes: 2 additions & 2 deletions self-development/kelos-pr-responder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <linked-issue-number> --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 `--force-with-lease` if the push is rejected after rebasing).
- 6. Self-review your changes: run `git diff origin/main...HEAD` and read the full diff to verify correctness, check for unintended changes, and ensure the diff only contains changes relevant to the task. Fix any issues you find, then commit and push again. Do NOT post "/review" as a PR comment — it does not trigger anything.
Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai bot Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: The self-review diff command always uses origin/main, but step 0 conditionally rebases on upstream/main when an upstream remote exists. In that scenario the diff base should also be upstream/main; otherwise the self-review compares against a potentially stale fork main and produces misleading results.

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At self-development/kelos-pr-responder.yaml, line 85:

<comment>The self-review diff command always uses `origin/main`, but step 0 conditionally rebases on `upstream/main` when an `upstream` remote exists. In that scenario the diff base should also be `upstream/main`; otherwise the self-review compares against a potentially stale fork `main` and produces misleading results.</comment>

<file context>
@@ -81,8 +81,8 @@ spec:
-      - 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 `--force-with-lease` if the push is rejected after rebasing).
+      - 6. Self-review your changes: run `git diff origin/main...HEAD` and read the full diff to verify correctness, check for unintended changes, and ensure the diff only contains changes relevant to the task. Fix any issues you find, then commit and push again. Do NOT post "/review" as a PR comment — it does not trigger anything.
       - 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.
</file context>
Suggested change
- 6. Self-review your changes: run `git diff origin/main...HEAD` and read the full diff to verify correctness, check for unintended changes, and ensure the diff only contains changes relevant to the task. Fix any issues you find, then commit and push again. Do NOT post "/review" as a PR comment — it does not trigger anything.
- 6. Self-review your changes: run `git diff origin/main...HEAD` (or `git diff upstream/main...HEAD` if an upstream remote is configured) and read the full diff to verify correctness, check for unintended changes, and ensure the diff only contains changes relevant to the task. Fix any issues you find, then commit and push again. Do NOT post "/review" as a PR comment — it does not trigger anything.
Fix with Cubic

- 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.

Expand Down
Loading