Merge remote-tracking branch 'origin/main' into codex/pr-26171-069-message-tts-profile-contract-alignment

# Conflicts:
#	docs_build/dev/reports/codex_changed_files.txt
#	docs_build/dev/reports/codex_review.diff

Author: ToolboxAid

docs_build/dev/PROJECT_INSTRUCTIONS.md

@@ -2009,6 +2009,16 @@ Required Git workflow report fields:
 - merge result
 - final main commit
 
+## OWNER-CONTROLLED STABLE AND MERGE APPROVAL
+
+Stable promotion and merge approval are owner-controlled.
+
+Rules:
+- Codex may prepare scoped changes, reports, validation evidence, ZIP artifacts, branches, and PRs.
+- Codex must not merge a PR or mark a workstream stable without explicit approval from the assigned Team Alpha or Team Beta owner.
+- Master Control may recommend sequencing or assignment, but affected workstream owners control stable and merge approval.
+- This targeted section supersedes older automatic-merge wording when approval ownership is in question.
+
 ## CODEX INSTRUCTION ENFORCEMENT START GATE
 
 Codex must run this gate before every PR execution and before any file changes.
@@ -2017,7 +2027,7 @@ Required instruction reads:
 - Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
 - Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
 - Treat the newest applicable section in `PROJECT_INSTRUCTIONS.md` as authoritative when rules overlap.
-- Treat the current owner/parity section in `PROJECT_MULTI_PC.txt` as authoritative for PC/Laptop routing.
+- Treat the current owner/parity section in `PROJECT_MULTI_PC.txt` as authoritative for Team Alpha / Team Beta routing.
 
 Required pre-change report:
 - Codex must report instruction compliance as `PASS` or `FAIL` before making file changes.
@@ -2027,7 +2037,7 @@ Required pre-change report:
 Hard stops before changes:
 - If the current branch is not `main`, HARD STOP.
 - If the repository is not clean before the PR branch is created, HARD STOP.
-- If the PR owner does not match the PC/Laptop ownership map in `PROJECT_MULTI_PC.txt`, HARD STOP.
+- If the PR owner does not match the Team Alpha / Team Beta ownership map in `PROJECT_MULTI_PC.txt`, HARD STOP.
 - If the PR number parity does not match the assigned machine in `PROJECT_MULTI_PC.txt`, HARD STOP.
 - If the PR asks for implementation and the implementation path is wrong, HARD STOP.
 - 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

@@ -11,7 +11,7 @@ Naming governance
 Workflow governance
 Environment strategy
 PR sequencing
-Merge approval
+Stable and merge approval
 
 It should never build code and never own implementation details.
 
@@ -22,12 +22,12 @@ Requirements
 Acceptance Criteria
 Dependencies
 Priority
-Owner (PC/Laptop)
+Owner (Team Alpha / Team Beta)
 Recommended Workstream Split
 
 Instead of arbitrary splits, split by Creator journey.
 
-PC — Creator Journey
+Team Alpha — Creator Journey
 
 Owns:
 
@@ -57,7 +57,7 @@ Reason:
 
 These tools are heavily connected.
 
-Laptop — Content Creation
+Team Beta — Content Creation
 
 Owns:
 
@@ -85,7 +85,7 @@ These tools share asset pipelines and publishing workflows.
 
 Messages Tool Placement
 
-I would move Messages to Laptop ownership.
+I would move Messages to Team Beta ownership.
 
 Reason:
 
@@ -191,7 +191,7 @@ Immediate Queue
 
 If we start using Master Control today, my queue would be:
 
-PC
+Team Alpha
 PR_26171_001-game-journey-completion-model
 
 Scope:
@@ -205,7 +205,7 @@ Sounds [17]
 
 This solves the "xxx%" problem.
 
-Laptop
+Team Beta
 PR_26171_002-messages-tool-foundation
 
 Scope:
@@ -282,7 +282,7 @@ Not developer.
 
 ---
 
-## PC Chat
+## Team Alpha Chat
 
 Give it ownership of a workstream.
 
@@ -309,7 +309,7 @@ it keeps building in that area.
 
 ---
 
-## Laptop Chat
+## Team Beta Chat
 
 Give it a different workstream.
 
@@ -371,13 +371,13 @@ So I'd keep IST mostly as infrastructure work and focus development on tool comp
 Master Control should assign ownership:
 
 ```text
-PC
+Team Alpha
   Game Journey
   Game Hub
   Publish
   Share
 
-Laptop
+Team Beta
   Audio
   MIDI
   Events
@@ -405,7 +405,7 @@ feature/game-hub
 feature/progress-tracking
 ```
 
-Never have both PCs working in the same tool at the same time.
+Never have both teams working in the same tool at the same time.
 
 ---
 
