Keep image jobs on the studio queue and confirm each job or library delete. Label stitch-frame slots when thumbs are hidden, and open output stills in a lightbox.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-28 09:04:08 -05:00
parent 8598dab516
commit fb748e9b6e
10 changed files with 996 additions and 369 deletions
@@ -1,7 +1,5 @@
-import { ensureComfyReady } from '~/server/utils/comfyLifecycle'
-import { getComfyHost, comfyConfigured, uploadImage, queuePrompt, purgeComfyArtifacts } from '~/server/utils/comfy'
-import { withImageComfyHost, waitForImageEdit, downloadEditedImage } from '~/server/utils/imageComfy'
-import { buildEditWorkflow } from '~/server/utils/imageWorkflow'
+import { addStudioJob, kickStudioQueue, listStudioJobs } from '~/server/utils/studioQueue'
+import { comfyConfigured } from '~/server/utils/comfy'
 import { imageDimensions } from '~/server/utils/resolution'

 function parseSteps(raw: unknown) {
@@ -82,6 +80,7 @@ export default defineEventHandler(async (event) => {
    ? Number(fields.seed)
    : Math.floor(Math.random() * 2_147_483_647)
  const size = imageDimensions(image.data)
+  const clipName = (fields.name || '').trim().slice(0, 80)

  const still = await rememberInputStill({
    ownerKey,
@@ -92,74 +91,63 @@ export default defineEventHandler(async (event) => {
    height: size?.height || 0,
    hideInput
  })
-  if (reference) {
-    await rememberInputStill({
+  const savedRef = reference
+    ? await rememberInputStill({
      ownerKey,
      folderId,
      filename: reference.filename,
      data: reference.data,
      hideInput
    })
-  }
+    : null

  const passes = extraPasses
  const chainTotal = 1 + passes.length
-  const familyId = chainTotal > 1 ? crypto.randomUUID() : undefined
-  const job = createJob()
-  job.kind = 'edit'
-  job.maxStep = steps
-  job.hideThumbnail = hideThumbnail
-  job.library = {
+  const familyId = crypto.randomUUID()
+  const studio = await addStudioJob({
    ownerKey,
-    folderId,
-    hideThumbnail,
-    hideInput,
-    folderLocked,
-    name: (fields.name || '').trim().slice(0, 80),
-    prompt,
-    aspect: 'auto',
-    width: size?.width || 0,
-    height: size?.height || 0,
-    steps,
-    turbo: true,
-    seed,
-    cfg,
-    stillId: still?.id,
    familyId,
-    chainIndex: 0,
-    chainStep: 1,
-    chainTotal,
-    chainLabel: chainTotal > 1 ? 'Pass 1' : undefined,
-    passes
-  }
-  emitJob(job, {
-    type: 'status',
-    message: 'Checking Beast ComfyUI...',
-    progress: 2,
-    chainStep: 1,
-    chainTotal,
-    chainLabel: job.library.chainLabel
-  })
-
-  void runEdit(job, {
-    image,
-    reference,
-    prompt,
-    passes,
-    negative: (fields.negative || '').trim(),
-    steps,
-    seed,
-    cfg
-  }).catch(async (error) => {
-    if (job.status === 'error' || job.status === 'cancelled') return
-    const message = error instanceof Error ? error.message : String(error)
-    job.status = 'error'
-    job.error = message
-    emitJob(job, { type: 'error', error: message, message })
+    kind: 'edit',
+    payload: {
+      prompt,
+      name: clipName,
+      folderId,
+      aspect: 'auto',
+      width: size?.width || 0,
+      height: size?.height || 0,
+      steps,
+      turbo: true,
+      seed,
+      cfg,
+      fps: 24,
+      samplerName: 'res_multistep',
+      scheduler: 'simple',
+      duration: 0,
+      sound: false,
+      workflow: 'v1',
+      useIdentityRefs: false,
+      stillId: still?.id,
+      stillFilename: still?.filename,
+      hideThumbnail,
+      hideInput,
+      folderLocked,
+      referenceStillIds: [null, null, null, null],
+      extensions: [],
+      queueAutoRun: false,
+      negative: (fields.negative || '').trim(),
+      passes,
+      referenceStillId: savedRef?.id,
+      referenceStillFilename: savedRef?.filename
+    }
  })
+  await kickStudioQueue()
+  const latest = listStudioJobs(ownerKey).find(item => item.id === studio.id)
+  const liveJobId = latest?.liveJobId || ''

  return {
-    jobId: job.id,
+    jobId: liveJobId || studio.id,
+    studioJobId: studio.id,
+    queued: !liveJobId,
    seed,
    steps,
    hideThumbnail,
@@ -168,180 +156,3 @@ export default defineEventHandler(async (event) => {
    chainTotal
  }
 })
-
-async function runEdit(
-  job: ReturnType<typeof createJob>,
-  params: {
-    image: { filename: string; data: Buffer; type?: string }
-    reference: { filename: string; data: Buffer; type?: string } | null
-    prompt: string
-    passes: { prompt: string }[]
-    negative: string
-    steps: number
-    seed: number
-    cfg: number
-  }
-) {
-  const library = job.library
-  if (!library) throw new Error('Edit job is missing library metadata')
-  const prompts = [params.prompt, ...params.passes.map(item => item.prompt)]
-  const chainTotal = prompts.length
-  library.chainTotal = chainTotal
-  library.familyId = chainTotal > 1 ? (library.familyId || crypto.randomUUID()) : library.familyId
-
-  await ensureComfyReady((status) => {
-    emitChainJob(job, {
-      type: status.state === 'busy' ? 'busy' : 'status',
-      message: status.message,
-      progress: status.state === 'online' ? Math.max(job.progress, 6) : Math.max(job.progress, 3),
-      busy: status.state === 'busy'
-    })
-  })
-  if (job.status === 'cancelled') throw new Error('Job interrupted.')
-  job.imageComfyHost = getComfyHost()
-
-  await withImageComfyHost(job.imageComfyHost, async () => {
-    let current = params.image
-    let parentStillId: string | undefined
-    for (let index = 0; index < prompts.length; index++) {
-      if (job.status === 'cancelled') throw new Error('Job interrupted.')
-      const prompt = prompts[index]
-      const last = index === prompts.length - 1
-      if (index > 0) {
-        await ensureComfyReady((status) => {
-          emitChainJob(job, {
-            type: status.state === 'busy' ? 'busy' : 'status',
-            message: status.message,
-            progress: status.state === 'online' ? 4 : 2,
-            busy: status.state === 'busy'
-          })
-        })
-      }
-      const seed = index === 0 ? params.seed : Math.floor(Math.random() * 2_147_483_647)
-      library.prompt = prompt
-      library.seed = seed
-      library.chainIndex = index
-      library.chainStep = index + 1
-      library.chainLabel = chainTotal > 1 ? `Pass ${index + 1}` : undefined
-      const reference = index === 0 ? params.reference : null
-      const dual = Boolean(reference)
-      const passName = stillChainName(library.name || '', index)
-
-      emitChainJob(job, {
-        type: 'status',
-        message: dual ? 'Uploading both stills to Beast...' : 'Uploading still to Beast...',
-        progress: 8
-      })
-      const uploaded = await uploadImage(current, job.id)
-      const uploadedRef = reference
-        ? await uploadImage({
-          ...reference,
-          filename: `ref_${reference.filename || 'image2.png'}`
-        }, job.id)
-        : null
-      if (job.status === 'cancelled') throw new Error('Job interrupted.')
-
-      emitChainJob(job, {
-        type: 'status',
-        message: dual
-          ? 'Queueing Flux.2 Klein two-image edit on Beast...'
-          : 'Queueing Flux.2 Klein edit on Beast...',
-        progress: 12
-      })
-      const graph = buildEditWorkflow({
-        prompt,
-        negative: params.negative,
-        imageName: uploaded.name,
-        referenceImageName: uploadedRef?.name,
-        steps: params.steps,
-        seed,
-        cfg: params.cfg,
-        filenamePrefix: `aigen_edit_${job.id.slice(0, 8)}_p${index + 1}`
-      })
-      const queued = await queuePrompt(graph, job.clientId)
-      job.promptId = queued.prompt_id
-      job.status = 'running'
-      emitChainJob(job, {
-        type: 'status',
-        message: dual ? 'Applying image 2 onto image 1...' : 'Editing still on Beast...',
-        progress: 18,
-        maxStep: params.steps
-      })
-
-      const output = await waitForImageEdit({
-        promptId: queued.prompt_id,
-        clientId: job.clientId,
-        timeoutMs: 10 * 60 * 1000,
-        onProgress: (event) => {
-          emitChainJob(job, {
-            type: 'status',
-            message: event.message,
-            progress: event.progress,
-            step: event.step,
-            maxStep: event.maxStep || params.steps,
-            node: event.node
-          })
-        },
-        isCancelled: () => job.status === 'cancelled'
-      })
-
-      emitChainJob(job, { type: 'status', message: 'Saving edited still...', progress: 94 })
-      const buffer = await downloadEditedImage(output)
-      const size = imageDimensions(buffer)
-      const still = await saveStill({
-        ownerKey: library.ownerKey,
-        folderId: library.folderId,
-        filename: passName ? `${passName}.png` : output.filename,
-        data: buffer,
-        width: size?.width || 0,
-        height: size?.height || 0,
-        hideInput: job.hideThumbnail === true,
-        role: 'output',
-        name: passName || undefined,
-        prompt,
-        familyId: library.familyId,
-        parentStillId,
-        chainIndex: index
-      })
-      job.stillId = still?.id
-      parentStillId = still?.id
-      await purgeComfyArtifacts({
-        video: { filename: output.filename, subfolder: output.subfolder, type: output.type },
-        imageName: uploaded.name,
-        imageSubfolder: uploaded.subfolder,
-        extraImageNames: uploadedRef?.name ? [uploadedRef.name] : [],
-        promptId: job.promptId
-      })
-
-      if (!last) {
-        emitChainJob(job, {
-          type: 'checkpoint',
-          message: `Pass ${index + 1} saved`,
-          progress: 100,
-          stillId: still?.id,
-          hideThumbnail: job.hideThumbnail,
-          folderLocked: library.folderLocked
-        })
-        current = {
-          filename: still?.filename || `pass_${index + 1}.png`,
-          data: buffer,
-          type: 'image/png'
-        }
-        continue
-      }
-
-      job.status = 'complete'
-      emitChainJob(job, {
-        type: 'complete',
-        message: chainTotal > 1 ? 'Edit chain finished on Beast' : 'Edit finished on Beast',
-        progress: 100,
-        stillId: still?.id,
-        filename: output.filename,
-        subfolder: output.subfolder,
-        mediaType: 'image',
-        hideThumbnail: job.hideThumbnail,
-        folderLocked: library.folderLocked
-      })
-    }
-  })
-}
@@ -1,8 +1,8 @@
-import { deleteShotQueue } from '~/server/utils/shotQueue'
+import { cancelOrphanQueue } from '~/server/utils/studioQueue'

 export default defineEventHandler(async (event) => {
  const { owner } = assertLibraryOwner(event)
  const id = String(getRouterParam(event, 'id') || '')
-  await deleteShotQueue(owner, id)
+  await cancelOrphanQueue(owner, id)
  return { ok: true }
 })
@@ -11,13 +11,21 @@ export default defineEventHandler((event) => {
  const byId = new Map(queues.map(queue => [queue.id, queue]))
  const jobs = active.map((job) => {
    const shots = job.shotQueueId ? byId.get(job.shotQueueId) || null : null
+    const kind = job.kind === 'edit' ? 'edit' : 'video'
    const shotSummary = shots ? summarizeQueue(shots) : null
    const plannedShots = shotSummary
      ? undefined
-      : [
-        { prompt: job.payload.prompt, duration: job.payload.duration },
-        ...(job.payload.extensions || [])
-      ]
+      : kind === 'edit'
+        ? (job.payload.passes?.length
+          ? [
+            { prompt: job.payload.prompt, duration: 0 },
+            ...job.payload.passes.map(item => ({ prompt: item.prompt, duration: 0 }))
+          ]
+          : undefined)
+        : [
+          { prompt: job.payload.prompt, duration: job.payload.duration },
+          ...(job.payload.extensions || [])
+        ]
    return {
      ...summarizeStudioJob(job),
      ...(full ? {