@dxos/assistant-toolkit 0.8.4-main.3fbcb4aa9b → 0.8.4-main.43cb759274

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

@@ -6,11 +6,11 @@ import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import { Blueprint, Operation } from '@dxos/compute';
-import { Database, Entity, Feed, Filter, Obj, Query, Ref, Relation, Tag } from '@dxos/echo';
+import { Database, Entity, Feed, Filter, Obj, Query, Ref, Relation, Scope, Tag, Type } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
 import { AgentService } from '@dxos/functions-runtime';
 import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
-import { ObjectId } from '@dxos/keys';
+import { EID, EntityId } from '@dxos/keys';
 import { Employer, Organization, Person } from '@dxos/types';
 import { trim } from '@dxos/util';
 
@@ -18,7 +18,7 @@ import DatabaseBlueprint from './blueprint';
 import { DatabaseHandlers } from './functions';
 import { Query as DatabaseQueryOperation } from './functions/definitions';
 
-ObjectId.dangerouslyDisableRandomness();
+EntityId.dangerouslyDisableRandomness();
 
 const TestLayer = AssistantTestLayer({
   operationHandlers: DatabaseHandlers,
@@ -60,10 +60,10 @@ describe('Database Blueprint', () => {
           'Add a new schema called "Project" with typename "com.example.type.project" and fields: name (string), description (string), and status (string).',
         );
         yield* agent.waitForCompletion();
-        const schemas = yield* Database.runSchemaQuery({
-          typename: 'com.example.type.project',
-          location: ['database', 'runtime'],
-        });
+        const allTypes = yield* Database.runQuery(
+          Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()),
+        );
+        const schemas = allTypes.filter((t) => Type.getTypename(t) === 'com.example.type.project');
         expect(schemas.length).toBeGreaterThanOrEqual(1);
       },
       Effect.provide(TestLayer),
@@ -185,8 +185,8 @@ describe('Database Blueprint', () => {
         const org = yield* Database.add(
           Obj.make(Organization.Organization, { name: 'Detail Corp', description: 'A detailed organization.' }),
         );
-        const dxn = Obj.getDXN(org).toString();
-        yield* agent.submitPrompt(`Load the full details of object ${dxn}. What is its description?`);
+        const uri = Obj.getURI(org);
+        yield* agent.submitPrompt(`Load the full details of object ${uri}. What is its description?`);
         yield* agent.waitForCompletion();
       },
       Effect.provide(TestLayer),
@@ -237,8 +237,8 @@ describe('Database Blueprint', () => {
             role: 'Director',
           }),
         );
-        const relationDxn = Relation.getDXN(relation).toString();
-        yield* agent.submitPrompt(`Delete the relation ${relationDxn}.`);
+        const relationUri = Relation.getURI(relation);
+        yield* agent.submitPrompt(`Delete the relation ${relationUri}.`);
         yield* agent.waitForCompletion();
         expect(Relation.isDeleted(relation)).toBe(true);
       },
@@ -263,9 +263,10 @@ describe('Database Blueprint', () => {
         const tag = yield* Database.add(Tag.make({ label: 'important' }));
         yield* agent.submitPrompt(`Add tag "important" to the organization "Tagged Corp".`);
         yield* agent.waitForCompletion();
-        const tags = Obj.getMeta(org).tags ?? [];
-        // TODO(dmaretskyi): matcher doesnt work with echo proxies.
-        expect([...tags]).toContain(Obj.getDXN(tag).toString());
+        // Compare by entity id: a same-space ref stores a local EID (`echo:/<id>`) while
+        // `Obj.getURI` returns the fully-qualified form (`echo://<space>/<id>`).
+        const taggedIds = Obj.getMeta(org).tags.map((ref) => EID.getEntityId(EID.parse(ref.uri)));
+        expect(taggedIds).toContain(tag.id);
       },
       Effect.provide(TestLayer),
       TestHelpers.provideTestContext,
@@ -282,14 +283,13 @@ 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.update(org, (org) => Entity.addTag(org, tagDxn));
-        expect(Obj.getMeta(org).tags ?? []).toContain(tagDxn);
+        // Compare by entity id (local vs fully-qualified EID forms refer to the same object).
+        const taggedIds = () => Obj.getMeta(org).tags.map((ref) => EID.getEntityId(EID.parse(ref.uri)));
+        Entity.update(org, (org) => Entity.addTag(org, Ref.make(tag)));
+        expect(taggedIds()).toContain(tag.id);
         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(taggedIds()).not.toContain(tag.id);
       },
       Effect.provide(TestLayer),
       TestHelpers.provideTestContext,
