Skip to content

Commit 71e0836

Browse files
ToolboxAidToolboxAid
committed
PR_26172_OWNER_022 branch persistence governance
1 parent 3362521 commit 71e0836

8 files changed

Lines changed: 310 additions & 858 deletions

‎docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,51 @@ Existing Project Instructions remain preserved in their current locations. This
3333

3434
No PR in this operating system is merged without explicit owner approval.
3535

36+
## Branch Persistence Rule
37+
38+
After a branch is created, the team remains on that active branch.
39+
40+
This applies to:
41+
- Team Alfa through Team Zulu
42+
- Team OWNER
43+
44+
Do not automatically return to main after:
45+
- commit
46+
- push
47+
- draft PR creation
48+
- testing
49+
- bug fixes
50+
- additional commits
51+
52+
Only return to main when:
53+
- the PR is merged
54+
- the branch is retired
55+
- the owner explicitly says: "Return to main"
56+
57+
Purpose:
58+
Allow continued testing, validation, bug fixes, and owner review on the active branch before EOD merge approval.
59+
60+
## Branch Context Rule
61+
62+
The active branch is the working context.
63+
64+
At the beginning of every work session, Codex must report:
65+
- current branch
66+
- expected branch
67+
- active team
68+
- active assignment
69+
70+
If not on the assigned team/OWNER branch:
71+
72+
STOP.
73+
74+
Report:
75+
- expected branch
76+
- current branch
77+
- required action
78+
79+
Do not continue until the branch context is corrected or owner override is provided.
80+
3681
## OWNER Governance
3782

3883
OWNER override wording:

