From 79e46c8a81887b7a0b44b8e7717d152d550de95a Mon Sep 17 00:00:00 2001
From: zhsama <torvalds@linux.do>
Date: Fri, 7 Nov 2025 15:19:40 +0800
Subject: [PATCH] feat(step-run): add resolvedStatus calculation for improved
 run result handling

---
 .../components/workflow-panel/last-run/index.tsx   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
index b26dd74714..d7081ee77f 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx
@@ -60,6 +60,16 @@ const LastRun: FC<Props> = ({
   const noLastRun = (error as any)?.status === 404
   const runResult = (canRunLastRun ? lastRunResult : singleRunResult) || lastRunResult || {}
 
+  const resolvedStatus = useMemo(() => {
+    if (isPaused)
+      return NodeRunningStatus.Stopped
+
+    if (oneStepRunRunningStatus === NodeRunningStatus.Stopped)
+      return NodeRunningStatus.Stopped
+
+    return (runResult as any).status || otherResultPanelProps.status
+  }, [isPaused, oneStepRunRunningStatus, runResult, otherResultPanelProps.status])
+
   const resetHidePageStatus = useCallback(() => {
     setPageHasHide(false)
     setPageShowed(false)
@@ -104,18 +114,18 @@ const LastRun: FC<Props> = ({
 
   if (isRunning)
     return <ResultPanel status='running' showSteps={false} />
-
   if (!isPaused && (noLastRun || !runResult)) {
     return (
       <NoData canSingleRun={canSingleRun} onSingleRun={onSingleRunClicked} />
     )
   }
+
   return (
     <div>
       <ResultPanel
         {...runResult as any}
         {...otherResultPanelProps}
-        status={isPaused ? NodeRunningStatus.Stopped : ((runResult as any).status || otherResultPanelProps.status)}
+        status={resolvedStatus}
         total_tokens={(runResult as any)?.execution_metadata?.total_tokens || otherResultPanelProps?.total_tokens}
         created_by={(runResult as any)?.created_by_account?.created_by || otherResultPanelProps?.created_by}
         nodeInfo={runResult as NodeTracing}