diff --git a/web/package-lock.json b/web/package-lock.json
index 07f14c2d1..f655c5d54 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -30,11 +30,11 @@
         "@radix-ui/react-tooltip": "^1.2.0",
         "@supabase/ssr": "^0.6.1",
         "@supabase/supabase-js": "^2.49.4",
-        "@tanstack/query-sync-storage-persister": "^5.72.1",
-        "@tanstack/react-form": "^1.3.0",
-        "@tanstack/react-query": "^5.72.1",
-        "@tanstack/react-query-devtools": "^5.72.1",
-        "@tanstack/react-query-persist-client": "^5.72.1",
+        "@tanstack/query-sync-storage-persister": "^5.73.1",
+        "@tanstack/react-form": "^1.3.1",
+        "@tanstack/react-query": "^5.72.2",
+        "@tanstack/react-query-devtools": "^5.72.2",
+        "@tanstack/react-query-persist-client": "^5.73.1",
         "@tanstack/react-table": "^8.21.2",
         "@tanstack/react-virtual": "^3.13.6",
         "@types/jest": "^29.5.14",
@@ -68,7 +68,7 @@
         "next-themes": "^0.4.6",
         "papaparse": "^5.5.2",
         "pluralize": "^8.0.0",
-        "posthog-js": "^1.235.0",
+        "posthog-js": "^1.235.4",
         "prettier": "^3.5.3",
         "prettier-plugin-tailwindcss": "^0.6.11",
         "react": "^18",
@@ -93,7 +93,7 @@
       "devDependencies": {
         "@chromatic-com/storybook": "^3.2.6",
         "@eslint/eslintrc": "^3",
-        "@next/bundle-analyzer": "^15.2.5",
+        "@next/bundle-analyzer": "^15.3.0",
         "@storybook/addon-controls": "^8.6.12",
         "@storybook/addon-essentials": "^8.6.12",
         "@storybook/addon-interactions": "^8.6.12",
@@ -116,7 +116,7 @@
         "@types/react-syntax-highlighter": "^15.5.13",
         "eslint": "^9",
         "eslint-config-next": "15.2.4",
-        "eslint-config-prettier": "^10.1.1",
+        "eslint-config-prettier": "^10.1.2",
         "eslint-plugin-storybook": "^0.12.0",
         "msw-storybook-addon": "^2.0.4",
         "sass": "^1.86.3",
@@ -4013,9 +4013,9 @@
       }
     },
     "node_modules/@next/bundle-analyzer": {
-      "version": "15.2.5",
-      "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-15.2.5.tgz",
-      "integrity": "sha512-p4JdhqDz2JZdXSzMPFLRUCOWn1be8lz/1EhjoGI9BQbebQAAS3Q2/QfPsdERUBKeUbJta1FUmsuImcLMZvEn0Q==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-15.3.0.tgz",
+      "integrity": "sha512-t1dn32bTBJTfksh2xLfpaw6hNNNrw1rsr1GlVSkRbJ5626YgEMFBjuos5tHr6l9/b+jKz1HFYFlWNgrIHqCslw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6838,9 +6838,9 @@
       }
     },
     "node_modules/@tanstack/form-core": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/form-core/-/form-core-1.3.0.tgz",
-      "integrity": "sha512-2ojXwrf50gGL+JzN9NLTilE2H8QM0NMDnRJiVeh9RZ8wc/1fJTGtswVqWeaO/cctTFHR/w3gM7965WrBqlvt7Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/form-core/-/form-core-1.3.1.tgz",
+      "integrity": "sha512-LuX72rAx3JL43aCrggJpPoE4HaktFPhHUYg0z005/3JhSeonF9vT6w2vXKDiRY5tlhmiR2s0RkLFNYSe9Mqwcw==",
       "license": "MIT",
       "dependencies": {
         "@tanstack/store": "^0.7.0"
@@ -6851,9 +6851,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.72.1.tgz",
-      "integrity": "sha512-nOu0EEkZuJ0BZnYgeaEfo44+psq1jBO7/zp3KudixD4dvgOVerrhAhDEKsWx2N7MxB59mjO4r0ddP/VqWGPK+Q==",
+      "version": "5.72.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.72.2.tgz",
+      "integrity": "sha512-fxl9/0yk3mD/FwTmVEf1/H6N5B975H0luT+icKyX566w6uJG0x6o+Yl+I38wJRCaogiMkstByt+seXfDbWDAcA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -6861,9 +6861,9 @@
       }
     },
     "node_modules/@tanstack/query-devtools": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.72.1.tgz",
