Temp/sync dev latest

Cargo.toml

@@ -23,7 +23,6 @@ members = [
     "crates/er_flow",
     "crates/terminal",
     "crates/terminal_view",
-    "crates/ferrum-flow",
     "main", "crates/ssh", "crates/sftp", "crates/sftp_view", "crates/one_ui", "crates/redis_view", "crates/mongodb_view", "crates/remote_file_editor"]
 resolver = "2"
 
@@ -157,7 +156,7 @@ interprocess = { version = "2.4.0", features = ["tokio"] }
 url = "2.5.4"
 percent-encoding = "2.3.1"
 global-hotkey = "0.7.0"
-ferrum-flow = { path = "crates/ferrum-flow" }
+ferrum-flow = { git = "https://github.com/tu6ge/ferrum-flow.git", rev = "507cab7505b8dfa6a1e4a121e3c503e3f2f882d6" }
 
 [patch.crates-io]
 gpui = { git = "https://github.com/zed-industries/zed", rev = "8b5328ca" }

README.md

@@ -69,6 +69,11 @@
 **Edit files directly from the app, with syntax highlighting and autocomplete.**
 ![remote_file_editor](remote_file_editor.png)
 
+**ER Diagram**
+![ER Diagram](er.png)
+
+Thanks to [ferrum-flow](https://github.com/tu6ge/ferrum-flow.git).
+
 ## Platform Support
 
 | Platform | Architecture | Rendering |

README_CN.md

@@ -75,6 +75,11 @@
 **直接在应用程序中编辑文件，具备语法高亮显示和自动完成功能。**
 ![remote_file_editor](remote_file_editor.png)
 
+**ER 图**
+![ER 图](er.png)
+
+感谢 [ferrum-flow](https://github.com/tu6ge/ferrum-flow.git)。
+
 ## 平台支持
 
 | 平台 | 架构 | 渲染后端 |

crates/core/src/ai_chat/components/model_settings.rs

@@ -137,8 +137,6 @@ impl ModelSettingsPanel {
         Self::with_labels(settings, ModelSettingsLabels::default(), window, cx)
     }
 
-
-
     /// 使用自定义标签创建模型设置面板
     pub fn with_labels(
         settings: ModelSettings,

crates/core/src/popup_window.rs

@@ -283,6 +283,7 @@ pub fn open_popup_window_with_should_close<F, E, H>(
     let title = options.title.clone();
     let on_should_close = Arc::new(on_should_close);
     let kind = options.kind.clone();
+    let corner_radius = cx.theme().radius_lg;
 
     cx.spawn(async move |cx| {
         let on_should_close = Arc::clone(&on_should_close);
@@ -314,7 +315,15 @@ pub fn open_popup_window_with_should_close<F, E, H>(
             let view = create_view_fn(window, cx).into();
             let popup_view =
                 cx.new(|cx| PopupWindowView::new(view, Some(content_size), window, cx));
-            cx.new(|cx| Root::new(popup_view, window, cx))
+            cx.new(|cx| {
+                let mut root = Root::new(popup_view, window, cx);
+                #[cfg(target_os = "linux")]
+                {
+                    // popup 的可见底色由 PopupWindowView 承担，避免 Root 底色在圆角处透出。
+                    root = root.bg(gpui::transparent_black());
+                }
+                root
+            })
         })?;
 
         window.update(cx, |_, window, _| {

crates/core/src/storage/models.rs

@@ -199,6 +199,9 @@ pub struct SshParams {
     /// SFTP 远程目录（留空则使用服务器默认目录）
     #[serde(skip_serializing_if = "Option::is_none")]
     pub sftp_remote_directory: Option<String>,
+    /// 关闭 shell integration 注入(走裸 request_shell,牺牲 prompt hook / 命令记录 / vim 鼠标)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_shell_integration: Option<bool>,
     /// 跳板机配置
     #[serde(skip_serializing_if = "Option::is_none")]
     pub jump_server: Option<JumpServerConfig>,

crates/db/src/clickhouse/plugin.rs

@@ -18,8 +18,8 @@ use crate::manifest_helpers::{
 use crate::plugin::{DatabaseOperationRequest, DatabasePlugin, SqlCompletionInfo};
 use crate::plugin_manifest::{
     DatabaseActionId, DatabaseActionManifest, DatabaseActionPlacement, DatabaseActionToolbarScope,
-    DatabaseFormFieldType, DatabaseFormKind, DatabaseFormManifest, DatabaseUiCapabilities,
-    DatabaseUiManifest,
+    DatabaseCapabilities, DatabaseFormFieldType, DatabaseFormKind, DatabaseFormManifest,
+    DatabaseUiCapabilities, DatabaseUiManifest,
 };
 use crate::types::*;
 
@@ -505,6 +505,15 @@ impl DatabasePlugin for ClickHousePlugin {
         format!("`{}`", identifier.replace("`", "``"))
     }
 
+    fn capabilities(&self) -> DatabaseCapabilities {
+        DatabaseUiCapabilities {
+            supports_functions: true,
+            supports_table_engine: true,
+            table_engines: self.engines(),
+            ..DatabaseUiCapabilities::default()
+        }
+    }
+
     fn ui_manifest(&self) -> DatabaseUiManifest {
         CLICKHOUSE_UI_MANIFEST.clone()
     }
@@ -688,10 +697,6 @@ impl DatabasePlugin for ClickHousePlugin {
         }
     }
 
-    fn supports_sequences(&self) -> bool {
-        false
-    }
-
     // === Database/Schema Level Operations ===
 
     fn sql_dialect(&self) -> Box<dyn sqlparser::dialect::Dialect> {
@@ -1112,10 +1117,6 @@ impl DatabasePlugin for ClickHousePlugin {
 
     // === Function Operations ===
 
-    fn supports_procedures(&self) -> bool {
-        false
-    }
-
     async fn list_procedures(
         &self,
         _connection: &dyn DbConnection,
@@ -1585,6 +1586,15 @@ mod tests {
         assert_eq!(plugin.quote_identifier("col`umn"), "`col``umn`");
     }
 
+    #[test]
+    fn test_capabilities() {
+        let capabilities = create_plugin().capabilities();
+        assert!(capabilities.supports_functions);
+        assert!(!capabilities.supports_procedures);
+        assert!(!capabilities.supports_sequences);
+        assert_eq!(capabilities.table_engines, clickhouse_engine_names());
+    }
+
     #[test]
     fn test_ui_manifest_smoke() {
         let manifest = create_plugin().ui_manifest();

crates/db/src/duckdb/plugin.rs

@@ -17,7 +17,8 @@ use crate::manifest_helpers::{DatabaseActionDescriptorExt, action, action_with_s
 use crate::plugin::{DatabaseOperationRequest, DatabasePlugin, SqlCompletionInfo};
 use crate::plugin_manifest::{
     DatabaseActionId, DatabaseActionManifest, DatabaseActionPlacement, DatabaseActionToolbarScope,
-    DatabaseFormFieldType, DatabaseFormKind, DatabaseFormManifest, DatabaseUiManifest,
+    DatabaseCapabilities, DatabaseFormFieldType, DatabaseFormKind, DatabaseFormManifest,
+    DatabaseUiCapabilities, DatabaseUiManifest,
 };
 use crate::sqlite::SqlitePlugin;
 use crate::types::*;
@@ -753,6 +754,10 @@ impl DatabasePlugin for DuckDbPlugin {
         DatabaseType::DuckDB
     }
 
+    fn capabilities(&self) -> DatabaseCapabilities {
+        DatabaseUiCapabilities::default()
+    }
+
     fn ui_manifest(&self) -> DatabaseUiManifest {
         DUCKDB_UI_MANIFEST.clone()
     }
@@ -1192,10 +1197,6 @@ impl DatabasePlugin for DuckDbPlugin {
         })
     }
 
-    fn supports_functions(&self) -> bool {
-        false
-    }
-
     async fn list_functions(
         &self,
         connection: &dyn DbConnection,
@@ -1212,10 +1213,6 @@ impl DatabasePlugin for DuckDbPlugin {
         self.sqlite.list_functions_view(connection, database).await
     }
 
-    fn supports_procedures(&self) -> bool {
-        false
-    }
-
     async fn list_procedures(
         &self,
         connection: &dyn DbConnection,
@@ -1468,6 +1465,14 @@ mod tests {
         DuckDbPlugin::new()
     }
 
+    #[test]
+    fn test_capabilities() {
+        let capabilities = create_plugin().capabilities();
+        assert!(!capabilities.supports_functions);
+        assert!(!capabilities.supports_procedures);
+        assert!(!capabilities.supports_sequences);
+    }
+
     #[test]
     fn test_ui_manifest_smoke() {
         let manifest = create_plugin().ui_manifest();