From 711fd65335622ab668a96256c4a8b196f75b3e5a Mon Sep 17 00:00:00 2001
From: klopez4212 <klopez4212@gmail.com>
Date: Sat, 27 Jun 2026 10:43:08 +0100
Subject: [PATCH] Fix task source navigation fallback

---
 desktop/src/features/channels/ui/ChannelPane.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index 832129ef6..9faaa43e6 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -216,12 +216,14 @@ function ChannelTasksView({
       .filter((marker) => !channelId || marker.channelId === channelId)
       .map((marker) => {
         const message = messageById.get(marker.agentReplyId) ?? null;
-        const threadMessage =
+        const resolvedThreadMessage =
           messageById.get(marker.threadRootMessageId ?? "") ??
           messageById.get(marker.threadRootId) ??
           messageById.get(marker.parentMessageId ?? "") ??
-          message ??
           null;
+        const threadMessage =
+          resolvedThreadMessage ??
+          (marker.threadRootId === marker.agentReplyId ? message : null);
         return {
           marker,
           message,