@dxos/assistant-toolkit 0.8.4-main.3fbcb4aa9b → 0.8.4-main.4668b7de9b

package/dist/lib/neutral/{fetch-messages-QOBBCTGC.mjs → fetch-messages-RUUU63L2.mjs}

@@ -1,7 +1,7 @@
 import {
   FetchMessages,
   TimeRange
-} from "./chunk-ZFXLTBZG.mjs";
+} from "./chunk-PHZNOLXL.mjs";
 import "./chunk-J5LGTIGS.mjs";
 
 // src/blueprints/discord/functions/fetch-messages.ts
@@ -136,4 +136,4 @@ ${thread.messages.map((message) => `  ${message.sender.name}: ${message.blocks.f
 export {
   fetch_messages_default as default
 };
-//# sourceMappingURL=fetch-messages-QOBBCTGC.mjs.map
+//# sourceMappingURL=fetch-messages-RUUU63L2.mjs.map

package/dist/lib/neutral/{get-context-TN7X7U2H.mjs → get-context-3SXNFRXG.mjs}

@@ -1,12 +1,12 @@
 import {
   GetContext
-} from "./chunk-246ACKSH.mjs";
+} from "./chunk-T3RP4AUP.mjs";
 import {
   Agent_exports,
   Plan_exports
-} from "./chunk-P4ZMYO4K.mjs";
-import "./chunk-NR3GTWRC.mjs";
-import "./chunk-KGU725LW.mjs";
+} from "./chunk-ALDU6VDG.mjs";
+import "./chunk-GQRUBCMT.mjs";
+import "./chunk-SOLG2NPH.mjs";
 import "./chunk-J5LGTIGS.mjs";
 
 // src/blueprints/project/functions/get-context.ts
@@ -18,18 +18,18 @@ var get_context_default = GetContext.pipe(Operation.withHandler(Effect.fnUntrace
   return {
     id: agent.id,
     name: agent.name,
-    instructions: yield* agent.instructions.pipe(Database.load).pipe(Effect.map((_) => _.content), Effect.catchTag("ObjectNotFoundError", () => Effect.succeed("No instructions found."))),
-    plan: yield* agent.plan?.pipe(Database.load).pipe(Effect.map(Plan_exports.formatPlan), Effect.catchTag("ObjectNotFoundError", () => Effect.succeed("No plan found."))) ?? Effect.succeed("No plan found."),
+    instructions: yield* agent.instructions.pipe(Database.load).pipe(Effect.map((_) => _.content), Effect.catchTag("EntityNotFoundError", () => Effect.succeed("No instructions found."))),
+    plan: yield* agent.plan?.pipe(Database.load).pipe(Effect.map(Plan_exports.formatPlan), Effect.catchTag("EntityNotFoundError", () => Effect.succeed("No plan found."))) ?? Effect.succeed("No plan found."),
     artifacts: yield* Effect.forEach(agent.artifacts, (artifact) => Effect.gen(function* () {
       return {
         name: artifact.name,
-        type: yield* Database.load(artifact.data).pipe(Effect.map(Obj.getTypename), Effect.catchTag("ObjectNotFoundError", () => Effect.succeed("Artifact not found."))),
-        dxn: artifact.data.dxn.toString()
+        type: yield* Database.load(artifact.data).pipe(Effect.map(Obj.getTypename), Effect.catchTag("EntityNotFoundError", () => Effect.succeed("Artifact not found."))),
+        dxn: artifact.data.uri
       };
     }))
   };
-})));
+})), Operation.opaqueHandler);
 export {
   get_context_default as default
 };
-//# sourceMappingURL=get-context-TN7X7U2H.mjs.map
+//# sourceMappingURL=get-context-3SXNFRXG.mjs.map

package/dist/lib/neutral/{get-context-TN7X7U2H.mjs.map → get-context-3SXNFRXG.mjs.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/blueprints/project/functions/get-context.ts"],
-  "sourcesContent": ["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Operation } from '@dxos/compute';\nimport { Database, Obj } from '@dxos/echo';\n\nimport { Plan, Agent } from '../../../types';\nimport { GetContext } from './definitions';\n\nexport default GetContext.pipe(\n  Operation.withHandler(\n    Effect.fnUntraced(function* () {\n      const agent = yield* Agent.getFromChatContext;\n\n      return {\n        id: agent.id,\n        name: agent.name,\n        instructions: yield* agent.instructions.pipe(Database.load).pipe(\n          Effect.map((_) => _.content),\n          Effect.catchTag('ObjectNotFoundError', () => Effect.succeed('No instructions found.')),\n        ),\n        plan: yield* (\n          agent.plan?.pipe(Database.load).pipe(\n            Effect.map(Plan.formatPlan),\n            Effect.catchTag('ObjectNotFoundError', () => Effect.succeed('No plan found.')),\n          ) ?? Effect.succeed('No plan found.')\n        ),\n        artifacts: yield* Effect.forEach(agent.artifacts, (artifact) =>\n          Effect.gen(function* () {\n            return {\n              name: artifact.name,\n              type: yield* Database.load(artifact.data).pipe(\n                Effect.map(Obj.getTypename),\n                Effect.catchTag('ObjectNotFoundError', () => Effect.succeed('Artifact not found.')),\n              ),\n              dxn: artifact.data.dxn.toString(),\n            };\n          }),\n        ),\n      };\n    }) as any,\n  ),\n);\n"],
-  "mappings": ";;;;;;;;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,iBAAiB;AAC1B,SAASC,UAAUC,WAAW;AAK9B,IAAA,sBAAeC,WAAWC,KACxBC,UAAUC,YACDC,kBAAW,aAAA;AAChB,QAAMC,QAAQ,OAAOC,cAAMC;AAE3B,SAAO;IACLC,IAAIH,MAAMG;IACVC,MAAMJ,MAAMI;IACZC,cAAc,OAAOL,MAAMK,aAAaT,KAAKU,SAASC,IAAI,EAAEX,KACnDY,WAAI,CAACC,MAAMA,EAAEC,OAAO,GACpBC,gBAAS,uBAAuB,MAAaC,eAAQ,wBAAA,CAAA,CAAA;IAE9DC,MAAM,OACJb,MAAMa,MAAMjB,KAAKU,SAASC,IAAI,EAAEX,KACvBY,WAAIM,aAAKC,UAAU,GACnBJ,gBAAS,uBAAuB,MAAaC,eAAQ,gBAAA,CAAA,CAAA,KAClDA,eAAQ,gBAAA;IAEtBI,WAAW,OAAcC,eAAQjB,MAAMgB,WAAW,CAACE,aAC1CC,WAAI,aAAA;AACT,aAAO;QACLf,MAAMc,SAASd;QACfgB,MAAM,OAAOd,SAASC,KAAKW,SAASG,IAAI,EAAEzB,KACjCY,WAAIc,IAAIC,WAAW,GACnBZ,gBAAS,uBAAuB,MAAaC,eAAQ,qBAAA,CAAA,CAAA;QAE9DY,KAAKN,SAASG,KAAKG,IAAIC,SAAQ;MACjC;IACF,CAAA,CAAA;EAEJ;AACF,CAAA,CAAA,CAAA;",
-  "names": ["Effect", "Operation", "Database", "Obj", "GetContext", "pipe", "Operation", "withHandler", "fnUntraced", "agent", "Agent", "getFromChatContext", "id", "name", "instructions", "Database", "load", "map", "_", "content", "catchTag", "succeed", "plan", "Plan", "formatPlan", "artifacts", "forEach", "artifact", "gen", "type", "data", "Obj", "getTypename", "dxn", "toString"]
+  "sourcesContent": ["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Operation } from '@dxos/compute';\nimport { Database, Obj } from '@dxos/echo';\n\nimport { Plan, Agent } from '../../../types';\nimport { GetContext } from './definitions';\n\nexport default GetContext.pipe(\n  Operation.withHandler(\n    Effect.fnUntraced(function* () {\n      const agent = yield* Agent.getFromChatContext;\n\n      return {\n        id: agent.id,\n        name: agent.name,\n        instructions: yield* agent.instructions.pipe(Database.load).pipe(\n          Effect.map((_) => _.content),\n          Effect.catchTag('EntityNotFoundError', () => Effect.succeed('No instructions found.')),\n        ),\n        plan: yield* (\n          agent.plan?.pipe(Database.load).pipe(\n            Effect.map(Plan.formatPlan),\n            Effect.catchTag('EntityNotFoundError', () => Effect.succeed('No plan found.')),\n          ) ?? Effect.succeed('No plan found.')\n        ),\n        artifacts: yield* Effect.forEach(agent.artifacts, (artifact) =>\n          Effect.gen(function* () {\n            return {\n              name: artifact.name,\n              type: yield* Database.load(artifact.data).pipe(\n                Effect.map(Obj.getTypename),\n                Effect.catchTag('EntityNotFoundError', () => Effect.succeed('Artifact not found.')),\n              ),\n              dxn: artifact.data.uri,\n            };\n          }),\n        ),\n      };\n    }) as any,\n  ),\n  Operation.opaqueHandler,\n);\n"],
+  "mappings": ";;;;;;;;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,iBAAiB;AAC1B,SAASC,UAAUC,WAAW;AAK9B,IAAA,sBAAeC,WAAWC,KACxBC,UAAUC,YACDC,kBAAW,aAAA;AAChB,QAAMC,QAAQ,OAAOC,cAAMC;AAE3B,SAAO;IACLC,IAAIH,MAAMG;IACVC,MAAMJ,MAAMI;IACZC,cAAc,OAAOL,MAAMK,aAAaT,KAAKU,SAASC,IAAI,EAAEX,KACnDY,WAAI,CAACC,MAAMA,EAAEC,OAAO,GACpBC,gBAAS,uBAAuB,MAAaC,eAAQ,wBAAA,CAAA,CAAA;IAE9DC,MAAM,OACJb,MAAMa,MAAMjB,KAAKU,SAASC,IAAI,EAAEX,KACvBY,WAAIM,aAAKC,UAAU,GACnBJ,gBAAS,uBAAuB,MAAaC,eAAQ,gBAAA,CAAA,CAAA,KAClDA,eAAQ,gBAAA;IAEtBI,WAAW,OAAcC,eAAQjB,MAAMgB,WAAW,CAACE,aAC1CC,WAAI,aAAA;AACT,aAAO;QACLf,MAAMc,SAASd;QACfgB,MAAM,OAAOd,SAASC,KAAKW,SAASG,IAAI,EAAEzB,KACjCY,WAAIc,IAAIC,WAAW,GACnBZ,gBAAS,uBAAuB,MAAaC,eAAQ,qBAAA,CAAA,CAAA;QAE9DY,KAAKN,SAASG,KAAKI;MACrB;IACF,CAAA,CAAA;EAEJ;AACF,CAAA,CAAA,GAEF5B,UAAU6B,aAAa;",
+  "names": ["Effect", "Operation", "Database", "Obj", "GetContext", "pipe", "Operation", "withHandler", "fnUntraced", "agent", "Agent", "getFromChatContext", "id", "name", "instructions", "Database", "load", "map", "_", "content", "catchTag", "succeed", "plan", "Plan", "formatPlan", "artifacts", "forEach", "artifact", "gen", "type", "data", "Obj", "getTypename", "dxn", "uri", "opaqueHandler"]
 }

package/dist/lib/neutral/index.mjs

@@ -1,31 +1,30 @@
 import {
   AgentPrompt
-} from "./chunk-GV66MKAQ.mjs";
+} from "./chunk-AYV2KMAV.mjs";
 import {
   DeleteMemory,
   QueryMemories,
   SaveMemory
-} from "./chunk-EJAQUAKM.mjs";
+} from "./chunk-53BZWMRB.mjs";
 import {
   EnableBlueprints,
-  QueryBlueprints,
-  UpdateBlueprints
-} from "./chunk-TO5IX24K.mjs";
+  QueryBlueprints
+} from "./chunk-3ZDYN7BG.mjs";
 import {
   AgentRules,
   CreateAgent,
   SyncTriggers
-} from "./chunk-XUF53B6B.mjs";
+} from "./chunk-DBUT6FKM.mjs";
 import {
   SyncIssues,
   syncObjects
-} from "./chunk-ROMZO4CB.mjs";
+} from "./chunk-BB6X6NT6.mjs";
 import {
   UpdateTasks
-} from "./chunk-FIGO6CA6.mjs";
+} from "./chunk-JRYAD4TG.mjs";
 import {
   Fetch
-} from "./chunk-WLR3BGO4.mjs";
+} from "./chunk-6SYN5IV3.mjs";
 import {
   ContextAdd,
   ContextRemove,
@@ -40,31 +39,31 @@ import {
   SchemaList,
   TagAdd,
   TagRemove
-} from "./chunk-IKBIORQX.mjs";
+} from "./chunk-V3PPVL3C.mjs";
 import {
   FetchMessages
-} from "./chunk-ZFXLTBZG.mjs";
+} from "./chunk-PHZNOLXL.mjs";
 import {
   AgentBlueprintHandlers,
   blueprint_default
-} from "./chunk-QO5SU37C.mjs";
+} from "./chunk-7OQIX2PP.mjs";
 import {
   AddArtifact,
   AgentWorker,
   GetContext,
   Qualifier
-} from "./chunk-246ACKSH.mjs";
+} from "./chunk-T3RP4AUP.mjs";
 import {
   Agent_exports,
   McpServer_exports,
   Plan_exports
-} from "./chunk-P4ZMYO4K.mjs";
+} from "./chunk-ALDU6VDG.mjs";
 import {
   Chat_exports
-} from "./chunk-NR3GTWRC.mjs";
+} from "./chunk-GQRUBCMT.mjs";
 import {
   Memory_exports
-} from "./chunk-KGU725LW.mjs";
+} from "./chunk-SOLG2NPH.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -77,7 +76,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-RUUU63L2.mjs"));
 
 // src/blueprints/discord/blueprint.ts
 var BLUEPRINT_KEY = "org.dxos.blueprint.discord";
@@ -117,7 +116,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-36TS2R7R.mjs"));
 
 // src/blueprints/linear/blueprint.ts
 var BLUEPRINT_KEY2 = "org.dxos.blueprint.linear";
@@ -155,14 +154,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-6MJCJ2KC.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 +181,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-B2AYJK7F.mjs"));
 
 // src/blueprints/websearch/blueprint.ts
 var BLUEPRINT_KEY4 = "org.dxos.blueprint.web-search";
@@ -259,7 +258,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-2G2CDRCK.mjs"), () => import("./context-remove-QQOT57JC.mjs"), () => import("./load-YWYQ4THR.mjs"), () => import("./object-create-WME2XFGD.mjs"), () => import("./object-delete-I5OAPI32.mjs"), () => import("./object-update-VCOL62NX.mjs"), () => import("./query-GZDTQRQ6.mjs"), () => import("./relation-create-UHBWQQXS.mjs"), () => import("./relation-delete-ZSB7JOHO.mjs"), () => import("./schema-add-ZJ64RAZK.mjs"), () => import("./schema-list-3X3VNYYB.mjs"), () => import("./tag-add-7P5O3IAV.mjs"), () => import("./tag-remove-YZIMOFA4.mjs"));
 
 // src/blueprints/database/blueprint.ts
 var BLUEPRINT_KEY6 = "org.dxos.blueprint.database";
@@ -309,7 +308,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-B2CSSFDG.mjs"), () => import("./query-KBKGBYUO.mjs"), () => import("./delete-MRER3QMO.mjs"));
 
 // src/blueprints/memory/blueprint.ts
 var BLUEPRINT_KEY7 = "org.dxos.blueprint.memory";
@@ -348,7 +347,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 +361,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 +388,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. 
@@ -447,14 +446,15 @@ var blueprint_default9 = blueprint8;
 
 // src/blueprints/blueprint-manager/blueprint.ts
 import { Blueprint as Blueprint9, Template } from "@dxos/compute";
+import { DXN } from "@dxos/keys";
 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-MFXXRZBY.mjs"), () => import("./enable-blueprints-GEIKTSRV.mjs"));
 
 // src/blueprints/blueprint-manager/blueprint.ts
-var BLUEPRINT_KEY9 = "org.dxos.blueprint.blueprint-manager";
+var BLUEPRINT_KEY9 = "org.dxos.blueprint.blueprintManager";
 var make10 = () => Blueprint9.make({
   key: BLUEPRINT_KEY9,
   name: "Blueprint Manager",
@@ -463,7 +463,6 @@ var make10 = () => Blueprint9.make({
     source: trim7`
         You can query available blueprints and enable them in the current conversation.
         Use [query-blueprints] to refresh the list of available blueprints.
-        Use [refresh-blueprints] to update blueprint objects stored in the database from the built-in registry when they have drifted.
         Use [enable-blueprints] to enable blueprints by their keys. Always call [query-blueprints] first.
         Only blueprints with agentCanEnable=true can be enabled by the agent.
 
@@ -479,15 +478,14 @@ var make10 = () => Blueprint9.make({
       {
         name: "blueprints",
         kind: "operation",
-        operation: QueryBlueprints.meta.key
+        operation: DXN.getName(QueryBlueprints.meta.key)
       }
     ]
   }),
   tools: Blueprint9.toolDefinitions({
     operations: [
       QueryBlueprints,
-      EnableBlueprints,
-      UpdateBlueprints
+      EnableBlueprints
     ]
   })
 });
