From 47d3678a18df69b2c8cc993ebf8967a2d28449c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6=E9=98=B3?= <wuy398@chinaunicom.cn>
Date: Thu, 7 May 2026 16:53:20 +0800
Subject: [PATCH] Fix replayed run state selector stability

---
 .../app/components/assistant-ui/thread.tsx    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/frontend/app/components/assistant-ui/thread.tsx b/frontend/app/components/assistant-ui/thread.tsx
index a6c30e0..1209f8d 100644
--- a/frontend/app/components/assistant-ui/thread.tsx
+++ b/frontend/app/components/assistant-ui/thread.tsx
@@ -32,7 +32,7 @@ import {
 } from "lucide-react";
 import { Popover as PopoverPrimitive } from "radix-ui";
 import type { ComponentProps, FC, KeyboardEvent, ReactNode } from "react";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import TextareaAutosize from "react-textarea-autosize";
 import { useActivityPanel } from "@/components/assistant-ui/activity-panel";
 import {
@@ -192,26 +192,39 @@ function useRefreshReplayedRun() {
 }
 
 function useReplayedRunState() {
-	return useAuiState((s) => {
+	const active = useAuiState((s) =>
+		s.thread.messages.some((message) => isReplayRunMessageId(message.id)),
+	);
+	const replaySessionId = useAuiState((s) => {
 		const replayRunMessage = s.thread.messages.find((message) =>
 			isReplayRunMessageId(message.id),
 		);
-		const sessionId = normalizeSessionId(
-			readMetadataValue(replayRunMessage?.metadata, "sessionId") ??
-				findLatestMessageMetadataValue(s.thread.messages, "sessionId") ??
-				(typeof window !== "undefined"
-					? window.localStorage.getItem("claw.activeSessionId")
-					: null),
+		return normalizeSessionId(
+			readMetadataValue(replayRunMessage?.metadata, "sessionId"),
 		);
-		const runId = normalizeSessionId(
+	});
+	const latestSessionId = useAuiState((s) =>
+		normalizeSessionId(
+			findLatestMessageMetadataValue(s.thread.messages, "sessionId"),
+		),
+	);
+	const runId = useAuiState((s) => {
+		const replayRunMessage = s.thread.messages.find((message) =>
+			isReplayRunMessageId(message.id),
+		);
+		return normalizeSessionId(
 			readMetadataValue(replayRunMessage?.metadata, "runId"),
 		);
-		return {
-			active: Boolean(replayRunMessage),
-			sessionId,
-			runId,
-		};
 	});
+	const localSessionId =
+		typeof window !== "undefined"
+			? normalizeSessionId(window.localStorage.getItem("claw.activeSessionId"))
+			: null;
+	const sessionId = replaySessionId ?? latestSessionId ?? localSessionId;
+	return useMemo(
+		() => ({ active, sessionId, runId }),
+		[active, sessionId, runId],
+	);
 }
 
 async function cancelLatestRun(sessionId: string, runId?: string | null) {