Pause the queue after the current clip for real, and carry global locks plus labeled permanence stills through generate and shot prompts.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-28 07:48:09 -05:00
parent 010ef6add2
commit efef409537
21 changed files with 1196 additions and 115 deletions
@@ -167,7 +167,7 @@
            </div>
          </div>
          <p v-if="shotScriptMode && studioMode === 'video'" class="mb-2 text-xs text-zinc-500">
-            Paste a block. Text before the first marker is shot 1. Put <span class="font-medium text-zinc-300">shot 2</span>, <span class="font-medium text-zinc-300">shot 3</span> on their own lines to queue extensions — a line like <span class="font-medium text-zinc-300">Shot Type</span> will not start a new shot. Every shot uses the duration slider.
+            Paste a block. Text before the first marker is shot 1. Put <span class="font-medium text-zinc-300">shot 2</span>, <span class="font-medium text-zinc-300">shot 3</span> on their own lines to queue extensions — a line like <span class="font-medium text-zinc-300">Shot Type</span> will not start a new shot. Every shot uses the duration slider. Global locks are inherited; each shot should add one beat.
            <span v-if="identityPrompting"> The Comfy identity prefix is prepended to every shot, and the same Picture 1 / extra stills are sent with each shot.</span>
          </p>
          <p v-else-if="identityPrompting" class="mb-2 text-xs text-zinc-500">
@@ -274,6 +274,18 @@
            <p class="mt-3 text-[10px] uppercase tracking-wide text-zinc-500">Concatenated result</p>
            <p class="mt-1 whitespace-pre-wrap text-xs text-zinc-300 [overflow-wrap:anywhere]">{{ composedIdentityPrompt }}</p>
          </details>
+          <div v-if="studioMode === 'video'" class="mt-3 space-y-3">
+            <GlobalLocksEditor v-model="globalLocks" />
+            <PermanenceRefStrip
+              :refs="familyPermanenceRefs"
+              label="Permanence refs"
+              hint="Labels for object permanence. Last-frame I2V inherits them in the prompt; they are not extra Comfy identity pictures."
+              :hidden="hideInputPreview"
+              @add="openPermanencePicker()"
+              @remove="removeFamilyRef"
+              @update-label="updateFamilyRefLabel"
+            />
+          </div>
          <div v-if="shotScriptMode && studioMode === 'video'" class="mt-3 hidden space-y-2 md:block">
            <p v-if="!parsedShots.length" class="text-xs text-zinc-500">Add a first shot, then <span class="text-zinc-300">shot 2</span> for an extension.</p>
            <div
@@ -285,7 +297,17 @@
                {{ index === 0 ? 'Initial' : `Extension ${index}` }}
                <span class="font-normal text-zinc-500"> · shot {{ shot.n }} · {{ formatClipDuration(duration) }}</span>
              </p>
-              <p class="mt-1 whitespace-pre-wrap text-xs text-zinc-300 [overflow-wrap:anywhere]">{{ identityPrompting ? buildIdentityPrompt(shot.prompt, extraIdentityPictures) : shot.prompt }}</p>
+              <p class="mt-1 whitespace-pre-wrap text-xs text-zinc-300 [overflow-wrap:anywhere]">{{ composedShotPreview(shot.prompt, index, shot.n) }}</p>
+              <PermanenceRefStrip
+                class="mt-2"
+                :refs="shotPermanenceRefs[shot.n] || []"
+                hint="This shot"
+                :hidden="hideInputPreview"
+                :max="4"
+                @add="openPermanencePicker(shot.n)"
+                @remove="(refIndex) => removeShotRef(shot.n, refIndex)"
+                @update-label="(refIndex, label) => updateShotRefLabel(shot.n, refIndex, label)"
+              />
            </div>
          </div>
        </div>
@@ -314,6 +336,16 @@
              placeholder="Motion prompt for this extension…"
            />
            <DurationField v-model="item.duration" class="mt-3" label="Duration" />
+            <PermanenceRefStrip
+              class="mt-3"
+              :refs="shotPermanenceRefs[index + 2] || []"
+              hint="This extension"
+              :hidden="hideInputPreview"
+              :max="4"
+              @add="openPermanencePicker(index + 2)"
+              @remove="(refIndex) => removeShotRef(index + 2, refIndex)"
+              @update-label="(refIndex, label) => updateShotRefLabel(index + 2, refIndex, label)"
+            />
          </div>
          <button
            type="button"
@@ -1116,6 +1148,16 @@
                      </div>
                    </div>
                    <p class="text-xs text-zinc-500">{{ clipMetaLine(entry.group.head) }}</p>
