@dxos/assistant-toolkit 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/blueprints/database/blueprint.test.ts

@@ -5,12 +5,11 @@
 import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
-import { AgentService } from '@dxos/assistant';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint, Operation } from '@dxos/compute';
 import { Database, Entity, Feed, Filter, Obj, Query, Ref, Relation, Tag } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
-import { FunctionInvocationService } from '@dxos/functions';
+import { AgentService } from '@dxos/functions-runtime';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 import { ObjectId } from '@dxos/keys';
 import { Employer, Organization, Person } from '@dxos/types';
 import { trim } from '@dxos/util';
@@ -238,8 +237,8 @@ describe('Database Blueprint', () => {
             role: 'Director',
           }),
         );
-        const relationDxn = Relation.getDXN(relation).toString();
-        yield* agent.submitPrompt(`Delete the relation ${relationDxn}.`);
+        const relationDXN = Relation.getDXN(relation).toString();
+        yield* agent.submitPrompt(`Delete the relation ${relationDXN}.`);
         yield* agent.waitForCompletion();
         expect(Relation.isDeleted(relation)).toBe(true);
       },
@@ -283,14 +282,14 @@ describe('Database Blueprint', () => {
         });
         const org = yield* Database.add(Obj.make(Organization.Organization, { name: 'Untagged Corp' }));
         const tag = yield* Database.add(Tag.make({ label: 'obsolete' }));
-        const tagDxn = Obj.getDXN(tag).toString();
-        Entity.change(org, (obj) => Entity.addTag(obj, tagDxn));
-        expect(Obj.getMeta(org).tags ?? []).toContain(tagDxn);
+        const tagDXN = Obj.getDXN(tag).toString();
+        Entity.update(org, (org) => Entity.addTag(org, tagDXN));
+        expect(Obj.getMeta(org).tags ?? []).toContain(tagDXN);
         yield* agent.submitPrompt(`Remove tag "obsolete" from the organization "Untagged Corp".`);
         yield* agent.waitForCompletion();
         const tags = Obj.getMeta(org).tags ?? [];
         // TODO(dmaretskyi): matcher doesnt work with echo proxies.
-        expect([...tags]).not.toContain(tagDxn);
+        expect([...tags]).not.toContain(tagDXN);
       },
       Effect.provide(TestLayer),
       TestHelpers.provideTestContext,
@@ -416,14 +415,14 @@ describe('Database Blueprint', () => {
         ]);
         yield* Database.flush();
 
