Fixes

webview-ui/src/components/chat/ChatRow.tsx

@@ -40,6 +40,7 @@ const ChatRow = memo(
 
 		useEffect(() => {
 			// used for partials, command output, etc.
+			// NOTE: it's important we don't distinguish between partial or complete here since our scroll effects in chatview need to handle height change during partial -> complete
 			const isInitialRender = prevHeightRef.current === 0 // prevents scrolling when new element is added since we already scroll for that
 			// height starts off at Infinity
 			if (isLast && height !== 0 && height !== Infinity && height !== prevHeightRef.current) {

webview-ui/src/components/chat/ChatView.tsx

@@ -508,16 +508,21 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 			taskMsgTsRef.current = task.ts
 			const timer = setTimeout(() => {
 				scrollToBottomSmooth()
+				lastMsgIndexScrolledOn.current = visibleMessages.length - 1
 			}, 50)
 			return () => clearTimeout(timer)
 		}
-	}, [task, scrollToBottomSmooth])
+	}, [task, scrollToBottomSmooth, visibleMessages.length])
 
-	const handleRowHeightChange = useCallback(() => {
-		if (isAtBottomRef.current) {
-			scrollToBottomSmooth()
-		}
-	}, [scrollToBottomSmooth])
+	const handleRowHeightChange = useCallback(
+		(index: number) => {
+			if (isAtBottomRef.current) {
+				scrollToBottomSmooth()
+				lastMsgIndexScrolledOn.current = index
+			}
+		},
+		[scrollToBottomSmooth]
+	)
 
 	const placeholderText = useMemo(() => {
 		const text = task ? "Type a message (@ to add context)..." : "Type your task here (@ to add context)..."
@@ -533,7 +538,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 				onToggleExpand={() => toggleRowExpansion(message.ts)}
 				lastModifiedMessage={modifiedMessages.at(-1)}
 				isLast={index === visibleMessages.length - 1}
-				onHeightChange={handleRowHeightChange}
+				onHeightChange={() => handleRowHeightChange(index)}
 			/>
 		),
 		[expandedRows, modifiedMessages, visibleMessages.length, toggleRowExpansion, handleRowHeightChange]