178 lines
11 KiB
Markdown
178 lines
11 KiB
Markdown
<!-- event: create author: "yoi ticket" at: 2026-06-11T03:20:32Z -->
|
|
|
|
## 作成
|
|
|
|
LocalTicketBackend によって作成されました。
|
|
|
|
---
|
|
|
|
<!-- event: plan author: intake at: 2026-06-11T04:33:13Z -->
|
|
|
|
## 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` を通すこと。
|
|
|
|
---
|
|
|
|
<!-- event: intake_summary author: intake at: 2026-06-11T04:33:22Z -->
|
|
|
|
## Intake summary
|
|
|
|
既存 Ticket 00001KTTB479X は実装・レビュー可能な粒度まで要件化済み。目的は Orchestrator を専用 orchestration worktree で実行し、implementation worktree は original workspace root 配下の sibling `.worktree/<ticket>` に作る運用・実装・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 できる。
|
|
|
|
---
|
|
|
|
<!-- event: state_changed author: intake at: 2026-06-11T04:33:23Z from: planning to: ready reason: intake_ready field: state -->
|
|
|
|
## State changed
|
|
|
|
Intake refinement により、本文・thread・artifacts を確認し、blocking open question がない implementation_ready Ticket と判断した。ユーザーが panel で queue した後、Orchestrator が routing できる状態にする。
|
|
|
|
---
|
|
|
|
<!-- event: state_changed author: workspace-panel at: 2026-06-11T04:33:46Z from: ready to: queued reason: queued field: state -->
|
|
|
|
## State changed
|
|
|
|
Ticket を `workspace-panel` が queued にしました。
|
|
|
|
|
|
---
|
|
|
|
<!-- event: state_changed author: orchestrator at: 2026-06-11T04:35:24Z from: queued to: inprogress reason: orchestrator_queue_acceptance field: state -->
|
|
|
|
## 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.
|
|
|
|
---
|
|
|
|
<!-- event: plan author: orchestrator at: 2026-06-11T04:35:24Z -->
|
|
|
|
## 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/<ticket>` 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`.
|
|
|
|
---
|
|
|
|
<!-- event: implementation_report author: orchestrator at: 2026-06-11T04:46:32Z -->
|
|
|
|
## Implementation report
|
|
|
|
Implementation report
|
|
|
|
Branch/worktree: `orchestrator-worktree-layout` / `.worktree/orchestrator-worktree-layout`
|
|
Commit:
|
|
- `834caba2 feat: track orchestration workspace roots`
|
|
|
|
Summary:
|
|
- Added `docs/design/orchestrator-worktree-layout.md` to record the four-root model: `role_workspace_root`, `original_workspace_root`, `implementation_worktree_root`, and `merge_target_workspace_root`.
|
|
- Extended `TicketRoleLaunchContext` / `TicketRoleLaunchPlan` with original/target workspace roots and derived implementation worktree root.
|
|
- Orchestrator launch prompts now emit a `Workspace routing context` section so the model-visible task can distinguish the role runtime/Ticket backend root from original implementation and merge target roots.
|
|
- Updated Orchestrator worktree-routing and merge-completion prompt resources so implementation worktrees are created under the recorded original workspace root and merge/cleanup runs against the recorded target workspace, not accidental process cwd.
|
|
- Updated `worktree-workflow` to use `<original-workspace-root>/.worktree/<task-name>` and `git -C <original-workspace-root> ...` instead of assuming the Orchestrator cwd is the repository root.
|
|
- Adjusted client Ticket-role prompt tests to cover workspace routing context and standing merge-completion authority behavior.
|
|
|
|
Validation run in branch:
|
|
- `cargo fmt --check` passed.
|
|
- `cargo test -p client ticket_role --lib` passed (18 passed).
|
|
- `git diff --check` passed.
|
|
- `/home/hare/Projects/yoi/target/debug/yoi ticket doctor` passed.
|
|
- `nix build .#yoi` passed.
|
|
|
|
Notes:
|
|
- Panel/workspace orchestration can later populate `original_workspace_root` and `target_workspace_root` when launching an Orchestrator from a dedicated worktree. This branch adds the plan/prompt plumbing and workflow policy without changing Ticket storage backend authority or introducing Git-external project records.
|
|
|
|
---
|
|
|
|
<!-- event: review author: reviewer-orchestrator-worktree-layout at: 2026-06-11T04:53:40Z status: request_changes -->
|
|
|
|
## Review: request changes
|
|
|
|
Branch-local review verdict: request_changes
|
|
|
|
Blocker:
|
|
- `.yoi/workflow/multi-agent-workflow.md` still contradicts the new root model. It still instructs creating `./.worktree/<task-name>` relative to Orchestrator cwd and frames read/write authority, orchestration authority, merge, validation, and lifecycle around `main workspace` instead of recorded original/target workspace roots. Because this workflow is advertised/resident and referenced by the updated Orchestrator prompt, it can reintroduce old behavior despite the updated `worktree-workflow`.
|
|
|
|
Non-blocking notes:
|
|
- `TicketRoleLaunchContext` / `TicketRoleLaunchPlan` root plumbing is directionally correct and generated Orchestrator prompt output exposes `role_workspace_root`, `original_workspace_root`, `implementation_worktree_root`, and `merge_target_workspace_root`.
|
|
- Production callers still construct `TicketRoleLaunchContext::new(workspace_root, TicketRole::Orchestrator)` without supplying distinct original/target roots. This can be a follow-up boundary, but the branch is not a complete dedicated-orchestration-worktree launch path yet.
|
|
- Tests cover new prompt wording and standing merge-completion wording, but should more strongly assert plan field values and that `SpawnConfig` stays on `role_workspace_root` when original/target roots differ.
|
|
|
|
Validation run by reviewer:
|
|
- `cargo test -p client ticket_role --lib` passed (18 passed).
|
|
- `git diff --check $(git merge-base HEAD develop)..HEAD` passed.
|
|
- `/home/hare/Projects/yoi/target/debug/yoi ticket doctor` passed.
|
|
- `nix build .#yoi --no-link` passed.
|
|
|
|
No files were modified by reviewer.
|
|
|
|
---
|
|
|
|
<!-- event: implementation_report author: orchestrator at: 2026-06-11T04:56:47Z -->
|
|
|
|
## Implementation report
|
|
|
|
Fix-loop implementation report
|
|
|
|
Reviewer blocker fixed in amended implementation commit `e7c78f96`:
|
|
- Updated `.yoi/workflow/multi-agent-workflow.md` so it no longer assumes Orchestrator cwd is the original repository root.
|
|
- Multi-agent workflow now explicitly says implementation worktrees are created under the recorded original workspace root `.worktree`, and merge-completion runs against the recorded merge target workspace.
|
|
- Replaced remaining `main workspace` merge/validation/Ticket-completion wording with recorded merge target / recorded Ticket backend wording where relevant.
|
|
- Kept `.yoi` path-exclusion policy intact while clarifying Orchestrator workspace / Ticket backend authority boundaries.
|
|
- Strengthened client tests to assert `TicketRoleLaunchPlan` root fields and that `SpawnConfig.workspace_root` remains the role runtime workspace root even when original/target roots differ.
|
|
|
|
Validation after fix:
|
|
- `cargo fmt --check` passed.
|
|
- `cargo test -p client ticket_role --lib` passed (18 passed).
|
|
- `git diff --check` passed.
|
|
- `/home/hare/Projects/yoi/target/debug/yoi ticket doctor` passed.
|
|
- `nix build .#yoi` passed.
|
|
|
|
Reviewer `reviewer-orchestrator-worktree-layout` has been asked to re-review the amended branch.
|
|
|
|
---
|