Join pre/prompt/post for Comfy, stop zero-size generates snapping to a small square, and give the phone library a real closeable preview.

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

server/api/edit.post.ts

@@ -4,6 +4,7 @@ import { assertImageScaleToTotalPixelsNode, comfyConfigured } from '~/server/uti
 import { imageDimensions } from '~/server/utils/resolution'
 import { parseImageAspect } from '~/utils/imageAspect'
 import { clampImageCfg, clampImageScaleMegapixels, clampImageSteps, parseImagePassMode, parseImageScaleToTotalPixels } from '~/utils/generationPresets'
+import { joinPromptParts } from '~/utils/promptParts'
 
 function parsePasses(raw: string | undefined) {
   if (!raw) return [] as { prompt: string }[]
@@ -33,16 +34,17 @@ export default defineEventHandler(async (event) => {
     }
   }
 
-  const prompt = (fields.prompt || '').trim()
+  const promptMid = (fields.prompt || '').trim()
   const promptPre = (fields.promptPre || '').trim()
   const promptPost = (fields.promptPost || '').trim()
+  const prompt = joinPromptParts(promptPre, promptMid, promptPost)
   const extraPasses = parsePasses(fields.passes)
   const passMode = parseImagePassMode(fields.passMode)
   const aspect = parseImageAspect(fields.aspect)
   if (!image) {
     throw createError({ statusCode: 400, statusMessage: 'An input image is required' })
   }
-  if (!prompt && aspect === 'auto') {
+  if (!promptMid && aspect === 'auto') {
     throw createError({ statusCode: 400, statusMessage: 'An edit prompt is required' })
   }
   if (extraPasses.some(item => !item.prompt)) {

server/api/generate.post.ts

@@ -4,7 +4,7 @@ import { listStudioLoras, parsePostedLoraStack, parseShotLoraStacks, persistLora
 import { clampVideoCfg } from '~/utils/generationPresets'
 import { defaultVideoSteps, isLtxWorkflow, isTextToVideo, LTX_DISABLED_MESSAGE, ltxWorkflowEnabled, parseVideoWorkflow, videoEngineOf } from '~/utils/videoModels'
 import { allowIdentityRefs, normalizePermanenceRefs, resolveGlobalLocks, type PermanenceRef } from '~/utils/globalLocks'
-import { composePromptParts, persistPromptWrappers } from '~/utils/promptParts'
+import { composePromptParts, joinPromptParts, persistPromptWrappers } from '~/utils/promptParts'
 import type { QueuedExtension } from '~/server/utils/library'
 
 function parseDuration(raw: unknown) {
@@ -150,7 +150,7 @@ export default defineEventHandler(async (event) => {
     throw createError({ statusCode: 400, statusMessage: 'A motion prompt is required' })
   }
   const resolvedLocks = resolveGlobalLocks(fields.globalLocks || '', promptMid)
-  const prompt = resolvedLocks.prompt
+  const prompt = joinPromptParts(promptPre, resolvedLocks.prompt, promptPost)
   const globalLocks = resolvedLocks.locks
   const extensions = parseExtensions(fields.extensions)
   const permanenceRefs = parseFamilyPermanenceRefs(fields.permanenceRefs)

server/api/v2/generate.post.ts

@@ -26,6 +26,7 @@ import {
   type ImageV2Task
 } from '~/utils/imageV2'
 import { isXaigenStudio } from '~/utils/videoModels'
+import { joinPromptParts } from '~/utils/promptParts'
 import { listStudioLoras, parsePostedLoraStack, persistLoraFields, assertImageV2LoraStack } from '~/server/utils/loras'
 import { getStill, rememberInputStill, stillPath } from '~/server/utils/library'
 import { existsSync, readFileSync } from 'node:fs'
@@ -135,13 +136,14 @@ export default defineEventHandler(async (event) => {
     fields.task,
     mode === 'generate' ? 't2i' : mode === 'refine' ? 'refine' : 'scene'
   )
-  const prompt = String(fields.prompt || '').trim()
+  const promptMid = String(fields.prompt || '').trim()
   const promptPre = String(fields.promptPre || '').trim()
   const promptPost = String(fields.promptPost || '').trim()
+  const prompt = joinPromptParts(promptPre, promptMid, promptPost)
   const extraPasses = parsePasses(fields.passes)
   const passMode = parseImagePassMode(fields.passMode)
   const aspect = parseImageAspect(fields.aspect)
-  if (!prompt && (mode === 'generate' || aspect === 'auto')) {
+  if (!promptMid && (mode === 'generate' || aspect === 'auto')) {
     throw createError({ statusCode: 400, statusMessage: 'A prompt is required' })
   }
   if (extraPasses.length && (mode === 'refine' || mode === 'generate')) {