@dxos/plugin-assistant 0.8.3 → 0.8.4-main.1da679c

package/src/components/ToolBlock/ToolBlock.tsx

@@ -0,0 +1,152 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type AiTool } from '@effect/ai';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+
+import { type AgentStatus } from '@dxos/ai';
+import { useTranslation } from '@dxos/react-ui';
+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 } from '@dxos/util';
+import { safeParseJson } from '@dxos/util';
+
+import { meta } from '../../meta';
+
+export const isToolMessage = (message: DataType.Message) => {
+  return message.blocks.some((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
+};
+
+export type ToolBlockProps = {
+  blocks: ContentBlock.Any[];
+};
+
+export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
+  const { t } = useTranslation(meta.id);
+
+  const getToolCaption = (tool?: AiTool.Any, status?: AgentStatus) => {
+    if (!tool) {
+      return t('calling tool label');
+    }
+
+    return status?.message ?? tool.description ?? [t('calling label'), tool.name].join(' ');
+  };
+
+  const items = useMemo(() => {
+    let lastToolCall: { tool: AiTool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
+    // TODO(burdon): Get from context?
+    const tools: AiTool.Any[] = []; //processor.conversation.toolkit?.tools ?? [];
+    return blocks
+      .filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult' || block._tag === 'summary')
+      .map((block) => {
+        switch (block._tag) {
+          case 'toolCall': {
+            if (block.pending && lastToolCall?.block.toolCallId === block.toolCallId) {
+              return null;
+            }
+
+            const tool = tools.find((tool) => tool.name === block.name);
+            lastToolCall = { tool, block };
+            return {
+              title: getToolCaption(lastToolCall?.tool),
+              content: {
+                ...block,
+                input: safeParseJson(block.input),
+              },
+            };
+          }
+
+          case 'toolResult': {
+            // TODO(burdon): Parse error type.
+            if (block.error) {
+              return {
+                title: t('error label'),
+                content: block,
+              };
+            }
+
+            const title = getToolCaption(lastToolCall?.tool ?? t('tool result label'));
+            lastToolCall = undefined;
+            return {
+              title,
+              content: {
+                ...block,
+                result: safeParseJson(block.result),
+              },
+            };
+          }
+
+          case 'summary': {
+            if (!lastToolCall) {
+              return null;
+            }
+
+            return {
+              title: t('summary label'),
+              content: block,
+            };
+          }
+        }
+      })
+      .filter(isNonNullable);
+  }, [blocks]);
+
+  if (!items.length) {
+    return null;
+  }
+
+  return <ToolContainer items={items} />;
+};
+
+ToolBlock.displayName = 'ToolBlock';
+
+type ToolContainerParams = {
+  items: { title: string; content: any }[];
+};
+
+export const ToolContainer = ({ items }: ToolContainerParams) => {
+  const tabsRef = useRef<HTMLDivElement>(null);
+  const [selected, setSelected] = useState(0);
+  const [open, setOpen] = useState(false);
+  useEffect(() => {
+    if (open) {
+      tabsRef.current?.focus();
+    }
+  }, [open]);
+
+  const handleSelect = (index: number) => {
+    setSelected(index);
+  };
+
+  const data = items[selected]?.content;
+
+  return (
+    <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={chatMessageJson}
+          replacer={{
+            maxDepth: 3,
+            maxArrayLen: 10,
+            maxStringLen: 128,
+          }}
+        />
+      </ToggleContainer.Content>
+    </ToggleContainer.Root>
+  );
+};

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/Toolbar/Toolbar.tsx

@@ -0,0 +1,21 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { type ThemedClassName } from '@dxos/react-ui';
+import { MenuProvider, ToolbarMenu } from '@dxos/react-ui-menu';
+
+import { type ChatToolbarActionsProps, useChatToolbarActions } from './useChatToolbarActions';
+
+export const Toolbar = ({ chat, companionTo, onReset, classNames }: ThemedClassName<ChatToolbarActionsProps>) => {
+  const menu = useChatToolbarActions({ chat, companionTo, onReset });
+
+  return (
+    <MenuProvider {...menu} attendableId={companionTo ? fullyQualifiedId(companionTo) : fullyQualifiedId(chat)}>
+      <ToolbarMenu classNames={classNames} />
+    </MenuProvider>
+  );
+};

package/src/{experimental/transcription → components/Toolbar}/index.ts

@@ -1,3 +1,5 @@
 //
 // Copyright 2025 DXOS.org
 //
+
+export * from './Toolbar';

package/src/components/Toolbar/useChatToolbarActions.ts

@@ -0,0 +1,126 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Rx } from '@effect-rx/rx-react';
+import { Effect } from 'effect';
+import { useMemo } from 'react';
+
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { getSpace, useQuery } from '@dxos/react-client/echo';
+import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
+
+import { meta } from '../../meta';
+import { Assistant, AssistantAction } from '../../types';
+
+export type ChatToolbarActionsProps = {
+  chat: Assistant.Chat;
+  companionTo?: Obj.Any;
+  onReset?: () => void;
+};
+
+export const useChatToolbarActions = ({ chat, companionTo, onReset }: ChatToolbarActionsProps) => {
+  const { dispatch } = useIntentDispatcher();
+  const space = getSpace(chat);
+  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);
+
+  return useMenuActions(
+    useMemo(
+      () =>
+        Rx.make(() => {
+          const builder = MenuBuilder.make()
+            .root({
+              label: ['chat toolbar title', { ns: meta.id }],
+            })
+            .action(
+              'new',
+              {
+                label: ['button new thread', { ns: meta.id }],
+                icon: 'ph--plus--regular',
+                type: 'new',
+              },
+              () =>
+                Effect.gen(function* () {
+                  invariant(space);
+                  const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+                  yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
+                  if (companionTo) {
+                    yield* dispatch(
+                      createIntent(SpaceAction.AddRelation, {
+                        space,
+                        schema: Assistant.CompanionTo,
+                        source: object,
+                        target: companionTo,
+                      }),
+                    );
+
+                    yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: object }));
+                  }
+                }).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),
+                    );
+                  });
+              },
+            );
+          }
+
+          if (onReset) {
+            builder.action(
+              'reset',
+              {
+                label: ['button reset', { ns: meta.id }],
+                icon: 'ph--trash--regular',
+                type: 'reset',
+              },
+              onReset,
+            );
+          }
+
+          return builder.build();
+        }),
+      [chats],
+    ),
+  );
+};

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

