Merge pull request #256 from ToolboxAid/PR_26179_OWNER_011-team-stacked-pr-policy

PR_26179_OWNER_011-team-stacked-pr-policy

Author: ToolboxAid

dev/build/ProjectInstructions/TEAM_START_COMMANDS.md

@@ -17,6 +17,10 @@ For Independent PRs and for the first PR in a new stacked workstream, no team cr
 
 Dependent Stacked PRs may start from the documented previous PR branch only when `dev/build/ProjectInstructions/addendums/pr_workflow.md` defines the direct dependency and merge order.
 
+OWNER PRs may start from synchronized `main` when independent.
+
+Non-Owner team PRs use Stacked PR workstreams by default. A non-Owner team PR may start from `main` only when OWNER explicitly marks it `standalone/no-dependency`.
+
 Use `dev/build/ProjectInstructions/` as the only active Project Instructions source.
 Read `dev/build/ProjectInstructions/addendums/team_backlog_sod_eod_standard.md` before implementation.
 

dev/build/ProjectInstructions/addendums/branch_context_governance.md

@@ -25,6 +25,7 @@ At the start of work, report or validate:
 - active PR number/name or explicit `PLAN_ONLY`
 - requested PR branching model: Independent PR or Stacked PR
 - expected starting branch for the requested PR branching model
+- whether a non-Owner team PR has OWNER `standalone/no-dependency` approval when starting from `main`
 - previous PR Closed status unless this is an explicitly documented stacked PR chain
 
 Session start must follow the canonical START phase in `dev/build/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md`.
@@ -35,6 +36,7 @@ Stop and report before changing files when:
 
 - current branch does not match the expected branch
 - requested PR branching model does not match the current/start branch
+- a non-Owner team PR starts from `main` without OWNER `standalone/no-dependency` approval
 - local branch is behind or ahead unexpectedly
 - worktree has unrelated changes
 - active assignment is missing or unclear

dev/build/ProjectInstructions/addendums/branch_lock_governance.md

@@ -29,9 +29,13 @@ This file owns branch lock enforcement and OWNER override handling; it must not
 - Identify the PR branching model before creating or continuing a PR branch.
 - Independent PRs and new stacked workstreams start from current `main`.
 - Dependent Stacked PRs may start from the documented previous PR branch only when a direct dependency and dependency order are documented in `dev/build/ProjectInstructions/addendums/pr_workflow.md`.
+- OWNER PRs may start from `main` when marked Independent and no direct dependency exists.
+- Non-Owner team PRs use Stacked PR workstreams by default.
+- A non-Owner team PR may start from `main` only when OWNER explicitly marks the PR as `standalone/no-dependency`.
 - Pull latest `origin/main` before creating an Independent PR branch or the first branch in a new stack.
 - Do not create an Independent PR branch unless current branch is `main`, worktree is clean, `main...origin/main` is `0 0`, and `HEAD` SHA matches the published EOD SHA.
 - HARD STOP if the current branch does not match the requested PR branching model.
+- HARD STOP if a non-Owner team PR starts from `main` without OWNER `standalone/no-dependency` approval.
 - Follow the canonical START / WORK / END lifecycle in `dev/build/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md`.
 - Keep work on the active branch until the PR is merged, the branch is retired, EOD closeout begins, or OWNER says to return to `main`.
 - For OWNER-approved stacked/sequential workstreams, PR branches/commits stay on the active team branch/workstream during the day and do not return to `main` between PRs.

dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md

@@ -10,7 +10,7 @@ Every Codex execution must produce at least one repository-structured ZIP artifa
 
 Each PR attempted by Codex must produce exactly one ZIP artifact representing that PR's final outcome.
 
-Missing ZIP means the Codex run did not complete correctly.
+Missing ZIP means the Codex run is incomplete and did not complete correctly.
 
 Canonical ZIP location:
 

dev/build/ProjectInstructions/addendums/pr_workflow.md

@@ -41,6 +41,14 @@ This file owns PR lifecycle governance. It must not duplicate command phase rule
 
 Every PR must declare one branching model before branch creation or branch continuation.
 