-        const noQueues = yield* FunctionInvocationService.invokeFunction(DatabaseQueryOperation, {
+        const noQueues = yield* Operation.invoke(DatabaseQueryOperation, {
           text: 'op-search-token-7f3a2c91',
           includeQueues: false,
           limit: 20,
         });
         expect(noQueues).toHaveLength(0);
 
-        const withQueues = yield* FunctionInvocationService.invokeFunction(DatabaseQueryOperation, {
+        const withQueues = yield* Operation.invoke(DatabaseQueryOperation, {
           text: 'op-search-token-7f3a2c91',
           includeQueues: true,
           limit: 20,
@@ -436,7 +435,7 @@ describe('Database Blueprint', () => {
           ),
         ).toBe(true);
 
-        const byTypename = yield* FunctionInvocationService.invokeFunction(DatabaseQueryOperation, {
+        const byTypename = yield* Operation.invoke(DatabaseQueryOperation, {
           typename: 'org.dxos.type.organization',
           includeQueues: true,
           limit: 20,
@@ -452,4 +451,81 @@ describe('Database Blueprint', () => {
       TestHelpers.provideTestContext,
     ),
   );
+
+  it.effect(
+    'query: in param scopes to feed children (agent uses Query tool)',
+    Effect.fnUntraced(
+      function* (_) {
+        const feed1 = Feed.make({ name: 'inbox-1' });
+        yield* Database.add(feed1);
+        yield* Feed.append(feed1, [
+          Obj.make(Organization.Organization, {
+            name: 'Email Corp Alpha',
+            description: 'Mock email in-param-token-a1b2c3.',
+          }),
+        ]);
+
+        const feed2 = Feed.make({ name: 'inbox-2' });
+        yield* Database.add(feed2);
+        yield* Feed.append(feed2, [
+          Obj.make(Organization.Organization, {
+            name: 'Email Corp Beta',
+            description: 'Mock email in-param-token-d4e5f6.',
+          }),
+        ]);
+        yield* Database.flush();
+
+        const agent = yield* AgentService.createSession({
+          blueprints: [DatabaseBlueprint.make()],
+        });
+        yield* agent.submitPrompt('Query for organizations in "inbox-1" feed.');
+        yield* agent.waitForCompletion();
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
+
+  it.effect(
+    'query operation: in param can be passed as string',
+    Effect.fnUntraced(
+      function* (_) {
+        const feed1 = Feed.make({ name: 'inbox-1' });
+        yield* Database.add(feed1);
+        yield* Feed.append(feed1, [
+          Obj.make(Organization.Organization, {
+            name: 'Email Corp Alpha',
+            description: 'Mock email in-param-invoke-token-a1b2c3.',
+          }),
+        ]);
+
+        const feed2 = Feed.make({ name: 'inbox-2' });
+        yield* Database.add(feed2);
+        yield* Feed.append(feed2, [
+          Obj.make(Organization.Organization, {
+            name: 'Email Corp Beta',
+            description: 'Mock email in-param-invoke-token-d4e5f6.',
+          }),
+        ]);
+        yield* Database.flush();
+
+        const agent = yield* AgentService.createSession({
+          blueprints: [DatabaseBlueprint.make()],
+        });
+        yield* agent.submitPrompt(
+          `Call query tool with precisely ${JSON.stringify({
+            includeContent: false,
+            limit: 10,
+            typename: Organization.Organization.typename,
+            in: [Obj.getDXN(feed1).toString()],
+          })}`,
+        );
+        yield* agent.waitForCompletion();
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
 });

package/src/blueprints/database/blueprint.ts

@@ -2,8 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
@@ -38,7 +37,7 @@ const make = () =>
     description: 'Query and manipulate objects in the ECHO database.',
     agentCanEnable: true,
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     tools: Blueprint.toolDefinitions({
       operations: [
@@ -59,7 +58,7 @@ const make = () =>
     }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

package/src/blueprints/database/functions/context-add.ts

@@ -4,15 +4,15 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
-import { Operation } from '@dxos/operation';
+import { AiContext } from '@dxos/assistant';
+import { Operation } from '@dxos/compute';
 
 import { ContextAdd } from './definitions';
 
 export default ContextAdd.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ obj }) {
-      const { binder } = yield* AiContextService;
+      const { binder } = yield* AiContext.Service;
       yield* Effect.promise(() =>
         binder.bind({
           blueprints: [],

package/src/blueprints/database/functions/context-remove.ts

@@ -4,15 +4,15 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
-import { Operation } from '@dxos/operation';
+import { AiContext } from '@dxos/assistant';
+import { Operation } from '@dxos/compute';
 
 import { ContextRemove } from './definitions';
 
 export default ContextRemove.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ obj }) {
-      const { binder } = yield* AiContextService;
+      const { binder } = yield* AiContext.Service;
       yield* Effect.promise(() =>
         binder.unbind({
           blueprints: [],

package/src/blueprints/database/functions/definitions.ts

@@ -4,9 +4,9 @@
 
 import * as Schema from 'effect/Schema';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
+import { Operation } from '@dxos/compute';
 import { Database, Obj, Ref, Relation, Tag } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 import { trim } from '@dxos/util';
 
 export const Query = Operation.make({
@@ -48,9 +48,26 @@ export const Query = Operation.make({
           "limit": 3
         }
       </example>
+
+      <example description="Emails from specific mailboxes">
+        {
+          "in": [{"/" : "dxn:echo:@:YYYYYY"}, {"/" : "dxn:echo:@:XXXXXXX"}],
+          "typename": "org.dxos.type.email",
+          "includeContent": true,
+          "limit": 20
+        }
+      </example>
     `,
   },
   input: Schema.Struct({
+    in: Schema.optional(
+      Schema.Array(Ref.Ref(Obj.Unknown)).annotations({
+        description:
+          'Scope the query to children of specific objects (transitively). ' +
+          'Use this to query items within containers such as feeds or folders. ' +
+          'For example, to find emails use `in: [mailbox1.feed, mailbox2.feed]`.',
+      }),
+    ),
     typename: Schema.optional(
       Schema.String.annotations({
         description: 'The typename of the objects to list.',
@@ -84,7 +101,7 @@ export const Query = Operation.make({
   }),
   output: Schema.Array(Schema.Unknown),
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const Load = Operation.make({
   meta: {
@@ -104,7 +121,7 @@ export const Load = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ObjectCreate = Operation.make({
   meta: {
@@ -123,7 +140,7 @@ export const ObjectCreate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ObjectUpdate = Operation.make({
   meta: {
@@ -141,7 +158,7 @@ export const ObjectUpdate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ObjectDelete = Operation.make({
   meta: {
@@ -156,7 +173,7 @@ export const ObjectDelete = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const SchemaAdd = Operation.make({
   meta: {
@@ -176,7 +193,7 @@ export const SchemaAdd = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const SchemaList = Operation.make({
   meta: {
@@ -191,7 +208,7 @@ export const SchemaList = Operation.make({
   }),
   output: Schema.Array(Schema.Unknown),
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const ContextAdd = Operation.make({
   meta: {
@@ -208,8 +225,8 @@ export const ContextAdd = Operation.make({
     }),
   }),
   output: Schema.Void,
-  services: [AiContextService],
-});
+  services: [AiContext.Service],
+}).pipe(Operation.intrinsic);
 
 export const ContextRemove = Operation.make({
   meta: {
@@ -226,8 +243,8 @@ export const ContextRemove = Operation.make({
     }),
   }),
   output: Schema.Void,
-  services: [AiContextService],
-});
+  services: [AiContext.Service],
+}).pipe(Operation.intrinsic);
 
 export const RelationCreate = Operation.make({
   meta: {
@@ -248,7 +265,7 @@ export const RelationCreate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const RelationDelete = Operation.make({
   meta: {
@@ -263,7 +280,7 @@ export const RelationDelete = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const TagAdd = Operation.make({
   meta: {
@@ -281,7 +298,7 @@ export const TagAdd = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);
 
 export const TagRemove = Operation.make({
   meta: {
@@ -298,4 +315,4 @@ export const TagRemove = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-});
+}).pipe(Operation.intrinsic);

package/src/blueprints/database/functions/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export * from './definitions';
 

package/src/blueprints/database/functions/load.ts

@@ -5,8 +5,8 @@
 import * as Array from 'effect/Array';
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { Load } from './definitions';
 

package/src/blueprints/database/functions/object-create.ts

@@ -4,10 +4,10 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity, Obj, Type } from '@dxos/echo';
 import { EncodedReference } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { deepMapValues } from '@dxos/util';
 
 import { ObjectCreate } from './definitions';

package/src/blueprints/database/functions/object-delete.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { ObjectDelete } from './definitions';
 

package/src/blueprints/database/functions/object-update.ts

@@ -4,9 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity } from '@dxos/echo';
 import { EncodedReference } from '@dxos/echo-protocol';
-import { Operation } from '@dxos/operation';
 
 import { ObjectUpdate } from './definitions';
 
@@ -15,7 +15,7 @@ export default ObjectUpdate.pipe(
     Effect.fn(function* ({ obj, properties }) {
       const { db } = yield* Database.Service;
       const object = yield* Database.load(obj);
-      Entity.change(object as Entity.Any, (obj) => {
+      Entity.update(object as Entity.Any, (obj) => {
         for (const [key, value] of Object.entries(properties)) {
           if (EncodedReference.isEncodedReference(value)) {
             obj[key] = db.makeRef(EncodedReference.toDXN(value));

package/src/blueprints/database/functions/query.ts

@@ -4,16 +4,15 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Entity, Filter, Obj, Query as EchoQuery } from '@dxos/echo';
-import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
+import { Database, Entity, Filter, Obj, Query as EchoQuery } from '@dxos/echo';
 
 import { Query } from './definitions';
 
 // TODO(burdon): Move to toolkit (i.e., tool not function).
 export default Query.pipe(
   Operation.withHandler(
-    Effect.fn(function* ({ typename, text, includeContent = false, limit = 10, includeQueues = false }) {
+    Effect.fn(function* ({ in: parents, typename, text, includeContent = false, limit = 10, includeQueues = false }) {
       const { db } = yield* Database.Service;
       let query: EchoQuery.Any;
       if (text) {
@@ -36,9 +35,14 @@ export default Query.pipe(
       } else {
         query = EchoQuery.select(Filter.everything());
       }
+
+      if (parents && parents.length > 0) {
+        query = query.select(Filter.childOf(parents));
+      }
+
       query = query.limit(limit);
       if (includeQueues) {
-        // Must scope to the current space: `from({ allQueuesFromSpaces: true })` alone has no spaceIds, so the SQL
+        // Must scope to the current space: `from({ allFeedsFromSpaces: true })` alone has no spaceIds, so the SQL
         // index returns nothing (see ObjectMetaIndex.buildSourceCondition / early returns when spaceIds are empty).
         query = query.from(db, { includeFeeds: true });
       }

package/src/blueprints/database/functions/relation-create.ts

@@ -4,9 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity, Relation, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 
 import { RelationCreate } from './definitions';
 

package/src/blueprints/database/functions/relation-delete.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { RelationDelete } from './definitions';
 

package/src/blueprints/database/functions/schema-add.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { SchemaAdd } from './definitions';
 

package/src/blueprints/database/functions/schema-list.ts

@@ -4,24 +4,30 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Database, JsonSchema, Type } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
+import { Routine, Blueprint, Operation } from '@dxos/compute';
+import { Database, Feed, JsonSchema, Type, View } from '@dxos/echo';
 
 import { SchemaList } from './definitions';
 
+// TODO(dmaretskyi): This is a balance between not filling the agent's context with too many types and not excluding important types.
+const EXCLUDED_TYPES = [Type.PersistentType, View.View, Routine.Routine, Blueprint.Blueprint, Feed.Feed];
+const excludedTypenames = EXCLUDED_TYPES.map((type) => Type.getTypename(type));
+
 export default SchemaList.pipe(
   Operation.withHandler(
     Effect.fn(function* () {
       const { db } = yield* Database.Service;
       const schema = yield* Effect.promise(() => db.schemaRegistry.query({ location: ['database', 'runtime'] }).run());
-      return schema.map((schema) => {
-        const meta = Type.getMeta(schema);
-        return {
-          typename: Type.getTypename(schema),
-          jsonSchema: JsonSchema.toJsonSchema(schema),
-          kind: meta?.sourceSchema ? 'relation' : 'record',
-        };
-      });
+      return schema
+        .filter((schema) => !excludedTypenames.includes(Type.getTypename(schema)))
+        .map((schema) => {
+          const meta = Type.getMeta(schema);
+          return {
+            typename: Type.getTypename(schema),
+            jsonSchema: JsonSchema.toJsonSchema(schema),
+            kind: meta?.sourceSchema ? 'relation' : 'record',
+          };
+        });
     }),
   ),
 );

package/src/blueprints/database/functions/tag-add.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity, Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { TagAdd } from './definitions';
 
@@ -14,7 +14,7 @@ export default TagAdd.pipe(
     Effect.fn(function* ({ tag, obj }) {
       const object = yield* Database.load(obj);
       const tagObj = yield* Database.load(tag);
-      Entity.change(object, (obj) => Entity.addTag(obj, Obj.getDXN(tagObj).toString()));
+      Entity.update(object, (object) => Entity.addTag(object, Obj.getDXN(tagObj).toString()));
       return Entity.toJSON(object);
     }),
   ),

package/src/blueprints/database/functions/tag-remove.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Entity, Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { TagRemove } from './definitions';
 
@@ -14,7 +14,7 @@ export default TagRemove.pipe(
     Effect.fn(function* ({ tag, obj }) {
       const object = yield* Database.load(obj);
       const tagObj = yield* Database.load(tag);
-      Entity.change(object, (obj) => Entity.removeTag(obj, Obj.getDXN(tagObj).toString()));
+      Entity.update(object, (object) => Entity.removeTag(object, Obj.getDXN(tagObj).toString()));
       return Entity.toJSON(object);
     }),
   ),

package/src/blueprints/discord/blueprint.ts

@@ -2,8 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 import { Ref } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
@@ -29,12 +28,12 @@ const make = () =>
     name: 'Discord',
     description: 'Discord integration.',
     instructions: {
-      source: Ref.make(Text.make(instructions)),
+      source: Ref.make(Text.make({ content: instructions })),
     },
     tools: Blueprint.toolDefinitions({ operations: [FetchMessages] }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

package/src/blueprints/discord/functions/definitions.ts

@@ -4,8 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { CredentialsService, TracingService } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
+import { Credential, Trace, Operation } from '@dxos/compute';
 
 // TODO(dmaretskyi): Extract.
 const TimeRangeSchema = Schema.String.pipe(Schema.pattern(/\d+(s|m|h|d)/)).annotations({
@@ -67,5 +66,5 @@ export const FetchMessages = Operation.make({
     }),
   }),
   output: Schema.Any,
-  services: [CredentialsService, TracingService],
+  services: [Credential.CredentialsService, Trace.TraceService],
 });