Skip to content

Commit 869e71a

Browse files
committed
Add GitHub authoritative workstream sync - PR_26171_GAMMA_009-github-authoritative-workstream-sync
1 parent e8845da commit 869e71a

7 files changed

Lines changed: 402 additions & 1645 deletions

docs_build/dev/PROJECT_INSTRUCTIONS.md

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,7 +2009,9 @@ Rules:
20092009
- Do not ask the user if a branch should be pushed.
20102010
- Treat PR creation as required.
20112011
- Treat branch push as required.
2012-
- Treat merge as required after validation passes.
2012+
- Treat merge as required only after validation passes and explicit owner/EOD approval is provided.
2013+
- Local-only commits are prohibited as completed workstream state.
2014+
- Every completed PR scope must be committed and pushed before Codex continues to another PR.
20132015
- If GitHub prompts `Would you like to create a Pull Request?`, answer YES automatically.
20142016
- If merge conflicts occur:
20152017
- preserve latest main
@@ -2025,15 +2027,58 @@ Required Git workflow report fields:
20252027
- merge result
20262028
- final main commit
20272029

2030+
## GITHUB AUTHORITATIVE WORKSTREAM RULE
2031+
2032+
GitHub is the authoritative workstream record.
2033+
2034+
Rules:
2035+
- GitHub branches, commits, and pull requests are the authoritative record for active and completed Codex workstreams.
2036+
- Local-only commits are prohibited.
2037+
- A PR scope is not complete until its scoped changes are committed and pushed to GitHub.
2038+
- Every completed PR scope must be committed and pushed before Codex continues to another PR.
2039+
- Push failure is a hard stop until resolved.
2040+
- A branch ahead of origin is a hard stop because it contains unpushed commits.
2041+
- Detached HEAD execution is prohibited for PR work.
2042+
- Ownership mismatch is a hard stop.
2043+
- This rule does not authorize merging.
2044+
- EOD merge approval remains owner-controlled and requires explicit approval.
2045+
2046+
Start-gate sync validation:
2047+
- PASS when:
2048+
- current branch is not detached
2049+
- repository is clean
2050+
- current branch has an origin upstream
2051+
- `local == origin`
2052+
- local branch HEAD equals origin branch HEAD
2053+
- TEAM ownership matches the requested PR scope
2054+
- FAIL when:
2055+
- current branch is detached HEAD
2056+
- repository is dirty
2057+
- branch is ahead of origin
2058+
- branch has unpushed commits
2059+
- local branch HEAD does not equal origin branch HEAD
2060+
- push failure is unresolved
2061+
- TEAM ownership mismatches the requested PR scope
2062+
2063+
Required report output:
2064+
- current branch
2065+
- upstream branch
2066+
- local commit
2067+
- origin commit
2068+
- local/origin sync PASS/FAIL
2069+
- push result
2070+
- TEAM ownership PASS/FAIL
2071+
20282072
## OWNER-CONTROLLED STABLE AND MERGE APPROVAL
20292073

20302074
Stable promotion and merge approval are owner-controlled.
20312075

20322076
Rules:
20332077
- 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.
2078+
- 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.
20352079
- Master Control may recommend sequencing or assignment, but affected workstream owners control stable and merge approval.
20362080
- This targeted section supersedes older automatic-merge wording when approval ownership is in question.
2081+
- EOD merge approval remains owner-controlled and requires explicit approval.
20372082

20382083
## CODEX INSTRUCTION ENFORCEMENT START GATE
20392084

@@ -2047,12 +2092,16 @@ Required instruction reads:
20472092

20482093
Required pre-change report:
20492094
- Codex must report instruction compliance as `PASS` or `FAIL` before making file changes.
2050-
- The report must include branch, clean status, PR TEAM owner, implementation path, validation scope, required report list, and ZIP requirement.
2095+
- The report must include branch, upstream branch, local/origin sync status, clean status, PR TEAM owner, implementation path, validation scope, required report list, and ZIP requirement.
20512096
- Any `FAIL` is a hard stop unless the PR explicitly scopes branch audit or recovery documentation without implementation.
20522097

