Skip to content

Commit 5411ad7

Browse files
committed
OWNER 010 fix Start of Day baseline rules
1 parent f31bdb4 commit 5411ad7

9 files changed

Lines changed: 147 additions & 227 deletions

dev/build/ProjectInstructions/addendums/pr_workflow.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ This file owns PR lifecycle governance. It must not duplicate command phase rule
4141
Team-neutral daily workflow:
4242

4343
- SOD starts from the latest synchronized `main`.
44-
- SOD creates or updates one active team branch/workstream.
44+
- SOD reports the active team branch/workstream recommendation only.
45+
- Branch creation or branch updates happen after SOD through the appropriate PR execution phase.
4546
- Work must be committed only to the active team branch.
4647
- PR branches/commits stay on the active team branch/workstream during the day when OWNER assigned a stacked or sequential workstream.
4748
- Do not return to `main` between stacked/sequential PRs in the same active workstream.

dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ At EOD, ChatGPT/Codex must provide:
8888
This standard preserves the existing branch workflow:
8989

9090
- SOD starts from latest `main`.
91-
- SOD creates or uses the active team branch.
91+
- SOD reports the recommended active team branch/workstream only.
92+
- Branch creation or use happens after SOD through the appropriate PR execution phase.
9293
- All commits go to the active team branch, not `main`.
9394
- Sequential PRs stay on the active team branch/workstream during the day.
9495
- EOD merges OWNER-approved work, pushes, returns to `main`, and verifies clean worktree and local/origin sync `0 0`.

dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,24 @@ The bootstrap loads:
3333
- Current branch
3434
- Worktree status
3535

36-
The bootstrap must not create branches, commit files, move files, or run implementation work by itself.
36+
The bootstrap requires the current branch to be `main`, the worktree to be clean, and local `main` to be synced with `origin/main`.
37+
38+
Allowed bootstrap sync actions:
39+
40+
```text
41+
git fetch origin
42+
git pull --ff-only origin main
43+
```
44+
45+
If the current branch is not `main`, the bootstrap must HARD STOP and return:
46+
47+
```text
48+
git switch main
49+
git pull --ff-only origin main
50+
Start of Day {Team}
51+
```
52+
53+
The bootstrap must not create branches, switch branches, commit files, move files, or run implementation work by itself.
3754

3855
Start-of-Day bootstrap must satisfy the Codex Completion Contract in `dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md` with a review-only ZIP unless a hard stop occurs.
3956

dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,26 @@ Start of Day Golf
2525

2626
Commands using non-canonical team names are invalid because active team names are Owner, Alfa, Bravo, Charlie, Delta, and Golf.
2727

28-
Start of Day is read-only discovery only.
28+
Start of Day is read-only discovery plus baseline sync only.
2929

30-
Start of Day must not require the current branch to be `main`.
30+
Start of Day requires:
31+
- current branch is `main`
32+
- worktree is clean
33+
- `git fetch origin`
34+
- `git pull --ff-only origin main`
35+
- local `main` and `origin/main` are synced
36+
37+
Allowed Start of Day git sync actions:
38+
- `git fetch origin`
39+
- `git pull --ff-only origin main`
40+
41+
If the current branch is not `main`, Start of Day must HARD STOP and return these correction steps:
42+
43+
```text
44+
git switch main
45+
git pull --ff-only origin main
46+
Start of Day {Team}
47+
```
3148

3249
Start of Day must not:
3350
- create a branch
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
# PR_26179_OWNER_010-canonical-project-folder-instructions
22

3-
Updated: 2026-06-28T02:44:56Z
3+
Updated: 2026-06-28T02:50:06Z
44
Team: OWNER
55
Branch: PR_26179_OWNER_010-canonical-project-folder-instructions
66
Scope: Documentation/governance only. No runtime code or production pages changed.
77

88
## Summary
9-
- Added the Codex Completion Contract to the artifact/reporting standard.
10-
- Defined canonical ZIP location as `dev/workspace/zips/`.
11-
- Defined outcome suffixes: `_delta.zip`, `_REVIEW.zip`, `_FAILED.zip`, and `_HARD_STOP.zip`.
12-
- Clarified one ZIP per attempted PR, with at least one repository-structured ZIP for every Codex execution.
13-
- Added stacked PR ZIP handling and failure/hard-stop ZIP content requirements.
14-
- Updated Start of Day, PLAN_PR, BUILD_PR, APPLY_PR, and PR workflow references to the completion contract.
9+
- Fixed Start of Day baseline governance in the Codex workflow command SSoT.
10+
- Start of Day now requires current branch `main`, clean worktree, latest `origin/main`, and local/origin main sync.
11+
- Removed conflicting wording that Start of Day must not require `main`.
12+
- Documented allowed Start of Day sync actions: `git fetch origin` and `git pull --ff-only origin main`.
13+
- Documented hard-stop correction steps when Start of Day is invoked away from `main`.
14+
- Updated bootstrap and workflow docs so SOD reports recommendations only; branch creation/use happens after SOD through PR execution phases.
1515

16-
## Completion Contract Result
17-
- SSoT: `dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md`.
18-
- Every Codex execution must produce at least one repository-structured ZIP.
19-
- Each PR attempted by Codex must produce exactly one final outcome ZIP.
20-
- Missing ZIP means the Codex run did not complete correctly.
21-
- Grep for conflicting `exactly one repository-structured ZIP` wording: PASS, no conflicting wording found.
16+
## SOD Baseline Result
17+
- Start of Day requires `main`: PASS.
18+
- Start of Day requires clean worktree: PASS.
19+
- Start of Day fetch/pull latest `origin/main`: PASS.
20+
- Start of Day verifies local `main` and `origin/main` sync: PASS.
21+
- If not on `main`, SOD HARD STOP steps documented: PASS.
22+
- Read-only SOD preserved except allowed git sync actions: PASS.
2223

