@dxos/plugin-search 0.8.4-main.67995b8 → 0.8.4-main.6fa680abb7

package/src/search/exa.ts

@@ -2,30 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Option, Schema, SchemaAST } from 'effect';
-import Exa from 'exa-js';
+// ISSUE(burdon): deprecated types: MixedStreamParser => effect
 
-import { type AiServiceClient, type GenerateRequest, MixedStreamParser, createTool } from '@dxos/ai';
-import { Key, Obj, Type } from '@dxos/echo';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
+import * as SchemaAST from 'effect/SchemaAST';
+
+import { type Entity, Key, Obj, type Type } from '@dxos/echo';
+import { ReferenceAnnotationId } from '@dxos/echo/internal';
 import { isEncodedReference } from '@dxos/echo-protocol';
-import { ReferenceAnnotationId } from '@dxos/echo-schema';
 import { mapAst } from '@dxos/effect';
-import { assertArgument, failedInvariant } from '@dxos/invariant';
-import { log } from '@dxos/log';
-import { type ContentBlock, DataType } from '@dxos/schema';
 import { deepMapValues, trim } from '@dxos/util';
 
 export type SearchOptions<Schema extends Schema.Schema.AnyNoContext> = {
   query?: string;
-
   // TODO(dmaretskyi): How can we pass this through.
   context?: string;
-
   schema: Schema[];
-
-  AiService: AiServiceClient;
   exaApiKey: string;
-
   liveCrawl?: boolean;
 };
 
@@ -37,94 +31,81 @@ export type SearchResult<T = unknown> = {
   };
 };
 
