fix: improve XML auto-fix with malformed quote pattern

- Fix ="..." pattern where " was used as delimiter instead of actual quotes - Common in dashPattern attributes like dashPattern="1 1;"
refactor: extract XML validation/fix helpers and add constants
2026-01-02 22:32:27 +08:00 · 2025-12-13 20:52:44 +09:00 · 2025-12-13 16:31:50 +09:00
4 changed files with 123 additions and 98 deletions
--- a/app/api/chat/route.ts
+++ b/app/api/chat/route.ts
@@ -95,6 +95,35 @@ function replaceHistoricalToolInputs(messages: any[]): any[] {
    })
 }

+// Helper function to fix tool call inputs for Bedrock API
+// Bedrock requires toolUse.input to be a JSON object, not a string
+function fixToolCallInputs(messages: any[]): any[] {
+    return messages.map((msg) => {
+        if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
+            return msg
+        }
+        const fixedContent = msg.content.map((part: any) => {
+            if (part.type === "tool-call") {
+                if (typeof part.input === "string") {
+                    try {
+                        const parsed = JSON.parse(part.input)
+                        return { ...part, input: parsed }
+                    } catch {
+                        // If parsing fails, wrap the string in an object
+                        return { ...part, input: { rawInput: part.input } }
+                    }
+                }
+                // Input is already an object, but verify it's not null/undefined
+                if (part.input === null || part.input === undefined) {
+                    return { ...part, input: {} }
+                }
+            }
+            return part
+        })
+        return { ...msg, content: fixedContent }
+    })
+}
+
 // Helper function to create cached stream response
 function createCachedStreamResponse(xml: string): Response {
    const toolCallId = `cached-${Date.now()}`
@@ -157,9 +186,9 @@ async function handleChatRequest(req: Request): Promise<Response> {
            : undefined

    // Extract user input text for Langfuse trace
-    const lastMessage = messages[messages.length - 1]
+    const currentMessage = messages[messages.length - 1]
    const userInputText =
-        lastMessage?.parts?.find((p: any) => p.type === "text")?.text || ""
+        currentMessage?.parts?.find((p: any) => p.type === "text")?.text || ""

    // Update Langfuse trace with input, session, and user
    setTraceInput({
@@ -213,6 +242,12 @@ async function handleChatRequest(req: Request): Promise<Response> {
    // Get the appropriate system prompt based on model (extended for Opus/Haiku 4.5)
    const systemMessage = getSystemPrompt(modelId)

+    const lastMessage = messages[messages.length - 1]
+
+    // Extract text from the last message parts
+    const lastMessageText =
+        lastMessage.parts?.find((part: any) => part.type === "text")?.text || ""
+
    // Extract file parts (images) from the last message
    const fileParts =
        lastMessage.parts?.filter((part: any) => part.type === "file") || []
@@ -220,19 +255,22 @@ async function handleChatRequest(req: Request): Promise<Response> {
    // User input only - XML is now in a separate cached system message
    const formattedUserInput = `User input:
 """md
-${userInputText}
+${lastMessageText}
 """`

    // Convert UIMessages to ModelMessages and add system message
    const modelMessages = convertToModelMessages(messages)

+    // Fix tool call inputs for Bedrock API (requires JSON objects, not strings)
+    const fixedMessages = fixToolCallInputs(modelMessages)
+
    // Replace historical tool call XML with placeholders to reduce tokens
    // Disabled by default - some models (e.g. minimax) copy placeholders instead of generating XML
    const enableHistoryReplace =
        process.env.ENABLE_HISTORY_XML_REPLACE === "true"
    const placeholderMessages = enableHistoryReplace
-        ? replaceHistoricalToolInputs(modelMessages)
-        : modelMessages
+        ? replaceHistoricalToolInputs(fixedMessages)
+        : fixedMessages

    // Filter out messages with empty content arrays (Bedrock API rejects these)
    // This is a safety measure - ideally convertToModelMessages should handle all cases
@@ -316,9 +354,6 @@ ${userInputText}

    const result = streamText({
        model,
-        ...(process.env.MAX_OUTPUT_TOKENS && {
-            maxOutputTokens: parseInt(process.env.MAX_OUTPUT_TOKENS, 10),
-        }),
        stopWhen: stepCountIs(5),
        messages: allMessages,
        ...(providerOptions && { providerOptions }), // This now includes all reasoning configs
@@ -330,6 +365,32 @@ ${userInputText}
                userId,
            }),
        }),
+        // Repair malformed tool calls (model sometimes generates invalid JSON with unescaped quotes)
+        experimental_repairToolCall: async ({ toolCall }) => {
+            // The toolCall.input contains the raw JSON string that failed to parse
+            const rawJson =
+                typeof toolCall.input === "string" ? toolCall.input : null
+
+            if (rawJson) {
+                try {
+                    // Fix unescaped quotes: x="520" should be x=\"520\"
+                    const fixed = rawJson.replace(
+                        /([a-zA-Z])="(\d+)"/g,
+                        '$1=\\"$2\\"',
+                    )
+                    const parsed = JSON.parse(fixed)
+                    return {
+                        type: "tool-call" as const,
+                        toolCallId: toolCall.toolCallId,
+                        toolName: toolCall.toolName,
+                        input: JSON.stringify(parsed),
+                    }
+                } catch {
+                    // Repair failed, return null
+                }
+            }
+            return null
+        },
        onFinish: ({ text, usage }) => {
            // Pass usage to Langfuse (Bedrock streaming doesn't auto-report tokens to telemetry)
            setTraceOutput(text, {
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -63,7 +63,7 @@ interface ChatPanelProps {
 // Constants for tool states
 const TOOL_ERROR_STATE = "output-error" as const
 const DEBUG = process.env.NODE_ENV === "development"
-const MAX_AUTO_RETRY_COUNT = 1
+const MAX_AUTO_RETRY_COUNT = 3

 /**
 * Check if auto-resubmit should happen based on tool errors.
@@ -1023,7 +1023,6 @@ Please retry with an adjusted search pattern or use display_diagram if retries a
                    style: {
                        maxWidth: "480px",
                    },
-                    duration: 2000,
                }}
            />
            {/* Header */}
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
            "version": "0.4.0",
            "license": "Apache-2.0",
            "dependencies": {
-                "@ai-sdk/amazon-bedrock": "^3.0.70",
+                "@ai-sdk/amazon-bedrock": "^3.0.62",
                "@ai-sdk/anthropic": "^2.0.44",
                "@ai-sdk/azure": "^2.0.69",
                "@ai-sdk/deepseek": "^1.0.30",
@@ -77,14 +77,14 @@
            }
        },
        "node_modules/@ai-sdk/amazon-bedrock": {
-            "version": "3.0.70",
-            "resolved": "https://registry.npmjs.org/@ai-sdk/amazon-bedrock/-/amazon-bedrock-3.0.70.tgz",
-            "integrity": "sha512-4NIBlwuS/iLKq2ynOqqyJ9imk/oyHuOzhBx88Bfm5I0ihQPKJ0dMMD1IKKuyDZvLRYKmlOEpa//P+/ZBp10drw==",
+            "version": "3.0.62",
+            "resolved": "https://registry.npmjs.org/@ai-sdk/amazon-bedrock/-/amazon-bedrock-3.0.62.tgz",
+            "integrity": "sha512-vVtndaj5zfHmgw8NSqN4baFDbFDTBZP6qufhKfqSNLtygEm8+8PL9XQX9urgzSzU3zp+zi3AmNNemvKLkkqblg==",
            "license": "Apache-2.0",
            "dependencies": {
-                "@ai-sdk/anthropic": "2.0.56",
+                "@ai-sdk/anthropic": "2.0.50",
                "@ai-sdk/provider": "2.0.0",
-                "@ai-sdk/provider-utils": "3.0.19",
+                "@ai-sdk/provider-utils": "3.0.18",
                "@smithy/eventstream-codec": "^4.0.1",
                "@smithy/util-utf8": "^4.0.0",
                "aws4fetch": "^1.0.20"
@@ -96,48 +96,14 @@
                "zod": "^3.25.76 || ^4.1.8"
            }
        },
-        "node_modules/@ai-sdk/amazon-bedrock/node_modules/@ai-sdk/provider-utils": {
-            "version": "3.0.19",
-            "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-3.0.19.tgz",
-            "integrity": "sha512-W41Wc9/jbUVXVwCN/7bWa4IKe8MtxO3EyA0Hfhx6grnmiYlCvpI8neSYWFE0zScXJkgA/YK3BRybzgyiXuu6JA==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@ai-sdk/provider": "2.0.0",
-                "@standard-schema/spec": "^1.0.0",
-                "eventsource-parser": "^3.0.6"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "peerDependencies": {
-                "zod": "^3.25.76 || ^4.1.8"
-            }
-        },
        "node_modules/@ai-sdk/anthropic": {
-            "version": "2.0.56",
-            "resolved": "https://registry.npmjs.org/@ai-sdk/anthropic/-/anthropic-2.0.56.tgz",
-            "integrity": "sha512-XHJKu0Yvfu9SPzRfsAFESa+9T7f2YJY6TxykKMfRsAwpeWAiX/Gbx5J5uM15AzYC3Rw8tVP3oH+j7jEivENirQ==",
+            "version": "2.0.50",
+            "resolved": "https://registry.npmjs.org/@ai-sdk/anthropic/-/anthropic-2.0.50.tgz",
+            "integrity": "sha512-21PaHfoLmouOXXNINTsZJsMw+wE5oLR2He/1kq/sKokTVKyq7ObGT1LDk6ahwxaz/GoaNaGankMh+EgVcdv2Cw==",
            "license": "Apache-2.0",
            "dependencies": {
                "@ai-sdk/provider": "2.0.0",
-                "@ai-sdk/provider-utils": "3.0.19"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "peerDependencies": {
-                "zod": "^3.25.76 || ^4.1.8"
-            }
-        },
-        "node_modules/@ai-sdk/anthropic/node_modules/@ai-sdk/provider-utils": {
-            "version": "3.0.19",
-            "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-3.0.19.tgz",
-            "integrity": "sha512-W41Wc9/jbUVXVwCN/7bWa4IKe8MtxO3EyA0Hfhx6grnmiYlCvpI8neSYWFE0zScXJkgA/YK3BRybzgyiXuu6JA==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@ai-sdk/provider": "2.0.0",
-                "@standard-schema/spec": "^1.0.0",
-                "eventsource-parser": "^3.0.6"
+                "@ai-sdk/provider-utils": "3.0.18"
            },
            "engines": {
                "node": ">=18"
@@ -2522,9 +2488,9 @@
            }
        },
        "node_modules/@next/env": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/env/-/env-16.0.10.tgz",
-            "integrity": "sha512-8tuaQkyDVgeONQ1MeT9Mkk8pQmZapMKFh5B+OrFUlG3rVmYTXcXlBetBgTurKXGaIZvkoqRT9JL5K3phXcgang==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/env/-/env-16.0.7.tgz",
+            "integrity": "sha512-gpaNgUh5nftFKRkRQGnVi5dpcYSKGcZZkQffZ172OrG/XkrnS7UBTQ648YY+8ME92cC4IojpI2LqTC8sTDhAaw==",
            "license": "MIT"
        },
        "node_modules/@next/eslint-plugin-next": {
@@ -2538,9 +2504,9 @@
            }
        },
        "node_modules/@next/swc-darwin-arm64": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.0.10.tgz",
-            "integrity": "sha512-4XgdKtdVsaflErz+B5XeG0T5PeXKDdruDf3CRpnhN+8UebNa5N2H58+3GDgpn/9GBurrQ1uWW768FfscwYkJRg==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.0.7.tgz",
+            "integrity": "sha512-LlDtCYOEj/rfSnEn/Idi+j1QKHxY9BJFmxx7108A6D8K0SB+bNgfYQATPk/4LqOl4C0Wo3LACg2ie6s7xqMpJg==",
            "cpu": [
                "arm64"
            ],
@@ -2554,9 +2520,9 @@
            }
        },
        "node_modules/@next/swc-darwin-x64": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.0.10.tgz",
-            "integrity": "sha512-spbEObMvRKkQ3CkYVOME+ocPDFo5UqHb8EMTS78/0mQ+O1nqE8toHJVioZo4TvebATxgA8XMTHHrScPrn68OGw==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.0.7.tgz",
+            "integrity": "sha512-rtZ7BhnVvO1ICf3QzfW9H3aPz7GhBrnSIMZyr4Qy6boXF0b5E3QLs+cvJmg3PsTCG2M1PBoC+DANUi4wCOKXpA==",
            "cpu": [
                "x64"
            ],
@@ -2570,9 +2536,9 @@
            }
        },
        "node_modules/@next/swc-linux-arm64-gnu": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.0.10.tgz",
