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

package/src/crud/graph.ts

@@ -11,23 +11,18 @@ import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
-import { Entity, Filter, Obj, Query, Type } from '@dxos/echo';
-import { Database } from '@dxos/echo';
-import { type Queue } from '@dxos/echo-db';
+import { Database, Entity, Feed, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
 import { isEncodedReference } from '@dxos/echo-protocol';
 import {
   ReferenceAnnotationId,
-  RelationSourceDXNId,
   RelationSourceId,
-  RelationTargetDXNId,
   RelationTargetId,
   createObject,
   getTypeAnnotation,
   getTypeIdentifierAnnotation,
 } from '@dxos/echo/internal';
 import { mapAst } from '@dxos/effect';
-import { ContextQueueService } from '@dxos/functions';
-import { DXN, ObjectId } from '@dxos/keys';
+import { DXN, EID, EntityId, type URI } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { deepMapValues, isNonNullable, trim } from '@dxos/util';
 
@@ -37,8 +32,7 @@ export const Subgraph = Schema.Struct({
   objects: Schema.Array(Schema.Any),
 });
 
-export interface Subgraph extends Schema.Schema.Type<typeof Subgraph> {}
-
+export type Subgraph = Schema.Schema.Type<typeof Subgraph>;
 export type RelatedSchema = {
   schema: Type.AnyEntity;
   kind: 'reference' | 'relation';
@@ -52,19 +46,19 @@ export type RelatedSchema = {
  * @returns
  */
 export const findRelatedSchema = async (db: Database.Database, anchor: Type.AnyEntity): Promise<RelatedSchema[]> => {
-  // TODO(dmaretskyi): Query stored schemas.
-  const allSchemas = await db.graph.schemaRegistry.query().run();
+  const allSchemas = await db.query(Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry())).run();
 
   // TODO(dmaretskyi): Also do references.
   return allSchemas
     .filter((schema) => {
-      if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
+      const annotation = getTypeAnnotation(Type.getSchema(schema));
+      if (annotation?.kind !== Entity.Kind.Relation) {
         return false;
       }
 
       return (
-        isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema)!.sourceSchema!)) ||
-        isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema)!.targetSchema!))
+        isSchemaAddressableByDXN(anchor, annotation.sourceSchema!) ||
+        isSchemaAddressableByDXN(anchor, annotation.targetSchema!)
       );
     })
     .map(
@@ -79,17 +73,12 @@ export const findRelatedSchema = async (db: Database.Database, anchor: Type.AnyE
  * Non-strict DXN comparison.
  * Returns true if the DXN could be resolved to the schema.
  */
-const isSchemaAddressableByDxn = (schema: Type.AnyEntity, dxn: DXN): boolean => {
-  if (getTypeIdentifierAnnotation(schema) === dxn.toString()) {
+const isSchemaAddressableByDXN = (type: Type.AnyEntity, dxn: DXN.DXN): boolean => {
+  if (getTypeIdentifierAnnotation(Type.getSchema(type)) === dxn) {
     return true;
   }
 
-  const t = dxn.asTypeDXN();
-  if (t) {
-    return t.type === Type.getTypename(schema);
-  }
-
-  return false;
+  return DXN.getName(dxn) === Type.getTypename(type);
 };
 
 /**
@@ -106,7 +95,7 @@ export const LocalSearchToolkit = Toolkit.make(
     },
     success: Schema.Unknown,
     failure: Schema.Never,
-    dependencies: [Database.Service],
+    dependencies: [Database.Service, Feed.FeedService],
   }),
 );
 
@@ -115,11 +104,11 @@ export const LocalSearchHandler = LocalSearchToolkit.toLayer({
     const objects = yield* Database.runQuery(Query.select(Filter.text(query, { type: 'vector' })));
     const results = [...objects];
 
-    const option = yield* Effect.serviceOption(ContextQueueService);
-    if (Option.isSome(option)) {
-      const queueObjects = yield* Effect.promise(() => option.value.queue.queryObjects());
-      // TODO(dmaretskyi): Text search on the queue.
-      results.push(...queueObjects);
+    const feedOption = yield* Effect.serviceOption(Feed.ContextFeedService);
+    if (Option.isSome(feedOption)) {
+      const feedObjects = yield* Feed.runQuery(feedOption.value.feed, Filter.everything());
+      // TODO(dmaretskyi): Text search on the feed.
+      results.push(...feedObjects);
     }
 
     return trim`
@@ -150,7 +139,7 @@ export const makeGraphWriterToolkit = ({ schema }: { schema: Type.AnyEntity[] })
       parameters: createExtractionSchema(schema).fields,
       success: Schema.Unknown,
       failure: Schema.Never,
-      dependencies: [Database.Service, ContextQueueService],
+      dependencies: [Database.Service, Feed.ContextFeedService, Feed.FeedService],
     }).annotateContext(Context.make(GraphWriterSchema, { schema })),
   );
 };
@@ -160,7 +149,7 @@ export const makeGraphWriterHandler = (
   {
     onAppend,
   }: {
-    onAppend?: (object: DXN[]) => void;
+    onAppend?: (object: URI.URI[]) => void;
   } = {},
 ) => {
   const { schema } = Context.get(
@@ -171,11 +160,11 @@ export const makeGraphWriterHandler = (
   return toolkit.toLayer({
     graph_writer: Effect.fn(function* (input) {
       const { db } = yield* Database.Service;
-      const { queue } = yield* ContextQueueService;
-      const data = yield* Effect.promise(() => sanitizeObjects(schema, input as any, db, queue));
-      yield* Effect.promise(() => queue.append(data as Obj.Unknown[]));
+      const { feed } = yield* Feed.ContextFeedService;
+      const data = yield* sanitizeObjects(schema, input as any, db, feed);
+      yield* Feed.append(feed, data as Obj.Unknown[]);
 
-      const dxns = data.map((obj) => Obj.getDXN(obj));
+      const dxns = data.map((obj) => Entity.getURI(obj));
       onAppend?.(dxns);
       return dxns;
     }),
@@ -188,149 +177,150 @@ export const makeGraphWriterHandler = (
 export const createExtractionSchema = (types: Type.AnyEntity[]) => {
   return Schema.Struct({
     ...Object.fromEntries(
-      types.map(preprocessSchema).map((schema, index) => [
-        `objects_${getSanitizedSchemaName(types[index])}`,
-        Schema.optional(Schema.Array(schema)).annotations({
-          description: `The objects of type: ${Type.getDXN(types[index])?.asTypeDXN()!.type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option.getOrElse(() => ''))}`,
-        }),
-      ]),
+      types
+        .map((type) => preprocessSchema(Type.getSchema(type)))
+        .map((schema, index) => [
+          `objects_${getSanitizedSchemaName(types[index])}`,
+          Schema.optional(Schema.Array(schema)).annotations({
+            description: `The objects of type: ${DXN.getName(DXN.tryMake(Type.getURI(types[index])!)!)}. ${SchemaAST.getDescriptionAnnotation(Type.getSchema(types[index]).ast).pipe(Option.getOrElse(() => ''))}`,
+          }),
+        ]),
     ),
   });
 };
 
 export const getSanitizedSchemaName = (schema: Type.AnyEntity) => {
-  return Type.getDXN(schema)!
-    .asTypeDXN()!
-    .type.replaceAll(/[^a-zA-Z0-9]+/g, '_');
+  return DXN.getName(DXN.tryMake(Type.getURI(schema)!)!).replaceAll(/[^a-zA-Z0-9]+/g, '_');
 };
 
-export const sanitizeObjects = async (
+export const sanitizeObjects = (
   types: Type.AnyEntity[],
   data: Record<string, readonly unknown[]>,
   db: Database.Database,
-  queue?: Queue,
-): Promise<Obj.Unknown[]> => {
-  const entries = types
-    .map(
-      (type) =>
-        data[`objects_${getSanitizedSchemaName(type)}`]?.map((object: any) => ({
-          data: object,
-          schema: type,
-        })) ?? [],
-    )
-    .flat();
-
-  const idMap = new Map<string, string>();
-  const existingIds = new Set<ObjectId>();
-  const enitties = new Map<ObjectId, Entity.Unknown>();
-
-  const resolveId = (id: string): DXN | undefined => {
-    if (ObjectId.isValid(id)) {
-      existingIds.add(id);
-      return DXN.fromLocalObjectId(id);
-    }
+  feed?: Feed.Feed,
+): Effect.Effect<Entity.Unknown[], never, Feed.FeedService> =>
+  Effect.gen(function* () {
+    const entries = types
+      .map(
+        (type) =>
+          data[`objects_${getSanitizedSchemaName(type)}`]?.map((object: any) => ({
+            data: object,
+            schema: type,
+          })) ?? [],
+      )
+      .flat();
+
+    const idMap = new Map<string, string>();
+    const existingIds = new Set<EntityId>();
+    const enitties = new Map<EntityId, Entity.Unknown>();
+
+    const resolveId = (id: string): EID.EID | undefined => {
+      if (EntityId.isValid(id)) {
+        existingIds.add(id);
+        return EID.make({ entityId: id });
+      }
 
-    const mappedId = idMap.get(id);
-    if (mappedId) {
-      return DXN.fromLocalObjectId(mappedId);
-    }
+      const mappedId = idMap.get(id);
+      if (mappedId && EntityId.isValid(mappedId)) {
+        return EID.make({ entityId: mappedId });
+      }
 
-    return undefined;
-  };
+      return undefined;
+    };
 
-  const res = entries
-    .map((entry) => {
-      // This entry mutates existing object.
-      if (ObjectId.isValid(entry.data.id)) {
+    const res = entries
+      .map((entry) => {
+        // This entry mutates existing object.
+        if (EntityId.isValid(entry.data.id)) {
+          return entry;
+        }
+
+        idMap.set(entry.data.id, EntityId.random());
+        entry.data.id = idMap.get(entry.data.id);
         return entry;
-      }
+      })
+      .map((entry) => {
+        const data = deepMapValues(entry.data, (value, recurse) => {
+          if (isEncodedReference(value)) {
+            const ref = value['/'];
+            const id = resolveId(ref);
+
+            if (id) {
+              // Link to an existing object.
+              return { '/': id.toString() };
+            } else {
+              // Search URIs?
+              return { '/': `search:?q=${encodeURIComponent(ref)}` };
+            }
+          }
 
-      idMap.set(entry.data.id, ObjectId.random());
-      entry.data.id = idMap.get(entry.data.id);
-      return entry;
-    })
-    .map((entry) => {
-      const data = deepMapValues(entry.data, (value, recurse) => {
-        if (isEncodedReference(value)) {
-          const ref = value['/'];
-          const id = resolveId(ref);
-
-          if (id) {
-            // Link to an existing object.
-            return { '/': id.toString() };
-          } else {
-            // Search URIs?
-            return { '/': `search:?q=${encodeURIComponent(ref)}` };
+          return recurse(value);
+        });
+
+        let sourceUri: EID.EID | undefined;
+        let targetUri: EID.EID | undefined;
+        if (Entity.getKind(Type.getSchema(entry.schema)) === 'relation') {
+          sourceUri = resolveId(data.source);
+          if (!sourceUri) {
+            log.warn('source not found', { source: data.source });
           }
+          targetUri = resolveId(data.target);
+          if (!targetUri) {
+            log.warn('target not found', { target: data.target });
+          }
+          delete data.source;
+          delete data.target;
         }
 
-        return recurse(value);
-      });
+        return {
+          data,
+          schema: entry.schema,
+          sourceUri,
+          targetUri,
+        };
+      })
+      .filter((object) => !existingIds.has(object.data.id)); // TODO(dmaretskyi): This dissallows updating existing objects.
+
+    // TODO(dmaretskyi): Use ref resolver.
+    const dbObjects = yield* Effect.promise(() => db.query(Query.select(Filter.id(...existingIds))).run());
+    const feedObjects = feed && existingIds.size > 0 ? yield* Feed.runQuery(feed, Filter.id(...existingIds)) : [];
+    const objects = [...dbObjects, ...feedObjects].filter(isNonNullable);
+
+    // TODO(dmaretskyi): Returns everything if IDs are empty!
+    log.info('objects', { dbObjects, feedObjects, existingIds });
+    const missing = Array.from(existingIds).filter((id) => !objects.some((object) => object.id === id));
+    if (missing.length > 0) {
+      throw new Error(`Object IDs do not point to existing objects: ${missing.join(', ')}`);
+    }
 
-      if (Entity.getKind(entry.schema) === 'relation') {
-        const sourceDxn = resolveId(data.source);
-        if (!sourceDxn) {
-          log.warn('source not found', { source: data.source });
+    return res.flatMap(({ data, schema, sourceUri, targetUri }) => {
+      let skip = false;
+      if (sourceUri) {
+        const id = EID.getEntityId(sourceUri);
+        const obj = objects.find((object) => object.id === id) ?? (id ? enitties.get(id) : undefined);
+        if (obj) {
+          data[RelationSourceId] = obj;
+        } else {
+          skip = true;
         }
-        const targetDxn = resolveId(data.target);
-        if (!targetDxn) {
-          log.warn('target not found', { target: data.target });
-        }
-        delete data.source;
-        delete data.target;
-        data[RelationSourceDXNId] = sourceDxn;
-        data[RelationTargetDXNId] = targetDxn;
       }
-
-      return {
-        data,
-        schema: entry.schema,
-      };
-    })
-    .filter((object) => !existingIds.has(object.data.id)); // TODO(dmaretskyi): This dissallows updating existing objects.
-
-  // TODO(dmaretskyi): Use ref resolver.
-  const dbObjects = await db.query(Query.select(Filter.id(...existingIds))).run();
-  const queueObjects = (await queue?.getObjectsById([...existingIds])) ?? [];
-  const objects = [...dbObjects, ...queueObjects].filter(isNonNullable);
-
-  // TODO(dmaretskyi): Returns everything if IDs are empty!
-  log.info('objects', { dbObjects, queueObjects, existingIds });
-  const missing = Array.from(existingIds).filter((id) => !objects.some((object) => object.id === id));
-  if (missing.length > 0) {
-    throw new Error(`Object IDs do not point to existing objects: ${missing.join(', ')}`);
-  }
-
-  return res.flatMap(({ data, schema }) => {
-    let skip = false;
-    if (RelationSourceDXNId in data) {
-      const id = (data[RelationSourceDXNId] as DXN).asEchoDXN()?.echoId;
-      const obj = objects.find((object) => object.id === id) ?? enitties.get(id!);
-      if (obj) {
-        delete data[RelationSourceDXNId];
-        data[RelationSourceId] = obj;
-      } else {
-        skip = true;
+      if (targetUri) {
+        const id = EID.getEntityId(targetUri);
+        const obj = objects.find((object) => object.id === id) ?? (id ? enitties.get(id) : undefined);
+        if (obj) {
+          data[RelationTargetId] = obj;
+        } else {
+          skip = true;
+        }
       }
-    }
-    if (RelationTargetDXNId in data) {
-      const id = (data[RelationTargetDXNId] as DXN).asEchoDXN()?.echoId;
-      const obj = objects.find((object) => object.id === id) ?? enitties.get(id!);
-      if (obj) {
-        delete data[RelationTargetDXNId];
-        data[RelationTargetId] = obj;
-      } else {
-        skip = true;
+      if (!skip) {
+        const obj = createObject(schema, data);
+        enitties.set(obj.id, obj);
+        return [obj];
       }
-    }
-    if (!skip) {
-      const obj = createObject(schema, data);
-      enitties.set(obj.id, obj);
-      return [obj];
-    }
-    return [];
+      return [];
+    });
   });
-};
 
 const SoftRef = Schema.Struct({
   '/': Schema.String,

package/src/errors.ts

@@ -3,7 +3,7 @@
 //
 
 import { BaseError } from '@dxos/errors';
-import { DXN } from '@dxos/keys';
+import { type EID } from '@dxos/keys';
 
 /**
  * Agent could not execute prompt.
@@ -13,8 +13,8 @@ export class PromptError extends BaseError.extend('PromptError') {
     message: string,
     context: {
       description?: string;
-      prompt?: DXN.String;
-      chat?: DXN.String;
+      prompt?: EID.EID;
+      chat?: EID.EID;
     },
   ) {
     super({

package/src/functions/agent/definitions.ts

@@ -7,6 +7,7 @@ import * as Schema from 'effect/Schema';
 import { AiService, OpaqueToolkit, ModelName } from '@dxos/ai';
 import { Routine, Trace, Operation, OperationRegistry } from '@dxos/compute';
 import { Database, Feed, Ref } from '@dxos/echo';
+import { DXN } from '@dxos/keys';
 import { Text } from '@dxos/schema';
 
 import * as Chat from '../../types/Chat';
@@ -14,9 +15,10 @@ import * as Chat from '../../types/Chat';
 // TODO(dmaretskyi): Rename to RunRoutine.
 export const AgentPrompt = Operation.make({
   meta: {
-    key: 'org.dxos.function.prompt',
+    key: DXN.make('org.dxos.function.prompt'),
     name: 'Run Routine',
     description: 'Agentic worker that executes a provided prompt using blueprints and tools.',
+    icon: 'ph--brain--regular',
   },
   input: Schema.Struct({
     prompt: Ref.Ref(Routine.Routine),
@@ -29,8 +31,8 @@ export const AgentPrompt = Operation.make({
     /**
      * @default @anthropic/claude-opus-4-6
      */
-
     model: Schema.optional(ModelName),
+
     /**
      * Input object or data.
      * References get auto-resolved.
@@ -53,4 +55,4 @@ export const AgentPrompt = Operation.make({
     OperationRegistry.Service,
     Trace.TraceService,
   ],
-}).pipe(Operation.intrinsic);
+});

package/src/functions/agent/prompt.conversations.json

@@ -1 +1 @@
-{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [completeJob] with the output.\nIf you are unable to complete the task, call [completeJob] with the failure reason.\nIf no output is required, call [completeJob] with an empty object: {}\nDo not stop until you call [completeJob].","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01BNfgUBNqETGfNka6Y58SUS","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" user wants me to reply with a single word \"ack\" and complete the job.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EoQCClkIDRgCKkDmvWuElJmvgQqKv/OM8h45Qm9vFiau8OtHTiKeFGzABfFt5k5Oc9XiWXg1jeCrSXFmAcI3XEaKXp6jF8PCj/O0Mg9jbGF1ZGUtb3B1cy00LTY4ABIMidROWDebGP+ji8voGgyiyrnCLJU9DZTeWc0iMJ5ewfC96fa6DHSOj+APcM0VyN0tJiYPjIJI7DxYTiu277zCDVNdAUxNb/k45dQGripZikOeASjJaTuovSm8Ni01mepSojCietSMDfM1xBLbnyPHKxucO7akJRwDczuw8req/NjtOhY492FCt1lagajkZq8/rsICFxutxbPXyHXSY04cd/2+oY9cRAQYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","delta":"{\"success","metadata":{}},{"type":"tool-params-delta","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","delta":"\": \"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":757,"outputTokens":89,"totalTokens":846},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":757,"output_tokens":9,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [completeJob] with the output.\nIf you are unable to complete the task, call [completeJob] with the failure reason.\nIf no output is required, call [completeJob] with an empty object: {}\nDo not stop until you call [completeJob].","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants me to reply with a single word \"ack\" and complete the job.","options":{}},{"type":"tool-call","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01VQiUHtyF77TZd49DrKhnPR","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_017Q7gpzDqQTqmKWouYU2oKt","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":824,"outputTokens":2,"totalTokens":826},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":824,"output_tokens":2,"server_tool_use":null,"service_tier":"standard"}}}}]}]}
+{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [completeJob] with the output.\nIf you are unable to complete the task, call [completeJob] with the failure reason.\nIf no output is required, call [completeJob] with an empty object: {}\nDo not stop until you call [completeJob].","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01JstbpndWJDAhVwAppVJz2H","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The user wants me to reply with a single word: \"ack\".","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EvsBCmMIDhgCKkDoETBa+lesagv7ixB9LGrYHpBYfS/DCnRnegAetRGGWDl0kkFyqVQI7oDc+ZWbyk9tB+4ePqoqNXQXwE3240/HMg9jbGF1ZGUtb3B1cy00LTY4AEIIdGhpbmtpbmcSDFVIZlew/AFp1rmNoxoMPw+kyp+9hoNL5WyHIjDdm7hZK7hOH93slrwJoeXIuYMlv70L5mOQbDviNfFQyGfbuluo3tzWampRVGtohCgqRtiIkY7cWA700K9SVqH4mMfq1sjQ7yYuCRMv2lT7PrbCp3IRJmncUU6avNwBVX6E/hMO7ml/pORVNgsnB8Tn6FrYKqMFENAYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","delta":"{\"success\"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","delta":": ","metadata":{}},{"type":"tool-params-delta","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","delta":"\"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":757,"outputTokens":85,"totalTokens":842},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":757,"output_tokens":60,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [completeJob] with the output.\nIf you are unable to complete the task, call [completeJob] with the failure reason.\nIf no output is required, call [completeJob] with an empty object: {}\nDo not stop until you call [completeJob].","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants me to reply with a single word: \"ack\".","options":{}},{"type":"tool-call","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01KDviPNKjzY2nh9cGmo4oKm","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01Pz14sZtxk8PRuR9CKbe7Fy","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":824,"outputTokens":2,"totalTokens":826},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":824,"output_tokens":2,"server_tool_use":null,"service_tier":"standard"}}}}]}]}

package/src/functions/agent/prompt.test.ts

@@ -5,13 +5,12 @@
 import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
-import { ContextBinding } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { Routine, Operation, OperationHandlerSet } from '@dxos/compute';
-import { Database, Feed, Obj, Ref } from '@dxos/echo';
+import { Database, Feed, Filter, Obj, Ref } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
-import { QueueService } from '@dxos/functions';
 import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
-import { ObjectId } from '@dxos/keys';
+import { EntityId } from '@dxos/keys';
 import { Text } from '@dxos/schema';
 import { Message } from '@dxos/types';
 
@@ -19,19 +18,19 @@ import * as Chat from '../../types/Chat';
 import { AgentPrompt } from './definitions';
 import defaultAgentPrompt from './prompt';
 
-ObjectId.dangerouslyDisableRandomness();
+EntityId.dangerouslyDisableRandomness();
 
 const operationHandlerSet = OperationHandlerSet.make(defaultAgentPrompt);
 
 const TestLayer = AssistantTestLayer({
   operationHandlers: operationHandlerSet,
-  types: [Chat.Chat, Message.Message, ContextBinding, Text.Text],
+  types: [Chat.Chat, Message.Message, AiContext.Binding, Text.Text],
   aiServicePreset: 'edge-remote',
 });
 
-const countQueueMessages = (queue: { queryObjects: () => Promise<Obj.Unknown[]> }) =>
-  Effect.promise(async () => {
-    const items = await queue.queryObjects();
+const countFeedMessages = (feed: Feed.Feed) =>
+  Effect.gen(function* () {
+    const items = yield* Feed.runQuery(feed, Filter.everything());
     return items.filter(Obj.instanceOf(Message.Message)).length;
   });
 
@@ -41,9 +40,7 @@ describe('Agent prompt', () => {
     Effect.fnUntraced(
       function* (_) {
         const feed = yield* Database.add(Feed.make());
-        const queueDxn = Feed.getQueueDxn(feed)!;
-        const queue = yield* QueueService.getQueue<Message.Message | ContextBinding>(queueDxn);
-        const messageCountBefore = yield* countQueueMessages(queue);
+        const messageCountBefore = yield* countFeedMessages(feed);
 
         const chat = yield* Database.add(
           Chat.make({
@@ -68,7 +65,7 @@ describe('Agent prompt', () => {
           chat: Ref.make(chat),
         });
 
-        const messageCountAfter = yield* countQueueMessages(queue);
+        const messageCountAfter = yield* countFeedMessages(feed);
 
         expect(messageCountAfter).toBeGreaterThan(messageCountBefore);
         expect(result).toBe('ack');

package/src/functions/agent/prompt.ts

@@ -62,7 +62,7 @@ export default AgentPrompt.pipe(
           Effect.map(Array.map((option) => option.value)),
         );
 
-        const promptInstructions = yield* Database.load(prompt.instructions.source);
+        const promptInstructions = yield* Database.load(prompt.instructions);
         let promptText = Template.process(promptInstructions.content, input);
 
         if (input !== undefined) {
@@ -100,7 +100,7 @@ export default AgentPrompt.pipe(
         });
 
         const runtime = yield* Effect.runtime<Feed.FeedService>();
-        const session = yield* acquireReleaseResource(() => new AiSession({ feed, runtime }));
+        const session = yield* acquireReleaseResource(() => new AiSession.Session({ feed, runtime }));
 
         yield* Effect.promise(() =>
           session.context.bind({
@@ -213,7 +213,7 @@ const ToolExecutionService = ({ feed }: ToolExecutionServiceOptions) =>
             log('invoking operation', { operationDef, input });
             const result = yield* operationInvoker
               .invoke(operationDef, input, {
-                conversation: Obj.getDXN(feed).toString(),
+                conversation: Obj.getURI(feed),
               })
               .pipe(Effect.orDie);
             log('result', { result });

package/src/sync/sync.ts

@@ -4,9 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Filter, Obj, Query, Ref } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Filter, Obj, Query, Ref } from '@dxos/echo';
 import { failedInvariant } from '@dxos/invariant';
+import { EID } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 /**
@@ -39,22 +39,23 @@ export const syncObjects: (
         if (!ref.target) {
           continue;
         }
-        if (Obj.getDXN(ref.target).isLocalObjectId()) {
+        const targetUri = EID.tryParse(Obj.getURI(ref.target));
+        if (targetUri && EID.isLocal(targetUri)) {
           // obj not persisted to db.
           const [target] = yield* syncObjects([ref.target], { foreignKeyId });
           (obj as any)[key] = Ref.make(target);
         }
       }
 
-      const schema = Obj.getSchema(obj) ?? failedInvariant('No schema.');
+      const type = Obj.getType(obj) ?? failedInvariant('No type.');
       const foreignId = Obj.getKeys(obj, foreignKeyId)[0]?.id ?? failedInvariant('No foreign key.');
       const [existing] = yield* Database.runQuery(
-        Query.select(Filter.foreignKeys(schema, [{ source: foreignKeyId, id: foreignId }])),
+        Query.select(Filter.foreignKeys(type, [{ source: foreignKeyId, id: foreignId }])),
       );
       log('sync object', {
         type: Obj.getTypename(obj),
         foreignId,
-        existing: existing ? Obj.getDXN(existing) : undefined,
+        existing: existing ? Obj.getURI(existing) : undefined,
       });
       if (!existing) {
         yield* Database.add(obj);