huskies: merge 1015
This commit is contained in:
@@ -384,8 +384,7 @@ pub(super) async fn run_agent_spawn(
|
||||
// passed to RuntimeContext for eager session recording (bug 967).
|
||||
let agent_model = config_clone
|
||||
.find_agent(&aname)
|
||||
.and_then(|a| a.model.clone())
|
||||
.unwrap_or_default();
|
||||
.and_then(|a| a.model.clone());
|
||||
|
||||
let run_result = match runtime_name {
|
||||
"claude-code" => {
|
||||
@@ -463,11 +462,15 @@ pub(super) async fn run_agent_spawn(
|
||||
&& let Some(agent) = agents.get(&key_clone)
|
||||
&& let Some(ref pr) = agent.project_root
|
||||
{
|
||||
let model = config_clone
|
||||
let model_for_record = config_clone
|
||||
.find_agent(&aname)
|
||||
.and_then(|a| a.model.clone());
|
||||
let record =
|
||||
crate::agents::token_usage::build_record(&sid, &aname, model, usage.clone());
|
||||
let record = crate::agents::token_usage::build_record(
|
||||
&sid,
|
||||
&aname,
|
||||
model_for_record,
|
||||
usage.clone(),
|
||||
);
|
||||
if let Err(e) = crate::agents::token_usage::append_record(pr, &record) {
|
||||
slog_error!(
|
||||
"[agents] Failed to persist token usage for \
|
||||
@@ -480,13 +483,13 @@ pub(super) async fn run_agent_spawn(
|
||||
if let Some(ref sess_id) = result.session_id {
|
||||
let model = config_clone
|
||||
.find_agent(&aname)
|
||||
.and_then(|a| a.model.clone())
|
||||
.unwrap_or_default();
|
||||
.and_then(|a| a.model.as_ref().map(|m| m.as_str()))
|
||||
.unwrap_or("");
|
||||
crate::agents::session_store::record_session(
|
||||
&project_root_clone,
|
||||
&sid,
|
||||
&aname,
|
||||
&model,
|
||||
model,
|
||||
sess_id,
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user