Skip to content

Commit 08ef154

Browse files
committed
Merge branch 'main' into pr/26172-OWNER-017-project-instructions-bootstrap-install
# Conflicts: # docs_build/dev/reports/codex_changed_files.txt # docs_build/dev/reports/codex_review.diff
2 parents 8fad0cd + 4cd3e36 commit 08ef154

6 files changed

Lines changed: 244 additions & 16 deletions

docs_build/dev/PROJECT_INSTRUCTIONS.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2032,9 +2032,29 @@ Stable promotion and merge approval are owner-controlled.
20322032
Rules:
20332033
- Codex may prepare scoped changes, reports, validation evidence, ZIP artifacts, branches, and PRs.
20342034
- Codex must not merge a PR or mark a workstream stable without explicit approval from the assigned Team Alpha or Team Beta owner.
2035-
- Master Control may recommend sequencing or assignment, but affected workstream owners control stable and merge approval.
2035+
- OWNER may recommend sequencing or assignment, but affected workstream owners control stable and merge approval.
20362036
- This targeted section supersedes older automatic-merge wording when approval ownership is in question.
20372037

2038+
## OWNER GOVERNANCE LANE
2039+
2040+
The governance lane formerly referred to by the prior governance token is now OWNER.
2041+
2042+
Rules:
2043+
- Use Team OWNER for owner-governance PRs going forward.
2044+
- PR names use the OWNER token going forward:
2045+
- `PR_<YYJJJ>_OWNER_<###>-<short-description>`
2046+
- Branch names mirror OWNER ownership going forward:
2047+
- `pr/<YYJJJ>-OWNER-<###>-<short-description>`
2048+
- Existing PRs, branches, reports, and ZIPs already uploaded with the prior governance token are historical and must not be renamed unless separately scoped.
2049+
- Required override wording is:
2050+
- `OWNER override approved: <reason>`
2051+
2052+
OWNER follows the same safety rules:
2053+
- One active OWNER branch at a time.
2054+
- One active OWNER assignment at a time.
2055+
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
2056+
- OWNER override must be explicitly documented.
2057+
20382058
## CODEX INSTRUCTION ENFORCEMENT START GATE
20392059

20402060
Codex must run this gate before every PR execution and before any file changes.

docs_build/dev/PROJECT_MULTI_PC.txt

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
I think this is the right operating model for GFS at your current stage, with a few modifications to fit how we've already organized the project.
22

3-
Master Control Responsibilities
3+
OWNER Responsibilities
44

5-
Master Control should own:
5+
OWNER should own:
66

77
Product roadmap
88
Tool priority
@@ -189,7 +189,7 @@ These become valuable after creators can build complete games.
189189

190190
Immediate Queue
191191

192-
If we start using Master Control today, my queue would be:
192+
If we start using OWNER today, my queue would be:
193193

194194
Team Alpha
195195
PR_26171_001-game-journey-completion-model
@@ -232,7 +232,7 @@ No TTS generation yet.
232232

233233
This establishes the foundation for dialog, narration, and speech consistency across games.
234234

235-
Master Control Rule
235+
OWNER Rule
236236

237237
Before any new PR is created, ask:
238238

@@ -257,7 +257,7 @@ until a complete game can be built start-to-finish entirely inside Game Foundry
257257
----------------------------------------------------------------------------------------
258258
If your goal is **maximum throughput**, I would have the three chats play different roles.
259259

260-
## Master Control
260+
## OWNER
261261

262262
Don't build anything here.
263263

@@ -336,7 +336,7 @@ it keeps building there.
336336

337337
---
338338

339-
## What should Master Control focus on?
339+
## What should OWNER focus on?
340340

341341
Right now, for GFS, I would prioritize:
342342

@@ -368,7 +368,7 @@ So I'd keep IST mostly as infrastructure work and focus development on tool comp
368368

369369
### 2. Create Tool Ownership Map
370370

371-
Master Control should assign ownership:
371+
OWNER should assign ownership:
372372

