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

server/src/chat/commands/diff.rs

@@ -90,19 +90,10 @@ fn find_story_id(num_str: &str) -> Option<String> {
 
 /// Return the configured base branch, or auto-detect it from the project root HEAD.
 fn resolve_base_branch(project_root: &Path) -> String {
-    crate::config::ProjectConfig::load(project_root)
+    let configured = crate::config::ProjectConfig::load(project_root)
         .ok()
-        .and_then(|c| c.base_branch)
-        .unwrap_or_else(|| {
-            Command::new("git")
-                .args(["rev-parse", "--abbrev-ref", "HEAD"])
-                .current_dir(project_root)
-                .output()
-                .ok()
-                .filter(|o| o.status.success())
-                .map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string())
-                .unwrap_or_else(|| "master".to_string())
-        })
+        .and_then(|c| c.base_branch);
+    crate::worktree::resolve_base_branch(project_root, configured.as_deref())
 }
 
 /// Run a git command in `dir`, returning trimmed stdout (empty string on failure).