@dxos/plugin-assistant 0.8.4-main.422d1c7879 → 0.8.4-main.4668b7de9b

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -2,11 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Option from 'effect/Option';
 import React from 'react';
 
-import { type AiContextBinder } from '@dxos/assistant';
-import { Annotation, type Database, Obj } from '@dxos/echo';
+import { type AiContext } from '@dxos/assistant';
+import { type Database, Obj } from '@dxos/echo';
 import { Icon, IconButton, type Label, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { getStyles, mx } from '@dxos/ui-theme';
 
@@ -14,7 +13,7 @@ import { useContextObjects } from '#hooks';
 import { meta } from '#meta';
 
 export type ChatReferencesProps = ThemedClassName<{
-  context: AiContextBinder;
+  context: AiContext.Binder;
   db: Database.Database;
 }>;
 
@@ -25,26 +24,23 @@ export const ChatReferences = ({ classNames, context, db }: ChatReferencesProps)
   return (
     <ul className={mx('flex', classNames)}>
       {objects.map((obj) => {
-        const dxn = Obj.getDXN(obj);
+        const uri = Obj.getURI(obj);
         const typename = Obj.getTypename(obj);
         const label: Label = Obj.getLabel(obj) ?? (typename ? ['object-name.placeholder', { ns: typename }] : obj.id);
-        const { icon, hue } = Option.fromNullable(Obj.getSchema(obj)).pipe(
-          Option.flatMap(Annotation.IconAnnotation.get),
-          Option.getOrElse(() => ({ icon: DEFAULT_OBJECT_ICON, hue: undefined as string | undefined })),
-        );
+        const { icon, hue } = Obj.getIcon(obj) ?? { icon: DEFAULT_OBJECT_ICON, hue: undefined };
         const styles = hue ? getStyles(hue) : undefined;
         return (
-          <li key={dxn.toString()} className='dx-tag py-0 ps-2 flex items-center gap-1' data-hue='neutral'>
-            <Icon icon={icon} size={4} classNames={styles?.surfaceText} />
+          <li key={uri.toString()} className='dx-tag py-0 flex items-center gap-1' data-hue='neutral'>
+            <Icon icon={icon} size={4} />
             {toLocalizedString(label, t)}
             <IconButton
               icon='ph--x--bold'
               iconOnly
               variant='ghost'
-              label={t('remove-object-in-context.label')}
+              label={t('remove-object.label')}
               classNames='p-0 hover:bg-transparent'
               size={3}
-              onClick={() => onUpdateObject?.(dxn, false)}
+              onClick={() => onUpdateObject?.(uri, false)}
             />
           </li>
         );

package/src/components/ChatPrompt/ChatStatus.tsx

@@ -0,0 +1,123 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { type ThemedClassName } from '@dxos/react-ui';
+import { ChatStatus as NaturalChatStatus, formatElapsed } from '@dxos/react-ui-chat';
+import { Matrix } from '@dxos/react-ui-sfx';
+import { type ContentBlock } from '@dxos/types';
+import { Unit } from '@dxos/util';
+
+import { type ChatRequestTiming, useChatContext } from '../Chat/context';
+
+const CHAT_STREAM_STATUS_NAME = 'Chat.StreamStatus';
+const TICK_MS = 1_000;
+
+export type ChatStreamStatusProps = ThemedClassName<{
+  icon?: boolean;
+}>;
+
+/**
+ * Live status pill rendered at the bottom of the chat thread.
+ *
+ * The block-widget host re-mounts this component each time wire's drip queue toggles
+ * (`wireDrainingEffect`) — so all visible state is derived from chat-context values that
+ * survive the unmount: the latest `stats` block on the chat context's `messages` for token counts,
+ * and `requestTiming` (start/end wall-clock timestamps) for the elapsed value.
+ *
+ * Shows:
+ * - elapsed seconds since the most recent request started (frozen at end-of-request)
+ * - last completed turn's output token count (from the most recent `stats` content block)
+ * - cumulative session total tokens across all `stats` content blocks
+ */
+export const ChatStatus = ({ classNames, icon }: ChatStreamStatusProps) => {
+  // Read `messages` from the chat context (combines `useQuery(queue)` + the processor's
+  // pending atom) rather than `processor.messages` directly — the latter only contains
+  // blocks streamed via the ephemeral `PartialBlock` channel, while finalized blocks
+  // (including the per-turn `stats` block we read for token counts) are submitted to the
+  // feed via `_submitMessage` and only show up through `useQuery`.
+  const { messages, requestTiming } = useChatContext(CHAT_STREAM_STATUS_NAME);
+
+  const { lastOutputTokens, sessionTotalTokens } = useMemo(() => {
+    let last: number | undefined;
+    let total = 0;
+    for (const message of messages) {
+      for (const block of message.blocks) {
+        if (isStats(block) && block.usage) {
+          last = block.usage.outputTokens;
+          total += block.usage.totalTokens ?? 0;
+        }
+      }
+    }
+    return { lastOutputTokens: last, sessionTotalTokens: total };
+  }, [messages]);
+
+  const isRunning = requestTiming != null && requestTiming.endedAt == null;
+  const show = requestTiming || lastOutputTokens || sessionTotalTokens > 0;
+  if (!show) {
+    return null;
+  }
+
+  return (
+    <NaturalChatStatus.Root defaultRunning={false} classNames={['py-2 gap-2 text-sm', classNames]}>
+      {icon && (
+        <NaturalChatStatus.Icon>
+          <Matrix
+            classNames='w-5 h-5'
+            dotClassNames='bg-primary-500'
+            dim={4}
+            dotSize={3}
+            count={10}
+            interval={500}
+            active={isRunning}
+          />
+        </NaturalChatStatus.Icon>
+      )}
+      {show && (
+        <div className='flex items-center'>
+          {requestTiming && (
+            <NaturalChatStatus.Text>
+              <Elapsed timing={requestTiming} />
+            </NaturalChatStatus.Text>
+          )}
+          {lastOutputTokens != null && (
+            <>
+              {requestTiming && <NaturalChatStatus.Separator />}
+              <NaturalChatStatus.Text>↓ {Unit.Thousand(lastOutputTokens).toString()}</NaturalChatStatus.Text>
+            </>
+          )}
+          {sessionTotalTokens > 0 && (
+            <>
+              {(requestTiming || lastOutputTokens != null) && <NaturalChatStatus.Separator />}
+              <NaturalChatStatus.Text>Σ {Unit.Thousand(sessionTotalTokens).toString()}</NaturalChatStatus.Text>
+            </>
+          )}
+        </div>
+      )}
+    </NaturalChatStatus.Root>
+  );
+};
+
+/**
+ * Wall-clock-derived elapsed display. Tick interval forces a re-render every second while
+ * the request is active so the displayed value advances; once `endedAt` is set, the value
+ * is frozen and the interval is no longer scheduled.
+ */
+const Elapsed = ({ timing }: { timing: ChatRequestTiming }) => {
+  const isRunning = timing.endedAt == null;
+  const [now, setNow] = useState(Date.now());
+  useEffect(() => {
+    if (!isRunning) {
+      return;
+    }
+
+    const id = setInterval(() => setNow(Date.now()), TICK_MS);
+    return () => clearInterval(id);
+  }, [isRunning]);
+
+  return <>{formatElapsed((timing.endedAt ?? now) - timing.startedAt)}</>;
+};
+
+const isStats = (block: ContentBlock.Any): block is ContentBlock.Stats => block._tag === 'stats';

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/ChatPrompt/index.ts

@@ -3,7 +3,10 @@
 //
 
 export * from './ChatActions';
+export * from './ChatMcpErrors';
 export * from './ChatOptions';
 export * from './ChatPresets';
+export * from './ChatPrompt';
 export * from './ChatReferences';
 export * from './ChatStatusIndicator';
+export * from './ChatStatus';

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';
@@ -21,9 +21,9 @@ import { Organization } from '@dxos/types';
  * Production-style click → popover demo.
  *
  * Wires up the same chain Composer uses:
- * - `<DxAnchor dxn=…>label</DxAnchor>` fires `DxAnchorActivate` on click.
+ * - `<DxAnchor uri=…>label</DxAnchor>` fires `DxAnchorActivate` on click.
  * - `PreviewPlugin`'s `preview-popover` capability listens for the event, resolves the DXN
- *   to a real ECHO object via `space.db.makeRef(dxn).load()`, then invokes
+ *   to a real ECHO object via `space.db.makeRef(uri).load()`, then invokes
  *   `LayoutOperation.UpdatePopover`.
  * - `StorybookPlugin` provides both the `LayoutOperation.UpdatePopover` handler (mutating
  *   the layout-state atom) and the `<Layout>` shell that renders the popover via
@@ -41,12 +41,12 @@ const DefaultStory = () => {
     return <Loading />;
   }
 
-  const dxn = Obj.getDXN(organization).toString();
+  const uri = Obj.getURI(organization);
   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}>
+        <DxAnchor className='dx-tag--anchor' dxn={uri}>
           {organization.name}
         </DxAnchor>{' '}
         to open the popover.

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

@@ -9,39 +9,44 @@ 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';
 
 import { createMessageGenerator } from '#testing';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 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,
@@ -136,7 +132,7 @@ export const Delayed: Story = {
     delay: 500,
     options: {
       autoScroll: true,
-      wire: true,
+      typewriter: true,
       cursor: true,
     },
   },

package/src/components/ChatThread/ChatThread.tsx

@@ -2,28 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { PublicKey } from '@dxos/keys';
 import { type Identity } from '@dxos/react-client/halo';
 import { type ThemedClassName, setRef } from '@dxos/react-ui';
-import { MarkdownStream, type MarkdownStreamController, type MarkdownStreamProps } from '@dxos/react-ui-components';
+import { MarkdownStream, type MarkdownStreamController, type MarkdownStreamProps } from '@dxos/react-ui-markdown';
 import { type Message } from '@dxos/types';
-import { mx } from '@dxos/ui-theme';
 import { keyToFallback } from '@dxos/util';
 
+import { type Assistant } from '../../types';
 import { type ChatEvent } from '../Chat';
-import { blockToMarkdown, componentRegistry } from './registry';
+import { componentRegistry, createBlockRenderer } from './registry';
 import { MessageSyncer } from './sync';
 
 const defaultOptions: MarkdownStreamProps['options'] = {
   autoScroll: true,
-  // The `wire` extension intercepts append transactions, buffers the text, and drips it into
-  // the editor one character at a time (200 chars/sec by default) while keeping XML elements,
-  // markdown links and images atomic. It's what gives the smooth char-by-char typewriter you
-  // see in the MarkdownStream/Reasoning story.
-  wire: true,
-  cursor: true,
+  cursor: false,
+  fader: false,
+  typewriter: true,
 };
 
 export type ChatThreadProps = ThemedClassName<
@@ -31,13 +28,27 @@ export type ChatThreadProps = ThemedClassName<
     identity?: Identity;
     messages?: Message.Message[];
     error?: Error;
+    viewType?: Assistant.ChatView;
     onEvent?: (event: ChatEvent) => void;
-  } & Pick<MarkdownStreamProps, 'options' | 'debug'>
+  } & Pick<MarkdownStreamProps, 'options' | 'debug' | 'extensions' | 'footer'>
 >;
 
-// TODO(burdon): Memo thread position.
 export const ChatThread = forwardRef<MarkdownStreamController | null, ChatThreadProps>(
-  ({ classNames, identity, messages = [], error, options = defaultOptions, debug = false, onEvent }, forwardedRef) => {
+  (
+    {
+      classNames,
+      identity,
+      messages = [],
+      error,
+      options = defaultOptions,
+      footer,
+      debug = false,
+      extensions,
+      viewType,
+      onEvent,
+    },
+    forwardedRef,
+  ) => {
     const [controller, setController] = useState<MarkdownStreamController | null>(null);
     const handleMarkdownStreamRef = useCallback(
       (instance: MarkdownStreamController | null) => {
@@ -52,17 +63,28 @@ export const ChatThread = forwardRef<MarkdownStreamController | null, ChatThread
       [identity],
     );
 
-    // Show error.
+    // Jump to the bottom instantly when the thread first mounts (e.g. opening the companion);
+    // smooth-scroll only on subsequent error changes.
+    const initializedRef = useRef(false);
     useEffect(() => {
-      controller?.scrollToBottom();
+      if (!controller) {
+        // MarkdownStream is keyed by viewType; switching views replaces the controller. Reset so
+        // the first scroll for the new controller is instant rather than animated.
+        initializedRef.current = false;
+        return;
+      }
+      controller.scrollToBottom(initializedRef.current ? 'smooth' : 'instant');
+      initializedRef.current = true;
     }, [controller, error]);
 
     // Update document.
-    const syncer = useMemo(() => controller && new MessageSyncer(controller, blockToMarkdown), [controller]);
+    const renderer = useMemo(() => createBlockRenderer(viewType), [viewType]);
+    const syncer = useMemo(() => controller && new MessageSyncer(controller, renderer), [controller, renderer]);
     useEffect(() => {
       if (!syncer) {
         return;
       }
+
       if (syncer.update(messages)) {
         controller?.scrollToBottom('instant');
       }
@@ -82,15 +104,15 @@ export const ChatThread = forwardRef<MarkdownStreamController | null, ChatThread
     );
 
     return (
-      <div
-        role='none'
-        data-hue={userHue}
-        className={mx('flex h-full w-full justify-center overflow-hidden', classNames)}
-      >
+      <div data-hue={userHue} className='contents'>
         <MarkdownStream
+          key={viewType}
+          classNames={classNames}
           registry={componentRegistry}
           options={options}
           debug={debug}
+          extensions={extensions}
+          footer={footer}
           onEvent={handleEvent}
           ref={handleMarkdownStreamRef}
         />

package/src/components/ChatThread/DEBUG.md

@@ -0,0 +1,41 @@
+# Dataflow from AI to Codemirror
+
+AiSession (packages/core/assistant/src/conversation/session.ts)
+│
+│ emits ephemeral Trace events containing
+│ PartialBlock { messageId, role, block: ContentBlock.Any }
+│ via AgentService.Session.subscribeEphemeral(): Stream<Trace.Message>
+▼
+AiChatProcessor (packages/plugins/plugin-assistant/src/processor/processor.ts)
+│
+│ Stream.runForEach → if Trace.isOfType(PartialBlock) →
+│ #handleEphemeralMessage(event.data)
+│ → upserts Message.Message into #streaming atom
+│ → finalizes into #messages atom on complete block
+▼
+Chat.tsx (packages/plugins/plugin-assistant/src/components/Chat/Chat.tsx)
+│
+│ reads processor.messages + processor.streaming atoms,
+│ passes flat Message[] down to ChatThread
+▼
+ChatThread.tsx (packages/plugins/plugin-assistant/src/components/ChatThread/ChatThread.tsx)
+│
+│ MessageSyncer (sync.ts) compares current messages
+│ to last rendered set:
+│ - new finalized chunk → controller.append(delta)
+│ - changed earlier message → controller.setContent(full)
+│ blockToMarkdown serializes ContentBlocks → markdown,
+│ embedding tool calls as XML widget tags
+│ (e.g. <tool-call name="...">...</tool-call>)
+▼
+MarkdownStreamController.append / setContent
+▼
+MarkdownStream (packages/ui/react-ui-markdown/src/MarkdownStream/MarkdownStream.tsx)
+│
+│ CodeMirror editor with:
+│ - extendedMarkdown (parseMixed → xmlLanguage on HTMLBlock/Paragraph)
+│ - xmlTags (registry → React/native widget portals)
+│ - wire extension (buffers appended text, drips at typewriter rate,
+│ treats XML atomic ranges as indivisible units)
+▼
+Rendered DOM (markdown + portaled widgets for tool calls / reasoning / etc.)

package/src/components/ChatThread/Link.tsx

@@ -6,20 +6,20 @@ import React, { useMemo } from 'react';
 
 import { type Space } from '@dxos/client/echo';
 import { Entity } from '@dxos/echo';
-import { type DXN } from '@dxos/keys';
+import { type URI } from '@dxos/keys';
 import { DxAnchor } from '@dxos/lit-ui/react';
 
 export type ObjectLinkProps = {
   space: Space;
-  dxn: DXN;
+  dxn: URI.URI;
 };
 
 export const ObjectLink = ({ space, dxn }: ObjectLinkProps) => {
-  const ref = useMemo(() => space.db.makeRef(dxn), [space, dxn.toString()]);
+  const ref = useMemo(() => space.db.makeRef(dxn), [space, dxn]);
 
-  const title = (ref.target && Entity.getLabel(ref.target)) ?? ref.target?.id ?? ref.dxn.toString();
+  const title = (ref.target && Entity.getLabel(ref.target)) ?? ref.target?.id ?? ref.uri;
   return (
-    <DxAnchor rootclassname='dx-tag--anchor' dxn={dxn.toString()}>
+    <DxAnchor rootclassname='dx-tag--anchor' dxn={dxn}>
       {title}
     </DxAnchor>
   );

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

@@ -15,12 +15,13 @@ import {
   type MarkdownStreamController,
   type MarkdownStreamProps,
   textStream,
-} from '@dxos/react-ui-components';
+} from '@dxos/react-ui-markdown';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { type ContentBlock } from '@dxos/types';
 import { keyToFallback } from '@dxos/util';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { componentRegistry } from './registry';
 import REASONING from './testing/reasoning.md?raw';
 import THINKING from './testing/thinking.md?raw';
@@ -207,7 +208,7 @@ export const Streaming: Story = {
     content: THREAD_1,
     options: {
       autoScroll: true,
-      wire: true,
+      typewriter: true,
       cursor: true,
     },
   },
@@ -273,7 +274,7 @@ export const Reasoning: Story = {
     content: REASONING_PARTS.body,
     options: {
       autoScroll: true,
-      wire: true,
+      typewriter: true,
       cursor: true,
     },
   },