From 562d7537e9a2742b6ea54d42b73e28eb17d344a0 Mon Sep 17 00:00:00 2001
From: abccodes <abayercalvert@gmail.com>
Date: Thu, 18 Jun 2026 23:30:22 -0700
Subject: [PATCH] [aidan] fix/workflow-cards: keep watched run tethered on
 finish to avoid duplicate chat

---
 frontend/src/app/pages/Workflows/WorkflowCard.tsx     |  4 ++--
 .../src/app/pages/Workflows/WorkflowCardLiveViews.tsx | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/pages/Workflows/WorkflowCard.tsx b/frontend/src/app/pages/Workflows/WorkflowCard.tsx
index 0c2c8c84..c255289c 100644
--- a/frontend/src/app/pages/Workflows/WorkflowCard.tsx
+++ b/frontend/src/app/pages/Workflows/WorkflowCard.tsx
@@ -804,10 +804,10 @@ const WorkflowCard: React.FC<Props> = ({
           <RunningView workflow={workflow} steps={steps} runs={runs} mode={card.sidecarKind === 'watching' ? 'sidecar-linked' : 'card'} />
         )}
         {card.view === 'completed' && workflow && (
-          <CompletedView workflow={workflow} steps={steps} runs={runs} mode={card.sidecarKind === 'viewing-completed' ? 'sidecar-linked' : 'card'} />
+          <CompletedView workflow={workflow} steps={steps} runs={runs} mode={(card.sidecarKind === 'viewing-completed' || card.sidecarKind === 'watching') ? 'sidecar-linked' : 'card'} />
         )}
         {card.view === 'failed' && workflow && (
-          <FailedView workflow={workflow} steps={steps} runs={runs} mode={card.sidecarKind === 'viewing-error' ? 'sidecar-linked' : 'card'} />
+          <FailedView workflow={workflow} steps={steps} runs={runs} mode={(card.sidecarKind === 'viewing-error' || card.sidecarKind === 'watching') ? 'sidecar-linked' : 'card'} />
         )}
         {card.view === 'scheduling' && workflow && (
           <SchedulingView workflow={workflow} steps={steps} />
diff --git a/frontend/src/app/pages/Workflows/WorkflowCardLiveViews.tsx b/frontend/src/app/pages/Workflows/WorkflowCardLiveViews.tsx
index 74a7ce37..9ae833f5 100644
--- a/frontend/src/app/pages/Workflows/WorkflowCardLiveViews.tsx
+++ b/frontend/src/app/pages/Workflows/WorkflowCardLiveViews.tsx
@@ -265,7 +265,11 @@ export function CompletedView({ workflow, steps, runs, mode = 'card' }: {
   const runId = card?.runId || null;
   const run = useMemo(() => (runs || []).find((r) => r.id === runId) || null, [runs, runId]);
   const statuses: StepStatus[] = steps.map(() => 'done');
-  const isLinked = mode === 'sidecar-linked' && card?.sidecarKind === 'viewing-completed';
+  // A run that was being watched live stays tethered to the same chat when it
+  // finishes, so the still-'watching' kind counts as linked too (the slice's
+  // watching->viewing-completed flip can miss on fast runs). Without this the
+  // card offers "View Agent", which spawns a duplicate chat.
+  const isLinked = mode === 'sidecar-linked' && (card?.sidecarKind === 'viewing-completed' || card?.sidecarKind === 'watching');
 
   const onDone = useCallback(() => {
     dispatch(updateWorkflowCard({ workflowId: workflow.id, patch: { view: 'saved', runId: null, sidecarSessionId: null, sidecarKind: null } }));
@@ -368,7 +372,10 @@ export function FailedView({ workflow, steps, runs, mode = 'card' }: {
   const statuses: StepStatus[] = steps.map((_, i) =>
     i < failedIdx ? 'done' : i === failedIdx ? 'failed' : 'pending',
   );
-  const isLinked = mode === 'sidecar-linked' && card?.sidecarKind === 'viewing-error';
+  // Same as CompletedView: a watched run that fails stays tethered, so treat the
+  // still-'watching' kind as linked and show Stop Viewing instead of View Error
+  // (which would open a second chat).
+  const isLinked = mode === 'sidecar-linked' && (card?.sidecarKind === 'viewing-error' || card?.sidecarKind === 'watching');
 
   const onIgnore = useCallback(() => {
     dispatch(updateWorkflowCard({ workflowId: workflow.id, patch: { view: 'saved', runId: null, sidecarSessionId: null, sidecarKind: null } }));