Skip to content

merge group pg-3166 for root #3166 - #373

Merged
PolyphonyRequiem merged 1 commit into
feature/3166from
mg/3166_pg-3166
May 14, 2026
Merged

merge group pg-3166 for root #3166#373
PolyphonyRequiem merged 1 commit into
feature/3166from
mg/3166_pg-3166

Conversation

@PolyphonyRequiem

Copy link
Copy Markdown
Owner

Merge group pg-3166 for root #3166

Promotes mg/3166_pg-3166 into feature/3166.

This PR was opened by polyphony pr open-mg-pr. The detailed body — including the manifest of items in this merge group — is composed by the orchestrating workflow when it has that context.

Add deterministic scope_empty_mg_triage node between scope_guidance_loader
and scope_reviewer to distinguish three zero-commit MG cases:

- Case A (structural_violation): genuinely empty MG — upstream bug
- Case B (zero_commits_unresolved): deferred to scope_reviewer with
  enriched context for ADO-based evaluation
- Case C (already_satisfied): fix already on main, auto-approved via
  scope_auto_approve node

Previously all three collapsed to changes_requested, causing infinite
revise loops that hit the scope_revise_cap_gate with no convergence path.

Changes:
- Add scope_empty_mg_triage script node with deterministic git checks
  (branch existence, task count, commit count, merge-base ancestry)
- Add scope_auto_approve script node for Case C auto-approval
- Update scope_reviewer prompt: keep structural checks (a)/(b), add
  zero-commit disambiguation section for Case A vs B
- Update user_acceptance prompt to handle both scope_reviewer and
  scope_auto_approve feedback paths
- Update lint tests (47 tests, all passing)

Co-authored-by: Daniel Green <dangreen@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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