feat: make it work

.gitea/actions/setup/action.yml

@@ -1,28 +0,0 @@
-name: Setup
-description: Restore caches and install pnpm dependencies (run after checkout)
-
-runs:
-  using: composite
-  steps:
-    - name: 💾 Setup pnpm Cache
-      uses: actions/cache@v4
-      with:
-        path: .pnpm-store
-        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm-
-
-    - name: 🦀 Cache Cargo
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-cargo-
-
-    - name: 📦 Install Dependencies
-      shell: bash
-      run: pnpm install --frozen-lockfile --store-dir .pnpm-store

.gitea/workflows/benchmark.yaml

@@ -12,7 +12,7 @@ env:
   CARGO_TARGET_DIR: target
 
 jobs:
-  benchmark:
+  release:
     runs-on: ubuntu-latest
     container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
 
@@ -23,10 +23,29 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GITEA_TOKEN }}
 
-      - name: 🔧 Setup
+      - name: 💾 Setup pnpm Cache
-        uses: ./.gitea/actions/setup
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.PNPM_CACHE_FOLDER }}
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-
 
-      - name: 🛠️ Build Nodes
+      - name: 🦀 Cache Cargo
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: 📦 Install Dependencies
+        run: pnpm install --frozen-lockfile --store-dir ${{ env.PNPM_CACHE_FOLDER }}
+
+      - name: 🛠️Build Nodes
         run: pnpm build:nodes
 
       - name: 🏃 Execute Runtime
@@ -37,12 +56,6 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.GIT_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
-          cat >> ~/.ssh/config <<'EOF'
-          Host git.max-richter.dev
-            Port 2222
-            IdentityFile ~/.ssh/id_ed25519
-            IdentitiesOnly yes
-          EOF
           ssh-keyscan -p 2222 -H git.max-richter.dev >> ~/.ssh/known_hosts
 
       - name: 📤 Push Results
@@ -52,16 +65,22 @@ jobs:
           git config --global user.name "nodarium-bot"
           git config --global user.email "nodarium-bot@max-richter.dev"
 
+          # 2. Clone the benchmarks repo into a temp folder
+          git config --global core.sshCommand "ssh -p 2222 -i ~/.ssh/id_ed25519 -o IdentitiesOnly=yes"
           git clone git@git.max-richter.dev:max/nodarium-benchmarks.git target_bench_repo
           
-          BRANCH="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
+          # 3. Create a directory structure based on the branch
-          SAFE_PR_NAME=$(printf "%s" "$BRANCH" | tr '/' '-')
+          # This allows the UI to "switch between branches"
+          SAFE_PR_NAME=$(printf "%s" "$GITHUB_HEAD_REF" | tr '/' '-')
           DEST_DIR="target_bench_repo/data/$SAFE_PR_NAME/$(date +%s)"
           mkdir -p "$DEST_DIR"
 
