Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,11 @@ OWNER follows the same safety rules:
- One active OWNER assignment at a time.
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
- OWNER override must be explicitly documented.

### OWNER Branch Lock Governance

- OWNER may override team locks.
- OWNER still has one active assignment at a time.
- OWNER still has one active branch at a time.
- OWNER may not silently delete, rewrite, or remove protected instructions.
- OWNER override must be documented.
8 changes: 8 additions & 0 deletions docs_build/dev/ProjectInstructions/addendums/multi_team.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,11 @@ Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
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.

## OWNER Branch Lock Governance

- OWNER may override team locks.
- OWNER still has one active assignment at a time.
- OWNER still has one active branch at a time.
- OWNER may not silently delete, rewrite, or remove protected instructions.
- OWNER override must be documented.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ Active assignment: none.

Active branch: none.

### OWNER Branch Lock Governance

- OWNER may override team locks.
- OWNER still has one active assignment at a time.
- OWNER still has one active branch at a time.
- OWNER may not silently delete, rewrite, or remove protected instructions.
- OWNER override must be documented.

## Team Name Registry

- Team Alfa
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# PR_26172_OWNER_020 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] Read `docs_build/dev/ProjectInstructions/README.txt`.
- [x] OWNER override documented by user.
- [x] Started from PR019 branch.
- [x] Created branch `pr/26172-OWNER-020-owner-branch-lock-governance`.
- [x] Added OWNER lock governance to requested files.
- [x] Did not delete ProjectInstructions content.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Ran docs/static validation.
- [x] Created repo-structured delta ZIP.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# PR_26172_OWNER_020 Manual Validation Notes

- Verified OWNER may override team locks.
- Verified OWNER still has one active assignment at a time.
- Verified OWNER still has one active branch at a time.
- Verified OWNER may not silently delete, rewrite, or remove protected instructions.
- Verified OWNER override must be documented.
- Verified no runtime, UI, Playwright, or sample files changed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# PR_26172_OWNER_020-owner-branch-lock-governance

## Scope

Make OWNER follow the same safety lock rules in the installed ProjectInstructions operating system.

## Changes

- Added OWNER branch lock governance to `team_assignments/TEAM_ASSIGNMENTS.md`.
- Added OWNER branch lock governance to `addendums/multi_team.md`.
- Confirmed OWNER branch lock governance in `PROJECT_INSTRUCTIONS.md`.

## Required Rules

- OWNER may override team locks.
- OWNER still has one active assignment at a time.
- OWNER still has one active branch at a time.
- OWNER may not silently delete, rewrite, or remove protected instructions.
- OWNER override must be documented.

## Validation

- `git diff --check`
- `git diff --cached --check`
- Targeted text search for OWNER branch lock rules

## Skipped Lanes

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

## Package

- `tmp/PR_26172_OWNER_020-owner-branch-lock-governance_delta.zip`
8 changes: 4 additions & 4 deletions docs_build/dev/reports/codex_changed_files.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff
77 changes: 41 additions & 36 deletions docs_build/dev/reports/codex_review.diff
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
diff --git a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
index 40db33c44..9636e2d41 100644
index 9636e2d41..96c4e5622 100644
--- a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
+++ b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
@@ -33,6 +33,15 @@ Existing Project Instructions remain preserved in their current locations. This

No PR in this operating system is merged without explicit owner approval.

+## Day Work / EOD Merge Rule
+
+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."
@@ -53,3 +53,11 @@ OWNER follows the same safety rules:
- One active OWNER assignment at a time.
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
- OWNER override must be explicitly documented.
+
+Do not treat sequential PR completion as merge approval.
+
## OWNER Governance

OWNER override wording:
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
index 35279e8f1..ff60e7bbb 100644
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
@@ -70,6 +70,8 @@ Work only that assignment.

Ready-to-copy reminder:

+Confirmed required rule:
+### OWNER Branch Lock Governance
+
```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

+- OWNER may override team locks.
+- OWNER still has one active assignment at a time.
+- OWNER still has one active branch at a time.
+- OWNER may not silently delete, rewrite, or remove protected instructions.
+- OWNER override must be documented.
diff --git a/docs_build/dev/ProjectInstructions/addendums/multi_team.md b/docs_build/dev/ProjectInstructions/addendums/multi_team.md
index 373a51ed0..f0a369ee9 100644
index f0a369ee9..670543d1a 100644
--- a/docs_build/dev/ProjectInstructions/addendums/multi_team.md
+++ b/docs_build/dev/ProjectInstructions/addendums/multi_team.md
@@ -28,6 +28,8 @@ Rules:
@@ -55,3 +55,11 @@ Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.

## Day Work / EOD Merge Rule

+Confirmed required rule:
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.
+
+## OWNER Branch Lock Governance
+
During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
+- OWNER may override team locks.
+- OWNER still has one active assignment at a time.
+- OWNER still has one active branch at a time.
+- OWNER may not silently delete, rewrite, or remove protected instructions.
+- OWNER override must be documented.
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
index b7c5df692..04ff72616 100644
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
@@ -38,6 +38,14 @@ Active assignment: none.

Active branch: none.

+### OWNER Branch Lock Governance
+
+- OWNER may override team locks.
+- OWNER still has one active assignment at a time.
+- OWNER still has one active branch at a time.
+- OWNER may not silently delete, rewrite, or remove protected instructions.
+- OWNER override must be documented.
+
## Team Name Registry

- Team Alfa
Loading