fix: don't cache blocks when part of an active node (#1255)

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>

Author: lewisbirks

src/main/java/io/jenkins/plugins/pipelinegraphview/treescanner/NodeRelationship.java

@@ -136,9 +136,16 @@ public FlowNode getEnd() {
     }
 
     /**
-     * Same as {@link #getStatus(WorkflowRun)} but threads {@code activeNodeIds} through to
-     * the step-node leaf. Block cases defer to {@link #getStatus(WorkflowRun)} so subclass
-     * overrides (e.g. {@link ParallelBlockRelationship}) apply.
+     * Same as {@link #getStatus(WorkflowRun)} but uses {@code activeNodeIds} for liveness
+     * checks instead of {@link FlowNode#isActive()}.
+     *
+     * <ul>
+     *   <li>Step nodes ({@code start == end}): liveness read from the set.</li>
+     *   <li>Block nodes ({@code start != end}): if {@code start} is in the active set the
+     *       block is still running (RUNNING/UNKNOWN); otherwise delegates to
+     *       {@link #getStatus(WorkflowRun)} so subclass overrides (e.g.
+     *       {@link ParallelBlockRelationship}) apply.</li>
+     * </ul>
      */
     public @NonNull NodeRunStatus getStatus(WorkflowRun run, @CheckForNull Set<String> activeNodeIds) {
         if (activeNodeIds == null) {
@@ -156,9 +163,17 @@ public FlowNode getEnd() {
                 return new NodeRunStatus(GenericStatus.fromResult(warningAction.getResult()));
             }
         }
+        // Step node: start and end are the same FlowNode — use the activeNodeIds set.
         if (this.start.getId().equals(this.end.getId())) {
             return new NodeRunStatus(this.start, activeNodeIds);
         }
+        // Block node: if the start is in the active set the block is still running.
+        // computeChunkStatus2 / getStatus(run) use FlowNode#isActive() / isCurrentHead()
+        // which can disagree with the snapshot's activeNodeIds during live execution.
+        // Honour the snapshot's view here so status stays consistent within a single read.
+        if (activeNodeIds.contains(this.start.getId())) {
+            return new NodeRunStatus(BlueRun.BlueRunResult.UNKNOWN, BlueRun.BlueRunState.RUNNING);
+        }
         return getStatus(run);
     }
 }

src/main/java/io/jenkins/plugins/pipelinegraphview/treescanner/PipelineNodeTreeScanner.java

@@ -557,15 +557,23 @@ private void assignParent(@NonNull FlowNodeWrapper wrappedNode, @CheckForNull Fl
                 FlowNode start = relationship.getStart();
                 FlowNode end = relationship.getEnd();
                 // Timing and status for a closed block are stable once the BlockEndNode
-                // exists; memoise so subsequent requests don't re-walk actions per block.
-                BlockResolutionCache cache = (start != end && end instanceof BlockEndNode<?>)
-                        ? LiveGraphRegistry.get().blockResolutionCache(execution)
-                        : null;
+                // exists AND the block is no longer active; memoise so subsequent requests
+                // don't re-walk actions per block.
+                // We must not cache while the start node is still active: the status can
+                // still change (e.g. IN_PROGRESS → SUCCESS), and an incorrectly cached
+                // value would be returned for the remainder of the run.
+                boolean blockClosed = start != end
+                        && end instanceof BlockEndNode<?>
+                        && (activeNodeIds == null || !activeNodeIds.contains(start.getId()));
+                BlockResolutionCache cache =
+                        blockClosed ? LiveGraphRegistry.get().blockResolutionCache(execution) : null;
                 if (cache != null) {
                     timing = cache.getOrComputeTiming(
                             start.getId(), end.getId(), () -> relationship.getTimingInfo(this.run));
+                    // Use the activeNodeIds-aware overload so the set is consulted even for
+                    // cached entries — the cache supplier captures activeNodeIds by reference.
                     status = cache.getOrComputeStatus(
-                            start.getId(), end.getId(), () -> relationship.getStatus(this.run));
+                            start.getId(), end.getId(), () -> relationship.getStatus(this.run, activeNodeIds));
                 } else {
                     timing = relationship.getTimingInfo(this.run);
                     status = relationship.getStatus(this.run, activeNodeIds);

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineGraphViewCache.java

@@ -37,7 +37,7 @@
  */
 public class PipelineGraphViewCache {
 
-    public static final int SCHEMA_VERSION = 1;
+    public static final int SCHEMA_VERSION = 2;
 
     public static final String TREE_FILE_NAME = "pipeline-graph-view-tree.v" + SCHEMA_VERSION + ".json";
     public static final String ALL_STEPS_FILE_NAME = "pipeline-graph-view-allsteps.v" + SCHEMA_VERSION + ".json";