@dxos/plugin-search 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.4-main.9be5663bfe",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Search plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -19,6 +19,7 @@
     "#hooks": "./src/hooks/index.ts",
     "#meta": "./src/meta.ts",
     "#operations": "./src/operations/index.ts",
+    "#translations": "./src/translations.ts",
     "#types": "./src/types/index.ts"
   },
   "exports": {
@@ -27,6 +28,12 @@
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -37,34 +44,34 @@
   "dependencies": {
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/ai": "0.8.4-main.9be5663bfe",
-    "@dxos/assistant": "0.8.4-main.9be5663bfe",
-    "@dxos/app-toolkit": "0.8.4-main.9be5663bfe",
-    "@dxos/blueprints": "0.8.4-main.9be5663bfe",
-    "@dxos/debug": "0.8.4-main.9be5663bfe",
-    "@dxos/async": "0.8.4-main.9be5663bfe",
-    "@dxos/echo": "0.8.4-main.9be5663bfe",
-    "@dxos/echo-protocol": "0.8.4-main.9be5663bfe",
-    "@dxos/echo-query": "0.8.4-main.9be5663bfe",
-    "@dxos/app-framework": "0.8.4-main.9be5663bfe",
-    "@dxos/effect": "0.8.4-main.9be5663bfe",
-    "@dxos/invariant": "0.8.4-main.9be5663bfe",
-    "@dxos/log": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-client": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-graph": "0.8.4-main.9be5663bfe",
-    "@dxos/operation": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-space": "0.8.4-main.9be5663bfe",
-    "@dxos/react-client": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-attention": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-menu": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-components": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-search": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe",
-    "@dxos/schema": "0.8.4-main.9be5663bfe",
-    "@dxos/util": "0.8.4-main.9be5663bfe",
-    "@dxos/types": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-deck": "0.8.4-main.9be5663bfe"
+    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/ai": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/assistant": "0.8.4-main.abd8ff62ef",
+    "@dxos/compute": "0.8.4-main.abd8ff62ef",
+    "@dxos/debug": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo-protocol": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo-query": "0.8.4-main.abd8ff62ef",
+    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
+    "@dxos/effect": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-graph": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-deck": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-space": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-attention": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-components": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-list": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
+    "@dxos/schema": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-search": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
+    "@dxos/types": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-menu": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -74,13 +81,13 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-preview": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-testing": "0.8.4-main.9be5663bfe",
-    "@dxos/random": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
-    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
+    "vite": "^8.0.10",
+    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-preview": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/random": "0.8.4-main.abd8ff62ef",
+    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -88,8 +95,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "publishConfig": {
     "access": "public"

package/src/SearchPlugin.tsx

@@ -7,10 +7,9 @@ import { AppPlugin } from '@dxos/app-toolkit';
 
 import { AppGraphBuilder, OperationHandler, ReactSurface } from '#capabilities';
 import { SEARCH_RESULT, meta } from '#meta';
+import { translations } from '#translations';
 import { type SearchResult } from '#types';
 
-import { translations } from './translations';
-
 export const SearchPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addMetadataModule({
@@ -35,3 +34,5 @@ export const SearchPlugin = Plugin.define(meta).pipe(
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default SearchPlugin;

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

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities, AppNode, getSpaceIdFromPath } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';

package/src/capabilities/index.ts

@@ -3,7 +3,7 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { SearchOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -3,7 +3,7 @@
 //
 
 import * as Effect from 'effect/Effect';
-import React from 'react';
+import React, { type ComponentProps } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface } from '@dxos/app-framework/ui';
@@ -20,19 +20,28 @@ export default Capability.makeModule(() =>
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: SEARCH_DIALOG,
-        role: 'dialog',
-        filter: AppSurface.componentDialog(SEARCH_DIALOG),
-        component: ({ data }) => (
-          <SearchContextProvider>
-            <SearchDialog {...data.props} />
-          </SearchContextProvider>
-        ),
+        filter: AppSurface.component<ComponentProps<typeof SearchDialog>>(AppSurface.Dialog, SEARCH_DIALOG),
+        component: ({ data }) => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return (
+            <SearchContextProvider>
+              <SearchDialog {...data.props} space={space} />
+            </SearchContextProvider>
+          );
+        },
       }),
       Surface.create({
         id: `${SEARCH_DIALOG}.search-input`,
         role: 'search-input',
         component: () => {
           const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
 
           return (
             <SearchContextProvider>

package/src/components/SearchResultStack/SearchResultStack.tsx

@@ -5,7 +5,7 @@
 import React, { type KeyboardEvent, forwardRef, useCallback, useMemo, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
-import { useObjectMenuItems } from '@dxos/app-toolkit/ui';
+import { AppSurface, useObjectMenuItems } from '@dxos/app-toolkit/ui';
 import { Entity } from '@dxos/echo';
 import { Card, Toolbar } from '@dxos/react-ui';
 import { ScrollArea } from '@dxos/react-ui';
@@ -106,7 +106,7 @@ const SearchResultTile = forwardRef<HTMLDivElement, SearchResultTileProps>(
                 </Menu.Trigger>
                 <Menu.Content items={menuItems} />
               </Card.Toolbar>
-              <Surface.Surface role='card--content' data={{ subject: result.object }} limit={1} />
+              <Surface.Surface type={AppSurface.Card} data={{ subject: result.object }} limit={1} />
             </Card.Root>
           </Focus.Item>
         </Mosaic.Tile>

package/src/containers/SearchArticle/SearchArticle.stories.tsx

@@ -19,8 +19,8 @@ import { createObjectFactory } from '@dxos/schema/testing';
 import { Organization, Person } from '@dxos/types';
 
 import { SearchContextProvider } from '#hooks';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { SearchArticle } from './SearchArticle';
 
 random.seed(0);
@@ -34,14 +34,13 @@ const DefaultStory = () => {
 
   return (
     <SearchContextProvider>
-      <SearchArticle space={space} />
+      <SearchArticle role='article' space={space} attendableId={space.id} />
     </SearchContextProvider>
   );
 };
 
 const meta = {
   title: 'plugins/plugin-search/containers/SearchArticle',
-  component: SearchArticle,
   render: DefaultStory,
   decorators: [
     withLayout({ layout: 'column' }),
@@ -71,7 +70,7 @@ const meta = {
   parameters: {
     layout: 'fullscreen',
   },
-} satisfies Meta<typeof SearchArticle>;
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 

package/src/containers/SearchArticle/SearchArticle.tsx

@@ -4,8 +4,9 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Entity, Query } from '@dxos/echo';
-import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
+import { Filter, useQuery } from '@dxos/react-client/echo';
 import { Panel, Toolbar } from '@dxos/react-ui';
 import { SearchList } from '@dxos/react-ui-search';
 import { Text } from '@dxos/schema';
@@ -14,16 +15,12 @@ import { isTauri, getHostPlatform } from '@dxos/util';
 import { SearchResultStack } from '#components';
 import { useGlobalSearch, useGlobalSearchResults, useWebSearch } from '#hooks';
 
-export type SearchArticleProps = {
-  space?: Space;
-};
-
-export const SearchArticle = ({ space }: SearchArticleProps) => {
+export const SearchArticle = ({ space }: AppSurface.SpaceArticleProps) => {
   // TODO(burdon): Option to query across spaces.
   const [query, setQuery] = useState<string>();
   // TODO(burdon): Re-enable full-text search when indexer is available in all environments.
   const objects = useQuery(
-    space?.db,
+    space.db,
     query === undefined ? Query.select(Filter.nothing()) : Query.select(Filter.not(Filter.type(Text.Text))),
   );
 

package/src/containers/SearchDialog/SearchDialog.stories.tsx

@@ -21,8 +21,8 @@ import { createObjectFactory } from '@dxos/schema/testing';
 import { Organization, Person } from '@dxos/types';
 
 import { SearchContextProvider } from '#hooks';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { SearchDialog } from './SearchDialog';
 
 random.seed(0);
@@ -38,7 +38,7 @@ const DefaultStory = () => {
     <SearchContextProvider>
       <Dialog.Root defaultOpen>
         <Dialog.Overlay>
-          <SearchDialog pivotId='storybook' space={space} />
+          <SearchDialog role='article' space={space} attendableId={space.id} pivotId='storybook' />
         </Dialog.Overlay>
       </Dialog.Root>
     </SearchContextProvider>
@@ -47,7 +47,6 @@ const DefaultStory = () => {
 
 const meta = {
   title: 'plugins/plugin-search/containers/SearchDialog',
-  component: SearchDialog,
   render: DefaultStory,
   decorators: [
     withLayout({ layout: 'fullscreen' }),
@@ -78,7 +77,7 @@ const meta = {
   parameters: {
     layout: 'fullscreen',
   },
-} satisfies Meta<typeof SearchDialog>;
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 

package/src/containers/SearchDialog/SearchDialog.tsx

@@ -6,10 +6,10 @@ import React, { useCallback, useMemo, useState } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { getObjectPathFromObject, LayoutOperation } from '@dxos/app-toolkit';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { useLayout } from '@dxos/app-toolkit/ui';
-import { useActiveSpace } from '@dxos/app-toolkit/ui';
 import { Entity, Obj, Query } from '@dxos/echo';
-import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
+import { Filter, useQuery } from '@dxos/react-client/echo';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { SearchList } from '@dxos/react-ui-search';
 import { Text } from '@dxos/schema';
@@ -18,21 +18,18 @@ import { useGlobalSearch, useGlobalSearchResults } from '#hooks';
 import { meta } from '#meta';
 import { type SearchResult } from '#types';
 
-export type SearchDialogProps = {
+export type SearchDialogProps = AppSurface.SpaceArticleProps<{
   pivotId?: string;
-  space?: Space;
-};
+}>;
 
-export const SearchDialog = ({ pivotId: pivotIdProp, space: spaceProp }: SearchDialogProps) => {
+export const SearchDialog = ({ space, pivotId: pivotIdProp }: SearchDialogProps) => {
   const { t } = useTranslation(meta.id);
-  const layout = useLayout();
-  const pivotId = pivotIdProp ?? layout.active[layout.active.length - 1];
   const { invokePromise } = useOperationInvoker();
   const { setMatch } = useGlobalSearch();
+  const layout = useLayout();
+  const pivotId = pivotIdProp ?? layout.active[layout.active.length - 1];
   const [query, setQuery] = useState<string>();
 
-  const activeSpace = useActiveSpace();
-  const space = spaceProp ?? activeSpace;
   // TODO(burdon): Re-enable full-text search when indexer is available in all environments.
   const objects = useQuery(
     space?.db,
@@ -75,26 +72,22 @@ export const SearchDialog = ({ pivotId: pivotIdProp, space: spaceProp }: SearchD
           <Dialog.CloseIconButton />
         </Dialog.Close>
       </Dialog.Header>
-      <Dialog.Body>
-        <SearchList.Root onSearch={handleSearch}>
-          <SearchList.Content classNames='max-h-[24rem]'>
-            <SearchList.Input classNames='px-0' autoFocus placeholder={t('search.placeholder')} />
-            <SearchList.Viewport>
-              {allResults.map((result) => (
-                <SearchList.Item
-                  key={result.id}
-                  classNames='flex gap-2 items-center'
-                  value={result.id}
-                  label={result.label ?? (result.object ? Entity.getLabel(result.object) : undefined) ?? result.id}
-                  icon={result.icon}
-                  onSelect={() => void handleSelect(result)}
-                />
-              ))}
-              {query && allResults.length === 0 && <SearchList.Empty />}
-            </SearchList.Viewport>
-          </SearchList.Content>
-        </SearchList.Root>
-      </Dialog.Body>
+      <SearchList.Root onSearch={handleSearch}>
+        <SearchList.Input classNames='px-0' autoFocus placeholder={t('search.placeholder')} />
+        <SearchList.Viewport classNames='max-h-[24rem]'>
+          {allResults.map((result) => (
+            <SearchList.Item
+              key={result.id}
+              classNames='flex gap-2 items-center'
+              value={result.id}
+              label={result.label ?? (result.object ? Entity.getLabel(result.object) : undefined) ?? result.id}
+              icon={result.icon}
+              onSelect={() => void handleSelect(result)}
+            />
+          ))}
+          {query && allResults.length === 0 && <SearchList.Empty />}
+        </SearchList.Viewport>
+      </SearchList.Root>
     </Dialog.Content>
   );
 };

package/src/containers/SearchDialog/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export { SearchDialog, type SearchDialogProps } from './SearchDialog';
 export { SearchDialog as default } from './SearchDialog';

package/src/containers/index.ts

@@ -4,7 +4,5 @@
 
 import { type ComponentType, lazy } from 'react';
 
-export type { SearchDialogProps } from './SearchDialog';
-
 export const SearchDialog: ComponentType<any> = lazy(() => import('./SearchDialog'));
 export const SearchArticle: ComponentType<any> = lazy(() => import('./SearchArticle'));

package/src/hooks/sync.ts

@@ -5,7 +5,7 @@
 import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
-import { type Entity, Obj } from '@dxos/echo';
+import { Entity, Obj } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 
 import { type SearchResult } from '#types';
@@ -57,7 +57,7 @@ export const filterObjectsSync = <T extends Entity.Unknown>(objects: T[], match?
 
       results.push({
         id: object.id,
-        type: getIcon(Obj.getSchema(object)),
+        type: getIcon(Entity.getSchema(object)),
         label,
         match,
         // TODO(burdon): Truncate.

package/src/hooks/useWebSearch.ts

@@ -5,7 +5,7 @@
 import { useCallback, useState } from 'react';
 
 import { EXA_API_KEY } from '@dxos/ai/testing';
-import { Obj } from '@dxos/echo';
+import { Entity } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { getIconAnnotation } from '@dxos/schema';
 import { TestSchema } from '@dxos/schema/testing';
@@ -44,7 +44,7 @@ export const useWebSearch = ({ query, context }: UseWebSearchProps): UseWebSearc
       });
 
       const mappedResults = results.data.map((result): SearchResult => {
-        const schema = Obj.getSchema(result);
+        const schema = Entity.getSchema(result);
         return {
           id: result.id,
           label: getStringProperty(result, ['name', 'title', 'label']),

package/src/index.ts

@@ -2,8 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './hooks';
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const SearchPlugin = Plugin.lazy(meta, () => import('./SearchPlugin'));
+
 export * from './meta';
-export * from './types';
 
-export * from './SearchPlugin';
+// TODO(wittjosiah): Hooks should not be exported from the plugin package at all.
+//   Either refactor callers to not need them or factor them out to a shared package.
+export * from './hooks';
+export * from './types';

package/src/operations/definitions.ts

@@ -4,7 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { meta } from '#meta';
 

package/src/operations/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export * as SearchOperation from './definitions';
 

package/src/operations/open-search.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { SEARCH_DIALOG } from '../constants';
 import { OpenSearch } from './definitions';

package/src/translations.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Resource } from '@dxos/react-ui';
-import { translations as searchTranslations } from '@dxos/react-ui-search';
+import { translations as searchTranslations } from '@dxos/react-ui-search/translations';
 
 import { meta } from '#meta';