prompt: clarify orchestrator branch base

.yoi/tickets/00001KTX1QMG9/item.md

@@ -1,8 +1,8 @@
 ---
 title: '実装ブランチをOrchestrator branch HEADから切る'
-state: 'inprogress'
+state: 'closed'
 created_at: '2026-06-12T04:34:05Z'
-updated_at: '2026-06-12T08:11:52Z'
+updated_at: '2026-06-12T08:15:54Z'
 assignee: null
 queued_by: 'yoi ticket'
 queued_at: '2026-06-12T08:11:52Z'

.yoi/tickets/00001KTX1QMG9/resolution.md

@@ -0,0 +1 @@
+Orchestrator が implementation worktree を original workspace 配下に作成する場合でも、implementation branch は Orchestrator workspace current HEAD / orchestration branch HEAD を base とするよう、role prompt / routing prompt / merge completion prompt に明記した。検証は cargo fmt、cargo test -p client ticket_role、cargo check --workspace、nix build .#yoi、git diff --check、target/debug/yoi ticket doctor で完了。

.yoi/tickets/00001KTX1QMG9/thread.md

@@ -39,4 +39,52 @@ Ticket を `yoi ticket` が queued にしました。
 State changed to `inprogress`.
 
 
+---
+
+<!-- event: implementation_report author: hare at: 2026-06-12T08:15:54Z -->
+
+## Implementation report
+
+実装報告:
+- Orchestrator role prompt の workspace routing context に、implementation worktree の配置先と branch base を分離して明記した。
+- Orchestrator worktree routing prompt に、implementation branch は Orchestrator workspace current HEAD / orchestration branch HEAD から切ると明記した。
+- Merge completion prompt に、implementation branch -> orchestration branch -> merge target の順序を明記した。
+- client prompt generation test に branch base guidance の assertion を追加した。
+
+検証:
+- cargo fmt
+- cargo test -p client ticket_role
+- cargo check --workspace
+- nix build .#yoi
+- git diff --check
+- target/debug/yoi ticket doctor
+
+
+---
+
+<!-- event: state_changed author: "yoi ticket" at: 2026-06-12T08:15:54Z from: inprogress to: done reason: cli_state field: state -->
+
+## State changed
+
+State changed to `done`.
+
+
+---
+
+<!-- event: state_changed author: hare at: 2026-06-12T08:15:54Z from: done to: closed reason: closed field: state -->
+
+## State changed
+
+Ticket を closed にしました。
+
+
+---
+
+<!-- event: close author: hare at: 2026-06-12T08:15:54Z status: closed -->
+
+## 完了
+
+Orchestrator が implementation worktree を original workspace 配下に作成する場合でも、implementation branch は Orchestrator workspace current HEAD / orchestration branch HEAD を base とするよう、role prompt / routing prompt / merge completion prompt に明記した。検証は cargo fmt、cargo test -p client ticket_role、cargo check --workspace、nix build .#yoi、git diff --check、target/debug/yoi ticket doctor で完了。
+
+
 ---