From 157fd8ff92cff5280fda4c6522450fdb74e95ff0 Mon Sep 17 00:00:00 2001 From: Hare Date: Sun, 7 Jun 2026 15:47:14 +0900 Subject: [PATCH] ticket: close orchestrator merge completion --- .../artifacts/.gitkeep | 0 .../item.md | 6 +-- .../resolution.md | 26 ++++++++++++ .../thread.md | 42 +++++++++++++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) rename .yoi/tickets/{open => closed}/20260607-035231-orchestrator-merge-completion/artifacts/.gitkeep (100%) rename .yoi/tickets/{open => closed}/20260607-035231-orchestrator-merge-completion/item.md (98%) create mode 100644 .yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/resolution.md rename .yoi/tickets/{open => closed}/20260607-035231-orchestrator-merge-completion/thread.md (86%) diff --git a/.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/artifacts/.gitkeep b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/artifacts/.gitkeep similarity index 100% rename from .yoi/tickets/open/20260607-035231-orchestrator-merge-completion/artifacts/.gitkeep rename to .yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/artifacts/.gitkeep diff --git a/.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/item.md b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/item.md similarity index 98% rename from .yoi/tickets/open/20260607-035231-orchestrator-merge-completion/item.md rename to .yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/item.md index b7aec908..6c3ff1d1 100644 --- a/.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/item.md +++ b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/item.md @@ -2,13 +2,13 @@ id: 20260607-035231-orchestrator-merge-completion slug: orchestrator-merge-completion title: Orchestrator merge completion -status: open +status: closed kind: task priority: P1 labels: [orchestrator, merge, ticket, workflow, validation] -workflow_state: ready +workflow_state: done created_at: 2026-06-07T03:52:31Z -updated_at: 2026-06-07T06:46:06Z +updated_at: 2026-06-07T06:47:03Z assignee: null legacy_ticket: null --- diff --git a/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/resolution.md b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/resolution.md new file mode 100644 index 00000000..ff719ba3 --- /dev/null +++ b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/resolution.md @@ -0,0 +1,26 @@ +Implemented, reviewed, merged, and validated. + +Summary: +- Added Orchestrator merge-completion guidance for reviewed in-progress Tickets with merge-ready dossiers. +- Merge authority is explicit: dogfooding/workspace policy may authorize merge/cleanup/close; conservative/missing authorization stops at the dossier. +- Dossier requirements are explicit: Ticket id/slug, branch/worktree, commits, intent/invariant check, implementation summary, coder/reviewer Pods, blockers fixed or rejected findings with reasons, validation performed, residual risks, dirty state, and parent/human decision needs. +- Post-merge validation baseline is explicit: focused Ticket/dossier tests, `cargo fmt --check`, `git diff --check`, `target/debug/yoi ticket doctor` where applicable, and broader validation such as `cargo check --workspace --all-targets` / `nix build .#yoi` when risk/touched files warrant it. +- Branch-local reviewer verdicts remain dossier evidence before merge; final main Ticket review/approval/completion records are written during merge-completion after confirming the reviewed branch is the branch being merged. +- Guidance covers merge, post-merge validation, Ticket `done`/close handling, Pod scope reclaim, and worktree/branch cleanup. +- Queue routing and worktree/coder/reviewer routing were not reimplemented in this ticket. + +Implementation: +- Child commits: `cb17728 orchestrator: add merge completion guidance`, `33abf3f fixup! orchestrator: add merge completion guidance` +- Merge commit: `merge: orchestrator merge completion` + +Review: +- External reviewer `orchestrator-merge-reviewer-20260607` requested changes for explicit dossier/validation requirements. +- Fixup addressed blockers. +- Reviewer approved after fixup. + +Validation after merge: +- `cargo test -p client ticket_role --lib` +- `cargo fmt --check` +- `git diff --check` +- `cargo build -p yoi` +- `target/debug/yoi ticket doctor` \ No newline at end of file diff --git a/.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/thread.md b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/thread.md similarity index 86% rename from .yoi/tickets/open/20260607-035231-orchestrator-merge-completion/thread.md rename to .yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/thread.md index c8a780f9..cfe3be61 100644 --- a/.yoi/tickets/open/20260607-035231-orchestrator-merge-completion/thread.md +++ b/.yoi/tickets/closed/20260607-035231-orchestrator-merge-completion/thread.md @@ -234,3 +234,45 @@ Reviewer validation: Operational note from reviewer: main workspace dirty-state should be checked before merge; observed dirtiness was Ticket files/backend lock from orchestration records, not a branch implementation issue. --- + + + +## State changed + +Ticket closed; workflow_state set to done. + + +--- + + + +## Closed + +Implemented, reviewed, merged, and validated. + +Summary: +- Added Orchestrator merge-completion guidance for reviewed in-progress Tickets with merge-ready dossiers. +- Merge authority is explicit: dogfooding/workspace policy may authorize merge/cleanup/close; conservative/missing authorization stops at the dossier. +- Dossier requirements are explicit: Ticket id/slug, branch/worktree, commits, intent/invariant check, implementation summary, coder/reviewer Pods, blockers fixed or rejected findings with reasons, validation performed, residual risks, dirty state, and parent/human decision needs. +- Post-merge validation baseline is explicit: focused Ticket/dossier tests, `cargo fmt --check`, `git diff --check`, `target/debug/yoi ticket doctor` where applicable, and broader validation such as `cargo check --workspace --all-targets` / `nix build .#yoi` when risk/touched files warrant it. +- Branch-local reviewer verdicts remain dossier evidence before merge; final main Ticket review/approval/completion records are written during merge-completion after confirming the reviewed branch is the branch being merged. +- Guidance covers merge, post-merge validation, Ticket `done`/close handling, Pod scope reclaim, and worktree/branch cleanup. +- Queue routing and worktree/coder/reviewer routing were not reimplemented in this ticket. + +Implementation: +- Child commits: `cb17728 orchestrator: add merge completion guidance`, `33abf3f fixup! orchestrator: add merge completion guidance` +- Merge commit: `merge: orchestrator merge completion` + +Review: +- External reviewer `orchestrator-merge-reviewer-20260607` requested changes for explicit dossier/validation requirements. +- Fixup addressed blockers. +- Reviewer approved after fixup. + +Validation after merge: +- `cargo test -p client ticket_role --lib` +- `cargo fmt --check` +- `git diff --check` +- `cargo build -p yoi` +- `target/debug/yoi ticket doctor` + +---