Resolve #150 against current main

Author: Delta Team

docs_build/dev/PROJECT_INSTRUCTIONS.md

@@ -6,9 +6,9 @@ Workflow:
 PLAN_PR → BUILD_PR → APPLY_PR
 
 PR lifecycle gate:
-PR Open → Building → Validation → Approved → Merged → Main Verified → Closed
+PR Open → Plan → Build → Validation → Approved → Merged → Main Verified → Closed
 
-The PLAN_PR → BUILD_PR → APPLY_PR workflow remains preserved. PR Open is the first lifecycle status for active work, and Closed is the final repository-state gate.
+The PLAN_PR → BUILD_PR → APPLY_PR workflow remains preserved. PR Open is the first lifecycle status for active work, Plan happens after PR Open on the same PR branch, and Closed is the final repository-state gate.
 
 # WORKFLOW & EXECUTION
 
@@ -54,35 +54,39 @@ Rules:
 Required state order:
 
 1. PR Open
-2. Building
-3. Validation
-4. Approved
-5. Merged
-6. Main Verified
-7. Closed
+2. Plan
+3. Build
+4. Validation
+5. Approved
+6. Merged
+7. Main Verified
+8. Closed
 
 Definitions:
 - PR Open is the first active lifecycle state.
-- PR Open means the PR or branch has been created and named, and the work has a tracked PR identity before implementation begins.
+- PR Open means the tracked PR identity and source branch have been created and named before Plan begins.
+- Plan happens after PR Open on the same PR branch.
+- Build, validation, reports, ZIP packaging, and closeout stay tied to that same PR identity and source branch.
 - No BUILD_PR may proceed without a PR name and active branch/PR identity unless it is explicitly marked `PLAN_ONLY`.
-- Building means scoped implementation, audit, report, validation, governance, or cleanup work is in progress for that PR identity.
+- Build means scoped implementation, audit, report, validation, governance, or cleanup work is in progress for that PR identity.
 - Validation means requested checks, required report creation, manual validation notes, and ZIP packaging are being completed.
-- Approved means the owner or required reviewer has approved the PR outcome or intentionally approved closure without merge.
-- Merged means the PR has merged or has been intentionally closed without merge with the reason recorded.
+- Approved means the owner or required reviewer has approved the PR outcome for merge.
+- Merged means the PR has merged and changes have been pushed.
 - Main Verified means Codex is back on `main`, `main` includes the merge commit or recorded final commit, the worktree is clean, local/origin sync is `0/0`, and no untracked files remain.
 - Closed means every Closed gate below is PASS.
 
 Closed is valid only when all are PASS:
-- PR merged or intentionally closed without merge with reason recorded.
-- Changes pushed.
+- PR merged and changes pushed.
 - Current branch is `main`.
 - `main` includes the merge commit or recorded final commit.
 - Worktree clean.
 - Local/origin sync is `0/0`.
 - No untracked files.
-- Branch disposition recorded as `deleted`, `retained for follow-up`, or `archived`.
+- Branch disposition recorded as `retained`.
 - Required reports exist.
 - Required repo-structured ZIP under `tmp/` exists.
+- Backlog updated.
+- Tool state updated when applicable.
 
 Hard stop:
 - A team must not begin another PR if its previous PR is not Closed.
@@ -99,6 +103,8 @@ FINAL REPOSITORY STATE:
 - PR status
 - Merge/final commit
 - Branch disposition
