@dxos/functions 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.8.4-main.69d29f4",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "Functions API.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,8 +16,7 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -27,23 +26,23 @@
     "src"
   ],
   "dependencies": {
-    "@effect/ai-anthropic": "0.22.0",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
-    "@dxos/ai": "0.8.4-main.69d29f4",
-    "@dxos/echo": "0.8.4-main.69d29f4",
-    "@dxos/context": "0.8.4-main.69d29f4",
-    "@dxos/errors": "0.8.4-main.69d29f4",
-    "@dxos/echo-db": "0.8.4-main.69d29f4",
-    "@dxos/effect": "0.8.4-main.69d29f4",
-    "@dxos/keys": "0.8.4-main.69d29f4",
-    "@dxos/log": "0.8.4-main.69d29f4",
-    "@dxos/invariant": "0.8.4-main.69d29f4",
-    "@dxos/node-std": "0.8.4-main.69d29f4",
-    "@dxos/operation": "0.8.4-main.69d29f4",
-    "@dxos/schema": "0.8.4-main.69d29f4",
-    "@dxos/protocols": "0.8.4-main.69d29f4",
-    "@dxos/types": "0.8.4-main.69d29f4"
+    "@effect/ai-anthropic": "0.23.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
+    "@dxos/ai": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-db": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7",
+    "@dxos/keys": "0.8.4-main.6fa680abb7",
+    "@dxos/errors": "0.8.4-main.6fa680abb7",
+    "@dxos/context": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/node-std": "0.8.4-main.6fa680abb7",
+    "@dxos/operation": "0.8.4-main.6fa680abb7",
+    "@dxos/protocols": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/types": "0.8.4-main.6fa680abb7"
   },
   "publishConfig": {
     "access": "public"

package/src/example/forex-effect.ts

@@ -14,7 +14,7 @@ import {
 import { Effect, Schedule } from 'https://esm.sh/effect@3.17.0?bundle=false';
 
 export default defineFunction({
-  key: 'dxos.org/script/forex-effect',
+  key: 'org.dxos.script.forex-effect',
   name: 'Forex Effect',
   description: 'Returns the exchange rate between two currencies.',
 

package/src/example/index.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { default as fib$ } from './fib';
-import { default as reply$ } from './reply';
-import { default as sleep$ } from './sleep';
+import Fibonacci from './fib';
+import Reply from './reply';
+import Sleep from './sleep';
 
-export namespace Example {
-  export const fib = fib$;
-  export const reply = reply$;
-  export const sleep = sleep$;
-}
+export const ExampleFunctions = {
+  Fibonacci,
+  Reply,
+  Sleep,
+};

package/src/protocol/protocol.ts

@@ -11,9 +11,9 @@ import * as SchemaAST from 'effect/SchemaAST';
 import { AiModelResolver, AiService } from '@dxos/ai';
 import { AnthropicResolver } from '@dxos/ai/resolvers';
 import { LifecycleState, Resource } from '@dxos/context';
-import { Database, Ref, Type } from '@dxos/echo';
+import { Database, Feed, JsonSchema, Ref, type Type } from '@dxos/echo';
 import { refFromEncodedReference } from '@dxos/echo/internal';
-import { EchoClient, type EchoDatabaseImpl, type QueueFactory } from '@dxos/echo-db';
+import { EchoClient, type EchoDatabaseImpl, type QueueFactory, createFeedServiceLayer } from '@dxos/echo-db';
 import { runAndForwardErrors } from '@dxos/effect';
 import { assertState, failedInvariant, invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -38,13 +38,15 @@ export const wrapFunctionHandler = (func: FunctionDefinition): FunctionProtocol.
       key: func.key,
       name: func.name,
       description: func.description,
-      inputSchema: Type.toJsonSchema(func.inputSchema),
-      outputSchema: func.outputSchema === undefined ? undefined : Type.toJsonSchema(func.outputSchema),
+      inputSchema: JsonSchema.toJsonSchema(func.inputSchema),
+      outputSchema: func.outputSchema === undefined ? undefined : JsonSchema.toJsonSchema(func.outputSchema),
       services: func.services,
     },
     handler: async ({ data, context }) => {
       if (
-        (func.services.includes(Database.Service.key) || func.services.includes(QueueService.key)) &&
+        (func.services.includes(Database.Service.key) ||
+          func.services.includes(QueueService.key) ||
+          func.services.includes(Feed.Service.key)) &&
         (!context.services.dataService || !context.services.queryService)
       ) {
         throw new FunctionError({
@@ -66,7 +68,7 @@ export const wrapFunctionHandler = (func: FunctionDefinition): FunctionProtocol.
 
         if (func.types.length > 0) {
           invariant(funcContext.db, 'Database is required for functions with types');
-          await funcContext.db.graph.schemaRegistry.register(func.types as Type.Entity.Any[]);
+          await funcContext.db.graph.schemaRegistry.register(func.types as Type.AnyEntity[]);
         }
 
         const dataWithDecodedRefs =
@@ -149,8 +151,9 @@ class FunctionContext extends Resource {
   createLayer(): Layer.Layer<FunctionServices> {
     assertState(this._lifecycleState === LifecycleState.OPEN, 'FunctionContext is not open');
 
-    const dbLayer = this.db ? Database.Service.layer(this.db) : Database.Service.notAvailable;
+    const dbLayer = this.db ? Database.layer(this.db) : Database.notAvailable;
     const queuesLayer = this.queues ? QueueService.layer(this.queues) : QueueService.notAvailable;
+    const feedLayer = this.queues ? createFeedServiceLayer(this.queues) : Feed.notAvailable;
     const credentials = dbLayer
       ? CredentialsService.layerFromDatabase({ caching: true }).pipe(Layer.provide(dbLayer))
       : CredentialsService.configuredLayer([]);
@@ -172,14 +175,7 @@ class FunctionContext extends Resource {
         )
       : AiService.notAvailable;
 
-    return Layer.mergeAll(
-      dbLayer, //
-      queuesLayer,
-      credentials,
-      functionInvocationService,
-      aiLayer,
-      tracing,
-    );
+    return Layer.mergeAll(dbLayer, queuesLayer, feedLayer, credentials, functionInvocationService, aiLayer, tracing);
   }
 }
 

package/src/sdk.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
 import { type AiService } from '@dxos/ai';
-import { Obj, Type } from '@dxos/echo';
+import { type Feed, JsonSchema, Obj, type Type } from '@dxos/echo';
 import { type Database } from '@dxos/echo';
 import { assertArgument, failedInvariant } from '@dxos/invariant';
 import { Operation } from '@dxos/operation';
@@ -39,7 +39,9 @@ export type FunctionServices =
   | AiService.AiService
   | CredentialsService
   | Database.Service
+  // TODO(wittjosiah): Remove QueueService — use Feed.Service instead.
   | QueueService
+  | Feed.Service
   | FunctionInvocationService;
 
 /**
@@ -68,26 +70,29 @@ export interface FunctionContext {
 
 const typeId = Symbol.for('@dxos/functions/FunctionDefinition');
 
-export type FunctionDefinition<T = any, O = any, S extends FunctionServices = FunctionServices> = {
+/**
+ * Deployable function definition.
+ */
+export type FunctionDefinition<TInput = any, TOutput = any, S extends FunctionServices = FunctionServices> = {
   [typeId]: true;
+
   key: string;
   name: string;
   description?: string;
-  inputSchema: Schema.Schema<T, any>;
-  outputSchema?: Schema.Schema<O, any>;
+  inputSchema: Schema.Schema<TInput, any>;
+  outputSchema?: Schema.Schema<TOutput, any>;
 
   /**
    * List of types the function uses.
    * This is used to ensure that the types are available when the function is executed.
    */
-  types: readonly Type.Entity.Any[];
+  types: readonly Type.AnyEntity[];
 
   /**
    * Keys of the required services.
    */
   services: readonly string[];
 
-  handler: FunctionHandler<T, O, S>;
   meta?: {
     /**
      * Tools that are projected from functions have this annotation.
@@ -100,6 +105,8 @@ export type FunctionDefinition<T = any, O = any, S extends FunctionServices = Fu
      */
     deployedFunctionId?: string;
   };
+
+  handler: FunctionHandler<TInput, TOutput, S>;
 };
 
 export declare namespace FunctionDefinition {
@@ -120,7 +127,8 @@ export type FunctionProps<T, O> = {
    * List of types the function uses.
    * This is used to ensure that the types are available when the function is executed.
    */
-  types?: readonly Type.Entity.Any[];
+  types?: readonly Type.AnyEntity[];
+
   // TODO(dmaretskyi): This currently doesn't cause a compile-time error if the handler requests a service that is not specified
   services?: readonly Context.Tag<any, any>[];
 
@@ -177,7 +185,7 @@ export const defineFunction: {
     handler: handlerWithSpan,
     types: types ?? [],
     services: !services ? [] : getServiceKeys(services),
-  } satisfies FunctionDefinition.Any;
+  };
 };
 
 const getServiceKeys = (services: readonly Context.Tag<any, any>[]) => {
@@ -259,8 +267,8 @@ export const serializeFunction = (functionDef: FunctionDefinition.Any): Function
     name: functionDef.name,
     version: '0.1.0',
     description: functionDef.description,
-    inputSchema: Type.toJsonSchema(functionDef.inputSchema),
-    outputSchema: !functionDef.outputSchema ? undefined : Type.toJsonSchema(functionDef.outputSchema),
+    inputSchema: JsonSchema.toJsonSchema(functionDef.inputSchema),
+    outputSchema: !functionDef.outputSchema ? undefined : JsonSchema.toJsonSchema(functionDef.outputSchema),
     services: functionDef.services,
   });
   if (functionDef.meta?.deployedFunctionId) {
@@ -276,8 +284,8 @@ export const deserializeFunction = (functionObj: Function.Function): FunctionDef
     key: functionObj.key ?? functionObj.name,
     name: functionObj.name,
     description: functionObj.description,
-    inputSchema: !functionObj.inputSchema ? Schema.Unknown : Type.toEffectSchema(functionObj.inputSchema),
-    outputSchema: !functionObj.outputSchema ? undefined : Type.toEffectSchema(functionObj.outputSchema),
+    inputSchema: !functionObj.inputSchema ? Schema.Unknown : JsonSchema.toEffectSchema(functionObj.inputSchema),
+    outputSchema: !functionObj.outputSchema ? undefined : JsonSchema.toEffectSchema(functionObj.outputSchema),
     // TODO(dmaretskyi): This should throw error.
     handler: () => {},
     services: functionObj.services ?? [],

package/src/services/event-logger.ts

@@ -52,7 +52,7 @@ export type ComputeEventPayload = Schema.Schema.Type<typeof ComputeEventPayload>
 
 export const ComputeEvent = Schema.Struct({
   payload: ComputeEventPayload,
-}).pipe(Type.object({ typename: 'dxos.org/type/ComputeEvent', version: '0.1.0' }));
+}).pipe(Type.object({ typename: 'org.dxos.type.compute-event', version: '0.1.0' }));
 
 /**
  * Logs event for the compute workflows.

package/src/types/Function.ts

@@ -4,7 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Annotation, JsonSchema, Obj, Type } from '@dxos/echo';
+import { Annotation, JsonSchema, Obj, Ref, Type } from '@dxos/echo';
 import { SystemTypeAnnotation } from '@dxos/echo/internal';
 
 import { Script } from './Script';
@@ -36,7 +36,7 @@ export const Function = Schema.Struct({
 
   // Reference to a source script if it exists within ECHO.
   // TODO(burdon): Don't ref ScriptType directly (core).
-  source: Schema.optional(Type.Ref(Script)),
+  source: Schema.optional(Ref.Ref(Script)),
 
   inputSchema: Schema.optional(JsonSchema.JsonSchema),
   outputSchema: Schema.optional(JsonSchema.JsonSchema),
@@ -51,10 +51,11 @@ export const Function = Schema.Struct({
   binding: Schema.optional(Schema.String),
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/Function',
+    typename: 'org.dxos.type.function',
     version: '0.1.0',
   }),
   Annotation.LabelAnnotation.set(['name']),
+  Annotation.IconAnnotation.set({ icon: 'ph--function--regular', hue: 'blue' }),
   SystemTypeAnnotation.set(true),
 );
 

package/src/types/Script.ts

@@ -17,10 +17,10 @@ export const Script = Schema.Struct({
   // TODO(burdon): Change to hash of deployed content.
   // Whether source has changed since last deploy.
   changed: Schema.Boolean.pipe(FormInputAnnotation.set(false), Schema.optional),
-  source: Type.Ref(Text.Text).pipe(FormInputAnnotation.set(false)),
+  source: Ref.Ref(Text.Text).pipe(FormInputAnnotation.set(false)),
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/Script',
+    typename: 'org.dxos.type.script',
     version: '0.1.0',
   }),
   Annotation.LabelAnnotation.set(['name']),

package/src/types/Trigger.ts

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
-import { Obj, QueryAST, Type } from '@dxos/echo';
+import { Annotation, Obj, QueryAST, Ref, Type } from '@dxos/echo';
 import { OptionsAnnotationId, SystemTypeAnnotation } from '@dxos/echo/internal';
 import { DXN } from '@dxos/keys';
 import { Expando } from '@dxos/schema';
@@ -25,6 +25,7 @@ export const EmailSpec = Schema.Struct({
 });
 export type EmailSpec = Schema.Schema.Type<typeof EmailSpec>;
 
+// TODO(wittjosiah): Remove. Migrate to Subscription triggers once EDGE supports them for feed queries.
 export const QueueSpec = Schema.Struct({
   kind: Schema.Literal('queue').annotations(kindLiteralAnnotations),
 
@@ -102,7 +103,7 @@ const TriggerSchema = Schema.Struct({
    * Function or workflow to invoke.
    */
   // TODO(dmaretskyi): Can be a Ref(FunctionType) or Ref(ComputeGraphType).
-  function: Schema.optional(Type.Ref(Expando.Expando).annotations({ title: 'Function' })),
+  function: Schema.optional(Ref.Ref(Expando.Expando).annotations({ title: 'Function' })),
 
   /**
    * Only used for workflowSchema.
@@ -117,6 +118,15 @@ const TriggerSchema = Schema.Struct({
 
   spec: Schema.optional(Spec),
 
+  concurrency: Schema.optional(
+    Schema.Number.annotations({
+      title: 'Concurrency',
+      default: 1,
+      description:
+        'Maximum number of concurrent invocations of the trigger. For queue triggers, this will process queue items in parallel.',
+    }),
+  ),
+
   /**
    * Passed as the input data to the function.
    * Must match the function's input schema.
@@ -131,9 +141,10 @@ const TriggerSchema = Schema.Struct({
   input: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/Trigger',
+    typename: 'org.dxos.type.trigger',
     version: '0.1.0',
   }),
+  Annotation.IconAnnotation.set({ icon: 'ph--lightning--regular', hue: 'yellow' }),
   SystemTypeAnnotation.set(true),
 );
 

package/src/types/TriggerEvent.ts

@@ -4,7 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { DXN, Type } from '@dxos/echo';
+import { DXN, Obj, Ref } from '@dxos/echo';
 
 // TODO(wittjosiah): Review this type.
 //   - Should be discriminated union.
@@ -38,7 +38,7 @@ export const SubscriptionEvent = Schema.Struct({
   /**
    * Reference to the object that was changed or created.
    */
-  subject: Type.Ref(Type.Obj),
+  subject: Ref.Ref(Obj.Unknown),
 
   /**
    * @deprecated

package/src/types/url.ts

@@ -5,9 +5,9 @@
 import { type Obj } from '@dxos/echo';
 
 // TODO: use URL scheme for source?
-export const FUNCTIONS_META_KEY = 'dxos.org/service/function';
+export const FUNCTIONS_META_KEY = 'org.dxos.service.function';
 
-export const FUNCTIONS_PRESET_META_KEY = 'dxos.org/service/function-preset';
+export const FUNCTIONS_PRESET_META_KEY = 'org.dxos.service.function-preset';
 
 /**
  * NOTE: functionId is backend ID, not ECHO object id.