Split prompts into pre/prompt/post and tidy the AIGen video form.

Keep wrappers off the library mid-prompt so Use as input and Extend restore the same split, send stills to xAIGen as hidden inputs, and stop the two-column library from growing with the list.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Towsty
2026-09-01 18:39:02 -05:00
co-authored by Cursor
parent ed04dcfee3
commit f788fd4bb4
22 changed files with 753 additions and 199 deletions
+4
View File
@@ -34,6 +34,8 @@ export default defineEventHandler(async (event) => {
}
const prompt = (fields.prompt || '').trim()
const promptPre = (fields.promptPre || '').trim()
const promptPost = (fields.promptPost || '').trim()
const extraPasses = parsePasses(fields.passes)
const passMode = parseImagePassMode(fields.passMode)
const aspect = parseImageAspect(fields.aspect)
@@ -127,6 +129,8 @@ export default defineEventHandler(async (event) => {
kind: 'edit',
payload: {
prompt,
promptPre: promptPre || undefined,
promptPost: promptPost || undefined,
name: clipName,
folderId,
aspect,
+9 -3
View File
@@ -1,6 +1,7 @@
import { copyFileSync, existsSync, readFileSync } from 'node:fs'
import { join } from 'node:path'
import { composeShotPrompt } from '~/utils/globalLocks'
import { composePromptParts } from '~/utils/promptParts'
import { parsePostedLoraStack, listStudioLoras, persistLoraFields, ensureComfyLoraNames } from '~/server/utils/loras'
import { readLoraStack } from '~/utils/loras'
import { clampVideoCfg } from '~/utils/generationPresets'
@@ -39,7 +40,7 @@ function parseScheduler(raw: unknown) {
}
export default defineEventHandler(async (event) => {
const body = await readBody<{ clipId?: string; prompt?: string; duration?: number; lora?: unknown; loraStack?: unknown }>(event).catch(() => ({}))
const body = await readBody<{ clipId?: string; prompt?: string; promptPre?: string; promptPost?: string; duration?: number; lora?: unknown; loraStack?: unknown }>(event).catch(() => ({}))
const clipId = String(body?.clipId || '').trim()
const prompt = String(body?.prompt || '').trim()
if (!clipId) {
@@ -60,9 +61,11 @@ export default defineEventHandler(async (event) => {
const destFolder = publicLibrary(event).folders.find(folder => folder.id === source.folderId)
const folderLocked = Boolean(destFolder?.protected && !destFolder.unlocked)
const durationSeconds = parseExtendDuration(body?.duration)
const promptPre = String(body?.promptPre ?? source.promptPre ?? '').trim()
const promptPost = String(body?.promptPost ?? source.promptPost ?? '').trim()
const composedPrompt = composeShotPrompt({
globalLocks: source.globalLocks,
prompt,
prompt: composePromptParts(promptPre, prompt, promptPost),
shotIndex: (source.chainIndex || 0) + 1,
familyRefs: source.permanenceRefs
})
@@ -99,7 +102,10 @@ export default defineEventHandler(async (event) => {
hideThumbnail: source.hideThumbnail,
folderLocked,
name: clipName,
prompt: composedPrompt,
prompt,
promptMid: prompt,
promptPre: promptPre || undefined,
promptPost: promptPost || undefined,
aspect: source.aspect || '16:9',
width,
height,
+9 -3
View File
@@ -5,6 +5,7 @@ import type { LoraStackItem } from '~/utils/loras'
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 } from '~/utils/promptParts'
function parseDuration(raw: unknown) {
const seconds = Number(raw)
@@ -137,11 +138,13 @@ export default defineEventHandler(async (event) => {
if (!image && !textToVideo) {
throw createError({ statusCode: 400, statusMessage: 'An initial image is required' })
}
const promptRaw = (fields.prompt || '').trim()
if (!promptRaw) {
const promptMid = (fields.prompt || '').trim()
const promptPre = (fields.promptPre || '').trim()
const promptPost = (fields.promptPost || '').trim()
if (!composePromptParts(promptPre, promptMid, promptPost)) {
throw createError({ statusCode: 400, statusMessage: 'A motion prompt is required' })
}
const resolvedLocks = resolveGlobalLocks(fields.globalLocks || '', promptRaw)
const resolvedLocks = resolveGlobalLocks(fields.globalLocks || '', promptMid)
const prompt = resolvedLocks.prompt
const globalLocks = resolvedLocks.locks
const extensions = parseExtensions(fields.extensions)
@@ -243,6 +246,9 @@ export default defineEventHandler(async (event) => {
familyId,
payload: {
prompt,
promptMid: promptMid || undefined,
promptPre: promptPre || undefined,
promptPost: promptPost || undefined,
name: clipName,
folderId,
aspect: fields.aspect || 'auto',
+48
View File
@@ -0,0 +1,48 @@
import { passwordAuthEnabled, privateInstanceId } from '~/server/utils/localAuth'
import { saveStill } from '~/server/utils/library'
function ingestOwner() {
if (passwordAuthEnabled()) return privateInstanceId()
return 'local'
}
function assertIngestToken(event: Parameters<typeof getHeader>[0]) {
const expected = String(useRuntimeConfig().backupIngestToken || process.env.BACKUP_INGEST_TOKEN || '').trim()
if (!expected) {
throw createError({ statusCode: 503, statusMessage: 'Backup ingest is not configured' })
}
const header = String(getHeader(event, 'authorization') || '')
if (header !== `Bearer ${expected}`) {
throw createError({ statusCode: 401, statusMessage: 'Unauthorized' })
}
}
export default defineEventHandler(async (event) => {
assertIngestToken(event)
const form = await readMultipartFormData(event)
if (!form?.length) throw createError({ statusCode: 400, statusMessage: 'Expected an image upload' })
const fields: Record<string, string> = {}
let image: { filename: string; data: Buffer } | null = null
for (const part of form) {
if (part.name === 'image' && part.filename && part.data?.length) {
image = { filename: part.filename, data: part.data }
} else if (part.name && part.data) {
fields[part.name] = part.data.toString('utf8')
}
}
if (!image) throw createError({ statusCode: 400, statusMessage: 'An image is required' })
const owner = ingestOwner()
const still = await saveStill({
ownerKey: owner,
folderId: 'inbox',
filename: image.filename,
data: image.data,
width: Number(fields.width || 0),
height: Number(fields.height || 0),
hideInput: true,
role: 'input',
name: (fields.name || '').trim().slice(0, 80) || undefined
})
if (!still) throw createError({ statusCode: 400, statusMessage: 'Backup studio already has that still' })
return { ok: true, id: still.id }
})
@@ -0,0 +1,38 @@
import { readFileSync } from 'node:fs'
import { isXaigenStudio } from '~/utils/videoModels'
import { assertLibraryOwner, getStill, stillPath } from '~/server/utils/library'
export default defineEventHandler(async (event) => {
if (isXaigenStudio()) {
throw createError({ statusCode: 404, statusMessage: 'Not found' })
}
const config = useRuntimeConfig()
const url = String(config.backupStudioUrl || process.env.BACKUP_STUDIO_URL || '').replace(/\/$/, '')
const token = String(config.backupStudioToken || process.env.BACKUP_STUDIO_TOKEN || '').trim()
if (!url || !token) {
throw createError({ statusCode: 503, statusMessage: 'Backup studio is not configured' })
}
const { owner } = assertLibraryOwner(event)
const id = String(getRouterParam(event, 'id') || '')
const still = getStill(owner, id)
const path = stillPath(owner, still.id)
const data = readFileSync(path)
const body = new FormData()
body.append('image', new Blob([Uint8Array.from(data)]), still.filename || 'still.png')
body.append('name', still.name || still.filename || 'still')
body.append('width', String(still.width || 0))
body.append('height', String(still.height || 0))
const res = await fetch(`${url}/api/library/backup-ingest`, {
method: 'POST',
headers: { Authorization: `Bearer ${token}` },
body
})
if (!res.ok) {
const message = await res.text().catch(() => '')
throw createError({
statusCode: res.status === 401 ? 502 : res.status,
statusMessage: message || 'Backup studio refused the still'
})
}
return { ok: true }
})
+4
View File
@@ -136,6 +136,8 @@ export default defineEventHandler(async (event) => {
mode === 'generate' ? 't2i' : mode === 'refine' ? 'refine' : 'scene'
)
const prompt = String(fields.prompt || '').trim()
const promptPre = String(fields.promptPre || '').trim()
const promptPost = String(fields.promptPost || '').trim()
const extraPasses = parsePasses(fields.passes)
const passMode = parseImagePassMode(fields.passMode)
const aspect = parseImageAspect(fields.aspect)
@@ -305,6 +307,8 @@ export default defineEventHandler(async (event) => {
kind: 'edit',
payload: {
prompt,
promptPre: promptPre || undefined,
promptPost: promptPost || undefined,
name: clipName,
folderId,
aspect: mode === 'generate' ? generateSize.aspect : aspect,