Skip to content

Commit 7dfb6ea

Browse files
committed
Add multi-team merge authority governance - PR_26171_046-multi-team-merge-authority
1 parent decd371 commit 7dfb6ea

5 files changed

Lines changed: 321 additions & 1287 deletions

File tree

docs_build/dev/PROJECT_INSTRUCTIONS.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,6 +2009,16 @@ Required Git workflow report fields:
20092009
- merge result
20102010
- final main commit
20112011

2012+
## OWNER-CONTROLLED STABLE AND MERGE APPROVAL
2013+
2014+
Stable promotion and merge approval are owner-controlled.
2015+
2016+
Rules:
2017+
- Codex may prepare scoped changes, reports, validation evidence, ZIP artifacts, branches, and PRs.
2018+
- Codex must not merge a PR or mark a workstream stable without explicit approval from the assigned Team Alpha or Team Beta owner.
2019+
- Master Control may recommend sequencing or assignment, but affected workstream owners control stable and merge approval.
2020+
- This targeted section supersedes older automatic-merge wording when approval ownership is in question.
2021+
20122022
## CODEX INSTRUCTION ENFORCEMENT START GATE
20132023

20142024
Codex must run this gate before every PR execution and before any file changes.
@@ -2017,7 +2027,7 @@ Required instruction reads:
20172027
- Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
20182028
- Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
20192029
- Treat the newest applicable section in `PROJECT_INSTRUCTIONS.md` as authoritative when rules overlap.
2020-
- Treat the current owner/parity section in `PROJECT_MULTI_PC.txt` as authoritative for PC/Laptop routing.
2030+
- Treat the current owner/parity section in `PROJECT_MULTI_PC.txt` as authoritative for Team Alpha / Team Beta routing.
20212031

20222032
Required pre-change report:
20232033
- Codex must report instruction compliance as `PASS` or `FAIL` before making file changes.
@@ -2027,7 +2037,7 @@ Required pre-change report:
20272037
Hard stops before changes:
20282038
- If the current branch is not `main`, HARD STOP.
20292039
- If the repository is not clean before the PR branch is created, HARD STOP.
2030-
- If the PR owner does not match the PC/Laptop ownership map in `PROJECT_MULTI_PC.txt`, HARD STOP.
2040+
- If the PR owner does not match the Team Alpha / Team Beta ownership map in `PROJECT_MULTI_PC.txt`, HARD STOP.
20312041
- If the PR number parity does not match the assigned machine in `PROJECT_MULTI_PC.txt`, HARD STOP.
20322042
- If the PR asks for implementation and the implementation path is wrong, HARD STOP.
20332043
- If a PR asks for functional parity and only placeholder-only work is possible, HARD STOP and report the missing source or blocker.

docs_build/dev/PROJECT_MULTI_PC.txt

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Naming governance
1111
Workflow governance
1212
Environment strategy
1313
PR sequencing
14-
Merge approval
14+
Stable and merge approval
1515

1616
It should never build code and never own implementation details.
1717

@@ -22,12 +22,12 @@ Requirements
2222
Acceptance Criteria
2323
Dependencies
2424
Priority
25-
Owner (PC/Laptop)
25+
Owner (Team Alpha / Team Beta)
2626
Recommended Workstream Split
2727

2828
Instead of arbitrary splits, split by Creator journey.
2929

30-
PC — Creator Journey
30+
Team Alpha — Creator Journey
3131

3232
Owns:
3333

@@ -57,7 +57,7 @@ Reason:
5757

5858
These tools are heavily connected.
5959

60-
Laptop — Content Creation
60+
Team Beta — Content Creation
6161

6262
Owns:
6363

@@ -85,7 +85,7 @@ These tools share asset pipelines and publishing workflows.
8585

8686
Messages Tool Placement
8787

88-
I would move Messages to Laptop ownership.
88+
I would move Messages to Team Beta ownership.
8989

9090
Reason:
9191

@@ -191,7 +191,7 @@ Immediate Queue
191191

192192
If we start using Master Control today, my queue would be:
193193

194-
PC
194+
Team Alpha
195195
PR_26171_001-game-journey-completion-model
196196

197197
Scope:
@@ -205,7 +205,7 @@ Sounds [17]
205205

206206
This solves the "xxx%" problem.
207207

208-
Laptop
208+
Team Beta
209209
PR_26171_002-messages-tool-foundation
210210

211211
Scope:
@@ -282,7 +282,7 @@ Not developer.
282282

283283
---
284284

285-
## PC Chat
285+
## Team Alpha Chat
286286

