Skip to content

feat(pr-sous-chef): exempt CONFLICTING PRs from last-comment-from-sous-chef skip#43286

Merged
pelikhan merged 2 commits into
mainfrom
copilot/update-souschef-heuristic
Jul 4, 2026
Merged

feat(pr-sous-chef): exempt CONFLICTING PRs from last-comment-from-sous-chef skip#43286
pelikhan merged 2 commits into
mainfrom
copilot/update-souschef-heuristic

Conversation

Copilot AI commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

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

  • Bash prefilter (fetch-prs step): gates the continue on mergeStateStatus != CONFLICTING, so conflicting PRs always pass through to the eligible list regardless of the last comment author
    # Before
    if [ "$last_comment_is_sous_chef" = "true" ]; then
      filtered_last_comment_from_sous_chef=$((...))
      continue
    fi
    
    # After
    merge_state_status="$(jq -r '.mergeStateStatus // ""' <<<"$pr")"
    if [ "$last_comment_is_sous_chef" = "true" ] && [ "$merge_state_status" != "CONFLICTING" ]; then
      filtered_last_comment_from_sous_chef=$((...))
      continue
    fi
  • Skip rule 2 (prompt): documents the CONFLICTING exception so the agent respects it during its own skip evaluation
  • pr-processor sub-agent: mirrors the same exception in its skip-condition list

Copilot AI and others added 2 commits July 4, 2026 03:34
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 AI requested a review from pelikhan July 4, 2026 03:36
@pelikhan pelikhan marked this pull request as ready for review July 4, 2026 03:39
Copilot AI review requested due to automatic review settings July 4, 2026 03:39
@pelikhan pelikhan merged commit 5803a9c into main Jul 4, 2026
@pelikhan pelikhan deleted the copilot/update-souschef-heuristic branch July 4, 2026 03:39

Copilot AI 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

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-prs bash prefilter to not skip when the last comment is from sous-chef if mergeStateStatus == CONFLICTING.
  • Updates the in-workflow documentation/prompted skip rules (including the pr-processor sub-agent) to reflect the new CONFLICTING exception.
  • Regenerates the compiled workflow lock for pr-sous-chef (and also updates metadata in design-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"}}
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.

3 participants