@livestore/cli 0.5.0-dev.0 → 0.5.0-dev.1

package/package.json

@@ -1,11 +1,34 @@
 {
+  "$genie": {
+    "source": "package.json.genie.ts",
+    "warning": "DO NOT EDIT - changes will be overwritten",
+    "workspaceClosureDirs": [
+      "packages/@livestore/adapter-node",
+      "packages/@livestore/cli",
+      "repos/livestore/packages/@livestore/adapter-web",
+      "repos/livestore/packages/@livestore/common",
+      "repos/livestore/packages/@livestore/common-cf",
+      "repos/livestore/packages/@livestore/livestore",
+      "repos/livestore/packages/@livestore/peer-deps",
+      "repos/livestore/packages/@livestore/sqlite-wasm",
+      "repos/livestore/packages/@livestore/utils",
+      "repos/livestore/packages/@livestore/utils-dev",
+      "repos/livestore/packages/@livestore/wa-sqlite",
+      "repos/livestore/packages/@livestore/webmesh"
+    ]
+  },
   "name": "@livestore/cli",
-  "version": "0.5.0-dev.0",
+  "version": "0.5.0-dev.1",
+  "type": "module",
+  "sideEffects": false,
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/livestorejs/livestore-contrib.git"
   },
+  "exports": {
+    ".": "./dist/mod.js"
+  },
   "bin": {
     "livestore": "./dist/bin.js"
   },
@@ -14,59 +37,36 @@
     "package.json",
     "src"
   ],
-  "type": "module",
-  "sideEffects": false,
-  "exports": {
-    ".": "./dist/mod.js"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@effect/ai-openai": "4.0.0-rc.111",
-    "@effect/opentelemetry": "4.0.0-rc.111",
-    "@livestore/adapter-node": "0.5.0-dev.0",
-    "@livestore/common": "0.5.0-dev.0",
-    "@livestore/livestore": "0.5.0-dev.0",
-    "@livestore/peer-deps": "0.5.0-dev.0",
-    "@livestore/utils": "0.5.0-dev.0",
-    "effect": "4.0.0-rc.111"
+    "@effect/ai-openai": "4.0.3",
+    "@effect/opentelemetry": "4.0.3",
+    "@livestore/adapter-node": "0.5.0-dev.1",
+    "@livestore/common": "0.5.0-dev.1",
+    "@livestore/livestore": "0.5.0-dev.1",
+    "@livestore/peer-deps": "0.5.0-dev.1",
+    "@livestore/utils": "0.5.0-dev.1",
+    "effect": "4.0.3"
   },
   "devDependencies": {
-    "@livestore/utils-dev": "0.5.0-dev.0",
+    "@livestore/utils-dev": "0.5.0-dev.1",
     "@types/node": "25.3.3",
-    "typescript": "6.0.3",
+    "typescript": "7.0.2",
     "vitest": "4.1.9"
   },
   "peerDependencies": {
-    "@effect/opentelemetry": "^4.0.0-rc.111",
-    "@effect/platform-browser": "^4.0.0-rc.111",
-    "@effect/platform-bun": "^4.0.0-rc.111",
-    "@effect/platform-node": "^4.0.0-rc.111",
-    "@effect/platform-node-shared": "^4.0.0-rc.111",
-    "@effect/vitest": "^4.0.0-rc.111",
+    "@effect/opentelemetry": "^4.0.3",
+    "@effect/platform-browser": "^4.0.3",
+    "@effect/platform-bun": "^4.0.3",
+    "@effect/platform-node": "^4.0.3",
+    "@effect/platform-node-shared": "^4.0.3",
+    "@effect/vitest": "^4.0.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
     "@standard-schema/spec": "^1.1.0",
-    "effect": "^4.0.0-rc.111"
+    "effect": "^4.0.3"
   },