+### Ownership Defaults
+
+OWNER may create an Independent PR from synchronized `main` when the PR has no direct dependency.
+
+Non-Owner team PRs use Stacked PR workstreams by default. A non-Owner team PR may start from `main` only when OWNER explicitly marks that PR as `standalone/no-dependency` before branch creation.
+
+If a non-Owner team PR is not explicitly marked `standalone/no-dependency`, Codex must treat it as Stacked and verify the active team workstream branch or documented previous PR branch before changing files.
+
 ### Independent PR
 
 Use an Independent PR when the change has no direct dependency on another open PR.
@@ -49,7 +57,10 @@ Rules:
 - Independent PRs must start from synchronized `main`.
 - Independent PRs must target `main`.
 - Independent PRs must not reuse another feature branch as their starting point.
+- OWNER PRs may use the Independent PR model when the PR has no direct dependency.
+- Non-Owner team PRs may use the Independent PR model only when OWNER explicitly marks the PR as `standalone/no-dependency`.
 - Codex must HARD STOP if the requested Independent PR starts from any branch other than `main`.
+- Codex must HARD STOP if a non-Owner team PR starts from `main` without an explicit OWNER `standalone/no-dependency` marker.
 - Codex must return to synchronized `main` before starting the next unrelated Independent PR.
 
 ### Stacked PR
@@ -58,6 +69,8 @@ Use a Stacked PR only when the PR has a direct dependency on the previous PR bra
 
 Rules:
 - Stacked PRs may start from the previous PR branch when there is a direct dependency.
+- Non-Owner team PRs should use Stacked PR workstreams by default.
+- A Stacked PR belongs under the active team workstream and must use the documented previous PR branch or active workstream branch as its starting point.
 - Stacked PRs must document the dependency order before BUILD begins.
 - Stacked PR reports must name:
   - the stack order
@@ -77,12 +90,15 @@ Codex must verify the requested PR model before changing files.
 
 HARD STOP when:
 - an Independent PR is requested but the current/start branch is not `main`
+- a non-Owner team PR starts from `main` without explicit OWNER `standalone/no-dependency` approval
 - a Stacked PR is requested but the current/start branch is not the documented previous PR branch
 - the request does not say whether the PR is Independent or Stacked and the start branch is not clearly valid
 - a PR is described as stacked but no direct dependency or merge order is documented
 
 When the model is unclear, Codex must report the current branch, expected starting branch, and the missing model/dependency information before making changes.
 
+All PR branching models remain subject to the Codex Completion Contract. Missing required ZIP output means the Codex run is incomplete.
+
 ## Daily Branch Workflow
 
 Team-neutral daily workflow:

dev/build/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md

@@ -55,6 +55,10 @@ For Independent PRs and for the first PR in a new stacked workstream, no team cr
 
 For dependent Stacked PRs, the start branch may be the documented previous PR branch only when `dev/build/ProjectInstructions/addendums/pr_workflow.md` identifies a direct dependency and dependency order.
 
+OWNER PRs may start from synchronized `main` when marked Independent and no direct dependency exists.
+
+A non-Owner team PR may start from `main` only when OWNER explicitly marks the PR as `standalone/no-dependency`. Otherwise, non-Owner team PRs use Stacked PR workstreams by default and must start from the active team workstream branch or documented previous PR branch.
+
 If any required check fails, or if the current branch does not match the requested PR model, stop before branch creation and restore the expected branch state or request OWNER direction.
 
 ## Branch Lifecycle (Canonical)

dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md

@@ -103,6 +103,7 @@ Rules:
 - Identify the correct branch or start point.
 - Identify whether the PR is Independent or Stacked.
 - For Stacked PRs, identify the previous PR branch and dependency order.
+- For non-Owner team PRs that start from `main`, identify the explicit OWNER `standalone/no-dependency` approval.
 - Identify the intended PR name, purpose, and scope.
 - Identify required validation and reporting.
 - Identify the required ZIP outcome path from the Codex Completion Contract.
@@ -116,13 +117,15 @@ BUILD_PR is the implementation phase.
 Rules:
 - Verify branch and worktree rules for the PR before changing files.
 - Verify the requested PR branching model before changing files.
