@dxos/plugin-search 0.8.1 → 0.8.2-main.10c050d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-search",
-  "version": "0.8.1",
+  "version": "0.8.2-main.10c050d",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,48 +23,55 @@
     "src"
   ],
   "dependencies": {
-    "effect": "3.13.3",
+    "@preact-signals/safe-react": "^0.9.0",
     "exa-js": "^1.5.12",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/app-framework": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/artifact": "0.8.1",
-    "@dxos/echo-protocol": "0.8.1",
-    "@dxos/echo-schema": "0.8.1",
-    "@dxos/effect": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/assistant": "0.8.1",
-    "@dxos/live-object": "0.8.1",
-    "@dxos/log": "0.8.1",
-    "@dxos/plugin-client": "0.8.1",
-    "@dxos/plugin-deck": "0.8.1",
-    "@dxos/plugin-graph": "0.8.1",
-    "@dxos/plugin-markdown": "0.8.1",
-    "@dxos/plugin-space": "0.8.1",
-    "@dxos/react-client": "0.8.1",
-    "@dxos/react-ui-searchlist": "0.8.1",
-    "@dxos/react-ui-card": "0.8.1",
-    "@dxos/schema": "0.8.1",
-    "@dxos/util": "0.8.1"
+    "@dxos/app-framework": "0.8.2-main.10c050d",
+    "@dxos/ai": "0.8.2-main.10c050d",
+    "@dxos/artifact": "0.8.2-main.10c050d",
+    "@dxos/assistant": "0.8.2-main.10c050d",
+    "@dxos/debug": "0.8.2-main.10c050d",
+    "@dxos/echo": "0.8.2-main.10c050d",
+    "@dxos/echo-schema": "0.8.2-main.10c050d",
+    "@dxos/echo-protocol": "0.8.2-main.10c050d",
+    "@dxos/effect": "0.8.2-main.10c050d",
+    "@dxos/invariant": "0.8.2-main.10c050d",
+    "@dxos/live-object": "0.8.2-main.10c050d",
+    "@dxos/plugin-client": "0.8.2-main.10c050d",
+    "@dxos/plugin-graph": "0.8.2-main.10c050d",
+    "@dxos/log": "0.8.2-main.10c050d",
+    "@dxos/plugin-space": "0.8.2-main.10c050d",
+    "@dxos/plugin-deck": "0.8.2-main.10c050d",
+    "@dxos/react-client": "0.8.2-main.10c050d",
+    "@dxos/react-ui-card": "0.8.2-main.10c050d",
+    "@dxos/react-ui-searchlist": "0.8.2-main.10c050d",
+    "@dxos/schema": "0.8.2-main.10c050d",
+    "@dxos/util": "0.8.2-main.10c050d"
   },
   "devDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "3.14.21",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.1",
