@dxos/assistant-toolkit 0.8.4-main.2c6827d → 0.8.4-main.3c1ae3b

package/dist/lib/node-esm/index.mjs

@@ -23,7 +23,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";
@@ -52,19 +53,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}`
     });
@@ -73,18 +74,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 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 toolkit = yield* createToolkit({
       blueprints
     });
-    const promptInstructions = yield* DatabaseService.load(prompt.instructions.source);
+    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({
@@ -313,7 +314,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",
@@ -328,8 +330,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
     };
@@ -340,7 +342,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 } 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",
@@ -356,8 +359,8 @@ 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);
+    const doc = yield* Database3.Service.resolve(ArtifactId2.toDXN(id), Markdown2.Document);
+    const text = yield* Database3.Service.load(doc.content);
     text.content = content;
   })
 });
@@ -378,7 +381,8 @@ 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 { 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";
@@ -393,13 +397,13 @@ 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 { Obj as Obj3 } from "@dxos/echo";
-import { Filter, Query } from "@dxos/echo";
-import { EntityKind, ObjectId, ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, create, getEntityKind, getSchemaDXN, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation } from "@dxos/echo/internal";
+import { Entity, Filter, Obj as Obj3, 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 { DXN } from "@dxos/keys";
+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";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant-toolkit/src/crud/graph.ts";
@@ -412,7 +416,7 @@ var findRelatedSchema = async (db, anchor) => {
     ...db.graph.schemaRegistry.schemas
   ];
   return allSchemas.filter((schema) => {
-    if (getTypeAnnotation(schema)?.kind !== EntityKind.Relation) {
+    if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
       return false;
     }
     return isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).targetSchema));
@@ -427,7 +431,7 @@ var isSchemaAddressableByDxn = (schema, dxn) => {
   }
   const t = dxn.asTypeDXN();
   if (t) {
-    return t.type === getSchemaTypename(schema);
+    return t.type === Type2.getTypename(schema);
   }
   return false;
 };
@@ -441,12 +445,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 = [
@@ -473,7 +477,7 @@ var makeGraphWriterToolkit = ({ schema }) => {
     success: Schema5.Unknown,
     failure: Schema5.Never,
     dependencies: [
-      DatabaseService4,
+      Database4.Service,
       ContextQueueService
     ]
   }).annotateContext(Context.make(GraphWriterSchema, {
@@ -484,7 +488,7 @@ 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));
@@ -499,13 +503,13 @@ var createExtractionSchema = (types) => {
     ...Object.fromEntries(types.map(preprocessSchema).map((schema, index) => [
       `objects_${getSanitizedSchemaName(types[index])}`,
       Schema5.optional(Schema5.Array(schema)).annotations({
-        description: `The objects of type: ${getSchemaDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option3.getOrElse(() => ""))}`
+        description: `The objects of type: ${Type2.getDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option3.getOrElse(() => ""))}`
       })
     ]))
   });
 };
 var getSanitizedSchemaName = (schema) => {
-  return getSchemaDXN(schema).asTypeDXN().type.replaceAll(/[^a-zA-Z0-9]+/g, "_");
+  return Type2.getDXN(schema).asTypeDXN().type.replaceAll(/[^a-zA-Z0-9]+/g, "_");
 };
 var sanitizeObjects = async (types, data, db, queue) => {
   const entries = types.map((type) => data[`objects_${getSanitizedSchemaName(type)}`]?.map((object) => ({
@@ -550,14 +554,14 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
       return recurse(value2);
     });
-    if (getEntityKind(entry.schema) === "relation") {
+    if (Entity.getKind(entry.schema) === "relation") {
       const sourceDxn = resolveId(data2.source);
       if (!sourceDxn) {
         log3.warn("source not found", {
           source: data2.source
         }, {
           F: __dxlog_file3,
-          L: 281,
+          L: 276,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -568,7 +572,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           target: data2.target
         }, {
           F: __dxlog_file3,
-          L: 285,
+          L: 280,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -583,7 +587,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
   ]) ?? [];
@@ -597,7 +601,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     existingIds
   }, {
     F: __dxlog_file3,
-    L: 306,
+    L: 301,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -628,7 +632,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
     }
     if (!skip) {
-      const obj = create(schema, data2);
+      const obj = createObject(schema, data2);
       enitties.set(obj.id, obj);
       return [
         obj
@@ -643,7 +647,7 @@ var SoftRef = Schema5.Struct({
   description: "Reference to another object."
 });
 var preprocessSchema = (schema) => {
-  const isRelationSchema = getEntityKind(schema) === "relation";
+  const isRelationSchema = Entity.getKind(schema) === "relation";
   const go = (ast, visited = /* @__PURE__ */ new Set()) => {
     if (visited.has(ast)) {
       return ast;
@@ -673,7 +677,8 @@ 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 { 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";
@@ -711,27 +716,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", {
@@ -739,7 +744,7 @@ var document_create_default = defineFunction5({
       object
     }, {
       F: __dxlog_file4,
-      L: 69,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -763,7 +768,8 @@ import { AiService as AiService2, ConsolePrinter as ConsolePrinter2 } from "@dxo
 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 { 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";
@@ -1363,28 +1369,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 Type2 } from "@dxos/echo";
+import { Obj as Obj5, 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: Type2.Ref(Queue)
-}).pipe(Type2.Obj({
+  queue: Type3.Ref(Queue)
+}).pipe(Type3.Obj({
   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(Obj5.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);
 }));
 
@@ -1453,7 +1461,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(Obj6.make(Person.Person, {
         preferredName: "John Doe",
         emails: [
           {
@@ -1476,7 +1484,7 @@ var research_default = defineFunction8({
         ]
       };
     }
-    yield* DatabaseService7.flush({
+    yield* Database7.Service.flush({
       indexes: true
     });
     yield* TracingService4.emitStatus({
@@ -1510,7 +1518,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) => Obj6.toJSON(obj))));
     return {
       document: extractLastTextBlock(result),
       objects
@@ -1595,7 +1603,7 @@ 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);
+        organization = yield* Database8.Service.resolve(created[0], Organization.Organization);
         Obj7.getMeta(organization).tags ??= [];
         Obj7.getMeta(organization).tags.push(...tags ?? []);
         contact.organization = Ref3.make(organization);
@@ -1620,13 +1628,13 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       actor
     }, {
       F: __dxlog_file5,
-      L: 100,
+      L: 107,
       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", {
@@ -1634,7 +1642,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       existingContact
     }, {
       F: __dxlog_file5,
-      L: 113,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1650,7 +1658,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       }
     ]
   });
-  yield* DatabaseService8.add(newContact);
+  yield* Database8.Service.add(newContact);
   if (name) {
     newContact.fullName = name;
   }
@@ -1660,7 +1668,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       email
     }, {
       F: __dxlog_file5,
-      L: 129,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1670,11 +1678,11 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
     emailDomain
   }, {
     F: __dxlog_file5,
-    L: 133,
+    L: 140,
     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 {
@@ -1687,7 +1695,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
           error: e
         }, {
           F: __dxlog_file5,
-          L: 151,
+          L: 158,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1701,7 +1709,7 @@ var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
       organization: matchingOrg
     }, {
       F: __dxlog_file5,
-      L: 159,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1724,14 +1732,15 @@ 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 { Database as Database10 } from "@dxos/echo";
+import { 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 { 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";
@@ -1753,7 +1762,7 @@ var syncObjects = Effect12.fn("syncObjects")(function* (objs, { foreignKeyId })
     }
     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 [existing] = yield* Database9.Service.runQuery(Query3.select(Filter3.foreignKeys(schema, [
       {
         source: foreignKeyId,
         id: foreignId
@@ -1765,12 +1774,12 @@ var syncObjects = Effect12.fn("syncObjects")(function* (objs, { foreignKeyId })
       existing: existing ? Obj8.getDXN(existing) : void 0
     }, {
       F: __dxlog_file6,
-      L: 47,
+      L: 45,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!existing) {
-      yield* DatabaseService9.add(obj);
+      yield* Database9.Service.add(obj);
       return obj;
     } else {
       copyObjectData(existing, obj);
@@ -1827,7 +1836,7 @@ query Issues($teamId: String!, $after: DateTimeOrDuration!) {
             updatedAt
             description
             assignee { id, name }
-            state { 
+            state {
                 name
             }
             project {
@@ -1866,7 +1875,7 @@ var sync_issues_default = defineFunction10({
       after
     }, {
       F: __dxlog_file7,
-      L: 91,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1884,7 +1893,7 @@ var sync_issues_default = defineFunction10({
       count: tasks.length
     }, {
       F: __dxlog_file7,
-      L: 104,
+      L: 105,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1897,7 +1906,7 @@ 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
@@ -1971,7 +1980,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",
@@ -1986,8 +1996,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");
@@ -2001,7 +2011,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
@@ -2152,8 +2163,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);
@@ -2431,11 +2442,11 @@ var websearch_default = websearch_blueprint_default;
 import * as Schema15 from "effect/Schema";
 import React from "react";
 import { Capabilities, contributes, createSurface } from "@dxos/app-framework";
-import { Type as Type3 } from "@dxos/echo";
+import { Format, Type as Type4 } from "@dxos/echo";
 import { JsonFilter } from "@dxos/react-ui-syntax-highlighter";
 var MapSchema = Schema15.Struct({
-  coordinates: Type3.Format.GeoPoint
-}).pipe(Type3.Obj({
+  coordinates: Format.GeoPoint
+}).pipe(Type4.Obj({
   typename: "example.com/type/Map",
   version: "0.1.0"
 }));
@@ -2458,7 +2469,7 @@ var capabilities = [
     id: "plugin-default",
     role: "card--extrinsic",
     position: "fallback",
-    component: ({ role, data }) => /* @__PURE__ */ React.createElement(JsonFilter, {
+    component: ({ data }) => /* @__PURE__ */ React.createElement(JsonFilter, {
       data
     })
   }))
@@ -2478,7 +2489,7 @@ import * as Record from "effect/Record";
 import * as Schema16 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", {
   description: trim10`
