ticket: close orchestrator merge completion

This commit is contained in:
Keisuke Hirata 2026-06-07 15:47:14 +09:00
parent 81248b1c7f
commit 157fd8ff92
No known key found for this signature in database
4 changed files with 71 additions and 3 deletions

View File

@ -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
---

View File

@ -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`

View File

@ -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.
---
<!-- event: state_changed author: hare at: 2026-06-07T06:47:03Z from: ready to: done reason: closed field: workflow_state -->
## State changed
Ticket closed; workflow_state set to done.
---
<!-- event: close author: hare at: 2026-06-07T06:47:03Z status: closed -->
## 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`
---