summaryrefslogtreecommitdiff
path: root/makima/src/server
diff options
context:
space:
mode:
authorsoryu <soryu@soryu.co>2026-01-29 16:43:07 +0000
committersoryu <soryu@soryu.co>2026-01-29 17:23:03 +0000
commit4f1d67797dd56046665b772702b6b38fda9aa039 (patch)
tree09bd946399987742c06076862daa5204b4f13245 /makima/src/server
parentaef9c46c5608c8e455d49d31d790a4cc483706b9 (diff)
downloadsoryu-4f1d67797dd56046665b772702b6b38fda9aa039.tar.gz
soryu-4f1d67797dd56046665b772702b6b38fda9aa039.zip
Add autodetection of master for PR creation
Diffstat (limited to 'makima/src/server')
-rw-r--r--makima/src/server/handlers/mesh_supervisor.rs6
-rw-r--r--makima/src/server/state.rs4
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,
},