Skip to content

Commit f56f708

Browse files
ToolboxAidToolboxAid
authored
Merge PR_26172_OWNER_030-workstream-and-pi-hygiene-governance
OWNER governance hygiene workstream: PR 030, 031, and 032
2 parents 60ac651 + 92000cc commit f56f708

13 files changed

Lines changed: 1235 additions & 144 deletions

‎docs_build/dev/PROJECT_INSTRUCTIONS.md‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,6 +2064,110 @@ Rules:
20642064
- If merge succeeds but repository is not returned to main:
20652065
closeout status = FAIL.
20662066

2067+
## WORKSTREAM HYGIENE GOVERNANCE
2068+
2069+
At workstream closeout, Codex must review repository collaboration state before reporting the workstream closed.
2070+
2071+
Required review targets:
2072+
- open PRs
2073+
- draft PRs
2074+
- local branches
2075+
- remote branches
2076+
2077+
Each reviewed item must be classified as one of:
2078+
- Active
2079+
- Merged
2080+
- Superseded
2081+
- Abandoned
2082+
- Historical/Archive
2083+
2084+
Rules:
2085+
- Merged branches should be deleted after successful merge and main sync.
2086+
- Superseded draft PRs should be closed.
2087+
- Abandoned branches should be documented before removal.
2088+
- Active workstream branches remain.
2089+
- No branch deletion is performed by this governance rule unless a later owner-approved cleanup task explicitly scopes deletion.
2090+
2091+
## PI CLOSEOUT GOVERNANCE
2092+
2093+
At PI completion, Codex must verify that the repository, GitHub workstream, and deferred-work record are ready for the next PI.
2094+
2095+
Required PI completion checks:
2096+
- all approved work merged
2097+
- repository returned to main
2098+
- main pulled clean
2099+
- local/origin sync = 0 0
2100+
- open PR review complete
2101+
- branch review complete
2102+
- active workstream review complete
2103+
- deferred work list recorded
2104+
- next PI queue recommendation recorded
2105+
2106+
Required PI closeout report fields:
2107+
- final main commit
2108+
- active PRs
2109+
- active branches
2110+
- closed/superseded PRs
2111+
- deleted branch candidates
2112+
- deferred work
2113+
- next PI priorities
2114+
2115+
Rules:
2116+
- EOD Workstream Closeout remains authoritative for final repository state.
2117+
- PI closeout must not imply approval to merge, close PRs, delete branches, or remove deferred work without explicit owner approval.
2118+
- If the repository is not on clean, synchronized main, PI closeout status = FAIL.
2119+
2120+
## GITHUB HYGIENE AUDIT GOVERNANCE
2121+
2122+
GitHub hygiene cleanup must begin with an audit-only pass.
2123+
2124+
Audit targets:
2125+
- open PRs
2126+
- draft PRs
2127+
- merged PR branches
2128+
- stale remote branches
2129+
- stale local branches
2130+
2131+
Recommendation-only first pass values:
2132+
- keep
2133+
- close
2134+
- delete local
2135+
- delete remote
2136+
- defer
2137+
2138+
Rules:
2139+
- Do not delete branches during the audit-only pass.
2140+
- Do not close PRs during the audit-only pass.
2141+
- Do not delete local branches without explicit owner approval.
2142+
- Do not delete remote branches without explicit owner approval.
2143+
- Do not close open or draft PRs without explicit owner approval.
2144+
- Cleanup actions must preserve EOD Workstream Closeout final-state requirements.
2145+
2146+
Command expectations for cleanup audits:
2147+
- report current branch
2148+
- report worktree status
2149+
- report local/origin sync
2150+
- list open PRs
2151+
- list draft PRs
2152+
- list local branches
2153+
- list remote branches
2154+
- identify merged branch candidates
2155+
- identify stale branch candidates
2156+
2157+
Required cleanup audit report fields:
2158+
- audit date
2159+
- repository
2160+
- final main commit, if on main
2161+
- current branch
2162+
- local/origin sync
2163+
- open PR recommendations
2164+
- draft PR recommendations
2165+
- merged PR branch recommendations
2166+
- stale remote branch recommendations
2167+
- stale local branch recommendations
2168+
- deferred cleanup items
2169+
- owner approvals required before action
2170+
20672171
## OWNER-CONTROLLED STABLE AND MERGE APPROVAL
20682172

20692173
Stable promotion and merge approval are owner-controlled.

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

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,110 @@ Rules:
8383
- If merge succeeds but repository is not returned to main:
8484
closeout status = FAIL.
8585

