@dxos/assistant-toolkit 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "Assistant toolkit, definitions, and utilities.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,28 +30,28 @@
     "@effect/platform": "^0.92.1",
     "dfx": "^0.126.0",
     "exa-js": "^1.5.12",
-    "@dxos/ai": "0.8.4-main.72ec0f3",
-    "@dxos/assistant": "0.8.4-main.72ec0f3",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/context": "0.8.4-main.72ec0f3",
-    "@dxos/conductor": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/echo-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/edge-client": "0.8.4-main.72ec0f3",
-    "@dxos/errors": "0.8.4-main.72ec0f3",
-    "@dxos/functions-runtime": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-markdown": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.7ace549",
+    "@dxos/app-framework": "0.8.4-main.7ace549",
+    "@dxos/blueprints": "0.8.4-main.7ace549",
+    "@dxos/conductor": "0.8.4-main.7ace549",
+    "@dxos/context": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/assistant": "0.8.4-main.7ace549",
+    "@dxos/echo-protocol": "0.8.4-main.7ace549",
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/edge-client": "0.8.4-main.7ace549",
+    "@dxos/functions": "0.8.4-main.7ace549",
+    "@dxos/functions-runtime": "0.8.4-main.7ace549",
+    "@dxos/errors": "0.8.4-main.7ace549",
+    "@dxos/effect": "0.8.4-main.7ace549",
+    "@dxos/keys": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/plugin-markdown": "0.8.4-main.7ace549",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7ace549",
+    "@dxos/schema": "0.8.4-main.7ace549",
+    "@dxos/types": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "effect": "3.18.3",

package/src/crud/graph.ts

@@ -11,20 +11,14 @@ import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
-import { Obj, type Relation } from '@dxos/echo';
-import { Filter, Query } from '@dxos/echo';
+import { Entity, Filter, Obj, Query, Type } from '@dxos/echo';
 import {
-  EntityKind,
-  ObjectId,
   ReferenceAnnotationId,
   RelationSourceDXNId,
   RelationSourceId,
   RelationTargetDXNId,
   RelationTargetId,
-  create,
-  getEntityKind,
-  getSchemaDXN,
-  getSchemaTypename,
+  createObject,
   getTypeAnnotation,
   getTypeIdentifierAnnotation,
 } from '@dxos/echo/internal';
@@ -32,7 +26,7 @@ import { type EchoDatabase, type Queue } from '@dxos/echo-db';
 import { isEncodedReference } from '@dxos/echo-protocol';
 import { mapAst } from '@dxos/effect';
 import { ContextQueueService, DatabaseService } from '@dxos/functions';
