Skip to content

patch/keep image inputs in order on multi-image nodes #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lightningpixel merged 3 commits into from
Aug 26, 2026
Merged

patch/keep image inputs in order on multi-image nodes #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f2b7ff
feat: dynamic N-handle multi-image input for extensions
iammojogo-sudo Jun 22, 2026
e5eac44
Merge branch 'dev' into extension-multi-image-fix
iammojogo-sudo Aug 1, 2026
496ad0f
fix: restore the multi-image routing e5eac44 silently dropped
lightningpixel Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 53 additions & 50 deletions src/areas/workflows/nodes/ExtensionNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,8 @@ export default function ExtensionNode({ id, data, selected }: { id: string; data
const { updateNodeData } = useReactFlow()
const running = useWorkflowRunStore((s) => s.activeNodeId === id)

// Refs for handle alignment — support up to 2 inputs
const ioRowRef = useRef<HTMLDivElement>(null)
const ioRow2Ref = useRef<HTMLDivElement>(null)
const [handleTop, setHandleTop] = useState('50%')
const [handle2Top, setHandle2Top] = useState('50%')
const handleRefs = useRef<HTMLDivElement[]>([])
const [handleTops, setHandleTops] = useState<string[]>([])

const { modelExtensions, processExtensions } = useExtensionsStore()
const allExtensions = buildAllWorkflowExtensions(modelExtensions, processExtensions)
Expand All @@ -178,15 +175,14 @@ export default function ExtensionNode({ id, data, selected }: { id: string; data

// Align handles with their respective IO rows after mount
useLayoutEffect(() => {
if (ioRowRef.current) {
const center = ioRowRef.current.offsetTop + ioRowRef.current.offsetHeight / 2
setHandleTop(`${center}px`)
}
if (ioRow2Ref.current) {
const center = ioRow2Ref.current.offsetTop + ioRow2Ref.current.offsetHeight / 2
setHandle2Top(`${center}px`)
}
}, [isMulti])
setHandleTops(handleRefs.current.map((ref) => {
if (ref) {
const center = ref.offsetTop + ref.offsetHeight / 2
return `${center}px`
}
return '50%'
}))
}, [isMulti, inputs?.length])

const patchParam = useCallback((key: string, val: number | string) => {
const params = { ...data.params, [key]: val }
Expand All @@ -207,32 +203,30 @@ export default function ExtensionNode({ id, data, selected }: { id: string; data

// ── IO subheader ─────────────────────────────────────────────────────────
const ioSubheader = isMulti ? (
// Multi-input layout: one row per input, output on first row
// Multi-input layout: one row per input (N, not just 2), output on the first row.
// Row refs feed the same handleRefs array handlesEl aligns its Handles against.
<div className="flex flex-col divide-y divide-zinc-800/40">
<div ref={ioRowRef} className="flex items-center justify-between px-3 py-2">
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-medium border ${TAG_CLS[inputs[0]] ?? 'border-zinc-700 bg-zinc-800 text-zinc-400'}`}>
{ext?.inputLabels?.[0] ?? inputs[0]}
</span>
{!isTerminal && (
<>
<svg width="8" height="8" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" className="text-zinc-600 shrink-0">
<line x1="5" y1="12" x2="19" y2="12"/><polyline points="12 5 19 12 12 19"/>
</svg>
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-medium border ${TAG_CLS[ext?.output ?? ''] ?? 'border-zinc-700 bg-zinc-800 text-zinc-400'}`}>
{ext?.output ?? '—'}
</span>
</>
)}
</div>
<div ref={ioRow2Ref} className="flex items-center px-3 py-2">
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-medium border ${TAG_CLS[inputs[1]] ?? 'border-zinc-700 bg-zinc-800 text-zinc-400'}`}>
{ext?.inputLabels?.[1] ?? inputs[1]}
</span>
</div>
{inputs.map((inputType, i) => (
<div key={i} ref={(el) => { if (el) handleRefs.current[i] = el }} className="flex items-center justify-between px-3 py-2">
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-medium border ${TAG_CLS[inputType] ?? 'border-zinc-700 bg-zinc-800 text-zinc-400'}`}>
{ext?.inputLabels?.[i] ?? inputType}
</span>
{i === 0 && !isTerminal && (
<>
<svg width="8" height="8" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" className="text-zinc-600 shrink-0">
<line x1="5" y1="12" x2="19" y2="12"/><polyline points="12 5 19 12 12 19"/>
</svg>
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-medium border ${TAG_CLS[ext?.output ?? ''] ?? 'border-zinc-700 bg-zinc-800 text-zinc-400'}`}>
{ext?.output ?? '—'}
</span>
</>
)}
</div>
))}
</div>
) : (
// Single-input layout (existing behavior)
<div ref={ioRowRef} className="flex items-center justify-between px-3 py-2">
<div ref={(el) => { if (el) handleRefs.current[0] = el }} className="flex items-center justify-between px-3 py-2">
<span className={`inline-flex items-center px-1.5 py-0.5 rounded text-[9px] font-medium border ${TAG_CLS[ext?.input ?? ''] ?? 'border-zinc-700 bg-zinc-800 text-zinc-400'}`}>
{ext?.input ?? '—'}
</span>
Expand All @@ -250,31 +244,40 @@ export default function ExtensionNode({ id, data, selected }: { id: string; data
)

// ── Handles ──────────────────────────────────────────────────────────────
const handlesEl = (
const handlesEl = isMulti ? (
<>
{/* Primary input handle */}
<Handle
id="input-0"
type="target"
position={Position.Left}
style={{ background: HANDLE_COLOR[isMulti ? inputs[0] : (ext?.input ?? 'image')], width: 14, height: 14, border: '2.5px solid #18181b', top: handleTop }}
/>
{/* Secondary input handle (multi-input only) */}
{isMulti && (
{inputs.map((inputType, i) => (
<Handle
id="input-1"
key={i}
id={`input-${i}`}
type="target"
position={Position.Left}
style={{ background: HANDLE_COLOR[inputs[1]], width: 14, height: 14, border: '2.5px solid #18181b', top: handle2Top }}
style={{ background: HANDLE_COLOR[inputType], width: 14, height: 14, border: '2.5px solid #18181b', top: handleTops[i] ?? '50%' }}
/>
))}
{!isTerminal && (
<Handle
id="output"
type="source"
position={Position.Right}
style={{ background: outputColor, width: 14, height: 14, border: '2.5px solid #18181b', top: handleTops[0] ?? '50%' }}
/>
)}
{/* Output handle */}
</>
) : (
<>
<Handle
id="input-0"
type="target"
position={Position.Left}
style={{ background: HANDLE_COLOR[ext?.input ?? 'image'], width: 14, height: 14, border: '2.5px solid #18181b', top: handleTops[0] ?? '50%' }}
/>
{!isTerminal && (
<Handle
id="output"
type="source"
position={Position.Right}
style={{ background: outputColor, width: 14, height: 14, border: '2.5px solid #18181b', top: handleTop }}
style={{ background: outputColor, width: 14, height: 14, border: '2.5px solid #18181b', top: handleTops[0] ?? '50%' }}
/>
)}
</>
Expand Down
47 changes: 40 additions & 7 deletions src/areas/workflows/workflowRunStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,20 +311,38 @@ async function executeExtensionNode(
// Per-slot texts for multi-text-input nodes (e.g. positive/negative prompts).
// Indexed by target handle: input-0 → texts[0], input-1 → texts[1].
const nodeInputTexts: (string | undefined)[] = []
// Every image beyond the first resolved slot, for extensions that take several
// (e.g. a texture node taking a mesh plus multiple reference images).
const extraImagePaths: string[] = []

const incomingEdges = workflow.edges.filter((e) => e.target === node.id)

if (ext?.inputs && ext.inputs.length > 1) {
const inputTypes = ext.inputs
// Resolved by target handle first, then typed by that slot's declared input --
// not by the arrival order of `incomingEdges`, which does not match slot order.
const inputPaths = new Array<string | undefined>(inputTypes.length).fill(undefined)

for (const edge of incomingEdges) {
const src = resolveSource(edge.source)
if (!src) continue
if (src.outputType === 'mesh') nodeInputMeshPath = src.filePath
else if (src.outputType === 'image') nodeInputPath = src.filePath
else if (src.filePath !== undefined) nodeInputPath = src.filePath
const slotMatch = /^input-(\d+)$/.exec(edge.targetHandle ?? '')
const slot = slotMatch ? Number(slotMatch[1]) : 0
if (src.filePath !== undefined && slot < inputTypes.length) inputPaths[slot] = src.filePath
if (src.text !== undefined && src.text.trim().length > 0) {
nodeInputText = src.text
const slot = /^input-(\d+)$/.exec(edge.targetHandle ?? '')
if (slot) nodeInputTexts[Number(slot[1])] = src.text
if (slotMatch) nodeInputTexts[slot] = src.text
}
}

for (let i = 0; i < inputTypes.length; i++) {
const fp = inputPaths[i]
if (!fp) continue
if (inputTypes[i] === 'mesh') {
nodeInputMeshPath = fp
} else if (inputTypes[i] === 'image') {
if (!nodeInputPath) nodeInputPath = fp
else extraImagePaths.push(fp)
}
}
} else {
Expand Down Expand Up @@ -370,6 +388,9 @@ async function executeExtensionNode(
extraParams.prompt = nodeInputText
extraParams.text = nodeInputText
}
if (extraImagePaths.length > 0) {
extraParams.extra_image_paths = extraImagePaths
}

const schemaDefaults = Object.fromEntries(
(ext.params ?? []).map((p) => [p.id, p.default]),
Expand Down Expand Up @@ -426,15 +447,27 @@ async function executeExtensionNode(
const parts = (node.data.extensionId ?? '').split('/')
const extId = parts[0]
const nid = parts[1] ?? ''

// Freshest params (liveParams), same as the model-node branch above, so a
// multi-image process node re-run inside a loop also picks up edits made while
// paused rather than the snapshot captured at run start.
const processParams: Record<string, unknown> = { ...liveParams }
if (nodeInputMeshPath && nodeInputPath) {
// Texture node: mesh is filePath, all images in extra_image_paths
processParams.extra_image_paths = [nodeInputPath, ...extraImagePaths]
} else if (extraImagePaths.length > 0) {
processParams.extra_image_paths = extraImagePaths
}

const result = await window.electron.extensions.runProcess(
extId,
{
filePath: nodeInputPath,
filePath: nodeInputMeshPath ?? nodeInputPath,
text: nodeInputText,
texts: nodeInputTexts.length > 0 ? nodeInputTexts : undefined,
nodeId: nid,
},
liveParams as Record<string, unknown>,
processParams,
)
if (!result.success) throw new Error(result.error ?? 'Process extension failed')
nodeInputPath = result.result?.filePath ?? nodeInputPath
Expand Down