Skip to content

Commit 4b682d8

Browse files
ToolboxAidToolboxAid
committed
PR_26172_OWNER_016 all-team Codex execution and EOD merge rule
1 parent 25793d9 commit 4b682d8

8 files changed

Lines changed: 250 additions & 42 deletions

‎docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
6565
Create one Team Gamma branch for the selected assignment.
6666
Work only that assignment.
6767
```
68+
69+
## Day Work / EOD Merge Reminder
70+
71+
Ready-to-copy reminder:
72+
73+
```text
74+
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
75+
76+
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
77+
"Merge this PR now."
78+
79+
Do not treat sequential PR completion as merge approval.
80+
```

‎docs_build/dev/ProjectInstructions/addendums/multi_team.md‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Multi-Team Codex Execution Governance
2+
3+
## All-Team Preferred Codex Execution Method
4+
5+
Preferred execution model:
6+
Single Codex session with multiple sequential PRs.
7+
8+
Applies to:
9+
- Team Alfa through Team Zulu
10+
- Team OWNER
11+
12+
Purpose:
13+
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
14+
15+
Rules:
16+
- One Codex session may execute multiple sequential PRs.
17+
- Each PR must still have one clear purpose.
18+
- Each PR must create or use its own approved branch.
19+
- Each PR may be committed and pushed during active work.
20+
- Each PR may be opened as a draft PR during active work.
21+
- Do not commit directly to main.
22+
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
23+
- If later PRs depend on earlier unmerged PRs, Codex must either:
24+
- stack the dependent PRs, or
25+
- stop and request owner approval for the dependency model.
26+
- Codex should reduce chit-chat by planning the full sequence before starting.
27+
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
28+
29+
## Day Work / EOD Merge Rule
30+
31+
During active work:
32+
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
33+
- Commits are allowed only on assigned non-main branches.
34+
- Pushes are allowed and expected.
35+
- Draft PRs are allowed and expected.
36+
- Direct commits to main are prohibited.
37+
- Merges to main are prohibited unless explicitly approved by the owner.
38+
39+
At end of day:
40+
- Owner reviews ready PRs.
41+
- Owner explicitly approves which PRs merge.
42+
- Only owner-approved PRs may merge to main.
43+
- After merge, return to main and pull latest main.
44+
- Do not treat sequential PR completion as merge approval.
45+
46+
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
47+
48+
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
49+
"Merge this PR now."
50+
51+
## Conflict Note
52+
53+
Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.
54+
55+
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.

‎docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,56 @@ Rules:
8888
- stop and request owner approval for the dependency model.
8989
- Codex should reduce chit-chat by planning the full sequence before starting.
9090
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
91+
92+
### All-Team Codex Execution Clarification
93+
94+
Preferred execution model:
95+
Single Codex session with multiple sequential PRs.
96+
97+
Applies to:
98+
- Team Alfa through Team Zulu
99+
- Team OWNER
100+
101+
Purpose:
102+
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
103+
104+
Rules:
105+
- One Codex session may execute multiple sequential PRs.
106+
- Each PR must still have one clear purpose.
107+
- Each PR must create or use its own approved branch.
108+
- Each PR may be committed and pushed during active work.
109+
- Each PR may be opened as a draft PR during active work.
110+
- Do not commit directly to main.
111+
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
112+
- If later PRs depend on earlier unmerged PRs, Codex must either:
113+
- stack the dependent PRs, or
114+
- stop and request owner approval for the dependency model.
115+
- Codex should reduce chit-chat by planning the full sequence before starting.
116+
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
117+
118+
Conflict note:
119+
- Older wording that says each PR must create its own branch remains preserved.
120+
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
121+
- If a branch model is unclear, owner approval is required before continuing.
122+
123+
## Day Work / EOD Merge Rule
124+
125+
During active work:
126+
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
127+
- Commits are allowed only on assigned non-main branches.
128+
- Pushes are allowed and expected.
129+
- Draft PRs are allowed and expected.
130+
- Direct commits to main are prohibited.
131+
- Merges to main are prohibited unless explicitly approved by the owner.
132+
133+
At end of day:
134+
- Owner reviews ready PRs.
135+
- Owner explicitly approves which PRs merge.
136+
- Only owner-approved PRs may merge to main.
137+
- After merge, return to main and pull latest main.
138+
- Do not treat sequential PR completion as merge approval.
139+
140+
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
141+
142+
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
143+
"Merge this PR now."

‎docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# PR_26172_OWNER_016 Instruction Compliance Checklist
2+
3+
- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
4+
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
5+
- [x] OWNER override documented by user.
6+
- [x] Started stacked PR016 from PR015 branch.
7+
- [x] Preserved existing ProjectInstructions content.
8+
- [x] Added or clarified documentation only.
9+
- [x] Added conflict note for overlapping branch/merge wording.
10+
- [x] Did not commit directly to `main`.
11+
- [x] Did not merge any PR.
12+
- [x] Did not delete protected instructions.
13+
- [x] Ran docs/static validation.
14+
- [x] Documented skipped validation lanes.
15+
- [x] Created repo-structured delta ZIP.

‎docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# PR_26172_OWNER_016 Manual Validation Notes
2+
3+
- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
4+
- Verified single-session sequential PR execution remains preferred.
5+
- Verified each PR still has one clear purpose.
6+
- Verified branch wording allows each PR to create or use its own approved branch.
7+
- Verified commit and push during active work are allowed only on assigned non-main branches.
8+
- Verified draft PRs are allowed and expected during active work.
9+
- Verified direct commits to `main` remain prohibited.
10+
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
11+
- Verified exact required wording is present.
12+
- Verified conflict note preserves older wording and requires owner approval when unclear.

‎docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
2+
3+
## Scope
4+
5+
Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.
6+
7+
## Files Changed
8+
9+
- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
10+
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
11+
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`
12+
13+
## Changes
14+
15+
- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
16+
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
17+
- Added Day Work / EOD Merge governance.
18+
- Added the exact required commit/push and EOD merge wording.
19+
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.
20+
21+
## Validation
22+
23+
- `git diff --check`
24+
- `git diff --cached --check`
25+
- Markdown/text review
26+
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note
27+
28+
## Skipped Lanes
29+
30+
- Playwright skipped: documentation-only scope.
31+
- Samples skipped: documentation-only scope.
32+
33+
## Package
34+
35+
- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

