@dxos/assistant-toolkit 0.8.4-main.7ace549 → 0.8.4-main.937b3ca

package/dist/lib/browser/index.mjs

@@ -1,13 +1,11 @@
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+import {
+  __export
+} from "./chunk-J5LGTIGS.mjs";
 
 // src/blueprints/design/design-blueprint.ts
 import { ToolId } from "@dxos/ai";
 import { Blueprint } from "@dxos/blueprints";
-import { Obj as Obj10, Ref as Ref6 } from "@dxos/echo";
+import { Ref as Ref6 } from "@dxos/echo";
 import { Text as Text2 } from "@dxos/schema";
 import { trim as trim5 } from "@dxos/util";
 
@@ -22,7 +20,8 @@ import { AiService, ConsolePrinter, ModelName } from "@dxos/ai";
 import { AiSession, GenerationObserver, createToolkit } from "@dxos/assistant";
 import { Prompt, Template } from "@dxos/blueprints";
 import { Obj, Ref, Type } from "@dxos/echo";
-import { DatabaseService, TracingService, defineFunction } from "@dxos/functions";
+import { Database } from "@dxos/echo";
+import { TracingService, defineFunction } from "@dxos/functions";
 import { log } from "@dxos/log";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant-toolkit/src/functions/agent/prompt.ts";
 var DEFAULT_MODEL = "@anthropic/claude-opus-4-0";
@@ -51,19 +50,19 @@ var prompt_default = defineFunction({
       input: data.input
     }, {
       F: __dxlog_file,
-      L: 40,
+      L: 41,
       S: this,
       C: (f, a) => f(...a)
     });
     const input = yield* Match.value(data.input).pipe(Match.when((value2) => Ref.isRef(value2), Effect.fnUntraced(function* (ref) {
-      const object = yield* DatabaseService.load(ref);
+      const object = yield* Database.Service.load(ref);
       return Obj.toJSON(object);
     })), Match.orElse(() => Effect.succeed(data.input)));
