Merge pull request #11436 from Byron/fix

flyby fixes

Author: Byron

crates/but-api/src/legacy/repo.rs

@@ -36,25 +36,19 @@ pub fn check_signing_settings(project_id: ProjectId) -> Result<bool> {
     project.check_signing_settings()
 }
 
+/// NOTE: this function currently needs a tokio runtime to work.
 #[api_cmd_tauri]
 #[instrument(err(Debug))]
-pub fn git_clone_repository(repository_url: String, target_dir: PathBuf) -> Result<()> {
-    let url_for_context = repository_url.clone();
-
-    std::thread::spawn(move || {
-        tokio::runtime::Runtime::new()
-            .unwrap()
-            .block_on(gitbutler_git::clone(
-                &repository_url,
-                &target_dir,
-                gitbutler_git::tokio::TokioExecutor,
-                handle_git_prompt_clone,
-                url_for_context,
-            ))
-    })
-    .join()
-    .unwrap()
-    .map_err(|e| anyhow::anyhow!("{e}"))
+pub async fn git_clone_repository(repository_url: String, target_dir: PathBuf) -> Result<()> {
+    gitbutler_git::clone(
+        &repository_url,
+        &target_dir,
+        gitbutler_git::tokio::TokioExecutor,
+        handle_git_prompt_clone,
+        repository_url.clone(),
+    )
+    .await?;
+    Ok(())
 }
 
 async fn handle_git_prompt_clone(prompt: String, url: String) -> Option<String> {

crates/but-claude/src/bridge.rs

@@ -427,7 +427,7 @@ async fn spawn_command(
     let mcp_config = serde_json::to_string(mcp_config)?;
     let mut command = Command::new(claude_executable);
 
-    /// Don't create a terminal window on windows.
+    // Don't create a terminal window on windows.
     #[cfg(windows)]
     {
         use std::os::windows::process::CommandExt;
@@ -1039,7 +1039,7 @@ pub async fn check_claude_available(claude_executable: &str) -> ClaudeCheckResul
     let mut command = Command::new(claude_executable);
     command.arg("--version");
 
-    /// Don't create a terminal window on windows.
+    // Don't create a terminal window on windows.
     #[cfg(windows)]
     {
         use std::os::windows::process::CommandExt;

crates/but-claude/src/compact.rs

@@ -234,7 +234,7 @@ pub async fn generate_summary(
 
         let mut cmd = Command::new(claude_executable);
 
-        /// Don't create a terminal window on windows.
+        // Don't create a terminal window on windows.
         #[cfg(windows)]
         {
             use std::os::windows::process::CommandExt;

crates/but-server/src/lib.rs

@@ -340,7 +340,7 @@ async fn handle_command(
         "git_get_local_config" => legacy::repo::git_get_local_config_cmd(request.params),
         "git_set_local_config" => legacy::repo::git_set_local_config_cmd(request.params),
         "check_signing_settings" => legacy::repo::check_signing_settings_cmd(request.params),
-        "git_clone_repository" => legacy::repo::git_clone_repository_cmd(request.params),
+        "git_clone_repository" => legacy::repo::git_clone_repository_cmd(request.params).await,
         "get_uncommited_files" => legacy::repo::get_uncommited_files_cmd(request.params),
         "get_commit_file" => legacy::repo::get_commit_file_cmd(request.params),
         "get_workspace_file" => legacy::repo::get_workspace_file_cmd(request.params),

crates/gitbutler-git/src/executor/tokio/windows.rs

@@ -1,4 +1,4 @@
-use std::{cell::RefCell, os::windows::io::AsRawHandle, path::Path, time::Duration};
+use std::{os::windows::io::AsRawHandle, path::Path, time::Duration};
 
 use tokio::{
     io::{AsyncBufReadExt, AsyncWriteExt, BufStream},
@@ -45,20 +45,20 @@ impl Socket for BufStream<NamedPipeServer> {
 
 /// A server for the `askpass` protocol using Tokio.
 pub struct TokioAskpassServer {
-    server: Mutex<RefCell<NamedPipeServer>>,
+    server: Mutex<NamedPipeServer>,
     connection_string: String,
 }
 
 impl TokioAskpassServer {
     pub(crate) fn new() -> Result<Self, std::io::Error> {
         let connection_string = format!("{ASKPASS_PIPE_PREFIX}{}", rand::random::<u64>());
 
-        let server = Mutex::new(RefCell::new(
+        let server = Mutex::new(
             ServerOptions::new()
                 .first_pipe_instance(true)
                 .max_instances(2)
                 .create(&connection_string)?,
-        ));
+        );
 
         Ok(TokioAskpassServer {
             server,
@@ -71,21 +71,22 @@ impl AskpassServer for TokioAskpassServer {
     type Error = std::io::Error;
     type SocketHandle = BufStream<NamedPipeServer>;
 
-    // We can ignore clippy here since we locked the mutex.
-    #[expect(clippy::await_holding_refcell_ref)]
     async fn accept(&self, timeout: Option<Duration>) -> Result<Self::SocketHandle, Self::Error> {
-        let server = self.server.lock().await;
+        let mut server = self.server.lock().await;
 
         if let Some(timeout) = timeout {
-            tokio::time::timeout(timeout, server.borrow().connect()).await??;
+            tokio::time::timeout(timeout, server.connect()).await??;
         } else {
-            server.borrow().connect().await?;
+            server.connect().await?;
         }
 
         // Windows is weird. The server becomes the peer connection,
         // and before we use the new connection, we first create
         // a new server to listen for the next connection.
-        let client = server.replace(ServerOptions::new().create(&self.connection_string)?);
+        let client = std::mem::replace(
+            &mut *server,
+            ServerOptions::new().create(&self.connection_string)?,
+        );
 
         Ok(tokio::io::BufStream::new(client))
     }
@@ -101,7 +102,7 @@ impl core::fmt::Display for TokioAskpassServer {
 impl Drop for TokioAskpassServer {
     fn drop(&mut self) {
         // Best effort
-        let _ = self.server.get_mut().get_mut().disconnect();
+        let _ = self.server.get_mut().disconnect();
     }
 }
 

crates/gitbutler-git/src/repository.rs

@@ -1,8 +1,7 @@
-use std::{collections::HashMap, path::Path, time::Duration};
-
 use futures::{FutureExt, select};
 use gix::{bstr::ByteSlice, config::tree::Key};
 use rand::Rng;
+use std::{collections::HashMap, path::Path, time::Duration};
 
 use super::executor::{AskpassServer, GitExecutor, Pid, Socket};
 use crate::RefSpec;