2324
## Changed Files
2425
```
25-
M dev/build/ProjectInstructions/PROJECT_INSTRUCTIONS.md
26-
M dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md
2726
M dev/build/ProjectInstructions/addendums/pr_workflow.md
27+
M dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md
2828
M dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md
2929
M dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md
3030
M dev/reports/codex_changed_files.txt
@@ -38,7 +38,7 @@ M dev/reports/PR_26179_OWNER_010-canonical-project-folder-instructions_validatio
3838
- `git diff --check`: PASS.
3939
- `npm run validate:canonical-structure`: PASS.
4040
- `node ./dev/scripts/run-platform-validation-suite.mjs`: PASS, 8/8 scenarios.
41-
- Grep for `exactly one repository-structured ZIP`: PASS, no replacement needed beyond SSoT wording.
41+
- Conflict scan for `Start of Day must not require` and SOD branch-creation wording: PASS.
4242

4343
## Blockers
4444
None.
Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
# PR_26179_OWNER_010-canonical-project-folder-instructions Requirement Checklist
22

3-
Updated: 2026-06-28T02:44:56Z
3+
Updated: 2026-06-28T02:50:06Z
44

55
- [x] Continued on current branch.
66
- [x] Documentation/governance only.
77
- [x] Runtime code not modified.
88
- [x] Production pages not modified.
9-
- [x] Codex Completion Contract documented.
10-
- [x] Every Codex execution requires at least one repository-structured ZIP.
11-
- [x] Each attempted PR requires exactly one final outcome ZIP.
12-
- [x] Missing ZIP means the Codex run did not complete correctly.
13-
- [x] Canonical ZIP location documented as `dev/workspace/zips/`.
14-
- [x] ZIP suffixes documented.
15-
- [x] Stacked PR ZIP rule documented.
16-
- [x] Failure/hard-stop ZIP contents documented.
17-
- [x] Success ZIP contents documented.
18-
- [x] Start of Day, PLAN_PR, BUILD_PR, and APPLY_PR docs reference the completion contract.
19-
- [x] Conflicting exactly-one-per-execution wording checked.
9+
- [x] CODEX_WORKFLOW_COMMANDS.md updated so Start of Day requires current branch `main`.
10+
- [x] CODEX_WORKFLOW_COMMANDS.md updated so Start of Day requires clean worktree.
11+
- [x] CODEX_WORKFLOW_COMMANDS.md updated so Start of Day fetches/pulls latest `origin/main`.
12+
- [x] CODEX_WORKFLOW_COMMANDS.md updated so Start of Day verifies local/main origin sync.
13+
- [x] Conflicting `Start of Day must not require the current branch to be main` wording removed.
14+
- [x] Bootstrap doc updated with baseline sync and hard-stop behavior.
15+
- [x] Start of Day read-only rule retained except allowed git sync actions.
16+
- [x] If not on main, SOD HARD STOP correction steps documented.
17+
- [x] Reports/checklists updated.
2018
- [x] git diff --check passed.
2119
- [x] npm run validate:canonical-structure passed.
2220
- [x] node ./dev/scripts/run-platform-validation-suite.mjs passed.
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
# PR_26179_OWNER_010-canonical-project-folder-instructions Validation Report
22

3-
Updated: 2026-06-28T02:44:56Z
3+
Updated: 2026-06-28T02:50:06Z
44

55
## Commands
66
- `git diff --check`: PASS
77
- `npm run validate:canonical-structure`: PASS
88
- `node ./dev/scripts/run-platform-validation-suite.mjs`: PASS, 8/8 scenarios
9-
- `rg 'exactly one repository-structured ZIP' dev/build/ProjectInstructions`: PASS, no conflicting wording remains
9+
- `rg` conflict scan for removed SOD main exception and SOD branch creation wording: PASS
1010

1111
## Scope Checks
1212
- Runtime code changed: NO
1313
- Production pages changed: NO
1414
- Documentation/governance only: YES
1515

1616
## Notes
17-
- Completion contract SSoT is `dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md`.
18-
- Command and PR workflow docs point to the contract instead of duplicating ZIP rules.
17+
- Start of Day is now baseline sync and discovery on clean `main`.
18+
- SOD may run `git fetch origin` and `git pull --ff-only origin main` only.
19+
- SOD hard-stops away from `main` and returns correction steps.
1920

2021
## Blockers
2122
None.
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
PR_26179_OWNER_010-canonical-project-folder-instructions
2-
Updated: 2026-06-28T02:44:56Z
2+
Updated: 2026-06-28T02:50:06Z
33
Branch: PR_26179_OWNER_010-canonical-project-folder-instructions
44

55
Changed files staged for this update:
6-
M dev/build/ProjectInstructions/PROJECT_INSTRUCTIONS.md
7-
M dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md
86
M dev/build/ProjectInstructions/addendums/pr_workflow.md
7+
M dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md
98
M dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md
109
M dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md
1110

1211
Working tree status at report generation:
13-
M dev/build/ProjectInstructions/PROJECT_INSTRUCTIONS.md
14-
M dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md
1512
M dev/build/ProjectInstructions/addendums/pr_workflow.md
13+
M dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md
1614
M dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md
1715
M dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md

0 commit comments

Comments
 (0)