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

package/src/components/{ChatThread → ToolBlock}/ToolBlock.tsx

@@ -2,38 +2,38 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiTool } from '@effect/ai';
+import type * as Tool from '@effect/ai/Tool';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 import { type AgentStatus } from '@dxos/ai';
 import { useTranslation } from '@dxos/react-ui';
-import { NumericTabs, TextCrawl, ToggleContainer } from '@dxos/react-ui-components';
+import {
+  NumericTabs,
+  TextCrawl,
+  ToggleContainer,
+  chatMessageJson,
+  chatMessagePanel,
+  chatMessagePanelContent,
+  chatMessagePanelHeader,
+} from '@dxos/react-ui-components';
 import { Json } from '@dxos/react-ui-syntax-highlighter';
 import { type ContentBlock, type DataType } from '@dxos/schema';
-import { isNonNullable, isNotFalsy } from '@dxos/util';
-import { safeParseJson } from '@dxos/util';
+import { isNonNullable, safeParseJson } from '@dxos/util';
 
 import { meta } from '../../meta';
 
-import { styles } from './ChatMessage';
-
 export const isToolMessage = (message: DataType.Message) => {
   return message.blocks.some((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
 };
 
-export type AiToolProvider = () => readonly AiTool.Any[];
-
 export type ToolBlockProps = {
-  message: DataType.Message;
-  toolProvider: AiToolProvider;
+  blocks: ContentBlock.Any[];
 };
 
-// TODO(burdon): Pass in blocks.
-export const ToolBlock = ({ message, toolProvider }: ToolBlockProps) => {
+export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
   const { t } = useTranslation(meta.id);
-  const { blocks = [] } = message;
 
-  const getToolCaption = (tool?: AiTool.Any, status?: AgentStatus) => {
+  const getToolCaption = (tool?: Tool.Any, status?: AgentStatus) => {
     if (!tool) {
       return t('calling tool label');
     }
@@ -42,8 +42,9 @@ export const ToolBlock = ({ message, toolProvider }: ToolBlockProps) => {
   };
 
   const items = useMemo(() => {
-    let lastToolCall: { tool: AiTool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
-    const tools = toolProvider();
+    let lastToolCall: { tool: Tool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
+    // TODO(burdon): Get from context?
+    const tools: Tool.Any[] = []; //processor.conversation.toolkit?.tools ?? [];
     return blocks
       .filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult' || block._tag === 'summary')
       .map((block) => {
@@ -99,13 +100,20 @@ export const ToolBlock = ({ message, toolProvider }: ToolBlockProps) => {
       .filter(isNonNullable);
   }, [blocks]);
 
+  if (!items.length) {
+    return null;
+  }
+
   return <ToolContainer items={items} />;
 };
 
+ToolBlock.displayName = 'ToolBlock';
+
 type ToolContainerParams = {
   items: { title: string; content: any }[];
 };
 
+// TODO(burdon): Maintain scroll position when closing.
 export const ToolContainer = ({ items }: ToolContainerParams) => {
   const tabsRef = useRef<HTMLDivElement>(null);
   const [selected, setSelected] = useState(0);
@@ -120,21 +128,18 @@ export const ToolContainer = ({ items }: ToolContainerParams) => {
     setSelected(index);
   };
 
-  const title = useMemo(() => {
-    const lines = items.map((item) => item.title).filter(isNotFalsy);
-    return <TextCrawl key='status-roll' lines={lines} autoAdvance />;
-  }, [items]);
-
-  const data = items[selected].content;
+  const data = items[selected]?.content;
 
   return (
-    <ToggleContainer.Root classNames={styles.panel} open={open} onChangeOpen={setOpen}>
-      <ToggleContainer.Header classNames={styles.panelHeader} title={title} />
-      <ToggleContainer.Content classNames={['grid grid-cols-[32px_1fr]', styles.panelContent]}>
+    <ToggleContainer.Root classNames={chatMessagePanel} open={open} onChangeOpen={setOpen}>
+      <ToggleContainer.Header classNames={chatMessagePanelHeader}>
+        <TextCrawl key='status-roll' lines={items.map((item) => item.title)} />
+      </ToggleContainer.Header>
+      <ToggleContainer.Content classNames={['grid grid-cols-[32px_1fr]', chatMessagePanelContent]}>
         <NumericTabs ref={tabsRef} classNames='p-1' length={items.length} selected={selected} onSelect={handleSelect} />
         <Json
           data={data}
-          classNames={styles.json}
+          classNames={chatMessageJson}
           replacer={{
             maxDepth: 3,
             maxArrayLen: 10,

package/src/components/ToolBlock/ToolBlockWidget.tsx

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export const ToolBlockWidget = () => {};

package/src/components/ToolBlock/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './ToolBlock';
+export * from './ToolBlockWidget';

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

@@ -2,20 +2,18 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 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';
 
@@ -30,6 +28,7 @@ const meta = {
   component: Toolbox as any,
   render: DefaultStory,
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [
         ClientPlugin({
@@ -37,7 +36,7 @@ const meta = {
             await client.halo.createIdentity();
           },
         }),
-        SpacePlugin(),
+        SpacePlugin({}),
         SettingsPlugin(),
         IntentPlugin(),
         ChessPlugin(),
@@ -46,8 +45,6 @@ const meta = {
       ],
       capabilities,
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'centered',

package/src/components/Toolbox/Toolbox.tsx

@@ -6,7 +6,7 @@ import React, { type FC, Fragment, useEffect, useState } from 'react';
 
 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';
@@ -19,7 +19,7 @@ import { ServiceType } from '../../types';
 
 export type ToolboxProps = ThemedClassName<{
   services?: { service: ServiceType }[];
-  functions?: FunctionType[];
+  functions?: Function.Function[];
   // TODO(burdon): Combine into single array.
   blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
   activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
@@ -125,7 +125,7 @@ export const ToolboxContainer = ({ classNames, space, processor }: ToolboxContai
   }, [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

@@ -7,13 +7,11 @@ import { lazy } from 'react';
 export * from './AssistantSettings';
 export * from './Chat';
 export * from './ChatProgress';
-export * from './PromptSettings';
+export * from './ChatToolbar';
 export * from './TemplateEditor';
-export * from './Toolbar';
 export * from './Toolbox';
 
 export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
 export const ChatCompanion = lazy(() => import('./ChatCompanion'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const ChatDialog = lazy(() => import('./ChatDialog'));
-export const SequenceContainer = lazy(() => import('./SequenceContainer'));

package/src/functions/analysis.ts

@@ -2,13 +2,15 @@
 // 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.' }),

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({

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

@@ -7,11 +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 './useMatcherExtension';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';
-export * from './useResolveRef';

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 Layer } 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';
@@ -17,7 +18,7 @@ import { type Assistant } from '../types';
 export type UseChatProcessorProps = {
   chat?: Assistant.Chat;
   preset?: AiServicePreset;
-  services?: Layer.Layer<AiChatServices>;
+  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
   blueprintRegistry?: Blueprint.Registry;
   settings?: Assistant.Settings;
 };
@@ -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,24 +2,16 @@
 // 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 { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { useCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  DatabaseService,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TracingService,
-} from '@dxos/functions';
+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';
 
@@ -31,34 +23,26 @@ export type UseChatServicesProps = {
 /**
  * Construct service layer.
  */
-export const useChatServices = ({ space, chat }: 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,
-          chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
-          LocalFunctionExecutionService.layer,
-          RemoteFunctionExecutionService.mockLayer,
-        ),
-      ),
-    );
-  }, [space, functions, toolkits, handlers, chat?.traceQueue?.target]);
+    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,
+            ),
+          );
+        }),
+      );
+  }, [space, chat?.traceQueue?.target]);
 };

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

@@ -3,16 +3,19 @@
 //
 
 import { type PluginMeta } from '@dxos/app-framework';
-
-export const ASSISTANT_PLUGIN = 'dxos.org/plugin/assistant';
-
-export const ASSISTANT_DIALOG = `${ASSISTANT_PLUGIN}/assistant/dialog`;
+import { trim } from '@dxos/util';
 
 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.',
+  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'],
 };
+
+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';