Skip to content

Handle unavailable OpenCode target reviews - #169

Closed
seonghobae wants to merge 1 commit into
mainfrom
codex/fix-opencode-unavailable-fallback
Closed

Handle unavailable OpenCode target reviews#169
seonghobae wants to merge 1 commit into
mainfrom
codex/fix-opencode-unavailable-fallback

Conversation

@seonghobae

Copy link
Copy Markdown
Contributor

Fixes the central OpenCode approval path observed while reviewing ContextualWisdomLab/html4tree#20: when every OpenCode model attempt fails to produce a publishable current-head control block, the selected-output gate path should reuse the existing deterministic current-head fallback instead of ending with OPENCODE_REVIEW_UNAVAILABLE.\n\nAlso aligns the OpenCode runtime/read contract docs and config with the existing self-test expectations.

@seonghobae
seonghobae force-pushed the codex/fix-opencode-unavailable-fallback branch 2 times, most recently from 4ca41e6 to e2e2b26 Compare June 30, 2026 01:15

@opencode-agent opencode-agent Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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 DIRTY for this pull request.
  • Root cause: Branch codex/fix-opencode-unavailable-fallback cannot be merged cleanly into main; the changed-file flow below shows which review/runtime path is blocked by the conflict.
  • Fix: Merge or rebase the latest main into codex/fix-opencode-unavailable-fallback, resolve conflict markers in the PR branch, rerun the focused checks, and push the same branch.
  • Repair commands:
gh pr checkout 169 --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:codex/fix-opencode-unavailable-fallback
# rebase path only: git push --force-with-lease origin HEAD:codex/fix-opencode-unavailable-fallback
  • Regression test: Keep OpenCode approval gated on mergeability so model-output failures cannot approve a conflicted PR.

Change Flow DAG

flowchart LR
  PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
  Evidence --> S1["Workflow: opencode-review.yml"]
  S1 --> I1["GitHub Actions review job"]
  I1 --> Conflict["Merge conflict blocks this path"]
  Conflict --> V1["actionlint plus required checks"]
  Evidence --> S2["CI script: test_strix_quick_gate.sh"]
  S2 --> I2["review and security gate shell path"]
  I2 --> Conflict["Merge conflict blocks this path"]
  Conflict --> V2["bash -n plus Strix self-test"]
Loading
  • Result: REQUEST_CHANGES
  • Reason: mergeStateStatus is DIRTY; mergeable is CONFLICTING.
  • Head SHA: e2e2b26e4a8c9e4ad4d0d07d9b3707b9694673f3
  • Workflow run: 28413557439
  • Workflow attempt: 1

@opencode-agent

opencode-agent Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

OpenCode Review Overview

  • Head SHA: 86b3d73f3bfb8c064065b265101fb6f7f5635b37
  • Workflow run: 28413836830
  • Workflow attempt: 1
  • Gate result: REQUEST_CHANGES (approval step)

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 DIRTY for this pull request.
  • Root cause: Branch codex/fix-opencode-unavailable-fallback cannot be merged cleanly into main; the changed-file flow below shows which review/runtime path is blocked by the conflict.
  • Fix: Merge or rebase the latest main into codex/fix-opencode-unavailable-fallback, resolve conflict markers in the PR branch, rerun the focused checks, and push the same branch.
  • Repair commands:
gh pr checkout 169 --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:codex/fix-opencode-unavailable-fallback
# rebase path only: git push --force-with-lease origin HEAD:codex/fix-opencode-unavailable-fallback
  • Regression test: Keep OpenCode approval gated on mergeability so model-output failures cannot approve a conflicted PR.

Change Flow DAG

flowchart LR
  PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
  Evidence --> S1["Workflow: opencode-review.yml"]
  S1 --> I1["GitHub Actions review job"]
  I1 --> Conflict["Merge conflict blocks this path"]
  Conflict --> V1["actionlint plus required checks"]
  Evidence --> S2["CI script: test_strix_quick_gate.sh"]
  S2 --> I2["review and security gate shell path"]
  I2 --> Conflict["Merge conflict blocks this path"]
  Conflict --> V2["bash -n plus Strix self-test"]
Loading
  • Result: REQUEST_CHANGES
  • Reason: mergeStateStatus is DIRTY; mergeable is CONFLICTING.
  • Head SHA: 86b3d73f3bfb8c064065b265101fb6f7f5635b37
  • Workflow run: 28413836830
  • Workflow attempt: 1

Merge Conflict Guidance

  • Current merge state: DIRTY
  • Base branch: main
  • Head branch: codex/fix-opencode-unavailable-fallback
  • Fix direction: merge or rebase origin/main into codex/fix-opencode-unavailable-fallback, resolve conflict markers in the changed files, rerun the focused checks, then push the same branch.
  • Repair commands:
gh pr checkout 169 --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:codex/fix-opencode-unavailable-fallback
# rebase path only: git push --force-with-lease origin HEAD:codex/fix-opencode-unavailable-fallback

@seonghobae
seonghobae force-pushed the codex/fix-opencode-unavailable-fallback branch from e2e2b26 to 86b3d73 Compare June 30, 2026 01:23
@seonghobae

Copy link
Copy Markdown
Contributor Author

Closing this duplicate process-fix PR: the same central OpenCode fallback behavior is already present on main via #170/#171, so this branch now has no remaining diff from main.

@seonghobae seonghobae closed this Jun 30, 2026

@opencode-agent opencode-agent Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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 DIRTY for this pull request.
  • Root cause: Branch codex/fix-opencode-unavailable-fallback cannot be merged cleanly into main; the changed-file flow below shows which review/runtime path is blocked by the conflict.
  • Fix: Merge or rebase the latest main into codex/fix-opencode-unavailable-fallback, resolve conflict markers in the PR branch, rerun the focused checks, and push the same branch.
  • Repair commands:
gh pr checkout 169 --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:codex/fix-opencode-unavailable-fallback
# rebase path only: git push --force-with-lease origin HEAD:codex/fix-opencode-unavailable-fallback
  • Regression test: Keep OpenCode approval gated on mergeability so model-output failures cannot approve a conflicted PR.

Change Flow DAG

flowchart LR
  PR["PR changed files"] --> Evidence["OpenCode bounded evidence"]
  Evidence --> S1["Workflow: opencode-review.yml"]
  S1 --> I1["GitHub Actions review job"]
  I1 --> Conflict["Merge conflict blocks this path"]
  Conflict --> V1["actionlint plus required checks"]
  Evidence --> S2["CI script: test_strix_quick_gate.sh"]
  S2 --> I2["review and security gate shell path"]
  I2 --> Conflict["Merge conflict blocks this path"]
  Conflict --> V2["bash -n plus Strix self-test"]
Loading
  • Result: REQUEST_CHANGES
  • Reason: mergeStateStatus is DIRTY; mergeable is CONFLICTING.
  • Head SHA: 86b3d73f3bfb8c064065b265101fb6f7f5635b37
  • Workflow run: 28413836830
  • Workflow attempt: 1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant