Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions docs_build/dev/PROJECT_INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2064,6 +2064,110 @@ Rules:
- If merge succeeds but repository is not returned to main:
closeout status = FAIL.

## WORKSTREAM HYGIENE GOVERNANCE

At workstream closeout, Codex must review repository collaboration state before reporting the workstream closed.

Required review targets:
- open PRs
- draft PRs
- local branches
- remote branches

Each reviewed item must be classified as one of:
- Active
- Merged
- Superseded
- Abandoned
- Historical/Archive

Rules:
- Merged branches should be deleted after successful merge and main sync.
- Superseded draft PRs should be closed.
- Abandoned branches should be documented before removal.
- Active workstream branches remain.
- No branch deletion is performed by this governance rule unless a later owner-approved cleanup task explicitly scopes deletion.

## PI CLOSEOUT GOVERNANCE

At PI completion, Codex must verify that the repository, GitHub workstream, and deferred-work record are ready for the next PI.

Required PI completion checks:
- all approved work merged
- repository returned to main
- main pulled clean
- local/origin sync = 0 0
- open PR review complete
- branch review complete
- active workstream review complete
- deferred work list recorded
- next PI queue recommendation recorded

Required PI closeout report fields:
- final main commit
- active PRs
- active branches
- closed/superseded PRs
- deleted branch candidates
- deferred work
- next PI priorities

Rules:
- EOD Workstream Closeout remains authoritative for final repository state.
- PI closeout must not imply approval to merge, close PRs, delete branches, or remove deferred work without explicit owner approval.
- If the repository is not on clean, synchronized main, PI closeout status = FAIL.

## GITHUB HYGIENE AUDIT GOVERNANCE

GitHub hygiene cleanup must begin with an audit-only pass.

Audit targets:
- open PRs
- draft PRs
- merged PR branches
- stale remote branches
- stale local branches

Recommendation-only first pass values:
- keep
- close
- delete local
- delete remote
- defer

Rules:
- Do not delete branches during the audit-only pass.
- Do not close PRs during the audit-only pass.
- Do not delete local branches without explicit owner approval.
- Do not delete remote branches without explicit owner approval.
- Do not close open or draft PRs without explicit owner approval.
- Cleanup actions must preserve EOD Workstream Closeout final-state requirements.

Command expectations for cleanup audits:
- report current branch
- report worktree status
- report local/origin sync
- list open PRs
- list draft PRs
- list local branches
- list remote branches
- identify merged branch candidates
- identify stale branch candidates

Required cleanup audit report fields:
- audit date
- repository
- final main commit, if on main
- current branch
- local/origin sync
- open PR recommendations
- draft PR recommendations
- merged PR branch recommendations
- stale remote branch recommendations
- stale local branch recommendations
- deferred cleanup items
- owner approvals required before action

## OWNER-CONTROLLED STABLE AND MERGE APPROVAL

Stable promotion and merge approval are owner-controlled.
Expand Down
104 changes: 104 additions & 0 deletions docs_build/dev/ProjectInstructions/addendums/multi_team.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,110 @@ Rules:
- If merge succeeds but repository is not returned to main:
closeout status = FAIL.

## Workstream Hygiene Governance

At workstream closeout, Codex must review repository collaboration state before reporting the workstream closed.

Required review targets:
- open PRs
- draft PRs
- local branches
- remote branches

Each reviewed item must be classified as one of:
- Active
- Merged
- Superseded
- Abandoned
- Historical/Archive

Rules:
- Merged branches should be deleted after successful merge and main sync.
- Superseded draft PRs should be closed.
- Abandoned branches should be documented before removal.
- Active workstream branches remain.
- No branch deletion is performed by this governance rule unless a later owner-approved cleanup task explicitly scopes deletion.

## PI Closeout Governance

At PI completion, Codex must verify that the repository, GitHub workstream, and deferred-work record are ready for the next PI.

Required PI completion checks:
- all approved work merged
- repository returned to main
- main pulled clean
- local/origin sync = 0 0
- open PR review complete
- branch review complete
- active workstream review complete
- deferred work list recorded
- next PI queue recommendation recorded

Required PI closeout report fields:
- final main commit
- active PRs
- active branches
- closed/superseded PRs
- deleted branch candidates
- deferred work
- next PI priorities

Rules:
- EOD Workstream Closeout remains authoritative for final repository state.
- PI closeout must not imply approval to merge, close PRs, delete branches, or remove deferred work without explicit owner approval.
- If the repository is not on clean, synchronized main, PI closeout status = FAIL.

## GitHub Hygiene Audit Governance

GitHub hygiene cleanup must begin with an audit-only pass.

Audit targets:
- open PRs
- draft PRs
- merged PR branches
- stale remote branches
- stale local branches

Recommendation-only first pass values:
- keep
- close
- delete local
- delete remote
- defer

Rules:
- Do not delete branches during the audit-only pass.
- Do not close PRs during the audit-only pass.
- Do not delete local branches without explicit owner approval.
- Do not delete remote branches without explicit owner approval.
- Do not close open or draft PRs without explicit owner approval.
- Cleanup actions must preserve EOD Workstream Closeout final-state requirements.

Command expectations for cleanup audits:
- report current branch
- report worktree status
- report local/origin sync
- list open PRs
- list draft PRs
- list local branches
- list remote branches
- identify merged branch candidates
- identify stale branch candidates

Required cleanup audit report fields:
- audit date
- repository
- final main commit, if on main
- current branch
- local/origin sync
- open PR recommendations
- draft PR recommendations
- merged PR branch recommendations
- stale remote branch recommendations
- stale local branch recommendations
- deferred cleanup items
- owner approvals required before action

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Manual Validation Notes

