Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ad04cf819 | ||
|
|
b46935c606 | ||
|
|
b28a5fe384 | ||
|
|
b66898ea28 | ||
|
|
9aca45cb65 |
@@ -1,3 +1,18 @@
|
|||||||
|
## [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
+11
-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,7 +4885,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zesdex-application"
|
name = "zesdex-application"
|
||||||
version = "1.19.1"
|
version = "1.19.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
@@ -4902,7 +4902,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 +4919,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 +4943,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 +4959,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 +4986,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 +5003,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 +5051,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 +5077,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 +5097,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.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["asepharyana <superaseph@gmail.com>"]
|
authors = ["asepharyana <superaseph@gmail.com>"]
|
||||||
|
|
||||||
|
|||||||
@@ -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]
|
||||||
|
|||||||
@@ -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