+/** @deprecated Use MixedStreamParser */
 export const search = async <Schema extends Schema.Schema.AnyNoContext>(
   options: SearchOptions<Schema>,
-): Promise<SearchResult<Schema.Schema.Type<Schema>>> => {
-  assertArgument(options.query || options.context, 'query or context is required');
-
-  let contextSearchTerms: readonly string[] = [];
-  if (options.context) {
-    contextSearchTerms = await getSearchTerms(options.AiService, options.context);
-    log.info('context search terms', { additionalSearchTerms: contextSearchTerms });
-  }
-
-  const mappedSchema = options.schema.map(mapSchemaRefs);
-
-  let startTime = performance.now();
-
-  const exa = new Exa(options.exaApiKey);
-  const context = await exa.searchAndContents(options.query + ' ' + contextSearchTerms.join(' '), {
-    type: 'auto',
-    text: { maxCharacters: 3_000 },
-    livecrawl: options.liveCrawl ? 'always' : undefined,
-  });
-  log.info('context', { context });
-
-  const sourceQueryTime = performance.now() - startTime;
-  startTime = performance.now();
-
-  let systemPrompt = DATA_EXTRACTION_INSTRUCTIONS;
-  if (options.query) {
-    systemPrompt += `\n<query>${options.query}</query>`;
-  }
-  if (options.context) {
-    systemPrompt += `\n<search_context>${options.context}</search_context>`;
-  }
-
-  const result = await getStructuredOutput(options.AiService, {
-    model: '@anthropic/claude-3-5-haiku-20241022',
-    systemPrompt,
-    history: [
-      Obj.make(DataType.Message, {
-        created: new Date().toISOString(),
-        sender: { role: 'user' },
-        blocks: context.results.map(
-          (result): ContentBlock.Text => ({
-            _tag: 'text',
-            text: `# ${result.title}\n\n${result.text}`,
-          }),
-        ),
-      }),
-    ],
-
-    schema: Schema.Struct({
-      ...Object.fromEntries(
-        mappedSchema.map((schema, index) => [
-          `objects_${index}`,
-          Schema.Array(schema).annotations({
-            description: `The objects to answer the query of type ${Type.getTypename(schema) ?? SchemaAST.getIdentifierAnnotation(schema.ast).pipe(Option.getOrNull)}`,
-          }),
-        ]),
-      ),
-    }),
-  });
-
-  const dataExtractionTime = performance.now() - startTime;
-
-  log.info('result', { result });
-
-  const rawObjects = Object.values(result);
-
-  // log('rawObjects', { rawObjects });
-
-  const entries = mappedSchema.flatMap((schema, i) => {
-    return (
-      (rawObjects[i] as any[])?.map((object: any) => ({
-        data: object,
-        schema: options.schema[i],
-      })) ?? []
-    );
-  });
-
-  // log('verified objects', { entries });
-
-  return {
-    data: sanitizeObjects(entries),
-    metrics: {
-      sourceQueryTime,
-      dataExtractionTime,
-    },
-  };
+): Promise<SearchResult<Entity.Unknown>> => {
+  throw new Error('Not implemented');
+  // assertArgument(options.query || options.context, "query or context", "query or context is required");
+  // let contextSearchTerms: readonly string[] = [];
+  // if (options.context) {
+  //   contextSearchTerms = await getSearchTerms(options.AiService, options.context);
+  //   log.info('context search terms', { additionalSearchTerms: contextSearchTerms });
+  // }
+  // const mappedSchema = options.schema.map(mapSchemaRefs);
+  // let startTime = performance.now();
+  // const exa = new Exa(options.exaApiKey);
+  // const context = await exa.searchAndContents(options.query + ' ' + contextSearchTerms.join(' '), {
+  //   type: 'auto',
+  //   text: { maxCharacters: 3_000 },
+  //   livecrawl: options.liveCrawl ? 'always' : undefined,
+  // });
+  // log.info('context', { context });
+  // const sourceQueryTime = performance.now() - startTime;
+  // startTime = performance.now();
+  // let systemPrompt = DATA_EXTRACTION_INSTRUCTIONS;
+  // if (options.query) {
+  //   systemPrompt += `\n<query>${options.query}</query>`;
+  // }
+  // if (options.context) {
+  //   systemPrompt += `\n<search_context>${options.context}</search_context>`;
+  // }
+  // const result = await getStructuredOutput(options.AiService, {
+  //   model: '@anthropic/claude-3-5-haiku-20241022',
+  //   systemPrompt,
+  //   history: [
+  //     Obj.make(Message.Message, {
+  //       created: new Date().toISOString(),
+  //       sender: { role: 'user' },
+  //       blocks: context.results.map(
+  //         (result): ContentBlock.Text => ({
+  //           _tag: 'text',
+  //           text: `# ${result.title}\n\n${result.text}`,
+  //         }),
+  //       ),
+  //     }),
+  //   ],
+  //   schema: Schema.Struct({
+  //     ...Object.fromEntries(
+  //       mappedSchema.map((schema, index) => [
+  //         `objects_${index}`,
+  //         Schema.Array(schema).annotations({
+  //           description: `The objects to answer the query of type ${Type.getTypename(schema) ?? SchemaAST.getIdentifierAnnotation(schema.ast).pipe(Option.getOrNull)}`,
+  //         }),
+  //       ]),
+  //     ),
+  //   }),
+  // });
+  // const dataExtractionTime = performance.now() - startTime;
+  // log.info('result', { result });
+  // const rawObjects = Object.values(result);
+  // // log('rawObjects', { rawObjects });
+  // const entries = mappedSchema.flatMap((schema, i) => {
+  //   return (
+  //     (rawObjects[i] as any[])?.map((object: any) => ({
+  //       data: object,
+  //       schema: options.schema[i],
+  //     })) ?? []
+  //   );
+  // });
+  // // log('verified objects', { entries });
+  // return {
+  //   data: sanitizeObjects(entries),
+  //   metrics: {
+  //     sourceQueryTime,
+  //     dataExtractionTime,
+  //   },
+  // };
 };
 
 const DATA_EXTRACTION_INSTRUCTIONS = trim`
@@ -146,61 +127,61 @@ const DATA_EXTRACTION_INSTRUCTIONS = trim`
 /**
  * Runs the LLM to produce a structured output matching a schema
  */
