@dxos/plugin-search 0.8.4-main.d05673bc65 → 0.8.4-main.dfabb4ec29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.4-main.d05673bc65",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "Search plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,12 +12,68 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": "./src/SearchPlugin.tsx",
+      "types": "./dist/types/src/SearchPlugin.d.ts",
+      "default": "./dist/lib/neutral/SearchPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "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"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -28,58 +84,59 @@
   "dependencies": {
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/app-framework": "0.8.4-main.d05673bc65",
-    "@dxos/app-toolkit": "0.8.4-main.d05673bc65",
-    "@dxos/assistant": "0.8.4-main.d05673bc65",
-    "@dxos/ai": "0.8.4-main.d05673bc65",
-    "@dxos/async": "0.8.4-main.d05673bc65",
-    "@dxos/debug": "0.8.4-main.d05673bc65",
-    "@dxos/echo-protocol": "0.8.4-main.d05673bc65",
-    "@dxos/blueprints": "0.8.4-main.d05673bc65",
-    "@dxos/echo-query": "0.8.4-main.d05673bc65",
-    "@dxos/echo": "0.8.4-main.d05673bc65",
-    "@dxos/effect": "0.8.4-main.d05673bc65",
-    "@dxos/invariant": "0.8.4-main.d05673bc65",
-    "@dxos/log": "0.8.4-main.d05673bc65",
-    "@dxos/operation": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-client": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-deck": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-graph": "0.8.4-main.d05673bc65",
-    "@dxos/react-client": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-space": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-mosaic": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-components": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-searchlist": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-menu": "0.8.4-main.d05673bc65",
-    "@dxos/schema": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-stack": "0.8.4-main.d05673bc65",
-    "@dxos/util": "0.8.4-main.d05673bc65",
-    "@dxos/types": "0.8.4-main.d05673bc65"
+    "@dxos/ai": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-framework": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/assistant": "0.8.4-main.dfabb4ec29",
+    "@dxos/compute": "0.8.4-main.dfabb4ec29",
+    "@dxos/async": "0.8.4-main.dfabb4ec29",
+    "@dxos/debug": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-query": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-protocol": "0.8.4-main.dfabb4ec29",
+    "@dxos/effect": "0.8.4-main.dfabb4ec29",
+    "@dxos/invariant": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-deck": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-components": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-search": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-space": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-stack": "0.8.4-main.dfabb4ec29",
+    "@dxos/schema": "0.8.4-main.dfabb4ec29",
+    "@dxos/types": "0.8.4-main.dfabb4ec29",
+    "@dxos/util": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-attention": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-list": "0.8.4-main.dfabb4ec29"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-preview": "0.8.4-main.d05673bc65",
-    "@dxos/random": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-testing": "0.8.4-main.d05673bc65",
-    "@dxos/storybook-utils": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui": "0.8.4-main.d05673bc65",
-    "@dxos/ui-theme": "0.8.4-main.d05673bc65"
+    "vite": "^8.0.10",
+    "@dxos/plugin-preview": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/random": "0.8.4-main.dfabb4ec29",
+    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.d05673bc65",
-    "@dxos/ui-theme": "0.8.4-main.d05673bc65"
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29"
   },
   "publishConfig": {
     "access": "public"

package/src/SearchPlugin.tsx

@@ -5,32 +5,16 @@
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 
-import { AppGraphBuilder, OperationResolver, ReactSurface } from './capabilities';
-import { SEARCH_RESULT, meta } from './meta';
-import { translations } from './translations';
-import { type SearchResult } from './types';
+import { AppGraphBuilder, OperationHandler, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
 export const SearchPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: SEARCH_RESULT,
-      metadata: {
-        parse: (item: SearchResult, type: string) => {
-          switch (type) {
-            case 'node':
-              return { id: item.id, label: item.label, data: item.object };
-            case 'object':
-              return item.object;
-            case 'view-object':
-              return item;
-          }
-        },
-      },
-    },
-  }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default SearchPlugin;

package/src/capabilities/{app-graph-builder/app-graph-builder.ts → app-graph-builder.ts}

