From dc08c5e9faaa198174c3fc0f93bc658e872d54f7 Mon Sep 17 00:00:00 2001 From: "Mr. Q" <97194984+ToolboxAid@users.noreply.github.com> Date: Sun, 21 Jun 2026 15:10:20 -0400 Subject: [PATCH] PR_26172_OWNER_019 day work EOD merge governance --- .../PROJECT_INSTRUCTIONS.md | 9 + .../TEAM_START_COMMANDS.md | 2 + .../addendums/multi_team.md | 2 + ...rnance-instruction-compliance-checklist.md | 14 + ...erge-governance-manual-validation-notes.md | 7 + ...OWNER_019-day-work-eod-merge-governance.md | 33 ++ .../dev/reports/codex_changed_files.txt | 14 +- docs_build/dev/reports/codex_review.diff | 379 ++---------------- 8 files changed, 109 insertions(+), 351 deletions(-) create mode 100644 docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md create mode 100644 docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md create mode 100644 docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md diff --git a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md index 40db33c44..9636e2d41 100644 --- a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md +++ b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md @@ -33,6 +33,15 @@ Existing Project Instructions remain preserved in their current locations. This No PR in this operating system is merged without explicit owner approval. +## Day Work / EOD Merge Rule + +Commit/push during the day is allowed only on assigned team/OWNER/PR branches. + +Merge to main is EOD-only and owner-approved, unless the owner explicitly says: +"Merge this PR now." + +Do not treat sequential PR completion as merge approval. + ## OWNER Governance OWNER override wording: diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md index 35279e8f1..ff60e7bbb 100644 --- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md +++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md @@ -70,6 +70,8 @@ Work only that assignment. Ready-to-copy reminder: +Confirmed required rule: + ```text Commit/push during the day is allowed only on assigned team/OWNER/PR branches. diff --git a/docs_build/dev/ProjectInstructions/addendums/multi_team.md b/docs_build/dev/ProjectInstructions/addendums/multi_team.md index 373a51ed0..f0a369ee9 100644 --- a/docs_build/dev/ProjectInstructions/addendums/multi_team.md +++ b/docs_build/dev/ProjectInstructions/addendums/multi_team.md @@ -28,6 +28,8 @@ Rules: ## Day Work / EOD Merge Rule +Confirmed required rule: + During active work: - Work happens on assigned team branches, OWNER branches, or scoped PR branches. - Commits are allowed only on assigned non-main branches. diff --git a/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md b/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md new file mode 100644 index 000000000..e2da6afe2 --- /dev/null +++ b/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md @@ -0,0 +1,14 @@ +# PR_26172_OWNER_019 Instruction Compliance Checklist + +- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`. +- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`. +- [x] Read `docs_build/dev/ProjectInstructions/README.txt`. +- [x] OWNER override documented by user. +- [x] Started from PR018 branch. +- [x] Created branch `pr/26172-OWNER-019-day-work-eod-merge-governance`. +- [x] Added or confirmed Day Work / EOD Merge rule. +- [x] Did not delete ProjectInstructions content. +- [x] Did not commit directly to `main`. +- [x] Did not merge any PR. +- [x] Ran docs/static validation. +- [x] Created repo-structured delta ZIP. diff --git a/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md b/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md new file mode 100644 index 000000000..7ca628318 --- /dev/null +++ b/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md @@ -0,0 +1,7 @@ +# PR_26172_OWNER_019 Manual Validation Notes + +- Verified the required commit/push rule appears in ProjectInstructions. +- Verified the required EOD merge rule appears in ProjectInstructions. +- Verified `multi_team.md` confirms the required rule. +- Verified `TEAM_START_COMMANDS.md` confirms the required rule. +- Verified no runtime, UI, Playwright, or sample files changed. diff --git a/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md b/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md new file mode 100644 index 000000000..463b787c3 --- /dev/null +++ b/docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md @@ -0,0 +1,33 @@ +# PR_26172_OWNER_019-day-work-eod-merge-governance + +## Scope + +Add and confirm Day Work / EOD Merge governance in the installed ProjectInstructions operating system. + +## Changes + +- Added the required Day Work / EOD Merge rule to `PROJECT_INSTRUCTIONS.md`. +- Confirmed the required rule in `addendums/multi_team.md`. +- Confirmed the required rule in `TEAM_START_COMMANDS.md`. + +## Required Rule + +Commit/push during the day is allowed only on assigned team/OWNER/PR branches. + +Merge to main is EOD-only and owner-approved, unless the owner explicitly says: +"Merge this PR now." + +## Validation + +- `git diff --check` +- `git diff --cached --check` +- Text search for required Day Work / EOD Merge wording + +## Skipped Lanes + +- Playwright skipped: documentation-only governance. +- Samples skipped: documentation-only governance. + +## Package + +- `tmp/PR_26172_OWNER_019-day-work-eod-merge-governance_delta.zip` diff --git a/docs_build/dev/reports/codex_changed_files.txt b/docs_build/dev/reports/codex_changed_files.txt index d6901d9a5..79bddf0d1 100644 --- a/docs_build/dev/reports/codex_changed_files.txt +++ b/docs_build/dev/reports/codex_changed_files.txt @@ -1,12 +1,8 @@ +docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md -docs_build/dev/ProjectInstructions/addendums/build_path_sync.md -docs_build/dev/ProjectInstructions/addendums/deprecation.md -docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md -docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md -docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md -docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization-instruction-compliance-checklist.md -docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization-manual-validation-notes.md -docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization.md +docs_build/dev/ProjectInstructions/addendums/multi_team.md +docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md +docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md +docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md docs_build/dev/reports/codex_changed_files.txt docs_build/dev/reports/codex_review.diff diff --git a/docs_build/dev/reports/codex_review.diff b/docs_build/dev/reports/codex_review.diff index 186e09a6b..4bf661b0c 100644 --- a/docs_build/dev/reports/codex_review.diff +++ b/docs_build/dev/reports/codex_review.diff @@ -1,351 +1,46 @@ +diff --git a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md +index 40db33c44..9636e2d41 100644 +--- a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md ++++ b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md +@@ -33,6 +33,15 @@ Existing Project Instructions remain preserved in their current locations. This + + No PR in this operating system is merged without explicit owner approval. + ++## Day Work / EOD Merge Rule ++ ++Commit/push during the day is allowed only on assigned team/OWNER/PR branches. ++ ++Merge to main is EOD-only and owner-approved, unless the owner explicitly says: ++"Merge this PR now." ++ ++Do not treat sequential PR completion as merge approval. ++ + ## OWNER Governance + + OWNER override wording: diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md -index 3490df216..35279e8f1 100644 +index 35279e8f1..ff60e7bbb 100644 --- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md +++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md -@@ -1,68 +1,68 @@ - # TEAM_START_COMMANDS +@@ -70,6 +70,8 @@ Work only that assignment. --## Start Team Alpha -+## Start Team Alfa - - Ready-to-copy command: - - ```text --OWNER override approved: Start Team Alpha from the ProjectInstructions release gate. -+OWNER override approved: Start Team Alfa from the ProjectInstructions release gate. - - Read docs_build/dev/ProjectInstructions/README.txt first. - Read docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md. - Read docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md. - --Pull one [ ] item for Team Alpha from BACKLOG_MASTER.md. --Stop if Team Alpha already has an active branch. --Stop if Team Alpha already has an active assignment. --Stop if no [ ] Team Alpha backlog item is available. -+Pull one [ ] item for Team Alfa from BACKLOG_MASTER.md. -+Stop if Team Alfa already has an active branch. -+Stop if Team Alfa already has an active assignment. -+Stop if no [ ] Team Alfa backlog item is available. - - Change the selected backlog item from [ ] to [.]. --Add the selected assignment under Team Alpha in TEAM_ASSIGNMENTS.md. --Create one Team Alpha branch for the selected assignment. -+Add the selected assignment under Team Alfa in TEAM_ASSIGNMENTS.md. -+Create one Team Alfa branch for the selected assignment. - Work only that assignment. - ``` - --## Start Team Beta -+## Start Team Bravo - - Ready-to-copy command: + Ready-to-copy reminder: ++Confirmed required rule: ++ ```text --OWNER override approved: Start Team Beta from the ProjectInstructions release gate. -+OWNER override approved: Start Team Bravo from the ProjectInstructions release gate. - - Read docs_build/dev/ProjectInstructions/README.txt first. - Read docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md. - Read docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md. - --Pull one [ ] item for Team Beta from BACKLOG_MASTER.md. --Stop if Team Beta already has an active branch. --Stop if Team Beta already has an active assignment. --Stop if no [ ] Team Beta backlog item is available. -+Pull one [ ] item for Team Bravo from BACKLOG_MASTER.md. -+Stop if Team Bravo already has an active branch. -+Stop if Team Bravo already has an active assignment. -+Stop if no [ ] Team Bravo backlog item is available. - - Change the selected backlog item from [ ] to [.]. --Add the selected assignment under Team Beta in TEAM_ASSIGNMENTS.md. --Create one Team Beta branch for the selected assignment. -+Add the selected assignment under Team Bravo in TEAM_ASSIGNMENTS.md. -+Create one Team Bravo branch for the selected assignment. - Work only that assignment. - ``` - --## Start Team Gamma -+## Start Team Charlie - - Ready-to-copy command: - - ```text --OWNER override approved: Start Team Gamma from the ProjectInstructions release gate. -+OWNER override approved: Start Team Charlie from the ProjectInstructions release gate. - - Read docs_build/dev/ProjectInstructions/README.txt first. - Read docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md. - Read docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md. - --Pull one [ ] item for Team Gamma from BACKLOG_MASTER.md. --Stop if Team Gamma already has an active branch. --Stop if Team Gamma already has an active assignment. --Stop if no [ ] Team Gamma backlog item is available. -+Pull one [ ] item for Team Charlie from BACKLOG_MASTER.md. -+Stop if Team Charlie already has an active branch. -+Stop if Team Charlie already has an active assignment. -+Stop if no [ ] Team Charlie backlog item is available. - - Change the selected backlog item from [ ] to [.]. --Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md. --Create one Team Gamma branch for the selected assignment. -+Add the selected assignment under Team Charlie in TEAM_ASSIGNMENTS.md. -+Create one Team Charlie branch for the selected assignment. - Work only that assignment. - ``` - -diff --git a/docs_build/dev/ProjectInstructions/addendums/build_path_sync.md b/docs_build/dev/ProjectInstructions/addendums/build_path_sync.md -index ad7195d1c..fe8d44537 100644 ---- a/docs_build/dev/ProjectInstructions/addendums/build_path_sync.md -+++ b/docs_build/dev/ProjectInstructions/addendums/build_path_sync.md -@@ -1,4 +1,4 @@ --# Build Path Status Sync Governance -+# Build Path Status Sync Governance - - ## Purpose - -diff --git a/docs_build/dev/ProjectInstructions/addendums/deprecation.md b/docs_build/dev/ProjectInstructions/addendums/deprecation.md -index 2268b30bc..6b2b585a6 100644 ---- a/docs_build/dev/ProjectInstructions/addendums/deprecation.md -+++ b/docs_build/dev/ProjectInstructions/addendums/deprecation.md -@@ -1,4 +1,4 @@ --# Deprecation Governance -+# Deprecation Governance - - ## Purpose - -diff --git a/docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md b/docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md -index f492806d8..d73cfcb9f 100644 ---- a/docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md -+++ b/docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md -@@ -2,7 +2,7 @@ - - ## Purpose - --This gate prevents Team Alpha, Team Beta, Team Gamma, or Team OWNER from starting regular assigned work before the ProjectInstructions operating system is ready. -+This gate prevents Team Alfa, Team Bravo, Team Charlie, or Team OWNER from starting regular assigned work before the ProjectInstructions operating system is ready. - - ## Release Rule - -diff --git a/docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md b/docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md -index a1a1b75e0..175dc6765 100644 ---- a/docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md -+++ b/docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md -@@ -1,4 +1,4 @@ --# Build Path Tile Overlay Status Governance -+# Build Path Tile Overlay Status Governance - - ## Purpose - -diff --git a/docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md b/docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md -index 6ecd9bac8..1eee148cb 100644 ---- a/docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md -+++ b/docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md -@@ -4,114 +4,114 @@ - - ### Idea - --0% Complete — Dream, brainstorm, and explore early game concepts -+0% Complete — Dream, brainstorm, and explore early game concepts - --- [ ] Alpha - Idea Board --- [ ] Alpha - Game Concept Notes --- [ ] Alpha - Creator Learning -+- [ ] Alfa - Idea Board -+- [ ] Alfa - Game Concept Notes -+- [ ] Alfa - Creator Learning - - ### Design - --0% Complete — Shape the game's story, structure, and systems -+0% Complete — Shape the game's story, structure, and systems - --- [ ] Alpha - Game Hub --- [ ] Alpha - Game Design --- [ ] Alpha - Game Configuration --- [ ] Alpha - Game Crew --- [ ] Alpha - Tags --- [ ] Beta - Messages -+- [ ] Alfa - Game Hub -+- [ ] Alfa - Game Design -+- [ ] Alfa - Game Configuration -+- [ ] Alfa - Game Crew -+- [ ] Alfa - Tags -+- [ ] Bravo - Messages - - ### Graphics - --0% Complete — Create the visual look of your game -+0% Complete — Create the visual look of your game - --- [ ] Beta - Asset Studio V2 --- [ ] Beta - Sprite Studio V2 --- [ ] Beta - Animation Studio V2 --- [ ] Beta - Palette Manager --- [ ] Beta - Video Studio -+- [ ] Bravo - Asset Studio V2 -+- [ ] Bravo - Sprite Studio V2 -+- [ ] Bravo - Animation Studio V2 -+- [ ] Bravo - Palette Manager -+- [ ] Bravo - Video Studio - - ### Audio - --0% Complete — Build sounds, music, and voices -+0% Complete — Build sounds, music, and voices - --- [ ] Beta - Audio Studio V2 --- [ ] Beta - Audio Effects --- [ ] Beta - MIDI Studio V2 --- [ ] Beta - Messages --- [ ] Beta - Text To Speech --- [ ] Beta - Voice Profiles -+- [ ] Bravo - Audio Studio V2 -+- [ ] Bravo - Audio Effects -+- [ ] Bravo - MIDI Studio V2 -+- [ ] Bravo - Messages -+- [ ] Bravo - Text To Speech -+- [ ] Bravo - Voice Profiles - - ### Objects - --0% Complete — Create the things players interact with -+0% Complete — Create the things players interact with - --- [ ] Alpha - Objects --- [ ] Alpha - Characters --- [ ] Alpha - Object Behaviors -+- [ ] Alfa - Objects -+- [ ] Alfa - Characters -+- [ ] Alfa - Object Behaviors - - ### Worlds - --0% Complete — Build levels, maps, and places to explore -+0% Complete — Build levels, maps, and places to explore - --- [ ] Alpha - Worlds --- [ ] Alpha - Environment Settings --- [ ] Alpha - Level Layouts -+- [ ] Alfa - Worlds -+- [ ] Alfa - Environment Settings -+- [ ] Alfa - Level Layouts - - ### Interface - --0% Complete — Design menus, HUDs, and player screens -+0% Complete — Design menus, HUDs, and player screens - --- [ ] Alpha - Interface Layouts --- [ ] Alpha - Fonts --- [ ] Alpha - Languages -+- [ ] Alfa - Interface Layouts -+- [ ] Alfa - Fonts -+- [ ] Alfa - Languages - - ### Controls - --0% Complete — Define how players interact with your game -+0% Complete — Define how players interact with your game - --- [ ] Alpha - Controls --- [ ] Alpha - Input Mapping --- [ ] Alpha - Hitboxes -+- [ ] Alfa - Controls -+- [ ] Alfa - Input Mapping -+- [ ] Alfa - Hitboxes - - ### Rules - --0% Complete — Create gameplay behavior and events -+0% Complete — Create gameplay behavior and events - --- [ ] Alpha - Events --- [ ] Alpha - Rules --- [ ] Alpha - Custom Extensions -+- [ ] Alfa - Events -+- [ ] Alfa - Rules -+- [ ] Alfa - Custom Extensions - - ### Progression - --0% Complete — Build rewards, unlocks, and advancement -+0% Complete — Build rewards, unlocks, and advancement - --- [ ] Alpha - Game Journey --- [ ] Alpha - Achievements --- [ ] Alpha - Saved Data -+- [ ] Alfa - Game Journey -+- [ ] Alfa - Achievements -+- [ ] Alfa - Saved Data - - ### Play Test - --0% Complete — Test, debug, and improve your game -+0% Complete — Test, debug, and improve your game - --- [ ] Alpha - Game Testing --- [ ] Alpha - Debug --- [ ] Alpha - Performance -+- [ ] Alfa - Game Testing -+- [ ] Alfa - Debug -+- [ ] Alfa - Performance - - ### Publish - --0% Complete — Prepare and release your game -+0% Complete — Prepare and release your game - --- [ ] Beta - Publish --- [ ] Beta - Build Game --- [ ] Beta - Platform Settings --- [ ] Beta - Game Migration -+- [ ] Bravo - Publish -+- [ ] Bravo - Build Game -+- [ ] Bravo - Platform Settings -+- [ ] Bravo - Game Migration - - ### Share - --0% Complete — Grow your audience and community -+0% Complete — Grow your audience and community - --- [ ] Beta - Marketplace --- [ ] Beta - Community --- [ ] Beta - Ratings --- [ ] Beta - Cloud -+- [ ] Bravo - Marketplace -+- [ ] Bravo - Community -+- [ ] Bravo - Ratings -+- [ ] Bravo - Cloud -diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -index 0b63c376f..b7c5df692 100644 ---- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -@@ -6,7 +6,7 @@ - - Active: team has one assignment in progress. - - Blocked: team cannot pull work until blocker is cleared. - --## Team Alpha -+## Team Alfa - - Status: Available - -@@ -14,7 +14,7 @@ Active assignment: none. - - Active branch: none. - --## Team Beta -+## Team Bravo - - Status: Available - -@@ -22,7 +22,7 @@ Active assignment: none. + Commit/push during the day is allowed only on assigned team/OWNER/PR branches. - Active branch: none. +diff --git a/docs_build/dev/ProjectInstructions/addendums/multi_team.md b/docs_build/dev/ProjectInstructions/addendums/multi_team.md +index 373a51ed0..f0a369ee9 100644 +--- a/docs_build/dev/ProjectInstructions/addendums/multi_team.md ++++ b/docs_build/dev/ProjectInstructions/addendums/multi_team.md +@@ -28,6 +28,8 @@ Rules: --## Team Gamma -+## Team Charlie + ## Day Work / EOD Merge Rule - Status: Available ++Confirmed required rule: ++ + During active work: + - Work happens on assigned team branches, OWNER branches, or scoped PR branches. + - Commits are allowed only on assigned non-main branches.