+- Backlog update status
+- Tool state update status
 - ZIP path
 - Closeout PASS/FAIL
 ```
@@ -2167,7 +2173,7 @@ Each reviewed item must be classified as one of:
 - Historical/Archive
 
 Rules:
-- Merged branches should be deleted after successful merge and main sync.
+- Merged source branches should be retained by default after successful merge and main sync.
 - Superseded draft PRs should be closed.
 - Abandoned branches should be documented before removal.
 - Active workstream branches remain.
@@ -2193,7 +2199,7 @@ Required PI closeout report fields:
 - active PRs
 - active branches
 - closed/superseded PRs
-- deleted branch candidates
+- retained branch disposition and any owner-approved deletion candidates
 - deferred work
 - next PI priorities
 
@@ -2216,8 +2222,7 @@ Audit targets:
 Recommendation-only first pass values:
 - keep
 - close
-- delete local
-- delete remote
+- retained
 - defer
 
 Rules:

docs_build/dev/ProjectInstructions/addendums/branch_context_governance.md

@@ -57,7 +57,7 @@ Closed branch context requires:
 - worktree clean
 - local/origin sync is `0/0`
 - no untracked files
-- branch disposition recorded as `deleted`, `retained for follow-up`, or `archived`
+- source branch disposition recorded as `retained`
 
 ## GitHub Authority
 

docs_build/dev/ProjectInstructions/addendums/branch_lock_governance.md

@@ -15,7 +15,8 @@ Keep active work attached to the correct assigned team, branch, and OWNER decisi
 - A team with no active assignment, active branch, or active PR is inactive.
 - A team with a previous PR that is not Closed must not begin another PR unless OWNER documented an explicit stacked PR chain.
 - PR Open begins only after the branch and PR identity are named.
-- Closed ends only after the final main-return, clean-worktree, local/origin `0/0`, no-untracked-files, required-report, required-ZIP, and branch-disposition gates pass.
+- Plan, Build, validation, reports, ZIP packaging, and closeout stay tied to the same PR identity and source branch.
+- Closed ends only after the final main-return, clean-worktree, local/origin `0/0`, no-untracked-files, required-report, required-ZIP, backlog, applicable tool-state, and branch-disposition gates pass.
 - Project Instructions must not assume a permanent team roster.
 
 ## Branch Rules
@@ -25,7 +26,8 @@ Keep active work attached to the correct assigned team, branch, and OWNER decisi
 - Keep work on the active branch until the PR is merged, the branch is retired, or OWNER says to return to `main`.
 - Do not commit directly to `main` unless OWNER explicitly approves.
 - Do not merge stale historical branches directly unless they are current, clean, still needed, and OWNER-approved.
-- Record branch disposition before Closed as one of: `deleted`, `retained for follow-up`, or `archived`.
+- Retain source branches by default after merge and closeout.
+- Record branch disposition before Closed as `retained`.
 
 ## OWNER Override
 

docs_build/dev/ProjectInstructions/addendums/multi_team.md

@@ -151,7 +151,7 @@ Required steps:
 5. Record final main commit.
 6. Report final repository state.
 7. Produce a repo-structured ZIP under `tmp/` that includes the EOD report and all changed or preserved repo files from the closeout.
-8. Record branch disposition as `deleted`, `retained for follow-up`, or `archived`.
+8. Record source branch disposition as `retained`.
 9. Mark the PR Closed only when every Closed gate passes.
 
 Required final state:
@@ -170,7 +170,9 @@ Rules:
 - A workstream is not considered closed until the repository is returned to main.
 - A PI is not considered complete until main is current and synchronized.
 - Do not leave Codex on a feature, team, workstream, recovery, governance, or owner branch after successful merge.
-- A PR is not Closed until the PR merged or an intentional no-merge close reason is recorded, changes are pushed, the repository is on `main`, `main` includes the merge or final commit, the worktree is clean, local/origin sync is `0/0`, no untracked files exist, branch disposition is recorded, required reports exist, and the required repo-structured ZIP exists under `tmp/`.
+- Plan, Build, validation, reports, ZIP packaging, and closeout stay tied to the same PR identity and source branch.
+- Source branches are retained by default after merge and closeout.
+- A PR is not Closed until the PR merged, changes are pushed, the repository is on `main`, `main` includes the merge or final commit, the worktree is clean, local/origin sync is `0/0`, no untracked files exist, branch disposition is recorded as `retained`, required reports exist, the required repo-structured ZIP exists under `tmp/`, backlog is updated, and tool state is updated when applicable.
 - A completed EOD closeout must produce the required ZIP even when the closeout changed no repo files; in that case, the ZIP must contain the EOD report proving the no-change result.
 - The EOD ZIP does not replace the EOD report or other required reports under `docs_build/dev/reports/`.
 - If merge succeeds but repository is not returned to main:
@@ -187,6 +189,8 @@ FINAL REPOSITORY STATE:
 - PR status
 - Merge/final commit
 - Branch disposition
+- Backlog update status
+- Tool state update status
 - ZIP path
 - Closeout PASS/FAIL
 ```