@@ -5,20 +5,20 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, COMPANION_PREFIX, getSpaceIdFromPath } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { AppCapabilities, AppNode, getSpaceIdFromPath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { linkedSegment } from '@dxos/react-ui-attention';
 
-import { meta } from '../../meta';
-import { SearchOperation } from '../../types';
+import { meta } from '#meta';
+import { SearchOperation } from '#types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
       GraphBuilder.createExtension({
-        id: `${meta.id}.space-search`,
+        id: 'space-search',
         match: NodeMatcher.whenRoot,
         connector: Effect.fnUntraced(function* (node, get) {
           const client = yield* Capability.get(ClientCapabilities.Client);
@@ -28,21 +28,17 @@ export default Capability.makeModule(
           const space = spaceId ? client.spaces.get(spaceId) : null;
 
           return [
-            {
-              id: `${COMPANION_PREFIX}search`,
-              type: DECK_COMPANION_TYPE,
+            AppNode.makeDeckCompanion({
+              id: linkedSegment('search'),
+              label: ['search.label', { ns: meta.id }],
+              icon: 'ph--magnifying-glass--regular',
               data: space,
-              properties: {
-                label: ['search label', { ns: meta.id }],
-                icon: 'ph--magnifying-glass--regular',
-                disposition: 'hidden',
-              },
-            },
+            }),
           ];
         }),
       }),
       GraphBuilder.createExtension({
-        id: meta.id,
+        id: 'root',
         match: NodeMatcher.whenRoot,
         actions: () =>
           Effect.succeed([
@@ -53,7 +49,7 @@ export default Capability.makeModule(
                 return false;
               }),
               properties: {
-                label: ['search action label', { ns: meta.id }],
+                label: ['search-action.label', { ns: meta.id }],
                 icon: 'ph--magnifying-glass--regular',
                 keyBinding: {
                   macos: 'shift+meta+f',

package/src/capabilities/index.ts

@@ -2,6 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './operation-resolver';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { SearchOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, SearchOperationHandlerSet);
+  }),
+);

package/src/capabilities/{react-surface/react-surface.tsx → react-surface.tsx}

@@ -3,39 +3,49 @@
 //
 
 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';
-import { useActiveSpace } from '@dxos/plugin-space';
+import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
 import { type Space, isSpace } from '@dxos/react-client/echo';
 
-import { SEARCH_DIALOG } from '../../constants';
-import { SearchDialog, type SearchDialogProps, SearchMain } from '../../containers';
-import { SearchContextProvider } from '../../hooks';
+import { SearchArticle, SearchDialog } from '#containers';
+import { SearchContextProvider } from '#hooks';
+
+import { SEARCH_DIALOG } from '../constants';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: SEARCH_DIALOG,
-        role: 'dialog',
-        filter: (data): data is { props: SearchDialogProps } => data.component === 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>
-              <SearchMain space={space} />
+              <SearchArticle space={space} />
             </SearchContextProvider>
           );
         },
@@ -52,7 +62,7 @@ export default Capability.makeModule(() =>
 
           return (
             <SearchContextProvider>
-              <SearchMain space={space} />
+              <SearchArticle space={space} />
             </SearchContextProvider>
           );
         },

package/src/components/SearchResultStack/SearchResultStack.tsx

@@ -0,0 +1,118 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { type KeyboardEvent, forwardRef, useCallback, useMemo, useState } from 'react';
+
+import { Surface } from '@dxos/app-framework/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';
+import { Menu } from '@dxos/react-ui-menu';
+import { type MosaicTileProps, Mosaic, useMosaicContainer, Focus } from '@dxos/react-ui-mosaic';
+import { type SearchResult } from '@dxos/react-ui-search';
+import { composable, composableProps } from '@dxos/ui-theme';
+
+//
+// SearchResultStack
+//
+
+export type SearchResultStackProps = {
+  results: SearchResult[];
+};
+
+export const SearchResultStack = composable<HTMLDivElement, SearchResultStackProps>(
+  ({ results, ...props }, forwardedRef) => {
+    const [viewport, setViewport] = useState<HTMLElement | null>(null);
+    const items = useMemo(() => results.map((result) => ({ result })), [results]);
+
+    const handleKeyDown = useCallback((event: KeyboardEvent<HTMLDivElement>) => {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        (document.activeElement as HTMLElement | null)?.click();
+      }
+    }, []);
+
+    return (
+      <Focus.Group asChild {...composableProps(props)} onKeyDown={handleKeyDown} ref={forwardedRef}>
+        <Mosaic.Container asChild>
+          <ScrollArea.Root orientation='vertical' padding centered>
+            <ScrollArea.Viewport ref={setViewport}>
+              <Mosaic.VirtualStack
+                Tile={SearchResultTile}
+                classNames='my-2'
+                gap={8}
+                items={items}
+                draggable={false}
+                getId={(item) => item.result.id}
+                getScrollElement={() => viewport}
+                estimateSize={() => 150}
+              />
+            </ScrollArea.Viewport>
+          </ScrollArea.Root>
+        </Mosaic.Container>
+      </Focus.Group>
+    );
+  },
+);
+
+SearchResultStack.displayName = 'SearchResultStack';
+
+//
+// SearchResultTile
+//
+
+type SearchResultTileData = {
+  result: SearchResult;
+};
+
+type SearchResultTileProps = Pick<MosaicTileProps<SearchResultTileData>, 'location' | 'data' | 'current'>;
+
+/**
+ * Search result tile that uses Surface to render object content.
+ */
+const SearchResultTile = forwardRef<HTMLDivElement, SearchResultTileProps>(
+  ({ data, location, current }, forwardedRef) => {
+    const { result } = data;
+    const menuItems = useObjectMenuItems(result.object);
+    const { setCurrentId } = useMosaicContainer('SearchResultTile');
+
+    const handleCurrentChange = useCallback(() => {
+      setCurrentId(result.id);
+    }, [result.id, setCurrentId]);
+
+    return (
+      <Menu.Root>
+        <Mosaic.Tile
+          asChild
+          classNames='dx-hover dx-current dx-selected'
+          id={result.id}
+          data={data}
+          location={location}
+        >
+          <Focus.Item asChild current={current} onCurrentChange={handleCurrentChange}>
+            <Card.Root ref={forwardedRef} role='button' classNames='cursor-pointer'>
+              <Card.Toolbar>
+                <Card.IconBlock />
+                <Card.Title>{result.label ?? (result.object && Entity.getLabel(result.object))}</Card.Title>
+                <Menu.Trigger asChild disabled={!menuItems?.length}>
+                  <Toolbar.IconButton
+                    iconOnly
+                    variant='ghost'
+                    icon='ph--dots-three-vertical--regular'
+                    label='Actions'
+                  />
+                </Menu.Trigger>
+                <Menu.Content items={menuItems} />
+              </Card.Toolbar>
+              <Surface.Surface type={AppSurface.Card} data={{ subject: result.object }} limit={1} />
+            </Card.Root>
+          </Focus.Item>
+        </Mosaic.Tile>
+      </Menu.Root>
+    );
+  },
+);
+
+SearchResultTile.displayName = 'SearchResultTile';

package/src/components/SearchResultStack/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export * from './SearchResultStack';

package/src/components/index.ts

@@ -1,3 +1,5 @@
 //
 // Copyright 2023 DXOS.org
 //
+
+export * from './SearchResultStack';

package/src/constants.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const SEARCH_DIALOG = `${meta.id}.SearchDialog`;

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

@@ -0,0 +1,79 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capability } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
+import { random } from '@dxos/random';
+import { useSpaces } from '@dxos/react-client/echo';
+import { Loading, withLayout } from '@dxos/react-ui/testing';
+import { createObjectFactory } from '@dxos/schema/testing';
+import { Organization, Person } from '@dxos/types';
+
+import { SearchContextProvider } from '#hooks';
+import { translations } from '#translations';
+
+import { SearchArticle } from './SearchArticle';
+
+random.seed(0);
+
+const DefaultStory = () => {
+  const spaces = useSpaces();
+  const space = spaces[spaces.length - 1];
+  if (!space) {
+    return <Loading />;
+  }
+
+  return (
+    <SearchContextProvider>
+      <SearchArticle role='article' space={space} attendableId={space.id} />
+    </SearchContextProvider>
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-search/containers/SearchArticle',
+  render: DefaultStory,
+  decorators: [
+    withLayout({ layout: 'column' }),
+    withPluginManager({
+      capabilities: [Capability.contributes(AppCapabilities.Translations, translations)],
+      plugins: [
+        ...corePlugins(),
+        StorybookPlugin({}),
+        ClientPlugin({
+          types: [Organization.Organization, Person.Person],
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              const { personalSpace } = yield* initializeIdentity(client);
+
+              const factory = createObjectFactory(personalSpace.db, random as any);
+              yield* Effect.promise(() =>
+                factory([
+                  { type: Organization.Organization, count: 10 },
+                  { type: Person.Person, count: 50 },
+                ]),
+              );
+            }),
+        }),
+      ],
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};