refactor: nodes as builder pattern

frontend/src/components/nodes/agent/AgentNode.tsx

@@ -16,6 +16,7 @@ import { NodeFooterEdgeIndicators } from '@/components/base/NodeFooterEdgeIndica
 import { NodeHeaderTitle } from '@/components/base/NodeHeaderTitle'
 import { InputHandle, OutputHandle } from '@/components/base/NodeHandles'
 import FlowContext from '@/lib/flowContext'
+import { useSyncConnectionStatus } from '@/lib/nodeLifecycle'
 import { getNodeType } from '@/lib/nodeRegistry'
 import { Button } from '@/components/ui/button'
 import { usePlatform } from '@/app/kosmos/KosmosContext'
@@ -57,10 +58,6 @@ function serializeNodeForContext(nodes: { id: string; type?: string; data?: unkn
 function AgentNodeComponent({ id, data, width, height, selected }: Props) {
   const flowContext = useContext(FlowContext)
   const setFullscreenNodeId = flowContext?.setFullscreenNodeId
-  const startConnectionPathUpdate = flowContext?.startConnectionPathUpdate
-  const endConnectionPathUpdate = flowContext?.endConnectionPathUpdate
-  const addConnectionPathPausedNode = flowContext?.addConnectionPathPausedNode
-  const removeConnectionPathPausedNode = flowContext?.removeConnectionPathPausedNode
   const supportsFullscreen = getNodeType('agent')?.supportsFullscreen
   const { nodes, sourceIds, updateData } = useAbstractNode<AgentNodeData>(id, data ?? {})
   const { aiConnection } = usePlatform()
@@ -103,9 +100,7 @@ function AgentNodeComponent({ id, data, width, height, selected }: Props) {
     const prompt = configContents.length > 0 ? configContents.join('\n\n---\n\n') : 'No prompt provided. Please describe what you want in structured markdown.'
     const contextNodes = sourceIds.map((sid) => ({ id: sid, content: serializeNodeForContext(nodes, sid) }))
 
-    removeConnectionPathPausedNode?.(id)
     updateData({ error: undefined, loading: true })
-    startConnectionPathUpdate?.(id)
     setRunning(true)
     try {
       const res = await fetch('/api/agent', {
@@ -125,7 +120,6 @@ function AgentNodeComponent({ id, data, width, height, selected }: Props) {
           error: (json as { error?: string }).error ?? `Request failed: ${res.status}`,
           outputMarkdown: undefined,
         })
-        endConnectionPathUpdate?.(id)
         return
       }
       const markdown = (json as { markdown?: string }).markdown ?? ''
@@ -135,18 +129,16 @@ function AgentNodeComponent({ id, data, width, height, selected }: Props) {
         outputMarkdown: markdown,
         lastRunSourceSignature: sourceSignature,
       })
-      endConnectionPathUpdate?.(id)
     } catch (err: unknown) {
       updateData({
         loading: false,
         error: err instanceof Error ? err.message : 'Agent request failed',
         outputMarkdown: undefined,
       })
-      endConnectionPathUpdate?.(id)
     } finally {
       setRunning(false)
     }
-  }, [sourceIds, nodes, contextText, sourceSignature, updateData, aiConnection, removeConnectionPathPausedNode, startConnectionPathUpdate, endConnectionPathUpdate])
+  }, [sourceIds, nodes, contextText, sourceSignature, updateData, aiConnection])
 
   const onContextChange = useCallback(
     (e: React.ChangeEvent<HTMLTextAreaElement>) => updateData({ context: e.target.value }),
@@ -161,10 +153,12 @@ function AgentNodeComponent({ id, data, width, height, selected }: Props) {
     triggerNodeIds.length > 0 &&
     !loading &&
     sourceSignature !== lastRunSourceSignature
-  useEffect(() => {
-    if (hasPendingInputs) addConnectionPathPausedNode?.(id)
-    else removeConnectionPathPausedNode?.(id)
-  }, [id, hasPendingInputs, addConnectionPathPausedNode, removeConnectionPathPausedNode])
+
+  useSyncConnectionStatus(id, {
+    updating: running || loading,
+    error: !!error,
+    paused: hasPendingInputs && !running && !loading,
+  })
 
   return (
     <BaseNode

frontend/src/components/nodes/agent/descriptor.tsx

@@ -0,0 +1,24 @@
+import React from 'react'
+import { Bot } from 'lucide-react'
+import { createNodeTypeBuilder } from '@/lib/nodeTypeBuilder'
+import { NODE_HELP } from '@/lib/nodeHelp'
+import type { NodeTypeDescriptor } from '@/lib/nodeRegistry'
+import AgentNode from './AgentNode'
+import { agentRenderingLogic } from './renderingLogic'
+
+const ICON_CLASS = 'mr-2 h-4 w-4'
+
+export function getAgentNodeDescriptor(): NodeTypeDescriptor {
+  return createNodeTypeBuilder('agent', AgentNode, { width: 360, height: 320 }, { context: '' })
+    .idPrefix('agt_')
+    .withInputOutput(true, true)
+    .classification('archon')
+    .allowedSourceTypes(['config', 'variable', 'data'])
+    .allowedTargetTypes(['render'])
+    .help(NODE_HELP.agent)
+    .menu('Agent', <Bot className={ICON_CLASS} />)
+    .connectionLabel('prompt/context')
+    .withFullscreen()
+    .sourceRenderingLogic(agentRenderingLogic)
+    .build()
+}

frontend/src/components/nodes/agent/index.ts

@@ -0,0 +1,2 @@
+export { default as AgentNode, type AgentNodeData } from './AgentNode'
+export { getAgentNodeDescriptor } from './descriptor'

frontend/src/components/nodes/agent/renderingLogic.ts

@@ -0,0 +1,15 @@
+/**
+ * Agent node rendering logic: provides the agent's markdown output to the Rendering node.
+ * Update mode is manual (user clicks Run on the renderer).
+ */
+
+import type { SourceRenderingLogic } from '@/lib/sourceRenderingLogic'
+
+export const agentRenderingLogic: SourceRenderingLogic = {
+  defaultUpdateMode: 'manual',
+  getResolvedContent: async (context) => {
+    const sourceNode = context.nodes.find((n) => n.id === context.sourceNodeId)
+    const outputMarkdown = (sourceNode?.data as { outputMarkdown?: string } | undefined)?.outputMarkdown ?? ''
+    return { resolved: outputMarkdown, outputTypeId: 'markdown' }
+  },
+}

frontend/src/components/nodes/config/ConfigNode.tsx

@@ -8,11 +8,11 @@ import {
     createAbstractNodeComponent,
     useAbstractNode,
     type FlowNode,
-} from '../../lib/abstractNode'
-import { useResizeHeight } from '../../hooks/useResizeHeight'
-import { nunjucksCompletionSource } from '../../lib/nunjucksAutocomplete'
-import { plantumlLanguage } from '../../lib/plantumlLanguage'
-import { useTheme } from '../../lib/themeContext'
+} from '@/lib/abstractNode'
+import { useResizeHeight } from '@/hooks/useResizeHeight'
+import { nunjucksCompletionSource } from '@/lib/nunjucksAutocomplete'
+import { plantumlLanguage } from '@/lib/plantumlLanguage'
+import { useTheme } from '@/lib/themeContext'
 import {
     CONFIG_TYPES,
     getConfigContent,
@@ -20,13 +20,13 @@ import {
     getConfigTypeId,
     isGroup,
     type ConfigTypeId,
-} from '../../lib/configTypes'
+} from '@/lib/configTypes'
 import {
     BaseNode,
     BaseNodeContent,
     BaseNodeFooter,
     BaseNodeHeaderRow,
-} from '../base/BaseNode'
+} from '@/components/base/BaseNode'
 import { Code2, Database, ScrollText, Variable } from 'lucide-react'
 import {
     MenubarItem,
@@ -35,15 +35,15 @@ import {
     MenubarSub,
     MenubarSubContent,
     MenubarSubTrigger,
-} from '../ui/menubar'
-import { Kbd } from '../ui/kbd'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select'
-import { InputHandle, OutputHandle } from '../base/NodeHandles'
-import { NodeFooterEdgeIndicators } from '../base/NodeFooterEdgeIndicators'
-import { NodeHeaderTitle } from '../base/NodeHeaderTitle'
-import { NodeMenubar } from '../base/NodeMenubar'
-import FlowContext from '../../lib/flowContext'
-import { getNodeType } from '../../lib/nodeRegistry'
+} from '@/components/ui/menubar'
+import { Kbd } from '@/components/ui/kbd'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { InputHandle, OutputHandle } from '@/components/base/NodeHandles'
+import { NodeFooterEdgeIndicators } from '@/components/base/NodeFooterEdgeIndicators'
+import { NodeHeaderTitle } from '@/components/base/NodeHeaderTitle'
+import { NodeMenubar } from '@/components/base/NodeMenubar'
+import FlowContext from '@/lib/flowContext'
+import { getNodeType } from '@/lib/nodeRegistry'
 
 export type ConfigNodeData = { configType?: ConfigTypeId; content?: string; title?: string; /** @deprecated use content */ plantuml?: string }
 

frontend/src/components/nodes/config/descriptor.tsx

@@ -0,0 +1,42 @@
+import React from 'react'
+import { ScrollText } from 'lucide-react'
+import { createNodeTypeBuilder } from '@/lib/nodeTypeBuilder'
+import { NODE_HELP } from '@/lib/nodeHelp'
+import { getResolvedContentForConfig } from './renderingLogic'
+import type { NodeTypeDescriptor } from '@/lib/nodeRegistry'
+import ConfigNode from './ConfigNode'
+
+const ICON_CLASS = 'mr-2 h-4 w-4'
+
+export function getConfigNodeDescriptor(): NodeTypeDescriptor {
+  return createNodeTypeBuilder(
+    'config',
+    ConfigNode,
+    { width: 320, height: 320 },
+    { configType: 'plantuml', content: '@startuml\n\n@enduml\n', title: '' }
+  )
+    .idPrefix('cfg_')
+    .withInputOutput(true, true)
+    .classification('psyche')
+    .allowedSourceTypes(['config', 'variable', 'function', 'data'])
+    .allowedTargetTypes(['config', 'render', 'agent'])
+    .help(NODE_HELP.config)
+    .menu('Config', <ScrollText className={ICON_CLASS} />)
+    .getDefaultData((newId) => ({
+      configType: 'plantuml',
+      content: '@startuml\n\n@enduml\n',
+      title: newId ?? '',
+    }))
+    .getResetData((nodeId) => ({
+      configType: 'plantuml',
+      content: '@startuml\n\n@enduml\n',
+      title: nodeId ?? '',
+    }))
+    .connectionLabel('adding input')
+    .withFullscreen()
+    .sourceRenderingLogic({
+      defaultUpdateMode: 'auto',
+      getResolvedContent: getResolvedContentForConfig,
+    })
+    .build()
+}

frontend/src/components/nodes/config/index.ts

@@ -0,0 +1,2 @@
+export { default as ConfigNode, type ConfigNodeData } from './ConfigNode'
+export { getConfigNodeDescriptor } from './descriptor'

frontend/src/components/nodes/config/renderingLogic.ts

@@ -0,0 +1,284 @@
+/**
+ * Config node rendering logic: resolves Nunjucks (extends/include/import, variables, data, functions)
+ * and returns the resolved string and output type for the Rendering node.
+ */
+
+import nunjucks from 'nunjucks'
+import type { ResolvedContentResult, SourceRenderingLogicContext } from '@/lib/sourceRenderingLogic'
+import { getConfigContent, getConfigTypeId, type ConfigTypeId } from '@/lib/configTypes'
+
+type Node = { id: string; type?: string; data?: unknown }
+type Edge = { id: string; source: string; target: string }
+
+function isReachable(edges: Edge[], startId: string, targetId: string): boolean {
+  const q: string[] = [startId]
+  const seen = new Set<string>([startId])
+  while (q.length) {
+    const cur = q.shift()!
+    if (cur === targetId) return true
+    for (const e of edges) {
+      if (e.source === cur && !seen.has(e.target)) {
+        seen.add(e.target)
+        q.push(e.target)
+      }
+    }
+  }
+  return false
+}
+
+function resolveExtendsRef(nodes: Node[], name: string): string {
+  const refName = name.replace(/\.(puml|html)$/, '').trim()
+  return nodes.find((n) => n.id === refName || (n.data as Record<string, unknown>)?.title === refName)?.id ?? refName
+}
+
+function getTemplateRefs(content: string): string[] {
+  const refs: string[] = []
+  const extendMatch = content.match(/\{\%\s*extends\s+["']([^"']+)["']\s*\%\}/)
+  if (extendMatch) refs.push(extendMatch[1].trim())
+  const includeRegex = /\{\%\s*include\s+["']([^"']+)["']\s*\%\}/g
+  let m
+  while ((m = includeRegex.exec(content)) !== null) refs.push(m[1].trim())
+  const importRegex = /\{\%\s*import\s+["']([^"']+)["']\s+as\s+\w+\s*\%\}/g
+  while ((m = importRegex.exec(content)) !== null) refs.push(m[1].trim())
+  return refs
+}
+
+export async function getResolvedContentForConfig(context: SourceRenderingLogicContext): Promise<ResolvedContentResult> {
+  const { nodes, edges, sourceNodeId, renderNodeId } = context
+  const srcId = sourceNodeId
+  const id = renderNodeId
+  const sourceNode = nodes.find((n) => n.id === sourceNodeId)
+  const outputTypeId: ConfigTypeId = sourceNode
+    ? getConfigTypeId((sourceNode.data ?? undefined) as Record<string, unknown> | undefined)
+    : 'plantuml'
+
+  const configIdsUsed = new Set<string>()
+
+  const addConfigAndRefs = (templateName: string, visited = new Set<string>()) => {
+    const refId = resolveExtendsRef(nodes, templateName)
+    if (visited.has(refId)) throw new Error(`Circular reference detected: ${templateName}`)
+    const node = nodes.find((n) => n.id === refId && n.type === 'config')
+    if (!node) throw new Error(`Config not found: ${templateName}`)
+    if (refId !== srcId && !isReachable(edges, refId, id))
+      throw new Error(`Referenced config not connected to renderer: ${templateName}`)
+    visited.add(refId)
+    configIdsUsed.add(refId)
+    const content = getConfigContent((node.data ?? undefined) as Record<string, unknown> | undefined)
+    for (const ref of getTemplateRefs(content)) addConfigAndRefs(ref, visited)
+  }
+
+  addConfigAndRefs(srcId)
+
+  const configLoader = {
+    getSource: (name: string): { src: string; path: string } | null => {
+      const refId = resolveExtendsRef(nodes, name)
+      const node = nodes.find((n) => n.id === refId && n.type === 'config')
+      if (!node) return null
+      if (refId !== srcId && !isReachable(edges, refId, id))
+        throw new Error(`Referenced config not connected to renderer: ${name}`)
+      return {
+        src: getConfigContent((node.data ?? undefined) as Record<string, unknown> | undefined),
+        path: name,
+      }
+    },
+  }
+
+  const nunjucksContext = Object.create(null) as Record<string, unknown>
+  const setVarInContext = (src: Node) => {
+    const v = (src.data as Record<string, unknown>)?.value
+    const str = v === undefined || v === null ? '' : String(v)
+    nunjucksContext[src.id] =
+      v === undefined || v === null ? '' : typeof v === 'boolean' || typeof v === 'number' ? v : str
+  }
+  for (const e of edges) {
+    if (!configIdsUsed.has(e.target)) continue
+    const src = nodes.find((n) => n.id === e.source)
+    if (src?.type === 'variable') setVarInContext(src)
+    if (src?.type === 'data') {
+      const rows = ((src.data as Record<string, unknown>)?.rows as Record<string, string>[]) ?? []
+      const hidden = ((src.data as Record<string, unknown>)?.hiddenColumns as string[]) ?? []
+      const visibleCols = ((src.data as Record<string, unknown>)?.columns as string[] | undefined) ?? []
+      const filtered = (visibleCols as string[]).filter((c) => !hidden.includes(c))
+      const filteredRows = rows.map((row) => {
+        const out: Record<string, string> = {}
+        for (const col of filtered) {
+          if (col in row) out[col] = row[col]
+        }
+        return out
+      })
+      nunjucksContext[src.id] = filteredRows
+    }
+  }
+
+  const functionIdsToRegister = new Set<string>()
+  let added = true
+  while (added) {
+    added = false
+    for (const e of edges) {
+      const src = nodes.find((n) => n.id === e.source)
+      if (src?.type !== 'function') continue
+      const targetInScope = configIdsUsed.has(e.target) || functionIdsToRegister.has(e.target)
+      if (!targetInScope) continue
+      if (!functionIdsToRegister.has(src.id)) {
+        functionIdsToRegister.add(src.id)
+        added = true
+      }
+    }
+  }
+  for (const e of edges) {
+    if (!configIdsUsed.has(e.target) && !functionIdsToRegister.has(e.target)) continue
+    const src = nodes.find((n) => n.id === e.source)
+    if (src?.type === 'function') {
+      for (const e2 of edges) {
+        if (e2.target !== src.id) continue
+        const vNode = nodes.find((n) => n.id === e2.source)
+        if (vNode?.type === 'variable') setVarInContext(vNode)
+      }
+    }
+  }
+
+  const env = new nunjucks.Environment([configLoader], { autoescape: false })
+
+  const formatFilterResult = (r: unknown): string => {
+    if (r === undefined || r === null) return ''
+    if (typeof r === 'string' || typeof r === 'number' || typeof r === 'boolean') return String(r)
+    return String(r)
+  }
+  const parseFunctionSignature = (body: string): { paramNames: string[]; innerBody: string } | null => {
+    const withCommentsStripped = body.replace(/^\s*\/\/[^\n]*\n?/gm, '').trim()
+    const trimmed = withCommentsStripped.trim()
+    const fnMatch = trimmed.match(/^function\s*\(([^)]*)\)\s*\{([\s\S]*)\}\s*$/)
+    if (fnMatch) {
+      const paramNames = fnMatch[1].split(',').map((p) => p.trim()).filter(Boolean)
+      return { paramNames, innerBody: fnMatch[2].trim() }
+    }
+    const arrowBlockMatch = trimmed.match(/^\(([^)]*)\)\s*=>\s*\{([\s\S]*)\}\s*$/)
+    if (arrowBlockMatch) {
+      const paramNames = arrowBlockMatch[1].split(',').map((p) => p.trim()).filter(Boolean)
+      return { paramNames, innerBody: arrowBlockMatch[2].trim() }
+    }
+    const arrowExprMatch = trimmed.match(/^\(([^)]*)\)\s*=>\s*(.+)\s*$/s)
+    if (arrowExprMatch) {
+      const paramNames = arrowExprMatch[1].split(',').map((p) => p.trim()).filter(Boolean)
+      return { paramNames, innerBody: 'return ' + arrowExprMatch[2].trim() }
+    }
+    return null
+  }
+  const isPlainObject = (v: unknown): v is Record<string, unknown> =>
+    typeof v === 'object' && v !== null && !Array.isArray(v)
+
+  const functionConnectedVariableIds = Object.create(null) as Record<string, string[]>
+  const functionConnectedFunctionIds = Object.create(null) as Record<string, string[]>
+  for (const fid of functionIdsToRegister) {
+    for (const e of edges) {
+      if (e.target !== fid) continue
+      const src = nodes.find((n) => n.id === e.source)
+      if (src?.type === 'variable') {
+        if (!functionConnectedVariableIds[fid]) functionConnectedVariableIds[fid] = []
+        functionConnectedVariableIds[fid].push(src.id)
+      } else if (src?.type === 'function') {
+        if (!functionConnectedFunctionIds[fid]) functionConnectedFunctionIds[fid] = []
+        functionConnectedFunctionIds[fid].push(src.id)
+      }
+    }
+  }
+
+  for (const fid of functionIdsToRegister) {
+    const src = nodes.find((n) => n.id === fid)
+    if (!src || src.type !== 'function') continue
+    const body = ((src.data as Record<string, unknown>)?.body as string) ?? 'return args[0];'
+    const parsed = parseFunctionSignature(body)
+    const connectedVarIds = new Set<string>(functionConnectedVariableIds[fid] ?? [])
+    const connectedFuncIds = functionConnectedFunctionIds[fid] ?? []
+    env.addFilter(
+      src.id,
+      (value: unknown, ...args: unknown[]) => {
+        const callback = args[args.length - 1] as (err: Error | null, res: string) => void
+        const raw = [value, ...args.slice(0, -1)]
+        const hasKwargs = raw.length > 0 && isPlainObject(raw[raw.length - 1])
+        const positionals = hasKwargs ? raw.slice(0, -1) : raw
+        const kwargs = hasKwargs ? (raw[raw.length - 1] as Record<string, unknown>) : Object.create(null)
+
+        const nestedCache = new Map<string, string>()
+        const coerceCached = (s: string): string | number => {
+          const n = Number(s)
+          return s.trim() !== '' && !Number.isNaN(n) ? n : s
+        }
+        const makeCallable = (filterId: string) => (input: unknown) => {
+          const key = `${filterId}::${JSON.stringify(input)}`
+          if (nestedCache.has(key)) return coerceCached(nestedCache.get(key)!)
+          const p = new Promise<string>((resolve, reject) => {
+            env.getFilter(filterId)(input, (err: Error | null, res: string) =>
+              err ? reject(err) : resolve(res)
+            )
+          })
+          p.then((res) => nestedCache.set(key, res))
+          const suspend = { __suspend: true as const, promise: p, key }
+          throw suspend
+        }
+
+        let invoke: () => unknown
+        if (parsed) {
+          const { paramNames, innerBody } = parsed
+          const lastParam = paramNames[paramNames.length - 1]
+          const invocationArgs = paramNames.map((name, i) => {
+            if (name === lastParam && lastParam === 'kwargs') return kwargs
+            if (connectedVarIds.has(name) && name in nunjucksContext) return nunjucksContext[name]
+            if (connectedFuncIds.includes(name)) return makeCallable(name)
+            return positionals[i]
+          })
+          const extraVarIds = [...connectedVarIds].filter((vid) => !paramNames.includes(vid))
+          const extraFuncIds = connectedFuncIds.filter((fid2) => !paramNames.includes(fid2))
+          const allParamNames = [...paramNames, ...extraVarIds, ...extraFuncIds]
+          const allArgs = [
+            ...invocationArgs,
+            ...extraVarIds.map((vid) => nunjucksContext[vid]),
+            ...extraFuncIds.map((fid2) => makeCallable(fid2)),
+          ]
+          const fn = new Function(...allParamNames, innerBody)
+          invoke = () => fn(...allArgs)
+        } else {
+          const fn = new Function('args', body)
+          invoke = () => fn(positionals)
+        }
+
+        const done = (err: Error | null, res: string) => callback(err, res)
+        const runInvoke = () => {
+          try {
+            const result = invoke()
+            if (result != null && typeof (result as Promise<unknown>).then === 'function') {
+              (result as Promise<unknown>).then(
+                (r) => done(null, formatFilterResult(r)),
+                (err) => done(err instanceof Error ? err : new Error(String(err)), '')
+              )
+            } else {
+              done(null, formatFilterResult(result))
+            }
+          } catch (e: unknown) {
+            const s = e as { __suspend?: boolean; promise?: Promise<string>; key?: string }
+            if (s?.__suspend && s.promise) {
+              s.promise.then(() => runInvoke(), (err) =>
+                done(err instanceof Error ? err : new Error(String(err)), '')
+              )
+            } else {
+              done(e instanceof Error ? e : new Error(String(e)), '')
+            }
+          }
+        }
+        runInvoke()
+      },
+      true
+    )
+  }
+
+  return new Promise((resolve, reject) => {
+    env.render(srcId, nunjucksContext, (nunjucksErr: Error | null, afterNunjucks: string) => {
+      if (nunjucksErr) {
+        reject(new Error(`Nunjucks: ${nunjucksErr.message}`))
+        return
+      }
+      const resolved = afterNunjucks.replace(/(\r?\n)(\s*\r?\n)+/g, '$1').trim()
+      resolve({ resolved, outputTypeId })
+    })
+  })
+}

