From 2b91848b301baf73a55d201fa9b25e1a38b0689c Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Wed, 15 Apr 2026 09:22:21 -0500
Subject: [PATCH] Mask stale issue active runs after completion

---
 ui/src/pages/IssueDetail.tsx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ui/src/pages/IssueDetail.tsx b/ui/src/pages/IssueDetail.tsx
index 4a6f2269062..7edea69730d 100644
--- a/ui/src/pages/IssueDetail.tsx
+++ b/ui/src/pages/IssueDetail.tsx
@@ -573,7 +573,11 @@ const IssueDetailChatTab = memo(function IssueDetailChatTab({
     refetchInterval: liveRunCount > 0 ? false : 3000,
     placeholderData: keepPreviousDataForSameQueryTail<ActiveRunForIssue | null>(issueId),
   });
-  const hasLiveRuns = liveRunCount > 0 || !!activeRun;
+  const resolvedActiveRun = useMemo(
+    () => resolveIssueActiveRun({ status: issueStatus, executionRunId }, activeRun),
+    [activeRun, executionRunId, issueStatus],
+  );
+  const hasLiveRuns = liveRunCount > 0 || !!resolvedActiveRun;
   const { data: linkedRuns } = useQuery({
     queryKey: queryKeys.issues.runs(issueId),
     queryFn: () => activityApi.runsForIssue(issueId),
@@ -584,8 +588,8 @@ const IssueDetailChatTab = memo(function IssueDetailChatTab({
   const resolvedLinkedRuns = linkedRuns ?? [];
 
   const runningIssueRun = useMemo(
-    () => resolveRunningIssueRun(activeRun, resolvedLiveRuns),
-    [activeRun, resolvedLiveRuns],
+    () => resolveRunningIssueRun(resolvedActiveRun, resolvedLiveRuns),
+    [resolvedActiveRun, resolvedLiveRuns],
   );
   const timelineRuns = useMemo(() => {
     const liveIds = new Set<string>();
@@ -672,7 +676,7 @@ const IssueDetailChatTab = memo(function IssueDetailChatTab({
         linkedRuns={timelineRuns}
         timelineEvents={timelineEvents}
         liveRuns={resolvedLiveRuns}
-        activeRun={activeRun}
+        activeRun={resolvedActiveRun}
         companyId={companyId}
         projectId={projectId}
         issueStatus={issueStatus}
@@ -950,7 +954,8 @@ export function IssueDetail() {
     select: (run) => !!run,
     placeholderData: keepPreviousDataForSameQueryTail<ActiveRunForIssue | null>(issueId ?? "pending"),
   });
-  const hasLiveRuns = liveRunCount > 0 || hasActiveRun;
+  const resolvedHasActiveRun = issue ? shouldTrackIssueActiveRun(issue) && hasActiveRun : hasActiveRun;
+  const hasLiveRuns = liveRunCount > 0 || resolvedHasActiveRun;
   const sourceBreadcrumb = useMemo(
     () => readIssueDetailBreadcrumb(issueId, location.state, location.search) ?? { label: "Issues", href: "/issues" },
     [issueId, location.state, location.search],