@dxos/plugin-assistant 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

package/src/functions/load.ts

@@ -2,7 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Option, Schema, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
 
 import { ArtifactId } from '@dxos/assistant';
 import { Obj } from '@dxos/echo';
@@ -11,7 +14,8 @@ import { DatabaseService, defineFunction } from '@dxos/functions';
 // TODO(burdon): Common error handling.
 // TODO(burdon): Factor out to space plugin.
 export default defineFunction({
-  name: 'dxos.org/function/assistant/load',
+  key: 'dxos.org/function/assistant/load',
+  name: 'Assistant load',
   description: 'Loads the object.',
   inputSchema: Schema.Struct({
     id: ArtifactId.annotations({
@@ -27,7 +31,7 @@ export default defineFunction({
   }),
   handler: Effect.fn(function* ({ data: { id, typename } }) {
     const object = yield* DatabaseService.resolve(ArtifactId.toDXN(id));
-    return yield* pipe(
+    return yield* Function.pipe(
       Option.fromNullable(object),
       Option.flatMap((object) => (Obj.getTypename(object) === typename ? Option.some(object) : Option.none())),
       Option.match({

package/src/hooks/index.ts

@@ -7,10 +7,8 @@ export * from './useChatProcessor';
 export * from './useChatServices';
 export * from './useContextBinder';
 export * from './useContextObjects';
-export * from './useExecutionGraph';
 export * from './useFlush';
 export * from './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';
-export * from './useComputeRuntimeCallback';

package/src/hooks/useBlueprintRegistry.ts

@@ -10,7 +10,8 @@ import { type AiContextBinder } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj, Ref } from '@dxos/echo';
-import { isNonNullable } from '@dxos/util';
+import { useQuery } from '@dxos/react-client/echo';
+import { distinctBy, isNonNullable } from '@dxos/util';
 
 /**
  * Provide a registry of blueprints from plugins.
@@ -21,8 +22,21 @@ export const useBlueprintRegistry = () => {
   return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
 };
 
-export const useBlueprints = ({ blueprintRegistry }: { blueprintRegistry?: Blueprint.Registry }) =>
-  useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+export const useBlueprints = ({
+  blueprintRegistry,
+  space,
+}: {
+  blueprintRegistry?: Blueprint.Registry;
+  space?: Space;
+}) => {
+  const staticBlueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+  const spaceBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+  return useMemo(() => {
+    const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => b.key);
+    blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
+    return blueprints;
+  }, [staticBlueprints, spaceBlueprints]);
+};
 
 /**
  * Create reactive map of active blueprints (by key).

package/src/hooks/useChatProcessor.ts

@@ -3,13 +3,14 @@
 //
 
 import { RegistryContext } from '@effect-rx/rx-react';
-import { type Runtime } from 'effect';
-import { useContext, useMemo } from '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 { useAsyncEffect } from '@dxos/react-ui';
 
 import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
 import { type Assistant } from '../types';
@@ -35,12 +36,19 @@ export const useChatProcessor = ({
   const observableRegistry = useContext(RegistryContext);
 
   // Create conversation from chat queue.
-  const conversation = useMemo(() => {
+  const [conversation, setConversation] = useState<AiConversation>();
+  useAsyncEffect(async () => {
     if (!chat?.queue.target) {
       return;
     }
 
-    return new AiConversation({ queue: chat.queue.target as Queue<any> });
+    const conversation = new AiConversation(chat.queue.target as Queue<any>);
+    await conversation.open();
+    setConversation(conversation);
+
+    return () => {
+      void conversation.close();
+    };
   }, [chat?.queue.target]);
 
   // Create processor.

package/src/hooks/useChatServices.ts

@@ -2,15 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, type Runtime } from 'effect';
+import * as Effect from 'effect/Effect';
+import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
 import { useCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
 import { TracingService } from '@dxos/functions';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
-import { AssistantCapabilities } from '../capabilities';
 import { type AiChatServices } from '../processor';
 import { type Assistant } from '../types';
 
@@ -25,12 +26,12 @@ export type UseChatServicesProps = {
 // TODO(dmaretskyi): Better return type.
 export const useChatServices = ({
   space,
-  chat,
+  chat, // TODO(burdon): Pass in queue directly.
 }: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
   const client = useClient();
   space ??= client.spaces.default;
 
-  const computeRuntimeResolver = useCapability(AssistantCapabilities.ComputeRuntime);
+  const computeRuntimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
 
   return useMemo(() => {
     const runtime = computeRuntimeResolver.getRuntime(space.id);

package/src/hooks/useContextBinder.ts

@@ -2,17 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useMemo } from 'react';
+import { useState } from 'react';
 
 import { AiContextBinder } from '@dxos/assistant';
+import { useAsyncEffect } from '@dxos/react-ui';
 
 import { type Assistant } from '../types';
 
 export const useContextBinder = (chat: Assistant.Chat | undefined): AiContextBinder | undefined => {
-  const binder = useMemo(() => {
-    const queue = chat?.queue.target;
-    return queue && new AiContextBinder(queue);
-  }, [chat]);
+  const [binder, setBinder] = useState<AiContextBinder>();
+
+  useAsyncEffect(async () => {
+    if (!chat?.queue.target) {
+      return;
+    }
+
+    const binder = new AiContextBinder(chat.queue.target);
+    await binder.open();
+    setBinder(binder);
+
+    return () => {
+      void binder.close();
+    };
+  }, [chat?.queue.target]);
 
   return binder;
 };

package/src/hooks/useItemTypes.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Option } from 'effect';
+import * as Option from 'effect/Option';
 import { useEffect, useState } from 'react';
 
 import { type Type } from '@dxos/echo';

package/src/index.ts

@@ -5,7 +5,9 @@
 export * from './capabilities';
 export * from './components';
 export * from './events';
+export * from './hooks';
 export * from './meta';
+export * from './translations';
 export * from './types';
 
 export * from './AssistantPlugin';

package/src/meta.ts

@@ -4,15 +4,13 @@
 
 import { type PluginMeta } from '@dxos/app-framework';
 
-export const ASSISTANT_PLUGIN = 'dxos.org/plugin/assistant';
-
-export const ASSISTANT_DIALOG = `${ASSISTANT_PLUGIN}/assistant/dialog`;
-
 export const meta: PluginMeta = {
-  id: ASSISTANT_PLUGIN,
+  id: 'dxos.org/plugin/assistant',
   name: 'Assistant',
   description: 'The Assistant plugin allows you to chat with your spaces inside of Composer.',
   icon: 'ph--atom--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-assistant',
   tags: ['labs'],
 };
+
+export const ASSISTANT_DIALOG = `${meta.id}/assistant/dialog`;

package/src/processor/index.ts

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

package/src/processor/presets.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { type ModelName } from '@dxos/ai';
 

package/src/processor/processor.test.ts

@@ -2,20 +2,22 @@
 // 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 { TestHelpers, acquireReleaseResource } from '@dxos/effect';
 import {
   ComputeEventLogger,
   CredentialsService,
-  LocalFunctionExecutionService,
+  FunctionInvocationService,
   QueueService,
-  RemoteFunctionExecutionService,
   TracingService,
 } from '@dxos/functions';
 import { TestDatabaseLayer } from '@dxos/functions/testing';
@@ -23,8 +25,8 @@ import { type DataType } from '@dxos/schema';
 
 import { AiChatProcessor, type AiChatServices } from './processor';
 
-class TestToolkit extends AiToolkit.make(
-  AiTool.make('random', {
+class TestToolkit extends Toolkit.make(
+  Tool.make('random', {
     description: 'Random number generator',
     parameters: {},
     success: Schema.Number,
@@ -32,7 +34,7 @@ class TestToolkit extends AiToolkit.make(
 ) {}
 
 // 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,27 +45,29 @@ const TestServicesLayer = Layer.mergeAll(
     // types: [],
   }),
   // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  LocalFunctionExecutionService.layer,
-  RemoteFunctionExecutionService.mockLayer,
+  FunctionInvocationService.layerTestMocked({ functions: [] }).pipe(
+    Layer.provideMerge(ComputeEventLogger.layerFromTracing),
+    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 = yield* Effect.runtime<AiChatServices>();
         const queue = yield* QueueService.createQueue<DataType.Message>();
-        const conversation = new AiConversation({ queue });
+        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

@@ -3,7 +3,12 @@
 //
 
 import { Registry, Rx } from '@effect-rx/rx-react';
-import { Cause, Effect, Exit, Fiber, Option, Runtime } from 'effect';
+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 Assistant } from '../types';
 
+import { updateName } from './update-name';
+
 export type AiChatServices =
   | CredentialsService
   | DatabaseService
   | QueueService
-  | RemoteFunctionExecutionService
+  | FunctionInvocationService
   | AiService.AiService
   | ToolExecutionService
   | ToolResolverService
@@ -166,10 +171,6 @@ export class AiChatProcessor {
         Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
 
         Effect.asVoid,
-        Effect.tapErrorCause((cause) => {
-          log.error('request failed', { cause });
-          return Effect.void;
-        }),
         Runtime.runFork(runtime), // Runs in the background.
       );
 
@@ -182,9 +183,9 @@ export class AiChatProcessor {
       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 })));
+    } catch (error) {
+      log.error('request failed', { error });
+      this._rx.set(this.error, Option.some(new Error('AI service error', { cause: error })));
     } finally {
       this._fiber = undefined;
       this._rx.set(this.active, false);
@@ -221,33 +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.

package/src/processor/update-name.ts

@@ -0,0 +1,57 @@
+//
+// 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,
+  // TODO(burdon): Use simpler model.
+  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/testing/index.ts

@@ -2,8 +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';

package/src/testing/test-generator.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 
 import { Obj } from '@dxos/echo';
 import { ContextQueueService, DatabaseService } from '@dxos/functions';
@@ -188,6 +188,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
             toolCallId: '1234',
             name: 'search',
             input: JSON.stringify({}),
+            providerExecuted: false,
           },
         ]),
         createMessage('user', [
@@ -196,6 +197,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
             toolCallId: '1234',
             name: 'search',
             result: 'This is a tool result.',
+            providerExecuted: false,
           },
         ]),
       ]),
@@ -218,6 +220,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
             toolCallId: '4567',
             name: 'create',
             input: JSON.stringify({}),
+            providerExecuted: false,
           },
         ]),
         createMessage('user', [
@@ -226,6 +229,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
             toolCallId: '4567',
             name: 'create',
             result: 'This is a tool result.',
+            providerExecuted: false,
           },
         ]),
         createMessage('assistant', [

package/src/testing/test-services.ts

@@ -4,16 +4,10 @@
 
 import { Obj } from '@dxos/echo';
 
-import {
-  type ApiAuthorization,
-  type BaseServiceRegistry,
-  type ServiceQuery,
-  ServiceType,
-  categoryIcons,
-} from '../types';
+import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '../types';
 
 export class MockServiceRegistry implements BaseServiceRegistry {
-  async queryServices(query?: ServiceQuery): Promise<ServiceType[]> {
+  async queryServices(): Promise<ServiceType[]> {
     return TEST_SERVICES;
   }
 }

package/src/translations.ts

@@ -81,6 +81,7 @@ export const translations = [
         'button run': 'Run',
         'button new thread': 'New Chat',
         'chat history label': 'Chat History',
+        'chat update name label': 'Update AI Chat name',
 
         'toolkit label': 'Toolkit',
         'summary label': 'Summary',

package/src/types/Assistant.ts

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { Queue } from '@dxos/client/echo';
-import { Type } from '@dxos/echo';
-import { LabelAnnotation } from '@dxos/echo-schema';
+import { Obj, Ref, Type } from '@dxos/echo';
+import { LabelAnnotation } from '@dxos/echo/internal';
+import { Queue } from '@dxos/echo-db';
 
 import { LLM_PROVIDERS } from './defs';
 
@@ -29,6 +29,9 @@ export const Chat = Schema.Struct({
 
 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).
  */

package/src/types/AssistantAction.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { Blueprint } from '@dxos/blueprints';
 import { EchoObjectSchema, SpaceSchema } from '@dxos/client/echo';
@@ -13,7 +13,8 @@ import { meta } from '../meta';
 
 import { Chat } from './Assistant';
 
-export class OnSpaceCreated extends Schema.TaggedClass<OnSpaceCreated>()(`${meta.id}/on-space-created`, {
+// TODO(burdon): Name?
+export class onCreateSpace extends Schema.TaggedClass<onCreateSpace>()(`${meta.id}/on-space-created`, {
   input: Schema.Struct({
     space: SpaceSchema,
     rootCollection: DataType.Collection,
@@ -31,6 +32,13 @@ export class CreateChat extends Schema.TaggedClass<CreateChat>()(`${meta.id}/act
   }),
 }) {}
 
+export class UpdateChatName extends Schema.TaggedClass<UpdateChatName>()(`${meta.id}/action/update-name`, {
+  input: Schema.Struct({
+    chat: Chat,
+  }),
+  output: Schema.Void,
+}) {}
+
 export const BlueprintForm = Schema.Struct({
   key: Schema.String,
   name: Schema.String,