@dxos/plugin-search 0.8.4-main.5ad4a44 → 0.8.4-main.66e292d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.4-main.5ad4a44",
+  "version": "0.8.4-main.66e292d",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,49 +27,50 @@
     "@preact-signals/safe-react": "^0.9.0",
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/ai": "0.8.4-main.5ad4a44",
-    "@dxos/app-framework": "0.8.4-main.5ad4a44",
-    "@dxos/assistant": "0.8.4-main.5ad4a44",
-    "@dxos/blueprints": "0.8.4-main.5ad4a44",
-    "@dxos/debug": "0.8.4-main.5ad4a44",
-    "@dxos/echo": "0.8.4-main.5ad4a44",
-    "@dxos/echo-protocol": "0.8.4-main.5ad4a44",
-    "@dxos/effect": "0.8.4-main.5ad4a44",
-    "@dxos/live-object": "0.8.4-main.5ad4a44",
-    "@dxos/log": "0.8.4-main.5ad4a44",
-    "@dxos/invariant": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-deck": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-space": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-graph": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-client": "0.8.4-main.5ad4a44",
-    "@dxos/react-client": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-stack": "0.8.4-main.5ad4a44",
-    "@dxos/schema": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-searchlist": "0.8.4-main.5ad4a44",
-    "@dxos/util": "0.8.4-main.5ad4a44"
+    "@dxos/ai": "0.8.4-main.66e292d",
+    "@dxos/app-framework": "0.8.4-main.66e292d",
+    "@dxos/assistant": "0.8.4-main.66e292d",
+    "@dxos/debug": "0.8.4-main.66e292d",
+    "@dxos/echo": "0.8.4-main.66e292d",
+    "@dxos/effect": "0.8.4-main.66e292d",
+    "@dxos/invariant": "0.8.4-main.66e292d",
+    "@dxos/echo-protocol": "0.8.4-main.66e292d",
+    "@dxos/live-object": "0.8.4-main.66e292d",
+    "@dxos/log": "0.8.4-main.66e292d",
+    "@dxos/plugin-client": "0.8.4-main.66e292d",
+    "@dxos/plugin-deck": "0.8.4-main.66e292d",
+    "@dxos/plugin-graph": "0.8.4-main.66e292d",
+    "@dxos/react-client": "0.8.4-main.66e292d",
+    "@dxos/blueprints": "0.8.4-main.66e292d",
+    "@dxos/react-ui-stack": "0.8.4-main.66e292d",
+    "@dxos/plugin-space": "0.8.4-main.66e292d",
+    "@dxos/util": "0.8.4-main.66e292d",
+    "@dxos/react-ui-searchlist": "0.8.4-main.66e292d",
+    "@dxos/types": "0.8.4-main.66e292d",
+    "@dxos/schema": "0.8.4-main.66e292d"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
     "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-theme": "0.8.4-main.5ad4a44",
-    "@dxos/storybook-utils": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui": "0.8.4-main.5ad4a44"
+    "@dxos/random": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/storybook-utils": "0.8.4-main.66e292d"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-theme": "0.8.4-main.5ad4a44"
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/app-graph-builder.ts

@@ -2,14 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
+import { Atom } from '@effect-atom/atom-react';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 
 import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { ROOT_ID, createExtension, rxFromSignal } from '@dxos/plugin-graph';
+import { ROOT_ID, atomFromSignal, createExtension } from '@dxos/plugin-graph';
 import { parseId } from '@dxos/react-client/echo';
 
 import { meta } from '../meta';