+                    <p v-if="entry.group.head.globalLocks" class="mt-1 text-[11px] text-zinc-600">Global locks saved with this collection.</p>
+                    <PermanenceRefStrip
+                      v-if="entry.group.parts.length === 1 && !entry.group.head.hideThumbnail"
+                      class="mt-2"
+                      :refs="entry.group.head.permanenceRefs || []"
+                      :hidden="entry.group.head.hideInput || hideInputPreview"
+                      @add="openPermanencePicker(undefined, entry.group.head.id)"
+                      @remove="(refIndex) => removeClipRef(entry.group.head, refIndex)"
+                      @update-label="(refIndex, label) => updateClipRefLabel(entry.group.head, refIndex, label)"
+                    />
                    <div class="mt-2 flex flex-wrap items-center gap-3">
                      <button v-if="entry.group.parts.length > 1" type="button" class="text-xs text-amber-200" @click="toggleFamily(entry.group.key)">
                        {{ expandedFamilies[entry.group.key] ? 'Collapse' : `Expand ${entry.group.parts.length} parts` }}
@@ -1170,6 +1212,15 @@
                        <p v-else class="min-w-0 flex-1 truncate text-sm font-medium">{{ item.name || item.prompt }}</p>
                      </div>
                      <p class="text-xs text-zinc-500">{{ clipMetaLine(item) }}</p>
+                      <PermanenceRefStrip
+                        v-if="!item.hideThumbnail"
+                        class="mt-2"
+                        :refs="item.permanenceRefs || []"
+                        :hidden="item.hideInput || hideInputPreview"
+                        @add="openPermanencePicker(undefined, item.id)"
+                        @remove="(refIndex) => removeClipRef(item, refIndex)"
+                        @update-label="(refIndex, label) => updateClipRefLabel(item, refIndex, label)"
+                      />
                      <div class="mt-1.5 flex flex-wrap items-center gap-3">
                        <button type="button" class="text-xs text-amber-300" @click="openClip(item)">Open</button>
                        <button type="button" class="text-xs text-amber-300" @click="openExtend(item)">Extend</button>
@@ -1360,10 +1411,12 @@
      :folder-id="folderId"
      :hide-input-preview="hideInputPreview"
      :heading="pickerHeading"
+      :still-only="permanencePicker"
      @close="pickerOpen = false"
      @updated="applyLibrary"
      @error="toast"
      @select="onPickedImage"
+      @pick="onPickedPermanence"
    />

    <div class="pointer-events-none fixed bottom-4 right-4 z-50 space-y-2">
@@ -1381,6 +1434,13 @@
 <script setup lang="ts">
 import { parseEditPasses, looksLikeShotScript } from '~/utils/parseRecommend'
 import { parseShotScript } from '~/utils/parseShots'
