@dxos/plugin-assistant 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/src/functions/{list.ts → object-list.ts}

@@ -9,15 +9,15 @@ 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.
+// TODO(burdon): Move to toolkit (i.e., tool not function).
 export default defineFunction({
-  key: 'dxos.org/function/assistant/list',
-  name: 'Assistant list',
+  key: 'dxos.org/function/assistant/object-list',
+  name: 'List objects',
   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.
+      Check the get-schemas tool for available types before calling this function.
     `,
   inputSchema: Schema.Struct({
     typename: Schema.String.annotations({

package/src/functions/{load.ts → object-load.ts}

@@ -11,11 +11,10 @@ import { ArtifactId } from '@dxos/assistant';
 import { Obj } from '@dxos/echo';
 import { DatabaseService, defineFunction } from '@dxos/functions';
 
-// TODO(burdon): Common error handling.
-// TODO(burdon): Factor out to space plugin.
+// TODO(burdon): Move to toolkit (i.e., tool not function).
 export default defineFunction({
-  key: 'dxos.org/function/assistant/load',
-  name: 'Assistant load',
+  key: 'dxos.org/function/assistant/object-load',
+  name: 'Load object',
   description: 'Loads the object.',
   inputSchema: Schema.Struct({
     id: ArtifactId.annotations({

package/src/hooks/index.ts

@@ -5,6 +5,7 @@
 export * from './useBlueprintRegistry';
 export * from './useChatProcessor';
 export * from './useChatServices';
+export * from './useChatToolbarActions';
 export * from './useContextBinder';
 export * from './useContextObjects';
 export * from './useFlush';

package/src/hooks/useBlueprintRegistry.ts

@@ -5,7 +5,8 @@
 import { useSignalEffect } from '@preact/signals-react';
 import { useCallback, useMemo, useState } from 'react';
 
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapabilities } from '@dxos/app-framework/react';
 import { type AiContextBinder } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
 import { type Space } from '@dxos/client/echo';

package/src/hooks/useChatProcessor.ts

@@ -2,20 +2,21 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-rx/rx-react';
+import { RegistryContext } from '@effect-atom/atom-react';
 import type * as Runtime from 'effect/Runtime';
 import { useContext, useMemo, useState } from 'react';
 
 import { AiConversation } from '@dxos/assistant';
 import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
-import { type Queue } from '@dxos/react-client/echo';
+import { type Queue, type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
 import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
 import { type Assistant } from '../types';
 
 export type UseChatProcessorProps = {
+  space?: Space;
   chat?: Assistant.Chat;
   preset?: AiServicePreset;
   services?: () => Promise<Runtime.Runtime<AiChatServices>>;
@@ -27,6 +28,7 @@ export type UseChatProcessorProps = {
  * Configure and create AiChatProcessor.
  */
 export const useChatProcessor = ({
+  space,
   chat,
   preset,
   services,
@@ -38,18 +40,21 @@ export const useChatProcessor = ({
   // Create conversation from chat queue.
   const [conversation, setConversation] = useState<AiConversation>();
   useAsyncEffect(async () => {
-    if (!chat?.queue.target) {
+    if (!space || !chat) {
       return;
     }
 
-    const conversation = new AiConversation({ queue: chat.queue.target as Queue<any> });
+    // NOTE: Passing in space and getting queue from space rather than resolving the reference.
+    //  This is because if the chat isn't in a space yet, the reference will not be resolvable.
+    const queue = space.queues.get(chat.queue.dxn);
+    const conversation = new AiConversation(queue as Queue<any>);
     await conversation.open();
     setConversation(conversation);
-
     return () => {
       void conversation.close();
+      setConversation(undefined);
     };
-  }, [chat?.queue.target]);
+  }, [space, chat?.queue.dxn.toString()]);
 
   // Create processor.
   const processor = useMemo(() => {
@@ -57,12 +62,7 @@ export const useChatProcessor = ({
       return undefined;
     }
 
-    log('creating processor', {
-      preset,
-      model: preset?.model,
-      settings,
-    });
-
+    log('creating processor', { preset, model: preset?.model, settings });
     return new AiChatProcessor(conversation, services, {
       observableRegistry,
       blueprintRegistry,

package/src/hooks/useChatServices.ts

@@ -6,9 +6,10 @@ import * as Effect from 'effect/Effect';
 import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 import { type Space } from '@dxos/client/echo';
 import { TracingService } from '@dxos/functions';
+import { TracingServiceExt } from '@dxos/functions-runtime';
 import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
@@ -31,16 +32,17 @@ export const useChatServices = ({
   const client = useClient();
   space ??= client.spaces.default;
 
-  const computeRuntimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
-
+  const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
   return useMemo(() => {
-    const runtime = computeRuntimeResolver.getRuntime(space.id);
+    const runtime = runtimeResolver.getRuntime(space.id);
     return () =>
       runtime.runPromise(
         Effect.gen(function* () {
           return yield* Effect.runtime<AiChatServices>().pipe(
             Effect.provide(
-              chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
+              chat?.traceQueue?.target
+                ? TracingServiceExt.layerQueue(chat.traceQueue?.target)
+                : TracingService.layerNoop,
             ),
           );
         }),

package/src/hooks/useChatToolbarActions.ts

@@ -0,0 +1,122 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Atom } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import { useMemo } from 'react';
+
+import { createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { useQuery } from '@dxos/react-client/echo';
+import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
+
+import { useChatContext } from '../components';
+import { meta } from '../meta';
+import { Assistant, AssistantAction } from '../types';
+
+export type ChatToolbarActionsProps = {
+  chat?: Assistant.Chat;
+  companionTo?: Obj.Any;
+};
+
+export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsProps) => {
+  const { dispatch } = useIntentDispatcher();
+  const { space } = useChatContext('useChatToolbarActions');
+  const query = companionTo
+    ? Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    : Query.select(Filter.nothing());
+
+  // TODO(wittjosiah): Query in react vs query in rx?
+  const chats = useQuery(space, query);
+
+  // Create stable reference for dependency array to avoid circular reference issues.
+  return useMenuActions(
+    useMemo(() => {
+      return Atom.make(() => {
+        const builder = MenuBuilder.make()
+          .root({
+            label: ['chat toolbar title', { ns: meta.id }],
+          })
+          .action(
+            'new',
+            {
+              label: ['new thread button', { ns: meta.id }],
+              icon: 'ph--plus--regular',
+              type: 'new',
+            },
+            () =>
+              dispatch(
+                createIntent(AssistantAction.SetCurrentChat, {
+                  companionTo,
+                  chat: undefined,
+                }),
+              ).pipe(Effect.runPromise),
+          )
+          .action(
+            'rename',
+            {
+              label: ['rename thread button', { ns: meta.id }],
+              icon: 'ph--magic-wand--regular',
+              type: 'rename',
+              disabled: !chat,
+            },
+            () =>
+              Effect.gen(function* () {
+                invariant(chat);
+                yield* dispatch(createIntent(AssistantAction.UpdateChatName, { chat }));
+              }).pipe(Effect.runPromise),
+          )
+          .action(
+            'branch',
+            {
+              label: ['button branch thread', { ns: meta.id }],
+              icon: 'ph--git-branch--regular',
+              type: 'branch',
+              disabled: true,
+            },
+            () => {},
+          );
+
+        if (chats.length > 0) {
+          builder.group(
+            'chats',
+            {
+              label: ['chat history label', { ns: meta.id }],
+              icon: 'ph--clock-counter-clockwise--regular',
+              selectCardinality: 'single',
+              variant: 'dropdownMenu',
+            },
+            (builder) => {
+              chats
+                // TODO(wittjosiah): This should be the default sort order.
+                .toSorted((a, b) => a.id.localeCompare(b.id))
+                .forEach((chat) => {
+                  builder.action(
+                    chat.id,
+                    {
+                      label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
+                    },
+                    () =>
+                      Effect.gen(function* () {
+                        invariant(companionTo);
+                        yield* dispatch(
+                          createIntent(AssistantAction.SetCurrentChat, {
+                            companionTo,
+                            chat,
+                          }),
+                        );
+                      }).pipe(Effect.runPromise),
+                  );
+                });
+            },
+          );
+        }
+
+        return builder.build();
+      });
+    }, [chats.length, space?.id, companionTo?.id, chat?.id, dispatch]),
+  );
+};

package/src/hooks/useContextBinder.ts

@@ -5,26 +5,26 @@
 import { useState } from 'react';
 
 import { AiContextBinder } from '@dxos/assistant';
+import { type Queue } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-import { type Assistant } from '../types';
-
-export const useContextBinder = (chat: Assistant.Chat | undefined): AiContextBinder | undefined => {
+// NOTE: This takes a queue rather than a chat because the chat may not be in a space yet.
+export const useContextBinder = (queue: Queue | undefined): AiContextBinder | undefined => {
   const [binder, setBinder] = useState<AiContextBinder>();
 
   useAsyncEffect(async () => {
-    if (!chat?.queue.target) {
+    if (!queue) {
       return;
     }
 
-    const binder = new AiContextBinder(chat.queue.target);
+    const binder = new AiContextBinder(queue);
     await binder.open();
     setBinder(binder);
 
     return () => {
       void binder.close();
     };
-  }, [chat?.queue.target]);
+  }, [queue]);
 
   return binder;
 };

package/src/hooks/useReferencesProvider.ts

@@ -4,7 +4,8 @@
 
 import { useMemo } from 'react';
 
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapabilities } from '@dxos/app-framework/react';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';

package/src/meta.ts

@@ -3,12 +3,17 @@
 //
 
 import { type PluginMeta } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
 export const meta: PluginMeta = {
   id: 'dxos.org/plugin/assistant',
   name: 'Assistant',
-  description: 'The Assistant plugin allows you to chat with your spaces inside of Composer.',
+  description: trim`
+    Intelligent AI assistant that can analyze and interact with objects across your spaces.
+    Chat naturally to get insights, search content, and perform actions using AI-powered context awareness.
+  `,
   icon: 'ph--atom--regular',
+  iconHue: 'sky',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-assistant',
   tags: ['labs'],
 };

package/src/processor/index.ts

@@ -4,3 +4,4 @@
 
 export * from './presets';
 export * from './processor';
+export * from './update-name';

package/src/processor/presets.ts

@@ -43,7 +43,7 @@ export const AiServicePresets: AiServicePreset[] = [
   },
   {
     provider: 'lm-studio' as const,
-    model: '@mlx-community/llama-3.2-3b-instruct' as const,
+    model: '@meta/llama-3.2-3b-instruct' as const,
   },
   {
     model: 'deepseek-r1:latest' as const,

package/src/processor/processor.test.ts

@@ -13,25 +13,19 @@ import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
 import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  FunctionInvocationService,
-  QueueService,
-  TracingService,
-} from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
-import { type DataType } from '@dxos/schema';
+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 Toolkit.make(
+const TestToolkit = Toolkit.make(
   Tool.make('random', {
     description: 'Random number generator',
     parameters: {},
     success: Schema.Number,
   }),
-) {}
+);
 
 // TODO(burdon): Create minimal toolkit.
 const toolkit = Toolkit.merge(TestToolkit) as Toolkit.Toolkit<any>;
@@ -45,10 +39,7 @@ const TestServicesLayer = Layer.mergeAll(
     // types: [],
   }),
   // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  FunctionInvocationService.layerTestMocked({ functions: [] }).pipe(
-    Layer.provideMerge(ComputeEventLogger.layerFromTracing),
-    Layer.provideMerge(TracingService.layerNoop),
-  ),
+  FunctionInvocationServiceLayerTestMocked({ functions: [] }).pipe(Layer.provideMerge(TracingService.layerNoop)),
 );
 
 const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
@@ -56,7 +47,6 @@ const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
   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.
@@ -66,8 +56,8 @@ describe('Chat processor', () => {
     Effect.fn(
       function* ({ expect }) {
         const services = yield* Effect.runtime<AiChatServices>();
-        const queue = yield* QueueService.createQueue<DataType.Message>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
+        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();

package/src/processor/processor.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
+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';
@@ -21,7 +21,6 @@ import {
 import {
   type AiConversation,
   type AiConversationRunParams,
-  AiSession,
   ArtifactDiffResolver,
   GenerationObserver,
   createSystemPrompt,
@@ -37,11 +36,12 @@ import {
   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
@@ -89,19 +89,19 @@ export class AiChatProcessor {
   private _lastRequest: AiRequest | undefined;
 
   /** Pending messages (incl. the current user request). */
-  private readonly _pending = Rx.make<DataType.Message[]>([]);
+  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());
+  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)));
+  public readonly streaming = Atom.make<boolean>((get) => Option.isSome(get(this._streaming)));
 
   /** Active state. */
-  public readonly active = Rx.make(false);
+  public readonly active = Atom.make(false);
 
   /** Array of Messages (incl. the current message being streamed). */
-  public readonly messages = Rx.make<DataType.Message[]>((get) =>
+  public readonly messages = Atom.make<Message.Message[]>((get) =>
     Option.match(get(this._streaming), {
       onNone: () => get(this._pending),
       onSome: (streaming) => [...get(this._pending), streaming],
@@ -109,7 +109,7 @@ 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,
@@ -222,32 +222,7 @@ export class AiChatProcessor {
    */
   async updateName(chat: Assistant.Chat): Promise<void> {
     const runtime = await this._services();
-    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(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-      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;
-        }
-      }),
-      Runtime.runFork(runtime), // Run in the background.
-    );
-
-    const response = await fiber.pipe(Fiber.join, Effect.runPromiseExit);
-    if (!Exit.isSuccess(response)) {
-      throwCause(response.cause);
-    }
+    await updateName(runtime, this._conversation, chat, this._options.model);
   }
 
   // TODO(burdon): Fix/factor out.
@@ -275,7 +250,7 @@ export class AiChatProcessor {
   };
 
   private _onMessage = Effect.fn(
-    function* (this: AiChatProcessor, message: DataType.Message) {
+    function* (this: AiChatProcessor, message: Message.Message) {
       this._rx.set(this._streaming, Option.none());
       this._rx.update(this._pending, (pending) => [...pending, message]);
     }.bind(this),
@@ -285,12 +260,12 @@ export class AiChatProcessor {
     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.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';