@dxos/plugin-assistant 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/src/components/ChatPrompt/ChatStatusIndicator.tsx

@@ -30,7 +30,7 @@ export const ChatStatusIndicator = ({ classNames, preset, processing, error, ...
   );
 
   return (
-    <div role='none' className={mx('relative flex', classNames)}>
+    <div className={mx('relative flex', classNames)}>
       <Spinner duration={period} state={!init ? 'flash' : error ? 'error' : processing ? 'spin' : 'pulse'} {...props} />
       {error && (
         <Tooltip.Trigger asChild content={error.message}>

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

@@ -9,9 +9,9 @@ import React from 'react';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Database, Filter, Obj } from '@dxos/echo';
 import { DxAnchor } from '@dxos/lit-ui/react';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { PreviewPlugin } from '@dxos/plugin-preview';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
 import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { Loading, withLayout } from '@dxos/react-ui/testing';
@@ -43,7 +43,7 @@ const DefaultStory = () => {
 
   const dxn = Obj.getDXN(organization).toString();
   return (
-    <div role='none' className='flex flex-col gap-2 p-4'>
+    <div className='flex flex-col gap-2 p-4'>
       <p>
         Click{' '}
         <DxAnchor className='dx-tag--anchor' dxn={dxn}>

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

@@ -9,15 +9,14 @@ import * as Layer from 'effect/Layer';
 import React, { useEffect, useMemo, useState } from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Database } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/client/echo';
+import { Database, Feed, Filter, Query } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
-import { ContextQueueService } from '@dxos/functions';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { PreviewPlugin } from '@dxos/plugin-preview';
+import { ClientPlugin, 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 { type Queue, useSpaces } from '@dxos/react-client/echo';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { EditorPreviewProvider } from '@dxos/react-ui-editor';
 import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Message, Organization, Person } from '@dxos/types';
@@ -29,19 +28,25 @@ import { ChatThread, type ChatThreadProps } from './ChatThread';
 
 random.seed(1);
 
-type MessageGenerator = Effect.Effect<void, never, Database.Service | ContextQueueService>;
+type MessageGenerator = Effect.Effect<void, never, Database.Service | Feed.ContextFeedService | Feed.FeedService>;
 
 type DefaultStoryProps = { generator?: MessageGenerator[]; delay?: number; wait?: boolean } & ChatThreadProps;
 
 const DefaultStory = ({ generator = [], delay = 0, wait, ...props }: DefaultStoryProps) => {
   const [space] = useSpaces();
-  const queue = useMemo<Queue<Message.Message> | undefined>(() => space?.queues.create(), [space]);
-  const messages = useQueueMessages(queue);
+  const feed = useMemo<Feed.Feed | undefined>(
+    () => (space ? space.db.add(Feed.make({ name: 'chat' })) : undefined),
+    [space],
+  );
+  const messages = useQuery(
+    space?.db,
+    feed ? Query.select(Filter.type(Message.Message)).from(feed) : Query.select(Filter.nothing()),
+  );
   const [done, setDone] = useState(false);
 
   // Generate messages.
   useEffect(() => {
-    if (!space || !queue) {
+    if (!space || !feed) {
       return;
     }
 
@@ -55,13 +60,21 @@ const DefaultStory = ({ generator = [], delay = 0, wait, ...props }: DefaultStor
         }
 
         setDone(true);
-      }).pipe(Effect.provide(Layer.mergeAll(Database.layer(space.db), ContextQueueService.layer(queue)))),
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            Database.layer(space.db),
+            Feed.ContextFeedService.layer(feed),
+            createFeedServiceLayer(space.queues),
+          ),
+        ),
+      ),
     );
 
     return () => {
       void runAndForwardErrors(Fiber.interrupt(fiber));
     };
-  }, [space, queue, generator, delay]);
+  }, [space, feed, generator, delay]);
 
   if (wait && !done) {
     return <Loading data={{ wait, done }} />;
@@ -74,23 +87,6 @@ const DefaultStory = ({ generator = [], delay = 0, wait, ...props }: DefaultStor
   );
 };
 
