@dxos/plugin-assistant 0.8.4-main.422d1c7879 → 0.8.4-main.43cb759274

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

@@ -1,9 +1,9 @@
-// @vitest-environment jsdom
-
 //
 // Copyright 2025 DXOS.org
 //
 
+// @vitest-environment jsdom
+
 import { EditorView } from '@codemirror/view';
 import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
@@ -14,7 +14,7 @@ import { type ContentBlock, type Message } from '@dxos/types';
 
 import { createMessage } from '#testing';
 
-import { blockToMarkdown } from './registry';
+import { createBlockRenderer } from './registry';
 import { type BlockRenderer, MessageSyncer, type MessageThreadContext, type TextModel } from './sync';
 
 class TestDocument implements TextModel {
@@ -48,7 +48,7 @@ describe('reducers', () => {
     'basic sync',
     Effect.fn(function* ({ expect }) {
       const doc = new TestDocument();
-      const syncer = new MessageSyncer(doc, blockToMarkdown);
+      const syncer = new MessageSyncer(doc, createBlockRenderer('thinking'));
 
       const messages = [
         createMessage('user', [{ _tag: 'text', text: 'Hello' }]),
@@ -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.change(messages[1], (obj) => {
+      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');
     }),
   );
 
@@ -70,7 +70,7 @@ describe('reducers', () => {
     'sync with partial updates',
     Effect.fn(function* ({ expect }) {
       const doc = new TestDocument();
-      const syncer = new MessageSyncer(doc, blockToMarkdown);
+      const syncer = new MessageSyncer(doc, createBlockRenderer('thinking'));
 
       const messages = [
         createMessage('user', [{ _tag: 'text', text: 'Hello' }]),
@@ -78,22 +78,20 @@ 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.change(messages[1], (obj) => {
+      Obj.update(messages[1], (obj) => {
         const block = obj.blocks[0] as Mutable<ContentBlock.Text>;
         block.text = 'Hi there! How are you?';
         block.pending = false;
       });
       syncer.update(messages);
 
-      Obj.change(messages[1], (obj) => {
+      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 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');
     }),
   );
 
@@ -105,10 +103,10 @@ describe('reducers', () => {
     'streaming reasoning with list-marker transitions does not duplicate opening tag',
     Effect.fn(function* ({ expect }) {
       const doc = new TestDocument();
-      const syncer = new MessageSyncer(doc, blockToMarkdown);
+      const syncer = new MessageSyncer(doc, createBlockRenderer('thinking'));
 
       const setReasoning = (message: Message.Message, text: string, pending: boolean) => {
-        Obj.change(message, (message) => {
+        Obj.update(message, (message) => {
           const block = message.blocks[0] as Mutable<ContentBlock.Reasoning>;
           block.reasoningText = text;
           block.pending = pending;
@@ -143,6 +141,74 @@ describe('reducers', () => {
     }),
   );
 
+  // Regression: prompt "respond with your name inside an xml tag" produces a streamed
+  // reasoning block followed by a text block containing a non-registered XML tag
+  // (`<name>Claude</name>`). The text block must appear in the document AFTER the
+  // closed reasoning block — the bug symptom is the reasoning tag rendering with no
+  // follow-up response visible.
+  it.effect(
+    'reasoning block followed by text containing a non-registered xml tag',
+    Effect.fn(function* ({ expect }) {
+      const doc = new TestDocument();
+      const syncer = new MessageSyncer(doc, createBlockRenderer('thinking'));
+
+      const setReasoning = (message: Message.Message, text: string, pending: boolean) => {
+        Obj.update(message, (message) => {
+          const block = message.blocks[0] as Mutable<ContentBlock.Reasoning>;
+          block.reasoningText = text;
+          block.pending = pending;
+        });
+      };
+
+      const setText = (message: Message.Message, text: string, pending: boolean) => {
+        Obj.update(message, (message) => {
+          const block = message.blocks[1] as Mutable<ContentBlock.Text>;
+          block.text = text;
+          block.pending = pending;
+        });
+      };
+
+      // Tick 1: reasoning starts streaming.
+      const messages = [createMessage('assistant', [{ _tag: 'reasoning', reasoningText: 'Thinking', pending: true }])];
+      syncer.update(messages);
+
+      // Tick 2: reasoning grows.
+      setReasoning(messages[0], 'Thinking about the answer', true);
+      syncer.update(messages);
+
+      // Tick 3: reasoning closes.
+      setReasoning(messages[0], 'Thinking about the answer', false);
+      syncer.update(messages);
+
+      // Tick 4: text block appears, pending and empty (model has started emitting but text is still '').
+      Obj.update(messages[0], (message) => {
+        message.blocks.push({ _tag: 'text', text: '', pending: true });
+      });
+      syncer.update(messages);
+
+      // Tick 5: partial text — opening tag only.
+      setText(messages[0], '<name>', true);
+      syncer.update(messages);
+
+      // Tick 6: full text streamed.
+      setText(messages[0], '<name>Claude</name>', true);
+      syncer.update(messages);
+
+      // Tick 7: text finalised.
+      setText(messages[0], '<name>Claude</name>', false);
+      syncer.update(messages);
+
+      // Both the closed reasoning tag and the response text must be present.
+      expect(doc.content).toContain('<reasoning>Thinking about the answer</reasoning>');
+      expect(doc.content).toContain('<name>Claude</name>');
+
+      const openReasoning = (doc.content.match(/<reasoning>/g) ?? []).length;
+      const closeReasoning = (doc.content.match(/<\/reasoning>/g) ?? []).length;
+      expect(openReasoning).toBe(1);
+      expect(closeReasoning).toBe(1);
+    }),
+  );
+
   // Direct test of `MessageSyncer`'s tolerance for non-monotonic renderer output —
   // any renderer that produces a shorter string for the same streaming block (e.g., due
   // to whitespace normalisation or future transforms) must not produce duplicate output.
@@ -170,12 +236,12 @@ describe('reducers', () => {
       const messages = [createMessage('assistant', [{ _tag: 'reasoning', reasoningText: 'abc\n1.', pending: true }])];
 
       syncer.update(messages);
-      Obj.change(messages[0], (obj) => {
+      Obj.update(messages[0], (obj) => {
         const block = obj.blocks[0] as Mutable<ContentBlock.Reasoning>;
         block.reasoningText = 'abc\n1. ';
       });
       syncer.update(messages);
-      Obj.change(messages[0], (obj) => {
+      Obj.update(messages[0], (obj) => {
         const block = obj.blocks[0] as Mutable<ContentBlock.Reasoning>;
         block.reasoningText = 'abc\n1. tail';
         block.pending = false;

package/src/components/ChatThread/sync.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type DXN } from '@dxos/echo';
-import { type MarkdownStreamController } from '@dxos/react-ui-components';
+import { type URI } from '@dxos/keys';
+import { type MarkdownStreamController } from '@dxos/react-ui-markdown';
 import { type ContentBlock, type Message } from '@dxos/types';
 import { type StateDispatch, type XmlWidgetStateManager } from '@dxos/ui-editor';
 
@@ -40,7 +40,7 @@ export class MessageThreadContext implements Pick<MarkdownStreamController, 'upd
   }
 
   // TODO(burdon): Resolve name from hypergraph.
-  getObjectLabel(_id: DXN) {
+  getObjectLabel(_id: URI.URI) {
     return 'Object';
   }
 }

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

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 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.
@@ -36,26 +38,30 @@ export class ReasoningWidget extends WidgetType {
   }
 
   override toDOM() {
-    const root = Domino.of('div')
-      .classNames('pt-2 pb-2')
+    return Domino.of('div')
+      .classNames(styles.padding)
       .append(
         Domino.of('div')
-          .classNames('relative overflow-hidden p-px rounded-sm border border-subdued-separator')
+          .classNames('relative overflow-hidden p-px', styles.border)
           .attributes({ 'data-trail-container': '' })
           .append(
             Domino.of('div')
-              .classNames('relative z-10 bg-base-surface rounded-sm text-sm text-description px-2 py-1')
+              .classNames(
+                'relative z-10 bg-base-surface rounded-sm text-sm text-subdued py-1',
+                'grid grid-cols-[24px_1fr] gap-x-0.5 items-start',
+              )
               .append(
                 Domino.of('div')
-                  .classNames('max-h-[5lh] overflow-y-auto')
+                  .classNames('flex h-5 w-full shrink-0 items-center justify-center self-start')
+                  .append(Domino.svg('ph--brain--regular').classNames('shrink-0 size-4 opacity-70')),
+                Domino.of('div')
+                  .classNames('px-2 max-h-[5lh] overflow-y-auto dx-scrollbar-thin min-w-0')
                   .text(this.text)
                   .attributes({ 'data-reasoning-text': '' }),
               ),
             Domino.of('div').attributes({ 'data-id': this.#pos }),
           ),
       ).root;
-
-    return root;
   }
 
   override updateDOM(dom: HTMLElement) {

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

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 export class ReferenceWidget extends WidgetType {
   constructor(
     private text: string,
@@ -20,7 +22,7 @@ export class ReferenceWidget extends WidgetType {
 
   override toDOM() {
     return Domino.of('div')
-      .classNames('pt-2 pb-2')
+      .classNames(styles.padding)
       .append(
         Domino.of('dx-anchor' as any)
           .classNames('dx-tag--anchor')

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

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 /**
  * Simple prompt widget.
  */
@@ -24,12 +26,12 @@ export class SelectWidget extends WidgetType {
   override toDOM() {
     return Domino.of('div')
       .attributes({ role: 'group' })
-      .classNames('flex flex-wrap pt-2 pb-2 gap-1')
+      .classNames(styles.padding, 'flex flex-wrap gap-1')
       .append(
         ...this.options.map((option) =>
           Domino.of('button')
             .classNames('dx-button inline-block max-w-[100cqi]')
-            .attributes({ 'data-action': 'submit', 'data-value': option, 'data-density': 'fine' })
+            .attributes({ 'data-action': 'submit', 'data-value': option, 'data-density': 'md' })
             .text(option),
         ),
       ).root;

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

@@ -6,6 +6,8 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
+import { styles } from './defaults';
+
 /**
  * Simple stats widget.
  */
@@ -19,7 +21,7 @@ export class StatsWidget extends WidgetType {
   }
 
   override toDOM() {
-    return Domino.of('div').classNames('pt-2 pb-4 text-sm text-placeholder').text(this.text).root;
+    return Domino.of('div').classNames(styles.padding, 'text-sm text-placeholder').text(this.text).root;
   }
 
   override updateDOM(dom: HTMLElement) {

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

@@ -6,38 +6,23 @@ import { WidgetType } from '@codemirror/view';
 
 import { Domino } from '@dxos/ui';
 
-/**
- * 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 };
-};
+import { styles } from './defaults';
 
 /**
- * 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() {
     return Domino.of('div')
-      .classNames('py-0.5')
+      .classNames(styles.padding)
       .append(
         Domino.of('div')
           .classNames('relative overflow-hidden rounded-sm')
@@ -47,7 +32,7 @@ export class StatusWidget extends WidgetType {
               .append(
                 Domino.of('div')
                   .classNames('flex h-5 w-full shrink-0 items-center justify-center self-start')
-                  .append(Domino.of('span').classNames('block size-1.5 shrink-0 rounded-full bg-current opacity-45')),
+                  .append(Domino.svg('ph--info--regular').classNames('shrink-0 size-4 opacity-70')),
                 Domino.of('div')
                   .classNames('relative min-w-0')
                   .append(
@@ -55,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 }),
                   ),
               ),
           ),
@@ -63,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/SuggestionWidget.ts

@@ -19,14 +19,14 @@ export class SuggestionWidget extends WidgetType {
   }
 
   override toDOM() {
-    // NOTE: Container must have `dx-size-container` to support cqi.
+    // NOTE: Container must have `dx-inline-size-container` (or `dx-size-container`) to support cqi.
     return Domino.of('span')
       .classNames(mx('inline-flex max-w-[calc(100cqi-8px)] my-1 pe-2 overflow-hidden'))
       .append(
         Domino.of('button')
           .attributes({
             'data-action': 'submit',
-            'data-density': 'fine',
+            'data-density': 'md',
             'data-value': this.text,
           })
           .classNames(mx('dx-button gap-2 w-full overflow-hidden'))

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

@@ -11,17 +11,16 @@ import { type XmlWidgetProps } from '@dxos/ui-editor';
 import { meta } from '#meta';
 
 import { MessageThreadContext } from '../sync';
+import { styles } from './defaults';
 
 export const SummaryWidget = ({ children }: XmlWidgetProps<MessageThreadContext>) => {
   const { t } = useTranslation(meta.id);
 
   return (
-    <TogglePanel.Root classNames='border border-separator rounded-sm'>
+    <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-description'>
-          {children}
-        </div>
+        <div className='p-1 text-sm text-subdued'>{children}</div>
       </TogglePanel.Content>
     </TogglePanel.Root>
   );

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

@@ -7,7 +7,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { type ContentBlock } from '@dxos/types';
 
-import { translations } from '../../../translations';
+import { translations } from '#translations';
+
 import { ToolWidget, type ToolWidgetProps } from './ToolWidget';
 
 const baseWidgetProps = {

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

@@ -5,7 +5,7 @@
 import type * as Tool from '@effect/ai/Tool';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { useTranslation } from '@dxos/react-ui';
+import { Icon, useTranslation } from '@dxos/react-ui';
 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';
@@ -42,6 +42,7 @@ export const ToolWidget = ({ view, blocks = [] }: ToolWidgetProps) => {
             lastToolCall = { tool, block };
             return {
               title: tool?.description ?? [t('tool-call.label'), block.name].filter(Boolean).join(' '),
+              icon: block.operationIcon,
               content: {
                 ...block,
                 input: safeParseJson(block.input),
@@ -54,6 +55,7 @@ export const ToolWidget = ({ view, blocks = [] }: ToolWidgetProps) => {
             if (block.error) {
               return {
                 title: t('tool-error.label'),
+                icon: lastToolCall?.block.operationIcon,
                 content: block,
               };
             }
@@ -61,12 +63,14 @@ export const ToolWidget = ({ view, blocks = [] }: ToolWidgetProps) => {
             const title =
               lastToolCall?.tool?.description ??
               [t('tool-result.label'), lastToolCall?.block.name].filter(Boolean).join(' ');
+            const icon = lastToolCall?.block.operationIcon;
             lastToolCall = undefined;
             return {
               title,
+              icon,
               content: {
                 ...block,
-                result: safeParseJson(block.result),
+                result: typeof block.result === 'string' ? safeParseJson(block.result) : block.result,
               },
             };
           }
@@ -78,6 +82,7 @@ export const ToolWidget = ({ view, blocks = [] }: ToolWidgetProps) => {
 
             return {
               title: t('stats.label'),
+              icon: lastToolCall.block.operationIcon,
               content: block,
             };
           }
@@ -101,10 +106,14 @@ export const ToolWidget = ({ view, blocks = [] }: ToolWidgetProps) => {
   return <ToolPanel items={items} onChangeOpen={handleChangeOpen} />;
 };
 
+type ToolPanelItem = { title: string; icon?: string; content: any };
+
 type ToolPanelProps = {
-  items: { title: string; content: any }[];
+  items: ToolPanelItem[];
 } & Pick<TogglePanelRootProps, 'onChangeOpen'>;
 
+const DEFAULT_TOOL_ICON = 'ph--wrench--regular';
+
 const ToolPanel = ({ items, onChangeOpen }: ToolPanelProps) => {
   const tabsRef = useRef<HTMLDivElement>(null);
   const [selected, setSelected] = useState(0);
@@ -126,9 +135,15 @@ const ToolPanel = ({ items, onChangeOpen }: ToolPanelProps) => {
     setSelected(index);
   }, []);
 
+  // Prefer the icon from the latest tool call so the header reflects what's currently active.
+  // TextCrawl shows multiple titles, but only one icon slot — using the most recent keeps it in sync
+  // with the visible operation while it streams.
+  const headerIcon = items[items.length - 1]?.icon ?? items[0]?.icon ?? DEFAULT_TOOL_ICON;
+
   return (
     <TogglePanel.Root open={open} onChangeOpen={setOpen}>
-      <TogglePanel.Header classNames='text-sm text-placeholder'>
+      <TogglePanel.Header classNames='flex items-center gap-2 text-sm text-placeholder'>
+        <Icon icon={headerIcon} size={4} classNames='shrink-0 opacity-70' />
         <TextCrawl key='status-roll' lines={items.map((item) => item.title)} autoAdvance greedy />
       </TogglePanel.Header>
       <TogglePanel.Content>

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

@@ -0,0 +1,8 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export const styles = {
+  padding: 'my-4',
+  border: 'border border-subdued-separator rounded-sm',
+};

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

@@ -3,12 +3,11 @@
 //
 
 export * from './FallbackWidget';
-export * from './PromptWidget';
 export * from './ReasoningWidget';
 export * from './ReferenceWidget';
 export * from './SelectWidget';
 export * from './StatsWidget';
+export * from './StatusWidget';
 export * from './SummaryWidget';
 export * from './SuggestionWidget';
 export * from './ToolWidget';
-export * from './StatusWidget';