From 02d6cf4e947a7b6c26af5054c5e398992872b664 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sat, 20 Jun 2026 21:41:44 +0800
Subject: [PATCH 1/9] fix: agent self-healing, tool timeout, JDBC bridge hang,
 UI polish

Backend (Rust):
- lib.rs: manage AppState directly, not Arc<AppState> (Tauri TypeId mismatch)
- capabilities/sql.rs: 35 adapter arms for JdbcBridge/ClickHouse/HttpSql/Rqlite/Turso
- capabilities/sql.rs: get_schema capped at 30 tables to prevent N+1 timeout on Oracle
- capabilities/sql.rs: tool descriptions improved (list_tables for existence, get_schema for DDL)
- jdbc_bridge/adapter.rs: spawn_blocking for pipe reads so tokio::time::timeout works
- deps: data-studio-agent upgraded to v0.1.2 (self-healing, tool timeout, message ordering)

Frontend (Vue/TS):
- agent-message-bubble.vue: tool errors auto-expand, retry text shown inline
- chat-panel.vue: removed floating status bar, cleaned up props
- agentRuntime.ts: tool retry event handler with inline status
- agentRuntime.ts: context-usage tracking wired
- useChatAgent.ts: system prompt hardened with tool usage rules
- agentApi.ts: onAgentLoopToolRetry event
- dataStudioStore.ts: session tracking fields (startTime, tokenUsage, activeTool)
---
 src-tauri/Cargo.lock                          |   2 +-
 src-tauri/Cargo.toml                          |   2 +-
 src-tauri/src/capabilities/sql.rs             | 230 +++++++++++++++++-
 src-tauri/src/database/jdbc_bridge/adapter.rs |   9 +-
 src-tauri/src/lib.rs                          |   3 +-
 src/components/agent-message-bubble.vue       |  15 +-
 src/components/chat-panel.vue                 |  15 --
 src/composables/agentRuntime.ts               |  31 +++
 src/composables/useChatAgent.ts               |  19 ++
 src/datasources/agentApi.ts                   |  13 +
 src/store/dataStudioStore.ts                  |  29 +++
 11 files changed, 335 insertions(+), 33 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 7cd2b23d..a8fcf68b 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1483,7 +1483,7 @@ checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
 [[package]]
 name = "data-studio-agent"
 version = "0.1.1"
-source = "git+https://github.com/geek-fun/data-studio-agent.git?tag=v0.1.1#4e82283a77d3627dbce6ecc8aeb7832ec0ad3d72"
+source = "git+https://github.com/geek-fun/data-studio-agent.git?tag=v0.1.2#bd34c5a061ea3162b2b8d351234c05ebceae57fa"
 dependencies = [
  "async-openai",
  "async-trait",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 0c5f060c..edfcfe86 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -86,7 +86,7 @@ http = "1"
 log = "0.4"
 futures = "0.3"
 rand = "0.8"
-data-studio-agent = { git = "https://github.com/geek-fun/data-studio-agent.git", tag = "v0.1.1" }
+data-studio-agent = { git = "https://github.com/geek-fun/data-studio-agent.git", tag = "v0.1.2" }
 
 # Archive extraction (JRE downloads)
 flate2 = "1.0"
diff --git a/src-tauri/src/capabilities/sql.rs b/src-tauri/src/capabilities/sql.rs
index 3b1d5f43..c159a686 100644
--- a/src-tauri/src/capabilities/sql.rs
+++ b/src-tauri/src/capabilities/sql.rs
@@ -96,7 +96,36 @@ async fn execute_on_adapter(adapter: &ActiveConnection, sql: &str) -> Result<Que
             .execute_query(sql)
             .await
             .map_err(|e| e.to_string()),
-        _ => todo!(),
+        ActiveConnection::ClickHouse(a) => a
+            .lock()
+            .await
+            .execute_query(sql)
+            .await
+            .map_err(|e| e.to_string()),
+        ActiveConnection::JdbcBridge(a) => a
+            .lock()
+            .await
+            .execute_query(sql)
+            .await
+            .map_err(|e| e.to_string()),
+        ActiveConnection::HttpSql(a) => a
+            .lock()
+            .await
+            .execute_query(sql)
+            .await
+            .map_err(|e| e.to_string()),
+        ActiveConnection::Rqlite(a) => a
+            .lock()
+            .await
+            .execute_query(sql)
+            .await
+            .map_err(|e| e.to_string()),
+        ActiveConnection::Turso(a) => a
+            .lock()
+            .await
+            .execute_query(sql)
+            .await
+            .map_err(|e| e.to_string()),
     }
 }
 
@@ -202,7 +231,36 @@ impl CapabilityHandler for ListDatabasesHandler {
                 .list_databases()
                 .await
                 .map_err(|e| e.to_string())?,
-            _ => todo!(),
+            ActiveConnection::ClickHouse(a) => a
+                .lock()
+                .await
+                .list_databases()
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::JdbcBridge(a) => a
+                .lock()
+                .await
+                .list_databases()
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::HttpSql(a) => a
+                .lock()
+                .await
+                .list_databases()
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Rqlite(a) => a
+                .lock()
+                .await
+                .list_databases()
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Turso(a) => a
+                .lock()
+                .await
+                .list_databases()
+                .await
+                .map_err(|e| e.to_string())?,
         };
         serde_json::to_string(&dbs).map_err(|e| e.to_string())
     }
@@ -238,7 +296,36 @@ impl CapabilityHandler for ListSchemasHandler {
                 .list_schemas(database)
                 .await
                 .map_err(|e| e.to_string())?,
-            _ => todo!(),
+            ActiveConnection::ClickHouse(a) => a
+                .lock()
+                .await
+                .list_schemas(database)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::JdbcBridge(a) => a
+                .lock()
+                .await
+                .list_schemas(database)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::HttpSql(a) => a
+                .lock()
+                .await
+                .list_schemas(database)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Rqlite(a) => a
+                .lock()
+                .await
+                .list_schemas(database)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Turso(a) => a
+                .lock()
+                .await
+                .list_schemas(database)
+                .await
+                .map_err(|e| e.to_string())?,
         };
         serde_json::to_string(&schemas).map_err(|e| e.to_string())
     }
