feat(ai): add CodeBuddy Code CLI provider

This commit is contained in:
Guoyu Su authored and GitHub committed 2026-08-10 18:27:37 +08:00
1 parent f5e7a37c8d
commit 1a3645a04d
38 files changed
+1697 -19

No files matched your search

+8
View File
@@ -196,6 +196,14 @@ pub async fn run_agent_loop(
crate::ai_grok_cli::build_grok_prompt(system_prompt, messages, agent_ctx.sql_permissions.allow_writes);
return crate::ai_grok_cli::run_grok_agent(config, &prompt, options, cancelled, on_event).await;
}
if matches!(config.provider, AiProvider::CodeBuddyCli) {
let prompt = crate::ai_codebuddy_cli::build_codebuddy_prompt(
system_prompt,
messages,
agent_ctx.sql_permissions.allow_writes,
);
return crate::ai_codebuddy_cli::run_codebuddy_agent(config, &prompt, options, cancelled, on_event).await;
}
let prompt =
crate::ai_codex_cli::build_codex_prompt(system_prompt, messages, agent_ctx.sql_permissions.allow_writes);
return crate::ai_codex_cli::run_codex_agent(config, &prompt, options, cancelled, on_event).await;
+76 -3
View File
@@ -85,6 +85,8 @@ pub enum AiProvider {
CursorCli,
#[serde(rename = "grok-cli")]
GrokCli,
#[serde(rename = "codebuddy-cli")]
CodeBuddyCli,
Custom,
}
@@ -105,6 +107,7 @@ impl AiProvider {
AiProvider::OpenCodeCli => "opencode-cli",
AiProvider::CursorCli => "cursor-cli",
AiProvider::GrokCli => "grok-cli",
AiProvider::CodeBuddyCli => "codebuddy-cli",
AiProvider::CodexCli => "codex-cli",
AiProvider::Custom => "custom",
}
@@ -408,6 +411,10 @@ pub struct AiConfig {
pub grok_cli_path: Option<String>,
#[serde(default)]
pub grok_cli_env: HashMap<String, String>,
#[serde(default)]
pub codebuddy_cli_path: Option<String>,
#[serde(default)]
pub codebuddy_cli_env: HashMap<String, String>,
}
fn default_enable_thinking() -> bool {
@@ -426,6 +433,7 @@ pub fn is_cli_provider(provider: &AiProvider) -> bool {
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli
)
}
@@ -658,6 +666,7 @@ pub fn resolve_endpoint(config: &AiConfig) -> String {
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli
| AiProvider::Gemini => unreachable!(),
}
}
@@ -1508,6 +1517,7 @@ pub async fn list_models_core(config: &AiConfig) -> Result<Vec<AiModelInfo>, Str
AiProvider::OpenCodeCli => crate::ai_opencode_cli::list_opencode_models(config).await?,
AiProvider::CursorCli => crate::ai_cursor_cli::list_cursor_models(config).await?,
AiProvider::GrokCli => crate::ai_grok_cli::list_grok_models(config).await?,
AiProvider::CodeBuddyCli => crate::ai_codebuddy_cli::list_codebuddy_models(config).await?,
_ => {
validate_model_list_config(config)?;
let client = build_ai_http_client(config, 30)?;
@@ -1535,7 +1545,8 @@ pub async fn list_models_core(config: &AiConfig) -> Result<Vec<AiModelInfo>, Str
| AiProvider::PiAgentCli
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli => {
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli => {
unreachable!()
}
}
@@ -1560,6 +1571,10 @@ pub async fn resolve_model_effort_core(config: &AiConfig, model_id: &str) -> Res
return crate::ai_opencode_cli::resolve_opencode_model_effort(config, model_id).await;
}
if matches!(config.provider, AiProvider::CodeBuddyCli) {
return crate::ai_codebuddy_cli::resolve_codebuddy_model_effort(config, model_id).await;
}
if matches!(config.provider, AiProvider::CursorCli) {
return Ok(AiEffortCapability::Unsupported);
}
@@ -2102,6 +2117,9 @@ pub async fn test_connection_core(config: &AiConfig) -> Result<AiTestConnectionR
if matches!(config.provider, AiProvider::GrokCli) {
return crate::ai_grok_cli::test_grok_connection(config).await;
}
if matches!(config.provider, AiProvider::CodeBuddyCli) {
return crate::ai_codebuddy_cli::test_codebuddy_connection(config).await;
}
let mut resolved_config = config.clone();
if resolved_config.model.trim().is_empty() {
let model = list_models_core(&resolved_config)
@@ -2479,7 +2497,8 @@ pub async fn complete(request: &AiCompletionRequest) -> Result<String, String> {
| AiProvider::PiAgentCli
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli => {
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli => {
unreachable!()
}
AiProvider::Openai
@@ -2538,7 +2557,8 @@ pub async fn stream(
| AiProvider::PiAgentCli
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli => {
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli => {
unreachable!()
}
AiProvider::Openai
@@ -4200,6 +4220,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
},
system_prompt: "Be concise.".to_string(),
messages: vec![AiMessage {
@@ -4785,6 +4807,8 @@ mod tests {
assert!(config.opencode_cli_env.is_empty());
assert!(config.cursor_cli_path.is_none());
assert!(config.cursor_cli_env.is_empty());
assert!(config.codebuddy_cli_path.is_none());
assert!(config.codebuddy_cli_env.is_empty());
}
#[test]
@@ -4816,6 +4840,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let err = build_ai_http_client(&config, 1).unwrap_err();
@@ -4852,6 +4878,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
build_ai_http_client(&config, 1).unwrap();
@@ -4886,6 +4914,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
build_ai_http_client(&config, 1).unwrap();
@@ -4920,6 +4950,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(
@@ -4958,6 +4990,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(resolve_endpoint(&ollama), "http://localhost:11434/v1/chat/completions");
@@ -4993,6 +5027,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
for provider in
@@ -5047,6 +5083,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(resolve_model_list_endpoint(&openai).unwrap(), "https://api.openai.com/v1/models");
@@ -5077,6 +5115,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(resolve_model_list_endpoint(&claude).unwrap(), "https://api.anthropic.com/v1/models");
}
@@ -5110,6 +5150,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert!(uses_anthropic_messages_api(&config));
@@ -5195,6 +5237,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert!(!uses_anthropic_messages_api(&config));
@@ -5240,6 +5284,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(resolve_endpoint(&config), "https://api.example.com/v1/chat/completions");
assert_eq!(resolve_model_list_endpoint(&config).unwrap(), "https://api.example.com/v1/models");
@@ -5309,6 +5355,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(resolve_endpoint(&config), "https://api.openai.com/v1/responses");
@@ -5350,6 +5398,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let api_key_headers = claude_headers(&config).unwrap();
@@ -5471,6 +5521,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(resolve_ollama_show_endpoint(&config).unwrap(), "http://localhost:11434/api/show");
@@ -5509,6 +5561,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
assert_eq!(ollama_selected_model_tool_support(&config).await.unwrap(), Some(true));
@@ -5596,6 +5650,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let models = vec![
AiModelInfo::new("qwen3:0.6b", None),
@@ -5863,6 +5919,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({
@@ -6080,6 +6138,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({
"model": &config.model,
@@ -6123,6 +6183,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({ "model": &config.model });
@@ -6172,6 +6234,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({ "model": &config.model });
@@ -6215,6 +6279,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({ "model": &config.model });
@@ -6254,6 +6320,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({ "model": &config.model });
@@ -6324,6 +6392,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let request = AiCompletionRequest {
config: config.clone(),
@@ -6388,6 +6458,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let mut body = serde_json::json!({
"model": &config.model,
@@ -6921,6 +6993,7 @@ mod tests {
AiProvider::OpenCodeCli,
AiProvider::CursorCli,
AiProvider::GrokCli,
AiProvider::CodeBuddyCli,
] {
let mut config = test_config(provider.clone());
config.max_retries = None;
@@ -587,6 +587,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
+10 -8
View File
@@ -34,6 +34,7 @@ pub struct CliAgentCommandSpec {
pub enum CliAgentJsonlDialect {
CodexExec,
ClaudeCodePrint,
CodeBuddyPrint,
OpenCodeRun,
CursorPrint,
/// Grok Build headless `--output-format streaming-json` (ACP-derived NDJSON).
@@ -237,7 +238,8 @@ pub fn parse_cli_jsonl_event(line: &str, dialect: CliAgentJsonlDialect) -> Optio
fn parse_cli_jsonl_line(line: &str, dialect: CliAgentJsonlDialect) -> ParsedCliAgentEvent {
match dialect {
CliAgentJsonlDialect::CodexExec => parse_codex_jsonl_line(line),
CliAgentJsonlDialect::ClaudeCodePrint => parse_claude_code_jsonl_line(line),
CliAgentJsonlDialect::ClaudeCodePrint => parse_claude_compatible_jsonl_line(line, "Claude Code CLI failed"),
CliAgentJsonlDialect::CodeBuddyPrint => parse_claude_compatible_jsonl_line(line, "CodeBuddy Code CLI failed"),
CliAgentJsonlDialect::OpenCodeRun => parse_open_code_jsonl_line(line),
CliAgentJsonlDialect::CursorPrint => parse_cursor_jsonl_line(line),
CliAgentJsonlDialect::GrokStreamingJson => parse_grok_streaming_json_line(line),
@@ -402,7 +404,7 @@ fn codex_error_message(value: &Value) -> String {
.to_string()
}
fn parse_claude_code_jsonl_line(line: &str) -> ParsedCliAgentEvent {
fn parse_claude_compatible_jsonl_line(line: &str, fallback_error: &str) -> ParsedCliAgentEvent {
let Ok(value) = serde_json::from_str::<Value>(line) else {
return ParsedCliAgentEvent::default();
};
@@ -410,9 +412,9 @@ fn parse_claude_code_jsonl_line(line: &str) -> ParsedCliAgentEvent {
match value.get("type").and_then(Value::as_str).unwrap_or_default() {
"assistant" => parse_claude_code_assistant(&value),
"user" => parse_claude_code_user(&value),
"result" => parse_claude_code_result(&value),
"result" => parse_claude_code_result(&value, fallback_error),
"error" => {
let message = claude_code_error_message(&value);
let message = claude_code_error_message(&value, fallback_error);
ParsedCliAgentEvent {
error: Some(message.clone()),
events: vec![AgentEvent::Error { message }],
@@ -489,10 +491,10 @@ fn parse_claude_code_user(value: &Value) -> ParsedCliAgentEvent {
ParsedCliAgentEvent { events, ..Default::default() }
}
fn parse_claude_code_result(value: &Value) -> ParsedCliAgentEvent {
fn parse_claude_code_result(value: &Value, fallback_error: &str) -> ParsedCliAgentEvent {
let subtype = value.get("subtype").and_then(Value::as_str).unwrap_or("success");
if subtype != "success" {
let message = claude_code_error_message(value);
let message = claude_code_error_message(value, fallback_error);
return ParsedCliAgentEvent {
error: Some(message.clone()),
events: vec![AgentEvent::Error { message }],
@@ -528,14 +530,14 @@ fn claude_content_blocks(content: &Value) -> Vec<Value> {
}
}
fn claude_code_error_message(value: &Value) -> String {
fn claude_code_error_message(value: &Value, fallback_error: &str) -> String {
value
.get("error")
.and_then(Value::as_str)
.or_else(|| value.get("message").and_then(Value::as_str))
.or_else(|| value.get("error").and_then(|error| error.get("message")).and_then(Value::as_str))
.or_else(|| value.get("result").and_then(Value::as_str))
.unwrap_or("Claude Code CLI failed")
.unwrap_or(fallback_error)
.to_string()
}
File diff suppressed because it is too large. Load diff
+2
View File
@@ -1044,6 +1044,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
+2
View File
@@ -424,6 +424,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
+8 -2
View File
@@ -88,7 +88,8 @@ pub fn static_effort_capability(config: &AiConfig, model_id: &str) -> Option<AiE
| AiProvider::PiAgentCli
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli => None,
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli => None,
}
}
@@ -196,6 +197,7 @@ pub fn registry_source_url(provider: &AiProvider) -> Option<&'static str> {
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli
| AiProvider::Custom => None,
}
}
@@ -217,6 +219,7 @@ pub fn validate_runtime_effort(config: &AiConfig) -> Result<(), String> {
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli
) {
return match selection {
AiEffortSelection::Enum(value) if !value.trim().is_empty() => Ok(()),
@@ -274,7 +277,8 @@ pub fn apply_runtime_effort(body: &mut Value, config: &AiConfig) {
| AiProvider::PiAgentCli
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli => {}
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli => {}
}
}
@@ -434,6 +438,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
+2
View File
@@ -571,6 +571,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
+1
View File
@@ -99,6 +99,7 @@ pub(crate) fn model_is_assistant_compatible(provider: &AiProvider, model_id: &st
| AiProvider::OpenCodeCli
| AiProvider::CursorCli
| AiProvider::GrokCli
| AiProvider::CodeBuddyCli
| AiProvider::MiniMax
| AiProvider::Custom => true,
}
+2
View File
@@ -470,6 +470,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
+2
View File
@@ -878,6 +878,8 @@ mod tests {
cursor_cli_env: HashMap::new(),
grok_cli_path: None,
grok_cli_env: HashMap::new(),
codebuddy_cli_path: None,
codebuddy_cli_env: HashMap::new(),
}
}
+2
View File
@@ -1594,6 +1594,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
},
}
}
+1
View File
@@ -12,6 +12,7 @@ pub mod agent_tools;
pub mod ai;
pub mod ai_claude_code_cli;
pub mod ai_cli_agent;
pub mod ai_codebuddy_cli;
pub mod ai_codex_cli;
pub mod ai_cursor_cli;
pub mod ai_effort;
+29
View File
@@ -5478,6 +5478,8 @@ mod tests {
cursor_cli_env: std::collections::HashMap::new(),
grok_cli_path: None,
grok_cli_env: std::collections::HashMap::new(),
codebuddy_cli_path: None,
codebuddy_cli_env: std::collections::HashMap::new(),
},
}
}
@@ -5593,6 +5595,33 @@ mod tests {
std::fs::remove_file(&db).ok();
}
#[tokio::test]
async fn codebuddy_cli_ai_config_roundtrip() {
let db = temp_db_path("codebuddy-cli-ai-roundtrip");
let storage = Storage::open(&db).await.unwrap();
let mut cfg = make_ai_config("codebuddy-cli", true);
cfg.config.provider = AiProvider::CodeBuddyCli;
cfg.config.api_key.clear();
cfg.config.endpoint.clear();
cfg.config.model = "kimi-k2.5".to_string();
cfg.config.codebuddy_cli_path = Some("/opt/homebrew/bin/codebuddy".to_string());
cfg.config.codebuddy_cli_env.insert("HTTPS_PROXY".to_string(), "http://127.0.0.1:7890".to_string());
storage.save_ai_config_item(&cfg).await.unwrap();
let loaded = storage.load_ai_configs().await.unwrap();
assert_eq!(loaded.len(), 1);
assert!(matches!(loaded[0].config.provider, AiProvider::CodeBuddyCli));
assert_eq!(loaded[0].config.model, "kimi-k2.5");
assert_eq!(loaded[0].config.codebuddy_cli_path.as_deref(), Some("/opt/homebrew/bin/codebuddy"));
assert_eq!(
loaded[0].config.codebuddy_cli_env.get("HTTPS_PROXY").map(String::as_str),
Some("http://127.0.0.1:7890")
);
std::fs::remove_file(&db).ok();
}
#[tokio::test]
async fn anthropic_compatible_ai_config_roundtrip() {
let db = temp_db_path("anthropic-compatible-ai-roundtrip");
+5
View File
@@ -533,6 +533,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
}
}
@@ -545,6 +547,7 @@ mod tests {
AiProvider::OpenCodeCli,
AiProvider::CursorCli,
AiProvider::GrokCli,
AiProvider::CodeBuddyCli,
] {
let config = make_config(provider);
assert!(reject_web_unsupported_ai_provider(&config).is_err());
@@ -633,6 +636,8 @@ mod tests {
cursor_cli_env: Default::default(),
grok_cli_path: None,
grok_cli_env: Default::default(),
codebuddy_cli_path: None,
codebuddy_cli_env: Default::default(),
};
let body = super::AiTestConnectionRequest { config };