‎docs_build/dev/reports/codex_changed_files.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
2+
docs_build/dev/ProjectInstructions/addendums/multi_team.md
13
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
2-
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
3-
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
4-
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
4+
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
5+
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
6+
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
57
docs_build/dev/reports/codex_changed_files.txt
68
docs_build/dev/reports/codex_review.diff

‎docs_build/dev/reports/codex_review.diff‎

Lines changed: 62 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
1+
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
2+
index 7634dad42..3490df216 100644
3+
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
4+
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
5+
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
6+
Create one Team Gamma branch for the selected assignment.
7+
Work only that assignment.
8+
```
9+
+
10+
+## Day Work / EOD Merge Reminder
11+
+
12+
+Ready-to-copy reminder:
13+
+
14+
+```text
15+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
16+
+
17+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
18+
+"Merge this PR now."
19+
+
20+
+Do not treat sequential PR completion as merge approval.
21+
+```
122
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
2-
index 3408c96f2..ce04c904b 100644
23+
index ce04c904b..0b63c376f 100644
324
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
425
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
5-
@@ -37,3 +37,54 @@ Status: Available
6-
Active assignment: none.
7-
8-
Active branch: none.
9-
+
10-
+## Team Name Registry
11-
+
12-
+- Team Alfa
13-
+- Team Bravo
14-
+- Team Charlie
15-
+- Team Delta
16-
+- Team Echo
17-
+- Team Foxtrot
18-
+- Team Golf
19-
+- Team Hotel
20-
+- Team India
21-
+- Team Juliett
22-
+- Team Kilo
23-
+- Team Lima
24-
+- Team Mike
25-
+- Team November
26-
+- Team Oscar
27-
+- Team Papa
28-
+- Team Quebec
29-
+- Team Romeo
30-
+- Team Sierra
31-
+- Team Tango
32-
+- Team Uniform
33-
+- Team Victor
34-
+- Team Whiskey
35-
+- Team X-ray
36-
+- Team Yankee
37-
+- Team Zulu
38-
+- Team OWNER
26+
@@ -88,3 +88,56 @@ Rules:
27+
- stop and request owner approval for the dependency model.
28+
- Codex should reduce chit-chat by planning the full sequence before starting.
29+
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
3930
+
40-
+## Preferred Codex Execution Method
31+
+### All-Team Codex Execution Clarification
4132
+
4233
+Preferred execution model:
4334
+Single Codex session with multiple sequential PRs.
4435
+
36+
+Applies to:
37+
+- Team Alfa through Team Zulu
38+
+- Team OWNER
39+
+
4540
+Purpose:
4641
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
4742
+
4843
+Rules:
4944
+- One Codex session may execute multiple sequential PRs.
5045
+- Each PR must still have one clear purpose.
51-
+- Each PR must create its own branch.
52-
+- Each PR must be committed, pushed, and opened as a draft PR.
46+
+- Each PR must create or use its own approved branch.
47+
+- Each PR may be committed and pushed during active work.
48+
+- Each PR may be opened as a draft PR during active work.
5349
+- Do not commit directly to main.
54-
+- Do not merge without explicit owner approval.
50+
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
5551
+- If later PRs depend on earlier unmerged PRs, Codex must either:
5652
+ - stack the dependent PRs, or
5753
+ - stop and request owner approval for the dependency model.
5854
+- Codex should reduce chit-chat by planning the full sequence before starting.
5955
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
56+
+
57+
+Conflict note:
58+
+- Older wording that says each PR must create its own branch remains preserved.
59+
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
60+
+- If a branch model is unclear, owner approval is required before continuing.
61+
+
62+
+## Day Work / EOD Merge Rule
63+
+
64+
+During active work:
65+
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
66+
+- Commits are allowed only on assigned non-main branches.
67+
+- Pushes are allowed and expected.
68+
+- Draft PRs are allowed and expected.
69+
+- Direct commits to main are prohibited.
70+
+- Merges to main are prohibited unless explicitly approved by the owner.
71+
+
72+
+At end of day:
73+
+- Owner reviews ready PRs.
74+
+- Owner explicitly approves which PRs merge.
75+
+- Only owner-approved PRs may merge to main.
76+
+- After merge, return to main and pull latest main.
77+
+- Do not treat sequential PR completion as merge approval.
78+
+
79+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
80+
+
81+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
82+
+"Merge this PR now."

0 commit comments

Comments
 (0)