frontend/src/components/nodes/data/DataNode.tsx

@@ -3,21 +3,21 @@ import {
     AbstractNodeProps,
     createAbstractNodeComponent,
     useAbstractNode,
-} from '../../lib/abstractNode'
+} from '@/lib/abstractNode'
 import {
     BaseNode,
     BaseNodeContent,
     BaseNodeFooter,
     BaseNodeHeaderRow,
-} from '../base/BaseNode'
-import { NodeFooterEdgeIndicators } from '../base/NodeFooterEdgeIndicators'
-import { NodeHeaderTitle } from '../base/NodeHeaderTitle'
-import { NodeMenubar } from '../base/NodeMenubar'
-import FlowContext from '../../lib/flowContext'
-import { getNodeType } from '../../lib/nodeRegistry'
-import { OutputHandle } from '../base/NodeHandles'
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '../ui/table'
-import { parseCsvToRows } from '../../lib/csvParse'
+} from '@/components/base/BaseNode'
+import { NodeFooterEdgeIndicators } from '@/components/base/NodeFooterEdgeIndicators'
+import { NodeHeaderTitle } from '@/components/base/NodeHeaderTitle'
+import { NodeMenubar } from '@/components/base/NodeMenubar'
+import FlowContext from '@/lib/flowContext'
+import { getNodeType } from '@/lib/nodeRegistry'
+import { OutputHandle } from '@/components/base/NodeHandles'
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
+import { parseCsvToRows } from '@/lib/csvParse'
 import { ArrowDown, ArrowUp, ArrowUpDown, Database, FileUp } from 'lucide-react'
 import {
     flexRender,
@@ -29,9 +29,9 @@ import {
     type ColumnDef,
     type SortingState,
 } from '@tanstack/react-table'
-import { Button } from '../ui/button'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
-import { ContextMenuCheckboxItem } from '../ui/context-menu'
+import { ContextMenuCheckboxItem } from '@/components/ui/context-menu'
 import {
     MenubarCheckboxItem,
     MenubarItem,
@@ -39,7 +39,7 @@ import {
     MenubarSub,
     MenubarSubContent,
     MenubarSubTrigger,
-} from '../ui/menubar'
+} from '@/components/ui/menubar'
 
 export type DataNodeData = {
     rows?: Record<string, string>[]

frontend/src/components/nodes/data/descriptor.tsx

@@ -0,0 +1,26 @@
+import React from 'react'
+import { Database } from 'lucide-react'
+import { createNodeTypeBuilder } from '@/lib/nodeTypeBuilder'
+import { NODE_HELP } from '@/lib/nodeHelp'
+import type { NodeTypeDescriptor } from '@/lib/nodeRegistry'
+import DataNode from './DataNode'
+
+const ICON_CLASS = 'mr-2 h-4 w-4'
+
+export function getDataNodeDescriptor(): NodeTypeDescriptor {
+  return createNodeTypeBuilder(
+    'data',
+    DataNode,
+    { width: 360, height: 280 },
+    { rows: [], columns: [], fileName: '' }
+  )
+    .idPrefix('data_')
+    .withInputOutput(false, true)
+    .classification('physis')
+    .allowedTargetTypes(['config', 'agent'])
+    .help(NODE_HELP.data)
+    .menu('Data', <Database className={ICON_CLASS} />)
+    .connectionLabel('data source')
+    .withFullscreen()
+    .build()
+}

frontend/src/components/nodes/data/index.ts

@@ -0,0 +1,2 @@
+export { default as DataNode, type DataNodeData } from './DataNode'
+export { getDataNodeDescriptor } from './descriptor'

frontend/src/components/nodes/function/FunctionNode.tsx

@@ -6,23 +6,23 @@ import {
     createAbstractNodeComponent,
     useAbstractNode,
     type FlowNode,
-} from '../../lib/abstractNode'
-import { useResizeHeight } from '../../hooks/useResizeHeight'
-import { useTheme } from '../../lib/themeContext'
+} from '@/lib/abstractNode'
+import { useResizeHeight } from '@/hooks/useResizeHeight'
+import { useTheme } from '@/lib/themeContext'
 import {
     BaseNode,
     BaseNodeContent,
     BaseNodeFooter,
     BaseNodeHeaderRow,
-} from '../base/BaseNode'
-import { InputHandle, OutputHandle } from '../base/NodeHandles'
-import { NodeFooterEdgeIndicators } from '../base/NodeFooterEdgeIndicators'
-import { NodeHeaderTitle } from '../base/NodeHeaderTitle'
-import { NodeMenubar } from '../base/NodeMenubar'
-import FlowContext from '../../lib/flowContext'
-import { getNodeType } from '../../lib/nodeRegistry'
-import { MenubarItem, MenubarShortcut } from '../ui/menubar'
-import { Kbd } from '../ui/kbd'
+} from '@/components/base/BaseNode'
+import { InputHandle, OutputHandle } from '@/components/base/NodeHandles'
+import { NodeFooterEdgeIndicators } from '@/components/base/NodeFooterEdgeIndicators'
+import { NodeHeaderTitle } from '@/components/base/NodeHeaderTitle'
+import { NodeMenubar } from '@/components/base/NodeMenubar'
+import FlowContext from '@/lib/flowContext'
+import { getNodeType } from '@/lib/nodeRegistry'
+import { MenubarItem, MenubarShortcut } from '@/components/ui/menubar'
+import { Kbd } from '@/components/ui/kbd'
 import { Code2, Variable } from 'lucide-react'
 
 export type FunctionNodeData = { body?: string }

