You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit c2300f1
Browse filesBrowse the repository at this point in the historyBrowse files
Copy file name to clipboardExpand all lines: docs_build/dev/ProjectInstructions/addendums/branch_lock_governance.md
+4-3Lines changed: 4 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -13,7 +13,7 @@ Keep active work attached to the correct assigned team, branch, and OWNER decisi
13
13
- An assigned work item keeps its owner of record until complete or OWNER reassignment.
14
14
- Work must not move to another team, branch, or PR without OWNER approval.
15
15
- A team with no active assignment, active branch, or active PR is inactive.
16
-
- A team with a previous PR that is not Closed must not begin another PR unless OWNER documented an explicit stacked PR chain.
16
+
- A team with a previous PR that is not Closed must not begin another unrelated PR unless OWNER documented an explicit stacked/sequential workstream.
17
17
- PR Open begins only after the branch and PR identity are named.
18
18
- Plan, Build, validation, reports, ZIP packaging, and closeout stay tied to the same PR identity and source branch.
19
19
- Closed ends only after the final main-return, clean-worktree, local/origin `0/0`, no-untracked-files, required-report, required-ZIP, backlog, applicable tool-state, and branch-disposition gates pass.
@@ -25,7 +25,8 @@ Keep active work attached to the correct assigned team, branch, and OWNER decisi
25
25
- Pull latest `origin/main` before creating a work branch.
26
26
- 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.
27
27
- Follow the canonical START / WORK / END lifecycle in `docs_build/dev/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md`.
28
-
- Keep work on the active branch until the PR is merged, the branch is retired, or OWNER says to return to `main`.
28
+
- 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.
29
30
- Do not commit directly to `main`.
30
31
- HARD STOP before committing if current branch is `main`.
31
32
- HARD STOP if the branch changes unexpectedly during implementation.
- END by merging, returning to synchronized `main`, publishing branch, HEAD SHA, and date/time, then stopping all work.
54
-
- Mandatory hard stops before commits on `main`, dirty branch creation, non-`0 0` main sync, baseline SHA mismatch, unvalidated merge, or new PR work before synchronized main return.
55
+
- Mandatory hard stops before commits on `main`, dirty branch creation, non-`0 0` main sync, baseline SHA mismatch, unvalidated merge, or new unrelated workstream before synchronized main return.
Copy file name to clipboardExpand all lines: docs_build/dev/ProjectInstructions/addendums/pr_workflow.md
+43-2Lines changed: 43 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -23,9 +23,26 @@ Define the standard pull request workflow for Game Foundry Studio.
23
23
12. Review the PR.
24
24
13. OWNER approves merge.
25
25
14. Merge to main.
26
-
15. Pull latest main before starting the next PR.
26
+
15. Pull latest main before starting the next unrelated workstream, or before a new PR when the work is not an OWNER-approved stacked/sequential workstream.
27
27
16. Verify Main Verified and Closed gates.
28
28
29
+
## Daily Branch Workflow
30
+
31
+
OWNER-approved daily workflow:
32
+
33
+
- 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.
37
+
- Do not return to `main` between stacked/sequential PRs in the same active workstream.
38
+
-`main` is only the SOD baseline and the EOD return target, unless OWNER explicitly approves an intermediate merge checkpoint.
39
+
- EOD merges or closes OWNER-approved work, pushes, returns to `main`, and verifies:
40
+
- current branch is `main`
41
+
- worktree clean
42
+
- local/origin sync is `0 0`
43
+
44
+
This section supersedes older active wording that implies returning to `main` between every PR inside an OWNER-approved stacked/sequential workstream.
45
+
29
46
## Branch Lifecycle (Canonical)
30
47
31
48
Every PR follows exactly three phases:
@@ -101,7 +118,8 @@ Closed gates:
101
118
- Source branches are retained by default after merge and closeout.
102
119
- Do not mix unrelated scopes.
103
120
- Do not start dependent PRs until the required base PR is merged.
104
-
- Always return to main before starting the next PR.
121
+
- Return to `main` before starting an unrelated PR or new workstream.
122
+
- Do not return to `main` between PRs in the same OWNER-approved stacked/sequential workstream unless OWNER approves an EOD or intermediate merge checkpoint.
105
123
- A team must not begin another PR if its previous PR is not Closed.
106
124
- Exception is allowed only for explicitly documented stacked PR chains.
107
125
- If validation fails, stop and report.
@@ -140,6 +158,29 @@ Each tool MVP PR plan or template must include:
140
158
141
159
Visible acceptance must be Creator-facing first. Architecture can be handled under the covers, but the PR purpose must be user-testable.
142
160
161
+
## Product Owner Testable Definition
162
+
163
+
A request to complete a page, tool, or testable MVP means Product Owner testable.
164
+
165
+
Not acceptable as a completed/testable page or tool:
166
+
167
+
- shell-only page
168
+
-`Not implemented yet`
169
+
- placeholder-only workspace, inspector, or output sections
Copy file name to clipboardExpand all lines: docs_build/dev/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md
+6-3Lines changed: 6 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -68,7 +68,7 @@ END
68
68
69
69
## START
70
70
71
-
Every team begins on`main`.
71
+
Every team begins SOD from`main`.
72
72
73
73
Required:
74
74
@@ -91,7 +91,7 @@ main...origin/main
91
91
HEAD equals published EOD SHA
92
92
```
93
93
94
-
Only after ALL four pass may a branch be created.
94
+
Only after ALL four pass may a branch be created or the active OWNER-approved workstream branch be updated.
95
95
96
96
Create the PR branch:
97
97
@@ -115,6 +115,8 @@ From branch creation until merge:
115
115
- Push only the PR branch.
116
116
- Execute validation from the PR branch.
117
117
- 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
+
- Do not return to `main` between sequential PRs in the same active workstream unless OWNER explicitly approves an EOD or intermediate merge checkpoint.
118
120
119
121
Hard Stops:
120
122
@@ -192,7 +194,8 @@ STOP if:
192
194
-`main...origin/main` is not `0 0` before creating PR branch
193
195
-`HEAD` SHA differs from published baseline
194
196
- merge attempted without successful validation
195
-
- new PR started before returning to synchronized `main`
197
+
- new unrelated PR or workstream started before returning to synchronized `main`
198
+
- sequential work continues without an OWNER-approved stacked/sequential workstream model
- Every user-accessible page must have at least one page-level Playwright test.
38
+
- Runtime page path determines the page-level Playwright test path.
39
+
- Primary page-level Playwright test file should be `index.spec.mjs`.
40
+
- Do not organize new page-level Playwright tests only by feature nickname or technology bucket when a page path exists.
41
+
- Legacy broad tests may remain while migration is planned; document migration/deprecation instead of moving broad legacy tests unless the PR scope requires it.
Copy file name to clipboardExpand all lines: docs_build/dev/ProjectInstructions/addendums/tool_mvp_stacked_pr_standard.md
+24-1Lines changed: 24 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -40,6 +40,27 @@ For tool MVP PR planning, visible acceptance must be Creator-facing first.
40
40
41
41
Architecture can be handled under the covers, but PR purpose must be user-testable.
42
42
43
+
A request to complete a page, tool, or testable MVP means Product Owner testable.
44
+
45
+
Not acceptable as complete/testable:
46
+
47
+
- shell-only page
48
+
-`Not implemented yet`
49
+
- placeholder-only workspace, inspector, or output sections
50
+
- planned-only tile
51
+
- template-only page
52
+
- route that loads but cannot be used
53
+
54
+
Required for Product Owner testable completion:
55
+
56
+
- visible working controls
57
+
- API-backed data where required
58
+
- validation and error states
59
+
- empty states
60
+
- save/load behavior where applicable
61
+
- manual validation steps for Product Owner
62
+
- targeted Playwright coverage where impacted.
63
+
43
64
Each tool MVP PR must state:
44
65
- Creator-testable outcome
45
66
- What Playwright tests
@@ -81,4 +102,6 @@ Each PR in the stack still follows the canonical START / WORK / END lifecycle an
81
102
82
103
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.
83
104
84
-
The final PR in the stack must perform normal closeout and stop all work after returning to synchronized main.
105
+
During an OWNER-approved day workstream, sequential PRs stay on the active workstream branch and do not return to `main` between PRs.
106
+
107
+
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.
Copy file name to clipboardExpand all lines: docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md
+4-1Lines changed: 4 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -26,7 +26,10 @@
26
26
0% Complete — Create the visual look of your game
27
27
28
28
-[ ] Bravo - Asset Studio V2
29
-
-[ ] Bravo - Sprite Studio V2
29
+
-[ ] Charlie - Sprites canvas editor MVP
30
+
- Sprites is a creator tool, not only an asset metadata library.
31
+
- MVP requires canvas/grid editor behavior, width/height controls, Palette/Colors-only reusable colors, color selection from Palette/Colors, pixel painting, save/load sprite grid data through the API/database, and Product Owner manual validation.
0 commit comments