+          # 4. Copy the new results
+          # Assuming your bench tool outputs a file named 'results.json'
           cp app/benchmark/out/*.json "$DEST_DIR/"
 
+          # 5. Commit and Push
           cd target_bench_repo
           git add .
-          git commit -m "Update benchmarks for $SAFE_PR_NAME: ${{ gitea.sha }}"
+          git commit -m "Update benchmarks for $SAFE_PR_NAME: ${{ github.sha }}"
           git push origin main

.gitea/workflows/release.yaml

@@ -13,7 +13,7 @@ env:
   CARGO_TARGET_DIR: target
 
 jobs:
-  quality:
+  release:
     runs-on: ubuntu-latest
     container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
 
@@ -24,8 +24,27 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GITEA_TOKEN }}
 
-      - name: 🔧 Setup
+      - name: 💾 Setup pnpm Cache
-        uses: ./.gitea/actions/setup
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.PNPM_CACHE_FOLDER }}
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-
+
+      - name: 🦀 Cache Cargo
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: 📦 Install Dependencies
+        run: pnpm install --frozen-lockfile --store-dir ${{ env.PNPM_CACHE_FOLDER }}
 
       - name: 🧹 Quality Control
         run: |
@@ -33,58 +52,7 @@ jobs:
           pnpm format:check
           pnpm check
           pnpm build
-
+          xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test
-  test-unit:
-    runs-on: ubuntu-latest
-    container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
-
-    steps:
-      - name: 📑 Checkout Code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITEA_TOKEN }}
-
-      - name: 🔧 Setup
-        uses: ./.gitea/actions/setup
-
-      - name: 🧪 Run Tests
-        run: xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test:unit
-
-  test-e2e:
-    runs-on: ubuntu-latest
-    container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
-
-    steps:
-      - name: 📑 Checkout Code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITEA_TOKEN }}
-
-      - name: 🔧 Setup
-        uses: ./.gitea/actions/setup
-
-      - name: 🧪 Run Tests
-        run: xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test:e2e
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: [quality, test-e2e, test-unit]
-    container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
-
-    steps:
-      - name: 📑 Checkout Code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITEA_TOKEN }}
-
-      - name: 🔧 Setup
-        uses: ./.gitea/actions/setup
-
-      - name: 🏗️ Build Web Assets
-        run: pnpm build
 
       - name: 🚀 Create Release Commit
         if: gitea.ref_type == 'tag'

Dockerfile.ci

@@ -5,7 +5,6 @@ ENV RUSTUP_HOME=/usr/local/rustup \
   PATH=/usr/local/cargo/bin:$PATH
 
 RUN apt-get update && apt-get install -y \
-  openssh-client \
   ca-certificates=20230311+deb12u1 \
   gpg=2.2.40-1.1+deb12u2 \
   gpg-agent=2.2.40-1.1+deb12u2 \

app/src/lib/graph-interface/graph-manager.svelte.test.ts

@@ -1,4 +1,4 @@
-import { assert, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { GraphManager } from './graph-manager.svelte';
 import {
   createMockNodeRegistry,
@@ -9,151 +9,8 @@ import {
   mockVec3OutputNode
 } from './test-utils';
 
-describe('groupNodes', () => {
+describe('GraphManager', () => {
-  it('should not do anything if no nodes are selected', () => {
+  describe('getPossibleSockets', () => {
-    const registry = createMockNodeRegistry([
-      mockFloatOutputNode,
-      mockFloatInputNode,
-      mockGeometryOutputNode,
-      mockPathInputNode
-    ]);
-
-    const manager = new GraphManager(registry);
-
-    const floatInputNode = manager.createNode({
-      type: 'test/node/input',
-      position: [100, 100],
-      props: {}
-    });
-
-    assert.isDefined(floatInputNode);
-
-    const floatOutputNode = manager.createNode({
-      type: 'test/node/output',
-      position: [0, 0],
-      props: {}
-    });
-    assert.isDefined(floatOutputNode);
-
-    const edge = manager.createEdge(floatInputNode, 0, floatOutputNode, 'input');
-    assert.isDefined(edge);
-    manager.save();
-
-    manager.groupNodes([]);
-
-    const graph = manager.serialize();
-    expect(graph.nodes.length).toBe(2);
-    expect(graph.edges.length).toBe(1);
-    expect(graph.groups.length).toBe(0);
-  });
-
-  it('should group selected nodes and create a group node', () => {
-    const registry = createMockNodeRegistry([
-      mockFloatOutputNode,
-      mockFloatInputNode,
-      mockGeometryOutputNode,
-      mockPathInputNode
-    ]);
-
-    const manager = new GraphManager(registry);
-
-    const floatInputNode = manager.createNode({
-      type: 'test/node/input',
-      position: [100, 100],
-      props: {}
-    });
-
-    assert.isDefined(floatInputNode);
-
-    const floatOutputNode = manager.createNode({
-      type: 'test/node/output',
-      position: [0, 0],
-      props: {}
-    });
-    assert.isDefined(floatOutputNode);
-
-    const edge = manager.createEdge(floatInputNode, 0, floatOutputNode, 'input');
-    assert.isDefined(edge);
-    manager.save();
-
-    const groupNode = manager.groupNodes([floatInputNode.id]);
-    assert.isDefined(groupNode);
-
-    const graph = manager.serialize();
-
-    expect(graph.nodes.map(n => n.id), 'graph to contain group node').to.contain(groupNode.id);
-    expect(graph.groups[0].nodes.map(n => n.id), 'group graph to contain float node').to.contain(
-      floatInputNode.id
-    );
-    expect(graph.nodes.map(n => n.id)).not.to.contain(floatInputNode.id);
-
-    expect(graph.nodes.length).toBe(2);
-    expect(graph.edges.length).toBe(1);
-    expect(graph.groups.length).toBe(1);
-  });
-
-  it('should rewire external edges when grouping a middle node in a chain', () => {
-    const registry = createMockNodeRegistry([mockFloatOutputNode, mockFloatInputNode]);
-    const manager = new GraphManager(registry);
-
-    // A → B → C  (float chain: output → middle → input)
-    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
-    const nodeB = manager.createNode({ type: 'test/node/output', position: [100, 0], props: {} });
-    const nodeC = manager.createNode({ type: 'test/node/input', position: [200, 0], props: {} });
-
-    assert.isDefined(nodeA);
-    assert.isDefined(nodeB);
-    assert.isDefined(nodeC);
-
-    manager.createEdge(nodeA, 0, nodeB, 'input');
-    manager.createEdge(nodeB, 0, nodeC, 'value');
-
-    const groupNode = manager.groupNodes([nodeB.id]);
-    assert.isDefined(groupNode);
-
-    const graph = manager.serialize();
-
-    // Top-level: A, C, groupNode — B is gone
-    expect(graph.nodes.length, 'top-level node count').toBe(3);
-    const topLevelIds = graph.nodes.map(n => n.id);
-    expect(topLevelIds).toContain(nodeA.id);
-    expect(topLevelIds).toContain(nodeC.id);
-    expect(topLevelIds).toContain(groupNode.id);
-    expect(topLevelIds).not.toContain(nodeB.id);
-
-    // Both original edges survive, now routing through the group node
-    expect(graph.edges.length, 'edge count unchanged').toBe(2);
-    const edgeSources = graph.edges.map(e => e[0]);
-    const edgeTargets = graph.edges.map(e => e[2]);
-    expect(edgeTargets).toContain(groupNode.id); // A → groupNode
-    expect(edgeSources).toContain(groupNode.id); // groupNode → C
-
-    // One group definition was created
-    expect(graph.groups.length).toBe(1);
-    const group = graph.groups[0];
-
-    // Group contains B plus the two boundary nodes
-    const groupNodeIds = group.nodes.map(n => n.id);
-    expect(groupNodeIds).toContain(nodeB.id);
-    const inputBoundary = group.nodes.find(n => n.type === '__internal/group/input');
-    const outputBoundary = group.nodes.find(n => n.type === '__internal/group/output');
-    expect(inputBoundary, 'group input boundary node').toBeDefined();
-    expect(outputBoundary, 'group output boundary node').toBeDefined();
-
-    // Group declares one input slot and one output slot
-    expect(Object.keys(group.inputs ?? {}).length, 'group input count').toBe(1);
-    expect(group.outputs?.length, 'group output count').toBe(1);
-
-    // Internal edges wire: inputBoundary → B → outputBoundary
-    expect(group.edges.length, 'internal edge count').toBe(2);
-    const internalSources = group.edges.map(e => e[0]);
-    const internalTargets = group.edges.map(e => e[2]);
-    expect(internalTargets).toContain(nodeB.id);
-    expect(internalSources).toContain(nodeB.id);
-  });
-});
-
-describe('getPossibleSockets', () => {
     describe('when dragging an output socket', () => {
       it('should return compatible input sockets based on type', () => {
         const registry = createMockNodeRegistry([
@@ -404,4 +261,5 @@ describe('getPossibleSockets', () => {
         expect(possibleSocketsForFloat.map(([n]) => n.id)).toContain(floatInputNode!.id);
       });
     });
+  });
 });

app/src/lib/graph-interface/graph-state.svelte.ts

@@ -5,7 +5,7 @@ import { SvelteMap, SvelteSet } from 'svelte/reactivity';
 import type { OrthographicCamera, Vector3 } from 'three';
 import type { GraphManager } from './graph-manager.svelte';
 import { ColorGenerator } from './graph/colors';
-import { getNodeHeight, getParameterHeight } from './helpers/nodeHelpers';
+import { getNodeHeight, getSocketPosition } from './helpers/nodeHelpers';
 
 const graphStateKey = Symbol('graph-state');
 export function getGraphState() {
@@ -99,6 +99,9 @@ export class GraphState {
     edges: [number, number, number, string][];
   } = null;
 
+  // Saved camera position per group so re-entering restores where you left off
+  groupCameras = new Map<string, [number, number, number]>();
+
   cameraBounds = $derived([
     this.cameraPosition[0] - this.width / this.cameraPosition[2] / 2,
     this.cameraPosition[0] + this.width / this.cameraPosition[2] / 2,
@@ -203,7 +206,7 @@ export class GraphState {
     }
 
     const debugNode = this.graph.createNode({
-      type: '__internal/node/debug',
+      type: 'max/plantarium/debug',
       position: [node.position[0] + 30, node.position[1]],
       props: {}
     });
@@ -240,10 +243,6 @@ export class GraphState {
     };
   }
 
-  groupSelectedNodes() {
-    return this.graph.groupNodes([...this.selectedNodes.keys(), this.activeNodeId]);
-  }
-
   centerNode(node?: NodeInstance) {
     const average = [0, 0, 4];
     if (node) {
@@ -305,7 +304,7 @@ export class GraphState {
         if (edge[3] === index) {
           node = edge[0];
           index = edge[1];
-          position = this.getSocketPosition(node, index);
+          position = getSocketPosition(node, index);
           this.graph.removeEdge(edge);
           break;
         }
@@ -325,7 +324,7 @@ export class GraphState {
         return {
           node,
           index,
-          position: this.getSocketPosition(node, index)
+          position: getSocketPosition(node, index)
         };
       });
   }
@@ -362,7 +361,7 @@ export class GraphState {
         for (const node of this.graph.nodes.values()) {
           const x = node.position[0];
           const y = node.position[1];
-          const height = getNodeHeight(this.graph.getNodeType(node)!);
+          const height = getNodeHeight(node.state.type!);
           if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
             clickedNodeId = node.id;
             break;
@@ -374,7 +373,7 @@ export class GraphState {
   }
 
   isNodeInView(node: NodeInstance) {
-    const height = getNodeHeight(this.graph.getNodeType(node)!);
+    const height = getNodeHeight(node.state.type!);
     const width = 20;
     return node.position[0] > this.cameraBounds[0] - width
       && node.position[0] < this.cameraBounds[1]
@@ -385,51 +384,4 @@ export class GraphState {
   openNodePalette() {
     this.addMenuPosition = [this.mousePosition[0], this.mousePosition[1]];
   }
-
-  enterGroupNode() {
-    if (this.activeNodeId === -1) return;
-    const node = this.graph.getNode(this.activeNodeId);
-    if (!node || node.type !== '__internal/group/instance') return;
-    const ok = this.graph.enterGroup(this.activeNodeId, [...this.cameraPosition]);
-    if (ok) {
-      this.activeNodeId = -1;
-      this.clearSelection();
-    }
-  }
-
-  exitGroupNode() {
-    const result = this.graph.exitGroup();
-    if (!result) return;
-    this.cameraPosition = result.camera;
-    this.activeNodeId = -1;
-    this.clearSelection();
-  }
-
-  getSocketPosition(
-    node: NodeInstance,
-    index: string | number
-  ): [number, number] {
-    if (typeof index === 'number') {
-      return [
-        (node?.state?.x ?? node.position[0]) + 20,
-        (node?.state?.y ?? node.position[1]) + 2.5 + 10 * index
-      ];
-    } else {
-      let height = 5;
-      const nodeType = this.graph.getNodeType(node)!;
-      const inputs = nodeType.inputs || {};
-      for (const inputKey in inputs) {
-        const h = getParameterHeight(nodeType, inputKey) / 10;
-        if (inputKey === index) {
-          height += h / 2;
-          break;
-        }
-        height += h;
-      }
-      return [
-        node?.state?.x ?? node.position[0],
-        (node?.state?.y ?? node.position[1]) + height
-      ];
-    }
-  }
 }

app/src/lib/graph-interface/graph/Graph.svelte

@@ -11,6 +11,7 @@
   import Debug from '../debug/Debug.svelte';
   import EdgeEl from '../edges/Edge.svelte';
   import { getGraphManager, getGraphState } from '../graph-state.svelte';
+  import { getSocketPosition } from '../helpers/nodeHelpers';
   import NodeEl from '../node/Node.svelte';
   import { maxZoom, minZoom } from './constants';
   import { FileDropEventManager } from './drop.events';
@@ -38,8 +39,8 @@
       return [0, 0, 0, 0];
     }
 
-    const pos1 = graphState.getSocketPosition(fromNode, edge[1]);
+    const pos1 = getSocketPosition(fromNode, edge[1]);
-    const pos2 = graphState.getSocketPosition(toNode, edge[3]);
+    const pos2 = getSocketPosition(toNode, edge[3]);
     return [pos1[0], pos1[1], pos2[0], pos2[1]];
   }
 
@@ -95,12 +96,14 @@
     graphState.addMenuPosition = null;
   }
 
-  function getSocketType(node: NodeInstance, index: number | string, e: unknown): string {
+  function getSocketType(node: NodeInstance, index: number | string): string {
-    const nodeType = graph.getNodeType(node);
     if (typeof index === 'string') {
-      return nodeType?.inputs?.[index].type || 'unknown';
+      return node.state.type?.inputs?.[index].type || 'unknown';
     }
-    return nodeType?.outputs?.[index] || 'unknown';
+    if (node.type === '__virtual/group/instance') {
+      index += 1;
+    }
+    return node.state.type?.outputs?.[index] || 'unknown';
   }
 </script>
 
@@ -169,12 +172,6 @@
     {/if}
 
     {#if graph.status === 'idle'}
-      {#if graph.isInsideGroup}
-        <HTML transform={false}>
-          <button class="exit-group" onclick={() => graphState.exitGroupNode()}>↑ Exit Group</button>
-        </HTML>
-      {/if}
-
       {#if graphState.addMenuPosition}
         <AddMenu
           onnode={handleNodeCreation}
@@ -188,8 +185,8 @@
       {#if graphState.activeSocket}
         <EdgeEl
           z={graphState.cameraPosition[2]}
-          inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index, 'c')}
+          inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
-          outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index, 'd')}
+          outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
           x1={graphState.activeSocket.position[0]}
           y1={graphState.activeSocket.position[1]}
           x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
@@ -202,8 +199,8 @@
         <EdgeEl
           id={graph.getEdgeId(edge)}
           z={graphState.cameraPosition[2]}
-          inputType={getSocketType(edge[0], edge[1], 'a')}
+          inputType={getSocketType(edge[0], edge[1])}
-          outputType={getSocketType(edge[2], edge[3], 'b')}
+          outputType={getSocketType(edge[2], edge[3])}
           {x1}
           {y1}
           {x2}
@@ -222,7 +219,7 @@
           style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`}
           class:hovering-sockets={graphState.activeSocket}
         >
-          {#each graph.getAllNodes() as node (node.id)}
+          {#each graph.nodes.values() as node (node.id)}
             <NodeEl
               {node}
               inView={graphState.isNodeInView(node)}
@@ -250,26 +247,6 @@
     height: 100%;
   }
 
-  :global(.exit-group) {
-    position: fixed;
-    top: 12px;
-    left: 50%;
-    transform: translateX(-50%);
-    z-index: 1000;
-    padding: 4px 12px;
-    background: var(--color-layer-2);
-    border: 1px solid var(--stroke);
-    border-radius: 4px;
-    color: inherit;
-    font-size: 0.85em;
-    cursor: pointer;
-    opacity: 0.85;
-  }
-
-  :global(.exit-group:hover) {
-    opacity: 1;
-  }
-
   .wrapper {
     position: absolute;
     z-index: 100;

app/src/lib/graph-interface/graph/Wrapper.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import { createKeyMap } from '$lib/helpers/createKeyMap';
   import type { Graph, NodeInstance, NodeRegistry } from '@nodarium/types';
-  import { onMount } from 'svelte';
   import { GraphManager } from '../graph-manager.svelte';
   import { GraphState, setGraphManager, setGraphState } from '../graph-state.svelte';
   import { setupKeymaps } from '../keymaps';
@@ -84,10 +83,101 @@
   manager.on('save', (save) => onsave?.(save));
 
   $effect(() => {
-    if (graph && (manager.status !== 'idle' || manager.graph.id !== graph.id)) {
+    if (graph) {
       manager.load(graph);
     }
   });
+
+  function navigateToBreadcrumb(index: number) {
+    const crumbs = manager.breadcrumbs;
+    const depth = crumbs.length - 1 - index;
+    let result: { camera: [number, number, number]; nodeId: number } | false = false;
+    for (let i = 0; i < depth; i++) {
+      const groupId = manager.currentGroupContext;
+      if (groupId) {
+        state.groupCameras.set(groupId, [...state.cameraPosition] as [number, number, number]);
+      }
+      result = manager.exitGroup();
+    }
+    if (result !== false) {
+      state.activeNodeId = result.nodeId;
+      state.clearSelection();
+      state.cameraPosition[0] = result.camera[0];
+      state.cameraPosition[1] = result.camera[1];
+      state.cameraPosition[2] = result.camera[2];
+    } else {
+      state.activeNodeId = -1;
+      state.clearSelection();
+      state.centerNode();
+    }
+  }
 </script>
 
+{#if manager.isInsideGroup}
+  <div class="breadcrumb-bar">
+    {#each manager.breadcrumbs as crumb, i}
+      {#if i > 0}
+        <span class="sep">›</span>
+      {/if}
+      <button
+        class="crumb"
+        class:active={i === manager.breadcrumbs.length - 1}
+        onclick={() => navigateToBreadcrumb(i)}
+      >
+        {crumb.name}
+      </button>
+    {/each}
+  </div>
+{/if}
+
 <GraphEl {keymap} {safePadding} />
+
+<style>
+  .breadcrumb-bar {
+    position: absolute;
+    top: 8px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 100;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    background: rgba(10, 15, 28, 0.85);
+    border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 6px;
+    padding: 4px 10px;
+    font-size: 12px;
+    pointer-events: all;
+    backdrop-filter: blur(8px);
+  }
+
+  .sep {
+    opacity: 0.4;
+    font-size: 14px;
+  }
+
+  .crumb {
+    background: none;
+    border: none;
+    color: rgba(255, 255, 255, 0.6);
+    cursor: pointer;
+    padding: 2px 4px;
+    border-radius: 4px;
+    font-size: 12px;
+    transition: color 0.15s, background 0.15s;
+  }
+
+  .crumb:hover {
+    color: white;
+    background: rgba(255, 255, 255, 0.08);
+  }
+
+  .crumb.active {
+    color: white;
+    cursor: default;
+  }
+
+  .crumb.active:hover {
+    background: none;
+  }
+</style>

app/src/lib/graph-interface/helpers/nodeHelpers.ts

@@ -3,6 +3,9 @@ import type { NodeDefinition, NodeInstance } from '@nodarium/types';
 export function getParameterHeight(node: NodeDefinition, inputKey: string) {
   const input = node.inputs?.[inputKey];
   if (!input) {
+    if (inputKey.startsWith('__virtual')) {
+      return 50;
+    }
     return 0;
   }
 
@@ -23,12 +26,53 @@ export function getParameterHeight(node: NodeDefinition, inputKey: string) {
   return 50;
 }
 
+export function getSocketPosition(
+  node: NodeInstance,
+  index: string | number
+): [number, number] {
+  if (typeof index === 'number') {
+    if (node.type === '__virtual/group/input') {
+      const nodeType = node.state.type;
+      const keys = Object.keys(nodeType?.inputs || {});
+      let height = 5;
+      for (let i = 0; i < keys.length; i++) {
+        const h = getParameterHeight(nodeType!, keys[i]) / 10;
+        if (i === index) { height += h / 2; break; }
+        height += h;
+      }
+      return [
+        (node?.state?.x ?? node.position[0]) + 20,
+        (node?.state?.y ?? node.position[1]) + height
+      ];
+    }
+    return [
+      (node?.state?.x ?? node.position[0]) + 20,
+      (node?.state?.y ?? node.position[1]) + 2.5 + 10 * index
+    ];
+  } else {
+    let height = 5;
+    const nodeType = node.state.type!;
+    const inputs = nodeType.inputs || {};
+    for (const inputKey in inputs) {
+      const h = getParameterHeight(nodeType, inputKey) / 10;
+      if (inputKey === index) {
+        height += h / 2;
+        break;
+      }
+      height += h;
+    }
+    return [
+      node?.state?.x ?? node.position[0],
+      (node?.state?.y ?? node.position[1]) + height
+    ];
+  }
+}
+
 const nodeHeightCache: Record<string, number> = {};
 export function getNodeHeight(node: NodeDefinition) {
-  if (!node) {
+  // Don't cache virtual nodes — their inputs can change dynamically
-    console.trace('Node is undefined', node);
+  const isVirtual = (node.id as string).startsWith('__virtual/');
-  }
+  if (!isVirtual && node.id in nodeHeightCache) {
-  if (node.id in nodeHeightCache) {
     return nodeHeightCache[node.id];
   }
   if (!node?.inputs) {
@@ -41,6 +85,8 @@ export function getNodeHeight(node: NodeDefinition) {
     height += h;
   }
 
+  if (!isVirtual) {
     nodeHeightCache[node.id] = height;
+  }
   return height;
 }

app/src/lib/graph-interface/keymaps.ts

@@ -45,12 +45,26 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
 
   keymap.addShortcut({
     key: 'Escape',
-    description: 'Deselect nodes',
+    description: 'Deselect nodes / Exit group',
     callback: () => {
       if (graph.isInsideGroup) {
-        graphState.exitGroupNode();
+        const groupId = graph.currentGroupContext;
+        if (groupId) {
+          graphState.groupCameras.set(
+            groupId,
+            [...graphState.cameraPosition] as [number, number, number]
+          );
+        }
+        const result = graph.exitGroup();
+        if (result !== false) {
+          graphState.activeNodeId = result.nodeId;
+          graphState.clearSelection();
+          graphState.cameraPosition[0] = result.camera[0];
+          graphState.cameraPosition[1] = result.camera[1];
+          graphState.cameraPosition[2] = result.camera[2];
           return;
         }
+      }
       graphState.activeNodeId = -1;
       graphState.clearSelection();
       graphState.edgeEndPosition = null;
@@ -58,20 +72,6 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
     }
   });
 
-  keymap.addShortcut({
-    key: 'g',
-    ctrl: true,
-    preventDefault: true,
-    description: 'Group selected nodes',
-    callback: () => graphState.groupSelectedNodes()
-  });
-
-  keymap.addShortcut({
-    key: 'Tab',
-    description: 'Enter selected node group',
-    callback: () => graphState.enterGroupNode()
-  });
-
   keymap.addShortcut({
     key: 'A',
     shift: true,
@@ -177,4 +177,80 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
       if (!edge) graph.smartConnect(nodes[1], nodes[0]);
     }
   });
+
+  keymap.addShortcut({
+    key: 'g',
+    ctrl: true,
+    preventDefault: true,
+    description: 'Group selected nodes',
+    callback: () => {
+      if (!graphState.isBodyFocused()) return;
+      const nodeIds = Array.from(
+        new Set([
+          ...(graphState.selectedNodes.size > 0 ? graphState.selectedNodes.values() : []),
+          ...(graphState.activeNodeId !== -1 ? [graphState.activeNodeId] : [])
+        ])
+      );
+      if (nodeIds.length === 0) return;
+      const groupNode = graph.createGroup(nodeIds);
+      if (groupNode) {
+        graphState.selectedNodes.clear();
+        graphState.activeNodeId = groupNode.id;
+      }
+    }
+  });
+
+  keymap.addShortcut({
+    key: 'g',
+    alt: true,
+    shift: true,
+    preventDefault: true,
+    description: 'Ungroup selected node',
+    callback: () => {
+      if (!graphState.isBodyFocused()) return;
+      const nodeId = graphState.activeNodeId !== -1
+        ? graphState.activeNodeId
+        : graphState.selectedNodes.size === 1
+        ? [...graphState.selectedNodes.values()][0]
+        : -1;
+      if (nodeId === -1) return;
+      graph.ungroup(nodeId);
+      graphState.activeNodeId = -1;
+      graphState.clearSelection();
+    }
+  });
+
+  keymap.addShortcut({
+    key: 'Tab',
+    preventDefault: true,
+    description: 'Enter focused group node',
+    callback: () => {
+      if (!graphState.isBodyFocused()) return;
+      const entered = graph.enterGroup(
+        graphState.activeNodeId,
+        [...graphState.cameraPosition] as [number, number, number]
+      );
+      if (entered) {
+        graphState.activeNodeId = -1;
+        graphState.clearSelection();
+        // Restore group-specific camera if we've been here before, else snap to center
+        const groupId = graph.currentGroupContext;
+        const saved = groupId ? graphState.groupCameras.get(groupId) : undefined;
+        if (saved) {
+          graphState.cameraPosition[0] = saved[0];
+          graphState.cameraPosition[1] = saved[1];
+          graphState.cameraPosition[2] = saved[2];
+        } else {
+          const nodes = [...graph.nodes.values()];
+          if (nodes.length) {
+            const avgX = nodes.reduce((s, n) => s + n.position[0], 0) / nodes.length;
+            const avgY = nodes.reduce((s, n) => s + n.position[1], 0) / nodes.length;
+            graphState.cameraPosition[0] = avgX;
+            graphState.cameraPosition[1] = avgY;
+            graphState.cameraPosition[2] = 10;
+          }
+        }
+      }
+    }
+  });
 }

app/src/lib/graph-interface/node/Node.svelte

@@ -3,14 +3,13 @@
   import type { NodeInstance } from '@nodarium/types';
   import { T } from '@threlte/core';
   import { type Mesh } from 'three';
-  import { getGraphManager, getGraphState } from '../graph-state.svelte';
+  import { getGraphState } from '../graph-state.svelte';
   import { colors } from '../graph/colors.svelte';
   import { getNodeHeight, getParameterHeight } from '../helpers/nodeHelpers';
   import NodeFrag from './Node.frag';
   import NodeVert from './Node.vert';
   import NodeHtml from './NodeHTML.svelte';
 
-  const graph = getGraphManager();
   const graphState = getGraphState();
 
   type Props = {
@@ -19,7 +18,7 @@
   };
   let { node = $bindable(), inView }: Props = $props();
 
-  const nodeType = $derived(graph.getNodeType(node)!);
+  const nodeType = $derived(node.state.type!);
 
   const isActive = $derived(graphState.activeNodeId === node.id);
   const isSelected = $derived(graphState.selectedNodes.has(node.id));
@@ -41,7 +40,7 @@
 
   let meshRef: Mesh | undefined = $state();
 
-  const height = $derived(getNodeHeight(nodeType));
+  const height = $derived(getNodeHeight(node.state.type!));
 
   const zoom = $derived(graphState.cameraPosition[2]);
 

app/src/lib/graph-interface/node/NodeHTML.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
-  import type { NodeInstance } from '@nodarium/types';
+  import type { NodeDefinition, NodeInstance } from '@nodarium/types';
   import { getGraphManager, getGraphState } from '../graph-state.svelte';
   import NodeHeader from './NodeHeader.svelte';
   import NodeParameter from './NodeParameter.svelte';
 
   let ref: HTMLDivElement;
 
-  const graph = getGraphManager();
   const graphState = getGraphState();
+  const manager = getGraphManager();
 
   type Props = {
     node: NodeInstance;
@@ -31,14 +31,60 @@
   const zOffset = Math.random() - 0.5;
   const zLimit = 2 - zOffset;
 
-  const nodeType = $derived(graph.getNodeType(node));
+  function buildParameters(node: NodeInstance, inputs: NodeDefinition['inputs']) {
-
+    let parameters = Object.entries(inputs || {}).filter(
-  const parameters = $derived(
-    Object.entries(nodeType?.inputs || {}).filter(
       (p) => p[1].type !== 'seed' && !('setting' in p[1]) && p[1]?.hidden !== true
-    ) || {}
     );
 
+    if (node.type === '__virtual/group/instance') {
+      const groupOptions = [...(manager?.groups?.entries() ?? [])].map(([id, g]) => ({
+        label: g.name,
+        value: id
+      }));
+      // Remove the static placeholder from the definition (height-only) and replace
+      // with a fully dynamic version that carries current names + value.
+      parameters = parameters.filter(([key]) => key !== '__virtual/groupId');
+      parameters = [['__virtual/groupId', {
+        type: 'select',
+        value: node.props?.groupId as string,
+        options: groupOptions
+      }], ...parameters];
+    }
+
+    return parameters;
+  }
+
+  $effect(() => {
+    const props = node.props as Record<string, unknown> | undefined;
+    const virtualGroupId = props?.['__virtual/groupId'] as string | undefined;
+    if (!virtualGroupId) return;
+    const activeGroupId = props?.groupId as string | undefined;
+    if (virtualGroupId === activeGroupId) return;
+    const newGroupDef = manager?.groupNodeDefinitions.get(`__virtual/group/${virtualGroupId}`);
+    if (!newGroupDef) return;
+    const { children, parents, ref } = node.state;
+    node.props = { ...props, groupId: virtualGroupId, '__virtual/groupId': virtualGroupId };
+    node.state = { type: newGroupDef, children, parents, ref };
+    manager?.execute();
+    manager?.save();
+  });
+
+  const parameters = $derived(buildParameters(node, node?.state?.type?.inputs || {}));
+
+  const currentGroupId = $derived((node.props?.groupId as string) ?? '');
+
+  function onGroupSelect(event: Event) {
+    const select = event.target as HTMLSelectElement;
+    const newGroupId = select.value;
+    if (!manager || newGroupId === currentGroupId) return;
+    const newGroupDef = manager.groupNodeDefinitions.get(`__virtual/group/${newGroupId}`);
+    if (!newGroupDef) return;
+    node.props = { ...(node.props ?? {}), groupId: newGroupId };
+    node.state = { type: newGroupDef };
+    manager.execute();
+    manager.save();
+  }
+
   $effect(() => {
     if ('state' in node && !node.state.ref) {
       node.state.ref = ref;
@@ -60,17 +106,52 @@
 >
   <NodeHeader {node} />
 
+  {#if false && node.type === '__virtual/group/instance'}
+    <div class="group-param">
+      <select
+        value={currentGroupId}
+        onchange={onGroupSelect}
+        onmousedown={(e) => e.stopPropagation()}
+        onclick={(e) => e.stopPropagation()}
+        onkeydown={(e) => e.stopPropagation()}
+      >
+        {#each manager?.groups?.entries() ?? [] as [gid, gdef]}
+          <option value={gid}>{gdef.name}</option>
+        {/each}
+      </select>
+    </div>
+  {/if}
+
   {#each parameters as [key, value], i (key)}
     <NodeParameter
       bind:node
       id={key}
       input={value}
       isLast={i == parameters.length - 1}
+      outputIndex={node.type === '__virtual/group/input' ? i : undefined}
     />
   {/each}
 </div>
 
 <style>
+  .group-param {
+    padding: 5px 8px;
+    border-bottom: solid 1px var(--color-layer-2);
+    background: var(--color-layer-1);
+  }
+
+  .group-param select {
+    width: 100%;
+    background: var(--color-layer-2);
+    color: var(--color-text);
+    border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    padding: 4px 6px;
+    font-size: 0.8em;
+    cursor: pointer;
+    box-sizing: border-box;
+  }
+
   .node {
     box-sizing: border-box;
     user-select: none !important;

app/src/lib/graph-interface/node/NodeHeader.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
   import { appSettings } from '$lib/settings/app-settings.svelte';
   import type { NodeInstance, Socket } from '@nodarium/types';
-  import { getGraphManager, getGraphState } from '../graph-state.svelte';
+  import { getGraphState } from '../graph-state.svelte';
   import { createNodePath } from '../helpers/index.js';
+  import { getSocketPosition } from '../helpers/nodeHelpers';
 
   const graphState = getGraphState();
-  const graph = getGraphManager();
 
   const { node }: { node: NodeInstance } = $props();
 
@@ -16,14 +16,13 @@
       graphState.setDownSocket?.({
         node,
         index: 0,
-        position: graphState.getSocketPosition?.(node, 0)
+        position: getSocketPosition?.(node, 0)
       });
     }
   }
 
   const cornerTop = 10;
-  const nodeType = $derived(graph.getNodeType(node));
+  const rightBump = $derived(!!node?.state?.type?.outputs?.length && node.type !== '__virtual/group/input');
-  const rightBump = $derived(!!nodeType?.outputs?.length);
   const aspectRatio = 0.25;
 
   const path = $derived(
@@ -71,8 +70,9 @@
     {#if appSettings.value.debug.advancedMode}
       <span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
     {/if}
-    {node.type.split('/').pop()}
+    {node.state?.type?.meta?.title ?? node.type.split('/').pop()}
   </div>
+  {#if node.type !== '__virtual/group/input'}
     <div
       class="target"
       role="button"
@@ -80,6 +80,7 @@
       onmousedown={handleMouseDown}
     >
     </div>
+  {/if}
   <svg
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 100 100"

app/src/lib/graph-interface/node/NodeInput.svelte

@@ -45,7 +45,7 @@
 
   $effect(() => {
     const a = $state.snapshot(value);
-    const b = $state.snapshot(node?.props?.[id]);
+    const b = $state.snapshot(node?.props?.[id]) as number | number[] | undefined;
     const isDiff = Array.isArray(a) ? diffArray(a, b) : a !== b;
     if (value !== undefined && isDiff) {
       node.props = { ...node.props, [id]: a };

app/src/lib/graph-interface/node/NodeParameter.svelte

@@ -2,7 +2,7 @@
   import type { NodeInput, NodeInstance, Socket } from '@nodarium/types';
   import { getGraphManager, getGraphState } from '../graph-state.svelte';
   import { createNodePath } from '../helpers';
-  import { getParameterHeight } from '../helpers/nodeHelpers';
+  import { getParameterHeight, getSocketPosition } from '../helpers/nodeHelpers';
   import NodeInputEl from './NodeInput.svelte';
 
   type Props = {
@@ -10,6 +10,7 @@
     input: NodeInput;
     id: string;
     isLast?: boolean;
+    outputIndex?: number;
   };
 
   const graph = getGraphManager();
@@ -17,13 +18,14 @@
   const graphId = graph?.id;
   const elementId = `input-${Math.random().toString(36).substring(7)}`;
 
-  let { node = $bindable(), input, id, isLast }: Props = $props();
+  let { node = $bindable(), input, id, isLast, outputIndex = undefined }: Props = $props();
 
-  const nodeType = $derived(graph.getNodeType(node)!);
+  const nodeType = $derived(node.state.type!);
 
   const inputType = $derived(nodeType.inputs?.[id]);
 
   const socketId = $derived(`${node.id}-${id}`);
+  const outputSocketId = $derived(outputIndex !== undefined ? `${node.id}-${outputIndex}` : '');
   const height = $derived(getParameterHeight(nodeType, id));
 
   function handleMouseDown(ev: MouseEvent) {
@@ -32,11 +34,23 @@
     graphState.setDownSocket({
       node,
       index: id,
-      position: graphState.getSocketPosition(node, id)
+      position: getSocketPosition(node, id)
     });
   }
 
-  const leftBump = $derived(nodeType.inputs?.[id].internal !== true);
+  function handleOutputMouseDown(ev: MouseEvent) {
+    ev.preventDefault();
+    ev.stopPropagation();
+    if (outputIndex === undefined) return;
+    graphState.setDownSocket({
+      node,
+      index: outputIndex,
+      position: getSocketPosition(node, outputIndex)
+    });
+  }
+
+  const leftBump = $derived(!id.startsWith('__virtual') && nodeType.inputs?.[id].internal !== true && outputIndex === undefined);
+  const rightBump = $derived(outputIndex !== undefined);
   const cornerBottom = $derived(isLast ? 5 : 0);
   const aspectRatio = 0.5;
 
@@ -47,6 +61,7 @@
       y: 50.5,
       cornerBottom,
       leftBump,
+      rightBump,
       aspectRatio
     })
   );
@@ -57,6 +72,7 @@
       y: 50.5,
       cornerBottom,
       leftBump,
+      rightBump,
       aspectRatio
     })
   );
@@ -79,11 +95,13 @@
   data-node-input={id}
   style:height="{height}px"
   style:--socket-color={hoverColor}
-  class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
+  class:possible-socket={outputIndex !== undefined
+    ? graphState?.possibleSocketIds.has(outputSocketId)
+    : graphState?.possibleSocketIds.has(socketId)}
 >
   {#key id && graphId}
     <div class="content" class:disabled={graph?.inputSockets?.has(socketId)}>
-      {#if inputType?.label !== ''}
+      {#if inputType?.label !== '' && !id.startsWith('__virtual')}
         <label for={elementId} title={input.description}>{input.label || id}</label>
       {/if}
       {#if inputType?.external !== true}
@@ -91,7 +109,7 @@
       {/if}
     </div>
 
-    {#if node?.state?.type?.inputs?.[id]?.internal !== true}
+    {#if outputIndex === undefined && node?.state?.type?.inputs?.[id]?.internal !== true}
       <div
         data-node-socket
         class="target"
@@ -103,6 +121,17 @@
     {/if}
   {/key}
 
+  {#if outputIndex !== undefined}
+    <div
+      data-node-socket
+      class="target target-right"
+      onmousedown={handleOutputMouseDown}
+      role="button"
+      tabindex="0"
+    >
+    </div>
+  {/if}
+
   <svg
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 100 100"
@@ -130,6 +159,16 @@
     transform: translateY(-50%) translateX(-50%);
   }
 
+  .target-right {
+    right: 0;
+    left: auto;
+    transform: translateY(-50%) translateX(50%);
+  }
+
+  .target-right:hover ~ svg path {
+    d: var(--hover-path);
+  }
+
   .possible-socket .target::before {
     content: "";
     position: absolute;

app/src/lib/graph-interface/test-utils.ts

@@ -23,11 +23,7 @@ export function createMockNodeRegistry(nodes: NodeDefinition[]): NodeRegistry {
 
 export const mockFloatOutputNode: NodeDefinition = {
   id: 'test/node/output',
-  inputs: {
+  inputs: {},
-    'input': {
-      type: 'float'
-    }
-  },
   outputs: ['float'],
   meta: { title: 'Float Output' },
   execute: () => new Int32Array()
@@ -36,7 +32,7 @@ export const mockFloatOutputNode: NodeDefinition = {
 export const mockFloatInputNode: NodeDefinition = {
   id: 'test/node/input',
   inputs: { value: { type: 'float' } },
-  outputs: ['float'],
+  outputs: [],
   meta: { title: 'Float Input' },
   execute: () => new Int32Array()
 };

app/src/lib/graph-templates/grid.ts

@@ -4,8 +4,7 @@ export function grid(width: number, height: number) {
   const graph: Graph = {
     id: Math.floor(Math.random() * 100000),
     edges: [],
-    nodes: [],
+    nodes: []
-    groups: []
   };
 
   const amount = width * height;

app/src/lib/graph-templates/tree.ts

@@ -47,7 +47,6 @@ export function tree(depth: number): Graph {
   return {
     id: Math.floor(Math.random() * 100000),
     nodes,
-    edges,
+    edges
-    groups: []
   };
 }

app/src/lib/node-registry/debugNode.ts

@@ -1,5 +1,5 @@
 export const debugNode = {
-  id: '__internal/debug/instance',
+  id: 'max/plantarium/debug',
   inputs: {
     input: {
       type: '*'

app/src/lib/node-registry/groupNode.ts

@@ -1,13 +0,0 @@
-export const groupNode = {
-  id: '__internal/group/instance',
-  meta: { title: 'Group' },
-  inputs: {
-    input: {
-      type: 'select',
-      values: []
-    }
-  },
-  execute(_data: Int32Array): Int32Array {
-    return _data;
-  }
-} as const;

app/src/lib/node-registry/groupNodes.ts

@@ -0,0 +1,25 @@
+import type { NodeDefinition } from '@nodarium/types';
+
+export const groupInputNode: NodeDefinition = {
+  id: '__virtual/group/input',
+  inputs: {},
+  outputs: [],
+  execute(_data: Int32Array): Int32Array { return _data; }
+} as unknown as NodeDefinition;
+
+export const groupOutputNode: NodeDefinition = {
+  id: '__virtual/group/output',
+  inputs: {},
+  outputs: [],
+  execute(_data: Int32Array): Int32Array { return _data; }
+} as unknown as NodeDefinition;
+
+// Stub registered in the registry so it appears in AddMenu.
+// Actual inputs/outputs are resolved from props.groupId at runtime.
+export const groupNode: NodeDefinition = {
+  id: '__virtual/group/instance',
+  meta: { title: 'Group' },
+  inputs: {},
+  outputs: [],
+  execute(_data: Int32Array): Int32Array { return _data; }
+} as unknown as NodeDefinition;

app/src/lib/node-registry/node-registry-client.ts

@@ -88,7 +88,6 @@ export class RemoteNodeRegistry implements NodeRegistry {
   }
 
   async fetchNodeDefinition(nodeId: `${string}/${string}/${string}`) {
-    if (nodeId.startsWith('__internal/')) return;
     return this.fetchJson(`nodes/${nodeId}.json`);
   }
 
@@ -110,8 +109,6 @@ export class RemoteNodeRegistry implements NodeRegistry {
           return this.nodes.get(id)!;
         }
 
-        if (id.startsWith('__internal/')) return;
-
         const wasmBuffer = await this.fetchNodeWasm(id);
 
         try {

app/src/lib/runtime/runtime-executor.test.ts

@@ -1,154 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { expandGroups } from './runtime-executor';
-import type { Graph } from '@nodarium/types';
-
-// Helpers to build minimal serialized nodes/edges
-function node(id: number, type: string, props?: Record<string, number>) {
-  return { id, type: type as Graph['nodes'][0]['type'], position: [0, 0] as [number, number], ...(props ? { props } : {}) };
-}
-
-function edge(from: number, fromSocket: number, to: number, toSocket: string): [number, number, number, string] {
-  return [from, fromSocket, to, toSocket];
-}
-
-describe('expandGroups', () => {
-  it('returns graph unchanged when there are no groups', () => {
-    const graph: Graph = {
-      id: 1,
-      nodes: [node(0, 'test/node/output'), node(1, 'test/node/input')],
-      edges: [edge(0, 0, 1, 'value')],
-      groups: []
-    };
-
-    const result = expandGroups(graph);
-
-    expect(result.nodes.length).toBe(2);
-    expect(result.edges.length).toBe(1);
-    expect(result).toBe(graph); // same reference — no copy needed
-  });
-
-  it('expands a simple group: A → [B] → C rewires to A → B → C', () => {
-    // IDs: A=1, B=2, C=3, groupNode=4, group.id=5, inputBoundary=6, outputBoundary=7
-    const groupId = 5;
-    const groupNodeId = 4;
-    const remappedB = (groupNodeId + 1) * 1_000_000 + 2; // 5_000_002
-
-    const graph: Graph = {
-      id: 1,
-      nodes: [
-        node(1, 'test/node/output'),
-        node(groupNodeId, '__internal/group/instance', { groupId }),
-        node(3, 'test/node/input')
-      ],
-      edges: [
-        edge(1, 0, groupNodeId, 'input_0'),  // A → group
-        edge(groupNodeId, 0, 3, 'value')     // group → C
-      ],
-      groups: [{
-        id: groupId,
-        nodes: [
-          node(6, '__internal/group/input'),
-          node(2, 'test/node/output'),
-          node(7, '__internal/group/output')
-        ],
-        edges: [
-          edge(6, 0, 2, 'input'),  // inputBoundary → B
-          edge(2, 0, 7, 'Out')     // B → outputBoundary
-        ],
-        inputs: { input_0: { type: 'float' } },
-        outputs: [{ type: 'float', label: 'Output 0' }]
-      }]
-    };
-
-    const result = expandGroups(graph);
-
-    const ids = result.nodes.map(n => n.id);
-    expect(ids).not.toContain(groupNodeId);
-    expect(ids).toContain(remappedB);
-    expect(ids).toContain(1); // A
-    expect(ids).toContain(3); // C
-    expect(result.nodes.length).toBe(3); // A, B(remapped), C
-
-    expect(result.edges).toContainEqual(edge(1, 0, remappedB, 'input'));   // A → B
-    expect(result.edges).toContainEqual(edge(remappedB, 0, 3, 'value')); // B → C
-    expect(result.edges.length).toBe(2);
-  });
-
-  it('expands a group with two internal nodes (B→D) and preserves the internal edge', () => {
-    // A → [B → D] → C
-    const groupId = 10;
-    const groupNodeId = 5;
-    const remappedB = (groupNodeId + 1) * 1_000_000 + 1; // 6_000_001
-    const remappedD = (groupNodeId + 1) * 1_000_000 + 2; // 6_000_002
-
-    const graph: Graph = {
-      id: 1,
-      nodes: [
-        node(0, 'test/node/output'),
-        node(groupNodeId, '__internal/group/instance', { groupId }),
-        node(9, 'test/node/input')
-      ],
-      edges: [
-        edge(0, 0, groupNodeId, 'input_0'),
-        edge(groupNodeId, 0, 9, 'value')
-      ],
-      groups: [{
-        id: groupId,
-        nodes: [
-          node(3, '__internal/group/input'),
-          node(1, 'test/node/output'),  // B
-          node(2, 'test/node/output'),  // D
-          node(4, '__internal/group/output')
-        ],
-        edges: [
-          edge(3, 0, 1, 'input'),  // inputBoundary → B
-          edge(1, 0, 2, 'input'),  // B → D (internal)
-          edge(2, 0, 4, 'Out')     // D → outputBoundary
-        ],
-        inputs: { input_0: { type: 'float' } },
-        outputs: [{ type: 'float' }]
-      }]
-    };
-
-    const result = expandGroups(graph);
-
-    expect(result.nodes.map(n => n.id)).not.toContain(groupNodeId);
-    expect(result.nodes.map(n => n.id)).toContain(remappedB);
-    expect(result.nodes.map(n => n.id)).toContain(remappedD);
-
-    expect(result.edges).toContainEqual(edge(0, 0, remappedB, 'input'));    // A → B
-    expect(result.edges).toContainEqual(edge(remappedB, 0, remappedD, 'input')); // B → D (internal)
-    expect(result.edges).toContainEqual(edge(remappedD, 0, 9, 'value'));    // D → C
-    expect(result.edges.length).toBe(3);
-  });
-
-  it('expands a group with no external connections (isolated)', () => {
-    const groupId = 20;
-    const groupNodeId = 1;
-    const remappedB = (groupNodeId + 1) * 1_000_000 + 2; // 2_000_002
-
-    const graph: Graph = {
-      id: 1,
-      nodes: [node(groupNodeId, '__internal/group/instance', { groupId })],
-      edges: [],
-      groups: [{
-        id: groupId,
-        nodes: [
-          node(3, '__internal/group/input'),
-          node(2, 'test/node/output'),
-          node(4, '__internal/group/output')
-        ],
-        edges: [
-          edge(3, 0, 2, 'input'),
-          edge(2, 0, 4, 'Out')
-        ]
-      }]
-    };
-
-    const result = expandGroups(graph);
-
-    expect(result.nodes.map(n => n.id)).not.toContain(groupNodeId);
-    expect(result.nodes.map(n => n.id)).toContain(remappedB);
-    expect(result.edges.length).toBe(0);
-  });
-});

app/src/lib/runtime/runtime-executor.ts

@@ -7,11 +7,18 @@ import type {
   SyncCache
 } from '@nodarium/types';
 
+function isGroupInstanceType(type: string): boolean {
+  return type === '__virtual/group/instance';
+}
+
 export function expandGroups(graph: Graph): Graph {
-  if (!graph.groups || graph.groups.length === 0) return graph;
+  if (!graph.groups || Object.keys(graph.groups).length === 0) {
+    return graph;
+  }
 
   let nodes = [...graph.nodes];
   let edges = [...graph.edges];
+  const groups = graph.groups;
 
   let changed = true;
   while (changed) {
@@ -19,69 +26,117 @@ export function expandGroups(graph: Graph): Graph {
 
     for (let i = 0; i < nodes.length; i++) {
       const node = nodes[i];
-      if (node.type !== '__internal/group/instance') continue;
+      if (!isGroupInstanceType(node.type)) continue;
 
-      const groupId = node.props?.groupId as number | undefined;
+      const groupId = (node.props as Record<string, unknown> | undefined)?.groupId as string | undefined;
-      if (groupId === undefined) continue;
+      if (!groupId) continue;
-
+      const group = groups[groupId];
-      const group = graph.groups.find(g => g.id === groupId);
       if (!group) continue;
 
       changed = true;
 
-      const ID_OFFSET = (node.id + 1) * 1_000_000;
+      // Recursively expand nested groups inside this group's internal graph
+      const expandedInternal = expandGroups({
+        id: 0,
+        nodes: group.graph.nodes,
+        edges: group.graph.edges,
+        groups
+      });
+
+      const ID_PREFIX = node.id * 1000000;
       const idMap = new Map<number, number>();
 
-      const inputBoundary = group.nodes.find(n => n.type === '__internal/group/input');
+      const inputVirtualNode = expandedInternal.nodes.find(
-      const outputBoundary = group.nodes.find(n => n.type === '__internal/group/output');
+        n => n.type === '__virtual/group/input'
-
+      );
-      const realNodes = group.nodes.filter(
+      const outputVirtualNode = expandedInternal.nodes.find(
-        n => n.type !== '__internal/group/input' && n.type !== '__internal/group/output'
+        n => n.type === '__virtual/group/output'
       );
 
-      for (const n of realNodes) idMap.set(n.id, ID_OFFSET + n.id);
+      const realInternalNodes = expandedInternal.nodes.filter(
+        n => n.type !== '__virtual/group/input' && n.type !== '__virtual/group/output'
+      );
+
+      for (const n of realInternalNodes) {
+        idMap.set(n.id, ID_PREFIX + n.id);
+      }
+
+      const parentIncomingEdges = edges.filter(e => e[2] === node.id);
+      const parentOutgoingEdges = edges.filter(e => e[0] === node.id);
+
+      // Edges from/to virtual nodes in the expanded internal graph
+      const edgesFromInput = expandedInternal.edges.filter(
+        e => e[0] === inputVirtualNode?.id
+      );
+      const edgesToOutput = expandedInternal.edges.filter(
+        e => e[2] === outputVirtualNode?.id
+      );
 
-      const incomingExternal = edges.filter(e => e[2] === node.id);
-      const outgoingExternal = edges.filter(e => e[0] === node.id);
       const newEdges: Graph['edges'] = [];
 
-      // external_source → [inputBoundary →] internal_target
+      // Short-circuit: parent source → internal target (via group input)
-      if (inputBoundary) {
+      for (const parentEdge of parentIncomingEdges) {
-        const fromInput = group.edges.filter(e => e[0] === inputBoundary.id);
+        const socketName = parentEdge[3];
-        for (const extEdge of incomingExternal) {
+        const socketIdx = group.inputs.findIndex(s => s.name === socketName);
-          for (const intEdge of fromInput) {
+        if (socketIdx === -1) continue;
-            const toId = idMap.get(intEdge[2]);
+
-            if (toId !== undefined) newEdges.push([extEdge[0], extEdge[1], toId, intEdge[3]]);
+        for (const internalEdge of edgesFromInput.filter(e => e[1] === socketIdx)) {
+          const remappedId = idMap.get(internalEdge[2]);
+          if (remappedId !== undefined) {
+            newEdges.push([parentEdge[0], parentEdge[1], remappedId, internalEdge[3]]);
           }
         }
       }
 
-      // internal_source → [outputBoundary →] external_target
+      // Short-circuit: internal source → parent target (via group output)
-      if (outputBoundary) {
+      for (const parentEdge of parentOutgoingEdges) {
-        const toOutput = group.edges.filter(e => e[2] === outputBoundary.id);
+        const outputIdx = parentEdge[1];
-        for (const extEdge of outgoingExternal) {
+        const outputSocketName = group.outputs[outputIdx]?.name;
-          for (const intEdge of toOutput) {
+        if (!outputSocketName) continue;
-            const fromId = idMap.get(intEdge[0]);
+
-            if (fromId !== undefined) newEdges.push([fromId, intEdge[1], extEdge[2], extEdge[3]]);
+        for (const internalEdge of edgesToOutput.filter(e => e[3] === outputSocketName)) {
+          const remappedId = idMap.get(internalEdge[0]);
+          if (remappedId !== undefined) {
+            newEdges.push([remappedId, internalEdge[1], parentEdge[2], parentEdge[3]]);
           }
         }
       }
 
-      // internal-to-internal edges (skip boundary edges)
+      // Remap internal-to-internal edges
-      for (const e of group.edges) {
+      const internalEdges = expandedInternal.edges.filter(
-        if (e[0] === inputBoundary?.id || e[2] === outputBoundary?.id) continue;
+        e => e[0] !== inputVirtualNode?.id
+          && e[0] !== outputVirtualNode?.id
+          && e[2] !== inputVirtualNode?.id
+          && e[2] !== outputVirtualNode?.id
+      );
+
+      for (const e of internalEdges) {
         const fromId = idMap.get(e[0]);
         const toId = idMap.get(e[2]);
-        if (fromId !== undefined && toId !== undefined) newEdges.push([fromId, e[1], toId, e[3]]);
+        if (fromId !== undefined && toId !== undefined) {
+          newEdges.push([fromId, e[1], toId, e[3]]);
+        }
       }
 
+      // Remove the group node
       nodes.splice(i, 1);
-      for (const n of realNodes) nodes.push({ ...n, id: idMap.get(n.id)! });
 
-      edges = edges.filter(e => e[0] !== node.id && e[2] !== node.id);
+      // Add remapped internal nodes
+      for (const n of realInternalNodes) {
+        nodes.push({ ...n, id: idMap.get(n.id)! });
+      }
+
+      // Remove group node's edges and add short-circuit edges
+      const groupEdgeKeys = new Set([
+        ...parentIncomingEdges.map(e => `${e[0]}-${e[1]}-${e[2]}-${e[3]}`),
+        ...parentOutgoingEdges.map(e => `${e[0]}-${e[1]}-${e[2]}-${e[3]}`)
+      ]);
+      edges = edges.filter(
+        e => !groupEdgeKeys.has(`${e[0]}-${e[1]}-${e[2]}-${e[3]}`)
+      );
       edges.push(...newEdges);
 
-      break;
+      break; // Restart loop with updated nodes array
     }
   }
 
@@ -307,7 +362,7 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
           if (inputNode) {
             if (results[inputNode.id] === undefined) {
               throw new Error(
-                `Node ${node.type} is missing input from node ${inputNode.type}#${inputNode.id}`
+                `Node ${node.type} is missing input from node ${inputNode.type}`
               );
             }
             return results[inputNode.id];

app/src/lib/runtime/worker-runtime-executor-backend.ts

@@ -1,12 +1,18 @@
 import { debugNode } from '$lib/node-registry/debugNode';
+import { groupInputNode, groupNode, groupOutputNode } from '$lib/node-registry/groupNodes';
 import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
 import type { Graph } from '@nodarium/types';
 import { createPerformanceStore } from '@nodarium/utils';
-import { MemoryRuntimeExecutor } from './runtime-executor';
+import { expandGroups, MemoryRuntimeExecutor } from './runtime-executor';
 import { MemoryRuntimeCache } from './runtime-executor-cache';
 
 const indexDbCache = new IndexDBCache('node-registry');
-const nodeRegistry = new RemoteNodeRegistry('', indexDbCache, [debugNode]);
+const nodeRegistry = new RemoteNodeRegistry('', indexDbCache, [
+  debugNode,
+  groupInputNode,
+  groupOutputNode,
+  groupNode
+]);
 
 const cache = new MemoryRuntimeCache();
 const executor = new MemoryRuntimeExecutor(nodeRegistry, cache);
@@ -34,7 +40,13 @@ export async function executeGraph(
   graph: Graph,
   settings: Record<string, unknown>
 ): Promise<Int32Array> {
-  await nodeRegistry.load(graph.nodes.map((n) => n.type));
+  // Expand groups before loading types so we only load real (non-virtual) node types
+  const expandedGraph = expandGroups(graph);
+  await nodeRegistry.load(
+    expandedGraph.nodes
+      .map(n => n.type)
+      .filter(t => !t.startsWith('__virtual/')) as any
+  );
   performanceStore.startRun();
   const res = await executor.execute(graph, settings);
   performanceStore.stopRun();

app/src/lib/settings/NestedSettings.svelte

@@ -52,7 +52,7 @@
     // select input: use index into options
     if ('options' in node && Array.isArray(node.options)) {
       if (typeof inputValue === 'string') {
-        return node.options.indexOf(inputValue);
+        return (node.options as string[]).indexOf(inputValue);
       }
       return 0;
     }

app/src/lib/sidebar/panels/ActiveNodeSelected.svelte

@@ -96,6 +96,4 @@
     bind:value={store}
     type={nodeDefinition}
   />
-{:else}
-  <p class="mx-4 mt-4">Node has no settings</p>
 {/if}

app/src/lib/sidebar/panels/ActiveNodeSettings.svelte

@@ -5,28 +5,27 @@
 
   type Props = {
     manager: GraphManager;
-    node: NodeInstance | undefined;
+    node: NodeInstance;
   };
 
   let { manager, node = $bindable() }: Props = $props();
+
+  const inputs = $derived(node?.state?.type?.inputs || {});
+
+  const hasSettings = $derived(
+    Object.values(inputs).find(entry => {
+      return entry.hidden === true;
+    }) !== undefined
+  );
+
+  $inspect({ inputs, hasSettings });
 </script>
 
-<div class='{node?"border-l-2 pl-3.5!":""} bg-layer-2 flex items-center h-[70px] border-b-1 border-l-selected border-b-outline pl-4'>
+{#key node.id}
+  {#if node && hasSettings}
+    <div class="border-l-2 pl-3.5! bg-layer-2 flex items-center h-[70px] border-b-1 border-l-selected border-b-outline pl-4">
       <h3>Node Settings</h3>
-</div>
+    </div>
-
-{#if node}
-  {#key node.id}
-    {#if node}
     <ActiveNodeSelected {manager} bind:node />
   {/if}
-  {/key}
+{/key}
-{:else}
-  <p class="mx-4 mt-4">No node selected</p>
-{/if}
-
-{#if manager?.graph.groups.length}
-  <button onclick={() => manager.removeUnusedGroups()}>
-    remove unused groups
-  </button>
-{/if}

app/src/lib/sidebar/panels/GraphSource.svelte

@@ -1,23 +1,20 @@
 <script lang="ts">
   import type { Graph } from '$lib/types';
-  import { JsonViewer } from '@nodarium/ui';
 
   const { graph }: { graph?: Graph } = $props();
 
-  const data = $derived(
+  function convert(g: Graph): string {
-    graph
+    return JSON.stringify(
-      ? {
+      {
-        ...graph,
+        ...g,
-        nodes: graph.nodes.map((n: object) => ({ ...n, tmp: undefined, state: undefined }))
+        nodes: g.nodes.map((n: object) => ({ ...n, tmp: undefined, state: undefined }))
-      }
+      },
-      : null
+      null,
+      2
     );
+  }
 </script>
 
-<div class="overflow-auto p-2">
+<pre>
-  {#if data}
+  {graph ? convert(graph) : "No graph loaded"}
-    <JsonViewer value={data} path="graph" />
+</pre>
-  {:else}
-    <span class="font-mono text-xs text-neutral-500">No graph loaded</span>
-  {/if}
-</div>

app/src/lib/sidebar/panels/GroupContextPanel.svelte

@@ -0,0 +1,175 @@
+<script lang="ts">
+  import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
+  import { InputSelect } from '@nodarium/ui';
+
+  type Props = { manager: GraphManager; groupId: string };
+  const { manager, groupId }: Props = $props();
+
+  const group = $derived(manager.groups.get(groupId));
+
+  const COMMON_TYPES = ['plant', 'float', 'int', 'vec3', 'bool'];
+  let selectedTypeIdx = $state(0);
+  let customType = $state('');
+
+  function rename(e: Event) {
+    if (!group) return;
+    const name = (e.target as HTMLInputElement).value.trim();
+    if (!name) return;
+    group.name = name;
+    if (manager.graph.groups?.[groupId]) manager.graph.groups[groupId].name = name;
+    const def = manager.groupNodeDefinitions.get(`__virtual/group/${groupId}`);
+    if (def?.meta) def.meta.title = name;
+    manager.save();
+  }
+
+  function addSocket() {
+    const type = customType.trim() || COMMON_TYPES[selectedTypeIdx];
+    if (!type) return;
+    manager.addGroupSocket('input', type);
+    customType = '';
+  }
+
+  function removeSocket(index: number) {
+    manager.removeGroupSocket('input', index);
+  }
+
+  function prune() {
+    manager.pruneUnusedGroups();
+  }
+</script>
+
+<div class="bg-layer-2 flex items-center h-[70px] border-b-1 border-outline pl-4">
+  <h3>Group Settings</h3>
+</div>
+
+<div class="px-4 py-3 flex flex-col gap-4">
+  <div class="flex flex-col gap-1.5">
+    <span class="section-label">Group name</span>
+    <input
+      type="text"
+      value={group?.name ?? ''}
+      onchange={rename}
+      onkeydown={(e) => e.stopPropagation()}
+      placeholder="Group name"
+      class="bg-layer-2 text-text rounded-[5px] px-2 py-1.5 text-sm w-full box-border outline outline-1 outline-outline"
+    />
+  </div>
+
+  <div class="flex flex-col gap-1.5">
+    <span class="section-label">Inputs</span>
+
+    {#if (group?.inputs?.length ?? 0) === 0}
+      <p class="text-sm opacity-40 italic m-0">No inputs yet</p>
+    {:else}
+      <ul class="socket-list">
+        {#each group?.inputs ?? [] as socket, i}
+          <li class="socket-item">
+            <span class="flex-1 opacity-80 text-sm">{socket.name}</span>
+            <span class="text-xs opacity-45 italic">{socket.type}</span>
+            <button class="remove-btn" onclick={() => removeSocket(i)} title="Remove">×</button>
+          </li>
+        {/each}
+      </ul>
+    {/if}
+
+    <div class="flex gap-1.5 items-center">
+      <InputSelect options={COMMON_TYPES} bind:value={selectedTypeIdx} />
+      <input
+        type="text"
+        placeholder="custom type…"
+        bind:value={customType}
+        onkeydown={(e) => {
+          e.stopPropagation();
+          if (e.key === 'Enter') addSocket();
+        }}
+        class="bg-layer-2 text-text rounded-[5px] px-2 py-1 text-sm flex-1 min-w-0 outline outline-1 outline-outline"
+      />
+      <button class="add-btn" onclick={addSocket}>+ Add</button>
+    </div>
+  </div>
+
+  <div class="flex flex-col gap-1.5">
+    <span class="section-label">Maintenance</span>
+    <button class="danger-btn" onclick={prune}>Prune unused groups</button>
+  </div>
+</div>
+
+<style>
+  .section-label {
+    font-size: 0.72em;
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    opacity: 0.5;
+  }
+
+  .socket-list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 3px;
+  }
+
+  .socket-item {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    background: var(--color-layer-2);
+    border-radius: 5px;
+    padding: 4px 8px;
+    outline: 1px solid var(--color-outline);
+  }
+
+  .remove-btn {
+    background: none;
+    border: none;
+    color: var(--color-text);
+    cursor: pointer;
+    opacity: 0.4;
+    padding: 0 2px;
+    font-size: 1.1em;
+    line-height: 1;
+  }
+
+  .remove-btn:hover {
+    opacity: 1;
+  }
+
+  .add-btn {
+    background: var(--color-layer-2);
+    color: var(--color-text);
+    border: none;
+    outline: 1px solid var(--color-outline);
+    border-radius: 5px;
+    padding: 0.4em 0.7em;
+    font-size: 0.8em;
+    cursor: pointer;
+    white-space: nowrap;
+    font-family: var(--font-family);
+  }
+
+  .add-btn:hover {
+    outline-color: var(--color-selected);
+  }
+
+  .danger-btn {
+    background: var(--color-layer-2);
+    color: var(--color-text);
+    border: none;
+    outline: 1px solid var(--color-outline);
+    border-radius: 5px;
+    padding: 0.4em 0.7em;
+    font-size: 0.8em;
+    cursor: pointer;
+    font-family: var(--font-family);
+    opacity: 0.7;
+    width: 100%;
+    text-align: left;
+  }
+
+  .danger-btn:hover {
+    outline-color: #e05050;
+    opacity: 1;
+  }
+</style>

app/src/routes/+page.svelte

@@ -4,7 +4,8 @@
   import Grid from '$lib/grid';
   import { debounceAsyncFunction } from '$lib/helpers';
   import { createKeyMap } from '$lib/helpers/createKeyMap';
-  import { debugNode } from '$lib/node-registry/debugNode';
+  import { debugNode } from '$lib/node-registry/debugNode.js';
+  import { groupInputNode, groupNode, groupOutputNode } from '$lib/node-registry/groupNodes.js';
   import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
   import NodeStore from '$lib/node-store/NodeStore.svelte';
   import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
@@ -21,6 +22,7 @@
   import Changelog from '$lib/sidebar/panels/Changelog.svelte';
   import ExportSettings from '$lib/sidebar/panels/ExportSettings.svelte';
   import GraphSource from '$lib/sidebar/panels/GraphSource.svelte';
+  import GroupContextPanel from '$lib/sidebar/panels/GroupContextPanel.svelte';
   import Keymap from '$lib/sidebar/panels/Keymap.svelte';
   import { panelState } from '$lib/sidebar/PanelState.svelte';
   import Sidebar from '$lib/sidebar/Sidebar.svelte';
@@ -37,7 +39,12 @@
 
   const registryCache = new IndexDBCache('node-registry');
 
-  const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode]);
+  const nodeRegistry = new RemoteNodeRegistry('', registryCache, [
+    debugNode,
+    groupInputNode,
+    groupOutputNode,
+    groupNode
+  ]);
   const workerRuntime = new WorkerRuntimeExecutor();
   const runtimeCache = new MemoryRuntimeCache();
   const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
@@ -321,7 +328,7 @@
           hidden={!appSettings.value.debug.advancedMode}
           icon="i-[tabler--code]"
         >
-          <GraphSource graph={manager?.serialize()} />
+          <GraphSource graph={pm.graph ?? manager?.serialize()} />
         </Panel>
         <Panel
           id="benchmark"
@@ -341,7 +348,20 @@
             type={graphSettingTypes}
             bind:value={graphSettings}
           />
+          {#if activeNode?.id}
             <ActiveNodeSettings {manager} bind:node={activeNode} />
+          {/if}
+          {#if manager?.isInsideGroup}
+            <GroupContextPanel
+              {manager}
+              groupId={manager.currentGroupContext!}
+            />
+          {:else if activeNode?.type === '__virtual/group/instance'}
+            <GroupContextPanel
+              {manager}
+              groupId={activeNode?.props?.groupId as string}
+            />
+          {/if}
         </Panel>
         <Panel
           id="changelog"

docs/LLM.md

@@ -1,204 +1,312 @@
-# Nodarium — LLM Reference
+# Nodarium - LLM Documentation
 
-## What It Is
+## Overview
 
-Nodarium is a **node-based visual programming editor**. Users wire together nodes on a 2D canvas; each node is a WebAssembly module that receives typed inputs and produces typed outputs. A live Three.js viewer renders the resulting 3D geometry/paths/instances.
+Nodarium is a **WebAssembly-based visual programming language** for creating procedural 3D plants. The app features a node-based interface where users connect WASM modules to generate plant models in real-time. Currently used to develop https://nodes.max-richter.dev, a procedural modelling tool for 3D plants.
 
----
+## Architecture
 
-## Repository Layout
+### Core Components
 
-```
+#### 1. Node System (`app/static/nodes/`)
-/
-├── app/                        # SvelteKit web app
-│   └── src/
-│       ├── routes/+page.svelte # App entry point
-│       └── lib/
-│           ├── graph-interface/  # Canvas editor (UI + state)
-│           ├── runtime/          # WASM execution engine
-│           ├── node-registry/    # Fetch & cache node definitions
-│           ├── project-manager/  # IndexDB persistence
-│           ├── result-viewer/    # Three.js 3D output
-│           ├── sidebar/          # UI panels
-│           └── settings/         # App + graph settings
-├── packages/
-│   ├── types/    # Shared TypeScript types + Zod schemas
-│   ├── utils/    # Logging, hashing, WASM wrapping, perf
-│   ├── ui/       # Reusable Svelte UI components
-│   ├── planty/   # Tutorial system
-│   └── macros/   # Build-time macros
-└── docs/
-```
 
----
+WASM-based nodes that perform computations. All nodes must implement the NodeDefinition interface.
 
-## Core Architecture
+- **Node Storage**: `app/static/nodes/max/plantarium/`
+  - `box.wasm` - Box geometry node
+  - `branch.wasm` - Branch generation
+  - `float.wasm` - Float value node
+  - `gravity.wasm` - Gravity/physics node
+  - `instance.wasm` - Instance rendering
+  - `leaf.wasm` - Leaf geometry
+  - `math.wasm` - Math operations
+  - `noise.wasm` - Noise generation
+  - `output.wasm` - Output node
+  - `random.wasm` - Random value generation
+  - `rotate.wasm` - Rotation node
+  - `shape.wasm` - Shape geometry
+  - `stem.wasm` - Stem generation
+  - `triangle.wasm` - Triangle geometry
+  - `vec3.wasm` - Vector3 node
 
-```
+- **Node Registry**: `app/src/lib/node-registry.ts`
-User Interaction
+  - Loads and manages WASM nodes
-  └── GraphInterface
+  - `getNodeWasm()` - Creates WASM wrapper from bytes
-        ├── GraphState   ← UI: selection, camera, mouse, clipboard
+  - `getNode()` - Retrieves node definition
-        └── GraphManager ← Logic: nodes, edges, history, serialization
-              ├── NodeRegistry   ← fetches WASM definitions (remote API + IndexDB cache)
-              ├── HistoryManager ← undo/redo (jsondiffpatch deltas)
-              └── emit('result') → RuntimeExecutor
-                                      └── node.execute(Int32Array) per node
-                                            └── ResultViewer (Three.js/Threlte)
-```
 
-**Event flow:**
+- **Debug Node**: `app/src/lib/node-registry/debugNode.js`
-1. User edits graph → GraphManager mutates state
+  - Special debug node with wildcard inputs
-2. GraphManager emits `save` → ProjectManager persists to IndexDB
+  - Variable-height nodes and parameters
-3. GraphManager emits `result` → Runtime executes graph → Viewer updates
+  - Quick-connect shortcut
 
----
+#### 2. Graph Interface
 
-## Critical Files
+Visual node editor built with Svelte 5.
 
-| File | Role |
+- **Main Wrapper**: `app/src/lib/graph-interface/graph/Wrapper.svelte`
-|------|------|
+  - Entry point for graph interface
-| `app/src/routes/+page.svelte` | Wires all systems; creates GraphManager, runtime, registry |
+  - Manages GraphManager and GraphState
-| `app/src/lib/graph-interface/graph-manager.svelte.ts` | Central graph logic: createNode, createEdge, serialize, load, history |
-| `app/src/lib/graph-interface/graph-state.svelte.ts` | UI state: camera, selection, mouse, clipboard, groupSelectedNodes |
-| `app/src/lib/graph-interface/graph/Graph.svelte` | Canvas renderer |
-| `app/src/lib/graph-interface/node/Node.svelte` | 3D mesh node (Three.js shader) |
-| `app/src/lib/graph-interface/node/NodeHTML.svelte` | HTML overlay: labels + parameters |
-| `app/src/lib/graph-interface/node/NodeHeader.svelte` | Node title bar |
-| `app/src/lib/graph-interface/keymaps.ts` | Keyboard shortcuts |
-| `app/src/lib/graph-interface/helpers/nodeHelpers.ts` | Node height calculations |
-| `app/src/lib/graph-interface/graph/colors.svelte.ts` | Socket type → color mapping |
-| `app/src/lib/runtime/runtime-executor.ts` | Executes nodes in DAG order; expandGroups() |
-| `app/src/lib/node-registry/index.ts` | RemoteNodeRegistry entry |
-| `app/src/lib/node-registry/groupNode.ts` | Built-in group node definition |
-| `app/src/lib/node-registry/debugNode.ts` | Built-in debug node |
-| `app/src/lib/sidebar/panels/ActiveNodeSettings.svelte` | Per-node settings panel |
-| `packages/types/src/types.ts` | Graph, NodeInstance, NodeDefinition, Edge, GroupDefinition |
-| `packages/types/src/inputs.ts` | NodeInput union types (float, vec3, geometry, path, …) |
-| `packages/utils/src/wasm.ts` | createWasmWrapper() — wraps WASM bytes into a NodeDefinition |
 
----
+- **GraphManager**: `app/src/lib/graph-interface/graph-manager.svelte.ts`
+  - Core entity managing the node graph
+  - Handles node connections and execution flow
 
-## Key Types
+- **GraphState**: `app/src/lib/graph-interface/graph-state.svelte.ts`
+  - Tracks UI state (selection, snapping, help, active nodes)
+
+- **Graph Components**:
+  - `app/src/lib/graph-interface/graph/` - Graph rendering
+  - `app/src/lib/graph-interface/node/` - Node rendering
+  - `app/src/lib/graph-interface/edges/` - Edge rendering
+  - `app/src/lib/graph-interface/components/` - UI components (AddMenu, Socket, etc.)
+  - `app/src/lib/graph-interface/debug/` - Debug overlays
+  - `app/src/lib/graph-interface/background/` - Grid/dots backgrounds
+
+- **Helpers**:
+  - `app/src/lib/helpers/` - Utility functions
+  - `app/src/lib/helpers/createKeyMap.ts` - Keyboard shortcuts
+
+#### 3. Runtime Execution
+
+Performs graph execution via WASM nodes.
+
+- **Runtime Executors** (`app/src/lib/runtime/`):
+  - **MemoryRuntime**: Direct WASM execution in main thread
+  - **WorkerRuntime**: WebWorker-based execution for performance
+  - Both implement the RuntimeExecutor interface
+
+- **Runtime Cache**: `app/src/lib/runtime/cache.ts`
+  - Memory-based caching for graph execution
+
+- **Execution Flow**:
+  1. Graph serialized from graph interface
+  2. Runtime executes nodes in topological order
+  3. Results passed through connected edges
+  4. Final mesh output rendered
+
+#### 4. 3D Viewer (`app/src/lib/result-viewer/`)
+
+Three.js-based rendering for 3D output.
+
+- **Viewer**: `app/src/lib/result-viewer/Viewer.svelte`
+  - Renders generated 3D meshes
+  - Uses @threlte/core (Svelte-Three.js wrapper)
+
+#### 5. Application Structure (`app/src/routes/`)
+
+SvelteKit application routing.
+
+- **Main Page**: `app/src/routes/+page.svelte`
+  - Combines GraphInterface + 3D Viewer
+  - Manages runtime selection (memory vs worker)
+  - Handles settings and performance tracking
+
+- **Layout**: `app/src/routes/+layout.svelte`
+  - Application shell
+
+- **Server**: `app/src/routes/+layout.server.ts`
+  - Loads git metadata and changelog
+
+#### 6. Settings System (`app/src/lib/settings/`)
+
+Application and graph settings.
+
+- **App Settings**: `app/src/lib/settings/app-settings.svelte.ts`
+  - Debug mode, themes, node interface options
+
+- **NestedSettings**: `app/src/lib/settings/NestedSettings.svelte`
+  - Recursive settings UI component
+
+#### 7. Sidebar Panels (`app/src/lib/sidebar/`)
+
+- `app/src/lib/sidebar/Sidebar.svelte` - Main sidebar
+- `app/src/lib/sidebar/panels/` - Individual panels:
+  - `ActiveNodeSettings.svelte` - Selected node properties
+  - `BenchmarkPanel.svelte` - Performance benchmarking
+  - `Changelog.svelte` - Version history
+  - `ExportSettings.svelte` - Export options
+  - `GraphSource.svelte` - Graph JSON view
+  - `Keymap.svelte` - Keyboard shortcuts
+
+#### 8. Project Management (`app/src/lib/project-manager/`)
+
+- `app/src/lib/project-manager/project-manager.svelte` - Project save/load
+- Uses IndexedDB for persistence
+
+#### 9. Node Store (`app/src/lib/node-store/`)
+
+- `app/src/lib/node-store/NodeStore.svelte`
+- Remote node registry management
+- IndexDBCache for offline storage
+
+#### 10. Graph Templates (`app/src/lib/graph-templates/`)
+
+Pre-built graph templates for testing:
+
+- Grid, Tree, LottaFaces, LottaNodes, LottaNodesAndFaces
+
+## Key Types (`app/src/lib/types.ts`)
 
 ```typescript
-// packages/types/src/types.ts
+interface NodeDefinition {
-
+  id: string;
-type NodeId = `${string}/${string}/${string}` // e.g. "max/plantarium/stem"
+  name: string;
-
+  inputs: Socket[];
-type NodeInstance = {
+  outputs: Socket[];
-  id: number
+  parameters: Parameter[];
-  type: NodeId
+  execute: (inputs: any[], parameters: any[]) => any[];
-  position: [number, number]
-  props?: Record<string, number | number[]>  // current parameter values
-  meta?: { title?: string; lastModified?: string }
-  state: NodeRuntimeState   // runtime-only, NOT serialized
 }
 
-type NodeRuntimeState = {
+interface Socket {
-  type?: NodeDefinition     // resolved definition
+  id: string;
-  parents?: NodeInstance[]
+  name: string;
-  children?: NodeInstance[]
+  type: string; // datatype (e.g., "number", "vec3", "*")
-  x?: number; y?: number    // interpolated position
+  defaultValue?: any;
-  mesh?: Mesh               // Three.js mesh reference
+  optional?: boolean;
-  ref?: HTMLElement
 }
 
-type NodeDefinition = {
+interface Parameter {
-  id: NodeId
+  id: string;
-  inputs?: Record<string, NodeInput>
+  name: string;
-  outputs?: string[]                      // output type names
+  type: string;
-  meta?: { title?: string; description?: string }
+  defaultValue: any;
-  execute(input: Int32Array): Int32Array  // WASM function
+  min?: number;
+  max?: number;
+  options?: string[];
 }
 
-// Edge: [fromNode, outputIndex, toNode, inputSocketName]
+interface Graph {
-type Edge = [NodeInstance, number, NodeInstance, string]
+  nodes: NodeInstance[];
-
+  edges: Edge[];
-type Graph = {
-  nodes: NodeInstance[]
-  edges: [number, number, number, string][]  // serialized (IDs, not refs)
-  settings: Record<string, unknown>
-  groups: GroupDefinition[]
 }
 
-type GroupDefinition = {
+interface NodeInstance {
-  id: number
+  id: number;
-  nodes: NodeInstance[]
+  nodeId: string;
-  edges: Edge[]
+  position: { x: number; y: number };
-  inputs?: Record<string, NodeInput>
+  parameters: Record<string, any>;
-  outputs?: string[]
+}
+
+interface Edge {
+  id: number;
+  fromNode: number;
+  fromSocket: string;
+  toNode: number;
+  toSocket: string;
 }
 ```
 
-### NodeInput socket types
+## Development Workflow
-`float` | `integer` | `boolean` | `select` | `seed` | `vec3` | `geometry` | `path` | `shape` | `color` | `*` (wildcard)
 
-Each input can have: `value` (default), `label`, `hidden`, `external`, `setting` (link to graph setting), `accepts` (extra compatible types).
+### Prerequisites
 
----
+- Node.js
+- pnpm
+- Rust
+- wasm-pack
 
-## Patterns & Conventions
+### Build Commands
-
-### Svelte 5 reactivity
-The codebase uses Svelte 5 runes throughout — `$state`, `$derived`, `$effect`. Collections use `SvelteMap<K,V>` and `SvelteSet<T>` (from `svelte/reactivity`) instead of plain Map/Set so that mutations trigger reactive updates.
-
-### Context API
-`GraphManager` and `GraphState` are provided via Svelte context (`setContext` / `getContext`) inside `GraphInterface`. All child components (Node, Edge, etc.) consume them via context rather than props.
-
-### Edge representation
-In memory, edges are `[NodeInstance, outputIndex, NodeInstance, inputSocketName]` — direct object references for fast traversal. On serialization (`Graph.edges`), they become `[nodeId, outputIndex, nodeId, inputSocketName]` (plain IDs).
-
-### Socket compatibility
-```typescript
-areSocketsCompatible(outputType: string, inputType: string | string[]): boolean
-// '*' wildcard matches any type; 'geometry' accepts ['geometry', 'instances']
-```
-
-### WASM execution interface
-Every node exposes a single function: `execute(input: Int32Array): Int32Array`.
-Data encoding (Plantarium):
-- `[0, stemDepth, ...x,y,z,thickness]` — path
-- `[1, vertexCount, faceCount, ...faces, ...vertices, ...normals]` — geometry
-- `[2, vertexCount, faceCount, instanceCount, stemDepth, ...]` — instances
-
-### Event emitter
-`GraphManager extends EventEmitter<{ save, result, settings }>`. Subscribe with `manager.on('result', cb)`. Used to decouple the editor UI from runtime execution and persistence.
-
-### History
-Every mutation goes through `HistoryManager`. Call `this.history.save(this.serialize())` before mutations; undo/redo replays jsondiffpatch deltas.
-
-### Internal node IDs
-Built-in nodes use the `__internal/` namespace: `__internal/group/instance`, `__internal/node/debug`. Virtual boundary nodes use `__virtual/`: `__virtual/group/input`, `__virtual/group/output`.
-
----
-
-## In-Progress: Node Groups (`feat/group-node-own`)
-
-Group selected nodes with **Ctrl+G**. A `GroupDefinition` is stored in `Graph.groups[]`; a group instance node (`__internal/group/instance`) referencing it by `props.groupId` replaces the selected nodes.
-
-**Known gaps as of 2026-05-03:**
-
-| Issue | Location |
-|-------|----------|
-| `createGroupNode()` called but not defined | `graph-state.svelte.ts:334` → missing in `graph-manager.svelte.ts` |
-| Runtime expects `group.graph.nodes/edges`; schema has flat `nodes/edges` | `runtime-executor.ts` vs `types.ts` |
-| Runtime expects `group.inputs` as array; schema defines it as `Record<string, NodeInput>` | Same mismatch |
-| `enterGroupNode()` is a stub — no group navigation | `graph-state.svelte.ts` |
-| `serialize()` writes parent-graph edges into group instead of group-internal edges | `graph-manager.svelte.ts` |
-
----
-
-## Dev Commands
-
-Run from `app/`:
 
 ```bash
-npm run dev          # start dev server (Vite)
+# Install dependencies
-npm run build        # production build
+pnpm i
-npm run check        # svelte-check + tsc
+
-npm run lint         # eslint
+# Build WASM nodes
-npm run test         # unit (vitest) + e2e (playwright)
+pnpm build:nodes
-npm run test:unit    # vitest only
+
-npm run test:e2e     # playwright only
+# Start development server
-npm run bench        # benchmark runner
+cd app && pnpm dev
+
+# Run tests
+cd app && pnpm test
+
+# Lint and typecheck
+cd app && pnpm lint
+cd app && pnpm check
+
+# Format code
+cd app && pnpm format
 ```
+
+### Creating New Nodes
+
+See `docs/DEVELOPING_NODES.md` for detailed instructions on creating custom WASM nodes.
+
+## Features
+
+### Current Features
+
+- Visual node-based programming with real-time 3D preview
+- WebAssembly nodes for high-performance computation
+- Debug node with wildcard inputs and runtime integration
+- Color-coded node sockets and edges (indicating data types)
+- Variable-height nodes and parameters
+- Edge dragging with valid socket highlighting
+- InputNumber snapping to predefined values (Alt+click)
+- Project save/load with IndexedDB
+- Performance monitoring and benchmarking
+- Changelog viewer
+- Advanced mode settings
+
+### UI Components
+
+- **InputNumber**: Numeric input with arrow controls
+- **InputColor**: Color picker
+- **InputShape**: Shape selector with preview
+- **InputSelect**: Dropdown with options
+
+## File Structure
+
+```
+nodarium/
+├── app/
+│   ├── src/
+│   │   ├── lib/
+│   │   │   ├── config.ts
+│   │   │   ├── graph-interface/    # Node editor
+│   │   │   ├── graph-manager.svelte.ts
+│   │   │   ├── graph-state.svelte.ts
+│   │   │   ├── graph-templates/   # Test templates
+│   │   │   ├── grid/
+│   │   │   ├── helpers/
+│   │   │   ├── node-registry.ts
+│   │   │   ├── node-registry/     # Node loading
+│   │   │   ├── node-store/
+│   │   │   ├── performance/
+│   │   │   ├── project-manager/
+│   │   │   ├── result-viewer/       # 3D viewer
+│   │   │   ├── runtime/           # Execution
+│   │   │   ├── settings/         # App settings
+│   │   │   ├── sidebar/
+│   │   │   └── types.ts
+│   │   └── routes/
+│   │       ├── +page.svelte
+│   │       └── +layout.svelte
+│   ├── static/
+│   │   └── nodes/
+│   │       └── max/
+│   │           └── plantarium/    # WASM nodes
+│   └── package.json
+├── docs/
+│   ├── ARCHITECTURE.md
+│   ├── DEVELOPING_NODES.md
+│   ├── NODE_DEFINITION.md
+│   └── PLANTARIUM.md
+├── nodes/                        # WASM node source (Rust)
+└── package.json
+```
+
+## Release Process
+
+1. Create annotated tag:
+   ```bash
+   git tag -a v1.0.0 -m "Release notes"
+   git push origin v1.0.0
+   ```
+
+2. CI workflow:
+   - Runs lint, format check, type check
+   - Builds project
+   - Updates package.json versions
+   - Generates CHANGELOG.md
+   - Creates Gitea release

package.json

@@ -6,8 +6,7 @@
     "qa": "pnpm lint && pnpm check && pnpm test",
     "format": "pnpm dprint fmt",
     "format:check": "pnpm dprint check",
-    "test:e2e": "pnpm run -r --parallel test:e2e",
+    "test": "pnpm run -r --parallel test",
-    "test:unit": "pnpm run -r --parallel test:unit",
     "check": "pnpm run -r --parallel check",
     "build": "pnpm build:nodes && pnpm build:app",
     "build:app": "BASE_PATH=/ui pnpm -r --filter 'ui' build && pnpm -r --filter 'app'... build",

packages/types/src/index.ts

@@ -4,12 +4,13 @@ export type {
   Box,
   Edge,
   Graph,
-  GroupDefinition,
+  GroupSocket,
   NodeDefinition,
+  NodeGroupDefinition,
   NodeId,
   NodeInstance,
   SerializedNode,
   Socket
 } from './types';
-export { GraphSchema, GroupSchema, NodeSchema } from './types';
+export { GraphSchema, NodeSchema } from './types';
 export { NodeDefinitionSchema } from './types';

packages/types/src/inputs.ts

@@ -61,7 +61,10 @@ export const NodeInputBooleanSchema = z.object({
 export const NodeInputSelectSchema = z.object({
   ...DefaultOptionsSchema.shape,
   type: z.literal('select'),
-  options: z.array(z.string()).optional(),
+  options: z.union([
+    z.array(z.string()),
+    z.array(z.object({ label: z.string(), value: z.string() }))
+  ]).optional(),
   value: z.string().optional()
 });
 

packages/types/src/types.ts

@@ -51,7 +51,7 @@ export const NodeSchema = z.object({
   id: z.number(),
   type: NodeIdSchema,
   props: z
-    .record(z.string(), z.union([z.number(), z.array(z.number())]))
+    .record(z.string(), z.union([z.number(), z.array(z.number()), z.string()]))
     .optional(),
   meta: z
     .object({
@@ -76,18 +76,32 @@ export type Socket = {
 
 export type Edge = [NodeInstance, number, NodeInstance, string];
 
-export const GroupSchema = z.object({
+export type GroupSocket = {
-  id: z.number(),
+  name: string;
-  nodes: z.array(NodeSchema),
+  type: string;
-  edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
+};
-  inputs: z.record(z.string(), NodeInputSchema).optional(),
-  outputs: z.array(z.object({
-    type: z.string(),
-    label: z.string().optional()
-  })).optional()
-});
 
-export type GroupDefinition = z.infer<typeof GroupSchema>;
+export type NodeGroupDefinition = {
+  id: string;
+  name: string;
+  inputs: GroupSocket[];
+  outputs: GroupSocket[];
+  graph: {
+    nodes: SerializedNode[];
+    edges: [number, number, number, string][];
+  };
+};
+
+const NodeGroupDefinitionSchema: z.ZodType<NodeGroupDefinition> = z.object({
+  id: z.string(),
+  name: z.string(),
+  inputs: z.array(z.object({ name: z.string(), type: z.string() })),
+  outputs: z.array(z.object({ name: z.string(), type: z.string() })),
+  graph: z.object({
+    nodes: z.array(NodeSchema),
+    edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()]))
+  })
+});
 
 export const GraphSchema = z.object({
   id: z.number(),
@@ -100,7 +114,7 @@ export const GraphSchema = z.object({
   settings: z.record(z.string(), z.any()).optional(),
   nodes: z.array(NodeSchema),
   edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
-  groups: z.array(GroupSchema)
+  groups: z.record(z.string(), NodeGroupDefinitionSchema).optional()
 });
 
 export type Graph = z.infer<typeof GraphSchema>;

packages/ui/src/lib/Input.svelte

@@ -40,7 +40,7 @@
 {:else if input.type === 'boolean'}
   <InputCheckbox bind:value={value as boolean} {id} />
 {:else if input.type === 'select'}
-  <InputSelect bind:value={value as number} options={input.options} {id} />
+  <InputSelect bind:value={value as number | string} options={input.options} {id} />
 {:else if input.type === 'vec3'}
   <InputVec3 bind:value={value as [number, number, number]} {id} />
 {/if}

packages/ui/src/lib/JsonViewer.svelte

@@ -1,137 +0,0 @@
-<script module>
-  const cache = new Map<string, Record<string, boolean>>();
-
-  function getStore(root: string): Record<string, boolean> {
-    if (!cache.has(root)) {
-      try {
-        const raw = localStorage.getItem(`json_viewer:${root}`);
-        cache.set(root, raw ? JSON.parse(raw) : {});
-      } catch {
-        cache.set(root, {});
-      }
-    }
-    return cache.get(root)!;
-  }
-
-  function readOpen(path: string, fallback: boolean): boolean {
-    const root = path.split('/')[0];
-    const store = getStore(root);
-    return path in store ? store[path] : fallback;
-  }
-
-  function writeOpen(path: string, value: boolean) {
-    const root = path.split('/')[0];
-    const store = getStore(root);
-    store[path] = value;
-    try {
-      localStorage.setItem(`json_viewer:${root}`, JSON.stringify(store));
-    } catch { /* quota exceeded etc */ }
-  }
-</script>
-
-<script lang="ts">
-  import { browser } from '$app/environment';
-  import JsonViewer from './JsonViewer.svelte';
-
-  let {
-    value,
-    key,
-    depth = 0,
-    path = ''
-  }: { value: unknown; key?: string; depth?: number; path?: string } = $props();
-
-  const defaultOpen = $derived(depth < 4);
-  let open = $derived(browser && path ? readOpen(path, defaultOpen) : defaultOpen);
-  let flashing = $state(false);
-
-  const isArr = $derived(Array.isArray(value));
-  const isExpandable = $derived(value !== null && typeof value === 'object');
-  const open_bracket = $derived(isArr ? '[' : '{');
-  const close_bracket = $derived(isArr ? ']' : '}');
-  const items = $derived.by(() => {
-    if (isArr) {
-      return (value as unknown[]).map((v, i) => [String(i), v] as [string, unknown]);
-    }
-    if (value !== null && typeof value === 'object') {
-      return Object.entries(value as Record<string, unknown>).filter(
-        ([, v]) => v !== undefined
-      );
-    }
-    return [] as [string, unknown][];
-  });
-  const showKeys = $derived(!isArr || typeof items[0]?.[1] === "object")
-
-  function toggle(next: boolean) {
-    open = next;
-    if (browser && path) writeOpen(path, next);
-  }
-
-  let prevJson = '';
-  let flashTimeout: ReturnType<typeof setTimeout> | null = null;
-
-  $effect(() => {
-    const json = JSON.stringify(value);
-    if (prevJson && json !== prevJson) {
-      if (flashTimeout) clearTimeout(flashTimeout);
-      flashing = true;
-      flashTimeout = setTimeout(() => {
-        flashing = false;
-        flashTimeout = null;
-      }, 500);
-    }
-    prevJson = json;
-  });
-</script>
-
-<span
-  class="font-mono text-xs leading-[1.6] rounded transition-[background-color] duration-500"
-  class:bg-layer-3={flashing}
->
-  {#if key !== undefined}
-    <span class="text-text">{key}</span><span class="text-text/40">: </span>
-  {/if}
-
-  {#if isExpandable}
-    {#if items.length === 0}
-      <span class="text-text/50">{open_bracket}{close_bracket}</span>
-    {:else if open}
-      {#if depth > 0}
-        <button class="w-3 text-text/50 hover:text-text" onclick={() => toggle(false)}>
-          ▼
-        </button>
-      {/if}
-      <span class="text-text/50">{open_bracket}</span>
-      <div class="pl-4 border-l border-outline">
-        {#each items as [k, v], i (k)}
-          <div>
-            <JsonViewer
-              value={v}
-              key={showKeys ? k : undefined }
-              depth={depth + 1}
-              path={path ? `${path}/${k}` : k}
-            />{#if i < items.length - 1}<span class="text-text/20">,</span>{/if}
-          </div>
-        {/each}
-      </div>
-      <span class="text-text/50">{close_bracket}</span>
-    {:else}
-      <button
-        class="inline text-text/50 hover:text-text"
-        onclick={() => toggle(true)}
-      >
-        <span class="w-3 inline-block">▶</span>
-        {open_bracket}<span class="text-text/40 mx-1">{items.length}</span>{close_bracket}
-      </button>
-    {/if}
-  {:else if value === null}
-    <span class="text-emerald-500!">null</span>
-  {:else if typeof value === 'boolean'}
-    <span class="text-blue-500!">{value}</span>
-  {:else if typeof value === 'number'}
-    <span class="text-orange-400!">{value}</span>
-  {:else if typeof value === 'string'}
-    <span class="text-emerald-500!">"{value}"</span>
-  {:else}
-    <span class="text-text/70">{String(value)}</span>
-  {/if}
-</span>

packages/ui/src/lib/index.ts

@@ -7,7 +7,6 @@ export { default as InputShape } from './inputs/InputShape.svelte';
 export { default as InputVec3 } from './inputs/InputVec3.svelte';
 
 export { default as Details } from './Details.svelte';
-export { default as JsonViewer } from './JsonViewer.svelte';
 export { default as ShortCut } from './ShortCut.svelte';
 
 import Input from './Input.svelte';

packages/ui/src/lib/inputs/InputSelect.svelte

@@ -1,17 +1,28 @@
 <script lang="ts">
+  type StringOption = string;
+  type LabeledOption = { label: string; value: string };
+
   interface Props {
-    options?: string[];
+    options?: StringOption[] | LabeledOption[];
-    value?: number;
+    value?: number | string;
     id?: string;
   }
 
-  let { options = [], value = $bindable(0), id = '' }: Props = $props();
+  let { options = [], value = $bindable<number | string>(0), id = '' }: Props = $props();
+
+  const isLabeled = $derived(options.length > 0 && typeof options[0] === 'object');
 </script>
 
 <select {id} bind:value class="bg-layer-2 text-text">
-  {#each options as label, i (label)}
+  {#if isLabeled}
-    <option value={i}>{label}</option>
+    {#each options as opt ((opt as LabeledOption).value)}
+      <option value={(opt as LabeledOption).value}>{(opt as LabeledOption).label}</option>
     {/each}
+  {:else}
+    {#each options as label, i (label)}
+      <option value={i}>{label as string}</option>
+    {/each}
+  {/if}
 </select>
 
 <style>

packages/ui/src/routes/+page.svelte

@@ -8,7 +8,6 @@
     InputSelect,
     InputShape,
     InputVec3,
-    JsonViewer,
     ShortCut
   } from '$lib';
   import Section from './Section.svelte';
@@ -26,32 +25,6 @@
   let colorValue = $state<[number, number, number]>([59, 130, 246]);
   let mirrorShape = $state(true);
   let detailsOpen = $state(false);
-  let jsonValue = $state({
-    id: 1,
-    nodes: [{ id: 0, type: 'max/test/node', position: [0, 0] }, {
-      id: 1,
-      type: 'max/test/other',
-      position: [100, 50]
-    }],
-    edges: [[0, 0, 1, 'input']],
-    groups: [],
-    settings: { seed: 42, enabled: true }
-  });
-
-  function randomlyUpdateJson() {
-    const rand = Math.floor(Math.random() * 5);
-    if (rand === 0) {
-      jsonValue.nodes[0].position[0] += 1;
-    } else if (rand === 1) {
-      jsonValue.nodes[0].position[1] += 1;
-    } else if (rand === 2) {
-      jsonValue.settings.seed += 1;
-    } else if (rand === 3) {
-      jsonValue.settings.enabled = !jsonValue.settings.enabled;
-    } else if (rand === 4) {
-      jsonValue.id += Math.floor(Math.random() * 10 - 5);
-    }
-  }
 
   let points = $state([]);
   let theme = $state('dark');
@@ -83,7 +56,6 @@
   </Section>
 
   <Section title="Select" value={d}>
-    <i>Select with simple values</i>
     <InputSelect bind:value={selectValue} {options} />
   </Section>
 
@@ -114,23 +86,6 @@
     </Details>
   </Section>
 
-  <Section title="JsonViewer">
-    {#snippet header()}
-      <button
-        onclick={() => randomlyUpdateJson()}
-        class="-mt-1 bg-layer-2 p-1 px-2 rounded-sm cursor-pointer"
-      >
-        update
-      </button>
-    {/snippet}
-    <div class="w-64 bg-layer-1 p-2 rounded">
-      <JsonViewer
-        value={jsonValue}
-        path="demo"
-      />
-    </div>
-  </Section>
-
   <Section title="Shortcut">
     <div class="flex gap-4">
       <ShortCut ctrl key="S" />

pnpm-lock.yaml

@@ -4,6 +4,12 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+catalogs:
+  default:
+    chokidar-cli:
+      specifier: github:open-cli-tools/chokidar-cli#semver:v4.0.0
+      version: 4.0.0
+
 importers:
 
   .: