Skip to content

Commit 366f628

Browse files
ToolboxAidToolboxAid
committed
Align queue branch governance with execution guard - PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment
1 parent e8845da commit 366f628

7 files changed

Lines changed: 479 additions & 1652 deletions

‎docs_build/dev/PROJECT_INSTRUCTIONS.md‎

Lines changed: 69 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,60 @@ User:
9191
- Do not expand scope beyond the PR
9292
- Do not modify `start_of_day` folders unless requested
9393

94-
## MAIN BRANCH EXECUTION GUARD
94+
## EXECUTION BRANCH VALIDATION GUARD
9595

9696
Before any BUILD execution, Codex must verify the current git branch.
9797

9898
Rules:
99-
- The required execution branch is:
99+
- The default required execution branch is:
100100
- `main`
101-
- If the current branch is not `main`:
101+
- Queue initialization must start from `main`.
102+
- The first queue branch must be created from `main`.
103+
- Approved Sequential Codex Queue Mode branches are allowed after queue initialization.
104+
- Approved queue branch format:
105+
- `team/<TEAM>/<workstream>`
106+
- Queue branch examples:
107+
- `team/ALPHA/game-hub`
108+
- `team/BETA/messages`
109+
- `team/GAMMA/admin`
110+
- Sequential Queue Mode execution path:
111+
- `main`
112+
- create team queue branch
113+
- queue PR 001
114+
- queue PR 002
115+
- queue PR 003
116+
- owner review
117+
- EOD merge
118+
- Subsequent queued PRs may execute from the active approved team queue branch.
119+
- Start gate passes in queue mode only when:
120+
- current branch matches the approved queue branch
121+
- TEAM ownership matches the queue branch
122+
- repository is clean
123+
- PR scope stays inside TEAM ownership
124+
- Start gate fails when:
125+
- branch is neither `main` nor the approved queue branch
126+
- repository is dirty
127+
- TEAM ownership mismatches
128+
- cross-team work is attempted
129+
- If the current branch is neither `main` nor an approved Sequential Codex Queue Mode branch:
102130
- HARD STOP.
103131
- Do not create code changes.
104132
- Do not create implementation PRs.
105133
- Do not create ZIP artifacts.
106134
- Do not continue execution.
107135
- Codex must report:
108136
- current branch
109-
- expected branch (`main`)
137+
- expected branch (`main` by default, or approved `team/<TEAM>/<workstream>` in Sequential Codex Queue Mode)
110138
- local branches found
111-
- Codex may continue only after the user explicitly returns to `main`.
139+
- Codex may continue only after the user explicitly returns to `main` or identifies the approved queue branch for Sequential Codex Queue Mode.
112140

113141
Exception:
114142
- Explicit branch-audit or branch-comparison PRs may inspect non-main branches but must not perform implementation work on them.
115143

116144
Required report output:
117145
- Current branch
146+
- Expected branch
147+
- Queue mode active/inactive
118148
- Branch validation PASS/FAIL
119149

120150
## SLIDER VALUE VISIBILITY REQUIREMENT
@@ -1999,7 +2029,7 @@ Required workflow:
19992029
10. Create Pull Request automatically.
20002030
11. Resolve merge conflicts if encountered.
20012031
12. Re-run validation after conflict resolution.
2002-
13. Merge PR.
2032+
13. Merge PR only after explicit owner/EOD approval.
20032033
14. Return to main.
20042034
15. Pull latest main.
20052035
16. Continue to next approved PR.
@@ -2008,8 +2038,8 @@ Rules:
20082038
- Do not ask the user if a PR should be created.
20092039
- Do not ask the user if a branch should be pushed.
20102040
- Treat PR creation as required.
2011-
- Treat branch push as required.
2012-
- Treat merge as required after validation passes.
2041+
- Treat branch push as required for scoped PR branch publishing.
2042+
- Treat merge as required only after validation passes and explicit owner/EOD approval is provided.
20132043
- If GitHub prompts `Would you like to create a Pull Request?`, answer YES automatically.
20142044
- If merge conflicts occur:
20152045
- preserve latest main
@@ -2031,9 +2061,38 @@ Stable promotion and merge approval are owner-controlled.
20312061

