Dark-Alex-17/coyote
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: additional edge case fix for duplicate tool call IDs in anthropic API calls
CI / All (ubuntu-latest) (push) Failing after 27s
Details
CI / All (macos-latest) (push) Has been cancelled
Details
CI / All (windows-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dark-Alex-17
2026-08-06 10:30:33 -06:00
parent e606eb7c49
commit d429def0f6
1 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/claude.rs
+89 -41
View File
@@ -329,51 +329,99 @@ pub fn claude_build_chat_completions_body(
})] })]
} }
MessageContent::ToolCalls(MessageContentToolCalls { MessageContent::ToolCalls(MessageContentToolCalls {
tool_results, text, .. tool_results,
text,
sequence,
}) => { }) => {
let mut assistant_parts = vec![]; if !sequence {
let mut user_parts = vec![]; let mut assistant_parts = vec![];
for (index, tool_result) in tool_results.iter().enumerate() { let mut user_parts = vec![];
for block in &tool_result.thinking { for (index, tool_result) in tool_results.iter().enumerate() {
assistant_parts.push(json!(block)); for block in &tool_result.thinking {
} assistant_parts.push(json!(block));
let round_text = if index == 0 && !text.is_empty() {
Some(text.as_str())
} else {
tool_result.text.as_deref()
};
if let Some(round_text) = round_text {
let round_text = strip_think_tag(round_text);
let round_text = round_text.trim();
if !round_text.is_empty() {
assistant_parts.push(json!({
"type": "text",
"text": round_text,
}))
} }
let round_text = if index == 0 && !text.is_empty() {
Some(text.as_str())
} else {
tool_result.text.as_deref()
};
if let Some(round_text) = round_text {
let round_text = strip_think_tag(round_text);
let round_text = round_text.trim();
if !round_text.is_empty() {
assistant_parts.push(json!({
"type": "text",
"text": round_text,
}))
}
}
assistant_parts.push(json!({
"type": "tool_use",
"id": tool_result.call.id,
"name": tool_result.call.name,
"input": tool_result.call.arguments,
}));
user_parts.push(json!({
"type": "tool_result",
"tool_use_id": tool_result.call.id,
"content": tool_result.output.to_string(),
}));
} }
assistant_parts.push(json!({ vec![
"type": "tool_use", json!({ "role": "assistant", "content": assistant_parts }),
"id": tool_result.call.id, json!({ "role": "user", "content": user_parts }),
"name": tool_result.call.name, ]
"input": tool_result.call.arguments, } else {
})); // One pair per round: Claude can reuse tool_use IDs across API calls.
user_parts.push(json!({ let mut messages = vec![];
"type": "tool_result", let mut assistant_parts: Vec<serde_json::Value> = vec![];
"tool_use_id": tool_result.call.id, let mut user_parts: Vec<serde_json::Value> = vec![];
"content": tool_result.output.to_string(), for (index, tool_result) in tool_results.iter().enumerate() {
})); if index > 0 && tool_result.text.is_some() {
messages.push(
json!({ "role": "assistant", "content": assistant_parts }),
);
messages.push(json!({ "role": "user", "content": user_parts }));
assistant_parts = vec![];
user_parts = vec![];
}
for block in &tool_result.thinking {
assistant_parts.push(json!(block));
}
let round_text = if index == 0 && !text.is_empty() {
Some(text.as_str())
} else {
tool_result.text.as_deref()
};
if let Some(round_text) = round_text {
let round_text = strip_think_tag(round_text);
let round_text = round_text.trim();
if !round_text.is_empty() {
assistant_parts.push(json!({
"type": "text",
"text": round_text,
}))
}
}
assistant_parts.push(json!({
"type": "tool_use",
"id": tool_result.call.id,
"name": tool_result.call.name,
"input": tool_result.call.arguments,
}));
user_parts.push(json!({
"type": "tool_result",
"tool_use_id": tool_result.call.id,
"content": tool_result.output.to_string(),
}));
}
if !assistant_parts.is_empty() {
messages
.push(json!({ "role": "assistant", "content": assistant_parts }));
messages.push(json!({ "role": "user", "content": user_parts }));
}
messages
} }
vec![
json!({
"role": "assistant",
"content": assistant_parts,
}),
json!({
"role": "user",
"content": user_parts,
}),
]
} }
} }
}) })