-const getStructuredOutput = async <S extends Schema.Schema.AnyNoContext>(
-  AiService: AiServiceClient,
-  request: Omit<GenerateRequest, 'tools'> & { schema: S },
-): Promise<Schema.Schema.Type<S>> => {
-  const result = await new MixedStreamParser().parse(
-    await AiService.execStream({
-      ...request,
-      systemPrompt:
-        request.systemPrompt +
-        '\nDo not output anything other then the tool call. Call the submit_result tool with the result.',
-      tools: [
-        createTool('submit_result', {
-          name: 'submit_result',
-          description: 'Submit the result',
-          schema: request.schema,
-          execute: async () => failedInvariant(),
-        }),
-      ],
-    }),
-  );
-  return result[0].blocks.find((c) => c._tag === 'toolCall')?.input as any;
-};
-
-const getSearchTerms = async (AiService: AiServiceClient, context: string) => {
-  const { terms } = await getStructuredOutput(AiService, {
-    model: '@anthropic/claude-3-5-haiku-20241022',
-    systemPrompt: trim`
-      You are a search term extraction agent.
-      Extract the relevant search terms from the context.
-      Return the search terms as an array of strings.
-      Prefer own names of people, companies, and projects, technologies, and other entities.
-    `,
-    history: [
-      Obj.make(DataType.Message, {
-        created: new Date().toISOString(),
-        sender: { role: 'user' },
-        blocks: [
-          {
-            _tag: 'text',
-            text: `# Context to extract search terms from:\n\n${context}`,
-          },
-        ],
-      }),
-    ],
-    schema: Schema.Struct({
-      terms: Schema.Array(Schema.String).annotations({
-        description: 'The search terms to use to find the objects. 0-10 terms.',
-      }),
-    }),
-  });
-
-  return terms;
-};
-
-const sanitizeObjects = (entries: { data: any; schema: Schema.Schema.AnyNoContext }[]) => {
+// const getStructuredOutput = async <S extends Schema.Schema.AnyNoContext>(
+//   AiService: AiServiceClient,
+//   request: Omit<GenerateRequest, 'tools'> & { schema: S },
+// ): Promise<Schema.Schema.Type<S>> => {
+//   const result = await new MixedStreamParser().parse(
+//     await AiService.execStream({
+//       ...request,
+//       systemPrompt:
+//         request.systemPrompt +
+//         '\nDo not output anything other then the tool call. Call the submit_result tool with the result.',
+//       tools: [
+//         createTool('submit_result', {
+//           name: 'submit_result',
+//           description: 'Submit the result',
+//           schema: request.schema,
+//           execute: async () => failedInvariant(),
+//         }),
+//       ],
+//     }),
+//   );
+//   return result[0].blocks.find((c) => c._tag === 'toolCall')?.input as any;
+// };
+
+// const getSearchTerms = async (AiService: AiServiceClient, context: string) => {
+//   const { terms } = await getStructuredOutput(AiService, {
+//     model: '@anthropic/claude-3-5-haiku-20241022',
+//     systemPrompt: trim`
+//       You are a search term extraction agent.
+//       Extract the relevant search terms from the context.
+//       Return the search terms as an array of strings.
+//       Prefer own names of people, companies, and projects, technologies, and other entities.
+//     `,
+//     history: [
+//       Obj.make(Message.Message, {
+//         created: new Date().toISOString(),
+//         sender: { role: 'user' },
+//         blocks: [
+//           {
+//             _tag: 'text',
+//             text: `# Context to extract search terms from:\n\n${context}`,
+//           },
+//         ],
+//       }),
+//     ],
+//     schema: Schema.Struct({
+//       terms: Schema.Array(Schema.String).annotations({
+//         description: 'The search terms to use to find the objects. 0-10 terms.',
+//       }),
+//     }),
+//   });
+
+//   return terms;
+// };
+
+const sanitizeObjects = (entries: { data: any; schema: Type.AnyObj }[]) => {
   const idMap = new Map<string, string>();
 
   return entries

package/src/translations.ts

@@ -16,7 +16,7 @@ export const translations = [
         'search dialog title': 'Open',
         'recently closed heading': 'Recently closed',
         'pending results message': 'Searching…',
-        'empty results message': 'No matching items in your spaces',
+        'empty results message': 'No matching objects',
         'search label': 'Search',
       },
     },

package/src/types/action.tsx

@@ -2,15 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { SEARCH_PLUGIN } from '../meta';
+import { Operation } from '@dxos/operation';
 
-export namespace SearchAction {
-  const SEARCH_ACTION = `${SEARCH_PLUGIN}/action`;
+import { meta } from '../meta';
 
-  export class OpenSearch extends Schema.TaggedClass<OpenSearch>()(`${SEARCH_ACTION}/open-search`, {
-    input: Schema.Void,
-    output: Schema.Void,
-  }) {}
+const SEARCH_OPERATION = `${meta.id}.operation`;
+
+export namespace SearchOperation {
+  export const OpenSearch = Operation.make({
+    meta: { key: `${SEARCH_OPERATION}.open-search`, name: 'Open Search' },
+    schema: { input: Schema.Void, output: Schema.Void },
+  });
 }

package/src/types/command-score.d.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+declare module 'command-score' {
+  /**
+   * Scores how well a string matches a query using a fuzzy matching algorithm.
+   * Used by cmdk for its built-in filtering.
+   *
+   * @param string - The string to score against.
+   * @param query - The search query.
+   * @returns A score between 0 and 1, where higher values indicate better matches.
+   */
+  function commandScore(string: string, query: string): number;
+  export default commandScore;
+}

package/src/types/search.ts

@@ -2,9 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import type { DXN } from '@dxos/keys';
+import type { Entity } from '@dxos/echo';
 
-export type SearchResult = {
+export type SearchResult<T extends Entity.Unknown = Entity.Unknown> = {
   id: string;
 
   /**
@@ -19,11 +19,5 @@ export type SearchResult = {
    * Icon id.
    */
   icon?: string;
-
-  /**
-   * DXN of the object type.
-   */
-  objectType?: DXN.String;
-
-  object?: any;
+  object?: T;
 };

package/dist/lib/browser/app-graph-builder-FLW7KDC5.mjs

@@ -1,77 +0,0 @@
-import {
-  SearchAction
-} from "./chunk-JVMYGOKS.mjs";
-import {
-  SEARCH_PLUGIN
-} from "./chunk-KNS62YL2.mjs";
-
-// src/capabilities/app-graph-builder.ts
-import { Rx } from "@effect-rx/rx-react";
-import { Option, pipe } from "effect";
-import { Capabilities, 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 { createExtension, ROOT_ID, rxFromSignal } from "@dxos/plugin-graph";
-import { parseId } from "@dxos/react-client/echo";
-var app_graph_builder_default = (context) => contributes(Capabilities.AppGraphBuilder, [
-  createExtension({
-    id: `${SEARCH_PLUGIN}/space-search`,
-    connector: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map((node2) => {
-      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: [
-            node2.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,
-    actions: (node) => Rx.make((get) => pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : 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(() => [])))
-  })
-]);
-export {
-  app_graph_builder_default as default
-};
-//# sourceMappingURL=app-graph-builder-FLW7KDC5.mjs.map

package/dist/lib/browser/app-graph-builder-FLW7KDC5.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/app-graph-builder.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Rx } from '@effect-rx/rx-react';\nimport { Option, pipe } from 'effect';\n\nimport { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';\nimport { ClientCapabilities } from '@dxos/plugin-client';\nimport { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';\nimport { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';\nimport { parseId } from '@dxos/react-client/echo';\n\nimport { SEARCH_PLUGIN } from '../meta';\nimport { SearchAction } from '../types';\n\nexport default (context: PluginContext) =>\n  contributes(Capabilities.AppGraphBuilder, [\n    createExtension({\n      id: `${SEARCH_PLUGIN}/space-search`,\n      connector: (node) =>\n        Rx.make((get) =>\n          pipe(\n            get(node),\n            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),\n            Option.map((node) => {\n              const workspace = get(rxFromSignal(() => context.getCapability(Capabilities.Layout).workspace));\n              const client = context.getCapability(ClientCapabilities.Client);\n              const { spaceId } = parseId(workspace);\n              const space = spaceId ? client.spaces.get(spaceId) : null;\n\n              return [\n                {\n                  id: [node.id, 'search'].join(ATTENDABLE_PATH_SEPARATOR),\n                  type: DECK_COMPANION_TYPE,\n                  data: space,\n                  properties: {\n                    label: ['search label', { ns: SEARCH_PLUGIN }],\n                    icon: 'ph--magnifying-glass--regular',\n                    disposition: 'hidden',\n                  },\n                },\n              ];\n            }),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n    createExtension({\n      id: SEARCH_PLUGIN,\n      actions: (node) =>\n        Rx.make((get) =>\n          pipe(\n            get(node),\n            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),\n            Option.map(() => {\n              return [\n                {\n                  id: SearchAction.OpenSearch._tag,\n                  data: async () => {\n                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);\n                    await dispatch(createIntent(SearchAction.OpenSearch));\n                  },\n                  properties: {\n                    label: ['search action label', { ns: SEARCH_PLUGIN }],\n                    icon: 'ph--magnifying-glass--regular',\n                    keyBinding: {\n                      macos: 'shift+meta+f',\n                      windows: 'shift+alt+f',\n                    },\n                  },\n                },\n              ];\n            }),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n  ]);\n"],
-  "mappings": ";;;;;;;;AAIA,SAASA,UAAU;AACnB,SAASC,QAAQC,YAAY;AAE7B,SAASC,cAAcC,aAAaC,oBAAwC;AAC5E,SAASC,0BAA0B;AACnC,SAASC,2BAA2BC,2BAA2B;AAC/D,SAASC,iBAAiBC,SAASC,oBAAoB;AACvD,SAASC,eAAe;AAKxB,IAAA,4BAAe,CAACC,YACdC,YAAYC,aAAaC,iBAAiB;EACxCC,gBAAgB;IACdC,IAAI,GAAGC,aAAAA;IACPC,WAAW,CAACC,SACVC,GAAGC,KAAK,CAACC,QACPC,KACED,IAAIH,IAAAA,GACJK,OAAOC,QAAQ,CAACN,UAAUA,MAAKH,OAAOU,UAAUF,OAAOG,KAAKR,KAAAA,IAAQK,OAAOI,KAAI,CAAA,GAC/EJ,OAAOK,IAAI,CAACV,UAAAA;AACV,YAAMW,YAAYR,IAAIS,aAAa,MAAMpB,QAAQqB,cAAcnB,aAAaoB,MAAM,EAAEH,SAAS,CAAA;AAC7F,YAAMI,SAASvB,QAAQqB,cAAcG,mBAAmBC,MAAM;AAC9D,YAAM,EAAEC,QAAO,IAAKC,QAAQR,SAAAA;AAC5B,YAAMS,QAAQF,UAAUH,OAAOM,OAAOlB,IAAIe,OAAAA,IAAW;AAErD,aAAO;QACL;UACErB,IAAI;YAACG,MAAKH;YAAI;YAAUyB,KAAKC,yBAAAA;UAC7BC,MAAMC;UACNC,MAAMN;UACNO,YAAY;YACVC,OAAO;cAAC;cAAgB;gBAAEC,IAAI/B;cAAc;;YAC5CgC,MAAM;YACNC,aAAa;UACf;QACF;;IAEJ,CAAA,GACA1B,OAAO2B,UAAU,MAAM,CAAA,CAAE,CAAA,CAAA;EAGjC,CAAA;EACApC,gBAAgB;IACdC,IAAIC;IACJmC,SAAS,CAACjC,SACRC,GAAGC,KAAK,CAACC,QACPC,KACED,IAAIH,IAAAA,GACJK,OAAOC,QAAQ,CAACN,UAAUA,MAAKH,OAAOU,UAAUF,OAAOG,KAAKR,KAAAA,IAAQK,OAAOI,KAAI,CAAA,GAC/EJ,OAAOK,IAAI,MAAA;AACT,aAAO;QACL;UACEb,IAAIqC,aAAaC,WAAWC;UAC5BV,MAAM,YAAA;AACJ,kBAAM,EAAEW,iBAAiBC,SAAQ,IAAK9C,QAAQqB,cAAcnB,aAAa6C,gBAAgB;AACzF,kBAAMD,SAASE,aAAaN,aAAaC,UAAU,CAAA;UACrD;UACAR,YAAY;YACVC,OAAO;cAAC;cAAuB;gBAAEC,IAAI/B;cAAc;;YACnDgC,MAAM;YACNW,YAAY;cACVC,OAAO;cACPC,SAAS;YACX;UACF;QACF;;IAEJ,CAAA,GACAtC,OAAO2B,UAAU,MAAM,CAAA,CAAE,CAAA,CAAA;EAGjC,CAAA;CACD;",
-  "names": ["Rx", "Option", "pipe", "Capabilities", "contributes", "createIntent", "ClientCapabilities", "ATTENDABLE_PATH_SEPARATOR", "DECK_COMPANION_TYPE", "createExtension", "ROOT_ID", "rxFromSignal", "parseId", "context", "contributes", "Capabilities", "AppGraphBuilder", "createExtension", "id", "SEARCH_PLUGIN", "connector", "node", "Rx", "make", "get", "pipe", "Option", "flatMap", "ROOT_ID", "some", "none", "map", "workspace", "rxFromSignal", "getCapability", "Layout", "client", "ClientCapabilities", "Client", "spaceId", "parseId", "space", "spaces", "join", "ATTENDABLE_PATH_SEPARATOR", "type", "DECK_COMPANION_TYPE", "data", "properties", "label", "ns", "icon", "disposition", "getOrElse", "actions", "SearchAction", "OpenSearch", "_tag", "dispatchPromise", "dispatch", "IntentDispatcher", "createIntent", "keyBinding", "macos", "windows"]
-}