@livestore/cli 0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b → 0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/cli",
-  "version": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b",
+  "version": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -11,17 +11,17 @@
   },
   "dependencies": {
     "@effect/ai-openai": "0.32.0",
-    "@livestore/adapter-node": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b",
-    "@livestore/common": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b",
-    "@livestore/livestore": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b",
-    "@livestore/peer-deps": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b",
-    "@livestore/sync-cf": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b",
-    "@livestore/utils": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b"
+    "@livestore/adapter-node": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2",
+    "@livestore/livestore": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2",
+    "@livestore/peer-deps": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2",
+    "@livestore/common": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2",
+    "@livestore/sync-cf": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2",
+    "@livestore/utils": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2"
   },
   "devDependencies": {
     "@types/node": "24.10.1",
     "typescript": "5.9.2",
-    "@livestore/utils-dev": "0.0.0-snapshot-7fec227f317fc3d47465077490fa0d09a16d739b"
+    "@livestore/utils-dev": "0.0.0-snapshot-29b38715366635e2fffea5f896089d326087c0f2"
   },
   "files": [
     "package.json",

package/src/cli.ts

@@ -1,7 +1,8 @@
 import { Cli } from '@livestore/utils/node'
+import { syncCommand } from './commands/import-export.ts'
 import { mcpCommand } from './commands/mcp.ts'
 import { createCommand } from './commands/new-project.ts'
 
 export const command = Cli.Command.make('livestore', {
   verbose: Cli.Options.boolean('verbose').pipe(Cli.Options.withDefault(false)),
-}).pipe(Cli.Command.withSubcommands([mcpCommand, createCommand]))
+}).pipe(Cli.Command.withSubcommands([mcpCommand, createCommand, syncCommand]))

package/src/commands/import-export.ts

