[chaos-test] [Chaos Test] merge-conflict-artist: multi-parent-merge (Run 21)

[github-actions]

Persona: merge-conflict-artist
Strategy: multi-parent-merge (two-commits)
Run: 21

This pull request is an automated chaos test for safe-output create-pull-request bundling.

Scenario: Two sequential commits — a base commit establishing the canvas, then a follow-up resolving imagined conflicts — simulating deliberate multi-step merge-conflict resolution.

Generated by Chaos PR Bundle Fuzzer · ● 12.3M · ◷

• expires on May 18, 2026, 12:54 AM UTC

[github-actions]

Hey there 👋 — thanks for the automated chaos test run! The merge-conflict-artist multi-parent-merge scenario (Run 21) is a great exercise for stress-testing safe-output's create-pull-request bundling logic.

One small flag from the checklist: no test files were detected in the diff — only the two scratchpad markdown artifacts (scratchpad/chaos/mca-r21-base.md, scratchpad/chaos/mca-r21-followup.md). For chaos test PRs that are themselves the test artifact, this is expected and totally fine. If the intent of this run is to also validate that bundling behaved correctly, consider wiring an assertion or result-capture step into the fuzzer workflow so the outcome is machine-verifiable rather than requiring manual inspection.

If you'd like to add automated assertions to the fuzzer, here's a ready-to-use agent prompt:

In the Chaos PR Bundle Fuzzer workflow (chaos-pr-bundle-fuzzer), add a post-run assertion step that:
1. Reads the generated scratchpad files (e.g. scratchpad/chaos/mca-r21-*.md).
2. Verifies they are non-empty and contain the expected persona/strategy metadata fields.
3. Fails the workflow run with a descriptive error if any assertion is violated.
Keep the existing scratchpad artifact creation logic intact.

Generated by ✅ Contribution Check · ● 7.5M · ◷