@dxos/functions-testing 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-testing",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "Functions tests",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,24 +30,24 @@
     "src"
   ],
   "dependencies": {
-    "@effect/platform": "0.96.1",
-    "@dxos/assistant-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/client": "0.9.1-main.c7dcc2e112",
-    "@dxos/async": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/config": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions-runtime-cloudflare": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions-runtime": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
-    "@dxos/schema": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112",
-    "@dxos/operation": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112"
+    "@effect/platform": "0.96.2",
+    "@dxos/assistant-toolkit": "0.9.1-staging.ee54ba693a",
+    "@dxos/async": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute": "0.9.1-staging.ee54ba693a",
+    "@dxos/client": "0.9.1-staging.ee54ba693a",
+    "@dxos/config": "0.9.1-staging.ee54ba693a",
+    "@dxos/context": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions": "0.9.1-staging.ee54ba693a",
+    "@dxos/invariant": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions-runtime": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/protocols": "0.9.1-staging.ee54ba693a",
+    "@dxos/operation": "0.9.1-staging.ee54ba693a",
+    "@dxos/schema": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions-runtime-cloudflare": "0.9.1-staging.ee54ba693a",
+    "@dxos/util": "0.9.1-staging.ee54ba693a"
   },
   "publishConfig": {
     "access": "public"

package/src/cpu-limit.test.ts

@@ -8,6 +8,7 @@ import { Trigger } from '@dxos/compute';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { Obj, Ref } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
 import { FunctionRuntimeKind } from '@dxos/protocols';
 
 import { deployFunction, observeInvocations, setup, sync } from './testing';
@@ -20,11 +21,14 @@ describe('CPU limit', { tags: ['functions-e2e'] }, () => {
 
   test('invoke directly', { timeout: 120_000 }, async ({ expect }) => {
     const { client, space, functionsServiceClient } = await setup(config);
+    const identity = client.halo.identity.get();
+    invariant(identity, 'Identity must exist after createIdentity.');
     const func = await deployFunction(
       space,
       functionsServiceClient,
       FIB_FUNCTION_PATH,
       FunctionRuntimeKind.enums.WORKERS_FOR_PLATFORMS,
+      identity.did,
     );
     const result = await functionsServiceClient.invoke(
       Context.default(),
@@ -41,16 +45,19 @@ describe('CPU limit', { tags: ['functions-e2e'] }, () => {
 
   test('force-trigger', { timeout: 120_000 }, async ({ expect }) => {
     const { client, space, functionsServiceClient } = await setup(config);
+    const identity = client.halo.identity.get();
+    invariant(identity, 'Identity must exist after createIdentity.');
     const func = await deployFunction(
       space,
       functionsServiceClient,
       FIB_FUNCTION_PATH,
       FunctionRuntimeKind.enums.WORKERS_FOR_PLATFORMS,
+      identity.did,
     );
     const trigger = space.db.add(
       Obj.make(Trigger.Trigger, {
         enabled: true,
-        function: Ref.make(func),
+        runnable: Ref.make(func),
         spec: Trigger.specTimer('* */30 * * * *'),
         input: { iterations: 100 },
       }),
@@ -62,16 +69,19 @@ describe('CPU limit', { tags: ['functions-e2e'] }, () => {
 
   test('break CPU limit', { timeout: 120_000 }, async ({ expect }) => {
     const { client, space, functionsServiceClient } = await setup(config);
+    const identity = client.halo.identity.get();
+    invariant(identity, 'Identity must exist after createIdentity.');
     const func = await deployFunction(
       space,
       functionsServiceClient,
       FIB_FUNCTION_PATH,
       FunctionRuntimeKind.enums.WORKERS_FOR_PLATFORMS,
+      identity.did,
     );
     const trigger = space.db.add(
       Obj.make(Trigger.Trigger, {
         enabled: true,
-        function: Ref.make(func),
+        runnable: Ref.make(func),
         spec: Trigger.specTimer('* */30 * * * *'),
         input: { iterations: 1_000_000_000 },
       }),
@@ -99,16 +109,19 @@ describe('CPU limit', { tags: ['functions-e2e'] }, () => {
 
   test('observe invocations', { timeout: 520_000 }, async ({ expect }) => {
     const { client, space, functionsServiceClient } = await setup(config);
+    const identity = client.halo.identity.get();
+    invariant(identity, 'Identity must exist after createIdentity.');
     const func = await deployFunction(
       space,
       functionsServiceClient,
       FIB_FUNCTION_PATH,
       FunctionRuntimeKind.enums.WORKERS_FOR_PLATFORMS,
+      identity.did,
     );
     const trigger = space.db.add(
       Obj.make(Trigger.Trigger, {
         enabled: true,
-        function: Ref.make(func),
+        runnable: Ref.make(func),
         spec: Trigger.specTimer('* * * * * *'),
         input: { iterations: 1_000_000 },
       }),
@@ -119,16 +132,19 @@ describe('CPU limit', { tags: ['functions-e2e'] }, () => {
 
   test('break CPU limit through natural exection', { timeout: 520_000 }, async ({ expect }) => {
     const { client, space, functionsServiceClient } = await setup(config);
+    const identity = client.halo.identity.get();
+    invariant(identity, 'Identity must exist after createIdentity.');
     const func = await deployFunction(
       space,
       functionsServiceClient,
       FIB_FUNCTION_PATH,
       FunctionRuntimeKind.enums.WORKERS_FOR_PLATFORMS,
+      identity.did,
     );
     const trigger = space.db.add(
       Obj.make(Trigger.Trigger, {
         enabled: true,
-        function: Ref.make(func),
+        runnable: Ref.make(func),
         spec: Trigger.specTimer('* * * * * *'),
         input: { iterations: 100 },
       }),

package/src/edge-routine.test.ts

@@ -2,16 +2,16 @@
 // Copyright 2026 DXOS.org
 //
 
-import * as Schema from 'effect/Schema';
 import { describe, test } from 'vitest';
 
-import { AgentPrompt, DatabaseBlueprint, Chat } from '@dxos/assistant-toolkit';
+import { Chat, DatabaseSkill, RunInstructions } from '@dxos/assistant-toolkit';
 import { Client } from '@dxos/client';
-import { Blueprint, Operation, Routine, Trigger } from '@dxos/compute';
+import { Instructions, Operation, Skill, 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 { DXN } from '@dxos/keys';
 import { dbg, log } from '@dxos/log';
 import { ErrorCodec } from '@dxos/protocols';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
@@ -21,23 +21,23 @@ 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.
+ * Cron trigger on EDGE runs {@link RunInstructions} for a {@link Routine} that uses the Database
+ * skill 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'] }, () => {
+describe('Edge instructions', { tags: ['functions-e2e'] }, () => {
   const config = configPreset({ edge: 'local' });
 
-  test('timer trigger runs routine with database blueprint on edge', { timeout: 420_000 }, async ({ expect }) => {
+  test('timer trigger runs instructions with database skill on edge', { timeout: 420_000 }, async ({ expect }) => {
     await using client = await new Client({
       config,
       types: [
         Operation.PersistentOperation,
         Trigger.Trigger,
-        Routine.Routine,
-        Blueprint.Blueprint,
+        Instructions.Instructions,
+        Skill.Skill,
         Feed.Feed,
         Text.Text,
         Chat.Chat,
@@ -59,38 +59,33 @@ describe('Edge routine', { tags: ['functions-e2e'] }, () => {
     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 databaseSkill = space.db.add(DatabaseSkill.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.
+    const instructions = space.db.add(
+      Instructions.make({
+        name: 'edge-e2e-count-orgs-db-skill',
+        text: trim`
+              You have access to the Database skill 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: [],
+        skills: [Ref.make(databaseSkill)],
       }),
     );
-    const fn = Operation.serialize(AgentPrompt);
+    const fn = Operation.serialize(RunInstructions);
     dbg(Obj.toJSON(fn));
 
     const trigger = space.db.add(
       Obj.make(Trigger.Trigger, {
         enabled: true,
-        function: Ref.make(fn),
+        runnable: Ref.make(fn),
         spec: Trigger.specTimer('* * * * * *'),
         input: {
-          prompt: Ref.make(routine),
+          instructions: Ref.make(instructions),
           input: {},
-          model: 'ai.claude.model.claude-haiku-4-5',
+          model: DXN.make('com.anthropic.model.claude-haiku-4-5.default'),
         },
       }),
     );

package/src/functions/query.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Database, Filter, Query as EchoQuery } from '@dxos/echo';
+import { Database, Query as EchoQuery, Filter } from '@dxos/echo';
 
 import { QueryDb } from './definitions';
 

package/src/testing/util.ts

@@ -53,6 +53,7 @@ export const deployFunction = async (
   functionsServiceClient: FunctionsServiceClient,
   entryPoint: string,
   runtime: FunctionRuntimeKind,
+  ownerUri: string,
 ): Promise<Operation.PersistentOperation> => {
   const artifact = await bundleFunction({
     entryPoint,
@@ -60,7 +61,7 @@ export const deployFunction = async (
   });
   const func = await functionsServiceClient.deploy(Context.default(), {
     version: '0.0.1',
-    ownerPublicKey: space.key,
+    ownerUri,
     entryPoint: artifact.entryPoint,
     assets: artifact.assets,
     runtime,