20532098
Hard stops before changes:
20542099
- If the current branch is not `main`, HARD STOP.
20552100
- If the repository is not clean before the PR branch is created, HARD STOP.
2101+
- If the current branch is detached HEAD, HARD STOP.
2102+
- If local branch HEAD does not equal origin branch HEAD, HARD STOP.
2103+
- If the current branch is ahead of origin or has unpushed commits, HARD STOP.
2104+
- If a previous push failed and remains unresolved, HARD STOP.
20562105
- If the PR name does not include a required TEAM token, HARD STOP.
20572106
- If the PR TEAM owner does not match the team ownership map in `PROJECT_MULTI_PC.txt`, HARD STOP.
20582107
- If the PR asks for implementation and the implementation path is wrong, HARD STOP.

docs_build/dev/PROJECT_MULTI_PC.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,31 @@ 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+
GitHub Authoritative Workstream Rule:
528+
- GitHub is the authoritative workstream record.
529+
- GitHub branches, commits, and pull requests are the authoritative record for active and completed Codex workstreams.
530+
- Local-only commits are prohibited.
531+
- Every completed PR scope must be committed and pushed before Codex continues to another PR.
532+
- Start-gate sync validation is PASS only when the branch is clean and `local == origin`, meaning local HEAD equals origin HEAD.
533+
- Start-gate sync validation is FAIL when:
534+
- branch is ahead of origin
535+
- branch has unpushed commits
536+
- current branch is detached HEAD
537+
- push failure is unresolved
538+
- TEAM ownership mismatches the requested PR scope
539+
- Branch ahead of origin is a hard stop.
540+
- Push failure is a hard stop until resolved.
541+
- Ownership mismatch is a hard stop.
542+
- EOD merge approval remains owner-controlled and requires explicit approval.
543+
527544
Stable and merge approval:
528545
- Stable promotion and merge approval are controlled by the assigned Team Alpha, Team Beta, or Team Gamma owner.
529546
- Master Control may recommend sequencing, but Codex must not merge or mark stable without explicit owner approval for the affected workstream.
530547

