Skip to content

Commit 009d2b8

Browse files
ToolboxAidToolboxAid
committed
PR_26172_OWNER_020 owner branch lock governance
1 parent dc08c5e commit 009d2b8

8 files changed

Lines changed: 125 additions & 40 deletions

‎docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,11 @@ OWNER follows the same safety rules:
5353
- One active OWNER assignment at a time.
5454
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
5555
- OWNER override must be explicitly documented.
56+
57+
### OWNER Branch Lock Governance
58+
59+
- OWNER may override team locks.
60+
- OWNER still has one active assignment at a time.
61+
- OWNER still has one active branch at a time.
62+
- OWNER may not silently delete, rewrite, or remove protected instructions.
63+
- OWNER override must be documented.

‎docs_build/dev/ProjectInstructions/addendums/multi_team.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,11 @@ Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
5555
Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.
5656

5757
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.
58+
59+
## OWNER Branch Lock Governance
60+
61+
- OWNER may override team locks.
62+
- OWNER still has one active assignment at a time.
63+
- OWNER still has one active branch at a time.
64+
- OWNER may not silently delete, rewrite, or remove protected instructions.
65+
- OWNER override must be documented.

‎docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ Active assignment: none.
3838

3939
Active branch: none.
4040

41+
### OWNER Branch Lock Governance
42+
43+
- OWNER may override team locks.
44+
- OWNER still has one active assignment at a time.
45+
- OWNER still has one active branch at a time.
46+
- OWNER may not silently delete, rewrite, or remove protected instructions.
47+
- OWNER override must be documented.
48+
4149
## Team Name Registry
4250

4351
- Team Alfa

‎docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance-instruction-compliance-checklist.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# PR_26172_OWNER_020 Instruction Compliance Checklist
2+
3+
- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
4+
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
5+
- [x] Read `docs_build/dev/ProjectInstructions/README.txt`.
6+
- [x] OWNER override documented by user.
7+
- [x] Started from PR019 branch.
8+
- [x] Created branch `pr/26172-OWNER-020-owner-branch-lock-governance`.
9+
- [x] Added OWNER lock governance to requested files.
10+
- [x] Did not delete ProjectInstructions content.
11+
- [x] Did not commit directly to `main`.
12+
- [x] Did not merge any PR.
13+
- [x] Ran docs/static validation.
14+
- [x] Created repo-structured delta ZIP.

‎docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance-manual-validation-notes.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# PR_26172_OWNER_020 Manual Validation Notes
2+
3+
- Verified OWNER may override team locks.
4+
- Verified OWNER still has one active assignment at a time.
5+
- Verified OWNER still has one active branch at a time.
6+
- Verified OWNER may not silently delete, rewrite, or remove protected instructions.
7+
- Verified OWNER override must be documented.
8+
- Verified no runtime, UI, Playwright, or sample files changed.

‎docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# PR_26172_OWNER_020-owner-branch-lock-governance
2+
3+
## Scope
4+
5+
Make OWNER follow the same safety lock rules in the installed ProjectInstructions operating system.
6+
7+
## Changes
8+
9+
- Added OWNER branch lock governance to `team_assignments/TEAM_ASSIGNMENTS.md`.
10+
- Added OWNER branch lock governance to `addendums/multi_team.md`.
11+
- Confirmed OWNER branch lock governance in `PROJECT_INSTRUCTIONS.md`.
12+
13+
## Required Rules
14+
15+
- OWNER may override team locks.
16+
- OWNER still has one active assignment at a time.
17+
- OWNER still has one active branch at a time.
18+
- OWNER may not silently delete, rewrite, or remove protected instructions.
19+
- OWNER override must be documented.
20+
21+
## Validation
22+
23+
- `git diff --check`
24+
- `git diff --cached --check`
25+
- Targeted text search for OWNER branch lock rules
26+
27+
## Skipped Lanes
28+
29+
- Playwright skipped: documentation-only governance.
30+
- Samples skipped: documentation-only governance.
31+
32+
## Package
33+
34+
- `tmp/PR_26172_OWNER_020-owner-branch-lock-governance_delta.zip`

