From 606c0f8afc3977926c5c5751b19ba16d55301d00 Mon Sep 17 00:00:00 2001
From: MaheshBhushan <mkoduri73@gmail.com>
Date: Tue, 10 Mar 2026 20:55:32 +0530
Subject: [PATCH] fix(tui): only mark queued for active tail assistant message

---
 packages/opencode/src/cli/cmd/tui/routes/session/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 5358b61ef33..b736e9bc85a 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -139,7 +139,11 @@ export function Session() {
   })
 
   const pending = createMemo(() => {
-    return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id
+    const lastMessage = messages().at(-1)
+    if (!lastMessage || lastMessage.role !== "assistant") return
+    if (lastMessage.time.completed) return
+    if (lastMessage.error) return
+    return lastMessage.id
   })
 
   const lastAssistant = createMemo(() => {