From 4f1d67797dd56046665b772702b6b38fda9aa039 Mon Sep 17 00:00:00 2001 From: soryu Date: Thu, 29 Jan 2026 16:43:07 +0000 Subject: Add autodetection of master for PR creation --- makima/src/server/handlers/mesh_supervisor.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'makima/src/server/handlers') diff --git a/makima/src/server/handlers/mesh_supervisor.rs b/makima/src/server/handlers/mesh_supervisor.rs index 6f17103..5e74251 100644 --- a/makima/src/server/handlers/mesh_supervisor.rs +++ b/makima/src/server/handlers/mesh_supervisor.rs @@ -1544,19 +1544,17 @@ pub async fn create_pr( ).into_response(); }; - // Use base_branch from the task's repository config, falling back to "main" - let base_branch = task.base_branch.unwrap_or_else(|| "main".to_string()); - // Subscribe to PR results BEFORE sending the command let mut rx = state.pr_results.subscribe(); // Send CreatePR command to daemon using the supervisor's task ID // (the branch is in the supervisor's worktree) + // Pass base_branch from task if available, otherwise daemon will auto-detect let cmd = DaemonCommand::CreatePR { task_id: supervisor_id, title: request.title.clone(), body: request.body.clone(), - base_branch, + base_branch: task.base_branch.clone(), branch: request.branch.clone(), }; -- cgit v1.2.3