From 95fb8340eb966c102568b17a8de58e1a30904bb0 Mon Sep 17 00:00:00 2001 From: Hare Date: Thu, 11 Jun 2026 13:35:34 +0900 Subject: [PATCH] ticket: accept orchestrator worktree layout --- .../artifacts/orchestration-plan.jsonl | 1 + .yoi/tickets/00001KTTB479X/item.md | 6 +- .yoi/tickets/00001KTTB479X/thread.md | 92 +++++++++++++++++++ 3 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 .yoi/tickets/00001KTTB479X/artifacts/orchestration-plan.jsonl diff --git a/.yoi/tickets/00001KTTB479X/artifacts/orchestration-plan.jsonl b/.yoi/tickets/00001KTTB479X/artifacts/orchestration-plan.jsonl new file mode 100644 index 00000000..10238443 --- /dev/null +++ b/.yoi/tickets/00001KTTB479X/artifacts/orchestration-plan.jsonl @@ -0,0 +1 @@ +{"id":"orch-plan-20260611-043524-1","ticket_id":"00001KTTB479X","kind":"accepted_plan","accepted_plan":{"summary":"Design/implement orchestration worktree separation: Panel/role launch context must distinguish orchestrator cwd/ticket backend from original workspace root, implementation worktrees must be created under original workspace root `.worktree/`, prompt/workflow guidance must treat merge-ready dossier as checkpoint when standing merge authority and safety conditions hold, and tests/workflow validation must cover cwd/backend/root separation.","branch":"orchestrator-worktree-layout","worktree":"/home/hare/Projects/yoi/.worktree/orchestrator-worktree-layout","role_plan":"Orchestrator implements directly in a dedicated worktree because this session has known coder write-scope/profile-refresh limitations. Use read-only reviewer after implementation. With standing merge authority, continue through merge/close if reviewer approves and post-merge safety checks pass."},"author":"orchestrator","at":"2026-06-11T04:35:24Z"} diff --git a/.yoi/tickets/00001KTTB479X/item.md b/.yoi/tickets/00001KTTB479X/item.md index 0c4ba8fa..d79d5191 100644 --- a/.yoi/tickets/00001KTTB479X/item.md +++ b/.yoi/tickets/00001KTTB479X/item.md @@ -1,9 +1,11 @@ --- title: 'Orchestratorを専用worktreeで実行し実装worktreeをworkspace root配下に作る' -state: 'planning' +state: 'inprogress' created_at: '2026-06-11T03:20:32Z' -updated_at: '2026-06-11T03:20:32Z' +updated_at: '2026-06-11T04:35:24Z' assignee: null +queued_by: 'workspace-panel' +queued_at: '2026-06-11T04:33:46Z' --- ## 背景 diff --git a/.yoi/tickets/00001KTTB479X/thread.md b/.yoi/tickets/00001KTTB479X/thread.md index 6059dfc0..d8800f18 100644 --- a/.yoi/tickets/00001KTTB479X/thread.md +++ b/.yoi/tickets/00001KTTB479X/thread.md @@ -5,3 +5,95 @@ LocalTicketBackend によって作成されました。 --- + + + +## Plan + +## Intake refinement + +既存 Ticket 本文・thread・artifacts を確認した。artifacts はなく、thread は作成イベントのみ。 + +### Readiness + +- readiness: implementation_ready +- open_questions: なし +- risk_flags: [worktree-layout, ticket-backend, panel-launcher, prompt-workflow-guidance, authority-boundary, merge-completion, cleanup] + +### Orchestrator / Reviewer focus + +- Orchestrator の `pwd`、Ticket backend root、original workspace root、implementation worktree root を混同しないこと。 +- implementation branch に orchestration branch の Ticket churn を混ぜないこと。 +- merge-ready dossier は停止点ではなく checkpoint とし、standing merge authority・reviewer approval・safe target workspace・未解決 human gate なしが揃う場合だけ merge / validation / close or done / cleanup まで進めること。 +- `resources/prompts/*`、`.yoi/workflow/*`、Panel/role launcher の実装が相互に矛盾しないこと。 +- filesystem Ticket backend 前提の運用分離であり、Git 外 Ticket store 移行や push 自動化は非目標として維持すること。 + +### Validation focus + +- targeted tests または workflow-level validation で cwd/backend/root 分離を確認すること。 +- `target/debug/yoi ticket doctor` を通すこと。 +- コード・runtime resource・prompt 変更が含まれるため、完了前に `nix build .#yoi` を通すこと。 + +--- + + + +## Intake summary + +既存 Ticket 00001KTTB479X は実装・レビュー可能な粒度まで要件化済み。目的は Orchestrator を専用 orchestration worktree で実行し、implementation worktree は original workspace root 配下の sibling `.worktree/` に作る運用・実装・prompt/workflow guidance を整えること。blocking open question はなし。主な risk flags は worktree-layout, ticket-backend, panel-launcher, prompt-workflow-guidance, authority-boundary, merge-completion, cleanup。Orchestrator は cwd/backend/root 分離、orchestration Ticket churn の混入防止、merge-completion authority 条件、prompt/workflow 整合性を重点確認して routing できる。 + +--- + + + +## State changed + +Intake refinement により、本文・thread・artifacts を確認し、blocking open question がない implementation_ready Ticket と判断した。ユーザーが panel で queue した後、Orchestrator が routing できる状態にする。 + +--- + + + +## State changed + +Ticket を `workspace-panel` が queued にしました。 + + +--- + + + +## State changed + +Queue acceptance: unrelated dirty code/profile diffs were identified as stale reverted reviewer-blocker changes from the prior Ticket and were restored before acceptance. The remaining dirty state is this Ticket's workspace-panel queue update. Relation query has no blockers, orchestration-plan query has no existing records, and the Ticket is implementation_ready with explicit requirements for orchestration worktree / original workspace root / merge-completion guidance. Implementation side effects may proceed after this recorded acceptance. + +--- + + + +## Plan + +Routing decision: implementation_ready + +Reason: +- Ticket is `queued`; user/panel authorized routing and user has given standing authorization to continue through merge-completion when reviewer approval and safety conditions hold. +- Relation query has no blockers and orchestration-plan query has no existing records. +- Workspace dirty state was checked. Stale bad role-profile diffs from the previous Ticket were restored; remaining dirty state was this Ticket's queued update. +- Ticket body and Intake refinement contain concrete requirements, acceptance criteria, non-goals, validation focus, and risk flags. + +Evidence checked: +- Ticket body/thread/artifacts. +- `TicketRelationQuery`: no blockers. +- `TicketOrchestrationPlanQuery`: no records before this routing pass. +- Workspace/worktree/branch state: main worktree only before acceptance. +- Visible Pods: no active implementation child Pods. + +IntentPacket: +- Intent: make Orchestrator execution and implementation worktree creation explicitly distinguish orchestration worktree cwd/ticket backend from the original workspace root and target merge workspace. +- Binding decisions / invariants: filesystem Ticket backend remains; no Git-external Ticket store; main workspace draft Tickets must not be implicit Orchestrator queue; implementation worktrees are siblings under original workspace root `.worktree/` and must not be nested under Orchestrator cwd; implementation branches must not include orchestration Ticket churn; prompt/workflow guidance must not reintroduce dossier stop when standing merge authority/safe target/reviewer approval/no human gate are present. +- Requirements / acceptance criteria: record design/implementation policy; update Panel/launcher/workflow/prompt guidance as needed; testable handling of Orchestrator cwd, Ticket backend root, original workspace root, implementation worktree root, target workspace/branch, and cleanup policy; `target/debug/yoi ticket doctor`; code/runtime resource/prompt changes require `nix build .#yoi` before completion. +- Implementation latitude: exact naming/reuse policy for orchestration worktrees and exact split between docs, prompts, workflow text, and launcher code can be chosen if the invariants and tests are met. +- Escalate if implementation requires changing Ticket storage backend authority, introducing push automation, or weakening merge/reviewer/safe-workspace checks. +- Validation: focused tests for launcher/worktree context and prompt/workflow text where practical, `cargo fmt --check`, `git diff --check`, `target/debug/yoi ticket doctor`, and `nix build .#yoi`. + +---