@@ -209,7 +213,7 @@ Each reviewed item must be classified as one of:
 - Historical/Archive
 
 Rules:
-- Merged branches should be deleted after successful merge and main sync.
+- Merged source branches should be retained by default after successful merge and main sync.
 - Superseded draft PRs should be closed.
 - Abandoned branches should be documented before removal.
 - Active workstream branches remain.
@@ -235,7 +239,7 @@ Required PI closeout report fields:
 - active PRs
 - active branches
 - closed/superseded PRs
-- deleted branch candidates
+- retained branch disposition and any owner-approved deletion candidates
 - deferred work
 - next PI priorities
 
@@ -258,8 +262,7 @@ Audit targets:
 Recommendation-only first pass values:
 - keep
 - close
-- delete local
-- delete remote
+- retained
 - defer
 
 Rules:

docs_build/dev/ProjectInstructions/addendums/pr_workflow.md

@@ -14,57 +14,63 @@ Define the standard pull request workflow for Game Foundry Studio.
 3. Verify clean worktree.
 4. Create a PR branch and PR identity.
 5. Mark lifecycle state as PR Open.
-6. Make scoped changes only.
-7. Validate the change.
-8. Commit with a clear OWNER/team message.
-9. Push the branch.
-10. Open or update the draft PR.
-11. Review the PR.
-12. OWNER approves merge or intentional close without merge.
-13. Merge to main or record the approved no-merge close reason.
-14. Pull latest main before starting the next PR.
-15. Verify Main Verified and Closed gates.
+6. Plan on the same PR branch.
+7. Build on the same PR branch.
+8. Validate the change.
+9. Commit with a clear OWNER/team message.
+10. Push the branch.
+11. Open or update the draft PR.
+12. Review the PR.
+13. OWNER approves merge.
+14. Merge to main.
+15. Pull latest main before starting the next PR.
+16. Verify Main Verified and Closed gates.
 
 ## PR Lifecycle States
 
 Required state order:
 
 1. PR Open
-2. Building
-3. Validation
-4. Approved
-5. Merged
-6. Main Verified
-7. Closed
+2. Plan
+3. Build
+4. Validation
+5. Approved
+6. Merged
+7. Main Verified
+8. Closed
 
 Definitions:
 - PR Open is the first active lifecycle state.
-- PR Open means the branch and PR identity are created and named before implementation begins.
+- PR Open means the tracked PR identity and source branch are created and named before Plan begins.
+- Plan happens after PR Open on the same PR branch.
 - No BUILD_PR may proceed without a PR name and active branch/PR identity unless explicitly marked `PLAN_ONLY`.
-- Building means scoped work is in progress.
+- Build means scoped work is in progress on the same PR branch and PR identity.
 - Validation means requested checks, required reports, manual validation notes, and ZIP packaging are underway.
-- Approved means OWNER or required reviewer approval exists for merge or intentional close without merge.
-- Merged means the PR merged, or the approved no-merge close reason is recorded.
+- Approved means OWNER or required reviewer approval exists for merge.
+- Merged means the PR merged and changes were pushed.
 - Main Verified means current branch is `main`, `main` includes the merge or final commit, worktree is clean, local/origin sync is `0/0`, and no untracked files remain.
 - Closed is valid only after every Closed gate passes.
 
 Closed gates:
-- PR merged or intentionally closed without merge with reason recorded.
-- Changes pushed.
+- PR merged and changes pushed.
 - Current branch is `main`.
 - `main` includes the merge commit or recorded final commit.
 - Worktree clean.
 - Local/origin sync is `0/0`.
 - No untracked files.
-- Branch disposition is recorded as `deleted`, `retained for follow-up`, or `archived`.
+- Branch disposition is recorded as `retained`.
 - Required reports exist.
 - Required repo-structured ZIP under `tmp/` exists.
+- Backlog is updated.
+- Tool state is updated when applicable.
 
 ## Rules
 
 - Direct commits to main are prohibited unless OWNER explicitly approves.
 - Draft PRs are preferred until validation is complete.
 - Each PR must have a clear scope.
