Skip to content

PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ToolboxAid wants to merge 1 commit into from
Closed

PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```
55 changes: 55 additions & 0 deletions docs_build/dev/ProjectInstructions/addendums/multi_team.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
- stack the dependent PRs, or
- stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.
53 changes: 53 additions & 0 deletions docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
- stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
- stack the dependent PRs, or
- stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."
15 changes: 15 additions & 0 deletions ...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.
12 changes: 12 additions & 0 deletions ...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.
35 changes: 35 additions & 0 deletions ...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`
8 changes: 5 additions & 3 deletions docs_build/dev/reports/codex_changed_files.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff
101 changes: 62 additions & 39 deletions docs_build/dev/reports/codex_review.diff
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
Active assignment: none.

Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
- stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule by ToolboxAid · Pull Request #65 · ToolboxAid/HTML-JavaScript-Gaming · GitHub
Skip to content
PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ToolboxAid
wants to merge
1
commit into

from

 Closed


PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule
#65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
Create one Team Gamma branch for the selected assignment.
Work only that assignment.
```

## Day Work / EOD Merge Reminder

Ready-to-copy reminder:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.
```

55 changes: 55 additions & 0 deletions
docs_build/dev/ProjectInstructions/addendums/multi_team.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
# Multi-Team Codex Execution Governance

## All-Team Preferred Codex Execution Method

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Conflict Note

Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

This addendum clarifies that merge to `main` remains owner-controlled. If a workflow rule appears to conflict with this addendum, stop and request explicit owner approval before merging.

53 changes: 53 additions & 0 deletions
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

### All-Team Codex Execution Clarification

Preferred execution model:
Single Codex session with multiple sequential PRs.

Applies to:
- Team Alfa through Team Zulu
- Team OWNER

Purpose:
Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.

Rules:
- One Codex session may execute multiple sequential PRs.
- Each PR must still have one clear purpose.
- Each PR must create or use its own approved branch.
- Each PR may be committed and pushed during active work.
- Each PR may be opened as a draft PR during active work.
- Do not commit directly to main.
- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
- If later PRs depend on earlier unmerged PRs, Codex must either:
 - stack the dependent PRs, or
 - stop and request owner approval for the dependency model.
- Codex should reduce chit-chat by planning the full sequence before starting.
- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.

Conflict note:
- Older wording that says each PR must create its own branch remains preserved.
- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
- If a branch model is unclear, owner approval is required before continuing.

## Day Work / EOD Merge Rule

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
- Pushes are allowed and expected.
- Draft PRs are allowed and expected.
- Direct commits to main are prohibited.
- Merges to main are prohibited unless explicitly approved by the owner.

At end of day:
- Owner reviews ready PRs.
- Owner explicitly approves which PRs merge.
- Only owner-approved PRs may merge to main.
- After merge, return to main and pull latest main.
- Do not treat sequential PR completion as merge approval.

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

15 changes: 15 additions & 0 deletions
...all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
# PR_26172_OWNER_016 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] OWNER override documented by user.
- [x] Started stacked PR016 from PR015 branch.
- [x] Preserved existing ProjectInstructions content.
- [x] Added or clarified documentation only.
- [x] Added conflict note for overlapping branch/merge wording.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Did not delete protected instructions.
- [x] Ran docs/static validation.
- [x] Documented skipped validation lanes.
- [x] Created repo-structured delta ZIP.

12 changes: 12 additions & 0 deletions
...WNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# PR_26172_OWNER_016 Manual Validation Notes

- Verified all-team preferred execution applies to Team Alfa through Team Zulu and Team OWNER.
- Verified single-session sequential PR execution remains preferred.
- Verified each PR still has one clear purpose.
- Verified branch wording allows each PR to create or use its own approved branch.
- Verified commit and push during active work are allowed only on assigned non-main branches.
- Verified draft PRs are allowed and expected during active work.
- Verified direct commits to `main` remain prohibited.
- Verified merges to `main` require owner approval and are not implied by sequential PR completion.
- Verified exact required wording is present.
- Verified conflict note preserves older wording and requires owner approval when unclear.

35 changes: 35 additions & 0 deletions
...d/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
# PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule

## Scope

Update ProjectInstructions governance so Codex execution rules apply to all teams and merge behavior remains owner-controlled.

## Files Changed

- `docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md`
- `docs_build/dev/ProjectInstructions/addendums/multi_team.md`
- `docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md`

## Changes