287287
Give it ownership of a workstream.
288288

@@ -309,7 +309,7 @@ it keeps building in that area.
309309

310310
---
311311

312-
## Laptop Chat
312+
## Team Beta Chat
313313

314314
Give it a different workstream.
315315

@@ -371,13 +371,13 @@ So I'd keep IST mostly as infrastructure work and focus development on tool comp
371371
Master Control should assign ownership:
372372

373373
```text
374-
PC
374+
Team Alpha
375375
Game Journey
376376
Game Hub
377377
Publish
378378
Share
379379

380-
Laptop
380+
Team Beta
381381
Audio
382382
MIDI
383383
Events
@@ -405,7 +405,7 @@ feature/game-hub
405405
feature/progress-tracking
406406
```
407407

408-
Never have both PCs working in the same tool at the same time.
408+
Never have both teams working in the same tool at the same time.
409409

410410
---
411411

@@ -418,19 +418,19 @@ For example, in Master Control you can ask:
418418
```text
419419
Given everything we know about GFS:
420420

421-
What should PC build next?
422-
What should Laptop build next?
421+
What should Team Alpha build next?
422+
What should Team Beta build next?
423423

424424
Generate the next PR for each.
425425
```
426426

427427
Then Master Control outputs:
428428

429429
```text
430-
PC:
430+
Team Alpha:
431431
PR_26171_002-game-hub-progress
432432

433-
Laptop:
433+
Team Beta:
434434
PR_26171_003-messages-tool-mvp
435435
```
436436

@@ -457,17 +457,17 @@ Codex must read this file before every PR execution.
457457

458458
Machine parity:
459459

460-
PC / Environment 1:
460+
Team Alpha / Environment 1:
461461
- Uses even-numbered PR sequence values.
462462
- Example: `PR_26171_064-*`.
463463

464-
Laptop / Environment 2:
464+
Team Beta / Environment 2:
465465
- Uses odd-numbered PR sequence values.
466466
- Example: `PR_26171_063-*`.
467467

468468
Owner map:
469469

470-
PC / Environment 1 owns Creator Journey work:
470+
Team Alpha / Environment 1 owns Creator Journey work:
471471
- Game Journey
472472
- Game Hub
473473
- Idea
@@ -483,7 +483,7 @@ PC / Environment 1 owns Creator Journey work:
483483
- Game Design
484484
- Game Crew
485485

486-
Laptop / Environment 2 owns Content Creation and asset/publishing work:
486+
Team Beta / Environment 2 owns Content Creation and asset/publishing work:
487487
- Graphics
488488
- Toolbox images
489489
- Audio
@@ -501,8 +501,12 @@ Governance, recovery, diagnostics, and instruction-hardening PRs:
501501
- Must not implement tool/runtime work from the opposite owner.
502502
- Must document owner/parity compliance in the PR report.
503503

