@livestore/cli 0.4.0-dev.6 → 0.4.0-dev.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/cli",
-  "version": "0.4.0-dev.6",
+  "version": "0.4.0-dev.8",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -10,14 +10,13 @@
     "livestore": "./dist/bin.js"
   },
   "dependencies": {
-    "@effect/ai-openai": "0.29.0",
-    "@livestore/common": "0.4.0-dev.6",
-    "@livestore/utils": "0.4.0-dev.6",
-    "@livestore/utils-dev": "0.4.0-dev.6"
+    "@effect/ai-openai": "0.30.1",
+    "@livestore/common": "0.4.0-dev.8",
+    "@livestore/utils": "0.4.0-dev.8"
   },
   "devDependencies": {
     "@types/node": "24.2.0",
-    "typescript": "^5.9.2"
+    "typescript": "5.9.2"
   },
   "files": [
     "package.json",

package/src/commands/mcp-coach.ts

@@ -1,17 +1,18 @@
 import { OpenAiClient, OpenAiLanguageModel } from '@effect/ai-openai'
 import {
   AiError,
-  AiLanguageModel,
-  AiTool,
   Config,
   Effect,
   FetchHttpClient,
+  LanguageModel,
   Layer,
+  Prompt,
   Schema,
+  Tool,
 } from '@livestore/utils/effect'
 
 // Define the coach tool that analyzes LiveStore usage
-export const coachTool = AiTool.make('livestore_coach', {
+export const coachTool = Tool.make('livestore_coach', {
   description:
     'Analyze LiveStore code (schemas, queries, mutations, etc.) and provide AI-powered feedback on best practices, performance, and improvements.',
   parameters: {
@@ -58,7 +59,10 @@ export const coachToolHandler = Effect.fnUntraced(
     // Build the analysis prompt
     const codeTypeContext = codeType ? `This is ${codeType} code using LiveStore. ` : 'This is LiveStore code. '
 
-    const prompt = `${codeTypeContext}Please review the following code and provide helpful feedback focusing on:
+    const prompt = Prompt.makeMessage('user', {
+      content: [
+        Prompt.makePart('text', {
+          text: `${codeTypeContext}Please review the following code and provide helpful feedback focusing on:
 
 1. LiveStore best practices and conventions
 2. Schema design and relationships (if applicable)
@@ -79,13 +83,18 @@ Please provide:
 3. Best practice recommendations
 4. Any potential issues or concerns
 
-Format your response as constructive feedback that helps developers improve their LiveStore usage.`
+Format your response as constructive feedback that helps developers improve their LiveStore usage.`,
+        }),
+      ],
+    })
 
-    const systemPrompt = `You are an expert LiveStore developer and code reviewer. Provide constructive, specific, and actionable feedback on LiveStore code. Focus on best practices, performance, and maintainability.`
+    const systemPrompt = Prompt.makeMessage('system', {
+      content: `You are an expert LiveStore developer and code reviewer. Provide constructive, specific, and actionable feedback on LiveStore code. Focus on best practices, performance, and maintainability.`,
+    })
 
     // Get OpenAI client and call the API
-    const llm = yield* AiLanguageModel.AiLanguageModel
-    const completion = yield* llm.generateText({ prompt, system: systemPrompt })
+    const llm = yield* LanguageModel.LanguageModel
+    const completion = yield* llm.generateText({ prompt: Prompt.fromMessages([systemPrompt, prompt]) })
 
     const feedback = completion.text ?? 'Unable to generate feedback'
 

package/src/commands/mcp-tools.ts

@@ -1,4 +1,4 @@
-import { AiTool, AiToolkit, Effect, Schema } from '@livestore/utils/effect'
+import { Effect, Schema, Tool, Toolkit } from '@livestore/utils/effect'
 import { blogSchemaContent } from '../mcp-content/schemas/blog.ts'
 import { ecommerceSchemaContent } from '../mcp-content/schemas/ecommerce.ts'
 import { socialSchemaContent } from '../mcp-content/schemas/social.ts'
@@ -6,10 +6,10 @@ import { todoSchemaContent } from '../mcp-content/schemas/todo.ts'
 import { coachTool, coachToolHandler } from './mcp-coach.ts'
 
 // Create toolkit with tools and handlers following Tim Smart's pattern
-export const livestoreToolkit = AiToolkit.make(
+export const livestoreToolkit = Toolkit.make(
   coachTool,
 
-  AiTool.make('livestore_generate_schema', {
+  Tool.make('livestore_generate_schema', {
     description:
       'Generate a LiveStore schema for a specific use case. Choose from predefined types (todo, blog, social, ecommerce) or request a custom schema by providing a description.',
     parameters: {
@@ -33,7 +33,7 @@ export const livestoreToolkit = AiToolkit.make(
     }),
   }),
 
-  AiTool.make('livestore_get_example_schema', {
+  Tool.make('livestore_get_example_schema', {
     description:
       'Get a complete example LiveStore schema with TypeScript code. Returns ready-to-use schema definitions for common application types.',
     parameters: {
@@ -50,8 +50,8 @@ export const livestoreToolkit = AiToolkit.make(
       }),
     }),
   })
-    .annotate(AiTool.Readonly, true)
-    .annotate(AiTool.Destructive, false),
+    .annotate(Tool.Readonly, true)
+    .annotate(Tool.Destructive, false),
 )
 
 // Tool handlers using Tim Smart's pattern