@dxos/assistant-toolkit 0.8.4-main.dfabb4ec29 → 0.8.4-main.effb148878

package/dist/lib/neutral/index.mjs

@@ -1,31 +1,31 @@
 import {
   AgentPrompt
-} from "./chunk-GV66MKAQ.mjs";
+} from "./chunk-FNN6ERC6.mjs";
 import {
   DeleteMemory,
   QueryMemories,
   SaveMemory
-} from "./chunk-EJAQUAKM.mjs";
+} from "./chunk-GHGJCH73.mjs";
 import {
   EnableBlueprints,
   QueryBlueprints,
   UpdateBlueprints
-} from "./chunk-TO5IX24K.mjs";
+} from "./chunk-MMIERIDT.mjs";
 import {
   AgentRules,
   CreateAgent,
   SyncTriggers
-} from "./chunk-XUF53B6B.mjs";
+} from "./chunk-RIF2TKJJ.mjs";
 import {
   SyncIssues,
   syncObjects
-} from "./chunk-ROMZO4CB.mjs";
+} from "./chunk-ONQXVECY.mjs";
 import {
   UpdateTasks
-} from "./chunk-FIGO6CA6.mjs";
+} from "./chunk-AF5TWFLV.mjs";
 import {
   Fetch
-} from "./chunk-WLR3BGO4.mjs";
+} from "./chunk-EUHZLWCG.mjs";
 import {
   ContextAdd,
   ContextRemove,
@@ -40,31 +40,31 @@ import {
   SchemaList,
   TagAdd,
   TagRemove
-} from "./chunk-IKBIORQX.mjs";
+} from "./chunk-EUTROPCP.mjs";
 import {
   FetchMessages
-} from "./chunk-ZFXLTBZG.mjs";
+} from "./chunk-DC5KITJP.mjs";
 import {
   AgentBlueprintHandlers,
   blueprint_default
-} from "./chunk-QO5SU37C.mjs";
+} from "./chunk-PAEPER4S.mjs";
 import {
   AddArtifact,
   AgentWorker,
   GetContext,
   Qualifier
-} from "./chunk-246ACKSH.mjs";
+} from "./chunk-GEMRKH7J.mjs";
 import {
   Agent_exports,
   McpServer_exports,
   Plan_exports
-} from "./chunk-P4ZMYO4K.mjs";
+} from "./chunk-CMHECL6N.mjs";
 import {
   Chat_exports
-} from "./chunk-NR3GTWRC.mjs";
+} from "./chunk-OC77MYT5.mjs";
 import {
   Memory_exports
-} from "./chunk-KGU725LW.mjs";
+} from "./chunk-LO2S3ICN.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -77,7 +77,7 @@ import { trim } from "@dxos/util";
 
 // src/blueprints/discord/functions/index.ts
 import { OperationHandlerSet } from "@dxos/compute";
-var DiscordHandlers = OperationHandlerSet.lazy(() => import("./fetch-messages-QOBBCTGC.mjs"));
+var DiscordHandlers = OperationHandlerSet.lazy(() => import("./fetch-messages-YXH77S3S.mjs"));
 
 // src/blueprints/discord/blueprint.ts
 var BLUEPRINT_KEY = "org.dxos.blueprint.discord";
@@ -117,7 +117,7 @@ import { trim as trim2 } from "@dxos/util";
 
 // src/blueprints/linear/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet2 } from "@dxos/compute";
-var LinearHandlers = OperationHandlerSet2.lazy(() => import("./sync-issues-4YE5XAK5.mjs"));
+var LinearHandlers = OperationHandlerSet2.lazy(() => import("./sync-issues-3U3EL6KO.mjs"));
 
 // src/blueprints/linear/blueprint.ts
 var BLUEPRINT_KEY2 = "org.dxos.blueprint.linear";
@@ -155,14 +155,14 @@ import { Blueprint as Blueprint3 } from "@dxos/compute";
 
 // src/blueprints/planning/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet3 } from "@dxos/compute";