@@ -0,0 +1,262 @@
+import path from 'node:path'
+import type { UnknownError } from '@livestore/common'
+import { Console, Effect, FileSystem, type HttpClient, type Scope } from '@livestore/utils/effect'
+import { Cli } from '@livestore/utils/node'
+import * as SyncOps from '../sync-operations.ts'
+
+/**
+ * Export events from the sync backend to a JSON file.
+ */
+const exportEvents = ({
+  configPath,
+  storeId,
+  clientId,
+  outputPath,
+}: {
+  configPath: string
+  storeId: string
+  clientId: string
+  outputPath: string
+}): Effect.Effect<
+  void,
+  SyncOps.ExportError | SyncOps.ConnectionError | UnknownError,
+  FileSystem.FileSystem | HttpClient.HttpClient | Scope.Scope
+> =>
+  Effect.gen(function* () {
+    yield* Console.log(`Connecting to sync backend...`)
+
+    const result = yield* SyncOps.pullEventsFromSyncBackend({ configPath, storeId, clientId })
+
+    yield* Console.log(`✓ Connected to sync backend`)
+    yield* Console.log(`Pulled ${result.eventCount} events`)
+
+    const fs = yield* FileSystem.FileSystem
+    const absOutputPath = path.isAbsolute(outputPath) ? outputPath : path.resolve(process.cwd(), outputPath)
+
+    yield* fs.writeFileString(absOutputPath, JSON.stringify(result.data, null, 2)).pipe(
+      Effect.mapError(
+        (cause) =>
+          new SyncOps.ExportError({
+            cause,
+            note: `Failed to write export file: ${cause}`,
+          }),
+      ),
+    )
+
+    yield* Console.log(`Exported ${result.eventCount} events to ${absOutputPath}`)
+  }).pipe(Effect.withSpan('cli:export'))
+
+/**
+ * Import events from a JSON file to the sync backend.
+ */
+const importEvents = ({
+  configPath,
+  storeId,
+  clientId,
+  inputPath,
+  force,
+  dryRun,
+}: {
+  configPath: string
+  storeId: string
+  clientId: string
+  inputPath: string
+  force: boolean
+  dryRun: boolean
+}): Effect.Effect<
+  void,
+  SyncOps.ImportError | SyncOps.ConnectionError | UnknownError,
+  FileSystem.FileSystem | HttpClient.HttpClient | Scope.Scope
+> =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem
+    const absInputPath = path.isAbsolute(inputPath) ? inputPath : path.resolve(process.cwd(), inputPath)
+
+    const exists = yield* fs.exists(absInputPath).pipe(
+      Effect.mapError(
+        (cause) =>
+          new SyncOps.ImportError({
+            cause,
+            note: `Failed to check file existence: ${cause}`,
+          }),
+      ),
+    )
+    if (!exists) {
+      return yield* new SyncOps.ImportError({
+        cause: new Error(`File not found: ${absInputPath}`),
+        note: `Import file does not exist at ${absInputPath}`,
+      })
+    }
+
+    yield* Console.log(`Reading import file...`)
+
+    const fileContent = yield* fs.readFileString(absInputPath).pipe(
+      Effect.mapError(
+        (cause) =>
+          new SyncOps.ImportError({
+            cause,
+            note: `Failed to read import file: ${cause}`,
+          }),
+      ),
+    )
+
+    const parsedContent = yield* Effect.try({
+      try: () => JSON.parse(fileContent),
+      catch: (error) =>
+        new SyncOps.ImportError({
+          cause: new Error(`Failed to parse JSON: ${error instanceof Error ? error.message : String(error)}`),
+          note: `Invalid JSON in import file: ${error instanceof Error ? error.message : String(error)}`,
+        }),
+    })
+
+    /** Validate export file format before proceeding */
+    const validation = yield* SyncOps.validateExportData({ data: parsedContent, targetStoreId: storeId })
+
+    if (validation.storeIdMismatch) {
+      if (!force) {
+        return yield* new SyncOps.ImportError({
+          cause: new Error(`Store ID mismatch: file has '${validation.sourceStoreId}', expected '${storeId}'`),
+          note: `The export file was created for a different store. Use --force to import anyway.`,
+        })
+      }
+      yield* Console.log(
+        `Store ID mismatch: file has '${validation.sourceStoreId}', importing to '${storeId}' (--force)`,
+      )
+    }
+
+    yield* Console.log(`Found ${validation.eventCount} events in export file`)
+
+    if (dryRun) {
+      yield* Console.log(`Dry run - validating import file...`)
+      yield* Console.log(`Dry run complete. ${validation.eventCount} events would be imported.`)
+      return
+    }
+
+    yield* Console.log(`Connecting to sync backend...`)
+
+    const result = yield* SyncOps.pushEventsToSyncBackend({
+      configPath,
+      storeId,
+      clientId,
+      data: parsedContent,
+      force,
+      dryRun: false,
+    })
+
+    yield* Console.log(`✓ Connected to sync backend`)
+    yield* Console.log(`Successfully imported ${result.eventCount} events`)
+  }).pipe(Effect.withSpan('cli:import'))
+
+export const exportCommand = Cli.Command.make(
+  'export',
+  {
+    config: Cli.Options.text('config').pipe(
+      Cli.Options.withAlias('c'),
+      Cli.Options.withDescription('Path to the config module that exports schema and syncBackend'),
+    ),
+    storeId: Cli.Options.text('store-id').pipe(
+      Cli.Options.withAlias('i'),
+      Cli.Options.withDescription('Store identifier'),
+    ),
+    clientId: Cli.Options.text('client-id').pipe(
+      Cli.Options.withDefault('cli-export'),
+      Cli.Options.withDescription('Client identifier for the sync connection'),
+    ),
+    output: Cli.Args.text({ name: 'file' }).pipe(Cli.Args.withDescription('Output JSON file path')),
+  },
+  Effect.fn(function* ({
+    config,
+    storeId,
+    clientId,
+    output,
+  }: {
+    config: string
+    storeId: string
+    clientId: string
+    output: string
+  }) {
+    yield* Console.log(`Exporting events from LiveStore...`)
+    yield* Console.log(`   Config: ${config}`)
+    yield* Console.log(`   Store ID: ${storeId}`)
+    yield* Console.log(`   Output: ${output}`)
+    yield* Console.log('')
+
+    yield* exportEvents({
+      configPath: config,
+      storeId,
+      clientId,
+      outputPath: output,
+    }).pipe(Effect.scoped)
+  }),
+).pipe(
+  Cli.Command.withDescription(
+    'Export all events from the sync backend to a JSON file. Useful for backup and migration.',
+  ),
+)
+
+export const importCommand = Cli.Command.make(
+  'import',
+  {
+    config: Cli.Options.text('config').pipe(
+      Cli.Options.withAlias('c'),
+      Cli.Options.withDescription('Path to the config module that exports schema and syncBackend'),
+    ),
+    storeId: Cli.Options.text('store-id').pipe(
+      Cli.Options.withAlias('i'),
+      Cli.Options.withDescription('Store identifier'),
+    ),
+    clientId: Cli.Options.text('client-id').pipe(
+      Cli.Options.withDefault('cli-import'),
+      Cli.Options.withDescription('Client identifier for the sync connection'),
+    ),
+    force: Cli.Options.boolean('force').pipe(
+      Cli.Options.withAlias('f'),
+      Cli.Options.withDefault(false),
+      Cli.Options.withDescription('Force import even if store ID does not match'),
+    ),
+    dryRun: Cli.Options.boolean('dry-run').pipe(
+      Cli.Options.withDefault(false),
+      Cli.Options.withDescription('Validate the import file without actually importing'),
+    ),
+    input: Cli.Args.text({ name: 'file' }).pipe(Cli.Args.withDescription('Input JSON file to import')),
+  },
+  Effect.fn(function* ({
+    config,
+    storeId,
+    clientId,
+    force,
+    dryRun,
+    input,
+  }: {
+    config: string
+    storeId: string
+    clientId: string
+    force: boolean
+    dryRun: boolean
+    input: string
+  }) {
+    yield* Console.log(`Importing events to LiveStore...`)
+    yield* Console.log(`   Config: ${config}`)
+    yield* Console.log(`   Store ID: ${storeId}`)
+    yield* Console.log(`   Input: ${input}`)
+    if (force) yield* Console.log(`   Force: enabled`)
+    if (dryRun) yield* Console.log(`   Dry run: enabled`)
+    yield* Console.log('')
+
+    yield* importEvents({
+      configPath: config,
+      storeId,
+      clientId,
+      inputPath: input,
+      force,
+      dryRun,
+    }).pipe(Effect.scoped)
+  }),
+).pipe(
+  Cli.Command.withDescription('Import events from a JSON file to the sync backend. The sync backend must be empty.'),
+)
+
+export const syncCommand = Cli.Command.make('sync').pipe(
+  Cli.Command.withSubcommands([exportCommand, importCommand]),
+  Cli.Command.withDescription('Import and export events from the sync backend'),
+)

