@dxos/plugin-assistant 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

package/src/components/Toolbox/Toolbox.stories.tsx

@@ -2,34 +2,33 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities } from '@dxos/assistant-testing';
+import { capabilities } from '@dxos/assistant-toolkit';
 import { ChessPlugin } from '@dxos/plugin-chess';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { MapPlugin } from '@dxos/plugin-map';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../../translations';
 
 import { Toolbox, type ToolboxProps } from './Toolbox';
 
 const DefaultStory = (props: ToolboxProps) => {
-  return <Toolbox {...props} classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1' />;
+  return <Toolbox {...props} classNames='is-[30rem] bs-[15rem] rounded-sm border border-separator plb-1' />;
 };
 
-const meta: Meta<typeof Toolbox> = {
+const meta = {
   title: 'plugins/plugin-assistant/Toolbox',
-  component: Toolbox,
+  component: Toolbox as any,
   render: DefaultStory,
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [
         ClientPlugin({
@@ -37,7 +36,7 @@ const meta: Meta<typeof Toolbox> = {
             await client.halo.createIdentity();
           },
         }),
-        SpacePlugin(),
+        SpacePlugin({}),
         SettingsPlugin(),
         IntentPlugin(),
         ChessPlugin(),
@@ -46,17 +45,15 @@ const meta: Meta<typeof Toolbox> = {
       ],
       capabilities,
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = Meta<typeof Toolbox>;
+type Story = StoryObj<typeof meta>;
 
-export const Default = {} satisfies Story;
+export const Default: Story = {};

package/src/components/Toolbox/Toolbox.tsx

@@ -4,24 +4,22 @@
 
 import React, { type FC, Fragment, useEffect, useState } from 'react';
 
-import { type Tool } from '@dxos/ai';
 import { type Blueprint } from '@dxos/blueprints';
 import { type Ref } from '@dxos/echo';
-import { FunctionType } from '@dxos/functions';
+import { Function } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { type AiChatProcessor } from '../../hooks';
 import { meta } from '../../meta';
-import { createToolsFromService } from '../../tools';
+import { type AiChatProcessor } from '../../processor';
 import { ServiceType } from '../../types';
 
 export type ToolboxProps = ThemedClassName<{
-  services?: { service: ServiceType; tools: Tool[] }[];
-  functions?: FunctionType[];
+  services?: { service: ServiceType }[];
+  functions?: Function.Function[];
   // TODO(burdon): Combine into single array.
   blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
   activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
@@ -57,10 +55,10 @@ export const Toolbox = ({ classNames, functions, services, blueprints, activeBlu
       {services && services.length > 0 && (
         <Section
           title='Services'
-          items={services.map(({ service: { serviceId, name, description }, tools }) => ({
+          items={services.map(({ service: { serviceId, name, description } }) => ({
             name: name ?? serviceId,
             description,
-            subitems: tools.map(({ name, description }) => ({ name: `∙ ${name}`, description })),
+            // subitems: tools.map(({ name, description }) => ({ name: `∙ ${name}`, description })),
           }))}
         />
       )}
@@ -68,10 +66,6 @@ export const Toolbox = ({ classNames, functions, services, blueprints, activeBlu
       {functions && functions.length > 0 && (
         <Section title='Functions' items={functions.map(({ name, description }) => ({ name, description }))} />
       )}
-
-      {!blueprints?.length && !activeBlueprints?.length && !services?.length && !functions?.length && (
-        <div>{t('no tools')}</div>
-      )}
     </div>
   );
 };
@@ -83,11 +77,11 @@ const Section: FC<{
 }> = ({ title, items, striped }) => {
   const stripeClassNames = 'odd:bg-neutral-50 dark:odd:bg-neutral-800';
   const gridClassNames = 'grid grid-cols-[8rem_1fr]';
-  const subGridClassNames = mx('col-span-full grid grid-cols-subgrid text-xs px-2', striped && stripeClassNames);
+  const subGridClassNames = mx('col-span-full grid grid-cols-subgrid text-xs pli-2', striped && stripeClassNames);
 
   return (
     <div>
-      <h1 className='px-2 text-sm'>{title}</h1>
+      <h1 className='pli-2 text-sm'>{title}</h1>
       <div className={gridClassNames}>
         {items.map(({ name, description, subitems }, i) => (
           <Fragment key={i}>
@@ -118,20 +112,20 @@ export type ToolboxContainerProps = ThemedClassName<{
 export const ToolboxContainer = ({ classNames, space, processor }: ToolboxContainerProps) => {
   // Registered services.
   const services = useQuery(space, Filter.type(ServiceType));
-  const [serviceTools, setServiceTools] = useState<{ service: ServiceType; tools: Tool[] }[]>([]);
+  const [serviceTools, setServiceTools] = useState<{ service: ServiceType }[]>([]);
   useEffect(() => {
     log('creating service tools...', { services: services.length });
     queueMicrotask(async () => {
-      const tools = await Promise.all(
-        services.map(async (service) => ({ service, tools: await createToolsFromService(service) })),
-      );
-
-      setServiceTools(tools);
+      // TODO(burdon): Fix.
+      // const tools = await Promise.all(
+      //   services.map(async (service) => ({ service, tools: await createToolsFromService(service) })),
+      // );
+      // setServiceTools(tools);
     });
   }, [services]);
 
   // Deployed functions.
-  const functions = useQuery(space, Filter.type(FunctionType));
+  const functions = useQuery(space, Filter.type(Function.Function));
 
   return (
     <Toolbox

package/src/components/index.ts

@@ -6,12 +6,11 @@ import { lazy } from 'react';
 
 export * from './AssistantSettings';
 export * from './Chat';
-export * from './PromptSettings';
 export * from './TemplateEditor';
-export * from './Timeline';
 export * from './Toolbox';
 
-export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
+export const BlueprintArticle = lazy(() => import('./BlueprintArticle'));
+export const ChatCompanion = lazy(() => import('./ChatCompanion'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const ChatDialog = lazy(() => import('./ChatDialog'));
-export const SequenceContainer = lazy(() => import('./SequenceContainer'));
+export const PromptArticle = lazy(() => import('./PromptArticle'));

package/src/functions/analysis.ts

@@ -2,19 +2,21 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { defineFunction } from '@dxos/functions';
 import { log } from '@dxos/log';
 
 export default defineFunction({
-  name: 'dxos.org/function/assistant-analysis',
+  key: 'dxos.org/function/assistant-analysis',
+  name: 'Assistant analysis',
   description: 'Enter analysis analysis mode.',
   inputSchema: Schema.Struct({
     enable: Schema.Boolean.annotations({ description: 'Enable or disable analysis mode.' }),
   }),
   outputSchema: Schema.Void,
-  handler: Effect.fn(function* ({ data: { enable } }) {
+  handler: Effect.fn(function* ({ context, data: { enable } }) {
     log.info('analysis mode', { enable });
   }),
 });

package/src/functions/index.ts

@@ -3,5 +3,5 @@
 //
 
 export { default as analysis } from './analysis';
-export { default as list } from './list';
-export { default as load } from './load';
+export { default as list } from './object-list';
+export { default as load } from './object-load';

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

@@ -2,20 +2,22 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 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({
-  name: 'dxos.org/function/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({
@@ -31,7 +33,11 @@ export default defineFunction({
     ),
   }),
   handler: Effect.fn(function* ({ data: { typename } }) {
-    const { objects } = yield* DatabaseService.runQuery(Query.select(Filter.typename(typename)));
+    // TODO(wittjosiah): Typename query is not working for dynamic schemas.
+    const [schema] = yield* DatabaseService.runSchemaQuery({ typename });
+    const filter = schema ? Filter.type(schema) : Filter.typename(typename);
+
+    const { objects } = yield* DatabaseService.runQuery(Query.select(filter));
     const results = objects.map((object) => ({
       dxn: Obj.getDXN(object).toString(),
       label: Obj.getLabel(object),

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

@@ -2,17 +2,19 @@
 // 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';
 import { DatabaseService, defineFunction } from '@dxos/functions';
-import { log } from '@dxos/log';
 
-// 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({
-  name: 'dxos.org/function/assistant/load',
+  key: 'dxos.org/function/assistant/object-load',
+  name: 'Load object',
   description: 'Loads the object.',
   inputSchema: Schema.Struct({
     id: ArtifactId.annotations({
@@ -28,13 +30,13 @@ 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({
         onNone: () => Effect.fail('Object not found.'),
         onSome: (object) => {
-          log.info('object', { object });
+          // log.info('object', { object });
           return Effect.succeed({ object });
         },
       }),

package/src/hooks/index.ts

@@ -2,14 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './chat-processor';
-export * from './errors';
-export * from './presets';
-
 export * from './useBlueprintRegistry';
 export * from './useChatProcessor';
 export * from './useChatServices';
+export * from './useChatToolbarActions';
+export * from './useContextBinder';
+export * from './useContextObjects';
+export * from './useFlush';
+export * from './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';
-export * from './useResolveRef';

package/src/hooks/useBlueprintRegistry.ts

@@ -5,12 +5,14 @@
 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';
 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,25 +23,38 @@ export const useBlueprintRegistry = () => {
   return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
 };
 
+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).
  */
-export const useBlueprints = ({ context }: { context?: AiContextBinder }) => {
+export const useActiveBlueprints = ({ context }: { context?: AiContextBinder }) => {
   const [active, setActive] = useState<Map<string, Blueprint.Blueprint>>(new Map());
+
   useSignalEffect(() => {
     const refs = [...(context?.blueprints.value ?? [])];
-    const t = setTimeout(async () => {
-      const blueprints = (await Ref.Array.loadAll(refs)).filter(isNonNullable);
-      setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
-    });
-
-    return () => clearTimeout(t);
+    const blueprints = refs.map((ref) => ref.target).filter(isNonNullable);
+    setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
   });
 
   return active;
 };
 
-// TODO(burdon): Context should manage ephemeral state of bindings until prompt is issued?
+// TODO(burdon): Move logic into binder.
 export const useBlueprintHandlers = ({
   space,
   context,
@@ -64,6 +79,7 @@ export const useBlueprintHandlers = ({
           if (!blueprint) {
             return;
           }
+
           // NOTE: Possible race condition with other peers.
           storedBlueprint = space.db.add(Obj.clone(blueprint));
         }

package/src/hooks/useChatProcessor.ts

@@ -2,24 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-rx/rx-react';
-import { type Layer } from 'effect';
-import { useContext, useMemo } from 'react';
+import { RegistryContext } from '@effect-atom/atom-react';
+import type * as Runtime from 'effect/Runtime';
+import { useContext, useMemo, useState } from 'react';
 
-import { useIntentDispatcher } from '@dxos/app-framework';
 import { AiConversation } from '@dxos/assistant';
 import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
-import { type Queue, type Space, fullyQualifiedId } 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 '../hooks';
+import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
 import { type Assistant } from '../types';
 
 export type UseChatProcessorProps = {
   space?: Space;
   chat?: Assistant.Chat;
   preset?: AiServicePreset;
-  services?: Layer.Layer<AiChatServices>;
+  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
   blueprintRegistry?: Blueprint.Registry;
   settings?: Assistant.Settings;
 };
@@ -36,46 +36,39 @@ export const useChatProcessor = ({
   settings,
 }: UseChatProcessorProps): AiChatProcessor | undefined => {
   const observableRegistry = useContext(RegistryContext);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
-  // Tools and context.
-  const chatId = useMemo(() => (chat ? fullyQualifiedId(chat) : undefined), [chat]);
-  const extensions = useMemo(() => ({ space, dispatch, pivotId: chatId }), [dispatch, space, chatId]);
-
-  const conversation = useMemo(() => {
-    if (!chat?.queue.target) {
+  // Create conversation from chat queue.
+  const [conversation, setConversation] = useState<AiConversation>();
+  useAsyncEffect(async () => {
+    if (!space || !chat) {
       return;
     }
 
-    return new AiConversation({ queue: chat.queue.target as Queue<any> });
-  }, [chat?.queue.target]);
+    // 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);
+    };
+  }, [space, chat?.queue.dxn.toString()]);
 
   // Create processor.
-  // TODO(burdon): Updated on each query update above; should just update current processor?
   const processor = useMemo(() => {
     if (!services || !conversation) {
       return undefined;
     }
 
-    log('creating processor', {
-      preset,
-      model: preset?.model,
-      settings,
-    });
-
-    return new AiChatProcessor(services, conversation, {
-      extensions,
-      blueprintRegistry,
+    log('creating processor', { preset, model: preset?.model, settings });
+    return new AiChatProcessor(conversation, services, {
       observableRegistry,
+      blueprintRegistry,
       model: preset?.model,
     });
-  }, [services, conversation, blueprintRegistry, extensions, preset]);
+  }, [services, conversation, blueprintRegistry, preset]);
 
   return processor;
 };
-
-// TODO(dmaretskyi): Extract.
-export const Stable = Object.freeze({
-  array: [] as readonly never[],
-  object: {} as {},
-});

package/src/hooks/useChatServices.ts

@@ -2,71 +2,50 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiTool, AiToolkit } from '@effect/ai';
-import { Layer } from 'effect';
+import * as Effect from 'effect/Effect';
+import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { type AiService, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { useCapability } from '@dxos/app-framework/react';
 import { type Space } from '@dxos/client/echo';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  DatabaseService,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TracingService,
-} from '@dxos/functions';
+import { TracingService } from '@dxos/functions';
+import { TracingServiceExt } from '@dxos/functions-runtime';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { useClient } from '@dxos/react-client';
 
-import { AssistantCapabilities } from '../capabilities';
-
-// TODO(burdon): Deconstruct into separate layers?
-export type AiChatServices =
-  | AiService.AiService
-  | CredentialsService
-  | DatabaseService
-  | QueueService
-  | RemoteFunctionExecutionService
-  | ToolResolverService
-  | ToolExecutionService
-  | TracingService;
+import { type AiChatServices } from '../processor';
+import { type Assistant } from '../types';
 
 export type UseChatServicesProps = {
   space?: Space;
+  chat?: Assistant.Chat;
 };
 
 /**
  * Construct service layer.
  */
-export const useChatServices = ({ space }: UseChatServicesProps): Layer.Layer<AiChatServices> | undefined => {
-  const serviceLayer = useCapabilities(AssistantCapabilities.AiServiceLayer).at(0) ?? Layer.die('AiService not found');
-  const functions = useCapabilities(Capabilities.Functions);
-  const toolkits = useCapabilities(Capabilities.Toolkit);
-  const handlers = useCapabilities(Capabilities.ToolkitHandler);
+// TODO(dmaretskyi): Better return type.
+export const useChatServices = ({
+  space,
+  chat,
+}: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
+  const client = useClient();
+  space ??= client.spaces.default;
 
+  const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
   return useMemo(() => {
-    const allFunctions = functions.flat();
-    // TODO(wittjosiah): Don't cast.
-    const toolkit = AiToolkit.merge(...toolkits) as AiToolkit.Any as AiToolkit.AiToolkit<AiTool.Any>;
-    const handlersLayer = Layer.mergeAll(Layer.empty, ...handlers);
-    return Layer.mergeAll(
-      serviceLayer,
-      makeToolResolverFromFunctions(allFunctions, toolkit),
-      makeToolExecutionServiceFromFunctions(allFunctions, toolkit, handlersLayer),
-      CredentialsService.layerFromDatabase(),
-      ComputeEventLogger.layerFromTracing,
-    ).pipe(
-      Layer.provideMerge(
-        Layer.mergeAll(
-          space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable,
-          space ? QueueService.layer(space.queues) : QueueService.notAvailable,
-          TracingService.layerNoop,
-          LocalFunctionExecutionService.layer,
-          RemoteFunctionExecutionService.mockLayer,
-        ),
-      ),
-    );
-  }, [space, functions, toolkits, handlers]);
+    const runtime = runtimeResolver.getRuntime(space.id);
+    return () =>
+      runtime.runPromise(
+        Effect.gen(function* () {
+          return yield* Effect.runtime<AiChatServices>().pipe(
+            Effect.provide(
+              chat?.traceQueue?.target
+                ? TracingServiceExt.layerQueue(chat.traceQueue?.target)
+                : TracingService.layerNoop,
+            ),
+          );
+        }),
+      );
+  }, [space, chat?.traceQueue?.target]);
 };