+import {
+  composeShotPrompt,
+  extractGlobalLocks,
+  isBlankGlobalLocks,
+  nextPermanenceLabel,
+  type PermanenceRef
+} from '~/utils/globalLocks'
 import {
  composeVideoWorkflow,
  isLtxWorkflow,
@@ -1452,6 +1512,8 @@ interface LibraryClip {
  stillId?: string
  sound?: boolean
  hideInput?: boolean
+  globalLocks?: string
+  permanenceRefs?: PermanenceRef[]
 }

 interface RetryDraft {
@@ -1476,8 +1538,11 @@ interface RetryDraft {
  fps?: number
  samplerName?: string
  scheduler?: string
-  extensions?: { prompt: string; duration: number }[]
+  extensions?: { prompt: string; duration: number; permanenceRefs?: PermanenceRef[] }[]
  workflow?: string
+  globalLocks?: string
+  permanenceRefs?: PermanenceRef[]
+  shotPermanenceRefs?: PermanenceRef[][]
 }

 interface QueuedExtension {
@@ -1669,7 +1734,7 @@ const studioJobs = ref<Array<{
 }>>([])
 const outputStudioJobId = ref('')
 const pickerOpen = ref(false)
-const pickerSlot = ref<'main' | 'editRef' | number>('main')
+const pickerSlot = ref<'main' | 'editRef' | number | 'perm' | `perm:${number}` | `clip:${string}`>('main')
 const libraryFilter = ref<'all' | 'images' | 'videos'>('all')
 const selectedKeys = ref<string[]>([])
 const lastSelectedKey = ref('')
@@ -1682,11 +1747,18 @@ const ltxVideo = computed(() => isLtxWorkflow(videoWorkflow.value))
 const useIdentityRefs = ref(false)
 const identityRefs = ref<(File | null)[]>([null, null, null, null])
 const identityPreviews = ref(['', '', '', ''])
+const globalLocks = ref('')
+const familyPermanenceRefs = ref<PermanenceRef[]>([])
+const shotPermanenceRefs = ref<Record<number, PermanenceRef[]>>({})
+const LOCKS_STORE = 'aigen-global-locks'
+const REFS_STORE = 'aigen-permanence-refs'
 const pickerHeading = computed(() => {
  if (pickerSlot.value === 'main') return studioMode.value === 'edit' ? 'Choose image 1' : 'Choose an image'
  if (pickerSlot.value === 'editRef') return 'Choose image 2'
+  if (typeof pickerSlot.value === 'string') return 'Choose a permanence still'
  return `Choose Picture ${Number(pickerSlot.value) + 2}`
 })
+const permanencePicker = computed(() => typeof pickerSlot.value === 'string' && pickerSlot.value !== 'main' && pickerSlot.value !== 'editRef')
 let videoTimer: ReturnType<typeof setInterval> | null = null
 let editTimer: ReturnType<typeof setInterval> | null = null
 let videoSource: EventSource | null = null
@@ -1902,6 +1974,16 @@ const recommendedShots = computed(() => {
 })
 const identityPrompting = computed(() => studioMode.value === 'video' && videoWorkflow.value === 'v2' && useIdentityRefs.value)
 const extraIdentityPictures = computed(() => identityRefs.value.flatMap((item, index) => item ? [index + 2] : []))
+function composedShotPreview(text: string, index: number, shotN?: number) {
+  const composed = composeShotPrompt({
+    globalLocks: globalLocks.value,
+    prompt: text,
+    shotIndex: index,
+    familyRefs: familyPermanenceRefs.value,
+    shotRefs: shotPermanenceRefs.value[shotN ?? index + 1]
+  })
+  return identityPrompting.value ? buildIdentityPrompt(composed, extraIdentityPictures.value) : composed
+}
 const identityActionPrompt = computed(() => {
  if (shotScriptMode.value) return parsedShots.value[0]?.prompt || prompt.value
  return prompt.value
@@ -2315,6 +2397,12 @@ onMounted(async () => {
      if (videoEngine.value === 'ltx') applyEngineDefaults('ltx')
    } catch { /* ignore */ }
    useIdentityRefs.value = localStorage.getItem('aigen-use-identity-refs') === 'true'
+    globalLocks.value = localStorage.getItem(LOCKS_STORE) || ''
+    try {
+      const savedRefs = JSON.parse(localStorage.getItem(REFS_STORE) || '')
+      familyPermanenceRefs.value = Array.isArray(savedRefs?.family) ? savedRefs.family : []
+      shotPermanenceRefs.value = savedRefs?.shots && typeof savedRefs.shots === 'object' ? savedRefs.shots : {}
+    } catch { /* ignore */ }
    activeQueueId.value = localStorage.getItem(QUEUE_STORE) || ''
    const savedPreset = localStorage.getItem('aigen-prompt-preset')
    if (savedPreset) recommendPresetId.value = savedPreset
@@ -2426,6 +2514,13 @@ watch(useIdentityRefs, (value) => {
  } catch { /* ignore */ }
 })

+watch([globalLocks, familyPermanenceRefs, shotPermanenceRefs], () => {
+  try {
+    localStorage.setItem(LOCKS_STORE, globalLocks.value)
+    localStorage.setItem(REFS_STORE, JSON.stringify({ family: familyPermanenceRefs.value, shots: shotPermanenceRefs.value }))
+  } catch { /* ignore */ }
+}, { deep: true })
+
 watch(turbo, (on) => {
  if (cfgTouched.value) return
  cfg.value = ltxVideo.value ? 3.5 : (on ? CFG_TURBO : CFG_QUALITY)
@@ -2569,8 +2664,10 @@ function applyRecommend() {
      prompt.value = text
    }
  } else {
-    prompt.value = text
-    if (looksLikeShotScript(text) || parseShotScript(text).length > 1) shotScriptMode.value = true
+    const extracted = extractGlobalLocks(text)
+    if (extracted.locks && isBlankGlobalLocks(globalLocks.value)) globalLocks.value = extracted.locks
+    prompt.value = extracted.script || text
+    if (looksLikeShotScript(prompt.value) || parseShotScript(prompt.value).length > 1) shotScriptMode.value = true
  }
  recommendApplied.value = true
  toast('Recommended prompt applied')
@@ -2625,6 +2722,9 @@ function clearVideoForm() {
  clipName.value = ''
  extensionQueue.value = []
  shotScriptMode.value = false
+  globalLocks.value = ''
+  familyPermanenceRefs.value = []
+  shotPermanenceRefs.value = {}
  identityRefs.value.forEach((_, index) => clearIdentityRef(index))
  recommendText.value = ''
  recommendError.value = ''
@@ -2649,6 +2749,81 @@ function openPicker(slot: 'main' | 'editRef' | number = 'main') {
  pickerOpen.value = true
 }

+function openPermanencePicker(shot?: number, clipId?: string) {
+  if (clipId) pickerSlot.value = `clip:${clipId}`
+  else if (typeof shot === 'number') pickerSlot.value = `perm:${shot}`
+  else pickerSlot.value = 'perm'
+  pickerOpen.value = true
+}
+
+function addPermanenceRef(stillId: string, shot?: number) {
+  if (typeof shot === 'number') {
+    const current = shotPermanenceRefs.value[shot] || []
+    if (current.some(item => item.stillId === stillId) || current.length >= 4) return
+    shotPermanenceRefs.value = { ...shotPermanenceRefs.value, [shot]: [...current, { stillId, label: nextPermanenceLabel(current) }] }
+    return
+  }
+  if (familyPermanenceRefs.value.some(item => item.stillId === stillId) || familyPermanenceRefs.value.length >= 6) return
+  familyPermanenceRefs.value = [...familyPermanenceRefs.value, { stillId, label: nextPermanenceLabel(familyPermanenceRefs.value) }]
+}
+
+function removeFamilyRef(index: number) {
+  familyPermanenceRefs.value = familyPermanenceRefs.value.filter((_, i) => i !== index)
+}
+
+function updateFamilyRefLabel(index: number, label: string) {
+  familyPermanenceRefs.value = familyPermanenceRefs.value.map((item, i) => i === index ? { ...item, label } : item)
+}
+
+function removeShotRef(shot: number, index: number) {
+  const current = (shotPermanenceRefs.value[shot] || []).filter((_, i) => i !== index)
+  const next = { ...shotPermanenceRefs.value }
+  if (current.length) next[shot] = current
+  else delete next[shot]
+  shotPermanenceRefs.value = next
+}
+
+function updateShotRefLabel(shot: number, index: number, label: string) {
+  const current = (shotPermanenceRefs.value[shot] || []).map((item, i) => i === index ? { ...item, label } : item)
+  shotPermanenceRefs.value = { ...shotPermanenceRefs.value, [shot]: current }
+}
+
+async function persistClipRefs(clip: LibraryClip, refs: PermanenceRef[]) {
+  try {
+    applyLibrary(await $fetch(`/api/library/clips/${clip.id}`, {
+      method: 'PATCH',
+      body: { permanenceRefs: refs }
+    }))
+  } catch (error: any) {
+    toast(error?.data?.statusMessage || 'Could not save permanence refs')
+  }
+}
+
+function removeClipRef(clip: LibraryClip, index: number) {
+  void persistClipRefs(clip, (clip.permanenceRefs || []).filter((_, i) => i !== index))
+}
+
+function updateClipRefLabel(clip: LibraryClip, index: number, label: string) {
+  void persistClipRefs(clip, (clip.permanenceRefs || []).map((item, i) => i === index ? { ...item, label } : item))
+}
+
+function onPickedPermanence(still: { id: string }) {
+  const slot = pickerSlot.value
+  pickerOpen.value = false
+  if (typeof slot === 'string' && slot.startsWith('clip:')) {
+    const clipId = slot.slice(5)
+    const clip = clips.value.find(item => item.id === clipId)
+    if (!clip) return
+    if ((clip.permanenceRefs || []).some(item => item.stillId === still.id)) return
+    void persistClipRefs(clip, [...(clip.permanenceRefs || []), { stillId: still.id, label: nextPermanenceLabel(clip.permanenceRefs || []) }])
+    return
+  }
+  if (typeof slot === 'string' && (slot === 'perm' || slot.startsWith('perm:'))) {
+    const shot = slot === 'perm' ? undefined : Number(slot.slice(5))
+    addPermanenceRef(still.id, Number.isFinite(shot) ? shot : undefined)
+  }
+}
+
 function setEditRef(next: File) {
  if (editRefPreview.value) URL.revokeObjectURL(editRefPreview.value)
  editRefFile.value = next
@@ -2686,6 +2861,7 @@ function clearIdentityRef(index: number) {
 function onPickedImage(next: File, hidden = false) {
  const slot = pickerSlot.value
  pickerOpen.value = false
+  if (typeof slot === 'string' && slot !== 'main' && slot !== 'editRef') return
  if (slot === 'editRef') {
    setEditRef(next)
    return
@@ -2864,8 +3040,11 @@ async function restoreStudioJob(id: string) {
      hideThumbnail?: boolean
      hideInput?: boolean
      referenceStillIds?: Array<string | null>
-      extensions?: { prompt: string; duration: number }[]
+      extensions?: { prompt: string; duration: number; permanenceRefs?: PermanenceRef[] }[]
      queueAutoRun?: boolean
+      globalLocks?: string
+      permanenceRefs?: PermanenceRef[]
+      shotPermanenceRefs?: PermanenceRef[][]
    }
  }>(`/api/studio-queue/${id}`)
  const payload = job.payload
@@ -2907,6 +3086,13 @@ async function restoreStudioJob(id: string) {
    duration: clampDuration(Number(item.duration))
  }))
  queueAutoRun.value = payload.queueAutoRun === true
+  globalLocks.value = payload.globalLocks || ''
+  familyPermanenceRefs.value = payload.permanenceRefs || []
+  const shotRefs: Record<number, PermanenceRef[]> = {}
+  ;(payload.shotPermanenceRefs || []).forEach((refs, index) => {
+    if (refs?.length) shotRefs[index + 1] = refs
+  })
+  shotPermanenceRefs.value = shotRefs
  const stillId = payload.stillId
  if (stillId) {
    const blob = await $fetch<Blob>(`/api/library/stills/${stillId}`, { responseType: 'blob' })
@@ -3131,6 +3317,16 @@ async function rerun(item: LibraryClip, collection = false) {
  shotScriptMode.value = restoreAll
  useIdentityRefs.value = false
  identityRefs.value.forEach((_, index) => clearIdentityRef(index))
+  const ordered = chronologicalParts(parts)
+  globalLocks.value = ordered.find(part => part.globalLocks)?.globalLocks || target.globalLocks || ''
+  familyPermanenceRefs.value = ordered[0]?.permanenceRefs || target.permanenceRefs || []
+  const familyIds = new Set(familyPermanenceRefs.value.map(ref => ref.stillId))
+  const nextShots: Record<number, PermanenceRef[]> = {}
+  ordered.forEach((part, index) => {
+    const extras = (part.permanenceRefs || []).filter(ref => !familyIds.has(ref.stillId))
+    if (extras.length) nextShots[index + 1] = extras
+  })
+  shotPermanenceRefs.value = nextShots
  extensionQueue.value = restoreAll
    ? parts.slice(1).map(part => ({
      id: crypto.randomUUID(),
@@ -3169,6 +3365,13 @@ async function loadDraft(draft: RetryDraft) {
  if (draft.hideInput && showPrivacyToggles.value) hideInputPreview.value = true
  duration.value = clampDuration(Number(draft.duration))
  applyVideoWorkflow(draft.workflow)
+  globalLocks.value = draft.globalLocks || ''
+  familyPermanenceRefs.value = draft.permanenceRefs || []
+  const draftShots: Record<number, PermanenceRef[]> = {}
+  ;(draft.shotPermanenceRefs || []).forEach((refs, index) => {
+    if (refs?.length) draftShots[index + 1] = refs
+  })
+  shotPermanenceRefs.value = draftShots
  extensionQueue.value = (draft.extensions || []).map(item => ({
    id: crypto.randomUUID(),
    prompt: String(item.prompt || ''),
@@ -3857,9 +4060,18 @@ async function generate() {
        if (ref) body.append(`refImage${index}`, ref)
      })
    }
+    if (globalLocks.value.trim()) body.append('globalLocks', globalLocks.value)
+    body.append('permanenceRefs', JSON.stringify(familyPermanenceRefs.value))
+    const shotRefList = shots
+      ? shots.map(shot => shotPermanenceRefs.value[shot.n] || [])
+      : [shotPermanenceRefs.value[1] || [], ...queued.map((_, index) => shotPermanenceRefs.value[index + 2] || [])]
+    body.append('shotPermanenceRefs', JSON.stringify(shotRefList))
    if (activeDraftId) body.append('draftId', activeDraftId)
    if (queued.length) {
-      body.append('extensions', JSON.stringify(queued))
+      body.append('extensions', JSON.stringify(queued.map((item, index) => ({
+        ...item,
+        permanenceRefs: shotRefList[index + 1] || []
+      }))))
      body.append('queueAutoRun', String(queueAutoRun.value))
    }
    const downloadName = clipFileName(clipName.value.trim() || initialPrompt.split(/[.!?\n]/)[0] || 'aigen')