‎docs_build/dev/reports/codex_changed_files.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
2-
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
32
docs_build/dev/ProjectInstructions/addendums/multi_team.md
4-
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md
5-
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md
6-
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md
3+
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
4+
docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance-instruction-compliance-checklist.md
5+
docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance-manual-validation-notes.md
6+
docs_build/dev/reports/PR_26172_OWNER_020-owner-branch-lock-governance.md
77
docs_build/dev/reports/codex_changed_files.txt
88
docs_build/dev/reports/codex_review.diff

‎docs_build/dev/reports/codex_review.diff‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
11
diff --git a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
2-
index 40db33c44..9636e2d41 100644
2+
index 9636e2d41..96c4e5622 100644
33
--- a/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
44
+++ b/docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
5-
@@ -33,6 +33,15 @@ Existing Project Instructions remain preserved in their current locations. This
6-
7-
No PR in this operating system is merged without explicit owner approval.
8-
9-
+## Day Work / EOD Merge Rule
10-
+
11-
+Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
12-
+
13-
+Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
14-
+"Merge this PR now."
5+
@@ -53,3 +53,11 @@ OWNER follows the same safety rules:
6+
- One active OWNER assignment at a time.
7+
- OWNER may override team locks, but may not silently delete, rewrite, or remove protected instructions.
8+
- OWNER override must be explicitly documented.
159
+
16-
+Do not treat sequential PR completion as merge approval.
17-
+
18-
## OWNER Governance
19-
20-
OWNER override wording:
21-
diff --git a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
22-
index 35279e8f1..ff60e7bbb 100644
23-
--- a/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
24-
+++ b/docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
25-
@@ -70,6 +70,8 @@ Work only that assignment.
26-
27-
Ready-to-copy reminder:
28-
29-
+Confirmed required rule:
10+
+### OWNER Branch Lock Governance
3011
+
31-
```text
32-
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
33-
12+
+- OWNER may override team locks.
13+
+- OWNER still has one active assignment at a time.
14+
+- OWNER still has one active branch at a time.
15+
+- OWNER may not silently delete, rewrite, or remove protected instructions.
16+
+- OWNER override must be documented.
3417
diff --git a/docs_build/dev/ProjectInstructions/addendums/multi_team.md b/docs_build/dev/ProjectInstructions/addendums/multi_team.md
35-
index 373a51ed0..f0a369ee9 100644
18+
index f0a369ee9..670543d1a 100644
3619
--- a/docs_build/dev/ProjectInstructions/addendums/multi_team.md
3720
+++ b/docs_build/dev/ProjectInstructions/addendums/multi_team.md
38-
@@ -28,6 +28,8 @@ Rules:
21+
@@ -55,3 +55,11 @@ Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
22+
Existing ProjectInstructions wording that appears to require immediate or automatic merge remains preserved for traceability.
3923

40-
## Day Work / EOD Merge Rule
41-
42-
+Confirmed required rule:
24+
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.
25+
+
26+
+## OWNER Branch Lock Governance
4327
+
44-
During active work:
45-
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
46-
- Commits are allowed only on assigned non-main branches.
28+
+- OWNER may override team locks.
29+
+- OWNER still has one active assignment at a time.
30+
+- OWNER still has one active branch at a time.
31+
+- OWNER may not silently delete, rewrite, or remove protected instructions.
32+
+- OWNER override must be documented.
33+
diff --git a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
34+
index b7c5df692..04ff72616 100644
35+
--- a/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
36+
+++ b/docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
37+
@@ -38,6 +38,14 @@ Active assignment: none.
38+
39+
Active branch: none.
40+
41+
+### OWNER Branch Lock Governance
42+
+
43+
+- OWNER may override team locks.
44+
+- OWNER still has one active assignment at a time.
45+
+- OWNER still has one active branch at a time.
46+
+- OWNER may not silently delete, rewrite, or remove protected instructions.
47+
+- OWNER override must be documented.
48+
+
49+
## Team Name Registry
50+
51+
- Team Alfa

0 commit comments

Comments
 (0)