Skip to content

Commit 5729a23

Browse files
committed
Clarify team-neutral branch workflow wording
1 parent c2300f1 commit 5729a23

12 files changed

Lines changed: 29 additions & 23 deletions

docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ OWNER override wording:
9393
`OWNER override approved: <reason>`
9494

9595
OWNER follows the same safety rules:
96-
- One active OWNER branch at a time.
96+
- One active Team OWNER branch at a time.
9797
- One active OWNER assignment at a time.
9898
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
9999
- OWNER override must be explicitly documented.

docs_build/dev/ProjectInstructions/addendums/branch_lock_governance.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ Keep active work attached to the correct assigned team, branch, and OWNER decisi
99

1010
## Active Work Lock
1111

12-
- Work must occur on the assigned team or OWNER branch.
12+
- Work must occur on the active team branch.
13+
- This rule applies to all teams: OWNER, Team Alfa, Team Bravo, Team Charlie, Team Delta, and any future team.
1314
- An assigned work item keeps its owner of record until complete or OWNER reassignment.
1415
- Work must not move to another team, branch, or PR without OWNER approval.
1516
- A team with no active assignment, active branch, or active PR is inactive.
@@ -26,7 +27,7 @@ Keep active work attached to the correct assigned team, branch, and OWNER decisi
2627
- Do not create a PR branch unless current branch is `main`, worktree is clean, `main...origin/main` is `0 0`, and `HEAD` SHA matches the published EOD SHA.
2728
- Follow the canonical START / WORK / END lifecycle in `docs_build/dev/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md`.
2829
- Keep work on the active branch until the PR is merged, the branch is retired, EOD closeout begins, or OWNER says to return to `main`.
29-
- For OWNER-approved stacked/sequential workstreams, sequential PR work stays on the active branch/workstream during the day and does not return to `main` between PRs.
30+
- For OWNER-approved stacked/sequential workstreams, PR branches/commits stay on the active team branch/workstream during the day and do not return to `main` between PRs.
3031
- Do not commit directly to `main`.
3132
- HARD STOP before committing if current branch is `main`.
3233
- HARD STOP if the branch changes unexpectedly during implementation.

docs_build/dev/ProjectInstructions/addendums/pr_workflow.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ Define the standard pull request workflow for Game Foundry Studio.
2828

2929
## Daily Branch Workflow
3030

31-
OWNER-approved daily workflow:
31+
Team-neutral daily workflow:
3232

3333
- SOD starts from the latest synchronized `main`.
34-
- SOD creates or updates one active team, OWNER, or scoped workstream branch.
35-
- All implementation commits go to the active branch, not `main`.
36-
- Sequential PRs stay on the active branch/workstream during the day when OWNER assigned a stacked or sequential workstream.
34+
- SOD creates or updates one active team branch/workstream.
35+
- Work must be committed only to the active team branch.
36+
- PR branches/commits stay on the active team branch/workstream during the day when OWNER assigned a stacked or sequential workstream.
3737
- Do not return to `main` between stacked/sequential PRs in the same active workstream.
3838
- `main` is only the SOD baseline and the EOD return target, unless OWNER explicitly approves an intermediate merge checkpoint.
3939
- EOD merges or closes OWNER-approved work, pushes, returns to `main`, and verifies:
4040
- current branch is `main`
4141
- worktree clean
4242
- local/origin sync is `0 0`
43+
- This rule applies to all teams: OWNER, Team Alfa, Team Bravo, Team Charlie, Team Delta, and any future team.
4344

4445
This section supersedes older active wording that implies returning to `main` between every PR inside an OWNER-approved stacked/sequential workstream.
4546