+- Plan, Build, validation, reports, ZIP packaging, and closeout must stay tied to the same PR identity and source branch.
+- Source branches are retained by default after merge and closeout.
 - Do not mix unrelated scopes.
 - Do not start dependent PRs until the required base PR is merged.
 - Always return to main before starting the next PR.

docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md

@@ -20,9 +20,9 @@ Teams may start only when all of the following are true:
 - No-direct-main rule exists.
 - Out-of-scope stop rule exists.
 - Build Path sync rule exists.
-- PR lifecycle states exist in order: PR Open, Building, Validation, Approved, Merged, Main Verified, Closed.
+- PR lifecycle states exist in order: PR Open, Plan, Build, Validation, Approved, Merged, Main Verified, Closed.
 - Previous-PR Closed gate exists before a team starts another PR, except explicitly documented stacked PR chains.
-- Final closeout output includes branch, worktree, local/origin sync, PR number/name, PR status, merge/final commit, branch disposition, ZIP path, and Closeout PASS/FAIL.
+- Final closeout output includes branch, worktree, local/origin sync, PR number/name, PR status, merge/final commit, branch disposition, backlog update status, tool state update status, ZIP path, and Closeout PASS/FAIL.
 
 ## Gate Outcome
 

docs_build/dev/ProjectInstructions/addendums/team_start_and_release.md

@@ -63,10 +63,12 @@ For backlog-driven work:
 3. Use the approved status model from `status_model.md`.
 4. Confirm the previous PR for the team is Closed, unless this is an explicitly documented stacked PR chain.
 5. Create or use the approved team branch and PR identity.
-6. Mark lifecycle state as PR Open before BUILD_PR work begins.
-7. Record active work in the active team registry when required.
-8. Open or update a draft PR during active work.
-9. Merge only through OWNER-approved PR workflow.
+6. Mark lifecycle state as PR Open.
+7. Plan on the same PR branch.
+8. Build on the same PR branch.
+9. Record active work in the active team registry when required.
+10. Open or update a draft PR during active work.
+11. Merge only through OWNER-approved PR workflow.
 
 ## Team Command Examples
 
@@ -94,15 +96,17 @@ A team or OWNER PR is release-ready when:
 - required reports and repo-structured ZIP under `tmp/` exist before Closed
 
 Closed readiness requires:
-- PR merged or intentionally closed without merge with reason recorded
+- PR merged and pushed
 - current branch is `main`
 - worktree clean
 - local/origin sync is `0/0`
 - no untracked files
 - merge or final commit recorded
-- branch disposition recorded as `deleted`, `retained for follow-up`, or `archived`
+- branch disposition recorded as `retained`
 - required reports exist
 - required repo-structured ZIP under `tmp/` exists
+- backlog updated
+- tool state updated when applicable
 
 ## Gate Behavior
 

docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md

@@ -140,7 +140,8 @@ Rules:
 - Each PR must create its own branch.
 - Each PR must be committed, pushed, and opened as a draft PR.
 - Each PR starts at PR Open after the branch and PR identity are named.
-- Each PR reaches Closed only after main-return, clean-worktree, local/origin `0/0`, no-untracked-files, required-report, required-ZIP, and branch-disposition gates pass.
+- Each PR plans and builds on the same source branch after PR Open.
+- Each PR reaches Closed only after main-return, clean-worktree, local/origin `0/0`, no-untracked-files, required-report, required-ZIP, backlog, applicable tool-state, and retained-branch-disposition gates pass.
 - A team must not begin another PR until its previous PR is Closed unless OWNER documented an explicit stacked PR chain.
 - Do not commit directly to main.
 - Do not merge without explicit owner approval.
@@ -168,7 +169,9 @@ Rules:
 - 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.
-- Each PR must move through PR Open, Building, Validation, Approved, Merged, Main Verified, and Closed in order.
+- Each PR must move through PR Open, Plan, Build, Validation, Approved, Merged, Main Verified, and Closed in order.
+- Plan, Build, validation, reports, ZIP packaging, and closeout must stay tied to the same PR identity and source branch.
+- Source branches are retained by default after merge and closeout.
 - A team must not begin another PR until its previous PR is Closed unless OWNER documented an explicit stacked PR chain.
 - Do not commit directly to main.
 - Do not merge to main during active work unless the owner explicitly says: "Merge this PR now."