From e652b5d57f3fff9800183c6b04990277d401fe1f Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 16 Oct 2025 11:53:13 +0200
Subject: [PATCH] Cleanup

---
 apps/desktop/desktop_native/napi/src/lib.rs            | 10 +++-------
 apps/desktop/desktop_native/ssh_agent/src/agent/mod.rs |  2 ++
 .../src/agent/{platform/mod.rs => platform.rs}         |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename apps/desktop/desktop_native/ssh_agent/src/agent/{platform/mod.rs => platform.rs} (98%)

diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index 1376884a44d..882be210fa3 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -1062,7 +1062,7 @@ pub mod sshagent_v2 {
         bindgen_prelude::Promise,
         threadsafe_function::{ErrorStrategy::CalleeHandled, ThreadsafeFunction},
     };
-    use ssh_agent::agent::ui_requester;
+    use ssh_agent::agent::{ui_requester, PlatformListener};
     use ssh_agent::{
         self,
         agent::{ui_requester::UiRequestMessage, BitwardenDesktopAgent},
@@ -1195,13 +1195,9 @@ pub mod sshagent_v2 {
 
         let agent = BitwardenDesktopAgent::new(ui_requester);
         let agent_copy = agent.clone();
-        tokio::spawn(async move {
-            UnixListenerStream::listen("/home/quexten/.ssh-sock".to_string(), agent_copy)
-                .await
-                .unwrap();
-        });
+        PlatformListener::spawn_listeners(agent_copy);
 
-        Ok(SshAgentState { agent: agent })
+        Ok(SshAgentState { agent })
     }
 
     #[napi]
diff --git a/apps/desktop/desktop_native/ssh_agent/src/agent/mod.rs b/apps/desktop/desktop_native/ssh_agent/src/agent/mod.rs
index efd3ba6465f..1460789c8f5 100644
--- a/apps/desktop/desktop_native/ssh_agent/src/agent/mod.rs
+++ b/apps/desktop/desktop_native/ssh_agent/src/agent/mod.rs
@@ -1,3 +1,5 @@
 pub mod agent;
 pub mod ui_requester;
 pub use agent::BitwardenDesktopAgent;
+mod platform;
+pub use platform::PlatformListener;
\ No newline at end of file
diff --git a/apps/desktop/desktop_native/ssh_agent/src/agent/platform/mod.rs b/apps/desktop/desktop_native/ssh_agent/src/agent/platform.rs
similarity index 98%
rename from apps/desktop/desktop_native/ssh_agent/src/agent/platform/mod.rs
rename to apps/desktop/desktop_native/ssh_agent/src/agent/platform.rs
index cc4070ba685..9572db74c34 100644
--- a/apps/desktop/desktop_native/ssh_agent/src/agent/platform/mod.rs
+++ b/apps/desktop/desktop_native/ssh_agent/src/agent/platform.rs
@@ -3,7 +3,7 @@ use homedir::my_home;
 
 use crate::{agent::{self, BitwardenDesktopAgent}, transport::unix_listener_stream::UnixListenerStream};
 
-struct PlatformListener {
+pub struct PlatformListener {
 }
 
 impl PlatformListener {