From 9337c7593d355cf89d2cf311455cc520ab092e1f Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Tue, 30 Jun 2026 17:35:35 +0800
Subject: [PATCH] fix(driver-store): hide native agent JRE badge

---
 .../components/config/DriverStoreDialog.vue   | 10 ++-
 .../desktop/src/lib/prestoSqlBuiltinDriver.ts |  1 +
 apps/desktop/src/lib/tauri.ts                 |  1 +
 crates/dbx-core/src/agent_manager.rs          |  1 +
 crates/dbx-core/src/agent_service.rs          |  7 +-
 crates/dbx-core/tests/agent_service.rs        | 71 +++++++++++++++++++
 6 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/components/config/DriverStoreDialog.vue b/apps/desktop/src/components/config/DriverStoreDialog.vue
index 310cc353f2..a9a3c2e698 100644
--- a/apps/desktop/src/components/config/DriverStoreDialog.vue
+++ b/apps/desktop/src/components/config/DriverStoreDialog.vue
@@ -180,7 +180,7 @@ const lastProgressPercent = ref<number | null>(null);
 const installedJres = computed(() => {
   const jreMap = new Map<string, boolean>();
   for (const d of drivers.value) {
-    if (!jreMap.has(d.jre)) {
+    if (driverRequiresJavaRuntime(d) && d.jre && !jreMap.has(d.jre)) {
       jreMap.set(d.jre, d.jre_installed);
     }
   }
@@ -258,6 +258,10 @@ function isDriverProgressActive(dbType: string): boolean {
   });
 }
 
+function driverRequiresJavaRuntime(driver: AgentDriverInfo): boolean {
+  return driver.requires_java_runtime ?? Boolean(driver.jre);
+}
+
 function progressTitle(fallback: string): string {
   return progressText.value || fallback;
 }
@@ -636,7 +640,7 @@ type JdbcDriverListItem =
 const filteredAgentDrivers = computed(() => {
   const query = agentDriverSearch.value.trim().toLowerCase();
   if (!query) return builtinDriverRows.value;
-  return builtinDriverRows.value.filter((driver) => [driver.label, driver.db_type, driver.version, driver.installed_version, driver.jre].filter(Boolean).join(" ").toLowerCase().includes(query));
+  return builtinDriverRows.value.filter((driver) => [driver.label, driver.db_type, driver.version, driver.installed_version, driverRequiresJavaRuntime(driver) ? driver.jre : ""].filter(Boolean).join(" ").toLowerCase().includes(query));
 });
 
 const jdbcDriverListItems = computed<JdbcDriverListItem[]>(() => {
@@ -1116,7 +1120,7 @@ watch(driverStoreTab, (tab) => {
                   <div class="text-sm font-medium">{{ driver.label }}</div>
                 </div>
                 <div class="flex shrink-0 items-center gap-1.5">
-                  <span v-if="driver.jre" class="rounded-full px-2 py-0.5 text-[11px]" :class="driver.jre !== '21' ? 'bg-blue-500/10 text-blue-600' : 'bg-muted text-muted-foreground'">JRE {{ driver.jre }}</span>
+                  <span v-if="driverRequiresJavaRuntime(driver) && driver.jre" class="rounded-full px-2 py-0.5 text-[11px]" :class="driver.jre !== '21' ? 'bg-blue-500/10 text-blue-600' : 'bg-muted text-muted-foreground'">JRE {{ driver.jre }}</span>
                   <template v-if="driver.installed">
                     <span class="rounded-full bg-muted px-2 py-0.5 text-[11px] text-muted-foreground">v{{ driver.installed_version }}</span>
                     <span v-if="driver.update_available" class="rounded-full bg-amber-500/15 px-2 py-0.5 text-[11px] text-amber-600">→ v{{ driver.version }}</span>
diff --git a/apps/desktop/src/lib/prestoSqlBuiltinDriver.ts b/apps/desktop/src/lib/prestoSqlBuiltinDriver.ts
index cdfc008073..094a881f2f 100644
--- a/apps/desktop/src/lib/prestoSqlBuiltinDriver.ts
+++ b/apps/desktop/src/lib/prestoSqlBuiltinDriver.ts
@@ -24,6 +24,7 @@ export function prestoSqlBuiltinDriverRow(bundles: JdbcMavenBundleInfo[]): Agent
     installed: Boolean(installedBundle),
     installed_version: installedBundle ? PRESTOSQL_JDBC_DRIVER_VERSION : null,
     update_available: false,
+    requires_java_runtime: false,
     jre: "",
     jre_installed: true,
   };
diff --git a/apps/desktop/src/lib/tauri.ts b/apps/desktop/src/lib/tauri.ts
index b19639fe3b..a07c442bbe 100644
--- a/apps/desktop/src/lib/tauri.ts
+++ b/apps/desktop/src/lib/tauri.ts
@@ -66,6 +66,7 @@ export interface AgentDriverInfo {
   installed: boolean;
   installed_version: string | null;
   update_available: boolean;
+  requires_java_runtime?: boolean;
   jre: string;
   jre_installed: boolean;
 }
diff --git a/crates/dbx-core/src/agent_manager.rs b/crates/dbx-core/src/agent_manager.rs
index c8c3663046..b22e514f3e 100644
--- a/crates/dbx-core/src/agent_manager.rs
+++ b/crates/dbx-core/src/agent_manager.rs
@@ -347,6 +347,7 @@ pub struct AgentDriverInfo {
     pub installed: bool,
     pub installed_version: Option<String>,
     pub update_available: bool,
+    pub requires_java_runtime: bool,
     pub jre: String,
     pub jre_installed: bool,
 }
diff --git a/crates/dbx-core/src/agent_service.rs b/crates/dbx-core/src/agent_service.rs
index 8afdea88ac..8424305219 100644
--- a/crates/dbx-core/src/agent_service.rs
+++ b/crates/dbx-core/src/agent_service.rs
@@ -184,9 +184,13 @@ pub fn build_agent_list(am: &AgentManager, registry: Option<&AgentRegistry>) ->
     agent_catalog::driver_store_entries()
         .map(|(key, label)| {
             let installed = am.is_driver_installed(key);
-            let requires_java_runtime = am.driver_requires_java_runtime(key);
             let local = local_state.installed_drivers.get(key);
             let remote = registry.and_then(|r| agent_registry_driver(r, key));
+            let requires_java_runtime = if installed {
+                am.driver_requires_java_runtime(key)
+            } else {
+                remote.is_some_and(|driver| driver.native.get(AgentManager::current_platform()).is_none())
+            };
             let jre_key = remote
                 .map(|r| r.jre.clone())
                 .or_else(|| local.map(|l| l.jre.clone()))
@@ -209,6 +213,7 @@ pub fn build_agent_list(am: &AgentManager, registry: Option<&AgentRegistry>) ->
                     (Some(l), Some(r)) => l.version != r.version || jre_update_available,
                     _ => false,
                 },
+                requires_java_runtime,
                 jre: jre_key.clone(),
                 jre_installed: !installed || !requires_java_runtime || am.is_jre_installed(&jre_key),
             }
diff --git a/crates/dbx-core/tests/agent_service.rs b/crates/dbx-core/tests/agent_service.rs
index a1f6f2d8e0..ccce698f6b 100644
--- a/crates/dbx-core/tests/agent_service.rs
+++ b/crates/dbx-core/tests/agent_service.rs
@@ -37,6 +37,30 @@ fn registry_with_jre_driver(db_type: &str, driver_version: &str, jre: &str, jre_
     registry
 }
 
+fn registry_with_native_driver(db_type: &str, version: &str, jre: &str) -> AgentRegistry {
+    let mut drivers = std::collections::HashMap::new();
+    drivers.insert(
+        db_type.to_string(),
+        DriverInfo {
+            version: version.to_string(),
+            label: db_type.to_string(),
+            min_app_version: "0.1.0".to_string(),
+            jre: jre.to_string(),
+            jar: Some(ArtifactInfo {
+                url: format!("https://example.com/dbx-agent-{db_type}-legacy-placeholder.jar"),
+                size: 0,
+            }),
+            native: [(
+                AgentManager::current_platform().to_string(),
+                ArtifactInfo { url: format!("https://example.com/dbx-agent-{db_type}"), size: 42 },
+            )]
+            .into_iter()
+            .collect(),
+        },
+    );
+    AgentRegistry { jre: None, jres: std::collections::HashMap::new(), drivers }
+}
+
 #[test]
 fn built_in_agent_list_includes_expected_driver_labels() {
     let manager = test_manager("labels");
@@ -80,6 +104,7 @@ fn agent_list_marks_installed_driver_update_when_registry_version_differs() {
     assert_eq!(h2.version, "0.2.0");
     assert_eq!(h2.size, 42);
     assert_eq!(h2.jre, "21");
+    assert!(h2.requires_java_runtime);
     assert!(h2.update_available);
 }
 
@@ -174,9 +199,55 @@ fn agent_list_does_not_require_jre_for_native_agent() {
     let dameng = agents.iter().find(|agent| agent.db_type == "dameng").unwrap();
 
     assert!(dameng.installed);
+    assert!(!dameng.requires_java_runtime);
     assert!(dameng.jre_installed);
 }
 
+#[test]
+fn agent_list_does_not_require_jre_for_registry_native_agent() {
+    let manager = test_manager("registry-native-no-jre");
+    let registry = registry_with_native_driver("xugu", "0.2.0", DEFAULT_JRE_KEY);
+
+    let agents = build_agent_list(&manager, Some(&registry));
+    let xugu = agents.iter().find(|agent| agent.db_type == "xugu").unwrap();
+
+    assert!(!xugu.installed);
+    assert_eq!(xugu.jre, DEFAULT_JRE_KEY);
+    assert!(!xugu.requires_java_runtime);
+    assert!(xugu.jre_installed);
+}
+
+#[test]
+fn agent_list_keeps_jre_requirement_for_installed_jar_when_registry_has_native() {
+    let manager = test_manager("installed-jar-registry-native");
+    let jar_path = manager.driver_jar_path("xugu");
+    std::fs::create_dir_all(jar_path.parent().unwrap()).unwrap();
+    std::fs::write(&jar_path, b"jar").unwrap();
+    manager
+        .save_state(&dbx_core::agent_manager::AgentState {
+            installed_drivers: [(
+                "xugu".to_string(),
+                InstalledDriver {
+                    version: "0.2.0".to_string(),
+                    installed_at: "2026-05-18T00:00:00Z".to_string(),
+                    jre: DEFAULT_JRE_KEY.to_string(),
+                },
+            )]
+            .into_iter()
+            .collect(),
+            ..Default::default()
+        })
+        .unwrap();
+    let registry = registry_with_native_driver("xugu", "0.2.0", DEFAULT_JRE_KEY);
+
+    let agents = build_agent_list(&manager, Some(&registry));
+    let xugu = agents.iter().find(|agent| agent.db_type == "xugu").unwrap();
+
+    assert!(xugu.installed);
+    assert!(xugu.requires_java_runtime);
+    assert!(!xugu.jre_installed);
+}
+
 #[test]
 fn agent_list_uses_legacy_default_jre_version_when_checking_updates() {
     let manager = test_manager("legacy-jre-version");