From b7dba5f5b8fa7751b7212fe14e48cc429383ac16 Mon Sep 17 00:00:00 2001
From: wuyang6 <wuyang6@xiaomi.com>
Date: Wed, 13 May 2026 17:47:28 +0800
Subject: [PATCH] Keep pending workspace status before first message

---
 frontend/app/components/assistant-ui/thread.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/app/components/assistant-ui/thread.tsx b/frontend/app/components/assistant-ui/thread.tsx
index 7c3b8dc..16d8717 100644
--- a/frontend/app/components/assistant-ui/thread.tsx
+++ b/frontend/app/components/assistant-ui/thread.tsx
@@ -1188,8 +1188,14 @@ function useComposerContextStatus() {
 						sessionPayload =
 							(await sessionResponse.json()) as ClawStoredSession;
 					} else if (sessionResponse.status === 404) {
-						clearActiveSessionId();
-						sessionId = null;
+						if (
+							sessionId === normalizeSessionId(readPendingWorkspaceSessionId())
+						) {
+							sessionPayload = null;
+						} else {
+							clearActiveSessionId();
+							sessionId = null;
+						}
 					}
 				}
 				const budgetUrl = new URL(