@@ -503,10 +501,10 @@ 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-LVIH4OLF.mjs"), () => import("./project-rules-7NYDDQ7K.mjs"), () => import("./sync-triggers-MMHKQDNW.mjs"));
 
 // src/blueprints/project-wizard/blueprint.ts
-var BLUEPRINT_KEY10 = "org.dxos.blueprint.agent-wizard";
+var BLUEPRINT_KEY10 = "org.dxos.blueprint.agentWizard";
 var make11 = () => Blueprint10.make({
   key: BLUEPRINT_KEY10,
   name: "Agent Wizard",
@@ -557,13 +555,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, Scope, 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 as DXN2, EID, EntityId } 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";
@@ -572,26 +568,23 @@ var Subgraph = Schema.Struct({
   objects: Schema.Array(Schema.Any)
 });
 var findRelatedSchema = async (db, anchor) => {
-  const allSchemas = await db.graph.schemaRegistry.query().run();
+  const allSchemas = await db.query(Query2.select(Filter.type(Type2.Type)).from(Scope.space(), Scope.registry())).run();
   return allSchemas.filter((schema) => {
-    if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
+    const annotation = getTypeAnnotation(Type2.getSchema(schema));
+    if (annotation?.kind !== Entity.Kind.Relation) {
       return false;
     }
-    return isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).targetSchema));
+    return isSchemaAddressableByDXN(anchor, annotation.sourceSchema) || isSchemaAddressableByDXN(anchor, annotation.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 DXN2.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 +596,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 +608,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 +630,8 @@ var makeGraphWriterToolkit = ({ schema }) => {
     failure: Schema.Never,
     dependencies: [
       Database.Service,
-      ContextQueueService
+      Feed.ContextFeedService,
+      Feed.FeedService
     ]
   }).annotateContext(Context.make(GraphWriterSchema, {
     schema
@@ -647,10 +642,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 +653,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: ${DXN2.getName(DXN2.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 DXN2.getName(DXN2.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
@@ -678,21 +673,25 @@ var sanitizeObjects = async (types, data, db, queue) => {
   const existingIds = /* @__PURE__ */ new Set();
   const enitties = /* @__PURE__ */ new Map();
   const resolveId = (id) => {
-    if (ObjectId.isValid(id)) {
+    if (EntityId.isValid(id)) {
       existingIds.add(id);
-      return DXN.fromLocalObjectId(id);
+      return EID.make({
+        entityId: id
+      });
     }
     const mappedId = idMap.get(id);
-    if (mappedId) {
-      return DXN.fromLocalObjectId(mappedId);
+    if (mappedId && EntityId.isValid(mappedId)) {
+      return EID.make({
+        entityId: mappedId
+      });
     }
     return void 0;
   };
   const res = entries.map((entry) => {
-    if (ObjectId.isValid(entry.data.id)) {
+    if (EntityId.isValid(entry.data.id)) {
       return entry;
     }
-    idMap.set(entry.data.id, ObjectId.random());
+    idMap.set(entry.data.id, EntityId.random());
     entry.data.id = idMap.get(entry.data.id);
     return entry;
   }).map((entry) => {
@@ -712,63 +711,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: 195, 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: 201, 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: 223, 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 = EID.getEntityId(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 = EID.getEntityId(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 +780,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     }
     return [];
   });
-};
+});
 var SoftRef = Schema.Struct({
   "/": Schema.String
 }).annotations({
@@ -817,7 +814,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-DZP2K2NE.mjs"));
 
 // src/toolkits/WebToolkit.ts
 var WebToolkit_exports = {};