Skip to content

Commit 60ac651

Browse files
ToolboxAidToolboxAid
authored
Merge PR_26172_OWNER_028-eod-mainline-closeout-governance
EOD mainline closeout governance
2 parents 4e15135 + ceb1864 commit 60ac651

7 files changed

Lines changed: 341 additions & 864 deletions

‎docs_build/dev/PROJECT_INSTRUCTIONS.md‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,11 @@ Required workflow:
20022002
13. Merge PR.
20032003
14. Return to main.
20042004
15. Pull latest main.
2005-
16. Continue to next approved PR.
2005+
16. Verify clean worktree.
2006+
17. Verify local/origin sync.
2007+
18. Record final main commit.
2008+
19. Report final repository state.
2009+
20. Continue to next approved PR.
20062010

20072011
Rules:
20082012
- Do not ask the user if a PR should be created.
@@ -2025,6 +2029,41 @@ Required Git workflow report fields:
20252029
- merge result
20262030
- final main commit
20272031

2032+
## EOD WORKSTREAM CLOSEOUT
2033+
2034+
At completion of a merged PR or approved workstream:
2035+
2036+
Required steps:
2037+
2038+
1. Merge approved PR.
2039+
2. Checkout main.
2040+
3. Pull latest main.
2041+
4. Verify:
2042+
- current branch = main
2043+
- worktree clean
2044+
- local/origin sync = 0 0
2045+
5. Record final main commit.
2046+
6. Report final repository state.
2047+
2048+
Required final state:
2049+
2050+
Branch:
2051+
main
2052+
2053+
Worktree:
2054+
clean
2055+
2056+
Local/origin:
2057+
0 0
2058+
2059+
Rules:
2060+
2061+
- A workstream is not considered closed until the repository is returned to main.
2062+
- A PI is not considered complete until main is current and synchronized.
2063+
- Do not leave Codex on a feature, team, workstream, recovery, governance, or owner branch after successful merge.
2064+
- If merge succeeds but repository is not returned to main:
2065+
closeout status = FAIL.
2066+
20282067
## OWNER-CONTROLLED STABLE AND MERGE APPROVAL
20292068

20302069
Stable promotion and merge approval are owner-controlled.

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,41 @@ Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
4848
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
4949
"Merge this PR now."
5050

51+
## EOD Workstream Closeout
52+
53+
At completion of a merged PR or approved workstream:
54+
55+
Required steps:
56+
57+
1. Merge approved PR.
58+
2. Checkout main.
59+
3. Pull latest main.
60+
4. Verify:
61+
- current branch = main
62+
- worktree clean
63+
- local/origin sync = 0 0
64+
5. Record final main commit.
65+
6. Report final repository state.
66+
67+
Required final state:
68+
69+
Branch:
70+
main
71+
72+
Worktree:
73+
clean
74+
75+
Local/origin:
76+
0 0
77+
78+
Rules:
79+
80+
- A workstream is not considered closed until the repository is returned to main.
81+
- A PI is not considered complete until main is current and synchronized.
82+
- Do not leave Codex on a feature, team, workstream, recovery, governance, or owner branch after successful merge.
83+
- If merge succeeds but repository is not returned to main:
84+
closeout status = FAIL.
85+
5186
## Conflict Note
5287

5388
Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

‎docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-instruction-compliance-checklist.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Instruction Compliance Checklist
2+
3+
PR: `PR_26172_OWNER_028-eod-mainline-closeout-governance`
4+
5+
- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
6+
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
7+
- [x] Verified current branch was `main` before creating the PR branch.
8+
- [x] Verified repository was clean before creating the PR branch.
9+
- [x] Verified local/origin sync was `0 0` before creating the PR branch.
10+
- [x] Verified PR TEAM token is `OWNER`.
11+
- [x] Verified OWNER governance scope matches TEAM ownership.
12+
- [x] Created branch `pr/26172-OWNER-028-eod-mainline-closeout-governance`.
13+
- [x] Updated only scoped governance documentation and required reports.
14+
- [x] Ran `git diff --check`.
15+
- [x] Verified EOD closeout section exists.
16+
- [x] Verified Git workflow section updated.
17+
- [x] Verified no conflicting closeout governance section remains.
18+
- [x] Documented skipped Playwright and samples lanes.
19+
- [x] Created required Codex reports.
20+
- [x] Created repo-structured delta ZIP under `tmp/`.

‎docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-manual-validation-notes.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Manual Validation Notes
2+
3+
PR: `PR_26172_OWNER_028-eod-mainline-closeout-governance`
4+
5+
## Checks Performed
6+
7+
- Confirmed the EOD closeout rule was added to `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
8+
- Confirmed the existing Git workflow list now includes clean worktree verification, local/origin sync verification, final main commit recording, and final repository state reporting.
9+
- Confirmed the active ProjectInstructions multi-team addendum includes matching EOD closeout governance.
10+
- Confirmed existing return-to-main wording is not conflicting; it is strengthened by the new required final-state checks.
11+
12+
## Manual Result
13+
14+
PASS
15+
16+
## Skipped Validation
17+
18+
- Playwright was not run because no UI or runtime behavior changed.
19+
- Samples were not run because no samples or sample-impacting runtime changed.

‎docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# PR_26172_OWNER_028-eod-mainline-closeout-governance
2+
3+
## Scope
4+
5+
Add governance requiring final repository normalization after a merged PR or approved workstream.
6+
7+
## Team Ownership
8+
9+
- TEAM token: OWNER
10+
- Ownership classification: governance / workflow governance
11+
- TEAM ownership result: PASS
12+
13+
## Files Changed
14+
15+
- `docs_build/dev/PROJECT_INSTRUCTIONS.md`
16+
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
17+
- `docs_build/dev/reports/codex_changed_files.txt`
18+
- `docs_build/dev/reports/codex_review.diff`
19+
- `docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance.md`
20+
- `docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-manual-validation-notes.md`
21+
- `docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-instruction-compliance-checklist.md`
22+
23+
## Change Summary
24+
25+
- Added `## EOD WORKSTREAM CLOSEOUT` to the legacy Project Instructions workflow.
26+
- Updated the `CODEX GIT WORKFLOW OWNERSHIP` required workflow to verify clean worktree, verify local/origin sync, record final main commit, and report final repository state before continuing.
27+
- Added matching EOD Workstream Closeout governance to the active ProjectInstructions multi-team addendum.
28+
29+
## Validation
30+
31+
- `git diff --check`: PASS
32+
- Verified EOD closeout section exists: PASS
33+
- Verified Git workflow section updated: PASS
34+
- Verified no conflicting closeout governance section: PASS
35+
36+
## Skipped Lanes
37+
38+
- Playwright: skipped because this is docs/governance-only.
39+
- Samples: skipped because no runtime, sample, or UI files changed.

‎docs_build/dev/reports/codex_changed_files.txt‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
1-
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
2-
docs_build/dev/ProjectInstructions/README.txt
3-
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
1+
docs_build/dev/PROJECT_INSTRUCTIONS.md
62
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
3+
docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance.md
4+
docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-manual-validation-notes.md
5+
docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-instruction-compliance-checklist.md
196
docs_build/dev/reports/codex_changed_files.txt
207
docs_build/dev/reports/codex_review.diff

0 commit comments

Comments
 (0)