-      "integrity": "sha512-D0vEoQaiVq9ayCqvvxA9XkDq7TIesyPpvgP69arRtt5FQF6n/Hrta4SlkfXC4m9BCvFLlhLDcKGYa2eMQ4ZIIA==",
+      "version": "5.72.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.72.2.tgz",
+      "integrity": "sha512-mMKnGb+iOhVBcj6jaerCFRpg8pACStdG8hmUBHPtToeZzs4ctjBUL1FajqpVn2WaMxnq8Wya+P3Q5tPFNM9jQw==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -6871,12 +6871,12 @@
       }
     },
     "node_modules/@tanstack/query-persist-client-core": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.72.1.tgz",
-      "integrity": "sha512-sceggk1lnJVNlvAUFoWZgaC1SVPgxyhoShHGczlAZHZIn7uLkEJcICXUQlvTSeJn4nr8XdFxBSW8ie/6YPmr6A==",
+      "version": "5.73.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.73.1.tgz",
+      "integrity": "sha512-xxhRCwLmUfZUnjvjck9TgStJGlSznHhP99NBHTc9bsI4EbZ1FiAEllEB0dQdEF5NoeFdUZw9TS2XxQwTqCTTSA==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.72.1"
+        "@tanstack/query-core": "5.72.2"
       },
       "funding": {
         "type": "github",
@@ -6884,13 +6884,13 @@
       }
     },
     "node_modules/@tanstack/query-sync-storage-persister": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-5.72.1.tgz",
-      "integrity": "sha512-j0GTitNNL42vOrAEh7aQ2MkCY8tI5IR/6l+jMfx7Yc7ajFoq8afJyVVVfnseOKfswFVHt6qqQ7leyaKctn3nlQ==",
+      "version": "5.73.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-5.73.1.tgz",
+      "integrity": "sha512-rqhmctylzqhKegKJCvxcLbBzCp0mbyD1hBnxl+owBUr5WAsnIqxPs4e0cQ7mVFryOGT53pdyq50F7gWfoL1WRA==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.72.1",
-        "@tanstack/query-persist-client-core": "5.72.1"
+        "@tanstack/query-core": "5.72.2",
+        "@tanstack/query-persist-client-core": "5.73.1"
       },
       "funding": {
         "type": "github",
@@ -6898,13 +6898,13 @@
       }
     },
     "node_modules/@tanstack/react-form": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-form/-/react-form-1.3.0.tgz",
-      "integrity": "sha512-W5btaBUpSdP64ZNt3wdLcg3EZL05IWwX/ROOOdyAbV4AdNlCQ5f7fOhEtY4Y9gJSt5HdapVcGJlZFsBy+8Dd4Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-form/-/react-form-1.3.1.tgz",
+      "integrity": "sha512-uhKlrMaK5TXMmOJh7Js1j6GtGb3/sGVdmqZ0n9pa3z53Kfc9cJkWmB657+iHSiTSUUS/fLKdIGTPHzzaPQ9UHw==",
       "license": "MIT",
       "dependencies": {
         "@remix-run/node": "^2.16.2",
-        "@tanstack/form-core": "1.3.0",
+        "@tanstack/form-core": "1.3.1",
         "@tanstack/react-store": "^0.7.0",
         "decode-formdata": "^0.9.0"
       },
@@ -6945,12 +6945,12 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.72.1.tgz",
-      "integrity": "sha512-4UEMyRx54xj144D2nDvDIMiXSG5BrqyCJrmyNoGbymNS+VWODcBDFrmRk9p2fe12UGZ4JtKPTNuW2Jg0aisUgQ==",
+      "version": "5.72.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.72.2.tgz",
+      "integrity": "sha512-SVNHzyBUYiis+XiCl+8yiPZmMYei2AKYY94wM/zpvB5l1jxqOo82FQTziSJ4pBi96jtYqvYrTMxWynmbQh3XKw==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.72.1"
+        "@tanstack/query-core": "5.72.2"
       },
       "funding": {
         "type": "github",
@@ -6961,36 +6961,36 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.72.1.tgz",
-      "integrity": "sha512-ckNRgABst3MLjpM2nD/CzQToCiaT3jb3Xhtf+GP/0/9ij9SPT/SC+lc3wUDSkT0OupnHobBBF5E1/Xp6B+XZLg==",
+      "version": "5.72.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.72.2.tgz",
+      "integrity": "sha512-n53qr9JdHCJTCUba6OvMhwiV2CcsckngOswKEE7nM5pQBa/fW9c43qw8omw1RPT2s+aC7MuwS8fHsWT8g+j6IQ==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-devtools": "5.72.1"
+        "@tanstack/query-devtools": "5.72.2"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.72.1",
+        "@tanstack/react-query": "^5.72.2",
         "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-query-persist-client": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-5.72.1.tgz",
-      "integrity": "sha512-VJ1wqgfDblyjjxdrm910bQflHNC6IVcqKMN6/DIhC7AGw8jeSKWDc7AVZW4d9L57tblyYdQfUfwTOBfpGk646Q==",
+      "version": "5.73.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-5.73.1.tgz",
+      "integrity": "sha512-fzrmIYa1FQPXp7s6qlzigy96y64qG9tf5kTUbM7DsNahf4DKb5xZ+BMjRzmINOo0h7Tzir+9tVe6ALG2Rpzlvg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-persist-client-core": "5.72.1"
+        "@tanstack/query-persist-client-core": "5.73.1"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.72.1",
+        "@tanstack/react-query": "^5.72.2",
         "react": "^18 || ^19"
       }
     },
