Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ toml = "0.8"
# Git
git2 = { version = "0.18", default-features = false, features = ["https", "vendored-libgit2"] }

# OpenSSL — Linux/macOS: `bitfun-core` adds `vendored` via target cfg. Windows: link prebuilt (OPENSSL_DIR); see README.
openssl = { version = "0.10" }

# Terminal
portable-pty = "0.8"
vte = "0.15.0"
Expand Down
8 changes: 3 additions & 5 deletions src/crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ tokio-tungstenite = { workspace = true }
# SSH - Remote SSH support (optional feature)
russh = { version = "0.45", optional = true }
russh-sftp = { version = "2.1", optional = true }
russh-keys = { version = "0.45", features = ["openssl"], optional = true }
openssl = { workspace = true, optional = true }
russh-keys = { version = "0.45", optional = true }
shellexpand = { version = "3", optional = true }
ssh_config = { version = "0.1", optional = true }

Expand All @@ -129,15 +128,14 @@ bitfun-transport = { path = "../transport" }
# Tauri dependency (optional, enabled only when needed)
tauri = { workspace = true, optional = true }

# Non-Windows: vendored OpenSSL (no system install). Windows: prebuilt OpenSSL via OPENSSL_DIR (see README).
# Non-Windows: vendored OpenSSL for libgit2 (no system install).
[target.'cfg(not(windows))'.dependencies]
git2 = { workspace = true, features = ["vendored-openssl"] }
openssl = { workspace = true, optional = true, features = ["vendored"] }

[target.'cfg(windows)'.dependencies]
win32job = { workspace = true }

[features]
default = ["ssh-remote"]
tauri-support = ["tauri"] # Optional tauri support
ssh-remote = ["russh", "russh-sftp", "russh-keys", "openssl", "shellexpand", "ssh_config"] # Optional SSH remote support
ssh-remote = ["russh", "russh-sftp", "russh-keys", "shellexpand", "ssh_config"] # russh-keys pure-Rust crypto backend (no openssl)
23 changes: 15 additions & 8 deletions src/crates/core/src/service/remote_connect/bot/command_router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2536,20 +2536,27 @@ async fn handle_chat_message(
}

let cancel_command = format!("/cancel_task {}", turn_id);
HandleResult {
reply: format!(
let verbose_mode = super::load_bot_persistence().verbose_mode;
let processing_line = if language.is_chinese() {
"正在处理你的消息..."
} else {
"Processing your message..."
};
let reply = if verbose_mode {
format!(
"{}\n\n{}",
if language.is_chinese() {
"正在处理你的消息..."
} else {
"Processing your message..."
},
processing_line,
if language.is_chinese() {
format!("如需停止本次请求,请发送 `{}`。", cancel_command)
} else {
format!("If needed, send `{}` to stop this request.", cancel_command)
},
),
)
} else {
processing_line.to_string()
};
HandleResult {
reply,
actions: cancel_task_actions(language, cancel_command),
forward_to_session: Some(ForwardRequest {
session_id,
Expand Down
Loading