@dxos/plugin-assistant 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -9,13 +9,13 @@ import { type Blueprint } from '@dxos/blueprints';
 import { Filter, Obj, Type } from '@dxos/echo';
 import { type Space, useQuery } from '@dxos/react-client/echo';
 import { Icon, IconButton, Popover, Select, useTranslation } from '@dxos/react-ui';
-import { SearchList } from '@dxos/react-ui-searchlist';
+import { Listbox, SearchList } from '@dxos/react-ui-searchlist';
 import { Tabs } from '@dxos/react-ui-tabs';
 
 import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useItemTypes } from '../../hooks';
 import { meta } from '../../meta';
 
-const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-[25rem] max-is-[--text-content]';
+const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
 
 export type ChatOptionsProps = {
   space: Space;
@@ -65,12 +65,12 @@ export const ChatOptions = ({
         </Popover.Trigger>
         <Popover.Portal>
           <Popover.Content side='top' classNames={panelClassNames}>
-            <Tabs.Root orientation='horizontal' defaultValue='blueprints' defaultActivePart='list'>
+            <Tabs.Root orientation='horizontal' defaultValue='blueprints' defaultActivePart='list' tabIndex={-1}>
               <Tabs.Viewport classNames='max-bs-[--radix-popover-content-available-height] grid grid-rows-[1fr_min-content] [&_[cmdk-root]]:contents [&_[role="tabpanel"]]:grid [&_[role="tabpanel"]]:grid-rows-[1fr_min-content] [&_[role="listbox"]]:min-bs-0 [&_[role="listbox"]]:overflow-y-auto [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:pli-cardSpacingChrome [&_[role="tabpanel"][data-state="active"]]:order-first [&_[role="tabpanel"][data-state="inactive"]]:hidden'>
-                <Tabs.Tabpanel value='blueprints'>
+                <Tabs.Tabpanel value='blueprints' tabIndex={-1} classNames='dx-focus-ring-inset'>
                   <BlueprintsPanel blueprintRegistry={blueprintRegistry} space={space} context={context} />
                 </Tabs.Tabpanel>
-                <Tabs.Tabpanel value='model'>
+                <Tabs.Tabpanel value='model' tabIndex={-1} classNames='dx-focus-ring-inset !pli-0'>
                   <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
                 </Tabs.Tabpanel>
                 <Tabs.Tablist classNames='sm:overflow-x-hidden justify-center p-[--dx-cardSpacingChrome] border-bs border-subduedSeparator order-last'>
@@ -98,7 +98,7 @@ const BlueprintsPanel = ({
 }: Pick<ChatOptionsProps, 'blueprintRegistry' | 'space' | 'context'>) => {
   const { t } = useTranslation(meta.id);
 
-  const blueprints = useBlueprints({ blueprintRegistry });
+  const blueprints = useBlueprints({ blueprintRegistry, space });
   const activeBlueprints = useActiveBlueprints({ context });
   const { onUpdateBlueprint } = useBlueprintHandlers({ space, context, blueprintRegistry });
 
@@ -120,7 +120,7 @@ const BlueprintsPanel = ({
           );
         })}
       </SearchList.Content>
-      <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-cardSpacingChrome' />
+      <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-cardSpacingChrome' autoFocus />
     </SearchList.Root>
   );
 };
@@ -131,24 +131,16 @@ const ModelsPanel = ({
   onPresetChange,
 }: Pick<ChatOptionsProps, 'presets' | 'preset' | 'onPresetChange'>) => {
   return (
-    <ul role='listbox' className='plb-cardSpacingChrome'>
+    <Listbox.Root value={preset} onValueChange={onPresetChange} autoFocus>
       {presets?.map(({ id, label }) => {
-        const isActive = preset === id;
         return (
-          <li
-            role='option'
-            key={id}
-            aria-selected={isActive}
-            tabIndex={0}
-            className='overflow-hidden dx-focus-ring flex gap-2 p-1 pis-2 pie-2 items-center rounded-sm select-none cursor-pointer hover:bg-hoverOverlay'
-            onClick={() => onPresetChange?.(id)}
-          >
-            <div className='grow truncate'>{label}</div>
-            <Icon icon='ph--check--regular' classNames={[!isActive && 'invisible']} />
-          </li>
+          <Listbox.Option key={id} value={id}>
+            <Listbox.OptionLabel>{label}</Listbox.OptionLabel>
+            <Listbox.OptionIndicator />
+          </Listbox.Option>
         );
       })}
-    </ul>
+    </Listbox.Root>
   );
 };
 