-            "integrity": "sha512-uQtWE3X0iGB8apTIskOMi2w/MKONrPOUCi5yLO+v3O8Mb5c7K4Q5KD1jvTpTF5gJKa3VH/ijKjKUq9O9UhwOYw==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.0.7.tgz",
+            "integrity": "sha512-mloD5WcPIeIeeZqAIP5c2kdaTa6StwP4/2EGy1mUw8HiexSHGK/jcM7lFuS3u3i2zn+xH9+wXJs6njO7VrAqww==",
            "cpu": [
                "arm64"
            ],
@@ -2586,9 +2552,9 @@
            }
        },
        "node_modules/@next/swc-linux-arm64-musl": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.0.10.tgz",
-            "integrity": "sha512-llA+hiDTrYvyWI21Z0L1GiXwjQaanPVQQwru5peOgtooeJ8qx3tlqRV2P7uH2pKQaUfHxI/WVarvI5oYgGxaTw==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.0.7.tgz",
+            "integrity": "sha512-+ksWNrZrthisXuo9gd1XnjHRowCbMtl/YgMpbRvFeDEqEBd523YHPWpBuDjomod88U8Xliw5DHhekBC3EOOd9g==",
            "cpu": [
                "arm64"
            ],
@@ -2602,9 +2568,9 @@
            }
        },
        "node_modules/@next/swc-linux-x64-gnu": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.0.10.tgz",
