@dxos/react-ui-chat 0.8.4-main.c1de068 → 0.8.4-main.e098934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-chat",
-  "version": "0.8.4-main.c1de068",
+  "version": "0.8.4-main.e098934",
   "description": "Chat components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -9,6 +9,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -23,50 +24,50 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/autocomplete": "^6.18.7",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/search": "^6.5.11",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.2",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
     "@radix-ui/react-accordion": "1.2.3",
     "@radix-ui/react-context": "1.1.1",
-    "@dxos/async": "0.8.4-main.c1de068",
-    "@dxos/debug": "0.8.4-main.c1de068",
-    "@dxos/echo-schema": "0.8.4-main.c1de068",
-    "@dxos/invariant": "0.8.4-main.c1de068",
-    "@dxos/live-object": "0.8.4-main.c1de068",
-    "@dxos/log": "0.8.4-main.c1de068",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-components": "0.8.4-main.c1de068",
-    "@dxos/react-ui-dnd": "0.8.4-main.c1de068",
-    "@dxos/react-ui-editor": "0.8.4-main.c1de068",
-    "@dxos/react-ui-sfx": "0.8.4-main.c1de068",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c1de068",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/react-ui-types": "0.8.4-main.c1de068",
-    "@dxos/util": "0.8.4-main.c1de068"
+    "@dxos/debug": "0.8.4-main.e098934",
+    "@dxos/echo-schema": "0.8.4-main.e098934",
+    "@dxos/invariant": "0.8.4-main.e098934",
+    "@dxos/live-object": "0.8.4-main.e098934",
+    "@dxos/async": "0.8.4-main.e098934",
+    "@dxos/react-ui-components": "0.8.4-main.e098934",
+    "@dxos/react-ui-dnd": "0.8.4-main.e098934",
+    "@dxos/react-ui-editor": "0.8.4-main.e098934",
+    "@dxos/react-ui-sfx": "0.8.4-main.e098934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.e098934",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934",
+    "@dxos/react-ui-types": "0.8.4-main.e098934",
+    "@dxos/util": "0.8.4-main.e098934",
+    "@dxos/react-ui": "0.8.4-main.e098934",
+    "@dxos/log": "0.8.4-main.e098934"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo": "0.8.4-main.c1de068",
-    "@dxos/random": "0.8.4-main.c1de068",
-    "@dxos/react-client": "0.8.4-main.c1de068",
-    "@dxos/storybook-utils": "0.8.4-main.c1de068"
+    "vite": "7.1.1",
+    "@dxos/echo": "0.8.4-main.e098934",
+    "@dxos/random": "0.8.4-main.e098934",
+    "@dxos/react-client": "0.8.4-main.e098934",
+    "@dxos/storybook-utils": "0.8.4-main.e098934"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068"
+    "@dxos/react-ui": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934"
   },
   "publishConfig": {
     "access": "public"

package/src/components/ChatDialog/ChatDialog.stories.tsx

@@ -4,18 +4,19 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { Input, Toolbar } from '@dxos/react-ui';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { ChatDialog } from './ChatDialog';
 import { translations } from '../../translations';
 
+import { ChatDialog } from './ChatDialog';
+
 const items = Array.from({ length: 100 }, (_, i) => `Item ${i}`);
 
-const meta: Meta<typeof ChatDialog.Root> = {
+const meta = {
   title: 'ui/react-ui-chat/ChatDialog',
   component: ChatDialog.Root,
   render: (args) => {
@@ -56,10 +57,10 @@ const meta: Meta<typeof ChatDialog.Root> = {
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof ChatDialog.Root>;
 
 export default meta;
 
-type Story = StoryObj<typeof ChatDialog.Root>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};

package/src/components/ChatDialog/ChatDialog.tsx

@@ -5,8 +5,8 @@
 import { createContext } from '@radix-ui/react-context';
 import React, { type Dispatch, type PropsWithChildren, type SetStateAction, useEffect, useState } from 'react';
 
-import { Dialog, Icon, IconButton, useControlledState, type ThemedClassName } from '@dxos/react-ui';
-import { resizeAttributes, ResizeHandle, type Size, sizeStyle } from '@dxos/react-ui-dnd';
+import { Dialog, Icon, IconButton, type ThemedClassName, useControlledState } from '@dxos/react-ui';
+import { ResizeHandle, type Size, resizeAttributes, sizeStyle } from '@dxos/react-ui-dnd';
 import { mx } from '@dxos/react-ui-theme';
 
 const preventDefault = (event: Event) => event.preventDefault();
@@ -48,14 +48,14 @@ type ChatDialogRootProps = PropsWithChildren<{
 const ChatDialogRoot = ({
   children,
   open: _open = false,
-  expanded: _expanded = false,
+  expanded: expandedParam = false,
   onOpenChange,
   onExpandedChange,
   onEscape,
 }: ChatDialogRootProps) => {
   const [size, setSize] = useState<Size>('min-content');
   const [open, setOpen] = useControlledState<boolean>(_open, onOpenChange);
-  const [expanded, setExpanded] = useControlledState<boolean>(_expanded, onExpandedChange);
+  const [expanded, setExpanded] = useControlledState<boolean>(expandedParam, onExpandedChange);
 
   // NOTE: We set the min size to 5rem (80px), and the header and prompt bar to 40px (i.e., the rail-size) each.
   // The dialog has no vertical padding and has box-content so that when closed it collapses to the size of the header and prompt bar.

package/src/components/ChatEditor/ChatEditor.stories.tsx

@@ -4,16 +4,17 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { log } from '@dxos/log';
 import { withTheme } from '@dxos/storybook-utils';
 
+import { translations } from '../../translations';
+
 import { ChatEditor } from './ChatEditor';
 import { type ReferenceData } from './references';
-import { translations } from '../../translations';
 
-const meta: Meta<typeof ChatEditor> = {
+const meta = {
   title: 'ui/react-ui-chat/ChatEditor',
   component: ChatEditor,
   decorators: [withTheme],
@@ -21,13 +22,13 @@ const meta: Meta<typeof ChatEditor> = {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof ChatEditor>;
 
 export default meta;
 
 const classNames = 'w-[20rem] p-2 border border-separator';
 
-type Story = StoryObj<typeof ChatEditor>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {

package/src/components/ChatEditor/ChatEditor.tsx

@@ -7,8 +7,10 @@ import React, { forwardRef, useImperativeHandle } from 'react';
 
 import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
 import {
+  type AutocompleteOptions,
   type BasicExtensionsOptions,
   type UseTextEditorProps,
+  autocomplete,
   createBasicExtensions,
   createThemeExtensions,
   useTextEditor,
@@ -16,13 +18,11 @@ import {
 import { mx } from '@dxos/react-ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { autocomplete, type AutocompleteOptions } from './autocomplete';
-import { references as referencesExtension, type ReferencesOptions } from './references';
-
-// TODO(burdon): Handle object references.
+import { type ReferencesOptions, references as referencesExtension } from './references';
 
 export interface ChatEditorController {
   focus(): void;
+  getText(): string;
   setText(text: string): void;
 }
 
@@ -31,7 +31,7 @@ export type ChatEditorProps = ThemedClassName<
     extensions?: Extension;
     references?: ReferencesOptions;
   } & AutocompleteOptions &
-    Pick<UseTextEditorProps, 'autoFocus'> &
+    Pick<UseTextEditorProps, 'id' | 'autoFocus'> &
     Pick<BasicExtensionsOptions, 'lineWrapping' | 'placeholder'>
 >;
 
@@ -41,8 +41,9 @@ export const ChatEditor = forwardRef<ChatEditorController, ChatEditorProps>(
     forwardRef,
   ) => {
     const { themeMode } = useThemeContext();
+
     const { parentRef, view } = useTextEditor(
-      {
+      () => ({
         debug: true,
         autoFocus,
         extensions: [
@@ -56,8 +57,8 @@ export const ChatEditor = forwardRef<ChatEditorController, ChatEditorProps>(
           }),
           extensions,
         ].filter(isNonNullable),
-      },
-      [themeMode, extensions, onSubmit, onSuggest],
+      }),
+      [themeMode, extensions, onSubmit, onSuggest, onCancel],
     );
 
     // Expose editor view.
@@ -66,6 +67,7 @@ export const ChatEditor = forwardRef<ChatEditorController, ChatEditorProps>(
         focus: () => {
           view?.focus();
         },
+        getText: () => view?.state.doc.toString() ?? '',
         setText: (text: string) => {
           view?.dispatch({
             changes: {

package/src/components/ChatEditor/references.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { autocompletion, completionKeymap, type CompletionResult } from '@codemirror/autocomplete';
+import { type CompletionResult, autocompletion, completionKeymap } from '@codemirror/autocomplete';
 import { type Extension, RangeSet } from '@codemirror/state';
 import {
   Decoration,

package/src/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './components';
+export * from './translations';

package/src/translations.ts

@@ -9,46 +9,7 @@ export const translationKey = 'react-ui-chat';
 export const translations = [
   {
     'en-US': {
-      [translationKey]: {
-        'templates label': 'Templates',
-        'open ambient chat label': 'Open Assistant',
-        'assistant chat label': 'Assistant',
-        'plugin name': 'Assistant',
-        'object placeholder': 'New prompt',
-        'create object label': 'Create prompt',
-        'create trigger label': 'Create trigger',
-        'create stack section label': 'Create prompt',
-        'command placeholder': 'Enter slash command...',
-        'template placeholder': 'Enter template...',
-        'value placeholder': 'Enter value...',
-        'prompt rules label': 'Prompt Rules',
-        'typename placeholder': 'Enter typename of objects which this template is for',
-        'description placeholder': 'Enter description of when this template should be used',
-        'select preset template placeholder': 'Select preset',
-        'service registry label': 'Service Registry',
-
-        'sequence logs label': 'Logs',
-
-        'assistant dialog title': 'Assistant',
-        'open assistant label': 'Open assistant',
-
-        'search input placeholder': 'Search...',
-        'chat input placeholder': 'Ask a question...',
-        'chat stop': 'Cancel request.',
-
-        'button save': 'Save',
-        'button run': 'Run',
-
-        'prompt placeholder': 'Ask a question...',
-        'microphone button': 'Click to speak',
-        'cancel processing button': 'Stop processing',
-
-        'settings default label': 'Default',
-        'settings custom prompts label': 'Use custom prompts',
-        'settings llm provider label': 'LLM provider',
-        'settings edge llm model label': 'Remote language model',
-        'settings ollama llm model label': 'Ollama language model',
-      },
+      [translationKey]: {},
     },
   },
 ] as const satisfies Resource[];

package/dist/types/src/components/ChatEditor/autocomplete.d.ts

@@ -1,25 +0,0 @@
-import { type Extension } from '@codemirror/state';
-export type AutocompleteOptions = {
-    /**
-     * Callback triggered when Enter is pressed.
-     * @param text The current text in the editor
-     * @returns true if the editor should reset the document.
-     */
-    onSubmit?: (text: string) => boolean | void;
-    /**
-     * Function that returns a list of suggestions based on the current text.
-     * @param text The current text before the cursor
-     * @returns Array of suggestion strings
-     */
-    onSuggest?: (text: string) => string[];
-    /**
-     * ESC pressed.
-     */
-    onCancel?: () => void;
-};
-/**
- * Creates an autocomplete extension that shows inline suggestions.
- * Pressing Tab will complete the suggestion.
- */
-export declare const autocomplete: ({ onSubmit, onSuggest, onCancel }: AutocompleteOptions) => Extension;
-//# sourceMappingURL=autocomplete.d.ts.map

package/dist/types/src/components/ChatEditor/autocomplete.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"autocomplete.d.ts","sourceRoot":"","sources":["../../../../../src/components/ChatEditor/autocomplete.ts"],"names":[],"mappings":"AAIA,OAAO,EAAQ,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAWzD,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI,CAAC;IAE5C;;;;OAIG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF;;;GAGG;AAEH,eAAO,MAAM,YAAY,GAAI,mCAAmC,mBAAmB,KAAG,SA+JrF,CAAC"}

package/src/components/ChatEditor/autocomplete.ts

@@ -1,218 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Prec, type Extension } from '@codemirror/state';
-import {
-  EditorView,
-  Decoration,
-  ViewPlugin,
-  keymap,
-  type DecorationSet,
-  type ViewUpdate,
-  WidgetType,
-} from '@codemirror/view';
-
-export type AutocompleteOptions = {
-  /**
-   * Callback triggered when Enter is pressed.
-   * @param text The current text in the editor
-   * @returns true if the editor should reset the document.
-   */
-  onSubmit?: (text: string) => boolean | void;
-
-  /**
-   * Function that returns a list of suggestions based on the current text.
-   * @param text The current text before the cursor
-   * @returns Array of suggestion strings
-   */
-  onSuggest?: (text: string) => string[];
-
-  /**
-   * ESC pressed.
-   */
-  onCancel?: () => void;
-};
-
-/**
- * Creates an autocomplete extension that shows inline suggestions.
- * Pressing Tab will complete the suggestion.
- */
-// TODO(burdon): Move to react-ui-editor.
-export const autocomplete = ({ onSubmit, onSuggest, onCancel }: AutocompleteOptions): Extension => {
-  const suggest = ViewPlugin.fromClass(
-    class {
-      _decorations: DecorationSet;
-      _currentSuggestion: string | null = null;
-
-      constructor(view: EditorView) {
-        this._decorations = this.computeDecorations(view);
-      }
-
-      update(update: ViewUpdate) {
-        if (update.docChanged || update.selectionSet) {
-          this._decorations = this.computeDecorations(update.view);
-        }
-      }
-
-      private computeDecorations(view: EditorView): DecorationSet {
-        const text = view.state.doc.toString();
-        const suggestions = onSuggest?.(text) ?? [];
-        if (!suggestions.length) {
-          this._currentSuggestion = null;
-          return Decoration.none;
-        }
-
-        // Get the first suggestion.
-        this._currentSuggestion = suggestions[0];
-        const suffix = this._currentSuggestion.slice(text.length);
-        if (!suffix) {
-          return Decoration.none;
-        }
-
-        // Always show ghost text at the end of the document.
-        return Decoration.set([
-          Decoration.widget({
-            widget: new InlineSuggestionWidget(suffix),
-            side: 1,
-          }).range(view.state.doc.length),
-        ]);
-      }
-
-      completeSuggestion(view: EditorView): boolean {
-        if (!this._currentSuggestion) {
-          return false;
-        }
-
-        const text = view.state.doc.toString();
-        const suffix = this._currentSuggestion.slice(text.length);
-        if (!suffix) {
-          return false;
-        }
-
-        view.dispatch({
-          changes: {
-            from: view.state.doc.length,
-            insert: suffix,
-          },
-          selection: {
-            anchor: view.state.doc.length + suffix.length,
-          },
-        });
-
-        return true;
-      }
-    },
-    {
-      decorations: (v) => v._decorations,
-    },
-  );
-
-  return [
-    suggest,
-    EditorView.theme({
-      '.cm-inline-suggestion': {
-        opacity: 0.4,
-      },
-    }),
-
-    Prec.highest(
-      keymap.of([
-        {
-          key: 'Tab',
-          preventDefault: true,
-          run: (view) => {
-            const plugin = view.plugin(suggest);
-            return plugin?.completeSuggestion(view) ?? false;
-          },
-        },
-        {
-          key: 'ArrowRight',
-          preventDefault: true,
-          run: (view) => {
-            // Only complete if cursor is at the end
-            if (view.state.selection.main.head !== view.state.doc.length) {
-              return false;
-            }
-
-            const plugin = view.plugin(suggest);
-            return plugin?.completeSuggestion(view) ?? false;
-          },
-        },
-        {
-          key: 'Enter',
-          preventDefault: true,
-          run: (view) => {
-            const text = view.state.doc.toString().trim();
-            if (text.length > 0 && onSubmit) {
-              const reset = onSubmit(text);
-
-              // Clear the document after calling onEnter.
-              if (reset) {
-                view.dispatch({
-                  changes: {
-                    from: 0,
-                    to: view.state.doc.length,
-                    insert: '',
-                  },
-                });
-              }
-            }
-
-            return true;
-          },
-        },
-        {
-          key: 'Shift-Enter',
-          preventDefault: true,
-          run: (view) => {
-            view.dispatch({
-              changes: {
-                from: view.state.selection.main.head,
-                insert: '\n',
-              },
-              selection: {
-                anchor: view.state.selection.main.head + 1,
-                head: view.state.selection.main.head + 1,
-              },
-            });
-            return true;
-          },
-        },
-        {
-          key: 'Escape',
-          preventDefault: true,
-          run: (view) => {
-            // Clear the entire document.
-            view.dispatch({
-              changes: {
-                from: 0,
-                to: view.state.doc.length,
-                insert: '',
-              },
-            });
-            onCancel?.();
-            return true;
-          },
-        },
-      ]),
-    ),
-  ];
-};
-
-class InlineSuggestionWidget extends WidgetType {
-  constructor(private suffix: string) {
-    super();
-  }
-
-  override toDOM(): HTMLSpanElement {
-    const span = document.createElement('span');
-    span.textContent = this.suffix;
-    span.className = 'cm-inline-suggestion';
-    return span;
-  }
-
-  override eq(other: InlineSuggestionWidget): boolean {
-    return other.suffix === this.suffix;
-  }
-}