PR: $pr

## Checks Performed

- Confirmed Workstream Hygiene governance was added to legacy and active ProjectInstructions governance.
- Confirmed closeout review targets include open PRs, draft PRs, local branches, and remote branches.
- Confirmed each reviewed item must be classified as Active, Merged, Superseded, Abandoned, or Historical/Archive.
- Confirmed merged branches are recommendation-only deletion candidates after successful merge and main sync.
- Confirmed this PR does not delete branches or close PRs.
- Confirmed EOD closeout remains present and authoritative.

## Manual Result

PASS

## Skipped Validation

- Playwright was not run because no UI or runtime behavior changed.
- Samples were not run because no samples or sample-impacting runtime changed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# PR_26172_OWNER_030-workstream-hygiene-governance

## Scope

Add Workstream Hygiene governance for closeout review of PR and branch state.

## Team Ownership

- TEAM token: OWNER
- Ownership classification: governance / workflow governance
- TEAM ownership result: PASS

## Files Changed

- docs_build/dev/PROJECT_INSTRUCTIONS.md
- docs_build/dev/ProjectInstructions/addendums/multi_team.md
- docs_build/dev/reports/codex_changed_files.txt
- docs_build/dev/reports/codex_review.diff
- docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance.md
- docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance-manual-validation-notes.md
- docs_build/dev/reports/PR_26172_OWNER_030-workstream-hygiene-governance-instruction-compliance-checklist.md

## Change Summary

- Added Workstream Hygiene governance to require review of open PRs, draft PRs, local branches, and remote branches at closeout.
- Added classifications: Active, Merged, Superseded, Abandoned, Historical/Archive.
- Documented recommendation-only outcomes for merged, superseded, abandoned, and active branches.
- Explicitly prohibited branch deletion in this PR.

## Validation

- git diff --check: PASS
- Verified Workstream Hygiene governance exists: PASS
- Verified EOD closeout remains authoritative: PASS
- Verified no conflicting governance wording: PASS

## Skipped Lanes

- Playwright: skipped because this is docs/governance-only.
- Samples: skipped because no runtime, sample, or UI files changed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Instruction Compliance Checklist

PR: $pr

- [x] Read docs_build/dev/PROJECT_INSTRUCTIONS.md.
- [x] Read docs_build/dev/PROJECT_MULTI_PC.txt.
- [x] Verified current branch was the approved OWNER workstream branch.
- [x] Verified repository was clean/synced after PR 030 push before PR 031 edits.
- [x] Verified PR TEAM token is OWNER.
- [x] Verified OWNER governance scope matches TEAM ownership.
- [x] Updated only scoped governance documentation and required reports.
- [x] Ran git diff --check.
- [x] Verified no conflicting governance wording.
- [x] Verified EOD closeout remains authoritative.
- [x] Documented skipped Playwright and samples lanes.
- [x] Created required Codex reports.
- [x] Created repo-structured delta ZIP under mp/.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Manual Validation Notes

PR: $pr

## Checks Performed

- Confirmed PI Closeout governance was added to legacy and active ProjectInstructions governance.
- 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.
- 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.
- Confirmed EOD Workstream Closeout remains authoritative for final repository state.
- Confirmed the governance does not approve merging, PR closure, branch deletion, or deferred-work removal without owner approval.

## Manual Result

PASS

## Skipped Validation

- Playwright was not run because no UI or runtime behavior changed.
- Samples were not run because no samples or sample-impacting runtime changed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# PR_26172_OWNER_031-pi-closeout-governance

## Scope

Add PI Closeout governance for final PI repository and GitHub hygiene review.

## Team Ownership

- TEAM token: OWNER
- Ownership classification: governance / workflow governance
- TEAM ownership result: PASS

## Files Changed

- docs_build/dev/PROJECT_INSTRUCTIONS.md
- docs_build/dev/ProjectInstructions/addendums/multi_team.md
- docs_build/dev/reports/codex_changed_files.txt
- docs_build/dev/reports/codex_review.diff
- docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance.md
- docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance-manual-validation-notes.md
- docs_build/dev/reports/PR_26172_OWNER_031-pi-closeout-governance-instruction-compliance-checklist.md

## Change Summary

- 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.
- Added required PI closeout report fields.
- Preserved EOD Workstream Closeout as authoritative for final repository state.
- Prohibited PI closeout from implying approval to merge, close PRs, delete branches, or remove deferred work without explicit owner approval.

## Validation

- git diff --check: PASS
- Verified PI Closeout governance exists: PASS
- Verified required PI closeout report fields exist: PASS
- Verified no conflicting governance wording: PASS
- Verified EOD closeout remains authoritative: PASS

## Skipped Lanes

- Playwright: skipped because this is docs/governance-only.
- Samples: skipped because no runtime, sample, or UI files changed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Instruction Compliance Checklist

PR: $pr

- [x] Read docs_build/dev/PROJECT_INSTRUCTIONS.md.
- [x] Read docs_build/dev/PROJECT_MULTI_PC.txt.
- [x] Verified current branch was the approved OWNER workstream branch.
- [x] Verified repository was clean/synced after PR 031 push before PR 032 edits.
- [x] Verified PR TEAM token is OWNER.
- [x] Verified OWNER governance scope matches TEAM ownership.
- [x] Updated only scoped governance documentation and required reports.
- [x] Ran git diff --check.
- [x] Verified no conflicting governance wording.
- [x] Verified EOD closeout remains authoritative.
- [x] Verified no branch deletion or PR closing was performed.
- [x] Documented skipped Playwright and samples lanes.
- [x] Created required Codex reports.
- [x] Created repo-structured delta ZIP under mp/.
Loading
Loading