Skip to content

Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors

Rust

fix(opencode): route Zen Claude models to Messages

Lucas Oliveiraf755182b16c5
diff --git a/crates/ai-memory-llm/src/anthropic.rs b/crates/ai-memory-llm/src/anthropic.rs
index 3e52f35e..f9b14bfd 100644
--- a/crates/ai-memory-llm/src/anthropic.rs
+++ b/crates/ai-memory-llm/src/anthropic.rs
@@ -3,6 +3,7 @@
use std::time::Duration;
use async_trait::async_trait;
+use reqwest::header::{HeaderName, HeaderValue};
use secrecy::{ExposeSecret, SecretString};
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};
@@ -11,7 +12,9 @@ use tracing::debug;
use crate::error::{LlmError, LlmResult};
use crate::provider::LlmProvider;
use crate::response::{provider_error_body, response_json_limited};
-use crate::types::{ChatRequest, ChatResponse, ExtraHeaders, ReasoningEffort, Usage};
+use crate::types::{
+ ChatRequest, ChatResponse, ExtraHeaders, LlmOperationId, ReasoningEffort, Usage,
+};
/// Default Anthropic API base.
pub const DEFAULT_BASE_URL: &str = "https://api.anthropic.com";
@@ -48,6 +51,13 @@ pub struct AnthropicProvider {
timeout: Duration,
reasoning_effort: Option<ReasoningEffort>,
extra_headers: ExtraHeaders,
+ client_headers: Option<ClientHeaders>,
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct ClientHeaders {
+ user_agent: &'static str,
+ operation_id: &'static str,
}
impl AnthropicProvider {
@@ -66,6 +76,7 @@ impl AnthropicProvider {
timeout: Duration::from_secs(crate::DEFAULT_REQUEST_TIMEOUT_SECS),
reasoning_effort: None,
extra_headers: ExtraHeaders::default(),
+ client_headers: None,
})
}
@@ -88,6 +99,7 @@ impl AnthropicProvider {
timeout: Duration::from_secs(crate::DEFAULT_REQUEST_TIMEOUT_SECS),
reasoning_effort: None,
extra_headers: ExtraHeaders::default(),
+ client_headers: None,
})
}
@@ -122,6 +134,19 @@ impl AnthropicProvider {
self.extra_headers = headers;
self
}
+
+ #[must_use]
+ pub(crate) fn with_client_headers(
+ mut self,
+ user_agent: &'static str,
+ operation_id: &'static str,
+ ) -> Self {
+ self.client_headers = Some(ClientHeaders {
+ user_agent,
+ operation_id,
+ });
+ self
+ }
}
#[derive(Debug, Serialize)]
@@ -206,8 +231,17 @@ impl LlmProvider for AnthropicProvider {
}
async fn complete(&self, request: ChatRequest) -> LlmResult<ChatResponse> {
+ self.complete_with_operation_id(request, LlmOperationId::new())
+ .await
+ }
+
+ async fn complete_with_operation_id(
+ &self,
+ request: ChatRequest,
+ operation_id: LlmOperationId,
+ ) -> LlmResult<ChatResponse> {
let body = self.build_request(&request, None);
- let response: AnthropicResponse = self.post(&body).await?;
+ let response: AnthropicResponse = self.post(&body, operation_id).await?;
let text = response
.content
.iter()
@@ -231,9 +265,19 @@ impl LlmProvider for AnthropicProvider {
&self,
request: ChatRequest,
schema: serde_json::Value,
+ ) -> LlmResult<serde_json::Value> {
+ self.complete_structured_raw_with_operation_id(request, schema, LlmOperationId::new())
+ .await
+ }
+
+ async fn complete_structured_raw_with_operation_id(
+ &self,
+ request: ChatRequest,
+ schema: serde_json::Value,
+ operation_id: LlmOperationId,
) -> LlmResult<serde_json::Value> {
let body = self.build_request(&request, Some(schema));
- let response: AnthropicResponse = self.post(&body).await?;
+ let response: AnthropicResponse = self.post(&body, operation_id).await?;
for c in response.content {
if let AnthropicContent::ToolUse { input, .. } = c {
return Ok(input);
@@ -298,7 +342,11 @@ impl AnthropicProvider {
}
}
- async fn post<B: Serialize, R: DeserializeOwned>(&self, body: &B) -> LlmResult<R> {
+ async fn post<B: Serialize, R: DeserializeOwned>(
+ &self,
+ body: &B,
+ operation_id: LlmOperationId,
+ ) -> LlmResult<R> {
let url = format!("{}/v1/messages", self.base_url.trim_end_matches('/'));
debug!(url, "POST anthropic");
let mut builder = self
@@ -312,7 +360,20 @@ impl AnthropicProvider {
for (name, value) in self.auth_headers() {
builder = builder.header(name, value);
}
- let resp = self.extra_headers.apply(builder).json(body).send().await?;
+ let mut headers = self.extra_headers.clone();
+ if let Some(client_headers) = self.client_headers {
+ headers.set_default(
+ HeaderName::from_static("user-agent"),
+ HeaderValue::from_static(client_headers.user_agent),
+ );
+ headers.set_default(
+ HeaderName::from_static(client_headers.operation_id),
+ HeaderValue::from_str(&operation_id.to_string()).map_err(|error| {
+ LlmError::UnexpectedShape(format!("invalid operation ID header: {error}"))
+ })?,
+ );
+ }
+ let resp = headers.apply(builder).json(body).send().await?;
let status = resp.status();
if !status.is_success() {
let body = provider_error_body(resp).await;
diff --git a/crates/ai-memory-llm/src/opencode.rs b/crates/ai-memory-llm/src/opencode.rs
index 1afdb941..b42a7cca 100644
--- a/crates/ai-memory-llm/src/opencode.rs
+++ b/crates/ai-memory-llm/src/opencode.rs
@@ -80,7 +80,8 @@ impl OpenCodeProvider {
)?),
OpenCodeApi::AnthropicMessages => OpenCodeTransport::AnthropicMessages(
AnthropicProvider::new(api_key, model)?
- .with_base_url(anthropic_base_url(&base_url)),
+ .with_base_url(anthropic_base_url(&base_url))
+ .with_client_headers(crate::DEFAULT_USER_AGENT, OPENCODE_SESSION_HEADER),
),
OpenCodeApi::ChatCompletions => OpenCodeTransport::ChatCompletions(
OpenAiCompatProvider::new(base_url, Some(api_key), model)?
@@ -219,7 +220,11 @@ impl LlmProvider for OpenCodeProvider {
OpenCodeTransport::Responses(provider) => {
provider.complete(request, operation_id).await
}
- OpenCodeTransport::AnthropicMessages(provider) => provider.complete(request).await,
+ OpenCodeTransport::AnthropicMessages(provider) => {
+ provider
+ .complete_with_operation_id(request, operation_id)
+ .await
+ }
}
}
@@ -250,7 +255,9 @@ impl LlmProvider for OpenCodeProvider {
.await
}
OpenCodeTransport::AnthropicMessages(provider) => {
- provider.complete_structured_raw(request, schema).await
+ provider
+ .complete_structured_raw_with_operation_id(request, schema, operation_id)
+ .await
}
}
}
@@ -322,18 +329,18 @@ const RESPONSES_MODELS: &[&str] = &[
];
const ANTHROPIC_MESSAGES_MODELS: &[&str] = &[
- "claude-fable-5.1",
+ "claude-fable-5-1",
"claude-fable-5",
- "claude-opus-5.5",
+ "claude-opus-5-5",
"claude-opus-5",
- "claude-opus-4.8",
- "claude-opus-4.7",
- "claude-opus-4.6",
- "claude-opus-4.5",
+ "claude-opus-4-8",
+ "claude-opus-4-7",
+ "claude-opus-4-6",
+ "claude-opus-4-5",
"claude-sonnet-5",
- "claude-sonnet-4.6",
- "claude-sonnet-4.5",
- "claude-haiku-4.5",
+ "claude-sonnet-4-6",
+ "claude-sonnet-4-5",
+ "claude-haiku-4-5",
"qwen3.8-flash",
"qwen3.7-max",
"qwen3.7-plus",
@@ -601,7 +608,7 @@ mod tests {
fn anthropic_response_with_content(content: &str) -> serde_json::Value {
json!({
- "model": "claude-sonnet-4.6",
+ "model": "claude-sonnet-4-6",
"content": [{ "type": "text", "text": content }],
"usage": { "input_tokens": 1, "output_tokens": 1 },
})
@@ -671,6 +678,16 @@ mod tests {
}
}
+ #[test]
+ fn default_model_selects_anthropic_messages_transport() {
+ let provider =
+ OpenCodeProvider::new(SecretString::from("sk-test"), OPENCODE_DEFAULT_MODEL).unwrap();
+ assert!(matches!(
+ provider.transport,
+ OpenCodeTransport::AnthropicMessages(_)
+ ));
+ }
+
#[test]
fn chat_completions_models_keep_the_existing_transport() {
let provider =
@@ -759,12 +776,13 @@ mod tests {
let provider = OpenCodeProvider::new_with_base_url(
SecretString::from("sk-test"),
- "claude-sonnet-4.6",
+ "claude-sonnet-4-6",
format!("{}/zen/v1", server.uri()),
)
.unwrap();
+ let operation_id = LlmOperationId::new();
let response = provider
- .complete(ChatRequest::user_prompt("hello"))
+ .complete_with_operation_id(ChatRequest::user_prompt("hello"), operation_id)
.await
.unwrap();
@@ -772,6 +790,14 @@ mod tests {
let requests = server.received_requests().await.unwrap();
assert_eq!(requests.len(), 1);
assert_eq!(header_value(&requests[0], "x-api-key"), Some("sk-test"));
+ assert_eq!(
+ header_value(&requests[0], "user-agent"),
+ Some(crate::DEFAULT_USER_AGENT)
+ );
+ assert_eq!(
+ header_value(&requests[0], OPENCODE_SESSION_HEADER),
+ Some(operation_id.to_string().as_str())
+ );
}
#[tokio::test]