feat: unified download progress with cross-layer progress events

jdbc-bridge/src/main/java/sqlkit/bridge/BridgeMain.java

@@ -15,7 +15,10 @@
 public class BridgeMain {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
-    private static final ProtocolHandler HANDLER = new ProtocolHandler(new ConnectionManager());
+    private static final ProtocolHandler HANDLER = new ProtocolHandler(
+        new ConnectionManager(),
+        progressJson -> System.out.println(progressJson)
+    );
 
     public static void main(String[] args) throws Exception {
         if (args.length > 0 && "--version".equals(args[0])) {

jdbc-bridge/src/main/java/sqlkit/bridge/DriverResolver.java

@@ -41,18 +41,20 @@ private static String getDriversCacheDir() {
      * @param versionCap     Optional max version to cap against. Null means resolve LATEST.
      * @param classifier     Optional Maven classifier (e.g. "standalone"). Null means no classifier.
      * @param downloadUrl    Direct download URL for drivers NOT on Maven Central. Null means use Maven.
+     * @param progressCb     Callback invoked with (downloaded, total) during JAR download, or null.
      * @return DriverResult with path to the cached JAR and resolved version
      */
     public static DriverResult resolve(String mavenGroup, String mavenArtifact,
                                         String versionCap, String classifier,
-                                        String downloadUrl) throws Exception {
+                                        String downloadUrl, ProgressCallback progressCb) throws Exception {
         if (downloadUrl != null && !downloadUrl.isEmpty()) {
-            return resolveDirect(mavenArtifact, versionCap, downloadUrl);
+            return resolveDirect(mavenArtifact, versionCap, downloadUrl, progressCb);
         }
-        return resolveFromMaven(mavenGroup, mavenArtifact, versionCap, classifier);
+        return resolveFromMaven(mavenGroup, mavenArtifact, versionCap, classifier, progressCb);
     }
 
-    private static DriverResult resolveDirect(String mavenArtifact, String versionCap, String downloadUrl) throws Exception {
+    private static DriverResult resolveDirect(String mavenArtifact, String versionCap,
+                                               String downloadUrl, ProgressCallback progressCb) throws Exception {
         String version = (versionCap != null && !versionCap.isEmpty()) ? versionCap : "1.0.0";
         String jarFilename = mavenArtifact + "-" + version + ".jar";
         Path destPath = Paths.get(DRIVERS_CACHE, mavenArtifact, jarFilename);
@@ -67,16 +69,30 @@ private static DriverResult resolveDirect(String mavenArtifact, String versionCa
             if (!response.isSuccessful()) {
                 throw new Exception("Failed to download JAR: HTTP " + response.code() + " for " + downloadUrl);
             }
-            byte[] jarBytes = response.body() != null ? response.body().bytes() : new byte[0];
-            response.close();
-            Files.write(destPath, jarBytes);
+            if (response.body() != null) {
+                long contentLength = response.body().contentLength();
+                long totalBytes = contentLength > 0 ? contentLength : 5_000_000L;
+                long downloadedBytes = 0L;
+                try (InputStream in = new BufferedInputStream(response.body().byteStream());
+                     OutputStream out = Files.newOutputStream(destPath)) {
+                    byte[] buffer = new byte[4096];
+                    int bytesRead;
+                    while ((bytesRead = in.read(buffer)) != -1) {
+                        out.write(buffer, 0, bytesRead);
+                        downloadedBytes += bytesRead;
+                        if (progressCb != null)
+                            progressCb.onProgress(downloadedBytes, totalBytes);
+                    }
+                }
+            }
         }
 
         return new DriverResult(destPath.toAbsolutePath().toString(), version);
     }
 
     private static DriverResult resolveFromMaven(String mavenGroup, String mavenArtifact,
-                                                   String versionCap, String classifier) throws Exception {
+                                                   String versionCap, String classifier,
+                                                   ProgressCallback progressCb) throws Exception {
         // 1. Fetch maven-metadata.xml
         String metadataUrl = String.format("%s/%s/%s/maven-metadata.xml",
             MAVEN_CENTRAL, mavenGroup.replace('.', '/'), mavenArtifact);
@@ -135,11 +151,26 @@ private static DriverResult resolveFromMaven(String mavenGroup, String mavenArti
             if (!response.isSuccessful()) {
                 throw new Exception("Failed to download JAR: HTTP " + response.code() + " for " + downloadUrl);
             }
+            if (response.body() == null) {
+                throw new Exception("Empty response body when downloading JAR from " + downloadUrl);
+            }
 
-            byte[] jarBytes = response.body() != null ? response.body().bytes() : new byte[0];
-            response.close();
+            long contentLength = response.body().contentLength();
+            long totalBytes = contentLength > 0 ? contentLength : 5_000_000L;
+            long downloadedBytes = 0L;
 
-            Files.write(destPath, jarBytes);
+            try (InputStream in = new BufferedInputStream(response.body().byteStream());
+                 OutputStream out = Files.newOutputStream(destPath)) {
+                byte[] buffer = new byte[4096];
+                int bytesRead;
+                while ((bytesRead = in.read(buffer)) != -1) {
+                    out.write(buffer, 0, bytesRead);
+                    downloadedBytes += bytesRead;
+                    if (progressCb != null) {
+                        progressCb.onProgress(downloadedBytes, totalBytes);
+                    }
+                }
+            }
         }
 
         return new DriverResult(destPath.toAbsolutePath().toString(), latestVersion);
@@ -194,6 +225,13 @@ private static int tryParseInt(String s) {
         }
     }
 
+    /**
+     * Callback interface for tracking JAR download progress.
+     */
+    public interface ProgressCallback {
+        void onProgress(long downloaded, long total);
+    }
+
     /**
      * Result of a driver resolution.
      */

jdbc-bridge/src/main/java/sqlkit/bridge/ProtocolHandler.java

@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 /**
  * Dispatches JSON-RPC requests to the appropriate handler.
@@ -19,9 +20,11 @@ public class ProtocolHandler {
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private final ConnectionManager connectionManager;
+    private final Consumer<String> progressConsumer;
 
-    public ProtocolHandler(ConnectionManager connectionManager) {
+    public ProtocolHandler(ConnectionManager connectionManager, Consumer<String> progressConsumer) {
         this.connectionManager = connectionManager;
+        this.progressConsumer = progressConsumer;
     }
 
     /**
@@ -222,7 +225,20 @@ private void handleResolveDriver(JsonNode params, ObjectNode response) throws Ex
         String downloadUrl = params.has("download_url") && !params.get("download_url").isNull()
                 ? params.get("download_url").asText() : null;
 
-        DriverResolver.DriverResult result = DriverResolver.resolve(mavenGroup, mavenArtifact, versionCap, classifier, downloadUrl);
+        DriverResolver.ProgressCallback progressCb = (downloaded, total) -> {
+            try {
+                ObjectNode progressNode = MAPPER.createObjectNode();
+                progressNode.put("phase", "progress");
+                progressNode.put("downloaded", downloaded);
+                progressNode.put("total", total);
+                progressConsumer.accept(MAPPER.writeValueAsString(progressNode));
+            } catch (Exception e) {
+                // Ignore progress reporting errors
+            }
+        };
+
+        DriverResolver.DriverResult result = DriverResolver.resolve(
+            mavenGroup, mavenArtifact, versionCap, classifier, downloadUrl, progressCb);
 
         ObjectNode resultNode = MAPPER.createObjectNode();
         resultNode.put("jar_path", result.getJarPath());

src-tauri/Cargo.toml

@@ -88,7 +88,7 @@ http = "1"
 log = "0.4"
 futures = "0.3"
 rand = "0.8"
-data-studio-agent = { path = "/Users/blankll/Documents/devs/geekfun/data-studio-agent" }
+data-studio-agent = { path = "../../data-studio-agent" }
 
 # Archive extraction (JRE downloads)
 flate2 = "1.0"

src-tauri/src/agent_adapters.rs

@@ -8,8 +8,8 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use data_studio_agent as lib;
+use data_studio_agent::storage;
 use data_studio_agent::traits::{CancelMap, ConfirmMap, EventEmitter};
-use data_studio_agent::storage as storage;
 use serde_json::Value;
 use tauri::{AppHandle, Emitter, Manager, State};
 
@@ -44,7 +44,8 @@ pub async fn run_agent_loop(
     let confirm_map: ConfirmMap = confirm_state.inner().clone();
     let cancel_state: State<CancelMap> = app.state::<CancelMap>();
     let cancel_map: CancelMap = cancel_state.inner().clone();
-    let executor_state: State<Arc<dyn lib::ToolExecutor>> = app.state::<Arc<dyn lib::ToolExecutor>>();
+    let executor_state: State<Arc<dyn lib::ToolExecutor>> =
+        app.state::<Arc<dyn lib::ToolExecutor>>();
     let executor: Arc<dyn lib::ToolExecutor> = executor_state.inner().clone();
 
     let connections: HashMap<String, Value> = settings
@@ -158,8 +159,7 @@ pub async fn run_agent_step(
     base_url: Option<String>,
 ) -> Result<String, String> {
     let result = lib::harness::run_agent_step(
-        provider, model, messages, tools,
-        http_proxy, proxy_mode, api_key, base_url,
+        provider, model, messages, tools, http_proxy, proxy_mode, api_key, base_url,
     )
     .await?;
 
@@ -178,7 +178,8 @@ pub async fn validate_llm_config(
     proxy_mode: Option<String>,
     base_url: Option<String>,
 ) -> Result<bool, String> {
-    lib::harness::validate_llm_config(provider, api_key, model, http_proxy, proxy_mode, base_url).await
+    lib::harness::validate_llm_config(provider, api_key, model, http_proxy, proxy_mode, base_url)
+        .await
 }
 
 #[tauri::command]