@@ -329,13 +329,13 @@ describe('Database Blueprint', () => {
         });
         const org = yield* Database.add(Obj.make(Organization.Organization, { name: 'Remove Context Corp' }));
         const { db } = yield* Database.Service;
-        const ref = db.makeRef(Obj.getDXN(org)) as Ref.Ref<any>;
+        const ref = db.makeRef(Obj.getURI(org)) as Ref.Ref<any>;
         yield* agent.addContext([ref]);
-        const dxn = Obj.getDXN(org).toString();
+        const uri = Obj.getURI(org);
         yield* agent.submitPrompt(`Remove the organization "Remove Context Corp" from the chat context.`);
         yield* agent.waitForCompletion();
         const contextRefs = yield* agent.getContext();
-        const found = contextRefs.find((contextRef) => contextRef.dxn.toString() === dxn);
+        const found = contextRefs.find((contextRef) => contextRef.uri === uri);
         expect(found).toBeUndefined();
       },
       Effect.provide(TestLayer),
@@ -517,8 +517,8 @@ describe('Database Blueprint', () => {
           `Call query tool with precisely ${JSON.stringify({
             includeContent: false,
             limit: 10,
-            typename: Organization.Organization.typename,
-            in: [Obj.getDXN(feed1).toString()],
+            typename: Type.getTypename(Organization.Organization),
+            in: [Obj.getURI(feed1)],
           })}`,
         );
         yield* agent.waitForCompletion();

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

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Operation } from '@dxos/compute';
 
 import { ContextAdd } from './definitions';
@@ -12,7 +12,7 @@ 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,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Operation } from '@dxos/compute';
 
 import { ContextRemove } from './definitions';
@@ -12,7 +12,7 @@ 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,15 +4,17 @@
 
 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 { Database, Obj, Ref, Relation, Tag, Type } from '@dxos/echo';
+import { DXN } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
 export const Query = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.query',
+    key: DXN.make('org.dxos.function.database.query'),
     name: 'Query',
+    icon: 'ph--magnifying-glass--regular',
     description: trim`
       Query for objects in ECHO.
       Use this tool when searching for information in the space (both automerge and queues).
@@ -51,7 +53,7 @@ export const Query = Operation.make({
 
       <example description="Emails from specific mailboxes">
         {
-          "in": [{"/" : "dxn:echo:@:YYYYYY"}, {"/" : "dxn:echo:@:XXXXXXX"}],
+          "in": [{"/" : "echo:/YYYYYY"}, {"/" : "echo:/XXXXXXX"}],
           "typename": "org.dxos.type.email",
           "includeContent": true,
           "limit": 20
@@ -101,18 +103,19 @@ export const Query = Operation.make({
   }),
   output: Schema.Array(Schema.Unknown),
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const Load = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.load',
+    key: DXN.make('org.dxos.function.database.load'),
     name: 'Load object',
+    icon: 'ph--download--regular',
     description: trim`
       Loads the object or relation content.
       Can load multiple objects at at time.
       Use the to read the data when you have a DXN.
       Call this tool with an array of one or more DXNs or object IDs.
-      When use see a reference ({ '/': 'dxn:...' }), you can call this function to load the object.
+      When use see a reference ({ '/': 'echo:...' }), you can call this function to load the object.
       Note that returned data is only a snapshot in time, and might have changed since the object was last loaded.
     `,
   },
@@ -121,17 +124,18 @@ export const Load = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const ObjectCreate = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.object-create',
+    key: DXN.make('org.dxos.function.database.objectCreate'),
     name: 'Create object',
+    icon: 'ph--plus--regular',
     description: trim`
       Creates a new object and adds it to the current space.
       Get the schema from the schema-list tool and ensure that the data matches the corresponding schema.