-    "@dxos/react-ui-theme": "0.8.1",
-    "@dxos/storybook-utils": "0.8.1",
-    "@dxos/random": "0.8.1"
+    "@dxos/random": "0.8.2-main.10c050d",
+    "@dxos/react-ui-theme": "0.8.2-main.10c050d",
+    "@dxos/react-ui": "0.8.2-main.10c050d",
+    "@dxos/storybook-utils": "0.8.2-main.10c050d"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.1",
-    "@dxos/react-ui-theme": "0.8.1"
+    "@dxos/react-ui": "0.8.2-main.10c050d",
+    "@dxos/react-ui-theme": "0.8.2-main.10c050d"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,60 +2,78 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, type PluginsContext } from '@dxos/app-framework';
+import { Rx } from '@effect-rx/rx-react';
+import { Option, pipe } from 'effect';
+
+import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { createExtension, type Node } from '@dxos/plugin-graph';
+import { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
 import { parseId } from '@dxos/react-client/echo';
 
 import { SEARCH_PLUGIN } from '../meta';
 import { SearchAction } from '../types';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
       id: `${SEARCH_PLUGIN}/space-search`,
-      filter: (node): node is Node<null> => node.id === 'root',
-      connector: ({ node }) => {
-        const layout = context.requestCapability(Capabilities.Layout);
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const { spaceId } = parseId(layout.workspace);
-        const space = spaceId ? client.spaces.get(spaceId) : null;
+      connector: (node) =>
+        Rx.make((get) =>
+          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 client = context.getCapability(ClientCapabilities.Client);
+              const { spaceId } = parseId(workspace);
+              const space = spaceId ? client.spaces.get(spaceId) : null;
 
-        return [
-          {
-            id: [node.id, 'search'].join(ATTENDABLE_PATH_SEPARATOR),
-            type: DECK_COMPANION_TYPE,
-            data: space,
-            properties: {
-              label: ['search label', { ns: SEARCH_PLUGIN }],
-              icon: 'ph--magnifying-glass--regular',
-              disposition: 'hidden',
-            },
-          },
-        ];
-      },
+              return [
+                {
+                  id: [node.id, 'search'].join(ATTENDABLE_PATH_SEPARATOR),
+                  type: DECK_COMPANION_TYPE,
+                  data: space,
+                  properties: {
+                    label: ['search label', { ns: SEARCH_PLUGIN }],
+                    icon: 'ph--magnifying-glass--regular',
+                    disposition: 'hidden',
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
     createExtension({
       id: SEARCH_PLUGIN,
-      filter: (node): node is Node<null> => node.id === 'root',
-      actions: () => [
-        {
-          id: SearchAction.OpenSearch._tag,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(createIntent(SearchAction.OpenSearch));
-          },
-          properties: {
-            label: ['search action label', { ns: SEARCH_PLUGIN }],
-            icon: 'ph--magnifying-glass--regular',
-            keyBinding: {
-              macos: 'shift+meta+f',
-              windows: 'shift+alt+f',
-            },
-            testId: 'searchPlugin.search',
-          },
-        },
-      ],
+      actions: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+            Option.map(() => {
+              return [
+                {
+                  id: SearchAction.OpenSearch._tag,
+                  data: async () => {
+                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                    await dispatch(createIntent(SearchAction.OpenSearch));
+                  },
+                  properties: {
+                    label: ['search action label', { ns: SEARCH_PLUGIN }],
+                    icon: 'ph--magnifying-glass--regular',
+                    keyBinding: {
+                      macos: 'shift+meta+f',
+                      windows: 'shift+alt+f',
+                    },
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
   ]);

package/src/capabilities/react-surface.tsx

@@ -4,8 +4,8 @@
 
 import React from 'react';
 
-import { Capabilities, contributes, createSurface, useLayout, useAppGraph } from '@dxos/app-framework';
-import { getActiveSpace } from '@dxos/plugin-space';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { useActiveSpace } from '@dxos/plugin-space';
 import { isSpace, type Space } from '@dxos/react-client/echo';
 
 import { SEARCH_DIALOG, SearchDialog, type SearchDialogProps, SearchMain } from '../components';
@@ -24,13 +24,10 @@ export default () =>
       ),
     }),
     createSurface({
-      // id: `${SEARCH_DIALOG}/search-input`,
-      id: 'search-input',
+      id: `${SEARCH_DIALOG}/search-input`,
       role: 'search-input',
       component: () => {
-        const layout = useLayout();
-        const { graph } = useAppGraph();
-        const space = graph ? getActiveSpace(graph, layout.active[0]) : undefined;
+        const space = useActiveSpace();
         if (!space) {
           return null;
         }

package/src/components/SearchDialog.tsx

@@ -2,6 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Option } from 'effect';
 import React, { forwardRef, useCallback, useState } from 'react';
 
 import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher, useLayout } from '@dxos/app-framework';
@@ -47,11 +48,11 @@ export const SearchDialog = ({ pivotId }: SearchDialogProps) => {
   const { graph } = useAppGraph();
   const layout = useLayout();
   const closed = (Array.isArray(layout.inactive) ? layout.inactive : [layout.inactive])
-    .map((id) => graph?.findNode(id))
+    .map((id) => graph?.getNode(id))
     .filter(Boolean);
   const [queryString, setQueryString] = useState('');
   const client = useClient();
-  const dangerouslyLoadAllObjects = useQuery(client.spaces, Filter.all());
+  const dangerouslyLoadAllObjects = useQuery(client.spaces, Filter.everything());
   const [pending, results] = useSearchResults(queryString, dangerouslyLoadAllObjects);
   const resultObjects = Array.from(results.keys());
   const { dispatchPromise: dispatch } = useIntentDispatcher();
@@ -96,17 +97,17 @@ export const SearchDialog = ({ pivotId }: SearchDialogProps) => {
           {queryString.length > 0 ? (
             resultObjects.length > 0 ? (
               resultObjects
-                .map((object) => graph?.findNode(fullyQualifiedId(object)))
-                .filter(Boolean)
-                .map((node) => <SearchListResult key={node!.id} node={node!} onSelect={handleSelect} />)
+                .map((object) => graph.getNode(fullyQualifiedId(object)))
+                .filter(Option.isSome)
+                .map((node) => <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />)
             ) : (
               <p className='pli-1'>{t(pending ? 'pending results message' : 'empty results message')}</p>
             )
           ) : (
             <>
               {closed.length > 0 && <h2 className={mx('mlb-1', descriptionText)}>{t('recently closed heading')}</h2>}
-              {closed.map((node) => (
-                <SearchListResult key={node!.id} node={node!} onSelect={handleSelect} />
+              {closed.filter(Option.isSome).map((node) => (
+                <SearchListResult key={node.value.id} node={node.value} onSelect={handleSelect} />
               ))}
             </>
           )}

package/src/components/SearchMain.tsx

@@ -8,7 +8,7 @@ import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { Filter, useQuery, type Space } from '@dxos/react-client/echo';
 import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { groupSurface, mx } from '@dxos/react-ui-theme';
+import { activeSurface, mx } from '@dxos/react-ui-theme';
 
 import { SearchResults } from './SearchResults';
 import { Searchbar } from './Searchbar';
@@ -25,7 +25,7 @@ export const SearchMain: FC<ThemedClassName<{ space: Space }>> = ({ classNames,
   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.all());
+  const objects = useQuery(allSpaces ? client.spaces : space, Filter.everything());
   const results = useGlobalSearchResults(objects);
 
   const {
@@ -56,9 +56,9 @@ export const SearchMain: FC<ThemedClassName<{ space: Space }>> = ({ classNames,
         }}
         onSubmit={runSearch}
       />
-      {isLoading && <div className={mx('flex flex-col grow overflow-hidden', groupSurface)}>Loading...</div>}
+      {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', groupSurface)}>
+        <div className={mx('flex flex-col grow overflow-hidden', activeSurface)}>
           <SearchResults items={allResults} selected={selected} onSelect={handleSelect} />
         </div>
       )}

package/src/components/SearchResults/SearchResults.tsx

@@ -49,7 +49,7 @@ export const SearchItem = forwardRef<HTMLDivElement, SearchItemProps>((item, for
   return (
     <Card.Root
       ref={forwardRef}
-      classNames={mx('mx-2 mt-2 cursor-pointer', selected && '!bg-groupSurface', ghostHover)}
+      classNames={mx('mx-2 mt-2 cursor-pointer', selected && '!bg-activeSurface', ghostHover)}
       onClick={() => onSelect?.(id)}
     >
       {objectType && (

package/src/components/Searchbar/Searchbar.tsx

@@ -3,7 +3,7 @@
 //
 
 import { MagnifyingGlass } from '@phosphor-icons/react';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { type KeyboardEvent, useEffect, useRef, useState } from 'react';
 
 import { Input, type TextInputProps } from '@dxos/react-ui';
 import { getSize, mx } from '@dxos/react-ui-theme';
@@ -35,7 +35,7 @@ export const Searchbar = ({ classes, variant, placeholder, value, onChange, onSu
     inputRef.current?.focus();
   };
 
-  const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
     switch (event.key) {
       case 'Enter':
         onSubmit?.(text);

package/src/hooks/sync.test.ts

@@ -5,8 +5,8 @@
 import { describe, expect, test } from 'vitest';
 
 import { Client } from '@dxos/client';
-import { Expando } from '@dxos/echo-schema';
-import { create } from '@dxos/live-object';
+import { Expando, Filter } from '@dxos/echo-schema';
+import { live } from '@dxos/live-object';
 import { faker } from '@dxos/random';
 
 import { filterObjectsSync } from './sync';
@@ -26,10 +26,10 @@ describe('Search', () => {
     Array.from({ length: 20 }).map((_, i) => {
       const content =
         i === 10 ? faker.lorem.sentence() + ` ${match}}. ` + faker.lorem.sentence() : faker.lorem.sentences();
-      return space.db.add(create(Expando, { title: faker.lorem.sentence(), content }));
+      return space.db.add(live(Expando, { title: faker.lorem.sentence(), content }));
     });
 
-    const { objects } = await space.db.query().run();
+    const { objects } = await space.db.query(Filter.everything()).run();
     const results = filterObjectsSync(objects, new RegExp(match, 'i'));
     expect(results).to.have.length(1);
   });

package/src/hooks/sync.ts

@@ -2,9 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { AST, type S } from '@dxos/echo-schema';
-import { getSchema } from '@dxos/live-object';
-import { TextType } from '@dxos/schema';
+import { type Schema, SchemaAST } from 'effect';
+
+import { getSchema } from '@dxos/echo-schema';
+import { DataType } from '@dxos/schema';
 
 import { type SearchResult } from '../types';
 
@@ -14,8 +15,8 @@ export const queryStringToMatch = (queryString?: string): RegExp | undefined =>
 };
 
 // TODO(burdon): Type name registry linked to schema?
-const getIcon = (schema: S.Schema.AnyNoContext | undefined): string | undefined => {
-  if (!(schema && AST.isTypeLiteral(schema.ast))) {
+const getIcon = (schema: Schema.Schema.AnyNoContext | undefined): string | undefined => {
+  if (!(schema && SchemaAST.isTypeLiteral(schema.ast))) {
     return undefined;
   }
   const keys = schema.ast.propertySignatures.map((p) => p.name);
@@ -44,7 +45,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 TextType) {
+    if (object instanceof DataType.Text) {
       return results;
     }
 
@@ -110,7 +111,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 TextType) {
+    if (typeof value === 'string' || value instanceof DataType.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 { TextType } from '@dxos/schema';
+import { DataType } 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 TextType))
+      .filter((object) => !(object instanceof DataType.Text))
       .map(async (object) => {
         await yieldOrContinue('interactive');
         const fields = mapObjectToTextFields<T>(object);

package/src/hooks/useWebSearch.ts

@@ -4,20 +4,17 @@
 
 import { useState } from 'react';
 
-import { AIServiceEdgeClient } from '@dxos/assistant';
-import { AI_SERVICE_ENDPOINT } from '@dxos/assistant/testing';
+import { AIServiceEdgeClient } from '@dxos/ai';
+import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from '@dxos/ai/testing';
 import { getSchema, getTypename } from '@dxos/echo-schema';
-import type { DXN } from '@dxos/keys';
+import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { getIconAnnotation } from '@dxos/schema';
 import { Testing } from '@dxos/schema/testing';
 
 import { getStringProperty } from './sync';
 import { search } from '../search';
-import type { SearchResult } from '../types';
-
-// TODO(dmaretskyi): Get from config/credentials
-const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
+import { type SearchResult } from '../types';
 
 export const useWebSearch = ({ query, context }: { query?: string; context?: string }) => {
   const aiService = new AIServiceEdgeClient({
@@ -34,7 +31,7 @@ export const useWebSearch = ({ query, context }: { query?: string; context?: str
       const results = await search({
         query,
         context,
-        schema: [Testing.Project, Testing.Org, Testing.Contact],
+        schema: [Testing.Project, Testing.Organization, Testing.Contact],
         aiService,
         exaApiKey: EXA_API_KEY,
       });
@@ -56,5 +53,6 @@ export const useWebSearch = ({ query, context }: { query?: string; context?: str
       setIsLoading(false);
     }
   };
+
   return { runSearch, results, isLoading };
 };

package/src/meta.ts

@@ -12,6 +12,6 @@ export const meta: PluginMeta = {
   name: 'Search',
   description: 'Search ECHO spaces for content.',
   icon: 'ph--magnifying-glass--regular',
-  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/experimental/plugin-search',
-  tags: ['experimental'],
+  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-search',
+  tags: ['labs'],
 };

package/src/search/exa.test.ts

@@ -4,14 +4,13 @@
 
 import { describe, test } from 'vitest';
 
-import { AIServiceEdgeClient, OllamaClient } from '@dxos/assistant';
-import { AI_SERVICE_ENDPOINT } from '@dxos/assistant/testing';
+import { AIServiceEdgeClient, OllamaClient } from '@dxos/ai';
+import { AI_SERVICE_ENDPOINT, EXA_API_KEY } from '@dxos/ai/testing';
 import { log } from '@dxos/log';
 import { Testing } from '@dxos/schema/testing';
 
 import { search } from './exa';
 
-const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
 const REMOTE_AI = true;
 
 const aiService = REMOTE_AI
@@ -40,7 +39,7 @@ describe.skip('Search', () => {
     test.skip('contacts projects and orgs', { timeout: 60_000 }, async () => {
       const objects = await search({
         query: 'top executives at google',
-        schema: [Testing.Contact, Testing.Project, Testing.Org],
+        schema: [Testing.Contact, Testing.Project, Testing.Organization],
         aiService,
         exaApiKey: EXA_API_KEY,
       });
@@ -51,7 +50,7 @@ describe.skip('Search', () => {
     test('a19z org, projects they invest in and team', { timeout: 60_000 }, async () => {
       const objects = await search({
         query: 'a19z org, projects they invest in and team',
-        schema: [Testing.Project, Testing.Org, Testing.Contact],
+        schema: [Testing.Project, Testing.Organization, Testing.Contact],
         aiService,
         exaApiKey: EXA_API_KEY,
       });
@@ -62,7 +61,7 @@ describe.skip('Search', () => {
     test('companies building CRDTs', { timeout: 60_000 }, async () => {
       const objects = await search({
         query: 'companies building CRDTs',
-        schema: [Testing.Project, Testing.Org, Testing.Contact],
+        schema: [Testing.Project, Testing.Organization, Testing.Contact],
         aiService,
         exaApiKey: EXA_API_KEY,
       });
@@ -75,7 +74,7 @@ describe.skip('Search', () => {
     test('composer context-based search', { timeout: 60_000 }, async () => {
       const objects = await search({
         context: COMPOSER_DXOS_DOC,
-        schema: [Testing.Project, Testing.Org, Testing.Contact],
+        schema: [Testing.Project, Testing.Organization, Testing.Contact],
         aiService,
         exaApiKey: EXA_API_KEY,
       });
@@ -86,7 +85,7 @@ describe.skip('Search', () => {
     test.only('edge architecture', { timeout: 60_000 }, async () => {
       const objects = await search({
         context: EDGE_ARCHITECTURE_DOC,
-        schema: [Testing.Project, Testing.Org, Testing.Contact],
+        schema: [Testing.Project, Testing.Organization, Testing.Contact],
         aiService,
         exaApiKey: EXA_API_KEY,
       });