504+
Stable and merge approval:
505+
- Stable promotion and merge approval are controlled by the assigned Team Alpha or Team Beta owner.
506+
- Master Control may recommend sequencing, but Codex must not merge or mark stable without explicit owner approval for the affected workstream.
507+
504508
Hard stop rules:
505509
- If the PR number parity does not match the current machine, stop before changes.
506510
- If the PR scope belongs to the other machine owner, stop before changes.
507-
- If the PR crosses PC and Laptop ownership, stop and require Master Control to split or assign the work.
511+
- If the PR crosses Team Alpha and Team Beta ownership, stop and require Master Control to split or assign the work.
508512
- If the requested implementation path conflicts with the active owner path, stop before changes.
Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,5 @@
1-
PR_26171_044-idea-board-game-hub-project-flow
2-
3-
Changed files:
4-
- docs_build/pr/PR_26171_044-idea-board-game-hub-project-flow/PLAN_PR.md
5-
- docs_build/pr/PR_26171_044-idea-board-game-hub-project-flow/BUILD_PR.md
6-
- docs_build/pr/PR_26171_044-idea-board-game-hub-project-flow/APPLY_PR.md
7-
- docs_build/dev/reports/codex_review.diff
8-
- docs_build/dev/reports/codex_changed_files.txt
9-
- src/dev-runtime/persistence/tool-repositories/game-workspace-mock-repository.js
10-
- tests/playwright/tools/GameWorkspaceMockRepository.spec.mjs
11-
- tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
12-
- tests/playwright/tools/ToolboxRoutePages.spec.mjs
13-
- toolbox/game-workspace/game-workspace.js
14-
- toolbox/game-workspace/index.html
15-
- toolbox/idea-board/index.html
16-
- toolbox/idea-board/index.js
17-
18-
Requirement PASS evidence:
19-
- PASS: Create Project appears only for Ready ideas. Evidence: Idea Board actions remain Edit/Create Project/Delete for Ready rows and switch to Open in Game Hub/Archive after creation in targeted Playwright.
20-
- PASS: Create Project uses the shared Game Hub project contract. Evidence: Idea Board calls the existing game-workspace server repository client createGame method; Playwright asserts the createGame repository request occurs.
21-
- PASS: Create Project sets Idea status to Project. Evidence: targeted Playwright asserts the row status becomes Project.
22-
- PASS: Project ideas and notes are read-only. Evidence: targeted Playwright asserts no Edit/Delete/Add Note/note actions remain for the Project row.
23-
- PASS: Project row actions are Open in Game Hub and Archive. Evidence: targeted Playwright asserts exact action labels.
24-
- PASS: Project ideas cannot be edited or deleted while Project. Evidence: Project rows do not render Edit/Delete actions and deletion guard remains active.
25-
- PASS: Project ideas cannot add/edit/delete notes. Evidence: expanded Project notes render without Add Note or note actions.
26-
- PASS: Archived ideas remain hidden by default and show Restore/Delete when visible. Evidence: targeted Playwright archives, shows Archived through the filter, and asserts Restore/Delete.
27-
- PASS: Game Hub shows creator-facing Project Information. Evidence: Game Hub HTML/JS replaces internal record display with Project Information and targeted Game Hub Playwright passes.
28-
- PASS: Game Hub shows read-only Source Idea fields. Evidence: Idea Board-to-Game Hub Playwright asserts Idea, Pitch, and Notes from the source idea render in Game Hub.
29-
- PASS: Game Hub avoids internal IDs, DB/API/mock/debug/seed wording in creator-facing display. Evidence: touched runtime files pass creator-visible text scan and targeted Playwright checks the navigated Game Hub main content.
30-
- PASS: Open in Game Hub navigates to the related project. Evidence: targeted Playwright waits for /toolbox/game-workspace/index.html?game=lantern-reef-* and asserts the linked project renders.
31-
- PASS: No Game Journey expansion beyond existing link/reference. Evidence: implementation does not add Game Journey creation or new journey wiring.
32-
33-
Validation evidence:
34-
- PASS: node --check toolbox/idea-board/index.js
35-
- PASS: node --check toolbox/game-workspace/game-workspace.js
36-
- PASS: node --check toolbox/game-workspace/game-workspace-api-client.js
37-
- PASS: node --check src/dev-runtime/persistence/tool-repositories/game-workspace-mock-repository.js
38-
- PASS: node --check tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
39-
- PASS: node --check tests/playwright/tools/ToolboxRoutePages.spec.mjs
40-
- PASS: node --check tests/playwright/tools/GameWorkspaceMockRepository.spec.mjs
41-
- PASS: npx playwright test tests/playwright/tools/IdeaBoardTableNotes.spec.mjs --project=playwright --workers=1 --reporter=line
42-
- PASS: npx playwright test tests/playwright/tools/ToolboxRoutePages.spec.mjs --project=playwright --workers=1 --reporter=line --grep "Idea Board launches"
43-
- PASS: npx playwright test tests/playwright/tools/GameWorkspaceMockRepository.spec.mjs --project=playwright --workers=1 --reporter=line --grep "Game Hub"
44-
- PASS: npm run test:workspace-v2
45-
- PASS: git diff --check
46-
47-
Git workflow:
48-
- Current branch: codex/pr-26171-044-idea-board-game-hub-project-flow
49-
- Created branch: codex/pr-26171-044-idea-board-game-hub-project-flow
50-
- Commit hash: 2a38796f81aae2dceb4151095b8f89a276cd2d32
51-
- Push result: pushed to origin/codex/pr-26171-044-idea-board-game-hub-project-flow
52-
- PR URL: https://github.com/ToolboxAid/HTML-JavaScript-Gaming/pull/22
53-
- Merge result: to be reported after merge
54-
- Final main commit: to be reported after returning to main and pulling latest
1+
docs_build/dev/PROJECT_INSTRUCTIONS.md
2+
docs_build/dev/PROJECT_MULTI_PC.txt
3+
docs_build/dev/reports/codex_review.diff
4+
docs_build/dev/reports/codex_changed_files.txt
5+
docs_build/dev/reports/team_alpha_beta_owner_approval_report.md

0 commit comments

Comments
 (0)