docs_build/dev/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ main...origin/main
9191
HEAD equals published EOD SHA
9292
```
9393

94-
Only after ALL four pass may a branch be created or the active OWNER-approved workstream branch be updated.
94+
Only after ALL four pass may a branch be created or the active team branch/workstream be updated.
9595

9696
Create the PR branch:
9797

@@ -112,11 +112,13 @@ From branch creation until merge:
112112
- Remain on the PR branch.
113113
- Never checkout `main`.
114114
- Commit only on the PR branch.
115+
- Work must be committed only to the active team branch.
115116
- Push only the PR branch.
116117
- Execute validation from the PR branch.
117118
- Open/update the PR from the PR branch.
118-
- For OWNER-approved stacked/sequential workstreams, remain on the active workstream branch between sequential PRs during the day.
119+
- For OWNER-approved stacked/sequential workstreams, PR branches/commits stay on the active team branch/workstream between sequential PRs during the day.
119120
- Do not return to `main` between sequential PRs in the same active workstream unless OWNER explicitly approves an EOD or intermediate merge checkpoint.
121+
- This rule applies to all teams: OWNER, Team Alfa, Team Bravo, Team Charlie, Team Delta, and any future team.
120122

121123
Hard Stops:
122124

docs_build/dev/ProjectInstructions/addendums/tool_mvp_stacked_pr_standard.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ Each PR in the stack still follows the canonical START / WORK / END lifecycle an
102102

103103
When OWNER gives one large Codex command for a tool MVP stack, Codex may continue from one completed PR to the next without stopping for a conversational checkpoint, unless a blocker listed in this standard occurs.
104104

105-
During an OWNER-approved day workstream, sequential PRs stay on the active workstream branch and do not return to `main` between PRs.
105+
During an OWNER-approved day workstream, PR branches/commits stay on the active team branch/workstream and do not return to `main` between PRs.
106+
107+
This rule applies to all teams: OWNER, Team Alfa, Team Bravo, Team Charlie, Team Delta, and any future team.
106108

107109
The final PR in the stack must perform normal EOD closeout or OWNER-approved merge-checkpoint closeout and stop all work after returning to synchronized main.

docs_build/dev/reports/PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ No runtime code, UI code, API code, database code, start_of_day files, history s
1818

1919
- Clarified SOD/day-work/EOD workflow:
2020
- SOD starts from latest synchronized `main`.
21-
- Active work happens on one active team, OWNER, or scoped workstream branch.
22-
- Sequential PRs stay on the active workstream branch during the day.
21+
- Active work happens on one active team branch/workstream.
22+
- Work must be committed only to the active team branch.
23+
- PR branches/commits stay on the active team branch/workstream during the day.
24+
- The rule applies to all teams: OWNER, Team Alfa, Team Bravo, Team Charlie, Team Delta, and any future team.
2325
- `main` is only the SOD baseline and EOD return target unless OWNER approves a merge checkpoint.
2426
- Added Product Owner testable completion definition.
2527
- Confirmed `Browser -> API -> Database`, one API/service contract across environments, and `Local API` as the shared API running locally.
@@ -52,4 +54,4 @@ No runtime code, UI code, API code, database code, start_of_day files, history s
5254

5355
Reviewers should verify that daily team work now has one clear model:
5456

55-
SOD from synchronized `main`, work on active workstream branch, no return to `main` between stacked/sequential PRs, and EOD return to synchronized `main`.
57+
SOD from synchronized `main`, work on the active team branch/workstream, no return to `main` between stacked/sequential PRs, and EOD return to synchronized `main`.

docs_build/dev/reports/PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment_branch-validation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Date: 2026-06-26
77
| --- | --- | --- |
88
| Started from `main` | PASS | `main...origin/main` was `0 0` before branch creation. |
99
| Worktree clean before branch | PASS | Start gate passed. |
10-
| Work committed only to OWNER branch | PASS | Branch is `PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment`. |
10+
| Work committed only to active team branch | PASS | Branch is `PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment`; no commit was made to `main`. |
1111
| No direct commit to `main` | PASS | No commit was made on `main`. |
1212
| Active instruction files only | PASS | Changes are under `docs_build/dev/ProjectInstructions/` plus required reports. |
1313
| Runtime files changed | PASS | None. |

docs_build/dev/reports/PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment_manual-validation-notes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Date: 2026-06-26
66
## Reviewer Checklist
77

88
- Confirm `main` is described as SOD baseline and EOD return target, not the place for day-work commits.
9-
- Confirm stacked/sequential PRs stay on the active workstream branch during the day.
9+
- Confirm stacked/sequential PR branches/commits stay on the active team branch/workstream during the day.
10+
- Confirm this branch workflow applies to all teams: OWNER, Team Alfa, Team Bravo, Team Charlie, Team Delta, and any future team.
1011
- Confirm Product Owner testable excludes shell-only, placeholder-only, planned-only, or route-only completion.
1112
- Confirm page-level Playwright tests follow runtime page paths.
1213
- Confirm `Local API` means the shared API running locally.

docs_build/dev/reports/PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment_requirements-checklist.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Date: 2026-06-26
66
| Requirement | Result | Notes |
77
| --- | --- | --- |
88
| Daily branch workflow documented | PASS | Added SOD/day-work/EOD wording. |
9+
| Branch workflow is team-neutral | PASS | Active wording says work commits and sequential PR branches/commits stay on the active team branch/workstream and applies to all teams. |
910
| Product Owner testable definition documented | PASS | Added in PR workflow and Tool MVP standard. |
1011
| API/environment rule confirmed | PASS | Added `Browser -> API -> Database`, shared API contract, and Local API definition. |
1112
| Page-level Playwright organization added | PASS | Added runtime path to test path rules and examples. |

docs_build/dev/reports/PR_26177_OWNER_009-project-instructions-workflow-testable-tests-alignment_validation-lane.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ rg -n "Product Owner testable|page-level Playwright|Browser -> API -> Database|L
1818
- PASS: changed files are active Project Instructions plus required reports only.
1919
- PASS: no runtime/UI/API/database/start_of_day files changed.
2020
- PASS: no `Sprite Studio V2` active backlog owner remains.
21+
- PASS: no OWNER-only branch workflow wording remains.
22+
- PASS: active branch workflow says commits and sequential PR branches/commits stay on the active team branch/workstream.
2123
- PASS: Product Owner testable text exists.
2224
- PASS: page-level Playwright organization text exists.
2325
- PASS: API/environment contract text exists.

0 commit comments

Comments
 (0)