acp_thread: If available, use git bash over powershell in terminal tool (#39466)

Release Notes:

- When git bash is installed, agents will now use that over powershell
when invoking terminal commands

crates/acp_thread/src/acp_thread.rs

@@ -12,7 +12,7 @@ use language::language_settings::FormatOnSave;
 pub use mention::*;
 use project::lsp_store::{FormatTrigger, LspFormatTarget};
 use serde::{Deserialize, Serialize};
-use settings::Settings as _;
+use settings::{Settings as _, SettingsLocation};
 use task::{Shell, ShellBuilder};
 pub use terminal::*;
 
@@ -35,7 +35,7 @@ use std::rc::Rc;
 use std::time::{Duration, Instant};
 use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
 use ui::App;
-use util::{ResultExt, get_default_system_shell};
+use util::{ResultExt, get_default_system_shell_preferring_bash};
 use uuid::Uuid;
 
 #[derive(Debug)]
@@ -2086,7 +2086,16 @@ impl AcpThread {
     ) -> Task<Result<Entity<Terminal>>> {
         let env = match &cwd {
             Some(dir) => self.project.update(cx, |project, cx| {
-                let shell = TerminalSettings::get_global(cx).shell.clone();
+                let worktree = project.find_worktree(dir.as_path(), cx);
+                let shell = TerminalSettings::get(
+                    worktree.as_ref().map(|(worktree, path)| SettingsLocation {
+                        worktree_id: worktree.read(cx).id(),
+                        path: &path,
+                    }),
+                    cx,
+                )
+                .shell
+                .clone();
                 project.directory_environment(&shell, dir.as_path().into(), cx)
             }),
             None => Task::ready(None).shared(),
@@ -2115,7 +2124,7 @@ impl AcpThread {
                             .remote_client()
                             .and_then(|r| r.read(cx).default_system_shell())
                     })?
-                    .unwrap_or_else(|| get_default_system_shell());
+                    .unwrap_or_else(|| get_default_system_shell_preferring_bash());
                 let (task_command, task_args) = ShellBuilder::new(&Shell::Program(shell))
                     .redirect_stdin_to_dev_null()
                     .build(Some(command.clone()), &args);