Skip to content

fix: Allow Codex worker to run for conflict action #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stranske merged 1 commit into from
Jan 11, 2026
Merged

fix: Allow Codex worker to run for conflict action #773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/agents-keepalive-loop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
preflight:
name: Verify secrets available
needs: evaluate
if: needs.evaluate.outputs.action == 'run' || needs.evaluate.outputs.action == 'fix'
if: needs.evaluate.outputs.action == 'run' || needs.evaluate.outputs.action == 'fix' || needs.evaluate.outputs.action == 'conflict'
Copy link

Copilot AI Jan 11, 2026

Choose a reason for hiding this comment

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

The workflow changes enable the 'conflict' action to trigger the Codex worker, but the required prompt file '.github/codex/prompts/fix_merge_conflicts.md' is missing from the repository. The keepalive_loop.js script references this file in the PROMPT_ROUTES object (line 23), and the sync manifest expects it (line 120), but it doesn't exist in .github/codex/prompts/. This will cause the workflow to fail when conflicts are detected. The prompt file needs to be created before these workflow changes can be effective.

Suggested change
if: needs.evaluate.outputs.action == 'run' || needs.evaluate.outputs.action == 'fix' || needs.evaluate.outputs.action == 'conflict'
if: needs.evaluate.outputs.action == 'run' || needs.evaluate.outputs.action == 'fix'

Copilot uses AI. Check for mistakes.
runs-on: ubuntu-latest
environment: agent-standard
outputs:
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
needs:
- evaluate
- preflight
if: needs.evaluate.outputs.action == 'run' || needs.evaluate.outputs.action == 'fix'
if: needs.evaluate.outputs.action == 'run' || needs.evaluate.outputs.action == 'fix' || needs.evaluate.outputs.action == 'conflict'
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
WORKFLOWS_APP_ID: ${{ secrets.WORKFLOWS_APP_ID }}
WORKFLOWS_APP_PRIVATE_KEY: ${{ secrets.WORKFLOWS_APP_PRIVATE_KEY }}
with:
skip: ${{ needs.evaluate.outputs.action != 'run' && needs.evaluate.outputs.action != 'fix' }}
skip: ${{ needs.evaluate.outputs.action != 'run' && needs.evaluate.outputs.action != 'fix' && needs.evaluate.outputs.action != 'conflict' }}
prompt_file: ${{ needs.evaluate.outputs.prompt_file }}
mode: keepalive
pr_number: ${{ needs.evaluate.outputs.pr_number }}
Expand Down
Loading