-    yield* DatabaseService.flush({
+    yield* Database.Service.flush({
       indexes: true
     });
-    const prompt = yield* DatabaseService.load(data.prompt);
-    const systemPrompt = data.systemPrompt ? yield* DatabaseService.load(data.systemPrompt) : void 0;
+    const prompt = yield* Database.Service.load(data.prompt);
+    const systemPrompt = data.systemPrompt ? yield* Database.Service.load(data.systemPrompt) : void 0;
     yield* TracingService.emitStatus({
       message: `Running ${prompt.id}`
     });
@@ -72,18 +71,18 @@ var prompt_default = defineFunction({
       input
     }, {
       F: __dxlog_file,
-      L: 70,
+      L: 71,
       S: this,
       C: (f, a) => f(...a)
     });
-    const blueprints = yield* Function.pipe(prompt.blueprints, Array2.appendAll(systemPrompt?.blueprints ?? []), Effect.forEach(DatabaseService.loadOption), Effect.map(Array2.filter(Option.isSome)), Effect.map(Array2.map((option) => option.value)));
-    const objects = yield* Function.pipe(prompt.context, Array2.appendAll(systemPrompt?.context ?? []), Effect.forEach(DatabaseService.loadOption), Effect.map(Array2.filter(Option.isSome)), Effect.map(Array2.map((option) => option.value)));
+    const blueprints = yield* Function.pipe(prompt.blueprints, Array2.appendAll(systemPrompt?.blueprints ?? []), Effect.forEach(Database.Service.loadOption), Effect.map(Array2.filter(Option.isSome)), Effect.map(Array2.map((option) => option.value)));
     const toolkit = yield* createToolkit({
       blueprints
     });
-    const promptInstructions = yield* DatabaseService.load(prompt.instructions.source);
+    const objects = yield* Function.pipe(prompt.context, Array2.appendAll(systemPrompt?.context ?? []), Effect.forEach(Database.Service.loadOption), Effect.map(Array2.filter(Option.isSome)), Effect.map(Array2.map((option) => option.value)));
+    const promptInstructions = yield* Database.Service.load(prompt.instructions.source);
     const promptText = Template.process(promptInstructions.content, input);
-    const systemInstructions = systemPrompt ? yield* DatabaseService.load(systemPrompt.instructions.source) : void 0;
+    const systemInstructions = systemPrompt ? yield* Database.Service.load(systemPrompt.instructions.source) : void 0;
     const systemText = systemInstructions ? Template.process(systemInstructions.content, {}) : void 0;
     const session = new AiSession();
     const result = yield* session.run({
@@ -211,7 +210,15 @@ var fetch_messages_default = defineFunction2({
       throw new Error("no channels found");
     }
     for (const channel of channels) {
-      console.log(channel.id, "name" in channel ? channel.name : void 0);
+      log2.info("channel", {
+        id: channel.id,
+        name: "name" in channel ? channel.name : void 0
+      }, {
+        F: __dxlog_file2,
+        L: 136,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     }
     yield* TracingService2.emitStatus({
       message: `Will fetch from channels: ${channels.length}`
@@ -312,7 +319,8 @@ var Discord;
 import * as Effect3 from "effect/Effect";
 import * as Schema3 from "effect/Schema";
 import { ArtifactId } from "@dxos/assistant";
-import { DatabaseService as DatabaseService2, defineFunction as defineFunction3 } from "@dxos/functions";
+import { Database as Database2 } from "@dxos/echo";
+import { defineFunction as defineFunction3 } from "@dxos/functions";
 import { Markdown } from "@dxos/plugin-markdown/types";
 var read_default = defineFunction3({
   key: "dxos.org/function/markdown/read",
@@ -327,8 +335,8 @@ var read_default = defineFunction3({
     content: Schema3.String
   }),
   handler: Effect3.fn(function* ({ data: { id } }) {
-    const doc = yield* DatabaseService2.resolve(ArtifactId.toDXN(id), Markdown.Document);
-    const { content } = yield* DatabaseService2.load(doc.content);
+    const doc = yield* Database2.Service.resolve(ArtifactId.toDXN(id), Markdown.Document);
+    const { content } = yield* Database2.Service.load(doc.content);
     return {
       content
     };
@@ -339,7 +347,8 @@ var read_default = defineFunction3({
 import * as Effect4 from "effect/Effect";
 import * as Schema4 from "effect/Schema";
 import { ArtifactId as ArtifactId2 } from "@dxos/assistant";
-import { DatabaseService as DatabaseService3, defineFunction as defineFunction4 } from "@dxos/functions";
+import { Database as Database3, Obj as Obj3 } from "@dxos/echo";
+import { defineFunction as defineFunction4 } from "@dxos/functions";
 import { Markdown as Markdown2 } from "@dxos/plugin-markdown/types";
 var update_default = defineFunction4({
   key: "dxos.org/function/markdown/update",
@@ -355,9 +364,11 @@ var update_default = defineFunction4({
   }),
   outputSchema: Schema4.Void,
   handler: Effect4.fn(function* ({ data: { id, content } }) {
-    const doc = yield* DatabaseService3.resolve(ArtifactId2.toDXN(id), Markdown2.Document);
-    const text = yield* DatabaseService3.load(doc.content);
-    text.content = content;
+    const doc = yield* Database3.Service.resolve(ArtifactId2.toDXN(id), Markdown2.Document);
+    const text = yield* Database3.Service.load(doc.content);
+    Obj3.change(text, (t) => {
+      t.content = content;
+    });
   })
 });
 
@@ -376,8 +387,9 @@ import * as Predicate from "effect/Predicate";
 import * as Schema11 from "effect/Schema";
 import { AiService as AiService3 } from "@dxos/ai";
 import { AiSession as AiSession3, makeToolExecutionServiceFromFunctions as makeToolExecutionServiceFromFunctions2, makeToolResolverFromFunctions as makeToolResolverFromFunctions2 } from "@dxos/assistant";
-import { Filter as Filter2, Obj as Obj7, Ref as Ref3 } from "@dxos/echo";
-import { DatabaseService as DatabaseService8, defineFunction as defineFunction9 } from "@dxos/functions";
+import { Filter as Filter2, Obj as Obj8, Ref as Ref3, Type as Type4 } from "@dxos/echo";
+import { Database as Database8 } from "@dxos/echo";
+import { defineFunction as defineFunction9 } from "@dxos/functions";
 import { FunctionInvocationServiceLayerTest } from "@dxos/functions-runtime/testing";
 import { log as log5 } from "@dxos/log";
 import { LegacyOrganization as LegacyOrganization2, Message as Message2, Organization, Person as Person2 } from "@dxos/types";
@@ -392,11 +404,12 @@ import * as Function3 from "effect/Function";
 import * as Option3 from "effect/Option";
 import * as Schema5 from "effect/Schema";
 import * as SchemaAST from "effect/SchemaAST";
-import { Entity, Filter, Obj as Obj3, Query, Type as Type2 } from "@dxos/echo";
+import { Entity, Filter, Obj as Obj4, Query, Type as Type2 } from "@dxos/echo";
+import { Database as Database4 } from "@dxos/echo";
 import { ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, createObject, getTypeAnnotation, getTypeIdentifierAnnotation } from "@dxos/echo/internal";
 import { isEncodedReference } from "@dxos/echo-protocol";
 import { mapAst } from "@dxos/effect";
-import { ContextQueueService, DatabaseService as DatabaseService4 } from "@dxos/functions";
+import { ContextQueueService } from "@dxos/functions";
 import { DXN, ObjectId } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { deepMapValues, isNonNullable, trim } from "@dxos/util";
@@ -406,17 +419,15 @@ var Subgraph = Schema5.Struct({
   objects: Schema5.Array(Schema5.Any)
 });
 var findRelatedSchema = async (db, anchor) => {
-  const allSchemas = [
-    ...db.graph.schemaRegistry.schemas
-  ];
+  const allSchemas = await db.graph.schemaRegistry.query().run();
   return allSchemas.filter((schema) => {
     if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
       return false;
     }
     return isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).targetSchema));
   }).map((schema) => ({
-    schema,
-    kind: "relation"
+    kind: "relation",
+    schema
   }));
 };
 var isSchemaAddressableByDxn = (schema, dxn) => {
@@ -439,12 +450,12 @@ var LocalSearchToolkit = Toolkit.make(Tool.make("search_local_search", {
   success: Schema5.Unknown,
   failure: Schema5.Never,
   dependencies: [
-    DatabaseService4
+    Database4.Service
   ]
 }));
 var LocalSearchHandler = LocalSearchToolkit.toLayer({
   search_local_search: Effect5.fn(function* ({ query }) {
-    const { objects } = yield* DatabaseService4.runQuery(Query.select(Filter.text(query, {
+    const objects = yield* Database4.Service.runQuery(Query.select(Filter.text(query, {
       type: "vector"
     })));
     const results = [
@@ -471,7 +482,7 @@ var makeGraphWriterToolkit = ({ schema }) => {
     success: Schema5.Unknown,
     failure: Schema5.Never,
     dependencies: [
-      DatabaseService4,
+      Database4.Service,
       ContextQueueService
     ]
   }).annotateContext(Context.make(GraphWriterSchema, {
@@ -482,11 +493,11 @@ var makeGraphWriterHandler = (toolkit, { onAppend } = {}) => {
   const { schema } = Context.get(toolkit.tools.graph_writer.annotations, GraphWriterSchema);
   return toolkit.toLayer({
     graph_writer: Effect5.fn(function* (input) {
-      const { db } = yield* DatabaseService4;
+      const { db } = yield* Database4.Service;
       const { queue } = yield* ContextQueueService;
       const data = yield* Effect5.promise(() => sanitizeObjects(schema, input, db, queue));
       yield* Effect5.promise(() => queue.append(data));
-      const dxns = data.map((obj) => Obj3.getDXN(obj));
+      const dxns = data.map((obj) => Obj4.getDXN(obj));
       onAppend?.(dxns);
       return dxns;
     })
@@ -555,7 +566,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           source: data2.source
         }, {
           F: __dxlog_file3,
-          L: 275,
+          L: 273,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -566,7 +577,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           target: data2.target
         }, {
           F: __dxlog_file3,
-          L: 279,
+          L: 277,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -581,7 +592,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
       schema: entry.schema
     };
   }).filter((object) => !existingIds.has(object.data.id));
-  const { objects: dbObjects } = await db.query(Query.select(Filter.ids(...existingIds))).run();
+  const dbObjects = await db.query(Query.select(Filter.id(...existingIds))).run();
   const queueObjects = await queue?.getObjectsById([
     ...existingIds
   ]) ?? [];
@@ -595,7 +606,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     existingIds
   }, {
     F: __dxlog_file3,
-    L: 300,
+    L: 298,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -670,8 +681,9 @@ var preprocessSchema = (schema) => {
 import * as Effect6 from "effect/Effect";
 import * as Schema6 from "effect/Schema";
 import { ArtifactId as ArtifactId3 } from "@dxos/assistant";
-import { Obj as Obj4, Relation } from "@dxos/echo";
-import { DatabaseService as DatabaseService5, TracingService as TracingService3, defineFunction as defineFunction5 } from "@dxos/functions";
+import { Obj as Obj5, Relation } from "@dxos/echo";
+import { Database as Database5 } from "@dxos/echo";
+import { TracingService as TracingService3, defineFunction as defineFunction5 } from "@dxos/functions";
 import { log as log4 } from "@dxos/log";
 import { Markdown as Markdown3 } from "@dxos/plugin-markdown/types";
 import { HasSubject } from "@dxos/types";
@@ -709,27 +721,27 @@ var document_create_default = defineFunction5({
       content
     }, {
       F: __dxlog_file4,
-      L: 42,
+      L: 43,
       S: this,
       C: (f, a) => f(...a)
     });
-    yield* DatabaseService5.flush({
+    yield* Database5.Service.flush({
       indexes: true
     });
     yield* TracingService3.emitStatus({
       message: "Creating research document..."
     });
-    const target = yield* DatabaseService5.resolve(ArtifactId3.toDXN(subject));
-    const object = yield* DatabaseService5.add(Markdown3.make({
+    const target = yield* Database5.Service.resolve(ArtifactId3.toDXN(subject));
+    const object = yield* Database5.Service.add(Markdown3.make({
       name,
       content
     }));
-    yield* DatabaseService5.add(Relation.make(HasSubject.HasSubject, {
+    yield* Database5.Service.add(Relation.make(HasSubject.HasSubject, {
       [Relation.Source]: object,
       [Relation.Target]: target,
       completedAt: (/* @__PURE__ */ new Date()).toISOString()
     }));
-    yield* DatabaseService5.flush({
+    yield* Database5.Service.flush({
       indexes: true
     });
     log4.info("Created research document", {
@@ -737,12 +749,12 @@ var document_create_default = defineFunction5({
       object
     }, {
       F: __dxlog_file4,
-      L: 69,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
     return {
-      document: Obj4.getDXN(object).toString()
+      document: Obj5.getDXN(object).toString()
     };
   })
 });
@@ -760,8 +772,9 @@ import * as String10 from "effect/String";
 import { AiService as AiService2, ConsolePrinter as ConsolePrinter2 } from "@dxos/ai";
 import { AiSession as AiSession2, GenerationObserver as GenerationObserver2, createToolkit as createToolkit2, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from "@dxos/assistant";
 import { Template as Template2 } from "@dxos/blueprints";
-import { Obj as Obj6 } from "@dxos/echo";
-import { DatabaseService as DatabaseService7, TracingService as TracingService4, defineFunction as defineFunction8 } from "@dxos/functions";
+import { Entity as Entity2, Obj as Obj7 } from "@dxos/echo";
+import { Database as Database7 } from "@dxos/echo";
+import { TracingService as TracingService4, defineFunction as defineFunction8 } from "@dxos/functions";
 import { FunctionInvocationServiceLayerTestMocked } from "@dxos/functions-runtime/testing";
 import { Person } from "@dxos/types";
 import { trim as trim3 } from "@dxos/util";
@@ -802,7 +815,7 @@ import * as Effect8 from "effect/Effect";
 import * as Schema8 from "effect/Schema";
 import { defineFunction as defineFunction7 } from "@dxos/functions";
 
-// src/testing/data/exa-search-1748337321991.ts
+// src/functions/exa/data/exa-search-1748337321991.ts
 var exa_search_1748337321991_default = {
   requestId: "324936368a74f4db978982172bc18a6c",
   autopromptString: "AI personal knowledge management tools projects 2024",
@@ -958,7 +971,7 @@ var exa_search_1748337321991_default = {
   }
 };
 
-// src/testing/data/exa-search-1748337331526.ts
+// src/functions/exa/data/exa-search-1748337331526.ts
 var exa_search_1748337331526_default = {
   requestId: "0dc12e344fa649884456960ca1a54954",
   autopromptString: "PKM software artificial intelligence integration open source projects",
@@ -1181,7 +1194,7 @@ npm run tauri dev
   }
 };
 
-// src/testing/data/exa-search-1748337344119.ts
+// src/functions/exa/data/exa-search-1748337344119.ts
 var exa_search_1748337344119_default = {
   requestId: "32df0c541f9883180b35e04caece4374",
   autopromptString: "open source AI knowledge management projects features comparison 2024",
@@ -1304,7 +1317,7 @@ var exa_search_1748337344119_default = {
   }
 };
 
-// src/testing/data/index.ts
+// src/functions/exa/data/index.ts
 var SEARCH_RESULTS = [
   exa_search_1748337321991_default,
   exa_search_1748337331526_default,
@@ -1361,29 +1374,30 @@ var levenshteinDistance = (str1, str2) => {
 import * as Effect9 from "effect/Effect";
 import * as Layer2 from "effect/Layer";
 import * as Schema9 from "effect/Schema";
-import { Obj as Obj5, Query as Query2, Ref as Ref2, Type as Type3 } from "@dxos/echo";
+import { Obj as Obj6, Query as Query2, Ref as Ref2, Type as Type3 } from "@dxos/echo";
+import { Database as Database6 } from "@dxos/echo";
 import { SystemTypeAnnotation } from "@dxos/echo/internal";
 import { Queue } from "@dxos/echo-db";
-import { ContextQueueService as ContextQueueService2, DatabaseService as DatabaseService6, QueueService } from "@dxos/functions";
+import { ContextQueueService as ContextQueueService2, QueueService } from "@dxos/functions";
 var ResearchGraph = Schema9.Struct({
   queue: Type3.Ref(Queue)
-}).pipe(Type3.Obj({
+}).pipe(Type3.object({
   typename: "dxos.org/type/ResearchGraph",
   version: "0.1.0"
 }), SystemTypeAnnotation.set(true));
 var queryResearchGraph = Effect9.fn("queryResearchGraph")(function* () {
-  const { objects } = yield* DatabaseService6.runQuery(Query2.type(ResearchGraph));
+  const objects = yield* Database6.Service.runQuery(Query2.type(ResearchGraph));
   return objects.at(0);
 });
 var createResearchGraph = Effect9.fn("createResearchGraph")(function* () {
   const queue = yield* QueueService.createQueue();
-  return yield* DatabaseService6.add(Obj5.make(ResearchGraph, {
+  return yield* Database6.Service.add(Obj6.make(ResearchGraph, {
     queue: Ref2.fromDXN(queue.dxn)
   }));
 });
 var contextQueueLayerFromResearchGraph = Layer2.unwrapEffect(Effect9.gen(function* () {
   const researchGraph = (yield* queryResearchGraph()) ?? (yield* createResearchGraph());
-  const researchQueue = yield* DatabaseService6.load(researchGraph.queue);
+  const researchQueue = yield* Database6.Service.load(researchGraph.queue);
   return ContextQueueService2.layer(researchQueue);
 }));
 
@@ -1452,7 +1466,7 @@ var research_default = defineFunction8({
   }),
   handler: Effect10.fnUntraced(function* ({ data: { query, instructions: instructions6, mockSearch = false, entityExtraction = false } }) {
     if (mockSearch) {
-      const mockPerson = yield* DatabaseService7.add(Obj6.make(Person.Person, {
+      const mockPerson = yield* Database7.Service.add(Obj7.make(Person.Person, {
         preferredName: "John Doe",
         emails: [
           {
@@ -1468,14 +1482,14 @@ var research_default = defineFunction8({
       return {
         document: trim3`
             The research ran in test-mode and was mocked. Proceed as usual.
-            We reference John Doe to test reference: ${Obj6.getDXN(mockPerson)}
+            We reference John Doe to test reference: ${Obj7.getDXN(mockPerson)}
           `,
         objects: [
-          Obj6.toJSON(mockPerson)
+          Obj7.toJSON(mockPerson)
         ]
       };
     }
-    yield* DatabaseService7.flush({
+    yield* Database7.Service.flush({
       indexes: true
     });
     yield* TracingService4.emitStatus({
@@ -1509,7 +1523,7 @@ var research_default = defineFunction8({
         tag: "research"
       }))
     });
-    const objects = yield* Effect10.forEach(objectDXNs, (dxn) => DatabaseService7.resolve(dxn)).pipe(Effect10.map(Array6.map((obj) => Obj6.toJSON(obj))));
+    const objects = yield* Effect10.forEach(objectDXNs, (dxn) => Database7.Service.resolve(dxn)).pipe(Effect10.map(Array6.map((obj) => Entity2.toJSON(obj))));
     return {
       document: extractLastTextBlock(result),
       objects
@@ -1560,12 +1574,12 @@ var entity_extraction_default = defineFunction9({
     })
   }),
   outputSchema: Schema11.Struct({
-    entities: Schema11.optional(Schema11.Array(Obj7.Any).annotations({
+    entities: Schema11.optional(Schema11.Array(Type4.Obj).annotations({
       description: "Extracted entities."
     }))
   }),
   handler: Effect11.fnUntraced(function* ({ data: { source: message, instructions: instructions6 } }) {
-    const tags = Obj7.getMeta(message)?.tags;
+    const tags = Obj8.getMeta(message)?.tags;
     const contact = yield* extractContact(message.sender, tags);
     let organization = null;
     if (contact && !contact.organization) {
@@ -1594,10 +1608,15 @@ var entity_extraction_default = defineFunction9({
       if (created.length > 1) {
         throw new Error("Multiple organizations created");
       } else if (created.length === 1) {
-        organization = yield* DatabaseService8.resolve(created[0], Organization.Organization);
-        Obj7.getMeta(organization).tags ??= [];
-        Obj7.getMeta(organization).tags.push(...tags ?? []);
-        contact.organization = Ref3.make(organization);
+        organization = yield* Database8.Service.resolve(created[0], Organization.Organization);
+        Obj8.change(organization, (org) => {
+          const meta = Obj8.getMeta(org);
+          meta.tags ??= [];
+          meta.tags.push(...tags ?? []);
+        });
+        Obj8.change(contact, (c) => {
+          c.organization = Ref3.make(organization);
+        });
       }
     }
     return {
@@ -1619,13 +1638,13 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       actor
     }, {
       F: __dxlog_file5,
-      L: 100,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
     return void 0;
   }
-  const { objects: existingContacts } = yield* DatabaseService8.runQuery(Filter2.type(Person2.Person));
+  const existingContacts = yield* Database8.Service.runQuery(Filter2.type(Person2.Person));
   const existingContact = existingContacts.find((contact) => contact.emails?.some((contactEmail) => contactEmail.value === email));
   if (existingContact) {
     log5.info("Contact already exists", {
@@ -1633,25 +1652,31 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       existingContact
     }, {
       F: __dxlog_file5,
-      L: 113,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
     return existingContact;
   }
-  const newContact = Obj7.make(Person2.Person, {
-    [Obj7.Meta]: {
-      tags
-    },
+  const newContact = Obj8.make(Person2.Person, {
+    ...tags ? {
+      [Obj8.Meta]: {
+        tags: [
+          ...tags
+        ]
+      }
+    } : {},
     emails: [
       {
         value: email
       }
     ]
   });
-  yield* DatabaseService8.add(newContact);
+  yield* Database8.Service.add(newContact);
   if (name) {
-    newContact.fullName = name;
+    Obj8.change(newContact, (c) => {
+      c.fullName = name;
+    });
   }
   const emailDomain = email.split("@")[1]?.toLowerCase();
   if (!emailDomain) {
@@ -1659,7 +1684,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       email
     }, {
       F: __dxlog_file5,
-      L: 129,
+      L: 143,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1669,11 +1694,11 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
     emailDomain
   }, {
     F: __dxlog_file5,
-    L: 133,
+    L: 147,
     S: this,
     C: (f, a) => f(...a)
   });
-  const { objects: existingOrganisations } = yield* DatabaseService8.runQuery(Filter2.type(Organization.Organization));
+  const existingOrganisations = yield* Database8.Service.runQuery(Filter2.type(Organization.Organization));
   const matchingOrg = existingOrganisations.find((org) => {
     if (org.website) {
       try {
@@ -1686,7 +1711,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
           error: e
         }, {
           F: __dxlog_file5,
-          L: 151,
+          L: 165,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1700,11 +1725,13 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       organization: matchingOrg
     }, {
       F: __dxlog_file5,
-      L: 159,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
-    newContact.organization = Ref3.make(matchingOrg);
+    Obj8.change(newContact, (c) => {
+      c.organization = Ref3.make(matchingOrg);
+    });
   }
   return newContact;
 });
@@ -1722,15 +1749,16 @@ import * as Array9 from "effect/Array";
 import * as Effect13 from "effect/Effect";
 import * as Function5 from "effect/Function";
 import * as Schema12 from "effect/Schema";
-import { Filter as Filter4, Obj as Obj9, Query as Query4, Ref as Ref5 } from "@dxos/echo";
-import { DatabaseService as DatabaseService10, defineFunction as defineFunction10, withAuthorization } from "@dxos/functions";
+import { Filter as Filter4, Obj as Obj10, Query as Query4, Ref as Ref5 } from "@dxos/echo";
+import { Database as Database10 } from "@dxos/echo";
+import { CredentialsService as CredentialsService3, defineFunction as defineFunction10, withAuthorization } from "@dxos/functions";
 import { log as log7 } from "@dxos/log";
 import { Person as Person3, Project as Project2, Task as Task2 } from "@dxos/types";
 
 // src/sync/sync.ts
 import * as Effect12 from "effect/Effect";
-import { Filter as Filter3, Obj as Obj8, Query as Query3, Ref as Ref4 } from "@dxos/echo";
-import { DatabaseService as DatabaseService9 } from "@dxos/functions";
+import { Filter as Filter3, Obj as Obj9, Query as Query3, Ref as Ref4 } from "@dxos/echo";
+import { Database as Database9 } from "@dxos/echo";
 import { failedInvariant } from "@dxos/invariant";
 import { log as log6 } from "@dxos/log";
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/assistant-toolkit/src/sync/sync.ts";
@@ -1741,7 +1769,7 @@ var syncObjects = Effect12.fn("syncObjects")(function* (objs, { foreignKeyId })
       if (!Ref4.isRef(obj[key])) continue;
       const ref = obj[key];
       if (!ref.target) continue;
-      if (Obj8.getDXN(ref.target).isLocalObjectId()) {
+      if (Obj9.getDXN(ref.target).isLocalObjectId()) {
         const [target] = yield* syncObjects([
           ref.target
         ], {
@@ -1750,26 +1778,26 @@ var syncObjects = Effect12.fn("syncObjects")(function* (objs, { foreignKeyId })
         obj[key] = Ref4.make(target);
       }
     }
-    const schema = Obj8.getSchema(obj) ?? failedInvariant("No schema.");
-    const foreignId = Obj8.getKeys(obj, foreignKeyId)[0]?.id ?? failedInvariant("No foreign key.");
-    const { objects: [existing] } = yield* DatabaseService9.runQuery(Query3.select(Filter3.foreignKeys(schema, [
+    const schema = Obj9.getSchema(obj) ?? failedInvariant("No schema.");
+    const foreignId = Obj9.getKeys(obj, foreignKeyId)[0]?.id ?? failedInvariant("No foreign key.");
+    const [existing] = yield* Database9.Service.runQuery(Query3.select(Filter3.foreignKeys(schema, [
       {
         source: foreignKeyId,
         id: foreignId
       }
     ])));
     log6("sync object", {
-      type: Obj8.getTypename(obj),
+      type: Obj9.getTypename(obj),
       foreignId,
-      existing: existing ? Obj8.getDXN(existing) : void 0
+      existing: existing ? Obj9.getDXN(existing) : void 0
     }, {
       F: __dxlog_file6,
-      L: 47,
+      L: 48,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!existing) {
-      yield* DatabaseService9.add(obj);
+      yield* Database9.Service.add(obj);
       return obj;
     } else {
       copyObjectData(existing, obj);
@@ -1780,23 +1808,25 @@ var syncObjects = Effect12.fn("syncObjects")(function* (objs, { foreignKeyId })
   });
 });
 var copyObjectData = (existing, newObj) => {
-  for (const key of Object.keys(newObj)) {
-    if (typeof key !== "string" || key === "id") continue;
-    if (typeof newObj[key] !== "string" && typeof newObj[key] !== "number" && typeof newObj[key] !== "boolean" && !Ref4.isRef(newObj[key])) continue;
-    existing[key] = newObj[key];
-  }
-  for (const key of Object.keys(existing)) {
-    if (typeof key !== "string" || key === "id") continue;
-    if (!(key in newObj)) {
-      delete existing[key];
+  Obj9.change(existing, (obj) => {
+    for (const key of Object.keys(newObj)) {
+      if (typeof key !== "string" || key === "id") continue;
+      if (typeof newObj[key] !== "string" && typeof newObj[key] !== "number" && typeof newObj[key] !== "boolean" && !Ref4.isRef(newObj[key])) continue;
+      obj[key] = newObj[key];
     }
-  }
-  for (const foreignKey of Obj8.getMeta(newObj).keys) {
-    Obj8.deleteKeys(existing, foreignKey.source);
-    Obj8.getMeta(existing).keys.push({
-      ...foreignKey
-    });
-  }
+    for (const key of Object.keys(obj)) {
+      if (typeof key !== "string" || key === "id") continue;
+      if (!(key in newObj)) {
+        delete obj[key];
+      }
+    }
+    for (const foreignKey of Obj9.getMeta(newObj).keys) {
+      Obj9.deleteKeys(obj, foreignKey.source);
+      Obj9.getMeta(obj).keys.push({
+        ...foreignKey
+      });
+    }
+  });
 };
 
 // src/util/graphql.ts
@@ -1826,7 +1856,7 @@ query Issues($teamId: String!, $after: DateTimeOrDuration!) {
             updatedAt
             description
             assignee { id, name }
-            state { 
+            state {
                 name
             }
             project {
@@ -1857,15 +1887,16 @@ var sync_issues_default = defineFunction10({
     })
   }),
   handler: Effect13.fnUntraced(function* ({ data }) {
-    const client = yield* HttpClient.HttpClient.pipe(Effect13.map(withAuthorization({
+    const credential = yield* CredentialsService3.getCredential({
       service: "linear.app"
-    })));
+    });
+    const client = yield* HttpClient.HttpClient.pipe(Effect13.map(withAuthorization(credential.apiKey)));
     const after = yield* getLatestUpdateTimestamp(data.team, Task2.Task);
     log7.info("will fetch", {
       after
     }, {
       F: __dxlog_file7,
-      L: 91,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1883,7 +1914,7 @@ var sync_issues_default = defineFunction10({
       count: tasks.length
     }, {
       F: __dxlog_file7,
-      L: 104,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1896,16 +1927,16 @@ var sync_issues_default = defineFunction10({
   }, Effect13.provide(FetchHttpClient2.layer))
 });
 var getLatestUpdateTimestamp = Effect13.fnUntraced(function* (teamId, dataType) {
-  const { objects: existingTasks } = yield* DatabaseService10.runQuery(Query4.type(dataType).select(Filter4.foreignKeys(dataType, [
+  const existingTasks = yield* Database10.Service.runQuery(Query4.type(dataType).select(Filter4.foreignKeys(dataType, [
     {
       source: LINEAR_TEAM_ID_KEY,
       id: teamId
     }
   ])));
-  return Function5.pipe(existingTasks, Array9.map((task) => Obj9.getKeys(task, LINEAR_UPDATED_AT_KEY).at(0)?.id), Array9.filter((x) => x !== void 0), Array9.reduce("2025-01-01T00:00:00.000Z", (acc, x) => x > acc ? x : acc));
+  return Function5.pipe(existingTasks, Array9.map((task) => Obj10.getKeys(task, LINEAR_UPDATED_AT_KEY).at(0)?.id), Array9.filter((x) => x !== void 0), Array9.reduce("2025-01-01T00:00:00.000Z", (acc, x) => x > acc ? x : acc));
 });
-var mapLinearPerson = (person, { teamId }) => Obj9.make(Person3.Person, {
-  [Obj9.Meta]: {
+var mapLinearPerson = (person, { teamId }) => Obj10.make(Person3.Person, {
+  [Obj10.Meta]: {
     keys: [
       {
         id: person.id,
@@ -1919,8 +1950,8 @@ var mapLinearPerson = (person, { teamId }) => Obj9.make(Person3.Person, {
   },
   nickname: person.name
 });
-var mapLinearIssue = (issue, { teamId }) => Obj9.make(Task2.Task, {
-  [Obj9.Meta]: {
+var mapLinearIssue = (issue, { teamId }) => Obj10.make(Task2.Task, {
+  [Obj10.Meta]: {
     keys: [
       {
         id: issue.id,
@@ -1944,7 +1975,7 @@ var mapLinearIssue = (issue, { teamId }) => Obj9.make(Task2.Task, {
   // TODO(dmaretskyi): Sync those (+ linear team as org?).
   // state: issue.state.name,
   project: !issue.project ? void 0 : Ref5.make(Project2.make({
-    [Obj9.Meta]: {
+    [Obj10.Meta]: {
       keys: [
         {
           id: issue.project.id,
@@ -1970,7 +2001,8 @@ var Linear;
 import * as Effect14 from "effect/Effect";
 import * as Schema13 from "effect/Schema";
 import { ArtifactId as ArtifactId4 } from "@dxos/assistant";
-import { DatabaseService as DatabaseService11, defineFunction as defineFunction11 } from "@dxos/functions";
+import { Database as Database11 } from "@dxos/echo";
+import { defineFunction as defineFunction11 } from "@dxos/functions";
 import { Markdown as Markdown4 } from "@dxos/plugin-markdown/types";
 var read_default2 = defineFunction11({
   key: "dxos.org/function/markdown/read-tasks",
@@ -1985,8 +2017,8 @@ var read_default2 = defineFunction11({
     content: Schema13.String
   }),
   handler: Effect14.fn(function* ({ data: { id } }) {
-    const doc = yield* DatabaseService11.resolve(ArtifactId4.toDXN(id), Markdown4.Document);
-    const { content } = yield* DatabaseService11.load(doc.content);
+    const doc = yield* Database11.Service.resolve(ArtifactId4.toDXN(id), Markdown4.Document);
+    const { content } = yield* Database11.Service.load(doc.content);
     const lines = content.split("\n");
     const len = String(lines.length).length;
     const numbered = lines.map((line, i) => `${String(i + 1).padStart(len, " ")}. ${line}`).join("\n");
@@ -2000,7 +2032,8 @@ var read_default2 = defineFunction11({
 import * as Effect15 from "effect/Effect";
 import * as Schema14 from "effect/Schema";
 import { ArtifactId as ArtifactId5 } from "@dxos/assistant";
-import { DatabaseService as DatabaseService12, defineFunction as defineFunction12 } from "@dxos/functions";
+import { Database as Database12 } from "@dxos/echo";
+import { defineFunction as defineFunction12 } from "@dxos/functions";
 import { Markdown as Markdown5 } from "@dxos/plugin-markdown/types";
 
 // src/functions/tasks/task-list.ts
@@ -2151,8 +2184,8 @@ var update_default2 = defineFunction12({
     })
   }),
   handler: Effect15.fn(function* ({ data: { id, operations = [] } }) {
-    const doc = yield* DatabaseService12.resolve(ArtifactId5.toDXN(id), Markdown5.Document);
-    const { content } = yield* DatabaseService12.load(doc.content);
+    const doc = yield* Database12.Service.resolve(ArtifactId5.toDXN(id), Markdown5.Document);
+    const { content } = yield* Database12.Service.load(doc.content);
     const taskManager = new MarkdownTasks(content);
     if (operations.length > 0) {
       taskManager.applyOperations(operations);
@@ -2181,7 +2214,7 @@ var instructions = trim5`
   When replying to the user, be terse with your comments about design doc handling.
   Do not announce when you read or write the design spec document.
 `;
-var blueprint = Obj10.make(Blueprint.Blueprint, {
+var blueprint = Blueprint.make({
   key: "dxos.org/blueprint/design",
   name: "Design Spec",
   description: "Preserve the conversation in the design spec.",
@@ -2193,15 +2226,14 @@ var blueprint = Obj10.make(Blueprint.Blueprint, {
     Document.update
   ].map((fn9) => ToolId.make(fn9.key))
 });
-var design_blueprint_default = blueprint;
 
 // src/blueprints/design/index.ts
-var design_default = design_blueprint_default;
+var design_default = blueprint;
 
 // src/blueprints/discord/discord-blueprint.ts
 import { ToolId as ToolId2 } from "@dxos/ai";
 import { Blueprint as Blueprint2 } from "@dxos/blueprints";
-import { Obj as Obj11, Ref as Ref7 } from "@dxos/echo";
+import { Ref as Ref7 } from "@dxos/echo";
 import { Text as Text3 } from "@dxos/schema";
 import { trim as trim6 } from "@dxos/util";
 var instructions2 = trim6`
@@ -2211,7 +2243,7 @@ var instructions2 = trim6`
 
   DXOS serverId: 837138313172353095
 `;
-var blueprint2 = Obj11.make(Blueprint2.Blueprint, {
+var blueprint2 = Blueprint2.make({
   key: "dxos.org/blueprint/discord",
   name: "Discord",
   description: "Discord integration.",
@@ -2222,15 +2254,14 @@ var blueprint2 = Obj11.make(Blueprint2.Blueprint, {
     ToolId2.make(Discord.fetch.key)
   ]
 });
-var discord_blueprint_default = blueprint2;
 
 // src/blueprints/discord/index.ts
-var discord_default = discord_blueprint_default;
+var discord_default = blueprint2;
 
 // src/blueprints/linear/linear-blueprint.ts
 import { ToolId as ToolId3 } from "@dxos/ai";
 import { Blueprint as Blueprint3 } from "@dxos/blueprints";
-import { Obj as Obj12, Ref as Ref8 } from "@dxos/echo";
+import { Ref as Ref8 } from "@dxos/echo";
 import { Text as Text4 } from "@dxos/schema";
 import { trim as trim7 } from "@dxos/util";
 var instructions3 = trim7`
@@ -2241,7 +2272,7 @@ var instructions3 = trim7`
 
   DXOS teamId: 1127c63a-6f77-4725-9229-50f6cd47321c
 `;
-var blueprint3 = Obj12.make(Blueprint3.Blueprint, {
+var blueprint3 = Blueprint3.make({
   key: "dxos.org/blueprint/linear",
   name: "Linear",
   description: "Syncs Linear workspaces.",
@@ -2252,15 +2283,14 @@ var blueprint3 = Obj12.make(Blueprint3.Blueprint, {
     Linear.sync
   ].map((tool) => ToolId3.make(tool.key))
 });
-var linear_blueprint_default = blueprint3;
 
 // src/blueprints/linear/index.ts
-var linear_default = linear_blueprint_default;
+var linear_default = blueprint3;
 
 // src/blueprints/planning/planning-blueprint.ts
 import { ToolId as ToolId4 } from "@dxos/ai";
 import { Blueprint as Blueprint4 } from "@dxos/blueprints";
-import { Obj as Obj13, Ref as Ref9 } from "@dxos/echo";
+import { Ref as Ref9 } from "@dxos/echo";
 import { Text as Text5 } from "@dxos/schema";
 import { trim as trim8 } from "@dxos/util";
 var instructions4 = trim8`
@@ -2334,7 +2364,7 @@ var instructions4 = trim8`
   - When creating subtasks, consider the parent task's completion status
   - Be precise with task descriptions and hierarchy levels
 `;
-var blueprint4 = Obj13.make(Blueprint4.Blueprint, {
+var blueprint4 = Blueprint4.make({
   key: "dxos.org/blueprint/planning",
   name: "Planning",
   description: "Plans and tracks complex tasks with artifact management.",
@@ -2346,15 +2376,14 @@ var blueprint4 = Obj13.make(Blueprint4.Blueprint, {
     Tasks.update
   ].map((fn9) => ToolId4.make(fn9.key))
 });
-var planning_blueprint_default = blueprint4;
 
 // src/blueprints/planning/index.ts
-var planning_default = planning_blueprint_default;
+var planning_default = blueprint4;
 
 // src/blueprints/research/research-blueprint.ts
 import { ToolId as ToolId5 } from "@dxos/ai";
 import { Blueprint as Blueprint5 } from "@dxos/blueprints";
-import { Obj as Obj14, Ref as Ref10 } from "@dxos/echo";
+import { Ref as Ref10 } from "@dxos/echo";
 import { Text as Text6 } from "@dxos/schema";
 import { trim as trim9 } from "@dxos/util";
 var instructions5 = trim9`
@@ -2383,7 +2412,7 @@ var instructions5 = trim9`
     Reply normally with the text mode of the result of your research.
   </unstructured_mode>
 `;
-var blueprint5 = Obj14.make(Blueprint5.Blueprint, {
+var blueprint5 = Blueprint5.make({
   key: "dxos.org/blueprint/research",
   name: "Research",
   description: "Researches the web and creates structured data.",
@@ -2395,17 +2424,16 @@ var blueprint5 = Obj14.make(Blueprint5.Blueprint, {
     Research.research
   ].map((fn9) => ToolId5.make(fn9.key))
 });
-var research_blueprint_default = blueprint5;
 
 // src/blueprints/research/index.ts
-var research_default2 = research_blueprint_default;
+var research_default2 = blueprint5;
 
 // src/blueprints/websearch/websearch-blueprint.ts
 import { ToolId as ToolId6 } from "@dxos/ai";
 import { Blueprint as Blueprint6 } from "@dxos/blueprints";
-import { Obj as Obj15, Ref as Ref11 } from "@dxos/echo";
+import { Ref as Ref11 } from "@dxos/echo";
 import { Text as Text7 } from "@dxos/schema";
-var blueprint6 = Obj15.make(Blueprint6.Blueprint, {
+var blueprint6 = Blueprint6.make({
   key: "dxos.org/blueprint/web-search",
   name: "Web Search",
   description: "Search the web.",
@@ -2416,7 +2444,6 @@ var blueprint6 = Obj15.make(Blueprint6.Blueprint, {
     ToolId6.make("AnthropicWebSearch")
   ]
 });
-var websearch_blueprint_default = blueprint6;
 
 // src/blueprints/websearch/websearch-toolkit.ts
 import * as Toolkit4 from "@effect/ai/Toolkit";
@@ -2424,44 +2451,7 @@ import * as AnthropicTool2 from "@effect/ai-anthropic/AnthropicTool";
 var WebSearchToolkit = Toolkit4.make(AnthropicTool2.WebSearch_20250305({}));
 
 // src/blueprints/websearch/index.ts
-var websearch_default = websearch_blueprint_default;
-
-// src/plugins.tsx
-import * as Schema15 from "effect/Schema";
-import React from "react";
-import { Capabilities, contributes, createSurface } from "@dxos/app-framework";
-import { Format, Type as Type4 } from "@dxos/echo";
-import { JsonFilter } from "@dxos/react-ui-syntax-highlighter";
-var MapSchema = Schema15.Struct({
-  coordinates: Format.GeoPoint
-}).pipe(Type4.Obj({
-  typename: "example.com/type/Map",
-  version: "0.1.0"
-}));
-var isImage = (data) => false;
-var capabilities = [
-  contributes(Capabilities.ReactSurface, createSurface({
-    id: "plugin-image",
-    role: "card--extrinsic",
-    filter: (data) => isImage(data.value),
-    component: ({ data }) => /* @__PURE__ */ React.createElement("img", {
-      className: "grow object-cover",
-      src: `data:image/jpeg;base64,${data.value.source.data}`,
-      alt: data.value.prompt ?? `Generated image [id=${data.value.id}]`
-    })
-  })),
-  //
-  // Default
-  //
-  contributes(Capabilities.ReactSurface, createSurface({
-    id: "plugin-default",
-    role: "card--extrinsic",
-    position: "fallback",
-    component: ({ role, data }) => /* @__PURE__ */ React.createElement(JsonFilter, {
-      data
-    })
-  }))
-];
+var websearch_default = blueprint6;
 
 // src/toolkits/AssistantToolkit.ts
 var AssistantToolkit_exports = {};
@@ -2474,39 +2464,64 @@ import * as Tool2 from "@effect/ai/Tool";
 import * as Toolkit5 from "@effect/ai/Toolkit";
 import * as Effect16 from "effect/Effect";
 import * as Record from "effect/Record";
-import * as Schema16 from "effect/Schema";
+import * as Schema15 from "effect/Schema";
 import { AiContextService, ArtifactId as ArtifactId6 } from "@dxos/assistant";
-import { Ref as Ref12 } from "@dxos/echo";
-import { DatabaseService as DatabaseService13 } from "@dxos/functions";
+import { Database as Database13 } from "@dxos/echo";
 import { trim as trim10 } from "@dxos/util";
-var AssistantToolkit = Toolkit5.make(Tool2.make("add-to-context", {
+var AssistantToolkit = Toolkit5.make(Tool2.make("context-add", {
   description: trim10`
       Adds the object to the chat context.
     `,
   parameters: {
     id: ArtifactId6.annotations({
-      description: "The ID of the document to read."
+      description: "The ID of the document to add."
+    })
+  },
+  success: Schema15.Void,
+  failure: Schema15.Never,
+  dependencies: [
+    AiContextService,
+    Database13.Service
+  ]
+}), Tool2.make("context-remove", {
+  description: trim10`
+      Removes the object from the chat context.
+    `,
+  parameters: {
+    id: ArtifactId6.annotations({
+      description: "The ID of the document to remove."
     })
   },
-  success: Schema16.Void,
-  failure: Schema16.Never,
+  success: Schema15.Void,
+  failure: Schema15.Never,
   dependencies: [
     AiContextService,
-    DatabaseService13
+    Database13.Service
   ]
 }));
 var tools = Record.keys(AssistantToolkit.tools);
 var layer3 = () => AssistantToolkit.toLayer({
-  "add-to-context": Effect16.fnUntraced(function* ({ id }) {
+  ["context-add"]: Effect16.fnUntraced(function* ({ id }) {
     const { binder } = yield* AiContextService;
-    const { db } = yield* DatabaseService13;
-    const ref = Ref12.fromDXN(ArtifactId6.toDXN(id, db.spaceId));
+    const { db } = yield* Database13.Service;
+    const ref = db.makeRef(ArtifactId6.toDXN(id, db.spaceId));
     yield* Effect16.promise(() => binder.bind({
       blueprints: [],
       objects: [
         ref
       ]
     }));
+  }),
+  ["context-remove"]: Effect16.fnUntraced(function* ({ id }) {
+    const { binder } = yield* AiContextService;
+    const { db } = yield* Database13.Service;
+    const ref = db.makeRef(ArtifactId6.toDXN(id, db.spaceId));
+    yield* Effect16.promise(() => binder.unbind({
+      blueprints: [],
+      objects: [
+        ref
+      ]
+    }));
   })
 });
 
@@ -2521,11 +2536,12 @@ import * as Tool3 from "@effect/ai/Tool";
 import * as Toolkit6 from "@effect/ai/Toolkit";
 import * as Effect17 from "effect/Effect";
 import * as Record2 from "effect/Record";
-import * as Schema17 from "effect/Schema";
+import * as Schema16 from "effect/Schema";
 import { ArtifactId as ArtifactId7 } from "@dxos/assistant";
-import { DXN as DXN2, Obj as Obj16, Relation as Relation2, Tag as Tag2, Type as Type5 } from "@dxos/echo";
-import { DatabaseService as DatabaseService14 } from "@dxos/functions";
+import { DXN as DXN2, Database as Database14, Entity as Entity3, Filter as Filter5, Obj as Obj11, Relation as Relation2, Tag as Tag2, Type as Type5 } from "@dxos/echo";
+import { invariant } from "@dxos/invariant";
 import { trim as trim11 } from "@dxos/util";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/core/assistant-toolkit/src/toolkits/SystemToolkit.ts";
 var SystemToolkit = Toolkit6.make(
   //
   // Schema
@@ -2536,13 +2552,13 @@ var SystemToolkit = Toolkit6.make(
     `,
     parameters: {
       // TODO(wittjosiah): Remove this once parameter-less tools are fixed.
-      limit: Schema17.Number
+      limit: Schema16.Number
     },
     // TODO(dmaretskyi): Effect returns ({ result, encodedResult })
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   Tool3.make("schema-add", {
@@ -2552,14 +2568,31 @@ var SystemToolkit = Toolkit6.make(
       The typename must be in the format of "example.com/type/Type".
     `,
     parameters: {
-      name: Schema17.String,
-      typename: Schema17.String,
-      jsonSchema: Schema17.Any
+      name: Schema16.String,
+      typename: Schema16.String,
+      jsonSchema: Schema16.Any
     },
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
+    ]
+  }),
+  //
+  // Query
+  //
+  Tool3.make("query", {
+    description: trim11`
+      Queries objects in the space.
+      Get the typename from the schema-list tool.
+    `,
+    parameters: {
+      typename: Schema16.String
+    },
+    success: Schema16.Any,
+    failure: Schema16.Never,
+    dependencies: [
+      Database14.Service
     ]
   }),
   //
@@ -2571,28 +2604,47 @@ var SystemToolkit = Toolkit6.make(
       Get the schema from the schema-list tool and ensure that the data matches the corresponding schema.
     `,
     parameters: {
-      typename: Schema17.String,
-      data: Schema17.Any
+      typename: Schema16.String,
+      data: Schema16.Any
+    },
+    success: Schema16.Any,
+    failure: Schema16.Never,
+    dependencies: [
+      Database14.Service
+    ]
+  }),
+  Tool3.make("object-delete", {
+    description: trim11`
+      Deletes the object.
+    `,
+    parameters: {
+      id: ArtifactId7.annotations({
+        description: "The ID of the object."
+      })
     },
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
-  Tool3.make("object-remove", {
+  Tool3.make("object-update", {
     description: trim11`
-      Removes an object or relation from the database.
+      Updates the object properties.
     `,
     parameters: {
       id: ArtifactId7.annotations({
         description: "The ID of the object."
+      }),
+      properties: Schema16.Record({
+        key: Schema16.String,
+        value: Schema16.Any
       })
     },
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   //
@@ -2604,21 +2656,36 @@ var SystemToolkit = Toolkit6.make(
       Get the schema from the schema-list tool and ensure that the data matches the corresponding schema.
     `,
     parameters: {
-      typename: Schema17.String,
+      typename: Schema16.String,
       source: ArtifactId7.annotations({
         description: "The ID of the source object."
       }),
       target: ArtifactId7.annotations({
         description: "The ID of the target object."
       }),
-      data: Schema17.Any.annotations({
+      data: Schema16.Any.annotations({
         description: "The data to be stored in the relation."
       })
     },
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
+    ]
+  }),
+  Tool3.make("relation-delete", {
+    description: trim11`
+      Deletes the relation.
+    `,
+    parameters: {
+      id: ArtifactId7.annotations({
+        description: "The ID of the relation."
+      })
+    },
+    success: Schema16.Any,
+    failure: Schema16.Never,
+    dependencies: [
+      Database14.Service
     ]
   }),
   //
@@ -2637,10 +2704,10 @@ var SystemToolkit = Toolkit6.make(
         description: "The ID of the object."
       })
     },
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   Tool3.make("tag-remove", {
@@ -2656,17 +2723,17 @@ var SystemToolkit = Toolkit6.make(
         description: "The ID of the object."
       })
     },
-    success: Schema17.Any,
-    failure: Schema17.Never,
+    success: Schema16.Any,
+    failure: Schema16.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   })
 );
 var tools2 = Record2.keys(SystemToolkit.tools);
 var layer4 = () => SystemToolkit.toLayer({
-  "schema-list": Effect17.fnUntraced(function* () {
-    const { db } = yield* DatabaseService14;
+  ["schema-list"]: Effect17.fnUntraced(function* () {
+    const { db } = yield* Database14.Service;
     const schema = yield* Effect17.promise(() => db.schemaRegistry.query({
       location: [
         "database",
@@ -2682,8 +2749,8 @@ var layer4 = () => SystemToolkit.toLayer({
       };
     });
   }),
-  "schema-add": Effect17.fnUntraced(function* ({ name, typename, jsonSchema }) {
-    const { db } = yield* DatabaseService14;
+  ["schema-add"]: Effect17.fnUntraced(function* ({ name, typename, jsonSchema }) {
+    const { db } = yield* Database14.Service;
     yield* Effect17.promise(() => db.schemaRegistry.register([
       {
         typename,
@@ -2693,8 +2760,12 @@ var layer4 = () => SystemToolkit.toLayer({
       }
     ]));
   }),
-  "object-create": Effect17.fnUntraced(function* ({ typename, data }) {
-    const { db } = yield* DatabaseService14;
+  ["query"]: Effect17.fnUntraced(function* ({ typename }) {
+    const objects = yield* Database14.Service.runQuery(Filter5.typename(typename));
+    return objects;
+  }),
+  ["object-create"]: Effect17.fnUntraced(function* ({ typename, data }) {
+    const { db } = yield* Database14.Service;
     const schema = yield* Effect17.promise(() => db.schemaRegistry.query({
       typename,
       location: [
@@ -2702,17 +2773,35 @@ var layer4 = () => SystemToolkit.toLayer({
         "runtime"
       ]
     }).first());
-    const object = db.add(Obj16.make(schema, data));
+    invariant(Type5.isObjectSchema(schema), "Schema is not an object schema", {
+      F: __dxlog_file8,
+      L: 238,
+      S: this,
+      A: [
+        "Type.isObjectSchema(schema)",
+        "'Schema is not an object schema'"
+      ]
+    });
+    const object = db.add(Obj11.make(schema, data));
     return object;
   }),
-  "object-remove": Effect17.fnUntraced(function* ({ id }) {
-    const { db } = yield* DatabaseService14;
-    const object = yield* DatabaseService14.resolve(DXN2.parse(id));
+  ["object-delete"]: Effect17.fnUntraced(function* ({ id }) {
+    const { db } = yield* Database14.Service;
+    const object = yield* Database14.Service.resolve(DXN2.parse(id));
     db.remove(object);
     return object;
   }),
-  "relation-create": Effect17.fnUntraced(function* ({ typename, source, target, data }) {
-    const { db } = yield* DatabaseService14;
+  ["object-update"]: Effect17.fnUntraced(function* ({ id, properties }) {
+    const object = yield* Database14.Service.resolve(DXN2.parse(id));
+    Entity3.change(object, (obj) => {
+      for (const [key, value2] of Object.entries(properties)) {
+        obj[key] = value2;
+      }
+    });
+    return object;
+  }),
+  ["relation-create"]: Effect17.fnUntraced(function* ({ typename, source, target, data }) {
+    const { db } = yield* Database14.Service;
     const schema = yield* Effect17.promise(() => db.schemaRegistry.query({
       typename,
       location: [
@@ -2720,8 +2809,17 @@ var layer4 = () => SystemToolkit.toLayer({
         "runtime"
       ]
     }).first());
-    const sourceObj = yield* DatabaseService14.resolve(DXN2.parse(source));
-    const targetObj = yield* DatabaseService14.resolve(DXN2.parse(target));
+    invariant(Type5.isRelationSchema(schema), "Schema is not a relation schema", {
+      F: __dxlog_file8,
+      L: 267,
+      S: this,
+      A: [
+        "Type.isRelationSchema(schema)",
+        "'Schema is not a relation schema'"
+      ]
+    });
+    const sourceObj = yield* Database14.Service.resolve(DXN2.parse(source));
+    const targetObj = yield* Database14.Service.resolve(DXN2.parse(target));
     const relation = db.add(Relation2.make(schema, {
       [Relation2.Source]: sourceObj,
       [Relation2.Target]: targetObj,
@@ -2729,14 +2827,20 @@ var layer4 = () => SystemToolkit.toLayer({
     }));
     return relation;
   }),
-  "tag-add": Effect17.fnUntraced(function* ({ tagId, objectId }) {
-    const object = yield* DatabaseService14.resolve(DXN2.parse(objectId));
-    Obj16.addTag(object, DXN2.parse(tagId).toString());
+  ["relation-delete"]: Effect17.fnUntraced(function* ({ id }) {
+    const { db } = yield* Database14.Service;
+    const relation = yield* Database14.Service.resolve(DXN2.parse(id));
+    db.remove(relation);
+    return relation;
+  }),
+  ["tag-add"]: Effect17.fnUntraced(function* ({ tagId, objectId }) {
+    const object = yield* Database14.Service.resolve(DXN2.parse(objectId));
+    Entity3.change(object, (obj) => Entity3.addTag(obj, DXN2.parse(tagId).toString()));
     return object;
   }),
-  "tag-remove": Effect17.fnUntraced(function* ({ tagId, objectId }) {
-    const object = yield* DatabaseService14.resolve(DXN2.parse(objectId));
-    Obj16.removeTag(object, DXN2.parse(tagId).toString());
+  ["tag-remove"]: Effect17.fnUntraced(function* ({ tagId, objectId }) {
+    const object = yield* Database14.Service.resolve(DXN2.parse(objectId));
+    Entity3.change(object, (obj) => Entity3.removeTag(obj, DXN2.parse(tagId).toString()));
     return object;
   })
 });
@@ -2752,7 +2856,6 @@ export {
   linear_default as LinearBlueprint,
   LocalSearchHandler,
   LocalSearchToolkit,
-  MapSchema,
   planning_default as PlanningBlueprint,
   Research,
   research_default2 as ResearchBlueprint,
@@ -2763,7 +2866,6 @@ export {
   Tasks,
   websearch_default as WebSearchBlueprint,
   WebSearchToolkit,
-  capabilities,
   contextQueueLayerFromResearchGraph,
   createExtractionSchema,
   createResearchGraph,