@dxos/plugin-assistant 0.8.4-main.72ec0f3 → 0.8.4-main.7996785055

package/src/processor/processor.ts

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+import type * as Tool from '@effect/ai/Tool';
 import { Atom, Registry } from '@effect-atom/atom-react';
 import * as Cause from 'effect/Cause';
 import * as Effect from 'effect/Effect';
@@ -19,32 +20,33 @@ import {
   type ToolResolverService,
 } from '@dxos/ai';
 import {
+  AiContextService,
   type AiConversation,
-  type AiConversationRunParams,
+  type AiConversationRunProps,
   ArtifactDiffResolver,
   GenerationObserver,
   createSystemPrompt,
 } from '@dxos/assistant';
+import { formatSystemPrompt } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
-import { Obj } from '@dxos/echo';
-import { throwCause } from '@dxos/effect';
+import { Obj, Ref } from '@dxos/echo';
+import { type Database } from '@dxos/echo';
+import { runAndForwardErrors, throwCause, unwrapExit } from '@dxos/effect';
 import {
   type CredentialsService,
-  type DatabaseService,
   type FunctionInvocationService,
   type QueueService,
-  type TracingService,
+  TracingService,
 } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type ContentBlock, Message } from '@dxos/types';
 
-import { type Assistant } from '../types';
-
 import { updateName } from './update-name';
 
 export type AiChatServices =
   | CredentialsService
-  | DatabaseService
+  | Database.Service
   | QueueService
   | FunctionInvocationService
   | AiService.AiService
