PR Cleanup And Integration Lab

PR Cleanup And Integration Lab

Last updated: 2026-06-05.

This page tracks the June 2026 PR cleanup pass for rayswaynl/a2waspwarfare. It exists so humans and AI agents can see which PRs are real features, which are superseded by the release bundle, which are docs-only, and which branches should be tested together.

Branches Created

Branch	Contents	Use
dev/pr8-only-testbed	Exact PR #8 tip, based on release/2026-06-feature-bundle / origin/pr/8.	Clean PR8-only multiplayer test baseline.
dev/pr8-plus-testbed	PR #8 + resolved PR #12 + PR #16.	Combined test branch for bundle plus quick fixes plus original-style WF menu UX.

Main Recommendation

Use PR #8 as the release bundle baseline. It already contains PR #1, PR #5, PR #6, PR #7, PR #10, and PR #11 by ancestry, so those standalone PRs should not be merged separately.

The best current combined gameplay test branch is:

dev/pr8-plus-testbed = PR #8 + PR #12 + PR #16

Keep PR #4, PR #9, PR #13, and PR #14/#18/#19 separate until they have their own focused test windows.

PR Triage Matrix

PR	Title / branch	Status	Recommendation	Evidence
#1	Supply helicopters	Closed	Superseded by PR #8.	origin/pr/1 is an ancestor of origin/pr/8.
#2	Developer wiki mirror	Open	Keep as docs PR, not gameplay test material.	175 files, mostly docs/wiki; includes wiki mirror tooling and docs.
#3	Claude wiki review	Open	Keep stacked on PR #2 or fold into docs branch later.	Docs-heavy branch based on docs/developer-wiki-index.
#4	Player stats phase 1 WIP	Open	Real feature, but keep separate from PR8 release test.	Clean merge candidate on top of PR8+12+16; adds DiscordBot stats pipeline and mission stat flush hooks.
#5	Upgrade queue	Closed	Superseded by PR #8.	Ancestor of PR #8.
#6	Engineer EASA repair truck	Closed	Superseded by PR #8.	Ancestor of PR #8.
#7	Delayed vehicle damage rewards	Closed	Superseded by PR #8.	Ancestor of PR #8.
#8	June 2026 feature bundle	Open	Treat as primary release bundle.	72 mission files; contains supply heli, WDDM positions, upgrade queue, EASA/QoL, rewards, fixes.
#9	Zargabad low-pop mission	Open	Real feature, but separate map-content test branch.	Clean merge candidate, but huge: 832 files and 77k+ insertions.
#10	Commander buildable positions	Closed	Superseded by PR #8.	Ancestor of PR #8.
#11	Buy-menu/EASA QoL	Open	Close or mark superseded by PR #8 after confirming PR #8 test passes.	origin/pr/11 is an ancestor of origin/pr/8.
#12	Quick-wins fixes	Open	Merged into dev/pr8-plus-testbed; needs focused server/economy smoke test.	Conflicted in five Chernarus files, resolved by preserving PR8 behavior plus PR12 fixes.
#13	Recon UAV	Open	Real feature train, but do not combine casually with PR8.	Brings drone saturation strike stack; conflicts in tactical menu, UAV module deletion, and parameters.
#14	AI Commander draft	Open	Keep experimental. Test alone or after commander-specific review.	Conflicts in Server_AI_Com_Upgrade.sqf; adds new Server/AI/Commander runtime.
#15	WF menu ops-console reskin	Open	Alternative UI direction. Do not merge with PR #16 without design decision.	Conflicts with PR #16 in Rsc/Dialogs.hpp and Rsc/Ressources.hpp for both Chernarus and Takistan.
#16	WF menu UX phase 1, original style	Open	Included in dev/pr8-plus-testbed.	Clean merge on top of PR8+12; less brand-opinionated than PR #15.
#17	Quad AI commander docs	Open	Docs/concept only. Keep as reference, not gameplay merge material.	23 docs/wiki files, no code.
#18	AI commander logs	Open	Stacked AI commander experiment. Keep with PR #14 chain.	Base is feat/ai-commander; conflicts in same commander upgrade function on PR8 lab.
#19	AI commander context beliefs	Open	Stacked AI commander experiment. Keep with PR #14/#18 chain.	Base is codex/ai-commander-logs; conflicts in same commander upgrade function on PR8 lab.

Cleanup Actions

Recommended PR board cleanup:

1. Close or label as superseded: PR #1, #5, #6, #7, #10, #11.
2. Keep docs-only outside gameplay testing: PR #2, #3, #17.
3. Test now: PR #8, then dev/pr8-plus-testbed.
4. Test separately later: PR #4 player stats, PR #9 Zargabad, PR #13 drone/recon UAV, PR #14/#18/#19 AI commander chain.
5. Pick one WF menu direction: PR #16 for original-style UX, or PR #15 for ops-console reskin. They overlap enough that both should not be merged blindly.

Test Notes For Discord

Short version to share:

PR8 is the baseline bundle.
PR8 already contains PR1/5/6/7/10/11, so those can be treated as superseded.

Two branches are ready:
- dev/pr8-only-testbed: PR8 only
- dev/pr8-plus-testbed: PR8 + PR12 quick fixes + PR16 WF menu UX

Keep separate for now:
- PR4 player stats: real but WIP
- PR9 Zargabad: real but huge map/content import
- PR13 drone/recon UAV: real but conflicts with PR8 UI/UAV files
- PR14/18/19 AI commander: real but experimental stacked chain
- PR15 ops-console UI: alternate to PR16, not both

Validation Performed

• Fetched origin and miksuu, including PR refs.
• Checked PR ancestry against PR #8.
• Created isolated worktrees under work/pr8-only-testbed and work/pr8-plus-testbed.
• Merged PR #12 into PR8 lab with manual conflict resolution in five files.
• Merged PR #16 cleanly into the combined lab.
• Dry-tested PR #4, #9, #13, #14, #15, #18, and #19 on top of the combined lab.
• Pushed both dev branches to origin.

Adjacent Upstream Note

Miksuu/master is ahead of rayswaynl/master by Marty_town_defense_fix as of this pass. That should be evaluated separately as an upstream-sync candidate before cutting a final gameplay release branch.