@dxos/plugin-assistant 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/src/components/TemplateEditor/extensions/handlebars-extension.ts

@@ -64,7 +64,7 @@ const regex = {
   url: /[\w.-]+\.[\w.-]+\/[\w/]+/g,
 };
 
-const tagPadding = 'mli-0.5 pli-1 rounded-sm';
+const tagPadding = 'mx-0.5 px-1 rounded-xs';
 
 /**
  * ViewPlugin that decorates Handlebars syntax.
@@ -158,14 +158,14 @@ const handlebarsHighlightPlugin = ViewPlugin.fromClass(
               decorations.push({
                 from: idx,
                 to: end,
-                decoration: Decoration.mark({ class: 'text-greenText' }),
+                decoration: Decoration.mark({ class: 'text-green-text' }),
               });
               end = idx;
             }
             decorations.push({
               from: start,
               to: end,
-              decoration: Decoration.mark({ class: 'text-blueText' }),
+              decoration: Decoration.mark({ class: 'text-blue-text' }),
             });
           }
         }
@@ -179,7 +179,7 @@ const handlebarsHighlightPlugin = ViewPlugin.fromClass(
             decorations.push({
               from: start,
               to: end,
-              decoration: Decoration.mark({ class: 'text-greenText' }),
+              decoration: Decoration.mark({ class: 'text-green-text' }),
             });
           }
         }

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 { NumericTabs, TextCrawl, TogglePanel, type TogglePanelRootProps } from '@dxos/react-ui-components';
 import { Json } 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
+        <Json.Data
           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

@@ -10,32 +10,30 @@ 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 { initializeIdentity } from '@dxos/plugin-client/testing';
 import { MapPlugin } from '@dxos/plugin-map';
 import { TablePlugin } from '@dxos/plugin-table';
 import { corePlugins } from '@dxos/plugin-testing';
-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='is-[30rem] bs-[15rem] rounded-sm border border-separator plb-1' />;
+  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,85 +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 Database, type Ref } from '@dxos/echo';
-import { Function } from '@dxos/functions';
 import { log } from '@dxos/log';
+import { Operation } from '@dxos/operation';
 import { Filter, useQuery } from '@dxos/react-client/echo';
-import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
+import { composable, composableProps, mx } from '@dxos/ui-theme';
+
+import { ServiceType } from '#types';
 
-import { meta } from '../../meta';
 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) => {
-  const { t } = useTranslation(meta.id);
-
-  return (
-    <div className={mx('flex flex-col overflow-y-auto box-content', 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 }))} />
-      )}
-    </div>
-  );
 };
 
-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}>
@@ -103,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 }[]>([]);
@@ -124,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/Typewriter/AssistantToolbar.tsx

@@ -12,12 +12,12 @@ import { runInRuntime } from '@dxos/effect';
 import { log } from '@dxos/log';
 import { Button, Icon, Input, ThemeProvider } from '@dxos/react-ui';
 
-export interface AssistantToolbarProps {
+export type AssistantToolbarProps = {
   view: EditorView;
   from: number;
   to: number;
   runtime: Runtime.Runtime<LanguageModel.LanguageModel>;
-}
+};
 
 export const AssistantToolbar = ({ view, from, to, runtime }: AssistantToolbarProps) => {
   const [isProcessing, setIsProcessing] = useState(false);
@@ -99,7 +99,7 @@ export const AssistantToolbar = ({ view, from, to, runtime }: AssistantToolbarPr
           </Input.Root>
           <Button
             variant='ghost'
-            classNames='p-1 min-bs-0 bs-6 is-6 rounded-full'
+            classNames='p-1 min-h-0 h-6 w-6 rounded-full'
             onClick={handleEditWithPrompt}
             disabled={!customPrompt || isProcessing}
           >
@@ -118,7 +118,7 @@ export const AssistantToolbar = ({ view, from, to, runtime }: AssistantToolbarPr
               onClick={handleCasual}
               disabled={isProcessing}
             >
-              <Icon icon='ph--caret-left--regular' size={4} />
+              <Icon icon='ph--caret-left--regular' />
               <span className='text-[10px] leading-none text-neutral-500 font-medium'>Casual</span>
             </Button>
 
@@ -128,7 +128,7 @@ export const AssistantToolbar = ({ view, from, to, runtime }: AssistantToolbarPr
               onClick={handleRegenerate}
               disabled={isProcessing}
             >
-              <Icon icon='ph--arrows-clockwise--regular' size={4} classNames={isProcessing ? 'animate-spin' : ''} />
+              <Icon icon='ph--arrows-clockwise--regular' classNames={isProcessing ? 'animate-spin' : ''} />
               <span className='text-[10px] leading-none text-neutral-500 font-medium'>Different</span>
             </Button>
 
@@ -138,7 +138,7 @@ export const AssistantToolbar = ({ view, from, to, runtime }: AssistantToolbarPr
               onClick={handleFormal}
               disabled={isProcessing}
             >
-              <Icon icon='ph--caret-right--regular' size={4} />
+              <Icon icon='ph--caret-right--regular' />
               <span className='text-[10px] leading-none text-neutral-500 font-medium'>Formal</span>
             </Button>
           </div>
@@ -151,7 +151,7 @@ export const AssistantToolbar = ({ view, from, to, runtime }: AssistantToolbarPr
             onClick={() => setShowPromptInput(true)}
             disabled={isProcessing}
           >
-            <Icon icon='ph--keyboard--regular' size={4} />
+            <Icon icon='ph--keyboard--regular' />
             <span className='text-[10px] leading-none text-neutral-500 font-medium'>Instruct</span>
           </Button>
         </div>

package/src/components/Typewriter/Typewriter.stories.tsx

@@ -11,15 +11,14 @@ import React, { useEffect, useState } from 'react';
 
 import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { Typewriter } from './Typewriter';
 
 const meta: Meta<typeof Typewriter> = {
-  title: 'plugins/plugin-assistant/Typewriter',
+  title: 'plugins/plugin-assistant/components/Typewriter',
   component: Typewriter,
-  parameters: {
-    layout: 'centered',
-  },
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
 };
 
 export default meta;
@@ -49,7 +48,7 @@ The quick brown fox jumps over teh lazy dog. i think this is cool.
 
 export const Default: Story = {
   render: () => {
-    const [rtEffect, setRtEffect] = useState<Runtime.Runtime<LanguageModel.LanguageModel>>();
+    const [runtime, setRuntime] = useState<Runtime.Runtime<LanguageModel.LanguageModel>>();
     useEffect(() => {
       let disposed = false;
       const rt = ManagedRuntime.make(
@@ -59,10 +58,18 @@ export const Default: Story = {
         ),
       );
       queueMicrotask(async () => {
-        if (disposed) return;
-        const x = await rt.runtime();
-        if (disposed) return;
-        setRtEffect(x);
+        try {
+          if (disposed) {
+            return;
+          }
+          const runtime = await rt.runtime();
+          if (disposed) {
+            return;
+          }
+          setRuntime(runtime);
+        } catch (error) {
+          console.error('Failed to initialize runtime:', error);
+        }
       });
       return () => {
         disposed = true;
@@ -70,14 +77,10 @@ export const Default: Story = {
       };
     }, []);
 
-    if (!rtEffect) {
+    if (!runtime) {
       return <div>...Loading</div>;
     }
 
-    return (
-      <div className='w-[800px] p-4'>
-        <Typewriter initialContent={sampleText} runtime={rtEffect} />
-      </div>
-    );
+    return <Typewriter initialContent={sampleText} runtime={runtime} />;
   },
 };

package/src/components/Typewriter/Typewriter.tsx

@@ -7,7 +7,7 @@ import type * as LanguageModel from '@effect/ai/LanguageModel';
 import type * as Runtime from 'effect/Runtime';
 import React, { useMemo, useRef } from 'react';
 
-import { DensityProvider, ThemeProvider } from '@dxos/react-ui';
+import { ThemeProvider } from '@dxos/react-ui';
 import { Editor, type EditorController } from '@dxos/react-ui-editor';
 import {
   createBasicExtensions,
@@ -40,15 +40,11 @@ export const Typewriter = ({ initialContent = '', extensions = [], runtime }: Ty
 
   return (
     <ThemeProvider>
-      <DensityProvider density='fine'>
-        <div className='is-full bs-full grid overflow-hidden'>
-          <Editor.Root ref={editorRef}>
-            <Editor.Viewport>
-              <Editor.Content initialValue={initialContent} extensions={extension} />
-            </Editor.Viewport>
-          </Editor.Root>
-        </div>
-      </DensityProvider>
+      <Editor.Root ref={editorRef}>
+        <Editor.Viewport>
+          <Editor.Content initialValue={initialContent} extensions={extension} />
+        </Editor.Viewport>
+      </Editor.Root>
     </ThemeProvider>
   );
 };

package/src/components/Typewriter/assistant-extension.tsx

@@ -8,7 +8,7 @@ import { EditorView, type Tooltip, showTooltip } from '@codemirror/view';
 import * as LanguageModel from '@effect/ai/LanguageModel';
 import * as Effect from 'effect/Effect';
 import * as Runtime from 'effect/Runtime';
-import React from 'react';
+import { createElement } from 'react';
 import { createRoot } from 'react-dom/client';
 
 import { unwrapExit } from '@dxos/effect';
@@ -54,8 +54,7 @@ const assistantState = (runtime: Runtime.Runtime<LanguageModel.LanguageModel>) =
             const dom = document.createElement('div');
             dom.classList.add('cm-tooltip-assistant');
             const root = createRoot(dom);
-
-            root.render(React.createElement(AssistantToolbar, { view, runtime, from, to }));
+            root.render(createElement(AssistantToolbar, { view, runtime, from, to }));
 
             return {
               dom,
@@ -111,9 +110,7 @@ const assistantLinter = (runtime: Runtime.Runtime<LanguageModel.LanguageModel>)
         if (match) {
           suggestions = JSON.parse(match[0]);
         }
-      } catch (e) {
-        // failed to parse
-      }
+      } catch {}
 
       const diagnostics: Diagnostic[] = [];
       for (const s of suggestions) {
@@ -137,8 +134,8 @@ const assistantLinter = (runtime: Runtime.Runtime<LanguageModel.LanguageModel>)
         }
       }
       return diagnostics;
-    } catch (e) {
-      log.error('Proofreading failed', { error: e });
+    } catch (error) {
+      log.catch(error);
       return [];
     }
   });

package/src/components/index.ts

@@ -2,15 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { 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 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 PromptArticle = lazy(() => import('./PromptArticle'));
+export const AssistantSettings: ComponentType<any> = lazy(() => import('./AssistantSettings'));