20322062
Rules:
20332063
- Codex may prepare scoped changes, reports, validation evidence, ZIP artifacts, branches, and PRs.
2034-
- Codex must not merge a PR or mark a workstream stable without explicit approval from the assigned Team Alpha or Team Beta owner.
2064+
- Codex must not merge a PR or mark a workstream stable without explicit approval from the assigned Team Alpha, Team Beta, or Team Gamma owner.
20352065
- Master Control may recommend sequencing or assignment, but affected workstream owners control stable and merge approval.
20362066
- This targeted section supersedes older automatic-merge wording when approval ownership is in question.
2067+
- EOD merge and EOD push actions are owner-controlled and require explicit approval.
2068+
2069+
## SEQUENTIAL CODEX QUEUE BRANCH GOVERNANCE
2070+
2071+
Sequential Codex Queue Mode may use approved team queue branches only after initialization from `main`.
2072+
2073+
Rules:
2074+
- Queue initialization must start from `main`.
2075+
- The first queue branch must be created from `main`.
2076+
- Subsequent queued PRs may execute from the active approved team queue branch.
2077+
- Approved queue branch format is `team/<TEAM>/<workstream>`.
2078+
- Examples:
2079+
- `team/ALPHA/game-hub`
2080+
- `team/BETA/messages`
2081+
- `team/GAMMA/admin`
2082+
- Start gate PASS in queue mode requires:
2083+
- current branch matches the approved queue branch
2084+
- TEAM ownership matches the queue branch
2085+
- repository is clean
2086+
- PR scope stays inside TEAM ownership
2087+
- Start gate FAIL in queue mode when:
2088+
- branch is neither `main` nor the approved queue branch
2089+
- repository is dirty
2090+
- TEAM ownership mismatches
2091+
- cross-team work is attempted
2092+
- Cross-team work remains prohibited unless Master Control splits or assigns each PR to the correct TEAM token.
2093+
- Owner approval remains required.
2094+
- EOD merge remains required.
2095+
- Automatic merge wording must not override owner-controlled EOD approval.
20372096

20382097
## CODEX INSTRUCTION ENFORCEMENT START GATE
20392098

@@ -2051,7 +2110,7 @@ Required pre-change report:
20512110
- Any `FAIL` is a hard stop unless the PR explicitly scopes branch audit or recovery documentation without implementation.
20522111

20532112
Hard stops before changes:
2054-
- If the current branch is not `main`, HARD STOP.
2113+
- If the current branch is neither `main` nor an approved Sequential Codex Queue Mode branch, HARD STOP.
20552114
- If the repository is not clean before the PR branch is created, HARD STOP.
20562115
- If the PR name does not include a required TEAM token, HARD STOP.
20572116
- If the PR TEAM owner does not match the team ownership map in `PROJECT_MULTI_PC.txt`, HARD STOP.

‎docs_build/dev/PROJECT_MULTI_PC.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,30 @@ Governance, recovery, diagnostics, and instruction-hardening PRs:
524524
- Must document TEAM ownership compliance in the PR report.
525525
- Recovery reports must include TEAM ownership.
526526

527+
Sequential Codex Queue branch governance:
528+
- Queue initialization must start from `main`.
529+
- The first queue branch must be created from `main`.
530+
- Subsequent queued PRs may execute from the active approved team queue branch.
531+
- Approved queue branch format:
532+
- `team/<TEAM>/<workstream>`
533+
- Queue branch examples:
534+
- `team/ALPHA/game-hub`
535+
- `team/BETA/messages`
536+
- `team/GAMMA/admin`
537+
- Start gate PASS in queue mode requires:
538+
- current branch matches the approved queue branch
539+
- TEAM ownership matches the queue branch
540+
- repository is clean
541+
- PR scope stays inside TEAM ownership
542+
- Start gate FAIL in queue mode when:
543+
- branch is neither `main` nor the approved queue branch
544+
- repository is dirty
545+
- TEAM ownership mismatches
546+
- cross-team work is attempted
547+
- Cross-team work remains prohibited unless Master Control splits or assigns each PR to the correct TEAM token.
548+
- Owner approval remains required.
549+
- EOD merge remains required.
550+
527551
Stable and merge approval:
528552
- Stable promotion and merge approval are controlled by the assigned Team Alpha, Team Beta, or Team Gamma owner.
529553
- Master Control may recommend sequencing, but Codex must not merge or mark stable without explicit owner approval for the affected workstream.

‎docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment-instruction-compliance-checklist.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Instruction Compliance Checklist - PR_26171_GAMMA_008
2+
3+
- PR has one purpose only: PASS
4+
- Exact PR name provided: PASS
5+
- PR name includes TEAM token `GAMMA`: PASS
6+
- Exact branch name provided: PASS
7+
- Branch started from latest `main`: PASS
8+
- `docs_build/dev/PROJECT_INSTRUCTIONS.md` read before changes: PASS
9+
- `docs_build/dev/PROJECT_MULTI_PC.txt` read before changes: PASS
10+
- Instruction enforcement start gate run before changes: PASS
11+
- Repository clean before branch creation: PASS
12+
- TEAM ownership verified as Gamma governance/instruction-hardening work: PASS
13+
- Scope limited to requested governance docs: PASS
14+
- MAIN BRANCH EXECUTION GUARD modified, not removed: PASS
15+
- `main` remains valid/default execution branch: PASS
16+
- Approved queue branches valid only in Sequential Codex Queue Mode: PASS
17+
- TEAM ownership boundaries remain enforced: PASS
18+
- Owner-controlled EOD merge approval remains enforced: PASS
19+
- Required reports created: PASS
20+
- Manual validation notes created: PASS
21+
- ZIP required and pending final packaging: PASS
22+
- Playwright skipped with reason documented: PASS
23+
- Samples skipped with reason documented: PASS
24+
- PR merge withheld until explicit EOD approval: PASS

