@dxos/assistant-toolkit 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/src/functions/entity-extraction/entity-extraction.test.ts

@@ -4,53 +4,36 @@
 
 import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
 
-import { AiService } from '@dxos/ai';
-import { MemoizedAiService, TestAiService } from '@dxos/ai/testing';
-import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { MemoizedAiService } from '@dxos/ai/testing';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
 import { Blueprint } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
 import { Database } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
-import { CredentialsService, FunctionInvocationService, TracingService } from '@dxos/functions';
-import { FunctionInvocationServiceLayerTest, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
+import { FunctionInvocationService } from '@dxos/functions';
 import { ObjectId } from '@dxos/keys';
 import { Message, Organization, Person } from '@dxos/types';
 
-import { testToolkit } from '../../blueprints/testing';
-import { ResearchGraph } from '../research';
+import { OperationHandlerSet } from '@dxos/operation';
+
+import { ResearchGraph } from '../../blueprints';
 
 import { default as entityExtraction } from './entity-extraction';
 
 ObjectId.dangerouslyDisableRandomness();
 
-const TestLayer = Layer.mergeAll(
-  AiService.model('@anthropic/claude-opus-4-0'),
-  makeToolResolverFromFunctions([], testToolkit),
-  makeToolExecutionServiceFromFunctions(testToolkit, testToolkit.toLayer({}) as any),
-).pipe(
-  Layer.provideMerge(FunctionInvocationServiceLayerTest({ functions: [entityExtraction] })),
-  Layer.provideMerge(
-    Layer.mergeAll(
-      TestAiService(),
-      TestDatabaseLayer({
-        spaceKey: 'fixed',
-        indexing: { vector: true },
-        types: [Blueprint.Blueprint, Message.Message, Person.Person, Organization.Organization, ResearchGraph],
-      }),
-      CredentialsService.configuredLayer([]),
-      TracingService.layerNoop,
-    ),
-  ),
-);
+const TestLayer = AssistantTestLayer({
+  operationHandlers: OperationHandlerSet.make(entityExtraction),
+  types: [Blueprint.Blueprint, Message.Message, Person.Person, Organization.Organization, ResearchGraph.ResearchGraph],
+});
 
 describe('Entity extraction', () => {
   it.effect(
-    'call a function to generate a research report',
+    'calls a function to generate a research report',
     Effect.fnUntraced(
       function* (_) {
-        const email = yield* Database.Service.add(
+        const email = yield* Database.add(
           Obj.make(Message.Message, {
             [Obj.Meta]: {
               tags: ['important'],
@@ -76,7 +59,7 @@ describe('Entity extraction', () => {
             ],
           }),
         );
-        yield* Database.Service.flush({ indexes: true });
+        yield* Database.flush();
         const result = yield* FunctionInvocationService.invokeFunction(entityExtraction, {
           source: email,
         });

package/src/functions/entity-extraction/entity-extraction.ts

@@ -2,108 +2,85 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Toolkit from '@effect/ai/Toolkit';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as Predicate from 'effect/Predicate';
-import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
-import { AiSession, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { Filter, Obj, Ref, Type } from '@dxos/echo';
-import { Database } from '@dxos/echo';
-import { defineFunction } from '@dxos/functions';
-import { FunctionInvocationServiceLayerTest } from '@dxos/functions-runtime/testing';
+import { GenericToolkit } from '@dxos/ai';
+import { AiSession, ToolExecutionServices } from '@dxos/assistant';
+import { Database, Filter, Obj, Ref } from '@dxos/echo';
+import { FunctionInvocationService } from '@dxos/functions';
 import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { type Actor, LegacyOrganization, Message, Organization, Person } from '@dxos/types';
+import { Operation } from '@dxos/operation';
+import { type Actor, LegacyOrganization, Organization, Person } from '@dxos/types';
 import { trim } from '@dxos/util';
 
+import { EntityExtraction } from './definitions';
+import { ResearchGraph } from '../../blueprints';
 import { makeGraphWriterHandler, makeGraphWriterToolkit } from '../../crud';
-import { contextQueueLayerFromResearchGraph } from '../research';
-
-export default defineFunction({
-  key: 'dxos.org/functions/entity-extraction',
-  name: 'Entity Extraction',
-  description: 'Extracts entities from emails and transcripts.',
-  inputSchema: Schema.Struct({
-    source: Message.Message.annotations({
-      description: 'Email or transcript to extract entities from.',
-    }),
-
-    // TODO(dmaretskyi): Consider making this an array of blueprints instead.
-    instructions: Schema.optional(Schema.String).annotations({
-      description: 'Instructions extraction process.',
-    }),
-  }),
-  outputSchema: Schema.Struct({
-    entities: Schema.optional(
-      Schema.Array(Type.Obj).annotations({
-        description: 'Extracted entities.',
-      }),
-    ),
-  }),
-  handler: Effect.fnUntraced(
-    function* ({ data: { source: message, instructions } }) {
-      const tags = Obj.getMeta(message)?.tags;
-      const contact = yield* extractContact(message.sender, tags);
-      let organization: Organization.Organization | null = null;
-
-      if (contact && !contact.organization) {
-        const created: DXN[] = [];
-        const GraphWriterToolkit = makeGraphWriterToolkit({
-          schema: [LegacyOrganization],
-        }).pipe();
-        const GraphWriterHandler = makeGraphWriterHandler(GraphWriterToolkit, {
-          onAppend: (dxns) => created.push(...dxns),
-        });
-        const toolkit = yield* GraphWriterToolkit.pipe(
-          Effect.provide(GraphWriterHandler.pipe(Layer.provide(contextQueueLayerFromResearchGraph))),
-        );
-
-        yield* new AiSession().run({
-          system: trim`
-            Extract the sender's organization from the email. If you are not sure, do nothing.
-            The extracted organization URL must match the sender's email domain.
-            ${instructions ? '<user_intructions>' + instructions + '</user_intructions>' : ''},
-          `,
-          prompt: JSON.stringify({ source: message, contact }),
-          toolkit,
-        });
 
-        if (created.length > 1) {
-          throw new Error('Multiple organizations created');
-        } else if (created.length === 1) {
-          organization = yield* Database.Service.resolve(created[0], Organization.Organization);
-          Obj.change(organization, (org) => {
-            const meta = Obj.getMeta(org);
-            meta.tags ??= [];
-            meta.tags.push(...(tags ?? []));
+export default EntityExtraction.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(
+      function* ({ source: message, instructions }) {
+        const tags = Obj.getMeta(message)?.tags;
+        const contact = yield* extractContact(message.sender, tags);
+        let organization: Organization.Organization | null = null;
+
+        if (contact && !contact.organization) {
+          const created: DXN[] = [];
+          const GraphWriterToolkit = makeGraphWriterToolkit({
+            schema: [LegacyOrganization],
+          }).pipe();
+          const GraphWriterHandler = makeGraphWriterHandler(GraphWriterToolkit, {
+            onAppend: (dxns) => created.push(...dxns),
           });
-          Obj.change(contact, (c) => {
-            c.organization = Ref.make(organization!);
+          const toolkit = yield* GraphWriterToolkit.pipe(
+            Effect.provide(GraphWriterHandler.pipe(Layer.provide(ResearchGraph.contextQueueLayer))),
+          );
+
+          yield* new AiSession().run({
+            system: trim`
+              Extract the sender's organization from the email. If you are not sure, do nothing.
+              The extracted organization URL must match the sender's email domain.
+              ${instructions ? '<user_intructions>' + instructions + '</user_intructions>' : ''},
+            `,
+            prompt: JSON.stringify({ source: message, contact }),
+            toolkit,
           });
+
+          if (created.length > 1) {
+            throw new Error('Multiple organizations created');
+          } else if (created.length === 1) {
+            organization = yield* Database.resolve(created[0], Organization.Organization);
+            Obj.change(organization, (org) => {
+              const meta = Obj.getMeta(org);
+              meta.tags ??= [];
+              meta.tags.push(...(tags ?? []));
+            });
+            Obj.change(contact, (obj) => {
+              obj.organization = Ref.make(organization!);
+            });
+          }
         }
-      }
 
-      return {
-        entities: [contact, organization].filter(Predicate.isNotNullable),
-      };
-    },
-    Effect.provide(
-      Layer.mergeAll(
-        AiService.model('@anthropic/claude-sonnet-4-0'), // TODO(dmaretskyi): Extract.
-        makeToolResolverFromFunctions([], Toolkit.make()),
-        makeToolExecutionServiceFromFunctions(Toolkit.make() as any, Layer.empty as any),
-      ).pipe(
-        Layer.provide(
-          // TODO(dmaretskyi): This should be provided by environment.
-          Layer.mergeAll(FunctionInvocationServiceLayerTest()),
-        ),
+        return {
+          entities: [contact, organization].filter(Predicate.isNotNullable),
+        };
+      },
+      Effect.provide(
+        Layer.mergeAll(
+          AiService.model('@anthropic/claude-sonnet-4-0'), // TODO(dmaretskyi): Extract.
+          ToolExecutionServices,
+          FunctionInvocationService.layerNotAvailable,
+        ).pipe(Layer.provide(GenericToolkit.providerEmpty)),
       ),
     ),
   ),
-});
+  Operation.opaqueHandler,
+);
 
 const extractContact = Effect.fn('extractContact')(function* (actor: Actor.Actor, tags?: readonly string[]) {
   const name = actor.name;
@@ -113,9 +90,8 @@ const extractContact = Effect.fn('extractContact')(function* (actor: Actor.Actor
     return undefined;
   }
 
-  const existingContacts = yield* Database.Service.runQuery(Filter.type(Person.Person));
+  const existingContacts = yield* Database.runQuery(Filter.type(Person.Person));
 
-  // Check for existing contact
   // TODO(dmaretskyi): Query filter DSL - https://linear.app/dxos/issue/DX-541/filtercontains-should-work-with-partial-objects
   const existingContact = existingContacts.find((contact) =>
     contact.emails?.some((contactEmail) => contactEmail.value === email),
@@ -130,11 +106,11 @@ const extractContact = Effect.fn('extractContact')(function* (actor: Actor.Actor
     ...(tags ? { [Obj.Meta]: { tags: [...tags] } } : {}),
     emails: [{ value: email }],
   });
-  yield* Database.Service.add(newContact);
+  yield* Database.add(newContact);
 
   if (name) {
-    Obj.change(newContact, (c) => {
-      c.fullName = name;
+    Obj.change(newContact, (obj) => {
+      obj.fullName = name;
     });
   }
 
@@ -146,7 +122,7 @@ const extractContact = Effect.fn('extractContact')(function* (actor: Actor.Actor
 
   log.info('extracted email domain', { emailDomain });
 
-  const existingOrganisations = yield* Database.Service.runQuery(Filter.type(Organization.Organization));
+  const existingOrganisations = yield* Database.runQuery(Filter.type(Organization.Organization));
   const matchingOrg = existingOrganisations.find((org) => {
     if (org.website) {
       try {
@@ -174,8 +150,8 @@ const extractContact = Effect.fn('extractContact')(function* (actor: Actor.Actor
 
   if (matchingOrg) {
     log.info('found matching organization', { organization: matchingOrg });
-    Obj.change(newContact, (c) => {
-      c.organization = Ref.make(matchingOrg);
+    Obj.change(newContact, (obj) => {
+      obj.organization = Ref.make(matchingOrg);
     });
   }
 

package/src/functions/entity-extraction/index.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { default as extract$ } from './entity-extraction';
+import { OperationHandlerSet } from '@dxos/operation';
 
-export namespace EntityExtraction {
-  export const extract = extract$;
-}
+export * from './definitions';
+
+export const EntityExtractionHandlers = OperationHandlerSet.lazy(() => import('./entity-extraction'));

package/src/functions/exa/definitions.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { CredentialsService } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
+
+export const ExaSearch = Operation.make({
+  meta: {
+    key: 'org.dxos.function.exa-search',
+    name: 'Exa Search',
+    description: 'Search the web for information',
+  },
+  input: Schema.Struct({
+    query: Schema.String.annotations({
+      description: 'The query to search for.',
+    }),
+  }),
+  output: Schema.Unknown,
+  services: [CredentialsService],
+});
+
+export const ExaMock = Operation.make({
+  meta: {
+    key: 'org.dxos.function.exa-mock',
+    name: 'Exa mock',
+    description: 'Search the web for information',
+  },
+  input: Schema.Struct({
+    query: Schema.String.annotations({
+      description: 'The query to search for.',
+    }),
+  }),
+  output: Schema.Unknown,
+});

package/src/functions/exa/exa.ts

@@ -3,35 +3,30 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Schema from 'effect/Schema';
 import Exa from 'exa-js';
 
-import { CredentialsService, defineFunction } from '@dxos/functions';
+import { CredentialsService } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
 
-export default defineFunction({
-  key: 'dxos.org/function/exa',
-  name: 'Exa',
-  description: 'Search the web for information',
-  inputSchema: Schema.Struct({
-    query: Schema.String.annotations({
-      description: 'The query to search for.',
-    }),
-  }),
-  outputSchema: Schema.Unknown,
-  handler: Effect.fnUntraced(function* ({ data: { query } }) {
-    const credential = yield* CredentialsService.getCredential({ service: 'exa.ai' });
-    const exa = new Exa(credential.apiKey);
+import { ExaSearch } from './definitions';
+
+export default ExaSearch.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ query }) {
+      const credential = yield* CredentialsService.getCredential({ service: 'exa.ai' });
+      const exa = new Exa(credential.apiKey);
 
-    const context = yield* Effect.promise(async () =>
-      exa.searchAndContents(query, {
-        type: 'auto',
-        text: {
-          maxCharacters: 3_000,
-        },
-        livecrawl: 'always',
-      }),
-    );
+      const context = yield* Effect.promise(async () =>
+        exa.searchAndContents(query, {
+          type: 'auto',
+          text: {
+            maxCharacters: 3_000,
+          },
+          livecrawl: 'always',
+        }),
+      );
 
-    return context;
-  }),
-});
+      return context;
+    }),
+  ),
+);

package/src/functions/exa/index.ts

@@ -2,5 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-export { default as exaFunction } from './exa';
-export { default as exaMockFunction } from './mock';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export * from './definitions';
+
+export const ExaHandlers = OperationHandlerSet.lazy(
+  () => import('./exa'),
+  () => import('./mock'),
+);

package/src/functions/exa/mock.ts

@@ -3,48 +3,39 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Schema from 'effect/Schema';
 
-import { defineFunction } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
 
+import { ExaMock } from './definitions';
 import { SEARCH_RESULTS } from './data';
 
-export default defineFunction({
-  key: 'dxos.org/function/exa-mock',
-  name: 'Exa mock',
-  description: 'Search the web for information',
-  inputSchema: Schema.Struct({
-    query: Schema.String.annotations({
-      description: 'The query to search for.',
+export default ExaMock.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ query }) {
+      const result = SEARCH_RESULTS.reduce(
+        (closest, current) => {
+          if (!current.autopromptString) {
+            return closest;
+          }
+          if (!closest) {
+            return current;
+          }
+
+          const dist1 = levenshteinDistance(query, current.autopromptString);
+          const dist2 = levenshteinDistance(query, closest.autopromptString || '');
+
+          const weight1 = dist1 / Math.max(query.length, current.autopromptString.length);
+          const weight2 = dist2 / Math.max(query.length, closest.autopromptString?.length || 0);
+
+          return weight1 < weight2 ? current : closest;
+        },
+        null as (typeof SEARCH_RESULTS)[0] | null,
+      );
+
+      return result;
     }),
-  }),
-  outputSchema: Schema.Unknown,
-  handler: Effect.fnUntraced(function* ({ data: { query } }) {
-    const result = SEARCH_RESULTS.reduce(
-      (closest, current) => {
-        if (!current.autopromptString) {
-          return closest;
-        }
-        if (!closest) {
-          return current;
-        }
-
-        // Calculate Levenshtein distance
-        const dist1 = levenshteinDistance(query, current.autopromptString);
-        const dist2 = levenshteinDistance(query, closest.autopromptString || '');
-
-        // Weight by length of the longer string to normalize
-        const weight1 = dist1 / Math.max(query.length, current.autopromptString.length);
-        const weight2 = dist2 / Math.max(query.length, closest.autopromptString?.length || 0);
-
-        return weight1 < weight2 ? current : closest;
-      },
-      null as (typeof SEARCH_RESULTS)[0] | null,
-    );
-
-    return result;
-  }),
-});
+  ),
+);
 
 const levenshteinDistance = (str1: string, str2: string): number => {
   const m = str1.length;

package/src/functions/index.ts

@@ -3,9 +3,5 @@
 //
 
 export * from './agent';
-export * from './discord';
-export * from './document';
 export * from './entity-extraction';
-export * from './linear';
-export * from './research';
-export * from './tasks';
+export * from './exa';

package/src/index.ts

@@ -3,7 +3,8 @@
 //
 
 export * from './blueprints';
+export * from './crud';
 export * from './functions';
 export * from './sync';
-export * from './crud';
 export * from './toolkits';
+export * from './types';

package/src/sync/sync.ts

@@ -42,7 +42,7 @@ export const syncObjects: (
 
       const schema = Obj.getSchema(obj) ?? failedInvariant('No schema.');
       const foreignId = Obj.getKeys(obj, foreignKeyId)[0]?.id ?? failedInvariant('No foreign key.');
-      const [existing] = yield* Database.Service.runQuery(
+      const [existing] = yield* Database.runQuery(
         Query.select(Filter.foreignKeys(schema, [{ source: foreignKeyId, id: foreignId }])),
       );
       log('sync object', {
@@ -51,7 +51,7 @@ export const syncObjects: (
         existing: existing ? Obj.getDXN(existing) : undefined,
       });
       if (!existing) {
-        yield* Database.Service.add(obj);
+        yield* Database.add(obj);
         return obj;
       } else {
         copyObjectData(existing, obj);

package/src/testing/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
+export * from '../blueprints/testing';
 export * from './plugins';

package/src/testing/plugins.tsx

@@ -5,15 +5,17 @@
 import * as Schema from 'effect/Schema';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
 import { Format, type Obj, Type } from '@dxos/echo';
-import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
+import { Card } from '@dxos/react-ui';
+import { Json } from '@dxos/react-ui-syntax-highlighter';
 
 export const MapSchema = Schema.Struct({
   coordinates: Format.GeoPoint,
 }).pipe(
   Type.object({
-    typename: 'example.com/type/Map',
+    typename: 'com.example.type.map',
     version: '0.1.0',
   }),
 );
@@ -38,31 +40,38 @@ const isImage = (data: any): data is any => false;
 
 export const capabilities: Capability.Any[] = [
   Capability.contributes(
-    Common.Capability.ReactSurface,
-    Common.createSurface({
+    Capabilities.ReactSurface,
+    Surface.create({
       id: 'plugin-image',
-      role: 'card--extrinsic',
+      role: 'card--content',
       filter: (data: any): data is any => isImage(data.value),
       component: ({ data }) => (
-        <img
-          className='grow object-cover'
-          src={`data:image/jpeg;base64,${data.value.source.data}`}
-          alt={data.value.prompt ?? `Generated image [id=${data.value.id}]`}
-        />
+        <Card.Content>
+          <img
+            className='grow object-cover'
+            src={`data:image/jpeg;base64,${data.value.source.data}`}
+            alt={data.value.prompt ?? `Generated image [id=${data.value.id}]`}
+          />
+        </Card.Content>
       ),
     }),
   ),
-
-  //
-  // Default
-  //
   Capability.contributes(
-    Common.Capability.ReactSurface,
-    Common.createSurface({
+    Capabilities.ReactSurface,
+    Surface.create({
       id: 'plugin-default',
-      role: 'card--extrinsic',
+      role: 'card--content',
       position: 'fallback',
-      component: ({ data }) => <JsonFilter data={data} />,
+      component: ({ data }) => (
+        <Card.Content>
+          <Json.Root data={data}>
+            <Json.Content>
+              <Json.Filter />
+              <Json.Data />
+            </Json.Content>
+          </Json.Root>
+        </Card.Content>
+      ),
     }),
   ),
 ];

package/src/toolkits/WebToolkit.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import * as AnthropicTool from '@effect/ai-anthropic/AnthropicTool';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+
+// TODO(dmaretskyi): Testing only.
+export const WebToolkit = Toolkit.make(
+  AnthropicTool.WebSearch_20250305({}).pipe(
+    // TODO(dmaretskyi): Effect bug -- provider-defined tools don't support annotations.
+    // ToolFormatter.assign({
+    //   debugFormatResult: (result) =>
+    //     Array.isArray(result) ? result.map(Struct.pick('title', 'type', 'url', 'page_age')) : result,
+    // }),
+  ),
+  Tool.make('WebFetch', {
+    parameters: {
+      url: Schema.String,
+    },
+    success: Schema.String,
+  }),
+);
+
+export const layer = WebToolkit.toLayer({
+  WebFetch: Effect.fnUntraced(function* ({ url }) {
+    const response = yield* Effect.promise(() => fetch(url).then((response) => response.text()));
+    return response;
+  }),
+});

package/src/toolkits/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as AssistantToolkit from './AssistantToolkit';
-export * as SystemToolkit from './SystemToolkit';
+export * as WebToolkit from './WebToolkit';