@dxos/assistant 0.8.4-main.3a94e84 → 0.8.4-main.5acf9ea

package/dist/lib/browser/index.mjs

@@ -159,7 +159,7 @@ var AiSession = class {
           ...this._pending
         ]);
         const blueprints = options.blueprints ?? [];
-        const systemPrompt = yield* pipe2(blueprints, Effect.forEach((blueprint) => DatabaseService.loadRef(blueprint.instructions)), Effect.flatMap(Effect.forEach((template) => DatabaseService.loadRef(template.source))), Effect.map(Array3.map((template) => `
+        const systemPrompt = yield* pipe2(blueprints, Effect.forEach((blueprint) => Effect.succeed(blueprint.instructions)), Effect.flatMap(Effect.forEach((template) => DatabaseService.loadRef(template.source))), Effect.map(Array3.map((template) => `
 
 <blueprint>${template.content}</blueprint>`)), Effect.map(Array3.reduce(options.systemPrompt ?? "", String.concat)));
         const blueprintToolkit = yield* ToolResolverService.resolveToolkit(blueprints.flatMap((bp) => bp.tools));
@@ -308,7 +308,7 @@ ${diff}` : ""}</changed-artifact>`).join("\n")}
     `
   };
 };
-var ArtifactDiffResolver = class extends Context.Tag("ArtifactDiffResolver")() {
+var ArtifactDiffResolver = class extends Context.Tag("@dxos/assistant/ArtifactDiffResolver")() {
 };
 var runTools = Effect.fn("runTools")(function* (toolCalls, toolkit) {
   const toolkitWithHandlers = Effect.isEffect(toolkit) ? yield* toolkit : toolkit;
@@ -712,8 +712,7 @@ var extractionNerFn = defineFunction2({
 import { AiTool } from "@effect/ai";
 import { Context as Context2, Effect as Effect3, Layer, Match, Predicate, Record, Schema as Schema5 } from "effect";
 import { AiToolNotFoundError, ToolExecutionService as ToolExecutionService2, ToolResolverService as ToolResolverService2 } from "@dxos/ai";
-import { todo as todo2 } from "@dxos/debug";
-import { FunctionError } from "@dxos/functions";
+import { LocalFunctionExecutionService } from "@dxos/functions";
 import { invariant as invariant2 } from "@dxos/invariant";
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/assistant/src/functions/services.ts";
 var makeToolResolverFromFunctions = (functions) => {
@@ -728,21 +727,24 @@ var makeToolResolverFromFunctions = (functions) => {
   });
 };
 var makeToolExecutionServiceFromFunctions = (functions) => {
-  return Layer.succeed(ToolExecutionService2, {
-    handlersFor: (toolkit) => {
-      const makeHandler = (tool) => {
-        return Effect3.fn("toolFunctionHandler")(function* (input) {
-          const { functionName } = Context2.get(FunctionToolAnnotation)(tool.annotations);
-          const fnDef = functions.find((f) => f.name === functionName);
-          if (!fnDef) {
-            return yield* Effect3.fail(new AiToolNotFoundError(tool.name));
-          }
-          return yield* invokeFunction(fnDef, input).pipe(Effect3.catchAllDefect((defect) => Effect3.fail(defect)));
-        });
-      };
-      return toolkit.of(Record.map(toolkit.tools, (tool, name) => makeHandler(tool)));
-    }
-  });
+  return Layer.effect(ToolExecutionService2, Effect3.gen(function* () {
+    const localFunctionExecutionService = yield* LocalFunctionExecutionService;
+    return {
+      handlersFor: (toolkit) => {
+        const makeHandler = (tool) => {
+          return Effect3.fn("toolFunctionHandler")(function* (input) {
+            const { functionName } = Context2.get(FunctionToolAnnotation)(tool.annotations);
+            const fnDef = functions.find((f) => f.name === functionName);
+            if (!fnDef) {
+              return yield* Effect3.fail(new AiToolNotFoundError(tool.name));
+            }
+            return yield* localFunctionExecutionService.invokeFunction(fnDef, input).pipe(Effect3.catchAllDefect((defect) => Effect3.fail(defect)));
+          });
+        };
+        return toolkit.of(Record.map(toolkit.tools, (tool, name) => makeHandler(tool)));
+      }
+    };
+  }));
 };
 var FunctionToolAnnotation = class extends Context2.Tag("@dxos/assisatnt/FunctionToolAnnotation")() {
 };
@@ -766,7 +768,7 @@ var makeToolName = (name) => {
   const toolName = name.replace(/[^a-zA-Z0-9]/g, "");
   invariant2(toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/), void 0, {
     F: __dxlog_file6,
-    L: 80,
+    L: 87,
     S: void 0,
     A: [
       "toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/)",
@@ -783,45 +785,6 @@ var createStructFieldsFromSchema = (schema) => {
     ]));
   }), Match.orElseAbsurd);
 };
-var invokeFunction = (fnDef, input) => Effect3.gen(function* () {
-  const assertInput = fnDef.inputSchema.pipe(Schema5.asserts);
-  assertInput(input);
-  const context = {
-    getService: () => todo2(),
-    getSpace: async (_spaceId) => {
-      throw new Error("Not available. Use the database service instead.");
-    },
-    space: void 0,
-    get ai() {
-      throw new Error("Not available. Use the ai service instead.");
-    }
-  };
-  const data = yield* Effect3.gen(function* () {
-    const result = fnDef.handler({
-      context,
-      data: input
-    });
-    if (Effect3.isEffect(result)) {
-      return yield* result.pipe(Effect3.orDie);
-    } else if (typeof result === "object" && result !== null && "then" in result && typeof result.then === "function") {
-      return yield* Effect3.promise(() => result);
-    } else {
-      return result;
-    }
-  }).pipe(Effect3.orDie, Effect3.catchAllDefect((defect) => Effect3.die(new FunctionError("Error running function", {
-    context: {
-      name: fnDef.name
-    },
-    cause: defect
-  }))));
-  const assertOutput = fnDef.outputSchema?.pipe(Schema5.asserts);
-  assertOutput(data);
-  return data;
-}).pipe(Effect3.withSpan("invokeFunction", {
-  attributes: {
-    name: fnDef.name
-  }
-}));
 
 // src/research/exa.ts
 import { AiTool as AiTool2, AiToolkit as AiToolkit2 } from "@effect/ai";
@@ -1492,7 +1455,7 @@ var LocalSearchHandler = LocalSearchToolkit.toLayer({
       `;
   })
 });
-var GraphWriterSchema = class extends Context3.Tag("GraphWriterSchema")() {
+var GraphWriterSchema = class extends Context3.Tag("@dxos/assistant/GraphWriterSchema")() {
 };
 var makeGraphWriterToolkit = ({ schema }) => {
   return AiToolkit3.make(AiTool3.make("graph_writer", {