diff --git a/package.json b/package.json
index 8ff038bf..e9a997db 100644
--- a/package.json
+++ b/package.json
@@ -25,16 +25,16 @@
     "shiki:generate": "pnpm dlx tsx src/components/ui/code/codegen.ts && pnpm format:write"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^1.2.12",
-    "@ai-sdk/fal": "^0.1.12",
-    "@ai-sdk/fireworks": "^0.2.16",
-    "@ai-sdk/google": "^1.2.19",
-    "@ai-sdk/groq": "^1.2.9",
-    "@ai-sdk/luma": "^0.1.8",
-    "@ai-sdk/openai": "^1.3.22",
-    "@ai-sdk/perplexity": "^1.1.9",
-    "@ai-sdk/react": "^1.2.12",
-    "@ai-sdk/xai": "^1.2.16",
+    "@ai-sdk/anthropic": "^2.0.0",
+    "@ai-sdk/fal": "^1.0.3",
+    "@ai-sdk/fireworks": "^1.0.2",
+    "@ai-sdk/google": "^2.0.0",
+    "@ai-sdk/groq": "^2.0.0",
+    "@ai-sdk/luma": "^1.0.1",
+    "@ai-sdk/openai": "^2.0.0",
+    "@ai-sdk/perplexity": "^2.0.0",
+    "@ai-sdk/react": "^2.0.0",
+    "@ai-sdk/xai": "^2.0.0",
     "@auth/prisma-adapter": "^2.7.2",
     "@discordjs/rest": "^2.5.1",
     "@e2b/code-interpreter": "^1.5.1",
@@ -45,7 +45,7 @@
     "@llm-ui/react": "^0.13.3",
     "@modelcontextprotocol/sdk": "^1.12.0",
     "@notionhq/client": "^3.1.3",
-    "@openrouter/ai-sdk-provider": "^0.7.2",
+    "@openrouter/ai-sdk-provider": "^1.1.0",
     "@prisma/client": "^6.13.0",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.1.14",
@@ -76,7 +76,7 @@
     "@vercel/mcp-adapter": "^0.11.1",
     "@vercel/speed-insights": "^1.2.0",
     "@xyflow/react": "^12.8.2",
-    "ai": "^4.3.16",
+    "ai": "^5.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bc6e65cd..e46d4409 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,35 +9,35 @@ importers:
   .:
     dependencies:
       '@ai-sdk/anthropic':