@@ -20,12 +20,12 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/space-search`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map((node) => {
-              const workspace = get(rxFromSignal(() => context.getCapability(Capabilities.Layout).workspace));
+              const workspace = get(atomFromSignal(() => context.getCapability(Capabilities.Layout).workspace));
               const client = context.getCapability(ClientCapabilities.Client);
               const { spaceId } = parseId(workspace);
               const space = spaceId ? client.spaces.get(spaceId) : null;
@@ -50,7 +50,7 @@ export default (context: PluginContext) =>
     createExtension({
       id: meta.id,
       actions: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
@@ -61,6 +61,7 @@ export default (context: PluginContext) =>
                   data: async () => {
                     const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
                     await dispatch(createIntent(SearchAction.OpenSearch));
+                    return false;
                   },
                   properties: {
                     label: ['search action label', { ns: meta.id }],

package/src/capabilities/react-surface.tsx

@@ -28,9 +28,6 @@ export default () =>
       role: 'search-input',
       component: () => {
         const space = useActiveSpace();
-        if (!space) {
-          return null;
-        }
 
         return (
           <SearchContextProvider>

package/src/components/Search.stories.tsx

@@ -6,7 +6,7 @@ import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite'
 import React, { useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { SearchContextProvider, useGlobalSearch, useGlobalSearchResults } from '../hooks';
 
@@ -26,7 +26,7 @@ const DefaultStory = ({ objects, ...props }: StoryProps) => {
 
   return (
     <div className='flex grow justify-center overflow-hidden'>
-      <div className='flex flex-col w-[300px] m-4 overflow-hidden'>
+      <div className='flex flex-col is-[300px] m-4 overflow-hidden'>
         <Searchbar variant='subdued' placeholder='Enter regular expression...' onChange={setMatch} {...props} />
         <SearchResults items={filteredItems} selected={selected} onSelect={setSelected} />
       </div>
@@ -56,10 +56,7 @@ const meta = {
   title: 'plugins/plugin-search/Search',
   component: Searchbar,
   render: DefaultStory,
-  decorators: [withTheme, withSearchContext()],
-  parameters: {
-    layout: 'column',
-  },
+  decorators: [withTheme, withLayout({ container: 'column' }), withSearchContext()],
 } satisfies Meta<typeof Searchbar>;
 
 export default meta;

package/src/components/SearchDialog.tsx

@@ -5,10 +5,12 @@
 import * as Option from 'effect/Option';
 import React, { forwardRef, useCallback, useState } from 'react';
 
-import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher, useLayout } from '@dxos/app-framework';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useAppGraph, useIntentDispatcher, useLayout } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
 import { type Node } from '@dxos/plugin-graph';
 import { useClient } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
+import { Filter, useQuery } from '@dxos/react-client/echo';
 import { Button, Dialog, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { SearchList, type SearchListItemProps } from '@dxos/react-ui-searchlist';
 import { descriptionText, mx } from '@dxos/react-ui-theme';
@@ -59,12 +61,22 @@ export const SearchDialog = ({ pivotId }: SearchDialogProps) => {
 
   const handleSelect = useCallback(
     async (nodeId: string) => {
-      await dispatch(createIntent(LayoutAction.UpdateDialog, { part: 'dialog', options: { state: false } }));
+      await dispatch(
+        createIntent(LayoutAction.UpdateDialog, {
+          part: 'dialog',
+          options: { state: false },
+        }),
+      );
 
       // If node is already present in the active parts, scroll to it and close the dialog.
       const index = layout.active.findIndex((id) => id === nodeId);
       if (index !== -1) {
-        await dispatch(createIntent(LayoutAction.ScrollIntoView, { part: 'current', subject: nodeId }));
+        await dispatch(
+          createIntent(LayoutAction.ScrollIntoView, {
+            part: 'current',
+            subject: nodeId,
+          }),
+        );
       } else {
         await dispatch(
           createIntent(LayoutAction.Open, {
@@ -91,13 +103,13 @@ export const SearchDialog = ({ pivotId }: SearchDialogProps) => {
             setQueryString(nextValue);
           }}
           placeholder={t('search placeholder')}
-          classNames='px-1 my-2'
+          classNames='pli-1 my-2'
         />
         <SearchList.Content classNames='max-bs-[24rem] overflow-auto'>
           {queryString.length > 0 ? (
             resultObjects.length > 0 ? (
               resultObjects
-                .map((object) => graph.getNode(fullyQualifiedId(object)))
+                .map((object) => graph.getNode(Obj.getDXN(object).toString()))
                 .filter(Option.isSome)
                 .map((node) => <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />)
             ) : (

package/src/components/SearchMain.tsx

@@ -2,67 +2,58 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type FC, useState } from 'react';
+import React, { useState } from 'react';
 
-import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
-import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { activeSurface, mx } from '@dxos/react-ui-theme';
+import { useTranslation } from '@dxos/react-ui';
+import { StackItem } from '@dxos/react-ui-stack';
+import { mx } from '@dxos/react-ui-theme';
 
-import { useGlobalSearch, useGlobalSearchResults } from '../hooks';
-import { useWebSearch } from '../hooks/useWebSearch';
+import { useGlobalSearch, useGlobalSearchResults, useWebSearch } from '../hooks';
 import { meta } from '../meta';
 
 import { Searchbar } from './Searchbar';
 import { SearchResults } from './SearchResults';
 
-export const SearchMain: FC<ThemedClassName<{ space: Space }>> = ({ classNames, space }) => {
+export const SearchMain = ({ space }: { space?: Space }) => {
   const { t } = useTranslation(meta.id);
   const client = useClient();
   const { setMatch } = useGlobalSearch();
   const [query, setQuery] = useState<string>();
-  // TODO(burdon): UX to select all spaces.
+  // TODO(burdon): Option to search across spaces.
   const allSpaces = false;
-
-  // TODO(burdon): Returns ALL objects (e.g., incl. Text objects that are fields of parent objects).
   const objects = useQuery(allSpaces ? client.spaces : space, Filter.everything());
   const results = useGlobalSearchResults(objects);
 
-  const {
-    runSearch,
-    results: webResults,
-    isLoading,
-  } = useWebSearch({
-    query,
-  });
-
-  const [selected, setSelected] = useState<string>();
+  const { runSearch, results: webResults } = useWebSearch({ query });
 
   // TODO(burdon): Activate and/or filter current main (set context).
+  const [selected, setSelected] = useState<string>();
   const handleSelect = (id: string) => {
     setSelected((selected) => (selected === id ? undefined : id));
   };
 
   const allResults = [...results, ...webResults];
-  log.info('results', { results, webResults });
 
   return (
-    <div className={mx('flex flex-col grow h-full overflow-hidden', classNames)}>
+    <StackItem.Content toolbar>
       <Searchbar
+        classNames='pli-2'
         placeholder={t('search placeholder')}
+        delay={300}
         onChange={(text) => {
           setQuery(text);
           setMatch?.(text);
         }}
         onSubmit={runSearch}
       />
-      {isLoading && <div className={mx('flex flex-col grow overflow-hidden', activeSurface)}>Loading...</div>}
+
       {allResults.length > 0 && (
-        <div className={mx('flex flex-col grow overflow-hidden', activeSurface)}>
+        <div className={mx('flex flex-col bs-full overflow-hidden')}>
           <SearchResults items={allResults} selected={selected} onSelect={handleSelect} />
         </div>
       )}
-    </div>
+    </StackItem.Content>
   );
 };

package/src/components/SearchResults/SearchResults.stories.tsx

@@ -5,6 +5,7 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
+import { withPluginManager } from '@dxos/app-framework/testing';
 import { faker } from '@dxos/random';
 import { withTheme } from '@dxos/react-ui/testing';
 
@@ -19,7 +20,7 @@ const DefaultStory = (props: SearchResultsProps) => {
 
   return (
     <div className='flex grow justify-center overflow-hidden'>
-      <div className='flex w-[300px] m-4 overflow-hidden'>
+      <div className='flex is-[300px] m-4 overflow-hidden'>
         <SearchResults {...props} selected={selected} onSelect={setSelected} />
       </div>
     </div>
@@ -40,7 +41,7 @@ const meta = {
   title: 'plugins/plugin-search/SearchResults',
   component: SearchResults,
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme, withPluginManager({ plugins: [] })],
   parameters: {
     layout: 'fullscreen',
   },

package/src/components/SearchResults/SearchResults.tsx

@@ -4,12 +4,57 @@
 
 import React, { type FC, forwardRef } from 'react';
 
+import { Surface } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
 import { Card } from '@dxos/react-ui-stack';
 import { ghostHover } from '@dxos/react-ui-theme';
 
-import { SEARCH_RESULT } from '../../meta';
 import { type SearchResult } from '../../types';
 
+export type SearchResultsProps = {
+  items: SearchResult[];
+  match?: RegExp;
+  selected?: string;
+  onSelect?: (id: string) => void;
+};
+
+// TODO(burdon): Key cursor up/down.
+// TODO(burdon): Use stack (should be virtualized).
+export const SearchResults = ({ items }: SearchResultsProps) => {
+  return (
+    <div className='overflow-y-auto'>
+      <div className='flex flex-col'>
+        {items
+          // TODO(burdon): Hack to reduce noise from system objects.
+          .filter((item) => Obj.getLabel(item.object))
+          .map((item) => (
+            <div key={item.id} role='none' className='pli-2 first:pbs-2 pbe-2'>
+              <Surface role='card' data={{ subject: item.object }} limit={1} />
+            </div>
+          ))}
+      </div>
+    </div>
+  );
+};
+
+export type SearchItemProps = SearchResult & { selected: boolean } & Pick<SearchResultsProps, 'onSelect'>;
+
+export const SearchItem = forwardRef<HTMLDivElement, SearchItemProps>((item, forwardRef) => {
+  const { id, objectType, label, snippet, match, selected, onSelect } = item;
+
+  return (
+    <Card.StaticRoot
+      ref={forwardRef}
+      classNames={['mx-2 mt-2 cursor-pointer', selected && '!bg-activeSurface', ghostHover]}
+      onClick={() => onSelect?.(id)}
+    >
+      {objectType && <div className='text-xs text-neutral-400 ml-4'>{objectType}</div>}
+      <Card.Heading>{label ?? 'Untitled'}</Card.Heading>
+      {snippet && <Snippet text={snippet} match={match} />}
+    </Card.StaticRoot>
+  );
+});
+
 export const Snippet: FC<{ text: string; match?: RegExp }> = ({ text, match }) => {
   let content = <>{text}</>;
   if (match) {
@@ -36,51 +81,3 @@ export const Snippet: FC<{ text: string; match?: RegExp }> = ({ text, match }) =
 
   return <span className='text-xs mb-1 line-clamp-3 text-neutral-300'>{content}</span>;
 };
-
-export type SearchItemProps = SearchResult & { selected: boolean } & Pick<SearchResultsProps, 'onSelect'>;
-
-export const SearchItem = forwardRef<HTMLDivElement, SearchItemProps>((item, forwardRef) => {
-  const { id, objectType, label, snippet, match, selected, onSelect } = item;
-
-  return (
-    <Card.StaticRoot
-      ref={forwardRef}
-      classNames={['mx-2 mt-2 cursor-pointer', selected && '!bg-activeSurface', ghostHover]}
-      onClick={() => onSelect?.(id)}
-    >
-      {objectType && (
-        <>
-          <div className='text-xs text-neutral-400 ml-4'>{objectType}</div>
-        </>
-      )}
-      <Card.Heading>{label ?? 'Untitled'}</Card.Heading>
-      {snippet && <Snippet text={snippet} match={match} />}
-    </Card.StaticRoot>
-  );
-});
-
-export type SearchResultsProps = {
-  match?: RegExp;
-  items: SearchResult[];
-  selected?: string;
-  onSelect?: (id: string) => void;
-};
-
-// TODO(burdon): Key cursor up/down.
-export const SearchResults = ({ items, selected, onSelect }: SearchResultsProps) => {
-  return (
-    <div className='flex flex-col grow overflow-y-auto'>
-      <div className='flex flex-col'>
-        {items.map((item) => (
-          <SearchItem
-            key={item.id}
-            type={SEARCH_RESULT}
-            {...item}
-            onSelect={onSelect}
-            selected={selected === item.id}
-          />
-        ))}
-      </div>
-    </div>
-  );
-};

package/src/components/Searchbar/Searchbar.tsx

@@ -2,66 +2,61 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type KeyboardEvent, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 
-import { Icon, Input, type TextInputProps } from '@dxos/react-ui';
+import { Input, type TextInputProps, type ThemedClassName, Toolbar, useControlledState } from '@dxos/react-ui';
 
-export type SearchbarProps = Pick<TextInputProps, 'variant' | 'placeholder'> & {
-  classes?: {
-    root?: string;
-    input?: string;
-  };
-  value?: string;
-  onChange?: (text?: string) => void;
-  onSubmit?: (text?: string) => void;
-  delay?: number;
-};
+export type SearchbarProps = ThemedClassName<
+  Pick<TextInputProps, 'variant' | 'placeholder'> & {
+    delay?: number;
+    value?: string;
+    onChange?: (text?: string) => void;
+    onSubmit?: (text?: string) => void;
+  }
+>;
 
-export const Searchbar = ({ classes, variant, placeholder, value, onChange, onSubmit }: SearchbarProps) => {
+export const Searchbar = ({ classNames, variant, placeholder, value, onChange, onSubmit }: SearchbarProps) => {
+  const [text, setText] = useControlledState(value, onChange);
   const inputRef = useRef<HTMLInputElement>(null);
-  const [text, setText] = useState(value);
-  useEffect(() => {
-    setText(value);
-  }, [value]);
-  const handleChange = (text?: string) => {
-    setText(text);
-    onChange?.(text);
-  };
 
-  const handleReset = () => {
-    handleChange(undefined);
-    inputRef.current?.focus();
-  };
+  const handleWindowKeyDown = useCallback(
+    (event: KeyboardEvent) => {
+      if (event.key === 'f' && event.metaKey && event.shiftKey) {
+        inputRef.current?.focus();
+      }
+    },
+    [inputRef],
+  );
 
-  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-    switch (event.key) {
-      case 'Enter':
-        onSubmit?.(text);
-        break;
-      case 'Escape':
-        handleReset();
-        break;
-    }
-  };
+  useEffect(() => {
+    window.addEventListener('keydown', handleWindowKeyDown);
+    return () => window.removeEventListener('keydown', handleWindowKeyDown);
+  }, [handleWindowKeyDown]);
+
+  const handleKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLInputElement>) => {
+      switch (event.key) {
+        case 'Enter':
+          onSubmit?.(text);
+          break;
+      }
+    },
+    [text, onSubmit],
+  );
 
   return (
-    <div className='flex shrink-0w-full items-center pli-1 pbs-1'>
+    <Toolbar.Root classNames={classNames}>
       <Input.Root>
         <Input.TextInput
           ref={inputRef}
           placeholder={placeholder}
+          autoFocus
           variant={variant}
           value={text ?? ''}
-          classNames={['pl-3 pr-10', classes?.input]}
-          onChange={({ target }) => handleChange(target.value)}
+          onChange={({ target }) => setText(target.value)}
           onKeyDown={handleKeyDown}
         />
-
-        {/* TODO(burdon): Margin should be density specific. */}
-        <div role='button' className='-ml-7 p-0 cursor-pointer' onClick={handleReset}>
-          <Icon icon='ph--magnifying-glass--regular' size={5} />
-        </div>
       </Input.Root>
-    </div>
+    </Toolbar.Root>
   );
 };

package/src/hooks/index.ts

@@ -3,5 +3,7 @@
 //
 
 export * from './sync';
+
 export * from './useGlobalSearch';
 export * from './useSearchResults';
+export * from './useWebSearch';

package/src/hooks/sync.ts

@@ -6,7 +6,7 @@ import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { Obj } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 
 import { type SearchResult } from '../types';
 
@@ -46,7 +46,7 @@ export const filterObjectsSync = <T extends Record<string, any>>(objects: T[], m
 
   return objects.reduce<SearchResult[]>((results, object) => {
     // TODO(burdon): Hack to ignore Text objects.
-    if (object instanceof DataType.Text) {
+    if (object instanceof Text.Text) {
       return results;
     }
 
@@ -112,7 +112,7 @@ const getKeys = (object: Record<string, unknown>): string[] => {
 export const mapObjectToTextFields = <T extends Record<string, unknown>>(object: T): TextFields => {
   return getKeys(object).reduce<TextFields>((fields, key) => {
     const value = object[key] as any;
-    if (typeof value === 'string' || value instanceof DataType.Text) {
+    if (typeof value === 'string' || value instanceof Text.Text) {
       try {
         fields[key] = String(value);
       } catch (err) {

package/src/hooks/useSearchResults.ts

@@ -5,7 +5,7 @@
 import { yieldOrContinue } from 'main-thread-scheduling';
 import { useEffect, useState } from 'react';
 
-import { DataType } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 
 // TODO(thure): Deprecate search-sync, move still-relevant utilities elsewhere (here, probably).
 import { mapObjectToTextFields, queryStringToMatch } from './sync';
@@ -20,7 +20,7 @@ export const filterObjects = async <T extends Record<string, any>>(
   }
   await Promise.all(
     objects
-      .filter((object) => !(object instanceof DataType.Text))
+      .filter((object) => !(object instanceof Text.Text))
       .map(async (object) => {
         await yieldOrContinue('interactive');
         const fields = mapObjectToTextFields<T>(object);

package/src/hooks/useWebSearch.ts

@@ -9,7 +9,7 @@ import { Obj } from '@dxos/echo';
 import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { getIconAnnotation } from '@dxos/schema';
-import { Testing } from '@dxos/schema/testing';
+import { TestSchema } from '@dxos/schema/testing';
 
 import { search } from '../search';
 import { type SearchResult } from '../types';
@@ -27,7 +27,7 @@ export const useWebSearch = ({ query, context }: { query?: string; context?: str
       const results = await search({
         query,
         context,
-        schema: [Testing.Project, Testing.Organization, Testing.Contact],
+        schema: [TestSchema.Project, TestSchema.Organization, TestSchema.Person],
         exaApiKey: EXA_API_KEY,
       });
 

package/src/meta.ts

@@ -3,11 +3,15 @@
 //
 
 import { type PluginMeta } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
 export const meta: PluginMeta = {
   id: 'dxos.org/plugin/search',
   name: 'Search',
-  description: 'Search ECHO spaces for content.',
+  description: trim`
+    Full-text search engine for finding content across all spaces and object types.
+    Quickly locate documents, tables, and other objects with instant results and relevance ranking.
+  `,
   icon: 'ph--magnifying-glass--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-search',
   tags: ['labs'],