fix: retry OpenCode after coverage blockers clear - #1141
Conversation
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
52afb94 to
53b5cef
Compare
Scheduler retry verification
The scheduler remains fail-closed for ordinary current-head change requests and only re-dispatches after successful coverage/Strix evidence with no failed checks. |
|
@opencode-agent review Review only exact head |
|
Current-head revalidation for 53b5cef: scheduler focused suite passed (110 tests), compileall and diff check passed. The retry predicate remains limited to exact-head coverage-only REQUEST_CHANGES plus completed successful coverage/Strix evidence and no failed checks; protected Checks and current approval remain required. |
|
@opencode-agent @cwl-noema-review Please review exact current head 53b5cef. |
|
@opencode-agent Review exact current head |
|
Exact-head update: pushed c041c34 for PR #1141. The coverage-blocker detector matches the live OpenCode review wording; this update adds complete branch regression coverage for stale and non-change-request reviews, failed coverage evidence, dispatch-queue waits, and same-head active dispatch. Verification on the exact tree: 1216 passed, 16 subtests passed; changed scheduler module branch coverage 100% (1,678 statements / 684 branches); Interrogate 100%; compileall and git diff --check passed. No source fix is justified for the unrelated pre-existing repository-wide 99.9% docstring result. |
|
@opencode-agent Re-review exact current head |
|
@opencode-agent Review exact current head |
|
@opencode-agent Please review exact current head |
|
ScopeWeave exact-current-head coverage blocker canary for this retry path:
Please keep the repair fail-closed. RED acceptance should cover a current-head coverage-only change request where authoritative coverage acquisition is presently incomplete: the scheduler must not redispatch merely because a status string says success, and it must distinguish missing authoritative server metrics from an ordinary source defect. GREEN acceptance should require complete/non-invented protected-base + exact-current coverage evidence, exact-head identity, Strix/current checks passing, then a bounded same-head OpenCode redispatch that produces a substantive formal review on the same head. If the coverage producer/helper cannot obtain canonical server metrics for this repository, that acquisition/attestation boundary remains the causal prerequisite and should be repaired by its existing central owner path rather than requiring ScopeWeave source churn. |
|
Superseded by #1152. |
github-project-automation
Bot
moved this from In Progress
to Done
in naruon Platform Roadmap
![opencode-agent[bot]](https://avatars.githubusercontent.com/in/1549082?s=60&v=4){kind=small}
There was a problem hiding this comment.
Pull request overview
OpenCode reviewed the current-head mergeability evidence and changed-file flow before approval, then found merge conflicts on the affected path.
Findings
1. HIGH Merge Conflict Guidance - Resolve the PR branch against the latest base branch
- Problem: GitHub reports mergeStateStatus
DIRTYfor this pull request. - Root cause: Branch
agent/retry-coverage-review-dispatchcannot be merged cleanly intomain; the changed-file flow below shows which review/runtime path is blocked by the conflict. - Fix: Merge or rebase the latest
mainintoagent/retry-coverage-review-dispatch, resolve conflict markers in the PR branch, rerun the focused checks, and push the same branch. - Repair commands:
gh pr checkout 1141 --repo ContextualWisdomLab/.github
git fetch origin main
git merge --no-ff origin/main # or: git rebase origin/main
git status --short
# resolve files, then git add <resolved-files>
# merge path: git commit
# rebase path: git rebase --continue
git push origin HEAD:agent/retry-coverage-review-dispatch
# rebase path only: git push --force-with-lease origin HEAD:agent/retry-coverage-review-dispatch- Regression test: Keep OpenCode approval gated on mergeability so model-output failures cannot approve a conflicted PR.
Merge Conflict Evidence Map
flowchart LR
PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
Evidence --> S1["CI script: pr_review_merge_scheduler.py"]
S1 --> I1["review and security gate shell path"]
I1 --> Conflict["Merge conflict blocks this path"]
Conflict --> V1["bash -n plus Strix self-test"]
Evidence --> S2["Test: test_pr_review_merge_scheduler.py"]
S2 --> I2["regression suite"]
I2 --> Conflict["Merge conflict blocks this path"]
Conflict --> V2["targeted test run"]
- Result: REQUEST_CHANGES
- Reason: mergeStateStatus is
DIRTY; mergeable isCONFLICTING. - Head SHA:
41a97b14436fc23ca7b56f9a2395a728db0d11e8 - Workflow run: 32311804363
- Workflow attempt: 1
Changed-File Evidence Map
flowchart LR
PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
Evidence --> S1["CI script: pr_review_merge_scheduler.py"]
S1 --> I1["review and security gate shell path"]
I1 --> Conflict["Merge conflict blocks this path"]
Conflict --> V1["bash -n plus Strix self-test"]
Evidence --> S2["Test: test_pr_review_merge_scheduler.py"]
S2 --> I2["regression suite"]
I2 --> Conflict["Merge conflict blocks this path"]
Conflict --> V2["targeted test run"]
OpenCode Review Overview
Pull request overviewOpenCode reviewed the current-head mergeability evidence and changed-file flow before approval, then found merge conflicts on the affected path. Findings1. HIGH Merge Conflict Guidance - Resolve the PR branch against the latest base branch
gh pr checkout 1141 --repo ContextualWisdomLab/.github
git fetch origin main
git merge --no-ff origin/main # or: git rebase origin/main
git status --short
# resolve files, then git add <resolved-files>
# merge path: git commit
# rebase path: git rebase --continue
git push origin HEAD:agent/retry-coverage-review-dispatch
# rebase path only: git push --force-with-lease origin HEAD:agent/retry-coverage-review-dispatch
Merge Conflict Evidence Mapflowchart LR
PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
Evidence --> S1["CI script: pr_review_merge_scheduler.py"]
S1 --> I1["review and security gate shell path"]
I1 --> Conflict["Merge conflict blocks this path"]
Conflict --> V1["bash -n plus Strix self-test"]
Evidence --> S2["Test: test_pr_review_merge_scheduler.py"]
S2 --> I2["regression suite"]
I2 --> Conflict["Merge conflict blocks this path"]
Conflict --> V2["targeted test run"]
Changed-File Evidence Mapflowchart LR
PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
Evidence --> S1["CI script: pr_review_merge_scheduler.py"]
S1 --> I1["review and security gate shell path"]
I1 --> Conflict["Merge conflict blocks this path"]
Conflict --> V1["bash -n plus Strix self-test"]
Evidence --> S2["Test: test_pr_review_merge_scheduler.py"]
S2 --> I2["regression suite"]
I2 --> Conflict["Merge conflict blocks this path"]
Conflict --> V2["targeted test run"]
Merge Conflict Guidance
gh pr checkout 1141 --repo ContextualWisdomLab/.github
git fetch origin main
git merge --no-ff origin/main # or: git rebase origin/main
git status --short
# resolve files, then git add <resolved-files>
# merge path: git commit
# rebase path: git rebase --continue
git push origin HEAD:agent/retry-coverage-review-dispatch
# rebase path only: git push --force-with-lease origin HEAD:agent/retry-coverage-review-dispatch |
1 participant
Summary
Verification