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,12 +1,13 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
-import { getJob, listJobs, type Job } from '~/server/utils/jobs'
-import { listPendingJobs, patchPendingJob, readPendingJob } from '~/server/utils/pending'
+import { getJob, listJobs, emitJob, type Job } from '~/server/utils/jobs'
+import { listPendingJobs, patchPendingJob, readPendingJob, deletePendingJob } from '~/server/utils/pending'
 import { getShotQueue } from '~/server/utils/shotQueue'
 import { parseVideoWorkflow, type VideoWorkflowId } from '~/utils/videoModels'
 import type { PermanenceRef } from '~/utils/globalLocks'

 export type StudioJobStatus = 'waiting' | 'running' | 'held' | 'complete' | 'error' | 'cancelled'
+export type StudioJobKind = 'video' | 'edit'

 export interface StudioJobPayload {
  prompt: string
@@ -37,6 +38,10 @@ export interface StudioJobPayload {
  globalLocks?: string
  permanenceRefs?: PermanenceRef[]
  shotPermanenceRefs?: PermanenceRef[][]
+  negative?: string
+  passes?: { prompt: string }[]
+  referenceStillId?: string
+  referenceStillFilename?: string
 }

 export interface StudioJob {
@@ -45,6 +50,7 @@ export interface StudioJob {
  createdAt: number
  updatedAt: number
  status: StudioJobStatus
+  kind: StudioJobKind
  name: string
  prompt: string
  shotCount: number
@@ -176,12 +182,17 @@ export function listStudioJobs(owner: string) {
  return readJobs(owner)
 }

+export function studioJobKind(job: Pick<StudioJob, 'kind'> | { kind?: string }) {
+  return job.kind === 'edit' ? 'edit' : 'video'
+}
+
 export function summarizeStudioJob(job: StudioJob) {
  return {
    id: job.id,
    createdAt: job.createdAt,
    updatedAt: job.updatedAt,
    status: job.status,
+    kind: studioJobKind(job),
    name: job.name,
    prompt: job.prompt,
    shotCount: job.shotCount,
@@ -203,7 +214,7 @@ export function summarizeStudioJob(job: StudioJob) {
 }

 export function videoJobsBusy() {
-  if (listJobs().some(job => job.kind !== 'edit' && (job.status === 'queued' || job.status === 'uploading' || job.status === 'running'))) {
+  if (listJobs().some(job => job.status === 'queued' || job.status === 'uploading' || job.status === 'running')) {
    return true
  }
  return listPendingJobs().some(job => Boolean(job.promptId))
@@ -230,15 +241,20 @@ export async function addStudioJob(params: {
  ownerKey: string
  payload: StudioJobPayload
  familyId: string
+  kind?: StudioJobKind
 }) {
  const now = Date.now()
-  const shotCount = 1 + (params.payload.extensions?.length || 0)
+  const kind = params.kind === 'edit' ? 'edit' : 'video'
+  const shotCount = kind === 'edit'
+    ? 1 + (params.payload.passes?.length || 0)
+    : 1 + (params.payload.extensions?.length || 0)
  const job: StudioJob = {
    id: crypto.randomUUID(),
    ownerKey: params.ownerKey,
    createdAt: now,
    updatedAt: now,
    status: 'waiting',
+    kind,
    name: (params.payload.name || '').trim() || params.payload.prompt.slice(0, 80),
    prompt: params.payload.prompt,
    shotCount,
@@ -264,32 +280,46 @@ export async function patchStudioJob(owner: string, id: string, patch: (job: Stu
 }

 export async function cancelStudioJob(owner: string, id: string) {
-  const result = await mutate(owner, (jobs) => {
-    const job = jobs.find(item => item.id === id)
+  const before = readJobs(owner).find(item => item.id === id)
+  if (!before) throw createError({ statusCode: 404, statusMessage: 'Queued job not found' })
+  if (before.status !== 'waiting' && before.status !== 'held' && before.status !== 'running') {
+    throw createError({ statusCode: 409, statusMessage: 'That job is no longer in the queue' })
+  }
+  const stopLive = before.status === 'running'
+  const liveJobId = before.liveJobId
+  const shotQueueId = before.shotQueueId
+
+  const result = await mutateStore(owner, (store) => {
+    const job = store.jobs.find(item => item.id === id)
    if (!job) throw createError({ statusCode: 404, statusMessage: 'Queued job not found' })
-    if (job.status === 'running') {
-      throw createError({ statusCode: 409, statusMessage: 'Stop the live job from Output if you want to cancel the one that is generating' })
-    }
-    if (job.status !== 'waiting' && job.status !== 'held') {
-      throw createError({ statusCode: 409, statusMessage: 'Only a waiting or paused job can be removed from the queue' })
+    if (job.status !== 'waiting' && job.status !== 'held' && job.status !== 'running') {
+      throw createError({ statusCode: 409, statusMessage: 'That job is no longer in the queue' })
    }
    job.status = 'cancelled'
    job.cutIn = false
    job.holdForCutIn = false
+    job.pauseAfterCurrent = false
+    job.pausedByUser = false
+    job.liveJobId = undefined
    job.updatedAt = Date.now()
-    const stillCutIn = jobs.some(item => item.status === 'waiting' && item.cutIn)
+    const stillCutIn = store.jobs.some(item => item.status === 'waiting' && item.cutIn)
    if (!stillCutIn) {
-      for (const item of jobs) {
+      for (const item of store.jobs) {
        if (item.status === 'running' || item.status === 'held') {
          item.holdForCutIn = false
        }
      }
    }
+    syncPausedFlag(store)
    return structuredClone(job)
  })
+  if (stopLive) {
+    await stopLiveGeneration(liveJobId, shotQueueId)
+  }
  if (result.shotQueueId) {
-    const { deleteShotQueue } = await import('~/server/utils/shotQueue')
-    await deleteShotQueue(owner, result.shotQueueId).catch(() => null)
+    const { deleteShotQueue, setQueueJob } = await import('~/server/utils/shotQueue')
+    setQueueJob(result.shotQueueId, null)
+    await deleteShotQueue(owner, result.shotQueueId, { force: true }).catch(() => null)
  }
  const jobs = readJobs(owner)
  if (!jobs.some(item => item.status === 'waiting' && item.cutIn)) {
@@ -303,6 +333,44 @@ export async function cancelStudioJob(owner: string, id: string) {
  return result
 }

+async function stopLiveGeneration(liveJobId?: string, shotQueueId?: string) {
+  if (shotQueueId) {
+    const { setQueueJob, pauseShotQueue } = await import('~/server/utils/shotQueue')
+    setQueueJob(shotQueueId, null)
+    const live = liveJobId ? getJob(liveJobId) : undefined
+    if (live?.library?.ownerKey) {
+      await pauseShotQueue(live.library.ownerKey, shotQueueId).catch(() => null)
+    }
+  }
+  if (!liveJobId) return
+  const live = getJob(liveJobId)
+  if (live) {
+    live.status = 'cancelled'
+    if (live.library) {
+      live.library.stopAfterCurrent = true
+      live.library.queueAutoRun = false
+    }
+    emitJob(live, { type: 'error', error: 'Job interrupted.', message: 'Job interrupted.' })
+  }
+  deletePendingJob(liveJobId)
+  const { interruptComfy } = await import('~/server/utils/comfy')
+  await interruptComfy().catch(() => false)
+}
+
+export async function cancelOrphanQueue(owner: string, queueId: string) {
+  const { getShotQueue, getQueueJobId, queueIsProcessing, deleteShotQueue } = await import('~/server/utils/shotQueue')
+  const queue = getShotQueue(owner, queueId)
+  if (!queue) throw createError({ statusCode: 404, statusMessage: 'Queue not found' })
+  const generating = queue.status === 'running' || queueIsProcessing(queueId)
+  const liveJobId = getQueueJobId(queueId) || queue.currentJobId
+  if (generating) {
+    await stopLiveGeneration(liveJobId, queueId)
+  }
+  await deleteShotQueue(owner, queueId, { force: true }).catch(() => null)
+  kickStudioQueue()
+  return { ok: true }
+}
+
 export async function requestCutIn(owner: string, id: string) {
  const jobsNow = readJobs(owner)
  const running = jobsNow.find(job => job.status === 'running')
@@ -518,7 +586,92 @@ async function resumeHeldStudioJob(item: StudioJob) {
  }
 }

+async function startStudioEditJob(item: StudioJob) {
+  try {
+    const { stillPath } = await import('~/server/utils/library')
+    const { existsSync, readFileSync } = await import('node:fs')
+    const { createEditLiveJob, runEdit } = await import('~/server/utils/imageChain')
+
+    const payload = item.payload
+    if (!payload.stillId || !existsSync(stillPath(item.ownerKey, payload.stillId))) {
+      throw new Error('The input still is missing from the library')
+    }
+    const image = {
+      filename: payload.stillFilename || 'still.png',
+      data: readFileSync(stillPath(item.ownerKey, payload.stillId)),
+      type: 'image/png'
+    }
+    const refId = payload.referenceStillId
+    const reference = refId && existsSync(stillPath(item.ownerKey, refId))
+      ? {
+        filename: payload.referenceStillFilename || 'image2.png',
+        data: readFileSync(stillPath(item.ownerKey, refId)),
+        type: 'image/png'
+      }
+      : null
+
+    const passes = payload.passes || []
+    const job = createEditLiveJob({
+      steps: payload.steps,
+      hideThumbnail: payload.hideThumbnail,
+      library: {
+        ownerKey: item.ownerKey,
+        folderId: payload.folderId,
+        hideThumbnail: payload.hideThumbnail,
+        hideInput: payload.hideInput,
+        folderLocked: payload.folderLocked,
+        name: payload.name,
+        prompt: payload.prompt,
+        aspect: payload.aspect || 'auto',
+        width: payload.width,
+        height: payload.height,
+        steps: payload.steps,
+        turbo: true,
+        seed: payload.seed || Math.floor(Math.random() * 2_147_483_647),
+        cfg: payload.cfg,
+        stillId: payload.stillId,
+        stillFilename: payload.stillFilename,
+        familyId: item.familyId,
+        chainIndex: 0,
+        chainStep: 1,
+        chainTotal: 1 + passes.length,
+        chainLabel: passes.length ? 'Pass 1' : undefined,
+        passes
+      }
+    })
+
+    await markStudioLive(item.ownerKey, item.id, job.id)
+    void runEdit(job, {
+      image,
+      reference,
+      prompt: payload.prompt,
+      passes,
+      negative: payload.negative || '',
+      steps: payload.steps,
+      seed: job.library?.seed || payload.seed,
+      cfg: payload.cfg
+    }).catch((error) => {
+      const message = error instanceof Error ? error.message : String(error)
+      if (job.status !== 'error' && job.status !== 'cancelled' && job.status !== 'deferred') {
+        job.status = 'error'
+        job.error = message
+      }
+    })
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    await patchStudioJob(item.ownerKey, item.id, (job) => {
+      job.status = 'error'
+      job.lastError = message
+    }).catch(() => null)
+    kickStudioQueue()
+  }
+}
+
 export async function startStudioJob(item: StudioJob) {
+  if (studioJobKind(item) === 'edit') {
+    await startStudioEditJob(item)
+    return
+  }
  try {
  const { createJob } = await import('~/server/utils/jobs')
  const { runGeneration, frameLength } = await import('~/server/utils/videoChain')
@@ -676,8 +829,17 @@ export async function onLiveVideoSettled(job: Job) {
  const failed = job.status === 'error' || job.status === 'cancelled'
  const snapshot = readStore(owner)
  const rowNow = snapshot.jobs.find(item => item.liveJobId === job.id)
-    || snapshot.jobs.find(item => item.status === 'running' && item.shotQueueId && item.shotQueueId === job.library?.queueId)
-    || snapshot.jobs.find(item => item.status === 'running' && !job.library?.queueId)
+    || snapshot.jobs.find(item => (
+      item.status === 'running'
+      && Boolean(item.shotQueueId)
+      && item.shotQueueId === job.library?.queueId
+    ))
+    || snapshot.jobs.find(item => (
+      item.status === 'running'
+      && !item.shotQueueId
+      && !job.library?.queueId
+      && (!item.liveJobId || item.liveJobId === job.id)
+    ))
  const userPause = !failed && rowNow?.holdForCutIn !== true && (
    rowNow?.pauseAfterCurrent === true
    || rowNow?.pausedByUser === true