373373
```text
374374
Team Alpha
@@ -411,9 +411,9 @@ Never have both teams working in the same tool at the same time.
411411

412412
## What I can do
413413

414-
I can help you turn Master Control into a scheduler.
414+
I can help you turn OWNER into a scheduler.
415415

416-
For example, in Master Control you can ask:
416+
For example, in OWNER you can ask:
417417

418418
```text
419419
Given everything we know about GFS:
@@ -424,7 +424,7 @@ What should Team Beta build next?
424424
Generate the next PR for each.
425425
```
426426

427-
Then Master Control outputs:
427+
Then OWNER outputs:
428428

429429
```text
430430
Team Alpha:
@@ -438,7 +438,7 @@ You paste those into the two development chats.
438438

439439
Both Codex sessions work simultaneously.
440440

441-
Then when PRs come back, Master Control decides:
441+
Then when PRs come back, OWNER decides:
442442

443443
```text
444444
Merge
@@ -479,6 +479,25 @@ Historical examples:
479479

480480
Owner map:
481481

482+
Team OWNER owns owner-governance routing and explicit override decisions:
483+
- Product roadmap
484+
- Tool priority
485+
- Architecture
486+
- Naming governance
487+
- Workflow governance
488+
- Environment strategy
489+
- PR sequencing
490+
- Stable and merge approval recommendations
491+
- Team lock override decisions
492+
493+
Team OWNER follows the same safety rules:
494+
- One active OWNER branch at a time.
495+
- One active OWNER assignment at a time.
496+
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
497+
- OWNER override must be explicitly documented.
498+
- Required override wording:
499+
- `OWNER override approved: <reason>`
500+
482501
Team Alpha owns Creator Journey work:
483502
- Game Journey
484503
- Game Hub
@@ -519,18 +538,26 @@ Team Gamma owns governance, recovery, diagnostics, and instruction-hardening wor
519538
- Static docs governance
520539

521540
Governance, recovery, diagnostics, and instruction-hardening PRs:
522-
- Use the TEAM token assigned by Master Control.
541+
- Use the TEAM token assigned by OWNER.
542+
- OWNER governance PRs use the OWNER token going forward.
523543
- Must not implement tool/runtime work from the opposite owner.
524544
- Must document TEAM ownership compliance in the PR report.
525545
- Recovery reports must include TEAM ownership.
526546

527547
Stable and merge approval:
528548
- Stable promotion and merge approval are controlled by the assigned Team Alpha, Team Beta, or Team Gamma owner.
529-
- Master Control may recommend sequencing, but Codex must not merge or mark stable without explicit owner approval for the affected workstream.
549+
- OWNER may recommend sequencing, but Codex must not merge or mark stable without explicit owner approval for the affected workstream.
550+
551+
OWNER naming rule:
552+
- Use Team OWNER for owner-governance work going forward.
553+
- Use OWNER override wording going forward.
554+
- Required override wording is:
555+
- `OWNER override approved: <reason>`
556+
- Existing uploaded PRs, branches, reports, and ZIPs with the prior governance token are historical and are not renamed by this rule unless separately scoped.
530557

531558
Hard stop rules:
532559
- If the PR name does not include a TEAM token, stop before changes.
533-
- If the TEAM token does not match the owner map or explicit Master Control assignment, stop before changes.
560+
- If the TEAM token does not match the owner map or explicit OWNER assignment, stop before changes.
534561
- If the PR scope belongs to another TEAM owner, stop before changes.
535-
- If the PR crosses multiple team ownership areas, stop and require Master Control to split or assign the work.
562+
- If the PR crosses multiple team ownership areas, stop and require OWNER to split or assign the work.
536563
- If the requested implementation path conflicts with the active owner path, stop before changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# PR_26172_OWNER_010 Instruction Compliance Checklist
2+
3+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
4+
- PASS: Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
5+
- PASS: Owner decision explicitly approved OWNER as the governance lane token going forward.
6+
- PASS: Branch name mirrors PR ownership: `pr/26172-OWNER-010-owner-governance-rename`.
7+
- PASS: Implementation path is active documentation only.
8+
- PASS: Existing uploaded MASTER-named ZIPs were not renamed.
9+
- PASS: Existing Project Instructions were updated only for the requested OWNER governance rename.
10+
- PASS: No runtime code changed.
11+
- PASS: No direct commit to `main`.
12+
- PASS: Required review artifacts are produced.
13+
- PASS: Required ZIP path is `tmp/PR_26172_OWNER_010-owner-governance-rename_delta.zip`.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# PR_26172_OWNER_010 Manual Validation Notes
2+
3+
- Confirmed branch was created from latest `main`.
4+
- Confirmed existing uploaded MASTER-named ZIPs were not renamed.
5+
- Confirmed active docs now define Team OWNER for owner-governance work going forward.
6+
- Confirmed required override wording is `OWNER override approved: <reason>`.
7+
- Confirmed OWNER safety rules are documented.
8+
- Confirmed no runtime/UI files changed.
9+
- Did not run Playwright because this is documentation-only.
10+
- Did not run samples.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# PR_26172_OWNER_010-owner-governance-rename
2+
3+
## Scope
4+
5+
Rename the owner-governance lane from the previous governance token to OWNER in active documentation.
6+
7+
## Changes
8+
9+
- Updated `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
10+
- Updated `docs_build/dev/PROJECT_MULTI_PC.txt`.
11+
- Replaced active `Master Control` wording with OWNER wording.
12+
- Added OWNER governance lane rules.
13+
- Added OWNER PR and branch naming rules going forward.
14+
- Added required override wording: `OWNER override approved: <reason>`.
15+
- Added OWNER safety rules for active branch, active assignment, protected instructions, and explicit documentation.
16+
- Preserved existing uploaded PRs, branches, reports, and ZIPs with prior names as historical artifacts.
17+
18+
## Validation
19+
20+
- `git diff --check`
21+
- Text check confirmed no active `Master Control`, `Team MASTER`, or `MASTER override` wording remains in active instruction files.
22+
- Text check confirmed `Team OWNER`, `OWNER override approved`, and OWNER safety rules exist.
23+
- Playwright skipped: documentation-only.
24+
- Samples skipped: not requested.
25+
26+
## ZIP
27+
28+
`tmp/PR_26172_OWNER_010-owner-governance-rename_delta.zip`

