From 27d300e6bd3bf8ab52e4f91fc4442845f4e6cbaf Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Sat, 1 Aug 2026 03:43:41 +0800
Subject: [PATCH] fix(agent): resolve relative native launch paths

---
 crates/dbx-core/src/agent_manager.rs | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/crates/dbx-core/src/agent_manager.rs b/crates/dbx-core/src/agent_manager.rs
index 2ab560add..3ae592753 100644
--- a/crates/dbx-core/src/agent_manager.rs
+++ b/crates/dbx-core/src/agent_manager.rs
@@ -275,6 +275,41 @@ mod tests {
         assert_eq!(launch.working_dir.as_deref(), Some(manager.driver_dir("dameng").as_path()));
     }
 
+    #[test]
+    fn resolves_relative_native_agent_launch_with_absolute_paths() {
+        let base_dir =
+            PathBuf::from("target").join(format!("dbx-agent-manager-relative-native-{}", uuid::Uuid::new_v4()));
+        let manager = AgentManager::new_with_base_dir(base_dir.clone());
+        let native = manager.driver_native_path("oracle");
+        touch(&native);
+        let expected_program = native.canonicalize().unwrap();
+        let expected_working_dir = manager.driver_dir("oracle").canonicalize().unwrap();
+
+        let launch = manager
+            .resolve_agent_launch_spec(&AgentState::default(), "oracle", DEFAULT_JRE_KEY)
+            .expect("relative native launch should resolve");
+
+        assert!(launch.program.is_absolute());
+        assert_eq!(launch.program, expected_program);
+        assert_eq!(launch.args, Vec::<String>::new());
+        assert_eq!(launch.working_dir.as_deref(), Some(expected_working_dir.as_path()));
+
+        fs::remove_dir_all(base_dir).unwrap();
+    }
+
+    #[test]
+    fn relative_native_agent_launch_keeps_missing_driver_error() {
+        let base_dir =
+            PathBuf::from("target").join(format!("dbx-agent-manager-relative-missing-{}", uuid::Uuid::new_v4()));
+        let manager = AgentManager::new_with_base_dir(base_dir);
+
+        let error = manager
+            .resolve_agent_launch_spec(&AgentState::default(), "oracle", DEFAULT_JRE_KEY)
+            .expect_err("missing native agent should fail");
+
+        assert_eq!(error, "oracle driver is not installed. Please install it from the Driver Manager.");
+    }
+
     #[test]
     fn resolves_manifest_agent_launch_with_driver_dir_templates() {
         let manager = test_manager("manifest-agent");
@@ -689,6 +724,17 @@ impl AgentManager {
 
         let native_path = self.driver_native_path(driver_key);
         if native_path.exists() {
+            let (native_path, driver_dir) = if native_path.is_relative() || driver_dir.is_relative() {
+                let native_path = native_path
+                    .canonicalize()
+                    .map_err(|e| format!("Failed to resolve {driver_key} native agent executable path: {e}"))?;
+                let driver_dir = driver_dir
+                    .canonicalize()
+                    .map_err(|e| format!("Failed to resolve {driver_key} native agent working directory: {e}"))?;
+                (native_path, driver_dir)
+            } else {
+                (native_path, driver_dir)
+            };
             return Ok(AgentLaunchSpec::new(native_path).with_working_dir(driver_dir));
         }