@dxos/functions 0.8.3 → 0.8.4-main.f9ba587

package/dist/lib/browser/bundler/index.mjs

@@ -1,9 +1,12 @@
-// packages/core/functions/src/bundler/bundler.ts
+// src/bundler/bundler.ts
+import { FetchHttpClient, HttpClient } from "@effect/platform";
+import { Duration, Effect, pipe, Schedule } from "effect";
 import { build, initialize } from "esbuild-wasm";
 import { subtleCrypto } from "@dxos/crypto";
+import { runAndForwardErrors } from "@dxos/effect";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/bundler/bundler.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/functions/src/bundler/bundler.ts";
 var initialized;
 var initializeBundler = async (options) => {
   await (initialized ??= initialize({
@@ -26,7 +29,7 @@ var Bundler = class {
     if (this._options.platform === "browser") {
       invariant(initialized, "Compiler not initialized.", {
         F: __dxlog_file,
-        L: 71,
+        L: 73,
         S: this,
         A: [
           "initialized",
@@ -120,7 +123,7 @@ var Bundler = class {
       });
       log("compile complete", result.metafile, {
         F: __dxlog_file,
-        L: 135,
+        L: 137,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -138,7 +141,7 @@ var Bundler = class {
   analyzeImports(result) {
     invariant(result.outputFiles, void 0, {
       F: __dxlog_file,
-      L: 148,
+      L: 150,
       S: this,
       A: [
         "result.outputFiles",
@@ -201,6 +204,8 @@ var analyzeSourceFileImports = (code) => {
     };
   });
 };
+var MAX_RETRIES = 5;
+var INITIAL_DELAY = 1e3;
 var httpPlugin = {
   name: "http",
   setup: (build2) => {
@@ -221,11 +226,17 @@ var httpPlugin = {
       filter: /.*/,
       namespace: "http-url"
     }, async (args) => {
-      const response = await fetch(args.path);
-      return {
-        contents: await response.text(),
-        loader: "jsx"
-      };
+      return Effect.gen(function* () {
+        const response = yield* HttpClient.get(args.path);
+        if (response.status !== 200) {
+          throw new Error(`failed to fetch: ${response.status}`);
+        }
+        const text = yield* response.text;
+        return {
+          contents: text,
+          loader: "jsx"
+        };
+      }).pipe(Effect.retry(pipe(Schedule.exponential(Duration.millis(INITIAL_DELAY)), Schedule.jittered, Schedule.intersect(Schedule.recurs(MAX_RETRIES - 1)))), Effect.provide(FetchHttpClient.layer), runAndForwardErrors);
     });
   }
 };

package/dist/lib/browser/bundler/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/bundler/bundler.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type BuildOptions } from 'esbuild';\nimport { build, initialize, type BuildResult, type Plugin } from 'esbuild-wasm';\n\nimport { subtleCrypto } from '@dxos/crypto';\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nexport type Import = {\n  moduleUrl: string;\n  defaultImport: boolean;\n  namedImports: string[];\n};\n\nexport type BundleOptions = {\n  /**\n   * Path to the source file on the local file system.\n   * If provided, the path will be used instead of the `source` code.\n   */\n  path?: string;\n\n  /**\n   * Source code to bundle.\n   * Required if `path` is not provided.\n   */\n  source?: string;\n};\n\nexport type BundleResult = {\n  timestamp: number;\n  sourceHash?: Buffer;\n  imports?: Import[];\n  bundle?: string;\n  error?: any;\n};\n\nexport type BundlerOptions = {\n  platform: BuildOptions['platform'];\n  sandboxedModules: string[];\n  remoteModules: Record<string, string>;\n};\n\nlet initialized: Promise<void>;\nexport const initializeBundler = async (options: { wasmUrl: string }) => {\n  await (initialized ??= initialize({\n    wasmURL: options.wasmUrl,\n  }));\n};\n\n/**\n * ESBuild bundler.\n */\nexport class Bundler {\n  constructor(private readonly _options: BundlerOptions) {}\n\n  async bundle({ path, source }: BundleOptions): Promise<BundleResult> {\n    const { sandboxedModules: providedModules, ...options } = this._options;\n\n    const createResult = async (result?: Partial<BundleResult>) => {\n      return {\n        timestamp: Date.now(),\n        sourceHash: source ? Buffer.from(await subtleCrypto.digest('SHA-256', Buffer.from(source))) : undefined,\n        ...result,\n      };\n    };\n\n    if (this._options.platform === 'browser') {\n      invariant(initialized, 'Compiler not initialized.');\n      await initialized;\n    }\n\n    const imports = source ? analyzeSourceFileImports(source) : [];\n\n    // https://esbuild.github.io/api/#build\n    try {\n      const result = await build({\n        platform: options.platform,\n        conditions: ['workerd', 'browser'],\n        metafile: true,\n        write: false,\n        entryPoints: [path ?? 'memory:main.tsx'],\n        bundle: true,\n        format: 'esm',\n        plugins: [\n          {\n            name: 'memory',\n            setup: (build) => {\n              build.onResolve({ filter: /^\\.\\/runtime\\.js$/ }, ({ path }) => {\n                return { path, external: true };\n              });\n\n              build.onResolve({ filter: /^dxos:functions$/ }, ({ path }) => {\n                return { path: './runtime.js', external: true };\n              });\n\n              build.onResolve({ filter: /^memory:/ }, ({ path }) => {\n                return { path: path.split(':')[1], namespace: 'memory' };\n              });\n\n              build.onLoad({ filter: /.*/, namespace: 'memory' }, ({ path }) => {\n                if (path === 'main.tsx') {\n                  return {\n                    contents: source,\n                    loader: 'tsx',\n                  };\n                }\n              });\n\n              for (const module of providedModules) {\n                build.onResolve({ filter: new RegExp(`^${module}$`) }, ({ path }) => {\n                  return { path, namespace: 'injected-module' };\n                });\n              }\n\n              build.onLoad({ filter: /.*/, namespace: 'injected-module' }, ({ path }) => {\n                const namedImports = imports.find((entry) => entry.moduleIdentifier === path)?.namedImports ?? [];\n                return {\n                  contents: `\n                  const { ${namedImports.join(',')} } = window.__DXOS_SANDBOX_MODULES__[${JSON.stringify(path)}];\n                  export { ${namedImports.join(',')} };\n                  export default window.__DXOS_SANDBOX_MODULES__[${JSON.stringify(path)}].default;\n                `,\n                  loader: 'tsx',\n                };\n              });\n            },\n          },\n          httpPlugin,\n        ],\n      });\n\n      log('compile complete', result.metafile);\n\n      return await createResult({\n        imports: this.analyzeImports(result),\n        bundle: result.outputFiles![0].text,\n      });\n    } catch (err) {\n      return await createResult({ error: err });\n    }\n  }\n\n  // TODO(dmaretskyi): In the future we can replace the compiler with SWC with plugins running in WASM.\n  analyzeImports(result: BuildResult): Import[] {\n    invariant(result.outputFiles);\n\n    // TODO(dmaretskyi): Support import aliases and wildcard imports.\n    const parsedImports = allMatches(IMPORT_REGEX, result.outputFiles[0].text);\n    return Object.values(result.metafile!.outputs)[0].imports.map((entry): Import => {\n      const namedImports: string[] = [];\n\n      const parsedImport = parsedImports.find((capture) => capture?.[4] === entry.path);\n      if (parsedImport?.[2]) {\n        NAMED_IMPORTS_REGEX.lastIndex = 0;\n        const namedImportsMatch = NAMED_IMPORTS_REGEX.exec(parsedImport[2]);\n        if (namedImportsMatch) {\n          namedImportsMatch[1].split(',').forEach((importName) => {\n            namedImports.push(importName.trim());\n          });\n        }\n      }\n\n      return {\n        moduleUrl: entry.path,\n        defaultImport: !!parsedImport?.[1],\n        namedImports,\n      };\n    });\n  }\n\n  analyzeSourceFileImports(code: string): {\n    defaultImportName: string;\n    namedImports: string[];\n    wildcardImportName: string;\n    moduleIdentifier: string;\n    quotes: string;\n  }[] {\n    // TODO(dmaretskyi): Support import aliases and wildcard imports.\n    const parsedImports = allMatches(IMPORT_REGEX, code);\n    return parsedImports.map((capture) => {\n      return {\n        defaultImportName: capture[1],\n        namedImports: capture[2]?.split(',').map((importName) => importName.trim()),\n        wildcardImportName: capture[3],\n        moduleIdentifier: capture[4],\n        quotes: capture[5],\n      };\n    });\n  }\n}\n\n// https://regex101.com/r/FEN5ks/1\n// https://stackoverflow.com/a/73265022\n// $1 = default import name (can be non-existent)\n// $2 = destructured exports (can be non-existent)\n// $3 = wildcard import name (can be non-existent)\n// $4 = module identifier\n// $5 = quotes used (either ' or \")\nconst IMPORT_REGEX =\n  /import(?:(?:(?:[ \\n\\t]+([^ *\\n\\t{},]+)[ \\n\\t]*(?:,|[ \\n\\t]+))?([ \\n\\t]*{(?:[ \\n\\t]*[^ \\n\\t\"'{}]+[ \\n\\t]*,?)+})?[ \\n\\t]*)|[ \\n\\t]*\\*[ \\n\\t]*as[ \\n\\t]+([^ \\n\\t{}]+)[ \\n\\t]+)from[ \\n\\t]*(?:['\"])([^'\"\\n]+)(['\"])/gm;\n\nconst NAMED_IMPORTS_REGEX = /[ \\n\\t]*{((?:[ \\n\\t]*[^ \\n\\t\"'{}]+[ \\n\\t]*,?)+)}[ \\n\\t]*/gm;\n\nconst allMatches = (regex: RegExp, str: string) => {\n  regex.lastIndex = 0;\n\n  let match;\n  const matches = [];\n  while ((match = regex.exec(str))) {\n    matches.push(match);\n  }\n\n  return matches;\n};\n\ntype ParsedImport = {\n  defaultImportName?: string;\n  namedImports: string[];\n  wildcardImportName?: string;\n  moduleIdentifier: string;\n  quotes: string;\n};\n\nconst analyzeSourceFileImports = (code: string): ParsedImport[] => {\n  // TODO(dmaretskyi): Support import aliases and wildcard imports.\n  const parsedImports = allMatches(IMPORT_REGEX, code);\n  return parsedImports.map((capture) => {\n    return {\n      defaultImportName: capture[1],\n      namedImports: capture[2]\n        ?.trim()\n        .slice(1, -1)\n        .split(',')\n        .map((importName) => importName.trim()),\n      wildcardImportName: capture[3],\n      moduleIdentifier: capture[4],\n      quotes: capture[5],\n    };\n  });\n};\n\nconst httpPlugin: Plugin = {\n  name: 'http',\n  setup: (build) => {\n    // Intercept import paths starting with \"http:\" and \"https:\" so esbuild doesn't attempt to map them to a file system location.\n    // Tag them with the \"http-url\" namespace to associate them with this plugin.\n    build.onResolve({ filter: /^https?:\\/\\// }, (args) => ({\n      path: args.path,\n      namespace: 'http-url',\n    }));\n\n    // We also want to intercept all import paths inside downloaded files and resolve them against the original URL.\n    // All of these files will be in the \"http-url\" namespace.\n    // Make sure to keep the newly resolved URL in the \"http-url\" namespace so imports inside it will also be resolved as URLs recursively.\n    build.onResolve({ filter: /.*/, namespace: 'http-url' }, (args) => ({\n      path: new URL(args.path, args.importer).toString(),\n      namespace: 'http-url',\n    }));\n\n    // When a URL is loaded, we want to actually download the content from the internet.\n    // This has just enough logic to be able to handle the example import from unpkg.com but in reality this would probably need to be more complex.\n    build.onLoad({ filter: /.*/, namespace: 'http-url' }, async (args) => {\n      const response = await fetch(args.path);\n      return { contents: await response.text(), loader: 'jsx' };\n    });\n  },\n};\n"],
-  "mappings": ";AAKA,SAASA,OAAOC,kBAAiD;AAEjE,SAASC,oBAAoB;AAC7B,SAASC,iBAAiB;AAC1B,SAASC,WAAW;;AAoCpB,IAAIC;AACG,IAAMC,oBAAoB,OAAOC,YAAAA;AACtC,SAAOF,gBAAgBJ,WAAW;IAChCO,SAASD,QAAQE;EACnB,CAAA;AACF;AAKO,IAAMC,UAAN,MAAMA;EACX,YAA6BC,UAA0B;SAA1BA,WAAAA;EAA2B;EAExD,MAAMC,OAAO,EAAEC,MAAMC,OAAM,GAA0C;AACnE,UAAM,EAAEC,kBAAkBC,iBAAiB,GAAGT,QAAAA,IAAY,KAAKI;AAE/D,UAAMM,eAAe,OAAOC,WAAAA;AAC1B,aAAO;QACLC,WAAWC,KAAKC,IAAG;QACnBC,YAAYR,SAASS,OAAOC,KAAK,MAAMtB,aAAauB,OAAO,WAAWF,OAAOC,KAAKV,MAAAA,CAAAA,CAAAA,IAAYY;QAC9F,GAAGR;MACL;IACF;AAEA,QAAI,KAAKP,SAASgB,aAAa,WAAW;AACxCxB,gBAAUE,aAAa,6BAAA;;;;;;;;;AACvB,YAAMA;IACR;AAEA,UAAMuB,UAAUd,SAASe,yBAAyBf,MAAAA,IAAU,CAAA;AAG5D,QAAI;AACF,YAAMI,SAAS,MAAMlB,MAAM;QACzB2B,UAAUpB,QAAQoB;QAClBG,YAAY;UAAC;UAAW;;QACxBC,UAAU;QACVC,OAAO;QACPC,aAAa;UAACpB,QAAQ;;QACtBD,QAAQ;QACRsB,QAAQ;QACRC,SAAS;UACP;YACEC,MAAM;YACNC,OAAO,CAACrC,WAAAA;AACNA,cAAAA,OAAMsC,UAAU;gBAAEC,QAAQ;cAAoB,GAAG,CAAC,EAAE1B,MAAAA,MAAI,MAAE;AACxD,uBAAO;kBAAEA,MAAAA;kBAAM2B,UAAU;gBAAK;cAChC,CAAA;AAEAxC,cAAAA,OAAMsC,UAAU;gBAAEC,QAAQ;cAAmB,GAAG,CAAC,EAAE1B,MAAAA,MAAI,MAAE;AACvD,uBAAO;kBAAEA,MAAM;kBAAgB2B,UAAU;gBAAK;cAChD,CAAA;AAEAxC,cAAAA,OAAMsC,UAAU;gBAAEC,QAAQ;cAAW,GAAG,CAAC,EAAE1B,MAAAA,MAAI,MAAE;AAC/C,uBAAO;kBAAEA,MAAMA,MAAK4B,MAAM,GAAA,EAAK,CAAA;kBAAIC,WAAW;gBAAS;cACzD,CAAA;AAEA1C,cAAAA,OAAM2C,OAAO;gBAAEJ,QAAQ;gBAAMG,WAAW;cAAS,GAAG,CAAC,EAAE7B,MAAAA,MAAI,MAAE;AAC3D,oBAAIA,UAAS,YAAY;AACvB,yBAAO;oBACL+B,UAAU9B;oBACV+B,QAAQ;kBACV;gBACF;cACF,CAAA;AAEA,yBAAWC,UAAU9B,iBAAiB;AACpChB,gBAAAA,OAAMsC,UAAU;kBAAEC,QAAQ,IAAIQ,OAAO,IAAID,MAAAA,GAAS;gBAAE,GAAG,CAAC,EAAEjC,MAAAA,MAAI,MAAE;AAC9D,yBAAO;oBAAEA,MAAAA;oBAAM6B,WAAW;kBAAkB;gBAC9C,CAAA;cACF;AAEA1C,cAAAA,OAAM2C,OAAO;gBAAEJ,QAAQ;gBAAMG,WAAW;cAAkB,GAAG,CAAC,EAAE7B,MAAAA,MAAI,MAAE;AACpE,sBAAMmC,eAAepB,QAAQqB,KAAK,CAACC,UAAUA,MAAMC,qBAAqBtC,KAAAA,GAAOmC,gBAAgB,CAAA;AAC/F,uBAAO;kBACLJ,UAAU;4BACAI,aAAaI,KAAK,GAAA,CAAA,wCAA4CC,KAAKC,UAAUzC,KAAAA,CAAAA;6BAC5EmC,aAAaI,KAAK,GAAA,CAAA;mEACoBC,KAAKC,UAAUzC,KAAAA,CAAAA;;kBAEhEgC,QAAQ;gBACV;cACF,CAAA;YACF;UACF;UACAU;;MAEJ,CAAA;AAEAnD,UAAI,oBAAoBc,OAAOa,UAAQ;;;;;;AAEvC,aAAO,MAAMd,aAAa;QACxBW,SAAS,KAAK4B,eAAetC,MAAAA;QAC7BN,QAAQM,OAAOuC,YAAa,CAAA,EAAGC;MACjC,CAAA;IACF,SAASC,KAAK;AACZ,aAAO,MAAM1C,aAAa;QAAE2C,OAAOD;MAAI,CAAA;IACzC;EACF;;EAGAH,eAAetC,QAA+B;AAC5Cf,cAAUe,OAAOuC,aAAW,QAAA;;;;;;;;;AAG5B,UAAMI,gBAAgBC,WAAWC,cAAc7C,OAAOuC,YAAY,CAAA,EAAGC,IAAI;AACzE,WAAOM,OAAOC,OAAO/C,OAAOa,SAAUmC,OAAO,EAAE,CAAA,EAAGtC,QAAQuC,IAAI,CAACjB,UAAAA;AAC7D,YAAMF,eAAyB,CAAA;AAE/B,YAAMoB,eAAeP,cAAcZ,KAAK,CAACoB,YAAYA,UAAU,CAAA,MAAOnB,MAAMrC,IAAI;AAChF,UAAIuD,eAAe,CAAA,GAAI;AACrBE,4BAAoBC,YAAY;AAChC,cAAMC,oBAAoBF,oBAAoBG,KAAKL,aAAa,CAAA,CAAE;AAClE,YAAII,mBAAmB;AACrBA,4BAAkB,CAAA,EAAG/B,MAAM,GAAA,EAAKiC,QAAQ,CAACC,eAAAA;AACvC3B,yBAAa4B,KAAKD,WAAWE,KAAI,CAAA;UACnC,CAAA;QACF;MACF;AAEA,aAAO;QACLC,WAAW5B,MAAMrC;QACjBkE,eAAe,CAAC,CAACX,eAAe,CAAA;QAChCpB;MACF;IACF,CAAA;EACF;EAEAnB,yBAAyBmD,MAMrB;AAEF,UAAMnB,gBAAgBC,WAAWC,cAAciB,IAAAA;AAC/C,WAAOnB,cAAcM,IAAI,CAACE,YAAAA;AACxB,aAAO;QACLY,mBAAmBZ,QAAQ,CAAA;QAC3BrB,cAAcqB,QAAQ,CAAA,GAAI5B,MAAM,GAAA,EAAK0B,IAAI,CAACQ,eAAeA,WAAWE,KAAI,CAAA;QACxEK,oBAAoBb,QAAQ,CAAA;QAC5BlB,kBAAkBkB,QAAQ,CAAA;QAC1Bc,QAAQd,QAAQ,CAAA;MAClB;IACF,CAAA;EACF;AACF;AASA,IAAMN,eACJ;AAEF,IAAMO,sBAAsB;AAE5B,IAAMR,aAAa,CAACsB,OAAeC,QAAAA;AACjCD,QAAMb,YAAY;AAElB,MAAIe;AACJ,QAAMC,UAAU,CAAA;AAChB,SAAQD,QAAQF,MAAMX,KAAKY,GAAAA,GAAO;AAChCE,YAAQX,KAAKU,KAAAA;EACf;AAEA,SAAOC;AACT;AAUA,IAAM1D,2BAA2B,CAACmD,SAAAA;AAEhC,QAAMnB,gBAAgBC,WAAWC,cAAciB,IAAAA;AAC/C,SAAOnB,cAAcM,IAAI,CAACE,YAAAA;AACxB,WAAO;MACLY,mBAAmBZ,QAAQ,CAAA;MAC3BrB,cAAcqB,QAAQ,CAAA,GAClBQ,KAAAA,EACDW,MAAM,GAAG,EAAC,EACV/C,MAAM,GAAA,EACN0B,IAAI,CAACQ,eAAeA,WAAWE,KAAI,CAAA;MACtCK,oBAAoBb,QAAQ,CAAA;MAC5BlB,kBAAkBkB,QAAQ,CAAA;MAC1Bc,QAAQd,QAAQ,CAAA;IAClB;EACF,CAAA;AACF;AAEA,IAAMd,aAAqB;EACzBnB,MAAM;EACNC,OAAO,CAACrC,WAAAA;AAGNA,IAAAA,OAAMsC,UAAU;MAAEC,QAAQ;IAAe,GAAG,CAACkD,UAAU;MACrD5E,MAAM4E,KAAK5E;MACX6B,WAAW;IACb,EAAA;AAKA1C,IAAAA,OAAMsC,UAAU;MAAEC,QAAQ;MAAMG,WAAW;IAAW,GAAG,CAAC+C,UAAU;MAClE5E,MAAM,IAAI6E,IAAID,KAAK5E,MAAM4E,KAAKE,QAAQ,EAAEC,SAAQ;MAChDlD,WAAW;IACb,EAAA;AAIA1C,IAAAA,OAAM2C,OAAO;MAAEJ,QAAQ;MAAMG,WAAW;IAAW,GAAG,OAAO+C,SAAAA;AAC3D,YAAMI,WAAW,MAAMC,MAAML,KAAK5E,IAAI;AACtC,aAAO;QAAE+B,UAAU,MAAMiD,SAASnC,KAAI;QAAIb,QAAQ;MAAM;IAC1D,CAAA;EACF;AACF;",
-  "names": ["build", "initialize", "subtleCrypto", "invariant", "log", "initialized", "initializeBundler", "options", "wasmURL", "wasmUrl", "Bundler", "_options", "bundle", "path", "source", "sandboxedModules", "providedModules", "createResult", "result", "timestamp", "Date", "now", "sourceHash", "Buffer", "from", "digest", "undefined", "platform", "imports", "analyzeSourceFileImports", "conditions", "metafile", "write", "entryPoints", "format", "plugins", "name", "setup", "onResolve", "filter", "external", "split", "namespace", "onLoad", "contents", "loader", "module", "RegExp", "namedImports", "find", "entry", "moduleIdentifier", "join", "JSON", "stringify", "httpPlugin", "analyzeImports", "outputFiles", "text", "err", "error", "parsedImports", "allMatches", "IMPORT_REGEX", "Object", "values", "outputs", "map", "parsedImport", "capture", "NAMED_IMPORTS_REGEX", "lastIndex", "namedImportsMatch", "exec", "forEach", "importName", "push", "trim", "moduleUrl", "defaultImport", "code", "defaultImportName", "wildcardImportName", "quotes", "regex", "str", "match", "matches", "slice", "args", "URL", "importer", "toString", "response", "fetch"]
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { FetchHttpClient, HttpClient } from '@effect/platform';\nimport { Duration, Effect, pipe, Schedule } from 'effect';\nimport { type BuildOptions, type Loader, build, initialize, type BuildResult, type Plugin } from 'esbuild-wasm';\n\nimport { subtleCrypto } from '@dxos/crypto';\nimport { runAndForwardErrors } from '@dxos/effect';\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nexport type Import = {\n  moduleUrl: string;\n  defaultImport: boolean;\n  namedImports: string[];\n};\n\nexport type BundleOptions = {\n  /**\n   * Path to the source file on the local file system.\n   * If provided, the path will be used instead of the `source` code.\n   */\n  path?: string;\n\n  /**\n   * Source code to bundle.\n   * Required if `path` is not provided.\n   */\n  source?: string;\n};\n\nexport type BundleResult = {\n  timestamp: number;\n  sourceHash?: Buffer;\n  imports?: Import[];\n  bundle?: string;\n  error?: any;\n};\n\nexport type BundlerOptions = {\n  platform: BuildOptions['platform'];\n  sandboxedModules: string[];\n  remoteModules: Record<string, string>;\n};\n\nlet initialized: Promise<void>;\nexport const initializeBundler = async (options: { wasmUrl: string }) => {\n  await (initialized ??= initialize({\n    wasmURL: options.wasmUrl,\n  }));\n};\n\n/**\n * ESBuild bundler.\n */\nexport class Bundler {\n  constructor(private readonly _options: BundlerOptions) {}\n\n  async bundle({ path, source }: BundleOptions): Promise<BundleResult> {\n    const { sandboxedModules: providedModules, ...options } = this._options;\n\n    const createResult = async (result?: Partial<BundleResult>) => {\n      return {\n        timestamp: Date.now(),\n        sourceHash: source ? Buffer.from(await subtleCrypto.digest('SHA-256', Buffer.from(source))) : undefined,\n        ...result,\n      };\n    };\n\n    if (this._options.platform === 'browser') {\n      invariant(initialized, 'Compiler not initialized.');\n      await initialized;\n    }\n\n    const imports = source ? analyzeSourceFileImports(source) : [];\n\n    // https://esbuild.github.io/api/#build\n    try {\n      const result = await build({\n        platform: options.platform,\n        conditions: ['workerd', 'browser'],\n        metafile: true,\n        write: false,\n        entryPoints: [path ?? 'memory:main.tsx'],\n        bundle: true,\n        format: 'esm',\n        plugins: [\n          {\n            name: 'memory',\n            setup: (build) => {\n              build.onResolve({ filter: /^\\.\\/runtime\\.js$/ }, ({ path }) => {\n                return { path, external: true };\n              });\n\n              build.onResolve({ filter: /^dxos:functions$/ }, ({ path }) => {\n                return { path: './runtime.js', external: true };\n              });\n\n              build.onResolve({ filter: /^memory:/ }, ({ path }) => {\n                return { path: path.split(':')[1], namespace: 'memory' };\n              });\n\n              build.onLoad({ filter: /.*/, namespace: 'memory' }, ({ path }) => {\n                if (path === 'main.tsx') {\n                  return {\n                    contents: source,\n                    loader: 'tsx',\n                  };\n                }\n              });\n\n              for (const module of providedModules) {\n                build.onResolve({ filter: new RegExp(`^${module}$`) }, ({ path }) => {\n                  return { path, namespace: 'injected-module' };\n                });\n              }\n\n              build.onLoad({ filter: /.*/, namespace: 'injected-module' }, ({ path }) => {\n                const namedImports = imports.find((entry) => entry.moduleIdentifier === path)?.namedImports ?? [];\n                return {\n                  contents: `\n                  const { ${namedImports.join(',')} } = window.__DXOS_SANDBOX_MODULES__[${JSON.stringify(path)}];\n                  export { ${namedImports.join(',')} };\n                  export default window.__DXOS_SANDBOX_MODULES__[${JSON.stringify(path)}].default;\n                `,\n                  loader: 'tsx',\n                };\n              });\n            },\n          },\n          httpPlugin,\n        ],\n      });\n\n      log('compile complete', result.metafile);\n\n      return await createResult({\n        imports: this.analyzeImports(result),\n        bundle: result.outputFiles![0].text,\n      });\n    } catch (err) {\n      return await createResult({ error: err });\n    }\n  }\n\n  // TODO(dmaretskyi): In the future we can replace the compiler with SWC with plugins running in WASM.\n  analyzeImports(result: BuildResult): Import[] {\n    invariant(result.outputFiles);\n\n    // TODO(dmaretskyi): Support import aliases and wildcard imports.\n    const parsedImports = allMatches(IMPORT_REGEX, result.outputFiles[0].text);\n    return Object.values(result.metafile!.outputs)[0].imports.map((entry): Import => {\n      const namedImports: string[] = [];\n\n      const parsedImport = parsedImports.find((capture) => capture?.[4] === entry.path);\n      if (parsedImport?.[2]) {\n        NAMED_IMPORTS_REGEX.lastIndex = 0;\n        const namedImportsMatch = NAMED_IMPORTS_REGEX.exec(parsedImport[2]);\n        if (namedImportsMatch) {\n          namedImportsMatch[1].split(',').forEach((importName) => {\n            namedImports.push(importName.trim());\n          });\n        }\n      }\n\n      return {\n        moduleUrl: entry.path,\n        defaultImport: !!parsedImport?.[1],\n        namedImports,\n      };\n    });\n  }\n\n  analyzeSourceFileImports(code: string): {\n    defaultImportName: string;\n    namedImports: string[];\n    wildcardImportName: string;\n    moduleIdentifier: string;\n    quotes: string;\n  }[] {\n    // TODO(dmaretskyi): Support import aliases and wildcard imports.\n    const parsedImports = allMatches(IMPORT_REGEX, code);\n    return parsedImports.map((capture) => {\n      return {\n        defaultImportName: capture[1],\n        namedImports: capture[2]?.split(',').map((importName) => importName.trim()),\n        wildcardImportName: capture[3],\n        moduleIdentifier: capture[4],\n        quotes: capture[5],\n      };\n    });\n  }\n}\n\n// https://regex101.com/r/FEN5ks/1\n// https://stackoverflow.com/a/73265022\n// $1 = default import name (can be non-existent)\n// $2 = destructured exports (can be non-existent)\n// $3 = wildcard import name (can be non-existent)\n// $4 = module identifier\n// $5 = quotes used (either ' or \")\nconst IMPORT_REGEX =\n  /import(?:(?:(?:[ \\n\\t]+([^ *\\n\\t{},]+)[ \\n\\t]*(?:,|[ \\n\\t]+))?([ \\n\\t]*{(?:[ \\n\\t]*[^ \\n\\t\"'{}]+[ \\n\\t]*,?)+})?[ \\n\\t]*)|[ \\n\\t]*\\*[ \\n\\t]*as[ \\n\\t]+([^ \\n\\t{}]+)[ \\n\\t]+)from[ \\n\\t]*(?:['\"])([^'\"\\n]+)(['\"])/gm;\n\nconst NAMED_IMPORTS_REGEX = /[ \\n\\t]*{((?:[ \\n\\t]*[^ \\n\\t\"'{}]+[ \\n\\t]*,?)+)}[ \\n\\t]*/gm;\n\nconst allMatches = (regex: RegExp, str: string) => {\n  regex.lastIndex = 0;\n\n  let match;\n  const matches = [];\n  while ((match = regex.exec(str))) {\n    matches.push(match);\n  }\n\n  return matches;\n};\n\ntype ParsedImport = {\n  defaultImportName?: string;\n  namedImports: string[];\n  wildcardImportName?: string;\n  moduleIdentifier: string;\n  quotes: string;\n};\n\nconst analyzeSourceFileImports = (code: string): ParsedImport[] => {\n  // TODO(dmaretskyi): Support import aliases and wildcard imports.\n  const parsedImports = allMatches(IMPORT_REGEX, code);\n  return parsedImports.map((capture) => {\n    return {\n      defaultImportName: capture[1],\n      namedImports: capture[2]\n        ?.trim()\n        .slice(1, -1)\n        .split(',')\n        .map((importName) => importName.trim()),\n      wildcardImportName: capture[3],\n      moduleIdentifier: capture[4],\n      quotes: capture[5],\n    };\n  });\n};\n\nconst MAX_RETRIES = 5;\nconst INITIAL_DELAY = 1_000;\n\nconst httpPlugin: Plugin = {\n  name: 'http',\n  setup: (build) => {\n    // Intercept import paths starting with \"http:\" and \"https:\" so esbuild doesn't attempt to map them to a file system location.\n    // Tag them with the \"http-url\" namespace to associate them with this plugin.\n    build.onResolve({ filter: /^https?:\\/\\// }, (args) => ({\n      path: args.path,\n      namespace: 'http-url',\n    }));\n\n    // We also want to intercept all import paths inside downloaded files and resolve them against the original URL.\n    // All of these files will be in the \"http-url\" namespace.\n    // Make sure to keep the newly resolved URL in the \"http-url\" namespace so imports inside it will also be resolved as URLs recursively.\n    build.onResolve({ filter: /.*/, namespace: 'http-url' }, (args) => ({\n      path: new URL(args.path, args.importer).toString(),\n      namespace: 'http-url',\n    }));\n\n    // When a URL is loaded, we want to actually download the content from the internet.\n    // This has just enough logic to be able to handle the example import from unpkg.com but in reality this would probably need to be more complex.\n    build.onLoad({ filter: /.*/, namespace: 'http-url' }, async (args) => {\n      return Effect.gen(function* () {\n        const response = yield* HttpClient.get(args.path);\n        if (response.status !== 200) {\n          throw new Error(`failed to fetch: ${response.status}`);\n        }\n\n        const text = yield* response.text;\n        return { contents: text, loader: 'jsx' as Loader };\n      }).pipe(\n        Effect.retry(\n          pipe(\n            Schedule.exponential(Duration.millis(INITIAL_DELAY)),\n            Schedule.jittered,\n            Schedule.intersect(Schedule.recurs(MAX_RETRIES - 1)),\n          ),\n        ),\n        Effect.provide(FetchHttpClient.layer),\n        runAndForwardErrors,\n      );\n    });\n  },\n};\n"],
+  "mappings": ";AAIA,SAASA,iBAAiBC,kBAAkB;AAC5C,SAASC,UAAUC,QAAQC,MAAMC,gBAAgB;AACjD,SAAyCC,OAAOC,kBAAiD;AAEjG,SAASC,oBAAoB;AAC7B,SAASC,2BAA2B;AACpC,SAASC,iBAAiB;AAC1B,SAASC,WAAW;;AAoCpB,IAAIC;AACG,IAAMC,oBAAoB,OAAOC,YAAAA;AACtC,SAAOF,gBAAgBL,WAAW;IAChCQ,SAASD,QAAQE;EACnB,CAAA;AACF;AAKO,IAAMC,UAAN,MAAMA;EACX,YAA6BC,UAA0B;SAA1BA,WAAAA;EAA2B;EAExD,MAAMC,OAAO,EAAEC,MAAMC,OAAM,GAA0C;AACnE,UAAM,EAAEC,kBAAkBC,iBAAiB,GAAGT,QAAAA,IAAY,KAAKI;AAE/D,UAAMM,eAAe,OAAOC,WAAAA;AAC1B,aAAO;QACLC,WAAWC,KAAKC,IAAG;QACnBC,YAAYR,SAASS,OAAOC,KAAK,MAAMvB,aAAawB,OAAO,WAAWF,OAAOC,KAAKV,MAAAA,CAAAA,CAAAA,IAAYY;QAC9F,GAAGR;MACL;IACF;AAEA,QAAI,KAAKP,SAASgB,aAAa,WAAW;AACxCxB,gBAAUE,aAAa,6BAAA;;;;;;;;;AACvB,YAAMA;IACR;AAEA,UAAMuB,UAAUd,SAASe,yBAAyBf,MAAAA,IAAU,CAAA;AAG5D,QAAI;AACF,YAAMI,SAAS,MAAMnB,MAAM;QACzB4B,UAAUpB,QAAQoB;QAClBG,YAAY;UAAC;UAAW;;QACxBC,UAAU;QACVC,OAAO;QACPC,aAAa;UAACpB,QAAQ;;QACtBD,QAAQ;QACRsB,QAAQ;QACRC,SAAS;UACP;YACEC,MAAM;YACNC,OAAO,CAACtC,WAAAA;AACNA,cAAAA,OAAMuC,UAAU;gBAAEC,QAAQ;cAAoB,GAAG,CAAC,EAAE1B,MAAAA,MAAI,MAAE;AACxD,uBAAO;kBAAEA,MAAAA;kBAAM2B,UAAU;gBAAK;cAChC,CAAA;AAEAzC,cAAAA,OAAMuC,UAAU;gBAAEC,QAAQ;cAAmB,GAAG,CAAC,EAAE1B,MAAAA,MAAI,MAAE;AACvD,uBAAO;kBAAEA,MAAM;kBAAgB2B,UAAU;gBAAK;cAChD,CAAA;AAEAzC,cAAAA,OAAMuC,UAAU;gBAAEC,QAAQ;cAAW,GAAG,CAAC,EAAE1B,MAAAA,MAAI,MAAE;AAC/C,uBAAO;kBAAEA,MAAMA,MAAK4B,MAAM,GAAA,EAAK,CAAA;kBAAIC,WAAW;gBAAS;cACzD,CAAA;AAEA3C,cAAAA,OAAM4C,OAAO;gBAAEJ,QAAQ;gBAAMG,WAAW;cAAS,GAAG,CAAC,EAAE7B,MAAAA,MAAI,MAAE;AAC3D,oBAAIA,UAAS,YAAY;AACvB,yBAAO;oBACL+B,UAAU9B;oBACV+B,QAAQ;kBACV;gBACF;cACF,CAAA;AAEA,yBAAWC,UAAU9B,iBAAiB;AACpCjB,gBAAAA,OAAMuC,UAAU;kBAAEC,QAAQ,IAAIQ,OAAO,IAAID,MAAAA,GAAS;gBAAE,GAAG,CAAC,EAAEjC,MAAAA,MAAI,MAAE;AAC9D,yBAAO;oBAAEA,MAAAA;oBAAM6B,WAAW;kBAAkB;gBAC9C,CAAA;cACF;AAEA3C,cAAAA,OAAM4C,OAAO;gBAAEJ,QAAQ;gBAAMG,WAAW;cAAkB,GAAG,CAAC,EAAE7B,MAAAA,MAAI,MAAE;AACpE,sBAAMmC,eAAepB,QAAQqB,KAAK,CAACC,UAAUA,MAAMC,qBAAqBtC,KAAAA,GAAOmC,gBAAgB,CAAA;AAC/F,uBAAO;kBACLJ,UAAU;4BACAI,aAAaI,KAAK,GAAA,CAAA,wCAA4CC,KAAKC,UAAUzC,KAAAA,CAAAA;6BAC5EmC,aAAaI,KAAK,GAAA,CAAA;mEACoBC,KAAKC,UAAUzC,KAAAA,CAAAA;;kBAEhEgC,QAAQ;gBACV;cACF,CAAA;YACF;UACF;UACAU;;MAEJ,CAAA;AAEAnD,UAAI,oBAAoBc,OAAOa,UAAQ;;;;;;AAEvC,aAAO,MAAMd,aAAa;QACxBW,SAAS,KAAK4B,eAAetC,MAAAA;QAC7BN,QAAQM,OAAOuC,YAAa,CAAA,EAAGC;MACjC,CAAA;IACF,SAASC,KAAK;AACZ,aAAO,MAAM1C,aAAa;QAAE2C,OAAOD;MAAI,CAAA;IACzC;EACF;;EAGAH,eAAetC,QAA+B;AAC5Cf,cAAUe,OAAOuC,aAAW,QAAA;;;;;;;;;AAG5B,UAAMI,gBAAgBC,WAAWC,cAAc7C,OAAOuC,YAAY,CAAA,EAAGC,IAAI;AACzE,WAAOM,OAAOC,OAAO/C,OAAOa,SAAUmC,OAAO,EAAE,CAAA,EAAGtC,QAAQuC,IAAI,CAACjB,UAAAA;AAC7D,YAAMF,eAAyB,CAAA;AAE/B,YAAMoB,eAAeP,cAAcZ,KAAK,CAACoB,YAAYA,UAAU,CAAA,MAAOnB,MAAMrC,IAAI;AAChF,UAAIuD,eAAe,CAAA,GAAI;AACrBE,4BAAoBC,YAAY;AAChC,cAAMC,oBAAoBF,oBAAoBG,KAAKL,aAAa,CAAA,CAAE;AAClE,YAAII,mBAAmB;AACrBA,4BAAkB,CAAA,EAAG/B,MAAM,GAAA,EAAKiC,QAAQ,CAACC,eAAAA;AACvC3B,yBAAa4B,KAAKD,WAAWE,KAAI,CAAA;UACnC,CAAA;QACF;MACF;AAEA,aAAO;QACLC,WAAW5B,MAAMrC;QACjBkE,eAAe,CAAC,CAACX,eAAe,CAAA;QAChCpB;MACF;IACF,CAAA;EACF;EAEAnB,yBAAyBmD,MAMrB;AAEF,UAAMnB,gBAAgBC,WAAWC,cAAciB,IAAAA;AAC/C,WAAOnB,cAAcM,IAAI,CAACE,YAAAA;AACxB,aAAO;QACLY,mBAAmBZ,QAAQ,CAAA;QAC3BrB,cAAcqB,QAAQ,CAAA,GAAI5B,MAAM,GAAA,EAAK0B,IAAI,CAACQ,eAAeA,WAAWE,KAAI,CAAA;QACxEK,oBAAoBb,QAAQ,CAAA;QAC5BlB,kBAAkBkB,QAAQ,CAAA;QAC1Bc,QAAQd,QAAQ,CAAA;MAClB;IACF,CAAA;EACF;AACF;AASA,IAAMN,eACJ;AAEF,IAAMO,sBAAsB;AAE5B,IAAMR,aAAa,CAACsB,OAAeC,QAAAA;AACjCD,QAAMb,YAAY;AAElB,MAAIe;AACJ,QAAMC,UAAU,CAAA;AAChB,SAAQD,QAAQF,MAAMX,KAAKY,GAAAA,GAAO;AAChCE,YAAQX,KAAKU,KAAAA;EACf;AAEA,SAAOC;AACT;AAUA,IAAM1D,2BAA2B,CAACmD,SAAAA;AAEhC,QAAMnB,gBAAgBC,WAAWC,cAAciB,IAAAA;AAC/C,SAAOnB,cAAcM,IAAI,CAACE,YAAAA;AACxB,WAAO;MACLY,mBAAmBZ,QAAQ,CAAA;MAC3BrB,cAAcqB,QAAQ,CAAA,GAClBQ,KAAAA,EACDW,MAAM,GAAG,EAAC,EACV/C,MAAM,GAAA,EACN0B,IAAI,CAACQ,eAAeA,WAAWE,KAAI,CAAA;MACtCK,oBAAoBb,QAAQ,CAAA;MAC5BlB,kBAAkBkB,QAAQ,CAAA;MAC1Bc,QAAQd,QAAQ,CAAA;IAClB;EACF,CAAA;AACF;AAEA,IAAMoB,cAAc;AACpB,IAAMC,gBAAgB;AAEtB,IAAMnC,aAAqB;EACzBnB,MAAM;EACNC,OAAO,CAACtC,WAAAA;AAGNA,IAAAA,OAAMuC,UAAU;MAAEC,QAAQ;IAAe,GAAG,CAACoD,UAAU;MACrD9E,MAAM8E,KAAK9E;MACX6B,WAAW;IACb,EAAA;AAKA3C,IAAAA,OAAMuC,UAAU;MAAEC,QAAQ;MAAMG,WAAW;IAAW,GAAG,CAACiD,UAAU;MAClE9E,MAAM,IAAI+E,IAAID,KAAK9E,MAAM8E,KAAKE,QAAQ,EAAEC,SAAQ;MAChDpD,WAAW;IACb,EAAA;AAIA3C,IAAAA,OAAM4C,OAAO;MAAEJ,QAAQ;MAAMG,WAAW;IAAW,GAAG,OAAOiD,SAAAA;AAC3D,aAAO/F,OAAOmG,IAAI,aAAA;AAChB,cAAMC,WAAW,OAAOtG,WAAWuG,IAAIN,KAAK9E,IAAI;AAChD,YAAImF,SAASE,WAAW,KAAK;AAC3B,gBAAM,IAAIC,MAAM,oBAAoBH,SAASE,MAAM,EAAE;QACvD;AAEA,cAAMxC,OAAO,OAAOsC,SAAStC;AAC7B,eAAO;UAAEd,UAAUc;UAAMb,QAAQ;QAAgB;MACnD,CAAA,EAAGhD,KACDD,OAAOwG,MACLvG,KACEC,SAASuG,YAAY1G,SAAS2G,OAAOZ,aAAAA,CAAAA,GACrC5F,SAASyG,UACTzG,SAAS0G,UAAU1G,SAAS2G,OAAOhB,cAAc,CAAA,CAAA,CAAA,CAAA,GAGrD7F,OAAO8G,QAAQjH,gBAAgBkH,KAAK,GACpCzG,mBAAAA;IAEJ,CAAA;EACF;AACF;",
+  "names": ["FetchHttpClient", "HttpClient", "Duration", "Effect", "pipe", "Schedule", "build", "initialize", "subtleCrypto", "runAndForwardErrors", "invariant", "log", "initialized", "initializeBundler", "options", "wasmURL", "wasmUrl", "Bundler", "_options", "bundle", "path", "source", "sandboxedModules", "providedModules", "createResult", "result", "timestamp", "Date", "now", "sourceHash", "Buffer", "from", "digest", "undefined", "platform", "imports", "analyzeSourceFileImports", "conditions", "metafile", "write", "entryPoints", "format", "plugins", "name", "setup", "onResolve", "filter", "external", "split", "namespace", "onLoad", "contents", "loader", "module", "RegExp", "namedImports", "find", "entry", "moduleIdentifier", "join", "JSON", "stringify", "httpPlugin", "analyzeImports", "outputFiles", "text", "err", "error", "parsedImports", "allMatches", "IMPORT_REGEX", "Object", "values", "outputs", "map", "parsedImport", "capture", "NAMED_IMPORTS_REGEX", "lastIndex", "namedImportsMatch", "exec", "forEach", "importName", "push", "trim", "moduleUrl", "defaultImport", "code", "defaultImportName", "wildcardImportName", "quotes", "regex", "str", "match", "matches", "slice", "MAX_RETRIES", "INITIAL_DELAY", "args", "URL", "importer", "toString", "gen", "response", "get", "status", "Error", "retry", "exponential", "millis", "jittered", "intersect", "recurs", "provide", "layer"]
 }

package/dist/lib/browser/{chunk-WEFZUEL2.mjs → chunk-54U464M4.mjs}

@@ -1,4 +1,4 @@
-// packages/core/functions/src/services/ai.ts
+// src/services/ai.ts
 import { Context, Layer } from "effect";
 var AiService = class _AiService extends Context.Tag("AiService")() {
   static {
@@ -22,8 +22,8 @@ var AiService = class _AiService extends Context.Tag("AiService")() {
   }
 };
 
-// packages/core/functions/src/services/database.ts
-import { Context as Context2, Layer as Layer2 } from "effect";
+// src/services/database.ts
+import { Context as Context2, Effect, Layer as Layer2 } from "effect";
 var DatabaseService = class _DatabaseService extends Context2.Tag("DatabaseService")() {
   static {
     this.notAvailable = Layer2.succeed(_DatabaseService, {
@@ -41,15 +41,41 @@ var DatabaseService = class _DatabaseService extends Context2.Tag("DatabaseServi
       };
     };
   }
+  static {
+    this.resolve = Effect.fn(function* (dxn) {
+      const { db } = yield* _DatabaseService;
+      return yield* Effect.tryPromise({
+        try: () => db.graph.createRefResolver({
+          context: {
+            space: db.spaceId
+          }
+        }).resolve(dxn),
+        catch: (error) => error
+      });
+    });
+  }
+  static {
+    this.loadRef = Effect.fn(function* (ref) {
+      return yield* Effect.tryPromise({
+        try: () => ref.load(),
+        catch: (error) => error
+      });
+    });
+  }
 };
 
-// packages/core/functions/src/services/queues.ts
+// src/services/queues.ts
 import { Context as Context3, Layer as Layer3 } from "effect";
 var QueueService = class _QueueService extends Context3.Tag("QueueService")() {
   static {
     this.notAvailable = Layer3.succeed(_QueueService, {
-      get queues() {
-        throw new Error("Queues not available");
+      queues: {
+        get(dxn) {
+          throw new Error("Queues not available");
+        },
+        create() {
+          throw new Error("Queues not available");
+        }
       },
       contextQueue: void 0
     });
@@ -64,7 +90,7 @@ var QueueService = class _QueueService extends Context3.Tag("QueueService")() {
   }
 };
 
-// packages/core/functions/src/services/credentials.ts
+// src/services/credentials.ts
 import { Context as Context4 } from "effect";
 var CredentialsService = class extends Context4.Tag("CredentialsService")() {
 };
@@ -88,11 +114,11 @@ var ConfiguredCredentialsService = class {
   }
 };
 
-// packages/core/functions/src/services/event-logger.ts
-import { Effect, Context as Context5 } from "effect";
+// src/services/event-logger.ts
+import { Effect as Effect2, Context as Context5 } from "effect";
 import { invariant } from "@dxos/invariant";
 import { log, LogLevel } from "@dxos/log";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/services/event-logger.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/functions/src/services/event-logger.ts";
 var EventLogger = class extends Context5.Tag("EventLogger")() {
   static {
     this.noop = {
@@ -102,7 +128,7 @@ var EventLogger = class extends Context5.Tag("EventLogger")() {
     };
   }
 };
-var logCustomEvent = (data) => Effect.gen(function* () {
+var logCustomEvent = (data) => Effect2.gen(function* () {
   const logger = yield* EventLogger;
   if (!logger.nodeId) {
     throw new Error("logCustomEvent must be called within a node compute function");
@@ -113,7 +139,7 @@ var logCustomEvent = (data) => Effect.gen(function* () {
     event: data
   });
 });
-var createDefectLogger = () => Effect.catchAll((error) => Effect.gen(function* () {
+var createDefectLogger = () => Effect2.catchAll((error) => Effect2.gen(function* () {
   log.error("unhandled effect error", {
     error
   }, {
@@ -149,7 +175,7 @@ var createEventLogger = (level, message = "event") => {
   };
 };
 
-// packages/core/functions/src/services/function-call-service.ts
+// src/services/function-call-service.ts
 import { Context as Context6 } from "effect";
 var FunctionCallService = class extends Context6.Tag("FunctionCallService")() {
   static fromClient(baseUrl, spaceId) {
@@ -197,9 +223,30 @@ var isSecure = (protocol) => {
   return protocol === "https:" || protocol === "wss:";
 };
 
-// packages/core/functions/src/services/tracing.ts
+// src/services/tool-resolver.ts
 import { Context as Context7 } from "effect";
-var TracingService = class extends Context7.Tag("TracingService")() {
+var ToolResolverService = class extends Context7.Tag("ToolResolverService")() {
+  static {
+    this.notAvailable = {
+      toolResolver: {
+        resolve: async (id) => {
+          throw new Error("Tool resolver not available");
+        }
+      }
+    };
+  }
+  static {
+    this.make = (toolResolver) => {
+      return {
+        toolResolver
+      };
+    };
+  }
+};
+
+// src/services/tracing.ts
+import { Context as Context8 } from "effect";
+var TracingService = class extends Context8.Tag("TracingService")() {
   static {
     this.noop = {
       write: () => {
@@ -215,7 +262,7 @@ var TracingService = class extends Context7.Tag("TracingService")() {
   }
 };
 
-// packages/core/functions/src/services/service-container.ts
+// src/services/service-container.ts
 import { Layer as Layer4 } from "effect";
 var SERVICE_MAPPING = {
   [AiService.key]: "ai",
@@ -224,7 +271,8 @@ var SERVICE_MAPPING = {
   [EventLogger.key]: "eventLogger",
   [FunctionCallService.key]: "functionCallService",
   [QueueService.key]: "queues",
-  [TracingService.key]: "tracing"
+  [TracingService.key]: "tracing",
+  [ToolResolverService.key]: "toolResolver"
 };
 var SERVICE_TAGS = [
   AiService,
@@ -278,7 +326,18 @@ var ServiceContainer = class _ServiceContainer {
     const tracing = Layer4.succeed(TracingService, this._services.tracing ?? TracingService.noop);
     const eventLogger = Layer4.succeed(EventLogger, this._services.eventLogger ?? EventLogger.noop);
     const functionCallService = Layer4.succeed(FunctionCallService, this._services.functionCallService ?? FunctionCallService.mock());
-    return Layer4.mergeAll(ai, credentials, database, queues, tracing, eventLogger, functionCallService);
+    const toolResolver = Layer4.succeed(ToolResolverService, this._services.toolResolver ?? ToolResolverService.notAvailable);
+    return Layer4.mergeAll(
+      //
+      ai,
+      credentials,
+      database,
+      queues,
+      tracing,
+      eventLogger,
+      functionCallService,
+      toolResolver
+    );
   }
 };
 
@@ -293,8 +352,9 @@ export {
   createDefectLogger,
   createEventLogger,
   FunctionCallService,
+  ToolResolverService,
   TracingService,
   SERVICE_TAGS,
   ServiceContainer
 };
-//# sourceMappingURL=chunk-WEFZUEL2.mjs.map
+//# sourceMappingURL=chunk-54U464M4.mjs.map

package/dist/lib/browser/chunk-54U464M4.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/services/ai.ts", "../../../src/services/database.ts", "../../../src/services/queues.ts", "../../../src/services/credentials.ts", "../../../src/services/event-logger.ts", "../../../src/services/function-call-service.ts", "../../../src/services/tool-resolver.ts", "../../../src/services/tracing.ts", "../../../src/services/service-container.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context, Layer } from 'effect';\n\nimport type { AiServiceClient } from '@dxos/ai';\n\n// TODO(burdon): Move to @dxos/ai.\nexport class AiService extends Context.Tag('AiService')<\n  AiService,\n  {\n    readonly client: AiServiceClient;\n  }\n>() {\n  static make = (client: AiServiceClient): Context.Tag.Service<AiService> => {\n    return {\n      get client() {\n        return client;\n      },\n    };\n  };\n\n  static makeLayer = (client: AiServiceClient): Layer.Layer<AiService> =>\n    Layer.succeed(AiService, AiService.make(client));\n\n  static notAvailable = Layer.succeed(AiService, {\n    get client(): AiServiceClient {\n      throw new Error('AiService not available');\n    },\n  });\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context, Effect, Layer } from 'effect';\n\nimport type { Obj, Ref, Relation } from '@dxos/echo';\nimport type { EchoDatabase } from '@dxos/echo-db';\nimport type { DXN } from '@dxos/keys';\n\nexport class DatabaseService extends Context.Tag('DatabaseService')<\n  DatabaseService,\n  {\n    readonly db: EchoDatabase;\n  }\n>() {\n  static notAvailable = Layer.succeed(DatabaseService, {\n    get db(): EchoDatabase {\n      throw new Error('Database not available');\n    },\n  });\n\n  static make = (db: EchoDatabase): Context.Tag.Service<DatabaseService> => {\n    return {\n      get db() {\n        return db;\n      },\n    };\n  };\n\n  static resolve: (dxn: DXN) => Effect.Effect<Obj.Any | Relation.Any, Error, DatabaseService> = Effect.fn(\n    function* (dxn) {\n      const { db } = yield* DatabaseService;\n      return yield* Effect.tryPromise({\n        try: () =>\n          db.graph.createRefResolver({ context: { space: db.spaceId } }).resolve(dxn) as Promise<\n            Obj.Any | Relation.Any\n          >,\n        catch: (error) => error as Error,\n      });\n    },\n  );\n\n  static loadRef: <T>(ref: Ref.Ref<T>) => Effect.Effect<T, Error, never> = Effect.fn(function* (ref) {\n    return yield* Effect.tryPromise({\n      try: () => ref.load(),\n      catch: (error) => error as Error,\n    });\n  });\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context, Layer } from 'effect';\n\nimport type { Queue, QueueAPI, QueueFactory } from '@dxos/echo-db';\n\nexport class QueueService extends Context.Tag('QueueService')<\n  QueueService,\n  {\n    /**\n     * API to access the queues.\n     */\n    readonly queues: QueueAPI;\n\n    /**\n     * The queue that is used to store the context of the current research.\n     */\n    // TODO(dmaretskyi): Is this really part of the queue service?\n    readonly contextQueue: Queue | undefined;\n  }\n>() {\n  static notAvailable = Layer.succeed(QueueService, {\n    queues: {\n      get(dxn) {\n        throw new Error('Queues not available');\n      },\n      create() {\n        throw new Error('Queues not available');\n      },\n    },\n    contextQueue: undefined,\n  });\n\n  static make = (queues: QueueFactory, contextQueue: Queue | undefined): Context.Tag.Service<QueueService> => {\n    return {\n      queues,\n      contextQueue,\n    };\n  };\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context } from 'effect';\n\ntype CredentialQuery = {\n  service?: string;\n};\n\n// TODO(dmaretskyi): Unify with other apis.\n// packages/sdk/schema/src/common/access-token.ts\nexport type ServiceCredential = {\n  service: string;\n\n  // TODO(dmaretskyi): Build out.\n  apiKey?: string;\n};\n\nexport class CredentialsService extends Context.Tag('CredentialsService')<\n  CredentialsService,\n  {\n    /**\n     * Query all.\n     */\n    queryCredentials: (query: CredentialQuery) => Promise<ServiceCredential[]>;\n\n    /**\n     * Get a single credential.\n     * @throws {Error} If no credential is found.\n     */\n    getCredential: (query: CredentialQuery) => Promise<ServiceCredential>;\n  }\n>() {}\n\nexport class ConfiguredCredentialsService implements Context.Tag.Service<CredentialsService> {\n  constructor(private readonly credentials: ServiceCredential[] = []) {}\n\n  addCredentials(credentials: ServiceCredential[]): ConfiguredCredentialsService {\n    this.credentials.push(...credentials);\n    return this;\n  }\n\n  async queryCredentials(query: CredentialQuery): Promise<ServiceCredential[]> {\n    return this.credentials.filter((credential) => credential.service === query.service);\n  }\n\n  async getCredential(query: CredentialQuery): Promise<ServiceCredential> {\n    const credential = this.credentials.find((credential) => credential.service === query.service);\n    if (!credential) {\n      throw new Error(`Credential not found for service: ${query.service}`);\n    }\n    return credential;\n  }\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Effect, Context } from 'effect';\n\nimport { invariant } from '@dxos/invariant';\nimport { log, LogLevel } from '@dxos/log';\n\nexport type ComputeEvent =\n  | {\n      type: 'begin-compute';\n      nodeId: string;\n      inputs: Record<string, any>;\n    }\n  | {\n      type: 'end-compute';\n      nodeId: string;\n      outputs: Record<string, any>;\n    }\n  | {\n      type: 'compute-input';\n      nodeId: string;\n      property: string;\n      value: any;\n    }\n  | {\n      type: 'compute-output';\n      nodeId: string;\n      property: string;\n      value: any;\n    }\n  | {\n      type: 'custom';\n      nodeId: string;\n      event: any;\n    };\n\nexport class EventLogger extends Context.Tag('EventLogger')<\n  EventLogger,\n  { readonly log: (event: ComputeEvent) => void; readonly nodeId: string | undefined }\n>() {\n  static noop: Context.Tag.Service<EventLogger> = {\n    log: () => {},\n    nodeId: undefined,\n  };\n}\n\nexport const logCustomEvent = (data: any) =>\n  Effect.gen(function* () {\n    const logger = yield* EventLogger;\n    if (!logger.nodeId) {\n      throw new Error('logCustomEvent must be called within a node compute function');\n    }\n    logger.log({\n      type: 'custom',\n      nodeId: logger.nodeId,\n      event: data,\n    });\n  });\n\nexport const createDefectLogger = <A, E, R>(): ((self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>) =>\n  Effect.catchAll((error) =>\n    Effect.gen(function* () {\n      log.error('unhandled effect error', { error });\n      throw error;\n    }),\n  );\n\nexport const createEventLogger = (level: LogLevel, message: string = 'event'): Context.Tag.Service<EventLogger> => {\n  const logFunction = (\n    {\n      [LogLevel.WARN]: log.warn,\n      [LogLevel.VERBOSE]: log.verbose,\n      [LogLevel.DEBUG]: log.debug,\n      [LogLevel.INFO]: log.info,\n      [LogLevel.ERROR]: log.error,\n    } as any\n  )[level];\n  invariant(logFunction);\n  return {\n    log: (event: ComputeEvent) => {\n      logFunction(message, event);\n    },\n    nodeId: undefined,\n  };\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context } from 'effect';\n\nimport type { SpaceId } from '@dxos/keys';\n\n/**\n * Allows calling into other functions.\n */\nexport class FunctionCallService extends Context.Tag('FunctionCallService')<\n  FunctionCallService,\n  {\n    callFunction(deployedFunctionId: string, input: any, spaceId?: SpaceId): Promise<any>;\n  }\n>() {\n  static fromClient(baseUrl: string, spaceId: SpaceId): Context.Tag.Service<FunctionCallService> {\n    return {\n      callFunction: async (deployedFunctionId: string, input: any) => {\n        const url = getInvocationUrl(deployedFunctionId, baseUrl, { spaceId });\n        const result = await fetch(url, {\n          method: 'POST',\n          headers: { 'Content-Type': 'application/json' },\n          body: JSON.stringify(input),\n        });\n        if (result.status >= 300 || result.status < 200) {\n          throw new Error('Failed to invoke function', { cause: new Error(`HTTP error: ${await result.text()}`) });\n        }\n        return await result.json();\n      },\n    };\n  }\n\n  static mock = () => {\n    return {\n      callFunction: async (deployedFunctionId: string, input: any) => {\n        return input;\n      },\n    };\n  };\n}\n\n// TODO(dmaretskyi): Reconcile with `getInvocationUrl` in `@dxos/functions/edge`.\nconst getInvocationUrl = (functionUrl: string, edgeUrl: string, options: InvocationOptions = {}) => {\n  const baseUrl = new URL('functions/', edgeUrl);\n\n  // Leading slashes cause the URL to be treated as an absolute path.\n  const relativeUrl = functionUrl.replace(/^\\//, '');\n  const url = new URL(`./${relativeUrl}`, baseUrl.toString());\n  options.spaceId && url.searchParams.set('spaceId', options.spaceId);\n  options.subjectId && url.searchParams.set('subjectId', options.subjectId);\n  url.protocol = isSecure(url.protocol) ? 'https' : 'http';\n  return url.toString();\n};\n\nconst isSecure = (protocol: string) => {\n  return protocol === 'https:' || protocol === 'wss:';\n};\n\ntype InvocationOptions = {\n  spaceId?: SpaceId;\n  subjectId?: string;\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context } from 'effect';\n\nimport { type ToolResolver } from '@dxos/ai';\n\nexport class ToolResolverService extends Context.Tag('ToolResolverService')<\n  ToolResolverService,\n  {\n    /**\n     * Tool resolver.\n     */\n    readonly toolResolver: ToolResolver;\n  }\n>() {\n  static notAvailable: Context.Tag.Service<ToolResolverService> = {\n    toolResolver: {\n      resolve: async (id: string) => {\n        throw new Error('Tool resolver not available');\n      },\n    },\n  };\n\n  static make = (toolResolver: ToolResolver): Context.Tag.Service<ToolResolverService> => {\n    return {\n      toolResolver,\n    };\n  };\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Context } from 'effect';\n\nimport type { AnyEchoObject } from '@dxos/echo-schema';\n\nexport class TracingService extends Context.Tag('TracingService')<\n  TracingService,\n  {\n    /**\n     * Write an event to the tracing queue.\n     * @param event - The event to write. Must be an a typed object.\n     */\n    write(event: AnyEchoObject): void;\n  }\n>() {\n  static noop: Context.Tag.Service<TracingService> = { write: () => {} };\n\n  static console: Context.Tag.Service<TracingService> = {\n    write: (event) => {\n      // eslint-disable-next-line no-console\n      console.log(event);\n    },\n  };\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Layer, type Context } from 'effect';\n\nimport { AiService } from './ai';\nimport { ConfiguredCredentialsService, CredentialsService } from './credentials';\nimport { DatabaseService } from './database';\nimport { EventLogger } from './event-logger';\nimport { FunctionCallService } from './function-call-service';\nimport { QueueService } from './queues';\nimport { ToolResolverService } from './tool-resolver';\nimport { TracingService } from './tracing';\n\n/**\n * List of all service tags and their names.\n */\nexport interface ServiceTagRecord {\n  ai: AiService;\n  credentials: CredentialsService;\n  database: DatabaseService;\n  eventLogger: EventLogger;\n  functionCallService: FunctionCallService;\n  tracing: TracingService;\n  queues: QueueService;\n  toolResolver: ToolResolverService;\n}\n\n/**\n * List of all services and their runtime types.\n */\nexport type ServiceRecord = {\n  [K in keyof ServiceTagRecord]: Context.Tag.Service<ServiceTagRecord[K]>;\n};\n\n/**\n * Union of all services.\n */\nexport type Services = ServiceTagRecord[keyof ServiceTagRecord];\n\nconst SERVICE_MAPPING: Record<string, keyof ServiceRecord> = {\n  [AiService.key]: 'ai',\n  [CredentialsService.key]: 'credentials',\n  [DatabaseService.key]: 'database',\n  [EventLogger.key]: 'eventLogger',\n  [FunctionCallService.key]: 'functionCallService',\n  [QueueService.key]: 'queues',\n  [TracingService.key]: 'tracing',\n  [ToolResolverService.key]: 'toolResolver',\n};\n\nexport const SERVICE_TAGS: Context.Tag<any, any>[] = [\n  AiService,\n  CredentialsService,\n  DatabaseService,\n  EventLogger,\n  FunctionCallService,\n  TracingService,\n  QueueService,\n];\n\nconst DEFAULT_SERVICES: Partial<ServiceRecord> = {\n  tracing: TracingService.noop,\n};\n\nexport class ServiceContainer {\n  private _services: Partial<ServiceRecord> = { ...DEFAULT_SERVICES };\n\n  /**\n   * Set services.\n   * @param services - Services to set.\n   * @returns The container instance.\n   */\n  setServices(services: Partial<ServiceRecord>): this {\n    this._services = { ...this._services, ...services };\n    return this;\n  }\n\n  getService<Id, T>(tag: Context.Tag<Id, T>): T {\n    const serviceKey = SERVICE_MAPPING[tag.key];\n    const service = serviceKey != null ? this._services[serviceKey] : undefined;\n    if (!service) {\n      throw new Error(`Service not available: ${tag.key}`);\n    }\n\n    return service as T;\n  }\n\n  clone(): ServiceContainer {\n    return new ServiceContainer().setServices({ ...this._services });\n  }\n\n  // TODO(dmaretskyi): `getService` is designed to error at runtime if the service is not available, but layer forces us to provide all services and makes stubs for the ones that are not available.\n  createLayer(): Layer.Layer<Services> {\n    const ai = this._services.ai != null ? Layer.succeed(AiService, this._services.ai) : AiService.notAvailable;\n    const credentials = Layer.succeed(CredentialsService, new ConfiguredCredentialsService());\n    const database =\n      this._services.database != null\n        ? Layer.succeed(DatabaseService, this._services.database)\n        : DatabaseService.notAvailable;\n    const queues =\n      this._services.queues != null ? Layer.succeed(QueueService, this._services.queues) : QueueService.notAvailable;\n    const tracing = Layer.succeed(TracingService, this._services.tracing ?? TracingService.noop);\n    const eventLogger = Layer.succeed(EventLogger, this._services.eventLogger ?? EventLogger.noop);\n    const functionCallService = Layer.succeed(\n      FunctionCallService,\n      this._services.functionCallService ?? FunctionCallService.mock(),\n    );\n    const toolResolver = Layer.succeed(\n      ToolResolverService,\n      this._services.toolResolver ?? ToolResolverService.notAvailable,\n    );\n\n    return Layer.mergeAll(\n      //\n      ai,\n      credentials,\n      database,\n      queues,\n      tracing,\n      eventLogger,\n      functionCallService,\n      toolResolver,\n    );\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["Context", "Layer", "AiService", "Context", "Tag", "make", "client", "makeLayer", "Layer", "succeed", "notAvailable", "Error", "Context", "Effect", "Layer", "DatabaseService", "Context", "Tag", "notAvailable", "Layer", "succeed", "db", "Error", "make", "resolve", "Effect", "fn", "dxn", "tryPromise", "try", "graph", "createRefResolver", "context", "space", "spaceId", "catch", "error", "loadRef", "ref", "load", "Context", "Layer", "QueueService", "Context", "Tag", "notAvailable", "Layer", "succeed", "queues", "get", "dxn", "Error", "create", "contextQueue", "undefined", "make", "Context", "CredentialsService", "Context", "Tag", "ConfiguredCredentialsService", "credentials", "addCredentials", "push", "queryCredentials", "query", "filter", "credential", "service", "getCredential", "find", "Error", "Effect", "Context", "invariant", "log", "LogLevel", "EventLogger", "Tag", "noop", "nodeId", "undefined", "logCustomEvent", "data", "gen", "logger", "Error", "type", "event", "createDefectLogger", "catchAll", "error", "createEventLogger", "level", "message", "logFunction", "WARN", "warn", "VERBOSE", "verbose", "DEBUG", "debug", "INFO", "info", "ERROR", "Context", "FunctionCallService", "Context", "Tag", "fromClient", "baseUrl", "spaceId", "callFunction", "deployedFunctionId", "input", "url", "getInvocationUrl", "result", "fetch", "method", "headers", "body", "JSON", "stringify", "status", "Error", "cause", "text", "json", "mock", "functionUrl", "edgeUrl", "options", "URL", "relativeUrl", "replace", "toString", "searchParams", "set", "subjectId", "protocol", "isSecure", "Context", "ToolResolverService", "Context", "Tag", "notAvailable", "toolResolver", "resolve", "id", "Error", "make", "Context", "TracingService", "Context", "Tag", "noop", "write", "console", "event", "log", "Layer", "SERVICE_MAPPING", "AiService", "key", "CredentialsService", "DatabaseService", "EventLogger", "FunctionCallService", "QueueService", "TracingService", "ToolResolverService", "SERVICE_TAGS", "DEFAULT_SERVICES", "tracing", "noop", "ServiceContainer", "_services", "setServices", "services", "getService", "tag", "serviceKey", "service", "undefined", "Error", "clone", "createLayer", "ai", "Layer", "succeed", "notAvailable", "credentials", "ConfiguredCredentialsService", "database", "queues", "eventLogger", "functionCallService", "mock", "toolResolver", "mergeAll"]
+}

package/dist/lib/browser/edge/index.mjs

@@ -1,9 +1,9 @@
-// packages/core/functions/src/edge/functions.ts
+// src/edge/functions.ts
 import { createEdgeIdentity } from "@dxos/client/edge";
 import { EdgeHttpClient } from "@dxos/edge-client";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/edge/functions.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/functions/src/edge/functions.ts";
 var uploadWorkerFunction = async ({ client, version, source, name, functionId, ownerPublicKey }) => {
   const edgeUrl = client.config.values.runtime?.services?.edge?.url;
   invariant(edgeUrl, "Edge is not configured.", {

package/dist/lib/browser/index.mjs

@@ -8,13 +8,14 @@ import {
   QueueService,
   SERVICE_TAGS,
   ServiceContainer,
+  ToolResolverService,
   TracingService,
   createDefectLogger,
   createEventLogger,
   logCustomEvent
-} from "./chunk-WEFZUEL2.mjs";
+} from "./chunk-54U464M4.mjs";
 
-// packages/core/functions/src/handler.ts
+// src/handler.ts
 import { Schema } from "effect";
 var defineFunction = (params) => {
   if (!Schema.isSchema(params.inputSchema)) {
@@ -31,7 +32,7 @@ var defineFunction = (params) => {
   };
 };
 
-// packages/core/functions/src/schema.ts
+// src/schema.ts
 import { Schema as Schema2 } from "effect";
 import { Type } from "@dxos/echo";
 import { JsonSchemaType, LabelAnnotation, Ref } from "@dxos/echo-schema";
@@ -68,14 +69,14 @@ var FunctionType = Schema2.Struct({
   "name"
 ]));
 
-// packages/core/functions/src/trace.ts
+// src/trace.ts
 import { Schema as Schema4 } from "effect";
 import { Type as Type2 } from "@dxos/echo";
 import { Queue } from "@dxos/echo-db";
 import { ObjectId } from "@dxos/echo-schema";
 import { log } from "@dxos/log";
 
-// packages/core/functions/src/types.ts
+// src/types.ts
 import { Schema as Schema3, SchemaAST } from "effect";
 import { Expando, OptionsAnnotationId, TypedObject, Ref as Ref2, RawObject } from "@dxos/echo-schema";
 import { DXN } from "@dxos/keys";
@@ -228,8 +229,8 @@ var FUNCTION_TYPES = [
   FunctionTrigger
 ];
 
-// packages/core/functions/src/trace.ts
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/trace.ts";
+// src/trace.ts
+var __dxlog_file = "/__w/dxos/dxos/packages/core/functions/src/trace.ts";
 var InvocationOutcome = /* @__PURE__ */ function(InvocationOutcome2) {
   InvocationOutcome2["SUCCESS"] = "success";
   InvocationOutcome2["FAILURE"] = "failure";
@@ -375,7 +376,7 @@ var createInvocationSpans = (items) => {
   return result;
 };
 
-// packages/core/functions/src/url.ts
+// src/url.ts
 var FUNCTIONS_META_KEY = "dxos.org/service/function";
 var FUNCTIONS_PRESET_META_KEY = "dxos.org/service/function-preset";
 var isSecure = (protocol) => {
@@ -408,8 +409,9 @@ var getInvocationUrl = (functionUrl, edgeUrl, options = {}) => {
   return url.toString();
 };
 
-// packages/core/functions/src/executor/executor.ts
+// src/executor/executor.ts
 import { Effect, Schema as Schema5 } from "effect";
+import { runAndForwardErrors } from "@dxos/effect";
 var FunctionExecutor = class {
   constructor(_services) {
     this._services = _services;
@@ -428,16 +430,19 @@ var FunctionExecutor = class {
         throw new Error("Not available. Use the ai service instead.");
       }
     };
-    const result = await fnDef.handler({
+    const result = fnDef.handler({
       context,
       data: input
     });
-    const assertOutput = fnDef.outputSchema?.pipe(Schema5.asserts);
-    assertOutput(result);
+    let data;
     if (Effect.isEffect(result)) {
-      return Effect.runPromise(result);
+      data = await result.pipe(Effect.provide(this._services.createLayer()), runAndForwardErrors);
+    } else {
+      data = await result;
     }
-    return result;
+    const assertOutput = fnDef.outputSchema?.pipe(Schema5.asserts);
+    assertOutput(data);
+    return data;
   }
 };
 export {
@@ -466,6 +471,7 @@ export {
   ServiceContainer,
   SubscriptionTriggerOutput,
   TimerTriggerOutput,
+  ToolResolverService,
   TraceEvent,
   TraceEventException,
   TraceEventLog,