diff options
Diffstat (limited to 'makima/src/server')
| -rw-r--r-- | makima/src/server/handlers/mesh_supervisor.rs | 6 | ||||
| -rw-r--r-- | makima/src/server/state.rs | 4 |
2 files changed, 4 insertions, 6 deletions
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(), }; diff --git a/makima/src/server/state.rs b/makima/src/server/state.rs index 4650a57..8a9bb7f 100644 --- a/makima/src/server/state.rs +++ b/makima/src/server/state.rs @@ -461,9 +461,9 @@ pub enum DaemonCommand { task_id: Uuid, title: String, body: Option<String>, - /// Base branch for the PR + /// Base branch for the PR. If None, will be auto-detected from the repo. #[serde(rename = "baseBranch")] - base_branch: String, + base_branch: Option<String>, /// Source branch name to push and create PR from branch: String, }, |