‎docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,47 @@ Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
7878
7979
Do not treat sequential PR completion as merge approval.
8080
```
81+
82+
## Branch Persistence And Context Reminder
83+
84+
Ready-to-copy reminder:
85+
86+
```text
87+
After a branch is created, the team remains on that active branch.
88+
89+
This applies to:
90+
- Team Alfa through Team Zulu
91+
- Team OWNER
92+
93+
Do not automatically return to main after:
94+
- commit
95+
- push
96+
- draft PR creation
97+
- testing
98+
- bug fixes
99+
- additional commits
100+
101+
Only return to main when:
102+
- the PR is merged
103+
- the branch is retired
104+
- the owner explicitly says: "Return to main"
105+
106+
The active branch is the working context.
107+
108+
At the beginning of every work session, Codex must report:
109+
- current branch
110+
- expected branch
111+
- active team
112+
- active assignment
113+
114+
If not on the assigned team/OWNER branch:
115+
116+
STOP.
117+
118+
Report:
119+
- expected branch
120+
- current branch
121+
- required action
122+
123+
Do not continue until the branch context is corrected or owner override is provided.
124+
```

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,51 @@ Rules:
2626
- Codex should reduce chit-chat by planning the full sequence before starting.
2727
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
2828

29+
## Branch Persistence Rule
30+
31+
After a branch is created, the team remains on that active branch.
32+
33+
This applies to:
34+
- Team Alfa through Team Zulu
35+
- Team OWNER
36+
37+
Do not automatically return to main after:
38+
- commit
39+
- push
40+
- draft PR creation
41+
- testing
42+
- bug fixes
43+
- additional commits
44+
45+
Only return to main when:
46+
- the PR is merged
47+
- the branch is retired
48+
- the owner explicitly says: "Return to main"
49+
50+
Purpose:
51+
Allow continued testing, validation, bug fixes, and owner review on the active branch before EOD merge approval.
52+
53+
## Branch Context Rule
54+
55+
The active branch is the working context.
56+
57+
At the beginning of every work session, Codex must report:
58+
- current branch
59+
- expected branch
60+
- active team
61+
- active assignment
62+
63+
If not on the assigned team/OWNER branch:
64+
65+
STOP.
66+
67+
Report:
68+
- expected branch
69+
- current branch
70+
- required action
71+
72+
Do not continue until the branch context is corrected or owner override is provided.
73+
2974
## Day Work / EOD Merge Rule
3075

3176
During active work:

‎docs_build/dev/reports/PR_26172_OWNER_022-branch-persistence-governance-instruction-compliance-checklist.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# PR_26172_OWNER_022 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] Read `docs_build/dev/ProjectInstructions/README.txt`.
6+
- [x] OWNER override documented by user.
7+
- [x] Started from latest `main`.
8+
- [x] Created branch `pr/26172-OWNER-022-branch-persistence-governance`.
9+
- [x] Added Branch Persistence Rule to requested files.
10+
- [x] Added Branch Context Rule to requested files.
11+
- [x] Did not delete ProjectInstructions content.
12+
- [x] Did not commit directly to `main`.
13+
- [x] Did not merge any PR.
14+
- [x] Ran docs/static validation.
15+
- [x] Created repo-structured delta ZIP.
16+
- [x] Stayed on the OWNER branch after push and draft PR creation.

‎docs_build/dev/reports/PR_26172_OWNER_022-branch-persistence-governance-manual-validation-notes.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# PR_26172_OWNER_022 Manual Validation Notes
2+
3+
- Verified branch persistence applies to Team Alfa through Team Zulu and Team OWNER.
4+
- Verified automatic return to main is prohibited after commit, push, draft PR creation, testing, bug fixes, and additional commits.
5+
- Verified return to main is allowed only when the PR is merged, the branch is retired, or the owner says `"Return to main"`.
6+
- Verified Branch Context Rule requires current branch, expected branch, active team, and active assignment reporting.
7+
- Verified branch mismatch requires STOP and required action reporting.
8+
- Verified no runtime, UI, Playwright, or sample files changed.

‎docs_build/dev/reports/PR_26172_OWNER_022-branch-persistence-governance.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# PR_26172_OWNER_022-branch-persistence-governance
2+
3+
## Scope
4+
5+
Add branch persistence and branch context governance for all teams, including OWNER.
6+
7+
## Files Changed
8+
9+
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
10+
- `docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md`
11+
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`
12+
13+
## Changes
14+
15+
- Added Branch Persistence Rule to the ProjectInstructions root.
16+
- Added Branch Persistence Rule to the multi-team addendum.
17+
- Added branch persistence/context reminder to team start commands.
18+
- Added Branch Context Rule requiring Codex to report current branch, expected branch, active team, and active assignment at the beginning of every work session.
19+
- Added stop behavior when the current branch does not match the assigned team/OWNER branch.
20+
21+
## Validation
22+
23+
- `git diff --check`
24+
- `git diff --cached --check`
25+
- Text review for Branch Persistence Rule and Branch Context Rule
26+
27+
## Skipped Lanes
28+
29+
- Playwright skipped: documentation-only governance.
30+
- Samples skipped: documentation-only governance.
31+
32+
## Package
33+
34+
- `tmp/PR_26172_OWNER_022-branch-persistence-governance_delta.zip`

‎docs_build/dev/reports/codex_changed_files.txt‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
2-
docs_build/dev/ProjectInstructions/README.txt
32
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
4-
docs_build/dev/ProjectInstructions/addendums/build_path_sync.md
5-
docs_build/dev/ProjectInstructions/addendums/deprecation.md
63
docs_build/dev/ProjectInstructions/addendums/multi_team.md
7-
docs_build/dev/ProjectInstructions/addendums/preservation.md
8-
docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md
9-
docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md
10-
docs_build/dev/ProjectInstructions/archive/README.md
11-
docs_build/dev/ProjectInstructions/archive/history/.gitkeep
12-
docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md
13-
docs_build/dev/ProjectInstructions/deprecation/README.md
14-
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
15-
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-instruction-compliance-checklist.md
16-
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-manual-validation-notes.md
17-
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-tree.txt
18-
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install.md
4+
docs_build/dev/reports/PR_26172_OWNER_022-branch-persistence-governance-instruction-compliance-checklist.md
5+
docs_build/dev/reports/PR_26172_OWNER_022-branch-persistence-governance-manual-validation-notes.md
6+
docs_build/dev/reports/PR_26172_OWNER_022-branch-persistence-governance.md
197
docs_build/dev/reports/codex_changed_files.txt
208
docs_build/dev/reports/codex_review.diff

0 commit comments

Comments
 (0)