-      References are provided in the following format: { "/": "dxn:..." }.
-      Reference examples: { "/": "dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }, { "/": "dxn:queue:data:01KG7R1ZXWFMWQ4DA1Q6TN1DG4:01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }
+      References are provided in the following format: { "/": "echo:..." }.
+      Reference examples: { "/": "echo:/01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }, { "/": "echo://<space id>/01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }
     `,
   },
   input: Schema.Struct({
@@ -140,16 +144,17 @@ export const ObjectCreate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const ObjectUpdate = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.object-update',
+    key: DXN.make('org.dxos.function.database.objectUpdate'),
     name: 'Update object',
+    icon: 'ph--pencil--regular',
     description: trim`
       Updates the object properties.
-      References are provided in the following format: { "/": "dxn:..." }.
-      Reference examples: { "/": "dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }, { "/": "dxn:queue:data:01KG7R1ZXWFMWQ4DA1Q6TN1DG4:01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }
+      References are provided in the following format: { "/": "echo:..." }.
+      Reference examples: { "/": "echo:/01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }, { "/": "echo://<space id>/01KG7R1ZXWFMWQ4DA1Q6TN1DG4" }
     `,
   },
   input: Schema.Struct({
@@ -158,27 +163,29 @@ export const ObjectUpdate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const ObjectDelete = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.object-delete',
+    key: DXN.make('org.dxos.function.database.objectDelete'),
     name: 'Delete object',
     description: trim`
       Deletes the object.
     `,
+    icon: 'ph--trash--regular',
   },
   input: Schema.Struct({
     obj: Ref.Ref(Obj.Unknown),
   }),
   output: Schema.Void,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const SchemaAdd = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.schema-add',
+    key: DXN.make('org.dxos.function.database.schemaAdd'),
     name: 'Add schema',
+    icon: 'ph--plus--regular',
     description: trim`
       Adds a schema to the space.
       The name will be used when displayed to the user.
@@ -193,12 +200,13 @@ export const SchemaAdd = Operation.make({
   }),
   output: Schema.Void,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const SchemaList = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.schema-list',
+    key: DXN.make('org.dxos.function.database.schemaList'),
     name: 'List schemas',
+    icon: 'ph--list--regular',
     description: trim`
       Lists schemas definitions.
     `,
@@ -208,12 +216,13 @@ export const SchemaList = Operation.make({
   }),
   output: Schema.Array(Schema.Unknown),
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const ContextAdd = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.context-add',
+    key: DXN.make('org.dxos.function.database.contextAdd'),
     name: 'Add to context',
+    icon: 'ph--plus-circle--regular',
     description: trim`
       Adds the object to the chat context.
       Use this it for objects that are useful long-term for the conversation.
@@ -225,13 +234,14 @@ export const ContextAdd = Operation.make({
     }),
   }),
   output: Schema.Void,
-  services: [AiContextService],
-}).pipe(Operation.intrinsic);
+  services: [AiContext.Service],
+});
 
 export const ContextRemove = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.context-remove',
+    key: DXN.make('org.dxos.function.database.contextRemove'),
     name: 'Remove from context',
+    icon: 'ph--minus-circle--regular',
     description: trim`
       Removes the object from the chat context.
       Use this it for objects that are no longer useful for the conversation.
@@ -243,13 +253,14 @@ export const ContextRemove = Operation.make({
     }),
   }),
   output: Schema.Void,
-  services: [AiContextService],
-}).pipe(Operation.intrinsic);
+  services: [AiContext.Service],
+});
 
 export const RelationCreate = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.relation-create',
+    key: DXN.make('org.dxos.function.database.relationCreate'),
     name: 'Create relation',
+    icon: 'ph--arrows-merge--regular',
     description: trim`
       Creates a new relation and adds it to the current space.
       Get the schema from the schema-list tool and ensure that the data matches the corresponding schema.
@@ -265,54 +276,57 @@ export const RelationCreate = Operation.make({
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const RelationDelete = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.relation-delete',
+    key: DXN.make('org.dxos.function.database.relationDelete'),
     name: 'Delete relation',
     description: trim`
       Deletes the relation.
     `,
+    icon: 'ph--trash--regular',
   },
   input: Schema.Struct({
     rel: Ref.Ref(Relation.Unknown),
   }),
   output: Schema.Void,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const TagAdd = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.tag-add',
+    key: DXN.make('org.dxos.function.database.tagAdd'),
     name: 'Add tag',
+    icon: 'ph--tag--regular',
     description: trim`
       Adds a tag to an object.
