diff --git a/packages/app/app.config.ts b/packages/app/app.config.ts
index 5c05b20..dae046d 100644
--- a/packages/app/app.config.ts
+++ b/packages/app/app.config.ts
@@ -24,6 +24,9 @@ const defaultConfig: ViteCustomizableConfig = {
     statebuilder({
       transformStores: ['eDefineAsync'],
       autoKey: true,
+      experimental: {
+        transformStateProviderDirective: true,
+      },
     }),
   ],
   optimizeDeps: {
diff --git a/packages/app/package.json b/packages/app/package.json
index daf557b..df21ae4 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -52,7 +52,7 @@
     "solid-js": "^1.9.3",
     "solid-jsx": "^1.1.4",
     "solid-mdx": "^0.0.7",
-    "statebuilder": "^0.7.1",
+    "statebuilder": "^0.7.2",
     "unique-names-generator": "^4.7.1",
     "vinxi": "^0.4.3",
     "vscode-languageserver-protocol": "^3.17.5",
diff --git a/packages/app/src/components/Editor/Editor.tsx b/packages/app/src/components/Editor/Editor.tsx
index aa7df22..cf18ddf 100644
--- a/packages/app/src/components/Editor/Editor.tsx
+++ b/packages/app/src/components/Editor/Editor.tsx
@@ -31,6 +31,7 @@ export interface EditorProps {
 }
 
 export function Editor(props: EditorProps) {
+  'use stateprovider';
   const editorUi = provideState(EditorUiStore);
   const editor = provideState(EditorStore);
 
diff --git a/packages/app/src/routes/editor/[...path].tsx b/packages/app/src/routes/editor/[...path].tsx
index 4fd459c..a0d1d39 100644
--- a/packages/app/src/routes/editor/[...path].tsx
+++ b/packages/app/src/routes/editor/[...path].tsx
@@ -5,7 +5,7 @@ import {
   type RouteDefinition,
   type RouteSectionProps,
 } from '@solidjs/router';
-import {provideState, StateProvider} from 'statebuilder';
+import {provideState} from 'statebuilder';
 import {Editor} from '~/components/Editor/Editor';
 import {
   EditorContext,
@@ -68,9 +68,7 @@ export default function EditorPage(props: RouteSectionProps) {
         user,
       }}
     >
-      <StateProvider>
-        <Editor type={'repository'} />
-      </StateProvider>
+      <Editor type={'repository'} />
     </EditorContext.Provider>
   );
 }
diff --git a/packages/app/src/routes/editor/scratch/[id].tsx b/packages/app/src/routes/editor/scratch/[id].tsx
index f201203..01b19c9 100644
--- a/packages/app/src/routes/editor/scratch/[id].tsx
+++ b/packages/app/src/routes/editor/scratch/[id].tsx
@@ -36,9 +36,7 @@ export default function EditorPage(props: RouteSectionProps) {
               user,
             }}
           >
-            <StateProvider>
-              <Editor type={'scratch'} />
-            </StateProvider>
+            <Editor type={'scratch'} />
           </EditorContext.Provider>
         )}
       </Show>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c2927de..e341018 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -161,8 +161,8 @@ importers:
         specifier: ^0.0.7
         version: 0.0.7(patch_hash=wongdwyww6mzxros5anf6ruhb4)(solid-js@1.9.3)(vite@5.4.10(@types/node@22.8.5)(terser@5.34.1))
       statebuilder:
-        specifier: ^0.7.1
-        version: 0.7.1
+        specifier: ^0.7.2
+        version: 0.7.2
       unique-names-generator:
         specifier: ^4.7.1
         version: 4.7.1
@@ -5442,8 +5442,8 @@ packages:
   statebuilder@0.6.2:
     resolution: {integrity: sha512-GLq0GKh/++3tQ3R9VsQ488Ma+KANSxWwGtVsqKlgX7VNfx3zS1CRrPCpfnbZBdNUQFOgiEFHt9TfNldPs93miw==}
 
-  statebuilder@0.7.1:
-    resolution: {integrity: sha512-1Ea7VEbnZzJpL6qact9iL0gMuxCWh/V3Z4C2tfc+RJqnVzWq7blwbR4j0MybLmFGsQi1gBL24jmAaLtFkEHAIg==}
+  statebuilder@0.7.2:
+    resolution: {integrity: sha512-bQG6qfZlQ6xFio+6wccpjpDQWPxk4WCRyzRteCDltGgxb+DqCP7vk55pkfvBDseazplF0oGztgtDN/l8BySZsQ==}
 
   statuses@2.0.1:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
@@ -12383,7 +12383,7 @@ snapshots:
       rxjs: 7.8.1
       solid-js: 1.9.3
 
-  statebuilder@0.7.1:
+  statebuilder@0.7.2:
     dependencies:
       '@babel/parser': 7.26.2
       '@solid-primitives/event-bus': 1.0.11(solid-js@1.9.3)