@dxos/assistant-toolkit 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/src/crud/graph.ts

@@ -11,9 +11,7 @@ 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, Type } from '@dxos/echo';
 import { isEncodedReference } from '@dxos/echo-protocol';
 import {
   ReferenceAnnotationId,
@@ -26,7 +24,6 @@ import {
   getTypeIdentifierAnnotation,
 } from '@dxos/echo/internal';
 import { mapAst } from '@dxos/effect';
-import { ContextQueueService } from '@dxos/functions';
 import { DXN, ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { deepMapValues, isNonNullable, trim } from '@dxos/util';
@@ -63,8 +60,8 @@ export const findRelatedSchema = async (db: Database.Database, anchor: Type.AnyE
       }
 
       return (
-        isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema)!.sourceSchema!)) ||
-        isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema)!.targetSchema!))
+        isSchemaAddressableByDXN(anchor, DXN.parse(getTypeAnnotation(schema)!.sourceSchema!)) ||
+        isSchemaAddressableByDXN(anchor, DXN.parse(getTypeAnnotation(schema)!.targetSchema!))
       );
     })
     .map(
@@ -79,7 +76,7 @@ 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 => {
+const isSchemaAddressableByDXN = (schema: Type.AnyEntity, dxn: DXN): boolean => {
   if (getTypeIdentifierAnnotation(schema) === dxn.toString()) {
     return true;
   }
@@ -106,7 +103,7 @@ export const LocalSearchToolkit = Toolkit.make(
     },
     success: Schema.Unknown,
     failure: Schema.Never,
-    dependencies: [Database.Service],
+    dependencies: [Database.Service, Feed.FeedService],
   }),
 );
 
@@ -115,11 +112,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 +147,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 })),
   );
 };
@@ -171,9 +168,9 @@ 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));
       onAppend?.(dxns);
@@ -204,133 +201,134 @@ export const getSanitizedSchemaName = (schema: Type.AnyEntity) => {
     .type.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<Obj.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<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);
+      }
 