-      Tags are objects of type ${Tag.Tag.typename}.
+      Tags are objects of type ${Type.getTypename(Tag.Tag)}.
       You must search database for available tags, or create a new one.
     `,
   },
   input: Schema.Struct({
-    tag: Ref.Ref(Obj.Unknown),
+    tag: Ref.Ref(Tag.Tag),
     obj: Ref.Ref(Obj.Unknown),
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});
 
 export const TagRemove = Operation.make({
   meta: {
-    key: 'org.dxos.function.database.tag-remove',
+    key: DXN.make('org.dxos.function.database.tagRemove'),
     name: 'Remove tag',
+    icon: 'ph--tag--regular',
     description: trim`
       Removes a tag from an object.
-      Tags are objects of type ${Tag.Tag.typename}.
+      Tags are objects of type ${Type.getTypename(Tag.Tag)}.
     `,
   },
   input: Schema.Struct({
-    tag: Ref.Ref(Obj.Unknown),
+    tag: Ref.Ref(Tag.Tag),
     obj: Ref.Ref(Obj.Unknown),
   }),
   output: Schema.Unknown,
   services: [Database.Service],
-}).pipe(Operation.intrinsic);
+});

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

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Database, Entity, Obj, Type } from '@dxos/echo';
+import { Database, Entity, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
 import { EncodedReference } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
 import { deepMapValues } from '@dxos/util';
@@ -16,17 +16,20 @@ export default ObjectCreate.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ typename, data }) {
       const { db } = yield* Database.Service;
-      const schema = yield* Effect.promise(() =>
-        db.schemaRegistry.query({ typename, location: ['database', 'runtime'] }).first(),
+      const types = yield* Database.runQuery(
+        Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()),
       );
-      invariant(Type.isObjectSchema(schema), 'Schema is not an object schema');
+      const foundSchema = types.find((t) => Type.getTypename(t) === typename);
+      invariant(foundSchema, `Schema not found: ${typename}`);
+      invariant(Type.isObject(foundSchema), 'Schema is not an object schema');
+      const schema = foundSchema;
 
       const object = db.add(
         Obj.make(
           schema,
           deepMapValues(data, (value, recurse) => {
             if (EncodedReference.isEncodedReference(value)) {
-              return db.makeRef(EncodedReference.toDXN(value));
+              return db.makeRef(EncodedReference.toURI(value));
             }
             return recurse(value);
           }),

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

@@ -18,7 +18,7 @@ export default ObjectUpdate.pipe(
       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));
+            obj[key] = db.makeRef(EncodedReference.toURI(value));
           } else {
             obj[key] = value;
           }

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

@@ -5,8 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Entity, Filter, Obj, Query as EchoQuery } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Entity, Filter, Obj, Query as EchoQuery, Scope, Type } from '@dxos/echo';
 
 import { Query } from './definitions';
 
@@ -21,18 +20,24 @@ export default Query.pipe(
           ...text.split(' ').map((term) => EchoQuery.select(Filter.text(term, { type: 'full-text' }))),
         );
         if (typename !== undefined) {
-          const schema = yield* Database.runSchemaQuery({ typename, location: ['database', 'runtime'] });
-          if (schema.length === 0) {
+          const types = yield* Database.runQuery(
+            EchoQuery.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()),
+          );
+          const schema = types.find((t) => Type.getTypename(t) === typename);
+          if (!schema) {
             return yield* Effect.fail(new Error(`Schema ${typename} not found`));
           }
-          query = query.select(Filter.type(schema[0]));
+          query = query.select(Filter.type(schema));
         }
       } else if (typename) {
-        const schema = yield* Database.runSchemaQuery({ typename, location: ['database', 'runtime'] });
-        if (schema.length === 0) {
+        const types = yield* Database.runQuery(
+          EchoQuery.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()),
+        );
+        const schema = types.find((t) => Type.getTypename(t) === typename);
+        if (!schema) {
           return yield* Effect.fail(new Error(`Schema ${typename} not found`));
         }
-        query = EchoQuery.select(Filter.type(schema[0]));
+        query = EchoQuery.select(Filter.type(schema));
       } else {
         query = EchoQuery.select(Filter.everything());
       }
@@ -43,8 +48,8 @@ export default Query.pipe(
 
       query = query.limit(limit);
       if (includeQueues) {
-        // Must scope to the current space: `from({ allQueuesFromSpaces: true })` alone has no spaceIds, so the SQL
-        // index returns nothing (see ObjectMetaIndex.buildSourceCondition / early returns when spaceIds are empty).
+        // Must scope to the current space: `from({ allFeedsFromSpaces: true })` alone has no spaceIds, so the SQL
+        // index returns nothing (see EntityMetaIndex.buildSourceCondition / early returns when spaceIds are empty).
         query = query.from(db, { includeFeeds: true });
       }
 
@@ -54,7 +59,7 @@ export default Query.pipe(
         return results.map((obj) => Entity.toJSON(obj));
       } else {
         return results.map((obj) => ({
-          dxn: Obj.getDXN(obj).toString(),
+          dxn: Obj.getURI(obj),
           typename: Obj.getTypename(obj),
           label: Obj.getLabel(obj),
         }));

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

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Database, Entity, Relation, Type } from '@dxos/echo';
+import { Database, Entity, Filter, Query, Relation, Scope, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 
 import { RelationCreate } from './definitions';
@@ -14,10 +14,13 @@ export default RelationCreate.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ typename, source, target, properties }) {
       const { db } = yield* Database.Service;
-      const schema = yield* Effect.promise(() =>
-        db.schemaRegistry.query({ typename, location: ['database', 'runtime'] }).first(),
+      const types = yield* Database.runQuery(
+        Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()),
       );
-      invariant(Type.isRelationSchema(schema), 'Schema is not a relation schema');
+      const foundSchema = types.find((t) => Type.getTypename(t) === typename);
+      invariant(foundSchema, `Schema not found: ${typename}`);
+      invariant(Type.isRelation(foundSchema), 'Schema is not a relation schema');
+      const schema = foundSchema;
 
       const sourceObj = yield* Database.load(source);
       const targetObj = yield* Database.load(target);

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

@@ -5,24 +5,19 @@
 import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
-import { Database } from '@dxos/echo';
+import { Database, Type } from '@dxos/echo';
 
 import { SchemaAdd } from './definitions';
 
 export default SchemaAdd.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ name, typename, jsonSchema }) {
-      const { db } = yield* Database.Service;
-      yield* Effect.promise(() =>
-        db.schemaRegistry.register([
-          {
-            typename,
-            version: '0.1.0',
-            jsonSchema,
-            name,
-          },
-        ]),
-      );
+      const schema = yield* Database.addType(Type.makeObjectFromJsonSchema({ typename, version: '0.1.0', jsonSchema }));
+      if (name) {
+        Type.update(schema, (draft) => {
+          draft.name = name;
+        });
+      }
     }),
   ),
 );

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

@@ -5,27 +5,32 @@
 import * as Effect from 'effect/Effect';
 
 import { Routine, Blueprint, Operation } from '@dxos/compute';
-import { Database, Feed, JsonSchema, Type, View } from '@dxos/echo';
+import { Database, Feed, Filter, JsonSchema, Query, Scope, 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 EXCLUDED_TYPES = [Type.Type, 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
+      const types = yield* Database.runQuery(
+        Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()),
+      );
+      return [...types]
         .filter((schema) => !excludedTypenames.includes(Type.getTypename(schema)))
+        .sort((a, b) => {
+          const aKey = `${Type.getTypename(a)}:${Type.getVersion(a)}`;
+          const bKey = `${Type.getTypename(b)}:${Type.getVersion(b)}`;
+          return aKey.localeCompare(bKey);
+        })
         .map((schema) => {
-          const meta = Type.getMeta(schema);
           return {
             typename: Type.getTypename(schema),
             jsonSchema: JsonSchema.toJsonSchema(schema),
-            kind: meta?.sourceSchema ? 'relation' : 'record',
+            kind: Type.isRelation(schema) ? 'relation' : 'record',
           };
         });
     }),

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

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