@@ -11449,9 +11449,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz",
-      "integrity": "sha512-4EQQr6wXwS+ZJSzaR5ZCrYgLxqvUjdXctaEtBqHcbkW944B1NQyO4qpdHQbXBONfwxXdkAY81HH4+LUfrg+zPw==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.2.tgz",
+      "integrity": "sha512-Epgp/EofAUeEpIdZkW60MHKvPyru1ruQJxPL+WIycnaPApuseK0Zpkrh/FwL9oIpQvIhJwV7ptOy0DWUjTlCiA==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -18080,9 +18080,9 @@
       "license": "MIT"
     },
     "node_modules/posthog-js": {
-      "version": "1.235.0",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.235.0.tgz",
-      "integrity": "sha512-H/s2lgqXhp4lBmYUxue1RlObnt1rfYAg0kLXIU5fUrP6gFLe1OIqs46ip3zGHonCkh+6ZB0oRLnFApWsA1+1YQ==",
+      "version": "1.235.4",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.235.4.tgz",
+      "integrity": "sha512-CcAQpw7oaIoOwyaeqNZoKjciIMygrjgn6+cBSWFQcbo7aEmiO2666BZHZH/GBFmz0g2/w5abSpO7UntAj/69dw==",
       "license": "MIT",
       "dependencies": {
         "core-js": "^3.38.1",
diff --git a/web/src/components/ui/indicators/StatusIndicator.tsx b/web/src/components/ui/indicators/StatusIndicator.tsx
index 757358f98..6ad5994f6 100644
--- a/web/src/components/ui/indicators/StatusIndicator.tsx
+++ b/web/src/components/ui/indicators/StatusIndicator.tsx
@@ -13,13 +13,14 @@ const animationConfig = {
 export const StatusIndicator: React.FC<{
   status?: 'completed' | 'loading' | 'failed';
   isCompletedStream?: boolean;
-}> = React.memo(({ status }) => {
+}> = React.memo(({ status = 'completed' }) => {
   const inProgress = status === 'loading';
   const failed = status === 'failed';
 
   return (
     <AnimatePresence mode="wait" initial={false}>
       <motion.div
+        key={status}
         className={cn(
           'text-gray-light relative flex items-center justify-center transition-all duration-300',
           inProgress && 'text-primary',
diff --git a/web/src/mocks/MOCK_CHAT.ts b/web/src/mocks/MOCK_CHAT.ts
index d5f668538..4b0b78289 100644
--- a/web/src/mocks/MOCK_CHAT.ts
+++ b/web/src/mocks/MOCK_CHAT.ts
@@ -61,7 +61,6 @@ const MOCK_MESSAGE_REASONING = (
         file_type: faker.helpers.arrayElement(['metric', 'dashboard']),
         file_name: faker.system.fileName(),
         version_number: faker.number.int({ min: 1, max: 10 }),
-        version_id: faker.string.uuid(),
         status: 'loading',
         file: {
           text: faker.lorem.sentence(),
diff --git a/web/src/mocks/chat.ts b/web/src/mocks/chat.ts
index 052f1221e..048159aa7 100644
--- a/web/src/mocks/chat.ts
+++ b/web/src/mocks/chat.ts
@@ -54,7 +54,6 @@ export const mockBusterChatMessage: IBusterChatMessage = {
           file_type: 'metric',
           file_name: 'test.ts',
           version_number: 1,
-          version_id: 'v1',
           status: 'completed',
           file: {
             text: `
@@ -85,7 +84,6 @@ bilbo_baggins:
           file_type: 'dashboard',
           file_name: 'example.js',
           version_number: 1,
-          version_id: 'v1',
           status: 'loading',
           file: {
             text: `