-            "integrity": "sha512-AK2q5H0+a9nsXbeZ3FZdMtbtu9jxW4R/NgzZ6+lrTm3d6Zb7jYrWcgjcpM1k8uuqlSy4xIyPR2YiuUr+wXsavA==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.0.7.tgz",
+            "integrity": "sha512-4WtJU5cRDxpEE44Ana2Xro1284hnyVpBb62lIpU5k85D8xXxatT+rXxBgPkc7C1XwkZMWpK5rXLXTh9PFipWsA==",
            "cpu": [
                "x64"
            ],
@@ -2618,9 +2584,9 @@
            }
        },
        "node_modules/@next/swc-linux-x64-musl": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.0.10.tgz",
-            "integrity": "sha512-1TDG9PDKivNw5550S111gsO4RGennLVl9cipPhtkXIFVwo31YZ73nEbLjNC8qG3SgTz/QZyYyaFYMeY4BKZR/g==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.0.7.tgz",
+            "integrity": "sha512-HYlhqIP6kBPXalW2dbMTSuB4+8fe+j9juyxwfMwCe9kQPPeiyFn7NMjNfoFOfJ2eXkeQsoUGXg+O2SE3m4Qg2w==",
            "cpu": [
                "x64"
            ],
@@ -2634,9 +2600,9 @@
            }
        },
        "node_modules/@next/swc-win32-arm64-msvc": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.0.10.tgz",
