huskies: merge 629_refactor_migrate_commanddispatch_and_commandcontext_to_services_bundle

server/src/chat/commands/diff.rs

@@ -15,13 +15,13 @@ pub(super) fn handle_diff(ctx: &CommandContext) -> Option<String> {
     if num_str.is_empty() {
         return Some(format!(
             "Usage: `{} diff <number>`\n\nShows the git diff from the main branch to the story's worktree HEAD.",
-            ctx.bot_name
+            ctx.services.bot_name
         ));
     }
     if !num_str.chars().all(|c| c.is_ascii_digit()) {
         return Some(format!(
             "Invalid story number: `{num_str}`. Usage: `{} diff <number>`",
-            ctx.bot_name
+            ctx.services.bot_name
         ));
     }
 
@@ -34,14 +34,14 @@ pub(super) fn handle_diff(ctx: &CommandContext) -> Option<String> {
         }
     };
 
-    let wt_path = crate::worktree::worktree_path(ctx.project_root, &story_id);
+    let wt_path = crate::worktree::worktree_path(ctx.effective_root(), &story_id);
     if !wt_path.is_dir() {
         return Some(format!(
             "Story **{num_str}** has no worktree. The diff is only available once a coder has started working on it."
         ));
     }
 
-    let base_branch = resolve_base_branch(ctx.project_root);
+    let base_branch = resolve_base_branch(ctx.effective_root());
     let range = format!("{base_branch}...HEAD");
 
     let stat = run_git(&wt_path, &["diff", "--stat", &range]);
@@ -144,22 +144,16 @@ fn truncate_at_char_boundary(s: &str, max_bytes: usize) -> &str {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::agents::AgentPool;
-    use std::collections::HashSet;
-    use std::sync::{Arc, Mutex};
 
     use super::super::{CommandDispatch, try_handle_command};
 
     fn diff_cmd(root: &std::path::Path, args: &str) -> Option<String> {
-        let agents = Arc::new(AgentPool::new_test(3000));
-        let ambient_rooms = Arc::new(Mutex::new(HashSet::new()));
+        let services = crate::services::Services::new_test(root.to_path_buf(), "Timmy".to_string());
         let room_id = "!test:example.com".to_string();
         let dispatch = CommandDispatch {
-            bot_name: "Timmy",
+            services: &services,
+            project_root: &services.project_root,
             bot_user_id: "@timmy:homeserver.local",
-            project_root: root,
-            agents: &agents,
-            ambient_rooms: &ambient_rooms,
             room_id: &room_id,
         };
         try_handle_command(&dispatch, &format!("@timmy diff {args}"))