@dxos/plugin-assistant 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

package/src/components/Chat/Chat.tsx

@@ -2,59 +2,32 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Extension, Prec } from '@codemirror/state';
-import { keymap } from '@codemirror/view';
 import { useAtomValue } from '@effect-atom/atom-react';
-import { createContext } from '@radix-ui/react-context';
 import * as Array from 'effect/Array';
 import * as Option from 'effect/Option';
 import React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { type Chat as ChatModule } from '@dxos/assistant-toolkit';
 import { Event } from '@dxos/async';
-import { type Database, Filter, Obj } from '@dxos/echo';
-import { useVoiceInput } from '@dxos/plugin-transcription';
-import { useQuery } from '@dxos/react-client/echo';
+import { Filter, Obj } from '@dxos/echo';
+import { type Queue, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { Input, type ThemedClassName, useDynamicRef, useTranslation } from '@dxos/react-ui';
-import { ChatEditor, type ChatEditorController, type ChatEditorProps } from '@dxos/react-ui-chat';
-import { type MarkdownStreamController } from '@dxos/react-ui-components';
-import { MenuProvider, ToolbarMenu } from '@dxos/react-ui-menu';
+import { type MarkdownStreamController } from '@dxos/react-ui-markdown';
+import { Menu, MenuRootProps } from '@dxos/react-ui-menu';
 import { Message } from '@dxos/types';
-import { mx } from '@dxos/ui-theme';
-import { isTruthy } from '@dxos/util';
+import { composable, composableProps } from '@dxos/ui-theme';
+
+import { useChatKeymapExtensions, useChatToolbarActions, useDebug } from '#hooks';
 
-import { useChatToolbarActions } from '../../hooks';
-import { meta } from '../../meta';
-import { type AiChatProcessor } from '../../processor';
 import {
-  ChatActions,
-  type ChatActionsProps,
-  ChatOptions,
-  type ChatPresetsProps,
-  ChatReferences,
-  ChatStatusIndicator,
+  ChatStatus,
+  ChatPrompt as NaturalChatPrompt,
+  type ChatPromptProps as NaturalChatPromptProps,
 } from '../ChatPrompt';
 import { ChatThread as NaturalChatThread, type ChatThreadProps as NaturalChatThreadProps } from '../ChatThread';
-
+import { ChatContextProvider, type ChatContextValue, type ChatRequestTiming, useChatContext } from './context';
 import { type ChatEvent } from './events';
 
-//
-// Context
-// NOTE: The context should not be exported. It is only used internally.
-// Components outside of this Radix-style group shuld define their own APIs.
-//
-
-type ChatContextValue = {
-  debug?: boolean;
-  event: Event<ChatEvent>;
-  db?: Database.Database;
-  chat?: ChatModule.Chat;
-  messages: Message.Message[];
-  processor: AiChatProcessor;
-};
-
-export const [ChatContextProvider, useChatContext] = createContext<ChatContextValue>('Chat');
+export { useChatContext };
 
 //
 // Root
@@ -62,46 +35,40 @@ export const [ChatContextProvider, useChatContext] = createContext<ChatContextVa
 
 type ChatRootProps = PropsWithChildren<
   Pick<ChatContextValue, 'db' | 'chat' | 'processor'> & {
+    feed?: Queue;
     onEvent?: (event: ChatEvent) => void;
   }
 >;
 
-const ChatRoot = ({ children, chat, processor, onEvent, ...props }: ChatRootProps) => {
+const ChatRoot = ({ children, chat, feed, processor, onEvent, ...props }: ChatRootProps) => {
   const [debug, setDebug] = useState(false);
-  const pending = useAtomValue(processor.messages);
   const streaming = useAtomValue(processor.streaming);
+  const active = useAtomValue(processor.active);
+  const requestTiming = useRequestTiming({ active });
   const lastPrompt = useRef<string | undefined>(undefined);
+  const db = props.db ?? (chat && Obj.getDatabase(chat));
 
-  // Messages.
-  const storedMessages = useQuery(chat?.queue?.target, Filter.type(Message.Message));
-  const messages = useMemo(() => {
-    return Array.dedupeWith([...storedMessages, ...pending], ({ id: a }, { id: b }) => a === b);
-  }, [storedMessages, pending]);
+  const feedMessages = useQuery(feed, Filter.type(Message.Message));
+  const pendingMessages = useAtomValue(processor.messages);
+  const messages = useMemo(
+    () => Array.dedupeWith([...feedMessages, ...pendingMessages], ({ id: a }, { id: b }) => a === b),
+    [feedMessages, pendingMessages],
+  );
+
+  const dump = useDebug({ processor });
 
-  // Events.
   const event = useMemo(() => new Event<ChatEvent>(), []);
   useEffect(() => {
     return event.on((ev) => {
       switch (ev.type) {
         case 'toggle-debug': {
-          setDebug((current) => !current);
-          // Dump state to console.
-          queueMicrotask(async () => {
-            const objects = processor.context.getObjects();
-            const blueprints = processor.context.getBlueprints();
-            const tools = await processor.getTools();
-            const system = await processor.getSystemPrompt();
-            // eslint-disable-next-line no-console
-            console.log('Chat processor state:', { objects, blueprints });
-            // eslint-disable-next-line no-console
-            console.log(`
-              ==== System Prompt ====
-              ${system}
-              ==== Tools ====
-              ${Object.values(tools)
-                .map((tool) => JSON.stringify(tool, null, 2))
-                .join('\n')}
-            `);
+          setDebug((debug) => {
+            if (debug) {
+              return false;
+            } else {
+              void dump();
+              return true;
+            }
           });
           break;
         }
@@ -135,9 +102,7 @@ const ChatRoot = ({ children, chat, processor, onEvent, ...props }: ChatRootProp
 
       onEvent?.(ev);
     });
-  }, [event, processor, streaming, onEvent]);
-
-  const db = props.db ?? (chat && Obj.getDatabase(chat));
+  }, [event, dump, processor, streaming, onEvent]);
 
   return (
     <ChatContextProvider
@@ -147,6 +112,7 @@ const ChatRoot = ({ children, chat, processor, onEvent, ...props }: ChatRootProp
       chat={chat}
       messages={messages}
       processor={processor}
+      requestTiming={requestTiming}
       {...props}
     >
       {children}
@@ -156,23 +122,61 @@ const ChatRoot = ({ children, chat, processor, onEvent, ...props }: ChatRootProp
 
 ChatRoot.displayName = 'Chat.Root';
 
+const useRequestTiming = ({ active }: { active: boolean }) => {
+  const [requestTiming, setRequestTiming] = useState<ChatRequestTiming | null>(null);
+  useEffect(() => {
+    if (active) {
+      setRequestTiming({ startedAt: Date.now(), endedAt: null });
+    } else {
+      setRequestTiming((prev) => (prev && prev.endedAt == null ? { ...prev, endedAt: Date.now() } : prev));
+    }
+  }, [active]);
+
+  return requestTiming;
+};
+
+//
+// Toolbar
+//
+
+const CHAT_TOOLBAR_NAME = 'Chat.Toolbar';
+
+type ChatToolbarProps = Pick<MenuRootProps, 'attendableId'> & {
+  companionTo?: Obj.Unknown;
+};
+
+const ChatToolbar = composable<HTMLDivElement, ChatToolbarProps>(
+  ({ attendableId, companionTo, ...props }, forwardedRef) => {
+    const { chat } = useChatContext(CHAT_TOOLBAR_NAME);
+    const menuActions = useChatToolbarActions({ chat, companionTo });
+
+    return (
+      <Menu.Root {...menuActions} attendableId={attendableId}>
+        <Menu.Toolbar {...composableProps(props)} ref={forwardedRef} />
+      </Menu.Root>
+    );
+  },
+);
+
+ChatToolbar.displayName = CHAT_TOOLBAR_NAME;
+
 //
-// Viewport
+// Content
 //
 
-const CHAT_VIEWPORT_NAME = 'Chat.Viewport';
+const CHAT_CONTENT_NAME = 'Chat.Content';
 
-type ChatViewportProps = ThemedClassName<PropsWithChildren>;
+type ChatContentProps = {};
 
-const ChatViewport = ({ classNames, children }: ChatViewportProps) => {
+const ChatContent = composable<HTMLDivElement, ChatContentProps>(({ children, ...props }, forwardedRef) => {
   return (
-    <div role='none' className={mx('flex flex-col bs-full is-full', classNames)}>
+    <div {...composableProps(props, { classNames: 'dx-expander flex flex-col' })} ref={forwardedRef}>
       {children}
     </div>
   );
-};
+});
 
-ChatViewport.displayName = CHAT_VIEWPORT_NAME;
+ChatContent.displayName = CHAT_CONTENT_NAME;
 
 //
 // Thread
@@ -182,10 +186,12 @@ const CHAT_THREAD_NAME = 'Chat.Thread';
 
 type ChatThreadProps = Omit<NaturalChatThreadProps, 'identity' | 'messages' | 'tools'>;
 
-const ChatThread = (props: ChatThreadProps) => {
+const ChatThread = ({ viewType, debug: debugProp, ...props }: ChatThreadProps) => {
   const { debug, event, messages, processor } = useChatContext(CHAT_THREAD_NAME);
+  const debugView = viewType === 'debug';
   const identity = useIdentity();
   const error = useAtomValue(processor.error).pipe(Option.getOrUndefined);
+  const extensions = useChatKeymapExtensions({ event });
 
   const controllerRef = useRef<MarkdownStreamController | null>(null);
   useEffect(() => {
@@ -222,7 +228,9 @@ const ChatThread = (props: ChatThreadProps) => {
       identity={identity}
       messages={messages}
       error={error}
-      debug={debug}
+      debug={debugProp ?? (debug || debugView)}
+      viewType={viewType}
+      extensions={extensions}
       onEvent={handleEvent}
       ref={controllerRef}
     />
@@ -237,222 +245,26 @@ ChatThread.displayName = CHAT_THREAD_NAME;
 
 const CHAT_PROMPT_NAME = 'Chat.Prompt';
 
-type ChatPromptProps = ThemedClassName<
-  {
-    outline?: boolean;
-    settings?: boolean;
-  } & Pick<ChatEditorProps, 'placeholder'> &
-    Omit<ChatPresetsProps, 'onChange'> & {
-      expandable?: boolean;
-      online?: boolean;
-      onOnlineChange?: (online: boolean) => void;
-      onPresetChange?: ChatPresetsProps['onChange'];
-    }
->;
-
-const ChatPrompt = ({
-  classNames,
-  outline,
-  settings = true,
-  placeholder,
-  expandable,
-  online,
-  presets,
-  preset,
-  onPresetChange,
-  onOnlineChange,
-}: ChatPromptProps) => {
-  const { t } = useTranslation(meta.id);
-  const { db, processor, event } = useChatContext(CHAT_PROMPT_NAME);
-
-  const error = useAtomValue(processor.error).pipe(Option.getOrUndefined);
-  const streaming = useAtomValue(processor.streaming);
-  const active = useAtomValue(processor.active);
-  const activeRef = useDynamicRef(active);
-
-  const editorRef = useRef<ChatEditorController>(null);
-  const [recordingState, setRecordingState] = useState(false);
-  useEffect(() => {
-    return event.on((event) => {
-      switch (event.type) {
-        case 'update-prompt':
-          if (!editorRef.current?.getText()?.length) {
-            editorRef.current?.setText(event.text);
-            editorRef.current?.focus();
-          }
-          break;
-        case 'record-start':
-          setRecordingState(true);
-          break;
-        case 'record-stop':
-          setRecordingState(false);
-          break;
-      }
-    });
-  }, [event]);
-
-  // TODO(burdon): Configure capability in TranscriptionPlugin.
-  const { recording } = useVoiceInput({
-    active: recordingState,
-    onUpdate: (text) => {
-      editorRef.current?.setText(text);
-      editorRef.current?.focus();
-    },
-  });
-
-  const extensions = useMemo<Extension[]>(() => {
-    return [
-      Prec.highest(
-        keymap.of([
-          {
-            key: 'Mod-d',
-            preventDefault: true,
-            run: () => {
-              event.emit({ type: 'toggle-debug' });
-              return true;
-            },
-          },
-          {
-            key: 'Mod-ArrowUp',
-            preventDefault: true,
-            run: () => {
-              event.emit({ type: 'nav-previous' });
-              return true;
-            },
-            shift: () => {
-              event.emit({ type: 'thread-open' });
-              return true;
-            },
-          },
-          {
-            key: 'Mod-ArrowDown',
-            preventDefault: true,
-            run: () => {
-              event.emit({ type: 'nav-next' });
-              return true;
-            },
-            shift: () => {
-              event.emit({ type: 'thread-close' });
-              return true;
-            },
-          },
-        ]),
-      ),
-    ].filter(isTruthy);
-  }, [event, expandable]);
-
-  const handleSubmit = useCallback<NonNullable<ChatEditorProps['onSubmit']>>(
-    (text) => {
-      if (!activeRef.current) {
-        event.emit({ type: 'submit', text });
-        return true;
-      }
-    },
-    [event],
-  );
-
-  const handleEvent = useCallback<NonNullable<ChatActionsProps['onEvent']>>(
-    (ev) => {
-      event.emit(ev);
-    },
-    [event],
-  );
+type ChatPromptProps = Omit<NaturalChatPromptProps, 'chat' | 'db' | 'processor' | 'event'>;
 
-  return (
-    <div
-      role='group'
-      className={mx(
-        'flex flex-col is-full density-fine',
-        outline &&
-          'bg-groupSurface border border-subduedSeparator transition transition-border [&:has(.cm-content:focus)]:border-separator rounded',
-        classNames,
-      )}
-    >
-      <div role='none' className='flex p-2 gap-2'>
-        <ChatStatusIndicator classNames='p-1' preset={preset} error={error} processing={streaming} />
-        <ChatEditor
-          ref={editorRef}
-          autoFocus
-          lineWrapping
-          classNames='col-span-2 pbs-0.5'
-          placeholder={placeholder ?? t('prompt placeholder')}
-          extensions={extensions}
-          onSubmit={handleSubmit}
-        />
-      </div>
-
-      {db && settings && (
-        <div role='none' className='flex items-center overflow-hidden'>
-          <ChatOptions
-            db={db}
-            blueprintRegistry={processor.blueprintRegistry}
-            context={processor.context}
-            preset={preset}
-            presets={presets}
-            onPresetChange={onPresetChange}
-          />
-
-          <div role='none' className='flex grow overflow-x-auto scrollbar-none'>
-            <ChatReferences db={db} context={processor.context} />
-          </div>
-
-          <ChatActions
-            classNames='col-span-2'
-            microphone={true}
-            recording={recording}
-            processing={streaming}
-            onEvent={handleEvent}
-          >
-            {/* TODO(burdon): Move offline switch into dialog. */}
-            {online !== undefined && (
-              <Input.Root>
-                <Input.Label srOnly>{t('online switch label')}</Input.Label>
-                <Input.Switch classNames='mli-2' checked={online} onCheckedChange={onOnlineChange} />
-              </Input.Root>
-            )}
-          </ChatActions>
-        </div>
-      )}
-    </div>
-  );
+const ChatPrompt = (props: ChatPromptProps) => {
+  const { chat, db, processor, event } = useChatContext(CHAT_PROMPT_NAME);
+  return <NaturalChatPrompt {...props} chat={chat} db={db} processor={processor} event={event} />;
 };
 
 ChatPrompt.displayName = CHAT_PROMPT_NAME;
 
-//
-// Toolbar
-//
-
-const CHAT_TOOLBAR_NAME = 'Chat.Toolbar';
-
-type ChatToolbarProps = ThemedClassName<{ companionTo?: Obj.Unknown }>;
-
-const ChatToolbar = ({ classNames, companionTo }: ChatToolbarProps) => {
-  const { chat } = useChatContext(CHAT_TOOLBAR_NAME);
-  const menu = useChatToolbarActions({ chat, companionTo });
-
-  return (
-    <MenuProvider
-      {...menu}
-      attendableId={companionTo ? Obj.getDXN(companionTo).toString() : chat ? Obj.getDXN(chat).toString() : ''}
-    >
-      <ToolbarMenu classNames={classNames} textBlockWidth />
-    </MenuProvider>
-  );
-};
-
-ChatToolbar.displayName = CHAT_TOOLBAR_NAME;
-
 //
 // Chat
 //
 
 export const Chat = {
   Root: ChatRoot,
-  Viewport: ChatViewport,
-  Thread: ChatThread,
-  Prompt: ChatPrompt,
   Toolbar: ChatToolbar,
+  Content: ChatContent,
+  Prompt: ChatPrompt,
+  Status: ChatStatus,
+  Thread: ChatThread,
 };
 
-export type { ChatRootProps, ChatViewportProps, ChatThreadProps, ChatPromptProps, ChatToolbarProps, ChatEvent };
+export type { ChatRootProps, ChatToolbarProps, ChatContentProps, ChatPromptProps, ChatThreadProps, ChatEvent };

package/src/components/Chat/context.ts

@@ -0,0 +1,39 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { createContext } from '@radix-ui/react-context';
+
+import { type Chat as ChatModule } from '@dxos/assistant-toolkit';
+import { type Event } from '@dxos/async';
+import { type Database } from '@dxos/echo';
+import { type Message } from '@dxos/types';
+
+import { type AiChatProcessor } from '../../processor';
+import { type ChatEvent } from './events';
+
+/**
+ * Wall-clock timestamps for the most-recent (or in-flight) request, lifted out of
+ * `ChatStreamStatus` so the elapsed value survives across re-mounts triggered when wire's
+ * drip queue toggles `wireDrainingEffect` (which removes/restores the footer block widget).
+ * `endedAt` is `null` while the request is still active.
+ */
+export type ChatRequestTiming = {
+  startedAt: number;
+  endedAt: number | null;
+};
+
+export type ChatContextValue = {
+  debug?: boolean;
+  event: Event<ChatEvent>;
+  db?: Database.Database;
+  chat?: ChatModule.Chat;
+  messages: Message.Message[];
+  processor: AiChatProcessor;
+  requestTiming: ChatRequestTiming | null;
+};
+
+// Internal: not re-exported from `Chat/index.ts`. Accessed by sibling components in this
+// package (e.g. `ChatStreamStatus`) without dragging in `Chat.tsx`'s heavy transitive
+// imports (transcription, etc.).
+export const [ChatContextProvider, useChatContext] = createContext<ChatContextValue>('Chat');

package/src/components/ChatPrompt/ChatActions.tsx

@@ -7,7 +7,8 @@ import React, { type PropsWithChildren } from 'react';
 import { IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
+
 import { type ChatEvent } from '../Chat';
 
 export type ChatActionsProps = ThemedClassName<
@@ -15,26 +16,26 @@ export type ChatActionsProps = ThemedClassName<
     microphone?: boolean;
     recording?: boolean;
     processing?: boolean;
+    debug?: boolean;
     onEvent?: (event: ChatEvent) => void;
   }>
 >;
 
-export const ChatActions = ({ classNames, children, microphone, recording, processing, onEvent }: ChatActionsProps) => {
+export const ChatActions = ({
+  classNames,
+  children,
+  microphone,
+  recording,
+  processing,
+  debug,
+  onEvent,
+}: ChatActionsProps) => {
   const { t } = useTranslation(meta.id);
 
   return (
-    <div className={mx('flex items-center mie-1', classNames)}>
+    <div className={mx('flex items-center', classNames)}>
       {children}
 
-      <IconButton
-        disabled={!processing}
-        variant='ghost'
-        icon='ph--x--regular'
-        iconOnly
-        label={t('cancel processing button')}
-        onClick={() => onEvent?.({ type: 'cancel' })}
-      />
-
       {microphone && (
         <IconButton
           disabled={!processing}
@@ -43,7 +44,7 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
           icon='ph--microphone--regular'
           iconOnly
           noTooltip
-          label={t('microphone button')}
+          label={t('microphone.button')}
           onMouseDown={() => onEvent?.({ type: 'record-start' })}
           onMouseUp={() => onEvent?.({ type: 'record-stop' })}
           onTouchStart={() => onEvent?.({ type: 'record-start' })}
@@ -51,12 +52,23 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
         />
       )}
 
+      {debug && (
+        <IconButton
+          variant='ghost'
+          icon='ph--wrench--regular'
+          iconOnly
+          label={t('debug.button')}
+          onClick={() => onEvent?.({ type: 'toggle-debug' })}
+        />
+      )}
+
       <IconButton
+        disabled={!processing}
         variant='ghost'
-        icon='ph--wrench--regular'
+        icon='ph--x--regular'
         iconOnly
-        label={t('debug button')}
-        onClick={() => onEvent?.({ type: 'toggle-debug' })}
+        label={t('cancel-processing.button')}
+        onClick={() => onEvent?.({ type: 'cancel' })}
       />
     </div>
   );

package/src/components/ChatPrompt/ChatMcpErrors.tsx

@@ -0,0 +1,50 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { useAtomValue } from '@effect-atom/atom-react';
+import React, { useCallback } from 'react';
+
+import { Message, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+
+import { meta } from '#meta';
+
+import { type AiChatProcessor } from '../../processor';
+
+export type ChatMcpErrorsProps = ThemedClassName<{
+  processor: AiChatProcessor;
+}>;
+
+/**
+ * Inline banner that lists MCP servers that failed to connect during the most recent request.
+ * The chat itself keeps working without these servers — this just lets the user see what was dropped.
+ */
+export const ChatMcpErrors = ({ classNames, processor }: ChatMcpErrorsProps) => {
+  const { t } = useTranslation(meta.id);
+  const errors = useAtomValue(processor.mcpErrors);
+
+  const handleDismiss = useCallback(() => {
+    processor.dismissMcpErrors();
+  }, [processor]);
+
+  if (errors.length === 0) {
+    return null;
+  }
+
+  return (
+    <Message.Root classNames={['m-1', classNames]} valence='warning'>
+      <Message.Title onClose={handleDismiss}>{t('mcp-server-error.label')}</Message.Title>
+      <Message.Content asChild>
+        <ul className='flex flex-col gap-0.5 text-sm'>
+          {errors.map((error) => (
+            <li key={`${error.url}::${error.protocol}`} className='truncate'>
+              <span className='font-mono'>{error.url}</span>
+              {' — '}
+              <span>{error.message}</span>
+            </li>
+          ))}
+        </ul>
+      </Message.Content>
+    </Message.Root>
+  );
+};