diff --git a/src/areas/generate/components/WorkflowPanel.tsx b/src/areas/generate/components/WorkflowPanel.tsx
index e2d920b..5d6c14f 100644
--- a/src/areas/generate/components/WorkflowPanel.tsx
+++ b/src/areas/generate/components/WorkflowPanel.tsx
@@ -10,6 +10,7 @@ import { useAppStore } from '@shared/stores/appStore'
import { useExtensionsStore } from '@shared/stores/extensionsStore'
import { useNavStore } from '@shared/stores/navStore'
import { useWorkflowRunStore } from '@areas/workflows/workflowRunStore'
+import { useWaitButton } from '@areas/workflows/useWaitButton'
import { buildAllWorkflowExtensions, getWorkflowExtension } from '@areas/workflows/mockExtensions'
import { validateWorkflowPreflight } from '@areas/workflows/preflight'
import type { WorkflowExtension } from '@areas/workflows/mockExtensions'
@@ -335,10 +336,7 @@ function TextParamRow({ nodeId, nodes, onPatch }: { nodeId: string; nodes: FlowN
}
function WaitParamRow({ nodeId }: { nodeId: string }) {
- const status = useWorkflowRunStore((s) => s.runState.status)
- const activeNodeId = useWorkflowRunStore((s) => s.activeNodeId)
- const continueRun = useWorkflowRunStore((s) => s.continueRun)
- const isPaused = status === 'paused' && activeNodeId === nodeId
+ const { waitState, canContinue, isRunning, label, buttonClass, onContinue } = useWaitButton(nodeId)
return (
@@ -348,15 +346,29 @@ function WaitParamRow({ nodeId }: { nodeId: string }) {
Wait
- {isPaused ? (
+ {waitState ? (
) : (
diff --git a/src/areas/workflows/nodeBehaviors.ts b/src/areas/workflows/nodeBehaviors.ts
new file mode 100644
index 0000000..ad3e746
--- /dev/null
+++ b/src/areas/workflows/nodeBehaviors.ts
@@ -0,0 +1,101 @@
+import type { WFNode, WFEdge } from '@shared/types/electron.d'
+
+// ─── Node behaviors registry ──────────────────────────────────────────────────
+//
+// Add a new entry here when you introduce a node type that needs to participate
+// in the runner's control-flow logic. The predicates and helpers below derive
+// everything they need from this table — no hardcoded type checks anywhere else.
+//
+// • passthrough — data flows through this node unchanged. Resolvers (inputs,
+// preflight typing) walk past it to find the real source.
+// • branchStarter — splits the run into a user-driven sub-DAG. The runner
+// pauses on these nodes and exposes a Continue/Retry button.
+// • sceneOutput — terminal sink that gets pushed to the 3D viewer. Used by
+// the immediate mesh-push logic during execution.
+
+export interface NodeBehavior {
+ passthrough?: boolean
+ branchStarter?: boolean
+ sceneOutput?: boolean
+}
+
+const BEHAVIORS: Record = {
+ waitNode: { passthrough: true, branchStarter: true },
+ outputNode: { sceneOutput: true },
+}
+
+export const isPassthrough = (type: string | undefined): boolean => !!type && !!BEHAVIORS[type]?.passthrough
+export const isBranchStarter = (type: string | undefined): boolean => !!type && !!BEHAVIORS[type]?.branchStarter
+export const isSceneOutput = (type: string | undefined): boolean => !!type && !!BEHAVIORS[type]?.sceneOutput
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+/**
+ * Walks `sourceId` backwards through passthrough nodes (following each one's
+ * incoming edge) until it hits a non-passthrough node. Returns its id, or
+ * undefined if a passthrough has no incoming edge.
+ */
+export function resolveDataSource(
+ sourceId: string,
+ edges: WFEdge[],
+ nodeMap: Map,
+): string | undefined {
+ let cur = sourceId
+ const seen = new Set()
+ while (isPassthrough(nodeMap.get(cur)?.type) && !seen.has(cur)) {
+ seen.add(cur)
+ const parent = edges.find((e) => e.target === cur)
+ if (!parent) return undefined
+ cur = parent.source
+ }
+ return cur
+}
+
+/**
+ * Walks backwards from `nodeId` and returns the set of nearest upstream
+ * branch-starter (Wait) nodes — the first Wait found on each incoming path,
+ * without traversing past it. Empty = no upstream Wait. Size > 1 = the node
+ * merges two distinct branches.
+ */
+export function nearestUpstreamWaits(
+ nodeId: string,
+ edges: WFEdge[],
+ nodeMap: Map,
+): Set {
+ const result = new Set()
+ const seen = new Set()
+ const stack = edges.filter((e) => e.target === nodeId).map((e) => e.source)
+ while (stack.length > 0) {
+ const id = stack.pop()!
+ if (seen.has(id)) continue
+ seen.add(id)
+ if (isBranchStarter(nodeMap.get(id)?.type)) { result.add(id); continue }
+ for (const e of edges) if (e.target === id) stack.push(e.source)
+ }
+ return result
+}
+
+/**
+ * True if any forward path from `sourceId` reaches a sceneOutput node, walking
+ * through passthrough nodes along the way.
+ */
+export function reachesSceneOutput(
+ sourceId: string,
+ edges: WFEdge[],
+ nodeMap: Map,
+): boolean {
+ const stack = [sourceId]
+ const seen = new Set()
+ while (stack.length > 0) {
+ const id = stack.pop()!
+ if (seen.has(id)) continue
+ seen.add(id)
+ for (const e of edges) {
+ if (e.source !== id) continue
+ const tType = nodeMap.get(e.target)?.type
+ if (isSceneOutput(tType)) return true
+ if (isPassthrough(tType)) stack.push(e.target)
+ }
+ }
+ return false
+}
diff --git a/src/areas/workflows/nodes/WaitNode.tsx b/src/areas/workflows/nodes/WaitNode.tsx
index 8e30302..3f3dff7 100644
--- a/src/areas/workflows/nodes/WaitNode.tsx
+++ b/src/areas/workflows/nodes/WaitNode.tsx
@@ -1,15 +1,38 @@
import { Handle, Position } from '@xyflow/react'
import type { WFNodeData } from '@shared/types/electron.d'
-import { useWorkflowRunStore } from '../workflowRunStore'
+import { useWaitButton } from '../useWaitButton'
import BaseNode from './BaseNode'
const HANDLE_STYLE = { background: '#71717a', width: 14, height: 14, border: '2.5px solid #18181b' }
export default function WaitNode({ id, data, selected }: { id: string; data: WFNodeData; selected?: boolean }) {
- const status = useWorkflowRunStore((s) => s.runState.status)
- const activeNodeId = useWorkflowRunStore((s) => s.activeNodeId)
- const continueRun = useWorkflowRunStore((s) => s.continueRun)
- const isPaused = status === 'paused' && activeNodeId === id
+ const { waitState, canContinue, isRunning, label, buttonClass, statusText, onContinue } = useWaitButton(id)
+
+ const subheader = waitState ? (
+
+ ) : undefined
return (
}
- subheader={isPaused ? (
-
- ) : undefined}
+ subheader={subheader}
handles={
<>
@@ -43,9 +56,7 @@ export default function WaitNode({ id, data, selected }: { id: string; data: WFN
}
>
-
- {isPaused ? 'Workflow paused — click Continue to resume.' : 'Pauses the workflow until you click Continue.'}
-
+
{statusText}