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

server/src/config/mod.rs

@@ -593,6 +593,7 @@ impl ProjectConfig {
     /// If `agent_name` is None, uses the first (default) agent.
     pub fn render_agent_args(
         &self,
+        project_root: &Path,
         worktree_path: &str,
         story_id: &str,
         agent_name: Option<&str>,
@@ -607,9 +608,11 @@ impl ProjectConfig {
                 .ok_or_else(|| "No agents configured".to_string())?,
         };
 
-        let bb = base_branch
-            .or(self.base_branch.as_deref())
-            .unwrap_or("master");
+        let bb_owned = crate::worktree::resolve_base_branch(
+            project_root,
+            base_branch.or(self.base_branch.as_deref()),
+        );
+        let bb = bb_owned.as_str();
         let aname = agent.name.as_str();
         let render = |s: &str| {
             s.replace("{{worktree_path}}", worktree_path)