@dxos/plugin-assistant 0.8.4-main.f9ba587 → 0.8.4-main.fd6878d

package/src/functions/list.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Effect, Schema } from 'effect';
+
+import { Filter, Obj, Query } from '@dxos/echo';
+import { DatabaseService, defineFunction } from '@dxos/functions';
+import { trim } from '@dxos/util';
+
+// TODO(burdon): Factor out to space plugin.
+export default defineFunction({
+  name: 'dxos.org/function/assistant/list',
+  description:
+    // TODO(wittjosiah): Find a better way to prompt for looking up typenames before querying with them.
+    trim`
+      Lists the objects of the given type.
+      Check the list-schemas tool for available types before calling this function.
+    `,
+  inputSchema: Schema.Struct({
+    typename: Schema.String.annotations({
+      description: 'The typename of the objects to list.',
+    }),
+  }),
+  outputSchema: Schema.Struct({
+    results: Schema.Array(
+      Schema.Struct({
+        dxn: Schema.String.annotations({ description: 'The DXN of the object.' }),
+        label: Schema.optional(Schema.String.annotations({ description: 'The label of the object.' })),
+      }),
+    ),
+  }),
+  handler: Effect.fn(function* ({ data: { typename } }) {
+    const { objects } = yield* DatabaseService.runQuery(Query.select(Filter.typename(typename)));
+    const results = objects.map((object) => ({
+      dxn: Obj.getDXN(object).toString(),
+      label: Obj.getLabel(object),
+    }));
+
+    return { results };
+  }),
+});

package/src/functions/load.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Effect, Option, Schema, pipe } from 'effect';
+
+import { ArtifactId } from '@dxos/assistant';
+import { Obj } from '@dxos/echo';
+import { DatabaseService, defineFunction } from '@dxos/functions';
+import { log } from '@dxos/log';
+
+// TODO(burdon): Common error handling.
+// TODO(burdon): Factor out to space plugin.
+export default defineFunction({
+  name: 'dxos.org/function/assistant/load',
+  description: 'Loads the object.',
+  inputSchema: Schema.Struct({
+    id: ArtifactId.annotations({
+      description: 'The ID of the object.',
+    }),
+    typename: Schema.String.annotations({
+      description: 'The typename of the object.',
+    }),
+  }),
+  outputSchema: Schema.Struct({
+    // TODO(wittjosiah): Type.Obj.Any | Type.Relation.Any
+    object: Schema.Any,
+  }),
+  handler: Effect.fn(function* ({ data: { id, typename } }) {
+    const object = yield* DatabaseService.resolve(ArtifactId.toDXN(id));
+    return yield* pipe(
+      Option.fromNullable(object),
+      Option.flatMap((object) => (Obj.getTypename(object) === typename ? Option.some(object) : Option.none())),
+      Option.match({
+        onNone: () => Effect.fail('Object not found.'),
+        onSome: (object) => {
+          log.info('object', { object });
+          return Effect.succeed({ object });
+        },
+      }),
+    );
+  }),
+});

package/src/hooks/chat-processor.ts

@@ -2,30 +2,30 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Signal, batch, computed, signal } from '@preact/signals-core';
+import { Registry, Result, Rx } from '@effect-rx/rx-react';
+import { Effect, type Layer, Option, Stream, pipe } from 'effect';
 
