@dxos/plugin-assistant 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

package/src/components/ToolBlock/ToolBlock.tsx

@@ -6,13 +6,13 @@ import type * as Tool from '@effect/ai/Tool';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { useTranslation } from '@dxos/react-ui';
-import { NumericTabs, TextCrawl, ToggleContainer, type ToggleContainerRootProps } from '@dxos/react-ui-components';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { NumericTabs, TextCrawl, TogglePanel, type TogglePanelRootProps } from '@dxos/react-ui-components';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { type ContentBlock, type Message } from '@dxos/types';
 import { type XmlWidgetProps } from '@dxos/ui-editor';
 import { isNonNullable, safeParseJson } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 export const isToolMessage = (message: Message.Message) => {
   return message.blocks.some((block: ContentBlock.Any) => block._tag === 'toolCall' || block._tag === 'toolResult');
@@ -25,12 +25,12 @@ export type ToolBlockProps = XmlWidgetProps<{
 export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
   const { t } = useTranslation(meta.id);
 
-  const items = useMemo<ToolContainerProps['items']>(() => {
+  const items = useMemo<ToolPanelProps['items']>(() => {
     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')
+      .filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult' || block._tag === 'stats')
       .map((block) => {
         switch (block._tag) {
           case 'toolCall': {
@@ -41,7 +41,7 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
             const tool = tools.find((tool) => tool.name === block.name);
             lastToolCall = { tool, block };
             return {
-              title: tool?.description ?? [t('tool call label'), tool?.name].join(' '),
+              title: tool?.description ?? [t('tool-call.label'), block?.name].join(' '),
               content: {
                 ...block,
                 input: safeParseJson(block.input),
@@ -53,13 +53,13 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
             // TODO(burdon): Parse error type.
             if (block.error) {
               return {
-                title: t('tool error label'),
+                title: t('tool-error.label'),
                 content: block,
               };
             }
 
             const title =
-              lastToolCall?.tool?.description ?? [t('tool result label'), lastToolCall?.tool?.name].join(' ');
+              lastToolCall?.tool?.description ?? [t('tool-result.label'), lastToolCall?.block?.name].join(' ');
             lastToolCall = undefined;
             return {
               title,
@@ -70,13 +70,13 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
             };
           }
 
-          case 'summary': {
+          case 'stats': {
             if (!lastToolCall) {
               return null;
             }
 
             return {
-              title: t('summary label'),
+              title: t('stats.label'),
               content: block,
             };
           }
@@ -92,20 +92,21 @@ export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
     }, 1_000);
   }, [view]);
 
+  // Ignore if empty.
   if (!items.length) {
     return null;
   }
 
-  return <ToolContainer items={items} onChangeOpen={handleChangeOpen} />;
+  return <ToolPanel items={items} onChangeOpen={handleChangeOpen} />;
 };
 
 ToolBlock.displayName = 'ToolBlock';
 
-type ToolContainerProps = {
+type ToolPanelProps = {
   items: { title: string; content: any }[];
-} & Pick<ToggleContainerRootProps, 'onChangeOpen'>;
+} & Pick<TogglePanelRootProps, 'onChangeOpen'>;
 
-export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
+const ToolPanel = ({ items, onChangeOpen }: ToolPanelProps) => {
   const tabsRef = useRef<HTMLDivElement>(null);
   const [selected, setSelected] = useState(0);
   const [open, setOpen] = useState(false);
@@ -122,13 +123,13 @@ export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
   }, []);
 
   return (
-    <ToggleContainer.Root classNames='mbs-2 is-full rounded-sm' open={open} onChangeOpen={setOpen}>
-      <ToggleContainer.Header classNames='text-sm text-placeholder'>
+    <TogglePanel.Root classNames='w-full rounded-xs border border-subdued-separator' open={open} onChangeOpen={setOpen}>
+      <TogglePanel.Header classNames='text-sm text-placeholder'>
         <TextCrawl key='status-roll' lines={items.map((item) => item.title)} autoAdvance greedy />
-      </ToggleContainer.Header>
-      <ToggleContainer.Content classNames='grid grid-cols-[32px_1fr]'>
+      </TogglePanel.Header>
+      <TogglePanel.Content classNames='grid grid-cols-[32px_1fr]'>
         <NumericTabs ref={tabsRef} classNames='p-1' length={items.length} selected={selected} onSelect={handleSelect} />
-        <Json
+        <JsonHighlighter
           data={items[selected]?.content}
           classNames='p-1 text-xs bg-transparent'
           replacer={{
@@ -137,7 +138,7 @@ export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
             maxStringLen: 128,
           }}
         />
-      </ToggleContainer.Content>
-    </ToggleContainer.Root>
+      </TogglePanel.Content>
+    </TogglePanel.Root>
   );
 };

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

@@ -8,34 +8,33 @@ import React from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { capabilities } from '@dxos/assistant-toolkit/testing';
-import { ChessPlugin } from '@dxos/plugin-chess';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { MapPlugin } from '@dxos/plugin-map';
-import { TablePlugin } from '@dxos/plugin-table';
+import { ChessPlugin } from '@dxos/plugin-chess/plugin';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { MapPlugin } from '@dxos/plugin-map/plugin';
+import { TablePlugin } from '@dxos/plugin-table/plugin';
 import { corePlugins } from '@dxos/plugin-testing';
-import { withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
 import { Toolbox, type ToolboxProps } from './Toolbox';
 
 const DefaultStory = (props: ToolboxProps) => {
-  return <Toolbox {...props} classNames='bs-[15rem] is-[30rem] plb-1 rounded-sm border border-separator' />;
+  return <Toolbox {...props} classNames='h-[15rem] w-[30rem] py-1 rounded-xs border border-separator' />;
 };
 
 const meta = {
-  title: 'plugins/plugin-assistant/Toolbox',
+  title: 'plugins/plugin-assistant/components/Toolbox',
   component: Toolbox as any,
   render: DefaultStory,
   decorators: [
-    withTheme(),
     withPluginManager({
       plugins: [
         ...corePlugins(),
         ClientPlugin({
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              yield* Effect.promise(() => client.halo.createIdentity());
+              yield* initializeIdentity(client);
             }),
         }),
         ChessPlugin(),

package/src/components/Toolbox/Toolbox.tsx

@@ -2,84 +2,91 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type FC, Fragment, useEffect, useState } from 'react';
+import React, { Fragment, useEffect, useState } from 'react';
 
-import { type Blueprint } from '@dxos/blueprints';
+import { type Blueprint } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { type Database, type Ref } from '@dxos/echo';
-import { Function } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { Filter, useQuery } from '@dxos/react-client/echo';
 import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
+import { composable, composableProps, mx } from '@dxos/ui-theme';
+
+import { ServiceType } from '#types';
 
 import { type AiChatProcessor } from '../../processor';
-import { ServiceType } from '../../types';
 
-export type ToolboxProps = ThemedClassName<{
+export type ToolboxProps = {
   services?: { service: ServiceType }[];
-  functions?: Function.Function[];
+  functions?: Operation.PersistentOperation[];
   // TODO(burdon): Combine into single array.
   blueprints?: readonly Blueprint.Blueprint[];
   activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
-}>;
-
-export const Toolbox = ({ classNames, functions, services, blueprints, activeBlueprints }: ToolboxProps) => {
-  return (
-    <ScrollArea.Root thin orientation='vertical'>
-      <ScrollArea.Viewport classNames={classNames}>
-        {blueprints && blueprints.length > 0 && (
-          <Section
-            title='Blueprints'
-            items={blueprints.map(({ name, description, tools }) => ({
-              name,
-              description,
-              subitems: 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)}` })),
-            }))}
-          />
-        )}
-
-        {services && services.length > 0 && (
-          <Section
-            title='Services'
-            items={services.map(({ service: { serviceId, name, description } }) => ({
-              name: name ?? serviceId,
-              description,
-              // subitems: tools.map(({ name, description }) => ({ name: `∙ ${name}`, description })),
-            }))}
-          />
-        )}
-
-        {functions && functions.length > 0 && (
-          <Section title='Functions' items={functions.map(({ name, description }) => ({ name, description }))} />
-        )}
-      </ScrollArea.Viewport>
-    </ScrollArea.Root>
-  );
 };
 
-const Section: FC<{
+export const Toolbox = composable<HTMLDivElement, ToolboxProps>(
+  ({ functions, services, blueprints, activeBlueprints, ...props }, forwardedRef) => {
+    return (
+      <ScrollArea.Root {...composableProps(props)} thin orientation='vertical' ref={forwardedRef}>
+        <ScrollArea.Viewport>
+          {blueprints && blueprints.length > 0 && (
+            <Section
+              title='Blueprints'
+              items={blueprints.map(({ name, description, tools }) => ({
+                name,
+                description,
+                subitems: 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)}` })),
+              }))}
+            />
+          )}
+
+          {services && services.length > 0 && (
+            <Section
+              title='Services'
+              items={services.map(({ service: { serviceId, name, description } }) => ({
+                name: name ?? serviceId,
+                description,
+                // subitems: tools.map(({ name, description }) => ({ name: `∙ ${name}`, description })),
+              }))}
+            />
+          )}
+
+          {functions && functions.length > 0 && (
+            <Section title='Functions' items={functions.map(({ name, description }) => ({ name, description }))} />
+          )}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    );
+  },
+);
+
+Toolbox.displayName = 'Toolbox';
+
+type SectionProps = {
   title: string;
   items: { name: string; description?: string; subitems?: { name: string; description?: string }[] }[];
   striped?: boolean;
-}> = ({ title, items, striped }) => {
+};
+
+const Section = ({ title, items, striped }: SectionProps) => {
   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 pli-2', striped && stripeClassNames);
+  const subGridClassNames = mx('col-span-full grid grid-cols-subgrid text-xs px-2', striped && stripeClassNames);
 
   return (
     <div>
-      <h1 className='pli-2 text-sm'>{title}</h1>
+      <h1 className='px-2 text-sm'>{title}</h1>
       <div className={gridClassNames}>
         {items.map(({ name, description, subitems }, i) => (
           <Fragment key={i}>
@@ -102,12 +109,12 @@ const Section: FC<{
   );
 };
 
-export type ToolboxContainerProps = ThemedClassName<{
+export type ToolboxPanelProps = ThemedClassName<{
   db?: Database.Database;
   processor?: AiChatProcessor;
 }>;
 
-export const ToolboxContainer = ({ classNames, db, processor }: ToolboxContainerProps) => {
+export const ToolboxPanel = ({ classNames, db, processor }: ToolboxPanelProps) => {
   // Registered services.
   const services = useQuery(db, Filter.type(ServiceType));
   const [serviceTools, setServiceTools] = useState<{ service: ServiceType }[]>([]);
@@ -123,7 +130,7 @@ export const ToolboxContainer = ({ classNames, db, processor }: ToolboxContainer
   }, [services]);
 
   // Deployed functions.
-  const functions = useQuery(db, Filter.type(Function.Function));
+  const functions = useQuery(db, Filter.type(Operation.PersistentOperation));
 
   return (
     <Toolbox

package/src/components/index.ts

@@ -2,24 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type LazyExoticComponent, lazy } from 'react';
+import { type ComponentType, lazy } from 'react';
 
-export * from './AssistantSettings';
 export * from './Chat';
+export * from './ProcessTree';
 export * from './TemplateEditor';
 export * from './Toolbox';
-export * from './TriggerStatus';
 
-export const BlueprintArticle = lazy(() => import('./BlueprintArticle'));
-export const ChatCompanion = lazy(() => import('./ChatCompanion'));
-// Type annotation needed to avoid declaration file emission issues with @dxos/assistant-toolkit types.
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-export const ChatContainer: LazyExoticComponent<typeof import('./ChatContainer').default> = lazy(
-  () => import('./ChatContainer'),
-);
-export const ChatDialog = lazy(() => import('./ChatDialog'));
-export const InitiativeContainer = lazy(() => import('./InitiativeContainer'));
-export const PromptArticle = lazy(() => import('./PromptArticle'));
-
-export type { ChatContainerProps } from './ChatContainer';
-export type { ChatDialogProps } from './ChatDialog';
+export const AssistantSettings: ComponentType<any> = lazy(() => import('./AssistantSettings'));

package/src/containers/AgentArticle/AgentArticle.stories.tsx

@@ -0,0 +1,120 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { Plan, Agent } from '@dxos/assistant-toolkit';
+import { Obj, Ref } from '@dxos/echo';
+import { AutomationPlugin } from '@dxos/plugin-automation/plugin';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
+import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
+import { random } from '@dxos/random';
+import { Filter, useQuery, useSpaces } from '@dxos/react-client/echo';
+import { Loading, withTheme } from '@dxos/react-ui/testing';
+import { Text } from '@dxos/schema';
+import { createObjectFactory, TypeSpec } from '@dxos/schema/testing';
+import { Message, Organization, Person } from '@dxos/types';
+
+import { createMessage } from '#testing';
+import { translations } from '#translations';
+
+import { AssistantPlugin } from '../../AssistantPlugin';
+import { AgentArticle } from './AgentArticle';
+
+random.seed(1);
+
+type DefaultStoryProps = {
+  spec?: TypeSpec[];
+  inputs?: boolean;
+};
+
+const DefaultStory = (_: DefaultStoryProps) => {
+  const [space] = useSpaces();
+  const [agent] = useQuery(space?.db, Filter.type(Agent.Agent));
+  if (!agent) {
+    return <Loading />;
+  }
+
+  return <AgentArticle role='article' subject={agent} attendableId='story' />;
+};
+
+const meta = {
+  title: 'plugins/plugin-assistant/containers/AgentArticle',
+  render: DefaultStory,
+  decorators: [
+    withTheme(),
+    withPluginManager<DefaultStoryProps>(({ args: { spec = [], inputs } }) => ({
+      plugins: [
+        ...corePlugins(),
+        ClientPlugin({
+          types: [Agent.Agent, Message.Message, Plan.Plan, Text.Text, Organization.Organization, Person.Person],
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              yield* initializeIdentity(client);
+              const [space] = client.spaces.get();
+              yield* Effect.promise(() => space.waitUntilReady());
+
+              const factory = createObjectFactory(space.db, random as any);
+              const artifacts = yield* Effect.promise(() => factory(spec));
+
+              const inputQueue = space.queues.create();
+              if (inputs) {
+                yield* Effect.promise(() =>
+                  inputQueue.append([
+                    createMessage('user', [{ _tag: 'text', text: 'Summarize the current artifacts.' }]),
+                    createMessage('assistant', [
+                      { _tag: 'text', text: 'Here is a quick overview of the organizations and contacts in context.' },
+                    ]),
+                    createMessage('user', [{ _tag: 'text', text: 'Flag anything that needs follow-up.' }]),
+                  ]),
+                );
+              }
+
+              space.db.add(
+                Obj.make(Agent.Agent, {
+                  instructions: Ref.make(Text.make()),
+                  plan: Ref.make(Plan.makePlan({ tasks: [] })),
+                  artifacts: artifacts.map((obj) => ({
+                    name: Obj.getLabel(obj) ?? 'Artifact',
+                    data: Ref.make(obj),
+                  })),
+                  queue: Ref.fromDXN(inputQueue.dxn),
+                  subscriptions: [],
+                }),
+              );
+            }),
+        }),
+        AutomationPlugin(),
+        AssistantPlugin(),
+        PreviewPlugin(),
+        StorybookPlugin({}),
+      ],
+    })),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<DefaultStoryProps>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    inputs: true,
+    spec: [
+      { type: Organization.Organization, count: 10 },
+      { type: Person.Person, count: 10 },
+    ],
+  },
+};
+
+export const Empty: Story = {};