feat(pr-sous-chef): exempt CONFLICTING PRs from last-comment-from-sous-chef skip#43286
Merged
Conversation
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
… pr-sous-chef Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot
AI
changed the title
feat: exempt CONFLICTING PRs from last-comment-from-sous-chef skip in pr-sous-chef
feat(pr-sous-chef): exempt CONFLICTING PRs from last-comment-from-sous-chef skip
Jul 4, 2026
Copilot created this pull request from a session on behalf of
pelikhan
July 4, 2026 03:36
View session
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the pr-sous-chef workflow so PRs that are merge-conflicting don’t get permanently skipped just because the most recent comment was previously posted by sous-chef—allowing repeated conflict-resolution nudges until the conflict is addressed.
Changes:
- Adjusts the
fetch-prsbash prefilter to not skip when the last comment is from sous-chef ifmergeStateStatus == CONFLICTING. - Updates the in-workflow documentation/prompted skip rules (including the
pr-processorsub-agent) to reflect the new CONFLICTING exception. - Regenerates the compiled workflow lock for
pr-sous-chef(and also updates metadata indesign-decision-gate.lock.yml).
Show a summary per file
| File | Description |
|---|---|
| .github/workflows/pr-sous-chef.md | Adds CONFLICTING exception in prefilter and documents the same rule for the agent/sub-agent skip logic. |
| .github/workflows/pr-sous-chef.lock.yml | Regenerated compiled workflow reflecting the updated prefilter logic. |
| .github/workflows/design-decision-gate.lock.yml | Metadata changed (body hash), seemingly unrelated to the pr-sous-chef change. |
Review details
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 3/3 changed files
- Comments generated: 1
- Review effort level: Low
| @@ -1,4 +1,4 @@ | |||
| # gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"1add653c616dba162ddd5f114e55e1cf347eaa0248a81d822f1f25fdaa99192b","body_hash":"7e583643f095382493209c5ecbcb97e582f922d97b58574d6cfdacdf33fbf79b","strict":true,"agent_id":"claude","agent_model":"claude-sonnet-4-6","engine_versions":{"claude":"2.1.198"}} | |||
| # gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"1add653c616dba162ddd5f114e55e1cf347eaa0248a81d822f1f25fdaa99192b","body_hash":"3baf377646ddd659eda7ead187d6043e41c8136688d6bcd3600649cc0de38e69","strict":true,"agent_id":"claude","agent_model":"claude-sonnet-4-6","engine_versions":{"claude":"2.1.198"}} | |||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When the last comment on a PR is from sous-chef, it skips the PR to avoid back-to-back nudges. This silently stalls PRs with merge conflicts — sous-chef posts the merge-main nudge once, then never repeats it even though the conflict remains unresolved.
Changes
fetch-prsstep): gates thecontinueonmergeStateStatus != CONFLICTING, so conflicting PRs always pass through to the eligible list regardless of the last comment authorpr-processorsub-agent: mirrors the same exception in its skip-condition list