|
1 | | -diff --git a/dev/build/ProjectInstructions/addendums/pr_workflow.md b/dev/build/ProjectInstructions/addendums/pr_workflow.md |
2 | | -index ce6483838..6fadd0789 100644 |
3 | | ---- a/dev/build/ProjectInstructions/addendums/pr_workflow.md |
4 | | -+++ b/dev/build/ProjectInstructions/addendums/pr_workflow.md |
5 | | -@@ -41,7 +41,8 @@ This file owns PR lifecycle governance. It must not duplicate command phase rule |
6 | | - Team-neutral daily workflow: |
7 | | - |
8 | | - - SOD starts from the latest synchronized `main`. |
9 | | --- SOD creates or updates one active team branch/workstream. |
10 | | -+- SOD reports the active team branch/workstream recommendation only. |
11 | | -+- Branch creation or branch updates happen after SOD through the appropriate PR execution phase. |
12 | | - - Work must be committed only to the active team branch. |
13 | | - - PR branches/commits stay on the active team branch/workstream during the day when OWNER assigned a stacked or sequential workstream. |
14 | | - - Do not return to `main` between stacked/sequential PRs in the same active workstream. |
15 | | -diff --git a/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md b/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md |
16 | | -index e191f9d7f..1e6a04a87 100644 |
17 | | ---- a/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md |
18 | | -+++ b/dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md |
19 | | -@@ -88,7 +88,8 @@ At EOD, ChatGPT/Codex must provide: |
20 | | - This standard preserves the existing branch workflow: |
21 | | - |
22 | | - - SOD starts from latest `main`. |
23 | | --- SOD creates or uses the active team branch. |
24 | | -+- SOD reports the recommended active team branch/workstream only. |
25 | | -+- Branch creation or use happens after SOD through the appropriate PR execution phase. |
26 | | - - All commits go to the active team branch, not `main`. |
27 | | - - Sequential PRs stay on the active team branch/workstream during the day. |
28 | | - - EOD merges OWNER-approved work, pushes, returns to `main`, and verifies clean worktree and local/origin sync `0 0`. |
29 | | -diff --git a/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md b/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md |
30 | | -index 280abef00..f2eb2787d 100644 |
31 | | ---- a/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md |
32 | | -+++ b/dev/build/ProjectInstructions/bootstrap/codex_start_of_day_bootstrap.md |
33 | | -@@ -33,7 +33,24 @@ The bootstrap loads: |
34 | | - - Current branch |
35 | | - - Worktree status |
36 | | - |
37 | | --The bootstrap must not create branches, commit files, move files, or run implementation work by itself. |
38 | | -+The bootstrap requires the current branch to be `main`, the worktree to be clean, and local `main` to be synced with `origin/main`. |
39 | | -+ |
40 | | -+Allowed bootstrap sync actions: |
41 | | -+ |
42 | | -+```text |
43 | | -+git fetch origin |
44 | | -+git pull --ff-only origin main |
45 | | -+``` |
46 | | -+ |
47 | | -+If the current branch is not `main`, the bootstrap must HARD STOP and return: |
48 | | -+ |
49 | | -+```text |
50 | | -+git switch main |
51 | | -+git pull --ff-only origin main |
52 | | -+Start of Day {Team} |
53 | | -+``` |
54 | | -+ |
55 | | -+The bootstrap must not create branches, switch branches, commit files, move files, or run implementation work by itself. |
56 | | - |
57 | | - 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. |
58 | | - |
59 | | -diff --git a/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md b/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md |
60 | | -index 25a403486..c0066966e 100644 |
61 | | ---- a/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md |
62 | | -+++ b/dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md |
63 | | -@@ -25,9 +25,26 @@ Start of Day Golf |
64 | | - |
65 | | - Commands using non-canonical team names are invalid because active team names are Owner, Alfa, Bravo, Charlie, Delta, and Golf. |
66 | | - |
67 | | --Start of Day is read-only discovery only. |
68 | | -+Start of Day is read-only discovery plus baseline sync only. |
69 | | - |
70 | | --Start of Day must not require the current branch to be `main`. |
71 | | -+Start of Day requires: |
72 | | -+- current branch is `main` |
73 | | -+- worktree is clean |
74 | | -+- `git fetch origin` |
75 | | -+- `git pull --ff-only origin main` |
76 | | -+- local `main` and `origin/main` are synced |
77 | | -+ |
78 | | -+Allowed Start of Day git sync actions: |
79 | | -+- `git fetch origin` |
80 | | -+- `git pull --ff-only origin main` |
81 | | -+ |
82 | | -+If the current branch is not `main`, Start of Day must HARD STOP and return these correction steps: |
83 | | -+ |
84 | | -+```text |
85 | | -+git switch main |
86 | | -+git pull --ff-only origin main |
87 | | -+Start of Day {Team} |
88 | | -+``` |
89 | | - |
90 | | - Start of Day must not: |
91 | | - - create a branch |
| 1 | +diff --git a/.gitignore b/.gitignore |
| 2 | +index 3ac762a04..1207a12fc 100644 |
| 3 | +--- a/.gitignore |
| 4 | ++++ b/.gitignore |
| 5 | +@@ -48,8 +48,8 @@ docs/dev/reports/playwright_v8_coverage_report.txt |
| 6 | + *.mp4 |
| 7 | + *.mkv |
| 8 | + |
| 9 | +-.env |
| 10 | +-.env.* |
| 11 | ++# Environment files |
| 12 | ++.env* |
| 13 | + !.env.example |
| 14 | + !.env.sample |
| 15 | + !.env.template |
0 commit comments