diff options
| author | soryu <soryu@soryu.co> | 2026-01-27 01:14:17 +0000 |
|---|---|---|
| committer | soryu <soryu@soryu.co> | 2026-01-27 01:18:55 +0000 |
| commit | d2ae4ce4f5808f823a77c79afb37ca089a04431c (patch) | |
| tree | ba27ab3a84d2504427e92aa2486e464090100f62 /Dockerfile | |
| parent | ee21c74987c61715660ff877b547b430426a27fd (diff) | |
| download | soryu-makima/fix-supervisor-merge.tar.gz soryu-makima/fix-supervisor-merge.zip | |
Fix supervisor merge for completed tasks and make PR command synchronousmakima/fix-supervisor-merge
## Issue 1: makima supervisor merge doesn't work for completed tasks
When a task completes, the daemon removes it from in-memory task tracking.
This caused merge operations to fail with "Task not found".
Fixed by updating handle_merge_task_to_target() to use get_task_worktree_path()
which scans the worktrees directory as a fallback when the task is not in memory.
Also updated handle_create_pr() with the same pattern for consistency.
## Issue 2: makima supervisor pr returns immediately without result
The create_pr handler was asynchronous - it sent the CreatePR command to the
daemon and immediately returned without waiting for the result.
Fixed by:
1. Adding PrResultNotification struct and pr_results broadcast channel to AppState
2. Updating mesh_daemon.rs to broadcast PRCreated results to the channel
3. Updating create_pr() handler to subscribe to pr_results and wait for the
result with a 60-second timeout (matching the merge command pattern)
Now the PR command returns the actual pr_url and pr_number from the daemon.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'Dockerfile')
0 files changed, 0 insertions, 0 deletions