package/src/commands/mcp-tool-handlers.ts

@@ -1,14 +1,20 @@
-import { Effect } from '@livestore/utils/effect'
+import { Effect, FetchHttpClient, Layer, type Toolkit } from '@livestore/utils/effect'
+import { PlatformNode } from '@livestore/utils/node'
 import { blogSchemaContent } from '../mcp-content/schemas/blog.ts'
 import { ecommerceSchemaContent } from '../mcp-content/schemas/ecommerce.ts'
 import { socialSchemaContent } from '../mcp-content/schemas/social.ts'
 import { todoSchemaContent } from '../mcp-content/schemas/todo.ts'
 import * as Runtime from '../mcp-runtime/runtime.ts'
+import * as SyncOps from '../sync-operations.ts'
 import { coachToolHandler } from './mcp-coach.ts'
 import { livestoreToolkit } from './mcp-tools-defs.ts'
 
-// Tool handlers using Tim Smart's pattern
-export const toolHandlers: any = livestoreToolkit.of({
+/** Layer providing FileSystem and HttpClient for sync operations */
+const SyncOpsLayer = Layer.mergeAll(PlatformNode.NodeFileSystem.layer, FetchHttpClient.layer)
+
+type LivestoreToolHandlers = Toolkit.HandlersFrom<Toolkit.Tools<typeof livestoreToolkit>>
+
+export const toolHandlers: LivestoreToolHandlers = livestoreToolkit.of({
   livestore_coach: coachToolHandler,
 
   livestore_generate_schema: Effect.fnUntraced(function* ({ schemaType, customDescription }) {
@@ -121,8 +127,13 @@ export const schema = Schema.create({
   }),
 
   // Connect the single in-process LiveStore instance from user module
-  livestore_instance_connect: Effect.fnUntraced(function* ({ storePath, storeId, clientId, sessionId }) {
-    const store = yield* Runtime.init({ storePath, storeId, clientId, sessionId }).pipe(Effect.orDie)
+  livestore_instance_connect: Effect.fnUntraced(function* ({ configPath, storeId, clientId, sessionId }) {
+    const store = yield* Runtime.init({
+      configPath,
+      storeId,
+      ...(clientId !== undefined ? { clientId } : {}),
+      ...(sessionId !== undefined ? { sessionId } : {}),
+    }).pipe(Effect.orDie)
     const eventNames = Array.from(store.schema.eventsDefsMap.keys())
     const tableNames = Array.from(store.schema.state.sqlite.tables.keys())
 
@@ -156,4 +167,32 @@ export const schema = Schema.create({
   livestore_instance_disconnect: Effect.fnUntraced(function* () {
     return yield* Runtime.disconnect
   }),
+
+  // Sync export - pull all events from sync backend
+  livestore_sync_export: Effect.fnUntraced(function* ({ configPath, storeId, clientId }) {
+    const result = yield* SyncOps.pullEventsFromSyncBackend({
+      configPath,
+      storeId,
+      clientId: clientId ?? 'mcp-export',
+    }).pipe(Effect.scoped, Effect.provide(SyncOpsLayer), Effect.orDie)
+
+    return {
+      storeId: result.storeId,
+      eventCount: result.eventCount,
+      exportedAt: result.exportedAt,
+      data: result.data,
+    }
+  }),
+
+  // Sync import - push events to sync backend
+  livestore_sync_import: Effect.fnUntraced(function* ({ configPath, storeId, clientId, data, force, dryRun }) {
+    return yield* SyncOps.pushEventsToSyncBackend({
+      configPath,
+      storeId,
+      clientId: clientId ?? 'mcp-import',
+      data,
+      force: force ?? false,
+      dryRun: dryRun ?? false,
+    }).pipe(Effect.scoped, Effect.provide(SyncOpsLayer), Effect.orDie)
+  }),
 })

package/src/commands/mcp-tools-defs.ts

@@ -43,7 +43,7 @@ export const livestoreToolkit = Toolkit.make(
 Notes:
 - Only one instance can be active at a time; calling connect again shuts down and replaces the previous instance.
 - Reconnecting creates a fresh, in-memory client database. The state visible to queries is populated by your backend's initial sync behavior; depending on configuration, you may briefly observe empty or partial data until sync completes.
-- \`storePath\` is resolved relative to the current working directory.
+- \`configPath\` is resolved relative to the current working directory.
 - \`syncBackend\` must be a function (factory) that returns a backend; \`syncPayload\` must be JSON-serializable.
 
 Module contract (generic example):
@@ -63,13 +63,13 @@ export const syncPayload = { authToken: process.env.LIVESTORE_SYNC_AUTH_TOKEN ??
 
 Connect parameters:
 {
-  "storePath": "<path-to-your-mcp-module>.ts",
+  "configPath": "livestore-cli.config.ts",
   "storeId": "<store-id>"
 }
 
 Optional identifiers to group client state on the server:
 {
-  "storePath": "<path-to-your-mcp-module>.ts",
+  "configPath": "livestore-cli.config.ts",
   "storeId": "<store-id>",
   "clientId": "<client-id>",
   "sessionId": "<session-id>"
@@ -86,7 +86,7 @@ Returns on success:
   }
 }`,
     parameters: {
-      storePath: Schema.String.annotations({
+      configPath: Schema.String.annotations({
         description: 'Path to a module that exports named variables: schema and syncBackend',
       }),
       storeId: Schema.String.annotations({ description: 'Required store id for the LiveStore instance.' }),
@@ -226,4 +226,92 @@ Example success:
     parameters: {},
     success: Schema.TaggedStruct('disconnected', {}),
   }),
+
+  Tool.make('livestore_sync_export', {
+    description: `Export all events from a sync backend to JSON data.
+
+This tool connects directly to the sync backend (without creating a full LiveStore instance) and pulls all events. Useful for backup, migration, and debugging.
+
+Module contract (same as livestore_instance_connect):
+\`\`\`ts
+export { schema } from './src/livestore/schema.ts'
+export const syncBackend = makeWsSync({ url: process.env.LIVESTORE_SYNC_URL ?? 'ws://localhost:8787' })
+export const syncPayload = { authToken: process.env.LIVESTORE_SYNC_AUTH_TOKEN }
+\`\`\`
+
+Example parameters:
+{
+  "configPath": "livestore-cli.config.ts",
+  "storeId": "my-store"
+}
+
+Returns on success:
+{
+  "storeId": "my-store",
+  "eventCount": 127,
+  "exportedAt": "2024-01-15T10:30:00.000Z",
+  "data": { "version": 1, "storeId": "my-store", ... }
+}`,
+    parameters: {
+      configPath: Schema.String.annotations({
+        description: 'Path to a module that exports schema and syncBackend',
+      }),
+      storeId: Schema.String.annotations({ description: 'Store identifier' }),
+      clientId: Schema.optional(Schema.String.annotations({ description: 'Client identifier (default: mcp-export)' })),
+    },
+    success: Schema.Struct({
+      storeId: Schema.String,
+      eventCount: Schema.Number,
+      exportedAt: Schema.String,
+      data: Schema.JsonValue.annotations({ description: 'The export file data (can be saved or passed to import)' }),
+    }),
+  }).annotate(Tool.Readonly, true),
+
+  Tool.make('livestore_sync_import', {
+    description: `Import events from export data to a sync backend.
+
+This tool connects directly to the sync backend and pushes events. The sync backend must be empty.
+
+Example parameters:
+{
+  "configPath": "livestore-cli.config.ts",
+  "storeId": "my-store",
+  "data": { "version": 1, "storeId": "my-store", "events": [...] }
+}
+
+With options:
+{
+  "configPath": "livestore-cli.config.ts",
+  "storeId": "my-store",
+  "data": { ... },
+  "force": true,  // Import even if store ID doesn't match
+  "dryRun": true  // Validate without importing
+}
+
+Returns on success:
+{
+  "storeId": "my-store",
+  "eventCount": 127,
+  "dryRun": false
+}`,
+    parameters: {
+      configPath: Schema.String.annotations({
+        description: 'Path to a module that exports schema and syncBackend',
+      }),
+      storeId: Schema.String.annotations({ description: 'Store identifier' }),
+      clientId: Schema.optional(Schema.String.annotations({ description: 'Client identifier (default: mcp-import)' })),
+      data: Schema.JsonValue.annotations({
+        description: 'The export data to import (from livestore_sync_export or a file)',
+      }),
+      force: Schema.optional(
+        Schema.Boolean.annotations({ description: 'Force import even if store ID does not match' }),
+      ),
+      dryRun: Schema.optional(Schema.Boolean.annotations({ description: 'Validate without actually importing' })),
+    },
+    success: Schema.Struct({
+      storeId: Schema.String,
+      eventCount: Schema.Number,
+      dryRun: Schema.Boolean,
+    }),
+  }).annotate(Tool.Destructive, true),
 )

package/src/mcp-runtime/runtime.ts

@@ -1,77 +1,40 @@
-import path from 'node:path'
-import { pathToFileURL } from 'node:url'
 import { makeAdapter as makeNodeAdapter } from '@livestore/adapter-node'
-import { isLiveStoreSchema, LiveStoreEvent, SystemTables } from '@livestore/common/schema'
+import type { UnknownError } from '@livestore/common'
+import { LiveStoreEvent, SystemTables } from '@livestore/common/schema'
 import type { Store } from '@livestore/livestore'
 import { createStorePromise } from '@livestore/livestore'
-import { shouldNeverHappen } from '@livestore/utils'
-import { Effect, Option, Schema } from '@livestore/utils/effect'
+import { Effect, FetchHttpClient, Layer, Option, Schema } from '@livestore/utils/effect'
+import { PlatformNode } from '@livestore/utils/node'
+
+import { loadModuleConfig } from '../module-loader.ts'
 
 /** Currently connected store */
 let store: Store<any> | undefined
 
+/** Layer providing FileSystem and HttpClient for module loading */
+const ModuleLoaderLayer = Layer.mergeAll(PlatformNode.NodeFileSystem.layer, FetchHttpClient.layer)
+
 /**
  * Dynamically imports a module that exports a `makeStore({ storeId }): Promise<Store>` function,
  * calls it with the provided storeId, and caches the Store instance for subsequent tool calls.
  */
 export const init = ({
-  storePath,
+  configPath,
   storeId,
   clientId,
   sessionId,
 }: {
-  storePath: string
+  configPath: string
   storeId: string
   clientId?: string
   sessionId?: string
-}) =>
-  Effect.promise(async () => {
+}): Effect.Effect<Store<any>, UnknownError> =>
+  Effect.gen(function* () {
     if (!storeId || typeof storeId !== 'string') {
-      throw new Error('Invalid storeId: expected a non-empty string')
-    }
-    // Resolve to absolute path and import as file URL
-    const abs = path.isAbsolute(storePath) ? storePath : path.resolve(process.cwd(), storePath)
-    const mod = await import(pathToFileURL(abs).href)
-
-    // Validate required exports
-    const schema = (mod as any)?.schema
-    if (!isLiveStoreSchema(schema)) {
-      throw new Error(
-        `Module at ${abs} must export a valid LiveStore 'schema'. Ex: export { schema } from './src/livestore/schema.ts'`,
-      )
+      return yield* Effect.die(new Error('Invalid storeId: expected a non-empty string'))
     }
 
-    const syncBackend = (mod as any)?.syncBackend
-    if (typeof syncBackend !== 'function') {
-      throw new Error(
-        `Module at ${abs} must export a 'syncBackend' constructor (e.g., makeWsSync({ url })). Ex: export const syncBackend = makeWsSync({ url })`,
-      )
-    }
-
-    // Optional: syncPayload for authenticated backends
-    const syncPayloadSchemaExport = (mod as any)?.syncPayloadSchema
-    const syncPayloadSchema =
-      syncPayloadSchemaExport === undefined
-        ? Schema.JsonValue
-        : Schema.isSchema(syncPayloadSchemaExport)
-          ? (syncPayloadSchemaExport as Schema.Schema<any>)
-          : shouldNeverHappen(
-              `Exported 'syncPayloadSchema' from ${abs} must be an Effect Schema (received ${typeof syncPayloadSchemaExport}).`,
-            )
-
-    const syncPayloadExport = (mod as any)?.syncPayload
-    const syncPayload =
-      syncPayloadExport === undefined
-        ? undefined
-        : (() => {
-            try {
-              return Schema.decodeSync(syncPayloadSchema)(syncPayloadExport)
-            } catch (error) {
-              throw new Error(
-                `Failed to decode 'syncPayload' from ${abs} using the provided schema: ${(error as Error).message}`,
-              )
-            }
-          })()
+    const { schema, syncBackendConstructor, syncPayloadSchema, syncPayload } = yield* loadModuleConfig({ configPath })
 
     // Build Node adapter internally
     const adapter = makeNodeAdapter({
@@ -79,32 +42,36 @@ export const init = ({
       ...(clientId ? { clientId } : {}),
       ...(sessionId ? { sessionId } : {}),
       sync: {
-        backend: syncBackend as any,
+        backend: syncBackendConstructor,
         initialSyncOptions: { _tag: 'Blocking', timeout: 5000 },
         onSyncError: 'shutdown',
       },
     })
 
     // Create the store
-    const s = await createStorePromise({
-      schema,
-      storeId,
-      adapter,
-      disableDevtools: true,
-      syncPayload,
-      syncPayloadSchema,
-    })
+    const s = yield* Effect.promise(() =>
+      createStorePromise({
+        schema,
+        storeId,
+        adapter,
+        disableDevtools: true,
+        syncPayload,
+        syncPayloadSchema,
+      }),
+    )
 
     // Replace existing store if any
     if (store) {
-      try {
-        await store.shutdownPromise()
-      } catch {}
+      yield* Effect.promise(async () => {
+        try {
+          await store!.shutdownPromise()
+        } catch {}
+      })
     }
 
     store = s
     return store
-  })
+  }).pipe(Effect.provide(ModuleLoaderLayer), Effect.withSpan('mcp-runtime:init'))
 
 export const getStore = Effect.sync(() => Option.fromNullable(store))