Merge origin/main into qpo-progressbar-node-name

src/scripts/app.getNodeDefs.test.ts

@@ -65,7 +65,6 @@ describe('ComfyApp.getNodeDefs', () => {
 
     const result = await comfyApp.getNodeDefs()
 
-    // When display_name is empty, should fall back to name
     expect(result.TestNode.display_name).toBe('TestNode')
   })
 
@@ -84,7 +83,6 @@ describe('ComfyApp.getNodeDefs', () => {
     }
 
     vi.mocked(api.getNodeDefs).mockResolvedValue(mockNodeDefs)
-    // Mock st to return a translation instead of fallback
     vi.mocked(st).mockReturnValue('Translated Display Name')
 
     const result = await comfyApp.getNodeDefs()

src/stores/executionStore.test.ts

@@ -1,6 +1,11 @@
 import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+
 import { app } from '@/scripts/app'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { executionIdToNodeLocatorId } from '@/utils/graphTraversalUtil'
@@ -346,6 +351,100 @@ describe('useExecutionErrorStore - Node Error Lookups', () => {
   })
 })
 
+describe('useExecutionStore - executingNode with subgraphs', () => {
+  let store: ReturnType<typeof useExecutionStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useExecutionStore()
+  })
+
+  it('should find executing node in root graph', () => {
+    const mockNode = createMockLGraphNode({
+      id: '123',
+      title: 'Test Node',
+      type: 'TestNode'
+    })
+
+    vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockNode)
+
+    store.nodeProgressStates = {
+      '123': {
+        state: 'running',
+        value: 0,
+        max: 100,
+        display_node_id: '123',
+        prompt_id: 'test-prompt',
+        node_id: '123'
+      }
+    }
+
+    expect(store.executingNode).toBe(mockNode)
+  })
+
+  it('should find executing node in subgraph using execution ID', () => {
+    const mockNodeInSubgraph = createMockLGraphNode({
+      id: '789',
+      title: 'Nested Node',
+      type: 'NestedNode'
+    })
+
+    const testSubgraph = createTestSubgraph({
+      id: 'sub-uuid'
+    })
+    testSubgraph.add(mockNodeInSubgraph)
+
+    const mockSubgraphNode = createTestSubgraphNode(testSubgraph, {
+      id: '456'
+    })
+
+    vi.spyOn(testSubgraph, 'getNodeById').mockImplementation(
+      (id: string | number | null | undefined) =>
+        id === '789' ? mockNodeInSubgraph : null
+    )
+
+    vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockSubgraphNode)
+
+    // Simulate node execution in subgraph with hierarchical execution ID "456:789"
+    store.nodeProgressStates = {
+      '456:789': {
+        state: 'running',
+        value: 0,
+        max: 100,
+        display_node_id: '456:789',
+        prompt_id: 'test-prompt',
+        node_id: '456:789'
+      }
+    }
+
+    expect(store.executingNode).toBe(mockNodeInSubgraph)
+  })
+
+  it('should return null when no node is executing', () => {
+    store.nodeProgressStates = {}
+
+    expect(store.executingNode).toBeNull()
+  })
+
+  it('should return null when executing node cannot be found', () => {
+    vi.mocked(app.rootGraph.getNodeById).mockReturnValue(null)
+
+    store.nodeProgressStates = {
+      '999': {
+        state: 'running',
+        value: 0,
+        max: 100,
+        display_node_id: '999',
+        prompt_id: 'test-prompt',
+        node_id: '999'
+      }
+    }
+
+    expect(store.executingNode).toBeNull()
+  })
+})
+
 describe('useExecutionErrorStore - setMissingNodeTypes', () => {
   let store: ReturnType<typeof useExecutionErrorStore>
 

src/stores/executionStore.ts

@@ -6,11 +6,7 @@ import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import type {
-  ComfyNode,
-  ComfyWorkflowJSON,
-  NodeId
-} from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import type {
   ExecutedWsMessage,
@@ -32,7 +28,10 @@ import { useJobPreviewStore } from '@/stores/jobPreviewStore'
 import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import type { NodeLocatorId } from '@/types/nodeIdentification'
 import { classifyCloudValidationError } from '@/utils/executionErrorUtil'
-import { executionIdToNodeLocatorId } from '@/utils/graphTraversalUtil'
+import {
+  executionIdToNodeLocatorId,
+  getNodeByExecutionId
+} from '@/utils/graphTraversalUtil'
 
 interface QueuedJob {
   /**
@@ -142,20 +141,10 @@ export const useExecutionStore = defineStore('execution', () => {
   )
 
   // For backward compatibility - returns the primary executing node
-  const executingNode = computed<ComfyNode | null>(() => {
+  const executingNode = computed(() => {
     if (!executingNodeId.value) return null
 
-    const workflow: ComfyWorkflow | undefined = activeJob.value?.workflow
-    if (!workflow) return null
-
-    const canvasState: ComfyWorkflowJSON | null =
-      workflow.changeTracker?.activeState ?? null
-    if (!canvasState) return null
-
-    return (
-      canvasState.nodes.find((n) => String(n.id) === executingNodeId.value) ??
-      null
-    )
+    return getNodeByExecutionId(app.rootGraph, String(executingNodeId.value))
   })
 
   // This is the progress of the currently executing node (for backward compatibility)