@@ -58,7 +60,11 @@ export type AiChatProcessorOptions = {
   blueprintRegistry?: Blueprint.Registry;
   observableRegistry?: Registry.Registry;
   extensions?: ToolContextExtensions;
-} & Pick<AiConversationRunParams, 'system'>;
+  /**
+   * For tracing.
+   */
+  chat?: Ref.Ref<Chat.Chat>;
+} & Pick<AiConversationRunProps, 'system'>;
 
 const defaultOptions: Partial<AiChatProcessorOptions> = {
   model: DEFAULT_EDGE_MODEL,
@@ -82,31 +88,26 @@ export class AiChatProcessor {
   /** External observer. */
   private readonly _observer: GenerationObserver;
 
+  /** Pending messages (incl. the current user request). */
+  private readonly _pending = Atom.make<Message.Message[]>([]);
+
+  /** Currently streaming message (from the AI service). */
+  private readonly _streaming = Atom.make<Message.Message[]>([]);
+
   /** Currently active request fiber. */
   private _fiber: Fiber.Fiber<void, any> | undefined;
 
   /** Last request (for retries). */
   private _lastRequest: AiRequest | undefined;
 
-  /** Pending messages (incl. the current user request). */
-  private readonly _pending = Atom.make<Message.Message[]>([]);
-
-  /** Currently streaming message (from the AI service). */
-  private readonly _streaming = Atom.make<Option.Option<Message.Message>>(Option.none());
-
   /** Streaming state. */
-  public readonly streaming = Atom.make<boolean>((get) => Option.isSome(get(this._streaming)));
+  public readonly streaming = Atom.make<boolean>((get) => get(this._streaming).length > 0);
 
   /** Active state. */
   public readonly active = Atom.make(false);
 
   /** Array of Messages (incl. the current message being streamed). */
-  public readonly messages = Atom.make<Message.Message[]>((get) =>
-    Option.match(get(this._streaming), {
-      onNone: () => get(this._pending),
-      onSome: (streaming) => [...get(this._pending), streaming],
-    }),
-  );
+  public readonly messages = Atom.make<Message.Message[]>((get) => [...get(this._pending), ...get(this._streaming)]);
 
   /** Last error. */
   public readonly error = Atom.make<Option.Option<Error>>(Option.none());
@@ -141,37 +142,92 @@ export class AiChatProcessor {
     return this._options.blueprintRegistry;
   }
 
+  get system(): string {
+    return this._options.system ?? '';
+  }
+
+  async getTools(): Promise<Record<string, Tool.Any>> {
+    return unwrapExit(await this._conversation.getTools().pipe(await Runtime.runPromiseExit(await this._services())));
+  }
+
+  async getSystemPrompt(): Promise<string> {
+    return unwrapExit(
+      await Effect.gen(this, function* () {
+        const blueprints = this.context.getBlueprints();
+        const objects = this.context.getObjects();
+        const system = yield* formatSystemPrompt({ system: this._options.system, blueprints, objects });
+        return system;
+      }).pipe(
+        Effect.provideService(AiContextService, {
+          binder: this.context,
+        }),
+        await Runtime.runPromiseExit(await this._services()),
+      ),
+    );
+  }
+
   /**
    * Initiates a new request.
    */
-  async request(requestParam: AiRequest): Promise<void> {
+  async request(requestProp: AiRequest): Promise<void> {
     if (this._fiber) {
       await this.cancel();
     }
 
     try {
-      this._lastRequest = requestParam;
+      this._lastRequest = requestProp;
       this._registry.set(this.error, Option.none());
       this._registry.set(this.active, true);
 
+      const services = await this._services();
+
       // Create request.
-      const request = this._conversation.createRequest({
-        system: this._options.system,
-        prompt: requestParam.message,
-        observer: this._observer,
-      });
+      const request = Effect.gen(this, function* () {
+        const tracer = yield* TracingService;
+        const trace = yield* tracer.traceInvocationStart({
+          target: undefined,
+          payload: {
+            chat: this._options.chat,
+            data: {
+              prompt: requestProp.message,
+            },
+          },
+        });
+
+        const result = yield* this._conversation
+          .createRequest({
+            system: this._options.system,
+            prompt: requestProp.message,
+            observer: this._observer,
+          })
+          .pipe(
+            Effect.provide(
+              trace.invocationTraceQueue ? TracingService.layerInvocation(trace) : TracingService.layerNoop,
+            ),
+            Effect.exit,
+          );
+
+        if (Exit.isFailure(result)) {
+          const error = Cause.prettyErrors(result.cause)[0];
+          log.error(error.message, error.cause ?? error.stack);
+        }
 
-      const runtime = await this._services();
+        yield* tracer.traceInvocationEnd({
+          trace,
+          // TODO(dmaretskyi): Might miss errors.
+          exception: Exit.isFailure(result) ? Cause.prettyErrors(result.cause)[0] : undefined,
+        });
+
+        return Effect.exit(result);
+      });
 
       // Create fiber.
       this._fiber = request.pipe(
         Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-
         // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
         Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
-
         Effect.asVoid,
-        Runtime.runFork(runtime), // Runs in the background.
+        Runtime.runFork(services), // Runs in the background.
       );
 
       // Execute request.
@@ -183,12 +239,12 @@ export class AiChatProcessor {
       this._registry.set(this.error, Option.none());
       this._lastRequest = undefined;
       this._fiber = undefined;
-    } catch (error) {
-      log.error('request failed', { error });
-      this._registry.set(this.error, Option.some(new Error('AI service error', { cause: error })));
+    } catch (err) {
+      log.error('request failed', { error: err });
+      this._registry.set(this.error, Option.some(new Error('AI service error', { cause: err })));
     } finally {
-      this._fiber = undefined;
       this._registry.set(this.active, false);
+      this._fiber = undefined;
     }
   }
 
@@ -196,7 +252,7 @@ export class AiChatProcessor {
    * Cancels the current request.
    */
   async cancel(): Promise<void> {
-    await Effect.runPromise(
+    await runAndForwardErrors(
       Effect.gen(this, function* () {
         if (this._fiber) {
           yield* this._fiber.pipe(Fiber.interrupt);
@@ -220,7 +276,7 @@ export class AiChatProcessor {
   /**
    * Update the current chat's name.
    */
-  async updateName(chat: Assistant.Chat): Promise<void> {
+  async updateName(chat: Chat.Chat): Promise<void> {
     const runtime = await this._services();
     await updateName(runtime, this._conversation, chat, this._options.model);
   }
@@ -233,7 +289,7 @@ export class AiChatProcessor {
       //   artifacts.map(async (artifact) => {
       //     const {
       //       objects: [object],
-      //     } = await space.db.query(Filter.ids(artifact.id)).run();
+      //     } = await space.db.query(Filter.id(artifact.id)).run();
       //     if (!object) {
       //       return;
       //     }
@@ -249,29 +305,29 @@ export class AiChatProcessor {
     },
   };
 
-  private _onMessage = Effect.fn(
-    function* (this: AiChatProcessor, message: Message.Message) {
-      this._registry.set(this._streaming, Option.none());
-      this._registry.update(this._pending, (pending) => [...pending, message]);
-    }.bind(this),
-  );
-
+  // TODO(dmaretskyi): Due to the way effect streams do buffering, we cannot rely on _onBlock and _onMessage to be called in order.
   private _onBlock = Effect.fn(
     function* (this: AiChatProcessor, block: ContentBlock.Any) {
       this._registry.update(this._streaming, (streaming) => {
-        const blocks = streaming.pipe(
-          Option.map((streaming) => streaming.blocks.filter((b: ContentBlock.Any) => !b.pending)),
-          Option.getOrElse(() => []),
-        );
+        const blocks = streaming.filter((message) => message.blocks.every((block) => !block.pending));
 
-        return Option.some(
+        // AiSession emits a message per each assistant content-block, so we do the same.
+        return [
+          ...blocks,
           Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: { role: 'assistant' },
-            blocks: [...blocks, block],
+            blocks: [block],
           }),
-        );
+        ];
       });
     }.bind(this),
   );
+
+  private _onMessage = Effect.fn(
+    function* (this: AiChatProcessor, message: Message.Message) {
+      this._registry.set(this._streaming, []);
+      this._registry.update(this._pending, (pending) => [...pending, message]);
+    }.bind(this),
+  );
 }

package/src/processor/update-name.ts

@@ -9,11 +9,11 @@ import * as Runtime from 'effect/Runtime';
 
 import { AiService, DEFAULT_EDGE_MODEL, type ModelName } from '@dxos/ai';
 import { type AiConversation, AiSession } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
+import { Obj } from '@dxos/echo';
 import { throwCause } from '@dxos/effect';
 import { trim } from '@dxos/util';
 
-import { type Assistant } from '../types';
-
 import { type AiChatServices } from './processor';
 
 /**
@@ -23,7 +23,7 @@ import { type AiChatServices } from './processor';
 export const updateName = async (
   runtime: Runtime.Runtime<AiChatServices>,
   conversation: AiConversation,
-  chat: Assistant.Chat,
+  chat: Chat.Chat,
   model: ModelName = DEFAULT_EDGE_MODEL,
 ): Promise<void> => {
   const history = await conversation.getHistory();
@@ -43,7 +43,9 @@ export const updateName = async (
       const message = messages.find((message) => message.sender.role === 'assistant');
       const title = message?.blocks.find((block) => block._tag === 'text')?.text;
       if (title) {
-        chat.name = title;
+        Obj.change(chat, (obj) => {
+          obj.name = title;
+        });
       }
     }),
     Runtime.runFork(runtime), // Run in the background.

package/src/queue-logger.ts

@@ -23,7 +23,10 @@ export class QueueLogger implements SequenceLogger {
     let dxn = this._space.properties.invocationTraceQueue?.dxn;
     if (!dxn) {
       dxn = DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, Key.ObjectId.random());
-      this._space.properties.invocationTraceQueue = Ref.fromDXN(dxn);
+      const newDxn = dxn;
+      Obj.change(this._space.properties, (obj) => {
+        obj.invocationTraceQueue = Ref.fromDXN(newDxn);
+      });
     }
     this._invocationTraceQueue = this._space.queues.get(dxn);
   }

package/src/testing/test-generator.ts

@@ -5,7 +5,8 @@
 import * as Effect from 'effect/Effect';
 
 import { Obj } from '@dxos/echo';
-import { ContextQueueService, DatabaseService } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { ContextQueueService } from '@dxos/functions';
 import { faker } from '@dxos/random';
 import { renderObjectLink } from '@dxos/react-ui-components';
 import { type Actor, type ContentBlock, Message, Organization } from '@dxos/types';
@@ -19,7 +20,7 @@ export const createMessage = (role: Actor.Role, blocks: ContentBlock.Any[]): Mes
   });
 };
 
-export type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
+export type MessageGenerator = Effect.Effect<void, never, Database.Service | ContextQueueService>;
 
 export const createMessageGenerator = (): MessageGenerator[] => [
   Effect.gen(function* () {
@@ -145,7 +146,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
 
   Effect.gen(function* () {
     const { queue } = yield* ContextQueueService;
-    const { db } = yield* DatabaseService;
+    const { db } = yield* Database.Service;
     const obj1 = db.add(Obj.make(Organization.Organization, { name: 'DXOS' }));
     // const obj2 = db.add(Obj.make(Person.Person, { fullName: 'Alice' }));
     // const obj3 = db.add(Obj.make(Person.Person, { fullName: 'Bob' }));

package/src/testing/test-sequence.ts

@@ -9,16 +9,16 @@ export const RESEARCH_SEQUENCE_DEFINITION: SequenceDefinition = {
   steps: [
     {
       instructions: 'Research information and entities related to the selected objects.',
-      tools: [ToolId.make('search/web_search')],
+      tools: [ToolId.make('search/web-search')],
     },
     {
       instructions:
         'Based on your research find matching entires that are already in the graph. Do exaustive research.',
-      tools: [ToolId.make('search/local_search')],
+      tools: [ToolId.make('search/local-search')],
     },
     {
       instructions: 'Add researched data to the graph. Make connections to existing objects.',
-      tools: [ToolId.make('search/local_search'), ToolId.make('graph/writer')],
+      tools: [ToolId.make('search/local-search'), ToolId.make('graph/writer')],
     },
   ],
 };

package/src/testing/test-services.ts

@@ -2,10 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Obj } from '@dxos/echo';
+import { Obj, type Type } from '@dxos/echo';
 
 import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '../types';
 
+const ServiceTypeSchema = ServiceType as unknown as Type.AnyObj;
+
 export class MockServiceRegistry implements BaseServiceRegistry {
   async queryServices(): Promise<ServiceType[]> {
     return TEST_SERVICES;
@@ -48,7 +50,7 @@ const VISUAL_CROSSING_CREDENTIALS: ApiAuthorization = {
 //  - e.g., https://github.com/konfig-sdks/openapi-examples/blob/main/xkcd/openapi.yaml
 
 const TEST_SERVICES: ServiceType[] = [
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'amadeus.com/service/FlightSearch',
     name: 'Amadeus Flight Search',
     description: 'Search for local and international flights.',
@@ -62,7 +64,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'amadeus.com/service/HotelSearch',
     name: 'Amadeus Hotel Search',
     description: 'Search for local and international hotels.',
@@ -76,7 +78,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'visualcrossing.com/service/Weather',
     name: 'Visual Crossing Weather',
     description: 'Search for global weather forecasts.',
@@ -91,7 +93,7 @@ const TEST_SERVICES: ServiceType[] = [
   }),
 
   // TODO(burdon): Needs auth.
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'abstractapi.com/service/GeoLocation',
     name: 'Abstract GeoLocation',
     description: 'Get the location of any IP address.',
@@ -109,7 +111,7 @@ const TEST_SERVICES: ServiceType[] = [
   //
 
   ...Array.from({ length: 20 }, (_, i) =>
-    Obj.make(ServiceType, {
+    Obj.make(ServiceTypeSchema, {
       serviceId: `example.com/service/test-${i}`,
       name: `Test ${i}`,
       description: `Test ${i}`,

package/src/translations.ts

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Chat, Project } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
 
 import { meta } from './meta';
-import { Assistant } from './types';
 
 // TODO(burdon): Standardize translation names.
 export const translations = [
@@ -21,8 +21,10 @@ export const translations = [
         'typename label_one': 'Blueprint',
         'typename label_other': 'Blueprints',
         'object name placeholder': 'New blueprint',
+        'add object label': 'Add blueprint',
         'rename object label': 'Rename blueprint',
         'delete object label': 'Delete blueprint',
+        'object deleted label': 'Blueprint deleted',
       },
       [Type.getTypename(Prompt.Prompt)]: {
         'typename label': 'Prompt',
@@ -30,8 +32,10 @@ export const translations = [
         'typename label_one': 'Prompt',
         'typename label_other': 'Prompts',
         'object name placeholder': 'New prompt',
+        'add object label': 'Add prompt',
         'rename object label': 'Rename prompt',
         'delete object label': 'Delete prompt',
+        'object deleted label': 'Prompt deleted',
       },
       // TODO(burdon): From conductor.
       [Sequence.typename]: {
@@ -40,14 +44,29 @@ export const translations = [
         'typename label_one': 'Sequence',
         'typename label_other': 'Sequences',
         'object name placeholder': 'New sequence',
+        'add object label': 'Add sequence',
         'rename object label': 'Rename sequence',
         'delete object label': 'Delete sequence',
+        'object deleted label': 'Sequence deleted',
       },
-      [Assistant.Chat.typename]: {
+      [Chat.Chat.typename]: {
         'typename label': 'AI Chat',
         'object name placeholder': 'New AI Chat',
+        'add object label': 'Add AI chat',
         'rename object label': 'Rename AI Chat',
         'delete object label': 'Delete AI Chat',
+        'object deleted label': 'AI Chat deleted',
+      },
+      [Project.Project.typename]: {
+        'typename label': 'Project',
+        'typename label_zero': 'Projects',
+        'typename label_one': 'Project',
+        'typename label_other': 'Projects',
+        'object name placeholder': 'New project',
+        'add object label': 'Add project',
+        'rename object label': 'Rename project',
+        'delete object label': 'Delete project',
+        'object deleted label': 'Project deleted',
       },
       // TODO(burdon): Reconcile with react-ui-chat.
       [meta.id]: {
@@ -76,9 +95,11 @@ export const translations = [
         'tool error label': 'Tool call failed',
 
         'invocations label': 'Invocations',
+        'trace label': 'Trace',
 
         'assistant dialog title': 'Assistant',
         'open assistant label': 'Open assistant',
+        'reset blueprints label': 'Reset blueprints',
 
         'no tools': 'No tools are configured',
         'no results': 'No results',
@@ -91,7 +112,7 @@ export const translations = [
         'chat update name label': 'Update AI Chat name',
 
         'toolkit label': 'Toolkit',
-        'summary label': 'Summary',
+        'stats label': 'Stats',
 
         'search placeholder': 'Search...',
         'prompt placeholder': 'Enter question or command...',
@@ -109,6 +130,15 @@ export const translations = [
         'settings llm provider label': 'LLM provider',
         'settings edge llm model label': 'Remote language model',
         'settings ollama llm model label': 'Ollama language model',
+
+        // Trigger status
+        'trigger status disabled label': 'Triggers disabled',
+        'trigger status idle label': 'Triggers idle',
+        'trigger status running label': 'Trigger running',
+        'trigger status error label': 'Trigger error',
+        'trigger runtime label': 'Auto trigger execution',
+        'trigger last invocation label': 'Last run',
+        'trigger duration label': 'Duration',
       },
     },
   },

package/src/types/Assistant.ts

@@ -4,48 +4,13 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Obj, Ref, Type } from '@dxos/echo';
-import { FormAnnotation, LabelAnnotation } from '@dxos/echo/internal';
-import { Queue } from '@dxos/echo-db';
+import { Chat as ChatModule } from '@dxos/assistant-toolkit';
 
 import { LLM_PROVIDERS } from './defs';
 
-/**
- * AI chat.
- */
-export const Chat = Schema.Struct({
-  name: Schema.String.pipe(Schema.optional),
-  queue: Type.Ref(Queue).pipe(FormAnnotation.set(false)),
-  // TODO(dmaretskyi): Eventually this and the message queue will be the same.
-  traceQueue: Type.Ref(Queue).pipe(FormAnnotation.set(false), Schema.optional),
-}).pipe(
-  Type.Obj({
-    typename: 'dxos.org/type/assistant/Chat',
-    version: '0.2.0',
-  }),
-  LabelAnnotation.set(['name']),
-);
-
-export interface Chat extends Schema.Schema.Type<typeof Chat> {}
-
-export const makeChat = ({ name, queue }: { name?: string; queue: Queue }) =>
-  Obj.make(Chat, { name, queue: Ref.fromDXN(queue.dxn) });
-
-/**
- * Relation between a Chat and companion objects (e.g., artifacts).
- */
-export const CompanionTo = Schema.Struct({
-  id: Type.ObjectId,
-}).pipe(
-  Type.Relation({
-    typename: 'dxos.org/relation/assistant/CompanionTo',
-    version: '0.1.0',
-    source: Chat,
-    target: Type.Expando,
-  }),
-);
-
-export interface CompanionTo extends Schema.Schema.Type<typeof CompanionTo> {}
+// Re-export Chat schema for backward compatibility.
+export const Chat = ChatModule.Chat;
+export type Chat = ChatModule.Chat;
 
 /**
  * Plugin settings.

package/src/types/capabilities.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Atom } from '@effect-atom/atom-react';
+import * as Schema from 'effect/Schema';
+
+import { Capability } from '@dxos/app-framework';
+
+import { meta } from '../meta';
+
+import { type Assistant } from './';
+
+export namespace AssistantCapabilities {
+  export const Settings = Capability.make<Atom.Writable<Assistant.Settings>>(`${meta.id}.capability.settings`);
+
+  export const StateSchema = Schema.mutable(
+    Schema.Struct({
+      /** Map of primary object dxn to current chat dxn. */
+      currentChat: Schema.Record({ key: Schema.String, value: Schema.UndefinedOr(Schema.String) }),
+      /** Map of chat object path to prompt text to auto-submit when the chat opens. */
+      pendingPrompts: Schema.Record({ key: Schema.String, value: Schema.UndefinedOr(Schema.String) }),
+    }),
+  );
+
+  export type AssistantState = Schema.Schema.Type<typeof StateSchema>;
+
+  export const State = Capability.make<Atom.Writable<AssistantState>>(`${meta.id}.capability.state`);
+}

package/src/types/events.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvent } from '@dxos/app-framework';
+
+import { meta } from '../meta';
+
+export namespace AssistantEvents {
+  export const SetupAiServiceProviders = ActivationEvent.make(`${meta.id}.event.setup-ai-service-providers`);
+}

package/src/types/index.ts

@@ -2,8 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
+// Re-export Chat type from assistant-toolkit for public API type declarations.
+export type { Chat as ChatType } from '@dxos/assistant-toolkit';
+
 export * as Assistant from './Assistant';
-export * as AssistantAction from './AssistantAction';
 
+export * from './capabilities';
 export * from './defs';
+export * from './events';
 export * from './service';