-import {
-  DEFAULT_EDGE_MODEL,
-  type ExecutableTool,
-  type GenerateRequest,
-  type Message,
-  type MessageContentBlock,
-  type ToolUseContentBlock,
-} from '@dxos/ai';
+import { AiService, DEFAULT_EDGE_MODEL, type ModelName, type ModelRegistry } from '@dxos/ai';
 import { type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { type ArtifactDefinition } from '@dxos/artifact';
 import {
-  type AISession,
-  type ArtifactDiffResolver,
-  type BlueprintRegistry,
-  type ContextBinder,
-  type Conversation,
+  type AiConversation,
+  type AiConversationRunParams,
+  AiSession,
+  ArtifactDiffResolver,
+  createSystemPrompt,
 } from '@dxos/assistant';
+import { type Blueprint } from '@dxos/blueprints';
 import { Context } from '@dxos/context';
+import { Obj } from '@dxos/echo';
+import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
 import { Filter, type Space, getVersion } from '@dxos/react-client/echo';
+import { type ContentBlock, DataType } from '@dxos/schema';
+
+import { AiServiceOverloadedError } from './errors';
+import { type AiChatServices } from './useChatServices';
 
-// TODO(burdon): Factor out.
+// TODO(burdon): Is this still used?
 declare global {
   interface ToolContextExtensions {
     space?: Space;
@@ -33,21 +33,20 @@ declare global {
   }
 }
 
-type RequestOptions = {
+export type AiRequestOptions = {
   // Empty for now.
 };
 
-export type ChatProcessorOptions = {
-  // TODO(burdon): Change to AiToolkit.
-  tools?: readonly ExecutableTool[];
-  artifacts?: readonly ArtifactDefinition[];
+export type AiChatProcessorOptions = {
+  model?: ModelName;
+  modelRegistry?: ModelRegistry;
+  blueprintRegistry?: Blueprint.Registry;
+  observableRegistry?: Registry.Registry;
   extensions?: ToolContextExtensions;
-  blueprintRegistry?: BlueprintRegistry;
-} & Pick<GenerateRequest, 'model' | 'systemPrompt'>;
+} & Pick<AiConversationRunParams<any>, 'system'>;
 
-const defaultOptions: ChatProcessorOptions = {
+const defaultOptions: Partial<AiChatProcessorOptions> = {
   model: DEFAULT_EDGE_MODEL,
-  systemPrompt: 'you are a helpful assistant',
 };
 
 /**
@@ -56,226 +55,206 @@ const defaultOptions: ChatProcessorOptions = {
  * Executes tools based on AI responses.
  * Supports cancellation of in-progress requests.
  */
-// TODO(burdon): Rename ChatContext?
-export class ChatProcessor {
+export class AiChatProcessor {
   /**
-   * Pending messages (incl. the current user request).
-   * @reactive
+   * Last error.
    */
-  private readonly _pending: Signal<Message[]> = signal([]);
+  // TODO(wittjosiah): Error should come from the message stream.
+  readonly error = Rx.make<Option.Option<Error>>(Option.none());
+
+  /** Rx registry. */
+  private readonly _observableRegistry: Registry.Registry;
+
+  /** Current session. */
+  private readonly _session = Rx.make<Option.Option<AiSession>>(Option.none());
 
   /**
-   * Current streaming block (from the AI service).
-   * @reactive
+   * Current streaming message (from the AI service).
    */
-  private readonly _block: Signal<MessageContentBlock | undefined> = signal(undefined);
+  private readonly _streaming: Rx.Rx<Result.Result<Option.Option<DataType.Message>, Error>> = Rx.make((get) => {
+    return pipe(
+      get(this._session),
+      Option.map((session) => Stream.fromQueue(session.blockQueue)),
+      Option.getOrElse(() => Stream.make()),
+      Stream.scan<Option.Option<DataType.Message>, Option.Option<ContentBlock.Any>>(Option.none(), (acc, blockOption) =>
+        Option.flatMap(blockOption, (block) =>
+          acc.pipe(
+            Option.match({
+              onNone: () => [block],
+              onSome: (message) => [...message.blocks.filter((b) => !b.pending), block],
+            }),
+            Option.some,
+            Option.map((blocks) =>
+              Obj.make(DataType.Message, {
+                created: new Date().toISOString(),
+                sender: { role: 'assistant' },
+                blocks,
+              }),
+            ),
+          ),
+        ),
+      ),
+    );
+  });
 
   /**
    * Streaming state.
-   * @reactive
    */
-  public readonly streaming: Signal<boolean> = computed(() => this._block.value !== undefined);
+  readonly streaming: Rx.Rx<boolean> = Rx.make((get) => {
+    return pipe(
+      get(this._streaming),
+      Result.map((streaming) => Option.isSome(streaming)),
+      Result.getOrElse(() => false),
+    );
+  });
 
   /**
-   * Last error.
-   * @reactive
+   * Pending messages (incl. the current user request).
    */
-  public readonly error: Signal<Error | undefined> = signal(undefined);
+  private readonly _pending: Rx.Rx<Result.Result<DataType.Message[], Error>> = Rx.make((get) => {
+    // TODO(wittjosiah): For some reason using Option.map here loses reactivity.
+    const session = get(this._session);
+    return Option.isSome(session)
+      ? pipe(
+          session.value.messageQueue,
+          Stream.fromQueue,
+          Stream.scan<DataType.Message[], DataType.Message>([], (acc, message) => [...acc, message]),
+        )
+      : Stream.make();
+  });
 
   /**
    * Array of Messages (incl. the current message being streamed).
-   * @reactive
    */
-  public readonly messages: Signal<Message[]> = computed(() => {
-    const messages = [...this._pending.value];
-    if (this._block.value && messages.length) {
-      const { content, ...rest } = messages.pop()!;
-      const message = { ...rest, content: [...content, this._block.value] };
-      messages.push(message);
-    }
-
-    return messages;
+  readonly messages: Rx.Rx<Result.Result<DataType.Message[], Error>> = Rx.make((get) => {
+    const streaming = get(this._streaming);
+    return Result.map(get(this._pending), (pending) =>
+      Result.match(streaming, {
+        onInitial: () => pending,
+        onSuccess: (streaming) =>
+          Option.match(streaming.value, {
+            onNone: () => pending,
+            onSome: (message) => [...pending, message],
+          }),
+        onFailure: () => pending,
+      }),
+    );
   });
 
-  // TODO(burdon): Replace with Toolkit.
-  private _tools?: ExecutableTool[];
-
-  /** Current session. */
-  private _session: AISession | undefined = undefined;
-
   constructor(
-    private readonly _conversation: Conversation,
-    private readonly _options: ChatProcessorOptions = defaultOptions,
+    // TODO(dmaretskyi): Replace this with effect's ManagedRuntime wrapping this layer.
+    private readonly _services: Layer.Layer<AiChatServices>,
+    private readonly _conversation: AiConversation,
+    private readonly _options: AiChatProcessorOptions = defaultOptions,
   ) {
-    this._tools = [...(_options.tools ?? [])];
+    // Initialize registries and defaults before using in other logic.
+    this._observableRegistry = this._options.observableRegistry ?? Registry.make();
+    if (this._options.model && !this._options.system) {
+      const capabilities = this._options.modelRegistry?.getCapabilities(this._options.model) ?? {};
+      this._options.system = createSystemPrompt(capabilities);
+    }
   }
 
-  get conversation() {
-    return this._conversation;
+  get context() {
+    return this._conversation.context;
   }
 
-  get context(): ContextBinder {
-    return this._conversation.context;
+  get conversation() {
+    return this._conversation;
   }
 
   get blueprintRegistry() {
     return this._options.blueprintRegistry;
   }
 
-  get tools() {
-    return this._tools;
-  }
-
-  /**
-   * @deprecated Replace with blueprints
-   */
-  setTools(tools: ExecutableTool[]): void {
-    this._tools = tools;
-  }
-
   /**
    * Make GPT request.
    */
-  async request(message: string, options: RequestOptions = {}): Promise<Message[]> {
+  async request(message: string, _options: AiRequestOptions = {}): Promise<void> {
     await using ctx = Context.default(); // Auto-disposed at the end of this block.
 
-    this._conversation.onBegin.on(ctx, (session) => {
-      log.info('onBegin', { session, isDisposed: ctx.disposed });
-
-      this._session = session;
-      ctx.onDispose(() => {
-        log.info('onDispose', { session, isDisposed: ctx.disposed });
-        if (this._session === session) {
-          this._session = undefined;
-        }
-      });
-
-      // Message complete.
-      session.message.on((message) => {
-        batch(() => {
-          this._pending.value = [...this._pending.value, message];
-          this._block.value = undefined;
-        });
-      });
-
-      // Streaming update (happens before message complete).
-      session.update.on((block) => {
-        batch(() => {
-          this._block.value = block;
-        });
-      });
-
-      session.userMessage.on((message) => {
-        log.info('userMessage', { message });
-        this._pending.value = [...this._pending.value, message];
-      });
-
-      session.toolStatusReport.on(({ message, status }) => {
-        const msg = this._pending.peek().find((m) => m.id === message.id);
-        const toolUse = msg?.content.find((block) => block.type === 'tool_use');
-        if (!toolUse) {
-          return;
-        }
-
-        const block = msg?.content.find(
-          (block): block is ToolUseContentBlock => block.type === 'tool_use' && block.id === toolUse.id,
-        );
-        if (block) {
-          this._pending.value = this._pending.value.map((m) => {
-            if (m.id === message.id) {
-              return {
-                ...m,
-                content: m.content.map((block) =>
-                  block.type === 'tool_use' && block.id === toolUse.id ? { ...block, currentStatus: status } : block,
-                ),
-              };
-            }
+    const session = new AiSession();
+    this._observableRegistry.set(this._session, Option.some(session));
 
-            return m;
-          });
-        } else {
-          log.warn('no block for status report');
-        }
+    ctx.onDispose(() => {
+      log.info('onDispose', { session, isDisposed: ctx.disposed });
+      Option.match(this._observableRegistry.get(this._session), {
+        onSome: (s) => {
+          if (s === session) {
+            this._observableRegistry.set(this._session, Option.none());
+          }
+        },
+        onNone: () => {},
       });
     });
 
     try {
-      const messages = await this._conversation.run({
-        artifacts: [...(this._options.artifacts ?? [])],
-        requiredArtifactIds: this._options.artifacts?.map((artifact) => artifact.id) ?? [],
-
-        // TODO(dmaretskyi): Migrate to Effect's AiToolkit.
-        tools: this._tools ?? [],
-        systemPrompt: this._options.systemPrompt,
-        prompt: message,
-        extensions: this._options.extensions,
-        artifactDiffResolver: this._artifactDiffResolver,
-        generationOptions: {
-          model: this._options.model,
-        },
-      });
+      const messages = await runAndForwardErrors(
+        this._conversation
+          .run({
+            session,
+            prompt: message,
+            system: this._options.system,
+          })
+          .pipe(
+            Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
+            // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
+            Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
+            Effect.provide(this._services),
+            Effect.tapErrorCause((cause) => {
+              log.error('error', { cause });
+              return Effect.void;
+            }),
+          ),
+      );
 
       log('completed', { messages });
     } catch (err) {
       log.catch(err);
       if (err instanceof Error && err.message.includes('Overloaded')) {
-        this.error.value = new AiServiceOverloadedError('AI service overloaded', { cause: err });
+        this._observableRegistry.set(
+          this.error,
+          Option.some(new AiServiceOverloadedError('AI service overloaded', { cause: err })),
+        );
       } else {
-        this.error.value = new Error('AI service error', { cause: err });
+        this._observableRegistry.set(this.error, Option.some(new Error('AI service error', { cause: err })));
       }
     }
-
-    return this._reset();
   }
 
   /**
    * Cancel pending requests.
-   * @returns Pending requests (incl. the request message).
    */
-  async cancel(): Promise<Message[]> {
+  async cancel(): Promise<void> {
     log.info('cancelling...');
 
-    // TODO(dmaretskyi): Conversation should handle aborting.
-    this._session?.abort();
-    return this._reset();
-  }
-
-  private async _reset(): Promise<Message[]> {
-    const messages = this._pending.value;
-    batch(() => {
-      this._pending.value = [];
-      this._block.value = undefined;
-    });
-
-    return messages;
+    // TODO(dmaretskyi): Abort using Fiber.interrupt.
   }
 
-  private _artifactDiffResolver: ArtifactDiffResolver = async (artifacts) => {
-    const space = this._options.extensions?.space;
-    if (!space) {
-      return new Map();
-    }
+  private _artifactDiffResolver: ArtifactDiffResolver.Service = {
+    resolve: async (artifacts) => {
+      const space = this._options.extensions?.space;
+      if (!space) {
+        return new Map();
+      }
 
-    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;
+      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;
+    },
   };
 }
-
-// TODO(wittjosiah): Move to ai-service-client.
-export class AiServiceOverloadedError extends Error {
-  code = 'AI_SERVICE_OVERLOADED';
-}

package/src/hooks/errors.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// TODO(wittjosiah): Move to ai-service-client.
+export class AiServiceOverloadedError extends Error {
+  code = 'AI_SERVICE_OVERLOADED';
+}

package/src/hooks/index.ts

@@ -3,9 +3,13 @@
 //
 
 export * from './chat-processor';
+export * from './errors';
+export * from './presets';
 
-export * from './useBlueprints';
+export * from './useBlueprintRegistry';
 export * from './useChatProcessor';
-export * from './useContextProvider';
-export * from './useServiceContainer';
-export * from './useTextInputEvents';
+export * from './useChatServices';
+export * from './useOnline';
+export * from './usePresets';
+export * from './useReferencesProvider';
+export * from './useResolveRef';

package/src/hooks/presets.ts

@@ -0,0 +1,53 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Schema } from 'effect';
+
+import { type ModelName } from '@dxos/ai';
+
+const ModelProviders = ['dxos-local', 'dxos-remote', 'lm-studio'] as const;
+
+const ModelProvider = Schema.Literal(...ModelProviders);
+type ModelProvider = Schema.Schema.Type<typeof ModelProvider>;
+
+export type AiServicePreset = {
+  id: string;
+  provider: ModelProvider;
+  model: ModelName;
+  label?: string;
+};
+
+const createModelLabel = (model: ModelName) => {
+  const parts = model.split('/');
+  return parts[parts.length - 1];
+};
+
+// TODO(burdon): Users should be able to create and edit presets.
+export const AiServicePresets: AiServicePreset[] = [
+  {
+    provider: 'dxos-remote' as const,
+    model: '@anthropic/claude-opus-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,
+  },
+  {
+    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) =>
+    ({
+      id: `preset-${i}`,
+      provider,
+      model,
+      label: createModelLabel(model),
+    }) satisfies AiServicePreset,
+);