-            "integrity": "sha512-aEZIS4Hh32xdJQbHz121pyuVZniSNoqDVx1yIr2hy+ZwJGipeqnMZBJHyMxv2tiuAXGx6/xpTcQJ6btIiBjgmg==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.0.7.tgz",
+            "integrity": "sha512-EviG+43iOoBRZg9deGauXExjRphhuYmIOJ12b9sAPy0eQ6iwcPxfED2asb/s2/yiLYOdm37kPaiZu8uXSYPs0Q==",
            "cpu": [
                "arm64"
            ],
@@ -2650,9 +2616,9 @@
            }
        },
        "node_modules/@next/swc-win32-x64-msvc": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.0.10.tgz",
-            "integrity": "sha512-E+njfCoFLb01RAFEnGZn6ERoOqhK1Gl3Lfz1Kjnj0Ulfu7oJbuMyvBKNj/bw8XZnenHDASlygTjZICQW+rYW1Q==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.0.7.tgz",
+            "integrity": "sha512-gniPjy55zp5Eg0896qSrf3yB1dw4F/3s8VK1ephdsZZ129j2n6e1WqCbE2YgcKhW9hPB9TVZENugquWJD5x0ug==",
            "cpu": [
                "x64"
            ],
@@ -8012,15 +7978,14 @@
            }
        },
        "node_modules/form-data": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+            "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
            "license": "MIT",
            "dependencies": {
                "asynckit": "^0.4.0",
                "combined-stream": "^1.0.8",
                "es-set-tostringtag": "^2.1.0",
-                "hasown": "^2.0.2",
                "mime-types": "^2.1.12"
            },
            "engines": {
@@ -10672,12 +10637,12 @@
            "license": "MIT"
        },
        "node_modules/next": {
-            "version": "16.0.10",
-            "resolved": "https://registry.npmjs.org/next/-/next-16.0.10.tgz",
-            "integrity": "sha512-RtWh5PUgI+vxlV3HdR+IfWA1UUHu0+Ram/JBO4vWB54cVPentCD0e+lxyAYEsDTqGGMg7qpjhKh6dc6aW7W/sA==",
+            "version": "16.0.7",
+            "resolved": "https://registry.npmjs.org/next/-/next-16.0.7.tgz",
+            "integrity": "sha512-3mBRJyPxT4LOxAJI6IsXeFtKfiJUbjCLgvXO02fV8Wy/lIhPvP94Fe7dGhUgHXcQy4sSuYwQNcOLhIfOm0rL0A==",
            "license": "MIT",
            "dependencies": {
-                "@next/env": "16.0.10",
+                "@next/env": "16.0.7",
                "@swc/helpers": "0.5.15",
                "caniuse-lite": "^1.0.30001579",
                "postcss": "8.4.31",
@@ -10690,14 +10655,14 @@
                "node": ">=20.9.0"
            },
            "optionalDependencies": {
-                "@next/swc-darwin-arm64": "16.0.10",
-                "@next/swc-darwin-x64": "16.0.10",
-                "@next/swc-linux-arm64-gnu": "16.0.10",
-                "@next/swc-linux-arm64-musl": "16.0.10",
-                "@next/swc-linux-x64-gnu": "16.0.10",
-                "@next/swc-linux-x64-musl": "16.0.10",
-                "@next/swc-win32-arm64-msvc": "16.0.10",
-                "@next/swc-win32-x64-msvc": "16.0.10",
+                "@next/swc-darwin-arm64": "16.0.7",
+                "@next/swc-darwin-x64": "16.0.7",
+                "@next/swc-linux-arm64-gnu": "16.0.7",
+                "@next/swc-linux-arm64-musl": "16.0.7",
+                "@next/swc-linux-x64-gnu": "16.0.7",
+                "@next/swc-linux-x64-musl": "16.0.7",
+                "@next/swc-win32-arm64-msvc": "16.0.7",
+                "@next/swc-win32-x64-msvc": "16.0.7",
                "sharp": "^0.34.4"
            },
            "peerDependencies": {
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
        "prepare": "husky"
    },
    "dependencies": {
-        "@ai-sdk/amazon-bedrock": "^3.0.70",
+        "@ai-sdk/amazon-bedrock": "^3.0.62",
        "@ai-sdk/anthropic": "^2.0.44",
        "@ai-sdk/azure": "^2.0.69",
        "@ai-sdk/deepseek": "^1.0.30",