fix: make eslint/typescript happy

feat: update some nodes a bit
feat(noise): add preserveLength toggle
2026-05-08 10:32:03 +02:00 · 2026-05-08 01:49:29 +02:00 · 2026-05-08 01:18:44 +02:00 · 2026-05-08 01:18:38 +02:00 · 2026-05-07 23:43:44 +02:00 · 2026-05-07 23:43:17 +02:00
118 changed files with 7006 additions and 3413 deletions
@@ -0,0 +1,28 @@
+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
@@ -12,9 +12,9 @@ env:
  CARGO_TARGET_DIR: target

 jobs:
-  release:
+  benchmark:
    runs-on: ubuntu-latest
-    container: git.max-richter.dev/max/nodarium-ci:bce06da456e3c008851ac006033cfff256015a47
+    container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69

    steps:
      - name: 📑 Checkout Code
@@ -23,37 +23,45 @@ jobs:
          fetch-depth: 0
          token: ${{ secrets.GITEA_TOKEN }}

-      - name: 💾 Setup pnpm Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.PNPM_CACHE_FOLDER }}
-          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-
+      - name: 🔧 Setup
+        uses: ./.gitea/actions/setup

-      - 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
+      - name: 🛠️ Build Nodes
        run: pnpm build:nodes

      - name: 🏃 Execute Runtime
        run: pnpm run --filter @nodarium/app bench

