@dxos/functions 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "Functions API and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -52,45 +52,33 @@
   ],
   "dependencies": {
     "@effect/platform": "0.92.1",
-    "@preact/signals-core": "^1.12.1",
-    "cron": "^3.1.6",
-    "cron-schedule": "^5.0.4",
     "effect": "3.18.3",
     "esbuild-wasm": "^0.16.14",
-    "express": "^4.19.2",
-    "get-port-please": "^3.1.1",
     "i18next": "^24.2.1",
     "iso-did": "^1.6.0",
-    "ws": "^8.14.2",
-    "@dxos/ai": "0.8.4-main.a4bbb77",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/client": "0.8.4-main.a4bbb77",
-    "@dxos/client-protocol": "0.8.4-main.a4bbb77",
-    "@dxos/context": "0.8.4-main.a4bbb77",
-    "@dxos/debug": "0.8.4-main.a4bbb77",
-    "@dxos/crypto": "0.8.4-main.a4bbb77",
-    "@dxos/echo-db": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/echo-pipeline": "0.8.4-main.a4bbb77",
-    "@dxos/echo-protocol": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/edge-client": "0.8.4-main.a4bbb77",
-    "@dxos/effect": "0.8.4-main.a4bbb77",
-    "@dxos/errors": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/keys": "0.8.4-main.a4bbb77",
-    "@dxos/kv-store": "0.8.4-main.a4bbb77",
-    "@dxos/live-object": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/node-std": "0.8.4-main.a4bbb77",
-    "@dxos/protocols": "0.8.4-main.a4bbb77",
-    "@dxos/schema": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77"
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.17",
-    "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.8.4-main.a4bbb77"
+    "@dxos/ai": "0.8.4-main.ae835ea",
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/client": "0.8.4-main.ae835ea",
+    "@dxos/client-protocol": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/crypto": "0.8.4-main.ae835ea",
+    "@dxos/echo-db": "0.8.4-main.ae835ea",
+    "@dxos/debug": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/echo-pipeline": "0.8.4-main.ae835ea",
+    "@dxos/echo-protocol": "0.8.4-main.ae835ea",
+    "@dxos/edge-client": "0.8.4-main.ae835ea",
+    "@dxos/effect": "0.8.4-main.ae835ea",
+    "@dxos/errors": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/kv-store": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/node-std": "0.8.4-main.ae835ea",
+    "@dxos/schema": "0.8.4-main.ae835ea",
+    "@dxos/protocols": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea",
+    "@dxos/keys": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/bundler/bundler.ts

@@ -2,8 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { FetchHttpClient, HttpClient } from '@effect/platform';
-import { Duration, Effect, Schedule, pipe } from 'effect';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as Duration from 'effect/Duration';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Schedule from 'effect/Schedule';
 import { type BuildOptions, type BuildResult, type Loader, type Plugin, build, initialize } from 'esbuild-wasm';
 
 import { subtleCrypto } from '@dxos/crypto';
@@ -277,7 +281,7 @@ const httpPlugin: Plugin = {
         return { contents: text, loader: 'jsx' as Loader };
       }).pipe(
         Effect.retry(
-          pipe(
+          Function.pipe(
             Schedule.exponential(Duration.millis(INITIAL_DELAY)),
             Schedule.jittered,
             Schedule.intersect(Schedule.recurs(MAX_RETRIES - 1)),

package/src/e2e/deploy.test.ts

@@ -0,0 +1,69 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { readFile } from 'node:fs/promises';
+
+import { describe, expect, test } from 'vitest';
+
+import { Client, Config } from '@dxos/client';
+import { createEdgeIdentity } from '@dxos/client/edge';
+import { Bundler } from '@dxos/functions/bundler';
+import { uploadWorkerFunction } from '@dxos/functions/edge';
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
+
+describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('Functions deployment', () => {
+  test('deploys FOREX (effect) function and invokes it via EDGE (main)', { timeout: 120_000 }, async () => {
+    const config = new Config({
+      version: 1,
+      runtime: {
+        services: {
+          edge: { url: 'https://edge-main.dxos.workers.dev' },
+        },
+      },
+    });
+
+    const client = new Client({ config });
+    await client.initialize();
+    await client.halo.createIdentity();
+
+    const space = await client.spaces.create();
+    await space.waitUntilReady();
+
+    // Inline echo function source.
+    const source = await readFile(new URL('../examples/forex-effect.ts', import.meta.url), 'utf-8');
+
+    // Bundle and upload.
+    const bundler = new Bundler({ platform: 'node', sandboxedModules: [], remoteModules: {} });
+    const buildResult = await bundler.bundle({ source });
+    if ('error' in buildResult) {
+      throw buildResult.error ?? new Error('Bundle creation failed');
+    }
+
+    const { functionId } = await uploadWorkerFunction({
+      client,
+      ownerPublicKey: space.key,
+      version: '0.0.1',
+      entryPoint: buildResult.entryPoint,
+      assets: { [buildResult.entryPoint]: buildResult.asset },
+      name: 'e2e-echo',
+    });
+
+    expect(functionId).toBeDefined();
+
+    // Invoke deployed function via EDGE directly.
+    const edgeClient = client.edge;
+    invariant(edgeClient, 'edgeClient is required');
+    edgeClient.setIdentity(createEdgeIdentity(client));
+
+    const input = { from: 'USD', to: 'EUR' };
+    const result = await edgeClient.invokeFunction({ functionId }, input);
+    log.info('>>> result', { result, functionId });
+    const resultNumber = Number(result);
+    expect(resultNumber).toBeGreaterThan(0);
+    expect(resultNumber).toBeLessThan(100);
+
+    await client.destroy();
+  });
+});

package/src/{examples → example}/fib.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { defineFunction } from '../handler';
 

package/src/example/forex-effect.ts

@@ -0,0 +1,40 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// @ts-ignore
+import { S, defineFunction } from 'dxos:functions';
+import {
+  FetchHttpClient,
+  HttpClient,
+  HttpClientRequest,
+  // @ts-ignore
+} from 'https://esm.sh/@effect/platform@0.89.0?deps=effect@3.17.0&bundle=false';
+// @ts-ignore
+import { Effect, Schedule } from 'https://esm.sh/effect@3.17.0?bundle=false';
+
+export default defineFunction({
+  key: 'dxos.org/script/forex-effect',
+  name: 'Forex Effect',
+  description: 'Returns the exchange rate between two currencies.',
+
+  inputSchema: S.Struct({
+    from: S.String.annotations({ description: 'The source currency' }),
+    to: S.String.annotations({ description: 'The target currency' }),
+  }),
+
+  outputSchema: S.String.annotations({ description: 'The exchange rate between the two currencies' }),
+
+  handler: async ({ data: { from, to } }: any) =>
+    Effect.gen(function* () {
+      const res = yield* HttpClientRequest.get(`https://free.ratesdb.com/v1/rates?from=${from}&to=${to}`).pipe(
+        HttpClient.execute,
+        Effect.flatMap((res: any) => res.json),
+        Effect.timeout('1 second'),
+        Effect.retry(Schedule.exponential(1_000).pipe(Schedule.compose(Schedule.recurs(3)))),
+        Effect.scoped,
+      );
+
+      return res.data.rates[to].toString();
+    }).pipe(Effect.provide(FetchHttpClient.layer)),
+});

package/src/example/index.ts

@@ -0,0 +1,13 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { default as fib$ } from './fib';
+import { default as reply$ } from './reply';
+import { default as sleep$ } from './sleep';
+
+export namespace Example {
+  export const fib = fib$;
+  export const reply = reply$;
+  export const sleep = sleep$;
+}

package/src/{examples → example}/reply.ts

@@ -2,7 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Console, Effect, Schema } from 'effect';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { defineFunction } from '../handler';
 

package/src/{examples → example}/sleep.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { defineFunction } from '../handler';
 

package/src/executor/executor.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { type SpaceId } from '@dxos/client/echo';
 import { runAndForwardErrors } from '@dxos/effect';

package/src/handler.ts

@@ -2,17 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Context, Effect, Schema, type Types } from 'effect';
+import type * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { Obj, Type } from '@dxos/echo';
+import { type HasId } from '@dxos/echo/internal';
 import { type EchoDatabase } from '@dxos/echo-db';
-import { type HasId } from '@dxos/echo-schema';
 import { assertArgument } from '@dxos/invariant';
 import { type DXN, type SpaceId } from '@dxos/keys';
 import { type QueryResult } from '@dxos/protocols';
 
-import { FunctionType } from './schema';
 import { type Services } from './services';
+import { Function } from './types';
 import { getUserFunctionIdInMetadata, setUserFunctionIdInMetadata } from './url';
 
 // TODO(burdon): Model after http request. Ref Lambda/OpenFaaS.
@@ -104,23 +106,25 @@ export type FunctionDefinition<T = any, O = any> = {
      * deployedFunctionId:
      * - Backend deployment ID assigned by the EDGE function service (typically a UUID).
      * - Used for remote invocation via `FunctionInvocationService` → `RemoteFunctionExecutionService`.
-     * - Persisted on the corresponding ECHO `FunctionType` object's metadata under the
+     * - Persisted on the corresponding ECHO `Function.Function` object's metadata under the
      *   `FUNCTIONS_META_KEY` and retrieved with `getUserFunctionIdInMetadata`.
      */
     deployedFunctionId?: string;
   };
 };
 
+export type FunctionProps<T, O> = {
+  key: string;
+  name: string;
+  description?: string;
+  inputSchema: Schema.Schema<T, any>;
+  outputSchema?: Schema.Schema<O, any>;
+  handler: FunctionHandler<T, O>;
+};
+
 // TODO(dmaretskyi): Output type doesn't get typechecked.
 export const defineFunction: {
-  <I, O>(params: {
-    key: string;
-    name: string;
-    description?: string;
-    inputSchema: Schema.Schema<I, any>;
-    outputSchema?: Schema.Schema<O, any>;
-    handler: Types.NoInfer<FunctionHandler<I, O>>;
-  }): FunctionDefinition<I, O>;
+  <I, O>(params: FunctionProps<I, O>): FunctionDefinition<I, O>;
 } = ({ key, name, description, inputSchema, outputSchema = Schema.Any, handler }) => {
   if (!Schema.isSchema(inputSchema)) {
     throw new Error('Input schema must be a valid schema');
@@ -166,7 +170,7 @@ export const defineFunction: {
     inputSchema,
     outputSchema,
     handler: handlerWithSpan,
-  };
+  } satisfies FunctionDefinition.Any;
 };
 
 export const FunctionDefinition = {
@@ -174,12 +178,12 @@ export const FunctionDefinition = {
   isFunction: (value: unknown): value is FunctionDefinition.Any => {
     return typeof value === 'object' && value !== null && Symbol.for('@dxos/functions/FunctionDefinition') in value;
   },
-  serialize: (functionDef: FunctionDefinition.Any): FunctionType => {
+  serialize: (functionDef: FunctionDefinition.Any): Function.Function => {
     assertArgument(FunctionDefinition.isFunction(functionDef), 'functionDef');
     return serializeFunction(functionDef);
   },
-  deserialize: (functionObj: FunctionType): FunctionDefinition.Any => {
-    assertArgument(Obj.instanceOf(FunctionType, functionObj), 'functionObj');
+  deserialize: (functionObj: Function.Function): FunctionDefinition.Any => {
+    assertArgument(Obj.instanceOf(Function.Function, functionObj), 'functionObj');
     return deserializeFunction(functionObj);
   },
 };
@@ -189,8 +193,8 @@ export declare namespace FunctionDefinition {
   export type Output<T extends FunctionDefinition> = T extends FunctionDefinition<any, infer O> ? O : never;
 }
 
-export const serializeFunction = (functionDef: FunctionDefinition<any, any>): FunctionType => {
-  const fn = Obj.make(FunctionType, {
+export const serializeFunction = (functionDef: FunctionDefinition<any, any>): Function.Function => {
+  const fn = Function.make({
     key: functionDef.key,
     name: functionDef.name,
     version: '0.1.0',
@@ -204,7 +208,7 @@ export const serializeFunction = (functionDef: FunctionDefinition<any, any>): Fu
   return fn;
 };
 
-export const deserializeFunction = (functionObj: FunctionType): FunctionDefinition<unknown, unknown> => {
+export const deserializeFunction = (functionObj: Function.Function): FunctionDefinition<unknown, unknown> => {
   return {
     [typeId]: true,
     // TODO(dmaretskyi): Fix key.

package/src/index.ts

@@ -3,12 +3,11 @@
 //
 
 export * from './errors';
+export * from './example';
+export * from './executor';
 export * from './handler';
-export * from './schema';
+export * from './services';
 export * from './trace';
+export * from './triggers';
 export * from './types';
 export * from './url';
-export * from './triggers';
-export * from './services';
-export * from './executor';
-export * as exampleFunctions from './examples';

package/src/services/credentials.ts

@@ -2,8 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { HttpClient, HttpClientRequest } from '@effect/platform';
-import { type Config, Context, Effect, Layer, Redacted } from 'effect';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as HttpClientRequest from '@effect/platform/HttpClientRequest';
+import type * as Config from 'effect/Config';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Redacted from 'effect/Redacted';
 
 import { Query } from '@dxos/echo';
 import { DataType } from '@dxos/schema';

package/src/services/database.ts

@@ -2,7 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, Layer, Option, type Schema } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Option from 'effect/Option';
+import type * as Schema from 'effect/Schema';
 
 import {
   type Filter,
@@ -14,9 +18,9 @@ import {
   type Relation,
   type Type,
 } from '@dxos/echo';
+import type { EchoSchema } from '@dxos/echo/internal';
 import type { EchoDatabase, FlushOptions, OneShotQueryResult, QueryResult, SchemaRegistryQuery } from '@dxos/echo-db';
 import type { SchemaRegistryPreparedQuery } from '@dxos/echo-db';
-import type { EchoSchema } from '@dxos/echo-schema';
 import { promiseWithCauseCapture } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import type { DXN } from '@dxos/keys';

package/src/services/event-logger.ts

@@ -2,7 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, Layer, Schema } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Schema from 'effect/Schema';
 
 import { Obj, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';

package/src/services/function-invocation-service.test.ts

@@ -3,7 +3,9 @@
 //
 
 import { describe, expect, it } from '@effect/vitest';
-import { Effect, Layer, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
 

package/src/services/function-invocation-service.ts

@@ -1,7 +1,9 @@
 //
 // Copyright 2025 DXOS.org
 //
-import { Context, Effect, Layer } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
 
 import { AiService } from '@dxos/ai';
 
@@ -51,7 +53,7 @@ export class FunctionInvocationService extends Context.Tag('@dxos/functions/Func
   static layerTest = ({
     functions = [],
   }: {
-    functions?: FunctionDefinition<any, any>[];
+    functions?: readonly FunctionDefinition<any, any>[];
   } = {}): Layer.Layer<
     FunctionInvocationService,
     never,
@@ -71,7 +73,7 @@ export class FunctionInvocationService extends Context.Tag('@dxos/functions/Func
   static layerTestMocked = ({
     functions,
   }: {
-    functions: FunctionDefinition<any, any>[];
+    functions?: readonly FunctionDefinition<any, any>[];
   }): Layer.Layer<FunctionInvocationService> =>
     FunctionInvocationService.layerTest({ functions }).pipe(
       Layer.provide(AiService.notAvailable),

package/src/services/local-function-execution.ts

@@ -2,7 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, Layer, Schema } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
 import { todo } from '@dxos/debug';
@@ -16,7 +19,7 @@ import { DatabaseService } from './database';
 import { type ComputeEventLogger } from './event-logger';
 import { QueueService } from './queues';
 import { RemoteFunctionExecutionService } from './remote-function-execution-service';
-import type { Services } from './service-container';
+import { type Services } from './service-container';
 import { type TracingService } from './tracing';
 
 /**
@@ -76,7 +79,7 @@ const invokeFunction = (
   input: any,
 ): Effect.Effect<unknown, never, Services> =>
   Effect.gen(function* () {
-    // Assert input matches schema
+    // Assert input matches schema.
     try {
       const assertInput = functionDef.inputSchema.pipe(Schema.asserts);
       (assertInput as any)(input);
@@ -92,7 +95,7 @@ const invokeFunction = (
       },
     };
 
-    log.info('Invoking function', { name: functionDef.name, input });
+    log.info('invoking function', { name: functionDef.name, input });
 
     // TODO(dmaretskyi): This should be delegated to a function invoker service.
     const data = yield* Effect.gen(function* () {
@@ -116,9 +119,9 @@ const invokeFunction = (
       ),
     );
 
-    log.info('Function completed', { name: functionDef.name, input, data });
+    log.info('completed', { function: functionDef.name, input, data });
 
-    // Assert output matches schema
+    // Assert output matches schema.
     try {
       const assertOutput = functionDef.outputSchema?.pipe(Schema.asserts);
       (assertOutput as any)(data);
@@ -137,7 +140,7 @@ export class FunctionImplementationResolver extends Context.Tag('@dxos/functions
     ): Effect.Effect<FunctionDefinition<I, O>, FunctionNotFoundError>;
   }
 >() {
-  static layerTest = ({ functions }: { functions: FunctionDefinition<any, any>[] }) =>
+  static layerTest = ({ functions }: { functions: readonly FunctionDefinition<any, any>[] }) =>
     Layer.succeed(FunctionImplementationResolver, {
       resolveFunctionImplementation: <I, O>(functionDef: FunctionDefinition<I, O>) => {
         const resolved = functions.find((f) => f.key === functionDef.key);

package/src/services/queues.ts

@@ -2,7 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, Layer } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
 
 import type { Obj, Relation } from '@dxos/echo';
 import type { Queue, QueueAPI, QueueFactory } from '@dxos/echo-db';

package/src/services/remote-function-execution-service.ts

@@ -2,7 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, Layer } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
 
 import type { SpaceId } from '@dxos/keys';
 

package/src/services/service-container.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Context, Layer } from 'effect';
+import type * as Context from 'effect/Context';
+import * as Layer from 'effect/Layer';
 
 import { AiService } from '@dxos/ai';
 import { entries } from '@dxos/util';

package/src/services/service-registry.test.ts

@@ -3,7 +3,10 @@
 //
 
 import { describe, it } from '@effect/vitest';
-import { Context, Effect, Layer, Option } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Option from 'effect/Option';
 
 import { ServiceRegistry } from './service-registry';
 

package/src/services/service-registry.ts

@@ -2,7 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, type Option, flow } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import type * as Option from 'effect/Option';
 
 import { ServiceNotAvailableError } from '../errors';
 
@@ -40,7 +43,8 @@ export class ServiceRegistry extends Context.Tag('@dxos/functions/ServiceRegistr
       E | ServiceNotAvailableError,
       Exclude<R, { [K in keyof Tags]: Context.Tag.Identifier<Tags[K]> }[number]> | ServiceRegistry
     >;
-  } = (...tags) => (flow as any)(...tags.map((tag) => Effect.provideServiceEffect(tag, ServiceRegistry.resolve(tag))));
+  } = (...tags) =>
+    (Function.flow as any)(...tags.map((tag) => Effect.provideServiceEffect(tag, ServiceRegistry.resolve(tag))));
 
   static provideOrDie: {
     <Tags extends [Context.Tag<any, any>, ...Context.Tag<any, any>[]]>(
@@ -53,7 +57,7 @@ export class ServiceRegistry extends Context.Tag('@dxos/functions/ServiceRegistr
       Exclude<R, { [K in keyof Tags]: Context.Tag.Identifier<Tags[K]> }[number]> | ServiceRegistry
     >;
   } = (...tags) =>
-    (flow as any)(
+    (Function.flow as any)(
       ...tags.map((tag) => Effect.provideServiceEffect(tag, ServiceRegistry.resolve(tag).pipe(Effect.orDie))),
     );
 }

package/src/services/tracing.ts

@@ -2,12 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Context, Effect, Layer } from 'effect';
+import * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
 
 import { AgentStatus } from '@dxos/ai';
 import { Obj } from '@dxos/echo';
+import type { ObjectId } from '@dxos/echo/internal';
 import type { Queue } from '@dxos/echo-db';
-import type { ObjectId } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 import { DataType } from '@dxos/schema';