fix: remove unnecessary as any casts for nullable assignments

- `node.widgets = undefined` works since widgets is `IBaseWidget[] | undefined`
- `node.graph = null` works since graph is `LGraph | Subgraph | null`

Addresses review feedback:
https://github.com/Comfy-Org/ComfyUI_frontend/pull/11149#discussion_r3187561906

browser_tests/assets/vueNodes/ksampler-denoise-widget-link.json

@@ -0,0 +1,90 @@
+{
+  "id": "06e5b524-5a40-40b9-b561-199dfab18cf0",
+  "revision": 0,
+  "last_node_id": 12,
+  "last_link_id": 10,
+  "nodes": [
+    {
+      "id": 10,
+      "type": "KSampler",
+      "pos": [230, 110],
+      "size": [270, 317.5666809082031],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": null
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": null
+        },
+        {
+          "name": "denoise",
+          "type": "FLOAT",
+          "widget": {
+            "name": "denoise"
+          },
+          "link": 10
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "KSampler"
+      },
+      "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
+    },
+    {
+      "id": 11,
+      "type": "PrimitiveFloat",
+      "pos": [-80.55032348632812, 375.2260443115233],
+      "size": [270, 80.23332977294922],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "FLOAT",
+          "type": "FLOAT",
+          "links": [10]
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PrimitiveFloat"
+      },
+      "widgets_values": [0]
+    }
+  ],
+  "links": [[10, 11, 0, 10, 4, "FLOAT"]],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 0.8264462809917354,
+      "offset": [1335.8909766107738, 692.7345403667316]
+    },
+    "frontendVersion": "1.45.4"
+  },
+  "version": 0.4
+}

browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts

@@ -1133,3 +1133,108 @@ test.describe(
     })
   }
 )
+
+test.describe('Vue Node Widget Link Position', { tag: '@vue-nodes' }, () => {
+  test('should keep widget-input link aligned after persisted-workflow reload', async ({
+    comfyPage
+  }) => {
+    test.setTimeout(30000)
+
+    await comfyPage.workflow.loadWorkflow(
+      'vueNodes/ksampler-denoise-widget-link'
+    )
+    await comfyPage.vueNodes.waitForNodes(2)
+    await comfyPage.workflow.waitForDraftPersisted()
+    await comfyPage.workflow.reloadAndWaitForApp()
+    await comfyPage.vueNodes.waitForNodes(2)
+
+    const ksampler = await comfyPage.page.evaluate(() => {
+      const node = window.app!.graph.nodes.find((n) => n.type === 'KSampler')
+      if (!node) return null
+      const findIndex = (name: string) =>
+        node.inputs.findIndex(
+          (input) => input.name === name || input.widget?.name === name
+        )
+      return {
+        id: node.id,
+        denoiseIndex: findIndex('denoise'),
+        schedulerIndex: findIndex('scheduler')
+      }
+    })
+    if (!ksampler) {
+      throw new Error('KSampler should be present in fixture')
+    }
+    expect(
+      ksampler.denoiseIndex,
+      'denoise input slot not found'
+    ).toBeGreaterThanOrEqual(0)
+    expect(
+      ksampler.schedulerIndex,
+      'scheduler input slot not found'
+    ).toBeGreaterThanOrEqual(0)
+
+    const denoiseSlot = slotLocator(
+      comfyPage.page,
+      ksampler.id,
+      ksampler.denoiseIndex,
+      true
+    )
+    const schedulerSlot = slotLocator(
+      comfyPage.page,
+      ksampler.id,
+      ksampler.schedulerIndex,
+      true
+    )
+    await expectVisibleAll(denoiseSlot, schedulerSlot)
+
+    await expect
+      .poll(() =>
+        getInputLinkDetails(comfyPage.page, ksampler.id, ksampler.denoiseIndex)
+      )
+      .toMatchObject({
+        targetId: ksampler.id,
+        targetSlot: ksampler.denoiseIndex
+      })
+
+    // If the regression returns, getInputPos stays stale relative to the
+    // grown slot DOM and the endpoint drifts toward scheduler. Re-read
+    // positions each retry so layout settle doesn't cause flakes.
+    await expect(async () => {
+      const linkEnd = await comfyPage.page.evaluate(
+        ([nodeId, targetSlotIndex]) => {
+          const node = window.app!.graph.getNodeById(nodeId)
+          if (!node) return null
+          const slotPos = node.getInputPos(targetSlotIndex)
+          const [cx, cy] = window.app!.canvas.ds.convertOffsetToCanvas([
+            slotPos[0],
+            slotPos[1]
+          ])
+          const rect = window.app!.canvas.canvas.getBoundingClientRect()
+          return { x: cx + rect.left, y: cy + rect.top }
+        },
+        [ksampler.id, ksampler.denoiseIndex] as const
+      )
+      expect(linkEnd, 'link endpoint should resolve').not.toBeNull()
+
+      const denoiseCenter = await getCenter(denoiseSlot)
+      const schedulerCenter = await getCenter(schedulerSlot)
+      const distToDenoise = Math.hypot(
+        linkEnd!.x - denoiseCenter.x,
+        linkEnd!.y - denoiseCenter.y
+      )
+      const rowGap = Math.hypot(
+        denoiseCenter.x - schedulerCenter.x,
+        denoiseCenter.y - schedulerCenter.y
+      )
+
+      // Bound at rowGap / 4 - half the inter-slot midpoint, so any drift
+      // toward scheduler fails well before reaching it.
+      expect(
+        distToDenoise,
+        `Link endpoint (${linkEnd!.x.toFixed(1)}, ${linkEnd!.y.toFixed(1)}) is ` +
+          `${distToDenoise.toFixed(1)}px from denoise — should be within ` +
+          `${(rowGap / 4).toFixed(1)}px (quarter of inter-slot gap ${rowGap.toFixed(1)}px)`
+      ).toBeLessThan(rowGap / 4)
+    }).toPass({ timeout: 5000 })
+  })
+})