-    const mappedId = idMap.get(id);
-    if (mappedId) {
-      return DXN.fromLocalObjectId(mappedId);
-    }
+      const mappedId = idMap.get(id);
+      if (mappedId) {
+        return DXN.fromLocalObjectId(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 (ObjectId.isValid(entry.data.id)) {
+          return entry;
+        }
+
+        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)}` };
+            }
+          }
 
-      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);
+        });
+
+        if (Entity.getKind(entry.schema) === 'relation') {
+          const sourceDXN = resolveId(data.source);
+          if (!sourceDXN) {
+            log.warn('source not found', { source: data.source });
           }
+          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 recurse(value);
-      });
+        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 = 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 });
-        }
-        const targetDxn = resolveId(data.target);
-        if (!targetDxn) {
-          log.warn('target not found', { target: data.target });
+    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;
         }
-        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 (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 (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/functions/agent/definitions.ts

@@ -7,13 +7,15 @@ 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 { Text } from '@dxos/schema';
 
 import * as Chat from '../../types/Chat';
 
+// TODO(dmaretskyi): Rename to RunRoutine.
 export const AgentPrompt = Operation.make({
   meta: {
     key: 'org.dxos.function.prompt',
-    name: 'Agent',
+    name: 'Run Routine',
     description: 'Agentic worker that executes a provided prompt using blueprints and tools.',
   },
   input: Schema.Struct({
@@ -27,8 +29,8 @@ export const AgentPrompt = Operation.make({
     /**
      * @default @anthropic/claude-opus-4-6
      */
-
     model: Schema.optional(ModelName),
+
     /**
      * Input object or data.
      * References get auto-resolved.
@@ -40,6 +42,9 @@ export const AgentPrompt = Operation.make({
     }),
   }),
   output: Schema.Any,
+  // ECHO types that the handler loads via Database.load(). Declaring them here ensures the
+  // runtime registers their schema before remote invocation (e.g. via the EDGE function service).
+  types: [Routine.Routine, Text.Text, Feed.Feed, Chat.Chat],
   services: [
     AiService.AiService,
     Database.Service,
@@ -48,4 +53,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_01BJnJPY3oMFLFRKBzfm18k4","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":"EvABClkIDRgCKkDoETBa+lesagv7ixB9LGrYHpBYfS/DCnRnegAetRGGWDl0kkFyqVQI7oDc+ZWbyk9tB+4ePqoqNXQXwE3240/HMg9jbGF1ZGUtb3B1cy00LTY4ABIMZ4jEaKNKFseHE6SGGgxDCMKKPXa0JrDQ52ciMG+cUvHgNQwSWMWlYEBfsVvvwZnDif1WmjybXm26QJIGtpnF/4kQQkk8Re1W0OPoYCpFYVSQgk56gj+oWRLRn8FgcWrdoxhpuw6BVArd0/EEeXi78h9AJPLa7BN30HyfNmAOQ5LiuW8fznNPRzCv1yHLrjw4IE+GGAE="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","delta":"{\"success\": ","metadata":{}},{"type":"tool-params-delta","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","delta":"\"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","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_01N1FCMswXa62WFdsMrbu4Kv","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01XmKNsc4F8Re8N5UEDdxcjp","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_014de59sT4sHe36njza5yiBZ","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/O0Mg9jbGF1ZGUtb3B1cy00LTY4ABIM63lszYQjMtcgEi3WGgzpeUSSrp9JhxxUoGsiMFJjapYnuh9y/rE9xW660c0B5Av77wj/bAOfx2vMXoXlHzL0C9O7TlzfgR+zqrw6cipZeF169zGXzr1tdCpD4N9lF1/HvBBieF/jOP7lhN5GXbuxFHatNfix4ocm9beWxWqOQ+WcOXQWJB8lQu+B/mW1y1MXgwTiQi1rf9OhDxtxXoBiIKCSp0aZPBMYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","delta":"{\"success\": ","metadata":{}},{"type":"tool-params-delta","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","delta":"\"a","metadata":{}},{"type":"tool-params-delta","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","delta":"ck\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","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_01Bn2cwnUQYvUCJ4RsL2SSuY","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01Bn2cwnUQYvUCJ4RsL2SSuY","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01R5VQTdGZLcaSFeVhzNYn6K","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,11 +5,10 @@
 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 { Text } from '@dxos/schema';
@@ -25,13 +24,13 @@ 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

@@ -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({
@@ -149,8 +149,11 @@ export default AgentPrompt.pipe(
           ),
         );
       },
+      Effect.tapBoth({
+        onSuccess: () => Database.flush(),
+        onFailure: () => Database.flush(),
+      }),
       Effect.scoped,
-      Effect.provide(Trace.writerLayerNoop),
     ),
   ),
   Operation.opaqueHandler,

package/src/sync/sync.ts

@@ -4,8 +4,7 @@
 
 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 { log } from '@dxos/log';
 

package/src/types/Agent.ts

@@ -8,16 +8,14 @@ import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 import * as Schema from 'effect/Schema';
 
-import { AiContextBinder, AiContextService } from '@dxos/assistant';
+import { AiContext } from '@dxos/assistant';
 import { type Blueprint } from '@dxos/compute';
 import { Annotation, Database, Feed, Format, Obj, Ref, Relation, Type } from '@dxos/echo';
-import { Queue } from '@dxos/echo-db';
 import { type ObjectNotFoundError } from '@dxos/echo/Err';
-import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
+import { FormInputAnnotation } from '@dxos/echo/internal';
 import { acquireReleaseResource } from '@dxos/effect';
-import { QueueService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
-import { QueueAnnotation, Text } from '@dxos/schema';
+import { Text } from '@dxos/schema';
 
 import * as Chat from './Chat';
 import * as Plan from './Plan';
@@ -64,24 +62,29 @@ export const Agent = Schema.Struct({
     }),
   ).pipe(FormInputAnnotation.set(false)),
 
-  /**
-   * Input feed for subscriptions.
-   */
-  // TODO(burdon): Rename to Feed?
-  // NOTE: Named `queue` to conform to subscribable schema (see QueueAnnotation).
-  queue: Schema.optional(Ref.Ref(Queue).pipe(FormInputAnnotation.set(false))),
-
   /**
    * References to objects with a canonical queue property.
    * Schema must have the QueueAnnotation.
    */
+  // Change to trigger.
   // TODO(dmaretskyi): Turn into an array of objects when form-data
   subscriptions: Schema.Array(Ref.Ref(Obj.Unknown)).pipe(FormInputAnnotation.set(false)),
 
+  /**
+   * Cron expression for a timer trigger that invokes the agent worker on a schedule.
+   * The timer trigger bypasses the qualifier and goes straight to the agent worker.
+   */
+  // Change to trigger.
+  cron: Schema.optional(Schema.String).annotations({
+    title: 'Cron',
+    description: 'Cron expression for a timer trigger that invokes the agent on a schedule.',
+  }),
+
   /**
    * Allow the agent to filter events.
    * Related events will be added to the input queue of the agent.
    * It is recommended to enable this.
+   * @deprecated
    */
   filterEvents: Schema.optional(Schema.Boolean).annotations({
     title: 'Filter events',
@@ -89,20 +92,16 @@ export const Agent = Schema.Struct({
   }),
 
   /**
-   * Cron expression for a timer trigger that invokes the agent worker on a schedule.
-   * The timer trigger bypasses the qualifier and goes straight to the agent worker.
+   * Input feed for subscriptions.
+   * @deprecated Subscriptions will write directly to the agent.
    */
-  cron: Schema.optional(Schema.String).annotations({
-    title: 'Cron',
-    description: 'Cron expression for a timer trigger that invokes the agent on a schedule.',
-  }),
+  feed: Schema.optional(Ref.Ref(Feed.Feed).pipe(FormInputAnnotation.set(false))),
 }).pipe(
   Type.object({
     typename: 'org.dxos.type.agent',
     version: '0.1.0',
   }),
-  LabelAnnotation.set(['name']),
-  QueueAnnotation.set(true),
+  Annotation.LabelAnnotation.set(['name']),
   Annotation.IconAnnotation.set({
     icon: 'ph--drone--regular',
     hue: 'sky',
@@ -126,11 +125,11 @@ export const makeInitialized = (
       contextObjects?: Ref.Ref<Obj.Any>[];
     },
   blueprint: Blueprint.Blueprint,
-): Effect.Effect<Agent, never, QueueService | Feed.FeedService | Database.Service> =>
+): Effect.Effect<Agent, never, Feed.FeedService | Database.Service> =>
   Effect.gen(function* () {
     const agent = Obj.make(Agent, {
       ...props,
-      instructions: Ref.make(Text.make(props.instructions)),
+      instructions: Ref.make(Text.make({ content: props.instructions })),
       plan: Ref.make(Plan.makePlan({ tasks: [] })),
       artifacts: props.artifacts ?? [],
       subscriptions: props.subscriptions ?? [],
@@ -140,7 +139,7 @@ export const makeInitialized = (
     yield* Database.add(agent);
     const feed = yield* Database.add(Feed.make());
     const runtime = yield* Effect.runtime<Feed.FeedService>();
-    const contextBinder = new AiContextBinder({ feed, runtime });
+    const contextBinder = new AiContext.Binder({ feed, runtime });
     // TODO(dmaretskyi): Blueprint registry.
     const agentBlueprint = yield* Database.add(Obj.clone(blueprint, { deep: true }));
     yield* Effect.promise(() =>
@@ -163,11 +162,11 @@ export const makeInitialized = (
       }),
     );
 
-    const inputQueue = yield* QueueService.createQueue();
+    const inputFeed = yield* Database.add(Feed.make());
 
     Obj.update(agent, (agent) => {
       agent.chat = Ref.make(chat);
-      agent.queue = Ref.fromDXN(inputQueue.dxn);
+      agent.feed = Ref.make(inputFeed);
     });
 
     return agent;
@@ -193,7 +192,7 @@ export const resetChatHistory = (
     const runtime = yield* Effect.runtime<Feed.FeedService>();
     const existingContextBinder = yield* acquireReleaseResource(
       () =>
-        new AiContextBinder({
+        new AiContext.Binder({
           feed: existingFeed,
           runtime,
         }),
@@ -202,7 +201,7 @@ export const resetChatHistory = (
     const objects = existingContextBinder.getObjects().map((object) => Ref.make(object));
 
     const feed = yield* Database.add(Feed.make());
-    const contextBinder = new AiContextBinder({ feed, runtime });
+    const contextBinder = new AiContext.Binder({ feed, runtime });
     yield* Effect.promise(() =>
       contextBinder.bind({
         blueprints,
@@ -228,8 +227,8 @@ export const resetChatHistory = (
     );
   }).pipe(Effect.scoped);
 
-export const getFromChatContext: Effect.Effect<Agent, Error, AiContextService> = Effect.gen(function* () {
-  const agents = yield* Function.pipe(AiContextService.findObjects(Agent));
+export const getFromChatContext: Effect.Effect<Agent, Error, AiContext.Service> = Effect.gen(function* () {
+  const agents = yield* Function.pipe(AiContext.Service.findObjects(Agent));
   if (agents.length !== 1) {
     return yield* Effect.fail(new Error(`There should be exactly one agent in context. Got: ${agents.length}`));
   }