@dxos/plugin-assistant 0.8.2 → 0.8.3-main.7f5a14c

package/dist/lib/browser/{chunk-QTW7KVDO.mjs → chunk-DLWFPGZE.mjs}

@@ -1,10 +1,10 @@
-import {
-  AssistantCapabilities
-} from "./chunk-3F44MBHU.mjs";
 import {
   ServiceType,
   categoryIcons
-} from "./chunk-IHEBFO5O.mjs";
+} from "./chunk-ZVHA24BL.mjs";
+import {
+  AssistantCapabilities
+} from "./chunk-3TIEETB2.mjs";
 import {
   ASSISTANT_PLUGIN
 } from "./chunk-XOZ7YMO3.mjs";
@@ -451,7 +451,7 @@ import { mx as mx3 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-assistant/src/tools/function.ts
 import { createTool, ToolResult } from "@dxos/ai";
-import { toEffectSchema } from "@dxos/echo-schema";
+import { Type } from "@dxos/echo";
 import { getInvocationUrl, getUserFunctionUrlInMetadata } from "@dxos/functions";
 import { log } from "@dxos/log";
 import { getMeta } from "@dxos/react-client/echo";
@@ -470,7 +470,7 @@ var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
   return createTool("user-function", {
     name: fn.name,
     description: fn.description,
-    schema: toEffectSchema(fn.inputSchema),
+    schema: Type.toEffectSchema(fn.inputSchema),
     execute: async (input) => {
       log.info("execute function tool", {
         name: fn.name,
@@ -498,7 +498,8 @@ var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
 import { Schema } from "effect";
 import jsonpointer from "jsonpointer";
 import { ToolResult as ToolResult2, createRawTool } from "@dxos/ai";
-import { JsonSchemaType, normalizeSchema, toEffectSchema as toEffectSchema2 } from "@dxos/echo-schema";
+import { Type as Type2 } from "@dxos/echo";
+import { normalizeSchema } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 import { deepMapValues } from "@dxos/util";
@@ -506,7 +507,7 @@ var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assista
 var createToolsFromService = async (service) => {
   invariant(service.interfaces?.length === 1 && service.interfaces[0].kind === "api", void 0, {
     F: __dxlog_file2,
-    L: 23,
+    L: 24,
     S: void 0,
     A: [
       "service.interfaces?.length === 1 && service.interfaces[0].kind === 'api'",
@@ -516,7 +517,7 @@ var createToolsFromService = async (service) => {
   const iface = service.interfaces[0];
   invariant(iface.schemaUrl, void 0, {
     F: __dxlog_file2,
-    L: 25,
+    L: 26,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -525,7 +526,7 @@ var createToolsFromService = async (service) => {
   });
   invariant(iface.schemaUrl, void 0, {
     F: __dxlog_file2,
-    L: 26,
+    L: 27,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -543,7 +544,7 @@ var createToolsFromApi = async (url, options) => {
     spec
   }, {
     F: __dxlog_file2,
-    L: 36,
+    L: 37,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -561,7 +562,7 @@ var createToolsFromApi = async (url, options) => {
         methodItem
       }, {
         F: __dxlog_file2,
-        L: 47,
+        L: 48,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -606,7 +607,7 @@ var createToolsFromApi = async (url, options) => {
         S: void 0,
         C: (f, a) => f(...a)
       });
-      Schema.validateSync(JsonSchemaType)(inputSchema);
+      Schema.validateSync(Type2.JsonSchema)(inputSchema);
       const description = methodItem.description ?? methodItem.summary;
       if (!description) {
         log2.warn("no description", {
@@ -721,7 +722,7 @@ var callApiEndpoint = async (endpoint, input) => {
       }
       case "body": {
         const value = input[parameter.name];
-        const effectSchema = toEffectSchema2(parameter.schema);
+        const effectSchema = Type2.toEffectSchema(parameter.schema);
         Schema.validateSync(effectSchema)(value);
         if (body) {
           throw new Error(`Duplicate body parameter: ${parameter.name}`);
@@ -1484,10 +1485,9 @@ var Thread = ({ classNames, space, messages, collapse = true, transcription, pro
 import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
 import React7, { useCallback as useCallback3, useEffect as useEffect5 } from "react";
 import { CollaborationActions, createIntent, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { DXN, Ref } from "@dxos/echo";
 import { invariant as invariant4 } from "@dxos/invariant";
-import { DXN } from "@dxos/keys";
-import { refFromDXN } from "@dxos/live-object";
-import { log as log8 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { getSpace as getSpace2 } from "@dxos/react-client/echo";
 
 // packages/plugins/plugin-assistant/src/hooks/processor.ts
@@ -1710,16 +1710,6 @@ import { log as log6 } from "@dxos/log";
 import { useConfig } from "@dxos/react-client";
 import { Filter as Filter3, fullyQualifiedId, useQuery as useQuery2 } from "@dxos/react-client/echo";
 import { isNonNullable as isNonNullable3 } from "@dxos/util";
-
-// packages/plugins/plugin-assistant/src/capabilities/index.ts
-import { lazy } from "@dxos/app-framework";
-var AiClient = lazy(() => import("./ai-client-COXVUC6V.mjs"));
-var AppGraphBuilder = lazy(() => import("./app-graph-builder-YH4EGNBC.mjs"));
-var IntentResolver = lazy(() => import("./intent-resolver-63EAHENI.mjs"));
-var ReactSurface = lazy(() => import("./react-surface-XCV6NR75.mjs"));
-var Settings = lazy(() => import("./settings-SHNQ4XXP.mjs"));
-
-// packages/plugins/plugin-assistant/src/hooks/useChatProcessor.tsx
 var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useChatProcessor.tsx";
 var useChatProcessor = ({
   chat,
@@ -1824,13 +1814,13 @@ ${definition.instructions}`),
 
 // packages/plugins/plugin-assistant/src/hooks/useMessageQueue.ts
 import { useMemo as useMemo4 } from "react";
-import { createQueueDxn } from "@dxos/echo-schema";
+import { createQueueDXN } from "@dxos/echo-schema";
 import { getSpace, useQueue } from "@dxos/react-client/echo";
 var useMessageQueue = (chat) => {
   const space = getSpace(chat);
   const queueDxn = useMemo4(() => {
     const dxn = space && chat?.queue.dxn;
-    return dxn ? createQueueDxn(space.id, dxn.parts.at(-1)) : void 0;
+    return dxn ? createQueueDXN(space.id, dxn.parts.at(-1)) : void 0;
   }, [
     space,
     chat?.queue.dxn
@@ -1841,18 +1831,43 @@ var useMessageQueue = (chat) => {
 // packages/plugins/plugin-assistant/src/hooks/useServices.ts
 import { useEffect as useEffect4, useMemo as useMemo5, useState as useState5 } from "react";
 
-// packages/plugins/plugin-assistant/src/testing/blueprint.ts
+// packages/plugins/plugin-assistant/src/testing/test-blueprint.ts
+import { ToolRegistry } from "@dxos/ai";
 import { EXA_API_KEY } from "@dxos/ai/testing";
-import { createExaTool, createGraphWriterTool, createLocalSearchTool } from "@dxos/assistant";
+import { BlueprintParser, createExaTool, createGraphWriterTool, createLocalSearchTool } from "@dxos/assistant";
 import { DataTypes } from "@dxos/schema";
 import { isNonNullable as isNonNullable4 } from "@dxos/util";
+var RESEARCH_BLUEPRINT_DEFINITION = {
+  steps: [
+    {
+      instructions: "Research information and entities related to the selected objects.",
+      tools: [
+        "search/web_search"
+      ]
+    },
+    {
+      instructions: "Based on your research find matching entires that are already in the graph. Do exaustive research.",
+      tools: [
+        "search/local_search"
+      ]
+    },
+    {
+      instructions: "Add researched data to the graph. Make connections to existing objects.",
+      tools: [
+        "search/local_search",
+        "graph/writer"
+      ]
+    }
+  ]
+};
+var RESEARCH_BLUEPRINT = BlueprintParser.create().parse(RESEARCH_BLUEPRINT_DEFINITION);
 
 // packages/plugins/plugin-assistant/src/testing/test-functions.ts
 import { DEFAULT_EDGE_MODEL as DEFAULT_EDGE_MODEL3 } from "@dxos/ai";
 import { createSystemPrompt as createSystemPrompt2 } from "@dxos/artifact";
 
 // packages/plugins/plugin-assistant/src/testing/test-services.ts
-import { create } from "@dxos/echo-schema";
+import { Obj } from "@dxos/echo";
 var AMADEUS_AUTH = {
   type: "oauth",
   clientId: "BOEnpLd1sMyKjAPGKYeAPFFy60u53QEG",
@@ -1869,7 +1884,7 @@ var VISUAL_CROSSING_CREDENTIALS = {
   }
 };
 var TEST_SERVICES = [
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: "amadeus.com/service/FlightSearch",
     name: "Amadeus Flight Search",
     description: "Search for local and international flights.",
@@ -1882,7 +1897,7 @@ var TEST_SERVICES = [
       }
     ]
   }),
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: "amadeus.com/service/HotelSearch",
     name: "Amadeus Hotel Search",
     description: "Search for local and international hotels.",
@@ -1895,7 +1910,7 @@ var TEST_SERVICES = [
       }
     ]
   }),
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: "visualcrossing.com/service/Weather",
     name: "Visual Crossing Weather",
     description: "Search for global weather forecasts.",
@@ -1909,7 +1924,7 @@ var TEST_SERVICES = [
     ]
   }),
   // TODO(burdon): Needs auth.
-  create(ServiceType, {
+  Obj.make(ServiceType, {
     serviceId: "abstractapi.com/service/GeoLocation",
     name: "Abstract GeoLocation",
     description: "Get the location of any IP address.",
@@ -1926,7 +1941,7 @@ var TEST_SERVICES = [
   //
   ...Array.from({
     length: 20
-  }, (_, i) => create(ServiceType, {
+  }, (_, i) => Obj.make(ServiceType, {
     serviceId: `example.com/service/test-${i}`,
     name: `Test ${i}`,
     description: `Test ${i}`,
@@ -1947,11 +1962,7 @@ import { useState as useState6, useCallback as useCallback2 } from "react";
 // packages/plugins/plugin-assistant/src/hooks/useContextProvider.ts
 import { useMemo as useMemo6 } from "react";
 import { Capabilities as Capabilities3, useCapabilities as useCapabilities3 } from "@dxos/app-framework";
-import { Filter as Filter4 } from "@dxos/client/echo";
-import { Obj } from "@dxos/echo";
-import { getDXN, getLabel } from "@dxos/echo-schema";
-import { log as log7 } from "@dxos/log";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useContextProvider.ts";
+import { Filter as Filter4, Obj as Obj2 } from "@dxos/echo";
 var stringMatch = (query, label) => label.toLowerCase().startsWith(query.toLowerCase());
 var useContextProvider = (space) => {
   const artifactDefinitions = useCapabilities3(Capabilities3.ArtifactDefinition);
@@ -1963,27 +1974,16 @@ var useContextProvider = (space) => {
       query: async ({ query }) => {
         const artifactSchemas = artifactDefinitions.map((artifact) => artifact.schema);
         const { objects } = await space.db.query(Filter4.or(...artifactSchemas.map((schema) => Filter4.type(schema)))).run();
-        return objects.map((object) => {
-          log7.info("object", {
-            object,
-            label: getLabel(Obj.getSchema(object), object)
-          }, {
-            F: __dxlog_file8,
-            L: 38,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-          return object;
-        }).filter((object) => stringMatch(query, getLabel(Obj.getSchema(object), object) ?? "")).filter((object) => !!getDXN(object)).map((object) => ({
-          uri: getDXN(object).toString(),
-          label: getLabel(Obj.getSchema(object), object) ?? ""
+        return objects.filter((object) => stringMatch(query, Obj2.getLabel(object) ?? "")).filter((object) => !!Obj2.getDXN(object)).map((object) => ({
+          uri: Obj2.getDXN(object).toString(),
+          label: Obj2.getLabel(object) ?? ""
         }));
       },
       resolveMetadata: async ({ uri }) => {
         const object = await space.db.query(Filter4.ids(uri)).first();
         return {
           uri,
-          label: getLabel(Obj.getSchema(object), object) ?? ""
+          label: Obj2.getLabel(object) ?? ""
         };
       }
     };
@@ -1994,7 +1994,7 @@ var useContextProvider = (space) => {
 };
 
 // packages/plugins/plugin-assistant/src/components/Thread/ThreadContainer.tsx
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Thread/ThreadContainer.tsx";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Thread/ThreadContainer.tsx";
 var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, onOpenChange, ...props }) => {
   var _effect = _useSignals9();
   try {
@@ -2019,7 +2019,7 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
         if (space && chat && message && dispatch && associatedArtifact) {
           void dispatch(createIntent(CollaborationActions.InsertContent, {
             target: associatedArtifact,
-            object: refFromDXN(new DXN(DXN.kind.QUEUE, [
+            object: Ref.fromDXN(new DXN(DXN.kind.QUEUE, [
               ...chat.queue.dxn.parts,
               message.id
             ])),
@@ -2034,9 +2034,9 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
     ]);
     const handleSubmit = useCallback3((text) => {
       if (processor.streaming.value) {
-        log8.warn("ignoring submit; still processing.", void 0, {
-          F: __dxlog_file9,
-          L: 65,
+        log7.warn("ignoring submit; still processing.", void 0, {
+          F: __dxlog_file8,
+          L: 64,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -2044,8 +2044,8 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
       }
       onOpenChange?.(true);
       invariant4(messageQueue, void 0, {
-        F: __dxlog_file9,
-        L: 71,
+        F: __dxlog_file8,
+        L: 70,
         S: void 0,
         A: [
           "messageQueue",
@@ -2096,11 +2096,6 @@ export {
   Toolbox,
   ToolboxContainer,
   Thread,
-  AiClient,
-  AppGraphBuilder,
-  IntentResolver,
-  ReactSurface,
-  Settings,
   ThreadContainer
 };
-//# sourceMappingURL=chunk-QTW7KVDO.mjs.map
+//# sourceMappingURL=chunk-DLWFPGZE.mjs.map