@@ -2493,14 +2504,14 @@ var AssistantToolkit = Toolkit5.make(Tool2.make("add-to-context", {
   failure: Schema16.Never,
   dependencies: [
     AiContextService,
-    DatabaseService13
+    Database13.Service
   ]
 }));
 var tools = Record.keys(AssistantToolkit.tools);
 var layer3 = () => AssistantToolkit.toLayer({
   "add-to-context": Effect16.fnUntraced(function* ({ id }) {
     const { binder } = yield* AiContextService;
-    const { db } = yield* DatabaseService13;
+    const { db } = yield* Database13.Service;
     const ref = Ref12.fromDXN(ArtifactId6.toDXN(id, db.spaceId));
     yield* Effect16.promise(() => binder.bind({
       blueprints: [],
@@ -2524,8 +2535,8 @@ import * as Effect17 from "effect/Effect";
 import * as Record2 from "effect/Record";
 import * as Schema17 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 Type4 } from "@dxos/echo";
-import { DatabaseService as DatabaseService14 } from "@dxos/functions";
+import { DXN as DXN2, Obj as Obj16, Relation as Relation2, Tag as Tag2, Type as Type5 } from "@dxos/echo";
+import { Database as Database14 } from "@dxos/echo";
 import { trim as trim11 } from "@dxos/util";
 var SystemToolkit = Toolkit6.make(
   //
@@ -2543,7 +2554,7 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   Tool3.make("schema-add", {
@@ -2560,7 +2571,7 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   //
@@ -2578,7 +2589,7 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   Tool3.make("object-remove", {
@@ -2593,7 +2604,7 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   //
@@ -2619,7 +2630,7 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   //
@@ -2641,7 +2652,7 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   }),
   Tool3.make("tag-remove", {
@@ -2660,14 +2671,14 @@ var SystemToolkit = Toolkit6.make(
     success: Schema17.Any,
     failure: Schema17.Never,
     dependencies: [
-      DatabaseService14
+      Database14.Service
     ]
   })
 );
 var tools2 = Record2.keys(SystemToolkit.tools);
 var layer4 = () => SystemToolkit.toLayer({
   "schema-list": Effect17.fnUntraced(function* () {
-    const { db } = yield* DatabaseService14;
+    const { db } = yield* Database14.Service;
     const schema = yield* Effect17.promise(() => db.schemaRegistry.query({
       location: [
         "database",
@@ -2675,16 +2686,16 @@ var layer4 = () => SystemToolkit.toLayer({
       ]
     }).run());
     return schema.map((schema2) => {
-      const meta = Type4.getMeta(schema2);
+      const meta = Type5.getMeta(schema2);
       return {
-        typename: Type4.getTypename(schema2),
-        jsonSchema: Type4.toJsonSchema(schema2),
+        typename: Type5.getTypename(schema2),
+        jsonSchema: Type5.toJsonSchema(schema2),
         kind: meta?.sourceSchema ? "relation" : "record"
       };
     });
   }),
   "schema-add": Effect17.fnUntraced(function* ({ name, typename, jsonSchema }) {
-    const { db } = yield* DatabaseService14;
+    const { db } = yield* Database14.Service;
     yield* Effect17.promise(() => db.schemaRegistry.register([
       {
         typename,
@@ -2695,7 +2706,7 @@ var layer4 = () => SystemToolkit.toLayer({
     ]));
   }),
   "object-create": Effect17.fnUntraced(function* ({ typename, data }) {
-    const { db } = yield* DatabaseService14;
+    const { db } = yield* Database14.Service;
     const schema = yield* Effect17.promise(() => db.schemaRegistry.query({
       typename,
       location: [
@@ -2707,13 +2718,13 @@ var layer4 = () => SystemToolkit.toLayer({
     return object;
   }),
   "object-remove": Effect17.fnUntraced(function* ({ id }) {
-    const { db } = yield* DatabaseService14;
-    const object = yield* DatabaseService14.resolve(DXN2.parse(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;
+    const { db } = yield* Database14.Service;
     const schema = yield* Effect17.promise(() => db.schemaRegistry.query({
       typename,
       location: [
@@ -2721,8 +2732,8 @@ var layer4 = () => SystemToolkit.toLayer({
         "runtime"
       ]
     }).first());
-    const sourceObj = yield* DatabaseService14.resolve(DXN2.parse(source));
-    const targetObj = yield* DatabaseService14.resolve(DXN2.parse(target));
+    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,
@@ -2731,12 +2742,12 @@ var layer4 = () => SystemToolkit.toLayer({
     return relation;
   }),
   "tag-add": Effect17.fnUntraced(function* ({ tagId, objectId }) {
-    const object = yield* DatabaseService14.resolve(DXN2.parse(objectId));
+    const object = yield* Database14.Service.resolve(DXN2.parse(objectId));
     Obj16.addTag(object, DXN2.parse(tagId).toString());
     return object;
   }),
   "tag-remove": Effect17.fnUntraced(function* ({ tagId, objectId }) {
-    const object = yield* DatabaseService14.resolve(DXN2.parse(objectId));
+    const object = yield* Database14.Service.resolve(DXN2.parse(objectId));
     Obj16.removeTag(object, DXN2.parse(tagId).toString());
     return object;
   })