@dxos/plugin-assistant 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/src/processor/processor.test.ts

@@ -2,37 +2,33 @@
 // Copyright 2025 DXOS.org
 //
 
-import { AiTool, AiToolkit } from '@effect/ai';
+import * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
 import { describe, it } from '@effect/vitest';
-import { Effect, Layer, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { TestHelpers } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TracingService,
-} from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
-import { type DataType } from '@dxos/schema';
+import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
+import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
+import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
+import { type Message } from '@dxos/types';
 
 import { AiChatProcessor, type AiChatServices } from './processor';
 
-class TestToolkit extends AiToolkit.make(
-  AiTool.make('random', {
+const TestToolkit = Toolkit.make(
+  Tool.make('random', {
     description: 'Random number generator',
     parameters: {},
     success: Schema.Number,
   }),
-) {}
+);
 
 // TODO(burdon): Create minimal toolkit.
-const toolkit = AiToolkit.merge(TestToolkit) as AiToolkit.Any as AiToolkit.AiToolkit<AiTool.Any>;
+const toolkit = Toolkit.merge(TestToolkit) as Toolkit.Toolkit<any>;
 
 // TODO(burdon): Explain structure.
 const TestServicesLayer = Layer.mergeAll(
@@ -43,31 +39,29 @@ const TestServicesLayer = Layer.mergeAll(
     // types: [],
   }),
   // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  LocalFunctionExecutionService.layer,
-  RemoteFunctionExecutionService.mockLayer,
+  FunctionInvocationServiceLayerTestMocked({ functions: [] }).pipe(Layer.provideMerge(TracingService.layerNoop)),
 );
 
 const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
   AiService.model('@anthropic/claude-opus-4-0'),
   makeToolResolverFromFunctions([], toolkit),
-  makeToolExecutionServiceFromFunctions([], toolkit, toolkit.toLayer({}) as any),
+  makeToolExecutionServiceFromFunctions(toolkit, toolkit.toLayer({}) as any),
   CredentialsService.layerFromDatabase(),
-  ComputeEventLogger.layerFromTracing,
 ).pipe(Layer.provideMerge(TestServicesLayer), Layer.orDie);
 
 // TODO(burdon): Create actual test with mock LLM.
 describe('Chat processor', () => {
-  it.effect(
+  it.scoped(
     'basic',
     Effect.fn(
       function* ({ expect }) {
-        const services = TestLayer;
-        const queue = yield* QueueService.createQueue<DataType.Message>();
-        const conversation = new AiConversation({ queue });
-        const processor = new AiChatProcessor(conversation, services);
+        const services = yield* Effect.runtime<AiChatServices>();
+        const queue = yield* QueueService.createQueue<Message.Message>();
+        const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
+        const processor = new AiChatProcessor(conversation, async () => services);
         const result = yield* Effect.promise(() => processor.request({ message: 'Hello' }));
         void processor.cancel();
-        expect(processor.isRunning).to.be.false;
+        expect(processor.active).to.be.false;
         expect(result).to.exist;
       },
       Effect.provide(TestLayer),

package/src/processor/processor.ts

@@ -2,8 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
-import { Cause, Effect, Exit, Fiber, Layer, Option } from 'effect';
+import { Atom, Registry } from '@effect-atom/atom-react';
+import * as Cause from 'effect/Cause';
+import * as Effect from 'effect/Effect';
+import * as Exit from 'effect/Exit';
+import * as Fiber from 'effect/Fiber';
+import * as Option from 'effect/Option';
+import * as Runtime from 'effect/Runtime';
 
 import {
   AiService,
@@ -16,7 +21,6 @@ import {
 import {
   type AiConversation,
   type AiConversationRunParams,
-  AiSession,
   ArtifactDiffResolver,
   GenerationObserver,
   createSystemPrompt,
@@ -27,21 +31,22 @@ import { throwCause } from '@dxos/effect';
 import {
   type CredentialsService,
   type DatabaseService,
+  type FunctionInvocationService,
   type QueueService,
-  type RemoteFunctionExecutionService,
   type TracingService,
 } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { type ContentBlock, DataType } from '@dxos/schema';
-import { trim } from '@dxos/util';
+import { type ContentBlock, Message } from '@dxos/types';
 
 import { type Assistant } from '../types';
 
+import { updateName } from './update-name';
+
 export type AiChatServices =
   | CredentialsService
   | DatabaseService
   | QueueService
-  | RemoteFunctionExecutionService
+  | FunctionInvocationService
   | AiService.AiService
   | ToolExecutionService
   | ToolResolverService
@@ -72,7 +77,7 @@ export type AiRequest = {
  * Handles streaming responses from the conversation.
  */
 export class AiChatProcessor {
-  private readonly _rx: Registry.Registry;
+  private readonly _registry: Registry.Registry;
 
   /** External observer. */
   private readonly _observer: GenerationObserver;
@@ -83,25 +88,20 @@ export class AiChatProcessor {
   /** Last request (for retries). */
   private _lastRequest: AiRequest | undefined;
 
-  /**
-   * Pending messages (incl. the current user request).
-   */
-  private readonly _pending = Rx.make<DataType.Message[]>([]);
+  /** Pending messages (incl. the current user request). */
+  private readonly _pending = Atom.make<Message.Message[]>([]);
 
-  /**
-   * Currently streaming message (from the AI service).
-   */
-  private readonly _streaming = Rx.make<Option.Option<DataType.Message>>(Option.none());
+  /** Currently streaming message (from the AI service). */
+  private readonly _streaming = Atom.make<Option.Option<Message.Message>>(Option.none());
 
-  /**
-   * Streaming state.
-   */
-  public readonly streaming = Rx.make<boolean>((get) => Option.isSome(get(this._streaming)));
+  /** Streaming state. */
+  public readonly streaming = Atom.make<boolean>((get) => Option.isSome(get(this._streaming)));
 
-  /**
-   * Array of Messages (incl. the current message being streamed).
-   */
-  public readonly messages = Rx.make<DataType.Message[]>((get) =>
+  /** 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],
@@ -109,16 +109,16 @@ export class AiChatProcessor {
   );
 
   /** Last error. */
-  public readonly error = Rx.make<Option.Option<Error>>(Option.none());
+  public readonly error = Atom.make<Option.Option<Error>>(Option.none());
 
   constructor(
     private readonly _conversation: AiConversation,
     // TODO(dmaretskyi): Replace this with effect's ManagedRuntime wrapping this layer.
-    private readonly _services: Layer.Layer<AiChatServices>,
+    private readonly _services: () => Promise<Runtime.Runtime<AiChatServices>>,
     private readonly _options: AiChatProcessorOptions = defaultOptions,
   ) {
     // Initialize registries and defaults before using in other logic.
-    this._rx = this._options.observableRegistry ?? Registry.make();
+    this._registry = this._options.observableRegistry ?? Registry.make();
     this._observer = GenerationObserver.make({
       onBlock: this._onBlock,
       onMessage: this._onMessage,
@@ -129,10 +129,6 @@ export class AiChatProcessor {
     }
   }
 
-  get isRunning() {
-    return !!this._fiber;
-  }
-
   get context() {
     return this._conversation.context;
   }
@@ -155,7 +151,8 @@ export class AiChatProcessor {
 
     try {
       this._lastRequest = requestParam;
-      this._rx.set(this.error, Option.none());
+      this._registry.set(this.error, Option.none());
+      this._registry.set(this.active, true);
 
       // Create request.
       const request = this._conversation.createRequest({
@@ -164,19 +161,17 @@ export class AiChatProcessor {
         observer: this._observer,
       });
 
+      const runtime = await this._services();
+
       // Create fiber.
       this._fiber = request.pipe(
-        Effect.provide(Layer.provideMerge(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL), this._services)),
+        Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
 
         // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
         Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
 
         Effect.asVoid,
-        Effect.tapErrorCause((cause) => {
-          log.error('request failed', { cause });
-          return Effect.void;
-        }),
-        Effect.runFork, // Runs in the background.
+        Runtime.runFork(runtime), // Runs in the background.
       );
 
       // Execute request.
@@ -185,14 +180,15 @@ export class AiChatProcessor {
         throwCause(response.cause);
       }
 
-      this._rx.set(this.error, Option.none());
+      this._registry.set(this.error, Option.none());
       this._lastRequest = undefined;
       this._fiber = undefined;
-    } catch (err) {
-      log.error('request failed', { err });
-      this._rx.set(this.error, Option.some(new Error('AI service error', { cause: err })));
+    } catch (error) {
+      log.error('request failed', { error });
+      this._registry.set(this.error, Option.some(new Error('AI service error', { cause: error })));
     } finally {
       this._fiber = undefined;
+      this._registry.set(this.active, false);
     }
   }
 
@@ -209,6 +205,7 @@ export class AiChatProcessor {
     );
 
     this._fiber = undefined;
+    this._registry.set(this.active, false);
   }
 
   /**
@@ -224,32 +221,8 @@ export class AiChatProcessor {
    * Update the current chat's name.
    */
   async updateName(chat: Assistant.Chat): Promise<void> {
-    const system = trim`
-      It is extremely important that you respond only with the title and nothing else.
-      If you cannot do this effectively respond with "New Chat".
-    `;
-
-    const history = await this._conversation.getHistory();
-    const fiber = Effect.gen(this, function* () {
-      const session = new AiSession();
-      return yield* session.run({ system, prompt: 'Suggest a name for this chat', history });
-    }).pipe(
-      // TODO(burdon): Use simpler model.
-      Effect.provide(Layer.provideMerge(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL), this._services)),
-      Effect.tap((messages) => {
-        const message = messages.find((message) => message.sender.role === 'assistant');
-        const title = message?.blocks.find((b) => b._tag === 'text')?.text;
-        if (title) {
-          chat.name = title;
-        }
-      }),
-      Effect.runFork, // Run in the background.
-    );
-
-    const response = await fiber.pipe(Fiber.join, Effect.runPromiseExit);
-    if (!Exit.isSuccess(response)) {
-      throwCause(response.cause);
-    }
+    const runtime = await this._services();
+    await updateName(runtime, this._conversation, chat, this._options.model);
   }
 
   // TODO(burdon): Fix/factor out.
@@ -277,22 +250,22 @@ export class AiChatProcessor {
   };
 
   private _onMessage = Effect.fn(
-    function* (this: AiChatProcessor, message: DataType.Message) {
-      this._rx.set(this._streaming, Option.none());
-      this._rx.update(this._pending, (pending) => [...pending, message]);
+    function* (this: AiChatProcessor, message: Message.Message) {
+      this._registry.set(this._streaming, Option.none());
+      this._registry.update(this._pending, (pending) => [...pending, message]);
     }.bind(this),
   );
 
   private _onBlock = Effect.fn(
     function* (this: AiChatProcessor, block: ContentBlock.Any) {
-      this._rx.update(this._streaming, (streaming) => {
+      this._registry.update(this._streaming, (streaming) => {
         const blocks = streaming.pipe(
-          Option.map((streaming) => streaming.blocks.filter((b) => !b.pending)),
+          Option.map((streaming) => streaming.blocks.filter((b: ContentBlock.Any) => !b.pending)),
           Option.getOrElse(() => []),
         );
 
         return Option.some(
-          Obj.make(DataType.Message, {
+          Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: { role: 'assistant' },
             blocks: [...blocks, block],

package/src/processor/update-name.ts

@@ -0,0 +1,56 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Exit from 'effect/Exit';
+import * as Fiber from 'effect/Fiber';
+import * as Runtime from 'effect/Runtime';
+
+import { AiService, DEFAULT_EDGE_MODEL, type ModelName } from '@dxos/ai';
+import { type AiConversation, AiSession } from '@dxos/assistant';
+import { throwCause } from '@dxos/effect';
+import { trim } from '@dxos/util';
+
+import { type Assistant } from '../types';
+
+import { type AiChatServices } from './processor';
+
+/**
+ * Update the current chat's name.
+ */
+// TODO(burdon): Convert this into a plugin tool.
+export const updateName = async (
+  runtime: Runtime.Runtime<AiChatServices>,
+  conversation: AiConversation,
+  chat: Assistant.Chat,
+  model: ModelName = DEFAULT_EDGE_MODEL,
+): Promise<void> => {
+  const history = await conversation.getHistory();
+  const system = trim`
+    It is extremely important that you respond only with the title and nothing else.
+    If you cannot do this effectively respond with "New Chat".
+  `;
+  const prompt = 'Suggest a name for this chat';
+
+  const fiber = Effect.gen(this, function* () {
+    const session = new AiSession();
+    return yield* session.run({ system, prompt, history });
+  }).pipe(
+    Effect.provide(AiService.model(model)),
+    Effect.tap((messages) => {
+      // TODO(burdon): Parse response (should update via tool).
+      const message = messages.find((message) => message.sender.role === 'assistant');
+      const title = message?.blocks.find((block) => block._tag === 'text')?.text;
+      if (title) {
+        chat.name = title;
+      }
+    }),
+    Runtime.runFork(runtime), // Run in the background.
+  );
+
+  const response = await fiber.pipe(Fiber.join, Effect.runPromiseExit);
+  if (!Exit.isSuccess(response)) {
+    throwCause(response.cause);
+  }
+};

package/src/queue-logger.ts

@@ -5,14 +5,10 @@
 import { type Queue, Ref, type Space, getSpace } from '@dxos/client/echo';
 import { type Sequence, type SequenceEvent, type SequenceLogger } from '@dxos/conductor';
 import { DXN, Key, Obj } from '@dxos/echo';
-import {
-  InvocationOutcome,
-  InvocationTraceEndEvent,
-  type InvocationTraceEvent,
-  InvocationTraceEventType,
-  InvocationTraceStartEvent,
-  TraceEvent,
-} from '@dxos/functions';
+import { InvocationTraceEndEvent, InvocationTraceEventType, InvocationTraceStartEvent } from '@dxos/functions-runtime';
+import { TraceEvent } from '@dxos/functions-runtime';
+import { InvocationOutcome } from '@dxos/functions-runtime';
+import { type InvocationTraceEvent } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
 import { QueueSubspaceTags } from '@dxos/keys';
 
@@ -39,7 +35,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(InvocationTraceStartEvent, {
             type: InvocationTraceEventType.START,
             invocationId: event.invocationId,
-            timestampMs: Date.now(),
+            timestamp: Date.now(),
             input: {},
             invocationTraceQueue: Ref.fromDXN(this._getTraceQueueDxn(event.invocationId)),
             invocationTarget: Ref.make(this.sequence),
@@ -51,7 +47,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(InvocationTraceEndEvent, {
             type: InvocationTraceEventType.END,
             invocationId: event.invocationId,
-            timestampMs: Date.now(),
+            timestamp: Date.now(),
             outcome: InvocationOutcome.SUCCESS,
           }),
         ]);
@@ -65,7 +61,7 @@ export class QueueLogger implements SequenceLogger {
             ingestionTimestamp: Date.now(),
             logs: [
               {
-                timestampMs: Date.now(),
+                timestamp: Date.now(),
                 level: 'info',
                 message: event.type,
                 context: { step: event.step },
@@ -83,7 +79,7 @@ export class QueueLogger implements SequenceLogger {
             ingestionTimestamp: Date.now(),
             logs: [
               {
-                timestampMs: Date.now(),
+                timestamp: Date.now(),
                 level: 'info',
                 message: event.type,
                 context: { message: event.message },
@@ -101,7 +97,7 @@ export class QueueLogger implements SequenceLogger {
             ingestionTimestamp: Date.now(),
             logs: [
               {
-                timestampMs: Date.now(),
+                timestamp: Date.now(),
                 level: 'info',
                 message: event.type,
                 context: { block: event.block },

package/src/testing/index.ts

@@ -2,7 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './test-data';
-export * from './test-functions';
+export * from './test-generator';
 export * from './test-sequence';
 export * from './test-services';