From f37deb4557a9afed512c2bcfeff381180c1d503a Mon Sep 17 00:00:00 2001
From: daniel-lxs <ricciodaniel98@gmail.com>
Date: Mon, 3 Nov 2025 09:11:58 -0500
Subject: [PATCH] fix: replace JSON.parse with safeJsonParse for improved error
 handling

---
 webview-ui/src/components/chat/ChatView.tsx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 00c5b8bc3a..42c93fa5b6 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -58,6 +58,7 @@ import { QueuedMessages } from "./QueuedMessages"
 import DismissibleUpsell from "../common/DismissibleUpsell"
 import { useCloudUpsell } from "@src/hooks/useCloudUpsell"
 import { Cloud } from "lucide-react"
+import { safeJsonParse } from "../../../../src/shared/safeJsonParse"
 
 export interface ChatViewProps {
 	isHidden: boolean
@@ -547,16 +548,18 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				lastApiReqStarted.text !== undefined &&
 				lastApiReqStarted.say === "api_req_started"
 			) {
-				const info = JSON.parse(lastApiReqStarted.text)
+				const info = safeJsonParse(lastApiReqStarted.text)
 
 				// If cancelReason is defined, the stream has been cancelled (terminal state)
-				if (info.cancelReason !== undefined) {
-					return false
-				}
+				if (typeof info === "object" && info !== null) {
+					if ("cancelReason" in info && info.cancelReason !== undefined) {
+						return false
+					}
 
-				// Otherwise, check if cost is defined to determine if streaming is complete
-				if (info.cost === undefined) {
-					return true // API request has not finished yet.
+					// Otherwise, check if cost is defined to determine if streaming is complete
+					if ("cost" in info && info.cost !== undefined) {
+						return true // API request has not finished yet.
+					}
 				}
 			}
 		}