@dxos/plugin-assistant 0.8.2-main.12df754 → 0.8.2-main.2f9c567

package/dist/lib/browser/{chunk-FQ4L5NYW.mjs → chunk-4EXBK6UE.mjs}

@@ -4,7 +4,7 @@ import {
 import {
   ServiceType,
   categoryIcons
-} from "./chunk-IAMR2FAE.mjs";
+} from "./chunk-5P7U35RJ.mjs";
 import {
   ASSISTANT_PLUGIN
 } from "./chunk-3HCI5FIL.mjs";
@@ -13,7 +13,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";
@@ -21,7 +21,7 @@ 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";
@@ -64,9 +64,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";
@@ -74,7 +75,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'",
@@ -84,7 +85,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",
@@ -93,7 +94,7 @@ var createToolsFromService = async (service) => {
   });
   invariant(iface.schemaUrl, void 0, {
     F: __dxlog_file2,
-    L: 25,
+    L: 26,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -111,7 +112,7 @@ var createToolsFromApi = async (url, options) => {
     spec
   }, {
     F: __dxlog_file2,
-    L: 32,
+    L: 33,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -129,7 +130,7 @@ var createToolsFromApi = async (url, options) => {
         methodItem
       }, {
         F: __dxlog_file2,
-        L: 44,
+        L: 45,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -147,7 +148,7 @@ var createToolsFromApi = async (url, options) => {
           parameter
         }, {
           F: __dxlog_file2,
-          L: 59,
+          L: 60,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -170,11 +171,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", {
@@ -182,7 +183,7 @@ var createToolsFromApi = async (url, options) => {
           method
         }, {
           F: __dxlog_file2,
-          L: 89,
+          L: 90,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -258,7 +259,7 @@ var callApiEndpoint = async (endpoint, input) => {
     input
   }, {
     F: __dxlog_file2,
-    L: 173,
+    L: 174,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -287,7 +288,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}`);
         }
@@ -317,7 +318,7 @@ var callApiEndpoint = async (endpoint, input) => {
     request
   }, {
     F: __dxlog_file2,
-    L: 236,
+    L: 237,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -328,7 +329,7 @@ var callApiEndpoint = async (endpoint, input) => {
     statusText: response.statusText
   }, {
     F: __dxlog_file2,
-    L: 239,
+    L: 240,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -352,7 +353,7 @@ var callApiEndpoint = async (endpoint, input) => {
         error
       }, {
         F: __dxlog_file2,
-        L: 257,
+        L: 258,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -363,7 +364,7 @@ var callApiEndpoint = async (endpoint, input) => {
         error
       }, {
         F: __dxlog_file2,
-        L: 261,
+        L: 262,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -378,7 +379,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)",
@@ -398,7 +399,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'",
@@ -436,7 +437,7 @@ var resolveJsonSchema = (schema, base) => {
             base
           }, {
             F: __dxlog_file2,
-            L: 321,
+            L: 322,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -753,7 +754,7 @@ var components = {
     }
     return /* @__PURE__ */ React3.createElement(ToggleContainer2, {
       // open={open}
-      defaultOpen: block.disposition === "cot" && block.pending,
+      defaultOpen: systemDispositions.includes(block.disposition ?? "") && block.pending,
       title,
       icon: block.pending ? /* @__PURE__ */ React3.createElement(Icon, {
         icon: "ph--circle-notch--regular",
@@ -764,7 +765,7 @@ var components = {
       content: block.text,
       classNames: [
         "pbe-2",
-        block.disposition === "cot" && "text-sm text-subdued"
+        systemDispositions.includes(block.disposition ?? "") && "text-sm text-subdued"
       ]
     }));
   },
@@ -841,8 +842,13 @@ var titles = {
   ["artifact"]: "Artifact",
   ["tool_use"]: "Tool request",
   ["tool_result"]: "Tool result",
-  ["tool_list"]: "Tools"
+  ["tool_list"]: "Tools",
+  ["artifact-update"]: "Artifact(s) changed"
 };
+var systemDispositions = [
+  "cot",
+  "artifact-update"
+];
 
 // packages/plugins/plugin-assistant/src/components/Thread/reducer.ts
 var messageReducer = ({ current, messages }, message) => {
@@ -1380,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 as DXN2 } 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
@@ -1393,6 +1399,7 @@ import { batch, computed, signal } from "@preact/signals-core";
 import { AISession, DEFAULT_EDGE_MODEL } from "@dxos/assistant";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log5 } from "@dxos/log";
+import { getVersion } from "@dxos/react-client/echo";
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/processor.ts";
 var defaultOptions = {
   model: DEFAULT_EDGE_MODEL,
@@ -1451,7 +1458,7 @@ var ChatProcessor = class {
   */
   async request(message, options = {}) {
     this._session = new AISession({
-      operationModel: "immediate"
+      operationModel: "configured"
     });
     this._session.message.on((message2) => {
       batch(() => {
@@ -1478,10 +1485,31 @@ var ChatProcessor = class {
         client: this._ai,
         history: options.history ?? [],
         artifacts: this._artifacts ?? [],
+        requiredArtifactIds: this._artifacts?.map((artifact) => artifact.id) ?? [],
         tools: this._tools ?? [],
         prompt: message,
         systemPrompt: this._options.systemPrompt,
         extensions: this._extensions,
+        artifactDiffResolver: async (artifacts) => {
+          const space = this._extensions?.space;
+          if (!space) {
+            return /* @__PURE__ */ new Map();
+          }
+          const versions = /* @__PURE__ */ new Map();
+          await Promise.all(artifacts.map(async (artifact) => {
+            const { objects: [object] } = await space.db.query({
+              id: artifact.id
+            }).run();
+            if (!object) {
+              return;
+            }
+            versions.set(artifact.id, {
+              version: getVersion(object),
+              diff: `Current state: ${JSON.stringify(object)}`
+            });
+          }));
+          return versions;
+        },
         generationOptions: {
           model: this._options.model
         }
@@ -1490,7 +1518,7 @@ var ChatProcessor = class {
         messages
       }, {
         F: __dxlog_file6,
-        L: 137,
+        L: 160,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1498,7 +1526,7 @@ var ChatProcessor = class {
     } catch (err) {
       log5.catch(err, void 0, {
         F: __dxlog_file6,
-        L: 140,
+        L: 163,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1523,7 +1551,7 @@ var ChatProcessor = class {
   async cancel() {
     log5.info("cancelling...", void 0, {
       F: __dxlog_file6,
-      L: 158,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1551,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";
@@ -1559,15 +1587,22 @@ 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-CDZLSNXE.mjs"));
-var AppGraphBuilder = lazy(() => import("./app-graph-builder-GU6ZWSP4.mjs"));
-var IntentResolver = lazy(() => import("./intent-resolver-YAQELTFQ.mjs"));
-var ReactSurface = lazy(() => import("./react-surface-JOATHBJ4.mjs"));
-var AssistantSettings = lazy(() => import("./settings-PAJLJEVW.mjs"));
+var AiClient = lazy(() => import("./ai-client-OK5SMYJC.mjs"));
+var AppGraphBuilder = lazy(() => import("./app-graph-builder-J5ISIFTE.mjs"));
+var IntentResolver = lazy(() => import("./intent-resolver-MGHOSZY3.mjs"));
+var ReactSurface = lazy(() => import("./react-surface-VP4ABBMH.mjs"));
+var Settings = lazy(() => import("./settings-OZX7J65A.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, space, settings, part = "deck", associatedArtifact }) => {
+var useChatProcessor = ({
+  chat,
+  space,
+  settings,
+  // part = 'deck',
+  part,
+  associatedArtifact
+}) => {
   const aiClient = useCapability(AssistantCapabilities.AiClient);
   const globalTools = useCapabilities2(Capabilities2.Tools);
   const artifactDefinitions = useCapabilities2(Capabilities2.ArtifactDefinition);
@@ -1577,7 +1612,7 @@ var useChatProcessor = ({ chat, space, settings, part = "deck", associatedArtifa
   useEffect3(() => {
     log6("creating service tools...", void 0, {
       F: __dxlog_file7,
-      L: 48,
+      L: 49,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1596,7 +1631,7 @@ var useChatProcessor = ({ chat, space, settings, part = "deck", associatedArtifa
   const [tools, extensions] = useMemo3(() => {
     log6("creating tools...", void 0, {
       F: __dxlog_file7,
-      L: 60,
+      L: 61,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1637,7 +1672,7 @@ ${definition.instructions}`),
       settings
     }, {
       F: __dxlog_file7,
-      L: 91,
+      L: 92,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1656,37 +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 { DXN, QueueSubspaceTags } from "@dxos/keys";
 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, [
+    return dxn ? new DXN(DXN.kind.QUEUE, [
       QueueSubspaceTags.DATA,
       space.id,
       dxn.parts.at(-1)
@@ -1699,7 +1712,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";
@@ -1707,11 +1720,6 @@ import { DEFAULT_EDGE_MODEL as DEFAULT_EDGE_MODEL3 } from "@dxos/assistant";
 
 // packages/plugins/plugin-assistant/src/testing/test-services.ts
 import { create } from "@dxos/echo-schema";
-var MockServiceRegistry = class {
-  async queryServices(query) {
-    return TEST_SERVICES;
-  }
-};
 var AMADEUS_AUTH = {
   type: "oauth",
   clientId: "BOEnpLd1sMyKjAPGKYeAPFFy60u53QEG",
@@ -1799,32 +1807,15 @@ var TEST_SERVICES = [
   }))
 ];
 
-// packages/plugins/plugin-assistant/src/hooks/useServices.ts
-var useServices = (space, query) => {
-  const registry = useMemo5(() => new MockServiceRegistry(), []);
-  const [services, setServices] = useState6([]);
-  useEffect5(() => {
-    const t = setTimeout(async () => {
-      const services2 = await registry.queryServices(query);
-      setServices(services2);
-    });
-    return () => clearTimeout(t);
-  }, [
-    query,
-    registry
-  ]);
-  return 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 { log as log7 } from "@dxos/log";
+import { Filter as Filter3 } from "@dxos/react-client/echo";
 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) => {
@@ -1836,9 +1827,9 @@ 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.schema(schema)))).run();
         return objects.map((object) => {
-          log9.info("object", {
+          log7.info("object", {
             object,
             label: getLabel(getSchema(object), object)
           }, {
@@ -1887,14 +1878,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 DXN2(DXN2.kind.QUEUE, [
             ...chat.assistantChatQueue.dxn.parts,
             message.id
           ])),
@@ -1909,7 +1900,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,
@@ -1918,7 +1909,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,
@@ -1963,15 +1954,14 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
 };
 
 export {
+  Toolbox,
+  ToolboxContainer,
+  Thread,
   AiClient,
   AppGraphBuilder,
   IntentResolver,
   ReactSurface,
-  AssistantSettings,
-  useServices,
-  Toolbox,
-  ToolboxContainer,
-  Thread,
+  Settings,
   ThreadContainer
 };
-//# sourceMappingURL=chunk-FQ4L5NYW.mjs.map
+//# sourceMappingURL=chunk-4EXBK6UE.mjs.map