address issues

Author: TheodoreSpeaks

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/thinking-block/thinking-block.tsx

@@ -28,9 +28,9 @@ export function ThinkingBlock({
   const [expanded, setExpanded] = useState(false)
   const panelRef = useRef<HTMLDivElement>(null)
   const wasActiveRef = useRef<boolean | null>(null)
-  // Suppress active thinking until it exceeds 5s. Completed-<=5s is
-  // filtered upstream in message-content, so if we're mounted with
-  // isActive=false we've already passed that gate.
+  // Suppress active thinking until it exceeds MIN_VISIBLE_THINKING_MS.
+  // Completed-<=threshold is filtered upstream in message-content, so if
+  // we're mounted with isActive=false we've already passed that gate.
   const [thresholdReached, setThresholdReached] = useState(() => {
     if (!isActive || startedAt === undefined) return true
     return Date.now() - startedAt > MIN_VISIBLE_THINKING_MS

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -3566,6 +3566,14 @@ export function useChat(
       queryClient.getQueryData<TaskChatHistory>(taskKeys.detail(chatIdRef.current))
         ?.activeStreamId ||
       undefined
+    // Snapshot the active assistant message id BEFORE clearActiveTurn()
+    // nulls the ref. Used below to restrict markMessageStopped to the
+    // in-flight turn only — historical messages from the chat history
+    // also lack `endedAt` on their legacy blocks (pre-timing-fields),
+    // and without this gate we'd corrupt them with cancelled markers.
+    const activeAssistantMessageId =
+      activeTurnRef.current?.assistantMessageId ??
+      (sid ? getLiveAssistantMessageId(sid) : undefined)
     const stopContentSnapshot = streamingContentRef.current
     const stopNow = Date.now()
     const stopBlocksSnapshot = streamingBlocksRef.current.map((block) => ({
@@ -3594,7 +3602,11 @@ export function useChat(
       await queryClient.cancelQueries({ queryKey: taskKeys.detail(activeChatId) })
       upsertTaskChatHistory(activeChatId, (current) => ({
         ...current,
-        messages: current.messages.map(markMessageStopped),
+        messages: current.messages.map((message) =>
+          activeAssistantMessageId && message.id === activeAssistantMessageId
+            ? markMessageStopped(message)
+            : message
+        ),
       }))
     } else {
       setPendingMessages((prev) =>