vrr/opencode
2
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-05-23 12:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

fix: msg tool issue

Browse source
This commit is contained in:
Aiden Cline 2026-04-15 14:27:46 -05:00
parent c4d804fb48
commit f0a12b549c
3 changed files with 84 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/opencode/src/provider/transform.ts
View file

@ -75,7 +75,7 @@ export namespace ProviderTransform {
if (model.api.id.includes("claude")) {
const scrub = (id: string) => id.replace(/[^a-zA-Z0-9_-]/g, "_")
return msgs.map((msg) => {
msgs = msgs.map((msg) => {
if (msg.role === "assistant" && Array.isArray(msg.content)) {
return {
...msg,
@ -101,6 +101,20 @@ export namespace ProviderTransform {
return msg
})
}
if (model.api.npm === "@ai-sdk/anthropic") {
msgs = msgs.flatMap((msg) => {
if (msg.role !== "assistant" || !Array.isArray(msg.content)) return [msg]
const parts = msg.content
const first = parts.findIndex((part) => part.type === "tool-call")
if (first === -1) return [msg]
if (!parts.slice(first).some((part) => part.type !== "tool-call")) return [msg]
return [
{ ...msg, content: parts.filter((part) => part.type !== "tool-call") },
{ ...msg, content: parts.filter((part) => part.type === "tool-call") },
]
})
}
if (
model.providerID === "mistral" ||
model.api.id.toLowerCase().includes("mistral") ||

66
packages/opencode/test/provider/transform.test.ts
View file

@ -1271,6 +1271,72 @@ describe("ProviderTransform.message - anthropic empty content filtering", () =>
expect(result[0].content).toBe("")
expect(result[1].content).toHaveLength(1)
})
test("splits anthropic assistant messages when text trails tool calls", () => {
const msgs = [
{
role: "user",
content: [{ type: "text", text: "Check my home directory for PDFs" }],
},
{
role: "assistant",
content: [
{ type: "tool-call", toolCallId: "toolu_1", toolName: "read", input: { filePath: "/root" } },
{ type: "tool-call", toolCallId: "toolu_2", toolName: "glob", input: { pattern: "**/*.pdf" } },
{ type: "text", text: "I checked your home directory and looked for PDF files." },
],
},
{
role: "tool",
content: [
{ type: "tool-result", toolCallId: "toolu_1", toolName: "read", output: { type: "text", value: "ok" } },
{
type: "tool-result",
toolCallId: "toolu_2",
toolName: "glob",
output: { type: "text", value: "No files found" },
},
],
},
] as any[]
const result = ProviderTransform.message(msgs, anthropicModel, {}) as any[]
expect(result).toHaveLength(4)
expect(result[1]).toMatchObject({
role: "assistant",
content: [{ type: "text", text: "I checked your home directory and looked for PDF files." }],
})
expect(result[2]).toMatchObject({
role: "assistant",
content: [
{ type: "tool-call", toolCallId: "toolu_1", toolName: "read", input: { filePath: "/root" } },
{ type: "tool-call", toolCallId: "toolu_2", toolName: "glob", input: { pattern: "**/*.pdf" } },
],
})
})
test("leaves valid anthropic assistant tool ordering unchanged", () => {
const msgs = [
{
role: "assistant",
content: [
{ type: "text", text: "I checked your home directory and looked for PDF files." },
{ type: "tool-call", toolCallId: "toolu_1", toolName: "read", input: { filePath: "/root" } },
{ type: "tool-call", toolCallId: "toolu_2", toolName: "glob", input: { pattern: "**/*.pdf" } },
],
},
] as any[]
const result = ProviderTransform.message(msgs, anthropicModel, {}) as any[]
expect(result).toHaveLength(1)
expect(result[0].content).toMatchObject([
{ type: "text", text: "I checked your home directory and looked for PDF files." },
{ type: "tool-call", toolCallId: "toolu_1", toolName: "read", input: { filePath: "/root" } },
{ type: "tool-call", toolCallId: "toolu_2", toolName: "glob", input: { pattern: "**/*.pdf" } },
])
})
})
describe("ProviderTransform.message - strip openai metadata when store=false", () => {

6
packages/opencode/test/session/llm.test.ts
View file

@ -1131,9 +1131,6 @@ describe("session.llm.stream", () => {
{
type: "text",
text: "I checked your home directory and looked for PDF files.",
cache_control: {
type: "ephemeral",
},
},
{
type: "tool_use",
@ -1146,6 +1143,9 @@ describe("session.llm.stream", () => {
id: "toolu_01APxrADs7VozN8uWzw9WwHr",
name: "glob",
input: { pattern: "**/*.pdf", path: "/root" },
cache_control: {
type: "ephemeral",
},
},
],
},