src/renderer/extensions/vueNodes/components/NodeWidgets.vue

@@ -90,6 +90,7 @@ import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteracti
 import AppInput from '@/renderer/extensions/linearMode/AppInput.vue'
 import { useNodeZIndex } from '@/renderer/extensions/vueNodes/composables/useNodeZIndex'
 import { useProcessedWidgets } from '@/renderer/extensions/vueNodes/composables/useProcessedWidgets'
+import { useVueElementTracking } from '@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking'
 import { cn } from '@comfyorg/tailwind-utils'
 
 import InputSlot from './InputSlot.vue'
@@ -134,4 +135,9 @@ const {
   processedWidgets,
   showAdvanced
 } = useProcessedWidgets(() => nodeData)
+
+// Tracks widget-row growth that the node-level RO can't see
+if (nodeData?.id != null) {
+  useVueElementTracking(String(nodeData.id), 'widgets-grid')
+}
 </script>

src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts

@@ -29,7 +29,10 @@ const raf = createRafBatch(() => {
   flushScheduledSlotLayoutSync()
 })
 
-function scheduleSlotLayoutSync(nodeId: string) {
+export function scheduleSlotLayoutSync(nodeId: string) {
+  // Drop signals for unregistered nodes (e.g. preview nodes with synthetic
+  // ids from LGraphNodePreview) - they'd otherwise pump setDirty per RAF.
+  if (!useNodeSlotRegistryStore().getNode(nodeId)) return
   pendingNodes.add(nodeId)
   raf.schedule()
 }

src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.test.ts

@@ -43,7 +43,8 @@ const testState = vi.hoisted(() => ({
   nodeLayouts: new Map<NodeId, NodeLayout>(),
   batchUpdateNodeBounds: vi.fn(),
   setSource: vi.fn(),
-  syncNodeSlotLayoutsFromDOM: vi.fn()
+  syncNodeSlotLayoutsFromDOM: vi.fn(),
+  scheduleSlotLayoutSync: vi.fn()
 }))
 
 vi.mock('@vueuse/core', () => ({
@@ -73,6 +74,7 @@ vi.mock('@/renderer/core/layout/store/layoutStore', () => ({
 }))
 
 vi.mock('./useSlotElementTracking', () => ({
+  scheduleSlotLayoutSync: testState.scheduleSlotLayoutSync,
   syncNodeSlotLayoutsFromDOM: testState.syncNodeSlotLayoutsFromDOM
 }))
 
@@ -159,6 +161,7 @@ describe('useVueNodeResizeTracking', () => {
     testState.batchUpdateNodeBounds.mockReset()
     testState.setSource.mockReset()
     testState.syncNodeSlotLayoutsFromDOM.mockReset()
+    testState.scheduleSlotLayoutSync.mockReset()
     resizeObserverState.observe.mockReset()
     resizeObserverState.unobserve.mockReset()
     resizeObserverState.disconnect.mockReset()
@@ -317,4 +320,25 @@ describe('useVueNodeResizeTracking', () => {
     expect(testState.setSource).toHaveBeenCalledWith(LayoutSource.DOM)
     expect(testState.batchUpdateNodeBounds).toHaveBeenCalled()
   })
+
+  it('widgets-grid resize schedules a slot resync without writing node bounds', () => {
+    const parentNodeId: NodeId = 'parent-node'
+    const element = document.createElement('div')
+    element.dataset.widgetsGridNodeId = parentNodeId
+    const boxSizes = [{ inlineSize: 200, blockSize: 80 }]
+    const entry = {
+      target: element,
+      borderBoxSize: boxSizes,
+      contentBoxSize: boxSizes,
+      devicePixelContentBoxSize: boxSizes,
+      contentRect: new DOMRect(0, 0, 200, 80)
+    } satisfies ResizeEntryLike
+
+    resizeObserverState.callback?.([entry], createObserverMock())
+
+    expect(testState.scheduleSlotLayoutSync).toHaveBeenCalledWith(parentNodeId)
+    expect(testState.batchUpdateNodeBounds).not.toHaveBeenCalled()
+    expect(testState.setSource).not.toHaveBeenCalled()
+    expect(testState.syncNodeSlotLayoutsFromDOM).not.toHaveBeenCalled()
+  })
 })

src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts

@@ -24,7 +24,10 @@ import {
 } from '@/renderer/core/layout/utils/geometry'
 import { removeNodeTitleHeight } from '@/renderer/core/layout/utils/nodeSizeUtil'
 
-import { syncNodeSlotLayoutsFromDOM } from './useSlotElementTracking'
+import {
+  scheduleSlotLayoutSync,
+  syncNodeSlotLayoutsFromDOM
+} from './useSlotElementTracking'
 
 /**
  * Generic update item for element bounds tracking
@@ -47,14 +50,14 @@ interface CachedNodeMeasurement {
 interface ElementTrackingConfig {
   /** Data attribute name (e.g., 'nodeId') */
   dataAttribute: string
-  /** Handler for processing bounds updates */
-  updateHandler: (updates: ElementBoundsUpdate[]) => void
+  /** Handler for processing bounds updates. Omit for signal-only entries. */
+  updateHandler?: (updates: ElementBoundsUpdate[]) => void
 }
 
 /**
  * Registry of tracking configurations by element type
  */
-const trackingConfigs: Map<string, ElementTrackingConfig> = new Map([
+const trackingConfigs = new Map<string, ElementTrackingConfig>([
   [
     'node',
     {
@@ -67,7 +70,10 @@ const trackingConfigs: Map<string, ElementTrackingConfig> = new Map([
         layoutStore.batchUpdateNodeBounds(nodeUpdates)
       }
     }
-  ]
+  ],
+  // Signal-only: outer node stays at its persisted min-h floor during
+  // widget hydration, so the inner grid's RO is the only slot-drift signal.
+  ['widgets-grid', { dataAttribute: 'widgetsGridNodeId' }]
 ])
 
 // Elements whose ResizeObserver fired while the tab was hidden
@@ -121,6 +127,14 @@ const resizeObserver = new ResizeObserver((entries) => {
     if (!(entry.target instanceof HTMLElement)) continue
     const element = entry.target
 
+    // Signal-only widgets-grid resize - route the parent node through the
+    // slot-layout pipeline and skip bounds processing entirely.
+    const widgetsGridParentNodeId = element.dataset.widgetsGridNodeId
+    if (widgetsGridParentNodeId) {
+      scheduleSlotLayoutSync(widgetsGridParentNodeId as NodeId)
+      continue
+    }
+
     // Find which type this element belongs to
     let elementType: string | undefined
     let elementId: string | undefined
@@ -238,7 +252,7 @@ const resizeObserver = new ResizeObserver((entries) => {
     // Flush per-type
     for (const [type, updates] of updatesByType) {
       const config = trackingConfigs.get(type)
-      if (config && updates.length) config.updateHandler(updates)
+      if (config?.updateHandler && updates.length) config.updateHandler(updates)
     }
   }
 

src/schemas/apiSchema.ts

@@ -10,7 +10,6 @@ import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 const zNodeType = z.string()
 const zJobId = z.string()
 export type JobId = z.infer<typeof zJobId>
-const zWorkflowId = z.string()
 export const resultItemType = z.enum(['input', 'output', 'temp'])
 export type ResultItemType = z.infer<typeof resultItemType>
 
@@ -57,7 +56,6 @@ const zProgressWsMessage = z.object({
   value: z.number().int(),
   max: z.number().int(),
   prompt_id: zJobId,
-  workflow_id: zWorkflowId.optional(),
   node: zNodeId
 })
 
@@ -67,7 +65,6 @@ const zNodeProgressState = z.object({
   state: z.enum(['pending', 'running', 'finished', 'error']),
   node_id: zNodeId,
   prompt_id: zJobId,
-  workflow_id: zWorkflowId.optional(),
   display_node_id: zNodeId.optional(),
   parent_node_id: zNodeId.optional(),
   real_node_id: zNodeId.optional()
@@ -75,15 +72,13 @@ const zNodeProgressState = z.object({
 
 const zProgressStateWsMessage = z.object({
   prompt_id: zJobId,
-  workflow_id: zWorkflowId.optional(),
   nodes: z.record(zNodeId, zNodeProgressState)
 })
 
 const zExecutingWsMessage = z.object({
   node: zNodeId,
   display_node: zNodeId,
-  prompt_id: zJobId,
-  workflow_id: zWorkflowId.optional()
+  prompt_id: zJobId
 })
 
 const zExecutedWsMessage = zExecutingWsMessage.extend({
@@ -93,7 +88,6 @@ const zExecutedWsMessage = zExecutingWsMessage.extend({
 
 const zExecutionWsMessageBase = z.object({
   prompt_id: zJobId,
-  workflow_id: zWorkflowId.optional(),
   timestamp: z.number().int()
 })
 
@@ -121,8 +115,7 @@ const zExecutionErrorWsMessage = zExecutionWsMessageBase.extend({
 const zProgressTextWsMessage = z.object({
   nodeId: zNodeId,
   text: z.string(),
-  prompt_id: z.string().optional(),
-  workflow_id: zWorkflowId.optional()
+  prompt_id: z.string().optional()
 })
 
 const zNotificationWsMessage = z.object({

src/stores/executionStore.test.ts

@@ -11,22 +11,12 @@ const {
   mockNodeExecutionIdToNodeLocatorId,
   mockNodeIdToNodeLocatorId,
   mockNodeLocatorIdToNodeExecutionId,
-  mockShowTextPreview,
-  mockActiveWorkflow,
-  mockRevokePreviewsByExecutionId
+  mockShowTextPreview
 } = vi.hoisted(() => ({
   mockNodeExecutionIdToNodeLocatorId: vi.fn(),
   mockNodeIdToNodeLocatorId: vi.fn(),
   mockNodeLocatorIdToNodeExecutionId: vi.fn(),
-  mockShowTextPreview: vi.fn(),
-  mockActiveWorkflow: {
-    current: null as null | {
-      activeState?: { id?: string }
-      initialState?: { id?: string }
-      path?: string
-    }
-  },
-  mockRevokePreviewsByExecutionId: vi.fn()
+  mockShowTextPreview: vi.fn()
 }))
 
 import type * as WorkflowStoreModule from '@/platform/workflow/management/stores/workflowStore'
@@ -45,10 +35,7 @@ vi.mock('@/platform/workflow/management/stores/workflowStore', async () => {
     useWorkflowStore: vi.fn(() => ({
       nodeExecutionIdToNodeLocatorId: mockNodeExecutionIdToNodeLocatorId,
       nodeIdToNodeLocatorId: mockNodeIdToNodeLocatorId,
-      nodeLocatorIdToNodeExecutionId: mockNodeLocatorIdToNodeExecutionId,
-      get activeWorkflow() {
-        return mockActiveWorkflow.current
-      }
+      nodeLocatorIdToNodeExecutionId: mockNodeLocatorIdToNodeExecutionId
     }))
   }
 })
@@ -83,9 +70,9 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 
-vi.mock('@/stores/nodeOutputStore', () => ({
+vi.mock('@/stores/imagePreviewStore', () => ({
   useNodeOutputStore: () => ({
-    revokePreviewsByExecutionId: mockRevokePreviewsByExecutionId
+    revokePreviewsByExecutionId: vi.fn()
   })
 }))
 
@@ -504,445 +491,6 @@ describe('useExecutionStore - clearActiveJobIfStale', () => {
   })
 })
 
-describe('useExecutionStore - active workflow gating', () => {
-  let store: ReturnType<typeof useExecutionStore>
-
-  function makeProgressNodes(
-    nodeId: string,
-    jobId: string
-  ): Record<string, NodeProgressState> {
-    return {
-      [nodeId]: {
-        value: 5,
-        max: 10,
-        state: 'running',
-        node_id: nodeId,
-        prompt_id: jobId,
-        display_node_id: nodeId
-      }
-    }
-  }
-
-  function fireProgressState(
-    jobId: string,
-    nodes: Record<string, NodeProgressState>,
-    workflowId?: string
-  ) {
-    const handler = apiEventHandlers.get('progress_state')
-    if (!handler) throw new Error('progress_state handler not bound')
-    handler(
-      new CustomEvent('progress_state', {
-        detail: { nodes, prompt_id: jobId, workflow_id: workflowId }
-      })
-    )
-  }
-
-  function fireProgress(
-    jobId: string,
-    nodeId: string,
-    workflowId?: string,
-    value = 5,
-    max = 10
-  ) {
-    const handler = apiEventHandlers.get('progress')
-    if (!handler) throw new Error('progress handler not bound')
-    handler(
-      new CustomEvent('progress', {
-        detail: {
-          value,
-          max,
-          prompt_id: jobId,
-          node: nodeId,
-          workflow_id: workflowId
-        }
-      })
-    )
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    apiEventHandlers.clear()
-    mockActiveWorkflow.current = null
-    setActivePinia(createTestingPinia({ stubActions: false }))
-    store = useExecutionStore()
-    store.bindExecutionEvents()
-  })
-
-  it('always updates per-job progress regardless of active workflow', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-
-    fireProgressState(
-      'job-other',
-      makeProgressNodes('1', 'job-other'),
-      'wf-other'
-    )
-
-    expect(store.nodeProgressStatesByJob).toHaveProperty('job-other')
-  })
-
-  it('skips global mirror when message workflow_id mismatches active workflow', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-
-    fireProgressState(
-      'job-other',
-      makeProgressNodes('1', 'job-other'),
-      'wf-other'
-    )
-
-    expect(store.nodeProgressStates).toEqual({})
-  })
-
-  it('updates global mirror when message workflow_id matches active workflow', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-
-    fireProgressState('job-1', makeProgressNodes('1', 'job-1'), 'wf-active')
-
-    expect(store.nodeProgressStates).toEqual(makeProgressNodes('1', 'job-1'))
-  })
-
-  it('falls back to jobIdToWorkflowId mapping when workflow_id missing', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    store.registerJobWorkflowIdMapping('job-other', 'wf-other')
-
-    fireProgressState('job-other', makeProgressNodes('1', 'job-other'))
-
-    expect(store.nodeProgressStates).toEqual({})
-  })
-
-  it('falls back to session path mapping when no id mapping is registered', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    store.ensureSessionWorkflowPath('job-other', '/wf-other.json')
-
-    fireProgressState('job-other', makeProgressNodes('1', 'job-other'))
-
-    expect(store.nodeProgressStates).toEqual({})
-  })
-
-  it('preserves single-tab behaviour when ownership is unresolvable', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-
-    fireProgressState('job-unknown', makeProgressNodes('1', 'job-unknown'))
-
-    expect(store.nodeProgressStates).toEqual(
-      makeProgressNodes('1', 'job-unknown')
-    )
-  })
-
-  it('updates mirror when there is no active workflow', () => {
-    mockActiveWorkflow.current = null
-
-    fireProgressState('job-1', makeProgressNodes('1', 'job-1'), 'wf-1')
-
-    expect(store.nodeProgressStates).toEqual(makeProgressNodes('1', 'job-1'))
-  })
-
-  it('skips preview revocation for non-active workflow messages', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    mockRevokePreviewsByExecutionId.mockClear()
-
-    fireProgressState(
-      'job-other',
-      makeProgressNodes('1', 'job-other'),
-      'wf-other'
-    )
-
-    expect(mockRevokePreviewsByExecutionId).not.toHaveBeenCalled()
-  })
-
-  it('revokes previews for active workflow messages', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    mockRevokePreviewsByExecutionId.mockClear()
-
-    fireProgressState('job-1', makeProgressNodes('1', 'job-1'), 'wf-active')
-
-    expect(mockRevokePreviewsByExecutionId).toHaveBeenCalledWith('1')
-  })
-
-  it('skips _executingNodeProgress on workflow_id mismatch', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-
-    fireProgress('job-other', '1', 'wf-other')
-
-    expect(store._executingNodeProgress).toBeNull()
-  })
-
-  it('updates _executingNodeProgress on workflow_id match', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-
-    fireProgress('job-1', '1', 'wf-active', 7, 10)
-
-    expect(store._executingNodeProgress).toEqual({
-      value: 7,
-      max: 10,
-      prompt_id: 'job-1',
-      node: '1',
-      workflow_id: 'wf-active'
-    })
-  })
-
-  it('execution_start from a non-active workflow does not steal activeJobId', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const handler = apiEventHandlers.get('execution_start')
-    if (!handler) throw new Error('execution_start handler not bound')
-    handler(
-      new CustomEvent('execution_start', {
-        detail: {
-          prompt_id: 'job-other',
-          timestamp: 0,
-          workflow_id: 'wf-other'
-        }
-      })
-    )
-
-    expect(store.activeJobId).toBeNull()
-  })
-
-  it('execution_start from active workflow adopts activeJobId', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const handler = apiEventHandlers.get('execution_start')
-    if (!handler) throw new Error('execution_start handler not bound')
-    handler(
-      new CustomEvent('execution_start', {
-        detail: {
-          prompt_id: 'job-1',
-          timestamp: 0,
-          workflow_id: 'wf-active'
-        }
-      })
-    )
-
-    expect(store.activeJobId).toBe('job-1')
-  })
-
-  it('execution_success from a non-active workflow does not clear activeJobId', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const startHandler = apiEventHandlers.get('execution_start')
-    if (!startHandler) throw new Error('execution_start handler not bound')
-    startHandler(
-      new CustomEvent('execution_start', {
-        detail: {
-          prompt_id: 'job-1',
-          timestamp: 0,
-          workflow_id: 'wf-active'
-        }
-      })
-    )
-
-    const successHandler = apiEventHandlers.get('execution_success')
-    if (!successHandler) throw new Error('execution_success handler not bound')
-    successHandler(
-      new CustomEvent('execution_success', {
-        detail: {
-          prompt_id: 'job-other',
-          timestamp: 0,
-          workflow_id: 'wf-other'
-        }
-      })
-    )
-
-    expect(store.activeJobId).toBe('job-1')
-  })
-
-  it('execution_interrupted from a non-active workflow does not clear activeJobId', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const startHandler = apiEventHandlers.get('execution_start')
-    if (!startHandler) throw new Error('execution_start handler not bound')
-    startHandler(
-      new CustomEvent('execution_start', {
-        detail: {
-          prompt_id: 'job-1',
-          timestamp: 0,
-          workflow_id: 'wf-active'
-        }
-      })
-    )
-
-    const intHandler = apiEventHandlers.get('execution_interrupted')
-    if (!intHandler) throw new Error('execution_interrupted handler not bound')
-    intHandler(
-      new CustomEvent('execution_interrupted', {
-        detail: {
-          prompt_id: 'job-other',
-          timestamp: 0,
-          node_id: '1',
-          node_type: 'X',
-          executed: [],
-          workflow_id: 'wf-other'
-        }
-      })
-    )
-
-    expect(store.activeJobId).toBe('job-1')
-  })
-
-  it('execution_cached from a non-active workflow does not mark active job nodes', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const startHandler = apiEventHandlers.get('execution_start')
-    if (!startHandler) throw new Error('execution_start handler not bound')
-    startHandler(
-      new CustomEvent('execution_start', {
-        detail: { prompt_id: 'job-1', timestamp: 0, workflow_id: 'wf-active' }
-      })
-    )
-
-    const cachedHandler = apiEventHandlers.get('execution_cached')
-    if (!cachedHandler) throw new Error('execution_cached handler not bound')
-    cachedHandler(
-      new CustomEvent('execution_cached', {
-        detail: {
-          prompt_id: 'job-other',
-          timestamp: 0,
-          workflow_id: 'wf-other',
-          nodes: ['n1', 'n2']
-        }
-      })
-    )
-
-    expect(store.activeJob?.nodes).toEqual({})
-  })
-
-  it('executed from a non-active workflow does not mark active job nodes', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const startHandler = apiEventHandlers.get('execution_start')
-    if (!startHandler) throw new Error('execution_start handler not bound')
-    startHandler(
-      new CustomEvent('execution_start', {
-        detail: { prompt_id: 'job-1', timestamp: 0, workflow_id: 'wf-active' }
-      })
-    )
-
-    const executedHandler = apiEventHandlers.get('executed')
-    if (!executedHandler) throw new Error('executed handler not bound')
-    executedHandler(
-      new CustomEvent('executed', {
-        detail: {
-          prompt_id: 'job-other',
-          node: 'n1',
-          display_node: 'n1',
-          workflow_id: 'wf-other',
-          output: {}
-        }
-      })
-    )
-
-    expect(store.activeJob?.nodes['n1']).toBeUndefined()
-  })
-
-  it('execution_error from a non-active workflow does not clear active job state but still clears the errored job initializing flag', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const startHandler = apiEventHandlers.get('execution_start')
-    if (!startHandler) throw new Error('execution_start handler not bound')
-    startHandler(
-      new CustomEvent('execution_start', {
-        detail: { prompt_id: 'job-1', timestamp: 0, workflow_id: 'wf-active' }
-      })
-    )
-
-    store.initializingJobIds = new Set(['job-other'])
-
-    const errorHandler = apiEventHandlers.get('execution_error')
-    if (!errorHandler) throw new Error('execution_error handler not bound')
-    errorHandler(
-      new CustomEvent('execution_error', {
-        detail: {
-          prompt_id: 'job-other',
-          timestamp: 0,
-          workflow_id: 'wf-other',
-          node_id: 'n1',
-          node_type: 'X',
-          executed: [],
-          exception_message: 'oops',
-          exception_type: 'RuntimeError',
-          traceback: [],
-          current_inputs: {},
-          current_outputs: {}
-        }
-      })
-    )
-
-    expect(store.activeJobId).toBe('job-1')
-    expect(store.initializingJobIds.has('job-other')).toBe(false)
-    expect(useExecutionErrorStore().lastExecutionError).toBeNull()
-  })
-
-  it('revokes preview when node transitions pending -> running', () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const pendingNodes: Record<string, NodeProgressState> = {
-      n1: {
-        value: 0,
-        max: 10,
-        state: 'pending',
-        node_id: 'n1',
-        prompt_id: 'job-1',
-        display_node_id: 'n1'
-      }
-    }
-    fireProgressState('job-1', pendingNodes, 'wf-active')
-    mockRevokePreviewsByExecutionId.mockClear()
-
-    const runningNodes: Record<string, NodeProgressState> = {
-      n1: { ...pendingNodes.n1, state: 'running', value: 1 }
-    }
-    fireProgressState('job-1', runningNodes, 'wf-active')
-
-    expect(mockRevokePreviewsByExecutionId).toHaveBeenCalledWith('n1')
-  })
-})
-
 describe('useExecutionStore - progress_text startup guard', () => {
   let store: ReturnType<typeof useExecutionStore>
 
@@ -950,7 +498,6 @@ describe('useExecutionStore - progress_text startup guard', () => {
     nodeId: string
     text: string
     prompt_id?: string
-    workflow_id?: string
   }) {
     const handler = apiEventHandlers.get('progress_text')
     if (!handler) throw new Error('progress_text handler not bound')
@@ -960,7 +507,6 @@ describe('useExecutionStore - progress_text startup guard', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     apiEventHandlers.clear()
-    mockActiveWorkflow.current = null
     setActivePinia(createTestingPinia({ stubActions: false }))
     store = useExecutionStore()
     store.bindExecutionEvents()
@@ -993,50 +539,6 @@ describe('useExecutionStore - progress_text startup guard', () => {
 
     expect(mockShowTextPreview).toHaveBeenCalledWith(mockNode, 'warming up')
   })
-
-  it('skips progress_text whose workflow_id mismatches active workflow', async () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const mockNode = createMockLGraphNode({ id: 1 })
-    const { useCanvasStore } =
-      await import('@/renderer/core/canvas/canvasStore')
-    useCanvasStore().canvas = {
-      graph: { getNodeById: vi.fn(() => mockNode) }
-    } as unknown as LGraphCanvas
-
-    fireProgressText({
-      nodeId: '1',
-      text: 'warming up',
-      prompt_id: 'job-other',
-      workflow_id: 'wf-other'
-    })
-
-    expect(mockShowTextPreview).not.toHaveBeenCalled()
-  })
-
-  it('forwards progress_text whose workflow_id matches active workflow', async () => {
-    mockActiveWorkflow.current = {
-      activeState: { id: 'wf-active' },
-      path: '/wf-active.json'
-    }
-    const mockNode = createMockLGraphNode({ id: 1 })
-    const { useCanvasStore } =
-      await import('@/renderer/core/canvas/canvasStore')
-    useCanvasStore().canvas = {
-      graph: { getNodeById: vi.fn(() => mockNode) }
-    } as unknown as LGraphCanvas
-
-    fireProgressText({
-      nodeId: '1',
-      text: 'warming up',
-      prompt_id: 'job-1',
-      workflow_id: 'wf-active'
-    })
-
-    expect(mockShowTextPreview).toHaveBeenCalledWith(mockNode, 'warming up')
-  })
 })
 
 describe('useExecutionErrorStore - Node Error Lookups', () => {
@@ -1316,7 +818,6 @@ describe('useExecutionStore - WebSocket event handlers', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     apiEventHandlers.clear()
-    mockActiveWorkflow.current = null
     setActivePinia(createTestingPinia({ stubActions: false }))
     store = useExecutionStore()
     store.bindExecutionEvents()
@@ -1331,7 +832,10 @@ describe('useExecutionStore - WebSocket event handlers', () => {
     })
 
     it('clears initializing state for the starting job', () => {
-      store.initializingJobIds = new Set(['job-1', 'job-2'])
+      store.initializingJobIds = new Set([
+        'job-1',
+        'job-2'
+      ]) as unknown as Set<string>
       fire('execution_start', { prompt_id: 'job-1', timestamp: 0 })
 
       expect(store.initializingJobIds.has('job-1')).toBe(false)
@@ -1422,16 +926,6 @@ describe('useExecutionStore - WebSocket event handlers', () => {
       expect(store.activeJobId).toBeNull()
       expect(store.queuedJobs['job-1']).toBeUndefined()
     })
-
-    it('clears initializing state for the completed job', () => {
-      store.initializingJobIds = new Set(['job-1', 'job-2'])
-      fire('execution_start', { prompt_id: 'job-1', timestamp: 0 })
-
-      fire('execution_success', { prompt_id: 'job-1', timestamp: 0 })
-
-      expect(store.initializingJobIds.has('job-1')).toBe(false)
-      expect(store.initializingJobIds.has('job-2')).toBe(true)
-    })
   })
 
   describe('executing', () => {

src/stores/executionStore.ts

@@ -247,32 +247,22 @@ export const useExecutionStore = defineStore('execution', () => {
   }
 
   function handleExecutionStart(e: CustomEvent<ExecutionStartWsMessage>) {
-    const jobId = e.detail.prompt_id
-    queuedJobs.value[jobId] ??= { nodes: {} }
-    clearInitializationByJobId(jobId)
+    executionIdToLocatorCache.clear()
+    executionErrorStore.clearAllErrors()
+    activeJobId.value = e.detail.prompt_id
+    queuedJobs.value[activeJobId.value] ??= { nodes: {} }
+    clearInitializationByJobId(activeJobId.value)
 
     // Ensure path mapping exists — execution_start can arrive via WebSocket
     // before the HTTP response from queuePrompt triggers storeJob.
-    if (!jobIdToSessionWorkflowPath.value.has(jobId)) {
-      const path = queuedJobs.value[jobId]?.workflow?.path
-      if (path) ensureSessionWorkflowPath(jobId, path)
+    if (!jobIdToSessionWorkflowPath.value.has(activeJobId.value)) {
+      const path = queuedJobs.value[activeJobId.value]?.workflow?.path
+      if (path) ensureSessionWorkflowPath(activeJobId.value, path)
     }
-
-    // Only adopt as the global active job and clear shared UI state when the
-    // starting job belongs to the active workflow. Otherwise a job started
-    // from another tab would steal activeJobId and clobber the active tab's
-    // execution UI.
-    if (!messageMatchesActiveWorkflow(jobId, e.detail.workflow_id)) return
-
-    executionIdToLocatorCache.clear()
-    executionErrorStore.clearAllErrors()
-    activeJobId.value = jobId
   }
 
   function handleExecutionCached(e: CustomEvent<ExecutionCachedWsMessage>) {
     if (!activeJob.value) return
-    if (!messageMatchesActiveWorkflow(e.detail.prompt_id, e.detail.workflow_id))
-      return
     for (const n of e.detail.nodes) {
       activeJob.value.nodes[n] = true
     }
@@ -282,15 +272,12 @@ export const useExecutionStore = defineStore('execution', () => {
     e: CustomEvent<ExecutionInterruptedWsMessage>
   ) {
     const jobId = e.detail.prompt_id
-    clearInitializationByJobId(jobId)
-    if (!messageMatchesActiveWorkflow(jobId, e.detail.workflow_id)) return
+    if (activeJobId.value) clearInitializationByJobId(activeJobId.value)
     resetExecutionState(jobId)
   }
 
   function handleExecuted(e: CustomEvent<ExecutedWsMessage>) {
     if (!activeJob.value) return
-    if (!messageMatchesActiveWorkflow(e.detail.prompt_id, e.detail.workflow_id))
-      return
     activeJob.value.nodes[e.detail.node] = true
   }
 
@@ -301,16 +288,16 @@ export const useExecutionStore = defineStore('execution', () => {
       })
     }
     const jobId = e.detail.prompt_id
-    clearInitializationByJobId(jobId)
-    if (!messageMatchesActiveWorkflow(jobId, e.detail.workflow_id)) return
     resetExecutionState(jobId)
   }
 
   function handleExecuting(e: CustomEvent<NodeId | null>): void {
+    // Clear the current node progress when a new node starts executing
     _executingNodeProgress.value = null
 
     if (!activeJob.value) return
 
+    // Update the executing nodes list
     if (typeof e.detail !== 'string') {
       if (activeJobId.value) {
         delete queuedJobs.value[activeJobId.value]
@@ -348,110 +335,43 @@ export const useExecutionStore = defineStore('execution', () => {
   }
 
   function handleProgressState(e: CustomEvent<ProgressStateWsMessage>) {
-    const { nodes, prompt_id: jobId, workflow_id: messageWorkflowId } = e.detail
-    const isActiveWorkflowMessage = messageMatchesActiveWorkflow(
-      jobId,
-      messageWorkflowId
-    )
+    const { nodes, prompt_id: jobId } = e.detail
 
+    // Revoke previews for nodes that are starting to execute
     const previousForJob = nodeProgressStatesByJob.value[jobId] || {}
-    if (isActiveWorkflowMessage) {
-      const { revokePreviewsByExecutionId } = useNodeOutputStore()
-      for (const nodeId in nodes) {
-        const nodeState = nodes[nodeId]
-        if (
-          nodeState.state === 'running' &&
-          previousForJob[nodeId]?.state !== 'running'
-        ) {
-          revokePreviewsByExecutionId(nodeId)
-        }
+    for (const nodeId in nodes) {
+      const nodeState = nodes[nodeId]
+      if (nodeState.state === 'running' && !previousForJob[nodeId]) {
+        // This node just started executing, revoke its previews
+        // Note that we're doing the *actual* node id instead of the display node id
+        // here intentionally. That way, we don't clear the preview every time a new node
+        // within an expanded graph starts executing.
+        const { revokePreviewsByExecutionId } = useNodeOutputStore()
+        revokePreviewsByExecutionId(nodeId)
       }
     }
 
+    // Update the progress states for all nodes
     nodeProgressStatesByJob.value = {
       ...nodeProgressStatesByJob.value,
       [jobId]: nodes
     }
     evictOldProgressJobs()
+    nodeProgressStates.value = nodes
 
-    if (isActiveWorkflowMessage) {
-      nodeProgressStates.value = nodes
-
-      if (executingNodeId.value && nodes[executingNodeId.value]) {
-        const nodeState = nodes[executingNodeId.value]
-        _executingNodeProgress.value = {
-          value: nodeState.value,
-          max: nodeState.max,
-          prompt_id: nodeState.prompt_id,
-          node: nodeState.display_node_id || nodeState.node_id
-        }
+    // If we have progress for the currently executing node, update it for backwards compatibility
+    if (executingNodeId.value && nodes[executingNodeId.value]) {
+      const nodeState = nodes[executingNodeId.value]
+      _executingNodeProgress.value = {
+        value: nodeState.value,
+        max: nodeState.max,
+        prompt_id: nodeState.prompt_id,
+        node: nodeState.display_node_id || nodeState.node_id
       }
     }
   }
 
-  /**
-   * Determines whether a WebSocket execution message belongs to the
-   * currently active workflow tab. Used to gate writes to the global
-   * "current execution" mirror so a job initiated from another open
-   * workflow cannot leak its progress into the active one.
-   *
-   * Resolution order:
-   *  1. `workflow_id` carried on the WS message (when backend supports it).
-   *  2. {@link jobIdToWorkflowId} mapping populated when the job was queued
-   *     from this tab.
-   *  3. {@link jobIdToSessionWorkflowPath} mapping (path-based fallback).
-   *
-   * When the workflow cannot be resolved at all (e.g. job queued in a
-   * different browser session), the message is treated as belonging to
-   * the active workflow to preserve current behaviour for the existing
-   * single-tab common case.
-   */
-  function messageMatchesActiveWorkflow(
-    jobId: JobId,
-    messageWorkflowId: string | undefined
-  ): boolean {
-    const activeWorkflow = workflowStore.activeWorkflow
-    if (!activeWorkflow) return true
-
-    const activeId =
-      activeWorkflow.activeState?.id ?? activeWorkflow.initialState?.id ?? null
-
-    if (messageWorkflowId && activeId) {
-      return messageWorkflowId === activeId
-    }
-
-    const mappedId = jobIdToWorkflowId.value.get(jobId)
-    if (mappedId && activeId) return mappedId === activeId
-
-    const mappedPath = jobIdToSessionWorkflowPath.value.get(jobId)
-    if (mappedPath && activeWorkflow.path) {
-      return mappedPath === activeWorkflow.path
-    }
-
-    return true
-  }
-
-  /**
-   * Returns true when workflow ownership for {@link jobId} can be resolved
-   * — either by an explicit `workflow_id` on the incoming message or by a
-   * mapping registered when the job was queued. When this returns false
-   * the caller should fall back to whatever legacy guard applied before
-   * workflow gating was introduced.
-   */
-  function canResolveWorkflowOwnership(
-    jobId: JobId,
-    messageWorkflowId: string | undefined
-  ): boolean {
-    return (
-      Boolean(messageWorkflowId) ||
-      jobIdToWorkflowId.value.has(jobId) ||
-      jobIdToSessionWorkflowPath.value.has(jobId)
-    )
-  }
-
   function handleProgress(e: CustomEvent<ProgressWsMessage>) {
-    const { prompt_id: jobId, workflow_id: messageWorkflowId } = e.detail
-    if (!messageMatchesActiveWorkflow(jobId, messageWorkflowId)) return
     _executingNodeProgress.value = e.detail
   }
 
@@ -473,16 +393,17 @@ export const useExecutionStore = defineStore('execution', () => {
         error: e.detail.exception_message
       })
 
+      // Cloud wraps validation errors (400) in exception_message as embedded JSON.
       if (handleCloudValidationError(e.detail)) return
     }
 
+    // Service-level errors (e.g. "Job has stagnated") have no associated node.
+    // Route them as job errors
     if (handleServiceLevelError(e.detail)) return
 
-    clearInitializationByJobId(e.detail.prompt_id)
-    if (!messageMatchesActiveWorkflow(e.detail.prompt_id, e.detail.workflow_id))
-      return
-
+    // OSS path / Cloud fallback (real runtime errors)
     executionErrorStore.lastExecutionError = e.detail
+    clearInitializationByJobId(e.detail.prompt_id)
     resetExecutionState(e.detail.prompt_id)
   }
 
@@ -492,9 +413,6 @@ export const useExecutionStore = defineStore('execution', () => {
       return false
 
     clearInitializationByJobId(detail.prompt_id)
-    if (!messageMatchesActiveWorkflow(detail.prompt_id, detail.workflow_id))
-      return true
-
     resetExecutionState(detail.prompt_id)
     executionErrorStore.lastPromptError = {
       type: detail.exception_type ?? 'error',
@@ -513,9 +431,6 @@ export const useExecutionStore = defineStore('execution', () => {
     if (!result) return false
 
     clearInitializationByJobId(detail.prompt_id)
-    if (!messageMatchesActiveWorkflow(detail.prompt_id, detail.workflow_id))
-      return true
-
     resetExecutionState(detail.prompt_id)
 
     if (result.kind === 'nodeErrors') {
@@ -614,21 +529,14 @@ export const useExecutionStore = defineStore('execution', () => {
   }
 
   function handleProgressText(e: CustomEvent<ProgressTextWsMessage>) {
-    const { nodeId, text, prompt_id, workflow_id } = e.detail
+    const { nodeId, text, prompt_id } = e.detail
     if (!text || !nodeId) return
 
-    // Prefer the workflow-ownership gate when ownership can be resolved.
-    // Only fall back to the legacy active-prompt guard when ownership is
-    // unresolvable; otherwise activeJobId pointing at a different workflow's
-    // job would incorrectly drop messages for the visible workflow.
-    if (prompt_id) {
-      if (canResolveWorkflowOwnership(prompt_id, workflow_id)) {
-        if (!messageMatchesActiveWorkflow(prompt_id, workflow_id)) return
-      } else if (activeJobId.value && prompt_id !== activeJobId.value) {
-        return
-      }
-    }
+    // Filter: only accept progress for the active prompt
+    if (prompt_id && activeJobId.value && prompt_id !== activeJobId.value)
+      return
 
+    // Handle execution node IDs for subgraphs
     const currentId = getNodeIdIfExecuting(nodeId)
     if (!currentId) return
     const node = canvasStore.canvas?.graph?.getNodeById(currentId)

src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts

@@ -1,6 +1,7 @@
 import { createTestingPinia } from '@pinia/testing'
 import ProgressSpinner from 'primevue/progressspinner'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
 
 import { render, screen } from '@testing-library/vue'
 
@@ -56,7 +57,8 @@ vi.mock('@vueuse/core', () => ({
   createSharedComposable: vi.fn((fn) => {
     let cached: ReturnType<typeof fn>
     return (...args: Parameters<typeof fn>) => (cached ??= fn(...args))
-  })
+  }),
+  useDocumentVisibility: vi.fn(() => ref<'visible' | 'hidden'>('visible'))
 }))
 
 vi.mock('@/config', () => ({