diff --git a/pages/index.vue b/pages/index.vue
index 2b1cadb..145285f 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -139,32 +139,40 @@
-
+
- + Pass
+ {{ extraPassButtonLabel }}
+
{{ extraPassHint }}
Prompt sent to Reference to Video
@@ -1561,14 +1570,27 @@
>
-
+
+
+
-
+
+
+
{
+ if (studioMode.value === 'video') return promptPresets.value
+ return promptPresets.value.filter(item => item.id !== 'shot-script')
+})
const recommendBusy = ref(false)
const recommendText = ref('')
const recommendError = ref('')
@@ -2849,6 +2888,7 @@ const editV2Blocked = computed(() => {
if (v2Mode.value !== 'generate' && !file.value) return true
if (v2Mode.value === 'compose' && !editRefFile.value) return true
if (v2Mode.value === 'refine' && !refineMaskDirty.value) return true
+ if (v2PassChaining.value && editPassQueue.value.some(item => !item.prompt.trim())) return true
return false
})
const editV2BlockReason = computed(() => {
@@ -2860,14 +2900,37 @@ const editV2BlockReason = computed(() => {
? 'Write a prompt first.'
: 'Write a prompt, or pick Landscape / Portrait / Square to fill the frame.'
}
+ if (v2PassChaining.value && editPassQueue.value.some(item => !item.prompt.trim())) return 'Each extra pass needs a prompt.'
if (!folderId.value) return 'Choose a library folder before generating.'
if (!imageComfyConfigured.value && !comfyOk.value) return 'Image v2 is not configured. Set COMFY_HOST.'
return ''
})
+const v2PassChaining = computed(() => studioMode.value === 'editv2' && (v2Mode.value === 'edit' || v2Mode.value === 'compose'))
+const v2ModeLocked = computed(() => v2PassChaining.value && editPassQueue.value.length > 0)
+const extraPassButtonLabel = computed(() => (
+ studioMode.value === 'editv2' && v2Mode.value === 'compose' ? '+ Compose pass' : '+ Edit pass'
+))
+const extraPassHint = computed(() => {
+ if (studioMode.value === 'editv2' && v2Mode.value === 'compose') {
+ return 'Each extra pass is another Compose on the last output, with the same still B. You cannot switch graphs between passes.'
+ }
+ return 'Each extra pass is another Edit on the last output. You cannot switch graphs between passes.'
+})
+const extraPassPlaceholder = computed(() => (
+ studioMode.value === 'editv2' && v2Mode.value === 'compose'
+ ? 'Next compose prompt, applied to the previous pass output…'
+ : 'Next edit prompt, applied to the previous pass output…'
+))
const editV2SubmitLabel = computed(() => {
const occupied = videoBusy.value || editBusy.value || studioJobs.value.some(job => job.status === 'running')
+ const n = v2PassChaining.value ? editPassQueue.value.length : 0
const label = v2Mode.value === 'generate' ? 'Generate image' : v2Mode.value === 'refine' ? 'Refine image' : v2Mode.value === 'compose' ? 'Compose image' : 'Edit image'
- return occupied ? `Queue ${label.toLowerCase()}` : label
+ if (!occupied) {
+ if (!n) return label
+ return n === 1 ? `${label} + 1 pass` : `${label} + ${n} passes`
+ }
+ if (n) return `Queue ${n + 1} passes`
+ return `Queue ${label.toLowerCase()}`
})
const generateLabel = computed(() => {
const n = queuedExtensionCount.value
@@ -3582,6 +3645,12 @@ watch(recommendPresetId, (id) => {
try { localStorage.setItem('aigen-prompt-preset', id) } catch { /* ignore */ }
})
+watch(studioMode, () => {
+ if (studioMode.value !== 'video' && recommendPresetId.value === 'shot-script') {
+ recommendPresetId.value = 'enhance'
+ }
+})
+
watch([browseFolderId, libraryFilter], () => {
selectedKeys.value = []
lastSelectedKey.value = ''
@@ -3987,6 +4056,7 @@ function applyGenerationPreset(preset: GenerationPreset) {
const settings = preset.settings as ImageV2PresetSettings
persistImageV2LoraStack(imageV2LoraStack.value, v2Engine.value)
v2Mode.value = settings.mode === 'compose' ? 'compose' : settings.mode === 'refine' ? 'refine' : settings.mode === 'generate' ? 'generate' : 'edit'
+ if (v2Mode.value !== 'edit' && v2Mode.value !== 'compose') editPassQueue.value = []
v2Engine.value = parseImageV2Engine(settings.engine, 'flux')
v2Task.value = v2Mode.value === 'compose' ? (settings.task || 'scene') : v2Mode.value === 'refine' ? 'refine' : v2Mode.value === 'generate' ? 't2i' : 'scene'
if (typeof settings.prompt === 'string') prompt.value = settings.prompt
@@ -4203,6 +4273,9 @@ async function loadPromptPresets() {
} else if (!promptPresets.value.some(item => item.id === recommendPresetId.value)) {
recommendPresetId.value = promptPresets.value[0]?.id || 'enhance'
}
+ if (studioMode.value !== 'video' && recommendPresetId.value === 'shot-script') {
+ recommendPresetId.value = 'enhance'
+ }
}
async function recommendPrompt() {
@@ -4220,7 +4293,7 @@ async function recommendPrompt() {
body.append('presetId', recommendPresetId.value)
body.append(
'mode',
- studioMode.value === 'edit' ? 'edit' : (shotScriptMode.value ? 'shot-script' : 'video')
+ studioMode.value === 'edit' || studioMode.value === 'editv2' ? 'edit' : (shotScriptMode.value ? 'shot-script' : 'video')
)
try {
const started = await $fetch('/api/prompt/recommend', { method: 'POST', body })
@@ -4258,7 +4331,7 @@ function applyRecommend() {
promptBeforeRecommend.value = prompt.value
editPassesBeforeRecommend.value = editPassQueue.value.map(item => ({ ...item }))
shotScriptBeforeRecommend.value = shotScriptMode.value
- if (studioMode.value === 'edit') {
+ if (studioMode.value === 'edit' || v2PassChaining.value) {
const passes = parseEditPasses(text)
if (passes && passes.length > 1) {
prompt.value = passes[0]
@@ -5909,6 +5982,11 @@ async function editImage() {
}
function setV2Mode(mode: ImageV2Mode) {
+ if (v2Mode.value === mode) return
+ if (editPassQueue.value.length && v2PassChaining.value) {
+ toast('Remove extra passes to change graphs. Extra passes stay in the current mode.')
+ return
+ }
v2Mode.value = mode
if (mode === 'edit') v2Task.value = 'scene'
if (mode === 'refine') {
@@ -5994,6 +6072,7 @@ async function ensureRefineCanvas() {
async function sendToEdit() {
if (!editResultUrl.value) return
+ editPassQueue.value = []
studioMode.value = 'editv2'
outputFocus.value = 'edit'
try {
@@ -6007,6 +6086,7 @@ async function sendToEdit() {
async function sendToRefine() {
if (!editResultUrl.value) return
+ editPassQueue.value = []
studioMode.value = 'editv2'
outputFocus.value = 'edit'
try {
@@ -6031,6 +6111,11 @@ async function editImageV2() {
toast('Paint a mask on Still A first. Refine will not fall back to Edit.')
return
}
+ if (v2PassChaining.value && editPassQueue.value.some(item => !item.prompt.trim())) {
+ toast('Each extra pass needs a prompt.')
+ return
+ }
+ const extraPasses = v2PassChaining.value ? editPassQueue.value.map(item => ({ prompt: item.prompt.trim() })) : []
const hideOut = hideThumbnail.value
try {
const body = new FormData()
@@ -6072,6 +6157,7 @@ async function editImageV2() {
body.append('hideThumbnail', String(showPrivacyToggles.value && hideThumbnail.value))
body.append('name', clipName.value.trim())
if (inputStillId.value) body.append('stillId', inputStillId.value)
+ if (extraPasses.length) body.append('passes', JSON.stringify(extraPasses))
const v2Stack = filterLoraStackForImageEngine(
filterLoraStackForStudio(imageV2LoraStack.value, ltxEnabled.value),
v2Engine.value
@@ -6097,7 +6183,10 @@ async function editImageV2() {
body
})
if (started.queued) {
- toast(v2Engine.value === 'krea' ? 'Queued Krea generate behind the current job.' : 'Queued Image v2 behind the current job.')
+ const n = 1 + extraPasses.length
+ toast(n > 1
+ ? `Queued ${n} Image v2 passes behind the current job.`
+ : (v2Engine.value === 'krea' ? 'Queued Krea generate behind the current job.' : 'Queued Image v2 behind the current job.'))
await refreshStudioQueue()
return
}
@@ -6113,11 +6202,17 @@ async function editImageV2() {
editStatusMessage.value = 'Checking Beast ComfyUI...'
editMaxStep.value = started.steps
editChainStep.value = 1
- editChainTotal.value = 1
- editChainLabel.value = ''
+ editChainTotal.value = 1 + extraPasses.length
+ editChainLabel.value = extraPasses.length ? 'Pass 1' : ''
editOverallProgress.value = 0
editCompletedChainStep.value = 0
- editActiveChainPlan.value = [{ label: v2Mode.value === 'generate' ? 'Generate' : v2Mode.value === 'refine' ? 'Refine' : v2Mode.value === 'compose' ? 'Compose' : 'Edit', prompt: prompt.value.trim() }]
+ const passNoun = v2Mode.value === 'compose' ? 'Compose' : v2Mode.value === 'refine' ? 'Refine' : v2Mode.value === 'generate' ? 'Generate' : 'Edit'
+ editActiveChainPlan.value = extraPasses.length
+ ? [
+ { label: 'Pass 1', prompt: prompt.value.trim() },
+ ...extraPasses.map((item, index) => ({ label: `Pass ${index + 2}`, prompt: item.prompt }))
+ ]
+ : [{ label: passNoun, prompt: prompt.value.trim() }]
startTimer('edit')
editDownloadName.value = downloadName
editJobId.value = started.jobId
diff --git a/pages/library.vue b/pages/library.vue
index 11a55f2..8a82b10 100644
--- a/pages/library.vue
+++ b/pages/library.vue
@@ -162,14 +162,27 @@
v-if="partCount(entry) > 1"
class="absolute right-2 top-2 rounded-md bg-black/60 px-1.5 py-0.5 text-[10px] text-amber-100"
>{{ partCount(entry) }}
-
+
+
+
{{ entry.name }}
@@ -184,8 +197,8 @@