‎docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment-manual-validation-notes.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Manual Validation Notes - PR_26171_GAMMA_008
2+
3+
## Scope Review
4+
5+
Reviewed the governance docs after edit:
6+
- `docs_build/dev/PROJECT_INSTRUCTIONS.md`
7+
- `docs_build/dev/PROJECT_MULTI_PC.txt`
8+
9+
Confirmed:
10+
- The branch guard was modified and renamed, not removed.
11+
- `main` remains the default required execution branch.
12+
- Queue initialization must start from `main`.
13+
- The first queue branch must be created from `main`.
14+
- Subsequent queued PRs may execute from the active approved team queue branch.
15+
- Approved queue branch format is `team/<TEAM>/<workstream>`.
16+
- Queue examples include:
17+
- `team/ALPHA/game-hub`
18+
- `team/BETA/messages`
19+
- `team/GAMMA/admin`
20+
- Queue-mode start gate PASS requires:
21+
- current branch matches the approved queue branch
22+
- TEAM ownership matches the queue branch
23+
- repository is clean
24+
- PR scope stays inside TEAM ownership
25+
- Queue-mode start gate FAIL includes:
26+
- branch is neither `main` nor the approved queue branch
27+
- repository is dirty
28+
- TEAM ownership mismatches
29+
- cross-team work is attempted
30+
- Owner approval and EOD merge approval remain required.
31+
- Automatic merge wording does not override owner approval.
32+
33+
## Validation Notes
34+
35+
Static validation was sufficient because this PR updates governance documentation only.
36+
37+
Skipped lanes:
38+
- Playwright was not run because no UI route, component, or browser behavior changed.
39+
- Samples smoke was not run because samples are outside the requested docs/static validation scope.