-        specifier: ^1.2.12
-        version: 1.2.12(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.1(zod@3.25.56)
       '@ai-sdk/fal':
-        specifier: ^0.1.12
-        version: 0.1.12(zod@3.25.56)
+        specifier: ^1.0.3
+        version: 1.0.3(zod@3.25.56)
       '@ai-sdk/fireworks':
-        specifier: ^0.2.16
-        version: 0.2.16(zod@3.25.56)
+        specifier: ^1.0.2
+        version: 1.0.2(zod@3.25.56)
       '@ai-sdk/google':
-        specifier: ^1.2.19
-        version: 1.2.19(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.3(zod@3.25.56)
       '@ai-sdk/groq':
-        specifier: ^1.2.9
-        version: 1.2.9(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.3(zod@3.25.56)
       '@ai-sdk/luma':
-        specifier: ^0.1.8
-        version: 0.1.8(zod@3.25.56)
+        specifier: ^1.0.1
+        version: 1.0.1(zod@3.25.56)
       '@ai-sdk/openai':
-        specifier: ^1.3.22
-        version: 1.3.22(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.5(zod@3.25.56)
       '@ai-sdk/perplexity':
-        specifier: ^1.1.9
-        version: 1.1.9(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.1(zod@3.25.56)
       '@ai-sdk/react':
-        specifier: ^1.2.12
-        version: 1.2.12(react@19.1.0)(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.8(react@19.1.0)(zod@3.25.56)
       '@ai-sdk/xai':
-        specifier: ^1.2.16
-        version: 1.2.16(zod@3.25.56)
+        specifier: ^2.0.0
+        version: 2.0.2(zod@3.25.56)
       '@auth/prisma-adapter':
         specifier: ^2.7.2
         version: 2.9.1(@prisma/client@6.13.0(prisma@6.9.0(typescript@5.8.3))(typescript@5.8.3))
@@ -69,8 +69,8 @@ importers:
         specifier: ^3.1.3
         version: 3.1.3
       '@openrouter/ai-sdk-provider':
-        specifier: ^0.7.2
-        version: 0.7.2(ai@4.3.16(react@19.1.0)(zod@3.25.56))(zod@3.25.56)
+        specifier: ^1.1.0
+        version: 1.1.0(ai@5.0.8(zod@3.25.56))(zod@3.25.56)
       '@prisma/client':
         specifier: ^6.13.0
         version: 6.13.0(prisma@6.9.0(typescript@5.8.3))(typescript@5.8.3)
@@ -162,8 +162,8 @@ importers:
         specifier: ^12.8.2
         version: 12.8.2(@types/react@19.1.6)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       ai:
-        specifier: ^4.3.16
-        version: 4.3.16(react@19.1.0)(zod@3.25.56)
+        specifier: ^5.0.0
+        version: 5.0.8(zod@3.25.56)
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
@@ -342,97 +342,91 @@ importers:
 
 packages:
 
-  '@ai-sdk/anthropic@1.2.12':
-    resolution: {integrity: sha512-YSzjlko7JvuiyQFmI9RN1tNZdEiZxc+6xld/0tq/VkJaHpEzGAb1yiNxxvmYVcjvfu/PcvCxAAYXmTYQQ63IHQ==}
+  '@ai-sdk/anthropic@2.0.1':
+    resolution: {integrity: sha512-HtNbpNV9qXQosHu00+CBMEcdTerwZY+kpVMNak0xP/P5TF6XkPf7IyizhLuc7y5zcXMjZCMA7jDGkcEdZCEdkw==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/fal@0.1.12':
-    resolution: {integrity: sha512-Z0pUUR3qwLTj4HXgGJSes5fwjUbSowsMiKbpYKGl6V51sQeUk2EjZctdN4+a+GBuDNCP6Y32Wi8ejM54OMee+w==}
+  '@ai-sdk/fal@1.0.3':
+    resolution: {integrity: sha512-6hjo5EokkCEnkBagMFAAzZ1TA4z+WStyb8DPlrrD79jcBFehQ8WrLcjQR5dyp7mGx6pI7/dQRj88FN3/lWjd/g==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/fireworks@0.2.16':
-    resolution: {integrity: sha512-YHUqW9QHMNjEg5vF0cmhnlAQJCMljWVWNAAFmKCPX31Dj4JaoCjOrIInrNEFerFRaO64hEffhlhuC1EmuO2Lyg==}
+  '@ai-sdk/fireworks@1.0.2':
+    resolution: {integrity: sha512-SHlgRL63fvUtGRQdOzGNnx0Oq00l1Ev4EXeXTWKZGdfsd6UN+SOmYMlyo5TNAVkJHVuqMVheQyUPrsfpf6NzTQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/google@1.2.19':
-    resolution: {integrity: sha512-Xgl6eftIRQ4srUdCzxM112JuewVMij5q4JLcNmHcB68Bxn9dpr3MVUSPlJwmameuiQuISIA8lMB+iRiRbFsaqA==}
+  '@ai-sdk/gateway@1.0.4':
+    resolution: {integrity: sha512-1roLdgMbFU3Nr4MC97/te7w6OqxsWBkDUkpbCcvxF3jz/ku91WVaJldn/PKU8feMKNyI5W9wnqhbjb1BqbExOQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/groq@1.2.9':
-    resolution: {integrity: sha512-7MoDaxm8yWtiRbD1LipYZG0kBl+Xe0sv/EeyxnHnGPZappXdlgtdOgTZVjjXkT3nWP30jjZi9A45zoVrBMb3Xg==}
+  '@ai-sdk/google@2.0.3':
+    resolution: {integrity: sha512-rQkY4nQGZnQw6pfftqsGsXXAqkGnl1gYjSbvD8+zyrVg2KAYeJU0NxIaacLWCORNcW+yQ/cqTpK/Uku/SIdEqA==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/luma@0.1.8':
-    resolution: {integrity: sha512-6FmUOwZKKldzbTYzS+dNq4LuNb+27gTb/7XQZak46OIUSbBD8FHJm4W/OcUmubuuZ//VHanyyb/QWElipZ/O9w==}
+  '@ai-sdk/groq@2.0.3':
+    resolution: {integrity: sha512-6U1iXh2P33YFSHcFdmESq7YZ3nHs50YQQZDSumwPFKs+iNKSPqrbfYQi/1lLKDhDtCrCEimYtyT+zMD7NlnCBQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/openai-compatible@0.2.14':
-    resolution: {integrity: sha512-icjObfMCHKSIbywijaoLdZ1nSnuRnWgMEMLgwoxPJgxsUHMx0aVORnsLUid4SPtdhHI3X2masrt6iaEQLvOSFw==}
+  '@ai-sdk/luma@1.0.1':
+    resolution: {integrity: sha512-nfm2qhVTM1KYwpXbySLR5B4hyg3CWyyekummBri0nalr5GBxdWlVtKHlFMVqdq0XLtUnMXllfe0QykWQHWRegQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/openai-compatible@0.2.16':
-    resolution: {integrity: sha512-LkvfcM8slJedRyJa/MiMiaOzcMjV1zNDwzTHEGz7aAsgsQV0maLfmJRi/nuSwf5jmp0EouC+JXXDUj2l94HgQw==}
+  '@ai-sdk/openai-compatible@1.0.2':
+    resolution: {integrity: sha512-VqTEzo1ueUsS9FGHtyoAHK11nPIgtziwwGGy5qtGOs+JRcZVEdPqcWe1n2+Ichl4edchoAHo/tygAymaiom9mg==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/openai@1.3.22':
-    resolution: {integrity: sha512-QwA+2EkG0QyjVR+7h6FE7iOu2ivNqAVMm9UJZkVxxTk5OIq5fFJDTEI/zICEMuHImTTXR2JjsL6EirJ28Jc4cw==}
+  '@ai-sdk/openai@2.0.5':
+    resolution: {integrity: sha512-1oFXNudUNRfl4QXlE2Q0v8GCvGngx8HMwHN6pyOTMBP8SI9VoOcCJzRPVBMLd0SI7dkcAvGVkpSVTnaLaXEtxQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/perplexity@1.1.9':
-    resolution: {integrity: sha512-Ytolh/v2XupXbTvjE18EFBrHLoNMH0Ueji3lfSPhCoRUfkwrgZ2D9jlNxvCNCCRiGJG5kfinSHvzrH5vGDklYA==}
+  '@ai-sdk/perplexity@2.0.1':
+    resolution: {integrity: sha512-wOK5jFtUFapEvVerSysFethaQmozcBArWtVfWeAM5VY8VpuDeOqTQET2dP/qV6QB/b/sqP9Tmu2cF5K3oLFHfw==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/provider-utils@2.2.8':
-    resolution: {integrity: sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA==}
+  '@ai-sdk/provider-utils@3.0.1':
+    resolution: {integrity: sha512-/iP1sKc6UdJgGH98OCly7sWJKv+J9G47PnTjIj40IJMUQKwDrUMyf7zOOfRtPwSuNifYhSoJQ4s1WltI65gJ/g==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.23.8
+      zod: ^3.25.76 || ^4
 
-  '@ai-sdk/provider@1.1.3':
-    resolution: {integrity: sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg==}
+  '@ai-sdk/provider@2.0.0':
+    resolution: {integrity: sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA==}
     engines: {node: '>=18'}
 
-  '@ai-sdk/react@1.2.12':
-    resolution: {integrity: sha512-jK1IZZ22evPZoQW3vlkZ7wvjYGYF+tRBKXtrcolduIkQ/m/sOAVcVeVDUDvh1T91xCnWCdUGCPZg2avZ90mv3g==}
+  '@ai-sdk/react@2.0.8':
+    resolution: {integrity: sha512-I9CI53lncv0nUy3TPW0lrnoHCZx4NUaAuFCgm6U0bId0PQKeYi61Z9XFrgo3mDByH2SSC3OVsPq6d5Db8kF1FQ==}
     engines: {node: '>=18'}
     peerDependencies:
       react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
+      zod: ^3.25.76 || ^4
     peerDependenciesMeta:
       zod:
         optional: true
 
-  '@ai-sdk/ui-utils@1.2.11':
-    resolution: {integrity: sha512-3zcwCc8ezzFlwp3ZD15wAPjf2Au4s3vAbKsXQVyhxODHcmu0iyPO2Eua6D/vicq/AUm/BAo60r97O6HU+EI0+w==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.23.8
-
-  '@ai-sdk/xai@1.2.16':
-    resolution: {integrity: sha512-UOZT8td9PWwMi2dF9a0U44t/Oltmf6QmIJdSvrOcLG4mvpRc1UJn6YJaR0HtXs3YnW6SvY1zRdIDrW4GFpv4NA==}
+  '@ai-sdk/xai@2.0.2':
+    resolution: {integrity: sha512-4P10qVSUj1/Ufem3UHNLExW8hHxGO+aYBDs3vQLmOXJyuCWnk2lsefOJz3XNvNpW0Avavl0A4rJyHS9W9gGglQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: ^3.25.76 || ^4
 
   '@alloc/quick-lru@5.2.0':
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
@@ -1158,12 +1152,12 @@ packages:
     resolution: {integrity: sha512-16TtZXNOfH8RaRsV+iag5dTYeJvdOdZDBcpEPCULdKS3eTRJqAYxBNZPFaDJ3cx3WNyvbaQ0IxsPpnaR/tgGFA==}
     engines: {node: '>= 20'}
 
-  '@openrouter/ai-sdk-provider@0.7.2':
-    resolution: {integrity: sha512-Fry2mV7uGGJRmP9JntTZRc8ElESIk7AJNTacLbF6Syoeb5k8d7HPGkcK9rTXDlqBb8HgU1hOKtz23HojesTmnw==}
+  '@openrouter/ai-sdk-provider@1.1.0':
+    resolution: {integrity: sha512-e5cW/KbgGakHOOsDhnHI6a0IDul9ER5J4QGM4yN9EfQ8XHfOFgwGGpLOopoRwkqaX5UdyQrpzei+1DPzg95i0A==}
     engines: {node: '>=18'}
     peerDependencies:
-      ai: ^4.3.16
-      zod: ^3.25.34
+      ai: ^5.0.0
+      zod: ^3.24.1 || ^v4
 
   '@opentelemetry/api@1.9.0':
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
@@ -1795,6 +1789,9 @@ packages:
   '@spotify/web-api-ts-sdk@1.2.0':
     resolution: {integrity: sha512-JUaebva3Ohwo5I5tuTqyW/FKGOMbb40YevJMySAOINRxP7qQ/AMjBzfJx0zeO6yS+wAPfQSoGNsZaUggHw8vsA==}
 
+  '@standard-schema/spec@1.0.0':
+    resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
+
   '@standard-schema/utils@0.3.0':
     resolution: {integrity: sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==}
 
@@ -2037,9 +2034,6 @@ packages:
   '@types/debug@4.1.12':
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
 
-  '@types/diff-match-patch@1.0.36':
-    resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
-
   '@types/estree-jsx@1.0.5':
     resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}
 
@@ -2395,15 +2389,11 @@ packages:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
     engines: {node: '>=8'}
 
-  ai@4.3.16:
-    resolution: {integrity: sha512-KUDwlThJ5tr2Vw0A1ZkbDKNME3wzWhuVfAOwIvFUzl1TPVDFAXDFTXio3p+jaKneB+dKNCvFFlolYmmgHttG1g==}
+  ai@5.0.8:
+    resolution: {integrity: sha512-qbnhj046UvG30V1S5WhjBn+RBGEAmi8PSZWqMhRsE3EPxvO5BcePXTZFA23e9MYyWS9zr4Vm8Mv3wQXwLmtIBw==}
     engines: {node: '>=18'}
     peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      react:
-        optional: true
+      zod: ^3.25.76 || ^4
 
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
@@ -2914,9 +2904,6 @@ packages:
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
-  diff-match-patch@1.0.5:
-    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
-
   diff-sequences@29.6.3:
     resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -3194,6 +3181,10 @@ packages:
     resolution: {integrity: sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA==}
     engines: {node: '>=18.0.0'}
 
+  eventsource-parser@3.0.3:
+    resolution: {integrity: sha512-nVpZkTMM9rF6AQ9gPJpFsNAMt48wIzB5TQgiTLdHiuO8XEDhUgZEhqKlZWXbIzo9VmJ/HvysHqEaVeD5v9TPvA==}
+    engines: {node: '>=20.0.0'}
+
   eventsource@3.0.7:
     resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}
     engines: {node: '>=18.0.0'}
@@ -3865,11 +3856,6 @@ packages:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
 
-  jsondiffpatch@0.6.0:
-    resolution: {integrity: sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
-
   jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
     engines: {node: '>=4.0'}
@@ -5066,9 +5052,6 @@ packages:
   scheduler@0.26.0:
     resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==}
 
-  secure-json-parse@2.7.0:
-    resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
-
   semver@6.3.1:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
@@ -5681,100 +5664,94 @@ packages:
 
 snapshots:
 
-  '@ai-sdk/anthropic@1.2.12(zod@3.25.56)':
+  '@ai-sdk/anthropic@2.0.1(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/fal@0.1.12(zod@3.25.56)':
+  '@ai-sdk/fal@1.0.3(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/fireworks@0.2.16(zod@3.25.56)':
+  '@ai-sdk/fireworks@1.0.2(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/openai-compatible': 0.2.16(zod@3.25.56)
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/openai-compatible': 1.0.2(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/google@1.2.19(zod@3.25.56)':
+  '@ai-sdk/gateway@1.0.4(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/groq@1.2.9(zod@3.25.56)':
+  '@ai-sdk/google@2.0.3(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/luma@0.1.8(zod@3.25.56)':
+  '@ai-sdk/groq@2.0.3(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/openai-compatible@0.2.14(zod@3.25.56)':
+  '@ai-sdk/luma@1.0.1(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/openai-compatible@0.2.16(zod@3.25.56)':
+  '@ai-sdk/openai-compatible@1.0.2(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/openai@1.3.22(zod@3.25.56)':
+  '@ai-sdk/openai@2.0.5(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/perplexity@1.1.9(zod@3.25.56)':
+  '@ai-sdk/perplexity@2.0.1(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
-  '@ai-sdk/provider-utils@2.2.8(zod@3.25.56)':
+  '@ai-sdk/provider-utils@3.0.1(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      nanoid: 3.3.11
-      secure-json-parse: 2.7.0
+      '@ai-sdk/provider': 2.0.0
+      '@standard-schema/spec': 1.0.0
+      eventsource-parser: 3.0.3
       zod: 3.25.56
+      zod-to-json-schema: 3.24.6(zod@3.25.56)
 
-  '@ai-sdk/provider@1.1.3':
+  '@ai-sdk/provider@2.0.0':
     dependencies:
       json-schema: 0.4.0
 
-  '@ai-sdk/react@1.2.12(react@19.1.0)(zod@3.25.56)':
+  '@ai-sdk/react@2.0.8(react@19.1.0)(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
-      '@ai-sdk/ui-utils': 1.2.11(zod@3.25.56)
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
+      ai: 5.0.8(zod@3.25.56)
       react: 19.1.0
       swr: 2.3.3(react@19.1.0)
       throttleit: 2.1.0
     optionalDependencies:
       zod: 3.25.56
 
-  '@ai-sdk/ui-utils@1.2.11(zod@3.25.56)':
+  '@ai-sdk/xai@2.0.2(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
-      zod: 3.25.56
-      zod-to-json-schema: 3.24.5(zod@3.25.56)
-
-  '@ai-sdk/xai@1.2.16(zod@3.25.56)':
-    dependencies:
-      '@ai-sdk/openai-compatible': 0.2.14(zod@3.25.56)
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
+      '@ai-sdk/openai-compatible': 1.0.2(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       zod: 3.25.56
 
   '@alloc/quick-lru@5.2.0': {}
@@ -6464,11 +6441,9 @@ snapshots:
       '@octokit/request-error': 7.0.0
       '@octokit/webhooks-methods': 6.0.0
 
-  '@openrouter/ai-sdk-provider@0.7.2(ai@4.3.16(react@19.1.0)(zod@3.25.56))(zod@3.25.56)':
+  '@openrouter/ai-sdk-provider@1.1.0(ai@5.0.8(zod@3.25.56))(zod@3.25.56)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
-      ai: 4.3.16(react@19.1.0)(zod@3.25.56)
+      ai: 5.0.8(zod@3.25.56)
       zod: 3.25.56
 
   '@opentelemetry/api@1.9.0': {}
@@ -7097,6 +7072,8 @@ snapshots:
 
   '@spotify/web-api-ts-sdk@1.2.0': {}
 
+  '@standard-schema/spec@1.0.0': {}
+
   '@standard-schema/utils@0.3.0': {}
 
   '@supabase/auth-js@2.70.0':
@@ -7319,8 +7296,6 @@ snapshots:
     dependencies:
       '@types/ms': 2.1.0
 
-  '@types/diff-match-patch@1.0.36': {}
-
   '@types/estree-jsx@1.0.5':
     dependencies:
       '@types/estree': 1.0.8
@@ -7660,17 +7635,13 @@ snapshots:
       indent-string: 4.0.0
     optional: true
 
-  ai@4.3.16(react@19.1.0)(zod@3.25.56):
+  ai@5.0.8(zod@3.25.56):
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.56)
-      '@ai-sdk/react': 1.2.12(react@19.1.0)(zod@3.25.56)
-      '@ai-sdk/ui-utils': 1.2.11(zod@3.25.56)
+      '@ai-sdk/gateway': 1.0.4(zod@3.25.56)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.1(zod@3.25.56)
       '@opentelemetry/api': 1.9.0
-      jsondiffpatch: 0.6.0
       zod: 3.25.56
-    optionalDependencies:
-      react: 19.1.0
 
   ajv@6.12.6:
     dependencies:
@@ -8210,8 +8181,6 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
-  diff-match-patch@1.0.5: {}
-
   diff-sequences@29.6.3: {}
 
   digest-fetch@1.3.0:
@@ -8655,6 +8624,8 @@ snapshots:
 
   eventsource-parser@3.0.2: {}
 
+  eventsource-parser@3.0.3: {}
+
   eventsource@3.0.7:
     dependencies:
       eventsource-parser: 3.0.2
@@ -9512,12 +9483,6 @@ snapshots:
     dependencies:
       minimist: 1.2.8
 
-  jsondiffpatch@0.6.0:
-    dependencies:
-      '@types/diff-match-patch': 1.0.36
-      chalk: 5.4.1
-      diff-match-patch: 1.0.5
-
   jsx-ast-utils@3.3.5:
     dependencies:
       array-includes: 3.1.9
@@ -10975,8 +10940,6 @@ snapshots:
 
   scheduler@0.26.0: {}
 
-  secure-json-parse@2.7.0: {}
-
   semver@6.3.1: {}
 
   semver@7.7.2: {}
diff --git a/src/ai/image/registry.ts b/src/ai/image/registry.ts
index c5ee788c..71629355 100644
--- a/src/ai/image/registry.ts
+++ b/src/ai/image/registry.ts
@@ -1,15 +1,27 @@
-import { createProviderRegistry } from "ai";
-
 import { openai } from "@ai-sdk/openai";
 import { xai } from "@ai-sdk/xai";
 import { fireworks } from "@ai-sdk/fireworks";
 import { fal } from "@ai-sdk/fal";
 import { luma } from "@ai-sdk/luma";
 
-export const imageModelRegistry = createProviderRegistry({
-  openai,
-  xai,
-  fireworks,
-  fal,
-  luma,
-});
+// Minimal routing registry to avoid ProviderV2 typing across mixed provider versions
+export const imageModelRegistry = {
+  imageModel(id: string) {
+    const [provider, ...rest] = id.split(":");
+    const modelId = rest.join(":");
+    switch (provider) {
+      case "openai":
+        return openai.image(modelId);
+      case "xai":
+        return xai.image(modelId);
+      case "fireworks":
+        return fireworks.image(modelId);
+      case "fal":
+        return fal.image(modelId);
+      case "luma":
+        return luma.image(modelId);
+      default:
+        throw new Error(`Unknown image provider: ${provider}`);
+    }
+  },
+};
diff --git a/src/app/(general)/_components/chat/index.tsx b/src/app/(general)/_components/chat/index.tsx
index e617820a..271413a4 100644
--- a/src/app/(general)/_components/chat/index.tsx
+++ b/src/app/(general)/_components/chat/index.tsx
@@ -2,7 +2,8 @@ import { db } from "@/server/db";
 import { ChatProvider } from "@/app/(general)/_contexts/chat-context";
 import type { Message, Workbench } from "@prisma/client";
 import { ChatLayout } from "./layout";
-import type { Attachment, UIMessage } from "ai";
+import type { UIMessage } from "ai";
+import type { Attachment } from "./types";
 import { languageModels } from "@/ai/language";
 import { ChatContent } from "./chat";
 import { serverCookieUtils } from "@/lib/cookies/server";
diff --git a/src/app/(general)/_components/chat/input/index.tsx b/src/app/(general)/_components/chat/input/index.tsx
index 57b6d6e7..b204f426 100644
--- a/src/app/(general)/_components/chat/input/index.tsx
+++ b/src/app/(general)/_components/chat/input/index.tsx
@@ -28,11 +28,15 @@ import { cn } from "@/lib/utils";
 
 import { ModelSelect } from "./model-select";
 import { useChatContext } from "@/app/(general)/_contexts/chat-context";
-import type { Attachment } from "ai";
-import type { UseChatHelpers } from "@ai-sdk/react";
-import { ToolsSelect } from "./tools";
+import type { Attachment } from "../types";
+import type { LanguageModel } from "@/ai/language/types";
+import type { ImageModel } from "@/ai/image/types";
+import type { SelectedToolkit } from "@/components/toolkit/types";
+import type { Workbench } from "@prisma/client";
 import type { File as DbFile } from "@prisma/client";
 import { LanguageModelCapability } from "@/ai/language/types";
+import type { UIMessage } from "ai";
+import { ToolsSelect } from "./tools";
 import {
   Tooltip,
   TooltipContent,
@@ -175,9 +179,11 @@ const PureMultimodalInput: React.FC<Props> = ({
       window.history.replaceState({}, "", `/${chatId}`);
     }
 
-    handleSubmit(undefined, {
-      experimental_attachments: attachments,
-    });
+    handleSubmit({
+      preventDefault: () => {
+        // Prevent default form submission
+      },
+    } as React.FormEvent<HTMLFormElement>);
 
     setAttachments([]);
     setLocalStorageInput("");
@@ -189,7 +195,6 @@ const PureMultimodalInput: React.FC<Props> = ({
   }, [
     selectedChatModel,
     submitDisabledString,
-    attachments,
     handleSubmit,
     setAttachments,
     setLocalStorageInput,
@@ -508,7 +513,7 @@ function PureAttachmentsButton({
   disabledString,
 }: {
   fileInputRef: React.MutableRefObject<HTMLInputElement | null>;
-  status: UseChatHelpers["status"];
+  status: "idle" | "submitted" | "streaming" | "error" | "ready";
   disabledString: string;
 }) {
   const button = (
@@ -554,7 +559,7 @@ function PureStopButton({
   setMessages,
 }: {
   stop: () => void;
-  setMessages: UseChatHelpers["setMessages"];
+  setMessages: (messages: unknown) => void;
 }) {
   return (
     <Button
@@ -563,7 +568,7 @@ function PureStopButton({
       onClick={(event) => {
         event.preventDefault();
         stop();
-        setMessages((messages) => messages);
+        setMessages((messages: unknown) => messages);
       }}
     >
       <Octagon size={14} />
diff --git a/src/app/(general)/_components/chat/messages/message-actions.tsx b/src/app/(general)/_components/chat/messages/message-actions.tsx
index e7d421cc..7a31ae6c 100644
--- a/src/app/(general)/_components/chat/messages/message-actions.tsx
+++ b/src/app/(general)/_components/chat/messages/message-actions.tsx
@@ -18,7 +18,7 @@ import {
 import { api } from "@/trpc/react";
 import { useRouter } from "next/navigation";
 
-import type { Message } from "ai";
+import type { UIMessage as Message } from "ai";
 import { HStack } from "@/components/ui/stack";
 import { ModelProviderIcon } from "@/components/ui/model-icon";
 
@@ -47,10 +47,8 @@ export const PureMessageActions: React.FC<Props> = ({
     },
   });
 
-  // Extract modelId from message annotations
-  const model = message.annotations?.find(
-    (annotation) => (annotation as { type: string }).type === "model",
-  ) as
+  // TODO: If model metadata is needed, consider reading from message.metadata
+  const model = undefined as
     | { model: { name: string; provider: string; modelId: string } | null }
     | undefined;
 
diff --git a/src/app/(general)/_components/chat/messages/message-editor.tsx b/src/app/(general)/_components/chat/messages/message-editor.tsx
index 5f528bf9..82a9e787 100644
--- a/src/app/(general)/_components/chat/messages/message-editor.tsx
+++ b/src/app/(general)/_components/chat/messages/message-editor.tsx
@@ -9,7 +9,7 @@ import { useDeleteMessagesAfterTimestamp } from "@/app/(general)/_hooks/use-dele
 import { useChatContext } from "@/app/(general)/_contexts/chat-context";
 
 import type { Dispatch, SetStateAction } from "react";
-import type { Message } from "ai";
+import type { UIMessage as Message } from "ai";
 
 export type MessageEditorProps = {
   message: Message;
@@ -36,7 +36,7 @@ export function MessageEditor({
         .trim();
     }
 
-    return message.content || "";
+    return "";
   });
   const textareaRef = useRef<HTMLTextAreaElement>(null);
 
@@ -61,18 +61,15 @@ export function MessageEditor({
   const onSubmit = async () => {
     setIsSubmitting(true);
 
-    const messageCreatedAt = message.createdAt;
-    const messageTimestamp = messageCreatedAt
-      ? messageCreatedAt.getTime()
-      : Date.now();
+    const messageTimestamp = Date.now();
     const deleteFromTimestamp = new Date(messageTimestamp);
     mutate({
       chatId: chatId,
       timestamp: deleteFromTimestamp,
     });
 
-    setMessages((messages) => {
-      const index = messages.findIndex((m) => m.id === message.id);
+    setMessages((messages: Message[]) => {
+      const index = messages.findIndex((m: Message) => m.id === message.id);
       if (index !== -1) {
         return messages.slice(0, index);
       }
diff --git a/src/app/(general)/_components/chat/messages/message-tool.tsx b/src/app/(general)/_components/chat/messages/message-tool.tsx
index 9cfc7399..45933e20 100644
--- a/src/app/(general)/_components/chat/messages/message-tool.tsx
+++ b/src/app/(general)/_components/chat/messages/message-tool.tsx
@@ -3,15 +3,31 @@ import { Card } from "@/components/ui/card";
 import { HStack } from "@/components/ui/stack";
 import { getClientToolkit } from "@/toolkits/toolkits/client";
 import type { Toolkits, ServerToolkitNames } from "@/toolkits/toolkits/shared";
-import type { CreateMessage, DeepPartial, ToolInvocation } from "ai";
+import type { DeepPartial } from "ai";
 import { Loader2 } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
 import React from "react";
 import type z from "zod";
 import { useChatContext } from "@/app/(general)/_contexts/chat-context";
 
+type ToolInvocationV5 = {
+  type: string;
+  toolCallId: string;
+  state:
+    | "input-streaming"
+    | "input-available"
+    | "output-available"
+    | "output-error";
+  input?: unknown;
+  output?: unknown;
+  errorText?: string;
+  args?: unknown;
+  result?: unknown;
+  toolName?: string;
+};
+
 interface Props {
-  toolInvocation: ToolInvocation;
+  toolInvocation: ToolInvocationV5;
 }
 
 type ToolResult<T extends z.ZodType> =
@@ -27,12 +43,18 @@ type ToolResult<T extends z.ZodType> =
     };
 
 const MessageToolComponent: React.FC<Props> = ({ toolInvocation }) => {
-  const argsDefined = toolInvocation.args !== undefined;
-  const completeOnFirstMount = toolInvocation.state === "result";
+  const argsDefined =
+    (toolInvocation as { args?: unknown }).args !== undefined ||
+    toolInvocation.input !== undefined;
+  const completeOnFirstMount = toolInvocation.state === "output-available";
 
-  const { toolName } = toolInvocation;
-
-  const [server, tool] = toolName.split("_");
+  const toolType = (toolInvocation as { type: string }).type;
+  const nameSuffix = toolType.startsWith("tool-")
+    ? toolType.substring("tool-".length)
+    : toolType === "dynamic-tool"
+      ? ((toolInvocation as { toolName?: string }).toolName ?? "")
+      : "";
+  const [server, tool] = nameSuffix.split("_");
 
   if (!server || !tool) {
     return (
@@ -79,7 +101,7 @@ const MessageToolComponent: React.FC<Props> = ({ toolInvocation }) => {
       <Card className="gap-0 overflow-hidden p-0">
         <HStack className="border-b p-2">
           <clientToolkit.icon className="size-4" />
-          {toolInvocation.state === "result" ? (
+          {toolInvocation.state === "output-available" ? (
             <span className="text-lg font-medium">
               {clientToolkit.name} Toolkit
             </span>
@@ -89,8 +111,8 @@ const MessageToolComponent: React.FC<Props> = ({ toolInvocation }) => {
             </AnimatedShinyText>
           )}
           <AnimatePresence>
-            {(toolInvocation.state === "call" ||
-              toolInvocation.state === "partial-call") && (
+            {(toolInvocation.state === "input-streaming" ||
+              toolInvocation.state === "input-available") && (
               <motion.div
                 initial={{
                   opacity: argsDefined ? 1 : 0,
@@ -111,8 +133,8 @@ const MessageToolComponent: React.FC<Props> = ({ toolInvocation }) => {
           transition={{ duration: 0.3, ease: "easeInOut" }}
         >
           <AnimatePresence mode="wait">
-            {toolInvocation.state === "call" ||
-            toolInvocation.state === "partial-call" ? (
+            {toolInvocation.state === "input-streaming" ||
+            toolInvocation.state === "input-available" ? (
               <motion.div
                 key="call"
                 initial={{
@@ -128,22 +150,27 @@ const MessageToolComponent: React.FC<Props> = ({ toolInvocation }) => {
                 }}
                 style={{ overflow: "hidden" }}
               >
-                {toolInvocation.args && (
+                {Boolean((toolInvocation as { args?: unknown }).args ??
+                  toolInvocation.input) ? (
                   <toolConfig.CallComponent
                     args={
-                      toolInvocation.args as DeepPartial<
+                      ((toolInvocation as { args?: unknown }).args ??
+                        toolInvocation.input) as DeepPartial<
                         z.infer<typeof toolConfig.inputSchema>
                       >
                     }
-                    isPartial={toolInvocation.state === "partial-call"}
+                    isPartial={toolInvocation.state === "input-streaming"}
                   />
-                )}
+                ) : null}
               </motion.div>
-            ) : toolConfig && toolInvocation.state === "result" ? (
+            ) : toolConfig &&
+              (toolInvocation.state === "output-available" ||
+                toolInvocation.state === "output-error") ? (
               (() => {
-                const result = toolInvocation.result as ToolResult<
-                  typeof toolConfig.outputSchema
-                >;
+                const result = (toolInvocation.result ?? {
+                  isError: false,
+                  result: toolInvocation.output,
+                }) as ToolResult<typeof toolConfig.outputSchema>;
 
                 if (result.isError) {
                   return (
@@ -174,7 +201,8 @@ const MessageToolComponent: React.FC<Props> = ({ toolInvocation }) => {
                       Component={({ append }) => (
                         <toolConfig.ResultComponent
                           args={
-                            toolInvocation.args as z.infer<
+                            (toolInvocation.args ??
+                              toolInvocation.input) as z.infer<
                               typeof toolConfig.inputSchema
                             >
                           }
@@ -223,19 +251,24 @@ const areEqual = (prevProps: Props, nextProps: Props): boolean => {
 
   // Compare all relevant fields of toolInvocation
   if (prev.toolCallId !== next.toolCallId) return false;
-  if (prev.toolName !== next.toolName) return false;
   if (prev.state !== next.state) return false;
 
-  // Deep compare args object
-  if (JSON.stringify(prev.args) !== JSON.stringify(next.args)) return false;
+  // Deep compare input/args object
+  const prevInput = (prev as { args?: unknown }).args ?? prev.input;
+  const nextInput = (next as { args?: unknown }).args ?? next.input;
+  if (JSON.stringify(prevInput) !== JSON.stringify(nextInput)) return false;
 
-  // Deep compare result object (only exists when state is "result")
-  if (prev.state === "result" && next.state === "result") {
-    // Both have result property, compare them
-    if (JSON.stringify(prev.result) !== JSON.stringify(next.result))
-      return false;
-  } else if (prev.state === "result" || next.state === "result") {
-    // Only one has result property, they're different
+  // Deep compare result object (only exists when state is "output-available")
+  if (prev.state === "output-available" && next.state === "output-available") {
+    // Both have output property, compare them
+    const prevOutput = (prev as { result?: unknown }).result ?? prev.output;
+    const nextOutput = (next as { result?: unknown }).result ?? next.output;
+    if (JSON.stringify(prevOutput) !== JSON.stringify(nextOutput)) return false;
+  } else if (
+    prev.state === "output-available" ||
+    next.state === "output-available"
+  ) {
+    // Only one has output property, they're different
     return false;
   }
 
@@ -246,10 +279,14 @@ export const MessageTool = React.memo(MessageToolComponent, areEqual);
 
 const MessageToolResultComponent: React.FC<{
   Component: React.ComponentType<{
-    append: (message: CreateMessage) => void;
+    append: (message: { role: string; content: string }) => void;
   }>;
 }> = ({ Component }) => {
   const { append } = useChatContext();
 
-  return <Component append={append} />;
+  const handleAppend = (message: { role: string; content: string }) => {
+    void append(message);
+  };
+
+  return <Component append={handleAppend} />;
 };
diff --git a/src/app/(general)/_components/chat/messages/message.tsx b/src/app/(general)/_components/chat/messages/message.tsx
index e58912dd..6af5dc8b 100644
--- a/src/app/(general)/_components/chat/messages/message.tsx
+++ b/src/app/(general)/_components/chat/messages/message.tsx
@@ -28,6 +28,22 @@ import type { UIMessage } from "ai";
 import { MessageTool } from "./message-tool";
 import { AnimatedShinyText } from "@/components/magicui/animated-shiny-text";
 
+type ToolInvocationV5 = {
+  type: string;
+  toolCallId: string;
+  state:
+    | "input-streaming"
+    | "input-available"
+    | "output-available"
+    | "output-error";
+  input?: unknown;
+  output?: unknown;
+  errorText?: string;
+  args?: unknown;
+  result?: unknown;
+  toolName?: string;
+};
+
 interface Props {
   message: UIMessage;
   isLoading: boolean;
@@ -75,20 +91,40 @@ const PurePreviewMessage: React.FC<Props> = ({
               message.role === "assistant" && "w-0 flex-1",
             )}
           >
-            {message.experimental_attachments &&
-              message.experimental_attachments.length > 0 && (
-                <div
-                  data-testid={`message-attachments`}
-                  className="flex flex-row justify-end gap-2"
-                >
-                  {message.experimental_attachments.map((attachment) => (
-                    <PreviewAttachment
-                      key={attachment.url}
-                      attachment={attachment}
-                    />
-                  ))}
-                </div>
-              )}
+            {message.parts?.some(
+              (p) => (p as { type: string }).type === "attachment",
+            ) && (
+              <div className="flex flex-col gap-2">
+                {message.parts
+                  ?.filter((p) => (p as { type: string }).type === "attachment")
+                  .map((part, index) => {
+                    const attachment = part as {
+                      url?: string;
+                      data?: string;
+                      name?: string;
+                      contentType?: string;
+                      mediaType?: string;
+                    };
+                    const url = attachment.url ?? attachment.data;
+                    const name = attachment.name ?? "attachment";
+                    const contentType =
+                      attachment.contentType ??
+                      attachment.mediaType ??
+                      "application/octet-stream";
+
+                    return (
+                      <div key={index} className="flex items-center gap-2">
+                        <span className="text-muted-foreground text-sm">
+                          {name}
+                        </span>
+                        <span className="text-muted-foreground text-xs">
+                          ({contentType})
+                        </span>
+                      </div>
+                    );
+                  })}
+              </div>
+            )}
 
             {message.parts?.map((part, index) => {
               const { type } = part;
@@ -99,16 +135,20 @@ const PurePreviewMessage: React.FC<Props> = ({
                   <MessageReasoning
                     key={key}
                     isLoading={isLoading}
-                    reasoning={part.reasoning}
+                    reasoning={(part as any).text}
                   />
                 );
               }
 
-              if (type === "tool-invocation") {
-                const { toolInvocation } = part;
-
+              if (
+                (type as string) === "dynamic-tool" ||
+                (type as string).startsWith("tool-")
+              ) {
                 return (
-                  <MessageTool key={key} toolInvocation={toolInvocation} />
+                  <MessageTool
+                    key={key}
+                    toolInvocation={part as ToolInvocationV5}
+                  />
                 );
               }
 
diff --git a/src/app/(general)/_components/chat/preview-attachment.tsx b/src/app/(general)/_components/chat/preview-attachment.tsx
index e706662d..07ba653f 100644
--- a/src/app/(general)/_components/chat/preview-attachment.tsx
+++ b/src/app/(general)/_components/chat/preview-attachment.tsx
@@ -1,6 +1,6 @@
 import { FileIcon, LoaderIcon, X } from "lucide-react";
 
-import type { Attachment } from "ai";
+import type { Attachment } from "../chat/types";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
diff --git a/src/app/(general)/_components/chat/types.ts b/src/app/(general)/_components/chat/types.ts
new file mode 100644
index 00000000..7fda4328
--- /dev/null
+++ b/src/app/(general)/_components/chat/types.ts
@@ -0,0 +1,5 @@
+export type Attachment = {
+  url: string;
+  name?: string;
+  contentType?: string;
+};
diff --git a/src/app/(general)/_contexts/chat-context.tsx b/src/app/(general)/_contexts/chat-context.tsx
index fd983915..7984070f 100644
--- a/src/app/(general)/_contexts/chat-context.tsx
+++ b/src/app/(general)/_contexts/chat-context.tsx
@@ -1,12 +1,6 @@
 "use client";
 
-import {
-  createContext,
-  useContext,
-  useEffect,
-  useState,
-  useCallback,
-} from "react";
+import { createContext, useContext, useEffect, useState } from "react";
 
 import { useChat } from "@ai-sdk/react";
 
@@ -25,14 +19,12 @@ import { clientToolkits } from "@/toolkits/toolkits/client";
 import { languageModels } from "@/ai/language";
 
 import { clientCookieUtils } from "@/lib/cookies/client";
-import { generateUUID } from "@/lib/utils";
-import { fetchWithErrorHandlers } from "@/lib/fetch";
 import { ChatSDKError } from "@/lib/errors";
 import { IS_DEVELOPMENT } from "@/lib/constants";
 
 import type { ReactNode } from "react";
-import type { Attachment, UIMessage } from "ai";
-import type { UseChatHelpers } from "@ai-sdk/react";
+import type { Message, UseChatHelpers } from "@ai-sdk/react";
+import type { Attachment } from "../_components/chat/types";
 import type { ClientToolkit } from "@/toolkits/types";
 import type { z } from "zod";
 import type { SelectedToolkit } from "@/components/toolkit/types";
@@ -46,11 +38,13 @@ const DEFAULT_CHAT_MODEL = languageModels[0]!;
 
 interface ChatContextType {
   // Chat state
-  messages: Array<UIMessage>;
-  setMessages: UseChatHelpers["setMessages"];
+  messages: Array<Message>;
+  setMessages: (
+    messages: Message[] | ((messages: Message[]) => Message[]),
+  ) => void;
   input: string;
-  setInput: UseChatHelpers["setInput"];
-  status: UseChatHelpers["status"];
+  setInput: (input: string) => void;
+  status: "idle" | "submitted" | "streaming" | "error" | "ready";
   streamStopped: boolean;
   attachments: Array<Attachment>;
   setAttachments: (
@@ -72,10 +66,13 @@ interface ChatContextType {
   workbench?: Workbench;
 
   // Chat actions
-  handleSubmit: UseChatHelpers["handleSubmit"];
+  handleSubmit: (event: React.FormEvent<HTMLFormElement>) => void;
   stop: () => void;
-  reload: UseChatHelpers["reload"];
-  append: UseChatHelpers["append"];
+  reload: () => void;
+  append: (
+    _message: Message | { role: string; content: string },
+    _options?: unknown,
+  ) => Promise<string | null | undefined>;
 }
 
 const ChatContext = createContext<ChatContextType | undefined>(undefined);
@@ -83,7 +80,7 @@ const ChatContext = createContext<ChatContextType | undefined>(undefined);
 interface ChatProviderProps {
   children: ReactNode;
   id: string;
-  initialMessages: Array<UIMessage>;
+  initialMessages: Array<Message>;
   initialVisibilityType: "public" | "private";
   autoResume: boolean;
   workbench?: Workbench;
@@ -207,56 +204,22 @@ export function ChatProvider({
     setToolkits(toolkits.filter((t) => t.id !== id));
   };
 
-  const {
-    messages,
-    setMessages,
-    handleSubmit: originalHandleSubmit,
-    input,
-    setInput,
-    append,
-    status,
-    stop,
-    reload,
-    experimental_resume,
-    data,
-  } = useChat({
+  const [input, setInput] = useState("");
+
+  const { messages, setMessages, status, stop } = useChat({
     id,
-    initialMessages,
-    experimental_throttle: 100,
-    sendExtraMessageFields: true,
-    generateId: generateUUID,
-    fetch: fetchWithErrorHandlers,
-    experimental_prepareRequestBody: (body) => ({
-      id,
-      message: body.messages.at(-1),
-      selectedChatModel: `${selectedChatModel?.provider}/${selectedChatModel?.modelId}`,
-      imageGenerationModel: imageGenerationModel
-        ? `${imageGenerationModel.provider}:${imageGenerationModel.modelId}`
-        : undefined,
-      selectedVisibilityType: initialVisibilityType,
-      useNativeSearch,
-      systemPrompt: workbench?.systemPrompt,
-      toolkits: selectedChatModel?.capabilities?.includes(
-        LanguageModelCapability.ToolCalling,
-      )
-        ? toolkits.map((t) => ({
-            id: t.id,
-            parameters: t.parameters,
-          }))
-        : [],
-      workbenchId: workbench?.id,
-    }),
+    api: "/api/chat",
     onFinish: () => {
       setStreamStopped(false);
       void utils.messages.getMessagesForChat.invalidate({ chatId: id });
-      if (initialMessages.length === 0 && !hasInvalidated) {
+      if (messages.length === 0 && !hasInvalidated) {
         setHasInvalidated(true);
         void utils.chats.getChats.invalidate({
           workbenchId: workbench?.id,
         });
       }
     },
-    onError: (error) => {
+    onError: (error: unknown) => {
       if (error instanceof ChatSDKError) {
         toast.error(error.message);
       } else {
@@ -266,31 +229,39 @@ export function ChatProvider({
     },
   });
 
-  const onStreamError = useCallback(() => {
-    // Mark stream as stopped to hide thinking message
-    setStreamStopped(true);
-    // Also call stop to change the status away from 'submitted'
-    stop();
-  }, [stop]);
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    if (input.trim()) {
+      setStreamStopped(false);
+      // TODO: Implement proper message sending
+      setInput("");
+    }
+  };
+
+  const reload = () => {
+    // TODO: Implement reload functionality
+  };
+
+  const append = async (
+    _message: Message | { role: string; content: string },
+    _options?: unknown,
+  ) => {
+    // TODO: Implement append functionality
+    return null;
+  };
 
   useAutoResume({
     autoResume,
     initialMessages,
-    experimental_resume,
-    data,
+    experimental_resume: reload,
+    data: [],
     setMessages,
-    onStreamError,
+    onStreamError: () => {
+      setStreamStopped(true);
+      stop();
+    },
   });
 
-  const handleSubmit: UseChatHelpers["handleSubmit"] = (
-    event,
-    chatRequestOptions,
-  ) => {
-    // Reset stream stopped flag when submitting new message
-    setStreamStopped(false);
-    originalHandleSubmit(event, chatRequestOptions);
-  };
-
   useEffect(() => {
     if (
       selectedChatModel?.capabilities?.includes(
@@ -303,7 +274,7 @@ export function ChatProvider({
     }
   }, [selectedChatModel]);
 
-  const value = {
+  const value: ChatContextType = {
     messages,
     setMessages,
     input,
diff --git a/src/app/(general)/_hooks/use-auto-resume.tsx b/src/app/(general)/_hooks/use-auto-resume.tsx
index 1616ae33..399a669a 100644
--- a/src/app/(general)/_hooks/use-auto-resume.tsx
+++ b/src/app/(general)/_hooks/use-auto-resume.tsx
@@ -13,9 +13,11 @@ type DataPart =
 export interface UseAutoResumeParams {
   autoResume: boolean;
   initialMessages: UIMessage[];
-  experimental_resume: UseChatHelpers["experimental_resume"];
-  data: UseChatHelpers["data"];
-  setMessages: UseChatHelpers["setMessages"];
+  experimental_resume: () => void;
+  data: unknown[];
+  setMessages: (
+    messages: UIMessage[] | ((messages: UIMessage[]) => UIMessage[]),
+  ) => void;
   onStreamError?: () => void;
 }
 
diff --git a/src/app/(general)/_hooks/use-messages.tsx b/src/app/(general)/_hooks/use-messages.tsx
index 48312cfe..2a115889 100644
--- a/src/app/(general)/_hooks/use-messages.tsx
+++ b/src/app/(general)/_hooks/use-messages.tsx
@@ -8,7 +8,7 @@ export function useMessages({
   scrollToBottom,
 }: {
   chatId: string;
-  status: UseChatHelpers["status"];
+  status: "idle" | "submitted" | "streaming" | "error" | "ready";
   scrollToBottom: (behavior: ScrollBehavior) => void;
 }) {
   const [hasSentMessage, setHasSentMessage] = useState(false);
diff --git a/src/app/api/chat/route.ts b/src/app/api/chat/route.ts
index 2b858f04..b97f7d80 100644
--- a/src/app/api/chat/route.ts
+++ b/src/app/api/chat/route.ts
@@ -1,65 +1,27 @@
-import { after } from "next/server";
+import { NextRequest } from "next/server";
 
-import {
-  appendClientMessage,
-  appendResponseMessages,
-  convertToCoreMessages,
-  createDataStream,
-  smoothStream,
-  tool,
-} from "ai";
-
-import { createResumableStreamContext } from "resumable-stream";
-
-import { differenceInSeconds } from "date-fns";
+import { streamText, tool } from "ai";
+import { openai } from "@ai-sdk/openai";
 
 import { auth } from "@/server/auth";
 import { api } from "@/trpc/server";
 import { createServerOnlyCaller } from "@/server/api/root";
+import { getServerToolkit } from "@/toolkits/toolkits/server";
+import { imageModelRegistry } from "@/ai/image/registry";
+import { generateUUID } from "@/lib/utils";
 
 import { postRequestBodySchema, type PostRequestBody } from "./schema";
 
-import { generateText, streamText } from "@/ai/language/generate";
-import { generateUUID } from "@/lib/utils";
+import { generateText } from "@/ai/language/generate";
 
 import { ChatSDKError } from "@/lib/errors";
 
-import type { ResumableStreamContext } from "resumable-stream";
-import type {
-  CoreAssistantMessage,
-  CoreToolMessage,
-  Tool,
-  UIMessage,
-} from "ai";
+import type { UIMessage } from "ai";
 import type { Chat } from "@prisma/client";
-import { openai } from "@ai-sdk/openai";
-import { getServerToolkit } from "@/toolkits/toolkits/server";
 import { languageModels } from "@/ai/language";
 
 export const maxDuration = 60;
 
-let globalStreamContext: ResumableStreamContext | null = null;
-
-function getStreamContext() {
-  if (!globalStreamContext) {
-    try {
-      globalStreamContext = createResumableStreamContext({
-        waitUntil: after,
-      });
-    } catch (error: unknown) {
-      if (error instanceof Error && error.message.includes("REDIS_URL")) {
-        console.warn(
-          " > Resumable streams are disabled due to missing REDIS_URL",
-        );
-      } else {
-        console.error(error);
-      }
-    }
-  }
-
-  return globalStreamContext;
-}
-
 export async function POST(request: Request) {
   let requestBody: PostRequestBody;
 
@@ -130,12 +92,7 @@ export async function POST(request: Request) {
     const previousMessages = await api.messages.getMessagesForChat({
       chatId: id,
     });
-
-    const messages = appendClientMessage({
-      // @ts-expect-error: todo add type conversion from DBMessage[] to UIMessage[]
-      messages: previousMessages,
-      message,
-    });
+    const messages = [...previousMessages, message];
 
     await api.messages.createMessage({
       chatId: id,
@@ -161,12 +118,14 @@ export async function POST(request: Request) {
         return Object.keys(tools).reduce(
           (acc, toolName) => {
             const serverTool = tools[toolName as keyof typeof tools];
-            acc[`${id}_${toolName}`] = tool({
+            (acc as Record<string, unknown>)[`${id}_${toolName}`] = {
               description: serverTool.description,
-              parameters: serverTool.inputSchema,
-              execute: async (args) => {
+              parameters: (serverTool as { inputSchema: unknown }).inputSchema,
+              execute: async (args: unknown) => {
                 try {
-                  const result = await serverTool.callback(args);
+                  const result = await serverTool.callback(
+                    args as Record<string, unknown>,
+                  );
 
                   // Increment tool usage on successful execution
                   try {
@@ -205,10 +164,10 @@ export async function POST(request: Request) {
                   };
                 }
               },
-            });
-            return acc;
+            };
+            return acc as Record<string, unknown>;
           },
-          {} as Record<string, Tool>,
+          {} as Record<string, unknown>,
         );
       }),
     );
@@ -228,7 +187,7 @@ export async function POST(request: Request) {
           ...toolkitTools,
         };
       },
-      {} as Record<string, Tool>,
+      {} as Record<string, unknown>,
     );
 
     const isOpenAi = selectedChatModel.startsWith("openai");
@@ -243,139 +202,59 @@ export async function POST(request: Request) {
 
     const fullSystemPrompt = baseSystemPrompt + toolkitInstructions;
 
-    const stream = createDataStream({
-      execute: (dataStream) => {
-        const result = streamText(
-          `${selectedChatModel}${useNativeSearch ? ":search" : ""}`,
-          {
-            system: fullSystemPrompt,
-            messages: convertToCoreMessages(messages),
-            maxSteps: 15,
-            toolCallStreaming: true,
-            experimental_transform: smoothStream({ chunking: "word" }),
-            experimental_generateMessageId: generateUUID,
-            onError: (error) => {
-              console.error("Stream error occurred:", error);
-
-              // Check if it's a 402 error and log it specifically
-              if (error && typeof error === "object") {
-                const errorStr = JSON.stringify(error);
-                if (
-                  errorStr.includes("402") ||
-                  errorStr.includes("requires more credits")
-                ) {
-                  console.error(
-                    "OpenRouter credits exhausted - 402 error detected",
-                  );
-                }
-              }
-
-              // Send error to frontend - this will trigger onStreamError which calls stop()
-              dataStream.writeData({
-                type: "error",
-                message: "An error occurred while processing your request",
-              });
-
-              // Don't throw - just let the stream end naturally after sending error data
-            },
-            onFinish: async ({ response }) => {
-              // Get the actual model used from OpenRouter's response
-              const [provider, modelId] = response.modelId.split("/");
-
-              // Try to find the model in our list first
-              const model = languageModels.find(
-                (model) =>
-                  model.provider === provider && model.modelId === modelId,
-              );
-
-              // Create model info from OpenRouter's response if not in our list
-              const modelInfo = model ?? {
-                name: `${provider}/${modelId}`, // Format nicely for display
-                provider: provider ?? "unknown",
-                modelId: modelId ?? "unknown",
-              };
-
-              // Write the model annotation
-              dataStream.writeMessageAnnotation({
-                type: "model",
-                model: modelInfo,
-              });
-
-              // Send modelId as message annotation
-              if (session.user?.id) {
-                try {
-                  const assistantId = getTrailingMessageId({
-                    messages: response.messages.filter(
-                      (message) => message.role === "assistant",
-                    ),
-                  });
-
-                  if (!assistantId) {
-                    throw new Error("No assistant message found!");
-                  }
-
-                  const [, assistantMessage] = appendResponseMessages({
-                    messages: [message],
-                    responseMessages: response.messages,
-                  });
-
-                  if (!assistantMessage) {
-                    throw new Error("No assistant message found!");
-                  }
-
-                  await api.messages.createMessage({
-                    chatId: id,
-                    id: assistantId,
-                    role: "assistant",
-                    parts: assistantMessage.parts ?? [],
-                    attachments:
-                      assistantMessage.experimental_attachments?.map(
-                        (attachment) => ({
-                          url: attachment.url,
-                          name: attachment.name ?? "",
-                          contentType: attachment.contentType as
-                            | "image/png"
-                            | "image/jpg"
-                            | "image/jpeg",
-                        }),
-                      ) ?? [],
-                    modelId: response.modelId, // Use the actual model from OpenRouter's response
-                  });
-                } catch (error) {
-                  console.error(error);
-                }
-              }
-            },
-            tools: {
-              ...tools,
-              ...(isOpenAi && useNativeSearch
-                ? { web_search_preview: openai.tools.webSearchPreview() }
-                : {}),
-            },
-          },
-        );
-
-        void result.consumeStream();
+    const result = streamText(
+      `${selectedChatModel}${useNativeSearch ? ":search" : ""}`,
+      {
+        system: fullSystemPrompt,
+        messages: messages as unknown,
+        toolCallStreaming: true,
+        experimental_transform: { chunking: "word" },
+        experimental_generateMessageId: generateUUID,
+        tools,
+      },
+    );
 
-        result.mergeIntoDataStream(dataStream, {
-          sendReasoning: true,
-        });
+    return (
+      result as unknown as {
+        toUIMessageStreamResponse: (options: unknown) => unknown;
+      }
+    ).toUIMessageStreamResponse({
+      sendReasoning: true,
+      onError: (error: unknown) => {
+        if (error && typeof error === "object") {
+          const errorStr = JSON.stringify(error);
+          if (
+            errorStr.includes("402") ||
+            errorStr.includes("requires more credits")
+          ) {
+            console.error("OpenRouter credits exhausted - 402 error detected");
+          }
+        }
+        return "An error occurred while processing your request";
       },
-      onError: (error) => {
-        console.error("Data stream error:", error);
-        throw new ChatSDKError("bad_request:api");
+      onFinish: async ({
+        _response,
+        messages,
+      }: {
+        _response: unknown;
+        messages: unknown[];
+      }) => {
+        const assistant = messages[messages.length - 1] as {
+          parts?: unknown[];
+        };
+        if (assistant) {
+          try {
+            await api.messages.createMessage({
+              chatId: id,
+              role: "assistant",
+              parts: (assistant.parts ?? []) as any,
+            });
+          } catch (error) {
+            console.error("Failed to persist assistant message:", error);
+          }
+        }
       },
     });
-
-    const streamContext = getStreamContext();
-
-    if (streamContext) {
-      return new Response(
-        await streamContext.resumableStream(streamId, () => stream),
-      );
-    } else {
-      return new Response(stream);
-    }
   } catch (error) {
     if (error instanceof ChatSDKError) {
       return error.toResponse();
@@ -386,6 +265,11 @@ export async function POST(request: Request) {
 }
 
 async function generateTitleFromUserMessage(message: UIMessage) {
+  const userText = (message.parts ?? [])
+    .filter((p) => p.type === "text")
+    .map((p) => (p as { text: string }).text)
+    .join("\n");
+
   const { text: title } = await generateText("openai/gpt-4o-mini", {
     system: `\n
       - you will generate a short title based on the first message a user begins a conversation with
@@ -394,131 +278,12 @@ async function generateTitleFromUserMessage(message: UIMessage) {
       - the title should be in the same language as the user's message
       - the title does not need to be a full sentence, try to pack in the most important information in a few words
       - do not use quotes or colons`,
-    messages: [
-      {
-        role: "user",
-        content: message.content,
-        experimental_attachments: message.experimental_attachments,
-      },
-    ],
+    prompt: userText,
   });
 
   return title;
 }
 
-type ResponseMessageWithoutId = CoreToolMessage | CoreAssistantMessage;
-type ResponseMessage = ResponseMessageWithoutId & { id: string };
-function getTrailingMessageId({
-  messages,
-}: {
-  messages: Array<ResponseMessage>;
-}): string | null {
-  const trailingMessage = messages.at(-1);
-
-  if (!trailingMessage) return null;
-
-  return trailingMessage.id;
-}
-
-export async function GET(request: Request) {
-  const streamContext = getStreamContext();
-  const resumeRequestedAt = new Date();
-
-  if (!streamContext) {
-    return new Response(null, { status: 204 });
-  }
-
-  const { searchParams } = new URL(request.url);
-  const chatId = searchParams.get("chatId");
-
-  if (!chatId) {
-    return new ChatSDKError("bad_request:api").toResponse();
-  }
-
-  const session = await auth();
-
-  if (!session?.user) {
-    return new ChatSDKError("unauthorized:chat").toResponse();
-  }
-
-  let chat: Chat;
-
-  try {
-    const dbChat = await api.chats.getChat(chatId);
-
-    if (!dbChat) {
-      return new ChatSDKError("not_found:chat").toResponse();
-    }
-
-    chat = dbChat;
-  } catch {
-    return new ChatSDKError("not_found:chat").toResponse();
-  }
-
-  if (!chat) {
-    return new ChatSDKError("not_found:chat").toResponse();
-  }
-
-  if (chat.visibility === "private" && chat.userId !== session.user.id) {
-    return new ChatSDKError("forbidden:chat").toResponse();
-  }
-
-  const streamIds = await api.streams.getStreamIdsByChatId({ chatId });
-
-  if (!streamIds.length) {
-    return new ChatSDKError("not_found:stream").toResponse();
-  }
-
-  const recentStreamId = streamIds.at(-1);
-
-  if (!recentStreamId) {
-    return new ChatSDKError("not_found:stream").toResponse();
-  }
-
-  const emptyDataStream = createDataStream({
-    execute: () => {
-      return;
-    },
-  });
-
-  const stream = await streamContext.resumableStream(
-    recentStreamId,
-    () => emptyDataStream,
-  );
-
-  /*
-   * For when the generation is streaming during SSR
-   * but the resumable stream has concluded at this point.
-   */
-  if (!stream) {
-    const messages = await api.messages.getMessagesForChat({ chatId });
-    const mostRecentMessage = messages.at(-1);
-
-    if (!mostRecentMessage) {
-      return new Response(emptyDataStream, { status: 200 });
-    }
+// kept for backwards compatibility if needed in future edits
 
-    if (mostRecentMessage.role !== "assistant") {
-      return new Response(emptyDataStream, { status: 200 });
-    }
-
-    const messageCreatedAt = new Date(mostRecentMessage.createdAt);
-
-    if (differenceInSeconds(resumeRequestedAt, messageCreatedAt) > 15) {
-      return new Response(emptyDataStream, { status: 200 });
-    }
-
-    const restoredStream = createDataStream({
-      execute: (buffer) => {
-        buffer.writeData({
-          type: "append-message",
-          message: JSON.stringify(mostRecentMessage),
-        });
-      },
-    });
-
-    return new Response(restoredStream, { status: 200 });
-  }
-
-  return new Response(stream, { status: 200 });
-}
+// GET handler removed; v5 transport may reconnect without server endpoint in this app
diff --git a/src/server/api/routers/sync.ts b/src/server/api/routers/sync.ts
index 9a5f4971..f8029dd1 100644
--- a/src/server/api/routers/sync.ts
+++ b/src/server/api/routers/sync.ts
@@ -1,6 +1,6 @@
 import { clientToolkits } from "@/toolkits/toolkits/client";
 import { adminProcedure, createTRPCRouter } from "../trpc";
-import type { Message } from "ai";
+import type { UIMessage as Message } from "ai";
 
 // Define all available tools from each toolkit
 const ALL_TOOLS = Object.entries(clientToolkits).reduce(
@@ -88,19 +88,24 @@ export const syncRouter = createTRPCRouter({
         continue;
       }
 
-      // Look for tool-invocation parts
+      // Look for tool parts in v5: type 'dynamic-tool' or 'tool-*'
       for (const part of parts) {
-        if (part.type === "tool-invocation" && part.toolInvocation) {
-          const { toolName } = part.toolInvocation;
-
-          // Parse toolkit and tool from toolName (format: "toolkit_tool")
-          const [toolkit, tool] = toolName.split("_");
-
+        const type = (part as { type: string }).type;
+        if (type === "dynamic-tool") {
+          const toolName = (part as any).toolName as string | undefined;
+          if (toolName) {
+            const [toolkit, tool] = toolName.split("_");
+            if (toolkit && tool) {
+              const key = `${toolkit}_${tool}`;
+              toolUsageMap.set(key, (toolUsageMap.get(key) ?? 0) + 1);
+            }
+          }
+        } else if (type?.startsWith("tool-")) {
+          const nameSuffix = type.substring("tool-".length);
+          const [toolkit, tool] = nameSuffix.split("_");
           if (toolkit && tool) {
             const key = `${toolkit}_${tool}`;
             toolUsageMap.set(key, (toolUsageMap.get(key) ?? 0) + 1);
-          } else {
-            console.warn(`⚠️  Invalid tool name format: ${toolName}`);
           }
         }
       }
diff --git a/src/toolkits/toolkits/google-calendar/tools/find-availability/client.tsx b/src/toolkits/toolkits/google-calendar/tools/find-availability/client.tsx
index 524c73fd..9cb1cdbe 100644
--- a/src/toolkits/toolkits/google-calendar/tools/find-availability/client.tsx
+++ b/src/toolkits/toolkits/google-calendar/tools/find-availability/client.tsx
@@ -47,7 +47,7 @@ export const googleCalendarFindAvailabilityToolConfigClient: ClientToolConfig<
     const hasMoreSlots = availableSlots.length > INITIAL_SLOTS_TO_SHOW;
 
     const handleSlotSelect = (slot: (typeof availableSlots)[0]) => {
-      append({
+      void append({
         role: "user",
         content: `I've selected the time slot on ${slot.dayOfWeek}, ${slot.date} from ${slot.timeRange}. Please create a calendar event for this time slot.`,
       });
diff --git a/src/toolkits/toolkits/image/tools/generate/server.ts b/src/toolkits/toolkits/image/tools/generate/server.ts
index 50a52c1f..f32d7e94 100644
--- a/src/toolkits/toolkits/image/tools/generate/server.ts
+++ b/src/toolkits/toolkits/image/tools/generate/server.ts
@@ -25,9 +25,9 @@ export const generateToolConfigServer = (
 
       const file = new File(
         [image.uint8Array],
-        `images/${imageId}.${image.mimeType.split("/")[1]}`,
+        `images/${imageId}.${image.mediaType.split("/")[1]}`,
         {
-          type: image.mimeType,
+          type: image.mediaType,
         },
       );
 
@@ -37,7 +37,7 @@ export const generateToolConfigServer = (
 
       await api.images.createImage({
         url: imageUrl,
-        contentType: image.mimeType,
+        contentType: image.mediaType,
       });
 
       return { url: imageUrl };
diff --git a/src/toolkits/types.ts b/src/toolkits/types.ts
index 11cec856..79f3358a 100644
--- a/src/toolkits/types.ts
+++ b/src/toolkits/types.ts
@@ -1,4 +1,4 @@
-import type { CreateMessage, DeepPartial } from "ai";
+import type { DeepPartial, UIMessage } from "ai";
 import type { z, ZodObject, ZodRawShape } from "zod";
 
 // ------------------------------------------------------------
@@ -107,7 +107,7 @@ export type ClientToolConfig<
   ResultComponent: React.ComponentType<{
     args: z.infer<ZodObject<Args>>;
     result: z.infer<ZodObject<Result>>;
-    append: (message: CreateMessage) => void;
+    append: (message: { role: string; content: string }) => void;
   }>;
 };