docs_build/dev/reports/codex_review.diff

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,3 +760,133 @@ index 000000000..0b63c376f
760760
+
761761
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
762762
+"Merge this PR now."
763+
diff --git a/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-instruction-compliance-checklist.md b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-instruction-compliance-checklist.md
764+
new file mode 100644
765+
index 000000000..af8e94480
766+
--- /dev/null
767+
+++ b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-instruction-compliance-checklist.md
768+
@@ -0,0 +1,17 @@
769+
+# PR_26172_OWNER_017 Instruction Compliance Checklist
770+
+
771+
+- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
772+
+- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
773+
+- [x] OWNER override documented by user.
774+
+- [x] Started from latest `main`.
775+
+- [x] Created branch `pr/26172-OWNER-017-project-instructions-bootstrap-install`.
776+
+- [x] Installed ProjectInstructions physical structure.
777+
+- [x] Created required anchor files.
778+
+- [x] Populated files with approved governance from OWNER PRs 001-016.
779+
+- [x] Did not redesign governance.
780+
+- [x] Did not create unrelated new governance.
781+
+- [x] Did not delete existing documentation.
782+
+- [x] Did not commit directly to `main`.
783+
+- [x] Did not merge any PR.
784+
+- [x] Ran docs/static validation.
785+
+- [x] Created repo-structured delta ZIP.
786+
diff --git a/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-manual-validation-notes.md b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-manual-validation-notes.md
787+
new file mode 100644
788+
index 000000000..4e7f24dd2
789+
--- /dev/null
790+
+++ b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-manual-validation-notes.md
791+
@@ -0,0 +1,12 @@
792+
+# PR_26172_OWNER_017 Manual Validation Notes
793+
+
794+
+- Verified branch was created from latest `main`.
795+
+- Verified `docs_build/dev/ProjectInstructions/` did not exist on `main` before installation.
796+
+- Verified required physical structure exists.
797+
+- Verified required anchor files exist.
798+
+- Verified installed files preserve approved ProjectInstructions governance content.
799+
+- Verified active override wording uses OWNER.
800+
+- Verified `BACKLOG_MASTER.md` filename remains preserved.
801+
+- Verified no existing documentation was deleted.
802+
+- Verified no runtime, UI, Playwright, or sample files changed.
803+
+- Verified no merge to `main` was performed.
804+
diff --git a/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-tree.txt b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-tree.txt
805+
new file mode 100644
806+
index 000000000..81c6d761b
807+
--- /dev/null
808+
+++ b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install-tree.txt
809+
@@ -0,0 +1,21 @@
810+
+docs_build/dev/ProjectInstructions/
811+
+|-- PROJECT_INSTRUCTIONS.md
812+
+|-- README.txt
813+
+|-- TEAM_START_COMMANDS.md
814+
+|-- addendums/
815+
+| |-- build_path_sync.md
816+
+| |-- deprecation.md
817+
+| |-- multi_team.md
818+
+| |-- preservation.md
819+
+| |-- team_release_readiness.md
820+
+| `-- tile_overlay_status.md
821+
+|-- archive/
822+
+| |-- README.md
823+
+| `-- history/
824+
+| `-- .gitkeep
825+
+|-- backlog/
826+
+| `-- BACKLOG_MASTER.md
827+
+|-- deprecation/
828+
+| `-- README.md
829+
+`-- team_assignments/
830+
+ `-- TEAM_ASSIGNMENTS.md
831+
diff --git a/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install.md b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install.md
832+
new file mode 100644
833+
index 000000000..8ecbc95af
834+
--- /dev/null
835+
+++ b/docs_build/dev/reports/PR_26172_OWNER_017-project-instructions-bootstrap-install.md
836+
@@ -0,0 +1,56 @@
837+
+# PR_26172_OWNER_017-project-instructions-bootstrap-install
838+
+
839+
+## Purpose
840+
+
841+
+Install the missing ProjectInstructions operating system into the repository.
842+
+
843+
+This is an installation PR, not a governance-design PR.
844+
+
845+
+## Source
846+
+
847+
+The installed files use governance already approved across OWNER/Master-to-OWNER ProjectInstructions PRs 001-016:
848+
+
849+
+- ProjectInstructions root and README bootstrap
850+
+- preservation and archive governance
851+
+- backlog governance and Game Journey MVP population
852+
+- team assignments and team registry
853+
+- release readiness gate
854+
+- team start commands
855+
+- all-team Codex execution method
856+
+- Day Work / EOD Merge rule
857+
+- Build Path sync and tile overlay status governance
858+
+- deprecation workflow
859+
+- OWNER override and OWNER safety rules
860+
+
861+
+## Files Installed
862+
+
863+
+- `docs_build/dev/ProjectInstructions/README.txt`
864+
+- `docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md`
865+
+- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`
866+
+- `docs_build/dev/ProjectInstructions/addendums/build_path_sync.md`
867+
+- `docs_build/dev/ProjectInstructions/addendums/deprecation.md`
868+
+- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
869+
+- `docs_build/dev/ProjectInstructions/addendums/preservation.md`
870+
+- `docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md`
871+
+- `docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md`
872+
+- `docs_build/dev/ProjectInstructions/archive/README.md`
873+
+- `docs_build/dev/ProjectInstructions/archive/history/.gitkeep`
874+
+- `docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md`
875+
+- `docs_build/dev/ProjectInstructions/deprecation/README.md`
876+
+- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
877+
+
878+
+## Validation
879+
+
880+
+- `git diff --check`
881+
+- `git diff --cached --check`
882+
+- Physical tree verification for `docs_build/dev/ProjectInstructions/`
883+
+- Targeted text verification for OWNER override, OWNER safety rules, team registry, EOD merge rule, and required anchor files
884+
+
885+
+## Skipped Lanes
886+
+
887+
+- Playwright skipped: documentation-only installation.
888+
+- Samples skipped: documentation-only installation.
889+
+
890+
+## Package
891+
+
892+
+- `tmp/PR_26172_OWNER_017-project-instructions-bootstrap-install_delta.zip`

0 commit comments

Comments
 (0)