frontend/src/components/nodes/function/descriptor.tsx

@@ -0,0 +1,27 @@
+import React from 'react'
+import { Code2 } from 'lucide-react'
+import { createNodeTypeBuilder } from '@/lib/nodeTypeBuilder'
+import { NODE_HELP } from '@/lib/nodeHelp'
+import type { NodeTypeDescriptor } from '@/lib/nodeRegistry'
+import FunctionNode from './FunctionNode'
+
+const ICON_CLASS = 'mr-2 h-4 w-4'
+
+const DEFAULT_BODY = `function(num, kwargs) {
+  return num + (kwargs.bar || 0);
+}`
+
+export function getFunctionNodeDescriptor(): NodeTypeDescriptor {
+  return createNodeTypeBuilder('function', FunctionNode, { width: 288, height: 260 }, { body: DEFAULT_BODY })
+    .idPrefix('fn_')
+    .withInputOutput(true, true)
+    .classification('psyche')
+    .allowedSourceTypes(['config', 'variable', 'function'])
+    .allowedTargetTypes(['config', 'function'])
+    .help(NODE_HELP.function)
+    .menu('Function', <Code2 className={ICON_CLASS} />)
+    .getResetData(() => ({ body: '' }))
+    .connectionLabel('adding input')
+    .withFullscreen()
+    .build()
+}

