@livestore/cli 0.4.0-dev.22 → 0.4.0-dev.23

package/package.json

@@ -1,42 +1,86 @@
 {
   "name": "@livestore/cli",
-  "version": "0.4.0-dev.22",
+  "version": "0.4.0-dev.23",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/livestorejs/livestore.git"
+  },
+  "bin": {
+    "livestore": "./dist/bin.js"
+  },
+  "files": [
+    "dist",
+    "package.json",
+    "src"
+  ],
   "type": "module",
   "sideEffects": false,
   "exports": {
     ".": "./dist/mod.js"
   },
-  "bin": {
-    "livestore": "./dist/bin.js"
+  "publishConfig": {
+    "access": "public"
   },
   "dependencies": {
-    "@effect/ai": "0.32.1",
-    "@effect/ai-openai": "0.36.0",
-    "@effect/experimental": "0.57.11",
-    "@effect/opentelemetry": "0.59.3",
-    "@effect/platform": "0.93.8",
-    "@effect/rpc": "0.72.2",
-    "@standard-schema/spec": "1.0.0",
-    "effect": "3.19.12",
-    "@livestore/common": "0.4.0-dev.22",
-    "@livestore/livestore": "0.4.0-dev.22",
-    "@livestore/sync-cf": "0.4.0-dev.22",
-    "@livestore/peer-deps": "0.4.0-dev.22",
-    "@livestore/adapter-node": "0.4.0-dev.22",
-    "@livestore/utils": "0.4.0-dev.22"
+    "@effect/ai": "0.35.0",
+    "@effect/ai-openai": "0.39.0",
+    "@effect/experimental": "0.60.0",
+    "@effect/opentelemetry": "0.63.0",
+    "@effect/platform": "0.96.1",
+    "@effect/rpc": "0.75.1",
+    "effect": "3.21.2",
+    "@livestore/adapter-node": "^0.4.0-dev.23",
+    "@livestore/common": "^0.4.0-dev.23",
+    "@livestore/peer-deps": "^0.4.0-dev.23",
+    "@livestore/utils": "^0.4.0-dev.23",
+    "@livestore/livestore": "^0.4.0-dev.23"
   },
   "devDependencies": {
-    "@types/node": "24.10.1",
-    "typescript": "5.9.2",
-    "@livestore/utils-dev": "0.4.0-dev.22"
+    "@types/node": "25.3.3",
+    "typescript": "5.9.3",
+    "vitest": "3.2.4",
+    "@livestore/utils-dev": "^0.4.0-dev.23"
   },
-  "files": [
-    "package.json",
-    "src",
-    "dist"
-  ],
-  "publishConfig": {
-    "access": "public"
+  "peerDependencies": {
+    "@effect/ai": "^0.35.0",
+    "@effect/cli": "^0.75.1",
+    "@effect/cluster": "^0.58.2",
+    "@effect/experimental": "^0.60.0",
+    "@effect/opentelemetry": "^0.63.0",
+    "@effect/platform": "^0.96.1",
+    "@effect/platform-browser": "^0.76.0",
+    "@effect/platform-bun": "^0.89.0",
+    "@effect/platform-node": "^0.106.0",
+    "@effect/printer": "^0.49.0",
+    "@effect/printer-ansi": "^0.49.0",
+    "@effect/rpc": "^0.75.1",
+    "@effect/sql": "^0.51.1",
+    "@effect/typeclass": "^0.40.0",
+    "@effect/vitest": "^0.29.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@standard-schema/spec": "^1.1.0",
+    "effect": "^3.21.2"
+  },
+  "$genie": {
+    "source": "package.json.genie.ts",
+    "warning": "DO NOT EDIT - changes will be overwritten",
+    "workspaceClosureDirs": [
+      "packages/@livestore/adapter-node",
+      "packages/@livestore/adapter-web",
+      "packages/@livestore/cli",
+      "packages/@livestore/common",
+      "packages/@livestore/common-cf",
+      "packages/@livestore/devtools-web-common",
+      "packages/@livestore/livestore",
+      "packages/@livestore/peer-deps",
+      "packages/@livestore/sqlite-wasm",
+      "packages/@livestore/utils",
+      "packages/@livestore/utils-dev",
+      "packages/@livestore/wa-sqlite",
+      "packages/@livestore/webmesh"
+    ]
   },
   "scripts": {
     "build": "tsc",

package/src/__tests__/fixtures/mock-config.ts

@@ -1,5 +1,6 @@
 import path from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
+
 import { Events, makeSchema, State } from '@livestore/common/schema'
 import type { MockSyncBackend } from '@livestore/common/sync'
 import { EventFactory } from '@livestore/common/testing'
@@ -7,6 +8,14 @@ import { Effect, FileSystem, type Mailbox, Schema } from '@livestore/utils/effec
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
+class DynamicImportError extends Schema.TaggedError<DynamicImportError>()('DynamicImportError', {
+  cause: Schema.Defect,
+  path: Schema.String,
+}) {}
+
+// Use package-local temp directory for test config files to ensure proper module resolution
+const tmpDir = path.join(__dirname, '.tmp-test-configs')
+
 const items = State.SQLite.table({
   name: 'items',
   columns: {
@@ -33,7 +42,6 @@ const state = State.SQLite.makeState({
 
 export const schema = makeSchema({ state, events })
 
-const tmpDir = path.join(process.cwd(), 'tmp', 'cli-sync-tests')
 const schemaModuleUrl = pathToFileURL(path.join(__dirname, 'mock-config.ts')).href
 
 /** Generates a per-test config module exporting schema, a mock backend, and connection event taps. */
@@ -81,7 +89,7 @@ export const useMockConfig = Effect.acquireRelease(
 
     const mod = (yield* Effect.tryPromise({
       try: () => import(pathToFileURL(tempPath).href),
-      catch: (cause) => (cause instanceof Error ? cause : new Error(String(cause))),
+      catch: (cause) => new DynamicImportError({ cause, path: tempPath }),
     })) as {
       mockBackend: MockSyncBackend
       connectionEvents: Mailbox.Mailbox<'connect' | 'disconnect'>

package/src/__tests__/sync-operations.test.ts

@@ -1,8 +1,10 @@
+import { expect } from 'vitest'
+
 import type { LiveStoreEvent } from '@livestore/common/schema'
+import { Vitest } from '@livestore/utils-dev/node-vitest'
 import { Chunk, Effect, FetchHttpClient, Layer, Mailbox, Stream } from '@livestore/utils/effect'
 import { PlatformNode } from '@livestore/utils/node'
-import { Vitest } from '@livestore/utils-dev/node-vitest'
-import { expect } from 'vitest'
+
 import { pullEventsFromSyncBackend, pushEventsToSyncBackend } from '../sync-operations.ts'
 import { makeEventFactory, useMockConfig } from './fixtures/mock-config.ts'
 

package/src/bin.ts

@@ -3,6 +3,7 @@
 import { liveStoreVersion } from '@livestore/common'
 import { Console, Effect, FetchHttpClient, Layer, Logger, LogLevel } from '@livestore/utils/effect'
 import { Cli, PlatformNode } from '@livestore/utils/node'
+
 import { command } from './cli.ts'
 
 const cli = Cli.Command.run(command, {

package/src/cli.ts

@@ -1,4 +1,5 @@
 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'

package/src/commands/import-export.ts

@@ -1,9 +1,14 @@
 import path from 'node:path'
+
 import type { UnknownError } from '@livestore/common'
-import { Console, Effect, FileSystem, type HttpClient, type Scope } from '@livestore/utils/effect'
+import { Console, Effect, FileSystem, type HttpClient, Schema, type Scope } from '@livestore/utils/effect'
 import { Cli } from '@livestore/utils/node'
+
 import * as SyncOps from '../sync-operations.ts'
 
+const jsonStringifyPretty = Schema.encodeSync(Schema.parseJson({ space: 2 }))
+const jsonParse = Schema.decodeUnknownSync(Schema.parseJson())
+
 const LARGE_EVENT_WARNING_THRESHOLD = 100_000
 
 /**
@@ -38,14 +43,14 @@ const exportEvents = ({
     }
 
     const fs = yield* FileSystem.FileSystem
-    const absOutputPath = path.isAbsolute(outputPath) ? outputPath : path.resolve(process.cwd(), outputPath)
+    const absOutputPath = path.isAbsolute(outputPath) === true ? outputPath : path.resolve(process.cwd(), outputPath)
 
-    yield* fs.writeFileString(absOutputPath, JSON.stringify(result.data, null, 2)).pipe(
+    yield* fs.writeFileString(absOutputPath, jsonStringifyPretty(result.data)).pipe(
       Effect.mapError(
         (cause) =>
           new SyncOps.ExportError({
             cause,
-            note: `Failed to write export file: ${cause}`,
+            note: `Failed to write export file: ${String(cause)}`,
           }),
       ),
     )
@@ -77,18 +82,18 @@ const importEvents = ({
 > =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem
-    const absInputPath = path.isAbsolute(inputPath) ? inputPath : path.resolve(process.cwd(), inputPath)
+    const absInputPath = path.isAbsolute(inputPath) === true ? 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}`,
+            note: `Failed to check file existence: ${String(cause)}`,
           }),
       ),
     )
-    if (!exists) {
+    if (exists === false) {
       return yield* new SyncOps.ImportError({
         cause: new Error(`File not found: ${absInputPath}`),
         note: `Import file does not exist at ${absInputPath}`,
@@ -102,13 +107,13 @@ const importEvents = ({
         (cause) =>
           new SyncOps.ImportError({
             cause,
-            note: `Failed to read import file: ${cause}`,
+            note: `Failed to read import file: ${String(cause)}`,
           }),
       ),
     )
 
     const parsedContent = yield* Effect.try({
-      try: () => JSON.parse(fileContent),
+      try: () => jsonParse(fileContent),
       catch: (error) =>
         new SyncOps.ImportError({
           cause: new Error(`Failed to parse JSON: ${error instanceof Error ? error.message : String(error)}`),
@@ -119,8 +124,8 @@ const importEvents = ({
     /** Validate export file format before proceeding */
     const validation = yield* SyncOps.validateExportData({ data: parsedContent, targetStoreId: storeId })
 
-    if (validation.storeIdMismatch) {
-      if (!force) {
+    if (validation.storeIdMismatch === true) {
+      if (force !== true) {
         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.`,
@@ -138,7 +143,7 @@ const importEvents = ({
       )
     }
 
-    if (dryRun) {
+    if (dryRun === true) {
       yield* Console.log(`Dry run - validating import file...`)
       yield* Console.log(`Dry run complete. ${validation.eventCount} events would be imported.`)
       return
@@ -255,8 +260,8 @@ export const importCommand = Cli.Command.make(
     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`)
+    if (force === true) yield* Console.log(`   Force: enabled`)
+    if (dryRun === true) yield* Console.log(`   Dry run: enabled`)
     yield* Console.log('')
 
     yield* importEvents({

package/src/commands/mcp-coach.ts

@@ -1,5 +1,6 @@
 import { LanguageModel } from '@effect/ai'
 import { OpenAiClient, OpenAiLanguageModel } from '@effect/ai-openai'
+
 import { AiError, Config, Effect, FetchHttpClient, Layer, Prompt, Schema, Tool } from '@livestore/utils/effect'
 
 // Define the coach tool that analyzes LiveStore usage
@@ -57,7 +58,7 @@ type CoachToolResult = {
 export const coachToolHandler: (input: CoachToolHandlerInput) => Effect.Effect<CoachToolResult, AiError.AiError> =
   Effect.fn('mcp-coach-handler')(({ code, codeType }) => {
     const effect = Effect.gen(function* () {
-      const codeTypeContext = codeType ? `This is ${codeType} code using LiveStore. ` : 'This is LiveStore code. '
+      const codeTypeContext = codeType !== undefined ? `This is ${codeType} code using LiveStore. ` : 'This is LiveStore code. '
 
       const prompt = Prompt.makeMessage('user', {
         content: [
@@ -113,11 +114,11 @@ Format your response as constructive feedback that helps developers improve thei
         .slice(0, 5)
 
       const scoreMatch = feedback.match(/(?:score|rating|quality).*?(\d+(?:\.\d+)?)/i)
-      const score = scoreMatch ? Number.parseFloat(scoreMatch[1] ?? '0') : undefined
+      const score = scoreMatch !== null ? Number.parseFloat(scoreMatch[1] ?? '0') : undefined
 
       return {
         feedback,
-        score: score && score >= 1 && score <= 10 ? score : undefined,
+        score: score !== undefined && score >= 1 && score <= 10 ? score : undefined,
         suggestions,
       }
     })

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

@@ -1,5 +1,6 @@
 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'
@@ -39,7 +40,7 @@ export const toolHandlers: LivestoreToolHandlers = livestoreToolkit.of({
         explanation = 'E-commerce schema with products, categories, orders, and inventory'
         break
       case 'custom': {
-        if (!customDescription) {
+        if (customDescription == null) {
           schemaCode = `// Custom schema requested but no description provided
 import { Schema } from '@livestore/livestore'
 
@@ -58,11 +59,11 @@ export const schema = Schema.create({
         }
 
         // Generate a basic custom schema based on description
-        const tableName = customDescription.toLowerCase().includes('user')
+        const tableName = customDescription.toLowerCase().includes('user') === true
           ? 'users'
-          : customDescription.toLowerCase().includes('product')
+          : customDescription.toLowerCase().includes('product') === true
             ? 'products'
-            : customDescription.toLowerCase().includes('post')
+            : customDescription.toLowerCase().includes('post') === true
               ? 'posts'
               : 'items'
 

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

@@ -1,4 +1,5 @@
 import { Schema, Tool, Toolkit } from '@livestore/utils/effect'
+
 import { coachTool } from './mcp-coach.ts'
 
 export const livestoreToolkit = Toolkit.make(

package/src/commands/mcp.ts

@@ -1,5 +1,6 @@
 import { Effect, Layer, Logger, McpServer } from '@livestore/utils/effect'
 import { Cli, PlatformNode } from '@livestore/utils/node'
+
 import { architectureContent } from '../mcp-content/architecture.ts'
 import { featuresContent } from '../mcp-content/features.ts'
 import { gettingStartedContent } from '../mcp-content/getting-started.ts'

package/src/commands/new-project.ts

@@ -1,5 +1,6 @@
 import * as os from 'node:os'
 import * as nodePath from 'node:path'
+
 import { sluggify } from '@livestore/utils'
 import {
   Command,
@@ -25,28 +26,38 @@ const GitHubContentSchema = Schema.Struct({
 
 const GitHubContentsResponseSchema = Schema.Array(GitHubContentSchema)
 
+const githubRequest = (url: string) => {
+  const request = HttpClientRequest.get(url).pipe(HttpClientRequest.setHeader('accept', 'application/vnd.github+json'))
+  const token = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN
+  return token === undefined ? request : request.pipe(HttpClientRequest.setHeader('authorization', `Bearer ${token}`))
+}
+
 /** Schema for parsing package.json scripts (dev or start) */
 const PackageJsonScriptsSchema = Schema.Struct({
   scripts: Schema.Union(Schema.Struct({ dev: Schema.String }), Schema.Struct({ start: Schema.String })),
 })
 
 // Error types
-export class ExampleNotFoundError extends Schema.TaggedError<ExampleNotFoundError>()('ExampleNotFoundError', {
+export class ExampleNotFoundError extends Schema.TaggedError<ExampleNotFoundError>('~@livestore/cli/ExampleNotFoundError')('ExampleNotFoundError', {
   exampleName: Schema.String,
   availableExamples: Schema.Array(Schema.String),
   message: Schema.String,
 }) {}
 
-export class NetworkError extends Schema.TaggedError<NetworkError>()('NetworkError', {
+export class NetworkError extends Schema.TaggedError<NetworkError>('~@livestore/cli/NetworkError')('NetworkError', {
   cause: Schema.Unknown,
   message: Schema.String,
 }) {}
 
-export class DirectoryExistsError extends Schema.TaggedError<DirectoryExistsError>()('DirectoryExistsError', {
+export class DirectoryExistsError extends Schema.TaggedError<DirectoryExistsError>('~@livestore/cli/DirectoryExistsError')('DirectoryExistsError', {
   path: Schema.String,
   message: Schema.String,
 }) {}
 
+export class NoExamplesError extends Schema.TaggedError<NoExamplesError>('~@livestore/cli/NoExamplesError')('NoExamplesError', {
+  message: Schema.String,
+}) {}
+
 // Fetch available examples from GitHub
 const fetchExamples = (ref: string) =>
   Effect.gen(function* () {
@@ -54,26 +65,26 @@ const fetchExamples = (ref: string) =>
 
     yield* Effect.log(`Fetching examples from ref: ${ref}`)
 
-    const request = HttpClientRequest.get(url)
+    const request = githubRequest(url)
     const response = yield* HttpClient.execute(request).pipe(
       Effect.scoped,
       Effect.catchAll(
         (error) =>
           new NetworkError({
             cause: error,
-            message: `Failed to fetch examples from GitHub: ${error}`,
+            message: `Failed to fetch examples from GitHub: ${String(error)}`,
           }),
       ),
     )
 
     const responseText = yield* response.text
 
-    const examples = yield* Schema.decodeUnknown(GitHubContentsResponseSchema)(JSON.parse(responseText)).pipe(
+    const examples = yield* Schema.decodeUnknown(Schema.parseJson(GitHubContentsResponseSchema))(responseText).pipe(
       Effect.catchAll(
         (error) =>
           new NetworkError({
             cause: error,
-            message: `Failed to parse GitHub API response: ${error}`,
+            message: `Failed to parse GitHub API response: ${String(error)}`,
           }),
       ),
     )
@@ -81,7 +92,7 @@ const fetchExamples = (ref: string) =>
     const exampleNames = examples
       .filter((item) => item.type === 'dir')
       .map((item) => item.name)
-      .sort()
+      .toSorted()
 
     yield* Effect.log(`Found ${exampleNames.length} examples: ${exampleNames.join(', ')}`)
 
@@ -92,7 +103,7 @@ const fetchExamples = (ref: string) =>
 const selectExample = (examples: string[]) =>
   Effect.gen(function* () {
     if (examples.length === 0) {
-      return yield* Effect.fail(new Error('No examples available'))
+      return yield* new NoExamplesError({ message: 'No examples available' })
     }
 
     const prompt = Cli.Prompt.select({
@@ -117,7 +128,7 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
     const tarballUrl = `https://api.github.com/repos/livestorejs/livestore/tarball/${ref}`
 
     // Download tarball directly
-    const request = HttpClientRequest.get(tarballUrl)
+    const request = githubRequest(tarballUrl)
 
     const response = yield* HttpClient.execute(request).pipe(
       Effect.scoped,
@@ -125,7 +136,7 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
         (error) =>
           new NetworkError({
             cause: error,
-            message: `Failed to download tarball: ${error}`,
+            message: `Failed to download tarball: ${String(error)}`,
           }),
       ),
     )
@@ -150,7 +161,7 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
         (error) =>
           new NetworkError({
             cause: error,
-            message: `Failed to extract tarball: ${error}`,
+            message: `Failed to extract tarball: ${String(error)}`,
           }),
       ),
     )
@@ -171,7 +182,7 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
     // Check if the example exists
     const exampleExists = yield* fs.exists(exampleSourcePath)
 
-    if (!exampleExists) {
+    if (exampleExists === false) {
       return yield* new ExampleNotFoundError({
         exampleName,
         availableExamples: [],
@@ -186,7 +197,7 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
         (error) =>
           new NetworkError({
             cause: error,
-            message: `Failed to copy example files: ${error}`,
+            message: `Failed to copy example files: ${String(error)}`,
           }),
       ),
     )
@@ -245,10 +256,10 @@ export const createCommand = Cli.Command.make(
     }
 
     // Select example (from CLI option or interactive prompt)
-    const selectedExample = Option.isSome(example) ? example.value : yield* selectExample(examples)
+    const selectedExample = Option.isSome(example) === true ? example.value : yield* selectExample(examples)
 
     // Validate selected example exists
-    if (!examples.includes(selectedExample)) {
+    if (examples.includes(selectedExample) === false) {
       yield* Console.log(`❌ Example "${selectedExample}" not found`)
       yield* Console.log(`Available examples: ${examples.join(', ')}`)
       return yield* new ExampleNotFoundError({
@@ -259,7 +270,7 @@ export const createCommand = Cli.Command.make(
     }
 
     // Determine destination path
-    const destinationPath = Option.isSome(path) ? nodePath.resolve(path.value) : nodePath.resolve(selectedExample)
+    const destinationPath = Option.isSome(path) === true ? nodePath.resolve(path.value) : nodePath.resolve(selectedExample)
 
     // Download and extract the example
     yield* downloadExample(selectedExample, ref, destinationPath)

package/src/mcp-runtime/runtime.ts

@@ -30,7 +30,7 @@ export const init = ({
   sessionId?: string
 }): Effect.Effect<Store<any>, UnknownError> =>
   Effect.gen(function* () {
-    if (!storeId || typeof storeId !== 'string') {
+    if (storeId === '' || typeof storeId !== 'string') {
       return yield* UnknownError.make({ cause: new Error('Invalid storeId: expected a non-empty string') })
     }
 
@@ -39,8 +39,8 @@ export const init = ({
     // Build Node adapter internally
     const adapter = makeNodeAdapter({
       storage: { type: 'in-memory' },
-      ...(clientId ? { clientId } : {}),
-      ...(sessionId ? { sessionId } : {}),
+      ...(clientId !== undefined && clientId !== '' ? { clientId } : {}),
+      ...(sessionId !== undefined && sessionId !== '' ? { sessionId } : {}),
       sync: {
         backend: syncBackendConstructor,
         initialSyncOptions: { _tag: 'Blocking', timeout: 5000 },
@@ -61,7 +61,7 @@ export const init = ({
     )
 
     // Replace existing store if any
-    if (store) {
+    if (store !== undefined) {
       yield* Effect.promise(async () => {
         try {
           await store!.shutdownPromise()
@@ -83,7 +83,7 @@ export const status = Effect.gen(function* () {
     }
   }
   const s = opt.value
-  const tableCounts = (Array.from(s.schema.state.sqlite.tables.keys()) as string[])
+  const tableCounts = Array.from(s.schema.state.sqlite.tables.keys())
     .filter((name) => !SystemTables.isStateSystemTable(name))
     .reduce(
       (acc, name) => {
@@ -102,34 +102,42 @@ export const status = Effect.gen(function* () {
   }
 }).pipe(Effect.withSpan('mcp-runtime:status'))
 
-export const query = ({ sql, bindValues }: { sql: string; bindValues?: readonly any[] | Record<string, unknown> }) =>
-  Effect.gen(function* () {
-    const opt = yield* getStore
-    if (opt._tag === 'None') {
-      return yield* Effect.dieMessage('LiveStore not connected. Call livestore_instance_connect first.')
-    }
-    const s = opt.value
+export const query = Effect.fn('mcp-runtime:query')(function* ({
+  sql,
+  bindValues,
+}: {
+  sql: string
+  bindValues?: readonly any[] | Record<string, unknown>
+}) {
+  const opt = yield* getStore
+  if (opt._tag === 'None') {
+    return yield* Effect.dieMessage('LiveStore not connected. Call livestore_instance_connect first.')
+  }
+  const s = opt.value
 
-    const rows = s.query({ query: sql, bindValues: (bindValues as any) ?? [] }) as Array<Record<string, unknown>>
-    const jsonRows = rows.map((r) => Object.fromEntries(Object.entries(r).map(([k, v]) => [k, v as Schema.JsonValue])))
-    return { rows: jsonRows, rowCount: jsonRows.length }
-  }).pipe(Effect.withSpan('mcp-runtime:query'))
+  const rows = s.query<Array<Record<string, unknown>>>({ query: sql, bindValues: (bindValues as any) ?? [] })
+  const jsonRows = rows.map((r) => Object.fromEntries(Object.entries(r).map(([k, v]) => [k, v as Schema.JsonValue])))
+  return { rows: jsonRows, rowCount: jsonRows.length }
+})
 
-export const commit = ({ events }: { events: ReadonlyArray<{ name: string; args: Schema.JsonValue }> }) =>
-  Effect.gen(function* () {
-    const opt = yield* getStore
-    if (opt._tag === 'None') {
-      return yield* Effect.dieMessage('LiveStore not connected. Call livestore_instance_connect first.')
-    }
-    const s = opt.value
-    const InputEventSchema = LiveStoreEvent.Input.makeSchema(s.schema) as Schema.Schema<any>
-    const decoded = events.map((e) => Schema.decodeSync(InputEventSchema)(e))
-    s.commit(...decoded)
-    return { committed: decoded.length }
-  }).pipe(Effect.withSpan('mcp-runtime:commit'))
+export const commit = Effect.fn('mcp-runtime:commit')(function* ({
+  events,
+}: {
+  events: ReadonlyArray<{ name: string; args: Schema.JsonValue }>
+}) {
+  const opt = yield* getStore
+  if (opt._tag === 'None') {
+    return yield* Effect.dieMessage('LiveStore not connected. Call livestore_instance_connect first.')
+  }
+  const s = opt.value
+  const InputEventSchema = LiveStoreEvent.Input.makeSchema(s.schema) as Schema.Schema<any>
+  const decoded = events.map((e) => Schema.decodeSync(InputEventSchema)(e))
+  s.commit(...decoded)
+  return { committed: decoded.length }
+})
 
 export const disconnect = Effect.promise(async () => {
-  if (store) {
+  if (store !== undefined) {
     try {
       await store.shutdownPromise()
     } catch {}