ticket: close orchestrator worktree layout

.yoi/tickets/00001KTTB479X/item.md

@@ -1,8 +1,8 @@
 ---
 title: 'Orchestratorを専用worktreeで実行し実装worktreeをworkspace root配下に作る'
-state: 'inprogress'
+state: 'closed'
 created_at: '2026-06-11T03:20:32Z'
-updated_at: '2026-06-11T04:58:54Z'
+updated_at: '2026-06-11T05:00:04Z'
 assignee: null
 queued_by: 'workspace-panel'
 queued_at: '2026-06-11T04:33:46Z'

.yoi/tickets/00001KTTB479X/resolution.md

@@ -0,0 +1,27 @@
+完了しました。
+
+実施内容:
+- `docs/design/orchestrator-worktree-layout.md` を追加し、`role_workspace_root` / `original_workspace_root` / `implementation_worktree_root` / `merge_target_workspace_root` の4-root model を記録しました。
+- `TicketRoleLaunchContext` / `TicketRoleLaunchPlan` に original/target/worktree root を追加しました。
+- Orchestrator launch prompt に `Workspace routing context` を出し、role runtime workspace / Ticket backend root と original implementation root / merge target root を区別できるようにしました。
+- Orchestrator routing / merge-completion prompt resources を更新し、implementation worktree は recorded original workspace root の `.worktree` 配下、merge/cleanup は recorded merge target workspace で行うよう明示しました。
+- `.yoi/workflow/worktree-workflow.md` と `.yoi/workflow/multi-agent-workflow.md` を更新し、Orchestrator cwd を original repo root / merge target とみなさない方針に揃えました。
+- standing merge authority があり、reviewer approval / safe target workspace / no blockers の条件が揃う場合は merge-ready dossier で止まらず merge/validation/close/cleanup まで進む guidance にしました。
+- client Ticket-role tests を更新し、root fields と `SpawnConfig.workspace_root` が role runtime workspace root のまま保たれることを検証しました。
+
+Merge:
+- Branch: `orchestrator-worktree-layout`
+- Implementation commit: `e7c78f96 feat: track orchestration workspace roots`
+- Merge commit: `5f7b3015 merge: orchestrator worktree layout`
+
+確認:
+- Branch-local reviewer `reviewer-orchestrator-worktree-layout` が初回 request_changes 後、修正済み branch を approve。
+- `cargo fmt --check` passed。
+- `cargo test -p client ticket_role --lib` passed（18 passed）。
+- `git diff --check` passed。
+- `target/debug/yoi ticket doctor` passed。
+- typed `TicketDoctor` は 0 errors / 3 pre-existing diagnostics。
+- `nix build .#yoi` passed。
+
+残作業:
+- Panel/workspace orchestration が dedicated Orchestrator worktree から起動する際に `original_workspace_root` / `target_workspace_root` を実際に populate する経路は follow-up 境界です。

.yoi/tickets/00001KTTB479X/thread.md

@@ -202,3 +202,82 @@ Validation run by reviewer:
 No files were modified by reviewer and no final main-branch approval/close was recorded by reviewer.
 
 ---
+
+<!-- event: review author: orchestrator at: 2026-06-11T04:59:47Z status: approve -->
+
+## Review: approve
+
+Main-branch review/merge-completion approval.
+
+Verified before merge:
+- Merge target matched branch `orchestrator-worktree-layout`, worktree `.worktree/orchestrator-worktree-layout`, and implementation commit `e7c78f96`.
+- Branch-local reviewer `reviewer-orchestrator-worktree-layout` approved after blocker fix.
+- Main workspace was clean before merge.
+- User has standing authorization to proceed through merge-completion when reviewer approval and safety checks pass.
+
+Merged:
+- `git merge --no-ff orchestrator-worktree-layout -m "merge: orchestrator worktree layout"`
+- Merge commit: `5f7b3015 merge: orchestrator worktree layout`
+
+Post-merge validation:
+- `cargo fmt --check` passed.
+- `cargo test -p client ticket_role --lib` passed (18 passed).
+- `git diff --check` passed.
+- `target/debug/yoi ticket doctor` passed.
+- typed `TicketDoctor` reported 0 errors and 3 pre-existing diagnostics.
+- `nix build .#yoi` passed.
+
+Result: approve.
+
+---
+
+<!-- event: state_changed author: orchestrator at: 2026-06-11T04:59:47Z from: inprogress to: done reason: merged_and_validated field: state -->
+
+## State changed
+
+Merged branch `orchestrator-worktree-layout` with merge commit `5f7b3015`; branch-local reviewer approved after fix and post-merge validation passed (`cargo fmt --check`, `cargo test -p client ticket_role --lib`, `git diff --check`, `target/debug/yoi ticket doctor`, typed `TicketDoctor` 0 errors / 3 pre-existing diagnostics, `nix build .#yoi`).
+
+---
+
+<!-- event: state_changed author: hare at: 2026-06-11T05:00:04Z from: done to: closed reason: closed field: state -->
+
+## State changed
+
+Ticket を closed にしました。
+
+
+---
+
+<!-- event: close author: hare at: 2026-06-11T05:00:04Z status: closed -->
+
+## 完了
+
+完了しました。
+
+実施内容:
+- `docs/design/orchestrator-worktree-layout.md` を追加し、`role_workspace_root` / `original_workspace_root` / `implementation_worktree_root` / `merge_target_workspace_root` の4-root model を記録しました。
+- `TicketRoleLaunchContext` / `TicketRoleLaunchPlan` に original/target/worktree root を追加しました。
+- Orchestrator launch prompt に `Workspace routing context` を出し、role runtime workspace / Ticket backend root と original implementation root / merge target root を区別できるようにしました。
+- Orchestrator routing / merge-completion prompt resources を更新し、implementation worktree は recorded original workspace root の `.worktree` 配下、merge/cleanup は recorded merge target workspace で行うよう明示しました。
+- `.yoi/workflow/worktree-workflow.md` と `.yoi/workflow/multi-agent-workflow.md` を更新し、Orchestrator cwd を original repo root / merge target とみなさない方針に揃えました。
+- standing merge authority があり、reviewer approval / safe target workspace / no blockers の条件が揃う場合は merge-ready dossier で止まらず merge/validation/close/cleanup まで進む guidance にしました。
+- client Ticket-role tests を更新し、root fields と `SpawnConfig.workspace_root` が role runtime workspace root のまま保たれることを検証しました。
+
+Merge:
+- Branch: `orchestrator-worktree-layout`
+- Implementation commit: `e7c78f96 feat: track orchestration workspace roots`
+- Merge commit: `5f7b3015 merge: orchestrator worktree layout`
+
+確認:
+- Branch-local reviewer `reviewer-orchestrator-worktree-layout` が初回 request_changes 後、修正済み branch を approve。
+- `cargo fmt --check` passed。
+- `cargo test -p client ticket_role --lib` passed（18 passed）。
+- `git diff --check` passed。
+- `target/debug/yoi ticket doctor` passed。
+- typed `TicketDoctor` は 0 errors / 3 pre-existing diagnostics。
+- `nix build .#yoi` passed。
+
+残作業:
+- Panel/workspace orchestration が dedicated Orchestrator worktree から起動する際に `original_workspace_root` / `target_workspace_root` を実際に populate する経路は follow-up 境界です。
+
+---