86+
## Workstream Hygiene Governance
87+
88+
At workstream closeout, Codex must review repository collaboration state before reporting the workstream closed.
89+
90+
Required review targets:
91+
- open PRs
92+
- draft PRs
93+
- local branches
94+
- remote branches
95+
96+
Each reviewed item must be classified as one of:
97+
- Active
98+
- Merged
99+
- Superseded
100+
- Abandoned
101+
- Historical/Archive
102+
103+
Rules:
104+
- Merged branches should be deleted after successful merge and main sync.
105+
- Superseded draft PRs should be closed.
106+
- Abandoned branches should be documented before removal.
107+
- Active workstream branches remain.
108+
- No branch deletion is performed by this governance rule unless a later owner-approved cleanup task explicitly scopes deletion.
109+
110+
## PI Closeout Governance
111+
112+
At PI completion, Codex must verify that the repository, GitHub workstream, and deferred-work record are ready for the next PI.
113+
114+
Required PI completion checks:
115+
- all approved work merged
116+
- repository returned to main
117+
- main pulled clean
118+
- local/origin sync = 0 0
119+
- open PR review complete
120+
- branch review complete
121+
- active workstream review complete
122+
- deferred work list recorded
123+
- next PI queue recommendation recorded
124+
125+
Required PI closeout report fields:
126+
- final main commit
127+
- active PRs
128+
- active branches
129+
- closed/superseded PRs
130+
- deleted branch candidates
131+
- deferred work
132+
- next PI priorities
133+
134+
Rules:
135+
- EOD Workstream Closeout remains authoritative for final repository state.
136+
- PI closeout must not imply approval to merge, close PRs, delete branches, or remove deferred work without explicit owner approval.
137+
- If the repository is not on clean, synchronized main, PI closeout status = FAIL.
138+
139+
## GitHub Hygiene Audit Governance
140+
141+
GitHub hygiene cleanup must begin with an audit-only pass.
142+
143+
Audit targets:
144+
- open PRs
145+
- draft PRs
146+
- merged PR branches
147+
- stale remote branches
148+
- stale local branches
149+
150+
Recommendation-only first pass values:
151+
- keep
152+
- close
153+
- delete local
154+
- delete remote
155+
- defer
156+
157+
Rules:
158+
- Do not delete branches during the audit-only pass.
159+
- Do not close PRs during the audit-only pass.
160+
- Do not delete local branches without explicit owner approval.
161+
- Do not delete remote branches without explicit owner approval.
162+
- Do not close open or draft PRs without explicit owner approval.
163+
- Cleanup actions must preserve EOD Workstream Closeout final-state requirements.
164+
165+
Command expectations for cleanup audits:
166+
- report current branch
167+
- report worktree status
168+
- report local/origin sync
169+
- list open PRs
170+
- list draft PRs
171+
- list local branches
172+
- list remote branches
173+
- identify merged branch candidates
174+
- identify stale branch candidates
175+
176+
Required cleanup audit report fields:
177+
- audit date
178+
- repository
179+
- final main commit, if on main
180+
- current branch
181+
- local/origin sync
182+
- open PR recommendations
183+
- draft PR recommendations
184+
- merged PR branch recommendations
185+
- stale remote branch recommendations
186+
- stale local branch recommendations
187+
- deferred cleanup items
188+
- owner approvals required before action
189+
86190
## Conflict Note
87191

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

‎docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance-instruction-compliance-checklist.md‎

906 Bytes
Binary file not shown.

‎docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance-manual-validation-notes.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Manual Validation Notes
2+
3+
PR: $pr
4+
5+
## Checks Performed
6+
7+
- Confirmed Workstream Hygiene governance was added to legacy and active ProjectInstructions governance.
8+
- Confirmed closeout review targets include open PRs, draft PRs, local branches, and remote branches.
9+
- Confirmed each reviewed item must be classified as Active, Merged, Superseded, Abandoned, or Historical/Archive.
10+
- Confirmed merged branches are recommendation-only deletion candidates after successful merge and main sync.
11+
- Confirmed this PR does not delete branches or close PRs.
12+
- Confirmed EOD closeout remains present and authoritative.
13+
14+
## Manual Result
15+
16+
PASS
17+
18+
## Skipped Validation
19+
20+
- Playwright was not run because no UI or runtime behavior changed.
21+
- Samples were not run because no samples or sample-impacting runtime changed.

