config: unify subconscious API resolution with the main chat path
Two parallel backend-resolution paths had drifted apart:
- Main chat: AppConfig::resolve_model() → a named BackendConfig in
AppConfig.backends
- Subconscious / oneshot / context_window(): four skip-serde
"cache" fields on Config (memory section) — api_base_url, api_key,
api_model, api_context_window — that used to be populated at
Config::try_load_shared time by walking memory.agent_model →
root.models[name] → root[backend_name]
When we renamed `models` to `backends` and collapsed ModelConfig into
BackendConfig, the latter chain started silently dereferencing
`root.get("models")` → None → no population. Subconscious agents fell
through the "API not configured" guard; context_window() started
returning 0 (since api_context_window default is u64's 0 now that we
don't populate it). It was only visibly working for the main chat.
Collapse to one path:
- Drop Config.agent_model (duplicate of AppConfig.default_backend)
- Drop Config.{api_base_url, api_key, api_model, api_context_window}
— no longer populated, no longer needed
- Drop default_context_window() — nobody reads the field anymore
- Drop the memory-side resolution block in try_load_shared()
- Subconscious (mind/unconscious.rs) and oneshot (agent/oneshot.rs)
now call load_app() + resolve_model(&app.default_backend) just like
the main chat does
- context_window() reads from config::app().backends[default_backend]
.context_window, defaulting to 128k only if the backend doesn't
specify one
Side effect: Kent's config file drops agent_model, api_reasoning,
journal_days, journal_max — all fields whose Rust counterparts are
now gone. (Figment tolerates unknown fields, so leaving them wouldn't
have broken anything, but they were lying about what's configurable.)
Co-Authored-By: Proof of Concept <poc@bcachefs.org>
This commit is contained in:
parent
28484a385b
commit
60de579305
4 changed files with 21 additions and 60 deletions
|
|
@ -275,17 +275,7 @@ pub async fn prepare_spawn(name: &str, mut auto: AutoAgent, wake: std::sync::Arc
|
|||
phase: s.phase.clone(),
|
||||
}).collect());
|
||||
|
||||
// Create standalone Agent — stored so UI can read context
|
||||
let config = crate::config::get();
|
||||
let base_url = config.api_base_url.as_deref().unwrap_or("");
|
||||
let api_key = config.api_key.as_deref().unwrap_or("");
|
||||
let model = config.api_model.as_deref().unwrap_or("");
|
||||
if base_url.is_empty() || model.is_empty() {
|
||||
dbglog!("[unconscious] API not configured");
|
||||
auto.steps = orig_steps;
|
||||
return Err(auto);
|
||||
}
|
||||
|
||||
// Create standalone Agent — stored so UI can read context.
|
||||
let cli = crate::user::CliArgs::default();
|
||||
let (app, _) = match crate::config::load_app(&cli) {
|
||||
Ok(r) => r,
|
||||
|
|
@ -295,9 +285,18 @@ pub async fn prepare_spawn(name: &str, mut auto: AutoAgent, wake: std::sync::Arc
|
|||
return Err(auto);
|
||||
}
|
||||
};
|
||||
let resolved = match app.resolve_model(&app.default_backend) {
|
||||
Ok(r) => r,
|
||||
Err(e) => {
|
||||
dbglog!("[unconscious] API not configured: {}", e);
|
||||
auto.steps = orig_steps;
|
||||
return Err(auto);
|
||||
}
|
||||
};
|
||||
|
||||
// Unconscious agents have self-contained prompts — no standard context.
|
||||
let client = crate::agent::api::ApiClient::new(base_url, api_key, model);
|
||||
let client = crate::agent::api::ApiClient::new(
|
||||
&resolved.api_base, &resolved.api_key, &resolved.model_id);
|
||||
let agent = crate::agent::Agent::new(
|
||||
client, Vec::new(),
|
||||
app, None,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue