From 5443f6437f8f16db3c634f9da08d206ad5d0176f Mon Sep 17 00:00:00 2001
From: Xisheng-Zhao <parker.z@live.cn>
Date: Mon, 8 Jun 2026 12:02:07 +0800
Subject: [PATCH] Avoid stale pending chat refresh state

---
 app/src/main/java/ai/multica/app/ComposePilotActivity.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ai/multica/app/ComposePilotActivity.kt b/app/src/main/java/ai/multica/app/ComposePilotActivity.kt
index 2e4f5d9..b2b8fce 100644
--- a/app/src/main/java/ai/multica/app/ComposePilotActivity.kt
+++ b/app/src/main/java/ai/multica/app/ComposePilotActivity.kt
@@ -3472,7 +3472,8 @@ private fun PilotChatMessages(
             runCatching { api.pendingChatTask(workspaceId, session.id) }
         }
         result.onSuccess { pending ->
-            state = Result.success(current.copy(pendingTask = pending))
+            val latest = state?.getOrNull() ?: current
+            state = Result.success(latest.copy(pendingTask = pending))
             if (validChatTaskId(previousPendingTaskId) && !validChatTaskId(pending.taskId)) {
                 messagesRefresh++
             }