huskies: merge 1176 bug base_branch fallback hardcodes master instead of auto-detecting

server/src/agents/pool/start/spawn.rs

@@ -189,10 +189,10 @@ pub(super) async fn run_agent_spawn(
     let wt_info = {
         let wt_path = crate::worktree::worktree_path(&project_root_clone, &sid);
         let branch = format!("feature/story-{sid}");
-        let base_branch = config_clone
-            .base_branch
-            .clone()
-            .unwrap_or_else(|| crate::worktree::detect_base_branch(&project_root_clone));
+        let base_branch = crate::worktree::resolve_base_branch(
+            &project_root_clone,
+            config_clone.base_branch.as_deref(),
+        );
         let deadline =
             tokio::time::Instant::now() + std::time::Duration::from_secs(worktree_wait_secs);
         loop {
@@ -260,6 +260,7 @@ pub(super) async fn run_agent_spawn(
     }
 
     let (command, mut args, mut prompt) = match config_clone.render_agent_args(
+        &project_root_clone,
         &wt_path_str,
         &sid,
         Some(&aname),