-  "$genie": {
-    "source": "package.json.genie.ts",
-    "warning": "DO NOT EDIT - changes will be overwritten",
-    "workspaceClosureDirs": [
-      "packages/@livestore/adapter-node",
-      "packages/@livestore/cli",
-      "repos/livestore/packages/@livestore/adapter-web",
-      "repos/livestore/packages/@livestore/common",
-      "repos/livestore/packages/@livestore/common-cf",
-      "repos/livestore/packages/@livestore/livestore",
-      "repos/livestore/packages/@livestore/peer-deps",
-      "repos/livestore/packages/@livestore/sqlite-wasm",
-      "repos/livestore/packages/@livestore/utils",
-      "repos/livestore/packages/@livestore/utils-dev",
-      "repos/livestore/packages/@livestore/wa-sqlite",
-      "repos/livestore/packages/@livestore/webmesh"
-    ]
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "tsc",

package/src/__tests__/fixtures/.gitignore

@@ -0,0 +1 @@
+.tmp-test-configs/

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

@@ -4,7 +4,7 @@ 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'
-import { Effect, FileSystem, type Queue, Schema } from '@livestore/utils/effect'
+import { Effect, FileSystem, type Queue, Schema, type SubscriptionRef } from '@livestore/utils/effect'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
@@ -49,10 +49,11 @@ const makeTempConfig = () => {
   const moduleSource = `
 import { schema } from ${JSON.stringify(schemaModuleUrl)}
 import { makeMockSyncBackend } from '@livestore/common/sync'
-import { Effect, Queue } from '@livestore/utils/effect'
+import { Effect, Queue, SubscriptionRef } from '@livestore/utils/effect'
 
 export const mockBackend = await Effect.runPromise(Effect.scoped(makeMockSyncBackend({ startConnected: true })))
 export const connectionEvents = await Effect.runPromise(Queue.make<'connect' | 'disconnect'>())
+export const disconnectShouldFail = await Effect.runPromise(SubscriptionRef.make(false))
 
 export { schema }
 
@@ -60,7 +61,11 @@ export const syncBackend = (_args) =>
   mockBackend.makeSyncBackend.pipe(
     Effect.tap(() => Queue.offer(connectionEvents, 'connect')),
     Effect.map((backend) => {
-      const disconnect = backend.disconnect ?? Effect.void
+      const disconnect = SubscriptionRef.get(disconnectShouldFail).pipe(
+        Effect.flatMap((shouldFail) =>
+          shouldFail ? Effect.fail(new Error('disconnect failed')) : (backend.disconnect ?? Effect.void),
+        ),
+      )
       return {
         ...backend,
         disconnect: disconnect.pipe(Effect.tap(() => Queue.offer(connectionEvents, 'disconnect'))),
@@ -93,14 +98,20 @@ export const useMockConfig = Effect.acquireRelease(
     })) as {
       mockBackend: MockSyncBackend
       connectionEvents: Queue.Queue<'connect' | 'disconnect'>
+      disconnectShouldFail: SubscriptionRef.SubscriptionRef<boolean>
     }
 
-    return { configPath: tempPath, mockBackend: mod.mockBackend, connectionEvents: mod.connectionEvents }
+    return {
+      configPath: tempPath,
+      mockBackend: mod.mockBackend,
+      connectionEvents: mod.connectionEvents,
+      disconnectShouldFail: mod.disconnectShouldFail,
+    }
   }),
   ({ configPath }) =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem
-      yield* fs.remove(configPath, { recursive: false }).pipe(Effect.catch(() => Effect.void))
+      yield* fs.remove(configPath, { recursive: false }).pipe(Effect.ignore)
     }),
 )
 

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

@@ -1,4 +1,4 @@
-import { Effect, FetchHttpClient, Layer, Queue, Stream } from '@livestore/utils/effect'
+import { Effect, FetchHttpClient, Layer, type Queue, Stream, SubscriptionRef } from '@livestore/utils/effect'
 import { PlatformNode } from '@livestore/utils/node'
 import { Vitest } from '@livestore/utils-dev/node-vitest'
 import { expect } from 'vitest'
@@ -46,6 +46,21 @@ Vitest.describe('sync-operations', { timeout: 10_000 }, () => {
     }).pipe(withTestCtx(test)),
   )
 
+  Vitest.live('preserves a successful export when backend disconnect fails', (test: Vitest.TestContext) =>
+    Effect.gen(function* () {
+      const { configPath, disconnectShouldFail } = yield* useMockConfig
+      yield* SubscriptionRef.set(disconnectShouldFail, true)
+
+      const result = yield* pullEventsFromSyncBackend({
+        configPath,
+        storeId,
+        clientId,
+      })
+
+      expect(result.eventCount).toBe(0)
+    }).pipe(withTestCtx(test)),
+  )
+
   Vitest.live('fails import when backend is not empty', (test: Vitest.TestContext) =>
     Effect.gen(function* () {
       const { mockBackend, connectionEvents, configPath } = yield* useMockConfig

package/src/cli.ts

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

package/src/commands/__fixtures__/mcp-protocol-server.ts

@@ -1,4 +1,4 @@
-import { McpServer } from 'effect/unstable/ai'
+import { McpServer } from 'effect/ai'
 
 import { Effect, Layer } from '@livestore/utils/effect'
 import { PlatformNode } from '@livestore/utils/node'

package/src/commands/import-export.ts

@@ -171,19 +171,19 @@ const importEvents = ({
 export const exportCommand = Cli.Command.make(
   'export',
   {
-    config: Cli.Flag.string('config').pipe(
+    config: Cli.Flag.String('config').pipe(
       Cli.Flag.withAlias('c'),
       Cli.Flag.withDescription('Path to the config module that exports schema and syncBackend'),
     ),
-    storeId: Cli.Flag.string('store-id').pipe(
+    storeId: Cli.Flag.String('store-id').pipe(
       Cli.Flag.withAlias('i'),
       Cli.Flag.withDescription('Store identifier'),
     ),
-    clientId: Cli.Flag.string('client-id').pipe(
+    clientId: Cli.Flag.String('client-id').pipe(
       Cli.Flag.withDefault('cli-export'),
       Cli.Flag.withDescription('Client identifier for the sync connection'),
     ),
-    output: Cli.Argument.string('file').pipe(Cli.Argument.withDescription('Output JSON file path')),
+    output: Cli.Argument.String('file').pipe(Cli.Argument.withDescription('Output JSON file path')),
   },
   Effect.fn(function* ({
     config,
@@ -218,28 +218,28 @@ export const exportCommand = Cli.Command.make(
 export const importCommand = Cli.Command.make(
   'import',
   {
-    config: Cli.Flag.string('config').pipe(
+    config: Cli.Flag.String('config').pipe(
       Cli.Flag.withAlias('c'),
       Cli.Flag.withDescription('Path to the config module that exports schema and syncBackend'),
     ),
-    storeId: Cli.Flag.string('store-id').pipe(
+    storeId: Cli.Flag.String('store-id').pipe(
       Cli.Flag.withAlias('i'),
       Cli.Flag.withDescription('Store identifier'),
     ),
-    clientId: Cli.Flag.string('client-id').pipe(
+    clientId: Cli.Flag.String('client-id').pipe(
       Cli.Flag.withDefault('cli-import'),
       Cli.Flag.withDescription('Client identifier for the sync connection'),
     ),
-    force: Cli.Flag.boolean('force').pipe(
+    force: Cli.Flag.Boolean('force').pipe(
       Cli.Flag.withAlias('f'),
       Cli.Flag.withDefault(false),
       Cli.Flag.withDescription('Force import even if store ID does not match'),
     ),
-    dryRun: Cli.Flag.boolean('dry-run').pipe(
+    dryRun: Cli.Flag.Boolean('dry-run').pipe(
       Cli.Flag.withDefault(false),
       Cli.Flag.withDescription('Validate the import file without actually importing'),
     ),
-    input: Cli.Argument.string('file').pipe(Cli.Argument.withDescription('Input JSON file to import')),
+    input: Cli.Argument.String('file').pipe(Cli.Argument.withDescription('Input JSON file to import')),
   },
   Effect.fn(function* ({
     config,

package/src/commands/mcp-coach.ts

@@ -1,4 +1,4 @@
-import { AiError, LanguageModel, Prompt, Tool } from 'effect/unstable/ai'
+import { AiError, LanguageModel, Prompt, Tool } from 'effect/ai'
 import { OpenAiClient, OpenAiLanguageModel } from '@effect/ai-openai'
 
 import { Config, Effect, FetchHttpClient, Layer, Schema } from '@livestore/utils/effect'
@@ -22,7 +22,7 @@ export const coachTool = Tool.make('livestore_coach', {
       description: 'AI-generated feedback and recommendations for the code',
     }),
     score: Schema.optional(
-      Schema.Number.annotate({
+      Schema.Finite.annotate({
         description: 'Code quality score from 1-10 (optional)',
       }),
     ),
@@ -39,7 +39,7 @@ export const coachTool = Tool.make('livestore_coach', {
 
 /** Composed layer: HttpClient → OpenAiClient → LanguageModel */
 const LanguageModelLayer = OpenAiLanguageModel.layer({ model: 'gpt-4o-mini' }).pipe(
-  Layer.provide(OpenAiClient.layerConfig({ apiKey: Config.redacted('OPENAI_API_KEY') })),
+  Layer.provide(OpenAiClient.layerConfig({ apiKey: Config.Redacted('OPENAI_API_KEY') })),
   Layer.provide(FetchHttpClient.layer),
 )
 

package/src/commands/mcp-protocols.ts

@@ -1,4 +1,4 @@
-import { McpProtocol } from 'effect/unstable/ai'
+import { McpProtocol } from 'effect/ai'
 
 /**
  * MCP stdio selects an exact offered version when available and otherwise

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

@@ -1,4 +1,4 @@
-import { type Toolkit } from 'effect/unstable/ai'
+import { type Toolkit } from 'effect/ai'
 
 import { Effect, FetchHttpClient, Layer } from '@livestore/utils/effect'
 import { PlatformNode } from '@livestore/utils/node'

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

@@ -1,4 +1,4 @@
-import { Tool } from 'effect/unstable/ai'
+import { Tool } from 'effect/ai'
 
 import { Vitest } from '@livestore/utils-dev/node-vitest'
 

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

@@ -1,4 +1,4 @@
-import { Tool, Toolkit } from 'effect/unstable/ai'
+import { Tool, Toolkit } from 'effect/ai'
 
 import { Schema } from '@livestore/utils/effect'
 
@@ -150,7 +150,7 @@ Returns on success:
     }),
     success: Schema.Struct({
       rows: Schema.Array(Schema.Record(Schema.String, Schema.Json)),
-      rowCount: Schema.Number,
+      rowCount: Schema.Finite,
     }),
   }).annotate(Tool.Destructive, false),
 
@@ -188,7 +188,7 @@ Returns on success:
         }),
       ),
     }),
-    success: Schema.Struct({ committed: Schema.Number }),
+    success: Schema.Struct({ committed: Schema.Finite }),
   }).annotate(Tool.Destructive, true),
 
   Tool.make('livestore_instance_status', {
@@ -213,7 +213,7 @@ Returns when not connected:
         storeId: Schema.String,
         clientId: Schema.String,
         sessionId: Schema.String,
-        tableCounts: Schema.Record(Schema.String, Schema.Number).annotate({
+        tableCounts: Schema.Record(Schema.String, Schema.Finite).annotate({
           description: 'Tables in the LiveStore instance with their row count',
         }),
       }),
@@ -264,7 +264,7 @@ Returns on success:
     }),
     success: Schema.Struct({
       storeId: Schema.String,
-      eventCount: Schema.Number,
+      eventCount: Schema.Finite,
       exportedAt: Schema.String,
       data: Schema.Json.annotate({ description: 'The export file data (can be saved or passed to import)' }),
     }),
@@ -313,7 +313,7 @@ Returns on success:
     }),
     success: Schema.Struct({
       storeId: Schema.String,
-      eventCount: Schema.Number,
+      eventCount: Schema.Finite,
       dryRun: Schema.Boolean,
     }),
   }).annotate(Tool.Destructive, true),

package/src/commands/mcp.ts

@@ -1,4 +1,4 @@
-import { McpServer } from 'effect/unstable/ai'
+import { McpProtocol, McpServer } from 'effect/ai'
 
 import { Effect, Layer, Logger } from '@livestore/utils/effect'
 import { Cli, PlatformNode } from '@livestore/utils/node'
@@ -91,7 +91,9 @@ const mcpServerCommand = Cli.Command.make(
     }).pipe(
       Layer.provide(LivestoreResources),
       Layer.provide(LivestoreTools),
-      Layer.provide(Logger.layer([Logger.consolePretty({ stderr: true })])),
+      Layer.provide(
+        Layer.merge(Logger.layer([Logger.consolePretty()]), Layer.succeed(Logger.LogToStderr, true)),
+      ),
       Layer.provide(PlatformNode.NodeStdio.layer),
       Layer.launch,
     )

package/src/commands/new-project.ts

@@ -87,7 +87,7 @@ const fetchExamples = (ref: string) =>
 
     const responseText = yield* response.text
 
-    const examples = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(GitHubContentsResponseSchema))(
+    const examples = yield* Schema.decodeEffect(Schema.fromJsonString(GitHubContentsResponseSchema))(
       responseText,
     ).pipe(
       Effect.catch(
@@ -116,7 +116,7 @@ const selectExample = (examples: string[]) =>
       return yield* new NoExamplesError({ message: 'No examples available' })
     }
 
-    const prompt = Cli.Prompt.select({
+    const prompt = Cli.Prompt.Select({
       message: '📦 Select a LiveStore example to create:',
       choices: examples.map((example) => ({
         title: example,
@@ -213,10 +213,10 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
     )
 
     // Clean up extract directory
-    yield* fs.remove(extractDir, { recursive: true }).pipe(Effect.catch(() => Effect.void))
+    yield* fs.remove(extractDir, { recursive: true }).pipe(Effect.ignore)
 
     // Clean up tarball
-    yield* fs.remove(tarballPath).pipe(Effect.catch(() => Effect.void))
+    yield* fs.remove(tarballPath).pipe(Effect.ignore)
 
     yield* Console.log(`✅ Example "${exampleName}" created successfully at: ${destinationPath}`)
   })
@@ -224,11 +224,11 @@ const downloadExample = (exampleName: string, ref: string, destinationPath: stri
 export const createCommand = Cli.Command.make(
   'create',
   {
-    example: Cli.Flag.string('example').pipe(
+    example: Cli.Flag.String('example').pipe(
       Cli.Flag.optional,
       Cli.Flag.withDescription('Example name to create (bypasses interactive selection)'),
     ),
-    ref: Cli.Flag.string('ref').pipe(
+    ref: Cli.Flag.String('ref').pipe(
       Cli.Flag.withAlias('commit'),
       Cli.Flag.withAlias('branch'),
       Cli.Flag.withAlias('tag'),
@@ -237,7 +237,7 @@ export const createCommand = Cli.Command.make(
         'The name of the commit/branch/tag to fetch examples from. Pull requests refs must be fully-formed (e.g., `refs/pull/123/merge`).',
       ),
     ),
-    path: Cli.Argument.string('path').pipe(
+    path: Cli.Argument.String('path').pipe(
       Cli.Argument.optional,
       Cli.Argument.withDescription('Destination path for the new project'),
     ),
@@ -292,7 +292,7 @@ export const createCommand = Cli.Command.make(
     const fs = yield* FileSystem.FileSystem
     const packageJsonPath = nodePath.join(destinationPath, 'package.json')
     const packageJsonContent = yield* fs.readFileString(packageJsonPath)
-    const runScript = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(PackageJsonScriptsSchema))(
+    const runScript = yield* Schema.decodeEffect(Schema.fromJsonString(PackageJsonScriptsSchema))(
       packageJsonContent,
     ).pipe(
       Effect.map((pkg) => ('dev' in pkg.scripts ? ('dev' as const) : ('start' as const))),

package/src/module-loader.ts

@@ -79,11 +79,10 @@ export const loadModuleConfig = ({
             )
 
     const syncPayloadExport = mod?.syncPayload
-    const syncPayload = yield* (
+    const syncPayload =
       syncPayloadExport === undefined
-        ? Effect.succeed<Schema.Json | undefined>(undefined)
-        : Schema.decodeUnknownEffect(syncPayloadSchema)(syncPayloadExport)
-    ).pipe(UnknownError.mapToUnknownError)
+        ? undefined
+        : yield* Schema.decodeUnknownEffect(syncPayloadSchema)(syncPayloadExport).pipe(UnknownError.mapToUnknownError)
 
     return {
       schema,

package/src/sync-operations.ts

@@ -35,7 +35,7 @@ export const ExportFileSchema = Schema.Struct({
   /** ISO timestamp of when the export was created */
   exportedAt: Schema.String,
   /** Total number of events in the export */
-  eventCount: Schema.Number,
+  eventCount: Schema.Finite,
   /** Array of events in global encoded format */
   events: Schema.Array(LiveStoreEvent.Global.Encoded),
 })
@@ -125,10 +125,17 @@ export const makeSyncBackend = ({
     return syncBackend
   })
 
+type SyncBackendWithOptionalDisconnect = SyncBackend.SyncBackend & {
+  readonly disconnect?: Effect.Effect<void, UnknownError>
+}
+
 const releaseSyncBackend = (syncBackend: SyncBackend.SyncBackend): Effect.Effect<void> => {
-  const maybeDisconnect = (syncBackend as { disconnect?: Effect.Effect<void> }).disconnect
-  const releaseEffect = maybeDisconnect ?? SubscriptionRef.set(syncBackend.isConnected, false)
-  return releaseEffect.pipe(Effect.catch(() => Effect.void))
+  const maybeDisconnect = (syncBackend as SyncBackendWithOptionalDisconnect).disconnect
+  const releaseEffect =
+    maybeDisconnect !== undefined && Effect.isEffect(maybeDisconnect) === true
+      ? maybeDisconnect
+      : SubscriptionRef.set(syncBackend.isConnected, false)
+  return releaseEffect.pipe(Effect.ignore)
 }
 
 export interface ExportResult {