frontend/src/components/nodes/function/index.ts

@@ -0,0 +1,2 @@
+export { default as FunctionNode, type FunctionNodeData } from './FunctionNode'
+export { getFunctionNodeDescriptor } from './descriptor'

frontend/src/components/nodes/render/RenderingNode.tsx

@@ -7,37 +7,53 @@ import {
     AbstractNodeProps,
     createAbstractNodeComponent,
     useAbstractNode,
-} from '../../lib/abstractNode'
-import { getConfigContent, getConfigType, getConfigTypeId } from '../../lib/configTypes'
-import { useResizeHeight } from '../../hooks/useResizeHeight'
-import { plantumlLanguage } from '../../lib/plantumlLanguage'
-import { Empty, EmptyHeader, EmptyTitle, EmptyDescription, EmptyContent, EmptyMedia } from '../ui/empty'
+} from '@/lib/abstractNode'
+import { getConfigContent, getConfigType, getConfigTypeId } from '@/lib/configTypes'
+import { getSourceRenderingLogic } from '@/lib/sourceRenderingLogic'
+import { useSyncConnectionStatus } from '@/lib/nodeLifecycle'
+import { useResizeHeight } from '@/hooks/useResizeHeight'
+import { plantumlLanguage } from '@/lib/plantumlLanguage'
+import { Empty, EmptyHeader, EmptyTitle, EmptyDescription, EmptyContent, EmptyMedia } from '@/components/ui/empty'
 import {
     BaseNode,
     BaseNodeContent,
     BaseNodeFooter,
     BaseNodeHeaderRow,
-} from '../base/BaseNode'
-import { getDefaultDataForType, getNextNodeId } from '../../lib/flowUtils'
-import FlowContext from '../../lib/flowContext'
-import { getDefaultStyle, getNodeType } from '../../lib/nodeRegistry'
-import { NodeFooterEdgeIndicators } from '../base/NodeFooterEdgeIndicators'
-import { NodeHeaderTitle } from '../base/NodeHeaderTitle'
-import { NodeMenubar } from '../base/NodeMenubar'
-import { NodeStatusIndicator } from '../base/NodeStatusIndicator'
-import { MenubarItem, MenubarSeparator, MenubarSub, MenubarSubContent, MenubarSubTrigger } from '../ui/menubar'
-import { Sparkles, ZoomIn, ZoomOut, RotateCcw, RotateCw, Copy } from 'lucide-react'
-import { InputHandle } from '../base/NodeHandles'
+} from '@/components/base/BaseNode'
+import { getDefaultDataForType, getNextNodeId } from '@/lib/flowUtils'
+import FlowContext from '@/lib/flowContext'
+import { getDefaultStyle, getNodeType } from '@/lib/nodeRegistry'
+import { NodeFooterEdgeIndicators } from '@/components/base/NodeFooterEdgeIndicators'
+import { NodeHeaderTitle } from '@/components/base/NodeHeaderTitle'
+import { NodeMenubar } from '@/components/base/NodeMenubar'
+import { NodeStatusIndicator } from '@/components/base/NodeStatusIndicator'
+import { MenubarItem, MenubarSeparator, MenubarSub, MenubarSubContent, MenubarSubTrigger } from '@/components/ui/menubar'
+import { Sparkles, ZoomIn, ZoomOut, RotateCcw, RotateCw, Copy, Play, ChevronDown } from 'lucide-react'
+import { InputHandle } from '@/components/base/NodeHandles'
 import { TransformWrapper, TransformComponent } from 'react-zoom-pan-pinch'
-import { Input } from '../ui/input'
-import { Button } from '../ui/button'
-import { ToggleGroup, ToggleGroupItem } from '../ui/toggle-group'
-import { useTheme } from '../../lib/themeContext'
+import { Input } from '@/components/ui/input'
+import { Button } from '@/components/ui/button'
+import { ButtonGroup } from '@/components/ui/button-group'
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuLabel,
+    DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
+import { useTheme } from '@/lib/themeContext'
 import { toast } from 'sonner'
 
 export type RenderingNodeData = {
     viewportWidth?: number
     viewportHeight?: number
+    /** When set, overrides the source node's default. 'auto' = re-render on upstream changes; 'manual' = only when user clicks Run. */
+    updateMode?: 'auto' | 'manual'
+    /** Incremented when user clicks Run (manual mode). Effect runs when this changes. */
+    runTrigger?: number
+    /** Signature of inputs used in the last successful render. Used in manual mode to show paused (yellow) when upstream changed. */
+    lastRunSourceSignature?: string
 }
 
 const DEFAULT_VIEWPORT_WIDTH = 1200