-      - name: 📤 Upload Benchmark Results
-        uses: actions/upload-artifact@v3
-        with:
-          name: benchmark-data
-          path: app/benchmark/out/
-          compression: 9
+      - name: 🔑 Setup SSH key
+        run: |
+          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
+        env:
+          BENCH_REPO: "git@git.max-richter.dev:max/nodarium-benchmarks.git"
+        run: |
+          git config --global user.name "nodarium-bot"
+          git config --global user.email "nodarium-bot@max-richter.dev"
+
+          git clone git@git.max-richter.dev:max/nodarium-benchmarks.git target_bench_repo
+
+          BRANCH="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
+          SAFE_PR_NAME=$(printf "%s" "$BRANCH" | tr '/' '-')
+          DEST_DIR="target_bench_repo/data/$SAFE_PR_NAME/$(date +%s)"
+          mkdir -p "$DEST_DIR"
+
+          cp app/benchmark/out/*.json "$DEST_DIR/"
+
+          cd target_bench_repo
+          git add .
+          git commit -m "Update benchmarks for $SAFE_PR_NAME: ${{ gitea.sha }}"
+          git push origin main
@@ -13,9 +13,9 @@ env:
  CARGO_TARGET_DIR: target

 jobs:
-  release:
+  quality:
    runs-on: ubuntu-latest
-    container: git.max-richter.dev/max/nodarium-ci:bce06da456e3c008851ac006033cfff256015a47
+    container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69

    steps:
      - name: 📑 Checkout Code
@@ -24,27 +24,8 @@ jobs:
          fetch-depth: 0
          token: ${{ secrets.GITEA_TOKEN }}

-      - name: 💾 Setup pnpm Cache
-        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: 🔧 Setup
+        uses: ./.gitea/actions/setup

      - name: 🧹 Quality Control
        run: |
@@ -52,7 +33,61 @@ 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: 🏗️ Build Web Assets
+        run: pnpm build
+
+      - 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'
@@ -1,3 +1,134 @@
+# v0.0.6 (2026-05-05)
+
+## Features
+
+- Upgrade graph source panel and JSON viewer with click-to-copy and improved select handling.
+- Capture system stats in benchmark runs.
+- Split CI into unit and end-to-end pipelines.
+- Add `LLM.md` documentation.
+- Add 🍀 Planty Tutorial Helper
+- Add a way to group nodes
+
+## Node Groups
+
+Node Groups introduce a way to structure graphs into nested, navigable subgraphs for better organization and reuse.
+
+- Nested graph workflows with full runtime support
+- Group input and output nodes defining clear boundaries
+- Named groups for organization and identification
+- Breadcrumb navigation for navigating nested levels
+- Context-aware UI when editing inside groups
+- Reliable enter/exit transitions with state restoration
+- Ability to ungroup nodes back into the main graph
+
+## Planty
+
+Planty is a Clippy-inspired in-app tutorial and guidance system that helps users understand and use the graph editor through contextual assistance.
+
+- Context-aware hints based on user actions in the graph
+- Step-by-step onboarding flows for core features
+- Inline guidance tied to nodes, sockets, and interactions
+- Lightweight runtime integration without external build requirements
+
+## Fixes
+
+- Fix benchmark execution and CI integration issues
+- Resolve debug node ID mismatch
+- Fix ESLint, TypeScript, Playwright, and test synchronization issues
+- Fix packaging issues in `@nodarium/planty` and UI library
+- Restore correct graph references after exiting node groups
+
+## Refactors
+
+- Remove graph element handling from `graphManager`
+- Restrict panel rendering to selected nodes only
+- Move JSON viewer into shared UI package
+- Clean up CI workflows
+
+## Chores
+
+- Upgrade dependencies via `pnpm upgrade`
+- Add SvelteKit sync before E2E tests
+- Remove flaky screenshot artifacts
+- General formatting, linting, and test maintenance
+
+---
+
+- [82c2f08](https://git.max-richter.dev/max/nodarium/commit/82c2f08a5653ccd596c6982a1d9efa4b20a0b624) chore: cleanup changelog
+- [a00db40](https://git.max-richter.dev/max/nodarium/commit/a00db400bba909db5da499e8484d6ed5541c4ad7) fix: dont crash when no groups exist
+- [2d9eb0c](https://git.max-richter.dev/max/nodarium/commit/2d9eb0c0879611c2355e52100b150dd39b924684) fix: make planty work
+- [954f572](https://git.max-richter.dev/max/nodarium/commit/954f5726c305508329856b6707a41b77f297c4bf) Merge pull request 'feat: initial node groups' (#44) from feat/group-node-own into main
+- [63d5b80](https://git.max-richter.dev/max/nodarium/commit/63d5b8079d785b4fe1e689611cd38e5dd4d3ecb6) chore: pnpm format
+- [3e32ca4](https://git.max-richter.dev/max/nodarium/commit/3e32ca419a1b914cbe64d98d887a89f4f5abb0e2) feat: ungroup nodes
+- [f0cb12a](https://git.max-richter.dev/max/nodarium/commit/f0cb12a088609f5bd56096f7c1f244af0a1f91d8) chore: fix some type issues
+- [1d60090](https://git.max-richter.dev/max/nodarium/commit/1d60090ffe1a93af4c0df6f36741957ac13b1a73) chore: fixup graph manager tests
+- [5b55056](https://git.max-richter.dev/max/nodarium/commit/5b55056fc12271b87393cf9ef3b61cdf518a9857) chore: remove graph element in graphManager
+- [e2c2b1a](https://git.max-richter.dev/max/nodarium/commit/e2c2b1a4d73e0953ddd0125cabe83649b58c8996) chore: remove e2e test screenshots (too flaky)
+- [7f082ad](https://git.max-richter.dev/max/nodarium/commit/7f082ad8f6f144b92947000b91ceddce3c52704b) feat: implement node sockets ui
+- [ed11195](https://git.max-richter.dev/max/nodarium/commit/ed1119532750d47a1395ced92fe310a6aa5e070e) chore: refactor graphStack to be simpler
+- [8ad62cf](https://git.max-richter.dev/max/nodarium/commit/8ad62cfc8e8c60e4e72fdaa3d8caca75a7472da6) feat: add node group breadcrumbs
+- [bff140a](https://git.max-richter.dev/max/nodarium/commit/bff140a764ff0b6ed2c6e42814a088ca9e2ef1ee) feat: show different ui when inside group
+- [85e2fd1](https://git.max-richter.dev/max/nodarium/commit/85e2fd1a7126aab4a544eea3d185cfc63754cb73) fix: use correct id for debug node
+- [5beb031](https://git.max-richter.dev/max/nodarium/commit/5beb03196d46434f617442cc55d721c7d3eebe33) fix: broken format command for @nodarium/planty
+- [83e0e47](https://git.max-richter.dev/max/nodarium/commit/83e0e47082ed0d9fbd60e67a6d6c9ed65a9f4f24) refactor: only show group/node panel when selected
+- [106797d](https://git.max-richter.dev/max/nodarium/commit/106797de32f0d57059c481770e734b555900421d) feat: make group input/output node work
+- [1a56ba9](https://git.max-richter.dev/max/nodarium/commit/1a56ba986d761be545c2cf0236f9c374222da6b1) damn dude
+- [703f531](https://git.max-richter.dev/max/nodarium/commit/703f531cd370c2d440a696a68413ea6d5f54019f) chore: make eslint and playwright happy
+- [0ed22f2](https://git.max-richter.dev/max/nodarium/commit/0ed22f20b913837b8e90d45aa1a4ada1a90a9313) chore: pnpm upgrade
+- [733b0a2](https://git.max-richter.dev/max/nodarium/commit/733b0a2ceb3be6fac1eda5bbf856a4bd1f724e36) chore: sync sveltekit app before e2e
+- [8f60816](https://git.max-richter.dev/max/nodarium/commit/8f60816c7841c845120e71590e1c4672d218703e) chore: sync sveltekit app before e2e
+- [cd7b51d](https://git.max-richter.dev/max/nodarium/commit/cd7b51d86a1243e0714d9be73588db56c844086c) chore: sync sveltekit app before e2e
+- [6c9cd15](https://git.max-richter.dev/max/nodarium/commit/6c9cd1505d72c1c0600910f56ee158d07b7e4811) chore: sync sveltekit app before e2e
+- [db5ee8b](https://git.max-richter.dev/max/nodarium/commit/db5ee8ba29812e6865706966ff690ef335ff5e4f) fix: make eslint happy
+- [a6b9ca4](https://git.max-richter.dev/max/nodarium/commit/a6b9ca43155b5e9357570705b6f45ba4fc3490a8) feat: capture system stats in benchmark
+- [d4910ab](https://git.max-richter.dev/max/nodarium/commit/d4910aba8c5408fb9321b1a22d4c35eae8142309) chore: pnpm format
+- [e695c76](https://git.max-richter.dev/max/nodarium/commit/e695c7649015b88d8ca6662bfee5dc0329dd89ac) chore: make eslint happy
+- [2a54fa7](https://git.max-richter.dev/max/nodarium/commit/2a54fa7590c1834904a45fb0fc1fd0aa371f0120) feat: add name to groups
+- [6d5cac6](https://git.max-richter.dev/max/nodarium/commit/6d5cac65e8acf013ac0a4a61baf3bbc423252d53) feat(ui): click-to-copy on node values in jsonviewer
+- [3ee074b](https://git.max-richter.dev/max/nodarium/commit/3ee074b11c9bc216ce7221f5611c8177cef9b313) feat(ui): make inputselect also handle value+label options
+- [59a1e63](https://git.max-richter.dev/max/nodarium/commit/59a1e63396635d05543fa4636de5800ce4899a2a) feat: add unit tests for graph state
+- [317d155](https://git.max-richter.dev/max/nodarium/commit/317d1552cea5a234ab1ab87684be9a3724b1976f) fix: graph correctly restore html refs after exiting node group
+- [78439b1](https://git.max-richter.dev/max/nodarium/commit/78439b19e96e6dbdfb31cc794f5b6e1ff005e26e) fix: make benchmark work
+- [ef217b1](https://git.max-richter.dev/max/nodarium/commit/ef217b1c409c25d6054515e1f705831ddbf5a24b) feat: some updates
+- [7499b80](https://git.max-richter.dev/max/nodarium/commit/7499b80789e99b87df54d6891597fac7edb56b0f) fix: make the runtime work with groups
+- [a5b663f](https://git.max-richter.dev/max/nodarium/commit/a5b663f6fc5e67d5ef67b128c22cdc7363232de5) feat(ci): split e2e and unit tests
+- [0550670](https://git.max-richter.dev/max/nodarium/commit/05506704bf68dfd289a1c5130d5d86ddd98954b1) feat: let claude fix ci
+- [63188e5](https://git.max-richter.dev/max/nodarium/commit/63188e57fd2cf055161508ee88cbef0cd941e662) feat: let claude fix ci
+- [4572d30](https://git.max-richter.dev/max/nodarium/commit/4572d30005d3538f357d4e9f1fb637c1a6559fb1) feat: let claude refactor ci
+- [ccc376d](https://git.max-richter.dev/max/nodarium/commit/ccc376d158f209b85a62d98919ac716e46e3e253) feat: store total vertices/faces in benchmarkl
+- [7e432e9](https://git.max-richter.dev/max/nodarium/commit/7e432e9033f7fdc73c21bb363cf502c1d8085407) chore: update ci workflow
+- [01f5837](https://git.max-richter.dev/max/nodarium/commit/01f58377c21048f95c839504a3e8c46c27ba12ae) feat: make more node group features work
+- [6ef5dc2](https://git.max-richter.dev/max/nodarium/commit/6ef5dc28ed9a4874a7b5fb2a9dca73efd1632519) chore: move jsonviewer into ui package
+- [3450d70](https://git.max-richter.dev/max/nodarium/commit/3450d7004781ea58f61d563967441a251c817a9b) docs: add LLM.md
+- [731b9e9](https://git.max-richter.dev/max/nodarium/commit/731b9e9b1e52598e11044874a46976e517a1150c) feat: upgrade graph source panel
+- [72f07d0](https://git.max-richter.dev/max/nodarium/commit/72f07d0a501fa715c40cf0e7c17527ef3f98e96b) feat: initial node groups
+- [a56e8f4](https://git.max-richter.dev/max/nodarium/commit/a56e8f445edb6064ae7a7b3b783fb7445f1b4e69) feat(ci): install openssh client
+- [1257274](https://git.max-richter.dev/max/nodarium/commit/12572742eb3ba1641cc744a18d330e88df50e9d0) fix(planty): remove debug span
+- [7aa9979](https://git.max-richter.dev/max/nodarium/commit/7aa9979e355fcf90342e8b5f1d233b879bb6c71f) chore: update e2e tests
+- [fc35a68](https://git.max-richter.dev/max/nodarium/commit/fc35a68826885ac7e9c624b39a5c0fe7d1cb83f0) fix: dont package ui library
+- [aba6f03](https://git.max-richter.dev/max/nodarium/commit/aba6f03bcce3e4363f0f22337d0000083bfff9a9) fix: dont package ui library
+- [2d6fd00](https://git.max-richter.dev/max/nodarium/commit/2d6fd00fd1ba31bfa943b6d3a4a628bd5132f668) fix: dont package ui library
+- [d231946](https://git.max-richter.dev/max/nodarium/commit/d231946e50975dfa1b41696cefbbc2f742480ea8) fix: remove unused imports
+- [e2f4a24](https://git.max-richter.dev/max/nodarium/commit/e2f4a24f759b917d3c7c1ca0b8347312785a03e5) fix(planty): make sure config is completely static
+- [58d39cd](https://git.max-richter.dev/max/nodarium/commit/58d39cd101298e6a41922d18466899f7bf4a0f97) feat: improve planty ux
+- [7ebb129](https://git.max-richter.dev/max/nodarium/commit/7ebb1297ac75987b3348dd81a57e0d25ed0a7405) feat(app): make zoom in nicer
+- [23f65a1](https://git.max-richter.dev/max/nodarium/commit/23f65a1c63650faba2051a2c87f7625378b4b0c6) fix: remove unused header div
+- [acdc582](https://git.max-richter.dev/max/nodarium/commit/acdc582e957df149ab723d268ac2e205595db199) feat: use ui and planty without build
+- [7a3e9eb](https://git.max-richter.dev/max/nodarium/commit/7a3e9eb893182e46e72e203df1eb7532a4652ddd) chore: update test screenshot
+- [be82312](https://git.max-richter.dev/max/nodarium/commit/be82312ea049b21e5ff859163e54ba6da88328a0) chore: update test screenshot
+- [84f67e9](https://git.max-richter.dev/max/nodarium/commit/84f67e9c33a1141d7e0c3332375576cd0898a47a) fix: update planty types
+- [491e345](https://git.max-richter.dev/max/nodarium/commit/491e345c2ff1893916848380e8941fa77dff44ec) feat: build planty in post install
+- [ba501b2](https://git.max-richter.dev/max/nodarium/commit/ba501b211db1d70930fa461e1fd82abb5b639c00) fix: correct tsconfig for planty
+- [7d76b9e](https://git.max-richter.dev/max/nodarium/commit/7d76b9e1f77ab934289bb18df6197bfd58ce3eeb) fix: mark planty as type:module
+- [5d4e2e9](https://git.max-richter.dev/max/nodarium/commit/5d4e2e928093cac39192960d9de21a0e1710904e) fix: make formatter happy
+- [4de15b1](https://git.max-richter.dev/max/nodarium/commit/4de15b19c8bdb35e53ba0d3e3e459cdbb12aee9d) feat: wire up planty with nodarium/app
+- [168e6fc](https://git.max-richter.dev/max/nodarium/commit/168e6fcc19dc55383b0b21d2b3ebab733058fb94) feat: update some node default settings
+- [c0eb75d](https://git.max-richter.dev/max/nodarium/commit/c0eb75d53c4251d041744b19a37c44d0d4a1728c) feat: new planty package
+- [2ec9bfc](https://git.max-richter.dev/max/nodarium/commit/2ec9bfc3c96a97aaf29557c70f76b7bf08156e15) feat(ci): compress benchmark data
+- [c975206](https://git.max-richter.dev/max/nodarium/commit/c97520617a0d48a765544feebf2d510400db8fb8) fix(ci): use older upload-artifact action
+- [6475790](https://git.max-richter.dev/max/nodarium/commit/64757901766efb7ccbd3693ebc63ba1367fe6d88) fix(ci): build nodes before benchmarking
+- [580ec73](https://git.max-richter.dev/max/nodarium/commit/580ec7346599e5d538ff53f31808ff770b4a8095) ci: run benchmark in ci
+
 # v0.0.5 (2026-02-13)

 ## Features
@@ -66,6 +66,7 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 name = "leaf"
 version = "0.1.0"
 dependencies = [
+ "glam",
 "nodarium_macros",
 "nodarium_utils",
 ]
@@ -117,6 +118,7 @@ dependencies = [
 name = "noise"
 version = "0.1.0"
 dependencies = [
+ "glam",
 "nodarium_macros",
 "nodarium_utils",
 "noise 0.9.0",
@@ -5,6 +5,7 @@ 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 \
@@ -1,54 +1,204 @@
 import type { Graph, Graph as GraphType, NodeId } from '@nodarium/types';
-import { createLogger, createPerformanceStore } from '@nodarium/utils';
+import { createLogger, createPerformanceStore, splitNestedArray } from '@nodarium/utils';
+
 import { mkdir, writeFile } from 'node:fs/promises';
+import { freemem, loadavg, totalmem } from 'node:os';
 import { resolve } from 'node:path';
+
 import { MemoryRuntimeExecutor } from '../src/lib/runtime/runtime-executor.ts';
 import { BenchmarkRegistry } from './benchmarkRegistry.ts';
+
+import {
+  getMachineInfo,
+  measureCpuUsage,
+  readCgroupCpuStat,
+  readCpuSnapshot,
+  readProcMemInfo,
+  SystemSample
+} from './systemStats.ts';
 import defaultPlantTemplate from './templates/default.json' assert { type: 'json' };
 import lottaFacesTemplate from './templates/lotta-faces.json' assert { type: 'json' };
 import plantTemplate from './templates/plant.json' assert { type: 'json' };

 const registry = new BenchmarkRegistry();
 const r = new MemoryRuntimeExecutor(registry);
-const perfStore = createPerformanceStore();

 const log = createLogger('bench');

 const templates: Record<string, Graph> = {
-  'plant': plantTemplate as unknown as GraphType,
+  plant: plantTemplate as unknown as GraphType,
  'lotta-faces': lottaFacesTemplate as unknown as GraphType,
-  'default': defaultPlantTemplate as unknown as GraphType
+  default: defaultPlantTemplate as unknown as GraphType
 };

+function average(values: number[]) {
+  if (values.length === 0) return 0;
+  return values.reduce((a, b) => a + b, 0) / values.length;
+}
+
+function countGeometry(result: Int32Array): {
+  totalVertices: number;
+  totalFaces: number;
+} {
+  const parts = splitNestedArray(result);
+
+  let totalVertices = 0;
+  let totalFaces = 0;
+
+  for (const part of parts) {
+    const type = part[0];
+
+    const vertexCount = part[1] >>> 0;
+    const faceCount = part[2] >>> 0;
+
+    if (type === 2) {
+      const instanceCount = part[3] >>> 0;
+
+      totalVertices += vertexCount * instanceCount;
+      totalFaces += faceCount * instanceCount;
+    } else {
+      totalVertices += vertexCount;
+      totalFaces += faceCount;
+    }
+  }
+
+  return {
+    totalVertices,
+    totalFaces
+  };
+}
+
 async function run(g: GraphType, amount: number) {
-  await registry.load(plantTemplate.nodes.map(n => n.type) as NodeId[]);
+  await registry.load(g.nodes.map(n => n.type) as NodeId[]);
+
  log.log('loaded ' + g.nodes.length + ' nodes');

  log.log('warming up');

-  // Warm up the runtime? maybe this does something?
  for (let index = 0; index < 10; index++) {
    await r.execute(g, { randomSeed: true });
  }

+  const systemSamples: SystemSample[] = [];
+
+  let previousCpuSnapshot = await readCpuSnapshot();
+
+  const sampler = setInterval(async () => {
+    try {
+      const cpu = await measureCpuUsage(previousCpuSnapshot);
+
+      previousCpuSnapshot = cpu.snapshot;
+
+      const [l1, l5, l15] = loadavg();
+
+      systemSamples.push({
+        timestamp: Date.now(),
+
+        cpuUsagePercent: cpu.usagePercent,
+        cpuStealPercent: cpu.stealPercent,
+
+        load1: l1,
+        load5: l5,
+        load15: l15,
+
+        freeMemory: freemem(),
+        totalMemory: totalmem()
+      });
+    } catch (err) {
+      console.error(err);
+    }
+  }, 1000);
+
  log.log('executing');
+
+  const perfStore = createPerformanceStore();
+
  r.perf = perfStore;
+
+  let res: Int32Array | undefined;
+
+  const cgroupBefore = await readCgroupCpuStat();
+
  for (let i = 0; i < amount; i++) {
    r.perf?.startRun();
-    await r.execute(g, { randomSeed: true });
+
+    res = await r.execute(g, { randomSeed: true });
+
    r.perf?.stopRun();
+
+    const { totalVertices, totalFaces } = countGeometry(res!);
+
+    r.perf?.addToLastRun('total-vertices', totalVertices);
+    r.perf?.addToLastRun('total-faces', totalFaces);
  }
+
+  const cgroupAfter = await readCgroupCpuStat();
+
+  clearInterval(sampler);
+
  log.log('finished');
-  return r.perf.get();
+
+  return {
+    data: r.perf.get(),
+    metadata: {
+      timestamp: new Date().toISOString(),
+
+      machine: getMachineInfo(),
+
+      process: {
+        pid: process.pid,
+        uptime: process.uptime(),
+
+        memoryUsage: process.memoryUsage()
+      },
+
+      system: {
+        averages: {
+          cpuUsagePercent: average(
+            systemSamples.map(s => s.cpuUsagePercent)
+          ),
+
+          cpuStealPercent: average(
+            systemSamples.map(s => s.cpuStealPercent)
+          ),
+
+          load1: average(systemSamples.map(s => s.load1)),
+          load5: average(systemSamples.map(s => s.load5)),
+          load15: average(systemSamples.map(s => s.load15)),
+
+          freeMemory: average(
+            systemSamples.map(s => s.freeMemory)
+          )
+        },
+
+        samples: systemSamples,
+
+        meminfo: await readProcMemInfo()
+      },
+
+      cgroup: {
+        before: cgroupBefore,
+        after: cgroupAfter
+      }
+    }
+  };
 }

 async function main() {
  const outPath = resolve('benchmark/out/');
+
  await mkdir(outPath, { recursive: true });
+
  for (const key in templates) {
    log.log('executing ' + key);
+
    const perfData = await run(templates[key], 100);
-    await writeFile(resolve(outPath, key + '.json'), JSON.stringify(perfData));
+
+    await writeFile(
+      resolve(outPath, key + '.json'),
+      JSON.stringify(perfData, null, 2)
+    );
+
    await new Promise(res => setTimeout(res, 200));
  }
 }
@@ -0,0 +1,129 @@
+import { readFile } from 'node:fs/promises';
+import { cpus, totalmem } from 'node:os';
+
+export type CpuSnapshot = {
+  idle: number;
+  total: number;
+  steal: number;
+};
+
+export type SystemSample = {
+  timestamp: number;
+  cpuUsagePercent: number;
+  cpuStealPercent: number;
+  load1: number;
+  load5: number;
+  load15: number;
+  freeMemory: number;
+  totalMemory: number;
+};
+
+export async function readCpuSnapshot(): Promise<CpuSnapshot> {
+  const stat = await readFile('/proc/stat', 'utf8');
+  const line = stat.split('\n')[0];
+
+  const parts: number[] = line
+    .trim()
+    .split(/\s+/)
+    .slice(1)
+    .map((v: unknown) => Number(v));
+
+  const idle = parts[3];
+  const iowait = parts[4];
+  const steal = parts[7];
+
+  return {
+    idle: idle + iowait,
+    total: parts.reduce((a, b) => a + b, 0),
+    steal: steal ?? 0
+  };
+}
+
+export async function measureCpuUsage(
+  previous: CpuSnapshot
+): Promise<{
+  snapshot: CpuSnapshot;
+  usagePercent: number;
+  stealPercent: number;
+}> {
+  const current = await readCpuSnapshot();
+
+  const idle = current.idle - previous.idle;
+  const total = current.total - previous.total;
+  const steal = current.steal - previous.steal;
+
+  return {
+    snapshot: current,
+    usagePercent: total === 0 ? 0 : 100 * (1 - idle / total),
+    stealPercent: total === 0 ? 0 : 100 * (steal / total)
+  };
+}
+
+export async function readCgroupCpuStat() {
+  const possiblePaths = [
+    '/sys/fs/cgroup/cpu.stat',
+    '/sys/fs/cgroup/cpu/cpu.stat'
+  ];
+
+  for (const path of possiblePaths) {
+    try {
+      const txt: string = await readFile(path, 'utf8');
+
+      return Object.fromEntries(
+        txt
+          .trim()
+          .split('\n')
+          .map(line => {
+            const [k, v] = line.trim().split(/\s+/);
+            return [k, Number(v)];
+          })
+      );
+    } catch {
+      // continue
+    }
+  }
+
+  return null;
+}
+
+export async function readProcMemInfo() {
+  try {
+    const txt = await readFile('/proc/meminfo', 'utf8');
+
+    const result: Record<string, number> = {};
+
+    for (const line of txt.split('\n')) {
+      const match = line.match(/^(\w+):\s+(\d+)/);
+
+      if (!match) continue;
+
+      result[match[1]] = Number(match[2]);
+    }
+
+    return result;
+  } catch {
+    return null;
+  }
+}
+
+export function getMachineInfo() {
+  const cpuInfo = cpus();
+
+  return {
+    platform: process.platform,
+    arch: process.arch,
+    nodeVersion: process.version,
+
+    cpuModel: cpuInfo[0]?.model ?? 'unknown',
+    cpuCount: cpuInfo.length,
+
+    totalMemory: totalmem(),
+
+    ci: {
+      githubActions: process.env.GITHUB_ACTIONS ?? false,
+      runnerName: process.env.RUNNER_NAME ?? null,
+      runnerOs: process.env.RUNNER_OS ?? null,
+      runnerArch: process.env.RUNNER_ARCH ?? null
+    }
+  };
+}
@@ -8,9 +8,6 @@ test('test', async ({ page }) => {

  await page.goto('http://localhost:4173', { waitUntil: 'load' });

-  // await expect(page).toHaveScreenshot();
-  await expect(page.locator('.graph-wrapper')).toHaveScreenshot();
-
  await page.getByRole('button', { name: 'projects' }).click();
  await page.getByRole('button', { name: 'New', exact: true }).click();
  await page.getByRole('combobox').selectOption('2');
@@ -23,9 +20,9 @@ test('test', async ({ page }) => {
      id: '10',
      type: 'max/plantarium/stem',
      props: {
-        amount: 50,
+        amount: 4,
        length: 4,
-        thickness: 1
+        thickness: 0.2
      }
    },
    {
@@ -1,13 +1,13 @@
 {
  "name": "@nodarium/app",
  "private": true,
-  "version": "0.0.5",
+  "version": "0.0.6",
  "type": "module",
  "scripts": {
    "dev": "vite dev",
    "predev": "rm static/CHANGELOG.md && ln -s ../../CHANGELOG.md static/CHANGELOG.md",
    "build": "svelte-kit sync && vite build",
-    "test:unit": "vitest",
+    "test:unit": "vitest --browser=false",
    "test": "npm run test:unit -- --run && npm run test:e2e",
    "test:e2e": "playwright test",
    "preview": "vite preview",
@@ -18,49 +18,49 @@
    "bench": "tsx ./benchmark/index.ts"
  },
  "dependencies": {
+    "@nodarium/planty": "workspace:*",
    "@nodarium/ui": "workspace:*",
    "@nodarium/utils": "workspace:*",
-    "@nodarium/planty": "workspace:*",
-    "@sveltejs/kit": "^2.50.2",
-    "@tailwindcss/vite": "^4.1.18",
-    "@threlte/core": "8.3.1",
-    "@threlte/extras": "9.7.1",
+    "@sveltejs/kit": "^2.59.0",
+    "@tailwindcss/vite": "^4.2.4",
+    "@threlte/core": "8.5.11",
+    "@threlte/extras": "9.15.1",
    "comlink": "^4.4.2",
    "file-saver": "^2.0.5",
    "idb": "^8.0.3",
    "jsondiffpatch": "^0.7.3",
    "micromark": "^4.0.2",
-    "tailwindcss": "^4.1.18",
-    "three": "^0.182.0"
+    "tailwindcss": "^4.2.4",
+    "three": "^0.184.0"
  },
  "devDependencies": {
-    "@eslint/compat": "^2.0.2",
-    "@eslint/js": "^9.39.2",
-    "@iconify-json/tabler": "^1.2.26",
-    "@iconify/tailwind4": "^1.2.1",
+    "@eslint/compat": "^2.0.5",
+    "@eslint/js": "^10.0.1",
+    "@iconify-json/tabler": "^1.2.33",
+    "@iconify/tailwind4": "^1.2.3",
    "@nodarium/types": "workspace:^",
-    "@playwright/test": "^1.58.1",
+    "@playwright/test": "^1.59.1",
    "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/vite-plugin-svelte": "^6.2.4",
-    "@tsconfig/svelte": "^5.0.7",
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
+    "@tsconfig/svelte": "^5.0.8",
    "@types/file-saver": "^2.0.7",
-    "@types/three": "^0.182.0",
-    "@vitest/browser-playwright": "^4.0.18",
-    "dprint": "^0.51.1",
-    "eslint": "^9.39.2",
-    "eslint-plugin-svelte": "^3.14.0",
-    "globals": "^17.3.0",
-    "svelte": "^5.49.2",
-    "svelte-check": "^4.3.6",
+    "@types/three": "^0.184.0",
+    "@vitest/browser-playwright": "^4.1.5",
+    "dprint": "^0.54.0",
+    "eslint": "^10.3.0",
+    "eslint-plugin-svelte": "^3.17.1",
+    "globals": "^17.6.0",
+    "svelte": "^5.55.5",
+    "svelte-check": "^4.4.7",
    "tslib": "^2.8.1",
    "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0",
-    "vite": "^7.3.1",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.1",
+    "vite": "^8.0.10",
    "vite-plugin-comlink": "^5.3.0",
-    "vite-plugin-glsl": "^1.5.5",
-    "vite-plugin-wasm": "^3.5.0",
-    "vitest": "^4.0.18",
-    "vitest-browser-svelte": "^2.0.2"
+    "vite-plugin-glsl": "^1.6.0",
+    "vite-plugin-wasm": "^3.6.0",
+    "vitest": "^4.1.5",
+    "vitest-browser-svelte": "^2.1.1"
  }
 }
@@ -3,6 +3,7 @@
  <head>
    <meta charset="utf-8" />
    <link rel="icon" href="%sveltekit.assets%/favicon.svg" />
+    <meta name="color-scheme" content="light dark">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    %sveltekit.head%
    <title>Nodes</title>
@@ -1,10 +1,12 @@
 <script lang="ts">
  import { appSettings } from '$lib/settings/app-settings.svelte';
-  import { T } from '@threlte/core';
+  import { T, useThrelte } from '@threlte/core';
  import { colors } from '../graph/colors.svelte';
  import BackgroundFrag from './Background.frag';
  import BackgroundVert from './Background.vert';

+  const { invalidate } = useThrelte();
+
  type Props = {
    minZoom?: number;
    maxZoom?: number;
@@ -33,9 +35,16 @@

  let bw = $derived(width / cameraPosition[2]);
  let bh = $derived(height / cameraPosition[2]);
+
+  $effect(() => {
+    if (appSettings.value.theme) {
+      setTimeout(() => invalidate(), 10);
+    }
+  });
 </script>

 <T.Group
+  visible={!appSettings.value.theme.includes('contrast')}
  position.x={cameraPosition[0]}
  position.z={cameraPosition[1]}
  position.y={-1.0}
@@ -183,8 +183,10 @@
            activeNodeId = node.id;
          }}
        >
-          {node.id.split('/').at(-1)}
+          {node.meta?.title ?? node.id.split('/').at(-1)}
        </div>
+      {:else}
+        <div class="no-results">No results for "{value}"</div>
      {/each}
    </div>
  </div>
@@ -241,4 +243,11 @@
    background: var(--color-layer-2);
    opacity: 1;
  }
+
+  .no-results {
+    padding: 1em 0.9em;
+    font-size: 0.85em;
+    opacity: 0.45;
+    font-style: italic;
+  }
 </style>
@@ -0,0 +1,68 @@
+<script lang="ts">
+  import { Button } from '@nodarium/ui';
+  import { getGraphManager } from '../graph-state.svelte';
+  const graph = getGraphManager();
+
+  function getGroupName(groupId: number) {
+    const group = graph.getGroup(groupId);
+    return group?.name || `Group#${groupId}`;
+  }
+
+  function exitToGroup(targetId?: number) {
+    while (graph.currentGroupId !== (targetId ?? null)) {
+      graph.exitGroup();
+    }
+  }
+
+  // Intermediate groups: parent stack entries that are groups (not the root graph).
+  const intermediateGroups = $derived(
+    graph.parentStack.filter(e => e.id !== graph.id)
+  );
+</script>
+
+<div class="shadow" class:is-inside-group={graph.isInsideGroup}></div>
+
+{#if graph.isInsideGroup}
+  <div class="group-name flex gap-1 items-center">
+    <Button variant="ghost" size="sm" onclick={() => exitToGroup()}>Root</Button>
+
+    {#each intermediateGroups as entry (entry.id)}
+      <span class="i-[tabler--arrow-right]"></span>
+      <Button variant="ghost" size="sm" onclick={() => exitToGroup(entry.id)}>
+        {getGroupName(entry.id)}
+      </Button>
+    {/each}
+
+    <span class="i-[tabler--arrow-right]"></span>
+    <Button variant="ghost" size="sm" class="opacity-100!">
+      {getGroupName(graph.currentGroupId!)}
+    </Button>
+  </div>
+{/if}
+
+<style>
+  .shadow {
+    position: absolute;
+    top: -5px;
+    left: -5px;
+    right: calc(var(--padding-right) - 5px);
+    bottom: -5px;
+    z-index: 1;
+    transition: box-shadow 0.3s ease;
+    box-shadow: 0 0 0px 0px var(--color-layer-2) inset;
+    pointer-events: none;
+  }
+
+  .shadow.is-inside-group  {
+    box-shadow: 0 0 0px 8px var(--color-layer-2) inset;
+  }
+
+  .group-name {
+    position: absolute;
+    left: calc(50% - var(--padding-right) / 2);
+    transition: left 0.3s ease;
+    top: 12px;
+    transform: translateX(-50%);
+    z-index: 1000;
+  }
+</style>
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest';
+import { assert, describe, expect, it } from 'vitest';
 import { GraphManager } from './graph-manager.svelte';
 import {
  createMockNodeRegistry,
@@ -9,257 +9,399 @@ import {
  mockVec3OutputNode
 } from './test-utils';

-describe('GraphManager', () => {
-  describe('getPossibleSockets', () => {
-    describe('when dragging an output socket', () => {
-      it('should return compatible input sockets based on type', () => {
-        const registry = createMockNodeRegistry([
-          mockFloatOutputNode,
-          mockFloatInputNode,
-          mockGeometryOutputNode,
-          mockPathInputNode
-        ]);
+describe('groupNodes', () => {
+  it('should not do anything if no nodes are selected', () => {
+    const registry = createMockNodeRegistry([
+      mockFloatOutputNode,
+      mockFloatInputNode,
+      mockGeometryOutputNode,
+      mockPathInputNode
+    ]);

-        const manager = new GraphManager(registry);
+    const manager = new GraphManager(registry);

-        const floatInputNode = manager.createNode({
-          type: 'test/node/input',
-          position: [100, 100],
-          props: {}
-        });
+    const floatInputNode = manager.createNode({
+      type: 'test/node/input',
+      position: [100, 100],
+      props: {}
+    });

-        const floatOutputNode = manager.createNode({
-          type: 'test/node/output',
-          position: [0, 0],
-          props: {}
-        });
+    assert.isDefined(floatInputNode);

-        expect(floatInputNode).toBeDefined();
-        expect(floatOutputNode).toBeDefined();
+    const floatOutputNode = manager.createNode({
+      type: 'test/node/output',
+      position: [0, 0],
+      props: {}
+    });
+    assert.isDefined(floatOutputNode);

-        const possibleSockets = manager.getPossibleSockets({
-          node: floatOutputNode!,
-          index: 0,
-          position: [0, 0]
-        });
+    const edge = manager.createEdge(floatInputNode, 0, floatOutputNode, 'input');
+    assert.isDefined(edge);
+    manager.save();

-        expect(possibleSockets.length).toBe(1);
-        const socketNodeIds = possibleSockets.map(([node]) => node.id);
-        expect(socketNodeIds).toContain(floatInputNode!.id);
+    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([
+        mockFloatOutputNode,
+        mockFloatInputNode,
+        mockGeometryOutputNode,
+        mockPathInputNode
+      ]);
+
+      const manager = new GraphManager(registry);
+
+      const floatInputNode = manager.createNode({
+        type: 'test/node/input',
+        position: [100, 100],
+        props: {}
      });

-      it('should exclude self node from possible sockets', () => {
-        const registry = createMockNodeRegistry([
-          mockFloatOutputNode,
-          mockFloatInputNode
-        ]);
-
-        const manager = new GraphManager(registry);
-
-        const floatInputNode = manager.createNode({
-          type: 'test/node/input',
-          position: [100, 100],
-          props: {}
-        });
-
-        expect(floatInputNode).toBeDefined();
-
-        const possibleSockets = manager.getPossibleSockets({
-          node: floatInputNode!,
-          index: 'value',
-          position: [0, 0]
-        });
-
-        const socketNodeIds = possibleSockets.map(([node]) => node.id);
-        expect(socketNodeIds).not.toContain(floatInputNode!.id);
+      const floatOutputNode = manager.createNode({
+        type: 'test/node/output',
+        position: [0, 0],
+        props: {}
      });

-      it('should exclude parent nodes from possible sockets when dragging output', () => {
-        const registry = createMockNodeRegistry([
-          mockFloatOutputNode,
-          mockFloatInputNode
-        ]);
+      expect(floatInputNode).toBeDefined();
+      expect(floatOutputNode).toBeDefined();

-        const manager = new GraphManager(registry);
-
-        const parentNode = manager.createNode({
-          type: 'test/node/output',
-          position: [0, 0],
-          props: {}
-        });
-
-        const childNode = manager.createNode({
-          type: 'test/node/input',
-          position: [100, 100],
-          props: {}
-        });
-
-        expect(parentNode).toBeDefined();
-        expect(childNode).toBeDefined();
-
-        if (parentNode && childNode) {
-          manager.createEdge(parentNode, 0, childNode, 'value');
-        }
-
-        const possibleSockets = manager.getPossibleSockets({
-          node: parentNode!,
-          index: 0,
-          position: [0, 0]
-        });
-
-        const socketNodeIds = possibleSockets.map(([node]) => node.id);
-        expect(socketNodeIds).not.toContain(childNode!.id);
+      const possibleSockets = manager.getPossibleSockets({
+        node: floatOutputNode!,
+        index: 0,
+        position: [0, 0]
      });

-      it('should return sockets compatible with accepts property', () => {
-        const registry = createMockNodeRegistry([
-          mockGeometryOutputNode,
-          mockPathInputNode
-        ]);
+      expect(possibleSockets.length).toBe(1);
+      const socketNodeIds = possibleSockets.map(([node]) => node.id);
+      expect(socketNodeIds).toContain(floatInputNode!.id);
+    });

-        const manager = new GraphManager(registry);
+    it('should exclude self node from possible sockets', () => {
+      const registry = createMockNodeRegistry([
+        mockFloatOutputNode,
+        mockFloatInputNode
+      ]);

-        const geometryOutputNode = manager.createNode({
-          type: 'test/node/geometry',
-          position: [0, 0],
-          props: {}
-        });
+      const manager = new GraphManager(registry);

-        const pathInputNode = manager.createNode({
-          type: 'test/node/path',
-          position: [100, 100],
-          props: {}
-        });
-
-        expect(geometryOutputNode).toBeDefined();
-        expect(pathInputNode).toBeDefined();
-
-        const possibleSockets = manager.getPossibleSockets({
-          node: geometryOutputNode!,
-          index: 0,
-          position: [0, 0]
-        });
-
-        const socketNodeIds = possibleSockets.map(([node]) => node.id);
-        expect(socketNodeIds).toContain(pathInputNode!.id);
+      const floatInputNode = manager.createNode({
+        type: 'test/node/input',
+        position: [100, 100],
+        props: {}
      });

-      it('should return empty array when no compatible sockets exist', () => {
-        const registry = createMockNodeRegistry([
-          mockVec3OutputNode,
-          mockFloatInputNode
-        ]);
+      expect(floatInputNode).toBeDefined();

-        const manager = new GraphManager(registry);
-
-        const vec3OutputNode = manager.createNode({
-          type: 'test/node/vec3',
-          position: [0, 0],
-          props: {}
-        });
-
-        const floatInputNode = manager.createNode({
-          type: 'test/node/input',
-          position: [100, 100],
-          props: {}
-        });
-
-        expect(vec3OutputNode).toBeDefined();
-        expect(floatInputNode).toBeDefined();
-
-        const possibleSockets = manager.getPossibleSockets({
-          node: vec3OutputNode!,
-          index: 0,
-          position: [0, 0]
-        });
-
-        const socketNodeIds = possibleSockets.map(([node]) => node.id);
-        expect(socketNodeIds).not.toContain(floatInputNode!.id);
-        expect(possibleSockets.length).toBe(0);
+      const possibleSockets = manager.getPossibleSockets({
+        node: floatInputNode!,
+        index: 'value',
+        position: [0, 0]
      });

-      it('should return socket info with correct socket key for inputs', () => {
-        const registry = createMockNodeRegistry([
-          mockFloatOutputNode,
-          mockFloatInputNode
-        ]);
+      const socketNodeIds = possibleSockets.map(([node]) => node.id);
+      expect(socketNodeIds).not.toContain(floatInputNode!.id);
+    });

-        const manager = new GraphManager(registry);
+    it('should exclude parent nodes from possible sockets when dragging output', () => {
+      const registry = createMockNodeRegistry([
+        mockFloatOutputNode,
+        mockFloatInputNode
+      ]);

-        const floatOutputNode = manager.createNode({
-          type: 'test/node/output',
-          position: [0, 0],
-          props: {}
-        });
+      const manager = new GraphManager(registry);

-        const floatInputNode = manager.createNode({
-          type: 'test/node/input',
-          position: [100, 100],
-          props: {}
-        });
-
-        expect(floatOutputNode).toBeDefined();
-        expect(floatInputNode).toBeDefined();
-
-        const possibleSockets = manager.getPossibleSockets({
-          node: floatOutputNode!,
-          index: 0,
-          position: [0, 0]
-        });
-
-        const matchingSocket = possibleSockets.find(([node]) => node.id === floatInputNode!.id);
-        expect(matchingSocket).toBeDefined();
-        expect(matchingSocket![1]).toBe('value');
+      const parentNode = manager.createNode({
+        type: 'test/node/output',
+        position: [0, 0],
+        props: {}
      });

-      it('should return multiple compatible sockets', () => {
-        const registry = createMockNodeRegistry([
-          mockFloatOutputNode,
-          mockFloatInputNode,
-          mockGeometryOutputNode,
-          mockPathInputNode
-        ]);
-
-        const manager = new GraphManager(registry);
-
-        const floatOutputNode = manager.createNode({
-          type: 'test/node/output',
-          position: [0, 0],
-          props: {}
-        });
-
-        const geometryOutputNode = manager.createNode({
-          type: 'test/node/geometry',
-          position: [200, 0],
-          props: {}
-        });
-
-        const floatInputNode = manager.createNode({
-          type: 'test/node/input',
-          position: [100, 100],
-          props: {}
-        });
-
-        const pathInputNode = manager.createNode({
-          type: 'test/node/path',
-          position: [300, 100],
-          props: {}
-        });
-
-        expect(floatOutputNode).toBeDefined();
-        expect(geometryOutputNode).toBeDefined();
-        expect(floatInputNode).toBeDefined();
-        expect(pathInputNode).toBeDefined();
-
-        const possibleSocketsForFloat = manager.getPossibleSockets({
-          node: floatOutputNode!,
-          index: 0,
-          position: [0, 0]
-        });
-
-        expect(possibleSocketsForFloat.length).toBe(1);
-        expect(possibleSocketsForFloat.map(([n]) => n.id)).toContain(floatInputNode!.id);
+      const childNode = manager.createNode({
+        type: 'test/node/input',
+        position: [100, 100],
+        props: {}
      });
+
+      expect(parentNode).toBeDefined();
+      expect(childNode).toBeDefined();
+
+      if (parentNode && childNode) {
+        manager.createEdge(parentNode, 0, childNode, 'value');
+      }
+
+      const possibleSockets = manager.getPossibleSockets({
+        node: parentNode!,
+        index: 0,
+        position: [0, 0]
+      });
+
+      const socketNodeIds = possibleSockets.map(([node]) => node.id);
+      expect(socketNodeIds).not.toContain(childNode!.id);
+    });
+
+    it('should return sockets compatible with accepts property', () => {
+      const registry = createMockNodeRegistry([
+        mockGeometryOutputNode,
+        mockPathInputNode
+      ]);
+
+      const manager = new GraphManager(registry);
+
+      const geometryOutputNode = manager.createNode({
+        type: 'test/node/geometry',
+        position: [0, 0],
+        props: {}
+      });
+
+      const pathInputNode = manager.createNode({
+        type: 'test/node/path',
+        position: [100, 100],
+        props: {}
+      });
+
+      expect(geometryOutputNode).toBeDefined();
+      expect(pathInputNode).toBeDefined();
+
+      const possibleSockets = manager.getPossibleSockets({
+        node: geometryOutputNode!,
+        index: 0,
+        position: [0, 0]
+      });
+
+      const socketNodeIds = possibleSockets.map(([node]) => node.id);
+      expect(socketNodeIds).toContain(pathInputNode!.id);
+    });
+
+    it('should return empty array when no compatible sockets exist', () => {
+      const registry = createMockNodeRegistry([
+        mockVec3OutputNode,
+        mockFloatInputNode
+      ]);
+
+      const manager = new GraphManager(registry);
+
+      const vec3OutputNode = manager.createNode({
+        type: 'test/node/vec3',
+        position: [0, 0],
+        props: {}
+      });
+
+      const floatInputNode = manager.createNode({
+        type: 'test/node/input',
+        position: [100, 100],
+        props: {}
+      });
+
+      expect(vec3OutputNode).toBeDefined();
+      expect(floatInputNode).toBeDefined();
+
+      const possibleSockets = manager.getPossibleSockets({
+        node: vec3OutputNode!,
+        index: 0,
+        position: [0, 0]
+      });
+
+      const socketNodeIds = possibleSockets.map(([node]) => node.id);
+      expect(socketNodeIds).not.toContain(floatInputNode!.id);
+      expect(possibleSockets.length).toBe(0);
+    });
+
+    it('should return socket info with correct socket key for inputs', () => {
+      const registry = createMockNodeRegistry([
+        mockFloatOutputNode,
+        mockFloatInputNode
+      ]);
+
+      const manager = new GraphManager(registry);
+
+      const floatOutputNode = manager.createNode({
+        type: 'test/node/output',
+        position: [0, 0],
+        props: {}
+      });
+
+      const floatInputNode = manager.createNode({
+        type: 'test/node/input',
+        position: [100, 100],
+        props: {}
+      });
+
+      expect(floatOutputNode).toBeDefined();
+      expect(floatInputNode).toBeDefined();
+
+      const possibleSockets = manager.getPossibleSockets({
+        node: floatOutputNode!,
+        index: 0,
+        position: [0, 0]
+      });
+
+      const matchingSocket = possibleSockets.find(([node]) => node.id === floatInputNode!.id);
+      expect(matchingSocket).toBeDefined();
+      expect(matchingSocket![1]).toBe('value');
+    });
+
+    it('should return multiple compatible sockets', () => {
+      const registry = createMockNodeRegistry([
+        mockFloatOutputNode,
+        mockFloatInputNode,
+        mockGeometryOutputNode,
+        mockPathInputNode
+      ]);
+
+      const manager = new GraphManager(registry);
+
+      const floatOutputNode = manager.createNode({
+        type: 'test/node/output',
+        position: [0, 0],
+        props: {}
+      });
+
+      const geometryOutputNode = manager.createNode({
+        type: 'test/node/geometry',
+        position: [200, 0],
+        props: {}
+      });
+
+      const floatInputNode = manager.createNode({
+        type: 'test/node/input',
+        position: [100, 100],
+        props: {}
+      });
+
+      const pathInputNode = manager.createNode({
+        type: 'test/node/path',
+        position: [300, 100],
+        props: {}
+      });
+
+      expect(floatOutputNode).toBeDefined();
+      expect(geometryOutputNode).toBeDefined();
+      expect(floatInputNode).toBeDefined();
+      expect(pathInputNode).toBeDefined();
+
+      const possibleSocketsForFloat = manager.getPossibleSockets({
+        node: floatOutputNode!,
+        index: 0,
+        position: [0, 0]
+      });
+
+      expect(possibleSocketsForFloat.length).toBe(1);
+      expect(possibleSocketsForFloat.map(([n]) => n.id)).toContain(floatInputNode!.id);
    });
  });
 });
@@ -0,0 +1,262 @@
+import { assert, describe, expect, it } from 'vitest';
+import { GraphManager } from './graph-manager.svelte';
+import { GraphState } from './graph-state.svelte';
+import { createMockNodeRegistry, mockFloatInputNode, mockFloatOutputNode } from './test-utils';
+
+// GraphState constructor reads localStorage synchronously — mock before any instantiation
+Object.defineProperty(globalThis, 'localStorage', {
+  value: {
+    getItem: () => null,
+    setItem: () => {},
+    removeItem: () => {},
+    clear: () => {},
+    length: 0,
+    key: () => null
+  } as Storage,
+  writable: true,
+  configurable: true
+});
+
+function createFixture() {
+  const registry = createMockNodeRegistry([mockFloatOutputNode, mockFloatInputNode]);
+  const manager = new GraphManager(registry);
+  const state = new GraphState(manager);
+  return { manager, state };
+}
+
+describe('clearSelection', () => {
+  it('empties selectedNodes', () => {
+    const { state } = createFixture();
+    state.selectedNodes.add(1);
+    state.selectedNodes.add(2);
+    state.clearSelection();
+    expect(state.selectedNodes.size).toBe(0);
+  });
+});
+
+describe('projectScreenToWorld', () => {
+  it('maps the viewport centre to the camera position', () => {
+    const { state } = createFixture();
+    // cameraPosition default: [140, 100, 3.5], width=100, height=100
+    state.width = 100;
+    state.height = 100;
+    state.cameraPosition = [140, 100, 3.5];
+    const [wx, wy] = state.projectScreenToWorld(50, 50);
+    expect(wx).toBeCloseTo(140);
+    expect(wy).toBeCloseTo(100);
+  });
+
+  it('offsets correctly for a point not at centre', () => {
+    const { state } = createFixture();
+    state.width = 100;
+    state.height = 100;
+    state.cameraPosition = [0, 0, 2];
+    const [wx, wy] = state.projectScreenToWorld(100, 50);
+    // x: 0 + (100 - 50) / 2 = 25
+    expect(wx).toBeCloseTo(25);
+    expect(wy).toBeCloseTo(0);
+  });
+});
+
+describe('groupSelectedNodes', () => {
+  it('delegates to graph.groupNodes with selected IDs and activeNodeId', () => {
+    const { manager, state } = createFixture();
+
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    const nodeB = manager.createNode({ type: 'test/node/input', position: [100, 0], props: {} });
+    assert.isDefined(nodeA);
+    assert.isDefined(nodeB);
+
+    state.selectedNodes.add(nodeA!.id);
+    state.activeNodeId = nodeB!.id;
+
+    const groupNode = state.groupSelectedNodes();
+    assert.isDefined(groupNode);
+
+    const graph = manager.serialize();
+    expect(graph.groups.length).toBe(1);
+    expect(graph.nodes.map(n => n.id)).toContain(groupNode!.id);
+  });
+
+  it('works when only activeNodeId is set with no extra selection', () => {
+    const { manager, state } = createFixture();
+
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    assert.isDefined(nodeA);
+
+    state.activeNodeId = nodeA!.id;
+    const groupNode = state.groupSelectedNodes();
+    assert.isDefined(groupNode);
+
+    expect(manager.groups.length).toBe(1);
+  });
+});
+
+describe('enterGroupNode', () => {
+  it('does nothing when activeNodeId is -1', () => {
+    const { manager, state } = createFixture();
+    state.activeNodeId = -1;
+    state.enterGroupNode();
+    expect(manager.parentStack.length).toBe(0);
+  });
+
+  it('does nothing when the active node is not a group instance', () => {
+    const { manager, state } = createFixture();
+    const node = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    assert.isDefined(node);
+    state.activeNodeId = node!.id;
+    state.enterGroupNode();
+    expect(manager.parentStack.length).toBe(0);
+  });
+
+  it('enters the group, pushes graphStack, and clears UI state', () => {
+    const { manager, state } = createFixture();
+
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    assert.isDefined(nodeA);
+    const groupNode = manager.groupNodes([nodeA!.id]);
+    assert.isDefined(groupNode);
+
+    state.selectedNodes.add(nodeA!.id);
+    state.activeNodeId = groupNode!.id;
+    state.cameraPosition = [10, 20, 5];
+
+    state.enterGroupNode();
+
+    expect(manager.parentStack.length).toBe(1);
+    expect(state.activeNodeId).toBe(-1);
+    expect(state.selectedNodes.size).toBe(0);
+    expect(manager.isInsideGroup).toBe(true);
+  });
+});
+
+describe('exitGroupNode', () => {
+  it('does nothing when not inside a group', () => {
+    const { manager, state } = createFixture();
+    const before = [...state.cameraPosition];
+    state.exitGroupNode();
+    expect(manager.parentStack.length).toBe(0);
+    expect(state.cameraPosition).toEqual(before);
+  });
+
+  it('clears activeNodeId and selection after exit', () => {
+    const { manager, state } = createFixture();
+
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    assert.isDefined(nodeA);
+    const groupNode = manager.groupNodes([nodeA!.id]);
+    assert.isDefined(groupNode);
+
+    state.activeNodeId = groupNode!.id;
+    state.enterGroupNode();
+    state.activeNodeId = 99;
+    state.selectedNodes.add(99);
+
+    state.exitGroupNode();
+
+    // Group instance node is re-selected on exit; internal selection is cleared
+    expect(state.activeNodeId).toBe(groupNode!.id);
+    expect(state.selectedNodes.size).toBe(0);
+  });
+
+  it('restores outer nodes to manager after exit', () => {
+    const { manager, state } = createFixture();
+
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    const nodeB = manager.createNode({ type: 'test/node/input', position: [100, 0], props: {} });
+    assert.isDefined(nodeA);
+    assert.isDefined(nodeB);
+
+    manager.createEdge(nodeA!, 0, nodeB!, 'value');
+    const groupNode = manager.groupNodes([nodeA!.id]);
+    assert.isDefined(groupNode);
+
+    state.activeNodeId = groupNode!.id;
+    state.enterGroupNode();
+
+    // Inside the group: nodeA is an internal node so it IS active; the outer
+    // nodes (nodeB, groupNode) are saved and no longer in the active Map.
+    expect(manager.nodes.has(nodeA!.id)).toBe(true);
+    expect(manager.nodes.has(nodeB!.id)).toBe(false);
+
+    state.exitGroupNode();
+
+    // After exit: outer nodes are restored
+    expect(manager.nodes.has(nodeB!.id)).toBe(true);
+    expect(manager.nodes.has(groupNode!.id)).toBe(true);
+    expect(manager.isInsideGroup).toBe(false);
+  });
+
+  it('isInsideGroup is false after exiting the only group level', () => {
+    const { manager, state } = createFixture();
+
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    assert.isDefined(nodeA);
+    const groupNode = manager.groupNodes([nodeA!.id]);
+    assert.isDefined(groupNode);
+
+    state.activeNodeId = groupNode!.id;
+    state.enterGroupNode();
+    expect(manager.isInsideGroup).toBe(true);
+
+    state.exitGroupNode();
+    expect(manager.isInsideGroup).toBe(false);
+  });
+});
+
+describe('copyNodes / pasteNodes', () => {
+  it('copies the active node into the clipboard', () => {
+    const { manager, state } = createFixture();
+    const node = manager.createNode({ type: 'test/node/output', position: [10, 20], props: {} });
+    assert.isDefined(node);
+
+    state.activeNodeId = node!.id;
+    state.mousePosition = [0, 0];
+    state.copyNodes();
+
+    assert.isNotNull(state.clipboard);
+    expect(state.clipboard!.nodes.map(n => n.id)).toContain(node!.id);
+  });
+
+  it('includes edges between copied nodes', () => {
+    const { manager, state } = createFixture();
+    const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    const nodeB = manager.createNode({ type: 'test/node/input', position: [100, 0], props: {} });
+    assert.isDefined(nodeA);
+    assert.isDefined(nodeB);
+
+    manager.createEdge(nodeA!, 0, nodeB!, 'value');
+
+    state.activeNodeId = nodeA!.id;
+    state.selectedNodes.add(nodeB!.id);
+    state.mousePosition = [0, 0];
+    state.copyNodes();
+
+    assert.isNotNull(state.clipboard);
+    expect(state.clipboard!.edges.length).toBe(1);
+  });
+
+  it('pastes nodes and adds them to the graph', () => {
+    const { manager, state } = createFixture();
+    const node = manager.createNode({ type: 'test/node/output', position: [10, 20], props: {} });
+    assert.isDefined(node);
+
+    state.activeNodeId = node!.id;
+    state.mousePosition = [0, 0];
+    state.copyNodes();
+
+    const countBefore = manager.nodes.size;
+    state.mousePosition = [50, 50];
+    state.pasteNodes();
+
+    expect(manager.nodes.size).toBe(countBefore + 1);
+  });
+
+  it('does nothing when clipboard is empty', () => {
+    const { manager, state } = createFixture();
+    manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
+    const countBefore = manager.nodes.size;
+    state.pasteNodes();
+    expect(manager.nodes.size).toBe(countBefore);
+  });
+});
@@ -1,10 +1,16 @@
-import type { NodeInstance, Socket } from '@nodarium/types';
+import { animate, debounce, lerp } from '$lib/helpers';
+import type { NodeInstance, SerializedEdge, SerializedNode, Socket } from '@nodarium/types';
 import { getContext, setContext } from 'svelte';
 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, getSocketPosition } from './helpers/nodeHelpers';
+import {
+  getNodeHeight,
+  getParameterHeight,
+  serializeEdge,
+  serializeNode
+} from './helpers/nodeHelpers';

 const graphStateKey = Symbol('graph-state');
 export function getGraphState() {
@@ -56,12 +62,20 @@ export class GraphState {
  colors = new ColorGenerator(predefinedColors);

  constructor(private graph: GraphManager) {
+    const saveCameraPosition = debounce(() => {
+      localStorage.setItem(
+        'cameraPosition',
+        `[${this.cameraPosition[0]},${this.cameraPosition[1]},${this.cameraPosition[2]}]`
+      );
+    }, 500);
+
    $effect.root(() => {
      $effect(() => {
-        localStorage.setItem(
-          'cameraPosition',
-          `[${this.cameraPosition[0]},${this.cameraPosition[1]},${this.cameraPosition[2]}]`
-        );
+        // Read values to subscribe to reactivity, then flush lazily.
+        void this.cameraPosition[0];
+        void this.cameraPosition[1];
+        void this.cameraPosition[2];
+        saveCameraPosition();
      });
    });
    const storedPosition = localStorage.getItem('cameraPosition');
@@ -94,8 +108,8 @@ export class GraphState {
  cameraPosition: [number, number, number] = $state([140, 100, 3.5]);

  clipboard: null | {
-    nodes: NodeInstance[];
-    edges: [number, number, number, string][];
+    nodes: SerializedNode[];
+    edges: SerializedEdge[];
  } = null;

  cameraBounds = $derived([
@@ -124,6 +138,9 @@ export class GraphState {
  activeNodeId = $state(-1);
  selectedNodes = new SvelteSet<number>();
  activeSocket = $state<Socket | null>(null);
+  safePadding = $state<{ left?: number; right?: number; bottom?: number; top?: number } | null>(
+    null
+  );
  hoveredSocket = $state<Socket | null>(null);
  possibleSockets = $state<Socket[]>([]);
  possibleSocketIds = $derived(
@@ -148,8 +165,25 @@ export class GraphState {
    this.edges.delete(edgeId);
  }

-  getEdgeData() {
-    return this.edges;
+  private _dirtyPositions = new SvelteSet<NodeInstance>();
+  private _positionFlushPending = false;
+
+  private _flushPositions() {
+    for (const node of this._dirtyPositions) {
+      if (node.state['x'] !== undefined && node.state['y'] !== undefined) {
+        if (node.state.ref) {
+          node.state.ref.style.setProperty('--nx', `${node.state.x * 10}px`);
+          node.state.ref.style.setProperty('--ny', `${node.state.y * 10}px`);
+        }
+      } else {
+        if (node.state.ref) {
+          node.state.ref.style.setProperty('--nx', `${node.position[0] * 10}px`);
+          node.state.ref.style.setProperty('--ny', `${node.position[1] * 10}px`);
+        }
+      }
+    }
+    this._dirtyPositions.clear();
+    this._positionFlushPending = false;
  }

  updateNodePosition(node: NodeInstance) {
@@ -161,16 +195,10 @@ export class GraphState {
      delete node.state.y;
    }

-    if (node.state['x'] !== undefined && node.state['y'] !== undefined) {
-      if (node.state.ref) {
-        node.state.ref.style.setProperty('--nx', `${node.state.x * 10}px`);
-        node.state.ref.style.setProperty('--ny', `${node.state.y * 10}px`);
-      }
-    } else {
-      if (node.state.ref) {
-        node.state.ref.style.setProperty('--nx', `${node.position[0] * 10}px`);
-        node.state.ref.style.setProperty('--ny', `${node.position[1] * 10}px`);
-      }
+    this._dirtyPositions.add(node);
+    if (!this._positionFlushPending) {
+      this._positionFlushPending = true;
+      requestAnimationFrame(() => this._flushPositions());
    }
  }

@@ -186,39 +214,14 @@ export class GraphState {
    return 1;
  }

-  tryConnectToDebugNode(nodeId: number) {
-    const node = this.graph.nodes.get(nodeId);
-    if (!node) return;
-    if (node.type.endsWith('/debug')) return;
-    if (!node.state.type?.outputs?.length) return;
-    for (const _node of this.graph.nodes.values()) {
-      if (_node.type.endsWith('/debug')) {
-        this.graph.createEdge(node, 0, _node, 'input');
-        return;
-      }
-    }
-
-    const debugNode = this.graph.createNode({
-      type: 'max/plantarium/debug',
-      position: [node.position[0] + 30, node.position[1]],
-      props: {}
-    });
-
-    if (debugNode) {
-      this.graph.createEdge(node, 0, debugNode, 'input');
-    }
-  }
-
  copyNodes() {
    if (this.activeNodeId === -1 && !this.selectedNodes?.size) {
      return;
    }
-    let nodes = [
-      this.activeNodeId,
-      ...(this.selectedNodes?.values() || [])
-    ]
+    const ids = new SvelteSet([this.activeNodeId, ...(this.selectedNodes?.values() || [])]);
+    let nodes = [...ids]
      .map((id) => this.graph.getNode(id))
-      .filter(b => !!b);
+      .filter((b): b is NodeInstance => !!b);

    const edges = this.graph.getEdgesBetweenNodes(nodes);
    nodes = nodes.map((node) => ({
@@ -226,26 +229,67 @@ export class GraphState {
      position: [
        this.mousePosition[0] - node.position[0],
        this.mousePosition[1] - node.position[1]
-      ],
-      tmp: undefined
+      ]
    }));

    this.clipboard = {
-      nodes: nodes,
-      edges: edges
+      nodes: nodes.map(n => serializeNode(n)),
+      edges: edges.map(e => serializeEdge(e))
    };
  }

+  unGroupSelectedNodes() {
+    return this.graph.ungroupNode(this.activeNodeId);
+  }
+
+  groupSelectedNodes() {
+    return this.graph.groupNodes([...this.selectedNodes.keys(), this.activeNodeId]);
+  }
+
+  centerNode(node?: NodeInstance) {
+    const average = [0, 0, 4];
+    if (node) {
+      average[0] = node.position[0] + (this.safePadding?.right || 0) / 10;
+      average[1] = node.position[1];
+      average[2] = 10;
+    } else {
+      for (const node of this.graph.nodes.values()) {
+        average[0] += node.position[0];
+        average[1] += node.position[1];
+      }
+      average[0] = (average[0] / this.graph.nodes.size)
+        + (this.safePadding?.right || 0) / (average[2] * 2);
+      average[1] /= this.graph.nodes.size;
+    }
+
+    const camX = this.cameraPosition[0];
+    const camY = this.cameraPosition[1];
+    const camZ = this.cameraPosition[2];
+
+    const ease = (t: number) => (t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t);
+    const easeZoom = (t: number) => t * t * (3 - 2 * t);
+
+    animate(500, (a: number) => {
+      this.cameraPosition[0] = lerp(camX, average[0], ease(a));
+      this.cameraPosition[1] = lerp(camY, average[1], ease(a));
+      this.cameraPosition[2] = lerp(camZ, average[2], easeZoom(a));
+      if (this.mouseDown) return false;
+    });
+  }
+
  pasteNodes() {
    if (!this.clipboard) return;

-    const nodes = this.clipboard.nodes
-      .map((node) => {
-        node.position[0] = this.mousePosition[0] - node.position[0];
-        node.position[1] = this.mousePosition[1] - node.position[1];
-        return node;
-      })
-      .filter(Boolean) as NodeInstance[];
+    // Create fresh node objects — never mutate clipboard so repeat pastes work correctly.
+    // State is also spread (with cleared parents/children) so createGraph's mutations
+    // don't corrupt the clipboard's stored state references.
+    const nodes = this.clipboard.nodes.map((node) => ({
+      ...node,
+      position: [
+        this.mousePosition[0] - node.position[0],
+        this.mousePosition[1] - node.position[1]
+      ] as [number, number]
+    }));

    const newNodes = this.graph.createGraph(nodes, this.clipboard.edges);
    this.selectedNodes.clear();
@@ -266,7 +310,7 @@ export class GraphState {
        if (edge[3] === index) {
          node = edge[0];
          index = edge[1];
-          position = getSocketPosition(node, index);
+          position = this.getSocketPosition(node, index);
          this.graph.removeEdge(edge);
          break;
        }
@@ -286,7 +330,7 @@ export class GraphState {
        return {
          node,
          index,
-          position: getSocketPosition(node, index)
+          position: this.getSocketPosition(node, index)
        };
      });
  }
@@ -323,7 +367,8 @@ export class GraphState {
        for (const node of this.graph.nodes.values()) {
          const x = node.position[0];
          const y = node.position[1];
-          const height = getNodeHeight(node.state.type!);
+          const nodeType = this.graph.getNodeType(node);
+          const height = nodeType ? getNodeHeight(nodeType) : 20;
          if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
            clickedNodeId = node.id;
            break;
@@ -335,7 +380,8 @@ export class GraphState {
  }

  isNodeInView(node: NodeInstance) {
-    const height = getNodeHeight(node.state.type!);
+    if (!node) return false;
+    const height = getNodeHeight(this.graph.getNodeType(node)!);
    const width = 20;
    return node.position[0] > this.cameraBounds[0] - width
      && node.position[0] < this.cameraBounds[1]
@@ -346,4 +392,57 @@ 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);
+    if (ok) {
+      this.activeNodeId = -1;
+      this.clearSelection();
+    }
+  }
+
+  exitGroupNode() {
+    const result = this.graph.exitGroup();
+    if (!result) return;
+    this.activeNodeId = result.nodeId;
+    this.clearSelection();
+  }
+
+  getSocketPosition(
+    node: NodeInstance,
+    index: string | number
+  ): [number, number] {
+    if (node.type === '__internal/group/input' && typeof index === 'number') {
+      return [
+        (node?.state?.x ?? node.position[0]) + 20,
+        (node?.state?.y ?? node.position[1]) + 2.5 + 5 * index + 5
+      ];
+    }
+
+    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
+      ];
+    }
+  }
 }
@@ -7,22 +7,23 @@
  import AddMenu from '../components/AddMenu.svelte';
  import BoxSelection from '../components/BoxSelection.svelte';
  import Camera from '../components/Camera.svelte';
+  import GroupBreadcrumps from '../components/GroupBreadcrumps.svelte';
  import HelpView from '../components/HelpView.svelte';
  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';
  import { MouseEventManager } from './mouse.events';
+  import ZoomIndicator from './ZoomIndicator.svelte';

  const {
    keymap,
-    addMenuPadding
+    safePadding
  }: {
    keymap: ReturnType<typeof createKeyMap>;
-    addMenuPadding?: { left?: number; right?: number; bottom?: number; top?: number };
+    safePadding?: { left?: number; right?: number; bottom?: number; top?: number };
  } = $props();

  const graph = getGraphManager();
@@ -39,8 +40,8 @@
      return [0, 0, 0, 0];
    }

-    const pos1 = getSocketPosition(fromNode, edge[1]);
-    const pos2 = getSocketPosition(toNode, edge[3]);
+    const pos1 = graphState.getSocketPosition(fromNode, edge[1]);
+    const pos2 = graphState.getSocketPosition(toNode, edge[3]);
    return [pos1[0], pos1[1], pos2[0], pos2[1]];
  }

@@ -97,10 +98,17 @@
  }

  function getSocketType(node: NodeInstance, index: number | string): string {
+    const nodeType = graph.getNodeType(node);
    if (typeof index === 'string') {
-      return node.state.type?.inputs?.[index].type || 'unknown';
+      return nodeType?.inputs?.[index].type || 'unknown';
    }
-    return node.state.type?.outputs?.[index] || 'unknown';
+
+    if (node.type === '__internal/group/input') {
+      const key = Object.keys(nodeType?.inputs || {})[index];
+      return nodeType?.inputs?.[key].type || 'unknown';
+    }
+
+    return nodeType?.outputs?.[index] || 'unknown';
  }
 </script>

@@ -114,6 +122,7 @@
  bind:this={graphState.wrapper}
  class="graph-wrapper"
  style="height: 100%"
+  class:is-inside-group={graph.isInsideGroup}
  class:is-panning={graphState.isPanning}
  class:is-hovering={graphState.hoveredNodeId !== -1}
  aria-label="Graph"
@@ -121,6 +130,7 @@
  tabindex="0"
  bind:clientWidth={graphState.width}
  bind:clientHeight={graphState.height}
+  style:--padding-right="{safePadding?.right || 0}px"
  onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
  onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
  oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)}
@@ -136,6 +146,8 @@
  />
  <label for="drop-zone"></label>

+  <GroupBreadcrumps />
+
  <Canvas shadows={false} renderMode="on-demand" colorManagementEnabled={false}>
    <Camera
      bind:camera={graphState.camera}
@@ -172,10 +184,10 @@
      {#if graphState.addMenuPosition}
        <AddMenu
          onnode={handleNodeCreation}
-          paddingTop={addMenuPadding?.top}
-          paddingRight={addMenuPadding?.right}
-          paddingBottom={addMenuPadding?.bottom}
-          paddingLeft={addMenuPadding?.left}
+          paddingTop={safePadding?.top}
+          paddingRight={safePadding?.right}
+          paddingBottom={safePadding?.bottom}
+          paddingLeft={safePadding?.left}
        />
      {/if}

@@ -216,10 +228,10 @@
          style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`}
          class:hovering-sockets={graphState.activeSocket}
        >
-          {#each graph.nodes.values() as node (node.id)}
+          {#each graph.nodeArray as node, index (node)}
            <NodeEl
-              {node}
-              inView={graphState.isNodeInView(node)}
+              bind:node={graph.nodeArray[index]}
+              inView={node ? graphState.isNodeInView(node) : false}
            />
          {/each}
        </div>
@@ -236,6 +248,8 @@
  <HelpView registry={graph.registry} />
 {/if}

+<ZoomIndicator {safePadding} />
+
 <style>
  .graph-wrapper {
    position: relative;
@@ -1,6 +1,7 @@
 <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';
@@ -18,7 +19,7 @@
    showHelp?: boolean;
    settingTypes?: Record<string, unknown>;

-    addMenuPadding?: { left?: number; right?: number; bottom?: number; top?: number };
+    safePadding?: { left?: number; right?: number; bottom?: number; top?: number };

    onsave?: (save: Graph) => void;
    onresult?: (result: unknown) => void;
@@ -27,7 +28,8 @@
  let {
    graph,
    registry,
-    addMenuPadding,
+    safePadding,
+    // eslint-disable-next-line no-useless-assignment
    settings = $bindable(),
    activeNode = $bindable(),
    backgroundType = $bindable('grid'),
@@ -44,29 +46,32 @@
  export const manager = new GraphManager(registry);
  setGraphManager(manager);

-  const graphState = new GraphState(manager);
+  export const state = new GraphState(manager);
  $effect(() => {
-    graphState.backgroundType = backgroundType;
-    graphState.snapToGrid = snapToGrid;
-    graphState.showHelp = showHelp;
+    if (safePadding) {
+      state.safePadding = safePadding;
+    }
+    state.backgroundType = backgroundType;
+    state.snapToGrid = snapToGrid;
+    state.showHelp = showHelp;
  });

-  setGraphState(graphState);
+  setGraphState(state);

-  setupKeymaps(keymap, manager, graphState);
+  setupKeymaps(keymap, manager, state);

  $effect(() => {
-    if (graphState.activeNodeId !== -1) {
-      activeNode = manager.getNode(graphState.activeNodeId);
+    if (state.activeNodeId !== -1) {
+      activeNode = manager.getNode(state.activeNodeId);
    } else if (activeNode) {
      activeNode = undefined;
    }
  });

  $effect(() => {
-    if (!graphState.addMenuPosition) {
-      graphState.edgeEndPosition = null;
-      graphState.activeSocket = null;
+    if (!state.addMenuPosition) {
+      state.edgeEndPosition = null;
+      state.activeSocket = null;
    }
  });

@@ -79,11 +84,11 @@

  manager.on('save', (save) => onsave?.(save));

-  $effect(() => {
+  onMount(() => {
    if (graph) {
      manager.load(graph);
    }
  });
 </script>

-<GraphEl {keymap} {addMenuPadding} />
+<GraphEl {keymap} {safePadding} />
@@ -0,0 +1,52 @@
+<script lang="ts">
+  import { getGraphState } from '../graph-state.svelte';
+
+  const { safePadding }: {
+    safePadding?: { left?: number; right?: number; bottom?: number; top?: number };
+  } = $props();
+
+  const graphState = getGraphState();
+</script>
+
+<div class="zoom-indicator" style:right="calc({safePadding?.right ?? 0}px + 10px)">
+  <button
+    class="fit-btn"
+    title="Fit to view (.)"
+    onclick={() => graphState.centerNode()}
+    aria-label="Fit nodes to view"
+  >
+    ⊡
+  </button>
+  <span>{Math.round(graphState.cameraPosition[2] * 10)}%</span>
+</div>
+
+<style>
+  .zoom-indicator {
+    position: absolute;
+    bottom: 10px;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    font-family: var(--font-family);
+    font-size: 0.75em;
+    color: var(--color-text);
+    opacity: 0.35;
+    z-index: 10;
+    transition: opacity 0.15s, right 0.2s;
+    pointer-events: auto;
+  }
+
+  .zoom-indicator:hover {
+    opacity: 0.9;
+  }
+
+  .fit-btn {
+    background: none;
+    border: none;
+    color: inherit;
+    cursor: pointer;
+    font-size: 1.1em;
+    line-height: 1;
+    padding: 0;
+  }
+</style>
@@ -2,7 +2,7 @@ type Color = { hue: number; saturation: number; lightness: number };

 export class ColorGenerator {
  private colors: Map<string, Color> = new Map();
-  private lightnessLevels = [10, 60];
+  // private lightnessLevels = [10, 60];

  constructor(predefined: Record<string, Color>) {
    for (const [id, colorStr] of Object.entries(predefined)) {
@@ -10,6 +10,14 @@ export class ColorGenerator {
    }
  }

+  public getColors() {
+    return Object.fromEntries(
+      this.colors.entries().map(([key, col]) => {
+        return [key, this.colorToHsl(col)];
+      })
+    );
+  }
+
  public getColor(id: string): string {
    if (this.colors.has(id)) {
      return this.colorToHsl(this.colors.get(id)!);
@@ -1,4 +1,5 @@
 import { GraphSchema, type NodeId } from '@nodarium/types';
+import { toast } from '@nodarium/ui';
 import type { GraphManager } from '../graph-manager.svelte';
 import type { GraphState } from '../graph-state.svelte';

@@ -41,6 +42,9 @@ export class FileDropEventManager {
          props,
          position: pos
        });
+      }).catch((e) => {
+        toast(`Failed to load node: ${nodeId}`, 'error');
+        console.error(e);
      });
    } else if (event.dataTransfer.files.length) {
      const file = event.dataTransfer.files[0];
@@ -65,8 +69,13 @@ export class FileDropEventManager {
        reader.onload = (e) => {
          const buffer = e.target?.result as ArrayBuffer;
          if (buffer) {
-            const state = GraphSchema.parse(JSON.parse(buffer.toString()));
-            this.graph.load(state);
+            try {
+              const state = GraphSchema.parse(JSON.parse(buffer.toString()));
+              this.graph.load(state);
+            } catch (e) {
+              toast('Failed to load graph: invalid file', 'error');
+              console.error(e);
+            }
          }
        };
        reader.readAsText(file);
@@ -9,6 +9,7 @@ import { EdgeInteractionManager } from './edge.events';

 export class MouseEventManager {
  edgeInteractionManager: EdgeInteractionManager;
+  private pendingSelectionFrame = false;

  constructor(
    private graph: GraphManager,
@@ -190,7 +191,7 @@ export class MouseEventManager {
    // if we clicked on a node
    if (clickedNodeId !== -1) {
      if (event.ctrlKey && event.shiftKey) {
-        this.state.tryConnectToDebugNode(clickedNodeId);
+        this.graph.tryConnectToDebugNode(clickedNodeId);
        return;
      }
      if (this.state.activeNodeId === -1) {
@@ -282,24 +283,31 @@ export class MouseEventManager {
    if (this.state.boxSelection) {
      event.preventDefault();
      event.stopPropagation();
-      const mouseD = this.state.projectScreenToWorld(
-        this.state.mouseDown[0],
-        this.state.mouseDown[1]
-      );
-      const x1 = Math.min(mouseD[0], this.state.mousePosition[0]);
-      const x2 = Math.max(mouseD[0], this.state.mousePosition[0]);
-      const y1 = Math.min(mouseD[1], this.state.mousePosition[1]);
-      const y2 = Math.max(mouseD[1], this.state.mousePosition[1]);
-      for (const node of this.graph.nodes.values()) {
-        if (!node?.state) continue;
-        const x = node.position[0];
-        const y = node.position[1];
-        const height = getNodeHeight(node.state.type!);
-        if (x > x1 - 20 && x < x2 && y > y1 - height && y < y2) {
-          this.state.selectedNodes?.add(node.id);
-        } else {
-          this.state.selectedNodes?.delete(node.id);
-        }
+      if (!this.pendingSelectionFrame) {
+        this.pendingSelectionFrame = true;
+        requestAnimationFrame(() => {
+          this.pendingSelectionFrame = false;
+          if (!this.state.mouseDown) return;
+          const mouseD = this.state.projectScreenToWorld(
+            this.state.mouseDown[0],
+            this.state.mouseDown[1]
+          );
+          const x1 = Math.min(mouseD[0], this.state.mousePosition[0]);
+          const x2 = Math.max(mouseD[0], this.state.mousePosition[0]);
+          const y1 = Math.min(mouseD[1], this.state.mousePosition[1]);
+          const y2 = Math.max(mouseD[1], this.state.mousePosition[1]);
+          for (const node of this.graph.nodes.values()) {
+            if (!node?.state) continue;
+            const x = node.position[0];
+            const y = node.position[1];
+            const height = getNodeHeight(node.state.type!);
+            if (x > x1 - 20 && x < x2 && y > y1 - height && y < y2) {
+              this.state.selectedNodes?.add(node.id);
+            } else {
+              this.state.selectedNodes?.delete(node.id);
+            }
+          }
+        });
      }
      return;
    }
@@ -1,6 +1,16 @@
-import type { NodeDefinition, NodeInstance } from '@nodarium/types';
+import type {
+  Edge,
+  NodeDefinition,
+  NodeInstance,
+  SerializedEdge,
+  SerializedNode
+} from '@nodarium/types';

 export function getParameterHeight(node: NodeDefinition, inputKey: string) {
+  if (node.id === '__internal/group/input') {
+    return 50;
+  }
+
  const input = node.inputs?.[inputKey];
  if (!input) {
    return 0;
@@ -23,42 +33,31 @@ export function getParameterHeight(node: NodeDefinition, inputKey: string) {
  return 50;
 }

-export function 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 = 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
-    ];
+export function serializeNode(node: SerializedNode | NodeInstance): SerializedNode {
+  return {
+    id: node.id,
+    position: [...node.position],
+    type: node.type,
+    props: node.props ? JSON.parse(JSON.stringify(node.props)) : undefined
+  };
+}
+
+export function serializeEdge(edge: SerializedEdge | Edge): SerializedEdge {
+  if (typeof edge[0] === 'number' && typeof edge[2] === 'number') {
+    return [edge[0], edge[1], edge[2], edge[3]];
  }
+  const e = edge as Edge;
+  return [e[0].id, e[1], e[2].id, e[3]];
 }

 const nodeHeightCache: Record<string, number> = {};
 export function getNodeHeight(node: NodeDefinition) {
+  if (!node || !('inputs' in node)) {
+    return 5;
+  }
  if (node.id in nodeHeightCache) {
    return nodeHeightCache[node.id];
  }
-  if (!node?.inputs) {
-    return 5;
-  }
  let height = 5;

  for (const key in node.inputs) {
@@ -69,3 +68,34 @@ export function getNodeHeight(node: NodeDefinition) {
  nodeHeightCache[node.id] = height;
  return height;
 }
+
+export function areSocketsCompatible(
+  output: string | undefined,
+  inputs: string | (string | undefined)[] | undefined
+) {
+  if (output === '*') return true;
+  if (Array.isArray(inputs) && output) {
+    return inputs.includes('*') || inputs.includes(output);
+  }
+  return inputs === output;
+}
+
+export function areEdgesEqual(firstEdge: Edge, secondEdge: Edge) {
+  if (firstEdge[0].id !== secondEdge[0].id) {
+    return false;
+  }
+
+  if (firstEdge[1] !== secondEdge[1]) {
+    return false;
+  }
+
+  if (firstEdge[2].id !== secondEdge[2].id) {
+    return false;
+  }
+
+  if (firstEdge[3] !== secondEdge[3]) {
+    return false;
+  }
+
+  return true;
+}
@@ -1,6 +1,6 @@
-import { animate, lerp } from '$lib/helpers';
 import type { createKeyMap } from '$lib/helpers/createKeyMap';
 import { panelState } from '$lib/sidebar/PanelState.svelte';
+import { toast } from '@nodarium/ui';
 import FileSaver from 'file-saver';
 import type { GraphManager } from './graph-manager.svelte';
 import type { GraphState } from './graph-state.svelte';
@@ -48,6 +48,10 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
    key: 'Escape',
    description: 'Deselect nodes',
    callback: () => {
+      if (graph.isInsideGroup) {
+        graphState.exitGroupNode();
+        return;
+      }
      graphState.activeNodeId = -1;
      graphState.clearSelection();
      graphState.edgeEndPosition = null;
@@ -55,6 +59,29 @@ 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: 'g',
+    alt: true,
+    preventDefault: true,
+    description: 'Ungroup selected nodes',
+    callback: () => graphState.unGroupSelectedNodes()
+  });
+
+  keymap.addShortcut({
+    key: 'Tab',
+    preventDefault: true,
+    description: 'Enter selected node group',
+    callback: () => graphState.enterGroupNode()
+  });
+
  keymap.addShortcut({
    key: 'A',
    shift: true,
@@ -67,27 +94,7 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
    description: 'Center camera',
    callback: () => {
      if (!graphState.isBodyFocused()) return;
-
-      const average = [0, 0];
-      for (const node of graph.nodes.values()) {
-        average[0] += node.position[0];
-        average[1] += node.position[1];
-      }
-      average[0] = average[0] ? average[0] / graph.nodes.size : 0;
-      average[1] = average[1] ? average[1] / graph.nodes.size : 0;
-
-      const camX = graphState.cameraPosition[0];
-      const camY = graphState.cameraPosition[1];
-      const camZ = graphState.cameraPosition[2];
-
-      const ease = (t: number) => (t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t);
-
-      animate(500, (a: number) => {
-        graphState.cameraPosition[0] = lerp(camX, average[0], ease(a));
-        graphState.cameraPosition[1] = lerp(camY, average[1], ease(a));
-        graphState.cameraPosition[2] = lerp(camZ, 2, ease(a));
-        if (graphState.mouseDown) return false;
-      });
+      graphState.centerNode(graph.getNode(graphState.activeNodeId));
    }
  });

@@ -140,6 +147,7 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
        type: 'application/json;charset=utf-8'
      });
      FileSaver.saveAs(blob, 'nodarium-graph.json');
+      toast('Graph downloaded', 'success', 1500);
    }
  });

@@ -3,13 +3,14 @@
  import type { NodeInstance } from '@nodarium/types';
  import { T } from '@threlte/core';
  import { type Mesh } from 'three';
-  import { getGraphState } from '../graph-state.svelte';
+  import { getGraphManager, 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 = {
@@ -18,7 +19,7 @@
  };
  let { node = $bindable(), inView }: Props = $props();

-  const nodeType = $derived(node.state.type!);
+  const nodeType = $derived(node ? graph.getNodeType(node) : undefined);

  const isActive = $derived(graphState.activeNodeId === node.id);
  const isSelected = $derived(graphState.selectedNodes.has(node.id));
@@ -32,15 +33,17 @@
  );

  const sectionHeights = $derived(
-    Object
-      .keys(nodeType.inputs || {})
-      .map(key => getParameterHeight(nodeType, key) / 10)
-      .filter(b => !!b)
+    nodeType
+      ? Object
+        .keys(nodeType?.inputs || {})
+        .map(key => getParameterHeight(nodeType, key) / 10)
+        .filter(b => !!b)
+      : [5]
  );

  let meshRef: Mesh | undefined = $state();

-  const height = getNodeHeight(node.state.type!);
+  const height = $derived(nodeType ? getNodeHeight(nodeType) : 20);

  const zoom = $derived(graphState.cameraPosition[2]);

@@ -1,11 +1,12 @@
 <script lang="ts">
  import type { NodeInstance } from '@nodarium/types';
-  import { getGraphState } from '../graph-state.svelte';
+  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();

  type Props = {
@@ -30,8 +31,12 @@
  const zOffset = Math.random() - 0.5;
  const zLimit = 2 - zOffset;

-  const parameters = Object.entries(node.state?.type?.inputs || {}).filter(
-    (p) => p[1].type !== 'seed' && !('setting' in p[1]) && p[1]?.hidden !== true
+  const nodeType = $derived(graph.getNodeType(node));
+
+  const parameters = $derived(
+    Object.entries(nodeType?.inputs || {}).filter(
+      (p) => p[1].type !== 'seed' && !('setting' in p[1]) && p[1]?.hidden !== true
+    ) || {}
  );

  $effect(() => {
@@ -1,11 +1,11 @@
 <script lang="ts">
  import { appSettings } from '$lib/settings/app-settings.svelte';
  import type { NodeInstance, Socket } from '@nodarium/types';
-  import { getGraphState } from '../graph-state.svelte';
+  import { getGraphManager, 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,13 +16,24 @@
      graphState.setDownSocket?.({
        node,
        index: 0,
-        position: getSocketPosition?.(node, 0)
+        position: graphState.getSocketPosition?.(node, 0)
      });
    }
  }

  const cornerTop = 10;
-  const rightBump = $derived(!!node?.state?.type?.outputs?.length);
+  const nodeType = $derived(graph.getNodeType(node));
+  const rightBump = $derived(
+    !!nodeType?.outputs?.length && node.type !== '__internal/group/input'
+  );
+  const cornerBottom = $derived(
+    node.type === '__internal/group/input'
+      ? (Object.keys(nodeType?.inputs ?? {}).length ? 0 : 10)
+      : node.type === '__internal/group/output'
+      ? (nodeType?.outputs?.length ? 0 : 10)
+      : 0
+  );
+
  const aspectRatio = 0.25;

  const path = $derived(
@@ -31,6 +42,7 @@
      height: 34,
      y: 49,
      cornerTop,
+      cornerBottom,
      rightBump,
      aspectRatio
    })
@@ -41,6 +53,7 @@
      height: 40,
      y: 49,
      cornerTop,
+      cornerBottom,
      rightBump,
      aspectRatio
    })
@@ -70,15 +83,17 @@
    {#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()}
-  </div>
-  <div
-    class="target"
-    role="button"
-    tabindex="0"
-    onmousedown={handleMouseDown}
-  >
+    {nodeType?.meta?.title || node.type?.split('/').pop()}
  </div>
+  {#if rightBump}
+    <div
+      class="target"
+      role="button"
+      tabindex="0"
+      onmousedown={handleMouseDown}
+    >
+    </div>
+  {/if}
  <svg
    xmlns="http://www.w3.org/2000/svg"
    viewBox="0 0 100 100"
@@ -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, getSocketPosition } from '../helpers/nodeHelpers';
+  import { getParameterHeight } from '../helpers/nodeHelpers';
  import NodeInputEl from './NodeInput.svelte';

  type Props = {
@@ -19,7 +19,7 @@

  let { node = $bindable(), input, id, isLast }: Props = $props();

-  const nodeType = $derived(node.state.type!);
+  let nodeType = $derived(graph.getNodeType(node)!);

  const inputType = $derived(nodeType.inputs?.[id]);

@@ -29,14 +29,27 @@
  function handleMouseDown(ev: MouseEvent) {
    ev.preventDefault();
    ev.stopPropagation();
-    graphState.setDownSocket({
-      node,
-      index: id,
-      position: getSocketPosition(node, id)
-    });
+
+    if (node.type === '__internal/group/input') {
+      const outputIndex = Object.entries(nodeType?.inputs ?? {}).findIndex(([key]) => key === id);
+      graphState.setDownSocket({
+        node,
+        index: outputIndex,
+        position: graphState.getSocketPosition(node, outputIndex)
+      });
+    } else {
+      graphState.setDownSocket({
+        node,
+        index: id,
+        position: graphState.getSocketPosition(node, id)
+      });
+    }
  }

-  const leftBump = $derived(nodeType.inputs?.[id].internal !== true);
+  const leftBump = $derived(
+    nodeType.inputs?.[id].internal !== true && node.type !== '__internal/group/input'
+  );
+  const rightBump = $derived(node.type === '__internal/group/input');
  const cornerBottom = $derived(isLast ? 5 : 0);
  const aspectRatio = 0.5;

@@ -46,6 +59,7 @@
      height: 2000 / height,
      y: 50.5,
      cornerBottom,
+      rightBump,
      leftBump,
      aspectRatio
    })
@@ -55,6 +69,7 @@
      depth: 7,
      height: 2200 / height,
      y: 50.5,
+      rightBump,
      cornerBottom,
      leftBump,
      aspectRatio
@@ -76,6 +91,7 @@
 <div
  class="wrapper"
  data-node-type={node.type}
+  class:is-group-input={node.type === '__internal/group/input'}
  data-node-input={id}
  style:height="{height}px"
  style:--socket-color={hoverColor}
@@ -130,6 +146,11 @@
    transform: translateY(-50%) translateX(-50%);
  }

+  .is-group-input .target {
+    right: 0px;
+    transform: translateY(-50%) translateX(50%);
+  }
+
  .possible-socket .target::before {
    content: "";
    position: absolute;
@@ -23,7 +23,11 @@ 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()
@@ -32,7 +36,7 @@ export const mockFloatOutputNode: NodeDefinition = {
 export const mockFloatInputNode: NodeDefinition = {
  id: 'test/node/input',
  inputs: { value: { type: 'float' } },
-  outputs: [],
+  outputs: ['float'],
  meta: { title: 'Float Input' },
  execute: () => new Int32Array()
 };
@@ -4,7 +4,8 @@ export function grid(width: number, height: number) {
  const graph: Graph = {
    id: Math.floor(Math.random() * 100000),
    edges: [],
-    nodes: []
+    nodes: [],
+    groups: []
  };

  const amount = width * height;
@@ -47,6 +47,7 @@ export function tree(depth: number): Graph {
  return {
    id: Math.floor(Math.random() * 100000),
    nodes,
-    edges
+    edges,
+    groups: []
  };
 }
@@ -1,8 +1,12 @@
 export const debugNode = {
-  id: 'max/plantarium/debug',
+  id: '__internal/node/debug',
+  meta: {
+    title: 'Debug'
+  },
  inputs: {
    input: {
-      type: '*'
+      type: '*',
+      label: ''
    }
  },
  execute(_data: Int32Array): Int32Array {
@@ -0,0 +1,14 @@
+export const groupNode = {
+  id: '__internal/group/instance',
+  meta: { title: 'Group' },
+  inputs: {
+    groupId: {
+      label: '',
+      type: 'select',
+      values: []
+    }
+  },
+  execute(_data: Int32Array): Int32Array {
+    return _data;
+  }
+} as const;
@@ -88,6 +88,7 @@ export class RemoteNodeRegistry implements NodeRegistry {
  }

  async fetchNodeDefinition(nodeId: `${string}/${string}/${string}`) {
+    if (nodeId.startsWith('__internal/')) return;
    return this.fetchJson(`nodes/${nodeId}.json`);
  }

@@ -109,6 +110,8 @@ export class RemoteNodeRegistry implements NodeRegistry {
          return this.nodes.get(id)!;
        }

+        if (id.startsWith('__internal/')) return;
+
        const wasmBuffer = await this.fetchNodeWasm(id);

        try {
@@ -133,12 +136,14 @@ export class RemoteNodeRegistry implements NodeRegistry {
  }

  async register(id: string, wasmBuffer: ArrayBuffer) {
-    let wrapper: ReturnType<typeof createWasmWrapper> = null!;
-    try {
-      wrapper = createWasmWrapper(wasmBuffer);
-    } catch (error) {
-      console.error(`Failed to create node wrapper for node: ${id}`, error);
-    }
+    const wrapper = (() => {
+      try {
+        return createWasmWrapper(wasmBuffer);
+      } catch (error) {
+        console.error(`Failed to create node wrapper for node: ${id}`, error);
+        throw error;
+      }
+    })();

    const rawDefinition = wrapper.get_definition();
    const definition = NodeDefinitionSchema.safeParse(rawDefinition);
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { defaultPlant, lottaFaces, plant, simple } from '$lib/graph-templates';
  import type { Graph } from '$lib/types';
-  import { InputSelect } from '@nodarium/ui';
+  import { Button, ConfirmDialog, InputSelect, Spinner } from '@nodarium/ui';
  import type { ProjectManager } from './project-manager.svelte';

  const { projectManager } = $props<{ projectManager: ProjectManager }>();
@@ -31,16 +31,27 @@
    newProjectName = '';
    showNewProject = false;
  }
+
+  let pendingDeleteId = $state<number | null>(null);
+  let confirmOpen = $state(false);
+
+  function requestDelete(id: number, e: MouseEvent) {
+    e.stopPropagation();
+    pendingDeleteId = id;
+    confirmOpen = true;
+  }
+
+  function confirmDelete() {
+    if (pendingDeleteId !== null) {
+      projectManager.handleDeleteProject(pendingDeleteId);
+      pendingDeleteId = null;
+    }
+  }
 </script>

 <header class="flex justify-between px-4 h-[70px] border-b-1 border-outline items-center bg-layer-2">
  <h3>Project</h3>
-  <button
-    class="px-3 py-1 bg-layer-1 rounded"
-    onclick={() => (showNewProject = !showNewProject)}
-  >
-    New
-  </button>
+  <Button onclick={() => (showNewProject = !showNewProject)}>New</Button>
 </header>

 {#if showNewProject}
@@ -53,20 +64,11 @@
      onkeydown={(e) => e.key === 'Enter' && handleCreate()}
    />
    <InputSelect options={templates.map(t => t.name)} bind:value={selectedTemplateIndex} />
-    <button
-      class="cursor-pointer self-end px-3 py-1 bg-selected rounded"
-      onclick={() => handleCreate()}
-    >
-      Create
-    </button>
+    <Button variant="primary" class="self-end" onclick={() => handleCreate()}>Create</Button>
  </div>
 {/if}

 <div class="text-white min-h-screen">
-  {#if projectManager.loading}
-    <p>Loading...</p>
-  {/if}
-
  <ul>
    {#each projectManager.projects as project (project.id)}
      <li>
@@ -89,16 +91,35 @@
          <div class="flex justify-between items-center grow">
            <span>{project.meta?.title || 'Untitled'}</span>
            <button
-              class="text-layer-1! bg-red-500 w-7 text-xl rounded-sm cursor-pointer opacity-20 hover:opacity-80"
-              onclick={() => {
-                projectManager.handleDeleteProject(project.id!);
-              }}
+              class="opacity-20 hover:opacity-70 transition-opacity cursor-pointer p-1 rounded text-red-400"
+              onclick={(e) => requestDelete(project.id!, e)}
+              aria-label="Delete project"
            >
-              ×
+              <span class="i-[tabler--trash] w-4 h-4 block"></span>
            </button>
          </div>
        </div>
      </li>
+    {:else}
+      {#if projectManager.loading}
+        <div class="flex items-center gap-2 p-4">
+          <Spinner size={12} />
+          <p>Loading</p>
+        </div>
+      {:else}
+        <li class="px-4 py-8 text-center opacity-40 text-sm">
+          No projects yet.<br />Press <b>New</b> to create one.
+        </li>
+      {/if}
    {/each}
  </ul>
 </div>
+
+<ConfirmDialog
+  bind:open={confirmOpen}
+  title="Delete project?"
+  message="This cannot be undone. The project and all its data will be permanently removed."
+  confirmLabel="Delete"
+  cancelLabel="Cancel"
+  onconfirm={confirmDelete}
+/>
@@ -10,14 +10,16 @@ export class ProjectManager {
    'node.activeProjectId',
    undefined
  );
-  public readonly loading = $derived(this.graph?.id !== this.activeProjectId.value);
+  public readonly loading = $derived(
+    this.projects.length && this.graph?.id !== this.activeProjectId.value
+  );

  constructor() {
    this.init();
  }

  async saveGraph(g: Graph) {
-    db.saveGraph(g);
+    await db.saveGraph(g);
  }

  private async init() {
@@ -24,6 +24,10 @@
  let geometryPool: ReturnType<typeof createGeometryPool>;
  let instancePool: ReturnType<typeof createInstancedGeometryPool>;

+  export function invalidate() {
+    sceneComponent?.invalidate();
+  }
+
  export function updateGeometries(inputs: Int32Array[], group: Group) {
    geometryPool = geometryPool || createGeometryPool(group, material);
    instancePool = instancePool || createInstancedGeometryPool(group, material);
@@ -32,7 +32,7 @@ function writePath(scene: Group, data: Int32Array): Vector3[] {

  // Instanced spheres at points
  if (positions.length > 0) {
-    const sphereGeometry = new SphereGeometry(0.05, 8, 8); // keep low-poly
+    const sphereGeometry = new SphereGeometry(0.02, 8, 8); // keep low-poly
    const sphereMaterial = new MeshBasicMaterial({
      color: 0xff0000,
      depthTest: false
@@ -80,7 +80,6 @@ export function createGeometryPool(parentScene: Group, material: Material) {
    }

    const normals = new Float32Array(data.buffer, index * 4, vertexCount * 3);
-    index = index + vertexCount * 3;

    if (
      geometry.userData?.faceCount !== faceCount
@@ -208,6 +207,7 @@ export function createInstancedGeometryPool(
      existingInstance
      && instanceCount > existingInstance.geometry.userData.count
    ) {
+      existingInstance.geometry.dispose();
      scene.remove(existingInstance);
      instances.splice(instances.indexOf(existingInstance), 1);
      existingInstance = new InstancedMesh(geometry, material, instanceCount);
@@ -1,18 +0,0 @@
-import type { Graph, RuntimeExecutor } from '@nodarium/types';
-
-export class RemoteRuntimeExecutor implements RuntimeExecutor {
-  constructor(private url: string) {}
-
-  async execute(graph: Graph, settings: Record<string, unknown>): Promise<Int32Array> {
-    const res = await fetch(this.url, {
-      method: 'POST',
-      body: JSON.stringify({ graph, settings })
-    });
-
-    if (!res.ok) {
-      throw new Error(`Failed to execute graph`);
-    }
-
-    return new Int32Array(await res.arrayBuffer());
-  }
-}
@@ -0,0 +1,164 @@
+import type { Graph } from '@nodarium/types';
+import { describe, expect, it } from 'vitest';
+import { expandGroups } from './runtime-executor';
+
+// 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);
+  });
+});
@@ -18,6 +18,113 @@ import type { RuntimeNode } from './types';
 const log = createLogger('runtime-executor');
 log.mute();

+export function expandGroups(graph: Graph): Graph {
+  if (!graph.groups || graph.groups.length === 0) return graph;
+
+  function groupContainsSelf(groupId: number, visited = new Set<number>()): boolean {
+    if (visited.has(groupId)) return true;
+    visited.add(groupId);
+    const group = graph.groups!.find(g => g.id === groupId);
+    if (!group) return false;
+    for (const n of group.nodes) {
+      if (n.type === '__internal/group/instance') {
+        const nestedId = n.props?.groupId as number | undefined;
+        if (nestedId !== undefined && groupContainsSelf(nestedId, visited)) return true;
+      }
+    }
+    return false;
+  }
+
+  for (const group of graph.groups) {
+    if (groupContainsSelf(group.id)) {
+      throw new Error(`Circular group reference: group ${group.id} contains itself`);
+    }
+  }
+
+  const nodes = [...graph.nodes];
+  let edges = [...graph.edges];
+
+  let changed = true;
+  while (changed) {
+    changed = false;
+
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+      if (node.type !== '__internal/group/instance') continue;
+
+      const groupId = node.props?.groupId as number | undefined;
+      if (groupId === undefined) continue;
+
+      const group = graph.groups.find(g => g.id === groupId);
+      if (!group) continue;
+
+      changed = true;
+
+      const ID_OFFSET = (node.id + 1) * 1_000_000;
+      const idMap = new Map<number, number>();
+
+      const inputBoundary = group.nodes.find(n => n.type === '__internal/group/input');
+      const outputBoundary = group.nodes.find(n => n.type === '__internal/group/output');
+
+      const realNodes = group.nodes.filter(
+        n => n.type !== '__internal/group/input' && n.type !== '__internal/group/output'
+      );
+
+      for (const n of realNodes) idMap.set(n.id, ID_OFFSET + n.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
+      //
+      // External socket names are "input_N" where N equals the input boundary's
+      // output index. Match each external edge only to the internal edges that
+      // originate from that specific output slot — not a cartesian product of all.
+      if (inputBoundary) {
+        const fromInput = group.edges.filter(e => e[0] === inputBoundary.id);
+        for (const extEdge of incomingExternal) {
+          const inputIndex = parseInt((extEdge[3] as string).replace('input_', ''), 10);
+          const matchingIntEdges = fromInput.filter(e => e[1] === inputIndex);
+          for (const intEdge of matchingIntEdges) {
+            const toId = idMap.get(intEdge[2]);
+            if (toId !== undefined) newEdges.push([extEdge[0], extEdge[1], toId, intEdge[3]]);
+          }
+        }
+      }
+
+      // internal_source → [outputBoundary →] external_target
+      if (outputBoundary) {
+        const toOutput = group.edges.filter(e => e[2] === outputBoundary.id);
+        for (const extEdge of outgoingExternal) {
+          for (const intEdge of toOutput) {
+            const fromId = idMap.get(intEdge[0]);
+            if (fromId !== undefined) newEdges.push([fromId, intEdge[1], extEdge[2], extEdge[3]]);
+          }
+        }
+      }
+
+      // internal-to-internal edges (skip boundary edges)
+      for (const e of group.edges) {
+        if (e[0] === inputBoundary?.id || e[2] === outputBoundary?.id) continue;
+        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]]);
+      }
+
+      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);
+      edges.push(...newEdges);
+
+      break;
+    }
+  }
+
+  return { ...graph, nodes, edges };
+}
+
 function getValue(input: NodeInput, value?: unknown) {
  if (value === undefined && 'value' in input) {
    value = input.value;
@@ -27,6 +134,15 @@ function getValue(input: NodeInput, value?: unknown) {
    return encodeFloat(value as number);
  }

+  if (input.type === 'select' && typeof value !== 'number') {
+    const index = input.options?.indexOf(value as string);
+    if (index === undefined || index < 0) {
+      // Defaultl to the first option
+      return 0;
+    }
+    return index;
+  }
+
  if (Array.isArray(value)) {
    if (input.type === 'vec3' || input.type === 'shape') {
      return [
@@ -52,6 +168,8 @@ function getValue(input: NodeInput, value?: unknown) {
    return value;
  }

+  console.log({ input, value });
+
  throw new Error(`Unknown input type ${input.type}`);
 }

@@ -66,16 +184,18 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
  constructor(
    private registry: NodeRegistry,
    public cache?: SyncCache<Int32Array>
-  ) {
-    this.cache = undefined;
-  }
+  ) {}

  private async getNodeDefinitions(graph: Graph) {
    if (this.registry.status !== 'ready') {
      throw new Error('Node registry is not ready');
    }

-    await this.registry.load(graph.nodes.map((node) => node.type));
+    // Only load non-virtual types (virtual nodes are resolved locally)
+    const nonVirtualTypes = graph.nodes
+      .map(node => node.type)
+      .filter(t => !t.startsWith('__internal/'));
+    await this.registry.load(nonVirtualTypes);

    const typeMap = new Map<string, NodeDefinition>();
    for (const node of graph.nodes) {
@@ -163,6 +283,9 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
    let a = performance.now();
    this.debugData = {};

+    // Expand group nodes into a flat graph before execution
+    graph = expandGroups(graph);
+
    // Then we add some metadata to the graph
    const [outputNode, nodes] = await this.addMetaData(graph);
    let b = performance.now();
@@ -219,7 +342,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}`
+                `Node ${node.type} is missing input from node ${inputNode.type}#${inputNode.id}`
              );
            }
            return results[inputNode.id];
@@ -285,7 +408,7 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
        log.groupEnd();
      } catch (e) {
        log.groupEnd();
-        log.error(`Error executing node ${node_type.id || node.id}`, e);
+        throw e;
      }
    }

@@ -2,6 +2,7 @@ import { debugNode } from '$lib/node-registry/debugNode';
 import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
 import type { Graph } from '@nodarium/types';
 import { createPerformanceStore } from '@nodarium/utils';
+import * as Comlink from 'comlink';
 import { MemoryRuntimeExecutor } from './runtime-executor';
 import { MemoryRuntimeCache } from './runtime-executor-cache';

@@ -38,6 +39,9 @@ export async function executeGraph(
  performanceStore.startRun();
  const res = await executor.execute(graph, settings);
  performanceStore.stopRun();
+  if (res?.buffer) {
+    return Comlink.transfer(res, [res.buffer]);
+  }
  return res;
 }

@@ -12,8 +12,8 @@ export class WorkerRuntimeExecutor implements RuntimeExecutor {
  getPerformanceData() {
    return this.worker.getPerformanceData();
  }
-  getDebugData() {
-    return this.worker.getDebugData();
+  async getDebugData() {
+    return await this.worker.getDebugData();
  }
  set useRuntimeCache(useCache: boolean) {
    this.worker.setUseRuntimeCache(useCache);
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { localState } from '$lib/helpers/localState.svelte';
  import type { NodeInput } from '@nodarium/types';
-  import Input from '@nodarium/ui';
+  import Input, { Button as UiButton } from '@nodarium/ui';
  import { onMount } from 'svelte';
  import NestedSettings from './NestedSettings.svelte';

@@ -126,9 +126,9 @@
  {@const inputType = type[key]}
  <div class="input input-{inputType.type}" class:first-level={depth === 1}>
    {#if inputType.type === 'button'}
-      <button onclick={() => onButtonClick?.(id)}>
+      <UiButton onclick={() => onButtonClick?.(id)}>
        {inputType.label || key}
-      </button>
+      </UiButton>
    {:else}
      {#if inputType.label !== ''}
        <label for={id}>{inputType.label || key}</label>
@@ -204,6 +204,13 @@

  .input-boolean > label {
    order: 2;
+    font-size: 1em;
+    opacity: 0.9;
+  }
+
+  label {
+    font-size: 0.8em;
+    opacity: 0.7;
  }

  .first-level.input {
@@ -217,13 +224,6 @@
    gap: 10px;
  }

-  button {
-    cursor: pointer;
-    background: var(--color-layer-2);
-    padding-block: 5px;
-    border-radius: 4px;
-  }
-
  hr {
    margin: 0;
    left: 0;
@@ -2,6 +2,7 @@
  import { type Snippet } from 'svelte';
  import { panelState as state } from './PanelState.svelte';

+  // eslint-disable-next-line no-useless-assignment
  let { children, open = $bindable(false) } = $props<{ children?: Snippet; open?: boolean }>();

  $effect(() => {
@@ -1,101 +0,0 @@
-<script lang="ts">
-  import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
-  import NestedSettings from '$lib/settings/NestedSettings.svelte';
-  import type { NodeId, NodeInput, NodeInstance } from '@nodarium/types';
-
-  type InternalNodeInput = NodeInput & {
-    __node_type?: NodeId;
-    __node_input: string;
-  };
-
-  type Props = {
-    manager: GraphManager;
-    node: NodeInstance;
-  };
-
-  const { manager, node = $bindable() }: Props = $props();
-
-  function filterInputs(inputs?: Record<string, NodeInput>) {
-    const _inputs = $state.snapshot(
-      inputs as Record<string, InternalNodeInput>
-    );
-    return Object.fromEntries(
-      Object.entries(structuredClone(_inputs ?? {}))
-        .filter(([, value]) => {
-          return value.hidden === true;
-        })
-        .map(([key, value]) => {
-          value.__node_type = node.state.type?.id;
-          value.__node_input = key;
-          return [key, value];
-        })
-    );
-  }
-  const nodeDefinition = filterInputs(node.state.type?.inputs);
-
-  type Store = Record<string, number | number[]>;
-  let store = $state<Store>(createStore(node?.props, nodeDefinition));
-  function createStore(
-    props: NodeInstance['props'],
-    inputs: Record<string, NodeInput>
-  ): Store {
-    const store: Store = {};
-    Object.keys(inputs).forEach((key) => {
-      if (props) {
-        const value = props[key] !== undefined ? props[key] : inputs[key].value;
-        if (Array.isArray(value) || typeof value === 'number') {
-          store[key] = value;
-        } else if (typeof value === 'boolean') {
-          store[key] = value ? 1 : 0;
-        } else {
-          console.error('Wrong error', { value });
-        }
-      }
-    });
-    return store;
-  }
-
-  let lastPropsHash = '';
-  function updateNode() {
-    if (!node || !store) return;
-    let needsUpdate = false;
-    Object.keys(store).forEach((_key: string) => {
-      node.props = node.props || {};
-      const key = _key as keyof typeof store;
-      if (node && store) {
-        needsUpdate = true;
-        const value = store[key];
-        if (value !== undefined) {
-          node.props[key] = value;
-        }
-      }
-    });
-
-    let propsHash = JSON.stringify(node.props);
-    if (propsHash === lastPropsHash) {
-      return;
-    }
-    lastPropsHash = propsHash;
-
-    if (needsUpdate) {
-      manager.save();
-      manager.execute();
-    }
-  }
-
-  $effect(() => {
-    if (store) {
-      updateNode();
-    }
-  });
-</script>
-
-{#if Object.keys(nodeDefinition).length}
-  <NestedSettings
-    id="activeNodeSettings"
-    bind:value={store}
-    type={nodeDefinition}
-  />
-{:else}
-  <p class="mx-4 mt-4">Node has no settings</p>
-{/if}
@@ -1,26 +1,103 @@
 <script lang="ts">
  import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
-  import type { NodeInstance } from '@nodarium/types';
-  import ActiveNodeSelected from './ActiveNodeSelected.svelte';
+  import NestedSettings from '$lib/settings/NestedSettings.svelte';
+  import type { NodeId, NodeInput, NodeInstance } from '@nodarium/types';
+
+  type InternalNodeInput = NodeInput & {
+    __node_type?: NodeId;
+    __node_input: string;
+  };

  type Props = {
    manager: GraphManager;
    node: NodeInstance | undefined;
  };

-  let { manager, node = $bindable() }: Props = $props();
+  const { manager, node = $bindable() }: Props = $props();
+
+  function filterInputs(inputs?: Record<string, NodeInput>) {
+    if (!node) return {};
+    return Object.fromEntries(
+      Object.entries(inputs ?? {})
+        .filter(([, value]) => {
+          return value.hidden === true;
+        })
+        .map(([key, value]) => {
+          const v = value as InternalNodeInput;
+          v.__node_type = node.state.type?.id;
+          v.__node_input = key;
+          return [key, v];
+        })
+    );
+  }
+  const nodeDefinition = node ? filterInputs(node.state.type?.inputs) : {};
+
+  type Store = Record<string, number | number[]>;
+  let store = $state<Store>(createStore(node?.props, nodeDefinition));
+  function createStore(
+    props: NodeInstance['props'],
+    inputs: Record<string, NodeInput>
+  ): Store {
+    const store: Store = {};
+    Object.keys(inputs).forEach((key) => {
+      if (props) {
+        const value = props[key] !== undefined ? props[key] : inputs[key].value;
+        if (Array.isArray(value) || typeof value === 'number') {
+          store[key] = value;
+        } else if (typeof value === 'boolean') {
+          store[key] = value ? 1 : 0;
+        } else {
+          console.error('Wrong error', { value });
+        }
+      }
+    });
+    return store;
+  }
+
+  let lastPropsHash = '';
+  function updateNode() {
+    if (!node || !store) return;
+    let needsUpdate = false;
+    Object.keys(store).forEach((_key: string) => {
+      node.props = node.props || {};
+      const key = _key as keyof typeof store;
+      if (node && store) {
+        needsUpdate = true;
+        const value = store[key];
+        if (value !== undefined) {
+          node.props[key] = value;
+        }
+      }
+    });
+
+    let propsHash = JSON.stringify(node.props);
+    if (propsHash === lastPropsHash) {
+      return;
+    }
+    lastPropsHash = propsHash;
+
+    if (needsUpdate) {
+      manager.save();
+      manager.execute();
+    }
+  }
+
+  const isGroupInstance = $derived(node?.type === '__internal/group/instance');
+
+  $effect(() => {
+    if (store) {
+      updateNode();
+    }
+  });
 </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'>
-  <h3>Node Settings</h3>
-</div>
-
-{#if node}
-  {#key node.id}
-    {#if node}
-      <ActiveNodeSelected {manager} bind:node />
-    {/if}
-  {/key}
-{:else}
-  <p class="mx-4 mt-4">No node selected</p>
+{#if !isGroupInstance && Object.keys(nodeDefinition).length}
+  <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'>
+    <h3>Node Settings</h3>
+  </div>
+  <NestedSettings
+    id="activeNodeSettings"
+    bind:value={store}
+    type={nodeDefinition}
+  />
 {/if}
@@ -8,7 +8,7 @@
  import { humanizeDuration } from '$lib/helpers';
  import { localState } from '$lib/helpers/localState.svelte';
  import Monitor from '$lib/performance/Monitor.svelte';
-  import { InputNumber } from '@nodarium/ui';
+  import { Button, InputNumber } from '@nodarium/ui';
  import { writable } from 'svelte/store';

  function calculateStandardDeviation(array: number[]) {
@@ -112,7 +112,7 @@
      onclick={() => copyContent(result?.stdev + '')}
    >(click to copy)</i>
    <div>
-      <button onclick={() => (isRunning = false)}>reset</button>
+      <Button onclick={() => (isRunning = false)}>reset</Button>
    </div>
  {:else if isRunning}
    <p>WarmUp ({$warmUp}/{warmUpAmount})</p>
@@ -126,7 +126,7 @@
  {:else}
    <label for="bench-samples">Samples</label>
    <InputNumber id="bench-sample" bind:value={amount.value} max={1000} step={1} />
-    <button onclick={benchmark} disabled={isRunning}>start</button>
+    <Button variant="primary" onclick={benchmark} disabled={isRunning}>start</Button>
  {/if}
 </div>

@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { Button, toast } from '@nodarium/ui';
  import FileSaver from 'file-saver';
  import type { Group } from 'three';
  import type { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js';
@@ -28,11 +29,12 @@
    exporter.parse(
      scene,
      (gltf) => {
-        // download .gltf file
        download(gltf as ArrayBuffer, 'plant', 'text/plain', 'gltf');
+        toast('Exported as GLTF', 'success');
      },
      (err) => {
-        console.log(err);
+        const msg = err instanceof Error ? err.message : String(err);
+        toast(`GLTF export failed: ${msg}`, 'error');
      }
    );
  }
@@ -45,13 +47,18 @@
        objExporter = new m.OBJExporter();
        return objExporter;
      }));
-    const result = exporter.parse(scene);
-    // download .obj file
-    download(result, 'plant', 'text/plain', 'obj');
+    try {
+      const result = exporter.parse(scene);
+      download(result, 'plant', 'text/plain', 'obj');
+      toast('Exported as OBJ', 'success');
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      toast(`OBJ export failed: ${msg}`, 'error');
+    }
  }
 </script>

-<div class="p-4">
-  <button onclick={exportObj}>export obj</button>
-  <button onclick={exportGltf}>export gltf</button>
+<div class="p-4 flex gap-2">
+  <Button onclick={exportObj}>export obj</Button>
+  <Button onclick={exportGltf}>export gltf</Button>
 </div>
@@ -1,20 +1,23 @@
 <script lang="ts">
  import type { Graph } from '$lib/types';
+  import { JsonViewer } from '@nodarium/ui';

  const { graph }: { graph?: Graph } = $props();

-  function convert(g: Graph): string {
-    return JSON.stringify(
-      {
-        ...g,
-        nodes: g.nodes.map((n: object) => ({ ...n, tmp: undefined, state: undefined }))
-      },
-      null,
-      2
-    );
-  }
+  const data = $derived(
+    graph
+      ? {
+        ...graph,
+        nodes: graph.nodes.map((n: object) => ({ ...n, state: undefined }))
+      }
+      : null
+  );
 </script>

-<pre>
-  {graph ? convert(graph) : "No graph loaded"}
-</pre>
+<div class="overflow-auto p-2">
+  {#if data}
+    <JsonViewer value={data} path="graph" />
+  {:else}
+    <span class="font-mono text-xs text-neutral-500">No graph loaded</span>
+  {/if}
+</div>
@@ -0,0 +1,156 @@
+<script lang="ts">
+  import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
+  import { GraphState } from '$lib/graph-interface/graph-state.svelte';
+  import type { NodeInstance } from '@nodarium/types';
+  import { SocketTable } from '@nodarium/ui';
+  import UnusedGroupsPanel from './UnusedGroupsPanel.svelte';
+
+  type Props = {
+    manager: GraphManager;
+    graphState: GraphState;
+    node?: NodeInstance;
+  };
+
+  const { manager, graphState, node = $bindable() }: Props = $props();
+
+  const activeGroup = $derived.by(() => {
+    if (node?.type === '__internal/group/instance') {
+      let group = manager.getGroup(node.props?.groupId as number);
+      if (group) return group;
+    }
+
+    if (manager?.isInsideGroup && manager.currentGroupId !== null) {
+      return manager.getGroup(manager.currentGroupId);
+    }
+  });
+
+  const groupName = $derived(activeGroup?.name ?? '');
+  function handleRename(e: Event) {
+    const name = (e.target as HTMLInputElement).value;
+    if (activeGroup) manager.renameGroup(activeGroup.id, name);
+  }
+
+  function handleRemoveInput(key: string) {
+    if (!activeGroup) return;
+    const group = manager.getGroup(activeGroup?.id);
+    const inputs = $state.snapshot(group?.inputs ?? {});
+    delete inputs[key];
+    activeGroup.inputs = inputs;
+    manager.nodes = manager.nodes;
+    manager.save();
+  }
+
+  const types = $derived(
+    Array.from(
+      new Set(
+        manager?.registry
+          ? manager.registry.getAllNodes()
+            .flatMap(n =>
+              Object.values(n.inputs ?? {})
+                .map(v => v.type)
+            )
+          : []
+      )
+    )
+  );
+
+  let outputType = $derived(activeGroup?.outputs?.[0]?.type ?? 'unknown');
+
+  $effect(() => {
+    if (!activeGroup) return;
+    const group = manager.getGroup(activeGroup?.id);
+    const outputs = $state.snapshot(group?.outputs ?? []);
+    if (outputs?.[0]?.type === outputType) return;
+    activeGroup.outputs = [
+      {
+        label: outputs[0]?.label ?? 'Output',
+        type: outputType
+      }
+    ];
+    manager.nodes = manager.nodes;
+    manager.save();
+  });
+</script>
+
+{#if activeGroup}
+  <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'>
+    <h3>Group Settings</h3>
+  </div>
+{/if}
+
+{#if activeGroup}
+  {#key activeGroup.id}
+    <div class="p-4 group-settings">
+      <label for="group-name">Group name</label>
+      <input
+        id="group-name"
+        type="text"
+        placeholder="Group {activeGroup.id}"
+        value={groupName}
+        oninput={handleRename}
+      />
+
+      <label for="group-name">Group Inputs</label>
+      <div>
+        <SocketTable
+          {types}
+          onremove={handleRemoveInput}
+          bind:inputs={activeGroup.inputs}
+          colors={graphState?.colors?.getColors()}
+        />
+      </div>
+
+      <label for="group-name mb-2">Group output</label>
+      <div class="flex bg-layer-2 rounded-sm outline outline-outline w-min">
+        <span
+          style:background={graphState?.colors?.getColor(outputType)}
+          class="block opacity-50 min-w-2 ml-2 w-2 h-2 my-auto rounded-sm"
+        ></span>
+        <select
+          class="text-[0.9em] shrink-0 px-2 py-1 border-outline"
+          bind:value={outputType}
+        >
+          {#each types as type (type)}
+            <option>
+              <span
+                style="background: {graphState?.colors?.getColor(type)}; width: 5px; height: 5px; border-radius: 5px;"
+              ></span>
+              {type}
+            </option>
+          {/each}
+        </select>
+      </div>
+    </div>
+  {/key}
+{/if}
+
+{#if manager && !manager.isInsideGroup}
+  <UnusedGroupsPanel {manager} />
+{/if}
+
+<style>
+  .group-settings {
+    display: flex;
+    flex-direction: column;
+    gap: 0.4em;
+  }
+
+  label {
+    font-size: 0.8em;
+    opacity: 0.7;
+  }
+
+  .group-settings input {
+    background: var(--color-layer-1);
+    border: 1px solid var(--color-outline);
+    border-radius: 4px;
+    color: var(--color-text);
+    font-family: var(--font-family);
+    font-size: 0.9em;
+    padding: 0.4em 0.6em;
+  }
+
+  .group-settings input:focus {
+    outline: 1px solid var(--color-active);
+  }
+</style>
@@ -0,0 +1,122 @@
+<script lang="ts">
+  import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
+  import type { GroupDefinition } from '@nodarium/types';
+  import { Button } from '@nodarium/ui';
+  import { SvelteMap, SvelteSet } from 'svelte/reactivity';
+
+  type Props = { manager: GraphManager };
+  const { manager }: Props = $props();
+
+  type GroupNode = { group: GroupDefinition; children: GroupNode[] };
+
+  const unusedTree = $derived.by((): GroupNode[] => {
+    const unused = manager.getUnusedGroups();
+    if (!unused.length) return [];
+
+    const unusedIds = new Set(unused.map(g => g.id));
+
+    // Build child map: which unused groups reference which other unused groups
+    const childrenOf = new SvelteMap<number, number[]>();
+    const referencedBy = new SvelteSet<number>();
+
+    for (const group of unused) {
+      const refs: number[] = [];
+      for (const node of group.nodes) {
+        if (node.type === '__internal/group/instance' && node.props?.groupId !== undefined) {
+          const childId = node.props.groupId as number;
+          if (unusedIds.has(childId)) {
+            refs.push(childId);
+            referencedBy.add(childId);
+          }
+        }
+      }
+      childrenOf.set(group.id, refs);
+    }
+
+    const byId = new Map(unused.map(g => [g.id, g]));
+
+    function buildNode(g: GroupDefinition): GroupNode {
+      return {
+        group: g,
+        children: (childrenOf.get(g.id) ?? []).map(id => buildNode(byId.get(id)!))
+      };
+    }
+
+    return unused
+      .filter(g => !referencedBy.has(g.id))
+      .map(buildNode);
+  });
+</script>
+
+{#if unusedTree.length}
+  <div class="panel p-4">
+    <div class="header">
+      <span>Unused groups</span>
+      <Button size="sm" variant="destructive" onclick={() => manager.removeUnusedGroups()}>
+        Remove all
+      </Button>
+    </div>
+
+    <ul class="tree">
+      {#snippet treeNode(node: GroupNode)}
+        <li>
+          <span class="group-name">{node.group.name || `Group #${node.group.id}`}</span>
+          {#if node.children.length}
+            <ul>
+              {#each node.children as child (child.group.id)}
+                {@render treeNode(child)}
+              {/each}
+            </ul>
+          {/if}
+        </li>
+      {/snippet}
+      {#each unusedTree as node (node.group.id)}
+        {@render treeNode(node)}
+      {/each}
+    </ul>
+  </div>
+{/if}
+
+<style>
+  .panel {
+    border-top: 1px solid var(--color-outline);
+    margin-top: -1px;
+    border-bottom: 1px solid var(--color-outline);
+  }
+
+  .header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 0.5em;
+    font-size: 0.8em;
+    opacity: 0.7;
+  }
+
+
+  .tree {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .tree ul {
+    list-style: none;
+    margin: 0;
+    padding-left: 1.2em;
+    border-left: 1px solid var(--color-outline);
+  }
+
+  .tree li {
+    padding: 0.15em 0;
+  }
+
+  .group-name {
+    font-size: 0.85em;
+  }
+
+  .tree ul .group-name::before {
+    content: '└ ';
+    opacity: 0.4;
+  }
+</style>
@@ -24,11 +24,10 @@ export const tutorialConfig: PlantyConfig = {

    tour_canvas: {
      position: 'bottom-left',
-      hook: 'setup-default',
+      action: 'setup-default',
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        'This is the **graph canvas**. Nodes connect together to build a plant — the 3D model updates automatically whenever you make a change.\nEach node does one specific job: grow stems, add noise, produce output.',
-      waitFor: 'click',
      next: 'tour_viewer'
    },

@@ -37,7 +36,6 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.cell:first-child', padding: 8 },
      text:
        'This is the **3D viewer** — the live preview of your plant.\nLeft-click to rotate · right-click to pan · scroll to zoom.',
-      waitFor: 'click',
      next: 'try_params'
    },

@@ -46,16 +44,14 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        'Click a node to select it. Its settings appear **directly on the node** — try changing a value and watch the plant update.\nThe sidebar shows extra hidden settings for the selected node.',
-      waitFor: 'click',
      next: 'start_building'
    },

    start_building: {
      position: 'center',
-      hook: 'load-tutorial-template',
+      action: 'load-tutorial-template',
      text:
        "Now let's build your own plant from scratch!\nI've loaded a blank project — it only has an **Output** node. Your goal: connect nodes to make a plant.",
-      waitFor: 'click',
      next: 'add_stem_node'
    },

@@ -64,7 +60,6 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        "Open the **Add Menu** with **Shift+A** or **right-click** on the canvas.\nAdd a **Stem** node, then connect its output socket to the Output node's input.",
-      waitFor: 'click',
      next: 'add_noise_node'
    },

@@ -73,7 +68,6 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        'Add a **Noise** node the same way.\nConnect: Stem → Noise input, then Noise output → Output.\nThis makes the stems grow in organic, curved shapes.',
-      waitFor: 'click',
      next: 'add_random_node'
    },

@@ -82,7 +76,6 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        "Let's add some randomness! Add a **Random** node and connect its output to the **thickness** or **length** input of the Stem node.\nThe default min/max range is small — **Ctrl+drag** any number field to exceed its normal limits.",
-      waitFor: 'click',
      next: 'prompt_regenerate'
    },

@@ -91,7 +84,6 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        'Now press **R** to regenerate. Each press gives the Random node a new value — your plant changes every run!',
-      waitFor: 'click',
      next: 'tour_sidebar'
    },

@@ -100,16 +92,13 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.tabs', padding: 4 },
      text:
        'The **sidebar** holds all your tools:\n⚙️ Settings · ⌨️ Shortcuts · 📦 Export · 📁 Projects · 📊 Graph Settings\nEnable **Advanced Mode** in Settings to unlock performance and benchmark panels.',
-      waitFor: 'click',
      next: 'save_project'
    },

    save_project: {
      position: 'right',
-      highlight: { selector: '.tabs', padding: 4 },
      text:
        'Your work is saved in the **Projects panel** — rename it, create new projects, or switch between them anytime.',
-      waitFor: 'click',
      next: 'congrats'
    },

@@ -129,22 +118,16 @@ export const tutorialConfig: PlantyConfig = {

    tour_canvas_nerd: {
      position: 'bottom-left',
-      hook: 'setup-default',
+      action: 'setup-default',
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        "The **graph canvas** renders a directed acyclic graph. Each node is an individual **WASM module** executed in isolation — inputs in, output out. The 3D model updates automatically on every change.\nI've loaded a starter graph so you can see it in action.",
      choices: [
        {
          label: '🔍 Explore Node Sourcecode',
-          onclick: () => {
-            window.open(
-              'https://git.max-richter.dev/max/nodarium/src/branch/main/nodes/max/plantarium',
-              '__blank'
-            );
-          }
+          action: 'open-github-nodes'
        }
      ],
-      waitFor: 'click',
      next: 'tour_viewer_nerd'
    },

@@ -153,15 +136,13 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.cell:first-child', padding: 8 },
      text:
        'The **3D viewer** uses `@threlte/core` (Svelte + Three.js). Mesh data streams from WASM execution results. OrbitControls: left-drag rotate, right-drag pan, scroll zoom.',
-      waitFor: 'click',
      next: 'tour_runtime_nerd'
    },

    tour_runtime_nerd: {
-      position: 'right',
+      position: 'bottom-right',
      text:
        'By default, nodes execute in a **WebWorker** for better performance. You can switch to main-thread execution by disabling **Debug → Execute in WebWorker** in Settings.\nEnable **Advanced Mode** to unlock the Performance and Benchmark panels.',
-      waitFor: 'click',
      next: 'start_building'
    },

@@ -171,7 +152,6 @@ export const tutorialConfig: PlantyConfig = {
      position: 'bottom-right',
      text:
        'Node sockets are **type-checked**. The coloured dots tell you what kind of data flows through:\n🔵 `number` · 🟢 `vec3` · 🟣 `shape` · ⚪ `*` (wildcard)',
-      waitFor: 'click',
      next: 'connections_rules'
    },

@@ -191,7 +171,6 @@ export const tutorialConfig: PlantyConfig = {
      highlight: { selector: '.graph-wrapper', padding: 12 },
      text:
        'Click any node to select it. Basic settings are shown **on the node itself**.\nThe sidebar under *Graph Settings → Active Node* shows the full list:\n**Number** — drag or type · **Vec3** — X/Y/Z · **Select** — dropdown · **Color** — picker',
-      waitFor: 'click',
      next: 'params_tip'
    },

@@ -210,7 +189,6 @@ export const tutorialConfig: PlantyConfig = {
      position: 'bottom-right',
      text:
        'Add a **Debug node** from the Add Menu (Shift+A or right-click). It accepts `*` wildcard inputs — connect any socket to inspect the data flowing through.\nEnable **Advanced Mode** in Settings to also see Performance and Graph Source panels.',
-      waitFor: 'click',
      next: 'debug_done'
    },

@@ -228,7 +206,6 @@ export const tutorialConfig: PlantyConfig = {
      position: 'bottom-right',
      text:
        '**Essential shortcuts:**\n`R` — Regenerate\n`Shift+A` / right-click — Add node\n`f` — Smart-connect selected nodes\n`.` — Center camera\n`Ctrl+Z` / `Ctrl+Y` — Undo / Redo\n`Delete` — Remove selected · `Ctrl+Delete` — Remove and restore edges',
-      waitFor: 'click',
      next: 'shortcuts_done'
    },

@@ -247,7 +224,6 @@ export const tutorialConfig: PlantyConfig = {
      position: 'right',
      text:
        'Export your 3D model from the **📦 Export** panel:\n**GLB** — standard for 3D apps (Blender, Three.js)\n**OBJ** — legacy format · **STL** — 3D printing · **PNG** — screenshot',
-      waitFor: 'click',
      next: 'congrats'
    },

@@ -4,9 +4,10 @@
  import Grid from '$lib/grid';
  import { debounceAsyncFunction } from '$lib/helpers';
  import { createKeyMap } from '$lib/helpers/createKeyMap';
-  import { debugNode } from '$lib/node-registry/debugNode.js';
+  import { debugNode } from '$lib/node-registry/debugNode';
+  import { groupNode } from '$lib/node-registry/groupNode.js';
  import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
-  import NodeStore from '$lib/node-store/NodeStore.svelte';
+
  import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
  import { ProjectManager } from '$lib/project-manager/project-manager.svelte';
  import ProjectManagerEl from '$lib/project-manager/ProjectManager.svelte';
@@ -21,23 +22,26 @@
  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 GroupSettings from '$lib/sidebar/panels/GroupSettings.svelte';
  import Keymap from '$lib/sidebar/panels/Keymap.svelte';
  import { panelState } from '$lib/sidebar/PanelState.svelte';
  import Sidebar from '$lib/sidebar/Sidebar.svelte';
  import { tutorialConfig } from '$lib/tutorial/tutorial-config';
  import { Planty } from '@nodarium/planty';
  import type { Graph, NodeInstance } from '@nodarium/types';
+  import { Spinner, Toast, toast } from '@nodarium/ui';
  import { createPerformanceStore } from '@nodarium/utils';
  import type { Group } from 'three';

  let performanceStore = createPerformanceStore();
  let planty = $state<ReturnType<typeof Planty>>();
+  let pendingSave = false;

  const { data } = $props();

  const registryCache = new IndexDBCache('node-registry');

-  const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode]);
+  const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode, groupNode]);
  const workerRuntime = new WorkerRuntimeExecutor();
  const runtimeCache = new MemoryRuntimeCache();
  const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
@@ -49,8 +53,8 @@
  );

  $effect(() => {
-    workerRuntime.useRegistryCache = appSettings.value.debug.cache.useRuntimeCache;
-    workerRuntime.useRuntimeCache = appSettings.value.debug.cache.useRegistryCache;
+    workerRuntime.useRegistryCache = appSettings.value.debug.cache.useRegistryCache;
+    workerRuntime.useRuntimeCache = appSettings.value.debug.cache.useRuntimeCache;

    if (appSettings.value.debug.cache.useRegistryCache) {
      nodeRegistry.cache = registryCache;
@@ -65,8 +69,19 @@
    }
  });

+  $effect(() => {
+    const handler = (e: BeforeUnloadEvent) => {
+      if (pendingSave) {
+        e.preventDefault();
+      }
+    };
+    window.addEventListener('beforeunload', handler);
+    return () => window.removeEventListener('beforeunload', handler);
+  });
+
  let activeNode = $state<NodeInstance | undefined>(undefined);
  let scene = $state<Group>(null!);
+  let isExecuting = $state(false);

  let sidebarOpen = $state(false);
  let graphInterface = $state<ReturnType<typeof GraphInterface>>(null!);
@@ -94,15 +109,21 @@
    randomSeed: { type: 'boolean', value: false }
  });
  $effect(() => {
-    if (graphSettings && graphSettingTypes) {
+    if (graphSettings && graphSettingTypes && manager?.loaded) {
      manager?.setSettings($state.snapshot(graphSettings));
    }
  });

+  let timeout: ReturnType<typeof setTimeout>;
+
  async function update(
    g: Graph,
    s: Record<string, unknown> = $state.snapshot(graphSettings)
  ) {
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      isExecuting = true;
+    }, 100);
    performanceStore.startRun();
    try {
      let a = performance.now();
@@ -125,8 +146,11 @@
      }
      viewerComponent?.update(graphResult);
    } catch (error) {
-      console.log('errors', error);
+      const msg = error instanceof Error ? error.message : String(error);
+      toast(`Execution failed: ${msg}`, 'error');
    } finally {
+      clearTimeout(timeout);
+      isExecuting = false;
      performanceStore.stopRun();
    }
  }
@@ -168,8 +192,9 @@
 <Planty
  bind:this={planty}
  config={tutorialConfig}
-  hooks={{
+  actions={{
    'setup-default': () => {
+      console.log('setup-default');
      const ts = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' });
      pm.handleCreateProject(
        structuredClone(templates.defaultPlant) as unknown as Graph,
@@ -177,12 +202,61 @@
      );
    },
    'load-tutorial-template': () => {
+      console.log('load-tutorial-template');
      if (!pm.graph) return;
      const g = structuredClone(templates.tutorial) as unknown as Graph;
      g.id = pm.graph.id;
      g.meta = { ...pm.graph.meta };
-      pm.graph = g;
-      pm.saveGraph(g);
+      manager.load(g);
+      graphInterface.state.centerNode(graphInterface.manager.getAllNodes()[0]);
+    },
+    'open-github-nodes': () => {
+      console.log('open-github-nodes');
+      window.open(
+        'https://github.com/jim-fx/nodarium/tree/main/nodes/max/plantarium',
+        '__blank'
+      );
+    }
+  }}
+  hooks={{
+    'action:add_stem_node': (cb) => {
+      const unsub = manager.on('save', () => {
+        const allNodes = graphInterface.manager.getAllNodes();
+        const stemNode = allNodes.find(n => n.type === 'max/plantarium/stem');
+        if (stemNode && graphInterface.manager.edges.length) {
+          unsub();
+          (cb as () => void)();
+        }
+      });
+    },
+    'action:add_noise_node': (cb) => {
+      const unsub = manager.on('save', () => {
+        const allNodes = graphInterface.manager.getAllNodes();
+        const noiseNode = allNodes.find(n => n.type === 'max/plantarium/noise');
+        if (noiseNode && graphInterface.manager.edges.length > 1) {
+          unsub();
+          (cb as () => void)();
+        }
+      });
+    },
+    'action:add_random_node': (cb) => {
+      const unsub = manager.on('save', () => {
+        const allNodes = graphInterface.manager.getAllNodes();
+        const noiseNode = allNodes.find(n => n.type === 'max/plantarium/random');
+        if (noiseNode && graphInterface.manager.edges.length > 2) {
+          unsub();
+          (cb as () => void)();
+        }
+      });
+    },
+    'action:prompt_regenerate': (cb) => {
+      function handleKeydown(e: KeyboardEvent) {
+        if (e.key === 'r') {
+          window.removeEventListener('keydown', handleKeydown);
+          (cb as () => void)();
+        }
+      }
+      window.addEventListener('keydown', handleKeydown);
    },
    'before:save_project': () => panelState.setActivePanel('projects'),
    'before:export_tour': () => panelState.setActivePanel('exports'),
@@ -196,30 +270,43 @@
  <header></header>
  <Grid.Row>
    <Grid.Cell>
-      <Viewer
-        bind:scene
-        bind:this={viewerComponent}
-        perf={performanceStore}
-        debugData={debugData}
-        centerCamera={appSettings.value.centerCamera}
-      />
+      <div class="viewer-cell">
+        <Viewer
+          bind:scene
+          bind:this={viewerComponent}
+          perf={performanceStore}
+          debugData={debugData}
+          centerCamera={appSettings.value.centerCamera}
+        />
+        {#if isExecuting}
+          <div class="viewer-spinner" aria-label="Executing graph">
+            <Spinner size={28} />
+          </div>
+        {/if}
+      </div>
    </Grid.Cell>
    <Grid.Cell>
      {#if pm.graph}
-        <GraphInterface
-          graph={pm.graph}
-          bind:this={graphInterface}
-          registry={nodeRegistry}
-          addMenuPadding={{ right: sidebarOpen ? 330 : undefined }}
-          backgroundType={appSettings.value.nodeInterface.backgroundType}
-          snapToGrid={appSettings.value.nodeInterface.snapToGrid}
-          bind:activeNode
-          bind:showHelp={appSettings.value.nodeInterface.showHelp}
-          bind:settings={graphSettings}
-          bind:settingTypes={graphSettingTypes}
-          onsave={(g) => pm.saveGraph(g)}
-          onresult={(result) => handleUpdate(result as Graph)}
-        />
+        {#key pm.graph.id}
+          <GraphInterface
+            graph={pm.graph}
+            bind:this={graphInterface}
+            registry={nodeRegistry}
+            safePadding={{ right: sidebarOpen ? 321 : undefined }}
+            backgroundType={appSettings.value.nodeInterface.backgroundType}
+            snapToGrid={appSettings.value.nodeInterface.snapToGrid}
+            bind:activeNode
+            bind:showHelp={appSettings.value.nodeInterface.showHelp}
+            bind:settings={graphSettings}
+            bind:settingTypes={graphSettingTypes}
+            onsave={async (g) => {
+              pendingSave = true;
+              await pm.saveGraph(g);
+              pendingSave = false;
+            }}
+            onresult={(result) => handleUpdate(result as Graph)}
+          />
+        {/key}
      {/if}
      <Sidebar bind:open={sidebarOpen}>
        <Panel id="general" title="General" icon="i-[tabler--settings]">
@@ -245,15 +332,7 @@
        <Panel id="exports" title="Exporter" icon="i-[tabler--package-export]">
          <ExportSettings {scene} />
        </Panel>
-        {#if false}
-          <Panel
-            id="node-store"
-            title="Node Store"
-            icon="i-[tabler--database] bg-green-400"
-          >
-            <NodeStore registry={nodeRegistry} />
-          </Panel>
-        {/if}
+
        <Panel
          id="performance"
          title="Performance"
@@ -273,7 +352,9 @@
          hidden={!appSettings.value.debug.advancedMode}
          icon="i-[tabler--code]"
        >
-          <GraphSource graph={pm.graph ?? manager?.serialize()} />
+          {#if manager?.status === 'idle'}
+            <GraphSource graph={manager.serialize()} />
+          {/if}
        </Panel>
        <Panel
          id="benchmark"
@@ -288,12 +369,16 @@
          title="Graph Settings"
          icon="i-[custom--graph] bg-blue-400"
        >
+          <span class="block h-[1px]"></span>
          <NestedSettings
            id="graph-settings"
            type={graphSettingTypes}
            bind:value={graphSettings}
          />
-          <ActiveNodeSettings {manager} bind:node={activeNode} />
+          {#key activeNode}
+            <ActiveNodeSettings {manager} bind:node={activeNode} />
+            <GroupSettings graphState={graphInterface?.state} {manager} bind:node={activeNode} />
+          {/key}
        </Panel>
        <Panel
          id="changelog"
@@ -307,6 +392,8 @@
  </Grid.Row>
 </div>

+<Toast />
+
 <style>
  header {
    background-color: var(--color-layer-1);
@@ -336,7 +423,21 @@
    width: 100vw;
    color: white;
    display: grid;
-    grid-template-rows: 36px 1fr;
+    grid-template-rows: 0px 1fr;
+  }
+
+  .viewer-cell {
+    position: relative;
+    height: 100%;
+  }
+
+  .viewer-spinner {
+    position: absolute;
+    bottom: 12px;
+    right: 12px;
+    color: var(--color-text, #cecece);
+    opacity: 0.6;
+    pointer-events: none;
  }

  .wrapper :global(canvas) {
@@ -1,10 +1,10 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import tailwindcss from '@tailwindcss/vite';
 import { playwright } from '@vitest/browser-playwright';
+import path from 'path';
 import comlink from 'vite-plugin-comlink';
 import glsl from 'vite-plugin-glsl';
 import wasm from 'vite-plugin-wasm';
-import path from 'path';
 import { defineConfig } from 'vitest/config';

 export default defineConfig({
@@ -0,0 +1,216 @@
+# Nodarium — LLM Reference
+
+## What It Is
+
+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.
+
+---
+
+## Repository Layout
+
+```
+/
+├── 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/
+```
+
+---
+
+## Core Architecture
+
+```
+User Interaction
+  └── GraphInterface
+        ├── GraphState   ← UI: selection, camera, mouse, clipboard
+        └── 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:**
+
+1. User edits graph → GraphManager mutates state
+2. GraphManager emits `save` → ProjectManager persists to IndexDB
+3. GraphManager emits `result` → Runtime executes graph → Viewer updates
+
+---
+
+## Critical Files
+
+| File                                                   | Role                                                                  |
+| ------------------------------------------------------ | --------------------------------------------------------------------- |
+| `app/src/routes/+page.svelte`                          | Wires all systems; creates GraphManager, runtime, registry            |
+| `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          |
+
+---
+
+## Key Types
+
+```typescript
+// packages/types/src/types.ts
+
+type NodeId = `${string}/${string}/${string}`; // e.g. "max/plantarium/stem"
+
+type NodeInstance = {
+  id: number;
+  type: NodeId;
+  position: [number, number];
+  props?: Record<string, number | number[]>; // current parameter values
+  meta?: { title?: string; lastModified?: string };
+  state: NodeRuntimeState; // runtime-only, NOT serialized
+};
+
+type NodeRuntimeState = {
+  type?: NodeDefinition; // resolved definition
+  parents?: NodeInstance[];
+  children?: NodeInstance[];
+  x?: number;
+  y?: number; // interpolated position
+  mesh?: Mesh; // Three.js mesh reference
+  ref?: HTMLElement;
+};
+
+type NodeDefinition = {
+  id: NodeId;
+  inputs?: Record<string, NodeInput>;
+  outputs?: string[]; // output type names
+  meta?: { title?: string; description?: string };
+  execute(input: Int32Array): Int32Array; // WASM function
+};
+
+// Edge: [fromNode, outputIndex, toNode, inputSocketName]
+type Edge = [NodeInstance, number, NodeInstance, string];
+
+type Graph = {
+  nodes: NodeInstance[];
+  edges: [number, number, number, string][]; // serialized (IDs, not refs)
+  settings: Record<string, unknown>;
+  groups: GroupDefinition[];
+};
+
+type GroupDefinition = {
+  id: number;
+  nodes: NodeInstance[];
+  edges: Edge[];
+  inputs?: Record<string, NodeInput>;
+  outputs?: string[];
+};
+```
+
+### NodeInput socket types
+
+`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).
+
+---
+
+## Patterns & Conventions
+
+### 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)
+npm run build        # production build
+npm run check        # svelte-check + tsc
+npm run lint         # eslint
+npm run test         # unit (vitest) + e2e (playwright)
+npm run test:unit    # vitest only
+npm run test:e2e     # playwright only
+npm run bench        # benchmark runner
+```
@@ -0,0 +1,645 @@
+# Comprehensive UX Practices for Web Applications
+
+## Introduction
+
+This document consolidates many of the most important practical UX principles for modern web applications.
+
+---
+
+# 1. Core UX Principles
+
+## 1.1 Visibility of System Status
+
+Users should always understand:
+
+- What the system is doing
+- Whether an action succeeded
+- Whether work is still in progress
+- Whether an error occurred
+
+### Good Practices
+
+- Show loading indicators immediately
+- Show success confirmations after important actions
+- Show inline validation messages
+- Display progress for long-running tasks
+- Use skeleton loading states instead of blank screens
+- Prevent silent failures
+- Avoid ambiguous UI states
+
+### Bad Practices
+
+- Buttons with no feedback after clicking
+- Infinite spinners without explanation
+- Hidden background operations
+- Saving without visible confirmation
+
+---
+
+## 1.2 Predictability and Consistency
+
+Users build mental models quickly.
+
+Breaking established expectations increases cognitive load and causes mistakes.
+
+### Good Practices
+
+- Use consistent layouts
+- Keep interaction patterns stable
+- Reuse common UI conventions
+- Keep naming and terminology consistent
+- Use standard keyboard shortcuts
+- Make similar components behave similarly
+
+### Bad Practices
+
+- Different button styles for identical actions
+- Inconsistent navigation behavior
+- Custom controls that ignore platform conventions
+- Unexpected modal behavior
+
+---
+
+## 1.3 Recognition Over Recall
+
+Interfaces should minimize memory requirements.
+
+Users should recognize options instead of remembering information.
+
+### Good Practices
+
+- Show recent searches
+- Use autocomplete
+- Display contextual hints
+- Preserve previously entered values
+- Use visible labels
+- Keep important actions visible
+
+### Bad Practices
+
+- Placeholder-only labels
+- Hidden functionality
+- Requiring users to remember previous state
+- Removing useful context during workflows
+
+---
+
+## 1.4 Error Prevention
+
+Preventing mistakes is better than handling mistakes.
+
+### Good Practices
+
+- Disable impossible actions
+- Validate input early
+- Warn before destructive operations
+- Use constrained input formats
+- Use safe defaults
+- Prefer undo over confirmation dialogs
+
+### Bad Practices
+
+- Destructive actions near common actions
+- Easy accidental deletion
+- Poor validation timing
+- Irreversible operations without recovery
+
+---
+
+# 2. Input and Form UX
+
+Forms are one of the most important and failure-prone areas in web applications.
+
+---
+
+## 2.1 Input Focus Behavior
+
+### Good Practices
+
+- Autofocus the primary field when appropriate
+- Preserve focus during rerenders
+- Preserve cursor position
+- Support keyboard-first workflows
+- Use logical tab ordering
+
+### Auto-Selecting Input Text
+
+Auto-selecting text on focus is context-dependent.
+
+### Good Use Cases
+
+- Quantity fields
+- Rename dialogs
+- Editable defaults
+- Quick replacement workflows
+- Temporary values users often replace entirely
+
+### Bad Use Cases
+
+- Long textareas
+- Complex text editing
+- Fields users commonly partially edit
+- Rich text editing
+
+### Principle
+
+Only auto-select when full replacement is more likely than partial editing.
+
+---
+
+## 2.2 Labels and Placeholders
+
+### Good Practices
+
+- Always use visible labels
+- Use placeholders only as supplementary examples
+- Keep labels visible after typing
+- Associate labels correctly for accessibility
+
+### Bad Practices
+
+- Placeholder-only forms
+- Ambiguous labels
+- Labels that disappear during editing
+
+---
+
+## 2.3 Validation
+
+### Recommended Validation Timing
+
+| Validation Type     | Timing    |
+| ------------------- | --------- |
+| Format validation   | Immediate |
+| Semantic validation | On blur   |
+| Server validation   | On submit |
+
+### Good Practices
+
+- Show errors near the relevant field
+- Explain how to fix issues
+- Preserve entered values after errors
+- Validate incrementally
+- Use clear language
+
+### Bad Practices
+
+- Generic “Invalid input” messages
+- Clearing form data after errors
+- Delayed validation surprises
+- Validation that interrupts typing
+
+---
+
+## 2.4 Input Types
+
+### Good Practices
+
+Use appropriate HTML input types:
+
+- `email`
+- `tel`
+- `number`
+- `date`
+- `password`
+- `search`
+
+### Benefits
+
+- Better mobile keyboards
+- Native validation
+- Improved accessibility
+- Better autofill support
+
+---
+
+## 2.5 Form Submission
+
+### Good Practices
+
+- Enter submits forms when expected
+- Escape cancels dialogs
+- Show loading states during submission
+- Prevent duplicate submissions
+- Preserve draft state
+- Allow keyboard submission
+
+### Bad Practices
+
+- Disabled submit buttons without explanation
+- Hidden validation failures
+- Silent submission failures
+
+---
+
+## 2.6 Dropdowns and Selection UX
+
+### Good Practices
+
+- Use radio buttons for small option sets
+- Use searchable selects for large datasets
+- Prefer autocomplete for many options
+- Show selected state clearly
+
+### Bad Practices
+
+- Massive unsearchable dropdowns
+- Nested dropdown hierarchies
+- Multi-select controls without search
+
+---
+
+# 3. Navigation UX
+
+---
+
+## 3.1 Orientation
+
+Users should always know:
+
+- Where they are
+- How they got there
+- What they can do next
+- How to go back
+
+### Good Practices
+
+- Highlight active navigation
+- Use breadcrumbs when helpful
+- Use meaningful page titles
+- Preserve navigation consistency
+
+---
+
+## 3.2 Navigation Structure
+
+### Good Practices
+
+- Keep hierarchy shallow
+- Group related actions
+- Use descriptive names
+- Keep primary actions stable
+
+### Bad Practices
+
+- Deep nesting
+- Ambiguous navigation labels
+- Constantly moving actions
+
+---
+
+## 3.3 URL Design
+
+### Good Practices
+
+- Use readable URLs
+- Make URLs shareable
+- Preserve app state in URLs when useful
+- Support browser history correctly
+
+### Bad Practices
+
+- Opaque generated URLs
+- Broken back button behavior
+- Losing state during navigation
+
+---
+
+# 4. Interaction Design
+
+---
+
+## 4.1 Click Targets
+
+### Good Practices
+
+- Large clickable areas
+- Adequate spacing between actions
+- Clear hover/focus states
+- Touch-friendly sizing
+
+### Bad Practices
+
+- Tiny clickable regions
+- Overlapping interactive elements
+- Hidden hit areas
+
+---
+
+## 4.2 Feedback
+
+Every interaction should produce feedback.
+
+### Good Practices
+
+- Hover states
+- Active states
+- Loading indicators
+- Success states
+- Error states
+- Optimistic updates when appropriate
+
+### Bad Practices
+
+- Dead-feeling interfaces
+- Invisible processing
+- Delayed reactions
+
+---
+
+## 4.3 Destructive Actions
+
+### Good Practices
+
+- Require confirmation for dangerous actions
+- Prefer undo systems
+- Visually distinguish destructive buttons
+- Separate destructive actions spatially
+
+### Bad Practices
+
+- Immediate irreversible deletion
+- Dangerous actions near common actions
+- Ambiguous destructive wording
+
+---
+
+## 4.4 Modal UX
+
+### Good Practices
+
+- Trap keyboard focus
+- Support Escape to close
+- Restore focus after closing
+- Prevent background interaction
+- Keep modal purpose focused
+
+### Bad Practices
+
+- Nested modals
+- Full workflows inside modals
+- Losing unsaved work accidentally
+
+---
+
+# 5. Performance UX
+
+Performance is a UX feature.
+
+Users interpret slowness as unreliability.
+
+---
+
+## 5.1 Perceived Performance
+
+### Good Practices
+
+- Show immediate visual response
+- Use optimistic UI updates
+- Preload likely next content
+- Stream content progressively
+- Use skeleton loaders
+
+### Bad Practices
+
+- Blank screens during loading
+- Long blocking operations
+- Frozen interfaces
+
+---
+
+## 5.2 Layout Stability
+
+### Good Practices
+
+- Prevent layout shift
+- Reserve image dimensions
+- Avoid moving buttons during loading
+- Keep skeletons aligned with final layout
+
+### Bad Practices
+
+- Jumping content
+- Shifting controls
+- Reflow-heavy rendering
+
+---
+
+## 5.3 Responsiveness
+
+### Good Practices
+
+- Keep UI interactive during async operations
+- Avoid blocking the main thread
+- Debounce expensive operations
+- Virtualize large lists
+
+### Bad Practices
+
+- UI freezes
+- Excessive rerenders
+- Laggy typing experiences
+
+---
+
+# 6. Accessibility
+
+Accessibility improves usability for everyone.
+
+---
+
+## 6.1 Keyboard Accessibility
+
+### Good Practices
+
+- Full keyboard navigation
+- Visible focus indicators
+- Logical tab order
+- Keyboard shortcuts for power users
+
+### Bad Practices
+
+- Mouse-only workflows
+- Hidden focus state
+- Keyboard traps
+
+---
+
+## 6.2 Semantic HTML
+
+### Good Practices
+
+- Use proper semantic elements
+- Use buttons for actions
+- Use links for navigation
+- Use headings correctly
+
+### Bad Practices
+
+- Clickable divs without accessibility support
+- Fake buttons
+- Missing semantic structure
+
+---
+
+## 6.3 Visual Accessibility
+
+### Good Practices
+
+- Sufficient color contrast
+- Support reduced motion
+- Avoid color-only communication
+- Use scalable typography
+
+### Bad Practices
+
+- Tiny text
+- Low contrast interfaces
+- Flashing animations
+
+---
+
+## 6.4 Screen Reader Support
+
+### Good Practices
+
+- Proper labels
+- Meaningful alt text
+- ARIA only when necessary
+- Correct live regions for updates
+
+### Bad Practices
+
+- Unlabeled controls
+- Excessive ARIA misuse
+- Non-announced state changes
+
+---
+
+# 7. Enterprise Application UX
+
+Enterprise UX differs significantly from marketing-oriented consumer interfaces.
+
+Power users often prioritize efficiency over visual minimalism.
+
+---
+
+## 7.1 Dense Information Design
+
+### Good Practices
+
+- Efficient data density
+- Resizable tables
+- Sticky headers
+- Multi-column layouts
+- High information throughput
+
+### Bad Practices
+
+- Excessive whitespace
+- Oversimplified dashboards
+- Hidden operational controls
+
+---
+
+## 7.2 Table UX
+
+### Good Practices
+
+- Sorting
+- Filtering
+- Column resizing
+- Pagination or virtualization
+- Keyboard navigation
+- Export functionality
+- Persistent user preferences
+
+### Bad Practices
+
+- Non-sortable enterprise tables
+- Horizontal scrolling nightmares
+- Missing filtering
+
+---
+
+## 7.3 Power User Workflows
+
+### Good Practices
+
+- Keyboard shortcuts
+- Bulk actions
+- Batch editing
+- Command palettes
+- State persistence
+- Fast navigation
+
+### Bad Practices
+
+- Forced wizard workflows
+- Excessive confirmations
+- Repetitive manual work
+
+---
+
+# 8. Mobile UX
+
+---
+
+## 8.1 Touch Design
+
+### Good Practices
+
+- Large touch targets
+- Thumb-friendly layouts
+- Avoid hover dependencies
+- Mobile-friendly spacing
+
+### Bad Practices
+
+- Tiny controls
+- Hover-only interactions
+- Precision-dependent gestures
+
+---
+
+## 8.2 Mobile Forms
+
+### Good Practices
+
+- Mobile keyboard optimization
+- Minimal typing
+- Autofill support
+- Step-by-step flows when necessary
+
+### Bad Practices
+
+- Long complex forms
+- Tiny input fields
+- Excessive required typing
+
+---
+
+# 9. Cognitive Psychology and UX
+
+---
+
+## 9.1 Hick’s Law
+
+More choices increase decision time.
+
+### Applications
+
+- Reduce unnecessary options
+- Group related actions
+- Prioritize primary actions
+
+---
+
+## 9.2 Fitts’s Law
+
+Closer and larger targets are easier to use.
+
+### Applications
+
+- Large primary buttons
+- Edge/corner placement for important actions
@@ -83,6 +83,14 @@
      "min": 0,
      "max": 360,
      "step": 0.01,
+      "value": 137.5
+    },
+    "angle": {
+      "type": "float",
+      "description": "Upward tilt of branches. 0 = horizontal, positive = upward, negative = drooping.",
+      "min": -90,
+      "max": 90,
+      "step": 1,
      "value": 0
    }
  }
@@ -78,7 +78,9 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
                continue;
            }

-            let branch_direction = rotate_vector_by_angle(orthogonal, direction, rotation_angle);
+            let up_angle = evaluate_float(args[10]) * PI / 180.0;
+            let tilted = (orthogonal * up_angle.cos() + direction * up_angle.sin()).normalize();
+            let branch_direction = rotate_vector_by_angle(tilted, direction, rotation_angle);

            log!(
                "BRANCH depth: {}, branch_origin: {:?}, direction_at: {:?}, branch_direction: {:?}",
@@ -13,19 +13,28 @@
      "max": 1,
      "value": 1
    },
-    "curviness": {
-      "type": "float",
-      "hidden": true,
-      "min": 0,
-      "max": 1,
-      "value": 0.5
-    },
    "depth": {
      "type": "integer",
      "min": 1,
      "max": 10,
      "hidden": true,
      "value": 1
+    },
+    "elasticity": {
+      "type": "float",
+      "description": "How rigid the stem is. 0 = rope (uniform droop), 1 = stiff rod (only the tip bends).",
+      "min": 0,
+      "max": 1,
+      "step": 0.05,
+      "value": 0.3
+    },
+    "mode": {
+      "type": "select",
+      "internal": true,
+      "label": "Mode",
+      "options": ["closed-form", "chain"],
+      "hidden": true,
+      "description": "closed-form lerps each segment toward gravity; chain is a forward-kinematic cantilever where each segment rotates by an angle that grows along the stem."
    }
  }
 }
@@ -20,7 +20,11 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
    let args = split_args(input);

    let plants = split_args(args[0]);
-    let depth = evaluate_int(args[3]);
+    let depth = evaluate_int(args[2]);
+    let elasticity = evaluate_float(args[3]).clamp(0.0, 1.0);
+    let mode = evaluate_int(args[4]); // 0 = closed-form, 1 = verlet
+    // 0 → sqrt (rope), 1 → ~4.5 (only the tip droops)
+    let bend_exponent = 0.5 + elasticity * 4.0;

    let mut max_depth = 0;
    for path_data in plants.iter() {
@@ -42,50 +46,124 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
            let mut output_data = path_data.clone();
            let output = wrap_path_mut(&mut output_data);

-            let mut offset_vec = Vec3::ZERO;
+            if mode == 1 {
+                // Forward-kinematic cantilever chain. Each segment rotates around
+                // an axis perpendicular to (rest_dir, gravity) by an angle that
+                // grows with alpha along the stem. Positions are built from the
+                // anchored base outward, so segment lengths are preserved by
+                // construction (no iteration, no rescaling, no oscillation).

-            for i in 0..path.length - 1 {
-                let alpha = i as f32 / (path.length - 1) as f32;
-                let start_index = i * 4;
+                let raw_strength = evaluate_float(args[1]);
+                let gravity_dir = Vec3::new(0.0, -1.0, 0.0);

-                let start_point = Vec3::from_slice(&path.points[start_index..start_index + 3]);
-                let end_point = Vec3::from_slice(&path.points[start_index + 4..start_index + 7]);
+                // Tip bend angle in radians. PI/2 = horizontal tip at strength=1.
+                let max_angle = raw_strength * std::f32::consts::FRAC_PI_2;

-                let direction = end_point - start_point;
+                let original: Vec<Vec3> = (0..path.length)
+                    .map(|i| {
+                        let s = i * 4;
+                        Vec3::from_slice(&path.points[s..s + 3])
+                    })
+                    .collect();

-                let length = direction.length();
+                let seg_lens: Vec<f32> = (0..path.length - 1)
+                    .map(|i| (original[i + 1] - original[i]).length())
+                    .collect();
+                let rest_dirs: Vec<Vec3> = (0..path.length - 1)
+                    .map(|i| {
+                        let d = original[i + 1] - original[i];
+                        let l = d.length();
+                        if l > 0.0001 { d / l } else { Vec3::Y }
+                    })
+                    .collect();

-                let curviness = evaluate_float(args[2]);
-                let strength =
-                    evaluate_float(args[1]) / curviness.max(0.0001) * evaluate_float(args[1]);
+                let mut cur = vec![Vec3::ZERO; path.length];
+                cur[0] = original[0];

-                log!(
-                    "length: {}, curviness: {}, strength: {}",
-                    length,
-                    curviness,
-                    strength
-                );
+                for i in 1..path.length {
+                    let seg_idx = i - 1;
+                    let alpha = if path.length > 2 {
+                        seg_idx as f32 / (path.length - 2) as f32
+                    } else {
+                        1.0
+                    };
+                    let bend_angle = max_angle * alpha.powf(bend_exponent);

-                let down_point = Vec3::new(0.0, -length * strength, 0.0);
+                    let rest_dir = rest_dirs[seg_idx];
+                    let mut bend_axis = rest_dir.cross(gravity_dir);
+                    let axis_len = bend_axis.length();
+                    bend_axis = if axis_len > 0.0001 {
+                        bend_axis / axis_len
+                    } else {
+                        // rest_dir parallel to gravity — pick an arbitrary
+                        // perpendicular axis to break symmetry.
+                        Vec3::X
+                    };

-                let mut mid_point = lerp_vec3(direction, down_point, curviness * alpha.sqrt());
+                    // Rodrigues' rotation formula
+                    let (sin_a, cos_a) = bend_angle.sin_cos();
+                    let bent_dir = rest_dir * cos_a
+                        + bend_axis.cross(rest_dir) * sin_a
+                        + bend_axis * bend_axis.dot(rest_dir) * (1.0 - cos_a);

-                if mid_point[0] == 0.0 && mid_point[2] == 0.0 {
-                    mid_point[0] += 0.0001;
-                    mid_point[2] += 0.0001;
+                    cur[i] = cur[i - 1] + bent_dir * seg_lens[seg_idx];
                }

-                // Correct midpoint length
-                mid_point *= length / mid_point.length();
+                for i in 0..path.length {
+                    let s = i * 4;
+                    output.points[s] = cur[i].x;
+                    output.points[s + 1] = cur[i].y;
+                    output.points[s + 2] = cur[i].z;
+                }
+            } else {
+                // Closed-form: per-segment lerp toward a downward vector
+                let mut offset_vec = Vec3::ZERO;

-                let final_end_point = start_point + mid_point;
-                let offset_end_point = end_point + offset_vec;
+                for i in 0..path.length - 1 {
+                    let alpha = i as f32 / (path.length - 1) as f32;
+                    let start_index = i * 4;

-                output.points[start_index + 4] = offset_end_point[0];
-                output.points[start_index + 5] = offset_end_point[1];
-                output.points[start_index + 6] = offset_end_point[2];
+                    let start_point = Vec3::from_slice(&path.points[start_index..start_index + 3]);
+                    let end_point =
+                        Vec3::from_slice(&path.points[start_index + 4..start_index + 7]);

-                offset_vec += final_end_point - end_point;
+                    let direction = end_point - start_point;
+
+                    let length = direction.length();
+
+                    let curviness = elasticity.max(0.0001);
+                    let strength_arg = evaluate_float(args[1]) * 10.0;
+                    let strength = strength_arg / curviness * strength_arg;
+
+                    log!(
+                        "length: {}, curviness: {}, strength: {}",
+                        length,
+                        curviness,
+                        strength
+                    );
+
+                    let down_point = Vec3::new(0.0, -length * strength, 0.0);
+
+                    let mut mid_point =
+                        lerp_vec3(direction, down_point, curviness * alpha.powf(bend_exponent));
+
+                    if mid_point[0] == 0.0 && mid_point[2] == 0.0 {
+                        mid_point[0] += 0.0001;
+                        mid_point[2] += 0.0001;
+                    }
+
+                    // Correct midpoint length
+                    mid_point *= length / mid_point.length();
+
+                    let final_end_point = start_point + mid_point;
+                    let offset_end_point = end_point + offset_vec;
+
+                    output.points[start_index + 4] = offset_end_point[0];
+                    output.points[start_index + 5] = offset_end_point[1];
+                    output.points[start_index + 6] = offset_end_point[2];
+
+                    offset_vec += final_end_point - end_point;
+                }
            }
            output_data
        })
@@ -8,5 +8,6 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]

 [dependencies]
+glam = "0.30.10"
 nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
 nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
@@ -19,6 +19,33 @@
      "max": 64,
      "value": 1,
      "hidden": true
+    },
+    "yCurve": {
+      "type": "float",
+      "description": "Curl the leaf upward along its length (radians). 0 = flat, ~1.57 = 90° tip curl.",
+      "min": -3.14,
+      "max": 3.14,
+      "step": 0.05,
+      "value": 0,
+      "hidden": true
+    },
+    "yTwist": {
+      "type": "float",
+      "description": "Twist around the leaf's spine. Combined with yCurve, produces a 3D spiral.",
+      "min": -6.28,
+      "max": 6.28,
+      "step": 0.05,
+      "value": 0,
+      "hidden": true
+    },
+    "xCurve": {
+      "type": "float",
+      "description": "Curl each cross-section into an arc, mirrored around the midrib. 0 = flat, ~1.57 = U-shape.",
+      "min": -3.14,
+      "max": 3.14,
+      "step": 0.05,
+      "value": 0,
+      "hidden": true
    }
  }
 }
@@ -1,6 +1,7 @@
 use std::convert::TryInto;
 use std::f32::consts::PI;

+use glam::Vec3;
 use nodarium_macros::nodarium_definition_file;
 use nodarium_macros::nodarium_execute;
 use nodarium_utils::encode_float;
@@ -42,6 +43,9 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
    let input_path = split_args(args[0])[0];
    let size = evaluate_float(args[1]);
    let width_resolution = evaluate_int(args[2]).max(3) as usize;
+    let y_curve = evaluate_float(args[3]);
+    let y_twist = evaluate_float(args[4]);
+    let x_curve = evaluate_float(args[5]);
    let path_length = (input_path.len() - 4) / 2;

    let slice_count = path_length;
@@ -93,27 +97,97 @@ pub fn execute(input: &[i32]) -> Vec<i32> {

    // Writing Positions
    let width = 50.0;
+    let leaf_length: f32 = 100.0;
    let mut positions = vec![[0.0f32; 3]; position_amount];
+
+    // Pre-compute a local frame (center, normal=local-Y, binormal=local-X) for
+    // each slice by walking the FK chain. At each step we bend around the
+    // current binormal (curls the leaf) and twist around the current tangent
+    // (rotates the bend plane → spiral).
+    let segs = (slice_count - 1).max(1) as f32;
+    let bend_per_step = y_curve / segs;
+    let twist_per_step = y_twist / segs;
+
+    let mut centers: Vec<Vec3> = Vec::with_capacity(slice_count);
+    let mut frame_n: Vec<Vec3> = Vec::with_capacity(slice_count);
+    let mut frame_b: Vec<Vec3> = Vec::with_capacity(slice_count);
+
+    let mut tangent = Vec3::new(0.0, 0.0, 1.0);
+    let mut normal = Vec3::new(0.0, 1.0, 0.0);
+    let mut binormal = Vec3::new(1.0, 0.0, 0.0);
+
+    let pz_first = decode_float(input_path[2 + 1]);
+    let mut center = Vec3::new(0.0, 0.0, pz_first - leaf_length);
+
    for i in 0..slice_count {
-        let ax = i as f32 / (slice_count -1) as f32;
+        centers.push(center);
+        frame_n.push(normal);
+        frame_b.push(binormal);

+        if i + 1 < slice_count {
+            let pz_curr = decode_float(input_path[2 + i * 2 + 1]);
+            let pz_next = decode_float(input_path[2 + (i + 1) * 2 + 1]);
+            let seg_len = pz_next - pz_curr;
+
+            center = center + tangent * seg_len;
+
+            // Bend around binormal — tilts tangent toward normal
+            let (sin_b, cos_b) = bend_per_step.sin_cos();
+            let new_t = tangent * cos_b + normal * sin_b;
+            let new_n = -tangent * sin_b + normal * cos_b;
+            tangent = new_t;
+            normal = new_n;
+
+            // Twist around tangent — rotates normal/binormal so the next bend
+            // happens in a rotated plane
+            let (sin_tw, cos_tw) = twist_per_step.sin_cos();
+            let new_n2 = normal * cos_tw + binormal * sin_tw;
+            let new_b = -normal * sin_tw + binormal * cos_tw;
+            normal = new_n2;
+            binormal = new_b;
+        }
+    }
+
+    for i in 0..slice_count {
+        let ax = i as f32 / segs;
        let px = decode_float(input_path[2 + i * 2 + 0]);
-        let pz = decode_float(input_path[2 + i * 2 + 1]);
+        let hw = width - px; // half-width at this slice

+        let c = centers[i];
+        let n = frame_n[i];
+        let b = frame_b[i];

        for j in 0..width_resolution {
            let alpha = j as f32 / (width_resolution - 1) as f32;
-            let x = 2.0 * (-px * (alpha - 0.5) + alpha * width);
-            let py = calculate_y(alpha-0.5)*5.0*(ax*PI).sin();
-            let pz_val = pz - 100.0;
+            // Signed cross-section parameter, -1 (left edge) → +1 (right edge)
+            let t = 2.0 * alpha - 1.0;
+            let py_local = calculate_y(alpha - 0.5) * 5.0 * (ax * PI).sin();
+
+            // X-curl: each cross-section traces a circular arc with curvature
+            // x_curve / hw. Because theta = x_curve * t is signed around the
+            // midrib, sin/cos give a mirrored arc (left and right edges curl
+            // the same direction).
+            let theta = x_curve * t;
+            let (sin_t, cos_t) = theta.sin_cos();
+            let (b_arc, n_arc) = if x_curve.abs() < 0.0001 {
+                (t * hw, 0.0)
+            } else {
+                let r = hw / x_curve;
+                (r * sin_t, r * (1.0 - cos_t))
+            };
+            // Cross-section bulge follows the rotated local frame
+            let b_total = b_arc - py_local * sin_t;
+            let n_total = n_arc + py_local * cos_t;
+
+            let world = c + b * b_total + n * n_total;

            let pos_idx = i * width_resolution + j;
-            positions[pos_idx] = [x - width, py, pz_val];
+            positions[pos_idx] = [world.x, world.y, world.z];

            let flat_idx = offset + pos_idx * 3;
-            out[flat_idx + 0] = encode_float((x - width) * size);
-            out[flat_idx + 1] = encode_float(py * size);
-            out[flat_idx + 2] = encode_float(pz_val * size);
+            out[flat_idx + 0] = encode_float(world.x * size);
+            out[flat_idx + 1] = encode_float(world.y * size);
+            out[flat_idx + 2] = encode_float(world.z * size);
        }
    }

@@ -8,6 +8,7 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]

 [dependencies]
+glam = "0.30.10"
 nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
 nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
 noise = "0.9.0"
@@ -15,9 +15,9 @@
    },
    "strength": {
      "type": "float",
-      "min": 0.1,
-      "max": 10,
-      "value": 2
+      "min": 0,
+      "max": 1,
+      "value": 0.5
    },
    "fixBottom": {
      "type": "float",
@@ -52,6 +52,12 @@
      "max": 5,
      "value": 1,
      "hidden": true
+    },
+    "preserveLength": {
+      "type": "boolean",
+      "label": "Preserve length",
+      "value": true,
+      "hidden": true
    }
  }
 }
@@ -1,3 +1,4 @@
+use glam::Vec3;
 use nodarium_macros::nodarium_definition_file;
 use nodarium_macros::nodarium_execute;
 use nodarium_utils::{
@@ -30,6 +31,7 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
    let depth = evaluate_int(args[6]);

    let octaves = evaluate_int(args[7]);
+    let preserve_length = evaluate_int(args[8]) != 0;

    let noise_x: HybridMulti<OpenSimplex> =
        HybridMulti::new(seed as u32 + 1).set_octaves(octaves as usize);
@@ -65,24 +67,82 @@ pub fn execute(input: &[i32]) -> Vec<i32> {

            let length = path.get_length() as f64;

-            for i in 0..path.length {
-                let a = i as f64 / (path.length - 1) as f64;
+            if preserve_length {
+                // Snapshot original positions so we can derive each segment's original
+                // direction even after we've modified earlier points.
+                let orig: Vec<f32> = path.points[..path.length * 4].to_vec();

-                let px = j as f64 + a * length * scale;
-                let py = a * scale as f64;
-
-                path.points[i * 4] += noise_x.get([px, py]) as f32
+                // Anchor the base (fix_bottom=1 → scale=0, no displacement at root)
+                let scale0 = lerp(1.0, 0.0, fix_bottom);
+                path.points[0] += noise_x.get([j as f64, 0.0]) as f32
                    * directional_strength[0]
                    * strength
-                    * lerp(1.0, a as f32, fix_bottom);
-                path.points[i * 4 + 1] += noise_y.get([px, py]) as f32
+                    * scale0;
+                path.points[1] += noise_y.get([j as f64, 0.0]) as f32
                    * directional_strength[1]
                    * strength
-                    * lerp(1.0, a as f32, fix_bottom);
-                path.points[i * 4 + 2] += noise_z.get([px, py]) as f32
+                    * scale0;
+                path.points[2] += noise_z.get([j as f64, 0.0]) as f32
                    * directional_strength[2]
                    * strength
-                    * lerp(1.0, a as f32, fix_bottom);
+                    * scale0;
+                let mut prev = Vec3::new(path.points[0], path.points[1], path.points[2]);
+
+                for i in 1..path.length {
+                    let a = i as f64 / (path.length - 1) as f64;
+                    let px = j as f64 + a * length * scale;
+                    let py = a * scale as f64;
+                    let sf = lerp(1.0, a as f32, fix_bottom);
+
+                    let orig_dir = Vec3::new(
+                        orig[i * 4] - orig[(i - 1) * 4],
+                        orig[i * 4 + 1] - orig[(i - 1) * 4 + 1],
+                        orig[i * 4 + 2] - orig[(i - 1) * 4 + 2],
+                    );
+                    let orig_len = orig_dir.length();
+
+                    let perturb = Vec3::new(
+                        noise_x.get([px, py]) as f32 * directional_strength[0] * strength * sf,
+                        noise_y.get([px, py]) as f32 * directional_strength[1] * strength * sf,
+                        noise_z.get([px, py]) as f32 * directional_strength[2] * strength * sf,
+                    );
+
+                    // Perturb the original direction and rescale to original length.
+                    // Biasing toward orig_dir prevents the segment from folding back.
+                    let mut new_dir = orig_dir + perturb;
+                    let nd_len = new_dir.length();
+                    if nd_len > 0.0001 && orig_len > 0.0001 {
+                        new_dir *= orig_len / nd_len;
+                    } else {
+                        new_dir = orig_dir;
+                    }
+
+                    let cur = prev + new_dir;
+                    path.points[i * 4] = cur.x;
+                    path.points[i * 4 + 1] = cur.y;
+                    path.points[i * 4 + 2] = cur.z;
+                    prev = cur;
+                }
+            } else {
+                for i in 0..path.length {
+                    let a = i as f64 / (path.length - 1) as f64;
+                    let px = j as f64 + a * length * scale;
+                    let py = a * scale as f64;
+                    let sf = lerp(1.0, a as f32, fix_bottom);
+
+                    path.points[i * 4] += noise_x.get([px, py]) as f32
+                        * directional_strength[0]
+                        * strength
+                        * sf;
+                    path.points[i * 4 + 1] += noise_y.get([px, py]) as f32
+                        * directional_strength[1]
+                        * strength
+                        * sf;
+                    path.points[i * 4 + 2] += noise_z.get([px, py]) as f32
+                        * directional_strength[2]
+                        * strength
+                        * sf;
+                }
            }
            path_data
        })
@@ -29,7 +29,7 @@
      "type": "boolean",
      "internal": true,
      "hidden": true,
-      "value": true,
+      "value": false,
      "description": "If multiple objects are connected, should we rotate them as one or spread them?"
    }
  }
@@ -1,12 +1,13 @@
 {
  "version": "0.0.4",
  "scripts": {
-    "postinstall": "pnpm run -r --filter 'ui' build",
+    "_postinstall": "pnpm run -r --filter 'ui' build && pnpm run -r --filter 'planty' build",
    "lint": "pnpm run -r --parallel lint",
    "qa": "pnpm lint && pnpm check && pnpm test",
    "format": "pnpm dprint fmt",
    "format:check": "pnpm dprint check",
-    "test": "pnpm run -r --parallel test",
+    "test:e2e": "pnpm run -r --parallel test:e2e",
+    "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",
@@ -19,6 +20,6 @@
  "packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316",
  "devDependencies": {
    "chokidar-cli": "catalog:",
-    "dprint": "^0.51.1"
+    "dprint": "^0.54.0"
  }
 }
@@ -1,9 +0,0 @@
-# Package Managers
-package-lock.json
-pnpm-lock.yaml
-yarn.lock
-bun.lock
-bun.lockb
-
-# Miscellaneous
-/static/
@@ -1,16 +0,0 @@
-{
-	"useTabs": true,
-	"singleQuote": true,
-	"trailingComma": "none",
-	"printWidth": 100,
-	"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
-	"overrides": [
-		{
-			"files": "*.svelte",
-			"options": {
-				"parser": "svelte"
-			}
-		}
-	],
-	"tailwindStylesheet": "./src/routes/layout.css"
-}
@@ -1,44 +1,44 @@
-import prettier from 'eslint-config-prettier';
-import path from 'node:path';
 import { includeIgnoreFile } from '@eslint/compat';
 import js from '@eslint/js';
+import prettier from 'eslint-config-prettier';
 import svelte from 'eslint-plugin-svelte';
 import { defineConfig } from 'eslint/config';
 import globals from 'globals';
+import path from 'node:path';
 import ts from 'typescript-eslint';
 import svelteConfig from './svelte.config.js';

 const gitignorePath = path.resolve(import.meta.dirname, '.gitignore');

 export default defineConfig(
-	includeIgnoreFile(gitignorePath),
-	js.configs.recommended,
-	ts.configs.recommended,
-	svelte.configs.recommended,
-	prettier,
-	svelte.configs.prettier,
-	{
-		languageOptions: { globals: { ...globals.browser, ...globals.node } },
-		rules: {
-			// typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.
-			// see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
-			'no-undef': 'off'
-		}
-	},
-	{
-		files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
-		languageOptions: {
-			parserOptions: {
-				projectService: true,
-				extraFileExtensions: ['.svelte'],
-				parser: ts.parser,
-				svelteConfig
-			}
-		}
-	},
-	{
-		// Override or add rule settings here, such as:
-		// 'svelte/button-has-type': 'error'
-		rules: {}
-	}
+  includeIgnoreFile(gitignorePath),
+  js.configs.recommended,
+  ts.configs.recommended,
+  svelte.configs.recommended,
+  prettier,
+  svelte.configs.prettier,
+  {
+    languageOptions: { globals: { ...globals.browser, ...globals.node } },
+    rules: {
+      // typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.
+      // see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
+      'no-undef': 'off'
+    }
+  },
+  {
+    files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
+    languageOptions: {
+      parserOptions: {
+        projectService: true,
+        extraFileExtensions: ['.svelte'],
+        parser: ts.parser,
+        svelteConfig
+      }
+    }
+  },
+  {
+    // Override or add rule settings here, such as:
+    // 'svelte/button-has-type': 'error'
+    rules: {}
+  }
 );
@@ -1,16 +1,17 @@
 {
  "name": "@nodarium/planty",
-  "version": "0.0.1",
+  "version": "0.0.6",
  "scripts": {
    "dev": "vite dev",
-    "build": "vite build && npm run prepack",
+    "build": "vite build",
    "preview": "vite preview",
    "prepare": "svelte-kit sync || echo ''",
    "prepack": "svelte-kit sync && svelte-package && publint",
    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "lint": "prettier --check . && eslint .",
-    "format": "prettier --write ."
+    "lint": "eslint .",
+    "format": "dprint fmt -c '../../.dprint.jsonc' .",
+    "format:check": "dprint check -c '../../.dprint.jsonc' ."
  },
  "files": [
    "dist",
@@ -20,42 +21,42 @@
  "sideEffects": [
    "**/*.css"
  ],
