Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

add hosted Grok X search

Raine Virta7ad36f7c405b
diff --git a/README.md b/README.md
index ffca6c1..df8a6b5 100644
--- a/README.md
+++ b/README.md
@@ -358,6 +358,9 @@ Supported model ids are `grok-composer-2.5-fast` and `grok-4.5`. Model access
can vary by account and region. The proxy translates Claude Code messages,
function tools, tool results, thinking, token counts, and streaming events.
Grok reasoning text appears in Claude Code as Anthropic `thinking` blocks.
+Claude Code's `WebSearch` uses Grok's hosted general web search. Requests to
+search X use Grok's hosted `x_search` tool, with citations and search usage
+reported in Claude Code.
Authentication uses browser OAuth with S256 PKCE through `auth.x.ai` and an
ephemeral loopback callback. The proxy stores its own access and refresh tokens,
diff --git a/src/providers/grok/translate/accumulate.rs b/src/providers/grok/translate/accumulate.rs
index 0c59929..ff6549c 100644
--- a/src/providers/grok/translate/accumulate.rs
+++ b/src/providers/grok/translate/accumulate.rs
@@ -51,6 +51,7 @@ pub fn accumulate_response_with_traffic(
let mut input = 0;
let mut output = 0;
let mut web_search_requests = 0;
+ let mut x_search_requests = 0;
let reduced = match reduce_upstream_bytes(upstream) {
Ok(events) => events,
Err(error) => {
@@ -128,16 +129,17 @@ pub fn accumulate_response_with_traffic(
block.as_object_mut().unwrap().remove("_args");
}
}
- ReducerEvent::WebSearch {
+ ReducerEvent::HostedSearch {
index,
result_index,
id,
+ name,
query,
} => {
block_positions.insert(index, blocks.len());
- blocks.push(serde_json::json!({"type":"server_tool_use","id":id,"name":"web_search","input":{"query":query}}));
+ blocks.push(serde_json::json!({"type":"server_tool_use","id":id,"name":name,"input":{"query":query}}));
block_positions.insert(result_index, blocks.len());
- blocks.push(serde_json::json!({"type":"web_search_tool_result","tool_use_id":id,"content":[]}));
+ blocks.push(serde_json::json!({"type":format!("{name}_tool_result"),"tool_use_id":id,"content":[]}));
}
ReducerEvent::Citation(index, annotation) => {
if let Some(block) = block_positions
@@ -161,17 +163,20 @@ pub fn accumulate_response_with_traffic(
stop_reason,
input_tokens,
output_tokens,
- web_search_requests: requests,
+ web_search_requests: web_requests,
+ x_search_requests: x_requests,
} => {
stop = stop_reason;
input = input_tokens;
output = output_tokens;
- web_search_requests = requests;
+ web_search_requests = web_requests;
+ x_search_requests = x_requests;
}
_ => {}
}
}
- let response = serde_json::json!({"id":message_id,"type":"message","role":"assistant","model":model,"content":blocks,"stop_reason":stop,"stop_sequence":null,"usage":{"input_tokens":input,"output_tokens":output,"server_tool_use":{"web_search_requests":web_search_requests}}});
+ let hosted_search_requests = web_search_requests + x_search_requests;
+ let response = serde_json::json!({"id":message_id,"type":"message","role":"assistant","model":model,"content":blocks,"stop_reason":stop,"stop_sequence":null,"usage":{"input_tokens":input,"output_tokens":output,"server_tool_use":{"web_search_requests":hosted_search_requests,"x_search_requests":x_search_requests}}});
if let Some(mut capture) = capture {
capture.downstream_event("response", response.clone());
finish_capture(Some(capture), traffic, "completed");
diff --git a/src/providers/grok/translate/reducer.rs b/src/providers/grok/translate/reducer.rs
index 394c16f..ff8677c 100644
--- a/src/providers/grok/translate/reducer.rs
+++ b/src/providers/grok/translate/reducer.rs
@@ -18,10 +18,11 @@ pub enum ReducerEvent {
ToolStart(usize, String, String),
ToolDelta(usize, String),
ToolStop(usize),
- WebSearch {
+ HostedSearch {
index: usize,
result_index: usize,
id: String,
+ name: String,
query: String,
},
Citation(usize, Value),
@@ -30,6 +31,7 @@ pub enum ReducerEvent {
input_tokens: u64,
output_tokens: u64,
web_search_requests: u64,
+ x_search_requests: u64,
},
}
@@ -41,7 +43,9 @@ pub struct Reducer {
item_calls: HashMap<String, String>,
tool_args: HashMap<String, String>,
completed_arguments: HashMap<String, bool>,
+ hosted_calls: HashMap<String, (String, String)>,
web_search_requests: u64,
+ x_search_requests: u64,
saw_tool: bool,
completed: bool,
}
@@ -68,8 +72,26 @@ impl Reducer {
.and_then(Value::as_str)
.ok_or_else(|| anyhow::anyhow!("reasoning delta is invalid"))?,
),
- "response.custom_tool_call_input.delta"
- | "response.custom_tool_call_input.done"
+ "response.custom_tool_call_input.delta" => {
+ let id = value
+ .get("item_id")
+ .and_then(Value::as_str)
+ .ok_or_else(|| anyhow::anyhow!("custom tool delta lacks item id"))?;
+ let delta = value
+ .get("delta")
+ .and_then(Value::as_str)
+ .ok_or_else(|| anyhow::anyhow!("custom tool delta is invalid"))?;
+ let (_, input) = self
+ .hosted_calls
+ .get_mut(id)
+ .ok_or_else(|| anyhow::anyhow!("custom tool delta is out of order"))?;
+ if input.len().saturating_add(delta.len()) > MAX_TOOL_ARGUMENT_BYTES {
+ anyhow::bail!("custom tool input exceeds the size limit");
+ }
+ input.push_str(delta);
+ Ok(vec![])
+ }
+ "response.custom_tool_call_input.done"
| "response.web_search_call.in_progress"
| "response.web_search_call.searching"
| "response.web_search_call.completed" => Ok(vec![]),
@@ -100,7 +122,26 @@ impl Reducer {
.get("item")
.and_then(Value::as_object)
.ok_or_else(|| anyhow::anyhow!("output item is invalid"))?;
- if item.get("type").and_then(Value::as_str) == Some("function_call") {
+ if item.get("type").and_then(Value::as_str) == Some("custom_tool_call") {
+ let id = item
+ .get("id")
+ .and_then(Value::as_str)
+ .filter(|id| !id.is_empty())
+ .ok_or_else(|| anyhow::anyhow!("custom tool call id is invalid"))?;
+ let name = item
+ .get("name")
+ .and_then(Value::as_str)
+ .filter(|name| !name.is_empty())
+ .unwrap_or("x_search");
+ let name = if name.starts_with("x_") {
+ "x_search"
+ } else {
+ name
+ };
+ self.hosted_calls
+ .insert(id.into(), (name.into(), String::new()));
+ Ok(vec![])
+ } else if item.get("type").and_then(Value::as_str) == Some("function_call") {
let id = item
.get("call_id")
.and_then(Value::as_str)
@@ -224,14 +265,56 @@ impl Reducer {
let result_index = index + 1;
self.next_index += 2;
self.web_search_requests += 1;
- out.push(ReducerEvent::WebSearch {
+ out.push(ReducerEvent::HostedSearch {
index,
result_index,
id: format!("srvtoolu_{id}"),
+ name: "web_search".into(),
query: query.into(),
});
Ok(out)
}
+ Some("custom_tool_call") => {
+ let id = item
+ .get("id")
+ .and_then(Value::as_str)
+ .filter(|id| !id.is_empty())
+ .ok_or_else(|| anyhow::anyhow!("completed custom tool lacks id"))?;
+ let (name, input) = self.hosted_calls.remove(id).unwrap_or_else(|| {
+ (
+ item.get("name")
+ .and_then(Value::as_str)
+ .unwrap_or("x_search")
+ .into(),
+ String::new(),
+ )
+ });
+ if name != "x_search" {
+ return Ok(vec![]);
+ }
+ let query = serde_json::from_str::<Value>(&input)
+ .ok()
+ .and_then(|input| {
+ input
+ .get("query")
+ .and_then(Value::as_str)
+ .map(str::to_string)
+ })
+ .unwrap_or_default();
+ let mut out = self.close_active()?;
+ let index = self.next_index;
+ let result_index = index + 1;
+ self.next_index += 2;
+ self.x_search_requests += 1;
+ out.push(ReducerEvent::HostedSearch {
+ index,
+ result_index,
+ id: format!("srvtoolu_{id}"),
+ name,
+ query,
+ });
+ Ok(out)
+ }
Some("function_call") => {
let id = item.get("call_id").and_then(Value::as_str).ok_or_else(|| {
anyhow::anyhow!("completed function call lacks call id")
@@ -275,6 +358,7 @@ impl Reducer {
input_tokens: input,
output_tokens: output,
web_search_requests: self.web_search_requests,
+ x_search_requests: self.x_search_requests,
});
Ok(out)
}
@@ -384,14 +468,20 @@ mod tests {
#[test]
fn grok_reducer_accepts_hosted_search_lifecycle() {
- let input = b"data: {\"type\":\"response.output_item.added\",\"item\":{\"type\":\"custom_tool_call\",\"id\":\"search_1\"}}\n\ndata: {\"type\":\"response.custom_tool_call_input.delta\",\"item_id\":\"search_1\",\"delta\":\"{\\\"query\\\":\\\"test\\\"}\"}\n\ndata: {\"type\":\"response.custom_tool_call_input.done\",\"item_id\":\"search_1\"}\n\ndata: {\"type\":\"response.output_item.done\",\"item\":{\"type\":\"custom_tool_call\",\"id\":\"search_1\"}}\n\ndata: {\"type\":\"response.output_text.annotation.added\",\"annotation\":{\"type\":\"url_citation\"}}\n\ndata: {\"type\":\"response.output_text.delta\",\"delta\":\"result\"}\n\ndata: {\"type\":\"response.output_text.done\"}\n\ndata: {\"type\":\"response.completed\",\"response\":{\"usage\":{}}}\n\n";
+ let input = b"data: {\"type\":\"response.output_item.added\",\"item\":{\"type\":\"custom_tool_call\",\"name\":\"x_keyword_search\",\"id\":\"search_1\"}}\n\ndata: {\"type\":\"response.custom_tool_call_input.delta\",\"item_id\":\"search_1\",\"delta\":\"{\\\"query\\\":\\\"test\\\"}\"}\n\ndata: {\"type\":\"response.custom_tool_call_input.done\",\"item_id\":\"search_1\"}\n\ndata: {\"type\":\"response.output_item.done\",\"item\":{\"type\":\"custom_tool_call\",\"name\":\"x_keyword_search\",\"id\":\"search_1\"}}\n\ndata: {\"type\":\"response.output_text.annotation.added\",\"annotation\":{\"type\":\"url_citation\"}}\n\ndata: {\"type\":\"response.output_text.delta\",\"delta\":\"result\"}\n\ndata: {\"type\":\"response.output_text.done\"}\n\ndata: {\"type\":\"response.completed\",\"response\":{\"usage\":{}}}\n\n";
let events = reduce_upstream_bytes(input).unwrap();
- assert!(
- events
- .iter()
- .any(|event| matches!(event, ReducerEvent::TextDelta(_, text) if text == "result"))
- );
- assert!(matches!(events.last(), Some(ReducerEvent::Finish { .. })));
+ assert!(events.iter().any(|event| matches!(
+ event,
+ ReducerEvent::HostedSearch { name, query, .. }
+ if name == "x_search" && query == "test"
+ )));
+ assert!(matches!(
+ events.last(),
+ Some(ReducerEvent::Finish {
+ x_search_requests: 1,
+ ..
+ })
+ ));
}
#[test]
diff --git a/src/providers/grok/translate/request.rs b/src/providers/grok/translate/request.rs
index 311e88e..c928bf4 100644
--- a/src/providers/grok/translate/request.rs
+++ b/src/providers/grok/translate/request.rs
@@ -58,6 +58,42 @@ pub struct GrokTool {
pub description: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub parameters: Option<Value>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub allowed_x_handles: Option<Vec<String>>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub excluded_x_handles: Option<Vec<String>>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub from_date: Option<String>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub to_date: Option<String>,
+}
+
+impl GrokTool {
+ fn hosted(kind: &str) -> Self {
+ Self {
+ kind: kind.into(),
+ name: None,
+ description: None,
+ parameters: None,
+ allowed_x_handles: None,
+ excluded_x_handles: None,
+ from_date: None,
+ to_date: None,
+ }
+ }
+
+ fn function(name: &str, description: Option<String>, parameters: Value) -> Self {
+ Self {
+ kind: "function".into(),
+ name: Some(name.into()),
+ description,
+ parameters: Some(parameters),
+ allowed_x_handles: None,
+ excluded_x_handles: None,
+ from_date: None,
+ to_date: None,
+ }
+ }
}
#[derive(Debug, Clone, Serialize)]
@@ -76,26 +112,36 @@ pub fn translate_request(
reject_unknown_top_level(req)?;
let mut instructions = parse_system(req.extra.get("system"))?;
let mut tools = parse_tools(req.extra.get("tools"))?;
- let hosted_search = tools
+ let hosted_web_search = tools
.as_ref()
.is_some_and(|tools| tools.iter().any(|tool| tool.kind == "web_search"));
- let force_hosted_search = hosted_search && requests_web_search(req);
- if force_hosted_search {
- tools = Some(vec![GrokTool {
- kind: "web_search".into(),
- name: None,
- description: None,
- parameters: None,
- }]);
+ let dedicated_x_search = tools
+ .as_ref()
+ .is_some_and(|tools| tools.iter().any(|tool| tool.kind == "x_search"));
+ let x_search_intent = requests_x_search(req);
+ let force_x_search = dedicated_x_search || x_search_intent;
+ let force_web_search = !force_x_search && hosted_web_search && requests_web_search(req);
+ if force_x_search {
+ tools = Some(vec![GrokTool::hosted("x_search")]);
+ } else if force_web_search {
+ tools = Some(vec![GrokTool::hosted("web_search")]);
+ } else {
+ let tools = tools.get_or_insert_default();
+ if !tools.iter().any(|tool| tool.kind == "x_search") {
+ tools.push(GrokTool::hosted("x_search"));
+ }
}
- if hosted_search {
- let guidance = "For general web searches, use the hosted web_search tool. Do not use shell commands, HTTP clients, or local tools to search the web.";
- instructions = Some(match instructions {
- Some(existing) if !existing.is_empty() => format!("{existing}\n\n{guidance}"),
- _ => guidance.into(),
- });
+ if hosted_web_search {
+ append_guidance(
+ &mut instructions,
+ "For general web searches, use the hosted web_search tool. Do not use shell commands, HTTP clients, or local tools to search the web.",
+ );
}
- let tool_choice = if force_hosted_search {
+ append_guidance(
+ &mut instructions,
+ "For requests to search X or Twitter, use the hosted x_search tool. XSearch accepts a query and supports allowed_x_handles, excluded_x_handles, from_date, and to_date filters. Do not use Bash, curl, HTTP clients, or general web_search for X searches.",
+ );
+ let tool_choice = if force_x_search || force_web_search {
Some(GrokToolChoice::Required("required".into()))
} else {
parse_tool_choice(req.extra.get("tool_choice"), tools.as_ref())?
@@ -117,25 +163,56 @@ pub fn translate_request(
})
}
-fn requests_web_search(req: &MessagesRequest) -> bool {
- let Some(message) = req
+fn append_guidance(instructions: &mut Option<String>, guidance: &str) {
+ *instructions = Some(match instructions.take() {
+ Some(existing) if !existing.is_empty() => format!("{existing}\n\n{guidance}"),
+ _ => guidance.into(),
+ });
+}
+
+fn latest_user_text(req: &MessagesRequest) -> Option<String> {
+ let message = req
.messages
.iter()
.rev()
- .find(|message| message.role == "user")
- else {
+ .find(|message| message.role == "user")?;
+ match &message.content {
+ Value::String(text) => Some(text.to_ascii_lowercase()),
+ Value::Array(blocks) => Some(
+ blocks
+ .iter()
+ .filter_map(|block| block.get("text").and_then(Value::as_str))
+ .collect::<Vec<_>>()
+ .join(" ")
+ .to_ascii_lowercase(),
+ ),
+ _ => None,
+ }
+}
+
+fn requests_x_search(req: &MessagesRequest) -> bool {
+ let Some(text) = latest_user_text(req) else {
return false;
};
- let text = match &message.content {
- Value::String(text) => text.clone(),
- Value::Array(blocks) => blocks
- .iter()
- .filter_map(|block| block.get("text").and_then(Value::as_str))
- .collect::<Vec<_>>()
- .join(" "),
- _ => return false,
+ [
+ "search x for",
+ "search on x",
+ "search twitter",
+ "search tweets",
+ "x search",
+ "posts on x",
+ "posts from x",
+ "tweets about",
+ "twitter posts",
+ ]
+ .iter()
+ .any(|phrase| text.contains(phrase))
+}
+
+fn requests_web_search(req: &MessagesRequest) -> bool {
+ let Some(text) = latest_user_text(req) else {
+ return false;
};
- let text = text.to_ascii_lowercase();
[
"search online",
"search the web",
@@ -226,12 +303,11 @@ fn parse_tools(value: Option<&Value>) -> anyhow::Result<Option<Vec<GrokTool>>> {
anyhow::bail!("duplicate tool name");
}
if name == "WebSearch" {
- out.push(GrokTool {
- kind: "web_search".into(),
- name: None,
- description: None,
- parameters: None,
- });
+ out.push(GrokTool::hosted("web_search"));
+ continue;
+ }
+ if name == "XSearch" {
+ out.push(GrokTool::hosted("x_search"));
continue;
}
let parameters = obj
@@ -239,15 +315,13 @@ fn parse_tools(value: Option<&Value>) -> anyhow::Result<Option<Vec<GrokTool>>> {
.filter(|value| value.is_object())
.cloned()
.ok_or_else(|| anyhow::anyhow!("tool input_schema must be an object"))?;
- out.push(GrokTool {
- kind: "function".to_string(),
- name: Some(name.to_string()),
- description: obj
- .get("description")
+ out.push(GrokTool::function(
+ name,
+ obj.get("description")
.and_then(Value::as_str)
.map(str::to_string),
- parameters: Some(parameters),
- });
+ parameters,
+ ));
}
Ok(Some(out))
}
@@ -329,6 +403,14 @@ fn parse_message(
GrokContentPart::InputText { text: text.into() }
});
}
+ ("assistant", "server_tool_use") => {
+ let name = object.get("name").and_then(Value::as_str);
+ if !matches!(name, Some("web_search" | "x_search")) {
+ anyhow::bail!("unsupported server tool use");
+ }
+ }
+ ("assistant", "web_search_tool_result" | "x_search_tool_result")
+ | ("user", "web_search_tool_result" | "x_search_tool_result") => {}
("assistant", "tool_use") => {
if object
.keys()
@@ -451,6 +533,29 @@ fn flush_message(role: &str, content: &mut Vec<GrokContentPart>, out: &mut Vec<G
#[cfg(test)]
mod tests {
use super::*;
+ #[test]
+ fn grok_translation_replays_hosted_search_history() {
+ let request: MessagesRequest = serde_json::from_value(serde_json::json!({
+ "model":"grok-4.5",
+ "messages":[
+ {"role":"user","content":"search X for the project"},
+ {"role":"assistant","content":[
+ {"type":"server_tool_use","id":"srvtoolu_1","name":"x_search","input":{"query":"project"}},
+ {"type":"x_search_tool_result","tool_use_id":"srvtoolu_1","content":[]},
+ {"type":"text","text":"Found it"}
+ ]},
+ {"role":"user","content":"summarize it"}
+ ]
+ }))
+ .unwrap();
+ let translated = translate_request(&request, "grok-4.5".into()).unwrap();
+ let value = serde_json::to_value(translated).unwrap();
+ assert!(value["input"].as_array().unwrap().iter().any(|item| {
+ item["role"] == "assistant" && item["content"][0]["text"] == "Found it"
+ }));
+ assert!(!value.to_string().contains("srvtoolu_1"));
+ }
+
#[test]
fn grok_translation_maps_text_and_function_round_trip() {
let request: MessagesRequest = serde_json::from_value(serde_json::json!({
@@ -465,7 +570,7 @@ mod tests {
})).unwrap();
let value =
serde_json::to_value(translate_request(&request, "grok-4.5".into()).unwrap()).unwrap();
- assert_eq!(value["instructions"], "rules");
+ assert!(value["instructions"].as_str().unwrap().starts_with("rules"));
assert_eq!(value["input"][1]["type"], "function_call");
assert_eq!(value["input"][2]["type"], "function_call_output");
assert_eq!(value["tool_choice"]["type"], "function");
@@ -497,6 +602,58 @@ mod tests {
assert_eq!(translated["tool_choice"], "required");
}
+ #[test]
+ fn grok_translation_maps_x_intent_to_required_hosted_x_search() {
+ let request: MessagesRequest = serde_json::from_value(serde_json::json!({
+ "model":"grok-4.5",
+ "messages":[{"role":"user","content":"Search X for recent posts mentioning claude-code-proxy"}],
+ "tools":[
+ {"name":"Bash","description":"Run a command","input_schema":{"type":"object"}},
+ {"name":"WebSearch","description":"Search the web","input_schema":{"type":"object","properties":{"query":{"type":"string"}}}}
+ ]
+ }))
+ .unwrap();
+ let translated =
+ serde_json::to_value(translate_request(&request, "grok-4.5".into()).unwrap()).unwrap();
+ assert_eq!(
+ translated["tools"],
+ serde_json::json!([{"type":"x_search"}])
+ );
+ assert_eq!(translated["tool_choice"], "required");
+ assert!(!translated.to_string().contains("\"name\":\"Bash\""));
+ }
+
+ #[test]
+ fn grok_translation_maps_dedicated_xsearch_with_domain_schema() {
+ let request: MessagesRequest = serde_json::from_value(serde_json::json!({
+ "model":"grok-4.5",
+ "messages":[{"role":"user","content":"find relevant posts"}],
+ "tools":[{
+ "name":"XSearch",
+ "description":"Search X posts",
+ "input_schema":{
+ "type":"object",
+ "properties":{
+ "query":{"type":"string"},
+ "allowed_x_handles":{"type":"array","items":{"type":"string"}},
+ "excluded_x_handles":{"type":"array","items":{"type":"string"}},
+ "from_date":{"type":"string","format":"date"},
+ "to_date":{"type":"string","format":"date"}
+ },
+ "required":["query"]
+ }
+ }]
+ }))
+ .unwrap();
+ let translated =
+ serde_json::to_value(translate_request(&request, "grok-4.5".into()).unwrap()).unwrap();
+ assert_eq!(
+ translated["tools"],
+ serde_json::json!([{"type":"x_search"}])
+ );
+ assert_eq!(translated["tool_choice"], "required");
+ }
+
#[test]
fn grok_translation_accepts_claude_code_context_management() {
let request: MessagesRequest = serde_json::from_value(serde_json::json!({
@@ -527,7 +684,12 @@ mod tests {
})).unwrap();
let translated =
serde_json::to_value(translate_request(&request, "grok-4.5".into()).unwrap()).unwrap();
- assert_eq!(translated["instructions"], "rules");
+ assert!(
+ translated["instructions"]
+ .as_str()
+ .unwrap()
+ .starts_with("rules")
+ );
assert_eq!(translated["input"][0]["content"][0]["text"], "hello");
assert!(!translated.to_string().contains("cache_control"));
}
diff --git a/src/providers/grok/translate/stream.rs b/src/providers/grok/translate/stream.rs
index ad3d669..62d0034 100644
--- a/src/providers/grok/translate/stream.rs
+++ b/src/providers/grok/translate/stream.rs
@@ -152,7 +152,7 @@ impl StreamTranslator {
ReducerEvent::ThinkingStart(_)
| ReducerEvent::TextStart(_)
| ReducerEvent::ToolStart(_, _, _)
- | ReducerEvent::WebSearch { .. }
+ | ReducerEvent::HostedSearch { .. }
| ReducerEvent::Finish { .. }
)
{
@@ -241,16 +241,18 @@ fn render(out: &mut Vec<u8>, event: ReducerEvent) {
"content_block_delta",
serde_json::json!({"type":"content_block_delta","index":i,"delta":{"type":"input_json_delta","partial_json":t}}),
),
- ReducerEvent::WebSearch {
+ ReducerEvent::HostedSearch {
index,
result_index,
id,
+ name,
query,
} => {
+ let result_type = format!("{name}_tool_result");
emit(
out,
"content_block_start",
- serde_json::json!({"type":"content_block_start","index":index,"content_block":{"type":"server_tool_use","id":id,"name":"web_search","input":{}}}),
+ serde_json::json!({"type":"content_block_start","index":index,"content_block":{"type":"server_tool_use","id":id,"name":name,"input":{}}}),
);
emit(
out,
@@ -265,7 +267,7 @@ fn render(out: &mut Vec<u8>, event: ReducerEvent) {
emit(
out,
"content_block_start",
- serde_json::json!({"type":"content_block_start","index":result_index,"content_block":{"type":"web_search_tool_result","tool_use_id":id,"content":[]}}),
+ serde_json::json!({"type":"content_block_start","index":result_index,"content_block":{"type":result_type,"tool_use_id":id,"content":[]}}),
);
emit(
out,
@@ -290,12 +292,14 @@ fn render(out: &mut Vec<u8>, event: ReducerEvent) {
stop_reason,
output_tokens,
web_search_requests,
+ x_search_requests,
..
} => {
+ let hosted_search_requests = web_search_requests + x_search_requests;
emit(
out,
"message_delta",
- serde_json::json!({"type":"message_delta","delta":{"stop_reason":stop_reason,"stop_sequence":null},"usage":{"output_tokens":output_tokens,"server_tool_use":{"web_search_requests":web_search_requests}}}),
+ serde_json::json!({"type":"message_delta","delta":{"stop_reason":stop_reason,"stop_sequence":null},"usage":{"output_tokens":output_tokens,"server_tool_use":{"web_search_requests":hosted_search_requests,"x_search_requests":x_search_requests}}}),
);
emit(
out,
@@ -357,6 +361,19 @@ mod tests {
assert!(output.contains("\"web_search_requests\":1"));
}
+ #[test]
+ fn stream_translates_hosted_x_search_usage_and_citations() {
+ let input = b"data: {\"type\":\"response.output_item.added\",\"item\":{\"type\":\"custom_tool_call\",\"name\":\"x_search\",\"id\":\"xs_1\"}}\n\ndata: {\"type\":\"response.custom_tool_call_input.delta\",\"item_id\":\"xs_1\",\"delta\":\"{\\\"query\\\":\\\"claude-code-proxy\\\"}\"}\n\ndata: {\"type\":\"response.custom_tool_call_input.done\",\"item_id\":\"xs_1\"}\n\ndata: {\"type\":\"response.output_item.done\",\"item\":{\"type\":\"custom_tool_call\",\"name\":\"x_search\",\"id\":\"xs_1\"}}\n\ndata: {\"type\":\"response.output_text.delta\",\"delta\":\"Recent post\"}\n\ndata: {\"type\":\"response.output_text.annotation.added\",\"annotation\":{\"type\":\"url_citation\",\"url\":\"https://x.com/example/status/1\",\"title\":\"Example post\"}}\n\ndata: {\"type\":\"response.output_text.done\"}\n\ndata: {\"type\":\"response.completed\",\"response\":{\"usage\":{\"input_tokens\":4,\"output_tokens\":3}}}\n\n";
+ let output =
+ String::from_utf8(translate_stream_bytes(input, "msg_1", "grok-4.5").unwrap()).unwrap();
+ assert!(output.contains("\"name\":\"x_search\""));
+ assert!(output.contains("x_search_tool_result"));
+ assert!(output.contains("https://x.com/example/status/1"));
+ assert!(output.contains("\"web_search_requests\":1"));
+ assert!(output.contains("\"x_search_requests\":1"));
+ assert!(!output.contains("\"name\":\"Bash\""));
+ }
+
#[test]
fn live_translator_emits_first_event_before_upstream_completion() {
let mut translator = LiveStreamTranslator::new("msg_1".into(), "grok-4.5".into());