@dxos/assistant-toolkit 0.8.4-main.2c6827d → 0.8.4-main.3eb6e50203

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.8.4-main.2c6827d",
+  "version": "0.8.4-main.3eb6e50203",
   "description": "Assistant toolkit, definitions, and utilities.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
@@ -11,57 +15,58 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./testing": {
+      "source": "./src/testing/index.ts",
+      "types": "./dist/types/src/testing/index.d.ts",
+      "default": "./dist/lib/neutral/testing/index.mjs"
     }
   },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect/ai": "0.29.1",
-    "@effect/ai-anthropic": "0.21.1",
-    "@effect/experimental": "0.56.0",
-    "@effect/platform": "^0.92.1",
-    "dfx": "^0.126.0",
+    "@effect/ai": "0.33.2",
+    "@effect/ai-anthropic": "0.23.0",
+    "@effect/experimental": "0.58.0",
+    "@effect/platform": "0.94.4",
+    "dfx": "^0.127.0",
     "exa-js": "^1.5.12",
-    "@dxos/app-framework": "0.8.4-main.2c6827d",
-    "@dxos/ai": "0.8.4-main.2c6827d",
-    "@dxos/assistant": "0.8.4-main.2c6827d",
-    "@dxos/blueprints": "0.8.4-main.2c6827d",
-    "@dxos/conductor": "0.8.4-main.2c6827d",
-    "@dxos/echo": "0.8.4-main.2c6827d",
-    "@dxos/context": "0.8.4-main.2c6827d",
-    "@dxos/echo-protocol": "0.8.4-main.2c6827d",
-    "@dxos/edge-client": "0.8.4-main.2c6827d",
-    "@dxos/echo-db": "0.8.4-main.2c6827d",
-    "@dxos/effect": "0.8.4-main.2c6827d",
-    "@dxos/invariant": "0.8.4-main.2c6827d",
-    "@dxos/errors": "0.8.4-main.2c6827d",
-    "@dxos/functions": "0.8.4-main.2c6827d",
-    "@dxos/functions-runtime": "0.8.4-main.2c6827d",
-    "@dxos/keys": "0.8.4-main.2c6827d",
-    "@dxos/plugin-markdown": "0.8.4-main.2c6827d",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2c6827d",
-    "@dxos/log": "0.8.4-main.2c6827d",
-    "@dxos/schema": "0.8.4-main.2c6827d",
-    "@dxos/types": "0.8.4-main.2c6827d",
-    "@dxos/util": "0.8.4-main.2c6827d"
+    "@dxos/ai": "0.8.4-main.3eb6e50203",
+    "@dxos/app-framework": "0.8.4-main.3eb6e50203",
+    "@dxos/blueprints": "0.8.4-main.3eb6e50203",
+    "@dxos/context": "0.8.4-main.3eb6e50203",
+    "@dxos/echo": "0.8.4-main.3eb6e50203",
+    "@dxos/conductor": "0.8.4-main.3eb6e50203",
+    "@dxos/client-protocol": "0.8.4-main.3eb6e50203",
+    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
+    "@dxos/echo-protocol": "0.8.4-main.3eb6e50203",
+    "@dxos/edge-client": "0.8.4-main.3eb6e50203",
+    "@dxos/effect": "0.8.4-main.3eb6e50203",
+    "@dxos/errors": "0.8.4-main.3eb6e50203",
+    "@dxos/functions": "0.8.4-main.3eb6e50203",
+    "@dxos/functions-runtime": "0.8.4-main.3eb6e50203",
+    "@dxos/assistant": "0.8.4-main.3eb6e50203",
+    "@dxos/keys": "0.8.4-main.3eb6e50203",
+    "@dxos/log": "0.8.4-main.3eb6e50203",
+    "@dxos/invariant": "0.8.4-main.3eb6e50203",
+    "@dxos/schema": "0.8.4-main.3eb6e50203",
+    "@dxos/types": "0.8.4-main.3eb6e50203",
+    "@dxos/util": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-markdown": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3eb6e50203"
   },
   "devDependencies": {
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0"
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/blueprints/design/design-blueprint.test.ts

@@ -12,13 +12,15 @@ import {
   AiConversation,
   type ContextBinding,
   GenerationObserver,
-  makeToolExecutionServiceFromFunctions,
-  makeToolResolverFromFunctions,
+  GenericToolkit,
+  ToolExecutionServices,
 } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
-import { DatabaseService, QueueService, TracingService } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { acquireReleaseResource } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
+import { QueueService, TracingService } from '@dxos/functions';
 import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
 import { log } from '@dxos/log';
 import { Markdown } from '@dxos/plugin-markdown/types';
@@ -27,9 +29,8 @@ import { type Message } from '@dxos/types';
 import { trim } from '@dxos/util';
 
 import { Document } from '../../functions';
-import { testToolkit } from '../testing';
 
-import blueprint from './design-blueprint';
+import { blueprint } from './design-blueprint';
 
 describe('Design Blueprint', { timeout: 120_000 }, () => {
   it.scoped(
@@ -38,21 +39,21 @@ describe('Design Blueprint', { timeout: 120_000 }, () => {
       function* ({ expect }) {
         const observer = GenerationObserver.fromPrinter(new ConsolePrinter());
         const queue = yield* QueueService.createQueue<Message.Message | ContextBinding>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
+        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
 
-        yield* DatabaseService.add(blueprint);
+        yield* Database.add(blueprint);
         yield* Effect.promise(() =>
           conversation.context.bind({
             blueprints: [Ref.make(blueprint)],
           }),
         );
 
-        const artifact = yield* DatabaseService.add(Markdown.make({ content: 'Hello, world!' }));
+        const artifact = yield* Database.add(Markdown.make({ content: 'Hello, world!' }));
         let prevContent = artifact.content;
 
         {
           const prompt = trim`
-            I want to design a new feature for our product. 
+            I want to design a new feature for our product.
 
             We need to add a user profile system with the following requirements:
             1. Users should be able to create and edit their profiles
@@ -72,7 +73,7 @@ describe('Design Blueprint', { timeout: 120_000 }, () => {
 
         {
           const prompt = trim`
-            I want this to be built on top of Durable Objects and SQLite database. 
+            I want this to be built on top of Durable Objects and SQLite database.
             Adjust the spec to reflect this.
           `;
 
@@ -82,13 +83,9 @@ describe('Design Blueprint', { timeout: 120_000 }, () => {
         }
       },
       Effect.provide(
-        Layer.mergeAll(
-          makeToolResolverFromFunctions([Document.read, Document.update], testToolkit),
-          makeToolExecutionServiceFromFunctions(testToolkit, testToolkit.toLayer({}) as any),
-          AiService.model('@anthropic/claude-3-5-sonnet-20241022'),
-        ).pipe(
+        Layer.mergeAll(ToolExecutionServices, AiService.model('@anthropic/claude-3-5-sonnet-20241022')).pipe(
           Layer.provideMerge(TestDatabaseLayer({ types: [Text.Text, Markdown.Document, Blueprint.Blueprint] })),
-          Layer.provideMerge(AiServiceTestingPreset('direct')),
+          Layer.provideMerge(Layer.mergeAll(GenericToolkit.providerEmpty, AiServiceTestingPreset('direct'))),
           Layer.provideMerge(
             FunctionInvocationServiceLayerTestMocked({ functions: [Document.read, Document.update] }).pipe(
               Layer.provideMerge(TracingService.layerNoop),

package/src/blueprints/design/design-blueprint.ts

@@ -4,7 +4,7 @@
 
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
+import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
@@ -20,7 +20,7 @@ const instructions = trim`
   Do not announce when you read or write the design spec document.
 `;
 
-const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
+export const blueprint = Blueprint.make({
   key: 'dxos.org/blueprint/design',
   name: 'Design Spec',
   description: 'Preserve the conversation in the design spec.',
@@ -29,5 +29,3 @@ const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   },
   tools: [Document.read, Document.update].map((fn) => ToolId.make(fn.key)),
 });
-
-export default blueprint;

package/src/blueprints/design/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import blueprint from './design-blueprint';
+import { blueprint } from './design-blueprint';
 
 export default blueprint;

package/src/blueprints/discord/discord-blueprint.ts

@@ -4,7 +4,7 @@
 
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
+import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
@@ -21,7 +21,7 @@ const instructions = trim`
   DXOS serverId: 837138313172353095
 `;
 
-export const blueprint = Obj.make(Blueprint.Blueprint, {
+export const blueprint = Blueprint.make({
   key: 'dxos.org/blueprint/discord',
   name: 'Discord',
   description: 'Discord integration.',
@@ -30,5 +30,3 @@ export const blueprint = Obj.make(Blueprint.Blueprint, {
   },
   tools: [ToolId.make(Discord.fetch.key)],
 });
-
-export default blueprint;

package/src/blueprints/discord/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import blueprint from './discord-blueprint';
+import { blueprint } from './discord-blueprint';
 
 export default blueprint;

package/src/blueprints/index.ts

@@ -8,3 +8,4 @@ export { default as LinearBlueprint } from './linear';
 export { default as PlanningBlueprint } from './planning';
 export { default as ResearchBlueprint } from './research';
 export { default as WebSearchBlueprint, WebSearchToolkit } from './websearch';
+export { default as MarkdownBlueprint } from './markdown';

package/src/blueprints/linear/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import blueprint from './linear-blueprint';
+import { blueprint } from './linear-blueprint';
 
 export default blueprint;

package/src/blueprints/linear/linear-blueprint.ts

@@ -4,7 +4,7 @@
 
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
+import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
@@ -22,7 +22,7 @@ const instructions = trim`
   DXOS teamId: 1127c63a-6f77-4725-9229-50f6cd47321c
 `;
 
-export const blueprint = Obj.make(Blueprint.Blueprint, {
+export const blueprint = Blueprint.make({
   key: 'dxos.org/blueprint/linear',
   name: 'Linear',
   description: 'Syncs Linear workspaces.',
@@ -31,5 +31,3 @@ export const blueprint = Obj.make(Blueprint.Blueprint, {
   },
   tools: [Linear.sync].map((tool) => ToolId.make(tool.key)),
 });
-
-export default blueprint;

package/src/blueprints/markdown/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { blueprint } from './markdown-blueprint';
+
+export default blueprint;

package/src/blueprints/markdown/markdown-blueprint.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Blueprint } from '@dxos/blueprints';
+import { Ref } from '@dxos/echo';
+import { Text } from '@dxos/schema';
+import { trim } from '@dxos/util';
+
+import { Document } from '../../functions';
+
+const instructions = trim`
+  You read, write & create markdown documents.
+`;
+
+export const blueprint = Blueprint.make({
+  key: 'dxos.org/blueprint/markdown',
+  name: 'Markdown',
+  description: 'Work with markdown documents.',
+  instructions: {
+    source: Ref.make(Text.make(instructions)),
+  },
+  tools: Blueprint.toolDefinitions({ functions: [Document.read, Document.update, Document.create] }),
+});

package/src/blueprints/planning/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import blueprint from './planning-blueprint';
+import { blueprint } from './planning-blueprint';
 
 export default blueprint;

package/src/blueprints/planning/planning-blueprint.test.ts

@@ -8,16 +8,13 @@ import * as Layer from 'effect/Layer';
 
 import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import {
-  AiConversation,
-  type ContextBinding,
-  makeToolExecutionServiceFromFunctions,
-  makeToolResolverFromFunctions,
-} from '@dxos/assistant';
+import { AiConversation, type ContextBinding, GenericToolkit, ToolExecutionServices } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj, Ref } from '@dxos/echo';
-import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
-import { DatabaseService, QueueService, TracingService } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { acquireReleaseResource } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
+import { QueueService, TracingService } from '@dxos/functions';
 import { FunctionImplementationResolver } from '@dxos/functions-runtime';
 import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
 import { log } from '@dxos/log';
@@ -27,9 +24,9 @@ import { type Message } from '@dxos/types';
 import { trim } from '@dxos/util';
 
 import { Tasks } from '../../functions';
-import { type TestStep, runSteps, testToolkit } from '../testing';
+import { type TestStep, runSteps } from '../testing';
 
-import blueprint from './planning-blueprint';
+import { blueprint } from './planning-blueprint';
 
 describe('Planning Blueprint', { timeout: 120_000 }, () => {
   it.scoped(
@@ -37,16 +34,16 @@ describe('Planning Blueprint', { timeout: 120_000 }, () => {
     Effect.fn(
       function* ({ expect }) {
         const queue = yield* QueueService.createQueue<Message.Message | ContextBinding>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
+        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
 
-        yield* DatabaseService.add(blueprint);
+        yield* Database.add(blueprint);
         yield* Effect.promise(() =>
           conversation.context.bind({
             blueprints: [Ref.make(blueprint)],
           }),
         );
 
-        const artifact = yield* DatabaseService.add(Markdown.make());
+        const artifact = yield* Database.add(Markdown.make());
         let prevContent = artifact.content;
         const matchList =
           ({ includes = [], excludes = [] }: { includes: RegExp[]; excludes?: RegExp[] }) =>
@@ -103,8 +100,7 @@ describe('Planning Blueprint', { timeout: 120_000 }, () => {
       Effect.provide(
         Layer.mergeAll(
           TestDatabaseLayer({ types: [Text.Text, Markdown.Document, Blueprint.Blueprint] }),
-          makeToolResolverFromFunctions([Tasks.read, Tasks.update], testToolkit),
-          makeToolExecutionServiceFromFunctions(testToolkit, testToolkit.toLayer({}) as any),
+          ToolExecutionServices,
           AiService.model('@anthropic/claude-3-5-sonnet-20241022'),
         ).pipe(
           Layer.provideMerge(
@@ -114,7 +110,7 @@ describe('Planning Blueprint', { timeout: 120_000 }, () => {
           ),
           Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: [Tasks.read, Tasks.update] })),
           Layer.provideMerge(TestDatabaseLayer({ types: [Text.Text, Markdown.Document, Blueprint.Blueprint] })),
-          Layer.provideMerge(AiServiceTestingPreset('direct')),
+          Layer.provideMerge(Layer.mergeAll(GenericToolkit.providerEmpty, AiServiceTestingPreset('direct'))),
         ),
       ),
       TestHelpers.provideTestContext,

package/src/blueprints/planning/planning-blueprint.ts

@@ -4,7 +4,7 @@
 
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
+import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
@@ -85,7 +85,7 @@ const instructions = trim`
   - Be precise with task descriptions and hierarchy levels
 `;
 
-export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
+export const blueprint = Blueprint.make({
   key: 'dxos.org/blueprint/planning',
   name: 'Planning',
   description: 'Plans and tracks complex tasks with artifact management.',
@@ -94,5 +94,3 @@ export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   },
   tools: [Tasks.read, Tasks.update].map((fn) => ToolId.make(fn.key)),
 });
-
-export default blueprint;

package/src/blueprints/research/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import blueprint from './research-blueprint';
+import { blueprint } from './research-blueprint';
 
 export default blueprint;

package/src/blueprints/research/research-blueprint.ts

@@ -4,7 +4,7 @@
 
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
+import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
@@ -40,7 +40,7 @@ const instructions = trim`
   </unstructured_mode>
 `;
 
-export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
+export const blueprint = Blueprint.make({
   key: 'dxos.org/blueprint/research',
   name: 'Research',
   description: 'Researches the web and creates structured data.',
@@ -49,5 +49,3 @@ export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   },
   tools: [Research.create, Research.research].map((fn) => ToolId.make(fn.key)),
 });
-
-export default blueprint;

package/src/blueprints/testing.ts

@@ -2,14 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Toolkit from '@effect/ai/Toolkit';
 import * as Effect from 'effect/Effect';
 
 import { ConsolePrinter } from '@dxos/ai';
-import { type AiConversation, type AiConversationRunParams, GenerationObserver } from '@dxos/assistant';
+import { type AiConversation, type AiConversationRunProps, GenerationObserver } from '@dxos/assistant';
 import { log } from '@dxos/log';
 
-export type TestStep = Pick<AiConversationRunParams, 'prompt' | 'system'> & {
+export type TestStep = Pick<AiConversationRunProps, 'prompt' | 'system'> & {
   test?: () => Promise<void>;
 };
 
@@ -29,6 +28,3 @@ export const runSteps = Effect.fn(function* (conversation: AiConversation, steps
     }
   }
 });
-
-// TODO(wittjosiah): Don't cast.
-export const testToolkit = Toolkit.empty as Toolkit.Toolkit<any>;

package/src/blueprints/websearch/index.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import blueprint from './websearch-blueprint';
+import { blueprint } from './websearch-blueprint';
 
 export { WebSearchToolkit } from './websearch-toolkit';
+
 export default blueprint;

package/src/blueprints/websearch/websearch-blueprint.ts

@@ -4,10 +4,10 @@
 
 import { ToolId } from '@dxos/ai';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
+import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 
-const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
+export const blueprint = Blueprint.make({
   key: 'dxos.org/blueprint/web-search',
   name: 'Web Search',
   description: 'Search the web.',
@@ -16,5 +16,3 @@ const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
   },
   tools: [ToolId.make('AnthropicWebSearch')],
 });
-
-export default blueprint;

package/src/chat/Chat.ts

@@ -0,0 +1,45 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { Obj, Type } from '@dxos/echo';
+import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
+import { Queue } from '@dxos/echo-db';
+
+/**
+ * AI chat.
+ */
+export const Chat = Schema.Struct({
+  name: Schema.String.pipe(Schema.optional),
+  queue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false)),
+  // TODO(dmaretskyi): Eventually this and the message queue will be the same.
+  traceQueue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false), Schema.optional),
+}).pipe(
+  Type.object({
+    typename: 'dxos.org/type/assistant/Chat',
+    version: '0.2.0',
+  }),
+  LabelAnnotation.set(['name']),
+);
+
+export interface Chat extends Schema.Schema.Type<typeof Chat> {}
+
+export const make = (props: Obj.MakeProps<typeof Chat>) => Obj.make(Chat, props);
+
+/**
+ * Relation between a Chat and companion objects (e.g., artifacts).
+ */
+export const CompanionTo = Schema.Struct({
+  id: Obj.ID,
+}).pipe(
+  Type.relation({
+    typename: 'dxos.org/relation/assistant/CompanionTo',
+    version: '0.1.0',
+    source: Chat,
+    target: Type.Obj,
+  }),
+);
+
+export interface CompanionTo extends Schema.Schema.Type<typeof CompanionTo> {}

package/src/chat/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * as Chat from './Chat';

package/src/crud/graph.test.ts

@@ -2,42 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as AnthropicClient from '@effect/ai-anthropic/AnthropicClient';
-import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
 import { describe, it } from '@effect/vitest';
-import * as Config from 'effect/Config';
 import * as Effect from 'effect/Effect';
-import * as Function from 'effect/Function';
 import * as Layer from 'effect/Layer';
 
-import { AiService, ToolExecutionService, ToolResolverService } from '@dxos/ai';
-import * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
-import { tapHttpErrors } from '@dxos/ai/testing';
 import { AiSession } from '@dxos/assistant';
-import { TestHelpers } from '@dxos/effect';
-import { DatabaseService, TracingService } from '@dxos/functions';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { TestHelpers } from '@dxos/effect/testing';
 import { log } from '@dxos/log';
-import { Project } from '@dxos/types';
+import { Pipeline } from '@dxos/types';
 
 import { makeGraphWriterHandler, makeGraphWriterToolkit } from './graph';
 
-// import { type EchoTestBuilder } from '@dxos/echo-db/testing';
-
-const TestLayer = Function.pipe(
-  AiService.model('@anthropic/claude-3-5-sonnet-20241022'),
-  Layer.provideMerge(DatabaseService.notAvailable),
-  Layer.provideMerge(ToolResolverService.layerEmpty),
-  Layer.provideMerge(ToolExecutionService.layerEmpty),
-  Layer.provide(AiServiceRouter.AiServiceRouter),
-  Layer.provide(
-    AnthropicClient.layerConfig({
-      apiKey: Config.redacted('ANTHROPIC_API_KEY'),
-      transformClient: tapHttpErrors,
-    }),
-  ),
-  Layer.provide(FetchHttpClient.layer),
-  Layer.provideMerge(TracingService.layerNoop),
-);
+const TestLayer = AssistantTestLayer({});
 
 describe('graph', () => {
   // let builder: EchoTestBuilder;
@@ -46,7 +23,7 @@ describe('graph', () => {
   //   const relatedSchemas = await findRelatedSchema(db, Schema.Struct({}));
   // });
 
-  const Toolkit = makeGraphWriterToolkit({ schema: [Project.Project] });
+  const Toolkit = makeGraphWriterToolkit({ schema: [Pipeline.Pipeline] });
   const ToolkitLayer = makeGraphWriterHandler(Toolkit);
 
   it.effect.skip(
@@ -63,7 +40,7 @@ describe('graph', () => {
         log.info('response', { response });
       },
       Effect.provide(Layer.mergeAll(TestLayer, ToolkitLayer)),
-      TestHelpers.runIf(process.env.ANTHROPIC_API_KEY),
+      TestHelpers.provideTestContext,
     ),
   );
 });