- Added all-team preferred Codex execution governance for Team Alfa through Team Zulu and Team OWNER.
- Clarified that sequential PR work may commit, push, and open draft PRs during active work on approved non-main branches.
- Added Day Work / EOD Merge governance.
- Added the exact required commit/push and EOD merge wording.
- Added a conflict note preserving older wording while requiring owner approval when merge or branch wording appears ambiguous.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Markdown/text review
- Targeted text verification for all-team applicability, day-work commit/push wording, EOD merge wording, owner approval, and conflict note

## Skipped Lanes

- Playwright skipped: documentation-only scope.
- Samples skipped: documentation-only scope.

## Package

- `tmp/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule_delta.zip`

8 changes: 5 additions & 3 deletions
docs_build/dev/reports/codex_changed_files.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_015-nato-team-registry-and-codex-execution-method.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_016-all-team-codex-execution-and-eod-merge-rule.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff

101 changes: 62 additions & 39 deletions
docs_build/dev/reports/codex_review.diff

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,59 +1,82 @@
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 7634dad42..3490df216 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -65,3 +65,16 @@ Add the selected assignment under Team Gamma in TEAM_ASSIGNMENTS.md.
 Create one Team Gamma branch for the selected assignment.
 Work only that assignment.
 ```
+
+## Day Work / EOD Merge Reminder
+
+Ready-to-copy reminder:
+
+```text
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
+
+Do not treat sequential PR completion as merge approval.
+```
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index 3408c96f2..ce04c904b 100644
index ce04c904b..0b63c376f 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -37,3 +37,54 @@ Status: Available
 Active assignment: none.

 Active branch: none.
+
+## Team Name Registry
+
+- Team Alfa
+- Team Bravo
+- Team Charlie
+- Team Delta
+- Team Echo
+- Team Foxtrot
+- Team Golf
+- Team Hotel
+- Team India
+- Team Juliett
+- Team Kilo
+- Team Lima
+- Team Mike
+- Team November
+- Team Oscar
+- Team Papa
+- Team Quebec
+- Team Romeo
+- Team Sierra
+- Team Tango
+- Team Uniform
+- Team Victor
+- Team Whiskey
+- Team X-ray
+- Team Yankee
+- Team Zulu
+- Team OWNER
@@ -88,3 +88,56 @@ Rules:
 - stop and request owner approval for the dependency model.
 - Codex should reduce chit-chat by planning the full sequence before starting.
 - Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+## Preferred Codex Execution Method
+### All-Team Codex Execution Clarification
+
+Preferred execution model:
+Single Codex session with multiple sequential PRs.
+
+Applies to:
+- Team Alfa through Team Zulu
+- Team OWNER
+
+Purpose:
+Reduce back-and-forth between owner and Codex while keeping PRs reviewable and scoped.
+
+Rules:
+- One Codex session may execute multiple sequential PRs.
+- Each PR must still have one clear purpose.
+- Each PR must create its own branch.
+- Each PR must be committed, pushed, and opened as a draft PR.
+- Each PR must create or use its own approved branch.
+- Each PR may be committed and pushed during active work.
+- Each PR may be opened as a draft PR during active work.
+- Do not commit directly to main.
+- Do not merge without explicit owner approval.
+- Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."
+- If later PRs depend on earlier unmerged PRs, Codex must either:
+ - stack the dependent PRs, or
+ - stop and request owner approval for the dependency model.
+- Codex should reduce chit-chat by planning the full sequence before starting.
+- Codex must still hard-stop for conflicts, dirty worktree, scope mismatch, missing assignment, or protected instruction deletion.
+
+Conflict note:
+- Older wording that says each PR must create its own branch remains preserved.
+- This all-team clarification allows an approved existing team, OWNER, or scoped PR branch when the owner assigns that dependency model.
+- If a branch model is unclear, owner approval is required before continuing.
+
+## Day Work / EOD Merge Rule
+
+During active work:
+- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
+- Commits are allowed only on assigned non-main branches.
+- Pushes are allowed and expected.
+- Draft PRs are allowed and expected.
+- Direct commits to main are prohibited.
+- Merges to main are prohibited unless explicitly approved by the owner.
+
+At end of day:
+- Owner reviews ready PRs.
+- Owner explicitly approves which PRs merge.
+- Only owner-approved PRs may merge to main.
+- After merge, return to main and pull latest main.
+- Do not treat sequential PR completion as merge approval.
+
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
+
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
+"Merge this PR now."
Loading