531548
Hard stop rules:
532549
- If the PR name does not include a TEAM token, stop before changes.
533550
- If the TEAM token does not match the owner map or explicit Master Control assignment, stop before changes.
551+
- If branch sync validation fails, stop before changes.
534552
- If the PR scope belongs to another TEAM owner, stop before changes.
535553
- If the PR crosses multiple team ownership areas, stop and require Master Control to split or assign the work.
536554
- If the requested implementation path conflicts with the active owner path, stop before changes.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Instruction Compliance Checklist - PR_26171_GAMMA_009
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+
- `main` local/origin sync verified before branch creation: PASS
13+
- TEAM ownership verified as Gamma governance/instruction-hardening work: PASS
14+
- Scope limited to requested governance docs: PASS
15+
- GitHub authoritative workstream rule added: PASS
16+
- Local-only commits prohibited: PASS
17+
- Completed PR scopes require commit and push before continuing: PASS
18+
- Start-gate sync validation added: PASS
19+
- Branch ahead of origin hard stop added: PASS
20+
- Owner-controlled EOD merge approval preserved: PASS
21+
- Runtime code unchanged: PASS
22+
- Required reports created: PASS
23+
- Manual validation notes created: PASS
24+
- ZIP required and pending final packaging: PASS
25+
- Playwright skipped with reason documented: PASS
26+
- Samples skipped with reason documented: PASS
27+
- PR merge withheld until explicit EOD approval: PASS
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Manual Validation Notes - PR_26171_GAMMA_009
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+
- GitHub is declared as the authoritative workstream record.
11+
- Local-only commits are prohibited.
12+
- Completed PR scopes must be committed and pushed before continuing.
13+
- Start-gate sync validation PASS requires a clean branch and `local == origin`.
14+
- Start-gate sync validation FAIL includes branch ahead of origin, unpushed commits, detached HEAD, unresolved push failure, and ownership mismatch.
15+
- Branch ahead of origin is a hard stop.
16+
- Runtime code was not changed.
17+
- EOD merge approval remains owner-controlled and requires explicit approval.
18+
19+
## Validation Notes
20+
21+
Static validation was sufficient because this PR updates governance documentation only.
22+
23+
Skipped lanes:
24+
- Playwright was not run because no UI route, component, or browser behavior changed.
25+
- Samples smoke was not run because samples are outside the requested docs/static validation scope.
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# PR_26171_GAMMA_009-github-authoritative-workstream-sync
2+
3+
## Summary
4+
5+
This PR adds GitHub Authoritative Workstream governance to the project instructions.
6+
7+
Scope completed:
8+
- Added `GitHub is the authoritative workstream record` to `PROJECT_INSTRUCTIONS.md`.
9+
- Added matching GitHub authoritative workstream guidance to `PROJECT_MULTI_PC.txt`.
10+
- Prohibited local-only commits as completed workstream state.
11+
- Required every completed PR scope to be committed and pushed before continuing.
12+
- Added start-gate sync validation PASS and FAIL criteria.
13+
- Added hard stops for detached HEAD, local/origin mismatch, branch ahead of origin, unresolved push failure, and ownership mismatch.
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+
- Checked out `main`: PASS
23+
- Pulled latest `main`: PASS
24+
- Verified current branch was `main` before creating PR branch: PASS
25+
- Verified repository was clean before creating PR branch: PASS
26+
- Verified `main` local/origin sync was `0 0`: 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-009-github-authoritative-workstream-sync`
35+
- Branch created from: `main`
36+
- Branch push: pending at initial report generation
37+
- Pull request: pending at initial report generation
38+
- Merge status: not merged; EOD merge requires explicit owner approval
39+
- ZIP artifact path: `tmp/PR_26171_GAMMA_009-github-authoritative-workstream-sync_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 check verifying `GitHub is the authoritative workstream record` exists.
48+
- Targeted text check verifying local-only commits are prohibited.
49+
- Targeted text check verifying branch ahead of origin is a hard stop.
50+
- Targeted text check verifying owner-controlled EOD merge approval remains enforced.
51+
52+
Skipped:
53+
- Playwright: skipped by request; this PR modifies governance docs only.
54+
- Samples smoke: skipped by request; this PR modifies governance docs only.
55+
56+
## Required Reports
57+
58+
- `docs_build/dev/reports/codex_review.diff`
59+
- `docs_build/dev/reports/codex_changed_files.txt`
60+
- `docs_build/dev/reports/PR_26171_GAMMA_009-github-authoritative-workstream-sync.md`
61+
- `docs_build/dev/reports/PR_26171_GAMMA_009-github-authoritative-workstream-sync-manual-validation-notes.md`
62+
- `docs_build/dev/reports/PR_26171_GAMMA_009-github-authoritative-workstream-sync-instruction-compliance-checklist.md`
Lines changed: 12 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,12 @@
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/PROJECT_INSTRUCTIONS.md
2+
M docs_build/dev/PROJECT_MULTI_PC.txt
3+
A docs_build/dev/reports/PR_26171_GAMMA_009-github-authoritative-workstream-sync-instruction-compliance-checklist.md
4+
A docs_build/dev/reports/PR_26171_GAMMA_009-github-authoritative-workstream-sync-manual-validation-notes.md
5+
A docs_build/dev/reports/PR_26171_GAMMA_009-github-authoritative-workstream-sync.md
6+
7+
docs_build/dev/PROJECT_INSTRUCTIONS.md | 55 +++++++++++++++++--
8+
docs_build/dev/PROJECT_MULTI_PC.txt | 18 +++++++
9+
...stream-sync-instruction-compliance-checklist.md | 27 ++++++++++
10+
...tive-workstream-sync-manual-validation-notes.md | 25 +++++++++
11+
...MMA_009-github-authoritative-workstream-sync.md | 62 ++++++++++++++++++++++
12+
5 files changed, 184 insertions(+), 3 deletions(-)

0 commit comments

Comments
 (0)