+- Verify non-Owner team PRs are stacked by default unless OWNER marked the PR `standalone/no-dependency`.
 - Use the latest Project Instructions.
 - Stay inside the approved PR purpose.
 - Create required reports.
 - Create the required repo-structured ZIP artifact for the attempted PR according to the Codex Completion Contract.
 - Run scoped validation required by the PR and Project Instructions.
 - HARD STOP on wrong branch.
 - HARD STOP when the current/start branch does not match the requested Independent or Stacked PR model.
+- HARD STOP when a non-Owner team PR starts from `main` without OWNER `standalone/no-dependency` approval.
 - HARD STOP on dirty worktree when the PR requires a clean start.
 - HARD STOP on scope conflict.
 - HARD STOP on missing required Project Instructions.

dev/reports/PR_26179_OWNER_011-team-stacked-pr-policy_branch-validation.md

@@ -0,0 +1,16 @@
+# PR_26179_OWNER_011-team-stacked-pr-policy Branch Validation
+
+## Result
+
+PASS
+
+## Checks
+
+| Check | Result | Notes |
+| --- | --- | --- |
+| Stacked PR model identified | PASS | This PR depends on PR #255. |
+| Started from documented previous PR branch | PASS | Started from `PR_26179_OWNER_011-pr-branching-model-docs`. |
+| Worktree clean before branch creation | PASS | Verified before branch creation. |
+| PR branch created | PASS | `PR_26179_OWNER_011-team-stacked-pr-policy`. |
+| Work stayed on PR branch | PASS | No direct commit to `main`. |
+| Documentation/governance scope | PASS | Only Project Instructions and reports changed. |

dev/reports/PR_26179_OWNER_011-team-stacked-pr-policy_manual-validation-notes.md

@@ -0,0 +1,8 @@
+# PR_26179_OWNER_011-team-stacked-pr-policy Manual Validation Notes
+
+## Notes
+
+- Confirmed this policy PR is stacked on PR #255 because it refines the Independent PR vs Stacked PR model introduced there.
+- Confirmed the new text does not weaken dependency-order, review-order, or merge-order requirements.
+- Confirmed the Codex Completion Contract still requires ZIP output for all outcomes.
+- Confirmed missing ZIP output is now explicitly described as an incomplete Codex run.

dev/reports/PR_26179_OWNER_011-team-stacked-pr-policy_report.md

@@ -0,0 +1,39 @@
+# PR_26179_OWNER_011-team-stacked-pr-policy Report
+
+## Purpose
+
+Update active Project Instructions so OWNER may create independent PRs from `main`, while non-Owner teams use stacked PR workstreams by default.
+
+## Branching Model
+
+- Model: Stacked PR
+- Previous PR dependency: `PR_26179_OWNER_011-pr-branching-model-docs` / PR #255
+- Starting branch: `PR_26179_OWNER_011-pr-branching-model-docs`
+- Merge order: PR #255 first, then this PR
+
+## Governance Outcome
+
+- OWNER PRs may start from synchronized `main` when independent and no direct dependency exists.
+- Non-Owner team PRs use Stacked PR workstreams by default.
+- Non-Owner team PRs may start from `main` only when OWNER explicitly marks the PR as `standalone/no-dependency`.
+- Stacked PRs still must document dependency order, review order, and merge order.
+- Codex must hard-stop when a branch/model mismatch is detected.
+- Missing ZIP output is clarified as an incomplete Codex run.
+
+## Updated Documents
+
+- `dev/build/ProjectInstructions/addendums/pr_workflow.md`
+- `dev/build/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.md`
+- `dev/build/ProjectInstructions/addendums/branch_lock_governance.md`
+- `dev/build/ProjectInstructions/addendums/branch_context_governance.md`
+- `dev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.md`
+- `dev/build/ProjectInstructions/TEAM_START_COMMANDS.md`
+- `dev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.md`
+
+## Runtime Impact
+
+None. This PR changes documentation/governance only.
+
+## ZIP
+
+- `dev/workspace/zips/PR_26179_OWNER_011-team-stacked-pr-policy_delta.zip`