summaryrefslogtreecommitdiff
path: root/makima/src/bin
diff options
context:
space:
mode:
authorsoryu <soryu@soryu.co>2026-01-27 01:22:11 +0000
committerGitHub <noreply@github.com>2026-01-27 01:22:11 +0000
commitb28345d15730ffbefe81244d06c06fe13c30b0ea (patch)
treeba27ab3a84d2504427e92aa2486e464090100f62 /makima/src/bin
parent6cd5b20670d7ecd3d48539ff898e021988f2a503 (diff)
downloadsoryu-b28345d15730ffbefe81244d06c06fe13c30b0ea.tar.gz
soryu-b28345d15730ffbefe81244d06c06fe13c30b0ea.zip
Fix supervisor merge and PR commands (#36)
* Task completion checkpoint * Task completion checkpoint * Task completion checkpoint * Fix supervisor merge for completed tasks and make PR command synchronous ## 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> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'makima/src/bin')
0 files changed, 0 insertions, 0 deletions