@@ -4,43 +4,36 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { IntentPlugin, Capabilities, useCapabilities, SettingsPlugin } from '@dxos/app-framework';
+import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities } from '@dxos/artifact-testing';
+import { capabilities } from '@dxos/assistant-testing';
 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, withSignals, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { translations } from '../../translations';
 
 import { Toolbox, type ToolboxProps } from './Toolbox';
-import translations from '../../translations';
 
 const DefaultStory = (props: ToolboxProps) => {
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-  return (
-    <Toolbox
-      {...props}
-      artifacts={artifactDefinitions}
-      classNames='w-[30rem] h-[15rem] rounded-md border border-separator py-1'
-    />
-  );
+  return <Toolbox {...props} classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1' />;
 };
 
-const meta: Meta<typeof Toolbox> = {
+const meta = {
   title: 'plugins/plugin-assistant/Toolbox',
-  component: Toolbox,
+  component: Toolbox as any,
   render: DefaultStory,
   decorators: [
-    withSignals,
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -60,10 +53,10 @@ const meta: Meta<typeof Toolbox> = {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = Meta<typeof Toolbox>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};

package/src/components/Toolbox/Toolbox.tsx

@@ -2,37 +2,52 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useState, useEffect, Fragment, type FC } from 'react';
+import React, { type FC, Fragment, useEffect, useState } from 'react';
 
-import { parseToolName, type Tool } from '@dxos/ai';
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { type ArtifactDefinition } from '@dxos/artifact';
+import { type Blueprint } from '@dxos/blueprints';
+import { type Ref } from '@dxos/echo';
 import { FunctionType } 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 { createToolsFromService } from '../../tools';
+import { meta } from '../../meta';
+import { type AiChatProcessor } from '../../processor';
 import { ServiceType } from '../../types';
 
 export type ToolboxProps = ThemedClassName<{
-  artifacts?: ArtifactDefinition[];
-  services?: { service: ServiceType; tools: Tool[] }[];
+  services?: { service: ServiceType }[];
   functions?: FunctionType[];
-  striped?: boolean;
+  // TODO(burdon): Combine into single array.
+  blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
+  activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
 }>;
 
-export const Toolbox = ({ classNames, artifacts, functions, services, striped }: ToolboxProps) => {
+export const Toolbox = ({ classNames, functions, services, blueprints, activeBlueprints }: ToolboxProps) => {
+  const { t } = useTranslation(meta.id);
+
   return (
     <div className={mx('flex flex-col overflow-y-auto box-content', classNames)}>
-      {artifacts && artifacts.length > 0 && (
+      {blueprints && blueprints.length > 0 && (
         <Section
-          title='Artifacts'
-          items={artifacts.map(({ name, description, tools }) => ({
-            name,
-            description,
-            subitems: tools.map(({ name, description }) => ({ name: `∙ ${parseToolName(name)}`, description })),
+          title='Blueprints'
+          items={blueprints.map(({ target }) => ({
+            name: target?.name ?? '',
+            description: target?.description ?? '',
+            subitems: target?.tools.map((toolId) => ({ name: `∙ ${safeToolId(toolId)}` })),
+          }))}
+        />
+      )}
+
+      {activeBlueprints && activeBlueprints.length > 0 && (
+        <Section
+          title='Blueprints'
+          items={activeBlueprints.map(({ target }) => ({
+            name: target?.name ?? '',
+            description: target?.description ?? '',
+            subitems: target?.tools.map((toolId) => ({ name: `∙ ${safeToolId(toolId)}` })),
           }))}
         />
       )}
@@ -40,10 +55,10 @@ export const Toolbox = ({ classNames, artifacts, functions, services, striped }:
       {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 })),
           }))}
         />
       )}
@@ -89,21 +104,23 @@ const Section: FC<{
   );
 };
 
-export const ToolboxContainer = ({ classNames, space }: ThemedClassName<{ space?: Space }>) => {
-  // Plugin artifacts.
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
+export type ToolboxContainerProps = ThemedClassName<{
+  space?: Space;
+  processor?: AiChatProcessor;
+}>;
 
+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]);
 
@@ -111,6 +128,15 @@ export const ToolboxContainer = ({ classNames, space }: ThemedClassName<{ space?
   const functions = useQuery(space, Filter.type(FunctionType));
 
   return (
-    <Toolbox classNames={classNames} artifacts={artifactDefinitions} services={serviceTools} functions={functions} />
+    <Toolbox
+      classNames={classNames}
+      blueprints={processor?.context.blueprints.value}
+      services={serviceTools}
+      functions={functions}
+    />
   );
 };
+
+const safeToolId = (name: string) => {
+  return name.split('_').pop();
+};

package/src/components/index.ts

@@ -4,18 +4,16 @@
 
 import { lazy } from 'react';
 
-export * from './AmbientDialog';
 export * from './AssistantSettings';
-export * from './Prompt';
+export * from './Chat';
+export * from './ChatProgress';
 export * from './PromptSettings';
 export * from './TemplateEditor';
-export * from './Thread';
+export * from './Toolbar';
 export * from './Toolbox';
 
-// TODO(burdon): Lazy loading causes issues with Tabster.
-//  Repro: open assistant dialog then close.
-//  https://github.com/microsoft/fluentui/issues/34020
-export const AssistantDialog = lazy(() => import('./AssistantDialog'));
 export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
+export const ChatCompanion = lazy(() => import('./ChatCompanion'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
-export const TemplateContainer = lazy(() => import('./TemplateContainer'));
+export const ChatDialog = lazy(() => import('./ChatDialog'));
+export const SequenceContainer = lazy(() => import('./SequenceContainer'));

package/src/events.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Events } from '@dxos/app-framework';
+import { defineEvent } from '@dxos/app-framework';
 
-import { ASSISTANT_PLUGIN } from './meta';
+import { meta } from './meta';
 
 export namespace AssistantEvents {
-  export const AiClientReady = Events.createStateEvent(`${ASSISTANT_PLUGIN}/ai-client-ready`);
+  export const SetupAiServiceProviders = defineEvent(`${meta.id}/event/setup-ai-service-providers`);
 }