-  "svelte": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "svelte": "./src/lib/index.ts",
+  "types": "./src/lib/index.ts",
  "type": "module",
  "exports": {
    ".": {
-      "types": "./dist/index.d.ts",
-      "svelte": "./dist/index.js"
+      "types": "./src/lib/index.ts",
+      "svelte": "./src/lib/index.ts"
    }
  },
  "peerDependencies": {
    "svelte": "^5.0.0"
  },
  "devDependencies": {
-    "@nodarium/ui": "workspace:*",
-    "@eslint/compat": "^2.0.4",
+    "@eslint/compat": "^2.0.5",
    "@eslint/js": "^10.0.1",
+    "@nodarium/ui": "workspace:*",
    "@sveltejs/adapter-auto": "^7.0.1",
-    "@sveltejs/kit": "^2.57.0",
+    "@sveltejs/kit": "^2.59.0",
    "@sveltejs/package": "^2.5.7",
    "@sveltejs/vite-plugin-svelte": "^7.0.0",
-    "@tailwindcss/vite": "^4.2.2",
-    "@types/node": "^24",
-    "eslint": "^10.2.0",
+    "@tailwindcss/vite": "^4.2.4",
+    "@types/node": "^25.6.0",
+    "eslint": "^10.3.0",
    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-svelte": "^3.17.0",
-    "globals": "^17.4.0",
-    "prettier": "^3.8.1",
+    "eslint-plugin-svelte": "^3.17.1",
+    "globals": "^17.6.0",
+    "prettier": "^3.8.3",
    "prettier-plugin-svelte": "^3.5.1",
-    "prettier-plugin-tailwindcss": "^0.7.2",
+    "prettier-plugin-tailwindcss": "^0.8.0",
    "publint": "^0.3.18",
-    "svelte": "^5.55.2",
-    "svelte-check": "^4.4.6",
-    "tailwindcss": "^4.2.2",
-    "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.1",
-    "vite": "^8.0.7"
+    "svelte": "^5.55.5",
+    "svelte-check": "^4.4.7",
+    "tailwindcss": "^4.2.4",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.1",
+    "vite": "^8.0.10"
  },
  "keywords": [
    "svelte"
@@ -1,13 +1,13 @@
 // See https://svelte.dev/docs/kit/types#app.d.ts
 // for information about these interfaces
 declare global {
-	namespace App {
-		// interface Error {}
-		// interface Locals {}
-		// interface PageData {}
-		// interface PageState {}
-		// interface Platform {}
-	}
+  namespace App {
+    // interface Error {}
+    // interface Locals {}
+    // interface PageData {}
+    // interface PageState {}
+    // interface Platform {}
+  }
 }

 export {};
@@ -1,13 +1,13 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en" class="theme-dark">
-	<head>
-		<meta charset="utf-8" />
-		<link rel="icon" href="%sveltekit.assets%/favicon.svg" />
-		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<meta name="text-scale" content="scale" />
-		%sveltekit.head%
-	</head>
-	<body data-sveltekit-preload-data="hover">
-		<div style="display: contents">%sveltekit.body%</div>
-	</body>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%sveltekit.assets%/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="text-scale" content="scale" />
+    %sveltekit.head%
+  </head>
+  <body data-sveltekit-preload-data="hover">
+    <div style="display: contents">%sveltekit.body%</div>
+  </body>
 </html>
@@ -80,7 +80,7 @@

 {#if rect}
  <div
-    class="highlight fixed z-99999 rounded-md pointer-events-none"
+    class="highlight pointer-events-none fixed z-99999 rounded-md"
    style:top="{rect.top}px"
    style:left="{rect.left}px"
    style:width="{rect.width}px"
@@ -91,7 +91,8 @@

 <style>
  @keyframes pulse {
-  	0%, 100% {
+  	0%,
+  	100% {
  		box-shadow:
  			0 0 0 9999px rgba(0, 0, 0, 0.45),
  			0 0 0 2px rgba(255, 255, 255, 0.9),
@@ -9,16 +9,12 @@
  interface Props {
    config: PlantyConfig;
    hooks?: Record<string, PlantyHook>;
+    actions?: Record<string, PlantyHook>;
    onStepChange?: (nodeId: string, node: DialogNode) => void;
    onComplete?: () => void;
  }

-  let {
-    config,
-    hooks = {},
-    onStepChange,
-    onComplete
-  }: Props = $props();
+  let { config, actions = {}, hooks = {}, onStepChange, onComplete }: Props = $props();

  const AVATAR_SIZE = 80;
  const SCREEN_PADDING = 20;
@@ -27,6 +23,7 @@
  let isActive = $state(false);
  let currentNodeId = $state<string | null>(null);
  let bubbleVisible = $state(false);
+  let avatar = $state<PlantyAvatar>(null!);
  let avatarX = $state(0);
  let avatarY = $state(0);
  let mood = $state<Mood>('idle');
@@ -35,6 +32,9 @@

  // ── Derived ──────────────────────────────────────────────────────────
  const runner = $derived(new DialogRunner(config));
+  const nextNode = $derived(
+    runner.getNextNode(currentNodeId ?? '')
+  );
  const mainPath = $derived(runner.getMainPath());
  const currentNode = $derived<DialogNode | null>(
    currentNodeId ? runner.getNode(currentNodeId) : null
@@ -130,32 +130,31 @@
    if (node.position) {
      mood = 'moving';
      const pos = resolvePosition(node.position);
+      const hasChanges = pos.x !== avatarX || pos.y !== avatarY;
      avatarX = pos.x;
      avatarY = pos.y;
-      await _wait(900);
+      if (hasChanges) await _wait(900);
    }

    mood = 'talking';
    bubbleVisible = true;

    // App hook
-    if (node.hook && hooks[node.hook]) {
-      const result = await hooks[node.hook](...(node.hookArgs ?? []));
+    if (node.action && actions[node.action]) {
+      const result = await actions[node.action]();
      if (typeof result === 'function') actionCleanup = result as () => void;
    }

-    // Auto-advance
-    if (typeof node.waitFor === 'number') {
-      autoAdvanceTimer = setTimeout(() => next(), node.waitFor);
-    }
-    if (node.waitFor === 'action') {
-      const actionHook = hooks[`action:${id}`];
-      if (actionHook) {
-        const advance = () => next();
-        const result = await actionHook(advance, ...(node.hookArgs ?? []));
-        if (typeof result === 'function') actionCleanup = result as () => void;
-      }
+    const actionHook = hooks[`action:${id}`];
+    if (actionHook) {
+      const advance = () => {
+        avatar.flash('happy', 2000);
+        next();
+      };
+      const result = await actionHook(advance);
+      if (typeof result === 'function') actionCleanup = result as () => void;
    }
+
    if (!node.choices && !node.next) {
      setTimeout(() => stop(), 3000);
    }
@@ -182,14 +181,10 @@
 {#if isActive}
  <div class="pointer-events-none fixed inset-0 z-99999">
    {#if highlight}
-      <Highlight
-        selector={highlight.selector}
-        hookName={highlight.hookName}
-        {hooks}
-      />
+      <Highlight selector={highlight.selector} hookName={highlight.hookName} {hooks} />
    {/if}

-    <PlantyAvatar bind:x={avatarX} bind:y={avatarY} {mood} />
+    <PlantyAvatar bind:this={avatar} bind:x={avatarX} bind:y={avatarY} {mood} />

    {#if showBubble && currentNode}
      <SpeechBubble
@@ -197,15 +192,19 @@
        {avatarX}
        {avatarY}
        choices={currentNode.choices || []}
-        showNext={currentNode.waitFor === 'click'}
+        showNext={nextNode !== null}
        {stepIndex}
        {totalSteps}
        onNext={next}
        onClose={stop}
        onChoose={async (choice) => {
          await _runAfter(currentNodeId!, currentNode);
-          if (choice && choice.onclick) {
-            choice.onclick();
+          if (choice && choice.action) {
+            if (choice.action in actions) {
+              actions[choice.action]();
+            } else {
+              console.warn(`Planty: No action found for ${choice.action}`);
+            }
            return;
          }
          if (!choice.next) {
@@ -69,6 +69,12 @@
    cursorY = e.clientY;
  }

+  export function flash(flashMood: Mood, duration = 500) {
+    const prev = displayMood;
+    mood = flashMood;
+    setTimeout(() => (mood = prev), duration);
+  }
+
  function pupilOffset(cx: number, cy: number, eyeSvgX: number, eyeSvgY: number, maxPx = 2.8) {
    const ex = x + eyeSvgX;
    const ey = y + eyeSvgY;
@@ -82,14 +88,10 @@
  }

  const left = $derived(
-    displayMood === 'talking'
-      ? { px: 0, py: 0 }
-      : pupilOffset(cursorX, cursorY, 9.5, 30.5)
+    displayMood === 'talking' ? { px: 0, py: 0 } : pupilOffset(cursorX, cursorY, 9.5, 30.5)
  );
  const right = $derived(
-    displayMood === 'talking'
-      ? { px: 0, py: 0 }
-      : pupilOffset(cursorX, cursorY, 31.5, 35.5)
+    displayMood === 'talking' ? { px: 0, py: 0 } : pupilOffset(cursorX, cursorY, 31.5, 35.5)
  );
 </script>

@@ -176,10 +178,10 @@
  	cursor: grab;
  	user-select: none;
  	pointer-events: auto;
-    filter: drop-shadow(0px 0px 10px black);
+  	filter: drop-shadow(0px 0px 10px black);
  	transition:
  		left 0.85s cubic-bezier(0.33, 1, 0.68, 1),
-  		top  0.85s cubic-bezier(0.33, 1, 0.68, 1),
+  		top 0.85s cubic-bezier(0.33, 1, 0.68, 1);
  }

  .dragging {
@@ -189,49 +191,83 @@

  /* idle: steady vertical bob */
  @keyframes bob {
-  	0%, 100% { transform: translateY(0); }
-  	50%       { transform: translateY(-5px); }
+  	0%,
+  	100% {
+  		transform: translateY(0);
+  	}
+  	50% {
+  		transform: translateY(-5px);
+  	}
+  }
+  .mood-idle {
+  	animation: bob 2.6s ease-in-out infinite;
+  }
+  .mood-happy {
+  	animation: bob 1.8s ease-in-out infinite;
  }
-  .mood-idle  { animation: bob 2.6s ease-in-out infinite; }
-  .mood-happy { animation: bob 1.8s ease-in-out infinite; }

  /* thinking: head tilted to the side — clearly different from idle */
  @keyframes think {
-  	0%, 100% { transform: rotate(-12deg) translateY(0); }
-  	50%       { transform: rotate(-12deg) translateY(-3px); }
+  	0%,
+  	100% {
+  		transform: rotate(-12deg) translateY(0);
+  	}
+  	50% {
+  		transform: rotate(-12deg) translateY(-3px);
+  	}
+  }
+  .mood-thinking {
+  	animation: think 2.8s ease-in-out infinite;
  }
-  .mood-thinking { animation: think 2.8s ease-in-out infinite; }

  /* talking: subtle head waggle */
  @keyframes waggle {
-  	0%, 100% { transform: rotate(0deg); }
-  	25%       { transform: rotate(-2deg) translateY(-1px); }
-  	75%       { transform: rotate(2deg)  translateY(1px); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	25% {
+  		transform: rotate(-2deg) translateY(-1px);
+  	}
+  	75% {
+  		transform: rotate(2deg) translateY(1px);
+  	}
+  }
+  .mood-talking {
+  	animation: waggle 0.3s ease-in-out infinite;
  }
-  .mood-talking { animation: waggle 0.3s ease-in-out infinite; }

  /* moving: forward-lean glide */
  @keyframes glide {
-  	0%, 100% { transform: translateY(0) rotate(-6deg); }
-  	50%       { transform: translateY(-8px) rotate(-4deg); }
+  	0%,
+  	100% {
+  		transform: translateY(0) rotate(-6deg);
+  	}
+  	50% {
+  		transform: translateY(-8px) rotate(-4deg);
+  	}
+  }
+  .mood-moving {
+  	animation: glide 0.4s ease-in-out infinite;
  }
-  .mood-moving { animation: glide 0.4s ease-in-out infinite; }

  /* ── Drop shadows ────────────────────────────────────────────────── */
  .body {
  	filter: drop-shadow(1px 1px 0 rgba(0, 0, 0, 0.5));
  	transition: d 0.12s ease-in-out;
  }
-  .eye-left, .eye-right {
+  .eye-left,
+  .eye-right {
  	filter: drop-shadow(1px 1px 0 rgba(0, 0, 0, 0.5));
  }

  .mood-talking {
-    .eye-left, .eye-right {
-      > g {
-        transition: transform 0.5s ease-in-out;
-      }
-    }
+  	.eye-left,
+  	.eye-right {
+  		> g {
+  			transition: transform 0.5s ease-in-out;
+  		}
+  	}
  }

  /* ── Leaves ──────────────────────────────────────────────────────── */
@@ -246,74 +282,154 @@

  /* idle: slow gentle breathing wave */
  @keyframes idle-right {
-  	0%, 100% { transform: rotate(0deg); }
-  	50%       { transform: rotate(-9deg); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	50% {
+  		transform: rotate(-9deg);
+  	}
  }
  @keyframes idle-left {
-  	0%, 100% { transform: rotate(0deg); }
-  	50%       { transform: rotate(7deg); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	50% {
+  		transform: rotate(7deg);
+  	}
+  }
+  .mood-idle .leave-right {
+  	animation: idle-right 3s ease-in-out infinite;
+  }
+  .mood-idle .leave-left {
+  	animation: idle-left 3s ease-in-out infinite 0.15s;
  }
-  .mood-idle .leave-right { animation: idle-right 3s    ease-in-out infinite; }
-  .mood-idle .leave-left  { animation: idle-left  3s    ease-in-out infinite 0.15s; }

  /* thinking: wings held raised, minimal drift */
  @keyframes think-right {
-  	0%, 100% { transform: rotate(-14deg); }
-  	50%       { transform: rotate(-10deg); }
+  	0%,
+  	100% {
+  		transform: rotate(-14deg);
+  	}
+  	50% {
+  		transform: rotate(-10deg);
+  	}
  }
  @keyframes think-left {
-  	0%, 100% { transform: rotate(10deg); }
-  	50%       { transform: rotate(7deg); }
+  	0%,
+  	100% {
+  		transform: rotate(10deg);
+  	}
+  	50% {
+  		transform: rotate(7deg);
+  	}
+  }
+  .mood-thinking .leave-right {
+  	animation: think-right 4s ease-in-out infinite;
+  }
+  .mood-thinking .leave-left {
+  	animation: think-left 4s ease-in-out infinite 0.3s;
  }
-  .mood-thinking .leave-right { animation: think-right 4s ease-in-out infinite; }
-  .mood-thinking .leave-left  { animation: think-left  4s ease-in-out infinite 0.3s; }

  /* talking: nearly still — tiny passive counter-sway */
  @keyframes talk-right {
-  	0%, 100% { transform: rotate(-2deg); }
-  	50%       { transform: rotate(2deg); }
+  	0%,
+  	100% {
+  		transform: rotate(-2deg);
+  	}
+  	50% {
+  		transform: rotate(2deg);
+  	}
  }
  @keyframes talk-left {
-  	0%, 100% { transform: rotate(2deg); }
-  	50%       { transform: rotate(-2deg); }
+  	0%,
+  	100% {
+  		transform: rotate(2deg);
+  	}
+  	50% {
+  		transform: rotate(-2deg);
+  	}
+  }
+  .mood-talking .leave-right {
+  	animation: talk-right 0.6s ease-in-out infinite;
+  }
+  .mood-talking .leave-left {
+  	animation: talk-left 0.6s ease-in-out infinite 0.1s;
  }
-  .mood-talking .leave-right { animation: talk-right 0.6s ease-in-out infinite; }
-  .mood-talking .leave-left  { animation: talk-left  0.6s ease-in-out infinite 0.1s; }

  /* happy: light casual flap */
  @keyframes happy-right {
-  	0%, 100% { transform: rotate(0deg); }
-  	50%       { transform: rotate(-18deg); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	50% {
+  		transform: rotate(-18deg);
+  	}
  }
  @keyframes happy-left {
-  	0%, 100% { transform: rotate(0deg); }
-  	50%       { transform: rotate(13deg); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	50% {
+  		transform: rotate(13deg);
+  	}
+  }
+  .mood-happy .leave-right {
+  	animation: happy-right 1.4s ease-in-out infinite;
+  }
+  .mood-happy .leave-left {
+  	animation: happy-left 1.4s ease-in-out infinite 0.1s;
  }
-  .mood-happy .leave-right { animation: happy-right 1.4s ease-in-out infinite; }
-  .mood-happy .leave-left  { animation: happy-left  1.4s ease-in-out infinite 0.1s; }

  /* moving: vigorous wing flap — full range, fast */
  @keyframes flap-right {
-  	0%, 100% { transform: rotate(0deg); }
-  	40%       { transform: rotate(-40deg); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	40% {
+  		transform: rotate(-40deg);
+  	}
  }
  @keyframes flap-left {
-  	0%, 100% { transform: rotate(0deg); }
-  	40%       { transform: rotate(26deg); }
+  	0%,
+  	100% {
+  		transform: rotate(0deg);
+  	}
+  	40% {
+  		transform: rotate(26deg);
+  	}
+  }
+  .mood-moving .leave-right {
+  	animation: flap-right 0.34s ease-in-out infinite;
+  }
+  .mood-moving .leave-left {
+  	animation: flap-left 0.34s ease-in-out infinite 0.04s;
  }
-  .mood-moving .leave-right { animation: flap-right 0.34s ease-in-out infinite; }
-  .mood-moving .leave-left  { animation: flap-left  0.34s ease-in-out infinite 0.04s; }

  /* ── Eye blink (on pupil so it doesn't fight cursor translate) ───── */
  @keyframes blink {
-  	0%, 93%, 100% { transform: scaleY(1); }
-  	96%            { transform: scaleY(0.05); }
+  	0%,
+  	93%,
+  	100% {
+  		transform: scaleY(1);
+  	}
+  	96% {
+  		transform: scaleY(0.05);
+  	}
  }
  .pupil {
  	transform-box: fill-box;
  	transform-origin: center;
  	animation: blink 4s ease-in-out infinite;
  }
-  .eye-left  .pupil { animation-delay: 0s; }
-  .eye-right .pupil { animation-delay: 0.07s; }
+  .eye-left .pupil {
+  	animation-delay: 0s;
+  }
+  .eye-right .pupil {
+  	animation-delay: 0.07s;
+  }
 </style>
@@ -54,8 +54,8 @@
        /`(.+?)`/g,
        '<code class="text-[11px] rounded px-1 font-mono" style="background: var(--color-layer-3); color: var(--color-text);">$1</code>'
      )
-      .replaceAll(/\*/, '')
-      .replaceAll(/\_/, '')
+      .replaceAll(/\*/g, '')
+      .replaceAll(/_/g, '')
      .replaceAll(/\n+/g, '<br>');
  }

@@ -73,7 +73,6 @@
      if (i < target.length) {
        displayed = target.slice(0, ++i);
        typeTimer = setTimeout(tick, 26);
-      } else {
      }
    }
    // Defer first tick so no reads happen during the synchronous effect body
@@ -86,11 +85,11 @@
 </script>

 <div
-  class="fixed p-2 z-99999 pointer-events-auto rounded-md border"
+  class="pointer-events-auto fixed z-99999 rounded-md border p-2"
  style:width="{BUBBLE_WIDTH}px"
  style:left="{left}px"
-  style:bottom={bottom}
-  style:top={top}
+  style:bottom
+  style:top
  style:background="var(--color-layer-0)"
  style:border-color="var(--color-outline)"
 >
@@ -98,7 +97,10 @@
    <!-- Tail pointing up toward avatar -->
    <div
      class="absolute -top-2 h-3.5 w-3.5 rotate-45 border-t border-l"
-      style:left="{Math.min(Math.max(avatarX - left + AVATAR_SIZE / 2 - 25, 12), BUBBLE_WIDTH - 28)}px"
+      style:left="{Math.min(
+				Math.max(avatarX - left + AVATAR_SIZE / 2 - 25, 12),
+				BUBBLE_WIDTH - 28
+			)}px"
      style:background="var(--color-layer-0)"
      style:border-color="var(--color-outline)"
    >
@@ -106,26 +108,29 @@
  {:else}
    <!-- Tail pointing down toward avatar -->
    <div
-      class="absolute -bottom-2 h-3.5 w-3.5 rotate-45 border-b border-r"
-      style:left="{Math.min(Math.max(avatarX - left + AVATAR_SIZE / 2 - 25, 12), BUBBLE_WIDTH - 28)}px"
+      class="absolute -bottom-2 h-3.5 w-3.5 rotate-45 border-r border-b"
+      style:left="{Math.min(
+				Math.max(avatarX - left + AVATAR_SIZE / 2 - 25, 12),
+				BUBBLE_WIDTH - 28
+			)}px"
      style:background="var(--color-layer-0)"
      style:border-color="var(--color-outline)"
    >
    </div>
  {/if}

-  <!-- svelte-ignore a11y_no_static_element_interactions -->
  <div class="mb-2 min-h-[1.4em] text-sm leading-relaxed" style="color: var(--color-text)">
+    <!-- eslint-disable-next-line svelte/no-at-html-tags -->
    {@html renderMarkdown(displayed)}
  </div>

  {#if choices.length > 0}
    <div class="flex flex-col gap-1.5">
-      {#each choices as choice, i}
+      {#each choices as choice, i (choice.label)}
        {#if finished}
          <button
            in:fade={{ duration: 200, delay: i * 250 }}
-            class="rounded-lg px-3 py-1.5 text-left text-sm font-medium transition-colors cursor-pointer"
+            class="cursor-pointer rounded-lg px-3 py-1.5 text-left text-sm font-medium transition-colors"
            style:background="var(--color-layer-1)"
            style:border-color="var(--color-outline)"
            style:color="var(--color-text)"
@@ -138,9 +143,9 @@
    </div>
  {/if}

-  <div class="flex items-center justify-between gap-2 mt-2">
+  <div class="mt-2 flex items-center justify-between gap-2">
    <button
-      class="text-xs transition-colors cursor-pointer"
+      class="cursor-pointer text-xs transition-colors"
      style="color: var(--color-outline)"
      onclick={onClose}
    >
@@ -154,7 +159,7 @@
      {/if}
      {#if showNext && finished}
        <button
-          class="rounded-lg px-3 py-1 text-xs font-semibold cursor-pointer transition-colors"
+          class="cursor-pointer rounded-lg px-3 py-1 text-xs font-semibold transition-colors"
          style:background="var(--color-outline)"
          style:color="var(--color-layer-0)"
          onclick={onNext}
@@ -18,49 +18,49 @@ import type { DialogNode, StepCallback } from './types.js';
 * <Planty {config} {steps} />
 */
 export class PlantySteps {
-	private _before = new Map<string, StepCallback[]>();
-	private _after  = new Map<string, StepCallback[]>();
+  private _before = new Map<string, StepCallback[]>();
+  private _after = new Map<string, StepCallback[]>();

-	/** Register a handler to run before `nodeId` becomes active. Chainable. */
-	before(nodeId: string, fn: StepCallback): this {
-		const list = this._before.get(nodeId) ?? [];
-		this._before.set(nodeId, [...list, fn]);
-		return this;
-	}
+  /** Register a handler to run before `nodeId` becomes active. Chainable. */
+  before(nodeId: string, fn: StepCallback): this {
+    const list = this._before.get(nodeId) ?? [];
+    this._before.set(nodeId, [...list, fn]);
+    return this;
+  }

-	/** Register a handler to run after the user leaves `nodeId`. Chainable. */
-	after(nodeId: string, fn: StepCallback): this {
-		const list = this._after.get(nodeId) ?? [];
-		this._after.set(nodeId, [...list, fn]);
-		return this;
-	}
+  /** Register a handler to run after the user leaves `nodeId`. Chainable. */
+  after(nodeId: string, fn: StepCallback): this {
+    const list = this._after.get(nodeId) ?? [];
+    this._after.set(nodeId, [...list, fn]);
+    return this;
+  }

-	/** Remove all handlers for a node (or all nodes if omitted). */
-	clear(nodeId?: string) {
-		if (nodeId) {
-			this._before.delete(nodeId);
-			this._after.delete(nodeId);
-		} else {
-			this._before.clear();
-			this._after.clear();
-		}
-	}
+  /** Remove all handlers for a node (or all nodes if omitted). */
+  clear(nodeId?: string) {
+    if (nodeId) {
+      this._before.delete(nodeId);
+      this._after.delete(nodeId);
+    } else {
+      this._before.clear();
+      this._after.clear();
+    }
+  }

-	/** @internal — called by Planty */
-	async runBefore(nodeId: string, node: DialogNode): Promise<void> {
-		for (const fn of this._before.get(nodeId) ?? []) {
-			await fn(nodeId, node);
-		}
-	}
+  /** @internal — called by Planty */
+  async runBefore(nodeId: string, node: DialogNode): Promise<void> {
+    for (const fn of this._before.get(nodeId) ?? []) {
+      await fn(nodeId, node);
+    }
+  }

-	/** @internal — called by Planty */
-	async runAfter(nodeId: string, node: DialogNode): Promise<void> {
-		for (const fn of this._after.get(nodeId) ?? []) {
-			await fn(nodeId, node);
-		}
-	}
+  /** @internal — called by Planty */
+  async runAfter(nodeId: string, node: DialogNode): Promise<void> {
+    for (const fn of this._after.get(nodeId) ?? []) {
+      await fn(nodeId, node);
+    }
+  }
 }

 export function createPlantySteps(): PlantySteps {
-	return new PlantySteps();
+  return new PlantySteps();
 }
@@ -22,12 +22,9 @@ export interface DialogNode {
  position?: AvatarPosition;
  highlight?: HighlightTarget;
  /** App hook to call on entering this node */
-  hook?: string;
-  hookArgs?: unknown[];
+  action?: string;
  next?: string | null;
  choices?: Choice[];
-  /** 'click' = wait for user click, number = auto-advance after N ms, 'action' = wait for hook to call advance() */
-  waitFor?: 'click' | 'action' | number;
  /** Called (and awaited) just before the avatar starts moving to this node */
  before?: StepCallback;
  /** Called (and awaited) just before the user leaves this node */
@@ -36,8 +33,8 @@ export interface DialogNode {

 export interface Choice {
  label: string;
-  next: string | null;
-  onclick?: () => void;
+  next?: string | null;
+  action?: string;
 }

 export interface PlantyConfig {
@@ -1,7 +1,6 @@
 <script lang="ts">
  import '@nodarium/ui/app.css';
  import './layout.css';
-
  const { children } = $props();
 </script>

@@ -34,7 +34,7 @@
 >
  <!-- Header -->
  <header
-    class="flex items-center gap-4 px-8 py-5 h-12"
+    class="flex h-12 items-center gap-4 px-8 py-5"
    style="border-color: var(--color-outline);"
  >
    <h1 class="text-xl font-semibold">🌿 Planty</h1>
@@ -75,11 +75,17 @@
          <PlantyAvatar x={0} y={0} mood={previewMood} />
        </div>
        <div class="flex gap-2">
-          {#each moods as m}
+          {#each moods as m (m)}
            <button
              class="rounded-lg border px-3 py-1 text-xs transition"
              onclick={() => (previewMood = m)}
-              style="border-color: {previewMood === m ? 'var(--color-selected)' : 'var(--color-outline)'}; color: {previewMood === m ? 'var(--color-selected)' : 'var(--color-text)'}; background: {previewMood === m ? 'var(--color-layer-2)' : 'transparent'};"
+              style="border-color: {previewMood === m
+  ? 'var(--color-selected)'
+  : 'var(--color-outline)'}; color: {previewMood === m
+  ? 'var(--color-selected)'
+  : 'var(--color-text)'}; background: {previewMood === m
+  ? 'var(--color-layer-2)'
+  : 'transparent'};"
            >
              {m}
            </button>
@@ -95,7 +101,7 @@
      style="border-color: var(--color-outline); background-color: var(--color-layer-0);"
    >
      <span
-        class="text-xs font-semibold uppercase tracking-widest"
+        class="text-xs font-semibold tracking-widest uppercase"
        style="color: var(--color-outline);"
      >Parameters</span>
      <div
@@ -117,7 +123,7 @@
        Leaf density: 0.6
      </div>
      <span
-        class="mt-2 text-xs font-semibold uppercase tracking-widest"
+        class="mt-2 text-xs font-semibold tracking-widest uppercase"
        style="color: var(--color-outline);"
      >Export</span>
      <div
@@ -139,4 +145,3 @@
    }}
  />
 {/if}
-
@@ -12,11 +12,8 @@
    'custom'
  ];

-  let { theme = $bindable() } = $props();
-
  let themeIndex = $state(0);
  $effect(() => {
-    theme = themes[themeIndex];
    const classList = document.documentElement.classList;
    for (const c of classList) {
      if (c.startsWith('theme-')) document.documentElement.classList.remove(c);
@@ -1,7 +1,7 @@
-@import "tailwindcss";
+@import 'tailwindcss';

 body {
-  color: var(--color-text);
-  background-color: var(--color-layer-0);
-  margin: 0;
+	color: var(--color-text);
+	background-color: var(--color-layer-0);
+	margin: 0;
 }
@@ -11,9 +11,9 @@
      "position": "bottom-right",
      "text": "👋 Hey! I'm Planty — your guide to this app. How would you like me to explain things?",
      "choices": [
-        { "label": "🤓 Technical — give me the details", "next": "intro_nerd"   },
-        { "label": "🌱 Simple — keep it friendly",       "next": "intro_simple" },
-        { "label": "No thanks, skip the tour",           "next": null           }
+        { "label": "🤓 Technical — give me the details", "next": "intro_nerd" },
+        { "label": "🌱 Simple — keep it friendly", "next": "intro_simple" },
+        { "label": "No thanks, skip the tour", "next": null }
      ]
    },

@@ -21,14 +21,12 @@
      "type": "step",
      "position": "bottom-right",
      "text": "This is a WebAssembly-powered node graph. Each node is a compiled .wasm module executed in a sandboxed runtime.",
-      "waitFor": "click",
      "next": "highlight_graph_nerd"
    },
    "intro_simple": {
      "type": "step",
      "position": "bottom-right",
      "text": "Think of this like a recipe card — each block does one thing, and you connect them to build a plant!",
-      "waitFor": "click",
      "next": "highlight_graph_simple"
    },

@@ -37,7 +35,6 @@
      "position": "bottom-left",
      "highlight": { "selector": "#graph-canvas", "padding": 12 },
      "text": "The graph canvas renders edges as Bézier curves. Node execution is topologically sorted before each WASM call.",
-      "waitFor": "click",
      "next": "highlight_sidebar_nerd"
    },
    "highlight_graph_simple": {
@@ -45,7 +42,6 @@
      "position": "bottom-left",
      "highlight": { "selector": "#graph-canvas", "padding": 12 },
      "text": "This is the main canvas — drag nodes around and connect them to create your plant!",
-      "waitFor": "click",
      "next": "highlight_sidebar_simple"
    },

@@ -54,7 +50,6 @@
      "position": "bottom-right",
      "highlight": { "selector": "#sidebar", "padding": 8 },
      "text": "The sidebar exposes node parameters, export settings, and the raw graph JSON for debugging.",
-      "waitFor": "click",
      "next": "tip_nerd"
    },
    "highlight_sidebar_simple": {
@@ -62,7 +57,6 @@
      "position": "bottom-right",
      "highlight": { "selector": "#sidebar", "padding": 8 },
      "text": "The sidebar lets you tweak settings and export your creation.",
-      "waitFor": "click",
      "next": "tip_simple"
    },

@@ -70,14 +64,12 @@
      "type": "step",
      "position": "center",
      "text": "Press Space or double-click the canvas to open node search. Nodes are fetched from the WASM registry at runtime.",
-      "waitFor": "click",
      "next": "done_nerd"
    },
    "tip_simple": {
      "type": "step",
      "position": "center",
      "text": "Press Space anywhere on the canvas to add a new block — try it!",
-      "waitFor": "click",
      "next": "done_simple"
    },

@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="107" height="128" viewBox="0 0 107 128"><title>svelte-logo</title><path d="M94.157 22.819c-10.4-14.885-30.94-19.297-45.792-9.835L22.282 29.608A29.92 29.92 0 0 0 8.764 49.65a31.5 31.5 0 0 0 3.108 20.231 30 30 0 0 0-4.477 11.183 31.9 31.9 0 0 0 5.448 24.116c10.402 14.887 30.942 19.297 45.791 9.835l26.083-16.624A29.92 29.92 0 0 0 98.235 78.35a31.53 31.53 0 0 0-3.105-20.232 30 30 0 0 0 4.474-11.182 31.88 31.88 0 0 0-5.447-24.116" style="fill:#ff3e00"/><path d="M45.817 106.582a20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.503 18 18 0 0 1 .624-2.435l.49-1.498 1.337.981a33.6 33.6 0 0 0 10.203 5.098l.97.294-.09.968a5.85 5.85 0 0 0 1.052 3.878 6.24 6.24 0 0 0 6.695 2.485 5.8 5.8 0 0 0 1.603-.704L69.27 76.28a5.43 5.43 0 0 0 2.45-3.631 5.8 5.8 0 0 0-.987-4.371 6.24 6.24 0 0 0-6.698-2.487 5.7 5.7 0 0 0-1.6.704l-9.953 6.345a19 19 0 0 1-5.296 2.326 20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.502 17.99 17.99 0 0 1 8.13-12.052l26.081-16.623a19 19 0 0 1 5.3-2.329 20.72 20.72 0 0 1 22.237 8.243 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-.624 2.435l-.49 1.498-1.337-.98a33.6 33.6 0 0 0-10.203-5.1l-.97-.294.09-.968a5.86 5.86 0 0 0-1.052-3.878 6.24 6.24 0 0 0-6.696-2.485 5.8 5.8 0 0 0-1.602.704L37.73 51.72a5.42 5.42 0 0 0-2.449 3.63 5.79 5.79 0 0 0 .986 4.372 6.24 6.24 0 0 0 6.698 2.486 5.8 5.8 0 0 0 1.602-.704l9.952-6.342a19 19 0 0 1 5.295-2.328 20.72 20.72 0 0 1 22.237 8.242 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-8.13 12.053l-26.081 16.622a19 19 0 0 1-5.3 2.328" style="fill:#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="107" height="128" viewBox="0 0 107 128">
+  <title>svelte-logo</title><path
+    d="M94.157 22.819c-10.4-14.885-30.94-19.297-45.792-9.835L22.282 29.608A29.92 29.92 0 0 0 8.764 49.65a31.5 31.5 0 0 0 3.108 20.231 30 30 0 0 0-4.477 11.183 31.9 31.9 0 0 0 5.448 24.116c10.402 14.887 30.942 19.297 45.791 9.835l26.083-16.624A29.92 29.92 0 0 0 98.235 78.35a31.53 31.53 0 0 0-3.105-20.232 30 30 0 0 0 4.474-11.182 31.88 31.88 0 0 0-5.447-24.116"
+    style="fill:#ff3e00"
+  /><path
+    d="M45.817 106.582a20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.503 18 18 0 0 1 .624-2.435l.49-1.498 1.337.981a33.6 33.6 0 0 0 10.203 5.098l.97.294-.09.968a5.85 5.85 0 0 0 1.052 3.878 6.24 6.24 0 0 0 6.695 2.485 5.8 5.8 0 0 0 1.603-.704L69.27 76.28a5.43 5.43 0 0 0 2.45-3.631 5.8 5.8 0 0 0-.987-4.371 6.24 6.24 0 0 0-6.698-2.487 5.7 5.7 0 0 0-1.6.704l-9.953 6.345a19 19 0 0 1-5.296 2.326 20.72 20.72 0 0 1-22.237-8.243 19.17 19.17 0 0 1-3.277-14.502 17.99 17.99 0 0 1 8.13-12.052l26.081-16.623a19 19 0 0 1 5.3-2.329 20.72 20.72 0 0 1 22.237 8.243 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-.624 2.435l-.49 1.498-1.337-.98a33.6 33.6 0 0 0-10.203-5.1l-.97-.294.09-.968a5.86 5.86 0 0 0-1.052-3.878 6.24 6.24 0 0 0-6.696-2.485 5.8 5.8 0 0 0-1.602.704L37.73 51.72a5.42 5.42 0 0 0-2.449 3.63 5.79 5.79 0 0 0 .986 4.372 6.24 6.24 0 0 0 6.698 2.486 5.8 5.8 0 0 0 1.602-.704l9.952-6.342a19 19 0 0 1 5.295-2.328 20.72 20.72 0 0 1 22.237 8.242 19.17 19.17 0 0 1 3.277 14.503 18 18 0 0 1-8.13 12.053l-26.081 16.622a19 19 0 0 1-5.3 2.328"
+    style="fill:#fff"
+  />
+</svg>
@@ -2,16 +2,16 @@ import adapter from '@sveltejs/adapter-auto';

 /** @type {import('@sveltejs/kit').Config} */
 const config = {
-	compilerOptions: {
-		// Force runes mode for the project, except for libraries. Can be removed in svelte 6.
-		runes: ({ filename }) => (filename.split(/[/\\]/).includes('node_modules') ? undefined : true)
-	},
-	kit: {
-		// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
-		// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
-		// See https://svelte.dev/docs/kit/adapters for more information about adapters.
-		adapter: adapter()
-	}
+  compilerOptions: {
+    // Force runes mode for the project, except for libraries. Can be removed in svelte 6.
+    runes: ({ filename }) => (filename.split(/[/\\]/).includes('node_modules') ? undefined : true)
+  },
+  kit: {
+    // adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
+    // If your environment is not supported, or you settled on a specific environment, switch out the adapter.
+    // See https://svelte.dev/docs/kit/adapters for more information about adapters.
+    adapter: adapter()
+  }
 };

 export default config;
@@ -1,15 +1,14 @@
 {
-	"extends": "./.svelte-kit/tsconfig.json",
-	"compilerOptions": {
-		"rewriteRelativeImportExtensions": true,
-		"allowJs": true,
-		"checkJs": true,
-		"forceConsistentCasingInFileNames": true,
-		"resolveJsonModule": true,
-		"skipLibCheck": true,
-		"sourceMap": true,
-		"strict": true,
-		"module": "NodeNext",
-		"moduleResolution": "NodeNext"
-	}
+  "extends": "./.svelte-kit/tsconfig.json",
+  "compilerOptions": {
+    "rewriteRelativeImportExtensions": true,
+    "allowJs": true,
+    "checkJs": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "moduleResolution": "bundler"
+  }
 }
@@ -1,5 +1,5 @@
-import tailwindcss from '@tailwindcss/vite';
 import { sveltekit } from '@sveltejs/kit/vite';
+import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';

 export default defineConfig({ plugins: [tailwindcss(), sveltekit()] });
@@ -1,7 +1,8 @@
 {
  "name": "@nodarium/types",
-  "version": "0.0.5",
+  "version": "0.0.6",
  "description": "",
+  "type": "module",
  "main": "src/index.ts",
  "scripts": {
    "format": "dprint fmt -c '../../.dprint.jsonc' .",
@@ -17,9 +18,9 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "zod": "^4.3.6"
+    "zod": "^4.4.3"
  },
  "devDependencies": {
-    "dprint": "^0.51.1"
+    "dprint": "^0.54.0"
  }
 }
@@ -4,11 +4,13 @@ export type {
  Box,
  Edge,
  Graph,
+  GroupDefinition,
  NodeDefinition,
  NodeId,
  NodeInstance,
+  SerializedEdge,
  SerializedNode,
  Socket
 } from './types';
-export { GraphSchema, NodeSchema } from './types';
+export { GraphSchema, GroupSchema, NodeSchema } from './types';
 export { NodeDefinitionSchema } from './types';
@@ -61,8 +61,10 @@ export const NodeInputBooleanSchema = z.object({
 export const NodeInputSelectSchema = z.object({
  ...DefaultOptionsSchema.shape,
  type: z.literal('select'),
-  options: z.array(z.string()).optional(),
-  value: z.string().optional()
+  options: z.array(
+    z.union([z.string(), z.object({ value: z.number(), label: z.string() })])
+  ).optional(),
+  value: z.union([z.string(), z.number()]).optional()
 });

 export const NodeInputSeedSchema = z.object({
@@ -103,7 +105,6 @@ export const NodeInputSchema = z.union([
  NodeInputIntegerSchema,
  NodeInputShapeSchema,
  NodeInputSelectSchema,
-  NodeInputSeedSchema,
  NodeInputVec3Schema,
  NodeInputGeometrySchema,
  NodeInputPathSchema,
@@ -76,6 +76,24 @@ export type Socket = {

 export type Edge = [NodeInstance, number, NodeInstance, string];

+const SerializedEdgeSchema = z.tuple([z.number(), z.number(), z.number(), z.string()]);
+
+export type SerializedEdge = z.infer<typeof SerializedEdgeSchema>;
+
+export const GroupSchema = z.object({
+  id: z.number(),
+  name: z.string().optional(),
+  nodes: z.array(NodeSchema),
+  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 const GraphSchema = z.object({
  id: z.number(),
  meta: z
@@ -86,7 +104,8 @@ export const GraphSchema = z.object({
    .optional(),
  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()]))
+  edges: z.array(SerializedEdgeSchema),
+  groups: z.array(GroupSchema)
 });

 export type Graph = z.infer<typeof GraphSchema>;
@@ -1,9 +1,9 @@
 {
  "name": "@nodarium/ui",
-  "version": "0.0.5",
+  "version": "0.0.6",
  "scripts": {
    "dev": "vite",
-    "build": "vite build && npm run package",
+    "build": "vite build",
    "preview": "vite preview",
    "package": "svelte-kit sync && svelte-package && publint",
    "prepublishOnly": "npm run package",
@@ -16,10 +16,10 @@
  },
  "exports": {
    ".": {
-      "types": "./dist/index.d.ts",
-      "svelte": "./dist/index.js"
+      "types": "./src/lib/index.ts",
+      "svelte": "./src/lib/index.ts"
    },
-    "./app.css": "./dist/app.css"
+    "./app.css": "./src/lib/app.css"
  },
  "files": [
    "dist",
@@ -30,46 +30,47 @@
    "svelte": "^4.0.0"
  },
  "devDependencies": {
-    "@eslint/compat": "^2.0.2",
-    "@eslint/eslintrc": "^3.3.3",
-    "@eslint/js": "^9.39.2",
+    "@eslint/compat": "^2.0.5",
+    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/js": "^10.0.1",
    "@nodarium/types": "workspace:^",
-    "@playwright/test": "^1.58.1",
+    "@playwright/test": "^1.59.1",
    "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/kit": "^2.50.2",
+    "@sveltejs/kit": "^2.59.0",
    "@sveltejs/package": "^2.5.7",
-    "@sveltejs/vite-plugin-svelte": "^6.2.4",
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
    "@testing-library/svelte": "^5.3.1",
    "@types/eslint": "^9.6.1",
-    "@types/three": "^0.182.0",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
-    "@vitest/browser-playwright": "^4.0.18",
-    "dprint": "^0.51.1",
-    "eslint": "^9.39.2",
-    "eslint-plugin-svelte": "^3.14.0",
-    "globals": "^17.3.0",
-    "publint": "^0.3.17",
-    "svelte": "^5.49.2",
-    "svelte-check": "^4.3.6",
-    "svelte-eslint-parser": "^1.4.1",
+    "@types/node": "^25.6.0",
+    "@types/three": "^0.184.0",
+    "@typescript-eslint/eslint-plugin": "^8.59.1",
+    "@typescript-eslint/parser": "^8.59.1",
+    "@vitest/browser-playwright": "^4.1.5",
+    "dprint": "^0.54.0",
+    "eslint": "^10.3.0",
+    "eslint-plugin-svelte": "^3.17.1",
+    "globals": "^17.6.0",
+    "publint": "^0.3.18",
+    "svelte": "^5.55.5",
+    "svelte-check": "^4.4.7",
+    "svelte-eslint-parser": "^1.6.0",
    "tslib": "^2.8.1",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0",
-    "vite": "^7.3.1",
-    "vitest": "^4.0.18",
-    "vitest-browser-svelte": "^2.0.2"
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.1",
+    "vite": "^8.0.10",
+    "vitest": "^4.1.5",
+    "vitest-browser-svelte": "^2.1.1"
  },
  "svelte": "./dist/index.js",
  "types": "./dist/index.d.ts",
  "type": "module",
  "dependencies": {
+    "@iconify-json/tabler": "^1.2.33",
+    "@iconify/tailwind4": "^1.2.3",
    "@nodarium/ui": "workspace:*",
-    "@iconify-json/tabler": "^1.2.26",
-    "@iconify/tailwind4": "^1.2.1",
-    "@tailwindcss/vite": "^4.1.18",
-    "@threlte/core": "^8.3.1",
-    "@threlte/extras": "^9.7.1",
-    "tailwindcss": "^4.1.18"
+    "@tailwindcss/vite": "^4.2.4",
+    "@threlte/core": "^8.5.11",
+    "@threlte/extras": "^9.15.1",
+    "tailwindcss": "^4.2.4"
  }
 }
@@ -0,0 +1,55 @@
+<script lang="ts">
+  import type { Snippet } from 'svelte';
+
+  interface Props {
+    variant?: 'default' | 'primary' | 'destructive' | 'ghost';
+    size?: 'sm' | 'md';
+    disabled?: boolean;
+    class?: string;
+    onclick?: (e: MouseEvent) => void;
+    children?: Snippet;
+    type?: 'button' | 'submit' | 'reset';
+  }
+
+  let {
+    variant = 'default',
+    size = 'md',
+    disabled = false,
+    class: _class = '',
+    onclick,
+    children,
+    type = 'button'
+  }: Props = $props();
+
+  const variantClasses = {
+    default: 'bg-layer-2 border border-outline text-text hover:opacity-85',
+    primary: 'bg-selected text-white border border-transparent hover:opacity-88',
+    destructive: 'bg-red-600 text-white border border-transparent hover:opacity-88',
+    ghost: 'bg-layer-2 border border-transparent text-text opacity-75 hover:opacity-100'
+  };
+
+  const sizeClasses = {
+    sm: 'px-2 py-0.5 text-xs',
+    md: 'px-3 py-1 text-sm'
+  };
+</script>
+
+<button
+  {type}
+  {disabled}
+  class:py-1={size === 'sm'}
+  class:px-1={size === 'sm'}
+  class:py-2={size !== 'sm'}
+  class="
+    inline-flex items-center gap-1.5 rounded cursor-pointer
+    font-(--font-family) leading-none whitespace-nowrap
+    transition-opacity duration-100
+    disabled:opacity-40 disabled:cursor-not-allowed
+    {variantClasses[variant]}
+    {sizeClasses[size]}
+    {_class}
+  "
+  {onclick}
+>
+  {@render children?.()}
+</button>
--- a/Show More
+++ b/Show More