-import { DXN } from '@dxos/keys';
+import { DXN, ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { deepMapValues, isNonNullable, trim } from '@dxos/util';
 
@@ -66,7 +60,7 @@ export const findRelatedSchema = async (
   // TODO(dmaretskyi): Also do references.
   return allSchemas
     .filter((schema) => {
-      if (getTypeAnnotation(schema)?.kind !== EntityKind.Relation) {
+      if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
         return false;
       }
 
@@ -94,7 +88,7 @@ const isSchemaAddressableByDxn = (schema: Schema.Schema.AnyNoContext, dxn: DXN):
 
   const t = dxn.asTypeDXN();
   if (t) {
-    return t.type === getSchemaTypename(schema);
+    return t.type === Type.getTypename(schema);
   }
 
   return false;
@@ -199,7 +193,7 @@ export const createExtractionSchema = (types: Schema.Schema.AnyNoContext[]) => {
       types.map(preprocessSchema).map((schema, index) => [
         `objects_${getSanitizedSchemaName(types[index])}`,
         Schema.optional(Schema.Array(schema)).annotations({
-          description: `The objects of type: ${getSchemaDXN(types[index])?.asTypeDXN()!.type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option.getOrElse(() => ''))}`,
+          description: `The objects of type: ${Type.getDXN(types[index])?.asTypeDXN()!.type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option.getOrElse(() => ''))}`,
         }),
       ]),
     ),
@@ -207,7 +201,7 @@ export const createExtractionSchema = (types: Schema.Schema.AnyNoContext[]) => {
 };
 
 export const getSanitizedSchemaName = (schema: Schema.Schema.AnyNoContext) => {
-  return getSchemaDXN(schema)!
+  return Type.getDXN(schema)!
     .asTypeDXN()!
     .type.replaceAll(/[^a-zA-Z0-9]+/g, '_');
 };
@@ -230,7 +224,7 @@ export const sanitizeObjects = async (
 
   const idMap = new Map<string, string>();
   const existingIds = new Set<ObjectId>();
-  const enitties = new Map<ObjectId, Obj.Any | Relation.Any>();
+  const enitties = new Map<ObjectId, Entity.Unknown>();
 
   const resolveId = (id: string): DXN | undefined => {
     if (ObjectId.isValid(id)) {
@@ -275,7 +269,7 @@ export const sanitizeObjects = async (
         return recurse(value);
       });
 
-      if (getEntityKind(entry.schema) === 'relation') {
+      if (Entity.getKind(entry.schema) === 'relation') {
         const sourceDxn = resolveId(data.source);
         if (!sourceDxn) {
           log.warn('source not found', { source: data.source });
@@ -332,7 +326,7 @@ export const sanitizeObjects = async (
       }
     }
     if (!skip) {
-      const obj = create(schema, data);
+      const obj = createObject(schema, data);
       enitties.set(obj.id, obj);
       return [obj];
     }
@@ -347,7 +341,7 @@ const SoftRef = Schema.Struct({
 });
 
 const preprocessSchema = (schema: Schema.Schema.AnyNoContext) => {
-  const isRelationSchema = getEntityKind(schema) === 'relation';
+  const isRelationSchema = Entity.getKind(schema) === 'relation';
 
   const go = (ast: SchemaAST.AST, visited = new Set<SchemaAST.AST>()): SchemaAST.AST => {
     if (visited.has(ast)) {

package/src/functions/entity-extraction/entity-extraction.ts

@@ -15,7 +15,7 @@ import { DatabaseService, defineFunction } from '@dxos/functions';
 import { FunctionInvocationServiceLayerTest } from '@dxos/functions-runtime/testing';
 import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { LegacyOrganization, Message, Organization, Person } from '@dxos/types';
+import { type Actor, LegacyOrganization, Message, Organization, Person } from '@dxos/types';
 import { trim } from '@dxos/util';
 
 import { makeGraphWriterHandler, makeGraphWriterToolkit } from '../../crud';
@@ -39,8 +39,9 @@ export default defineFunction({
     ),
   }),
   handler: Effect.fnUntraced(
-    function* ({ data: { source, instructions } }) {
-      const contact = yield* extractContact(source);
+    function* ({ data: { source: message, instructions } }) {
+      const tags = Obj.getMeta(message)?.tags;
+      const contact = yield* extractContact(message.sender, tags);
       let organization: Organization.Organization | null = null;
 
       if (contact && !contact.organization) {
@@ -59,7 +60,7 @@ export default defineFunction({
             The extracted organization URL must match the sender's email domain.
             ${instructions ? '<user_intructions>' + instructions + '</user_intructions>' : ''},
           `,
-          prompt: JSON.stringify({ source, contact }),
+          prompt: JSON.stringify({ source: message, contact }),
           toolkit,
         });
 
@@ -68,7 +69,7 @@ export default defineFunction({
         } else if (created.length === 1) {
           organization = yield* DatabaseService.resolve(created[0], Organization.Organization);
           Obj.getMeta(organization).tags ??= [];
-          Obj.getMeta(organization).tags!.push(...(Obj.getMeta(source)?.tags ?? []));
+          Obj.getMeta(organization).tags!.push(...(tags ?? []));
           contact.organization = Ref.make(organization);
         }
       }
@@ -92,11 +93,11 @@ export default defineFunction({
   ),
 });
 
-const extractContact = Effect.fn('extractContact')(function* (message: Message.Message) {
-  const name = message.sender.name;
-  const email = message.sender.email;
+const extractContact = Effect.fn('extractContact')(function* (actor: Actor.Actor, tags?: string[]) {
+  const name = actor.name;
+  const email = actor.email;
   if (!email) {
-    log.warn('email is required for contact extraction', { sender: message.sender });
+    log.warn('email is required for contact extraction', { actor });
     return undefined;
   }
 
@@ -114,9 +115,7 @@ const extractContact = Effect.fn('extractContact')(function* (message: Message.M
   }
 
   const newContact = Obj.make(Person.Person, {
-    [Obj.Meta]: {
-      tags: Obj.getMeta(message)?.tags,
-    },
+    [Obj.Meta]: { tags },
     emails: [{ value: email }],
   });
   yield* DatabaseService.add(newContact);

package/src/functions/research/research-graph.ts

@@ -7,6 +7,7 @@ import * as Layer from 'effect/Layer';
 import * as Schema from 'effect/Schema';
 
 import { Obj, Query, Ref, Type } from '@dxos/echo';
+import { SystemTypeAnnotation } from '@dxos/echo/internal';
 import { Queue } from '@dxos/echo-db';
 import { ContextQueueService, DatabaseService, QueueService } from '@dxos/functions';
 
@@ -20,6 +21,7 @@ export const ResearchGraph = Schema.Struct({
     typename: 'dxos.org/type/ResearchGraph',
     version: '0.1.0',
   }),
+  SystemTypeAnnotation.set(true),
 );
 
 export interface ResearchGraph extends Schema.Schema.Type<typeof ResearchGraph> {}

package/src/functions/research/types.ts

@@ -9,7 +9,7 @@ import { Event, HasConnection, HasRelationship, LegacyOrganization, LegacyPerson
 /**
  * Data types for research.
  */
-export const ResearchDataTypes: (Type.Obj.Any | Type.Relation.Any)[] = [
+export const ResearchDataTypes: Type.Entity.Any[] = [
   // Objects
   Event.Event,
   LegacyOrganization,

package/src/plugins.tsx

@@ -6,11 +6,11 @@ import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { type AnyCapability, Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { type Obj, Type } from '@dxos/echo';
+import { Format, type Obj, Type } from '@dxos/echo';
 import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
 
 export const MapSchema = Schema.Struct({
-  coordinates: Type.Format.GeoPoint,
+  coordinates: Format.GeoPoint,
 }).pipe(
   Type.Obj({
     typename: 'example.com/type/Map',