‎docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment.md‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment
2+
3+
## Summary
4+
5+
This PR aligns Sequential Codex Queue Mode with the branch execution guard.
6+
7+
Scope completed:
8+
- Modified and renamed `MAIN BRANCH EXECUTION GUARD` to `EXECUTION BRANCH VALIDATION GUARD`.
9+
- Preserved `main` as the default required execution branch.
10+
- Added approved Sequential Codex Queue Mode branches as an allowed execution branch type after queue initialization.
11+
- Added approved queue branch format `team/<TEAM>/<workstream>` with Alpha, Beta, and Gamma examples.
12+
- Added queue-mode start gate PASS and FAIL criteria.
13+
- Preserved TEAM ownership boundaries and cross-team prohibition.
14+
- Preserved owner-controlled EOD merge approval.
15+
16+
## Start Gate
17+
18+
Instruction compliance start gate: PASS
19+
20+
- Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`: PASS
21+
- Read `docs_build/dev/PROJECT_MULTI_PC.txt`: PASS
22+
- Stopped current branch work before starting this PR: PASS
23+
- Checked out `main`: PASS
24+
- Pulled latest `main`: PASS
25+
- Verified current branch was `main` before creating PR branch: PASS
26+
- Verified repository was clean before creating PR branch: PASS
27+
- Created PR branch from `main`: PASS
28+
- PR name includes TEAM token `GAMMA`: PASS
29+
- TEAM ownership verified as Gamma governance/instruction-hardening scope: PASS
30+
- Base `main` commit: `e8845dae6`
31+
32+
## Git Workflow
33+
34+
- PR branch: `pr/26171-GAMMA-008-sequential-queue-branch-governance-alignment`
35+
- Branch created from: `main`
36+
- Branch push: PASS, pushed to `origin/pr/26171-GAMMA-008-sequential-queue-branch-governance-alignment`
37+
- Pull request: PASS, draft PR https://github.com/ToolboxAid/HTML-JavaScript-Gaming/pull/33
38+
- Merge status: not merged; EOD merge requires explicit owner approval
39+
- ZIP artifact path: `tmp/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment_delta.zip`
40+
41+
## Validation
42+
43+
Requested validation scope was docs/static only.
44+
45+
Executed:
46+
- `git diff --check`: PASS
47+
- Targeted text checks verifying the branch guard was modified and not removed.
48+
- Targeted text checks verifying `main` remains the default required execution branch.
49+
- Targeted text checks verifying approved queue branches are valid only in Sequential Codex Queue Mode.
50+
- Targeted text checks verifying TEAM ownership and cross-team restrictions remain enforced.
51+
- Targeted text checks verifying owner-controlled EOD merge approval remains enforced.
52+
53+
Skipped:
54+
- Playwright: skipped by request; this PR modifies governance docs only.
55+
- Samples smoke: skipped by request; this PR modifies governance docs only.
56+
57+
## Required Reports
58+
59+
- `docs_build/dev/reports/codex_review.diff`
60+
- `docs_build/dev/reports/codex_changed_files.txt`
61+
- `docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment.md`
62+
- `docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment-manual-validation-notes.md`
63+
- `docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment-instruction-compliance-checklist.md`

‎docs_build/dev/reports/codex_changed_files.txt‎

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,8 @@
1-
docs_build/dev/reports/codex_changed_files.txt
2-
docs_build/dev/reports/codex_review.diff
3-
docs_build/dev/reports/coverage_changed_js_guardrail.txt
4-
docs_build/dev/reports/dependency_gating_report.md
5-
docs_build/dev/reports/dependency_hydration_reuse_report.md
6-
docs_build/dev/reports/execution_graph_reuse_report.md
7-
docs_build/dev/reports/failure_fingerprint_report.md
8-
docs_build/dev/reports/filesystem_scan_reduction_report.md
9-
docs_build/dev/reports/incremental_validation_report.md
10-
docs_build/dev/reports/lane_compilation_report.md
11-
docs_build/dev/reports/lane_deduplication_report.md
12-
docs_build/dev/reports/lane_input_validation_report.md
13-
docs_build/dev/reports/lane_manifests/workspace-contract.json
14-
docs_build/dev/reports/lane_runtime_optimization_report.md
15-
docs_build/dev/reports/lane_snapshot_report.md
16-
docs_build/dev/reports/lane_snapshots/workspace-contract.json
17-
docs_build/dev/reports/lane_warm_start_report.md
18-
docs_build/dev/reports/lane_warm_starts/workspace-contract.json
19-
docs_build/dev/reports/monolith_trigger_removal_report.md
20-
docs_build/dev/reports/persistent_lane_manifest_report.md
21-
docs_build/dev/reports/playwright_discovery_ownership_report.md
22-
docs_build/dev/reports/playwright_discovery_scope_report.md
23-
docs_build/dev/reports/playwright_structure_audit.md
24-
docs_build/dev/reports/playwright_v8_coverage_report.txt
25-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction-instruction-compliance-checklist.md
26-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction-manual-validation-notes.md
27-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction-message-parent-child-table-checklist.md
28-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction-tts-summary-layout-checklist.md
29-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction-tts-tools-registration-checklist.md
30-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction-validation-report.md
31-
docs_build/dev/reports/PR_26171_BETA_073-message-tts-table-ui-correction.md
32-
docs_build/dev/reports/retry_suppression_report.md
33-
docs_build/dev/reports/slow_path_pruning_report.md
34-
docs_build/dev/reports/static_validation_report.md
35-
docs_build/dev/reports/targeted_file_manifest_report.md
36-
docs_build/dev/reports/test_cleanup_performance_report.md
37-
docs_build/dev/reports/test_cleanup_routing_report.md
38-
docs_build/dev/reports/testing_lane_execution_report.md
39-
docs_build/dev/reports/validation_cache_report.md
40-
docs_build/dev/reports/zero_browser_preflight_report.md
41-
src/shared/toolbox/tool-metadata-inventory.js
42-
tests/playwright/tools/MessagesTool.spec.mjs
43-
tests/playwright/tools/RootToolsFutureState.spec.mjs
44-
tests/playwright/tools/TextToSpeechFunctional.spec.mjs
45-
tests/playwright/tools/ToolboxRoutePages.spec.mjs
46-
toolbox/messages/index.html
47-
toolbox/messages/messages.js
48-
toolbox/text-to-speech/index.html
1+
M docs_build/dev/reports/PR_26171_GAMMA_008-sequential-queue-branch-governance-alignment.md
2+
3+
docs_build/dev/PROJECT_INSTRUCTIONS.md | 79 +++++++++++++++++++---
4+
docs_build/dev/PROJECT_MULTI_PC.txt | 24 +++++++
5+
...e-alignment-instruction-compliance-checklist.md | 24 +++++++
6+
...governance-alignment-manual-validation-notes.md | 39 +++++++++++
7+
...sequential-queue-branch-governance-alignment.md | 63 +++++++++++++++++
8+
5 files changed, 219 insertions(+), 10 deletions(-)

0 commit comments

Comments
 (0)