‎docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# PR_26172_OWNER_030-workstream-hygiene-governance
2+
3+
## Scope
4+
5+
Add Workstream Hygiene governance for closeout review of PR and branch state.
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_030-workstream-hygiene-governance.md
20+
- docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance-manual-validation-notes.md
21+
- docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance-instruction-compliance-checklist.md
22+
23+
## Change Summary
24+
25+
- Added Workstream Hygiene governance to require review of open PRs, draft PRs, local branches, and remote branches at closeout.
26+
- Added classifications: Active, Merged, Superseded, Abandoned, Historical/Archive.
27+
- Documented recommendation-only outcomes for merged, superseded, abandoned, and active branches.
28+
- Explicitly prohibited branch deletion in this PR.
29+
30+
## Validation
31+
32+
- git diff --check: PASS
33+
- Verified Workstream Hygiene governance exists: PASS
34+
- Verified EOD closeout remains authoritative: PASS
35+
- Verified no conflicting governance wording: PASS
36+
37+
## Skipped Lanes
38+
39+
- Playwright: skipped because this is docs/governance-only.
40+
- Samples: skipped because no runtime, sample, or UI files changed.

‎docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance-instruction-compliance-checklist.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Instruction Compliance Checklist
2+
3+
PR: $pr
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 the approved OWNER workstream branch.
8+
- [x] Verified repository was clean/synced after PR 030 push before PR 031 edits.
9+
- [x] Verified PR TEAM token is OWNER.
10+
- [x] Verified OWNER governance scope matches TEAM ownership.
11+
- [x] Updated only scoped governance documentation and required reports.
12+
- [x] Ran git diff --check.
13+
- [x] Verified no conflicting governance wording.
14+
- [x] Verified EOD closeout remains authoritative.
15+
- [x] Documented skipped Playwright and samples lanes.
16+
- [x] Created required Codex reports.
17+
- [x] Created repo-structured delta ZIP under mp/.

‎docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance-manual-validation-notes.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Manual Validation Notes
2+
3+
PR: $pr
4+
5+
## Checks Performed
6+
7+
- Confirmed PI Closeout governance was added to legacy and active ProjectInstructions governance.
8+
- Confirmed PI completion checks include all approved work merged, repository returned to main, clean pull, local/origin sync, open PR review, branch review, active workstream review, deferred work, and next PI queue recommendation.
9+
- Confirmed required PI closeout report fields include final main commit, active PRs, active branches, closed/superseded PRs, deleted branch candidates, deferred work, and next PI priorities.
10+
- Confirmed EOD Workstream Closeout remains authoritative for final repository state.
11+
- Confirmed the governance does not approve merging, PR closure, branch deletion, or deferred-work removal without owner approval.
12+
13+
## Manual Result
14+
15+
PASS
16+
17+
## Skipped Validation
18+
19+
- Playwright was not run because no UI or runtime behavior changed.
20+
- Samples were not run because no samples or sample-impacting runtime changed.

‎docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# PR_26172_OWNER_031-pi-closeout-governance
2+
3+
## Scope
4+
5+
Add PI Closeout governance for final PI repository and GitHub hygiene review.
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_031-pi-closeout-governance.md
20+
- docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance-manual-validation-notes.md
21+
- docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance-instruction-compliance-checklist.md
22+
23+
## Change Summary
24+
25+
- Added PI Closeout governance to require approved-work merge status, clean synchronized main, open PR review, branch review, active workstream review, deferred work list, and next PI queue recommendations.
26+
- Added required PI closeout report fields.
27+
- Preserved EOD Workstream Closeout as authoritative for final repository state.
28+
- Prohibited PI closeout from implying approval to merge, close PRs, delete branches, or remove deferred work without explicit owner approval.
29+
30+
## Validation
31+
32+
- git diff --check: PASS
33+
- Verified PI Closeout governance exists: PASS
34+
- Verified required PI closeout report fields exist: PASS
35+
- Verified no conflicting governance wording: PASS
36+
- Verified EOD closeout remains authoritative: PASS
37+
38+
## Skipped Lanes
39+
40+
- Playwright: skipped because this is docs/governance-only.
41+
- Samples: skipped because no runtime, sample, or UI files changed.

‎docs_build/dev/reports/PR_26172_OWNER_032-github-hygiene-audit-template-instruction-compliance-checklist.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Instruction Compliance Checklist
2+
3+
PR: $pr
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 the approved OWNER workstream branch.
8+
- [x] Verified repository was clean/synced after PR 031 push before PR 032 edits.
9+
- [x] Verified PR TEAM token is OWNER.
10+
- [x] Verified OWNER governance scope matches TEAM ownership.
11+
- [x] Updated only scoped governance documentation and required reports.
12+
- [x] Ran git diff --check.
13+
- [x] Verified no conflicting governance wording.
14+
- [x] Verified EOD closeout remains authoritative.
15+
- [x] Verified no branch deletion or PR closing was performed.
16+
- [x] Documented skipped Playwright and samples lanes.
17+
- [x] Created required Codex reports.
18+
- [x] Created repo-structured delta ZIP under mp/.

0 commit comments

Comments
 (0)