ticket: clarify orchestrator review git boundary

.yoi/tickets/open/20260607-035201-orchestrator-worktree-agent-routing/item.md

@@ -34,14 +34,11 @@ Make the workspace Orchestrator execute accepted in-progress Tickets through wor
 - Spawn reviewer Pods as Orchestrator siblings, not coder children, with read-only scope by default.
 - Coder task prompts must include an intent packet: intent, requirements, invariants, non-goals, escalation conditions, validation expectations, worktree path, and branch.
 - Reviewer task prompts must focus on Ticket intent, diff, invariants, validation adequacy, and blocker/non-blocker classification.
-- Orchestrator must record progress in the Ticket thread at meaningful checkpoints:
-  - accepted worktree/branch plan;
-  - coder delegated;
-  - coder completed or blocked;
-  - reviewer delegated;
-  - review approved/requested changes;
-  - fix loop outcome.
-- Orchestrator must not merge in this ticket's scope. It should produce a merge-ready dossier for `orchestrator-merge-completion`.
+- Orchestrator must record durable progress without misrepresenting branch-local review as main-branch Ticket approval:
+  - main Ticket thread may record accepted worktree/branch plan, coder delegated, coder completed/blocked, reviewer delegated, and fix-loop progress;
+  - reviewer verdicts for an unmerged implementation branch should be captured in the merge-ready dossier or branch-scoped review report, not as a final main-branch Ticket approval event before merge;
+  - if a reviewer requests changes, the Orchestrator may record a concise progress/blocker summary in the Ticket thread, but the branch remains unapproved until the fix loop and final merge-completion phase.
+- Orchestrator must not merge in this ticket's scope. It should produce a merge-ready dossier for `orchestrator-merge-completion` that includes the independent reviewer verdict and validation evidence.
 - If compaction occurs, workflow obligations should remain understandable; relate to `preserve-active-workflows-across-compaction` but do not block first implementation on it.
 
 ## Non-goals
@@ -57,6 +54,6 @@ Make the workspace Orchestrator execute accepted in-progress Tickets through wor
 - Orchestrator has builtin/role guidance or implementation wiring that follows `worktree-workflow` and `multi-agent-workflow` for accepted Tickets.
 - Worktree creation excludes `.yoi`.
 - Coder and reviewer Pods are spawned as siblings under Orchestrator with the expected scopes.
-- Progress is recorded in the Ticket thread.
-- A merge-ready dossier format is produced after review approval and validation.
+- Progress is recorded durably, while branch-local review verdicts are kept in the merge-ready dossier/review report rather than committed as final main-branch Ticket approval before merge.
+- A merge-ready dossier format is produced after branch review and validation.
 - Tests or prompt/resource tests cover the worktree/coder/reviewer routing instructions and scope boundaries.

.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/item.md

@@ -8,7 +8,7 @@ priority: P1
 labels: [orchestrator, merge, ticket, workflow, validation]
 workflow_state: intake
 created_at: 2026-06-07T03:52:31Z
-updated_at: 2026-06-07T03:52:31Z
+updated_at: 2026-06-07T05:00:22Z
 assignee: null
 legacy_ticket: null
 ---
@@ -28,7 +28,9 @@ Implement Orchestrator merge/completion behavior for reviewed in-progress Ticket
 - Define the merge authority boundary clearly:
   - in local dogfooding mode/workspace policy, Orchestrator may merge/cleanup/close after review approval and validation;
   - otherwise Orchestrator must stop at a merge-ready dossier with human action required.
-- Require an independent reviewer approval before merge, unless a human explicitly overrides and records a decision.
+- Require an independent reviewer approval in the merge-ready dossier before merge, unless a human explicitly overrides and records a decision.
+- Treat the reviewer verdict before merge as branch-scoped evidence, not a final main-branch Ticket approval event.
+- Commit main-branch Ticket review/approval and completion records only in the merge-completion phase, after the branch is merged or as part of the same controlled completion sequence, so the main Ticket history does not claim approval for code that is not in main.
 - Require a merge-ready dossier including:
   - Ticket id/slug;
   - branch/worktree;
@@ -48,7 +50,7 @@ Implement Orchestrator merge/completion behavior for reviewed in-progress Ticket
   - `git diff --check`;
   - `target/debug/yoi ticket doctor` where applicable.
 - Use broader validation (`cargo check --workspace --all-targets`, `nix build .#yoi`, etc.) when risk or touched files warrant it.
-- Record implementation/review/merge/validation outcome in the Ticket thread.
+- Record review/merge/validation outcome in the Ticket thread during the merge-completion phase, after confirming that the reviewed branch is the branch being merged.
 - Transition `inprogress -> done` or close the Ticket according to typed Ticket workflow rules.
 - Remove merged child worktree and delete merged branch unless the user/workflow explicitly asks to keep them.
 - Stop coder/reviewer Pods and reclaim scopes after completion.
@@ -66,6 +68,6 @@ Implement Orchestrator merge/completion behavior for reviewed in-progress Ticket
 - Orchestrator has explicit merge/completion guidance or implementation wiring based on `multi-agent-workflow`.
 - Reviewed in-progress Tickets can be merged, validated, closed/done, and cleaned up by Orchestrator in authorized dogfooding mode.
 - Conservative mode or missing authorization stops at merge-ready dossier rather than merging.
-- Ticket thread records the merge/completion decision and validation evidence.
+- Ticket thread records branch-reviewed merge/completion decision and validation evidence in the merge-completion phase, not as premature main-branch approval before merge.
 - Worktrees/branches/Pods are cleaned up after successful merge/close.
 - Tests or prompt/resource tests cover merge authority boundary and required dossier/validation fields.

.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/thread.md

@@ -5,3 +5,22 @@
 Created by LocalTicketBackend create.
 
 ---
+
+<!-- event: decision author: hare at: 2026-06-07T05:00:22Z -->
+
+## Decision
+
+## Git/Ticket review record boundary
+
+Decision:
+- Reviewer verdicts on an unmerged implementation branch are branch-scoped evidence, not final main-branch Ticket approval.
+- The Orchestrator should keep branch-local review results in the merge-ready dossier/review report during the worktree-agent phase.
+- Main Ticket thread may still record durable progress such as worktree plan, coder/reviewer delegation, blockers, and fix-loop status.
+- The final Ticket review/approval/completion record should be written during the merge-completion phase, after confirming the reviewed branch is the branch being merged, or as part of the same controlled completion sequence.
+
+Rationale:
+- Avoid main branch Ticket history claiming approval for code that is not yet in main.
+- Keep git history aligned: implementation branch review evidence leads to merge; main Ticket lifecycle records the completed merge/validation outcome.
+- Builtin Orchestrator workflow should make this explicit so automation does not reproduce the ad-hoc parent-side `TicketReview` timing used during manual dogfooding.
+
+---