@dxos/functions 0.8.4-main.03d5cd7b56 → 0.8.4-main.05e74ebcff

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.8.4-main.03d5cd7b56",
+  "version": "0.8.4-main.05e74ebcff",
   "description": "Functions API.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "info@dxos.org",
   "sideEffects": false,
   "type": "module",
@@ -30,20 +30,20 @@
     "@effect/ai-anthropic": "0.23.0",
     "@effect/platform": "0.94.4",
     "effect": "3.20.0",
-    "@dxos/ai": "0.8.4-main.03d5cd7b56",
-    "@dxos/context": "0.8.4-main.03d5cd7b56",
-    "@dxos/compute": "0.8.4-main.03d5cd7b56",
-    "@dxos/echo": "0.8.4-main.03d5cd7b56",
-    "@dxos/errors": "0.8.4-main.03d5cd7b56",
-    "@dxos/invariant": "0.8.4-main.03d5cd7b56",
-    "@dxos/keys": "0.8.4-main.03d5cd7b56",
-    "@dxos/echo-db": "0.8.4-main.03d5cd7b56",
-    "@dxos/log": "0.8.4-main.03d5cd7b56",
-    "@dxos/node-std": "0.8.4-main.03d5cd7b56",
-    "@dxos/protocols": "0.8.4-main.03d5cd7b56",
-    "@dxos/schema": "0.8.4-main.03d5cd7b56",
-    "@dxos/types": "0.8.4-main.03d5cd7b56",
-    "@dxos/effect": "0.8.4-main.03d5cd7b56"
+    "@dxos/ai": "0.8.4-main.05e74ebcff",
+    "@dxos/compute": "0.8.4-main.05e74ebcff",
+    "@dxos/echo": "0.8.4-main.05e74ebcff",
+    "@dxos/echo-db": "0.8.4-main.05e74ebcff",
+    "@dxos/context": "0.8.4-main.05e74ebcff",
+    "@dxos/errors": "0.8.4-main.05e74ebcff",
+    "@dxos/keys": "0.8.4-main.05e74ebcff",
+    "@dxos/invariant": "0.8.4-main.05e74ebcff",
+    "@dxos/node-std": "0.8.4-main.05e74ebcff",
+    "@dxos/log": "0.8.4-main.05e74ebcff",
+    "@dxos/protocols": "0.8.4-main.05e74ebcff",
+    "@dxos/effect": "0.8.4-main.05e74ebcff",
+    "@dxos/schema": "0.8.4-main.05e74ebcff",
+    "@dxos/types": "0.8.4-main.05e74ebcff"
   },
   "publishConfig": {
     "access": "public"

package/src/protocol/protocol.ts

@@ -12,6 +12,7 @@ import * as SchemaAST from 'effect/SchemaAST';
 import { AiModelResolver, AiService, OpaqueToolkit } from '@dxos/ai';
 import { AnthropicResolver } from '@dxos/ai/resolvers';
 import {
+  Blueprint,
   FunctionError,
   InvalidOperationInputError,
   InvalidOperationOutputError,
@@ -48,6 +49,12 @@ export interface FunctionWrappingOptions {
    * Toolkits to make available via the `OpaqueToolkitProvider`.
    */
   toolkits?: OpaqueToolkit.OpaqueToolkit[];
+
+  /**
+   * Blueprint registry to expose as `Blueprint.RegistryService` inside handler Effects.
+   * Required for operations that declare `Blueprint.RegistryService` in their `services` list.
+   */
+  blueprintRegistry?: Blueprint.Registry;
 }
 
 /**
@@ -121,6 +128,18 @@ export const wrapFunctionHandler = (
           );
         }
 
+        // Flush in-memory ECHO writes before the function scope closes.
+        // Writes performed by `db.add` / `db.remove` are buffered in the in-memory
+        // `EchoDatabaseImpl` and only pushed across the `DataService` binding when
+        // `db.flush({ disk })` is called. `FunctionContext._close` (invoked by the
+        // `await using` above) calls `db.close()` but does NOT flush, so mutations
+        // performed by handlers that declare `Database.Service` (e.g. `object-create`,
+        // `object-update`, `relation-create`) would be silently dropped before reaching
+        // the edge `AutomergeReplicator`. Flushing here closes that hole.
+        if (serviceTags.includes(Database.Service.key) && funcContext.db) {
+          await funcContext.db.flush({ disk: true, indexes: false });
+        }
+
         if (func.output && !SchemaAST.isAnyKeyword(func.output.ast)) {
           try {
             Schema.validateSync(func.output, { onExcessProperty: 'error' })(result);
@@ -223,6 +242,10 @@ class FunctionContext extends Resource {
       types: this.opts.types?.length ?? 0,
     });
 
+    const blueprintRegistryLayer = this.opts.blueprintRegistry
+      ? Layer.succeed(Blueprint.RegistryService, this.opts.blueprintRegistry)
+      : Blueprint.RegistryService.notAvailable;
+
     return Layer.mergeAll(
       dbLayer,
       queuesLayer,
@@ -233,6 +256,7 @@ class FunctionContext extends Resource {
       aiLayer,
       OpaqueToolkit.providerLayer(OpaqueToolkit.merge(...(this.opts.toolkits ?? []))),
       traceWriterLayer,
+      blueprintRegistryLayer,
 
       // `FunctionInvocationService` is deprecated; new code should yield `Operation.Service`.
       // The cloudflare wrapper provides only the unavailable layer to satisfy the (still-present)
@@ -295,6 +319,9 @@ const makeOperationServiceLayer = (
     invariant(op.meta.deployedId, `Operation '${op.meta.key}' has no deployedId; cannot invoke remotely.`);
     const result = await functionsService.invoke(op.meta.deployedId, input, {
       spaceId: options?.spaceId,
+      // Forward the conversation DXN so the remote runtime can rebuild conversation-scoped
+      // services (e.g. `AiContext.Service`) needed by operations like `GetContext`.
+      conversation: options?.conversation,
     });
     if (result._kind === 'success') {
       return { data: result.data };
@@ -345,7 +372,7 @@ const makeOperationRegistryLayer = (
     resolve: (key: string) =>
       Effect.gen(function* () {
         const records = yield* Effect.tryPromise(() => functionsService.query({ spaceId })).pipe(Effect.orDie);
-        const match = (records as Operation.PersistentOperation[]).find((record) => record.key === key);
+        const match = (records as Operation.PersistentOperation[]).find((record) => Operation.getKey(record) === key);
         return match ? Option.some(Operation.deserialize(match)) : Option.none();
       }),
   });

package/src/services/credentials.ts

@@ -11,8 +11,7 @@ import * as Layer from 'effect/Layer';
 import * as Redacted from 'effect/Redacted';
 
 import { Credential } from '@dxos/compute';
-import { Query } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Query } from '@dxos/echo';
 import { AccessToken } from '@dxos/types';
 
 export class ConfiguredCredentialsService implements Context.Tag.Service<Credential.CredentialsService> {

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

@@ -7,6 +7,9 @@ import * as Layer from 'effect/Layer';
 
 import { type FunctionNotFoundError, Operation } from '@dxos/compute';
 
+/**
+ * @deprecated
+ */
 export class FunctionInvocationService extends Context.Tag('@dxos/functions/FunctionInvocationService')<
   FunctionInvocationService,
   {

package/src/services/queues.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export { ContextQueueService, QueueService, feedServiceFromQueueServiceLayer } from '@dxos/echo-db';
+export { QueueService, feedServiceFromQueueServiceLayer } from '@dxos/echo-db';