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
41 changes: 40 additions & 1 deletion docs_build/dev/PROJECT_INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2002,7 +2002,11 @@ Required workflow:
13. Merge PR.
14. Return to main.
15. Pull latest main.
16. Continue to next approved PR.
16. Verify clean worktree.
17. Verify local/origin sync.
18. Record final main commit.
19. Report final repository state.
20. Continue to next approved PR.

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

## EOD WORKSTREAM CLOSEOUT

At completion of a merged PR or approved workstream:

Required steps:

1. Merge approved PR.
2. Checkout main.
3. Pull latest main.
4. Verify:
- current branch = main
- worktree clean
- local/origin sync = 0 0
5. Record final main commit.
6. Report final repository state.

Required final state:

Branch:
main

Worktree:
clean

Local/origin:
0 0

Rules:

- A workstream is not considered closed until the repository is returned to main.
- A PI is not considered complete until main is current and synchronized.
- Do not leave Codex on a feature, team, workstream, recovery, governance, or owner branch after successful merge.
- If merge succeeds but repository is not returned to main:
closeout status = FAIL.

## OWNER-CONTROLLED STABLE AND MERGE APPROVAL

Stable promotion and merge approval are owner-controlled.
Expand Down
35 changes: 35 additions & 0 deletions docs_build/dev/ProjectInstructions/addendums/multi_team.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,41 @@ Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## EOD Workstream Closeout

At completion of a merged PR or approved workstream:

Required steps:

1. Merge approved PR.
2. Checkout main.
3. Pull latest main.
4. Verify:
- current branch = main
- worktree clean
- local/origin sync = 0 0
5. Record final main commit.
6. Report final repository state.

Required final state:

Branch:
main

Worktree:
clean

Local/origin:
0 0

Rules:

- A workstream is not considered closed until the repository is returned to main.
- A PI is not considered complete until main is current and synchronized.
- Do not leave Codex on a feature, team, workstream, recovery, governance, or owner branch after successful merge.
- If merge succeeds but repository is not returned to main:
closeout status = FAIL.

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Instruction Compliance Checklist

PR: `PR_26172_OWNER_028-eod-mainline-closeout-governance`

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] Verified current branch was `main` before creating the PR branch.
- [x] Verified repository was clean before creating the PR branch.
- [x] Verified local/origin sync was `0 0` before creating the PR branch.
- [x] Verified PR TEAM token is `OWNER`.
- [x] Verified OWNER governance scope matches TEAM ownership.
- [x] Created branch `pr/26172-OWNER-028-eod-mainline-closeout-governance`.
- [x] Updated only scoped governance documentation and required reports.
- [x] Ran `git diff --check`.
- [x] Verified EOD closeout section exists.
- [x] Verified Git workflow section updated.
- [x] Verified no conflicting closeout governance section remains.
- [x] Documented skipped Playwright and samples lanes.
- [x] Created required Codex reports.
- [x] Created repo-structured delta ZIP under `tmp/`.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Manual Validation Notes

PR: `PR_26172_OWNER_028-eod-mainline-closeout-governance`

## Checks Performed

- Confirmed the EOD closeout rule was added to `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- Confirmed the existing Git workflow list now includes clean worktree verification, local/origin sync verification, final main commit recording, and final repository state reporting.
- Confirmed the active ProjectInstructions multi-team addendum includes matching EOD closeout governance.
- Confirmed existing return-to-main wording is not conflicting; it is strengthened by the new required final-state checks.

## 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,39 @@
# PR_26172_OWNER_028-eod-mainline-closeout-governance

## Scope

Add governance requiring final repository normalization after a merged PR or approved workstream.

## 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_028-eod-mainline-closeout-governance.md`
- `docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-manual-validation-notes.md`
- `docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-instruction-compliance-checklist.md`

## Change Summary

- Added `## EOD WORKSTREAM CLOSEOUT` to the legacy Project Instructions workflow.
- 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.
- Added matching EOD Workstream Closeout governance to the active ProjectInstructions multi-team addendum.

## Validation

- `git diff --check`: PASS
- Verified EOD closeout section exists: PASS
- Verified Git workflow section updated: PASS
- Verified no conflicting closeout governance section: PASS

## Skipped Lanes

- Playwright: skipped because this is docs/governance-only.
- Samples: skipped because no runtime, sample, or UI files changed.
21 changes: 4 additions & 17 deletions docs_build/dev/reports/codex_changed_files.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
docs_build/dev/ProjectInstructions/README.txt
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/build_path_sync.md
docs_build/dev/ProjectInstructions/addendums/deprecation.md
docs_build/dev/PROJECT_INSTRUCTIONS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/addendums/preservation.md
docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md
docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md
docs_build/dev/ProjectInstructions/archive/README.md
docs_build/dev/ProjectInstructions/archive/history/.gitkeep
docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md
docs_build/dev/ProjectInstructions/deprecation/README.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-tree.txt
docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install.md
docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance.md
docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_028-eod-mainline-closeout-governance-instruction-compliance-checklist.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff
Loading
Loading