{
it('auto-selects skeleton on first job start when no selection', () => {
const store = useLinearOutputStore()
+ setJobWorkflowPath('job-1', 'workflows/test-workflow.json')
store.onJobStart('job-1')
expect(store.selectedId).toBe(`slot:${store.inProgressItems[0].id}`)
@@ -132,6 +133,7 @@ describe('linearOutputStore', () => {
it('transitions to latent on preview', () => {
vi.useFakeTimers()
const store = useLinearOutputStore()
+ setJobWorkflowPath('job-1', 'workflows/test-workflow.json')
store.onJobStart('job-1')
const itemId = store.inProgressItems[0].id
@@ -265,6 +267,7 @@ describe('linearOutputStore', () => {
// selectAsLatest simulates "following the latest output"
store.selectAsLatest('history:asset-1:0')
+ setJobWorkflowPath('job-1', 'workflows/test-workflow.json')
store.onJobStart('job-1')
// Following latest → auto-select new skeleton
@@ -286,6 +289,7 @@ describe('linearOutputStore', () => {
it('falls back selection when selected item is removed', () => {
const store = useLinearOutputStore()
+ setJobWorkflowPath('job-1', 'workflows/test-workflow.json')
store.onJobStart('job-1')
const firstId = `slot:${store.inProgressItems[0].id}`
expect(store.selectedId).toBe(firstId)
@@ -400,6 +404,8 @@ describe('linearOutputStore', () => {
it('two sequential runs: selection clears after each resolve', () => {
const store = useLinearOutputStore()
+ setJobWorkflowPath('job-1', 'workflows/test-workflow.json')
+ setJobWorkflowPath('job-2', 'workflows/test-workflow.json')
// Run 1: 3 outputs
store.onJobStart('job-1')
@@ -738,6 +744,34 @@ describe('linearOutputStore', () => {
expect(imageItems[0].output?.nodeId).toBe('2')
})
+ it('does not auto-select for jobs belonging to another workflow', () => {
+ const store = useLinearOutputStore()
+
+ // User is on workflow-b, following latest
+ activeWorkflowPathRef.value = 'workflows/app-b.json'
+ store.selectAsLatest('history:asset-b:0')
+
+ // Job from workflow-a starts
+ setJobWorkflowPath('job-1', 'workflows/app-a.json')
+ store.onJobStart('job-1')
+
+ // Should NOT yank selection to the other workflow's slot
+ expect(store.selectedId).toBe('history:asset-b:0')
+ })
+
+ it('auto-selects for jobs belonging to the active workflow', () => {
+ const store = useLinearOutputStore()
+
+ activeWorkflowPathRef.value = 'workflows/app-a.json'
+ store.selectAsLatest('history:asset-a:0')
+
+ setJobWorkflowPath('job-1', 'workflows/app-a.json')
+ store.onJobStart('job-1')
+
+ // Should auto-select since job matches active workflow
+ expect(store.selectedId?.startsWith('slot:')).toBe(true)
+ })
+
it('ignores execution events when not in app mode', async () => {
const { nextTick } = await import('vue')
const store = useLinearOutputStore()
diff --git a/src/renderer/extensions/linearMode/linearOutputStore.ts b/src/renderer/extensions/linearMode/linearOutputStore.ts
index fdc03387b6..384685c4cc 100644
--- a/src/renderer/extensions/linearMode/linearOutputStore.ts
+++ b/src/renderer/extensions/linearMode/linearOutputStore.ts
@@ -67,7 +67,7 @@ export const useLinearOutputStore = defineStore('linearOutput', () => {
inProgressItems.value = [item, ...inProgressItems.value]
trackedJobId.value = jobId
- autoSelect(`slot:${item.id}`)
+ autoSelect(`slot:${item.id}`, jobId)
}
let raf: number | null = null
@@ -88,7 +88,7 @@ export const useLinearOutputStore = defineStore('linearOutput', () => {
state: 'latent',
latentPreviewUrl: url
}))
- if (wasEmpty) autoSelect(`slot:${existing.id}`)
+ if (wasEmpty) autoSelect(`slot:${existing.id}`, jobId)
return
}
@@ -103,7 +103,7 @@ export const useLinearOutputStore = defineStore('linearOutput', () => {
}
currentSkeletonId.value = item.id
inProgressItems.value = [item, ...inProgressItems.value]
- autoSelect(`slot:${item.id}`)
+ autoSelect(`slot:${item.id}`, jobId)
})
}
@@ -136,7 +136,7 @@ export const useLinearOutputStore = defineStore('linearOutput', () => {
output: newOutputs[0],
latentPreviewUrl: undefined
}
- autoSelect(`slot:${imageItem.id}`)
+ autoSelect(`slot:${imageItem.id}`, jobId)
const extras: InProgressItem[] = newOutputs.slice(1).map((o) => ({
id: makeItemId(jobId),
@@ -162,7 +162,7 @@ export const useLinearOutputStore = defineStore('linearOutput', () => {
state: 'image' as const,
output: o
}))
- autoSelect(`slot:${newItems[0].id}`)
+ autoSelect(`slot:${newItems[0].id}`, jobId)
inProgressItems.value = [...newItems, ...inProgressItems.value]
}
@@ -226,7 +226,12 @@ export const useLinearOutputStore = defineStore('linearOutput', () => {
isFollowing.value = true
}
- function autoSelect(slotId: string) {
+ function autoSelect(slotId: string, jobId: string) {
+ // Only auto-select if the job belongs to the active workflow
+ const path = workflowStore.activeWorkflow?.path
+ if (path && executionStore.jobIdToSessionWorkflowPath.get(jobId) !== path)
+ return
+
const sel = selectedId.value
if (!sel || sel.startsWith('slot:') || isFollowing.value) {
selectedId.value = slotId
diff --git a/src/renderer/extensions/linearMode/useOutputHistory.test.ts b/src/renderer/extensions/linearMode/useOutputHistory.test.ts
index bd514cdc55..dbfbe9006b 100644
--- a/src/renderer/extensions/linearMode/useOutputHistory.test.ts
+++ b/src/renderer/extensions/linearMode/useOutputHistory.test.ts
@@ -11,9 +11,13 @@ import { ResultItemImpl } from '@/stores/queueStore'
const mediaRef = ref
([])
const pendingResolveRef = ref(new Set())
const inProgressItemsRef = ref([])
+const activeWorkflowInProgressItemsRef = ref([])
const selectedIdRef = ref(null)
const activeWorkflowPathRef = ref('workflows/test.json')
const jobIdToPathRef = ref(new Map())
+const isActiveWorkflowRunningRef = ref(false)
+const runningTasksRef = ref>([])
+const pendingTasksRef = ref>([])
const selectAsLatestFn = vi.fn()
const resolveIfReadyFn = vi.fn()
@@ -40,6 +44,9 @@ vi.mock('@/renderer/extensions/linearMode/linearOutputStore', () => ({
get inProgressItems() {
return inProgressItemsRef.value
},
+ get activeWorkflowInProgressItems() {
+ return activeWorkflowInProgressItemsRef.value
+ },
get selectedId() {
return selectedIdRef.value
},
@@ -61,10 +68,27 @@ vi.mock('@/stores/executionStore', () => ({
useExecutionStore: () => ({
get jobIdToSessionWorkflowPath() {
return jobIdToPathRef.value
+ },
+ get isActiveWorkflowRunning() {
+ return isActiveWorkflowRunningRef.value
}
})
}))
+vi.mock('@/stores/queueStore', async (importOriginal) => {
+ return {
+ ...(await importOriginal()),
+ useQueueStore: () => ({
+ get runningTasks() {
+ return runningTasksRef.value
+ },
+ get pendingTasks() {
+ return pendingTasksRef.value
+ }
+ })
+ }
+})
+
const { jobDetailResults } = vi.hoisted(() => ({
jobDetailResults: new Map()
}))
@@ -128,9 +152,13 @@ describe(useOutputHistory, () => {
mediaRef.value = []
pendingResolveRef.value = new Set()
inProgressItemsRef.value = []
+ activeWorkflowInProgressItemsRef.value = []
selectedIdRef.value = null
activeWorkflowPathRef.value = 'workflows/test.json'
jobIdToPathRef.value = new Map()
+ isActiveWorkflowRunningRef.value = false
+ runningTasksRef.value = []
+ pendingTasksRef.value = []
resolvedOutputsCacheRef.clear()
jobDetailResults.clear()
selectAsLatestFn.mockReset()
@@ -378,4 +406,54 @@ describe(useOutputHistory, () => {
expect(selectAsLatestFn).toHaveBeenCalledWith(null)
})
})
+
+ describe('mayBeActiveWorkflowPending', () => {
+ it('returns false when no tasks are queued', () => {
+ const { mayBeActiveWorkflowPending } = useOutputHistory()
+ expect(mayBeActiveWorkflowPending.value).toBe(false)
+ })
+
+ it('returns false when there are active in-progress items', () => {
+ activeWorkflowInProgressItemsRef.value = [
+ { id: 'item-1', jobId: 'job-1', state: 'skeleton' }
+ ]
+ runningTasksRef.value = [{ jobId: 'job-1' }]
+ jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+
+ const { mayBeActiveWorkflowPending } = useOutputHistory()
+ expect(mayBeActiveWorkflowPending.value).toBe(false)
+ })
+
+ it('returns true when a running task matches the active workflow', () => {
+ runningTasksRef.value = [{ jobId: 'job-1' }]
+ jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+
+ const { mayBeActiveWorkflowPending } = useOutputHistory()
+ expect(mayBeActiveWorkflowPending.value).toBe(true)
+ })
+
+ it('returns true when a pending task matches the active workflow', () => {
+ pendingTasksRef.value = [{ jobId: 'job-1' }]
+ jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+
+ const { mayBeActiveWorkflowPending } = useOutputHistory()
+ expect(mayBeActiveWorkflowPending.value).toBe(true)
+ })
+
+ it('returns false when tasks belong to another workflow', () => {
+ runningTasksRef.value = [{ jobId: 'job-1' }]
+ jobIdToPathRef.value = new Map([['job-1', 'workflows/other.json']])
+
+ const { mayBeActiveWorkflowPending } = useOutputHistory()
+ expect(mayBeActiveWorkflowPending.value).toBe(false)
+ })
+
+ it('returns false when no workflow path is set', () => {
+ activeWorkflowPathRef.value = ''
+ runningTasksRef.value = [{ jobId: 'job-1' }]
+
+ const { mayBeActiveWorkflowPending } = useOutputHistory()
+ expect(mayBeActiveWorkflowPending.value).toBe(false)
+ })
+ })
})
diff --git a/src/renderer/extensions/linearMode/useOutputHistory.ts b/src/renderer/extensions/linearMode/useOutputHistory.ts
index a93130d74e..9a692e2085 100644
--- a/src/renderer/extensions/linearMode/useOutputHistory.ts
+++ b/src/renderer/extensions/linearMode/useOutputHistory.ts
@@ -1,4 +1,5 @@
import { useAsyncState } from '@vueuse/core'
+import type { ComputedRef } from 'vue'
import { computed, ref, watchEffect } from 'vue'
import type { IAssetsProvider } from '@/platform/assets/composables/media/IAssetsProvider'
@@ -9,14 +10,20 @@ import { useWorkflowStore } from '@/platform/workflow/management/stores/workflow
import { flattenNodeOutput } from '@/renderer/extensions/linearMode/flattenNodeOutput'
import { useLinearOutputStore } from '@/renderer/extensions/linearMode/linearOutputStore'
import { getJobDetail } from '@/services/jobOutputCache'
+import { api } from '@/scripts/api'
import { useAppModeStore } from '@/stores/appModeStore'
+import { useCommandStore } from '@/stores/commandStore'
import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
import type { ResultItemImpl } from '@/stores/queueStore'
export function useOutputHistory(): {
outputs: IAssetsProvider
allOutputs: (item?: AssetItem) => ResultItemImpl[]
selectFirstHistory: () => void
+ mayBeActiveWorkflowPending: ComputedRef
+ isWorkflowActive: ComputedRef
+ cancelActiveWorkflowJobs: () => Promise
} {
const backingOutputs = useMediaAssets('output')
void backingOutputs.fetchMediaList()
@@ -24,6 +31,37 @@ export function useOutputHistory(): {
const workflowStore = useWorkflowStore()
const executionStore = useExecutionStore()
const appModeStore = useAppModeStore()
+ const queueStore = useQueueStore()
+
+ function matchesActiveWorkflow(task: { jobId: string | number }): boolean {
+ const path = workflowStore.activeWorkflow?.path
+ if (!path) return false
+ return (
+ executionStore.jobIdToSessionWorkflowPath.get(String(task.jobId)) === path
+ )
+ }
+
+ function hasActiveWorkflowJobs(): boolean {
+ if (!workflowStore.activeWorkflow?.path) return false
+ return (
+ queueStore.runningTasks.some(matchesActiveWorkflow) ||
+ queueStore.pendingTasks.some(matchesActiveWorkflow)
+ )
+ }
+
+ // True when there are queued/running jobs for the active workflow but no
+ // in-progress output items yet.
+ const mayBeActiveWorkflowPending = computed(() => {
+ if (linearStore.activeWorkflowInProgressItems.length > 0) return false
+ return hasActiveWorkflowJobs()
+ })
+
+ // True when the active workflow has running/pending jobs or in-progress items.
+ const isWorkflowActive = computed(
+ () =>
+ linearStore.activeWorkflowInProgressItems.length > 0 ||
+ hasActiveWorkflowJobs()
+ )
function filterByOutputNodes(items: ResultItemImpl[]): ResultItemImpl[] {
const nodeIds = appModeStore.selectedOutputs
@@ -140,5 +178,29 @@ export function useOutputHistory(): {
}
})
- return { outputs, allOutputs, selectFirstHistory }
+ async function cancelActiveWorkflowJobs() {
+ if (!workflowStore.activeWorkflow?.path) return
+
+ // Interrupt the running job if it belongs to this workflow
+ if (queueStore.runningTasks.some(matchesActiveWorkflow)) {
+ void useCommandStore().execute('Comfy.Interrupt')
+ } else {
+ // Delete first pending job for this workflow from the queue
+ for (const task of queueStore.pendingTasks) {
+ if (matchesActiveWorkflow(task)) {
+ await api.deleteItem('queue', String(task.jobId))
+ break
+ }
+ }
+ }
+ }
+
+ return {
+ outputs,
+ allOutputs,
+ selectFirstHistory,
+ mayBeActiveWorkflowPending,
+ isWorkflowActive,
+ cancelActiveWorkflowJobs
+ }
}
diff --git a/src/stores/appModeStore.ts b/src/stores/appModeStore.ts
index 645fa7b58e..5fec531556 100644
--- a/src/stores/appModeStore.ts
+++ b/src/stores/appModeStore.ts
@@ -7,6 +7,7 @@ import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
import type { LinearData } from '@/platform/workflow/management/stores/comfyWorkflow'
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
import { app } from '@/scripts/app'
import { resolveNode } from '@/utils/litegraphUtil'
@@ -26,20 +27,25 @@ export const useAppModeStore = defineStore('appMode', () => {
return !!app.rootGraph?.nodes?.length
})
- function loadSelections(data: Partial | undefined) {
+ // Prune entries referencing nodes deleted in workflow mode.
+ // Only check node existence, not widgets — dynamic widgets can
+ // hide/show other widgets so a missing widget does not mean stale data.
+ function pruneLinearData(data: Partial | undefined): LinearData {
const rawInputs = data?.inputs ?? []
const rawOutputs = data?.outputs ?? []
- // Prune entries referencing nodes deleted in workflow mode.
- // Only check node existence, not widgets — dynamic widgets can
- // hide/show other widgets so a missing widget does not mean stale data.
- const inputs = app.rootGraph
- ? rawInputs.filter(([nodeId]) => resolveNode(nodeId))
- : rawInputs
- const outputs = app.rootGraph
- ? rawOutputs.filter((nodeId) => resolveNode(nodeId))
- : rawOutputs
+ return {
+ inputs: app.rootGraph
+ ? rawInputs.filter(([nodeId]) => resolveNode(nodeId))
+ : rawInputs,
+ outputs: app.rootGraph
+ ? rawOutputs.filter((nodeId) => resolveNode(nodeId))
+ : rawOutputs
+ }
+ }
+ function loadSelections(data: Partial | undefined) {
+ const { inputs, outputs } = pruneLinearData(data)
selectedInputs.splice(0, selectedInputs.length, ...inputs)
selectedOutputs.splice(0, selectedOutputs.length, ...outputs)
}
@@ -105,6 +111,8 @@ export const useAppModeStore = defineStore('appMode', () => {
return
}
+ useSidebarTabStore().activeSidebarTabId = null
+
setMode(
mode.value === 'app' && hasOutputs.value
? 'builder:arrange'
@@ -112,7 +120,7 @@ export const useAppModeStore = defineStore('appMode', () => {
)
}
- async function exitBuilder() {
+ function exitBuilder() {
resetSelectedToWorkflow()
setMode('graph')
}
@@ -122,6 +130,7 @@ export const useAppModeStore = defineStore('appMode', () => {
exitBuilder,
hasNodes,
hasOutputs,
+ pruneLinearData,
resetSelectedToWorkflow,
selectedInputs,
selectedOutputs
diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index 81f505c67b..87192cf796 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -549,6 +549,13 @@ export const useExecutionStore = defineStore('execution', () => {
() => runningJobIds.value.length
)
+ const isActiveWorkflowRunning = computed(() => {
+ if (!activeJobId.value) return false
+ const path = workflowStore.activeWorkflow?.path
+ if (!path) return false
+ return jobIdToSessionWorkflowPath.value.get(activeJobId.value) === path
+ })
+
return {
isIdle,
clientId,
@@ -568,6 +575,7 @@ export const useExecutionStore = defineStore('execution', () => {
runningJobIds,
runningWorkflowCount,
initializingJobIds,
+ isActiveWorkflowRunning,
isJobInitializing,
clearInitializationByJobId,
clearInitializationByJobIds,