@@ -280,7 +367,36 @@ impl CapabilityHandler for ListTablesHandler {
                 .list_tables(database, schema)
                 .await
                 .map_err(|e| e.to_string())?,
-            _ => todo!(),
+            ActiveConnection::ClickHouse(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::JdbcBridge(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::HttpSql(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Rqlite(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Turso(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
         };
         serde_json::to_string(&tables).map_err(|e| e.to_string())
     }
@@ -323,10 +439,48 @@ impl CapabilityHandler for GetSchemaHandler {
                 .list_tables(database, schema)
                 .await
                 .map_err(|e| e.to_string())?,
-            _ => todo!(),
+            ActiveConnection::ClickHouse(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::JdbcBridge(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::HttpSql(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Rqlite(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Turso(a) => a
+                .lock()
+                .await
+                .list_tables(database, schema)
+                .await
+                .map_err(|e| e.to_string())?,
         };
 
+        const MAX_SCHEMA_TABLES: usize = 30;
+        let tables: Vec<_> = tables.into_iter().take(MAX_SCHEMA_TABLES).collect();
+
         let mut schema_lines: Vec<String> = Vec::new();
+        if tables.len() >= MAX_SCHEMA_TABLES {
+            schema_lines.push(format!(
+                "-- Showing first {} tables. Specify a schema filter for complete results.\n",
+                MAX_SCHEMA_TABLES
+            ));
+        }
         for table in &tables {
             let cols = match &adapter {
                 ActiveConnection::Postgres(a) => a
@@ -353,7 +507,36 @@ impl CapabilityHandler for GetSchemaHandler {
                     .list_columns(database, schema, &table.name)
                     .await
                     .map_err(|e| e.to_string())?,
-                _ => todo!(),
+                ActiveConnection::ClickHouse(a) => a
+                    .lock()
+                    .await
+                    .list_columns(database, schema, &table.name)
+                    .await
+                    .map_err(|e| e.to_string())?,
+                ActiveConnection::JdbcBridge(a) => a
+                    .lock()
+                    .await
+                    .list_columns(database, schema, &table.name)
+                    .await
+                    .map_err(|e| e.to_string())?,
+                ActiveConnection::HttpSql(a) => a
+                    .lock()
+                    .await
+                    .list_columns(database, schema, &table.name)
+                    .await
+                    .map_err(|e| e.to_string())?,
+                ActiveConnection::Rqlite(a) => a
+                    .lock()
+                    .await
+                    .list_columns(database, schema, &table.name)
+                    .await
+                    .map_err(|e| e.to_string())?,
+                ActiveConnection::Turso(a) => a
+                    .lock()
+                    .await
+                    .list_columns(database, schema, &table.name)
+                    .await
+                    .map_err(|e| e.to_string())?,
             };
 
             let schema_name = table.schema.as_deref().unwrap_or("public");
@@ -425,7 +608,36 @@ impl CapabilityHandler for DescribeTableHandler {
                 .list_columns(database, schema, table)
                 .await
                 .map_err(|e| e.to_string())?,
-            _ => todo!(),
+            ActiveConnection::ClickHouse(a) => a
+                .lock()
+                .await
+                .list_columns(database, schema, table)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::JdbcBridge(a) => a
+                .lock()
+                .await
+                .list_columns(database, schema, table)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::HttpSql(a) => a
+                .lock()
+                .await
+                .list_columns(database, schema, table)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Rqlite(a) => a
+                .lock()
+                .await
+                .list_columns(database, schema, table)
+                .await
+                .map_err(|e| e.to_string())?,
+            ActiveConnection::Turso(a) => a
+                .lock()
+                .await
+                .list_columns(database, schema, table)
+                .await
+                .map_err(|e| e.to_string())?,
         };
         serde_json::to_string(&cols).map_err(|e| e.to_string())
     }
@@ -504,7 +716,7 @@ pub fn register_sql_tools(reg: &mut CapabilityRegistry) {
 
     reg.register(Capability {
         name: "sqlkit__list_tables",
-        description: "List all tables in a database schema.",
+        description: "List all tables in a database schema. Returns table names, types, and row counts — fast and lightweight. Use this to check if tables exist or browse available objects. For full column details, use sqlkit__describe_table or sqlkit__get_schema.",
         handler: Arc::new(ListTablesHandler),
         input_schema: json!({"type": "object", "properties": {
             "connection_id": connection_id_schema(),
@@ -518,7 +730,7 @@ pub fn register_sql_tools(reg: &mut CapabilityRegistry) {
 
     reg.register(Capability {
         name: "sqlkit__get_schema",
-        description: "Get the full database schema (all tables and columns) as DDL-like text. Use this before writing queries to understand the structure.",
+        description: "Get the full database schema (all tables and all columns) as DDL-like text. SLOW on databases with many objects. Prefer sqlkit__list_tables for browsing and sqlkit__describe_table for single-table details.",
         handler: Arc::new(GetSchemaHandler),
         input_schema: json!({"type": "object", "properties": {
             "connection_id": connection_id_schema(),
diff --git a/src-tauri/src/database/jdbc_bridge/adapter.rs b/src-tauri/src/database/jdbc_bridge/adapter.rs
index 0dc7dd39..2af93039 100644
--- a/src-tauri/src/database/jdbc_bridge/adapter.rs
+++ b/src-tauri/src/database/jdbc_bridge/adapter.rs
@@ -74,8 +74,13 @@ impl JdbcBridgeAdapter {
         launcher: &Arc<Mutex<JdbcBridgeLauncher>>,
         req: JdbcRequest,
     ) -> DbResult<serde_json::Value> {
-        let mut guard = launcher.lock().await;
-        let resp = guard.send_request(&req)?;
+        let launcher = launcher.clone();
+        let resp = tokio::task::spawn_blocking(move || {
+            let mut guard = launcher.blocking_lock();
+            guard.send_request(&req)
+        })
+        .await
+        .map_err(|e| DbError::Connection(format!("JDBC bridge task panicked: {}", e)))??;
         Ok(resp.result.unwrap_or(serde_json::Value::Null))
     }
 
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 77770ca2..0f67eeb7 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -80,7 +80,6 @@ pub fn run() {
     use crate::connection::guardian::ConnectionGuardian;
     use state::AppState;
 
-    let app_state = Arc::new(AppState::new());
     let store = commands::store::Store::new();
 
     tauri::Builder::default()
@@ -91,7 +90,7 @@ pub fn run() {
         .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_window_state::Builder::default().build())
-        .manage(app_state.clone())
+        .manage(AppState::new())
         .manage(store.clone())
         .setup(move |app| {
             let handle = app.handle().clone();
diff --git a/src/components/agent-message-bubble.vue b/src/components/agent-message-bubble.vue
index 70cd8e03..706b1590 100644
--- a/src/components/agent-message-bubble.vue
+++ b/src/components/agent-message-bubble.vue
@@ -87,11 +87,13 @@ const activeToolName = computed(() => {
   )
 })
 
-function resultStatus(tc: AgentToolCall): 'success' | 'error' | 'denied' {
+function resultStatus(tc: AgentToolCall): 'success' | 'error' | 'denied' | 'executing' {
   if (tc.status === 'denied')
     return 'denied'
   if (tc.status === 'error')
     return 'error'
+  if (tc.status === 'executing')
+    return 'executing'
   return 'success'
 }
 
@@ -360,7 +362,10 @@ function toolVerb(toolName: string, tc: AgentToolCall): string {
         </div>
 
         <template v-for="tc in message.toolCalls" :key="tc.id">
-          <details class="activity-item-details">
+          <details
+            class="activity-item-details"
+            :open="tc.status === 'error' || tc.status === 'denied' || tc.status === 'executing'"
+          >
             <summary class="activity-item">
               <span class="activity-icon" :class="toolIcon(tc.toolName)" />
               <span class="tool-name-badge">{{ tc.toolName }}</span>
@@ -394,7 +399,7 @@ function toolVerb(toolName: string, tc: AgentToolCall): string {
               <span
                 v-if="
                   toolResultText(tc)
-                    && (tc.status === 'done' || tc.status === 'error' || tc.status === 'denied')
+                    && (tc.status === 'done' || tc.status === 'error' || tc.status === 'denied' || tc.status === 'executing')
                 "
                 class="result-preview"
                 :class="`result-preview-${resultStatus(tc)}`"
@@ -656,6 +661,10 @@ function toolVerb(toolName: string, tc: AgentToolCall): string {
   color: hsl(var(--destructive) / 0.7);
 }
 
+.result-preview-executing {
+  color: hsl(var(--primary) / 0.7);
+}
+
 .tool-body-wrapper {
   display: flex;
   flex-direction: column;
diff --git a/src/components/chat-panel.vue b/src/components/chat-panel.vue
index e52fbd44..d264317c 100644
--- a/src/components/chat-panel.vue
+++ b/src/components/chat-panel.vue
@@ -278,21 +278,6 @@ onBeforeUnmount(() => {
             <span class="i-carbon-close h-3.5 w-3.5" />
           </button>
         </div>
-
-        <!-- Progress indicator -->
-        <div v-if="isLoading && progress" class="text-xs text-muted-foreground py-1 flex gap-2 items-center justify-center">
-          <span class="i-carbon-loading h-3.5 w-3.5 animate-spin" />
-          <span v-if="progress.phase === 'iterating'">
-            {{ t('dataStudio.agent.iteration') }} {{ progress.iter }}/{{ progress.maxIter }}
-          </span>
-          <!-- waiting_llm phase hidden — message bubble activity timeline already shows "Waiting for model" -->
-          <span v-else-if="progress.phase === 'compacting'">
-            {{ t('dataStudio.agent.compacting') }}
-          </span>
-          <span v-else-if="progress.phase === 'preparing'">
-            {{ t('dataStudio.agent.preparing') }}
-          </span>
-        </div>
       </ScrollArea>
     </div>
 
diff --git a/src/composables/agentRuntime.ts b/src/composables/agentRuntime.ts
index 87d588d0..1f447715 100644
--- a/src/composables/agentRuntime.ts
+++ b/src/composables/agentRuntime.ts
@@ -151,6 +151,7 @@ async function initAgentRuntime(): Promise<void> {
     await agentApi.onAgentLoopToolCall(({ session_id, tool_call_id, tool_name, arguments: args }) => {
       const store = useDataStudioStore()
       store.removePreparingPlaceholder()
+      store.setSessionActiveTool(session_id, tool_name)
       const session = getSessionById(store.sessions, session_id)
       if (!session)
         return
@@ -215,6 +216,7 @@ async function initAgentRuntime(): Promise<void> {
     await agentApi.onAgentLoopToolResult(({ session_id, tool_call_id, envelope, error }) => {
       clearToolTimeout(tool_call_id)
       const store = useDataStudioStore()
+      store.setSessionActiveTool(session_id, null)
       const session = getSessionById(store.sessions, session_id)
       if (!session)
         return
@@ -393,6 +395,35 @@ async function initAgentRuntime(): Promise<void> {
     }),
   )
 
+  unlisteners.push(
+    await agentApi.onAgentContextUsage((payload) => {
+      const store = useDataStudioStore()
+      store.setSessionTokenUsage(payload.session_id, payload.used_tokens, payload.capacity)
+    }),
+  )
+
+  unlisteners.push(
+    await agentApi.onAgentLoopToolRetry(({ session_id, tool_call_id, attempt, max_attempts, delay_secs }) => {
+      const store = useDataStudioStore()
+      const session = getSessionById(store.sessions, session_id)
+      if (!session)
+        return
+      const assistantMsg = [...session.messages].reverse().find(
+        m => m.role === 'assistant' && m.toolCalls?.some(tc => tc.id === tool_call_id),
+      )
+      if (assistantMsg) {
+        store.updateToolCallStatus(
+          assistantMsg.id,
+          tool_call_id,
+          'executing',
+          `Retrying in ${delay_secs}s (${attempt}/${max_attempts})`,
+          undefined,
+          session_id,
+        )
+      }
+    }),
+  )
+
   runtimeInitPromise = Promise.resolve().then(() => {
     if (runtimeDisposed) {
       unlisteners.forEach(unlisten => unlisten())
diff --git a/src/composables/useChatAgent.ts b/src/composables/useChatAgent.ts
index 18fb56f6..5a0db8b8 100644
--- a/src/composables/useChatAgent.ts
+++ b/src/composables/useChatAgent.ts
@@ -228,6 +228,21 @@ function buildSystemPrompt({ schema, sources, permissionsMode }: {
   }
   parts.push('')
 
+  // Tool usage rules
+  parts.push('## Tool Usage Rules')
+  parts.push(
+    '- READ every tool result before deciding your next action. Do not ignore results.',
+    '- If a tool result shows data that contradicts your assumption, trust the result and update your plan.',
+    '- If a CREATE TABLE returns ORA-00955, the table ALREADY EXISTS. Do NOT retry — move on.',
+    '- If a query returns rows showing tables exist, the database is NOT empty. Acknowledge this.',
+    '- Never repeat a query that already returned a clear result. Use the data you have.',
+    '- If you find yourself repeating the same action, STOP. The previous result already answered your question.',
+    '- When a tool times out, try a simpler query or a different approach instead of retrying.',
+    '- Use sqlkit__list_tables to check if tables exist. Do NOT use sqlkit__get_schema for simple existence checks.',
+    '- Use sqlkit__describe_table for one table\'s columns. Use sqlkit__get_schema only when you need DDL for ALL tables.',
+  )
+  parts.push('')
+
   // Session-wide rules
   parts.push('## Rules')
   parts.push(
@@ -475,6 +490,10 @@ export function useChatAgent(config: UseChatAgentConfig) {
     const sessionId = config.sessionStore.activeSessionId.value
     if (!sessionId)
       return
+    if (!isLoading.value) {
+      config.sessionStore.clearSessionStop?.(sessionId)
+      return
+    }
     try {
       await agentApi.cancelAgentLoop(sessionId)
     }
diff --git a/src/datasources/agentApi.ts b/src/datasources/agentApi.ts
index f944a06b..1ace0f29 100644
--- a/src/datasources/agentApi.ts
+++ b/src/datasources/agentApi.ts
@@ -262,6 +262,18 @@ export const agentApi = {
   ): Promise<() => void> =>
     listen('agent-loop-tool-result', e => handler(e.payload as any)),
 
+  onAgentLoopToolRetry: (
+    handler: (payload: {
+      session_id: string
+      tool_call_id: string
+      tool_name: string
+      attempt: number
+      max_attempts: number
+      delay_secs: number
+    }) => void,
+  ): Promise<() => void> =>
+    listen('agent-loop-tool-retry', e => handler(e.payload as any)),
+
   onAgentLoopStepDone: (
     handler: (payload: { session_id: string }) => void,
   ): Promise<() => void> =>
@@ -373,5 +385,6 @@ export const deleteAttachedSource = agentApi.deleteAttachedSource
 export const compactAgentSession = agentApi.compactAgentSession
 export const getAgentContextUsage = agentApi.getAgentContextUsage
 export const onAgentContextUsage = agentApi.onAgentContextUsage
+export const onAgentLoopToolRetry = agentApi.onAgentLoopToolRetry
 
 export default agentApi
diff --git a/src/store/dataStudioStore.ts b/src/store/dataStudioStore.ts
index 8c2f8f06..fc5d1fc1 100644
--- a/src/store/dataStudioStore.ts
+++ b/src/store/dataStudioStore.ts
@@ -269,6 +269,9 @@ type DataStudioStoreState = {
   toolResultFullBodies: Record<string, string>
   sessionErrors: Record<string, string>
   sessionProgress: Record<string, SessionProgress>
+  sessionStartTimes: Record<string, number>
+  sessionTokenUsage: Record<string, { used: number, capacity: number }>
+  sessionActiveTool: Record<string, string | null>
 }
 
 // ─── Store ───────────────────────────────────────────────────────────────────
@@ -283,6 +286,9 @@ export const useDataStudioStore = defineStore('dataStudio', {
     toolResultFullBodies: {},
     sessionErrors: {},
     sessionProgress: {},
+    sessionStartTimes: {},
+    sessionTokenUsage: {},
+    sessionActiveTool: {},
   }),
   persist: {
     pick: ['activeSessionId', 'sidebarSessionId'],
@@ -831,12 +837,29 @@ export const useDataStudioStore = defineStore('dataStudio', {
       this.sessionProgress = rest
     },
 
+    setSessionTokenUsage(sessionId: string, used: number, capacity: number) {
+      this.sessionTokenUsage = {
+        ...this.sessionTokenUsage,
+        [sessionId]: { used, capacity },
+      }
+    },
+
+    setSessionActiveTool(sessionId: string, toolName: string | null) {
+      this.sessionActiveTool = {
+        ...this.sessionActiveTool,
+        [sessionId]: toolName,
+      }
+    },
+
     // ── Status ─────────────────────────────────────────────────────────────
 
     setSessionStatus(sessionId: string, status: AgentSessionStatus) {
       this.sessions = this.sessions.map(s =>
         s.id === sessionId ? { ...s, status, updated_at: Date.now() } : s,
       )
+      if (status === 'running') {
+        this.sessionStartTimes = { ...this.sessionStartTimes, [sessionId]: Date.now() }
+      }
       if (status !== 'error') {
         const { [sessionId]: _removed, ...rest } = this.sessionErrors
         this.sessionErrors = rest
@@ -844,6 +867,12 @@ export const useDataStudioStore = defineStore('dataStudio', {
       if (status === 'idle' || status === 'stopped' || status === 'error') {
         this.clearSessionProgress(sessionId)
         this.removePreparingPlaceholder()
+        const { [sessionId]: _st, ...restStart } = this.sessionStartTimes
+        this.sessionStartTimes = restStart
+        const { [sessionId]: _tu, ...restToken } = this.sessionTokenUsage
+        this.sessionTokenUsage = restToken
+        const { [sessionId]: _at, ...restTool } = this.sessionActiveTool
+        this.sessionActiveTool = restTool
       }
     },
 

From a0905e003d4089d1091156462595b393ad2fe9ae Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sat, 20 Jun 2026 22:05:10 +0800
Subject: [PATCH 2/9] fix: Oracle DB listDatabases returns empty causing broken
 DB browser

Root cause: JDBC getCatalogs() returns empty for Oracle, so the
frontend database selector had no options and the tree was empty.

Changes:
- jdbc-bridge: Add Oracle fallback in MetadataProvider.listDatabases()
  using SYS_CONTEXT('USERENV', 'CON_NAME') and v queries when
  getCatalogs() returns empty
- frontend: Add defensive fallback in databaseStore.fetchDatabases()
  to synthesize a database entry from the connection's configured
  database when the backend returns an empty list
---
 .../java/sqlkit/bridge/MetadataProvider.java  | 45 ++++++++++++++++++-
 src/store/databaseStore.ts                    | 14 +++++-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/jdbc-bridge/src/main/java/sqlkit/bridge/MetadataProvider.java b/jdbc-bridge/src/main/java/sqlkit/bridge/MetadataProvider.java
index b7d604c6..0c75f342 100644
--- a/jdbc-bridge/src/main/java/sqlkit/bridge/MetadataProvider.java
+++ b/jdbc-bridge/src/main/java/sqlkit/bridge/MetadataProvider.java
@@ -10,14 +10,57 @@ public class MetadataProvider {
 
     /**
      * List all databases (catalogs) on the server.
+     *
+     * For Oracle, getCatalogs() returns empty because Oracle doesn't use
+     * JDBC catalogs in the traditional sense. Fall back to querying the
+     * current container/PDB name via SYS_CONTEXT, then try listing all
+     * PDBs if connected to a CDB.
      */
     public static List<String> listDatabases(Connection conn) throws Exception {
         List<String> databases = new ArrayList<>();
         try (ResultSet rs = conn.getMetaData().getCatalogs()) {
             while (rs.next()) {
-                databases.add(rs.getString("TABLE_CAT"));
+                String cat = rs.getString("TABLE_CAT");
+                if (cat != null && !cat.isEmpty()) {
+                    databases.add(cat);
+                }
             }
         }
+
+        // Oracle fallback: getCatalogs() returns empty for Oracle JDBC.
+        // Try SYS_CONTEXT first (works in any Oracle container),
+        // then v$pdbs (only works in CDB$ROOT).
+        if (databases.isEmpty()) {
+            try (Statement stmt = conn.createStatement();
+                 ResultSet rs = stmt.executeQuery(
+                     "SELECT SYS_CONTEXT('USERENV', 'CON_NAME') FROM DUAL")) {
+                if (rs.next()) {
+                    String conName = rs.getString(1);
+                    if (conName != null && !conName.isEmpty()) {
+                        databases.add(conName);
+                    }
+                }
+            } catch (SQLException e) {
+                // Fall through to v$pdbs
+            }
+        }
+
+        if (databases.isEmpty()) {
+            try (Statement stmt = conn.createStatement();
+                 ResultSet rs = stmt.executeQuery("SELECT name FROM v$pdbs")) {
+                while (rs.next()) {
+                    String name = rs.getString(1);
+                    if (name != null && !name.isEmpty()) {
+                        databases.add(name);
+                    }
+                }
+            } catch (SQLException e) {
+                // Driver does not support Oracle-specific queries;
+                // leave databases empty (frontend will fall back to
+                // the configured connection database).
+            }
+        }
+
         return databases;
     }
 
diff --git a/src/store/databaseStore.ts b/src/store/databaseStore.ts
index 2237b21d..e9e72d99 100644
--- a/src/store/databaseStore.ts
+++ b/src/store/databaseStore.ts
@@ -95,9 +95,19 @@ export const useDatabaseStore = defineStore('databases', {
           return
         }
 
+        let databases = result
+
+        if (databases.length === 0) {
+          const connectionStore = useConnectionStore()
+          const currentDb = connectionStore.getCurrentDatabase(connectionId)
+          if (currentDb) {
+            databases = [{ name: currentDb, is_system: false }]
+          }
+        }
+
         if (!this.metadata[connectionId]) {
           this.metadata[connectionId] = {
-            databases: result,
+            databases,
             schemas: {},
             tables: {},
             objects: {},
@@ -105,7 +115,7 @@ export const useDatabaseStore = defineStore('databases', {
           }
         }
         else {
-          this.metadata[connectionId].databases = result
+          this.metadata[connectionId].databases = databases
           this.metadata[connectionId].lastRefresh = new Date().toISOString()
         }
       }

From 60de3b996c64cc438125054e113b2cf8aa36bc89 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:04:11 +0800
Subject: [PATCH 3/9] feat(dm8): consolidate DM8 and DM8Oracle into single
 Dameng type

Merge the two separate database type variants (DM8 for MySQL-wire protocol, DM8Oracle for JDBC bridge) into a single Dameng variant that routes exclusively through the JDBC bridge using the official Dameng JDBC driver (com.dameng:DmJdbcDriver8).

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 src-tauri/src/commands/helpers.rs               |  3 +--
 src-tauri/src/commands/jdbc.rs                  |  2 +-
 src-tauri/src/database/config.rs                |  6 ++----
 src-tauri/src/database/jdbc_bridge/drivers.toml |  8 ++++----
 src-tauri/src/database/jdbc_bridge/fallback.rs  |  2 +-
 src-tauri/src/database/jdbc_bridge/registry.rs  |  8 ++++----
 src-tauri/src/database/strategy.rs              | 13 ++++++-------
 src-tauri/src/state.rs                          |  3 +--
 8 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src-tauri/src/commands/helpers.rs b/src-tauri/src/commands/helpers.rs
index b0516dd7..09d76d73 100644
--- a/src-tauri/src/commands/helpers.rs
+++ b/src-tauri/src/commands/helpers.rs
@@ -170,8 +170,7 @@ fn db_type_to_enum(db_type: &str) -> Result<crate::database::DatabaseType, Strin
         "oceanbase" => Ok(DatabaseType::OceanBase),
         "tdsql" => Ok(DatabaseType::TDSQL),
         "polardb" => Ok(DatabaseType::PolarDB),
-        "dm8" | "dm" => Ok(DatabaseType::DM8),
-        "dm8_oracle" | "dm8oracle" => Ok(DatabaseType::DM8Oracle),
+        "dameng" | "dm" | "dm8" | "dm8_oracle" | "dm8oracle" => Ok(DatabaseType::Dameng),
         "kingbasees" | "kingbase" => Ok(DatabaseType::KingbaseES),
         "gaussdb" | "gauss" => Ok(DatabaseType::GaussDB),
         "highgo" => Ok(DatabaseType::HighGo),
diff --git a/src-tauri/src/commands/jdbc.rs b/src-tauri/src/commands/jdbc.rs
index 5d74c32d..966da013 100644
--- a/src-tauri/src/commands/jdbc.rs
+++ b/src-tauri/src/commands/jdbc.rs
@@ -139,7 +139,7 @@ fn parse_db_type(s: &str) -> Result<DatabaseType, String> {
         "h2" => Ok(DatabaseType::H2),
         "derby" => Ok(DatabaseType::Derby),
         "snowflake" => Ok(DatabaseType::Snowflake),
-        "dm8_oracle" | "dm8oracle" => Ok(DatabaseType::DM8Oracle),
+        "dameng" | "dm8" | "dm" | "dm8_oracle" | "dm8oracle" => Ok(DatabaseType::Dameng),
         "xugudb" | "xugu" => Ok(DatabaseType::XuguDB),
         "gbase8a" | "gbase_8a" => Ok(DatabaseType::GBase8a),
         "hive" => Ok(DatabaseType::Hive),
diff --git a/src-tauri/src/database/config.rs b/src-tauri/src/database/config.rs
index ed5aa0c2..a1584442 100644
--- a/src-tauri/src/database/config.rs
+++ b/src-tauri/src/database/config.rs
@@ -84,8 +84,6 @@ pub enum DatabaseType {
     TDSQL,
     /// 阿里云 PolarDB (MySQL mode) — MySQL wire protocol.
     PolarDB,
-    /// 达梦 DM8 (MySQL mode, secondary) — MySQL wire protocol alias.
-    DM8,
     /// Apache Doris — MySQL wire protocol.
     Doris,
     /// SelectDB (Doris fork) — MySQL wire protocol.
@@ -139,8 +137,8 @@ pub enum DatabaseType {
     Iris,
     /// Microsoft Access — JDBC bridge.
     Access,
-    /// 达梦 DM8 (Oracle mode, primary) — JDBC bridge.
-    DM8Oracle,
+    /// 达梦 Dameng DM8 — JDBC bridge.
+    Dameng,
     /// 虚谷 XuguDB — JDBC bridge.
     XuguDB,
     /// 南大通用 GBase 8a — JDBC bridge.
diff --git a/src-tauri/src/database/jdbc_bridge/drivers.toml b/src-tauri/src/database/jdbc_bridge/drivers.toml
index 7d1437df..ddb84795 100644
--- a/src-tauri/src/database/jdbc_bridge/drivers.toml
+++ b/src-tauri/src/database/jdbc_bridge/drivers.toml
@@ -143,13 +143,13 @@ version_error_signatures = [
   "Incompatible driver version",
 ]
 
-# ── 达梦 DM8 (Oracle mode) ──
+# ── 达梦 Dameng DM8 (JDBC bridge) ──
 
-[databases.dm8_oracle]
-name = "达梦 DM8"
+[databases.dameng]
+name = "达梦 Dameng"
 class_name = "dm.jdbc.driver.DmDriver"
 maven_group = "com.dameng"
-maven_artifact = "DmJdbcDriver"
+maven_artifact = "DmJdbcDriver8"
 jdbc_url_template = "jdbc:dm://{host}:{port}"
 default_port = 5236
 min_jre_version = "11"
diff --git a/src-tauri/src/database/jdbc_bridge/fallback.rs b/src-tauri/src/database/jdbc_bridge/fallback.rs
index 3549134a..c420d6be 100644
--- a/src-tauri/src/database/jdbc_bridge/fallback.rs
+++ b/src-tauri/src/database/jdbc_bridge/fallback.rs
@@ -351,7 +351,7 @@ fn db_type_from_config(config: &DatabaseDriverConfig) -> DatabaseType {
         "H2 Database" => DatabaseType::H2,
         "Apache Derby" => DatabaseType::Derby,
         "Snowflake" => DatabaseType::Snowflake,
-        "达梦 DM8" => DatabaseType::DM8Oracle,
+        "达梦 Dameng" => DatabaseType::Dameng,
         "虚谷 XuguDB" => DatabaseType::XuguDB,
         "GBase 8a" => DatabaseType::GBase8a,
         "Apache Hive" => DatabaseType::Hive,
diff --git a/src-tauri/src/database/jdbc_bridge/registry.rs b/src-tauri/src/database/jdbc_bridge/registry.rs
index bca0cfdd..46196e12 100644
--- a/src-tauri/src/database/jdbc_bridge/registry.rs
+++ b/src-tauri/src/database/jdbc_bridge/registry.rs
@@ -175,7 +175,7 @@ fn db_type_to_registry_key(db: DatabaseType) -> Option<&'static str> {
         DatabaseType::Derby => Some("derby"),
         DatabaseType::Snowflake => Some("snowflake"),
         DatabaseType::TDengine => Some("tdengine"),
-        DatabaseType::DM8Oracle => Some("dm8_oracle"),
+        DatabaseType::Dameng => Some("dameng"),
         DatabaseType::XuguDB => Some("xugudb"),
         DatabaseType::GBase8a => Some("gbase8a"),
         DatabaseType::Hive => Some("hive"),
@@ -321,12 +321,12 @@ mod tests {
 
     #[test]
     fn test_build_jdbc_url_no_database_placeholder() {
-        // DM8 template has no {database} — should remain unchanged
+        // Dameng DM8 template has no {database} — should remain unchanged
         let config = DatabaseDriverConfig {
-            name: "DM8".into(),
+            name: "达梦 Dameng".into(),
             class_name: "dm.jdbc.driver.DmDriver".into(),
             maven_group: "com.dameng".into(),
-            maven_artifact: "DmJdbcDriver".into(),
+            maven_artifact: "DmJdbcDriver8".into(),
             jdbc_url_template: "jdbc:dm://{host}:{port}".into(),
             jdbc_url_template_service: None,
             default_port: Some(5236),
diff --git a/src-tauri/src/database/strategy.rs b/src-tauri/src/database/strategy.rs
index 847435a1..68631f1f 100644
--- a/src-tauri/src/database/strategy.rs
+++ b/src-tauri/src/database/strategy.rs
@@ -17,7 +17,6 @@ pub enum CoreDatabaseType {
     DB2,
     H2,
     Snowflake,
-    DM8Oracle,
     Trino,
     Presto,
 }
@@ -54,7 +53,7 @@ pub fn resolve_effective_type(db: DatabaseType) -> ConnectionStrategy {
         // Native MySQL adapter
         MySQL => ConnectionStrategy::Native(CoreDatabaseType::MySQL),
         // MySQL wire protocol compat
-        MariaDB | TiDB | OceanBase | TDSQL | PolarDB | DM8 | Doris | SelectDB | StarRocks
+        MariaDB | TiDB | OceanBase | TDSQL | PolarDB | Doris | SelectDB | StarRocks
         | Databend | GoldenDB | ManticoreSearch
         | SingleStoreMemSQL | CloudSQLMySQL => {
             ConnectionStrategy::Native(CoreDatabaseType::MySQL)
@@ -73,7 +72,7 @@ pub fn resolve_effective_type(db: DatabaseType) -> ConnectionStrategy {
         H2 => ConnectionStrategy::JdbcBridge,
         Snowflake => ConnectionStrategy::JdbcBridge,
         TDengine => ConnectionStrategy::JdbcBridge,
-        DM8Oracle => ConnectionStrategy::JdbcBridge,
+        Dameng => ConnectionStrategy::JdbcBridge,
         XuguDB => ConnectionStrategy::JdbcBridge,
         GBase8a => ConnectionStrategy::JdbcBridge,
         Derby => ConnectionStrategy::JdbcBridge,
@@ -124,7 +123,7 @@ pub fn default_port(db: DatabaseType) -> Option<u16> {
         | AlloyDB | CloudSQLPG | FujitsuPG => Some(5432),
         QuestDB => Some(8812),
         YashanDB => Some(1688),
-        MySQL | MariaDB | TiDB | OceanBase | TDSQL | PolarDB | DM8 | GoldenDB
+        MySQL | MariaDB | TiDB | OceanBase | TDSQL | PolarDB | GoldenDB
         | SingleStoreMemSQL | CloudSQLMySQL => Some(3306),
         Doris | SelectDB | StarRocks => Some(9030),
         Databend => Some(3307),
@@ -139,7 +138,7 @@ pub fn default_port(db: DatabaseType) -> Option<u16> {
         H2 => Some(9092),
         Snowflake => Some(443),
         TDengine => Some(6030),
-        DM8Oracle => Some(5236),
+        Dameng => Some(5236),
         XuguDB => Some(5138),
         GBase8a => Some(5258),
         Derby => Some(1527),
@@ -257,7 +256,7 @@ mod tests {
             DatabaseType::H2,
             DatabaseType::Snowflake,
             DatabaseType::TDengine,
-            DatabaseType::DM8Oracle,
+            DatabaseType::Dameng,
             DatabaseType::XuguDB,
             DatabaseType::GBase8a,
             DatabaseType::Derby,
@@ -305,7 +304,7 @@ mod tests {
         assert_eq!(default_port(DatabaseType::PostgreSQL), Some(5432));
         assert_eq!(default_port(DatabaseType::MySQL), Some(3306));
         assert_eq!(default_port(DatabaseType::SqlServer), Some(1433));
-        assert_eq!(default_port(DatabaseType::DM8Oracle), Some(5236));
+        assert_eq!(default_port(DatabaseType::Dameng), Some(5236));
         assert_eq!(default_port(DatabaseType::Oracle), Some(1521));
         assert_eq!(default_port(DatabaseType::Doris), Some(9030));
         assert_eq!(default_port(DatabaseType::SelectDB), Some(9030));
diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs
index c4f44a03..c022374f 100644
--- a/src-tauri/src/state.rs
+++ b/src-tauri/src/state.rs
@@ -117,8 +117,7 @@ impl ServerConfig {
             "h2" => Ok(DatabaseType::H2),
             "snowflake" => Ok(DatabaseType::Snowflake),
             "tdengine" | "td" => Ok(DatabaseType::TDengine),
-            "dm8" | "dm" => Ok(DatabaseType::DM8),
-            "dm8_oracle" => Ok(DatabaseType::DM8Oracle),
+            "dameng" | "dm" | "dm8" | "dm8_oracle" => Ok(DatabaseType::Dameng),
             "trino" => Ok(DatabaseType::Trino),
             "presto" => Ok(DatabaseType::Presto),
             "rqlite" => Ok(DatabaseType::RQLite),

From 8b47161a256e4784a965b32f62bf703371464957 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:04:19 +0800
Subject: [PATCH 4/9] feat(dm8): update frontend, i18n and tests for single
 Dameng type

Collapse DM8 and DM8ORACLE enum values into DAMENG. Update connection form, database icons, SQL formatter dialect (plsql), data studio agent sources, SSL labels, and translation keys. Remove unused dm8oracle-logo.svg. Preserve isConnected across fetchConnections for accurate active-session display.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 .../images/database-icons/dm8oracle-logo.svg  |  4 --
 .../connections/ServerFormDialog.vue          | 15 ++---
 .../connections/ssl/SslConfigSection.vue      |  3 +-
 src/composables/useDatabaseIcon.ts            |  6 +-
 src/composables/useSqlFormatter.ts            |  3 +-
 src/lang/enUS.ts                              |  3 +-
 src/lang/zhCN.ts                              |  3 +-
 src/pages/DataStudioPage.vue                  |  2 +-
 src/store/connectionStore.ts                  | 60 ++++++++++---------
 tests/composables/useSqlFormatter.test.ts     |  1 -
 tests/store/connectionStore.test.ts           |  4 +-
 11 files changed, 45 insertions(+), 59 deletions(-)
 delete mode 100644 src/assets/images/database-icons/dm8oracle-logo.svg

diff --git a/src/assets/images/database-icons/dm8oracle-logo.svg b/src/assets/images/database-icons/dm8oracle-logo.svg
deleted file mode 100644
index 569aa6e7..00000000
--- a/src/assets/images/database-icons/dm8oracle-logo.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 1024 1024" fill="none">
-  <image href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAMAAABF0y+mAAAAZlBMVEVHcExqFKEAANsAANYAANYAANAAANvqGzQAANEAANAAANLyHCTsGzDrGzPcGUjvGyrsGzIAAOkAANPsGzApBMXtGy7vGykAAOLsGzEAANDQGFoAANIAANLsGzEAANLyHCQAANYAANBwY1GSAAAAInRSTlMAB0yEprM+ePn/9kDj/yaP8izovA/OZx1VzEXcValwHGOR5f2tgwAAAM1JREFUeAHN0UWiwyAARVHiAi84jcv+F/mVeObtnR4c8ukFYRQnSZQ+UBbkxX/llSlDUGydtAIXkDuqg+kMGY5YmM0sHBxQHfDlybwYanALHu9IfCq0qAEK1JHy1niLi4jD1hA1F4y34Z+H//Z7CiNgKRfQmYMlXVF0fmLzg3nvLNhQO7Aag9yOY/ybxGOrMWRwAqTo/cT+8CoMFHrAFBLfuKNycGAck6fTzJzCMcbp4Zd27Cgy8J1O68YOriLn+tLjTCdyT47LEvWGvL9vI5UQftdytRsAAAAASUVORK5CYII=" x="102" y="102" width="820" height="820" preserveAspectRatio="xMidYMid meet"/>
-</svg>
\ No newline at end of file
diff --git a/src/components/connections/ServerFormDialog.vue b/src/components/connections/ServerFormDialog.vue
index 66f5d9d1..feded3fc 100644
--- a/src/components/connections/ServerFormDialog.vue
+++ b/src/components/connections/ServerFormDialog.vue
@@ -70,7 +70,7 @@ const defaultPorts: Record<string, number> = {
   [DatabaseType.OCEANBASE]: 2883,
   [DatabaseType.TDSQL]: 3306,
   [DatabaseType.POLARDB]: 3306,
-  [DatabaseType.DM8]: 5236,
+  [DatabaseType.DAMENG]: 5236,
   [DatabaseType.DORIS]: 9030,
   [DatabaseType.SELECTDB]: 9030,
   [DatabaseType.STARROCKS]: 9030,
@@ -81,7 +81,6 @@ const defaultPorts: Record<string, number> = {
   [DatabaseType.DB2]: 50000,
   [DatabaseType.H2]: 9092,
   [DatabaseType.SNOWFLAKE]: 443,
-  [DatabaseType.DM8ORACLE]: 5236,
   [DatabaseType.XUGUDB]: 5138,
   [DatabaseType.GBASE8A]: 5258,
   [DatabaseType.TRINO]: 8080,
@@ -1068,16 +1067,10 @@ function handleSave() {
                     {{ t('components.serverForm.databaseTypes.databend') }}
                   </div>
                 </SelectItem>
-                <SelectItem :value="DatabaseType.DM8">
+                <SelectItem :value="DatabaseType.DAMENG">
                   <div class="flex gap-2 items-center">
-                    <img :src="getDatabaseIcon(DatabaseType.DM8)" alt="" class="h-5 w-5 object-contain">
-                    {{ t('components.serverForm.databaseTypes.dm8') }}
-                  </div>
-                </SelectItem>
-                <SelectItem :value="DatabaseType.DM8ORACLE">
-                  <div class="flex gap-2 items-center">
-                    <img :src="getDatabaseIcon(DatabaseType.DM8ORACLE)" alt="" class="h-5 w-5 object-contain">
-                    {{ t('components.serverForm.databaseTypes.dm8oracle') }}
+                    <img :src="getDatabaseIcon(DatabaseType.DAMENG)" alt="" class="h-5 w-5 object-contain">
+                    {{ t('components.serverForm.databaseTypes.dameng') }}
                   </div>
                 </SelectItem>
                 <SelectItem :value="DatabaseType.GAUSSDB">
diff --git a/src/components/connections/ssl/SslConfigSection.vue b/src/components/connections/ssl/SslConfigSection.vue
index 1d55247f..ad490d6f 100644
--- a/src/components/connections/ssl/SslConfigSection.vue
+++ b/src/components/connections/ssl/SslConfigSection.vue
@@ -43,12 +43,11 @@ const SSL_DB_TYPE_LABELS: Record<string, string> = {
   [DatabaseType.OCEANBASE]: 'OceanBase',
   [DatabaseType.TDSQL]: 'TDSQL',
   [DatabaseType.POLARDB]: 'PolarDB',
-  [DatabaseType.DM8]: 'DM8',
+  [DatabaseType.DAMENG]: 'Dameng',
   [DatabaseType.ORACLE]: 'Oracle',
   [DatabaseType.DB2]: 'DB2',
   [DatabaseType.H2]: 'H2',
   [DatabaseType.SNOWFLAKE]: 'Snowflake',
-  [DatabaseType.DM8ORACLE]: 'DM8',
   [DatabaseType.XUGUDB]: 'XuguDB',
   [DatabaseType.GBASE8A]: 'GBase 8a',
   [DatabaseType.TRINO]: 'Trino',
diff --git a/src/composables/useDatabaseIcon.ts b/src/composables/useDatabaseIcon.ts
index 4c551916..b4e024b1 100644
--- a/src/composables/useDatabaseIcon.ts
+++ b/src/composables/useDatabaseIcon.ts
@@ -12,8 +12,7 @@ import databendLogo from '@/assets/images/database-icons/databend-logo.svg'
 import databricksLogo from '@/assets/images/database-icons/databricks-logo.svg'
 import db2Logo from '@/assets/images/database-icons/db2-logo.svg'
 import derbyLogo from '@/assets/images/database-icons/derby-logo.svg'
-import dm8Logo from '@/assets/images/database-icons/dm8-logo.svg'
-import dm8oracleLogo from '@/assets/images/database-icons/dm8oracle-logo.svg'
+import damengLogo from '@/assets/images/database-icons/dm8-logo.svg'
 import dorisLogo from '@/assets/images/database-icons/doris-logo.svg'
 import duckdbLogo from '@/assets/images/database-icons/duckdb-logo.svg'
 import enterprisedbLogo from '@/assets/images/database-icons/enterprisedb-logo.svg'
@@ -94,7 +93,7 @@ const databaseIcons: Record<DatabaseType, DatabaseIconConfig> = {
   OCEANBASE: { icon: oceanbaseLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   TDSQL: { icon: tdsqlLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   POLARDB: { icon: polardbLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
-  DM8: { icon: dm8Logo, color: 'bg-blue-100 dark:bg-blue-900/30' },
+  DAMENG: { icon: damengLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   DORIS: { icon: dorisLogo, color: 'bg-orange-100 dark:bg-orange-900/30' },
   SELECTDB: { icon: selectdbLogo, color: 'bg-cyan-100 dark:bg-cyan-900/30' },
   STARROCKS: { icon: starrocksLogo, color: 'bg-yellow-100 dark:bg-yellow-900/30' },
@@ -105,7 +104,6 @@ const databaseIcons: Record<DatabaseType, DatabaseIconConfig> = {
   DB2: { icon: db2Logo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   H2: { icon: h2Logo, color: 'bg-green-100 dark:bg-green-900/30' },
   SNOWFLAKE: { icon: snowflakeLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
-  DM8ORACLE: { icon: dm8oracleLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   XUGUDB: { icon: xugudbLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   GBASE8A: { icon: gbaseLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
   TRINO: { icon: trinoLogo, color: 'bg-blue-100 dark:bg-blue-900/30' },
diff --git a/src/composables/useSqlFormatter.ts b/src/composables/useSqlFormatter.ts
index 8c58f7e1..c3ad4c3e 100644
--- a/src/composables/useSqlFormatter.ts
+++ b/src/composables/useSqlFormatter.ts
@@ -39,7 +39,6 @@ const dialectMap: Record<string, string> = {
   [DatabaseType.OCEANBASE]: 'mysql',
   [DatabaseType.TDSQL]: 'mysql',
   [DatabaseType.POLARDB]: 'mysql',
-  [DatabaseType.DM8]: 'mysql',
   [DatabaseType.DORIS]: 'mysql',
   [DatabaseType.SELECTDB]: 'mysql',
   [DatabaseType.STARROCKS]: 'mysql',
@@ -56,7 +55,7 @@ const dialectMap: Record<string, string> = {
   [DatabaseType.CLICKHOUSE]: 'clickhouse',
 
   [DatabaseType.ORACLE]: 'plsql',
-  [DatabaseType.DM8ORACLE]: 'plsql',
+  [DatabaseType.DAMENG]: 'plsql',
 
   [DatabaseType.DB2]: 'db2',
 
diff --git a/src/lang/enUS.ts b/src/lang/enUS.ts
index a846dcec..ccf3fd06 100644
--- a/src/lang/enUS.ts
+++ b/src/lang/enUS.ts
@@ -916,7 +916,7 @@ export const enUS = {
         oceanbase: 'OceanBase',
         tdsql: 'TDSQL',
         polardb: 'PolarDB',
-        dm8: '达梦 DM8',
+        dameng: '达梦 Dameng',
         doris: 'Apache Doris',
         selectdb: 'SelectDB',
         starrocks: 'StarRocks',
@@ -927,7 +927,6 @@ export const enUS = {
         db2: 'IBM Db2',
         h2: 'H2',
         snowflake: 'Snowflake',
-        dm8oracle: '达梦 DM8 (Oracle兼容模式)',
         xugudb: '虚谷数据库 (XuguDB)',
         gbase8a: '南大通用 GBase 8a',
         trino: 'Trino',
diff --git a/src/lang/zhCN.ts b/src/lang/zhCN.ts
index df3f77e5..42f6ffce 100644
--- a/src/lang/zhCN.ts
+++ b/src/lang/zhCN.ts
@@ -916,7 +916,7 @@ export const zhCN = {
         oceanbase: 'OceanBase',
         tdsql: 'TDSQL',
         polardb: 'PolarDB',
-        dm8: 'DM8 (达梦)',
+        dameng: 'Dameng (达梦)',
         doris: 'Apache Doris',
         selectdb: 'SelectDB',
         starrocks: 'StarRocks',
@@ -927,7 +927,6 @@ export const zhCN = {
         db2: 'IBM Db2',
         h2: 'H2',
         snowflake: 'Snowflake',
-        dm8oracle: 'DM8 Oracle兼容模式 (达梦)',
         xugudb: 'XuguDB (虚谷数据库)',
         gbase8a: 'GBase 8a (南大通用)',
         trino: 'Trino',
diff --git a/src/pages/DataStudioPage.vue b/src/pages/DataStudioPage.vue
index 64c931bd..774913ff 100644
--- a/src/pages/DataStudioPage.vue
+++ b/src/pages/DataStudioPage.vue
@@ -59,7 +59,7 @@ const AGENT_SUPPORTED_TYPES = new Set<DatabaseType>([
   DatabaseType.OCEANBASE,
   DatabaseType.TDSQL,
   DatabaseType.POLARDB,
-  DatabaseType.DM8,
+  DatabaseType.DAMENG,
   DatabaseType.DORIS,
   DatabaseType.SELECTDB,
   DatabaseType.STARROCKS,
diff --git a/src/store/connectionStore.ts b/src/store/connectionStore.ts
index bbc8f9a5..3c1f9dfa 100644
--- a/src/store/connectionStore.ts
+++ b/src/store/connectionStore.ts
@@ -29,7 +29,7 @@ export enum DatabaseType {
   OCEANBASE = 'OCEANBASE',
   TDSQL = 'TDSQL',
   POLARDB = 'POLARDB',
-  DM8 = 'DM8',
+  DAMENG = 'DAMENG',
   DORIS = 'DORIS',
   SELECTDB = 'SELECTDB',
   STARROCKS = 'STARROCKS',
@@ -40,7 +40,6 @@ export enum DatabaseType {
   DB2 = 'DB2',
   H2 = 'H2',
   SNOWFLAKE = 'SNOWFLAKE',
-  DM8ORACLE = 'DM8ORACLE',
   XUGUDB = 'XUGUDB',
   GBASE8A = 'GBASE8A',
   TRINO = 'TRINO',
@@ -101,7 +100,7 @@ export const dbTypeToBackend: Record<DatabaseType, string> = {
   [DatabaseType.OCEANBASE]: MYSQL_BACKEND,
   [DatabaseType.TDSQL]: MYSQL_BACKEND,
   [DatabaseType.POLARDB]: MYSQL_BACKEND,
-  [DatabaseType.DM8]: MYSQL_BACKEND,
+  [DatabaseType.DAMENG]: 'dameng',
   [DatabaseType.DORIS]: MYSQL_BACKEND,
   [DatabaseType.SELECTDB]: MYSQL_BACKEND,
   [DatabaseType.STARROCKS]: MYSQL_BACKEND,
@@ -112,7 +111,6 @@ export const dbTypeToBackend: Record<DatabaseType, string> = {
   [DatabaseType.DB2]: 'db2',
   [DatabaseType.H2]: 'h2',
   [DatabaseType.SNOWFLAKE]: 'snowflake',
-  [DatabaseType.DM8ORACLE]: 'dm8_oracle',
   [DatabaseType.XUGUDB]: 'xugudb',
   [DatabaseType.GBASE8A]: 'gbase8a',
   [DatabaseType.TRINO]: 'trino',
@@ -156,7 +154,7 @@ export const dbTypeFromBackend: Record<string, DatabaseType> = {
   db2: DatabaseType.DB2,
   h2: DatabaseType.H2,
   snowflake: DatabaseType.SNOWFLAKE,
-  dm8_oracle: DatabaseType.DM8ORACLE,
+  dameng: DatabaseType.DAMENG,
   xugudb: DatabaseType.XUGUDB,
   gbase8a: DatabaseType.GBASE8A,
   trino: DatabaseType.TRINO,
@@ -209,7 +207,7 @@ export function isJdbcDatabase(type: DatabaseType): boolean {
     DatabaseType.DB2,
     DatabaseType.H2,
     DatabaseType.SNOWFLAKE,
-    DatabaseType.DM8ORACLE,
+    DatabaseType.DAMENG,
     DatabaseType.XUGUDB,
     DatabaseType.GBASE8A,
     DatabaseType.DERBY,
@@ -236,7 +234,7 @@ export const jdbcDatabaseTypes: DatabaseType[] = [
   DatabaseType.DB2,
   DatabaseType.H2,
   DatabaseType.SNOWFLAKE,
-  DatabaseType.DM8ORACLE,
+  DatabaseType.DAMENG,
   DatabaseType.XUGUDB,
   DatabaseType.GBASE8A,
   DatabaseType.DERBY,
@@ -504,27 +502,33 @@ export const useConnectionStore = defineStore('connectionStore', {
     async fetchConnections() {
       try {
         const result = await connectionApi.list()
-        this.connections = result.map((item: Record<string, unknown>) => ({
-          id: item.id as string,
-          name: item.name as string,
-          type: dbTypeFromBackend[item.db_type as string] || DatabaseType.POSTGRESQL,
-          host: item.host as string,
-          port: item.port as number,
-          username: item.username as string,
-          password: item.password as string | undefined,
-          database: item.database as string | undefined,
-          ssl: {
-            mode: sslModeFromBackend(item.ssl_mode as string | null).mode,
-            caCertPath: item.ssl_ca_cert as string | undefined,
-            clientCertPath: item.ssl_client_cert as string | undefined,
-            clientKeyPath: item.ssl_client_key as string | undefined,
-            trustServerCertificate: item.trust_server_certificate as boolean | undefined,
-          },
-          sshTunnel: extractSshTunnelFromTransport(item.transport_layers),
-          oracleOptions: extractOracleOptions(item.oracle_options),
-          isConnected: item.is_connected as boolean | undefined,
-          lastUsed: item.last_used ? new Date(item.last_used as string) : undefined,
-        }))
+        // The backend doesn't track runtime connection state, so we preserve
+        // `isConnected` from the existing store entries.
+        const existing = new Map(this.connections.map(c => [c.id, c.isConnected]))
+        this.connections = result.map((item: Record<string, unknown>) => {
+          const id = item.id as string
+          return {
+            id,
+            name: item.name as string,
+            type: dbTypeFromBackend[item.db_type as string] || DatabaseType.POSTGRESQL,
+            host: item.host as string,
+            port: item.port as number,
+            username: item.username as string,
+            password: item.password as string | undefined,
+            database: item.database as string | undefined,
+            ssl: {
+              mode: sslModeFromBackend(item.ssl_mode as string | null).mode,
+              caCertPath: item.ssl_ca_cert as string | undefined,
+              clientCertPath: item.ssl_client_cert as string | undefined,
+              clientKeyPath: item.ssl_client_key as string | undefined,
+              trustServerCertificate: item.trust_server_certificate as boolean | undefined,
+            },
+            sshTunnel: extractSshTunnelFromTransport(item.transport_layers),
+            oracleOptions: extractOracleOptions(item.oracle_options),
+            isConnected: existing.has(id) ? existing.get(id) : (item.is_connected as boolean | undefined),
+            lastUsed: item.last_used ? new Date(item.last_used as string) : undefined,
+          }
+        })
       }
       catch (error) {
         console.error('Failed to fetch connections:', error)
diff --git a/tests/composables/useSqlFormatter.test.ts b/tests/composables/useSqlFormatter.test.ts
index d56c4b1f..428a3c0d 100644
--- a/tests/composables/useSqlFormatter.test.ts
+++ b/tests/composables/useSqlFormatter.test.ts
@@ -60,7 +60,6 @@ describe('resolveDialect', () => {
       DatabaseType.OCEANBASE,
       DatabaseType.TDSQL,
       DatabaseType.POLARDB,
-      DatabaseType.DM8,
       DatabaseType.DORIS,
       DatabaseType.SELECTDB,
       DatabaseType.STARROCKS,
diff --git a/tests/store/connectionStore.test.ts b/tests/store/connectionStore.test.ts
index 601ce0e7..90648c32 100644
--- a/tests/store/connectionStore.test.ts
+++ b/tests/store/connectionStore.test.ts
@@ -51,7 +51,7 @@ describe('connectionStore', () => {
       expect(dbTypeToBackend[DatabaseType.OCEANBASE]).toBe('MySQL')
       expect(dbTypeToBackend[DatabaseType.TDSQL]).toBe('MySQL')
       expect(dbTypeToBackend[DatabaseType.POLARDB]).toBe('MySQL')
-      expect(dbTypeToBackend[DatabaseType.DM8]).toBe('MySQL')
+      expect(dbTypeToBackend[DatabaseType.DAMENG]).toBe('dameng')
     })
 
     it('maps standalone native types correctly', () => {
@@ -68,7 +68,7 @@ describe('connectionStore', () => {
       expect(dbTypeToBackend[DatabaseType.DB2]).toBe('db2')
       expect(dbTypeToBackend[DatabaseType.H2]).toBe('h2')
       expect(dbTypeToBackend[DatabaseType.SNOWFLAKE]).toBe('snowflake')
-      expect(dbTypeToBackend[DatabaseType.DM8ORACLE]).toBe('dm8_oracle')
+      expect(dbTypeToBackend[DatabaseType.DAMENG]).toBe('dameng')
       expect(dbTypeToBackend[DatabaseType.XUGUDB]).toBe('xugudb')
       expect(dbTypeToBackend[DatabaseType.GBASE8A]).toBe('gbase8a')
     })

From 735c43da611ab493ae02279631bedf7abec98707 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:04:24 +0800
Subject: [PATCH 5/9] fix(jdbc-bridge): split multi-statement SQL and make
 list_connections resilient

Add split_sql_statements() to the JDBC bridge adapter so multi-statement SQL (e.g. CREATE TABLE; COMMENT ON) is executed individually. The Dameng JDBC driver rejects ;-separated statements in a single execute() call. Also make list_connections fallback to an empty list instead of propagating store errors.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 src-tauri/src/capabilities/sqlkit.rs          |  16 +-
 src-tauri/src/database/jdbc_bridge/adapter.rs | 213 +++++++++++++++++-
 2 files changed, 210 insertions(+), 19 deletions(-)

diff --git a/src-tauri/src/capabilities/sqlkit.rs b/src-tauri/src/capabilities/sqlkit.rs
index 13abd52c..23f35ae3 100644
--- a/src-tauri/src/capabilities/sqlkit.rs
+++ b/src-tauri/src/capabilities/sqlkit.rs
@@ -19,13 +19,15 @@ pub(crate) struct TauriStoreReader;
 
 impl ConnectionStoreReader for TauriStoreReader {
     fn get_connections(&self) -> Result<Value, String> {
-        let app = crate::APP_HANDLE
-            .get()
-            .ok_or_else(|| "AppHandle not initialized — app may still be starting".to_string())?;
-
-        let store = app
-            .store(".store.dat")
-            .map_err(|e| format!("Failed to open store: {}", e))?;
+        let app = match crate::APP_HANDLE.get() {
+            Some(handle) => handle,
+            None => return Ok(Value::Array(vec![])),
+        };
+
+        let store = match app.store(".store.dat") {
+            Ok(s) => s,
+            Err(_) => return Ok(Value::Array(vec![])),
+        };
 
         Ok(store.get("connections").unwrap_or(Value::Array(vec![])))
     }
diff --git a/src-tauri/src/database/jdbc_bridge/adapter.rs b/src-tauri/src/database/jdbc_bridge/adapter.rs
index 2af93039..0f0932de 100644
--- a/src-tauri/src/database/jdbc_bridge/adapter.rs
+++ b/src-tauri/src/database/jdbc_bridge/adapter.rs
@@ -167,18 +167,36 @@ impl DatabaseAdapter for JdbcBridgeAdapter {
 
     async fn execute_query(&self, query: &str) -> DbResult<QueryResult> {
         let launcher = self.launcher()?;
-        let data = Self::send_request(
-            &launcher,
-            JdbcRequest::new(
-                JdbcMethod::ExecuteQuery,
-                serde_json::json!({
-                    "conn_id": self.conn_id,
-                    "sql": query,
-                }),
-            ),
-        )
-        .await?;
-        Self::parse_query_result(data)
+        let statements = split_sql_statements(query);
+        if statements.is_empty() {
+            return Ok(QueryResult {
+                columns: Vec::new(),
+                column_types: Vec::new(),
+                rows: Vec::new(),
+                rows_affected: Some(0),
+                execution_time_ms: None,
+                truncated: false,
+            });
+        }
+        // Execute each statement individually; return the last non-error result.
+        // Many JDBC drivers (notably Dameng) reject multiple DDL/DML statements
+        // sent as a single string, so splitting is required.
+        let mut last_result = None;
+        for stmt in &statements {
+            let data = Self::send_request(
+                &launcher,
+                JdbcRequest::new(
+                    JdbcMethod::ExecuteQuery,
+                    serde_json::json!({
+                        "conn_id": self.conn_id,
+                        "sql": stmt,
+                    }),
+                ),
+            )
+            .await?;
+            last_result = Some(Self::parse_query_result(data)?);
+        }
+        last_result.ok_or_else(|| DbError::Connection("No statements executed".to_string()))
     }
 
     async fn list_databases(&self) -> DbResult<Vec<DatabaseSchema>> {
@@ -343,3 +361,174 @@ impl DatabaseAdapter for JdbcBridgeAdapter {
         &self.config
     }
 }
+
+/// Split a SQL string into individual statements separated by `;`.
+///
+/// Handles:
+/// - Single-quoted string literals (`'...'`)
+/// - Double-quoted identifiers (`"..."`)
+/// - `--` single-line comments
+/// - `/* ... */` block comments
+/// - Trailing semicolons and whitespace
+/// - Empty statements are skipped
+fn split_sql_statements(sql: &str) -> Vec<String> {
+    let mut statements: Vec<String> = Vec::new();
+    let mut current = String::new();
+    let chars: Vec<char> = sql.chars().collect();
+    let mut i = 0;
+
+    while i < chars.len() {
+        let c = chars[i];
+
+        // Single-quoted string literal
+        if c == '\'' {
+            current.push(c);
+            i += 1;
+            while i < chars.len() {
+                current.push(chars[i]);
+                if chars[i] == '\'' {
+                    // Check for escaped single quote ''
+                    if i + 1 < chars.len() && chars[i + 1] == '\'' {
+                        i += 1;
+                        current.push(chars[i]);
+                    } else {
+                        break;
+                    }
+                }
+                i += 1;
+            }
+        }
+        // Double-quoted identifier
+        else if c == '"' {
+            current.push(c);
+            i += 1;
+            while i < chars.len() {
+                current.push(chars[i]);
+                if chars[i] == '"' {
+                    // Check for escaped double quote ""
+                    if i + 1 < chars.len() && chars[i + 1] == '"' {
+                        i += 1;
+                        current.push(chars[i]);
+                    } else {
+                        break;
+                    }
+                }
+                i += 1;
+            }
+        }
+        // Single-line comment
+        else if c == '-' && i + 1 < chars.len() && chars[i + 1] == '-' {
+            i += 2;
+            while i < chars.len() && chars[i] != '\n' {
+                i += 1;
+            }
+        }
+        // Block comment
+        else if c == '/' && i + 1 < chars.len() && chars[i + 1] == '*' {
+            i += 2;
+            while i + 1 < chars.len() {
+                if chars[i] == '*' && chars[i + 1] == '/' {
+                    i += 2;
+                    break;
+                }
+                i += 1;
+            }
+        }
+        // Statement separator
+        else if c == ';' {
+            let trimmed = current.trim().to_string();
+            if !trimmed.is_empty() {
+                statements.push(trimmed);
+            }
+            current.clear();
+        } else {
+            current.push(c);
+        }
+
+        i += 1;
+    }
+
+    // Last statement (after final semicolon or no trailing semicolon)
+    let trimmed = current.trim().to_string();
+    if !trimmed.is_empty() {
+        statements.push(trimmed);
+    }
+
+    statements
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_split_single_statement() {
+        let stmts = split_sql_statements("SELECT * FROM users");
+        assert_eq!(stmts, vec!["SELECT * FROM users"]);
+    }
+
+    #[test]
+    fn test_split_with_trailing_semicolon() {
+        let stmts = split_sql_statements("SELECT * FROM users;");
+        assert_eq!(stmts, vec!["SELECT * FROM users"]);
+    }
+
+    #[test]
+    fn test_split_multi_statement() {
+        let stmts = split_sql_statements(
+            "CREATE TABLE t (id INT); INSERT INTO t VALUES (1); SELECT * FROM t",
+        );
+        assert_eq!(
+            stmts,
+            vec![
+                "CREATE TABLE t (id INT)",
+                "INSERT INTO t VALUES (1)",
+                "SELECT * FROM t",
+            ]
+        );
+    }
+
+    #[test]
+    fn test_split_comment_statement() {
+        let stmts = split_sql_statements(
+            "CREATE TABLE t (id INT);\nCOMMENT ON TABLE t IS 'hello';",
+        );
+        assert_eq!(
+            stmts,
+            vec![
+                "CREATE TABLE t (id INT)",
+                "COMMENT ON TABLE t IS 'hello'",
+            ]
+        );
+    }
+
+    #[test]
+    fn test_split_with_semicolon_in_string() {
+        let stmts = split_sql_statements("SELECT 'hello;world' AS x");
+        assert_eq!(stmts, vec!["SELECT 'hello;world' AS x"]);
+    }
+
+    #[test]
+    fn test_skip_empty_statements() {
+        let stmts = split_sql_statements(";;SELECT 1;;;");
+        assert_eq!(stmts, vec!["SELECT 1"]);
+    }
+
+    #[test]
+    fn test_split_complex_ddl() {
+        let sql = "CREATE TABLE SYSDBA.CLASSES (\n    class_id INT PRIMARY KEY\n);\nCOMMENT ON TABLE SYSDBA.CLASSES IS '班级信息表';\nCOMMENT ON COLUMN SYSDBA.CLASSES.class_id IS '班级ID';";
+        let stmts = split_sql_statements(sql);
+        assert_eq!(stmts.len(), 3);
+        assert!(stmts[0].starts_with("CREATE TABLE"));
+        assert!(stmts[1].starts_with("COMMENT ON TABLE"));
+        assert!(stmts[2].starts_with("COMMENT ON COLUMN"));
+    }
+
+    #[test]
+    fn test_split_dollar_sign_is_not_comment() {
+        let stmts = split_sql_statements("SELECT * FROM t WHERE x = 1; -- comment\nSELECT 2");
+        assert_eq!(stmts.len(), 2);
+        assert_eq!(stmts[0], "SELECT * FROM t WHERE x = 1");
+        assert_eq!(stmts[1], "SELECT 2");
+    }
+}

From 82f900c427367c699cd7f4d63d5dd1a34f1e06a9 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:04:28 +0800
Subject: [PATCH 6/9] fix(ui): enable schema browser for JDBC databases and
 show Actions column in query results

Make supportsSchemas data-driven (checks actual schema data) instead of hardcoded to PostgreSQL and SQL Server, so Dameng/Oracle/DB2 users can browse schemas. Show the DataGrid Actions column (copy, edit, delete) in query result panels, not just table views. Add synthetic database entry when listDatabases returns empty.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 .../database-browser/DatabaseBrowser.vue      | 25 +++++++++++++++----
 src/components/grid/DataGrid.vue              |  8 +++---
 src/store/databaseStore.ts                    |  8 ++++++
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/components/database-browser/DatabaseBrowser.vue b/src/components/database-browser/DatabaseBrowser.vue
index 284583df..7f72e4ea 100644
--- a/src/components/database-browser/DatabaseBrowser.vue
+++ b/src/components/database-browser/DatabaseBrowser.vue
@@ -16,7 +16,7 @@ import {
   SelectValue,
 } from '@/components/ui/select'
 import { deleteQueryFile, listSavedQueryFiles } from '@/datasources'
-import { ConnectionStatus, DatabaseType, useConnectionStore, useDatabaseStore } from '@/store'
+import { ConnectionStatus, useConnectionStore, useDatabaseStore } from '@/store'
 
 export type TreeNodeMetadata = TableInfo & {
   database: string
@@ -91,9 +91,17 @@ const isActiveConnectionConnected = computed(() =>
     : false,
 )
 
+/// Whether the currently selected database has known schemas (e.g., PG, MSSQL, Oracle, Dameng).
+/// Driven by actual data rather than a hardcoded allowlist, so any database that
+/// returns schemas from `listSchemas` gets schema-aware browsing automatically.
 const supportsSchemas = computed(() => {
-  const type = activeConnection.value?.type
-  return type === DatabaseType.POSTGRESQL || type === DatabaseType.SQLSERVER
+  if (!props.selectedDatabase || !connectionId.value) {
+    return false
+  }
+  const meta = databaseStore.metadata[connectionId.value]
+  if (!meta) return false
+  const schemas = meta.schemas[props.selectedDatabase]
+  return schemas !== undefined && schemas.length > 0
 })
 
 const availableSchemas = computed<string[]>(() => {
@@ -517,7 +525,12 @@ watch(connectionId, async (newId) => {
 
   await databaseStore.fetchDatabases(newId)
 
-  const connectedDb = connection.database || connectionStore.getCurrentDatabase(newId)
+  // Pick the database to load: prefer the connected database, otherwise
+  // grab the first user database from the metadata (common for single-DB
+  // systems like Dameng, Oracle, etc.).
+  const meta = databaseStore.metadata[newId]
+  const firstDb = meta?.databases.find(db => !db.is_system)?.name
+  const connectedDb = connection.database || connectionStore.getCurrentDatabase(newId) || firstDb
   if (connectedDb) {
     await loadDatabaseData(newId, connectedDb)
   }
@@ -534,7 +547,9 @@ watch(() => activeConnection.value?.isConnected, async (isConnected) => {
 
   await databaseStore.fetchDatabases(connectionId.value)
 
-  const connectedDb = activeConnection.value?.database || connectionStore.getCurrentDatabase(connectionId.value)
+  const meta = databaseStore.metadata[connectionId.value]
+  const firstDb = meta?.databases.find(db => !db.is_system)?.name
+  const connectedDb = activeConnection.value?.database || connectionStore.getCurrentDatabase(connectionId.value) || firstDb
   if (connectedDb) {
     await loadDatabaseData(connectionId.value, connectedDb)
   }
diff --git a/src/components/grid/DataGrid.vue b/src/components/grid/DataGrid.vue
index 4a178cff..3e7035c8 100644
--- a/src/components/grid/DataGrid.vue
+++ b/src/components/grid/DataGrid.vue
@@ -526,7 +526,7 @@ watch(() => [props.rows, props.columns], () => {
       <!-- Scroll container -->
       <div
         ref="scrollContainer"
-        class="flex-1 overflow-auto"
+        class="flex-1 overflow-auto relative"
         @scroll="() => {}"
       >
         <div
@@ -589,7 +589,7 @@ watch(() => [props.rows, props.columns], () => {
             </div>
             <!-- Actions Column Header -->
             <div
-              v-if="connectionId && tableName"
+              v-if="connectionId"
               class="bg-muted flex-shrink-0 w-10 right-0 sticky z-10"
             >
               <div class="flex h-8 items-center justify-center">
@@ -603,7 +603,7 @@ watch(() => [props.rows, props.columns], () => {
             v-for="virtualRow in rowVirtualizer.getVirtualItems()"
             :key="`r-${virtualRow.index}`"
             :data-index="virtualRow.index"
-            class="border-b border-border/30 flex transition-colors duration-75 left-0 top-0 absolute hover:bg-muted/[0.08]"
+            class="group border-b border-border/30 flex transition-colors duration-75 left-0 top-0 absolute hover:bg-muted/[0.08]"
             :class="[
               virtualRow.index % 2 === 0 ? 'bg-muted/[0.03]' : '',
               selection.isSelected(virtualRow.index) ? 'bg-primary/[0.08]' : '',
@@ -692,7 +692,7 @@ watch(() => [props.rows, props.columns], () => {
 
             <!-- Row Actions -->
             <div
-              v-if="connectionId && tableName"
+              v-if="connectionId"
               class="bg-background/80 opacity-0 flex flex-shrink-0 w-10 transition-opacity items-center right-0 justify-center sticky z-10 group-hover:opacity-100"
               @click.stop
             >
diff --git a/src/store/databaseStore.ts b/src/store/databaseStore.ts
index e9e72d99..e6b08030 100644
--- a/src/store/databaseStore.ts
+++ b/src/store/databaseStore.ts
@@ -102,6 +102,14 @@ export const useDatabaseStore = defineStore('databases', {
           const currentDb = connectionStore.getCurrentDatabase(connectionId)
           if (currentDb) {
             databases = [{ name: currentDb, is_system: false }]
+          } else {
+            // JDBC databases (Oracle, Dameng, DB2, etc.) often don't support
+            // listing databases. Show a single synthetic entry so the browser
+            // tree (via userDatabaseNodes) is non-empty and schemas can be
+            // displayed underneath.
+            const conn = connectionStore.getConnectionById(connectionId)
+            const label = conn?.name || 'Default'
+            databases = [{ name: label, is_system: false }]
           }
         }
 

From a5991e3d20a7107d5c3c99f05b69c782d08069e6 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:04:32 +0800
Subject: [PATCH 7/9] docs: update READMEs for Dameng DM8 consolidation

Move Dameng from MySQL-wire to JDBC bridge table. Rename DM8 to Dameng to be version-agnostic.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 README.md    | 4 ++--
 README_zh.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9dae78e3..3016dbe3 100644
--- a/README.md
+++ b/README.md
@@ -107,8 +107,8 @@ SqlKit supports **70+ databases** across four adapter strategies:
 |----------|-----------|
 | **Native** (Rust) | PostgreSQL, MySQL, SQL Server, SQLite |
 | **PG-wire compat** | CockroachDB, Redshift, YugabyteDB, TimescaleDB, QuestDB, Vastbase, YashanDB, KingbaseES, GaussDB, HighGo, UXDB, OpenGauss, GBase8c, Greenplum, EnterpriseDB, CrateDB, Materialize, AlloyDB, CloudSQLPG, FujitsuPG |
-| **MySQL-wire compat** | MariaDB, TiDB, OceanBase, TDSQL, PolarDB, DM8, Doris, SelectDB, StarRocks, Databend, GoldenDB, ManticoreSearch, SingleStore, CloudSQLMySQL |
-| **JDBC bridge** | Oracle, DuckDB, Firebird, DB2, H2, Snowflake, TDengine, Derby, Hive, Databricks, Hana, Teradata, Vertica, Exasol, BigQuery, Informix, Kylin, Cassandra, Iris, Access, DM8Oracle, XuguDB, GBase8a |
+| **MySQL-wire compat** | MariaDB, TiDB, OceanBase, TDSQL, PolarDB, Doris, SelectDB, StarRocks, Databend, GoldenDB, ManticoreSearch, SingleStore, CloudSQLMySQL |
+| **JDBC bridge** | Oracle, DuckDB, Firebird, DB2, H2, Snowflake, TDengine, Derby, Hive, Databricks, Hana, Teradata, Vertica, Exasol, BigQuery, Informix, Kylin, Cassandra, Iris, Access, Dameng, XuguDB, GBase8a |
 | **HTTP bridge** | ClickHouse, Trino, Presto, RQLite, Turso |
 
 ### Product-Grade Editor
diff --git a/README_zh.md b/README_zh.md
index 20f2261c..57850e1e 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -107,8 +107,8 @@ SqlKit 支持 **70+ 种数据库**，通过四种适配策略覆盖：
 |------|--------|
 | **原生** (Rust) | PostgreSQL、MySQL、SQL Server、SQLite |
 | **PG 协议兼容** | CockroachDB、Redshift、YugabyteDB、TimescaleDB、QuestDB、Vastbase、YashanDB、KingbaseES、GaussDB、HighGo、UXDB、OpenGauss、GBase8c、Greenplum、EnterpriseDB、CrateDB、Materialize、AlloyDB、CloudSQLPG、FujitsuPG |
-| **MySQL 协议兼容** | MariaDB、TiDB、OceanBase、TDSQL、PolarDB、DM8、Doris、SelectDB、StarRocks、Databend、GoldenDB、ManticoreSearch、SingleStore、CloudSQLMySQL |
-| **JDBC 桥接** | Oracle、DuckDB、Firebird、DB2、H2、Snowflake、TDengine、Derby、Hive、Databricks、Hana、Teradata、Vertica、Exasol、BigQuery、Informix、Kylin、Cassandra、Iris、Access、DM8Oracle、XuguDB、GBase8a |
+| **MySQL 协议兼容** | MariaDB、TiDB、OceanBase、TDSQL、PolarDB、Doris、SelectDB、StarRocks、Databend、GoldenDB、ManticoreSearch、SingleStore、CloudSQLMySQL |
+| **JDBC 桥接** | Oracle、DuckDB、Firebird、DB2、H2、Snowflake、TDengine、Derby、Hive、Databricks、Hana、Teradata、Vertica、Exasol、BigQuery、Informix、Kylin、Cassandra、Iris、Access、Dameng、XuguDB、GBase8a |
 | **HTTP 桥接** | ClickHouse、Trino、Presto、RQLite、Turso |
 
 ### 专业级编辑器

From aed3e0a3769d53b8fcbcabd2e7944130aa950c14 Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:08:59 +0800
Subject: [PATCH 8/9] fix: fix lint issues

---
 src/components/database-browser/DatabaseBrowser.vue | 3 ++-
 src/components/grid/DataGrid.vue                    | 2 +-
 src/store/databaseStore.ts                          | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/database-browser/DatabaseBrowser.vue b/src/components/database-browser/DatabaseBrowser.vue
index 7f72e4ea..5e8ccbaa 100644
--- a/src/components/database-browser/DatabaseBrowser.vue
+++ b/src/components/database-browser/DatabaseBrowser.vue
@@ -99,7 +99,8 @@ const supportsSchemas = computed(() => {
     return false
   }
   const meta = databaseStore.metadata[connectionId.value]
-  if (!meta) return false
+  if (!meta)
+    return false
   const schemas = meta.schemas[props.selectedDatabase]
   return schemas !== undefined && schemas.length > 0
 })
diff --git a/src/components/grid/DataGrid.vue b/src/components/grid/DataGrid.vue
index 3e7035c8..baabd4c0 100644
--- a/src/components/grid/DataGrid.vue
+++ b/src/components/grid/DataGrid.vue
@@ -526,7 +526,7 @@ watch(() => [props.rows, props.columns], () => {
       <!-- Scroll container -->
       <div
         ref="scrollContainer"
-        class="flex-1 overflow-auto relative"
+        class="flex-1 relative overflow-auto"
         @scroll="() => {}"
       >
         <div
diff --git a/src/store/databaseStore.ts b/src/store/databaseStore.ts
index e6b08030..73c63d56 100644
--- a/src/store/databaseStore.ts
+++ b/src/store/databaseStore.ts
@@ -102,7 +102,8 @@ export const useDatabaseStore = defineStore('databases', {
           const currentDb = connectionStore.getCurrentDatabase(connectionId)
           if (currentDb) {
             databases = [{ name: currentDb, is_system: false }]
-          } else {
+          }
+          else {
             // JDBC databases (Oracle, Dameng, DB2, etc.) often don't support
             // listing databases. Show a single synthetic entry so the browser
             // tree (via userDatabaseNodes) is non-empty and schemas can be

From a71d5ae2f38c6fde884b36a125876e699cdf114f Mon Sep 17 00:00:00 2001
From: blankll <zilisheng1996@gmail.com>
Date: Sun, 21 Jun 2026 00:13:01 +0800
Subject: [PATCH 9/9] fix(jdbc-bridge): aggregate multi-statement SQL results
 properly

Accumulate rows_affected across DML statements and preserve the last SELECT result. Document that multi-statement execution is in autocommit mode (no transaction wrapping).

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 src-tauri/src/database/jdbc_bridge/adapter.rs | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/src-tauri/src/database/jdbc_bridge/adapter.rs b/src-tauri/src/database/jdbc_bridge/adapter.rs
index 0f0932de..4a456f44 100644
--- a/src-tauri/src/database/jdbc_bridge/adapter.rs
+++ b/src-tauri/src/database/jdbc_bridge/adapter.rs
@@ -178,10 +178,27 @@ impl DatabaseAdapter for JdbcBridgeAdapter {
                 truncated: false,
             });
         }
-        // Execute each statement individually; return the last non-error result.
-        // Many JDBC drivers (notably Dameng) reject multiple DDL/DML statements
-        // sent as a single string, so splitting is required.
-        let mut last_result = None;
+        // Execute each statement individually. Many JDBC drivers (notably
+        // Dameng) reject multiple DDL/DML statements sent as a single string,
+        // so splitting is required.
+        //
+        // Result aggregation: for SELECT statements we want to show the last
+        // result (the user is interested in the final query output). For DML
+        // statements (no rows, has rows_affected) we accumulate the total so
+        // that multi-statement INSERTs and UPDATEs report correct counts.
+        //
+        // Note: statements are NOT wrapped in a transaction — each executes
+        // in autocommit mode. If statement N fails, statements 1..N-1 are
+        // already committed. This matches the behavior of executing each
+        // statement individually in the editor.
+        let mut result = QueryResult {
+            columns: Vec::new(),
+            column_types: Vec::new(),
+            rows: Vec::new(),
+            rows_affected: Some(0),
+            execution_time_ms: None,
+            truncated: false,
+        };
         for stmt in &statements {
             let data = Self::send_request(
                 &launcher,
@@ -194,9 +211,21 @@ impl DatabaseAdapter for JdbcBridgeAdapter {
                 ),
             )
             .await?;
-            last_result = Some(Self::parse_query_result(data)?);
+            let stmt_result = Self::parse_query_result(data)?;
+            let has_rows = !stmt_result.columns.is_empty() || !stmt_result.rows.is_empty();
+            if has_rows {
+                result.columns = stmt_result.columns;
+                result.column_types = stmt_result.column_types;
+                result.rows = stmt_result.rows;
+                result.rows_affected = stmt_result.rows_affected;
+            } else if let Some(affected) = stmt_result.rows_affected {
+                let total = result.rows_affected.unwrap_or(0) + affected;
+                result.rows_affected = Some(total);
+            }
+            result.execution_time_ms = stmt_result.execution_time_ms;
+            result.truncated = result.truncated || stmt_result.truncated;
         }
-        last_result.ok_or_else(|| DbError::Connection("No statements executed".to_string()))
+        Ok(result)
     }
 
     async fn list_databases(&self) -> DbResult<Vec<DatabaseSchema>> {