@dxos/assistant-toolkit 0.8.4-main.7ace549 → 0.8.4-main.937b3ca

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.8.4-main.7ace549",
+  "version": "0.8.4-main.937b3ca",
   "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",
@@ -13,55 +17,65 @@
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
+    },
+    "./testing": {
+      "source": "./src/testing/index.ts",
+      "types": "./dist/types/src/testing/index.d.ts",
+      "browser": "./dist/lib/browser/testing/index.mjs",
+      "node": "./dist/lib/node-esm/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
-    "*": {}
+    "*": {
+      "testing": [
+        "./dist/types/src/testing/index.d.ts"
+      ]
+    }
   },
   "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.32.1",
+    "@effect/ai-anthropic": "0.22.0",
+    "@effect/experimental": "0.57.11",
+    "@effect/platform": "0.93.6",
+    "dfx": "^0.127.0",
     "exa-js": "^1.5.12",
-    "@dxos/ai": "0.8.4-main.7ace549",
-    "@dxos/app-framework": "0.8.4-main.7ace549",
-    "@dxos/blueprints": "0.8.4-main.7ace549",
-    "@dxos/conductor": "0.8.4-main.7ace549",
-    "@dxos/context": "0.8.4-main.7ace549",
-    "@dxos/echo": "0.8.4-main.7ace549",
-    "@dxos/assistant": "0.8.4-main.7ace549",
-    "@dxos/echo-protocol": "0.8.4-main.7ace549",
-    "@dxos/echo-db": "0.8.4-main.7ace549",
-    "@dxos/edge-client": "0.8.4-main.7ace549",
-    "@dxos/functions": "0.8.4-main.7ace549",
-    "@dxos/functions-runtime": "0.8.4-main.7ace549",
-    "@dxos/errors": "0.8.4-main.7ace549",
-    "@dxos/effect": "0.8.4-main.7ace549",
-    "@dxos/keys": "0.8.4-main.7ace549",
-    "@dxos/invariant": "0.8.4-main.7ace549",
-    "@dxos/log": "0.8.4-main.7ace549",
-    "@dxos/plugin-markdown": "0.8.4-main.7ace549",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7ace549",
-    "@dxos/schema": "0.8.4-main.7ace549",
-    "@dxos/types": "0.8.4-main.7ace549",
-    "@dxos/util": "0.8.4-main.7ace549"
+    "@dxos/app-framework": "0.8.4-main.937b3ca",
+    "@dxos/ai": "0.8.4-main.937b3ca",
+    "@dxos/assistant": "0.8.4-main.937b3ca",
+    "@dxos/blueprints": "0.8.4-main.937b3ca",
+    "@dxos/conductor": "0.8.4-main.937b3ca",
+    "@dxos/context": "0.8.4-main.937b3ca",
+    "@dxos/echo": "0.8.4-main.937b3ca",
+    "@dxos/echo-db": "0.8.4-main.937b3ca",
+    "@dxos/echo-protocol": "0.8.4-main.937b3ca",
+    "@dxos/edge-client": "0.8.4-main.937b3ca",
+    "@dxos/effect": "0.8.4-main.937b3ca",
+    "@dxos/errors": "0.8.4-main.937b3ca",
+    "@dxos/functions": "0.8.4-main.937b3ca",
+    "@dxos/keys": "0.8.4-main.937b3ca",
+    "@dxos/log": "0.8.4-main.937b3ca",
+    "@dxos/functions-runtime": "0.8.4-main.937b3ca",
+    "@dxos/invariant": "0.8.4-main.937b3ca",
+    "@dxos/plugin-markdown": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.937b3ca",
+    "@dxos/schema": "0.8.4-main.937b3ca",
+    "@dxos/util": "0.8.4-main.937b3ca",
+    "@dxos/types": "0.8.4-main.937b3ca"
   },
   "devDependencies": {
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0"
+    "effect": "3.19.11",
+    "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.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "publishConfig": {
     "access": "public"

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

@@ -17,8 +17,10 @@ import {
 } 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';
@@ -29,7 +31,7 @@ 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 +40,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.Service.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.Service.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 +74,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.
           `;
 

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/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/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

@@ -16,8 +16,10 @@ import {
 } 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';
@@ -29,7 +31,7 @@ import { trim } from '@dxos/util';
 import { Tasks } from '../../functions';
 import { type TestStep, runSteps, testToolkit } from '../testing';
 
-import blueprint from './planning-blueprint';
+import { blueprint } from './planning-blueprint';
 
 describe('Planning Blueprint', { timeout: 120_000 }, () => {
   it.scoped(
@@ -37,16 +39,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.Service.add(blueprint);
         yield* Effect.promise(() =>
           conversation.context.bind({
             blueprints: [Ref.make(blueprint)],
           }),
         );
 
-        const artifact = yield* DatabaseService.add(Markdown.make());
+        const artifact = yield* Database.Service.add(Markdown.make());
         let prevContent = artifact.content;
         const matchList =
           ({ includes = [], excludes = [] }: { includes: RegExp[]; excludes?: RegExp[] }) =>

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

@@ -6,10 +6,10 @@ 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>;
 };
 

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/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 { 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;
@@ -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,
     ),
   );
 });

package/src/crud/graph.ts

@@ -12,6 +12,7 @@ import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { Entity, Filter, Obj, Query, Type } from '@dxos/echo';
+import { Database } from '@dxos/echo';
 import {
   ReferenceAnnotationId,
   RelationSourceDXNId,
@@ -22,10 +23,10 @@ import {
   getTypeAnnotation,
   getTypeIdentifierAnnotation,
 } from '@dxos/echo/internal';
-import { type EchoDatabase, type Queue } from '@dxos/echo-db';
+import { type Queue } from '@dxos/echo-db';
 import { isEncodedReference } from '@dxos/echo-protocol';
 import { mapAst } from '@dxos/effect';
-import { ContextQueueService, DatabaseService } from '@dxos/functions';
+import { ContextQueueService } from '@dxos/functions';
 import { DXN, ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { deepMapValues, isNonNullable, trim } from '@dxos/util';
@@ -39,7 +40,7 @@ export const Subgraph = Schema.Struct({
 export interface Subgraph extends Schema.Schema.Type<typeof Subgraph> {}
 
 export type RelatedSchema = {
-  schema: Schema.Schema.AnyNoContext;
+  schema: Type.Entity.Any;
   kind: 'reference' | 'relation';
 };
 
@@ -50,12 +51,9 @@ export type RelatedSchema = {
  * @param schema
  * @returns
  */
-export const findRelatedSchema = async (
-  db: EchoDatabase,
-  anchor: Schema.Schema.AnyNoContext,
-): Promise<RelatedSchema[]> => {
+export const findRelatedSchema = async (db: Database.Database, anchor: Type.Entity.Any): Promise<RelatedSchema[]> => {
   // TODO(dmaretskyi): Query stored schemas.
-  const allSchemas = [...db.graph.schemaRegistry.schemas];
+  const allSchemas = await db.graph.schemaRegistry.query().run();
 
   // TODO(dmaretskyi): Also do references.
   return allSchemas
@@ -71,8 +69,8 @@ export const findRelatedSchema = async (
     })
     .map(
       (schema): RelatedSchema => ({
-        schema,
         kind: 'relation',
+        schema,
       }),
     );
 };
@@ -81,7 +79,7 @@ export const findRelatedSchema = async (
  * Non-strict DXN comparison.
  * Returns true if the DXN could be resolved to the schema.
  */
-const isSchemaAddressableByDxn = (schema: Schema.Schema.AnyNoContext, dxn: DXN): boolean => {
+const isSchemaAddressableByDxn = (schema: Type.Entity.Any, dxn: DXN): boolean => {
   if (getTypeIdentifierAnnotation(schema) === dxn.toString()) {
     return true;
   }
@@ -108,13 +106,13 @@ export const LocalSearchToolkit = Toolkit.make(
     },
     success: Schema.Unknown,
     failure: Schema.Never,
-    dependencies: [DatabaseService],
+    dependencies: [Database.Service],
   }),
 );
 
 export const LocalSearchHandler = LocalSearchToolkit.toLayer({
   search_local_search: Effect.fn(function* ({ query }) {
-    const { objects } = yield* DatabaseService.runQuery(Query.select(Filter.text(query, { type: 'vector' })));
+    const objects = yield* Database.Service.runQuery(Query.select(Filter.text(query, { type: 'vector' })));
     const results = [...objects];
 
     const option = yield* Effect.serviceOption(ContextQueueService);
@@ -138,21 +136,21 @@ export const LocalSearchHandler = LocalSearchToolkit.toLayer({
 class GraphWriterSchema extends Context.Tag('@dxos/assistant/GraphWriterSchema')<
   GraphWriterSchema,
   {
-    schema: Schema.Schema.AnyNoContext[];
+    schema: Type.Entity.Any[];
   }
 >() {}
 
 /**
  * Forms typed objects that can be written to the graph database.
  */
-export const makeGraphWriterToolkit = ({ schema }: { schema: Schema.Schema.AnyNoContext[] }) => {
+export const makeGraphWriterToolkit = ({ schema }: { schema: Type.Entity.Any[] }) => {
   return Toolkit.make(
     Tool.make('graph_writer', {
       description: 'Write to the local graph database',
       parameters: createExtractionSchema(schema).fields,
       success: Schema.Unknown,
       failure: Schema.Never,
-      dependencies: [DatabaseService, ContextQueueService],
+      dependencies: [Database.Service, ContextQueueService],
     }).annotateContext(Context.make(GraphWriterSchema, { schema })),
   );
 };
@@ -172,10 +170,10 @@ export const makeGraphWriterHandler = (
 
   return toolkit.toLayer({
     graph_writer: Effect.fn(function* (input) {
-      const { db } = yield* DatabaseService;
+      const { db } = yield* Database.Service;
       const { queue } = yield* ContextQueueService;
       const data = yield* Effect.promise(() => sanitizeObjects(schema, input as any, db, queue));
-      yield* Effect.promise(() => queue.append(data as Obj.Any[]));
+      yield* Effect.promise(() => queue.append(data as Obj.Unknown[]));
 
       const dxns = data.map((obj) => Obj.getDXN(obj));
       onAppend?.(dxns);
@@ -187,7 +185,7 @@ export const makeGraphWriterHandler = (
 /**
  * Create a schema for structured data extraction.
  */
-export const createExtractionSchema = (types: Schema.Schema.AnyNoContext[]) => {
+export const createExtractionSchema = (types: Type.Entity.Any[]) => {
   return Schema.Struct({
     ...Object.fromEntries(
       types.map(preprocessSchema).map((schema, index) => [
@@ -200,18 +198,18 @@ export const createExtractionSchema = (types: Schema.Schema.AnyNoContext[]) => {
   });
 };
 
-export const getSanitizedSchemaName = (schema: Schema.Schema.AnyNoContext) => {
+export const getSanitizedSchemaName = (schema: Type.Entity.Any) => {
   return Type.getDXN(schema)!
     .asTypeDXN()!
     .type.replaceAll(/[^a-zA-Z0-9]+/g, '_');
 };
 
 export const sanitizeObjects = async (
-  types: Schema.Schema.AnyNoContext[],
+  types: Type.Entity.Any[],
   data: Record<string, readonly unknown[]>,
-  db: EchoDatabase,
+  db: Database.Database,
   queue?: Queue,
-): Promise<Obj.Any[]> => {
+): Promise<Obj.Unknown[]> => {
   const entries = types
     .map(
       (type) =>
@@ -292,7 +290,7 @@ export const sanitizeObjects = async (
     .filter((object) => !existingIds.has(object.data.id)); // TODO(dmaretskyi): This dissallows updating existing objects.
 
   // TODO(dmaretskyi): Use ref resolver.
-  const { objects: dbObjects } = await db.query(Query.select(Filter.ids(...existingIds))).run();
+  const dbObjects = await db.query(Query.select(Filter.id(...existingIds))).run();
   const queueObjects = (await queue?.getObjectsById([...existingIds])) ?? [];
   const objects = [...dbObjects, ...queueObjects].filter(isNonNullable);
 

package/src/experimental/feed.test.ts

@@ -13,7 +13,7 @@ import * as Redacted from 'effect/Redacted';
 import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset, EXA_API_KEY } from '@dxos/ai/testing';
 import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { TestHelpers } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
 import { CredentialsService, FunctionInvocationService } from '@dxos/functions';
 import { TracingServiceExt } from '@dxos/functions-runtime';
 import {