@dxos/plugin-assistant 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/dist/lib/node-esm/{chunk-XFUXN5QU.mjs → chunk-ED55ZE4G.mjs}

@@ -5,7 +5,7 @@ import {
 import {
   ServiceType,
   categoryIcons
-} from "./chunk-ECYNZYEG.mjs";
+} from "./chunk-UZWYXNR5.mjs";
 import {
   ASSISTANT_PLUGIN
 } from "./chunk-ECRK6TUQ.mjs";
@@ -14,7 +14,7 @@ import {
 import React, { useState, useEffect, Fragment } from "react";
 import { Capabilities, useCapabilities } from "@dxos/app-framework";
 import { parseToolName } from "@dxos/artifact";
-import { FunctionType } from "@dxos/functions/types";
+import { FunctionType } from "@dxos/functions";
 import { log as log3 } from "@dxos/log";
 import { Filter, useQuery } from "@dxos/react-client/echo";
 import { mx } from "@dxos/react-ui-theme";
@@ -22,11 +22,11 @@ import { mx } from "@dxos/react-ui-theme";
 // packages/plugins/plugin-assistant/src/tools/function.ts
 import { defineTool, ToolResult } from "@dxos/artifact";
 import { toEffectSchema } from "@dxos/echo-schema";
-import { getInvocationUrl, getUserFunctionUrlInMetadata } from "@dxos/functions/types";
+import { getInvocationUrl, getUserFunctionUrlInMetadata } from "@dxos/functions";
 import { log } from "@dxos/log";
 import { getMeta } from "@dxos/react-client/echo";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/tools/function.ts";
-var covertFunctionToTool = (fn, edgeUrl, spaceId) => {
+var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
   if (!fn.description || !fn.inputSchema) {
     return void 0;
   }
@@ -48,7 +48,7 @@ var covertFunctionToTool = (fn, edgeUrl, spaceId) => {
         input
       }, {
         F: __dxlog_file,
-        L: 36,
+        L: 34,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -65,9 +65,10 @@ var covertFunctionToTool = (fn, edgeUrl, spaceId) => {
 };
 
 // packages/plugins/plugin-assistant/src/tools/openapi.ts
+import { Schema } from "effect";
 import jsonpointer from "jsonpointer";
 import { ToolResult as ToolResult2 } from "@dxos/artifact";
-import { JsonSchemaType, normalizeSchema, S, toEffectSchema as toEffectSchema2 } from "@dxos/echo-schema";
+import { JsonSchemaType, normalizeSchema, toEffectSchema as toEffectSchema2 } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 import { deepMapValues } from "@dxos/util";
@@ -75,7 +76,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: 22,
+    L: 23,
     S: void 0,
     A: [
       "service.interfaces?.length === 1 && service.interfaces[0].kind === 'api'",
@@ -85,7 +86,7 @@ var createToolsFromService = async (service) => {
   const iface = service.interfaces[0];
   invariant(iface.schemaUrl, void 0, {
     F: __dxlog_file2,
-    L: 24,
+    L: 25,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -94,7 +95,7 @@ var createToolsFromService = async (service) => {
   });
   invariant(iface.schemaUrl, void 0, {
     F: __dxlog_file2,
-    L: 25,
+    L: 26,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -112,7 +113,7 @@ var createToolsFromApi = async (url, options) => {
     spec
   }, {
     F: __dxlog_file2,
-    L: 32,
+    L: 33,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -130,7 +131,7 @@ var createToolsFromApi = async (url, options) => {
         methodItem
       }, {
         F: __dxlog_file2,
-        L: 44,
+        L: 45,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -148,7 +149,7 @@ var createToolsFromApi = async (url, options) => {
           parameter
         }, {
           F: __dxlog_file2,
-          L: 59,
+          L: 60,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -171,11 +172,11 @@ var createToolsFromApi = async (url, options) => {
         inputSchema
       }, {
         F: __dxlog_file2,
-        L: 84,
+        L: 85,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      S.validateSync(JsonSchemaType)(inputSchema);
+      Schema.validateSync(JsonSchemaType)(inputSchema);
       const description = methodItem.description ?? methodItem.summary;
       if (!description) {
         log2.warn("no description", {
@@ -183,7 +184,7 @@ var createToolsFromApi = async (url, options) => {
           method
         }, {
           F: __dxlog_file2,
-          L: 89,
+          L: 90,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -259,7 +260,7 @@ var callApiEndpoint = async (endpoint, input) => {
     input
   }, {
     F: __dxlog_file2,
-    L: 173,
+    L: 174,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -288,7 +289,7 @@ var callApiEndpoint = async (endpoint, input) => {
       case "body": {
         const value = input[parameter.name];
         const effectSchema = toEffectSchema2(parameter.schema);
-        S.validateSync(effectSchema)(value);
+        Schema.validateSync(effectSchema)(value);
         if (body) {
           throw new Error(`Duplicate body parameter: ${parameter.name}`);
         }
@@ -318,7 +319,7 @@ var callApiEndpoint = async (endpoint, input) => {
     request
   }, {
     F: __dxlog_file2,
-    L: 236,
+    L: 237,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -329,7 +330,7 @@ var callApiEndpoint = async (endpoint, input) => {
     statusText: response.statusText
   }, {
     F: __dxlog_file2,
-    L: 239,
+    L: 240,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -353,7 +354,7 @@ var callApiEndpoint = async (endpoint, input) => {
         error
       }, {
         F: __dxlog_file2,
-        L: 257,
+        L: 258,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -364,7 +365,7 @@ var callApiEndpoint = async (endpoint, input) => {
         error
       }, {
         F: __dxlog_file2,
-        L: 261,
+        L: 262,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -379,7 +380,7 @@ var getEndpointUrl = (endpoint) => {
   } else {
     invariant(!isV3_1(endpoint.document), void 0, {
       F: __dxlog_file2,
-      L: 272,
+      L: 273,
       S: void 0,
       A: [
         "!isV3_1(endpoint.document)",
@@ -399,7 +400,7 @@ var resolveAuthorization = async (authorization) => {
     case "api-key": {
       invariant(authorization.placement.type === "authorization-header", void 0, {
         F: __dxlog_file2,
-        L: 288,
+        L: 289,
         S: void 0,
         A: [
           "authorization.placement.type === 'authorization-header'",
@@ -437,7 +438,7 @@ var resolveJsonSchema = (schema, base) => {
             base
           }, {
             F: __dxlog_file2,
-            L: 321,
+            L: 322,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -511,7 +512,7 @@ var Section = ({ title, items, striped }) => {
 };
 var ToolboxContainer = ({ classNames, space }) => {
   const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-  const services = useQuery(space, Filter.schema(ServiceType));
+  const services = useQuery(space, Filter.type(ServiceType));
   const [serviceTools, setServiceTools] = useState([]);
   useEffect(() => {
     log3("creating service tools...", {
@@ -532,7 +533,7 @@ var ToolboxContainer = ({ classNames, space }) => {
   }, [
     services
   ]);
-  const functions = useQuery(space, Filter.schema(FunctionType));
+  const functions = useQuery(space, Filter.type(FunctionType));
   return /* @__PURE__ */ React.createElement(Toolbox, {
     classNames,
     artifacts: artifactDefinitions,
@@ -682,7 +683,7 @@ var ToolContainer = ({ classNames, items }) => {
 // packages/plugins/plugin-assistant/src/components/Thread/ThreadMessage.tsx
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Thread/ThreadMessage.tsx";
 var panelClassNames = "flex flex-col w-full px-2 bg-groupSurface rounded-md";
-var userClassNames = "bg-[--user-fill] text-inverse";
+var userClassNames = "bg-[--user-fill] text-accentSurfaceText";
 var ToggleContainer2 = (props) => {
   return /* @__PURE__ */ React3.createElement(NativeToggleContainer, {
     ...props,
@@ -1255,7 +1256,7 @@ import React5, { useRef as useRef2, useState as useState3 } from "react";
 import { useVoiceInput } from "@dxos/plugin-transcription";
 import { Icon as Icon2, IconButton as IconButton2, Tooltip, useTranslation } from "@dxos/react-ui";
 import { Spinner } from "@dxos/react-ui-sfx";
-import { errorMessageColors, errorText, mx as mx4 } from "@dxos/react-ui-theme";
+import { errorText, mx as mx4 } from "@dxos/react-ui-theme";
 var PromptBar = ({ classNames, placeholder, processing, error, microphone, onCancel, references, ...props }) => {
   const { t } = useTranslation(ASSISTANT_PLUGIN);
   const promptRef = useRef2(null);
@@ -1271,15 +1272,14 @@ var PromptBar = ({ classNames, placeholder, processing, error, microphone, onCan
     className: mx4("shrink-0 w-full grid grid-cols-[var(--rail-action)_1fr_var(--rail-action)] overflow-hidden", classNames)
   }, /* @__PURE__ */ React5.createElement("div", {
     className: "flex w-[--rail-action] h-[--rail-action] items-center justify-center"
-  }, error && /* @__PURE__ */ React5.createElement(Tooltip.Root, {
+  }, error && /* @__PURE__ */ React5.createElement(Tooltip.Trigger, {
+    content: error.message,
     delayDuration: 0
-  }, /* @__PURE__ */ React5.createElement(Tooltip.Trigger, null, /* @__PURE__ */ React5.createElement(Icon2, {
+  }, /* @__PURE__ */ React5.createElement(Icon2, {
     icon: "ph--warning-circle--regular",
     classNames: errorText,
     size: 5
-  })), /* @__PURE__ */ React5.createElement(Tooltip.Portal, null, /* @__PURE__ */ React5.createElement(Tooltip.Content, null, /* @__PURE__ */ React5.createElement("div", {
-    className: mx4("text-sm", errorMessageColors)
-  }, error.message), /* @__PURE__ */ React5.createElement(Tooltip.Arrow, null)))) || /* @__PURE__ */ React5.createElement(Spinner, {
+  })) || /* @__PURE__ */ React5.createElement(Spinner, {
     active: processing
   })), /* @__PURE__ */ React5.createElement(Prompt, {
     ref: promptRef,
@@ -1386,12 +1386,12 @@ var Thread = ({ classNames, space, messages, collapse = true, transcription, pro
 };
 
 // packages/plugins/plugin-assistant/src/components/Thread/ThreadContainer.tsx
-import React7, { useCallback as useCallback3, useEffect as useEffect6 } from "react";
+import React7, { useCallback as useCallback3, useEffect as useEffect5 } from "react";
 import { CollaborationActions, createIntent, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
-import { invariant as invariant6 } from "@dxos/invariant";
-import { DXN as DXN3 } from "@dxos/keys";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { DXN } from "@dxos/keys";
 import { makeRef, refFromDXN } from "@dxos/live-object";
-import { log as log10 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { getSpace as getSpace2 } from "@dxos/react-client/echo";
 
 // packages/plugins/plugin-assistant/src/hooks/processor.ts
@@ -1579,7 +1579,7 @@ import { useEffect as useEffect3, useMemo as useMemo3, useState as useState4 } f
 import { Capabilities as Capabilities2, useCapabilities as useCapabilities2, useCapability, useIntentDispatcher } from "@dxos/app-framework";
 import { createSystemPrompt } from "@dxos/artifact";
 import { DEFAULT_EDGE_MODEL as DEFAULT_EDGE_MODEL2, DEFAULT_OLLAMA_MODEL } from "@dxos/assistant";
-import { FunctionType as FunctionType2 } from "@dxos/functions/types";
+import { FunctionType as FunctionType2 } from "@dxos/functions";
 import { log as log6 } from "@dxos/log";
 import { useConfig } from "@dxos/react-client";
 import { Filter as Filter2, fullyQualifiedId, useQuery as useQuery2 } from "@dxos/react-client/echo";
@@ -1587,11 +1587,11 @@ import { isNonNullable as isNonNullable2 } from "@dxos/util";
 
 // packages/plugins/plugin-assistant/src/capabilities/index.ts
 import { lazy } from "@dxos/app-framework";
-var AiClient = lazy(() => import("./ai-client-LYCBXZI7.mjs"));
-var AppGraphBuilder = lazy(() => import("./app-graph-builder-SV4WC2E2.mjs"));
-var IntentResolver = lazy(() => import("./intent-resolver-DZY2O2DG.mjs"));
-var ReactSurface = lazy(() => import("./react-surface-R43NHNMC.mjs"));
-var Settings = lazy(() => import("./settings-K3JDH2I5.mjs"));
+var AiClient = lazy(() => import("./ai-client-RZQWEDUX.mjs"));
+var AppGraphBuilder = lazy(() => import("./app-graph-builder-WXJNZDYB.mjs"));
+var IntentResolver = lazy(() => import("./intent-resolver-Q3I6S6HN.mjs"));
+var ReactSurface = lazy(() => import("./react-surface-RI3JONQY.mjs"));
+var Settings = lazy(() => import("./settings-CLE57WEP.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";
@@ -1607,7 +1607,7 @@ var useChatProcessor = ({
   const globalTools = useCapabilities2(Capabilities2.Tools);
   const artifactDefinitions = useCapabilities2(Capabilities2.ArtifactDefinition);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const services = useQuery2(space, Filter2.schema(ServiceType));
+  const services = useQuery2(space, Filter2.type(ServiceType));
   const [serviceTools, setServiceTools] = useState4([]);
   useEffect3(() => {
     log6("creating service tools...", void 0, {
@@ -1624,7 +1624,7 @@ var useChatProcessor = ({
     services
   ]);
   const config = useConfig();
-  const functions = useQuery2(space, Filter2.schema(FunctionType2));
+  const functions = useQuery2(space, Filter2.type(FunctionType2));
   const chatId = useMemo3(() => chat ? fullyQualifiedId(chat) : void 0, [
     chat
   ]);
@@ -1638,7 +1638,7 @@ var useChatProcessor = ({
     const tools2 = [
       ...globalTools.flat(),
       ...serviceTools,
-      ...functions.map((fn) => covertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? "", space?.id)).filter(isNonNullable2)
+      ...functions.map((fn) => convertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? "", space?.id)).filter(isNonNullable2)
     ];
     const extensions2 = {
       space,
@@ -1691,41 +1691,15 @@ ${definition.instructions}`),
   return processor;
 };
 
-// packages/plugins/plugin-assistant/src/hooks/useLocalTriggerManager.ts
-import { useEffect as useEffect4, useState as useState5 } from "react";
-import { Mutex as Mutex2 } from "@dxos/async";
-import { Context } from "@dxos/context";
-import { createSubscriptionTrigger } from "@dxos/functions";
-import { FunctionTrigger } from "@dxos/functions/types";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { log as log8 } from "@dxos/log";
-import { useClient } from "@dxos/react-client";
-import { Filter as Filter3, useQuery as useQuery3 } from "@dxos/react-client/echo";
-
-// packages/plugins/plugin-assistant/src/hooks/invocation-handler.ts
-import { sleep } from "@dxos/async";
-import { getObjectCore, ResultFormat } from "@dxos/echo-db";
-import { FunctionType as FunctionType3, getUserFunctionUrlInMetadata as getUserFunctionUrlInMetadata2 } from "@dxos/functions/types";
-import { invariant as invariant4 } from "@dxos/invariant";
-import { DXN, LOCAL_SPACE_TAG } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
-
-// packages/plugins/plugin-assistant/src/hooks/useLocalTriggerManager.ts
-var registerTriggersMutex = new Mutex2();
-
 // packages/plugins/plugin-assistant/src/hooks/useMessageQueue.ts
 import { useMemo as useMemo4 } from "react";
-import { DXN as DXN2, QueueSubspaceTags } from "@dxos/keys";
+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?.assistantChatQueue.dxn;
-    return dxn ? new DXN2(DXN2.kind.QUEUE, [
-      QueueSubspaceTags.DATA,
-      space.id,
-      dxn.parts.at(-1)
-    ]) : void 0;
+    return dxn ? createQueueDxn(space.id) : void 0;
   }, [
     space,
     chat?.assistantChatQueue.dxn
@@ -1734,7 +1708,7 @@ var useMessageQueue = (chat) => {
 };
 
 // packages/plugins/plugin-assistant/src/hooks/useServices.ts
-import { useEffect as useEffect5, useMemo as useMemo5, useState as useState6 } from "react";
+import { useEffect as useEffect4, useMemo as useMemo5, useState as useState5 } from "react";
 
 // packages/plugins/plugin-assistant/src/testing/test-functions.ts
 import { createSystemPrompt as createSystemPrompt2 } from "@dxos/artifact";
@@ -1830,14 +1804,15 @@ var TEST_SERVICES = [
 ];
 
 // packages/plugins/plugin-assistant/src/hooks/useTextInputEvents.ts
-import { useState as useState7, useCallback as useCallback2 } from "react";
+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 { getDXN, getLabel, getSchema } from "@dxos/echo-schema";
-import { log as log9 } from "@dxos/log";
-import { Filter as Filter4 } from "@dxos/react-client/echo";
+import { Filter as Filter3 } from "@dxos/client/echo";
+import { Type } 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";
 var stringMatch = (query, label) => label.toLowerCase().startsWith(query.toLowerCase());
 var useContextProvider = (space) => {
@@ -1849,21 +1824,21 @@ var useContextProvider = (space) => {
     return {
       query: async ({ query }) => {
         const artifactSchemas = artifactDefinitions.map((artifact) => artifact.schema);
-        const { objects } = await space.db.query(Filter4.or(...artifactSchemas.map((schema) => Filter4.schema(schema)))).run();
+        const { objects } = await space.db.query(Filter3.or(...artifactSchemas.map((schema) => Filter3.type(schema)))).run();
         return objects.map((object) => {
-          log9.info("object", {
+          log7.info("object", {
             object,
-            label: getLabel(getSchema(object), object)
+            label: getLabel(Type.getSchema(object), object)
           }, {
             F: __dxlog_file8,
-            L: 36,
+            L: 38,
             S: void 0,
             C: (f, a) => f(...a)
           });
           return object;
-        }).filter((object) => stringMatch(query, getLabel(getSchema(object), object) ?? "")).filter((object) => !!getDXN(object)).map((object) => ({
+        }).filter((object) => stringMatch(query, getLabel(Type.getSchema(object), object) ?? "")).filter((object) => !!getDXN(object)).map((object) => ({
           uri: getDXN(object).toString(),
-          label: getLabel(getSchema(object), object) ?? ""
+          label: getLabel(Type.getSchema(object), object) ?? ""
         }));
       },
       resolveMetadata: async ({ uri }) => {
@@ -1872,7 +1847,7 @@ var useContextProvider = (space) => {
         }).first();
         return {
           uri,
-          label: getLabel(getSchema(object), object) ?? ""
+          label: getLabel(Type.getSchema(object), object) ?? ""
         };
       }
     };
@@ -1900,14 +1875,14 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
     ...messageQueue?.items ?? [],
     ...processor.messages.value
   ];
-  useEffect6(() => {
+  useEffect5(() => {
     if (!processor.streaming.value && messageQueue?.items) {
       const message = messageQueue.items[messageQueue.items.length - 1];
       if (space && chat && message && dispatch && associatedArtifact) {
         void dispatch(createIntent(CollaborationActions.InsertContent, {
           spaceId: space.id,
           target: makeRef(associatedArtifact),
-          object: refFromDXN(new DXN3(DXN3.kind.QUEUE, [
+          object: refFromDXN(new DXN(DXN.kind.QUEUE, [
             ...chat.assistantChatQueue.dxn.parts,
             message.id
           ])),
@@ -1922,7 +1897,7 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
   ]);
   const handleSubmit = useCallback3((text) => {
     if (processor.streaming.value) {
-      log10.warn("ignoring submit; still processing.", void 0, {
+      log8.warn("ignoring submit; still processing.", void 0, {
         F: __dxlog_file9,
         L: 66,
         S: void 0,
@@ -1931,7 +1906,7 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
       return false;
     }
     onOpenChange?.(true);
-    invariant6(messageQueue, void 0, {
+    invariant4(messageQueue, void 0, {
       F: __dxlog_file9,
       L: 72,
       S: void 0,
@@ -1986,4 +1961,4 @@ export {
   Settings,
   ThreadContainer
 };
-//# sourceMappingURL=chunk-XFUXN5QU.mjs.map
+//# sourceMappingURL=chunk-ED55ZE4G.mjs.map