-const useQueueMessages = (queue?: Queue<Message.Message>) => {
-  const [messages, setMessages] = useState<Message.Message[]>([]);
-
-  useEffect(() => {
-    if (!queue) {
-      setMessages([]);
-      return;
-    }
-
-    const update = () => setMessages([...queue.objects]);
-    update();
-    return queue.subscribe(update);
-  }, [queue]);
-
-  return messages;
-};
-
 const meta = {
   title: 'plugins/plugin-assistant/components/ChatThread',
   component: ChatThread,

package/src/components/ChatThread/ChatThread.tsx

@@ -95,7 +95,7 @@ export const ChatThread = forwardRef<MarkdownStreamController | null, ChatThread
     );
 
     return (
-      <div role='none' data-hue={userHue} className='contents'>
+      <div data-hue={userHue} className='contents'>
         <MarkdownStream
           key={viewType}
           classNames={classNames}

package/src/components/ChatThread/registry.tsx

@@ -98,9 +98,9 @@ export const componentRegistry: XmlWidgetRegistry = {
   status: {
     block: true,
     streaming: true,
-    factory: ({ children, range }) => {
+    factory: ({ children }) => {
       const text = getXmlTextChild(children);
-      return text ? new StatusWidget(text, range.from) : null;
+      return text ? new StatusWidget(text) : null;
     },
   },
 
@@ -115,7 +115,7 @@ export const componentRegistry: XmlWidgetRegistry = {
   toolCall: {
     block: true,
     Component: (props) => (
-      <div role='none' className='py-2'>
+      <div className='py-2'>
         <ToolWidget {...props} />
       </div>
     ),
@@ -159,6 +159,10 @@ export function createBlockRenderer(viewType: Assistant.ChatView | undefined): B
     }
     let str = blockToMarkdownImpl(context, message, block);
     if (str && !block.pending) {
+      // Use a blank line as the block separator so each rendered block parses as its own
+      // markdown block. A single newline lets CommonMark absorb a following `<prompt>` (an
+      // HTML type-7 tag, which can't interrupt an open paragraph) into the previous
+      // paragraph, rendering the prompt bubble inline next to the prior assistant text.
       return (str += '\n');
     }
     return str;
@@ -193,7 +197,7 @@ const blockToMarkdownImpl = (context: MessageThreadContext, message: Message.Mes
         if (block.disposition === 'synthetic') {
           return renderXMLBlock('synthetic', { content: block.text, pending: block.pending });
         } else {
-          return `<prompt>${block.text}</prompt>`;
+          return `\n<prompt>${block.text}</prompt>`;
         }
       } else {
         const text = block.text.trim();

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

@@ -56,13 +56,13 @@ describe('reducers', () => {
       ];
 
       syncer.update(messages);
-      expect(doc.content).toEqual(['<prompt>Hello</prompt>', 'Hi there!', ''].join('\n'));
+      expect(doc.content).toEqual('\n<prompt>Hello</prompt>\nHi there!\n');
 
       Obj.update(messages[1], (obj) => {
         obj.blocks.push({ _tag: 'text', text: 'How can I help?' });
       });
       syncer.update(messages);
-      expect(doc.content).toEqual(['<prompt>Hello</prompt>', 'Hi there!', 'How can I help?', ''].join('\n'));
+      expect(doc.content).toEqual('\n<prompt>Hello</prompt>\nHi there!\nHow can I help?\n');
     }),
   );
 
@@ -78,7 +78,7 @@ describe('reducers', () => {
       ];
 
       syncer.update(messages);
-      expect(doc.content).toEqual(['<prompt>Hello</prompt>', 'Hi there!'].join('\n'));
+      expect(doc.content).toEqual('\n<prompt>Hello</prompt>\nHi there!');
 
       Obj.update(messages[1], (obj) => {
         const block = obj.blocks[0] as Mutable<ContentBlock.Text>;
@@ -91,9 +91,7 @@ describe('reducers', () => {
         obj.blocks.push({ _tag: 'text', text: 'How can I help?' });
       });
       syncer.update(messages);
-      expect(doc.content).toEqual(
-        ['<prompt>Hello</prompt>', 'Hi there! How are you?', 'How can I help?', ''].join('\n'),
-      );
+      expect(doc.content).toEqual('\n<prompt>Hello</prompt>\nHi there! How are you?\nHow can I help?\n');
     }),
   );
 

package/src/components/ChatThread/widgets/ReasoningWidget.ts

@@ -46,10 +46,10 @@ export class ReasoningWidget extends WidgetType {
           .attributes({ 'data-trail-container': '' })
           .append(
             Domino.of('div')
-              .classNames('relative z-10 bg-base-surface rounded-sm text-sm text-subdued px-2 py-1')
+              .classNames('relative z-10 bg-base-surface rounded-sm text-sm text-subdued py-1')
               .append(
                 Domino.of('div')
-                  .classNames('max-h-[5lh] overflow-y-auto')
+                  .classNames('px-2 max-h-[5lh] overflow-y-auto dx-scrollbar-thin')
                   .text(this.text)
                   .attributes({ 'data-reasoning-text': '' }),
               ),

package/src/components/ChatThread/widgets/StatusWidget.ts

@@ -9,32 +9,15 @@ import { Domino } from '@dxos/ui';
 import { styles } from './defaults';
 
 /**
- * Props used to derive a stable key for a reasoning block across CodeMirror widget rebuilds.
- * CodeMirror does not assign persistent IDs to widgets; streaming re-runs the factory each tick.
- */
-export type StatusWidgetBlockIdProps = {
-  id?: string;
-  range?: { from: number; to: number };
-};
-
-/**
- * AI reasoning widget.
+ * AI status widget.
  */
 export class StatusWidget extends WidgetType {
-  readonly #pos: string;
-  /** The timer id last registered for this instance (may differ from the map if superseded). */
-  #ownedTimerId: ReturnType<typeof setTimeout> | null = null;
-
-  constructor(
-    private readonly text: string,
-    pos: string | number | undefined,
-  ) {
+  constructor(private readonly text: string) {
     super();
-    this.#pos = pos === undefined || pos === '' ? 'status' : String(pos);
   }
 
   override eq(other: this) {
-    return this.text === other.text && this.#pos === other.#pos;
+    return this.text === other.text;
   }
 
   override toDOM() {
@@ -57,7 +40,6 @@ export class StatusWidget extends WidgetType {
                       .classNames('relative z-10 rounded-sm text-sm leading-5')
                       .attributes({ 'data-status-text': '' })
                       .text(this.text),
-                    Domino.of('div').attributes({ 'data-id': this.#pos }),
                   ),
               ),
           ),
@@ -65,69 +47,7 @@ export class StatusWidget extends WidgetType {
   }
 
   override updateDOM(dom: HTMLElement) {
-    // Update only the text leaf; `dom` may be wrapped in an outer shell, and the trail host is a
-    // sibling of the text node inside the wrapper — setting `textContent` on the wrong
-    // ancestor would remove `[data-id]`.
     dom.querySelector<HTMLElement>('[data-status-text]')?.replaceChildren(this.text);
-
-    const trailHost = dom.querySelector<HTMLElement>('[data-id]');
-    if (trailHost?.childElementCount === 0) {
-      trailHost.append(...createTrailLayers());
-    }
-
-    this.#scheduleTrailRemoval(dom);
     return true;
   }
-
-  override destroy(_dom: HTMLElement) {
-    this.#clearOwnedTrailTimer();
-  }
-
-  #scheduleTrailRemoval(dom: HTMLElement) {
-    const previous = trailRemovalTimers.get(this.#pos);
-    if (previous !== undefined) {
-      clearTimeout(previous);
-    }
-
-    const timerId = setTimeout(() => {
-      if (trailRemovalTimers.get(this.#pos) !== timerId) {
-        return;
-      }
-      trailRemovalTimers.delete(this.#pos);
-      this.#ownedTimerId = null;
-      dom.querySelector<HTMLElement>('[data-id]')?.remove();
-    }, TRAIL_REMOVAL_DELAY_MS);
-
-    trailRemovalTimers.set(this.#pos, timerId);
-    this.#ownedTimerId = timerId;
-  }
-
-  #clearOwnedTrailTimer() {
-    const active = trailRemovalTimers.get(this.#pos);
-    if (active !== undefined && active === this.#ownedTimerId) {
-      clearTimeout(active);
-      trailRemovalTimers.delete(this.#pos);
-    }
-    this.#ownedTimerId = null;
-  }
 }
-
-const trail = [
-  'absolute z-0 aspect-[2/1] w-16',
-  'bg-[radial-gradient(at_100%_50%,_theme(colors.green.700),_transparent_80%)]',
-  '[offset-anchor:100%_50%] [offset-path:border-box]',
-];
-
-/** Delay after the last content update before hiding the trail. */
-const TRAIL_REMOVAL_DELAY_MS = 1_000;
-
-/**
- * One pending removal timer per logical block. Streaming creates a new widget instance each tick;
- * `destroy` may run after the next instance has already scheduled, so we must not clear a newer timer.
- */
-const trailRemovalTimers = new Map<string, ReturnType<typeof setTimeout>>();
-
-const createTrailLayers = (): [HTMLElement, HTMLElement] => [
-  Domino.of('div').classNames(...trail, 'animate-trail').root,
-  Domino.of('div').classNames(...trail, 'animate-trail-offset').root,
-];

package/src/components/ChatThread/widgets/SummaryWidget.tsx

@@ -20,9 +20,7 @@ export const SummaryWidget = ({ children }: XmlWidgetProps<MessageThreadContext>
     <TogglePanel.Root classNames={styles.border}>
       <TogglePanel.Header classNames='text-sm bg-group-surface'>{t('summary.label')}</TogglePanel.Header>
       <TogglePanel.Content>
-        <div role='none' className='p-1 text-sm text-subdued'>
-          {children}
-        </div>
+        <div className='p-1 text-sm text-subdued'>{children}</div>
       </TogglePanel.Content>
     </TogglePanel.Root>
   );

package/src/components/ProcessTree/ProcessTree.tsx

@@ -61,6 +61,7 @@ export const ProcessTree = composable<HTMLDivElement, ProcessTreeProps>(
                       <Tooltip.Trigger className='p-1' content={process.state.toString()}>
                         <Icon
                           size={4}
+                          synchronized
                           classNames={mx(
                             process.state === Process.State.RUNNING && 'animate-spin',
                             process.state === Process.State.FAILED && 'text-error-text',
@@ -78,7 +79,7 @@ export const ProcessTree = composable<HTMLDivElement, ProcessTreeProps>(
                           )}
                         />
                       </Tooltip.Trigger>
-                      <div role='none' className='flex items-center gap-2 text-xs overflow-hidden'>
+                      <div className='flex items-center gap-2 text-xs overflow-hidden'>
                         {/* TODO(burdon): Name is too long (and not informative). */}
                         <span className='truncate text-description select-none'>
                           {process.params.name ?? process.pid.toString()}

package/src/components/TaskList/TaskList.stories.tsx

@@ -0,0 +1,44 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { Plan } from '@dxos/assistant-toolkit';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { TaskList } from './TaskList';
+
+type DefaultStoryProps = {
+  tasks?: Omit<Plan.Task, 'id'>[];
+};
+
+const DefaultStory = ({ tasks = [] }: DefaultStoryProps) => {
+  const plan = React.useMemo(() => Plan.makePlan({ tasks }), [tasks]);
+  return <TaskList plan={plan} />;
+};
+
+const meta = {
+  title: 'plugins/plugin-assistant/components/TaskList',
+  render: (args) => <DefaultStory {...args} />,
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    tasks: [
+      { title: 'Crack the eggs', status: 'done' },
+      { title: 'Whisk with salt and pepper', status: 'done' },
+      { title: 'Heat the pan with butter', status: 'in-progress' },
+      { title: 'Pour and stir continuously', status: 'todo' },
+      { title: 'Plate and serve', status: 'todo' },
+    ],
+  },
+};
+
+export const Empty: Story = {};

package/src/components/TaskList/TaskList.tsx

@@ -0,0 +1,45 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React from 'react';
+
+import { Plan } from '@dxos/assistant-toolkit';
+import { useObject } from '@dxos/react-client/echo';
+import { Icon, Tag, type ThemedClassName } from '@dxos/react-ui';
+import { Row, RowList } from '@dxos/react-ui-list';
+import { composable, composableProps } from '@dxos/ui-theme';
+
+export type TaskListProps = ThemedClassName<{
+  plan: Plan.Plan;
+}>;
+
+export const TaskList = composable<HTMLDivElement, TaskListProps>(({ plan, ...props }, forwardedRef) => {
+  const [snapshot] = useObject(plan);
+  const tasks = snapshot?.tasks ?? [];
+
+  return (
+    <RowList.Root>
+      <RowList.Viewport {...composableProps(props, { classNames: 'dx-container' })} ref={forwardedRef}>
+        <RowList.Content aria-label='Tasks'>
+          {tasks.map((task) => (
+            <Row key={task.id} id={task.id} classNames='py-0'>
+              <div className='flex items-center gap-2'>
+                <Icon
+                  icon={task.status === 'done' ? 'ph--check--regular' : 'ph--circle--regular'}
+                  classNames={task.status === 'done' ? 'text-success-text' : undefined}
+                  size={4}
+                />
+                <span className='sr-only'>
+                  {task.status === 'done' ? 'done' : task.status === 'in-progress' ? 'in progress' : 'to do'}
+                </span>
+                <span className='truncate flex-1'>{task.title}</span>
+                {task.status === 'in-progress' && <Tag palette='info'>pending</Tag>}
+              </div>
+            </Row>
+          ))}
+        </RowList.Content>
+      </RowList.Viewport>
+    </RowList.Root>
+  );
+});

package/src/{cli → components/TaskList}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2026 DXOS.org
 //
 
-export * from './plugin';
+export * from './TaskList';

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

@@ -48,7 +48,7 @@ const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
     const space = client.spaces.get()[0];
     return space.db.add(
       Blueprint.make({
-        key: 'example.com/blueprint/test',
+        key: 'com.example.blueprint.test',
         name: 'Test',
         instructions: Template.make({ source }),
       }),

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

@@ -34,7 +34,7 @@ const DefaultStory = () => {
     invariant(space, 'TemplateForm story requires at least one space');
     return space.db.add(
       Blueprint.make({
-        key: 'example.com/blueprint/test',
+        key: 'com.example.blueprint.test',
         name: 'Test',
         instructions: Template.make({ source: TEMPLATE }),
       }),
@@ -48,11 +48,7 @@ const DefaultStory = () => {
     [blueprint],
   );
 
-  return (
-    <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm id={blueprint.id} template={blueprint.instructions} onChange={handleChange} />
-    </div>
-  );
+  return <TemplateForm id={blueprint.id} template={blueprint.instructions} onChange={handleChange} />;
 };
 
 const meta = {