@@ -418,19 +418,19 @@ For example, in Master Control you can ask:
 ```text
 Given everything we know about GFS:
 
-What should PC build next?
-What should Laptop build next?
+What should Team Alpha build next?
+What should Team Beta build next?
 
 Generate the next PR for each.
 ```
 
 Then Master Control outputs:
 
 ```text
-PC:
+Team Alpha:
 PR_26171_002-game-hub-progress
 
-Laptop:
+Team Beta:
 PR_26171_003-messages-tool-mvp
 ```
 
@@ -457,17 +457,17 @@ Codex must read this file before every PR execution.
 
 Machine parity:
 
-PC / Environment 1:
+Team Alpha / Environment 1:
 - Uses even-numbered PR sequence values.
 - Example: `PR_26171_064-*`.
 
-Laptop / Environment 2:
+Team Beta / Environment 2:
 - Uses odd-numbered PR sequence values.
 - Example: `PR_26171_063-*`.
 
 Owner map:
 
-PC / Environment 1 owns Creator Journey work:
+Team Alpha / Environment 1 owns Creator Journey work:
 - Game Journey
 - Game Hub
 - Idea
@@ -483,7 +483,7 @@ PC / Environment 1 owns Creator Journey work:
 - Game Design
 - Game Crew
 
-Laptop / Environment 2 owns Content Creation and asset/publishing work:
+Team Beta / Environment 2 owns Content Creation and asset/publishing work:
 - Graphics
 - Toolbox images
 - Audio
@@ -501,8 +501,12 @@ Governance, recovery, diagnostics, and instruction-hardening PRs:
 - Must not implement tool/runtime work from the opposite owner.
 - Must document owner/parity compliance in the PR report.
 
+Stable and merge approval:
+- Stable promotion and merge approval are controlled by the assigned Team Alpha or Team Beta owner.
+- Master Control may recommend sequencing, but Codex must not merge or mark stable without explicit owner approval for the affected workstream.
+
 Hard stop rules:
 - If the PR number parity does not match the current machine, stop before changes.
 - If the PR scope belongs to the other machine owner, stop before changes.
-- If the PR crosses PC and Laptop ownership, stop and require Master Control to split or assign the work.
+- If the PR crosses Team Alpha and Team Beta ownership, stop and require Master Control to split or assign the work.
 - If the requested implementation path conflicts with the active owner path, stop before changes.

docs_build/dev/reports/PR_26171_071-conflicted-files-before-cleanup.txt

@@ -0,0 +1,2 @@
+docs_build/dev/reports/codex_changed_files.txt
+docs_build/dev/reports/codex_review.diff

docs_build/dev/reports/PR_26171_071-discarded-unrelated-work-report.md

@@ -0,0 +1,60 @@
+# PR_26171_071 Discarded / Unrelated Work Report
+
+## Pre-cleanup State
+
+The active merge had unrelated staged payload from upstream PR_26171_044 / PR_26171_067 and two singleton report conflicts.
+
+```text
+## main...origin/main [ahead 1, behind 4]
+A  docs_build/dev/reports/PR_26171_067-instruction-compliance-checklist.md
+A  docs_build/dev/reports/PR_26171_067-manual-validation-notes.md
+A  docs_build/dev/reports/PR_26171_067-message-tts-contract-checklist.md
+A  docs_build/dev/reports/PR_26171_067-parent-child-table-checklist.md
+A  docs_build/dev/reports/PR_26171_067-tts-profile-emotion-table-foundation.md
+A  docs_build/dev/reports/PR_26171_067-validation.md
+UU docs_build/dev/reports/codex_changed_files.txt
+UU docs_build/dev/reports/codex_review.diff
+M  docs_build/dev/reports/coverage_changed_js_guardrail.txt
+M  docs_build/dev/reports/playwright_v8_coverage_report.txt
+A  docs_build/pr/PR_26171_044-idea-board-game-hub-project-flow/APPLY_PR.md
+A  docs_build/pr/PR_26171_044-idea-board-game-hub-project-flow/BUILD_PR.md
+A  docs_build/pr/PR_26171_044-idea-board-game-hub-project-flow/PLAN_PR.md
+M  src/dev-runtime/persistence/tool-repositories/game-workspace-mock-repository.js
+M  tests/playwright/tools/GameWorkspaceMockRepository.spec.mjs
+M  tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
+M  tests/playwright/tools/TextToSpeechFunctional.spec.mjs
+M  tests/playwright/tools/ToolboxRoutePages.spec.mjs
+M  tests/tools/Text2SpeechShell.test.mjs
+M  toolbox/game-workspace/game-workspace.js
+M  toolbox/game-workspace/index.html
+M  toolbox/idea-board/index.html
+M  toolbox/idea-board/index.js
+M  toolbox/text-to-speech/index.html
+M  toolbox/text-to-speech/text2speech.js
+```
+
+## Conflicted Files
+
+```text
+docs_build/dev/reports/codex_changed_files.txt
+docs_build/dev/reports/codex_review.diff
+```
+
+## Untracked Files Before Cleanup
+
+```text
+(none)
+```
+
+## Recording Before Cleanup
+
+- Full pre-cleanup recovery patch: `docs_build/dev/reports/PR_26171_071-recovery-precleanup.patch.md`.
+- Pre-cleanup status: `docs_build/dev/reports/PR_26171_071-status-before-cleanup.txt`.
+- Pre-cleanup conflicted file list: `docs_build/dev/reports/PR_26171_071-conflicted-files-before-cleanup.txt`.
+- Pre-cleanup untracked file list: `docs_build/dev/reports/PR_26171_071-untracked-files-before-cleanup.txt`.
+
+## Cleanup Decision
+
+The unrelated staged PR_26171_044 / PR_26171_067 work was removed from the index by aborting the interrupted merge. Latest upstream history was then reapplied through `git pull --rebase origin main`, so upstream committed work remains as history instead of as unresolved staged changes.
+
+No Message/TTS implementation files were edited by this recovery PR.

