Reattach Comfy watchers after refresh so pending jobs finish and save.

Co-authored-by: Cursor <cursoragent@cursor.com>

server/api/generate/[id].get.ts

@@ -8,14 +8,8 @@ export default defineEventHandler(async (event) => {
     if (pending) {
       const done = await resolvePendingJob(pending).catch(() => null)
       if (done) return done
-      return {
-        type: 'snapshot',
-        status: 'running',
-        message: 'Reconnecting to ComfyUI...',
-        progress: 90,
-        promptId: pending.promptId,
-        elapsedMs: Date.now() - pending.startedAt
-      }
+      const job = ensurePendingWatch(pending)
+      return jobSnapshot(job)
     }
   }
 

server/api/generate/[id]/stream.get.ts

@@ -1,6 +1,10 @@
 export default defineEventHandler(async (event) => {
   const id = getRouterParam(event, 'id')
-  const job = id ? getJob(id) : undefined
+  let job = id ? getJob(id) : undefined
+  if (!job && id) {
+    const pending = readPendingJob(id)
+    if (pending) job = ensurePendingWatch(pending)
+  }
   if (!job) {
     throw createError({ statusCode: 404, statusMessage: 'Job not found' })
   }

server/api/generate/active.get.ts

@@ -35,17 +35,13 @@ export default defineEventHandler(async (event) => {
           ...resolved
         }
       } else {
+        const job = ensurePendingWatch(pending)
         video = {
           jobId: pending.jobId,
           kind: 'video',
-          type: 'snapshot',
-          status: 'running',
-          message: 'Reconnecting to ComfyUI...',
-          progress: Math.max(8, Math.min(90, Math.round((Date.now() - pending.startedAt) / 1000))),
-          promptId: pending.promptId,
-          elapsedMs: Date.now() - pending.startedAt,
           hideThumbnail: pending.hideThumbnail === true,
-          folderLocked: pending.folderLocked === true
+          folderLocked: pending.folderLocked === true,
+          ...jobSnapshot(job)
         }
       }
     }

server/api/generate/recover.post.ts

@@ -9,17 +9,7 @@ export default defineEventHandler(async (event) => {
     if (pending) {
       const done = await resolvePendingJob(pending)
       if (done) return done
-      return {
-        type: 'snapshot',
-        status: 'running',
-        jobId,
-        message: 'Reconnecting to ComfyUI...',
-        progress: 90,
-        promptId: pending.promptId,
-        elapsedMs: Date.now() - pending.startedAt,
-        hideThumbnail: pending.hideThumbnail,
-        folderLocked: pending.folderLocked
-      }
+      return jobSnapshot(ensurePendingWatch(pending))
     }
     throw createError({ statusCode: 404, statusMessage: 'Job not found' })
   }

server/plugins/resume-comfy.ts

@@ -1,5 +1,9 @@
 export default defineNitroPlugin(() => {
   for (const pending of listPendingJobs()) {
-    void resolvePendingJob(pending).catch(() => null)
+    void resolvePendingJob(pending).then((done) => {
+      if (!done) ensurePendingWatch(pending)
+    }).catch(() => {
+      ensurePendingWatch(pending)
+    })
   }
 })

server/utils/jobs.ts

@@ -118,6 +118,36 @@ export function getJob(id: string) {
   return jobs.get(id)
 }
 
+export function restoreJob(params: {
+  id: string
+  clientId: string
+  promptId: string
+  startedAt: number
+  hideThumbnail?: boolean
+  library: Job['library']
+}) {
+  const existing = jobs.get(params.id)
+  if (existing) return existing
+  const job: Job = {
+    id: params.id,
+    clientId: params.clientId,
+    kind: 'video',
+    promptId: params.promptId,
+    status: 'running',
+    message: 'Waiting for ComfyUI to finish this job...',
+    progress: 8,
+    step: 0,
+    maxStep: params.library?.steps || 0,
+    startedAt: params.startedAt,
+    hideThumbnail: params.hideThumbnail === true,
+    library: params.library,
+    events: [],
+    listeners: new Set()
+  }
+  jobs.set(job.id, job)
+  return job
+}
+
 export function listJobs() {
   return [...jobs.values()]
 }

server/utils/watch.ts

@@ -1,5 +1,6 @@
 import { existsSync } from 'node:fs'
 import type { Job, JobEvent } from '~/server/utils/jobs'
+import { getJob, restoreJob } from '~/server/utils/jobs'
 
 function classifyError(message: string) {
   const lower = message.toLowerCase()
@@ -375,3 +376,71 @@ export async function waitForComfySocket(job: Job, ms = 4000) {
     await sleep(100)
   }
 }
+
+const pendingWatches = new Set<string>()
+
+export function ensurePendingWatch(pending: {
+  jobId: string
+  promptId: string
+  clientId: string
+  ownerKey: string
+  folderId: string
+  hideThumbnail: boolean
+  folderLocked?: boolean
+  name?: string
+  prompt: string
+  aspect: string
+  width: number
+  height: number
+  steps: number
+  turbo: boolean
+  seed: number
+  startedAt: number
+  imageName?: string
+  imageSubfolder?: string
+  extendTmpDir?: string
+  extendPart1Path?: string
+  familyId?: string
+  parentClipId?: string
+  chainIndex?: number
+  stillId?: string
+  sound?: boolean
+}) {
+  const existing = getJob(pending.jobId)
+  if (existing) return existing
+  const job = restoreJob({
+    id: pending.jobId,
+    clientId: pending.clientId,
+    promptId: pending.promptId,
+    startedAt: pending.startedAt,
+    hideThumbnail: pending.hideThumbnail,
+    library: {
+      ownerKey: pending.ownerKey,
+      folderId: pending.folderId,
+      hideThumbnail: pending.hideThumbnail,
+      folderLocked: pending.folderLocked,
+      name: pending.name,
+      prompt: pending.prompt,
+      aspect: pending.aspect,
+      width: pending.width,
+      height: pending.height,
+      steps: pending.steps,
+      turbo: pending.turbo,
+      seed: pending.seed,
+      imageName: pending.imageName,
+      imageSubfolder: pending.imageSubfolder,
+      extendTmpDir: pending.extendTmpDir,
+      extendPart1Path: pending.extendPart1Path,
+      familyId: pending.familyId,
+      parentClipId: pending.parentClipId,
+      chainIndex: pending.chainIndex,
+      stillId: pending.stillId,
+      sound: pending.sound
+    }
+  })
+  if (!pendingWatches.has(job.id)) {
+    pendingWatches.add(job.id)
+    void watchComfyJob(job, { persist: true }).finally(() => pendingWatches.delete(job.id))
+  }
+  return job
+}