ai-workspace-services/opencode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix(mcp): type tool error content"

Browse Source 
This reverts commit 9258e8ca86.
This commit is contained in:
adamelmore 2026-06-16 12:06:26 +02:00
parent a98d5732c0
commit 3a2ff11be8
No known key found for this signature in database
GPG Key ID: 9CB48779AF150E75
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/opencode/src/mcp/catalog.ts
View File

@ -65,7 +65,13 @@ export function convertTool(mcpTool: MCPToolDef, client: Client, timeout?: numbe
onprogress: () => {},
},
)
if (result.isError) throw new Error(formatToolErrorContent(result.content))
if (result.isError)
throw new Error(
result.content
.flatMap((item) => (item.type === "text" ? [item.text] : []))
.filter((text) => text.trim())
.join("\n\n") || "MCP tool returned an error",
)
if (result.structuredContent === undefined || result.structuredContent === null) return result
return {
...result,
@ -103,22 +109,6 @@ export function fetch<T extends { name: string }>(
export const sanitize = (value: string) => value.replace(/[^a-zA-Z0-9_-]/g, "_")
function formatToolErrorContent(content: unknown) {
if (!Array.isArray(content)) return "MCP tool returned an error"
return (
content
.flatMap((item) => (isTextContent(item) ? [item.text] : []))
.filter((text) => text.trim())
.join("\n\n") || "MCP tool returned an error"
)
}
function isTextContent(value: unknown): value is { type: "text"; text: string } {
if (typeof value !== "object" || value === null) return false
const item = value as Record<string, unknown>
return item.type === "text" && typeof item.text === "string"
}
export function prompts(client: Client, timeout?: number) {
if (!client.getServerCapabilities()?.prompts) return Promise.resolve([])
return paginate(