@@ -184,8 +176,8 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
   const { objects: contextObjects, onUpdateObject } = useContextObjects({ space, context });
 
   return (
-    <SearchList.Root classNames='pis-2 pie-2'>
-      <SearchList.Content classNames='plb-cardSpacingChrome [&:has([cmdk-list-sizer]:empty)]:plb-0'>
+    <SearchList.Root>
+      <SearchList.Content classNames='p-cardSpacingChrome [&:has([cmdk-list-sizer]:empty)]:plb-0'>
         {objects.length ? (
           objects.map((object) => {
             const label = Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id;
@@ -207,7 +199,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
         )}
       </SearchList.Content>
 
-      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 mbe-cardSpacingChrome'>
+      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 pli-cardSpacingChrome mbe-cardSpacingChrome'>
         <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
           <Select.TriggerButton density='fine' placeholder={t('type filter placeholder')} />
           <Select.Portal>
@@ -226,7 +218,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
             </Select.Content>
           </Select.Portal>
         </Select.Root>
-        <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-0' />
+        <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-0' autoFocus />
       </div>
     </SearchList.Root>
   );

package/src/components/ChatThread/ChatThread.stories.tsx

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Effect, Fiber, Layer } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Fiber from 'effect/Fiber';
+import * as Layer from 'effect/Layer';
 import React, { useEffect, useMemo, useState } from 'react';
 
 import { ContextQueueService, DatabaseService } from '@dxos/functions';
@@ -13,10 +13,10 @@ import { faker } from '@dxos/random';
 import { useQueue, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Popover } from '@dxos/react-ui';
-import { PreviewProvider, useRefPopover } from '@dxos/react-ui-editor';
+import { withTheme } from '@dxos/react-ui/testing';
+import { PreviewPopoverProvider, usePreviewPopover } from '@dxos/react-ui-editor/testing';
 import { Card } from '@dxos/react-ui-stack';
 import { DataType } from '@dxos/schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { createMessageGenerator } from '../../testing';
 import { translations } from '../../translations';
@@ -64,21 +64,21 @@ const DefaultStory = ({ generator = [], delay = 0, ...props }: StoryProps) => {
 
   // TODO(burdon): Elsewhere PreviewProvider is implemented via the plugin-preview.
   return (
-    <PreviewProvider
+    <PreviewPopoverProvider
       onLookup={async ({ label, ref }) => {
         return { label, text: ref };
       }}
     >
       <ChatThread {...props} messages={queue?.objects ?? []} ref={setController} />
       <PreviewCard />
-    </PreviewProvider>
+    </PreviewPopoverProvider>
   );
 };
 
 // TODO(burdon): Factor out.
 // TODO(burdon): Provide renderer for preview extension.
 const PreviewCard = () => {
-  const { target } = useRefPopover('PreviewCard');
+  const { target } = usePreviewPopover('PreviewCard');
 
   return (
     <Popover.Portal>
@@ -100,12 +100,11 @@ const meta = {
   component: ChatThread,
   render: DefaultStory,
   decorators: [
-    withClientProvider({ createIdentity: true, createSpace: true, types: [DataType.Organization, DataType.Person] }),
-    withLayout({ fullscreen: true }),
     withTheme,
+    withClientProvider({ createIdentity: true, createSpace: true, types: [DataType.Organization, DataType.Person] }),
   ],
   parameters: {
-    layout: 'fullscreen', // TODO(burdon): Replace withLayout.
+    layout: 'fullscreen',
     translations,
   },
 } satisfies Meta<typeof ChatThread>;

package/src/components/ChatThread/ChatThread.tsx

@@ -32,12 +32,16 @@ export type ChatThreadProps = ThemedClassName<
     identity?: Identity;
     messages?: DataType.Message[];
     error?: Error;
+    overscroll?: number;
     onEvent?: (event: ChatEvent) => void;
-  } & Pick<MarkdownStreamProps, 'cursor' | 'fadeIn'>
+  } & Pick<MarkdownStreamProps, 'cursor' | 'fadeIn' | 'overscroll'>
 >;
 
 export const ChatThread = forwardRef<ChatThreadController | null, ChatThreadProps>(
-  ({ classNames, identity, messages = [], error, cursor = false, fadeIn = true, onEvent }, forwardedRef) => {
+  (
+    { classNames, identity, messages = [], error, cursor = false, fadeIn = true, overscroll, onEvent },
+    forwardedRef,
+  ) => {
     const userHue = useMemo(() => {
       return identity?.profile?.data?.hue || keyToFallback(identity?.identityKey ?? PublicKey.random()).hue;
     }, [identity]);
@@ -81,10 +85,10 @@ export const ChatThread = forwardRef<ChatThreadController | null, ChatThreadProp
       >
         <MarkdownStream
           ref={setController}
-          classNames='bs-full max-is-prose overflow-hidden'
           registry={componentRegistry}
           cursor={cursor}
           fadeIn={fadeIn}
+          overscroll={overscroll}
           onEvent={handleEvent}
         />
       </div>

package/src/components/ChatThread/registry.tsx

@@ -13,7 +13,7 @@ import {
   SummaryWidget,
   ToggleContainer,
 } from '@dxos/react-ui-components';
-import { type XmlWidgetProps, type XmlWidgetRegistry } from '@dxos/react-ui-editor';
+import { type XmlWidgetProps, type XmlWidgetRegistry, getXmlTextChild } from '@dxos/react-ui-editor';
 import { Json } from '@dxos/react-ui-syntax-highlighter';
 import { ContentBlock, type DataType } from '@dxos/schema';
 
@@ -32,11 +32,6 @@ const Fallback = ({ _tag, ...props }: XmlWidgetProps<MessageThreadContext>) => {
   );
 };
 
-const getTextChild = (children: any[]): string | null => {
-  const child = children?.[0];
-  return typeof child === 'string' ? child : null;
-};
-
 /**
  * Custom XML tags registry.
  */
@@ -48,14 +43,14 @@ export const componentRegistry: XmlWidgetRegistry = {
   ['prompt' as const]: {
     block: true,
     factory: (props) => {
-      const text = getTextChild(props.children);
+      const text = getXmlTextChild(props.children);
       return text ? new PromptWidget(text) : null;
     },
   },
   ['reference' as const]: {
     block: false,
     factory: (props) => {
-      const text = getTextChild(props.children);
+      const text = getXmlTextChild(props.children);
       return text && props.ref ? new ReferenceWidget(text, props.ref) : null;
     },
   },
@@ -63,7 +58,7 @@ export const componentRegistry: XmlWidgetRegistry = {
     block: true,
     factory: (props) => {
       const options = props.children
-        ?.map((option: any) => option._tag === 'option' && getTextChild(option.children))
+        ?.map((option: any) => option._tag === 'option' && getXmlTextChild(option.children))
         .filter(Boolean);
       return options?.length ? new SelectWidget(options) : null;
     },
@@ -71,14 +66,14 @@ export const componentRegistry: XmlWidgetRegistry = {
   ['suggestion' as const]: {
     block: true,
     factory: (props) => {
-      const text = getTextChild(props.children);
+      const text = getXmlTextChild(props.children);
       return text ? new SuggestionWidget(text) : null;
     },
   },
   ['summary' as const]: {
     block: true,
     factory: (props) => {
-      const text = getTextChild(props.children);
+      const text = getXmlTextChild(props.children);
       return text ? new SummaryWidget(text) : null;
     },
   },

package/src/components/ChatThread/sync.test.ts

@@ -4,7 +4,7 @@
 
 import { EditorView } from '@codemirror/view';
 import { describe, it } from '@effect/vitest';
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 
 import { type ContentBlock } from '@dxos/schema';
 

package/src/components/ChatThread/sync.ts

@@ -65,7 +65,7 @@ export class MessageSyncer {
 
   sync(messages: DataType.Message[]) {
     log('sync', {
-      messages: messages.map((m) => m.blocks.length),
+      messages: messages.map((message) => message.blocks.length),
       currentMessageIndex: this._currentMessageIndex,
       currentBlockIndex: this._currentBlockIndex,
       currentBlockContent: this._currentBlockContent,

package/src/components/SequenceContainer.tsx

@@ -25,7 +25,7 @@ const parseSequence = (text: string): SequenceDefinition | undefined => {
     const json = JSON5.parse(text);
     const { steps } = json;
     return { steps };
-  } catch (error) {
+  } catch {
     // Ignore.
   }
 };
@@ -40,7 +40,7 @@ export const SequenceContainer = ({ sequence }: { sequence: Sequence }) => {
     });
   }, [sequence]);
 
-  const editorRef = useRef<EditorView | undefined>(undefined);
+  const editorRef = useRef<EditorView>(null);
 
   // TODO(burdon): Factor out.
   // const toolRegistry = useMemo(() => {

package/src/components/SequenceEditor/SequenceEditor.stories.tsx

@@ -2,11 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
 
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { RESEARCH_SEQUENCE_DEFINITION } from '../../testing';
 import { translations } from '../../translations';
@@ -16,7 +15,9 @@ import { SequenceEditor } from './SequenceEditor';
 const meta = {
   title: 'plugins/plugin-assistant/SequenceEditor',
   component: SequenceEditor,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'mli-auto max-is-[50rem] justify-center' })],
+  // TODO(wittjosiah): Fix story.
+  render: () => <>TODO</>,
+  decorators: [withTheme, withLayout({ container: 'column' })],
   parameters: {
     translations,
   },

package/src/components/SequenceEditor/SequenceEditor.tsx

@@ -21,7 +21,7 @@ export type SequenceEditorProps = ThemedClassName<{
 }>;
 
 // TODO(burdon): Factor out JsonEditor.
-export const SequenceEditor = forwardRef<EditorView | undefined, SequenceEditorProps>(
+export const SequenceEditor = forwardRef<EditorView | null, SequenceEditorProps>(
   ({ classNames, sequence }, forwardedRef) => {
     const { themeMode } = useThemeContext();
     const { parentRef, view } = useTextEditor({
@@ -43,7 +43,7 @@ export const SequenceEditor = forwardRef<EditorView | undefined, SequenceEditorP
       ],
     });
 
-    useImperativeHandle(forwardedRef, () => view, [view]);
+    useImperativeHandle<EditorView | null, EditorView | null>(forwardedRef, () => view, [view]);
 
     return <div ref={parentRef} className={mx('overflow-hidden', classNames)} />;
   },

package/src/components/TemplateEditor/TemplateEditor.stories.tsx

@@ -2,8 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
@@ -11,7 +9,7 @@ import { createSystemPrompt } from '@dxos/assistant';
 import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
 import { translations } from '../../translations';
@@ -29,6 +27,8 @@ const TEMPLATE = trim`
   - {{this}}
   {{/each}}
 
+  Reponse in the format: <suggestion>SUGGESTION</suggestion>
+
   ---
 
   {{input}}
@@ -61,13 +61,13 @@ const meta = {
   component: TemplateEditor as any,
   render: DefaultStory,
   decorators: [
+    withTheme,
+    withLayout({ container: 'column' }),
     withClientProvider({
       types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
     }),
-    withLayout({ fullscreen: true, classNames: 'justify-center bg-deckSurface' }),
-    withTheme,
   ],
   parameters: {
     translations,

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+import { xml } from '@codemirror/lang-xml';
+import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
 import React from 'react';
 
 import { type Template } from '@dxos/blueprints';
@@ -12,10 +14,11 @@ import {
   createDataExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
+  decorateMarkdown,
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
-import { isNotFalsy } from '@dxos/util';
+import { isNonNullable } from '@dxos/util';
 
 import { meta } from '../../meta';
 
@@ -46,11 +49,12 @@ export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps
           placeholder: t('template placeholder'),
         }),
         createThemeExtensions({ themeMode }),
-
-        // Extend markdown with handlebars support.
         createMarkdownExtensions(),
+        decorateMarkdown(), // TODO(burdon): Move into bundle.
+        xml(),
         handlebars(),
-      ].filter(isNotFalsy),
+        syntaxHighlighting(defaultHighlightStyle),
+      ].filter(isNonNullable),
     };
   }, [themeMode, template.source?.target]);
 

package/src/components/TemplateEditor/TemplateForm.stories.tsx

@@ -2,15 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
 import { translations } from '../../translations';
@@ -52,13 +50,13 @@ const meta = {
   component: TemplateForm,
   render: DefaultStory,
   decorators: [
+    withTheme,
+    withLayout({ container: 'column' }),
     withClientProvider({
       types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
     }),
-    withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
-    withTheme,
   ],
   parameters: {
     translations,

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import React, { Fragment, useEffect } from 'react';
 
 import { type Template } from '@dxos/blueprints';

package/src/components/ToolBlock/ToolBlock.tsx

@@ -2,7 +2,7 @@
 // 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';
@@ -18,8 +18,7 @@ import {
 } 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 { isNonNullable, safeParseJson } from '@dxos/util';
 
 import { meta } from '../../meta';
 
@@ -34,7 +33,7 @@ export type ToolBlockProps = {
 export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
   const { t } = useTranslation(meta.id);
 
-  const getToolCaption = (tool?: AiTool.Any, status?: AgentStatus) => {
+  const getToolCaption = (tool?: Tool.Any, status?: AgentStatus) => {
     if (!tool) {
       return t('calling tool label');
     }
@@ -43,9 +42,9 @@ export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
   };
 
   const items = useMemo(() => {
-    let lastToolCall: { tool: AiTool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
+    let lastToolCall: { tool: Tool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
     // TODO(burdon): Get from context?
-    const tools: AiTool.Any[] = []; //processor.conversation.toolkit?.tools ?? [];
+    const tools: Tool.Any[] = []; //processor.conversation.toolkit?.tools ?? [];
     return blocks
       .filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult' || block._tag === 'summary')
       .map((block) => {
@@ -114,6 +113,7 @@ 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);

package/src/components/Toolbar/Toolbar.tsx

@@ -15,7 +15,7 @@ export const Toolbar = ({ chat, companionTo, onReset, classNames }: ThemedClassN
 
   return (
     <MenuProvider {...menu} attendableId={companionTo ? fullyQualifiedId(companionTo) : fullyQualifiedId(chat)}>
-      <ToolbarMenu classNames={classNames} />
+      <ToolbarMenu classNames={classNames} textBlockWidth />
     </MenuProvider>
   );
 };

package/src/components/Toolbar/useChatToolbarActions.ts

@@ -3,7 +3,7 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 import { useMemo } from 'react';
 
 import { createIntent, useIntentDispatcher } from '@dxos/app-framework';

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

@@ -2,8 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
@@ -15,7 +13,7 @@ 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/index.ts

@@ -5,9 +5,9 @@
 import { lazy } from 'react';
 
 export * from './AssistantSettings';
+export * from './BlueprintSettings';
 export * from './Chat';
 export * from './ChatProgress';
-export * from './PromptSettings';
 export * from './TemplateEditor';
 export * from './Toolbar';
 export * from './Toolbox';

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/list.ts

@@ -2,7 +2,8 @@
 // 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';
@@ -10,7 +11,8 @@ import { trim } from '@dxos/util';
 
 // TODO(burdon): Factor out to space plugin.
 export default defineFunction({
-  name: 'dxos.org/function/assistant/list',
+  key: 'dxos.org/function/assistant/list',
+  name: 'Assistant list',
   description:
     // TODO(wittjosiah): Find a better way to prompt for looking up typenames before querying with them.
     trim`