Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion bt-daemon/src/translate/opencode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ struct MessageInfo {
#[serde(default, rename = "modelID")]
model_id: Option<String>,
#[serde(default)]
variant: Option<String>,
#[serde(default)]
time: Option<MessageTime>,
#[serde(default)]
tokens: Option<MessageTokens>,
Expand Down Expand Up @@ -987,6 +989,11 @@ impl OpenCodeTranslator {
};
let provider = info.provider_id.as_deref().unwrap_or("unknown");
let model = info.model_id.as_deref().unwrap_or("unknown");
// Allowlist the selected OpenCode variant; do not copy arbitrary model options.
let mut metadata = json!({"model":model,"provider":provider,"message_id":mid});
if let Some(variant) = &info.variant {
metadata["variant"] = json!(variant);
}
vec![SpanOp::Insert(SpanRow {
span_id: ids::span_id(&self.daemon_session_id, &format!("llm:{sid}:{mid}")),
root_span_id: state.effective_root_span_id.clone(),
Expand All @@ -1011,7 +1018,7 @@ impl OpenCodeTranslator {
.or(Some(ts_ms)),
input: Some(Value::Array(input)),
output: Some(Value::Array(vec![assistant])),
metadata: Some(json!({"model":model,"provider":provider,"message_id":mid})),
metadata: Some(metadata),
metrics: Some(
json!({"prompt_tokens":prompt,"completion_tokens":completion,"tokens":prompt+completion+reasoning,"prompt_cached_tokens":cache_read,"prompt_cache_creation_tokens":cache_write,"reasoning_tokens":reasoning}),
),
Expand Down
7 changes: 6 additions & 1 deletion bt-daemon/tests/opencode_translator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fn opencode_builds_turn_llm_tool_and_closes_the_session() {
event(
"message.updated",
5,
json!({"properties":{"info":{"id":"m1","sessionID":"native","role":"assistant","providerID":"openai","modelID":"gpt-5","time":{"created":2,"completed":5},"tokens":{"input":5,"output":2,"reasoning":1,"cache":{"read":3,"write":4}}}}}),
json!({"properties":{"info":{"id":"m1","sessionID":"native","role":"assistant","providerID":"openai","modelID":"gpt-5","variant":"high","time":{"created":2,"completed":5},"tokens":{"input":5,"output":2,"reasoning":1,"cache":{"read":3,"write":4}}}}}),
),
event(
"tool.execute.after",
Expand Down Expand Up @@ -120,6 +120,7 @@ fn opencode_builds_turn_llm_tool_and_closes_the_session() {
.values()
.find(|r| r.span_type == SpanType::Llm)
.unwrap();
assert_eq!(llm.metadata.as_ref().unwrap()["variant"], "high");
assert_eq!(llm.metrics.as_ref().unwrap()["prompt_tokens"], 12);
assert_eq!(llm.output.as_ref().unwrap()[0]["content"], "world");
let tool = rows
Expand Down Expand Up @@ -260,6 +261,10 @@ fn opencode_idle_updates_a_resumable_session_root() {
.count();
assert_eq!(reopened_roots, 1);
let rows = reduce(ops);
assert!(rows
.values()
.filter(|row| row.span_type == SpanType::Llm)
.all(|row| row.metadata.as_ref().unwrap().get("variant").is_none()));
let root = rows.values().find(|row| row.name == "OpenCode").unwrap();
assert_eq!(root.metadata.as_ref().unwrap()["total_turns"], 2);
assert_eq!(root.end_ms, Some(13));
Expand Down
Loading