-var PlanningHandlers = OperationHandlerSet3.lazy(() => import("./update-tasks-H7SWIFQL.mjs"));
+var PlanningHandlers = OperationHandlerSet3.lazy(() => import("./update-tasks-PNNNCPWH.mjs"));
 
 // src/blueprints/planning/blueprint.ts
 var BLUEPRINT_KEY3 = "org.dxos.blueprint.planning";
 var make3 = () => Blueprint3.make({
   key: BLUEPRINT_KEY3,
   name: "Planning",
-  description: "Plans and tracks complex tasks with artifact management.",
+  description: "Plans and tracks complex tasks using artifacts.",
   tools: Blueprint3.toolDefinitions({
     operations: [
       UpdateTasks
@@ -182,7 +182,7 @@ import { Text as Text3 } from "@dxos/schema";
 
 // src/blueprints/websearch/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet4 } from "@dxos/compute";
-var WebSearchHandlers = OperationHandlerSet4.lazy(() => import("./fetch-KHMHV7JR.mjs"));
+var WebSearchHandlers = OperationHandlerSet4.lazy(() => import("./fetch-VV3DU75K.mjs"));
 
 // src/blueprints/websearch/blueprint.ts
 var BLUEPRINT_KEY4 = "org.dxos.blueprint.web-search";
@@ -259,7 +259,7 @@ import { trim as trim4 } from "@dxos/util";
 
 // src/blueprints/database/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet5 } from "@dxos/compute";
-var DatabaseHandlers = OperationHandlerSet5.lazy(() => import("./context-add-VB7AOY3G.mjs"), () => import("./context-remove-VCM3VPSO.mjs"), () => import("./load-ALP3TK2E.mjs"), () => import("./object-create-Z57Y3X6Y.mjs"), () => import("./object-delete-X53LS37B.mjs"), () => import("./object-update-GVKSBR7T.mjs"), () => import("./query-PPJU5622.mjs"), () => import("./relation-create-XJ2IX6X3.mjs"), () => import("./relation-delete-EP4KXAFL.mjs"), () => import("./schema-add-Z5CY6P24.mjs"), () => import("./schema-list-W326VPVX.mjs"), () => import("./tag-add-VNIIOVJA.mjs"), () => import("./tag-remove-6R2R27W3.mjs"));
+var DatabaseHandlers = OperationHandlerSet5.lazy(() => import("./context-add-VNJUVPSY.mjs"), () => import("./context-remove-ZASL7ABZ.mjs"), () => import("./load-K7HEJA54.mjs"), () => import("./object-create-EN6PJN3L.mjs"), () => import("./object-delete-RMA5ZKGY.mjs"), () => import("./object-update-JW5PLR2T.mjs"), () => import("./query-3FK3ED6L.mjs"), () => import("./relation-create-XOFKYPL2.mjs"), () => import("./relation-delete-MVJKKVEQ.mjs"), () => import("./schema-add-I7BFBU55.mjs"), () => import("./schema-list-TYGGAO2P.mjs"), () => import("./tag-add-RCE2QULJ.mjs"), () => import("./tag-remove-EPKB5CDE.mjs"));
 
 // src/blueprints/database/blueprint.ts
 var BLUEPRINT_KEY6 = "org.dxos.blueprint.database";
@@ -309,7 +309,7 @@ import { trim as trim5 } from "@dxos/util";
 
 // src/blueprints/memory/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet6 } from "@dxos/compute";
-var MemoryHandlers = OperationHandlerSet6.lazy(() => import("./save-GWAPLT3Z.mjs"), () => import("./query-U56GNEV6.mjs"), () => import("./delete-J3PMWP7Z.mjs"));
+var MemoryHandlers = OperationHandlerSet6.lazy(() => import("./save-TFQMJKG7.mjs"), () => import("./query-GXZT4KUX.mjs"), () => import("./delete-NLBJMMBJ.mjs"));
 
 // src/blueprints/memory/blueprint.ts
 var BLUEPRINT_KEY7 = "org.dxos.blueprint.memory";
@@ -348,7 +348,7 @@ var blueprint_default8 = blueprint7;
 
 // src/blueprints/automation/blueprint.ts
 import { Blueprint as Blueprint8, Trigger, Operation } from "@dxos/compute";
-import { Ref as Ref7 } from "@dxos/echo";
+import { Ref as Ref7, Type } from "@dxos/echo";
 import { Text as Text7 } from "@dxos/schema";
 import { trim as trim6 } from "@dxos/util";
 var BLUEPRINT_KEY8 = "dxos.org/blueprint/automation";
@@ -362,7 +362,7 @@ var instructions6 = trim6`
   Triggers are configured by the properties of the Trigger object.
   - enabled: Must be true for trigger to run.
   - spec: Events that the trigger matches.
-  - function: Ref to a ${Operation.PersistentOperation.typename} object that will be invoked. Query the functions present in the space first, and reference them in the trigger.
+  - function: Ref to a ${Type.getTypename(Operation.PersistentOperation)} object that will be invoked. Query the functions present in the space first, and reference them in the trigger.
   - input: The spec of the input data that will be passed to the function.
 
   ## Input patterns
@@ -389,7 +389,7 @@ var instructions6 = trim6`
 
   ## Editing triggers
 
-  Triggers are represented as objects of type ${Trigger.Trigger.typename}.
+  Triggers are represented as objects of type ${Type.getTypename(Trigger.Trigger)}.
   You need access to the Database blueprint to manipulate triggers.
   Read trigger schema before manipulating triggers.
   Having a Trigger object in the database is enough to setup an automation. 
@@ -451,7 +451,7 @@ import { trim as trim7 } from "@dxos/util";
 
 // src/blueprints/blueprint-manager/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet7 } from "@dxos/compute";
-var BlueprintManagerHandlers = OperationHandlerSet7.lazy(() => import("./query-blueprints-KXADGHSA.mjs"), () => import("./enable-blueprints-LBDZH2CY.mjs"), () => import("./update-blueprints-N2AK2VUR.mjs"));
+var BlueprintManagerHandlers = OperationHandlerSet7.lazy(() => import("./query-blueprints-GA2JM54N.mjs"), () => import("./enable-blueprints-SMGQ2WCU.mjs"), () => import("./update-blueprints-VOGJKSMQ.mjs"));
 
 // src/blueprints/blueprint-manager/blueprint.ts
 var BLUEPRINT_KEY9 = "org.dxos.blueprint.blueprint-manager";
@@ -503,7 +503,7 @@ import { trim as trim8 } from "@dxos/util";
 
 // src/blueprints/project-wizard/functions/index.ts
 import { OperationHandlerSet as OperationHandlerSet8 } from "@dxos/compute";
-var AgentWizardHandlers = OperationHandlerSet8.lazy(() => import("./create-project-EIF4OJMY.mjs"), () => import("./project-rules-IVDHKSKI.mjs"), () => import("./sync-triggers-CDMJVW6E.mjs"));
+var AgentWizardHandlers = OperationHandlerSet8.lazy(() => import("./create-project-VNC2KKBG.mjs"), () => import("./project-rules-IVA3DSOW.mjs"), () => import("./sync-triggers-M6U6RAKN.mjs"));
 
 // src/blueprints/project-wizard/blueprint.ts
 var BLUEPRINT_KEY10 = "org.dxos.blueprint.agent-wizard";
@@ -557,13 +557,11 @@ import * as Function from "effect/Function";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as SchemaAST from "effect/SchemaAST";
-import { Entity, Filter, Obj, Query as Query2, Type } from "@dxos/echo";
-import { Database } from "@dxos/echo";
+import { Database, Entity, Feed, Filter, Query as Query2, Type as Type2 } from "@dxos/echo";
 import { isEncodedReference } from "@dxos/echo-protocol";
-import { ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, createObject, getTypeAnnotation, getTypeIdentifierAnnotation } from "@dxos/echo/internal";
+import { ReferenceAnnotationId, RelationSourceId, RelationTargetId, createObject, getTypeAnnotation, getTypeIdentifierAnnotation } from "@dxos/echo/internal";
 import { mapAst } from "@dxos/effect";
-import { ContextQueueService } from "@dxos/functions";
-import { DXN, ObjectId } from "@dxos/keys";
+import { DXN, EchoURI, ObjectId } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { deepMapValues, isNonNullable, trim as trim9 } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/compute/assistant-toolkit/src/crud/graph.ts";
@@ -573,25 +571,22 @@ var Subgraph = Schema.Struct({
 });
 var findRelatedSchema = async (db, anchor) => {
   const allSchemas = await db.graph.schemaRegistry.query().run();
-  return allSchemas.filter((schema) => {
+  return allSchemas.filter((type) => {
+    const schema = Type2.getSchema(type);
     if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
       return false;
     }
-    return isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).targetSchema));
+    return isSchemaAddressableByDXN(anchor, getTypeAnnotation(schema).sourceSchema) || isSchemaAddressableByDXN(anchor, getTypeAnnotation(schema).targetSchema);
   }).map((schema) => ({
     kind: "relation",
     schema
   }));
 };
-var isSchemaAddressableByDxn = (schema, dxn) => {
-  if (getTypeIdentifierAnnotation(schema) === dxn.toString()) {
+var isSchemaAddressableByDXN = (type, dxn) => {
+  if (getTypeIdentifierAnnotation(Type2.getSchema(type)) === dxn) {
     return true;
   }
-  const t = dxn.asTypeDXN();
-  if (t) {
-    return t.type === Type.getTypename(schema);
-  }
-  return false;
+  return DXN.getName(dxn) === Type2.getTypename(type);
 };
 var LocalSearchToolkit = Toolkit2.make(Tool.make("search_local_search", {
   description: "Search the local database for information using a vector index",
@@ -603,7 +598,8 @@ var LocalSearchToolkit = Toolkit2.make(Tool.make("search_local_search", {
   success: Schema.Unknown,
   failure: Schema.Never,
   dependencies: [
-    Database.Service
+    Database.Service,
+    Feed.FeedService
   ]
 }));
 var LocalSearchHandler = LocalSearchToolkit.toLayer({
@@ -614,10 +610,10 @@ var LocalSearchHandler = LocalSearchToolkit.toLayer({
     const results = [
       ...objects
     ];
-    const option = yield* Effect.serviceOption(ContextQueueService);
-    if (Option.isSome(option)) {
-      const queueObjects = yield* Effect.promise(() => option.value.queue.queryObjects());
-      results.push(...queueObjects);
+    const feedOption = yield* Effect.serviceOption(Feed.ContextFeedService);
+    if (Option.isSome(feedOption)) {
+      const feedObjects = yield* Feed.runQuery(feedOption.value.feed, Filter.everything());
+      results.push(...feedObjects);
     }
     return trim9`
       <local_context>
@@ -636,7 +632,8 @@ var makeGraphWriterToolkit = ({ schema }) => {
     failure: Schema.Never,
     dependencies: [
       Database.Service,
-      ContextQueueService
+      Feed.ContextFeedService,
+      Feed.FeedService
     ]
   }).annotateContext(Context.make(GraphWriterSchema, {
     schema
@@ -647,10 +644,10 @@ var makeGraphWriterHandler = (toolkit, { onAppend } = {}) => {
   return toolkit.toLayer({
     graph_writer: Effect.fn(function* (input) {
       const { db } = yield* Database.Service;
-      const { queue } = yield* ContextQueueService;
-      const data = yield* Effect.promise(() => sanitizeObjects(schema, input, db, queue));
-      yield* Effect.promise(() => queue.append(data));
-      const dxns = data.map((obj) => Obj.getDXN(obj));
+      const { feed } = yield* Feed.ContextFeedService;
+      const data = yield* sanitizeObjects(schema, input, db, feed);
+      yield* Feed.append(feed, data);
+      const dxns = data.map((obj) => Entity.getURI(obj));
       onAppend?.(dxns);
       return dxns;
     })
@@ -658,18 +655,18 @@ var makeGraphWriterHandler = (toolkit, { onAppend } = {}) => {
 };
 var createExtractionSchema = (types) => {
   return Schema.Struct({
-    ...Object.fromEntries(types.map(preprocessSchema).map((schema, index) => [
+    ...Object.fromEntries(types.map((type) => preprocessSchema(Type2.getSchema(type))).map((schema, index) => [
       `objects_${getSanitizedSchemaName(types[index])}`,
       Schema.optional(Schema.Array(schema)).annotations({
-        description: `The objects of type: ${Type.getDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option.getOrElse(() => ""))}`
+        description: `The objects of type: ${DXN.getName(DXN.tryMake(Type2.getURI(types[index])))}. ${SchemaAST.getDescriptionAnnotation(Type2.getSchema(types[index]).ast).pipe(Option.getOrElse(() => ""))}`
       })
     ]))
   });
 };
 var getSanitizedSchemaName = (schema) => {
-  return Type.getDXN(schema).asTypeDXN().type.replaceAll(/[^a-zA-Z0-9]+/g, "_");
+  return DXN.getName(DXN.tryMake(Type2.getURI(schema))).replaceAll(/[^a-zA-Z0-9]+/g, "_");
 };
-var sanitizeObjects = async (types, data, db, queue) => {
+var sanitizeObjects = (types, data, db, feed) => Effect.gen(function* () {
   const entries = types.map((type) => data[`objects_${getSanitizedSchemaName(type)}`]?.map((object) => ({
     data: object,
     schema: type
@@ -680,11 +677,15 @@ var sanitizeObjects = async (types, data, db, queue) => {
   const resolveId = (id) => {
     if (ObjectId.isValid(id)) {
       existingIds.add(id);
-      return DXN.fromLocalObjectId(id);
+      return EchoURI.make({
+        objectId: id
+      });
     }
     const mappedId = idMap.get(id);
-    if (mappedId) {
-      return DXN.fromLocalObjectId(mappedId);
+    if (mappedId && ObjectId.isValid(mappedId)) {
+      return EchoURI.make({
+        objectId: mappedId
+      });
     }
     return void 0;
   };
@@ -712,63 +713,61 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
       return recurse(value);
     });
-    if (Entity.getKind(entry.schema) === "relation") {
-      const sourceDxn = resolveId(data2.source);
-      if (!sourceDxn) {
+    let sourceUri;
+    let targetUri;
+    if (Entity.getKind(Type2.getSchema(entry.schema)) === "relation") {
+      sourceUri = resolveId(data2.source);
+      if (!sourceUri) {
         log.warn("source not found", {
           source: data2.source
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 193, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 196, S: this });
       }
-      const targetDxn = resolveId(data2.target);
-      if (!targetDxn) {
+      targetUri = resolveId(data2.target);
+      if (!targetUri) {
         log.warn("target not found", {
           target: data2.target
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 199, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 202, S: this });
       }
       delete data2.source;
       delete data2.target;
-      data2[RelationSourceDXNId] = sourceDxn;
-      data2[RelationTargetDXNId] = targetDxn;
     }
     return {
       data: data2,
-      schema: entry.schema
+      schema: entry.schema,
+      sourceUri,
+      targetUri
     };
   }).filter((object) => !existingIds.has(object.data.id));
-  const dbObjects = await db.query(Query2.select(Filter.id(...existingIds))).run();
-  const queueObjects = await queue?.getObjectsById([
-    ...existingIds
-  ]) ?? [];
+  const dbObjects = yield* Effect.promise(() => db.query(Query2.select(Filter.id(...existingIds))).run());
+  const feedObjects = feed && existingIds.size > 0 ? yield* Feed.runQuery(feed, Filter.id(...existingIds)) : [];
   const objects = [
     ...dbObjects,
-    ...queueObjects
+    ...feedObjects
   ].filter(isNonNullable);
   log.info("objects", {
     dbObjects,
-    queueObjects,
+    feedObjects,
     existingIds
-  }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 223, S: void 0 });
+  }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 224, S: this });
   const missing = Array.from(existingIds).filter((id) => !objects.some((object) => object.id === id));
   if (missing.length > 0) {
     throw new Error(`Object IDs do not point to existing objects: ${missing.join(", ")}`);
   }
-  return res.flatMap(({ data: data2, schema }) => {
+  return res.flatMap(({ data: data2, schema, sourceUri, targetUri }) => {
     let skip = false;
-    if (RelationSourceDXNId in data2) {
-      const id = data2[RelationSourceDXNId].asEchoDXN()?.echoId;
-      const obj = objects.find((object) => object.id === id) ?? enitties.get(id);
+    if (sourceUri) {
+      const id = EchoURI.getObjectId(sourceUri);
+      const obj = objects.find((object) => object.id === id) ?? (id ? enitties.get(id) : void 0);
       if (obj) {
-        delete data2[RelationSourceDXNId];
         data2[RelationSourceId] = obj;
       } else {
         skip = true;
       }
     }
-    if (RelationTargetDXNId in data2) {
-      const id = data2[RelationTargetDXNId].asEchoDXN()?.echoId;
-      const obj = objects.find((object) => object.id === id) ?? enitties.get(id);
+    if (targetUri) {
+      const id = EchoURI.getObjectId(targetUri);
+      const obj = objects.find((object) => object.id === id) ?? (id ? enitties.get(id) : void 0);
       if (obj) {
-        delete data2[RelationTargetDXNId];
         data2[RelationTargetId] = obj;
       } else {
         skip = true;
@@ -783,7 +782,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     }
     return [];
   });
-};
+});
 var SoftRef = Schema.Struct({
   "/": Schema.String
 }).annotations({
@@ -817,7 +816,7 @@ var preprocessSchema = (schema) => {
 
 // src/functions/agent/index.ts
 import { OperationHandlerSet as OperationHandlerSet9 } from "@dxos/compute";
-var AgentHandlers = OperationHandlerSet9.lazy(() => import("./prompt-Y7NN7M5D.mjs"));
+var AgentHandlers = OperationHandlerSet9.lazy(() => import("./prompt-YVFNLD7U.mjs"));
 
 // src/toolkits/WebToolkit.ts
 var WebToolkit_exports = {};