Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
992e60980c | ||
|
|
74b1ad4302 | ||
|
|
9ad04cf819 | ||
|
|
b46935c606 | ||
|
|
b28a5fe384 | ||
|
|
b66898ea28 | ||
|
|
9aca45cb65 |
@@ -1,3 +1,25 @@
|
|||||||
|
## [1.19.6](https://github.com/asepharyana/zesdex/compare/v1.19.5...v1.19.6) (2026-08-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* **agent:** eksekusi tool read-only paralel seperti Claude Code ([74b1ad4](https://github.com/asepharyana/zesdex/commit/74b1ad43020a11ca27e60e3a24de0db5d1ab37b4))
|
||||||
|
|
||||||
|
## [1.19.5](https://github.com/asepharyana/zesdex/compare/v1.19.4...v1.19.5) (2026-08-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **api:** model Opus default pakai claude-opus-5 (bukan -4-8) ([b28a5fe](https://github.com/asepharyana/zesdex/commit/b28a5fe384fd45255a6b249c7febd3b4ffc0fd2f))
|
||||||
|
* **api:** update zesdex packages to version 1.19.4 ([b46935c](https://github.com/asepharyana/zesdex/commit/b46935c606d4f68ea227c7db27e4c2aa9b4e373c))
|
||||||
|
|
||||||
|
## [1.19.4](https://github.com/asepharyana/zesdex/compare/v1.19.3...v1.19.4) (2026-08-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **api:** model claude selalu pakai Opus dari settings.json, bukan deepseek ([9aca45c](https://github.com/asepharyana/zesdex/commit/9aca45cb65d6913d14fecc10d70c180934f69d74))
|
||||||
|
|
||||||
## [1.19.3](https://github.com/asepharyana/zesdex/compare/v1.19.2...v1.19.3) (2026-08-27)
|
## [1.19.3](https://github.com/asepharyana/zesdex/compare/v1.19.2...v1.19.3) (2026-08-27)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Generated
+12
-11
@@ -4862,7 +4862,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-api"
|
name = "zesdex-api"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"argon2",
|
"argon2",
|
||||||
@@ -4885,11 +4885,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-application"
|
name = "zesdex-application"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
"futures-util",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2 0.11.0",
|
"sha2 0.11.0",
|
||||||
@@ -4902,7 +4903,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-bootstrap"
|
name = "zesdex-bootstrap"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -4919,7 +4920,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-daemon"
|
name = "zesdex-daemon"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
@@ -4943,7 +4944,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-domain"
|
name = "zesdex-domain"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
@@ -4959,7 +4960,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-gateway"
|
name = "zesdex-gateway"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -4986,7 +4987,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-grpc"
|
name = "zesdex-grpc"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -5003,7 +5004,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-infrastructure"
|
name = "zesdex-infrastructure"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"argon2",
|
"argon2",
|
||||||
@@ -5051,7 +5052,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-tui"
|
name = "zesdex-tui"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
@@ -5077,7 +5078,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-web"
|
name = "zesdex-web"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -5097,7 +5098,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-ws"
|
name = "zesdex-ws"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "1.19.3"
|
version = "1.19.6"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["asepharyana <superaseph@gmail.com>"]
|
authors = ["asepharyana <superaseph@gmail.com>"]
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ uuid.workspace = true
|
|||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
|
futures-util.workspace = true
|
||||||
base64.workspace = true
|
base64.workspace = true
|
||||||
sha2.workspace = true
|
sha2.workspace = true
|
||||||
url.workspace = true
|
url.workspace = true
|
||||||
|
|||||||
@@ -11,6 +11,17 @@ pub trait ToolExecutor: Send + Sync {
|
|||||||
tool_name: &str,
|
tool_name: &str,
|
||||||
args: &serde_json::Value,
|
args: &serde_json::Value,
|
||||||
) -> impl Future<Output = Result<String>> + Send;
|
) -> impl Future<Output = Result<String>> + Send;
|
||||||
|
|
||||||
|
/// Whether a tool is *read-only* and therefore safe to run concurrently
|
||||||
|
/// with other read-only tools in the same assistant message.
|
||||||
|
///
|
||||||
|
/// Defaults to `false` (sequential) so a caller that does not know the
|
||||||
|
/// tool surface stays conservative. Concrete executors that know their
|
||||||
|
/// tools override this — e.g. return `true` for `read`/`grep`/`glob`.
|
||||||
|
fn is_parallel_safe(&self, tool_name: &str) -> bool {
|
||||||
|
let _ = tool_name;
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Service for running agent turns asynchronously.
|
/// Service for running agent turns asynchronously.
|
||||||
|
|||||||
@@ -187,6 +187,53 @@ async fn execute_tool_call<T: ToolExecutor>(
|
|||||||
output
|
output
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Helper: bounded-parallel execution of read-only tool calls.
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/// Maximum number of read-only tool calls executed concurrently in a single
|
||||||
|
/// assistant batch. Models rarely emit more than a handful of reads per
|
||||||
|
/// message; this cap keeps resource usage bounded while still removing the
|
||||||
|
/// serial round-trip latency of many independent lookups.
|
||||||
|
const MAX_PARALLEL_TOOLS: usize = 8;
|
||||||
|
|
||||||
|
fn tool_executor_ref<T: ToolExecutor>(tool_executor: &T) -> &T {
|
||||||
|
tool_executor
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Execute a batch of *read-only* tool calls concurrently (bounded by
|
||||||
|
/// [`MAX_PARALLEL_TOOLS`]) and return their outputs **in the original call
|
||||||
|
/// order**.
|
||||||
|
///
|
||||||
|
/// Order preservation matters: OpenAI/Anthropic tool-calling contracts expect
|
||||||
|
/// tool-result messages to appear in the same order as the `tool_calls`
|
||||||
|
/// emitted in the assistant message. Without it, the model sees shuffled
|
||||||
|
/// results and loses track of which result belongs to which call.
|
||||||
|
///
|
||||||
|
/// Each call still pushes its `TurnEvent::ToolResult` (so the TUI shows each
|
||||||
|
/// tool as it completes) but the returned `Vec` is ordered by the input index.
|
||||||
|
async fn execute_tool_calls_in_parallel<T: ToolExecutor>(
|
||||||
|
tool_executor: &T,
|
||||||
|
turn_events: &Arc<Mutex<VecDeque<TurnEvent>>>,
|
||||||
|
tool_calls: &[zesdex_domain::core::ToolCall],
|
||||||
|
) -> Vec<String> {
|
||||||
|
let semaphore = Arc::new(tokio::sync::Semaphore::new(MAX_PARALLEL_TOOLS));
|
||||||
|
let executor_ref = tool_executor_ref(tool_executor);
|
||||||
|
|
||||||
|
let futures = tool_calls.iter().map(|tc| {
|
||||||
|
let tc = tc.clone();
|
||||||
|
let events = turn_events.clone();
|
||||||
|
let sem = semaphore.clone();
|
||||||
|
async move {
|
||||||
|
// Acquire a permit to bound concurrency across the batch.
|
||||||
|
let _permit = sem.acquire_owned().await;
|
||||||
|
execute_tool_call(executor_ref, &events, &tc).await
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
futures_util::future::join_all(futures).await
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Helper: emit usage event from optional LLM response metadata.
|
// Helper: emit usage event from optional LLM response metadata.
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -384,10 +431,42 @@ impl<P: ProviderService, T: ToolExecutor> super::AgentTurnService for AgentTurnS
|
|||||||
params.messages.push(assistant_msg);
|
params.messages.push(assistant_msg);
|
||||||
|
|
||||||
// ── Execute each tool call ──────────────────────────
|
// ── Execute each tool call ──────────────────────────
|
||||||
|
//
|
||||||
|
// If the whole batch is made of *read-only* tools
|
||||||
|
// (read/grep/glob/…), run it concurrently with bounded
|
||||||
|
// parallelism — a big latency win for coding turns that
|
||||||
|
// emit several independent lookups in one message. Any
|
||||||
|
// single mutating tool forces the whole batch back to the
|
||||||
|
// safe sequential path so writes never race.
|
||||||
|
//
|
||||||
|
// Results are always collected in the original call order
|
||||||
|
// to honour the tool-calling contract.
|
||||||
|
let parallel = tool_calls.len() > 1
|
||||||
|
&& tool_calls
|
||||||
|
.iter()
|
||||||
|
.all(|tc| self.tool_executor.is_parallel_safe(&tc.function.name));
|
||||||
|
let outputs: Vec<String> = if parallel {
|
||||||
|
execute_tool_calls_in_parallel(
|
||||||
|
self.tool_executor.as_ref(),
|
||||||
|
¶ms.turn_events,
|
||||||
|
&tool_calls,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
} else {
|
||||||
|
let mut sequential = Vec::with_capacity(tool_calls.len());
|
||||||
for tc in &tool_calls {
|
for tc in &tool_calls {
|
||||||
let output =
|
let out = execute_tool_call(
|
||||||
execute_tool_call(self.tool_executor.as_ref(), ¶ms.turn_events, tc)
|
self.tool_executor.as_ref(),
|
||||||
|
¶ms.turn_events,
|
||||||
|
tc,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
|
sequential.push(out);
|
||||||
|
}
|
||||||
|
sequential
|
||||||
|
};
|
||||||
|
|
||||||
|
for (tc, output) in tool_calls.iter().zip(outputs) {
|
||||||
if output.starts_with("Error:") {
|
if output.starts_with("Error:") {
|
||||||
errors.record(&tc.function.name, &output, &mut params.messages);
|
errors.record(&tc.function.name, &output, &mut params.messages);
|
||||||
}
|
}
|
||||||
@@ -479,7 +558,6 @@ pub async fn compact_messages_with_ai<P: ProviderService>(
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn truncate_short_output_is_unchanged() {
|
fn truncate_short_output_is_unchanged() {
|
||||||
let out = "short".to_string();
|
let out = "short".to_string();
|
||||||
@@ -536,4 +614,83 @@ mod tests {
|
|||||||
];
|
];
|
||||||
assert_eq!(conversation_chars(&messages), 3 + 11 + 6);
|
assert_eq!(conversation_chars(&messages), 3 + 11 + 6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A fake executor that reports parallel-safety for read-only tools and
|
||||||
|
/// whose `execute` sleeps on the first call to prove the batch runs
|
||||||
|
/// concurrently (a sequential loop would pay the sleep per call).
|
||||||
|
struct FakeExecutor;
|
||||||
|
|
||||||
|
impl ToolExecutor for FakeExecutor {
|
||||||
|
async fn execute(&self, name: &str, _args: &serde_json::Value) -> anyhow::Result<String> {
|
||||||
|
if name == "read" {
|
||||||
|
// 30ms sleep on every read; a parallel batch of 3 would
|
||||||
|
// finish in ~30ms instead of ~90ms sequentially.
|
||||||
|
tokio::time::sleep(std::time::Duration::from_millis(30)).await;
|
||||||
|
}
|
||||||
|
Ok(format!("out:{name}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_parallel_safe(&self, name: &str) -> bool {
|
||||||
|
matches!(name, "read" | "grep")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn tc(name: &str, id: usize) -> zesdex_domain::core::ToolCall {
|
||||||
|
zesdex_domain::core::ToolCall {
|
||||||
|
id: format!("call_{id}"),
|
||||||
|
type_: "function".to_string(),
|
||||||
|
function: zesdex_domain::core::ToolFunction {
|
||||||
|
name: name.to_string(),
|
||||||
|
arguments: serde_json::Value::String(String::new()),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parallel_batch_runs_concurrently_and_preserves_order() {
|
||||||
|
let executor = FakeExecutor;
|
||||||
|
let events = Arc::new(Mutex::new(VecDeque::new()));
|
||||||
|
let calls = vec![tc("read", 1), tc("grep", 2), tc("read", 3)];
|
||||||
|
|
||||||
|
// All three are parallel-safe.
|
||||||
|
assert!(calls
|
||||||
|
.iter()
|
||||||
|
.all(|c| executor.is_parallel_safe(&c.function.name)));
|
||||||
|
|
||||||
|
let rt = tokio::runtime::Builder::new_multi_thread()
|
||||||
|
.enable_time()
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
let started = std::time::Instant::now();
|
||||||
|
let outputs = rt.block_on(execute_tool_calls_in_parallel(&executor, &events, &calls));
|
||||||
|
let elapsed = started.elapsed();
|
||||||
|
|
||||||
|
// Results are in *original* call order (read, grep, read).
|
||||||
|
assert_eq!(
|
||||||
|
outputs,
|
||||||
|
vec![
|
||||||
|
"out:read".to_string(),
|
||||||
|
"out:grep".to_string(),
|
||||||
|
"out:read".to_string()
|
||||||
|
]
|
||||||
|
);
|
||||||
|
// Two reads sleep 30ms each; sequential would take ~60ms+ for the
|
||||||
|
// two reads, parallel keeps the whole batch under 60ms.
|
||||||
|
assert!(
|
||||||
|
elapsed < std::time::Duration::from_millis(60),
|
||||||
|
"batch took {elapsed:?}, expected parallel execution"
|
||||||
|
);
|
||||||
|
assert!(elapsed >= std::time::Duration::from_millis(25));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mutating_batch_falls_back_to_sequential_path() {
|
||||||
|
// A batch containing a mutating tool is not eligible for the parallel
|
||||||
|
// path, so the main loop keeps results ordered and side-effects safe.
|
||||||
|
let executor = FakeExecutor;
|
||||||
|
let calls = [tc("read", 1), tc("edit", 2)];
|
||||||
|
assert!(!calls
|
||||||
|
.iter()
|
||||||
|
.all(|c| executor.is_parallel_safe(&c.function.name)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ impl Default for AppConfig {
|
|||||||
///
|
///
|
||||||
/// ## Defaults
|
/// ## Defaults
|
||||||
/// - Zen provider: `deepseek-v4-flash-free` model
|
/// - Zen provider: `deepseek-v4-flash-free` model
|
||||||
/// - Router provider: `claude-opus-4-8` model
|
/// - Router provider: `claude-opus-5` model
|
||||||
/// - Default role: "default" → zen / deepseek-v4-flash-free, temp 0.7
|
/// - Default role: "default" → zen / deepseek-v4-flash-free, temp 0.7
|
||||||
/// - `default_context_window`: 256,000 tokens
|
/// - `default_context_window`: 256,000 tokens
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
@@ -99,7 +99,7 @@ impl Default for AppConfig {
|
|||||||
ProviderConfig {
|
ProviderConfig {
|
||||||
api_base: "https://9router.asepharyana.my.id/v1".to_string(),
|
api_base: "https://9router.asepharyana.my.id/v1".to_string(),
|
||||||
api_key_env: Some("ROUTER_API_KEY".to_string()),
|
api_key_env: Some("ROUTER_API_KEY".to_string()),
|
||||||
default_model: Some("claude-opus-4-8".to_string()),
|
default_model: Some("claude-opus-5".to_string()),
|
||||||
default_api_key: None,
|
default_api_key: None,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ pub use repository::SettingsRepository;
|
|||||||
pub use service::ConversationService;
|
pub use service::ConversationService;
|
||||||
pub use service::MemoryService;
|
pub use service::MemoryService;
|
||||||
pub use service::SettingsService;
|
pub use service::SettingsService;
|
||||||
|
pub use settings::resolve_effective_model;
|
||||||
pub use settings::InternetMode;
|
pub use settings::InternetMode;
|
||||||
pub use settings::Settings;
|
pub use settings::Settings;
|
||||||
pub use settings::SettingsFlags;
|
pub use settings::SettingsFlags;
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ use std::collections::HashMap;
|
|||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use super::app_config::AppConfig;
|
||||||
|
|
||||||
/// Controls how much network access the agent is permitted during a session.
|
/// Controls how much network access the agent is permitted during a session.
|
||||||
///
|
///
|
||||||
/// ## Variants
|
/// ## Variants
|
||||||
@@ -112,3 +114,86 @@ impl Default for Settings {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Pick the effective model name for the main agent.
|
||||||
|
///
|
||||||
|
/// When `settings.provider` is `"claude"` (auto-detected from
|
||||||
|
/// `~/.claude/settings.json`), the provider's `default_model` (or the
|
||||||
|
/// app-level `default_model`) wins over a possibly-stale persisted
|
||||||
|
/// `settings.model`. Otherwise the user's explicit `settings.model` is used.
|
||||||
|
///
|
||||||
|
/// Why: the user's custom Claude endpoint (URL + API key from
|
||||||
|
/// `~/.claude/settings.json`) implies Opus as the model; a stale
|
||||||
|
/// `settings.json` (e.g. "deepseek-v4-flash-free") must not override it.
|
||||||
|
pub fn resolve_effective_model(settings: &Settings, app_config: &AppConfig) -> String {
|
||||||
|
if settings.provider == "claude" {
|
||||||
|
if let Some(m) = app_config
|
||||||
|
.providers
|
||||||
|
.get("claude")
|
||||||
|
.and_then(|p| p.default_model.clone())
|
||||||
|
{
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
return app_config.default_model.clone();
|
||||||
|
}
|
||||||
|
settings.model.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::cms::app_config::AppConfig;
|
||||||
|
|
||||||
|
fn claude_app_config() -> AppConfig {
|
||||||
|
let mut cfg = AppConfig::default();
|
||||||
|
cfg.providers.insert(
|
||||||
|
"claude".to_string(),
|
||||||
|
crate::cms::ProviderConfig {
|
||||||
|
api_base: "https://9router.example/v1".to_string(),
|
||||||
|
api_key_env: Some("ANTHROPIC_API_KEY".to_string()),
|
||||||
|
default_model: Some("claude-opus-5".to_string()),
|
||||||
|
default_api_key: Some("sk-test".to_string()),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
cfg.default_provider = "claude".to_string();
|
||||||
|
cfg.default_model = "claude-opus-5".to_string();
|
||||||
|
cfg
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn claude_provider_uses_opus_model_over_stale_settings_model() {
|
||||||
|
let settings = Settings {
|
||||||
|
provider: "claude".to_string(),
|
||||||
|
model: "deepseek-v4-flash-free".to_string(), // stale persisted
|
||||||
|
..Settings::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let model = resolve_effective_model(&settings, &claude_app_config());
|
||||||
|
assert_eq!(model, "claude-opus-5");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn non_claude_provider_uses_settings_model() {
|
||||||
|
let settings = Settings {
|
||||||
|
provider: "zen".to_string(),
|
||||||
|
model: "my-model".to_string(),
|
||||||
|
..Settings::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let model = resolve_effective_model(&settings, &AppConfig::default());
|
||||||
|
assert_eq!(model, "my-model");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn claude_falls_back_to_app_default() {
|
||||||
|
let settings = Settings {
|
||||||
|
provider: "claude".to_string(),
|
||||||
|
model: String::new(),
|
||||||
|
..Settings::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let cfg = AppConfig::default();
|
||||||
|
let model = resolve_effective_model(&settings, &cfg);
|
||||||
|
assert_eq!(model, cfg.default_model);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ fn detect_claude_settings_provider() -> Option<(ProviderConfig, Option<String>)>
|
|||||||
/// persisted entry with the current base URL + key from settings.json).
|
/// persisted entry with the current base URL + key from settings.json).
|
||||||
/// 2. Registers known Claude model roles if missing.
|
/// 2. Registers known Claude model roles if missing.
|
||||||
/// 3. Always sets `default_provider = "claude"` and
|
/// 3. Always sets `default_provider = "claude"` and
|
||||||
/// `default_model = custom_model.unwrap_or("claude-opus-4-8")` so Opus
|
/// `default_model = custom_model.unwrap_or("claude-opus-5")` so Opus
|
||||||
/// is the default whenever `~/.claude/settings.json` is present.
|
/// is the default whenever `~/.claude/settings.json` is present.
|
||||||
fn apply_claude_provider(
|
fn apply_claude_provider(
|
||||||
cfg: &mut AppConfig,
|
cfg: &mut AppConfig,
|
||||||
@@ -89,7 +89,7 @@ fn apply_claude_provider(
|
|||||||
cfg.providers.insert("claude".to_string(), claude_provider);
|
cfg.providers.insert("claude".to_string(), claude_provider);
|
||||||
|
|
||||||
let claude_models: [(&str, &str); 3] = [
|
let claude_models: [(&str, &str); 3] = [
|
||||||
("claude-opus-4-8", "claude-opus-4-8"),
|
("claude-opus-5", "claude-opus-5"),
|
||||||
("claude-sonnet-5", "claude-sonnet-5"),
|
("claude-sonnet-5", "claude-sonnet-5"),
|
||||||
("claude-haiku-4-5", "claude-haiku-4-5-20251001"),
|
("claude-haiku-4-5", "claude-haiku-4-5-20251001"),
|
||||||
];
|
];
|
||||||
@@ -118,7 +118,7 @@ fn apply_claude_provider(
|
|||||||
// Always prefer the Claude provider + Opus model when settings.json
|
// Always prefer the Claude provider + Opus model when settings.json
|
||||||
// is present — this is the user's explicit custom endpoint choice.
|
// is present — this is the user's explicit custom endpoint choice.
|
||||||
cfg.default_provider = "claude".to_string();
|
cfg.default_provider = "claude".to_string();
|
||||||
cfg.default_model = custom_model.unwrap_or_else(|| "claude-opus-4-8".to_string());
|
cfg.default_model = custom_model.unwrap_or_else(|| "claude-opus-5".to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppConfigRepository for JsonAppConfigRepository {
|
impl AppConfigRepository for JsonAppConfigRepository {
|
||||||
@@ -159,7 +159,7 @@ mod tests {
|
|||||||
ProviderConfig {
|
ProviderConfig {
|
||||||
api_base: base.to_string(),
|
api_base: base.to_string(),
|
||||||
api_key_env: Some("ANTHROPIC_API_KEY".to_string()),
|
api_key_env: Some("ANTHROPIC_API_KEY".to_string()),
|
||||||
default_model: Some("claude-opus-4-8".to_string()),
|
default_model: Some("claude-opus-5".to_string()),
|
||||||
default_api_key: key.map(|s| s.to_string()),
|
default_api_key: key.map(|s| s.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,10 +209,10 @@ mod tests {
|
|||||||
assert_eq!(claude.default_api_key.as_deref(), Some("sk-new"));
|
assert_eq!(claude.default_api_key.as_deref(), Some("sk-new"));
|
||||||
// Insert (not or_insert) → stale entry refreshed.
|
// Insert (not or_insert) → stale entry refreshed.
|
||||||
assert_eq!(cfg.default_provider, "claude");
|
assert_eq!(cfg.default_provider, "claude");
|
||||||
assert_eq!(cfg.default_model, "claude-opus-4-8");
|
assert_eq!(cfg.default_model, "claude-opus-5");
|
||||||
|
|
||||||
// Claude model roles registered.
|
// Claude model roles registered.
|
||||||
assert!(cfg.model_roles.contains_key("claude-opus-4-8"));
|
assert!(cfg.model_roles.contains_key("claude-opus-5"));
|
||||||
assert!(cfg.model_roles.contains_key("claude-sonnet-5"));
|
assert!(cfg.model_roles.contains_key("claude-sonnet-5"));
|
||||||
assert!(cfg.model_roles.contains_key("claude-haiku-4-5"));
|
assert!(cfg.model_roles.contains_key("claude-haiku-4-5"));
|
||||||
}
|
}
|
||||||
@@ -223,10 +223,10 @@ mod tests {
|
|||||||
apply_claude_provider(
|
apply_claude_provider(
|
||||||
&mut cfg,
|
&mut cfg,
|
||||||
claude_provider("https://9router.example/v1", Some("sk-new")),
|
claude_provider("https://9router.example/v1", Some("sk-new")),
|
||||||
Some("claude-opus-4-8".to_string()),
|
Some("claude-opus-5".to_string()),
|
||||||
);
|
);
|
||||||
assert_eq!(cfg.default_model, "claude-opus-4-8");
|
assert_eq!(cfg.default_model, "claude-opus-5");
|
||||||
assert!(cfg.model_roles.contains_key("claude-opus-4-8"));
|
assert!(cfg.model_roles.contains_key("claude-opus-5"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -15,6 +15,13 @@ impl InfrastructureToolExecutor {
|
|||||||
tools: all_tools(),
|
tools: all_tools(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether a tool is read-only and safe to execute concurrently with
|
||||||
|
/// other parallel-safe tools. Delegates to the registry so the main
|
||||||
|
/// turn loop and subagent engine share one source of truth.
|
||||||
|
pub fn is_parallel_safe(tool_name: &str) -> bool {
|
||||||
|
crate::tools::tool_is_parallel_safe(tool_name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ToolExecutor for InfrastructureToolExecutor {
|
impl ToolExecutor for InfrastructureToolExecutor {
|
||||||
@@ -37,4 +44,8 @@ impl ToolExecutor for InfrastructureToolExecutor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_parallel_safe(&self, tool_name: &str) -> bool {
|
||||||
|
Self::is_parallel_safe(tool_name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ pub mod workflow;
|
|||||||
// like `crate::tools::{Tool, ToolCtx}` continue to work.
|
// like `crate::tools::{Tool, ToolCtx}` continue to work.
|
||||||
pub use context::{ToolCtx, ToolCtxBuilder};
|
pub use context::{ToolCtx, ToolCtxBuilder};
|
||||||
pub use graduated::{check_graduated_checks, GraduatedCheck};
|
pub use graduated::{check_graduated_checks, GraduatedCheck};
|
||||||
pub use registry::{all_tools, tool_defs, tool_is_risky};
|
pub use registry::{all_tools, tool_defs, tool_is_parallel_safe, tool_is_risky};
|
||||||
pub use util::{arg_str, execute_cmd, log_write_edit_tool, resolve_path};
|
pub use util::{arg_str, execute_cmd, log_write_edit_tool, resolve_path};
|
||||||
|
|
||||||
/// Common interface every agent-invocable tool implements.
|
/// Common interface every agent-invocable tool implements.
|
||||||
|
|||||||
@@ -52,6 +52,34 @@ pub fn tool_is_risky(name: &str) -> bool {
|
|||||||
matches!(name, "write" | "delete" | "edit" | "bash" | "git_operator")
|
matches!(name, "write" | "delete" | "edit" | "bash" | "git_operator")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether a tool by name is read-only and therefore safe to run *in
|
||||||
|
/// parallel* with other tool calls within the same assistant message.
|
||||||
|
///
|
||||||
|
/// Read-only tools only inspect the workspace (read files, grep, glob,
|
||||||
|
/// semantic search, list symbols, recall memory, web search, directory
|
||||||
|
/// listing). They have no side effects, so concurrent execution cannot
|
||||||
|
/// create data races or conflicting writes.
|
||||||
|
///
|
||||||
|
/// Everything else (edits, writes, deletes, shell, git, planning, memory
|
||||||
|
/// writes, agent/spawn orchestration) stays sequential to preserve
|
||||||
|
/// correctness.
|
||||||
|
pub fn tool_is_parallel_safe(name: &str) -> bool {
|
||||||
|
matches!(
|
||||||
|
name,
|
||||||
|
"read"
|
||||||
|
| "grep"
|
||||||
|
| "glob"
|
||||||
|
| "semantic_search"
|
||||||
|
| "list_symbols"
|
||||||
|
| "web_search"
|
||||||
|
| "recall"
|
||||||
|
| "dir_list"
|
||||||
|
| "pong"
|
||||||
|
| "seq_think"
|
||||||
|
| "dir_cache_update"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
/// Convert a list of tools into provider-facing `ToolDef` request schema.
|
/// Convert a list of tools into provider-facing `ToolDef` request schema.
|
||||||
pub fn tool_defs(tools: &[Box<dyn super::Tool>]) -> Vec<zesdex_domain::core::ToolDef> {
|
pub fn tool_defs(tools: &[Box<dyn super::Tool>]) -> Vec<zesdex_domain::core::ToolDef> {
|
||||||
tools
|
tools
|
||||||
@@ -66,3 +94,59 @@ pub fn tool_defs(tools: &[Box<dyn super::Tool>]) -> Vec<zesdex_domain::core::Too
|
|||||||
})
|
})
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn read_only_tools_are_parallel_safe() {
|
||||||
|
for name in [
|
||||||
|
"read",
|
||||||
|
"grep",
|
||||||
|
"glob",
|
||||||
|
"semantic_search",
|
||||||
|
"list_symbols",
|
||||||
|
"web_search",
|
||||||
|
"recall",
|
||||||
|
"dir_list",
|
||||||
|
"pong",
|
||||||
|
"seq_think",
|
||||||
|
"dir_cache_update",
|
||||||
|
] {
|
||||||
|
assert!(
|
||||||
|
tool_is_parallel_safe(name),
|
||||||
|
"{name} should be parallel-safe"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mutating_and_shell_tools_are_not_parallel_safe() {
|
||||||
|
for name in [
|
||||||
|
"edit",
|
||||||
|
"write",
|
||||||
|
"delete",
|
||||||
|
"bash",
|
||||||
|
"git_operator",
|
||||||
|
"git_worktree",
|
||||||
|
"remember",
|
||||||
|
"forget",
|
||||||
|
"todowrite",
|
||||||
|
"todofinish",
|
||||||
|
"plan_enter",
|
||||||
|
"plan_ready",
|
||||||
|
"workflow_run",
|
||||||
|
"hive_mind",
|
||||||
|
"spawn_agents",
|
||||||
|
"spawn_pipeline",
|
||||||
|
"parallel_delegate",
|
||||||
|
"explore_codebase",
|
||||||
|
] {
|
||||||
|
assert!(
|
||||||
|
!tool_is_parallel_safe(name),
|
||||||
|
"{name} should NOT be parallel-safe"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -316,13 +316,13 @@ fn handle_submit_input(state: &mut AppStateRest, text: String) {
|
|||||||
in_flight: std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
in_flight: std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||||
abort: state.abort_flag.clone(),
|
abort: state.abort_flag.clone(),
|
||||||
api_key: api_key.clone(),
|
api_key: api_key.clone(),
|
||||||
model: state.settings.model.clone(),
|
model: zesdex_domain::cms::resolve_effective_model(&state.settings, &state.app_config),
|
||||||
api_base: provider_cfg.as_ref().map(|cfg| cfg.api_base.clone()),
|
api_base: provider_cfg.as_ref().map(|cfg| cfg.api_base.clone()),
|
||||||
};
|
};
|
||||||
|
|
||||||
let client = std::sync::Arc::new(zesdex_infrastructure::llm::provider::LlmClient::new(
|
let client = std::sync::Arc::new(zesdex_infrastructure::llm::provider::LlmClient::new(
|
||||||
api_key,
|
api_key,
|
||||||
state.settings.model.clone(),
|
zesdex_domain::cms::resolve_effective_model(&state.settings, &state.app_config),
|
||||||
provider_cfg.map(|cfg| cfg.api_base.clone()),
|
provider_cfg.map(|cfg| cfg.api_base.clone()),
|
||||||
));
|
));
|
||||||
|
|
||||||
@@ -465,7 +465,7 @@ fn handle_compact(state: &mut AppStateRest) {
|
|||||||
.get(provider_name)
|
.get(provider_name)
|
||||||
.cloned()
|
.cloned()
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
let model = state.settings.model.clone();
|
let model = zesdex_domain::cms::resolve_effective_model(&state.settings, &state.app_config);
|
||||||
let api_base = provider_cfg.map(|cfg| cfg.api_base.clone());
|
let api_base = provider_cfg.map(|cfg| cfg.api_base.clone());
|
||||||
|
|
||||||
let client = zesdex_infrastructure::llm::provider::LlmClient::new(api_key, model, api_base);
|
let client = zesdex_infrastructure::llm::provider::LlmClient::new(api_key, model, api_base);
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ pub fn spawn_agent_turn(state: &mut AppStateRest, text: String) {
|
|||||||
// ── Resolve provider configuration ─────────────────────────────────
|
// ── Resolve provider configuration ─────────────────────────────────
|
||||||
let provider_name = &state.settings.provider;
|
let provider_name = &state.settings.provider;
|
||||||
let api_key = resolve_api_key(state, provider_name);
|
let api_key = resolve_api_key(state, provider_name);
|
||||||
let model = state.settings.model.clone();
|
let model = zesdex_domain::cms::resolve_effective_model(&state.settings, &state.app_config);
|
||||||
let api_base = resolve_api_base(state, provider_name);
|
let api_base = resolve_api_base(state, provider_name);
|
||||||
|
|
||||||
// ── Build message list ─────────────────────────────────────────────
|
// ── Build message list ─────────────────────────────────────────────
|
||||||
|
|||||||
Reference in New Issue
Block a user