@dxos/functions-testing 0.8.4-main.fcc0d83b33 → 0.8.4-staging.60fe92afc8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-testing",
-  "version": "0.8.4-main.fcc0d83b33",
+  "version": "0.8.4-staging.60fe92afc8",
   "description": "Functions tests",
   "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": true,
   "type": "module",
@@ -30,19 +30,24 @@
     "src"
   ],
   "dependencies": {
-    "@effect/platform": "0.94.4",
-    "@dxos/client": "0.8.4-main.fcc0d83b33",
-    "@dxos/async": "0.8.4-main.fcc0d83b33",
-    "@dxos/echo": "0.8.4-main.fcc0d83b33",
-    "@dxos/functions": "0.8.4-main.fcc0d83b33",
-    "@dxos/context": "0.8.4-main.fcc0d83b33",
-    "@dxos/functions-runtime": "0.8.4-main.fcc0d83b33",
-    "@dxos/config": "0.8.4-main.fcc0d83b33",
-    "@dxos/functions-runtime-cloudflare": "0.8.4-main.fcc0d83b33",
-    "@dxos/invariant": "0.8.4-main.fcc0d83b33",
-    "@dxos/operation": "0.8.4-main.fcc0d83b33",
-    "@dxos/protocols": "0.8.4-main.fcc0d83b33",
-    "@dxos/log": "0.8.4-main.fcc0d83b33"
+    "@effect/platform": "0.96.1",
+    "@dxos/assistant-toolkit": "0.8.4-staging.60fe92afc8",
+    "@dxos/async": "0.8.4-staging.60fe92afc8",
+    "@dxos/client": "0.8.4-staging.60fe92afc8",
+    "@dxos/context": "0.8.4-staging.60fe92afc8",
+    "@dxos/functions": "0.8.4-staging.60fe92afc8",
+    "@dxos/echo": "0.8.4-staging.60fe92afc8",
+    "@dxos/functions-runtime": "0.8.4-staging.60fe92afc8",
+    "@dxos/config": "0.8.4-staging.60fe92afc8",
+    "@dxos/functions-runtime-cloudflare": "0.8.4-staging.60fe92afc8",
+    "@dxos/invariant": "0.8.4-staging.60fe92afc8",
+    "@dxos/keys": "0.8.4-staging.60fe92afc8",
+    "@dxos/operation": "0.8.4-staging.60fe92afc8",
+    "@dxos/log": "0.8.4-staging.60fe92afc8",
+    "@dxos/schema": "0.8.4-staging.60fe92afc8",
+    "@dxos/compute": "0.8.4-staging.60fe92afc8",
+    "@dxos/protocols": "0.8.4-staging.60fe92afc8",
+    "@dxos/util": "0.8.4-staging.60fe92afc8"
   },
   "publishConfig": {
     "access": "public"

package/src/cpu-limit.test.ts

@@ -4,10 +4,10 @@
 
 import { describe, test } from 'vitest';
 
+import { Trigger } from '@dxos/compute';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { Obj, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { FunctionRuntimeKind } from '@dxos/protocols';
 
 import { deployFunction, observeInvocations, setup, sync } from './testing';
@@ -117,7 +117,7 @@ describe('CPU limit', { tags: ['functions-e2e'] }, () => {
     await observeInvocations(space, 100);
   });
 
-  test.only('break CPU limit through natural exection', { timeout: 520_000 }, async ({ expect }) => {
+  test('break CPU limit through natural exection', { timeout: 520_000 }, async ({ expect }) => {
     const { client, space, functionsServiceClient } = await setup(config);
     const func = await deployFunction(
       space,

package/src/edge-routine.test.ts

@@ -0,0 +1,110 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import { describe, test } from 'vitest';
+
+import { AgentPrompt, DatabaseBlueprint, Chat } from '@dxos/assistant-toolkit';
+import { Client } from '@dxos/client';
+import { Blueprint, Operation, Routine, Trigger } from '@dxos/compute';
+import { configPreset } from '@dxos/config';
+import { Context } from '@dxos/context';
+import { Feed, Obj, Ref, Type } from '@dxos/echo';
+import { TestSchema } from '@dxos/echo/testing';
+import { dbg, log } from '@dxos/log';
+import { ErrorCodec } from '@dxos/protocols';
+import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { Text } from '@dxos/schema';
+import { trim } from '@dxos/util';
+
+import { sync } from './testing';
+
+/**
+ * Cron trigger on EDGE runs {@link AgentPrompt} for a {@link Routine} that uses the Database
+ * blueprint Query tool against replicated ECHO documents.
+ *
+ * Prereq: local EDGE (`configPreset({ edge: 'local' })` → `http://localhost:8787`) with LLM
+ * available (API key and/or memo replay under `conversationsCache/`).
+ */
+describe('Edge routine', { tags: ['functions-e2e'] }, () => {
+  const config = configPreset({ edge: 'local' });
+
+  test('timer trigger runs routine with database blueprint on edge', { timeout: 420_000 }, async ({ expect }) => {
+    await using client = await new Client({
+      config,
+      types: [
+        Operation.PersistentOperation,
+        Trigger.Trigger,
+        Routine.Routine,
+        Blueprint.Blueprint,
+        Feed.Feed,
+        Text.Text,
+        Chat.Chat,
+        TestSchema.Organization,
+      ],
+    }).initialize();
+
+    await client.halo.createIdentity();
+    const space = await client.spaces.create();
+    await space.waitUntilReady();
+
+    await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
+
+    Obj.update(space.properties, (properties) => {
+      properties.computeEnvironment = 'edge';
+    });
+
+    space.db.add(Obj.make(TestSchema.Organization, { name: 'Acme Corp' }));
+    space.db.add(Obj.make(TestSchema.Organization, { name: 'Globex Industries' }));
+    space.db.add(Obj.make(TestSchema.Organization, { name: 'Initech' }));
+
+    const databaseBlueprint = space.db.add(DatabaseBlueprint.make());
+
+    const routine = space.db.add(
+      Routine.make({
+        name: 'edge-e2e-count-orgs-db-blueprint',
+        instructions: trim`
+              You have access to the Database blueprint tools.
+              Use the Query tool exactly once with typename "${Type.getTypename(TestSchema.Organization)}" and no other arguments.
+              Then call completeJob with the output object { "count": <number of rows returned by Query> }.
+              If you are unable to query -- fail.
+              Do not list schemas first.
+            `,
+        input: Schema.Struct({}),
+        output: Schema.Struct({
+          count: Schema.Number,
+        }),
+        blueprints: [Ref.make(databaseBlueprint)],
+        context: [],
+      }),
+    );
+    const fn = Operation.serialize(AgentPrompt);
+    dbg(Obj.toJSON(fn));
+
+    const trigger = space.db.add(
+      Obj.make(Trigger.Trigger, {
+        enabled: true,
+        function: Ref.make(fn),
+        spec: Trigger.specTimer('* * * * * *'),
+        input: {
+          prompt: Ref.make(routine),
+          input: {},
+          model: 'ai.claude.model.claude-haiku-4-5',
+        },
+      }),
+    );
+
+    await sync(space);
+
+    log('trigger created and synced');
+    log.break();
+
+    const runResult: any = await client.edge.http.forceRunCronTrigger(Context.default(), space.id, trigger.id);
+    if (runResult._kind === 'error') {
+      throw ErrorCodec.decode(runResult.error);
+    }
+    log('trigger ran', { runResult });
+    expect(runResult.result.count).toBe(3);
+  });
+});

package/src/functions/definitions.ts

@@ -4,12 +4,13 @@
 
 import * as Schema from 'effect/Schema';
 
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
+import { DXN } from '@dxos/keys';
 
 export const Fibonacci = Operation.make({
   meta: {
-    key: 'org.example.function.fib',
+    key: DXN.make('org.example.function.fib'),
     name: 'Fibonacci',
     description: 'Function that calculates a Fibonacci number',
   },
@@ -26,7 +27,7 @@ export const Fibonacci = Operation.make({
 
 export const Reply = Operation.make({
   meta: {
-    key: 'org.example.function.reply',
+    key: DXN.make('org.example.function.reply'),
     name: 'Reply',
     description: 'Function that echoes the input',
   },
@@ -36,7 +37,7 @@ export const Reply = Operation.make({
 
 export const Sleep = Operation.make({
   meta: {
-    key: 'org.example.function.sleep',
+    key: DXN.make('org.example.function.sleep'),
     name: 'Sleep',
     description: 'Function that sleeps for a given amount of time',
   },
@@ -51,7 +52,7 @@ export const Sleep = Operation.make({
 
 export const QueryDb = Operation.make({
   meta: {
-    key: 'org.example.function.query',
+    key: DXN.make('org.example.function.query'),
     name: 'Query',
     description: 'Queries the database',
   },

package/src/functions/fib.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Fibonacci } from './definitions';
 

package/src/functions/forex-effect.ts

@@ -10,11 +10,12 @@ import * as Effect from 'effect/Effect';
 import * as Schedule from 'effect/Schedule';
 import * as Schema from 'effect/Schema';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
+import { DXN } from '@dxos/keys';
 
 const ForexEffect = Operation.make({
   meta: {
-    key: 'org.dxos.script.forex-effect',
+    key: DXN.make('org.dxos.script.forexEffect'),
     name: 'Forex Effect',
     description: 'Returns the exchange rate between two currencies.',
   },

package/src/functions/query.ts

@@ -4,15 +4,15 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Filter, Query as EchoQuery } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { QueryDb } from './definitions';
 
 export default QueryDb.pipe(
   Operation.withHandler(
     Effect.fn(function* (data) {
-      const results = yield* Database.runQuery(EchoQuery.select(Filter.everything()));
+      const results = yield* Database.query(EchoQuery.select(Filter.everything())).run;
       return { count: results.length };
     }),
   ),

package/src/functions/reply.ts

@@ -5,7 +5,7 @@
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Reply } from './definitions';
 

package/src/functions/sleep.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Sleep } from './definitions';
 

package/src/testing/util.ts

@@ -7,14 +7,13 @@ import fs from 'node:fs';
 import { sleep } from '@dxos/async';
 import { Client, type Config } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
+import { Operation, Trigger } from '@dxos/compute';
 import { Context } from '@dxos/context';
 import { Feed, Obj } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { InvocationTraceEndEvent, InvocationTraceStartEvent } from '@dxos/functions-runtime';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
 import { bundleFunction } from '@dxos/functions-runtime/native';
 import type { BundleResult } from '@dxos/functions-runtime/native';
-import { Operation } from '@dxos/operation';
 import { ErrorCodec, type FunctionRuntimeKind } from '@dxos/protocols';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 
@@ -85,8 +84,10 @@ export const observeInvocations = async (space: Space, maxCount: number | null)
   while (true) {
     try {
       const traceFeed = space.properties.invocationTraceFeed?.target;
-      const traceQueueDxn = traceFeed ? Feed.getQueueDxn(traceFeed) : undefined;
-      const invocations = traceQueueDxn ? ((await space.queues.get(traceQueueDxn).queryObjects()) ?? []) : [];
+      const traceFeedDXN = traceFeed ? Feed.getQueueUri(traceFeed) : undefined;
+      const invocations = traceFeedDXN
+        ? ((await space.queues.get(traceFeedDXN, { subspaceTag: traceFeed!.namespace }).queryObjects()) ?? [])
+        : [];
 
       for (const invocation of invocations) {
         if (Obj.instanceOf(InvocationTraceStartEvent, invocation)) {