diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md index 7634dad42..3490df216 100644 --- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md +++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md @@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md. Create one Team Gamma branch for the selected assignment. Work only that assignment. ``` + +## Day Work / EOD Merge Reminder + +Ready-to-copy reminder: + +```text +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. +``` diff --git a/docs_build/dev/ProjectInstructions/addendums/multi_team.md b/docs_build/dev/ProjectInstructions/addendums/multi_team.md new file mode 100644 index 000000000..373a51ed0 --- /dev/null +++ b/docs_build/dev/ProjectInstructions/addendums/multi_team.md @@ -0,0 +1,55 @@ +# Multi-Team Codex Execution Governance + +## All-Team Preferred Codex Execution Method + +Preferred execution model: +Single Codex session with multiple sequential PRs. + +Applies to: +- Team Alfa through Team Zulu +- Team OWNER + +Purpose: +Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped. + +Rules: +- One Codex session may execute multiple sequential PRs. +- Each PR must still have one clear purpose. +- Each PR must create or use its own approved branch. +- Each PR may be committed and pushed during active work. +- Each PR may be opened as a draft PR during active work. +- Do not commit directly to main. +- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now." +- If later PRs depend on earlier unmerged PRs, Codex must either: + - stack the dependent PRs, or + - stop and request owner approval for the dependency model. +- Codex should reduce chit-chat by planning the full sequence before starting. +- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion. + +## Day Work / EOD Merge 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. +- Pushes are allowed and expected. +- Draft PRs are allowed and expected. +- Direct commits to main are prohibited. +- Merges to main are prohibited unless explicitly approved by the owner. + +At end of day: +- Owner reviews ready PRs. +- Owner explicitly approves which PRs merge. +- Only owner-approved PRs may merge to main. +- After merge, return to main and pull latest main. +- Do not treat sequential PR completion as merge approval. + +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." + +## Conflict Note + +Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability. + +This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging. diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md index ce04c904b..0b63c376f 100644 --- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md +++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md @@ -88,3 +88,56 @@ Rules: - stop and request owner approval for the dependency model. - Codex should reduce chit-chat by planning the full sequence before starting. - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion. + +### All-Team Codex Execution Clarification + +Preferred execution model: +Single Codex session with multiple sequential PRs. + +Applies to: +- Team Alfa through Team Zulu +- Team OWNER + +Purpose: +Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped. + +Rules: +- One Codex session may execute multiple sequential PRs. +- Each PR must still have one clear purpose. +- Each PR must create or use its own approved branch. +- Each PR may be committed and pushed during active work. +- Each PR may be opened as a draft PR during active work. +- Do not commit directly to main. +- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now." +- If later PRs depend on earlier unmerged PRs, Codex must either: + - stack the dependent PRs, or + - stop and request owner approval for the dependency model. +- Codex should reduce chit-chat by planning the full sequence before starting. +- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion. + +Conflict note: +- Older wording that says each PR must create its own branch remains preserved. +- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model. +- If a branch model is unclear, owner approval is required before continuing. + +## Day Work / EOD Merge 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. +- Pushes are allowed and expected. +- Draft PRs are allowed and expected. +- Direct commits to main are prohibited. +- Merges to main are prohibited unless explicitly approved by the owner. + +At end of day: +- Owner reviews ready PRs. +- Owner explicitly approves which PRs merge. +- Only owner-approved PRs may merge to main. +- After merge, return to main and pull latest main. +- Do not treat sequential PR completion as merge approval. + +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." diff --git a/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md b/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md new file mode 100644 index 000000000..b224940fc --- /dev/null +++ b/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md @@ -0,0 +1,15 @@ +# PR_26172_OWNER_016 Instruction Compliance Checklist + +- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`. +- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`. +- [x] OWNER override documented by user. +- [x] Started stacked PR016 from PR015 branch. +- [x] Preserved existing ProjectInstructions content. +- [x] Added or clarified documentation only. +- [x] Added conflict note for overlapping branch/merge wording. +- [x] Did not commit directly to `main`. +- [x] Did not merge any PR. +- [x] Did not delete protected instructions. +- [x] Ran docs/static validation. +- [x] Documented skipped validation lanes. +- [x] Created repo-structured delta ZIP. diff --git a/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md b/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md new file mode 100644 index 000000000..048144ce9 --- /dev/null +++ b/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md @@ -0,0 +1,12 @@ +# PR_26172_OWNER_016 Manual Validation Notes + +- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER. +- Verified single-session sequential PR execution remains preferred. +- Verified each PR still has one clear purpose. +- Verified branch wording allows each PR to create or use its own approved branch. +- Verified commit and push during active work are allowed only on assigned non-main branches. +- Verified draft PRs are allowed and expected during active work. +- Verified direct commits to `main` remain prohibited. +- Verified merges to `main` require owner approval and are not implied by sequential PR completion. +- Verified exact required wording is present. +- Verified conflict note preserves older wording and requires owner approval when unclear. diff --git a/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md b/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md new file mode 100644 index 000000000..228e0ad9b --- /dev/null +++ b/docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md @@ -0,0 +1,35 @@ +# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule + +## Scope + +Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled. + +## Files Changed + +- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md` +- `docs_build/dev/ProjectInstructions/addendums/multi_team.md` +- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md` + +## Changes + +- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER. +- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches. +- Added Day Work / EOD Merge governance. +- Added the exact required commit/push and EOD merge wording. +- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous. + +## Validation + +- `git diff --check` +- `git diff --cached --check` +- Markdown/text review +- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note + +## Skipped Lanes + +- Playwright skipped: documentation-only scope. +- Samples skipped: documentation-only scope. + +## Package + +- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip` diff --git a/docs_build/dev/reports/codex_changed_files.txt b/docs_build/dev/reports/codex_changed_files.txt index 00612de9b..7bb240ccd 100644 --- a/docs_build/dev/reports/codex_changed_files.txt +++ b/docs_build/dev/reports/codex_changed_files.txt @@ -1,6 +1,8 @@ +docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md +docs_build/dev/ProjectInstructions/addendums/multi_team.md docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md -docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md -docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md +docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md +docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md +docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.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 515c39009..9586b95a6 100644 --- a/docs_build/dev/reports/codex_review.diff +++ b/docs_build/dev/reports/codex_review.diff @@ -1,59 +1,82 @@ +diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md +index 7634dad42..3490df216 100644 +--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md ++++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md +@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md. + Create one Team Gamma branch for the selected assignment. + Work only that assignment. + ``` ++ ++## Day Work / EOD Merge Reminder ++ ++Ready-to-copy reminder: ++ ++```text ++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. ++``` diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -index 3408c96f2..ce04c904b 100644 +index ce04c904b..0b63c376f 100644 --- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md +++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md -@@ -37,3 +37,54 @@ Status: Available - Active assignment: none. - - Active branch: none. -+ -+## Team Name Registry -+ -+- Team Alfa -+- Team Bravo -+- Team Charlie -+- Team Delta -+- Team Echo -+- Team Foxtrot -+- Team Golf -+- Team Hotel -+- Team India -+- Team Juliett -+- Team Kilo -+- Team Lima -+- Team Mike -+- Team November -+- Team Oscar -+- Team Papa -+- Team Quebec -+- Team Romeo -+- Team Sierra -+- Team Tango -+- Team Uniform -+- Team Victor -+- Team Whiskey -+- Team X-ray -+- Team Yankee -+- Team Zulu -+- Team OWNER +@@ -88,3 +88,56 @@ Rules: + - stop and request owner approval for the dependency model. + - Codex should reduce chit-chat by planning the full sequence before starting. + - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion. + -+## Preferred Codex Execution Method ++### All-Team Codex Execution Clarification + +Preferred execution model: +Single Codex session with multiple sequential PRs. + ++Applies to: ++- Team Alfa through Team Zulu ++- Team OWNER ++ +Purpose: +Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped. + +Rules: +- One Codex session may execute multiple sequential PRs. +- Each PR must still have one clear purpose. -+- Each PR must create its own branch. -+- Each PR must be committed, pushed, and opened as a draft PR. ++- Each PR must create or use its own approved branch. ++- Each PR may be committed and pushed during active work. ++- Each PR may be opened as a draft PR during active work. +- Do not commit directly to main. -+- Do not merge without explicit owner approval. ++- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now." +- If later PRs depend on earlier unmerged PRs, Codex must either: + - stack the dependent PRs, or + - stop and request owner approval for the dependency model. +- Codex should reduce chit-chat by planning the full sequence before starting. +- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion. ++ ++Conflict note: ++- Older wording that says each PR must create its own branch remains preserved. ++- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model. ++- If a branch model is unclear, owner approval is required before continuing. ++ ++## Day Work / EOD Merge 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. ++- Pushes are allowed and expected. ++- Draft PRs are allowed and expected. ++- Direct commits to main are prohibited. ++- Merges to main are prohibited unless explicitly approved by the owner. ++ ++At end of day: ++- Owner reviews ready PRs. ++- Owner explicitly approves which PRs merge. ++- Only owner-approved PRs may merge to main. ++- After merge, return to main and pull latest main. ++- Do not treat sequential PR completion as merge approval. ++ ++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."