@@ -50,10 +66,6 @@ type ViewMode = 'preview' | 'raw'
 function RenderingNodeComponent({ id, data, width, height, selected }: Props) {
     const flowContext = useContext(FlowContext)
     const setFullscreenNodeId = flowContext?.setFullscreenNodeId
-    const startConnectionPathUpdate = flowContext?.startConnectionPathUpdate
-    const endConnectionPathUpdate = flowContext?.endConnectionPathUpdate
-    const addConnectionPathError = flowContext?.addConnectionPathError
-    const removeConnectionPathError = flowContext?.removeConnectionPathError
     const supportsFullscreen = getNodeType('render')?.supportsFullscreen
     const [renderedContent, setRenderedContent] = useState<string | null>(null)
     const [resolvedContent, setResolvedContent] = useState<string | null>(null)
@@ -65,6 +77,7 @@ function RenderingNodeComponent({ id, data, width, height, selected }: Props) {
     const runIdRef = useRef(0)
     const loadingStartedAtRef = useRef<number | null>(null)
     const minLoadingTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+    const lastManualRunTriggerRef = useRef<number>(0)
     const { nodes, edges, setNodes, setEdges, sourceIds, updateData } = useAbstractNode<RenderingNodeData>(id, data ?? {})
     const viewportWidth = data?.viewportWidth ?? DEFAULT_VIEWPORT_WIDTH
     const viewportHeight = data?.viewportHeight ?? DEFAULT_VIEWPORT_HEIGHT
@@ -72,6 +85,9 @@ function RenderingNodeComponent({ id, data, width, height, selected }: Props) {
     const incomingIds = sourceIds
     const srcId = incomingIds.length > 0 ? incomingIds[0] : null
     const srcNode = nodes.find((n: any) => n.id === srcId)
+    const sourceLogic = useMemo(() => (srcNode?.type ? getSourceRenderingLogic(srcNode.type) : null), [srcNode?.type])
+    const effectiveUpdateMode = data?.updateMode ?? sourceLogic?.defaultUpdateMode ?? 'auto'
+    const runTrigger = data?.runTrigger ?? 0
     const isAgentSource = srcNode?.type === 'agent'
     const agentOutputMarkdown = isAgentSource ? ((srcNode.data as { outputMarkdown?: string })?.outputMarkdown ?? '') : ''
     const configTypeId = srcNode?.type === 'config' ? getConfigTypeId((srcNode.data ?? undefined) as Record<string, unknown> | undefined) : isAgentSource ? 'markdown' : 'plantuml'
@@ -80,14 +96,7 @@ function RenderingNodeComponent({ id, data, width, height, selected }: Props) {
     const sourceContent = srcNode?.type === 'config' ? getConfigContent((srcNode.data ?? undefined) as Record<string, unknown> | undefined) : isAgentSource ? agentOutputMarkdown : ''
     const srcData = srcNode?.data ?? {}
 
-    useEffect(() => {
-        if (!addConnectionPathError || !removeConnectionPathError) return
-        if (error != null) {
-            addConnectionPathError(id)
-            return () => removeConnectionPathError(id)
-        }
-        removeConnectionPathError(id)
-    }, [id, error, addConnectionPathError, removeConnectionPathError])
+    const triggerNodeIds = flowContext?.connectionPathTriggerNodeIds ?? []
 
     /** Set of node IDs that can affect this render node (configs in the chain + variables/functions feeding them) */
     const connectedNodeIds = useMemo(() => {
@@ -197,385 +206,153 @@ function RenderingNodeComponent({ id, data, width, height, selected }: Props) {
         [nodes, connectedNodeIds]
     )
 
+    /** Single signature of all inputs that affect this render. Stored on successful render for manual-mode paused state. */
+    const sourceSignature = useMemo(
+        () =>
+            JSON.stringify({
+                configSignature,
+                edgesSignature,
+                variablesSignature,
+                functionsSignature,
+                dataSignature,
+            }),
+        [configSignature, edgesSignature, variablesSignature, functionsSignature, dataSignature]
+    )
+
+    const lastRunSourceSignature = data?.lastRunSourceSignature
+    /**
+     * In manual mode, yellow = "dirty": inputs changed since the last manual run (or never run).
+     * We report paused when dirty so we get added to connectionPathPausedNodeIds; the path is
+     * then computed as downstream(trigger) ∩ upstream(paused), so we must not require
+     * pathNodeIds.has(id) here (that would be a chicken-and-egg).
+     */
+    const hasPendingInputs =
+        effectiveUpdateMode === 'manual' &&
+        !loading &&
+        triggerNodeIds.length > 0 &&
+        incomingIds.length > 0 &&
+        sourceSignature !== lastRunSourceSignature
+
+    useSyncConnectionStatus(id, { updating: loading, error: error != null, paused: hasPendingInputs })
+
     const RENDER_DEBOUNCE_MS = 250
 
     useEffect(() => {
-        if (!sourceContent && incomingIds.length > 0) {
-            setRenderedContent(null)
-            setResolvedContent(null)
-            setError({
-                kind: 'no-content',
-                message: isAgentSource ? 'Run the Agent node to generate output.' : 'No content on connected configuration node',
-            })
-            setLoading(false)
-            endConnectionPathUpdate?.(id)
-            return
-        }
         if (incomingIds.length === 0) {
             setRenderedContent(null)
             setResolvedContent(null)
             setError(null)
             setLoading(false)
-            endConnectionPathUpdate?.(id)
             return
         }
+        if (!srcId || !srcNode) {
+            setRenderedContent(null)
+            setResolvedContent(null)
+            setError(null)
+            setLoading(false)
+            return
+        }
+        const logic = getSourceRenderingLogic(srcNode.type ?? '')
+        if (!logic) {
+            setRenderedContent(null)
+            setResolvedContent(null)
+            setError({ kind: 'render', message: `Unsupported source type: ${srcNode.type}` })
+            setLoading(false)
+            return
+        }
+        if (effectiveUpdateMode === 'manual' && runTrigger === 0) {
+            setRenderedContent(null)
+            setResolvedContent(null)
+            setError({
+                kind: 'no-content',
+                message: isAgentSource ? 'Run the Agent node to generate output, then click Run here.' : 'Click Run to render.',
+            })
+            setLoading(false)
+            return
+        }
+        if (effectiveUpdateMode === 'manual' && runTrigger === lastManualRunTriggerRef.current) {
+            return
+        }
+        if (effectiveUpdateMode === 'manual') lastManualRunTriggerRef.current = runTrigger
 
         runIdRef.current += 1
         const thisRunId = runIdRef.current
+        const signatureForThisRun = sourceSignature
+        const isManualMode = effectiveUpdateMode === 'manual'
         let cancelled = false
 
         const run = async () => {
             loadingStartedAtRef.current = Date.now()
             setLoading(true)
-            startConnectionPathUpdate?.(id)
             setError(null)
             try {
-                if (srcNode?.type === 'agent') {
-                    const md = (srcNode.data as { outputMarkdown?: string })?.outputMarkdown ?? ''
-                    setResolvedContent(md)
-                    const markdownType = getConfigType('markdown')
-                    const html = await markdownType.render(md)
-                    if (cancelled || thisRunId !== runIdRef.current) return
-                    setRenderedContent(html)
-                    setError(null)
-                    setLoading(false)
-                    endConnectionPathUpdate?.(id)
-                    return
+                const context = {
+                    nodes,
+                    edges,
+                    sourceNodeId: srcId,
+                    renderNodeId: id,
+                    viewportWidth,
+                    viewportHeight,
                 }
-                const configIdsUsed = new Set<string>()
-
-                const isReachable = (startId: string, targetId: string) => {
-                    const q: string[] = [startId]
-                    const seen = new Set<string>([startId])
-                    while (q.length) {
-                        const cur = q.shift()!
-                        if (cur === targetId) return true
-                        for (const e of edges) {
-                            if (e.source === cur && !seen.has(e.target)) {
-                                seen.add(e.target)
-                                q.push(e.target)
-                            }
-                        }
-                    }
-                    return false
+                const { resolved, outputTypeId } = await logic.getResolvedContent(context)
+                if (cancelled || thisRunId !== runIdRef.current) return
+                setResolvedContent(resolved)
+                const typeRenderer = getConfigType(outputTypeId)
+                const renderOptions = outputTypeId === 'wireframe' ? { width: viewportWidth, height: viewportHeight } : undefined
+                const htmlOrSvg = await typeRenderer.render(resolved, renderOptions)
+                if (cancelled || thisRunId !== runIdRef.current) return
+                setRenderedContent(htmlOrSvg)
+                setError(null)
+                if (isManualMode) {
+                    updateData({ lastRunSourceSignature: signatureForThisRun })
                 }
-
-                const resolveExtendsRef = (name: string): string => {
-                    const refName = name.replace(/\.(puml|html)$/, '').trim()
-                    return nodes.find((n: any) => n.id === refName || n.data?.title === refName)?.id ?? refName
-                }
-
-                /** Collect refs from {% extends %}, {% include %}, {% import %} in template content */
-                const getTemplateRefs = (content: string): string[] => {
-                    const refs: string[] = []
-                    const extendMatch = content.match(/\{\%\s*extends\s+["']([^"']+)["']\s*\%\}/)
-                    if (extendMatch) refs.push(extendMatch[1].trim())
-                    const includeRegex = /\{\%\s*include\s+["']([^"']+)["']\s*\%\}/g
-                    let m
-                    while ((m = includeRegex.exec(content)) !== null) refs.push(m[1].trim())
-                    const importRegex = /\{\%\s*import\s+["']([^"']+)["']\s+as\s+\w+\s*\%\}/g
-                    while ((m = importRegex.exec(content)) !== null) refs.push(m[1].trim())
-                    return refs
-                }
-
-                const addConfigAndRefs = (templateName: string, visited = new Set<string>()) => {
-                    const refId = resolveExtendsRef(templateName)
-                    if (visited.has(refId)) throw new Error(`Circular reference detected: ${templateName}`)
-                    const node = nodes.find((n: any) => n.id === refId && n.type === 'config')
-                    if (!node) throw new Error(`Config not found: ${templateName}`)
-                    if (refId !== srcId && !isReachable(refId, id))
-                        throw new Error(`Referenced config not connected to renderer: ${templateName}`)
-                    visited.add(refId)
-                    configIdsUsed.add(refId)
-                    const content = getConfigContent((node.data ?? undefined) as Record<string, unknown> | undefined)
-                    for (const ref of getTemplateRefs(content)) addConfigAndRefs(ref, visited)
-                }
-
-                if (srcId && srcNode?.type === 'config') addConfigAndRefs(srcId)
-
-                // Loader for Nunjucks {% extends %}, {% include %}, {% import %}: resolve template name to config node's plantuml
-                const configLoader = {
-                    getSource: (name: string): { src: string; path: string } | null => {
-                        const refId = resolveExtendsRef(name)
-                        const node = nodes.find((n: any) => n.id === refId && n.type === 'config')
-                        if (!node) return null
-                        if (refId !== srcId && !isReachable(refId, id))
-                            throw new Error(`Referenced config not connected to renderer: ${name}`)
-                        return {
-                            src: getConfigContent((node.data ?? undefined) as Record<string, unknown> | undefined),
-                            path: name,
-                        }
-                    },
-                }
-
-                // Context: variables connected to configs, plus variables connected to functions that feed configs (so they can be injected as constants).
-                const nunjucksContext = Object.create(null) as Record<string, unknown>
-                const setVarInContext = (src: any) => {
-                    const v = src.data?.value
-                    const str = v === undefined || v === null ? '' : String(v)
-                    nunjucksContext[src.id] =
-                        v === undefined || v === null ? '' : typeof v === 'boolean' || typeof v === 'number' ? v : str
-                }
-                for (const e of edges) {
-                    if (!configIdsUsed.has(e.target)) continue
-                    const src = nodes.find((n: any) => n.id === e.source)
-                    if (src?.type === 'variable') setVarInContext(src)
-                    if (src?.type === 'data') {
-                        const rows = (src.data?.rows as Record<string, string>[] | undefined) ?? []
-                        const hidden = (src.data?.hiddenColumns as string[] | undefined) ?? []
-                        const visibleCols = (src.data?.columns as string[] | undefined) ?? []
-                            .filter((c) => !hidden.includes(c))
-                        const filteredRows = rows.map((row) => {
-                            const out: Record<string, string> = {}
-                            for (const col of visibleCols) {
-                                if (col in row) out[col] = row[col]
-                            }
-                            return out
-                        })
-                        nunjucksContext[src.id] = filteredRows
-                    }
-                }
-                // All function node ids that feed (directly or transitively) into config — need to register them and collect their variables
-                const functionIdsToRegister = new Set<string>()
-                let added = true
-                while (added) {
-                    added = false
-                    for (const e of edges) {
-                        const src = nodes.find((n: any) => n.id === e.source)
-                        if (src?.type !== 'function') continue
-                        const targetInScope = configIdsUsed.has(e.target) || functionIdsToRegister.has(e.target)
-                        if (!targetInScope) continue
-                        if (!functionIdsToRegister.has(src.id)) {
-                            functionIdsToRegister.add(src.id)
-                            added = true
-                        }
-                    }
-                }
-                for (const e of edges) {
-                    if (!configIdsUsed.has(e.target) && !functionIdsToRegister.has(e.target)) continue
-                    const src = nodes.find((n: any) => n.id === e.source)
-                    if (src?.type === 'function') {
-                        for (const e2 of edges) {
-                            if (e2.target !== src.id) continue
-                            const vNode = nodes.find((n: any) => n.id === e2.source)
-                            if (vNode?.type === 'variable') setVarInContext(vNode)
-                        }
-                    }
-                }
-
-                const env = new nunjucks.Environment([configLoader], { autoescape: false })
-
-                // Register each connected function node as a Nunjucks custom filter (async so sync and async user code both work).
-                // Supports either named params: function(num, x, y, kwargs) { return num + (kwargs.bar || 10); } or legacy: args array.
-                const formatFilterResult = (r: unknown): string => {
-                    if (r === undefined || r === null) return ''
-                    if (typeof r === 'string' || typeof r === 'number' || typeof r === 'boolean') return String(r)
-                    return String(r)
-                }
-                /** Parse function(num, x, y, kwargs) { body } or (num, x, y, kwargs) => body to get param names and inner body. */
-                const parseFunctionSignature = (body: string): { paramNames: string[]; innerBody: string } | null => {
-                    const withCommentsStripped = body.replace(/^\s*\/\/[^\n]*\n?/gm, '').trim()
-                    const trimmed = withCommentsStripped.trim()
-                    const fnMatch = trimmed.match(/^function\s*\(([^)]*)\)\s*\{([\s\S]*)\}\s*$/)
-                    if (fnMatch) {
-                        const paramNames = fnMatch[1].split(',').map((p) => p.trim()).filter(Boolean)
-                        return { paramNames, innerBody: fnMatch[2].trim() }
-                    }
-                    const arrowBlockMatch = trimmed.match(/^\(([^)]*)\)\s*=>\s*\{([\s\S]*)\}\s*$/)
-                    if (arrowBlockMatch) {
-                        const paramNames = arrowBlockMatch[1].split(',').map((p) => p.trim()).filter(Boolean)
-                        return { paramNames, innerBody: arrowBlockMatch[2].trim() }
-                    }
-                    const arrowExprMatch = trimmed.match(/^\(([^)]*)\)\s*=>\s*(.+)\s*$/s)
-                    if (arrowExprMatch) {
-                        const paramNames = arrowExprMatch[1].split(',').map((p) => p.trim()).filter(Boolean)
-                        return { paramNames, innerBody: 'return ' + arrowExprMatch[2].trim() }
-                    }
-                    return null
-                }
-                const isPlainObject = (v: unknown): v is Record<string, unknown> =>
-                    typeof v === 'object' && v !== null && !Array.isArray(v)
-
-                // For each registered function: which variable/function node ids are connected to it?
-                const functionConnectedVariableIds = Object.create(null) as Record<string, string[]>
-                const functionConnectedFunctionIds = Object.create(null) as Record<string, string[]>
-                for (const fid of functionIdsToRegister) {
-                    for (const e of edges) {
-                        if (e.target !== fid) continue
-                        const src = nodes.find((n: any) => n.id === e.source)
-                        if (src?.type === 'variable') {
-                            if (!functionConnectedVariableIds[fid]) functionConnectedVariableIds[fid] = []
-                            functionConnectedVariableIds[fid].push(src.id)
-                        } else if (src?.type === 'function') {
-                            if (!functionConnectedFunctionIds[fid]) functionConnectedFunctionIds[fid] = []
-                            functionConnectedFunctionIds[fid].push(src.id)
-                        }
-                    }
-                }
-
-                for (const fid of functionIdsToRegister) {
-                    const src = nodes.find((n: any) => n.id === fid)
-                    if (!src || src.type !== 'function') continue
-                    const body = (src.data as { body?: string } | undefined)?.body ?? 'return args[0];'
-                    const parsed = parseFunctionSignature(body)
-                    const connectedVarIds = new Set<string>(functionConnectedVariableIds[fid] ?? [])
-                    const connectedFuncIds = functionConnectedFunctionIds[fid] ?? []
-                    env.addFilter(
-                        src.id,
-                        (value: unknown, ...args: unknown[]) => {
-                            const callback = args[args.length - 1] as (err: Error | null, res: string) => void
-                            const raw = [value, ...args.slice(0, -1)]
-                            const hasKwargs = raw.length > 0 && isPlainObject(raw[raw.length - 1])
-                            const positionals = hasKwargs ? raw.slice(0, -1) : raw
-                            const kwargs = hasKwargs ? (raw[raw.length - 1] as Record<string, unknown>) : Object.create(null)
-
-                            // Cache for nested filter results so sync-looking code like `num + fn_003(4)` works:
-                            // callable throws Suspend when result isn't ready; we await, cache, then re-run.
-                            // Cached values are strings (Nunjucks); coerce to number when numeric so 2 + fn_003(4) => 10 not "28".
-                            const nestedCache = new Map<string, string>()
-                            const coerceCached = (s: string): string | number => {
-                                const n = Number(s)
-                                return s.trim() !== '' && !Number.isNaN(n) ? n : s
-                            }
-                            const makeCallable = (filterId: string) => (input: unknown) => {
-                                const key = `${filterId}::${JSON.stringify(input)}`
-                                if (nestedCache.has(key)) return coerceCached(nestedCache.get(key)!)
-                                const p = new Promise<string>((resolve, reject) => {
-                                    env.getFilter(filterId)(input, (err: Error | null, res: string) =>
-                                        err ? reject(err) : resolve(res)
-                                    )
-                                })
-                                p.then((res) => nestedCache.set(key, res))
-                                const suspend = { __suspend: true as const, promise: p, key }
-                                throw suspend
-                            }
-
-                            let invoke: () => unknown
-                            if (parsed) {
-                                const { paramNames, innerBody } = parsed
-                                const lastParam = paramNames[paramNames.length - 1]
-                                const invocationArgs = paramNames.map((name, i) => {
-                                    if (name === lastParam && lastParam === 'kwargs') return kwargs
-                                    if (connectedVarIds.has(name) && name in nunjucksContext)
-                                        return nunjucksContext[name]
-                                    if (connectedFuncIds.includes(name)) return makeCallable(name)
-                                    return positionals[i]
-                                })
-                                const extraVarIds = [...connectedVarIds].filter((vid) => !paramNames.includes(vid))
-                                const extraFuncIds = connectedFuncIds.filter((fid2) => !paramNames.includes(fid2))
-                                const allParamNames = [...paramNames, ...extraVarIds, ...extraFuncIds]
-                                const allArgs = [
-                                    ...invocationArgs,
-                                    ...extraVarIds.map((vid) => nunjucksContext[vid]),
-                                    ...extraFuncIds.map((fid2) => makeCallable(fid2)),
-                                ]
-                                const fn = new Function(...allParamNames, innerBody)
-                                invoke = () => fn(...allArgs)
-                            } else {
-                                const fn = new Function('args', body)
-                                invoke = () => fn(positionals)
-                            }
-
-                            const done = (err: Error | null, res: string) => {
-                                callback(err, res)
-                            }
-                            const runInvoke = () => {
-                                try {
-                                    const result = invoke()
-                                    if (result != null && typeof (result as Promise<unknown>).then === 'function') {
-                                        (result as Promise<unknown>).then(
-                                            (r) => done(null, formatFilterResult(r)),
-                                            (err) => done(err instanceof Error ? err : new Error(String(err)), '')
-                                        )
-                                    } else {
-                                        done(null, formatFilterResult(result))
-                                    }
-                                } catch (e: unknown) {
-                                    const s = e as { __suspend?: boolean; promise?: Promise<string>; key?: string }
-                                    if (s?.__suspend && s.promise) {
-                                        s.promise.then(() => runInvoke(), (err) =>
-                                            done(err instanceof Error ? err : new Error(String(err)), '')
-                                        )
-                                    } else {
-                                        done(e instanceof Error ? e : new Error(String(e)), '')
-                                    }
-                                }
-                            }
-                            runInvoke()
-                        },
-                        true
-                    )
-                }
-
-                env.render(srcId!, nunjucksContext, async (nunjucksErr: Error | null, afterNunjucks: string) => {
-                    if (cancelled || thisRunId !== runIdRef.current) return
-                    if (nunjucksErr) {
-                        setRenderedContent(null)
-                        setResolvedContent(null)
-                        setError({ kind: 'render', message: `Nunjucks: ${nunjucksErr.message}` })
-                        setLoading(false)
-                        endConnectionPathUpdate?.(id)
-                        return
-                    }
-
-                    // Collapse runs of newlines so {% for %} / {{ }} on their own lines don't leave blank lines
-                    const resolved = afterNunjucks.replace(/(\r?\n)(\s*\r?\n)+/g, '$1').trim()
-                    setResolvedContent(resolved)
-                    const typeRenderer = getConfigType(configTypeId)
-
-                    try {
-                        const renderOptions = configTypeId === 'wireframe' ? { width: viewportWidth, height: viewportHeight } : undefined
-                        const htmlOrSvg = await typeRenderer.render(resolved, renderOptions)
-                        if (cancelled || thisRunId !== runIdRef.current) return
-                        setRenderedContent(htmlOrSvg)
-                        setError(null)
-                    } catch (err: any) {
-                        if (cancelled || thisRunId !== runIdRef.current) return
-                        const msg = err?.message ?? 'Render error'
-                        setRenderedContent(null)
-                        setError({ kind: 'render', message: msg })
-                    } finally {
-                        if (!cancelled && thisRunId === runIdRef.current) {
-                            const startedAt = loadingStartedAtRef.current ?? 0
-                            const elapsed = Date.now() - startedAt
-                            const remaining = Math.max(0, 1000 - elapsed)
-                            if (remaining > 0) {
-                                minLoadingTimeoutRef.current = setTimeout(() => {
-                                    minLoadingTimeoutRef.current = null
-                                    if (!cancelled && thisRunId === runIdRef.current) {
-                                        setLoading(false)
-                                        endConnectionPathUpdate?.(id)
-                                    }
-                                }, remaining)
-                            } else {
-                                setLoading(false)
-                                endConnectionPathUpdate?.(id)
-                            }
-                        }
-                    }
-                })
             } catch (err: any) {
                 if (!cancelled && thisRunId === runIdRef.current) {
                     setRenderedContent(null)
                     setError({ kind: 'render', message: err?.message ?? 'Render error' })
-                    setLoading(false)
-                    endConnectionPathUpdate?.(id)
+                }
+            } finally {
+                if (!cancelled && thisRunId === runIdRef.current) {
+                    const startedAt = loadingStartedAtRef.current ?? 0
+                    const elapsed = Date.now() - startedAt
+                    const remaining = Math.max(0, 1000 - elapsed)
+                    if (remaining > 0) {
+                        minLoadingTimeoutRef.current = setTimeout(() => {
+                            minLoadingTimeoutRef.current = null
+                            if (!cancelled && thisRunId === runIdRef.current) {
+                                setLoading(false)
+                            }
+                        }, remaining)
+                    } else {
+                        setLoading(false)
+                    }
                 }
             }
         }
 
-        const debounceTimer = setTimeout(run, RENDER_DEBOUNCE_MS)
+        if (effectiveUpdateMode === 'auto') {
+            const debounceTimer = setTimeout(run, RENDER_DEBOUNCE_MS)
+            return () => {
+                cancelled = true
+                clearTimeout(debounceTimer)
+                if (minLoadingTimeoutRef.current != null) {
+                    clearTimeout(minLoadingTimeoutRef.current)
+                    minLoadingTimeoutRef.current = null
+                }
+                setLoading(false)
+            }
+        }
+        run()
         return () => {
             cancelled = true
-            clearTimeout(debounceTimer)
             if (minLoadingTimeoutRef.current != null) {
                 clearTimeout(minLoadingTimeoutRef.current)
                 minLoadingTimeoutRef.current = null
             }
-            endConnectionPathUpdate?.(id)
+            setLoading(false)
         }
-        // Only re-run when inputs that affect the resolved output change (signatures + source). Debounced to avoid excessive re-renders while typing. retryCount triggers re-run on Retry.
-    }, [id, sourceContent, configTypeId, configSignature, edgesSignature, variablesSignature, functionsSignature, dataSignature, viewportWidth, viewportHeight, retryCount, isAgentSource])
+    }, [id, srcId, srcNode?.type, effectiveUpdateMode, runTrigger, sourceContent, sourceSignature, configSignature, edgesSignature, variablesSignature, functionsSignature, dataSignature, viewportWidth, viewportHeight, retryCount, nodes, edges, updateData])
+
 
     const dimensions =
         width != null && height != null && width > 0 && height > 0
@@ -706,40 +483,99 @@ function RenderingNodeComponent({ id, data, width, height, selected }: Props) {
                     onHeaderDoubleClick={supportsFullscreen && setFullscreenNodeId ? () => setFullscreenNodeId(id) : undefined}
                     right={
                         incomingIds.length > 0 ? (
-                            <ToggleGroup
-                                type="single"
-                                value={viewMode}
-                                onValueChange={(v) => {
-                                    if (v === 'preview' || v === 'raw') setViewMode(v)
-                                }}
-                                aria-label="View mode"
-                                variant="outline"
-                                size="sm"
-                                className="gap-0 rounded-md p-0.5 [&>button]:rounded-none [&>button:first-child]:rounded-l-md [&>button:last-child]:rounded-r-md [&>button:not(:first-child)]:border-l-0"
-                            >
-                                <ToggleGroupItem
-                                    value="preview"
-                                    aria-label="Preview"
-                                    className="gap-1.5 px-2.5 h-7"
-                                    onClick={(e) => {
-                                        e.stopPropagation()
-                                        setViewMode('preview')
+                            <div className="flex items-center gap-2 shrink-0">
+                                <ButtonGroup className="nodrag nopan">
+                                    <Button
+                                        type="button"
+                                        size="sm"
+                                        variant="outline"
+                                        className="h-7 gap-1.5 rounded-r-none border-r-0 px-2.5 text-xs"
+                                        onClick={(e) => {
+                                            e.stopPropagation()
+                                            updateData({ runTrigger: (data?.runTrigger ?? 0) + 1 })
+                                        }}
+                                    >
+                                        <Play className="size-3.5" />
+                                        Run
+                                    </Button>
+                                    <DropdownMenu>
+                                        <DropdownMenuTrigger asChild>
+                                            <Button
+                                                type="button"
+                                                size="sm"
+                                                variant="outline"
+                                                className="h-7 min-w-[4.5rem] gap-1 rounded-l-none pl-2 pr-1.5 text-xs font-normal"
+                                                aria-label="Update mode"
+                                                onClick={(e) => e.stopPropagation()}
+                                            >
+                                                <span className="text-muted-foreground">
+                                                    {effectiveUpdateMode === 'manual' ? 'Manual' : 'Auto'}
+                                                </span>
+                                                <ChevronDown className="size-3.5 shrink-0 opacity-70" />
+                                            </Button>
+                                        </DropdownMenuTrigger>
+                                        <DropdownMenuContent align="end" className="w-64" onClick={(e) => e.stopPropagation()}>
+                                            <DropdownMenuLabel className="text-xs font-normal text-muted-foreground">
+                                                When to re-render
+                                            </DropdownMenuLabel>
+                                            <DropdownMenuCheckboxItem
+                                                checked={effectiveUpdateMode === 'auto'}
+                                                onCheckedChange={(checked) => checked && updateData({ updateMode: 'auto' })}
+                                                className="flex flex-col items-start gap-0.5 py-2"
+                                            >
+                                                <span className="font-medium">Auto</span>
+                                                <span className="text-muted-foreground text-xs font-normal">
+                                                    Re-renders when upstream content changes
+                                                </span>
+                                            </DropdownMenuCheckboxItem>
+                                            <DropdownMenuCheckboxItem
+                                                checked={effectiveUpdateMode === 'manual'}
+                                                onCheckedChange={(checked) => checked && updateData({ updateMode: 'manual' })}
+                                                className="flex flex-col items-start gap-0.5 py-2"
+                                            >
+                                                <span className="font-medium">Manual</span>
+                                                <span className="text-muted-foreground text-xs font-normal">
+                                                    Re-renders only when you click Run
+                                                </span>
+                                            </DropdownMenuCheckboxItem>
+                                        </DropdownMenuContent>
+                                    </DropdownMenu>
+                                </ButtonGroup>
+                                <ToggleGroup
+                                    type="single"
+                                    value={viewMode}
+                                    onValueChange={(v) => {
+                                        if (v === 'preview' || v === 'raw') setViewMode(v)
                                     }}
+                                    aria-label="View mode"
+                                    variant="outline"
+                                    size="sm"
+                                    className="gap-0 rounded-md p-0.5 [&>button]:rounded-none [&>button:first-child]:rounded-l-md [&>button:last-child]:rounded-r-md [&>button:not(:first-child)]:border-l-0"
                                 >
-                                    Preview
-                                </ToggleGroupItem>
-                                <ToggleGroupItem
-                                    value="raw"
-                                    aria-label="Raw config"
-                                    className="gap-1.5 px-2.5 h-7"
-                                    onClick={(e) => {
-                                        e.stopPropagation()
-                                        setViewMode('raw')
-                                    }}
-                                >
-                                    Raw
-                                </ToggleGroupItem>
-                            </ToggleGroup>
+                                    <ToggleGroupItem
+                                        value="preview"
+                                        aria-label="Preview"
+                                        className="gap-1.5 px-2.5 h-7"
+                                        onClick={(e) => {
+                                            e.stopPropagation()
+                                            setViewMode('preview')
+                                        }}
+                                    >
+                                        Preview
+                                    </ToggleGroupItem>
+                                    <ToggleGroupItem
+                                        value="raw"
+                                        aria-label="Raw config"
+                                        className="gap-1.5 px-2.5 h-7"
+                                        onClick={(e) => {
+                                            e.stopPropagation()
+                                            setViewMode('raw')
+                                        }}
+                                    >
+                                        Raw
+                                    </ToggleGroupItem>
+                                </ToggleGroup>
+                            </div>
                         ) : undefined
                     }
                 />

frontend/src/components/nodes/render/descriptor.tsx

@@ -0,0 +1,26 @@
+import React from 'react'
+import { Sparkles } from 'lucide-react'
+import { createNodeTypeBuilder } from '@/lib/nodeTypeBuilder'
+import { NODE_HELP } from '@/lib/nodeHelp'
+import type { NodeTypeDescriptor } from '@/lib/nodeRegistry'
+import RenderingNode from './RenderingNode'
+
+const ICON_CLASS = 'mr-2 h-4 w-4'
+
+export function getRenderNodeDescriptor(): NodeTypeDescriptor {
+  return createNodeTypeBuilder(
+    'render',
+    RenderingNode,
+    { width: 384, height: 320 },
+    { viewportWidth: 1200, viewportHeight: 800 }
+  )
+    .idPrefix('rnd_')
+    .withInputOutput(true, false)
+    .classification('pneuma')
+    .allowedSourceTypes(['config', 'agent'])
+    .help(NODE_HELP.render)
+    .menu('Renderer', <Sparkles className={ICON_CLASS} />)
+    .connectionLabel('rendering')
+    .withFullscreen()
+    .build()
+}

frontend/src/components/nodes/render/index.ts

@@ -0,0 +1,2 @@
+export { default as RenderingNode, type RenderingNodeData } from './RenderingNode'
+export { getRenderNodeDescriptor } from './descriptor'

frontend/src/components/nodes/variable/VariableNode.tsx

@@ -3,20 +3,20 @@ import {
     AbstractNodeProps,
     createAbstractNodeComponent,
     useAbstractNode,
-} from '../../lib/abstractNode'
+} from '@/lib/abstractNode'
 import {
     BaseNode,
     BaseNodeContent,
     BaseNodeFooter,
     BaseNodeHeaderRow,
-} from '../base/BaseNode'
-import { NodeMenubar } from '../base/NodeMenubar'
-import { Input } from '../ui/input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select'
-import { Switch } from '../ui/switch'
-import { NodeFooterEdgeIndicators } from '../base/NodeFooterEdgeIndicators'
-import { NodeHeaderTitle } from '../base/NodeHeaderTitle'
-import { OutputHandle } from '../base/NodeHandles'
+} from '@/components/base/BaseNode'
+import { NodeMenubar } from '@/components/base/NodeMenubar'
+import { Input } from '@/components/ui/input'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Switch } from '@/components/ui/switch'
+import { NodeFooterEdgeIndicators } from '@/components/base/NodeFooterEdgeIndicators'
+import { NodeHeaderTitle } from '@/components/base/NodeHeaderTitle'
+import { OutputHandle } from '@/components/base/NodeHandles'
 import { Variable } from 'lucide-react'
 
 export type ValueType = 'string' | 'number' | 'boolean'

frontend/src/components/nodes/variable/descriptor.tsx

@@ -0,0 +1,24 @@
+import React from 'react'
+import { Variable } from 'lucide-react'
+import { createNodeTypeBuilder } from '@/lib/nodeTypeBuilder'
+import { NODE_HELP } from '@/lib/nodeHelp'
+import type { NodeTypeDescriptor } from '@/lib/nodeRegistry'
+import VariableNode from './VariableNode'
+
+const ICON_CLASS = 'mr-2 h-4 w-4'
+
+export function getVariableNodeDescriptor(): NodeTypeDescriptor {
+  return createNodeTypeBuilder(
+    'variable',
+    VariableNode,
+    { width: 224, height: 240 },
+    { value: '', valueType: 'string' }
+  )
+    .idPrefix('var_')
+    .withInputOutput(false, true)
+    .classification('psyche')
+    .allowedTargetTypes(['config', 'function', 'agent'])
+    .help(NODE_HELP.variable)
+    .menu('Variable', <Variable className={ICON_CLASS} />)
+    .build()
+}

frontend/src/components/nodes/variable/index.ts

@@ -0,0 +1,2 @@
+export { default as VariableNode, type VariableNodeData, type ValueType } from './VariableNode'
+export { getVariableNodeDescriptor } from './descriptor'