docs_build/dev/reports/PR_26171_071-manual-validation-notes.md

@@ -0,0 +1,77 @@
+# PR_26171_071 Manual Validation Notes
+
+## Commands Run
+
+- `git status`
+- `git log --oneline -5`
+- `git diff --check`
+
+## git status
+
+```text
+On branch main
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   docs_build/dev/reports/codex_changed_files.txt
+	modified:   docs_build/dev/reports/codex_review.diff
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	docs_build/dev/reports/PR_26171_071-conflicted-files-before-cleanup.txt
+	docs_build/dev/reports/PR_26171_071-discarded-unrelated-work-report.md
+	docs_build/dev/reports/PR_26171_071-manual-validation-notes.md
+	docs_build/dev/reports/PR_26171_071-merge-conflict-recovery-report.md
+	docs_build/dev/reports/PR_26171_071-preserved-local-commit-report.md
+	docs_build/dev/reports/PR_26171_071-recovery-precleanup.patch.md
+	docs_build/dev/reports/PR_26171_071-status-before-cleanup.txt
+	docs_build/dev/reports/PR_26171_071-untracked-files-before-cleanup.txt
+
+no changes added to commit (use "git add" and/or "git commit -a")
+```
+
+## git log --oneline -5
+
+```text
+7dfb6ea5f Add multi-team merge authority governance - PR_26171_046-multi-team-merge-authority
+decd37141 PR_26171_044 Idea Board Game Hub project flow
+485e96c69 Merge remote-tracking branch 'origin/main' into codex/pr-26171-044-idea-board-game-hub-project-flow
+2a38796f8 Wire Idea Board projects into Game Hub
+83fa8ad9d PR_26171_067 tts profile emotion table foundation
+```
+
+## git diff --check
+
+Result: PASS
+
+```text
+(no output)
+```
+
+## ZIP Evidence
+
+- ZIP path: `tmp/PR_26171_071-main-merge-conflict-recovery_delta.zip`
+- ZIP contents:
+  - docs_build/dev/reports/codex_review.diff
+  - docs_build/dev/reports/codex_changed_files.txt
+  - docs_build/dev/reports/PR_26171_071-merge-conflict-recovery-report.md
+  - docs_build/dev/reports/PR_26171_071-preserved-local-commit-report.md
+  - docs_build/dev/reports/PR_26171_071-discarded-unrelated-work-report.md
+  - docs_build/dev/reports/PR_26171_071-manual-validation-notes.md
+  - docs_build/dev/reports/PR_26171_071-recovery-precleanup.patch.md
+  - docs_build/dev/reports/PR_26171_071-status-before-cleanup.txt
+  - docs_build/dev/reports/PR_26171_071-conflicted-files-before-cleanup.txt
+  - docs_build/dev/reports/PR_26171_071-untracked-files-before-cleanup.txt
+
+## Manual Notes
+
+- Active merge source was inspected and recorded before cleanup.
+- Conflict files were identified as `docs_build/dev/reports/codex_changed_files.txt` and `docs_build/dev/reports/codex_review.diff`.
+- Local commit `390912b56` was preserved by branch before cleanup.
+- The active merge was aborted safely.
+- Latest `origin/main` was synced with rebase, preserving the governance commit as `7dfb6ea5f14e23f87d556bc7448e35cd95866d48`.
+- No Message/TTS implementation work was performed in this PR.
+- Playwright impacted: No, recovery/reporting workflow only.