@dxos/plugin-assistant 0.8.4-main.2e9d522 → 0.8.4-main.5ea62a8

package/src/parser/filter-generator.ts

@@ -4,14 +4,9 @@
 
 import { Filter } from '@dxos/echo';
 
-import {
-  type BinaryExpression,
-  type Expression,
-  type Identifier,
-  type Literal,
-  type RelationalOperator,
-  type UnaryExpression,
-} from './types';
+// TODO(burdon): Factor out.
+
+import { type Expression, type Identifier, type Literal, type RelationalOperator } from './types';
 
 const relationalOperators: Record<RelationalOperator, (value: any) => Filter<any>> = {
   EQ: Filter.eq,
@@ -26,7 +21,7 @@ const specialPredicates: Record<string, (value: string) => Filter<any>> = {
 export const createFilter = (ast: Expression): Filter<any> => {
   switch (ast.type) {
     case 'binary': {
-      const { operator, left, right } = ast as BinaryExpression;
+      const { operator, left, right } = ast;
 
       // Handle logical operators.
       if (operator === 'AND') {
@@ -44,7 +39,7 @@ export const createFilter = (ast: Expression): Filter<any> => {
       }
 
       // Handle relational operators
-      const filterFn = relationalOperators[operator as RelationalOperator];
+      const filterFn = relationalOperators[operator];
       if (filterFn) {
         return filterFn((right as Literal).value);
       }
@@ -53,7 +48,7 @@ export const createFilter = (ast: Expression): Filter<any> => {
     }
 
     case 'unary': {
-      const { operator, argument } = ast as UnaryExpression;
+      const { operator, argument } = ast;
       if (operator === 'NOT') {
         return Filter.not(createFilter(argument));
       }
@@ -61,12 +56,12 @@ export const createFilter = (ast: Expression): Filter<any> => {
     }
 
     case 'identifier': {
-      const { name } = ast as Identifier;
+      const { name } = ast;
       return Filter._props({ [name]: true });
     }
 
     case 'literal': {
-      const { value } = ast as Literal;
+      const { value } = ast;
       // Handle special '*' value for empty input.
       if (value === '*') {
         return Filter.everything();

package/src/parser/query-parser.ts

@@ -4,7 +4,7 @@
 
 import { invariant } from '@dxos/invariant';
 
-import { type Expression, type BinaryOperator, type RelationalOperator } from './types';
+import { type BinaryOperator, type Expression, type RelationalOperator } from './types';
 
 // TODO(burdon): Move to echo-schema?
 

package/src/parser/types.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+// TODO(burdon): Factor out.
+
 export type UnaryOperator = 'NOT';
 
 export type RelationalOperator = 'EQ' | 'LT' | 'GT';

package/src/processor/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './presets';
+export * from './processor';

package/src/{hooks → processor}/presets.ts

@@ -4,7 +4,7 @@
 
 import { Schema } from 'effect';
 
-import { type LLMModel } from '@dxos/ai';
+import { type ModelName } from '@dxos/ai';
 
 const ModelProviders = ['dxos-local', 'dxos-remote', 'lm-studio'] as const;
 
@@ -14,11 +14,11 @@ type ModelProvider = Schema.Schema.Type<typeof ModelProvider>;
 export type AiServicePreset = {
   id: string;
   provider: ModelProvider;
-  model: LLMModel;
+  model: ModelName;
   label?: string;
 };
 
-const createModelLabel = (model: LLMModel) => {
+const createModelLabel = (model: ModelName) => {
   const parts = model.split('/');
   return parts[parts.length - 1];
 };
@@ -27,20 +27,28 @@ const createModelLabel = (model: LLMModel) => {
 export const AiServicePresets: AiServicePreset[] = [
   {
     provider: 'dxos-remote' as const,
-    model: '@anthropic/claude-3-5-haiku-20241022' as const,
+    model: '@anthropic/claude-opus-4-0' as const,
   },
   {
     provider: 'dxos-remote' as const,
-    model: '@anthropic/claude-opus-4-0' as const,
+    model: '@anthropic/claude-sonnet-4-0' as const,
+  },
+  {
+    provider: 'dxos-remote' as const,
+    model: '@anthropic/claude-3-5-haiku-20241022' as const,
   },
   {
     provider: 'lm-studio' as const,
-    model: '@google/gemma-3-12b' as const,
+    model: '@google/gemma-3-27b' as const,
   },
   {
     provider: 'lm-studio' as const,
     model: '@mlx-community/llama-3.2-3b-instruct' as const,
   },
+  {
+    model: 'deepseek-r1:latest' as const,
+    provider: 'dxos-local' as const,
+  },
 ].map(
   ({ model, provider }, i) =>
     ({

package/src/processor/processor.test.ts

@@ -0,0 +1,77 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { AiTool, AiToolkit } from '@effect/ai';
+import { describe, it } from '@effect/vitest';
+import { Effect, Layer, Schema } from 'effect';
+
+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 { AiChatProcessor, type AiChatServices } from './processor';
+
+class TestToolkit extends AiToolkit.make(
+  AiTool.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>;
+
+// TODO(burdon): Explain structure.
+const TestServicesLayer = Layer.mergeAll(
+  TracingService.layerNoop,
+  AiServiceTestingPreset('direct'),
+  TestDatabaseLayer({
+    // indexing: { vector: true },
+    // types: [],
+  }),
+  // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
+  LocalFunctionExecutionService.layer,
+  RemoteFunctionExecutionService.mockLayer,
+);
+
+const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
+  AiService.model('@anthropic/claude-opus-4-0'),
+  makeToolResolverFromFunctions([], toolkit),
+  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(
+    '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 result = yield* Effect.promise(() => processor.request({ message: 'Hello' }));
+        void processor.cancel();
+        expect(processor.isRunning).to.be.false;
+        expect(result).to.exist;
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.taggedTest('llm'),
+    ),
+  );
+});

package/src/processor/processor.ts

@@ -0,0 +1,304 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Registry, Rx } from '@effect-rx/rx-react';
+import { Cause, Effect, Exit, Fiber, Layer, Option } from 'effect';
+
+import {
+  AiService,
+  DEFAULT_EDGE_MODEL,
+  type ModelName,
+  type ModelRegistry,
+  type ToolExecutionService,
+  type ToolResolverService,
+} from '@dxos/ai';
+import {
+  type AiConversation,
+  type AiConversationRunParams,
+  AiSession,
+  ArtifactDiffResolver,
+  GenerationObserver,
+  createSystemPrompt,
+} from '@dxos/assistant';
+import { type Blueprint } from '@dxos/blueprints';
+import { Obj } from '@dxos/echo';
+import { throwCause } from '@dxos/effect';
+import {
+  type CredentialsService,
+  type DatabaseService,
+  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 Assistant } from '../types';
+
+export type AiChatServices =
+  | CredentialsService
+  | DatabaseService
+  | QueueService
+  | RemoteFunctionExecutionService
+  | AiService.AiService
+  | ToolExecutionService
+  | ToolResolverService
+  | TracingService;
+
+export type AiChatProcessorOptions = {
+  model?: ModelName;
+  modelRegistry?: ModelRegistry;
+  blueprintRegistry?: Blueprint.Registry;
+  observableRegistry?: Registry.Registry;
+  extensions?: ToolContextExtensions;
+} & Pick<AiConversationRunParams, 'system'>;
+
+const defaultOptions: Partial<AiChatProcessorOptions> = {
+  model: DEFAULT_EDGE_MODEL,
+};
+
+// TODO(burdon): Retry, timeout?
+export type AiRequestOptions = {};
+
+export type AiRequest = {
+  message: string;
+  options?: AiRequestOptions;
+};
+
+/**
+ * Handles interactions with the AI service.
+ * Handles streaming responses from the conversation.
+ */
+export class AiChatProcessor {
+  private readonly _rx: Registry.Registry;
+
+  /** External observer. */
+  private readonly _observer: GenerationObserver;
+
+  /** 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 = Rx.make<DataType.Message[]>([]);
+
+  /**
+   * Currently streaming message (from the AI service).
+   */
+  private readonly _streaming = Rx.make<Option.Option<DataType.Message>>(Option.none());
+
+  /**
+   * Streaming state.
+   */
+  public readonly streaming = Rx.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) =>
+    Option.match(get(this._streaming), {
+      onNone: () => get(this._pending),
+      onSome: (streaming) => [...get(this._pending), streaming],
+    }),
+  );
+
+  /** Last error. */
+  public readonly error = Rx.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 _options: AiChatProcessorOptions = defaultOptions,
+  ) {
+    // Initialize registries and defaults before using in other logic.
+    this._rx = this._options.observableRegistry ?? Registry.make();
+    this._observer = GenerationObserver.make({
+      onBlock: this._onBlock,
+      onMessage: this._onMessage,
+    });
+    if (this._options.model && !this._options.system) {
+      const capabilities = this._options.modelRegistry?.getCapabilities(this._options.model) ?? {};
+      this._options.system = createSystemPrompt(capabilities);
+    }
+  }
+
+  get isRunning() {
+    return !!this._fiber;
+  }
+
+  get context() {
+    return this._conversation.context;
+  }
+
+  get conversation() {
+    return this._conversation;
+  }
+
+  get blueprintRegistry() {
+    return this._options.blueprintRegistry;
+  }
+
+  /**
+   * Initiates a new request.
+   */
+  async request(requestParam: AiRequest): Promise<void> {
+    if (this._fiber) {
+      await this.cancel();
+    }
+
+    try {
+      this._lastRequest = requestParam;
+      this._rx.set(this.error, Option.none());
+
+      // Create request.
+      const request = this._conversation.createRequest({
+        system: this._options.system,
+        prompt: requestParam.message,
+        observer: this._observer,
+      });
+
+      // Create fiber.
+      this._fiber = request.pipe(
+        Effect.provide(Layer.provideMerge(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL), this._services)),
+
+        // 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.
+      );
+
+      // Execute request.
+      const response = await this._fiber.pipe(Fiber.join, Effect.runPromiseExit);
+      if (!Exit.isSuccess(response) && !Cause.isInterruptedOnly(response.cause)) {
+        throwCause(response.cause);
+      }
+
+      this._rx.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 })));
+    } finally {
+      this._fiber = undefined;
+    }
+  }
+
+  /**
+   * Cancels the current request.
+   */
+  async cancel(): Promise<void> {
+    await Effect.runPromise(
+      Effect.gen(this, function* () {
+        if (this._fiber) {
+          yield* this._fiber.pipe(Fiber.interrupt);
+        }
+      }),
+    );
+
+    this._fiber = undefined;
+  }
+
+  /**
+   * Retry last failed request.
+   */
+  async retry(): Promise<void> {
+    if (this._lastRequest) {
+      return this.request(this._lastRequest);
+    }
+  }
+
+  /**
+   * 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);
+    }
+  }
+
+  // TODO(burdon): Fix/factor out.
+  private _artifactDiffResolver: ArtifactDiffResolver.Service = {
+    resolve: async (_artifacts) => {
+      const versions = new Map();
+      // await Promise.all(
+      //   artifacts.map(async (artifact) => {
+      //     const {
+      //       objects: [object],
+      //     } = await space.db.query(Filter.ids(artifact.id)).run();
+      //     if (!object) {
+      //       return;
+      //     }
+
+      //     versions.set(artifact.id, {
+      //       version: getVersion(object),
+      //       diff: `Current state: ${JSON.stringify(object)}`,
+      //     });
+      //   }),
+      // );
+
+      return versions;
+    },
+  };
+
+  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]);
+    }.bind(this),
+  );
+
+  private _onBlock = Effect.fn(
+    function* (this: AiChatProcessor, block: ContentBlock.Any) {
+      this._rx.update(this._streaming, (streaming) => {
+        const blocks = streaming.pipe(
+          Option.map((streaming) => streaming.blocks.filter((b) => !b.pending)),
+          Option.getOrElse(() => []),
+        );
+
+        return Option.some(
+          Obj.make(DataType.Message, {
+            created: new Date().toISOString(),
+            sender: { role: 'assistant' },
+            blocks: [...blocks, block],
+          }),
+        );
+      });
+    }.bind(this),
+  );
+}

package/src/queue-logger.ts

@@ -2,16 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { getSpace, Ref, type Queue, type Space } from '@dxos/client/echo';
+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,
-  type InvocationTraceEvent,
 } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { QueueSubspaceTags } from '@dxos/keys';
@@ -62,7 +62,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),
@@ -80,7 +80,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),
@@ -98,7 +98,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),