@dxos/assistant 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/dist/lib/neutral/extraction/index.mjs

@@ -3,12 +3,13 @@ import "../chunk-J5LGTIGS.mjs";
 // src/extraction/extraction.ts
 import * as Schema from "effect/Schema";
 import { Operation } from "@dxos/compute";
-import { Obj } from "@dxos/echo";
+import { Obj, Type } from "@dxos/echo";
+import { DXN } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { Message } from "@dxos/types";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/compute/assistant/src/extraction/extraction.ts";
 var ExtractionInput = Schema.Struct({
-  message: Message.Message,
+  message: Type.getSchema(Message.Message),
   objects: Schema.optional(Schema.Array(Obj.Unknown)),
   options: Schema.optional(Schema.Struct({
     timeout: Schema.optional(Schema.Number),
@@ -16,23 +17,25 @@ var ExtractionInput = Schema.Struct({
   }))
 });
 var ExtractionOutput = Schema.Struct({
-  message: Message.Message,
+  message: Type.getSchema(Message.Message),
   timeElapsed: Schema.Number
 });
 var extractionAnthropicFunction = Operation.make({
   meta: {
-    key: "org.dxos.function.extraction.anthropic",
+    key: DXN.make("org.dxos.function.extraction.anthropic"),
     name: "Entity Extraction (Anthropic)",
-    description: "Extract entities from transcript using Anthropic LLM."
+    description: "Extract entities from transcript using Anthropic LLM.",
+    icon: "ph--text-t--regular"
   },
   input: ExtractionInput,
   output: ExtractionOutput
 });
 var extractionNerFunction = Operation.make({
   meta: {
-    key: "org.dxos.function.extraction.ner",
+    key: DXN.make("org.dxos.function.extraction.ner"),
     name: "Entity Extraction (NER)",
-    description: "Extract entities from transcript using Named Entity Recognition."
+    description: "Extract entities from transcript using Named Entity Recognition.",
+    icon: "ph--text-t--regular"
   },
   input: ExtractionInput,
   output: ExtractionOutput
@@ -46,7 +49,7 @@ var processTranscriptMessage = async (params) => {
     if (params.options?.fallbackToRaw) {
       log.warn("failed to process message, falling back to raw text", {
         error
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 57, S: void 0 });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 60, S: void 0 });
       return {
         message: params.input.message,
         timeElapsed: 0
@@ -141,8 +144,7 @@ var combineNerTokens = (group) => {
 // src/extraction/quotes.ts
 import * as Schema2 from "effect/Schema";
 import { Filter, Query } from "@dxos/echo";
-import { ObjectId } from "@dxos/keys";
-import { DXN } from "@dxos/keys";
+import { EID, EntityId } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/core/compute/assistant/src/extraction/quotes.ts";
 var ReferencedQuotes = Schema2.Struct({
@@ -165,7 +167,7 @@ var findQuotes = async (quotes, db) => {
     log3.info("found quotes in vector index", {
       objects,
       quote
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 26, S: void 0 });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 25, S: void 0 });
     return objects.length > 0 ? [
       {
         id: objects[0].id.toString(),
@@ -179,11 +181,13 @@ var findQuotes = async (quotes, db) => {
 };
 var insertReferences = (text, quotes) => {
   for (const quote of quotes.references) {
-    if (!ObjectId.isValid(quote.id)) {
+    if (!EntityId.isValid(quote.id)) {
       continue;
     }
     const regex = new RegExp(quote.quote.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "gi");
-    text = text.replace(regex, `[${quote.quote}](${DXN.fromLocalObjectId(quote.id).toString()})`);
+    text = text.replace(regex, `[${quote.quote}](${EID.make({
+      entityId: quote.id
+    })})`);
   }
   return text;
 };

package/dist/lib/neutral/extraction/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/extraction/extraction.ts", "../../../../src/extraction/extraction-ner-function/named-entity-recognition.ts", "../../../../src/extraction/quotes.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { Operation } from '@dxos/compute';\nimport { Obj } from '@dxos/echo';\nimport { log } from '@dxos/log';\nimport { Message } from '@dxos/types';\n\nexport const ExtractionInput = Schema.Struct({\n  message: Message.Message,\n  objects: Schema.optional(Schema.Array(Obj.Unknown)),\n  options: Schema.optional(\n    Schema.Struct({\n      timeout: Schema.optional(Schema.Number),\n      fallbackToRaw: Schema.optional(Schema.Boolean),\n    }),\n  ),\n});\nexport interface ExtractionInput extends Schema.Schema.Type<typeof ExtractionInput> {}\n\nexport const ExtractionOutput = Schema.Struct({\n  message: Message.Message,\n  timeElapsed: Schema.Number,\n});\nexport interface ExtractionOutput extends Schema.Schema.Type<typeof ExtractionOutput> {}\n\nexport type ProcessTranscriptMessageProps = {\n  input: ExtractionInput;\n  function: Operation.Definition<ExtractionInput, ExtractionOutput>;\n\n  options?: {\n    /**\n     * Timeout for the entity extraction.\n     */\n    timeout?: number;\n\n    /**\n     * Fallback to raw text if the entity extraction fails.\n     * Otherwise the function will throw an error.\n     * @default false\n     */\n    fallbackToRaw?: boolean;\n  };\n};\n\nexport type ExtractionFunction = Operation.Definition<ExtractionInput, ExtractionOutput>;\n\n/**\n * Placeholder for Anthropic-based entity extraction.\n * Implementation is currently disabled pending restoration of extraction logic.\n */\nexport const extractionAnthropicFunction = Operation.make({\n  meta: {\n    key: 'org.dxos.function.extraction.anthropic',\n    name: 'Entity Extraction (Anthropic)',\n    description: 'Extract entities from transcript using Anthropic LLM.',\n  },\n  input: ExtractionInput,\n  output: ExtractionOutput,\n});\n\n/**\n * Placeholder for NER-based entity extraction.\n * Implementation is currently disabled pending restoration of extraction logic.\n */\nexport const extractionNerFunction = Operation.make({\n  meta: {\n    key: 'org.dxos.function.extraction.ner',\n    name: 'Entity Extraction (NER)',\n    description: 'Extract entities from transcript using Named Entity Recognition.',\n  },\n  input: ExtractionInput,\n  output: ExtractionOutput,\n});\n\n/**\n * Extract entities from the transcript message and add them to the message.\n */\n// TODO(dmaretskyi): Move context to a vector search index.\nexport const processTranscriptMessage = async (params: ProcessTranscriptMessageProps): Promise<ExtractionOutput> => {\n  try {\n    if (params.options?.timeout && params.options.timeout > 0) {\n      // return await asyncTimeout(params.executor.invoke(params.function, params.input), params.options.timeout);\n    } else {\n      // return await params.executor.invoke(params.function, params.input);\n    }\n  } catch (error) {\n    if (params.options?.fallbackToRaw) {\n      log.warn('failed to process message, falling back to raw text', { error });\n      return {\n        message: params.input.message,\n        timeElapsed: 0,\n      };\n    } else {\n      throw error;\n    }\n  }\n\n  // TODO(dmaretskyi): Restore extraction logic.\n  return { message: params.input.message, timeElapsed: 0 };\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport {\n  type TokenClassificationOutput,\n  type TokenClassificationPipelineType,\n  type TokenClassificationSingle,\n  pipeline,\n} from '@xenova/transformers';\n\nimport { log } from '@dxos/log';\n\nlet _ner: Promise<TokenClassificationPipelineType>;\n\n/**\n * Named Entity Recognition pipeline.\n * Initializes the pipeline on first call.\n * @returns The singleton promise that resolves to a token classification pipeline.\n */\nexport const getNer = () => {\n  if (!_ner) {\n    _ner = pipeline('ner', 'Xenova/bert-base-NER').then((ner) => {\n      log.info('NER model is ready');\n      return ner;\n    });\n  }\n\n  return _ner;\n};\n\n/**\n * Extracts entities from text using the named entity recognition pipeline and does simple grouping of tokens.\n */\nexport const extractFullEntities = async (text: string): Promise<TokenClassificationSingle[]> => {\n  const ner = await getNer();\n  const entities = (await ner(text)) as TokenClassificationOutput;\n  const tokenGroups = createTokenGroups(entities);\n  const combinedEntities = tokenGroups.map(combineNerTokens);\n  return combinedEntities;\n};\n\nexport const createTokenGroups = (tokens: TokenClassificationSingle[]): TokenClassificationSingle[][] => {\n  const tokenGroups: TokenClassificationSingle[][] = [];\n\n  const canBeCombined = (prevToken: TokenClassificationSingle, currentToken: TokenClassificationSingle) => {\n    const [currentState, currentEntity] = currentToken.entity.split('-'); // B, I, O\n    const [prevState, prevEntity] = prevToken.entity.split('-'); // B, I, O\n    if (prevEntity !== currentEntity) {\n      return false;\n    }\n    if (prevState === 'O') {\n      return false;\n    }\n    if (currentState === 'I') {\n      return true;\n    }\n    if ((prevState === 'B' || prevState === 'I') && currentState === 'B') {\n      return currentToken.word.startsWith('#');\n    }\n    return false;\n  };\n\n  for (const token of tokens) {\n    if (tokenGroups.length === 0) {\n      tokenGroups.push([token]);\n      continue;\n    }\n    const lastTokenGroup = tokenGroups.at(-1)!;\n    if (canBeCombined(lastTokenGroup.at(-1)!, token)) {\n      lastTokenGroup.push(token);\n      continue;\n    }\n    tokenGroups.push([token]);\n  }\n\n  return tokenGroups;\n};\n\nexport const combineNerTokens = (group: TokenClassificationSingle[]): TokenClassificationSingle => {\n  const combinedToken: TokenClassificationSingle = {\n    entity: group.at(0)!.entity.split('-')[1],\n    score: group.reduce((acc, token) => acc + token.score, 0) / group.length,\n    index: group.at(0)!.index,\n    word: group.at(0)!.word,\n    start: group.at(0)!.start,\n    end: group.at(-1)!.end,\n  };\n\n  for (const token of group.slice(1)) {\n    if (token.word.startsWith('#')) {\n      combinedToken.word += token.word.replace(/^#+/, '');\n    } else {\n      combinedToken.word += ' ' + token.word;\n    }\n  }\n\n  return combinedToken;\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { type Database, Filter, Query } from '@dxos/echo';\nimport { ObjectId } from '@dxos/keys';\nimport { DXN } from '@dxos/keys';\nimport { log } from '@dxos/log';\n\nexport const ReferencedQuotes = Schema.Struct({\n  references: Schema.Array(\n    Schema.Struct({\n      id: Schema.String,\n      quote: Schema.String, // TODO(burdon): Quote?\n    }),\n  )\n    .pipe(Schema.mutable)\n    .annotations({\n      // TODO(burdon): Does this description make sense?\n      description: `\n      The references to the context objects that are mentioned in the transcript. \n      Quote should match the original transcript text exactly, while id is the id of the context object.\n    `,\n    }),\n});\nexport type ReferencedQuotes = Schema.Schema.Type<typeof ReferencedQuotes>;\n\nexport const findQuotes = async (quotes: string[], db: Database.Database): Promise<ReferencedQuotes> => {\n  const references = await Promise.all(\n    quotes.map(async (quote) => {\n      const objects = await db.query(Query.select(Filter.text(quote, { type: 'vector' }))).run();\n      log.info('found quotes in vector index', { objects, quote });\n      return objects.length > 0 ? [{ id: objects[0].id.toString(), quote }] : [];\n    }),\n  );\n  return { references: references.flat() };\n};\n\n/**\n * Finds and replaces all quotes with DXNs references.\n */\n// TODO(dmaretskyi): Lookup and verifiy ids from provided context.\nexport const insertReferences = (text: string, quotes: ReferencedQuotes) => {\n  for (const quote of quotes.references) {\n    if (!ObjectId.isValid(quote.id)) {\n      continue;\n    }\n\n    // Use a case-insensitive regular expression to replace the quote.\n    const regex = new RegExp(quote.quote.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&'), 'gi');\n    text = text.replace(regex, `[${quote.quote}](${DXN.fromLocalObjectId(quote.id).toString()})`);\n  }\n\n  return text;\n};\n"],
-  "mappings": ";;;AAIA,YAAYA,YAAY;AAExB,SAASC,iBAAiB;AAC1B,SAASC,WAAW;AACpB,SAASC,WAAW;AACpB,SAASC,eAAe;AAExB,IAAA,eAAaC;AAEXC,IAASN,kBAAuBO,cAAML;EACtCM,SAASR,QAAOS;WAEHT,gBAAgBA,aAAOU,IAAM,OAAA,CAAA;WACtCC,gBAAsBF,cAAST;IACjC,SAAA,gBAAA,aAAA;IAED,eAAA,gBAAA,cAAA;EAGH,CAAA,CAAA;;AAEEY,IAAAA,mBAA0B,cAAA;EACzB,SAAA,QAAA;EAwBH,aAAA;;AAMIC,IAAK,8BAAA,UAAA,KAAA;QACLC;IACAC,KAAAA;IACF,MAAA;IACAC,aAAOX;EACPY;EACC,OAAA;EAEH,QAAA;;AAMIJ,IAAK,wBAAA,UAAA,KAAA;QACLC;IACAC,KAAAA;IACF,MAAA;IACAC,aAAOX;EACPY;EACC,OAAA;EAEH,QAAA;;IAMQC,2BAA2BA,OAAOV,WAAQW;MAC5C;AACF,QAAA,OAAO,SAAA,WAAA,OAAA,QAAA,UAAA,GAAA;IAEP,OAAA;IAEA;WACEhB,OAAQ;eAA0DiB,SAAAA,eAAAA;AAAM,UAAA,KAAA,uDAAA;QACxE;uBACWF,YAAY,GAACG,cAAO,GAAA,IAAA,GAAA,OAAA,CAAA;aAC7BT;QACF,SAAA,OAAA,MAAA;QACK,aAAA;MACL;IACF,OAAA;AACF,YAAA;IAEA;EACA;SAAwCA;IAAe,SAAA,OAAA,MAAA;IACvD,aAAA;;;;;ACnGF,SAIEU,gBACK;AAEP,SAASC,OAAAA,YAAW;AAEpB,IAAIC,gBAAAA;;AASAA,IAAOF,SAAS,MAAA;aACdC;WACA,SAAOE,OAAAA,sBAAAA,EAAAA,KAAAA,CAAAA,QAAAA;AACT,MAAAF,KAAA,KAAA,sBAAA,QAAA,EAAA,YAAA,YAAA,GAAAG,eAAA,GAAA,IAAA,GAAA,OAAA,CAAA;AACF,aAAA;IAEA,CAAA;EACA;AAEF,SAAA;;AAKQC,IAAAA,sBAAsBC,OAAAA,SAAAA;AAC5B,QAAMC,MAAAA,MAAAA,OAAcC;AACpB,QAAMC,WAAAA,MAAAA,IAAmBF,IAAAA;AACzB,QAAA,cAAOE,kBAAAA,QAAAA;AACP,QAAA,mBAAA,YAAA,IAAA,gBAAA;AAEF,SAAO;;AAGL,IAAMC,oBAAiBC,CAAAA,WAAsCC;QAC3D,cAAOC,CAAAA;QACP,gBAAkBC,CAAAA,WAAW,iBAAaC;AAC1C,UAAID,CAAAA,cAAeE,aAAe,IAAA,aAAA,OAAA,MAAA,GAAA;UAChC,CAAA,WAAO,UAAA,IAAA,UAAA,OAAA,MAAA,GAAA;AACT,QAAA,eAAA,eAAA;AACIC,aAAAA;;AAEJ,QAAA,cAAA,KAAA;AACIJ,aAAAA;;AAEJ,QAAA,iBAAA,KAAA;AACKI,aAAAA;;AAEL,SAAA,cAAA,OAAA,cAAA,QAAA,iBAAA,KAAA;AACA,aAAO,aAAA,KAAA,WAAA,GAAA;IACT;AAEA,WAAWC;;aAEPX,SAAYY,QAAK;oBAACD,WAAAA,GAAAA;kBAAM,KAAA;QACxB;MACF,CAAA;AACA;IACA;UACEE,iBAAmB,YAACF,GAAAA,EAAAA;QACpB,cAAA,eAAA,GAAA,EAAA,GAAA,KAAA,GAAA;AACF,qBAAA,KAAA,KAAA;AACAX;;gBAAwB,KAAA;MAC1B;IAEA,CAAA;EACA;AAEF,SAAO;;IAEHQ,mBAAqBA,CAAAA,UAAa;QAClCM,gBAAaC;IACbC,QAAOC,MAAMC,GAAG,CAAA,EAAIF,OAAK,MAAA,GAAA,EAAA,CAAA;IACzBG,OAAMF,MAAMC,OAAOC,CAAAA,KAAI,UAAA,MAAA,MAAA,OAAA,CAAA,IAAA,MAAA;IACvBC,OAAOH,MAAMC,GAAG,CAAA,EAAIE;IACpBC,MAAKJ,MAAMC,GAAI,CAAA,EAAIG;IACrB,OAAA,MAAA,GAAA,CAAA,EAAA;IAEA,KAAK,MAAMV,GAAAA,EAASM,EAAAA;;aAEhBK,SAAAA,MAAkB,MAAIX,CAAAA,GAAAA;AACxB,QAAA,MAAO,KAAA,WAAA,GAAA,GAAA;AACLW,oBAAcH,QAAQ,MAAMR,KAAAA,QAAU,OAAA,EAAA;IACxC,OAAA;AACF,oBAAA,QAAA,MAAA,MAAA;IAEA;EACA;;;;;AC9FF,YAAYY,aAAY;AAExB,SAAwBC,QAAQC,aAAa;AAC7C,SAASC,gBAAgB;AACzB,SAASC,WAAW;AACpB,SAASC,OAAAA,YAAW;AAEpB,IAAAC,gBAAaC;IAGHP,mBAAa,eAAA;cACHQ,cAAM,eAAA;IAGrBC,IAAKT;IAEJ,OAAA;MACAU,KAAAA,eAAc,EAAA,YAAA;;;;;;EAQpB,CAAA;;IAGM,aAAgB,OAASC,QAAMT,OAAMU;qBAAkC,MAAA,QAAA,IAAA,OAAA,IAAA,OAAA,UAAA;AAAS,UAAKC,UAAG,MAAA,GAAA,MAAA,MAAA,OAAA,OAAA,KAAA,OAAA;MACpFC,MAAK;SAAkCC,IAAAA;SAASC,KAAAA,gCAAAA;MAAM;MAC1D;qBAA6B,YAAA,GAAAV,eAAA,GAAA,IAAA,GAAA,OAAA,CAAA;mBAAMS,SAAWE,IAAGC;;QAAkB,IAAA,QAAA,CAAA,EAAA,GAAA,SAAA;QAAO;MAC5E;IAEF,IAAO,CAAA;;AAAgC,SAAA;IACvC,YAAA,WAAA,KAAA;EAEF;;IAMSf,mBAAiBa,CAAAA,MAAQ,WAAG;aAC/B,SAAA,OAAA,YAAA;AACF,QAAA,CAAA,SAAA,QAAA,MAAA,EAAA,GAAA;AAEA;IACA;AAEF,UAAA,QAAA,IAAA,OAAA,MAAA,MAAA,QAAA,uBAAA,MAAA,GAAA,IAAA;AAEA,WAAOG,KAAAA,QAAAA,OAAAA,IAAAA,MAAAA,KAAAA,KAAAA,IAAAA,kBAAAA,MAAAA,EAAAA,EAAAA,SAAAA,CAAAA,GAAAA;EACP;;;",
-  "names": ["Schema", "Operation", "Obj", "log", "Message", "ExtractionInput", "objects", "Array", "options", "optional", "Number", "fallbackToRaw", "timeElapsed", "key", "name", "description", "input", "output", "params", "timeout", "error", "message", "pipeline", "log", "_ner", "ner", "__dxlog_file", "entities", "text", "tokenGroups", "createTokenGroups", "combinedEntities", "canBeCombined", "prevToken", "currentToken", "currentState", "prevEntity", "entity", "currentEntity", "prevState", "token", "push", "lastTokenGroup", "score", "reduce", "index", "group", "at", "word", "start", "end", "combinedToken", "Schema", "Filter", "Query", "ObjectId", "DXN", "log", "__dxlog_file", "ReferencedQuotes", "String", "pipe", "description", "query", "select", "run", "info", "objects", "quote", "id", "toString", "text"]
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { Operation } from '@dxos/compute';\nimport { Obj, Type } from '@dxos/echo';\nimport { DXN } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { Message } from '@dxos/types';\n\nexport const ExtractionInput = Schema.Struct({\n  message: Type.getSchema(Message.Message),\n  objects: Schema.optional(Schema.Array(Obj.Unknown)),\n  options: Schema.optional(\n    Schema.Struct({\n      timeout: Schema.optional(Schema.Number),\n      fallbackToRaw: Schema.optional(Schema.Boolean),\n    }),\n  ),\n});\nexport type ExtractionInput = Schema.Schema.Type<typeof ExtractionInput>;\nexport const ExtractionOutput = Schema.Struct({\n  message: Type.getSchema(Message.Message),\n  timeElapsed: Schema.Number,\n});\nexport type ExtractionOutput = Schema.Schema.Type<typeof ExtractionOutput>;\nexport type ProcessTranscriptMessageProps = {\n  input: ExtractionInput;\n  function: Operation.Definition<ExtractionInput, ExtractionOutput>;\n\n  options?: {\n    /**\n     * Timeout for the entity extraction.\n     */\n    timeout?: number;\n\n    /**\n     * Fallback to raw text if the entity extraction fails.\n     * Otherwise the function will throw an error.\n     * @default false\n     */\n    fallbackToRaw?: boolean;\n  };\n};\n\nexport type ExtractionFunction = Operation.Definition<ExtractionInput, ExtractionOutput>;\n\n/**\n * Placeholder for Anthropic-based entity extraction.\n * Implementation is currently disabled pending restoration of extraction logic.\n */\nexport const extractionAnthropicFunction = Operation.make({\n  meta: {\n    key: DXN.make('org.dxos.function.extraction.anthropic'),\n    name: 'Entity Extraction (Anthropic)',\n    description: 'Extract entities from transcript using Anthropic LLM.',\n    icon: 'ph--text-t--regular',\n  },\n  input: ExtractionInput,\n  output: ExtractionOutput,\n});\n\n/**\n * Placeholder for NER-based entity extraction.\n * Implementation is currently disabled pending restoration of extraction logic.\n */\nexport const extractionNerFunction = Operation.make({\n  meta: {\n    key: DXN.make('org.dxos.function.extraction.ner'),\n    name: 'Entity Extraction (NER)',\n    description: 'Extract entities from transcript using Named Entity Recognition.',\n    icon: 'ph--text-t--regular',\n  },\n  input: ExtractionInput,\n  output: ExtractionOutput,\n});\n\n/**\n * Extract entities from the transcript message and add them to the message.\n */\n// TODO(dmaretskyi): Move context to a vector search index.\nexport const processTranscriptMessage = async (params: ProcessTranscriptMessageProps): Promise<ExtractionOutput> => {\n  try {\n    if (params.options?.timeout && params.options.timeout > 0) {\n      // return await asyncTimeout(params.executor.invoke(params.function, params.input), params.options.timeout);\n    } else {\n      // return await params.executor.invoke(params.function, params.input);\n    }\n  } catch (error) {\n    if (params.options?.fallbackToRaw) {\n      log.warn('failed to process message, falling back to raw text', { error });\n      return {\n        message: params.input.message,\n        timeElapsed: 0,\n      };\n    } else {\n      throw error;\n    }\n  }\n\n  // TODO(dmaretskyi): Restore extraction logic.\n  return { message: params.input.message, timeElapsed: 0 };\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport {\n  type TokenClassificationOutput,\n  type TokenClassificationPipelineType,\n  type TokenClassificationSingle,\n  pipeline,\n} from '@xenova/transformers';\n\nimport { log } from '@dxos/log';\n\nlet _ner: Promise<TokenClassificationPipelineType>;\n\n/**\n * Named Entity Recognition pipeline.\n * Initializes the pipeline on first call.\n * @returns The singleton promise that resolves to a token classification pipeline.\n */\nexport const getNer = () => {\n  if (!_ner) {\n    _ner = pipeline('ner', 'Xenova/bert-base-NER').then((ner) => {\n      log.info('NER model is ready');\n      return ner;\n    });\n  }\n\n  return _ner;\n};\n\n/**\n * Extracts entities from text using the named entity recognition pipeline and does simple grouping of tokens.\n */\nexport const extractFullEntities = async (text: string): Promise<TokenClassificationSingle[]> => {\n  const ner = await getNer();\n  const entities = (await ner(text)) as TokenClassificationOutput;\n  const tokenGroups = createTokenGroups(entities);\n  const combinedEntities = tokenGroups.map(combineNerTokens);\n  return combinedEntities;\n};\n\nexport const createTokenGroups = (tokens: TokenClassificationSingle[]): TokenClassificationSingle[][] => {\n  const tokenGroups: TokenClassificationSingle[][] = [];\n\n  const canBeCombined = (prevToken: TokenClassificationSingle, currentToken: TokenClassificationSingle) => {\n    const [currentState, currentEntity] = currentToken.entity.split('-'); // B, I, O\n    const [prevState, prevEntity] = prevToken.entity.split('-'); // B, I, O\n    if (prevEntity !== currentEntity) {\n      return false;\n    }\n    if (prevState === 'O') {\n      return false;\n    }\n    if (currentState === 'I') {\n      return true;\n    }\n    if ((prevState === 'B' || prevState === 'I') && currentState === 'B') {\n      return currentToken.word.startsWith('#');\n    }\n    return false;\n  };\n\n  for (const token of tokens) {\n    if (tokenGroups.length === 0) {\n      tokenGroups.push([token]);\n      continue;\n    }\n    const lastTokenGroup = tokenGroups.at(-1)!;\n    if (canBeCombined(lastTokenGroup.at(-1)!, token)) {\n      lastTokenGroup.push(token);\n      continue;\n    }\n    tokenGroups.push([token]);\n  }\n\n  return tokenGroups;\n};\n\nexport const combineNerTokens = (group: TokenClassificationSingle[]): TokenClassificationSingle => {\n  const combinedToken: TokenClassificationSingle = {\n    entity: group.at(0)!.entity.split('-')[1],\n    score: group.reduce((acc, token) => acc + token.score, 0) / group.length,\n    index: group.at(0)!.index,\n    word: group.at(0)!.word,\n    start: group.at(0)!.start,\n    end: group.at(-1)!.end,\n  };\n\n  for (const token of group.slice(1)) {\n    if (token.word.startsWith('#')) {\n      combinedToken.word += token.word.replace(/^#+/, '');\n    } else {\n      combinedToken.word += ' ' + token.word;\n    }\n  }\n\n  return combinedToken;\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { type Database, Filter, Query } from '@dxos/echo';\nimport { EID, EntityId } from '@dxos/keys';\nimport { log } from '@dxos/log';\n\nexport const ReferencedQuotes = Schema.Struct({\n  references: Schema.Array(\n    Schema.Struct({\n      id: Schema.String,\n      quote: Schema.String, // TODO(burdon): Quote?\n    }),\n  )\n    .pipe(Schema.mutable)\n    .annotations({\n      // TODO(burdon): Does this description make sense?\n      description: `\n      The references to the context objects that are mentioned in the transcript. \n      Quote should match the original transcript text exactly, while id is the id of the context object.\n    `,\n    }),\n});\nexport type ReferencedQuotes = Schema.Schema.Type<typeof ReferencedQuotes>;\n\nexport const findQuotes = async (quotes: string[], db: Database.Database): Promise<ReferencedQuotes> => {\n  const references = await Promise.all(\n    quotes.map(async (quote) => {\n      const objects = await db.query(Query.select(Filter.text(quote, { type: 'vector' }))).run();\n      log.info('found quotes in vector index', { objects, quote });\n      return objects.length > 0 ? [{ id: objects[0].id.toString(), quote }] : [];\n    }),\n  );\n  return { references: references.flat() };\n};\n\n/**\n * Finds and replaces all quotes with DXNs references.\n */\n// TODO(dmaretskyi): Lookup and verifiy ids from provided context.\nexport const insertReferences = (text: string, quotes: ReferencedQuotes) => {\n  for (const quote of quotes.references) {\n    if (!EntityId.isValid(quote.id)) {\n      continue;\n    }\n\n    // Use a case-insensitive regular expression to replace the quote.\n    const regex = new RegExp(quote.quote.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&'), 'gi');\n    text = text.replace(regex, `[${quote.quote}](${EID.make({ entityId: quote.id })})`);\n  }\n\n  return text;\n};\n"],
+  "mappings": "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",
+  "names": ["Schema", "Operation", "Obj", "Type", "DXN", "log", "Message", "ExtractionInput", "objects", "Array", "options", "Struct", "Number", "fallbackToRaw", "optional", "timeElapsed", "key", "make", "name", "description", "icon", "input", "output", "params", "timeout", "error", "message", "pipeline", "log", "_ner", "ner", "__dxlog_file", "entities", "text", "tokenGroups", "createTokenGroups", "combinedEntities", "canBeCombined", "prevToken", "currentToken", "currentState", "prevEntity", "entity", "currentEntity", "prevState", "token", "push", "lastTokenGroup", "score", "reduce", "index", "group", "at", "word", "start", "end", "combinedToken", "Schema", "Filter", "Query", "EID", "EntityId", "log", "__dxlog_file", "ReferencedQuotes", "String", "pipe", "description", "query", "select", "run", "info", "objects", "quote", "id", "toString", "entityId", "text"]
 }

package/dist/lib/neutral/index.mjs

@@ -22,37 +22,48 @@ import { invariant } from "@dxos/invariant";
 import * as Schema from "effect/Schema";
 import { Database, Obj, Ref } from "@dxos/echo";
 import { EncodedReference } from "@dxos/echo-protocol";
-import { DXN, LOCAL_SPACE_TAG } from "@dxos/keys";
+import { EID, EntityId, SpaceId } from "@dxos/keys";
 import { trim } from "@dxos/util";
 var createArtifactElement = (id) => `<artifact id=${id} />`;
-var ArtifactId = class extends Schema.String.annotations({
+var ArtifactURI = class extends Schema.String.annotations({
   // TODO(dmaretskyi): This section gets overriden.
   description: trim`
-    The ID of the referenced object. Formats accepted:
-    - DXN (dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4). DXNs can be prepended with an @ symbol for compatibility with in-text references.
+    The URI of the referenced object. Protocols accepted:
+    - echo://01KG7R1ZXWFMWQ4DA1Q6TN1DG4. 
     - space ID, object ID tuple (spaceID:objectID)
     - Only object ID that is assumed to be in the current space (01KG7R1ZXWFMWQ4DA1Q6TN1DG4)
+    - dxn:org.dxos.type.calendar:0.1.0 -- named entity from the registry. Absoutely make sure it actually exists in the registry.
+
+    URIs can be prepended with an @ symbol for compatibility with in-text references.
   `,
   examples: [
-    "dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4",
-    "@dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4",
+    "echo://01KG7R1ZXWFMWQ4DA1Q6TN1DG4",
+    "@echo://01KG7R1ZXWFMWQ4DA1Q6TN1DG4",
     "BM3FSHFOMJCHCG5QW7JTVKGYABD2GAA7G:01KG7R1ZXWFMWQ4DA1Q6TN1DG4",
-    "01KG7R1ZXWFMWQ4DA1Q6TN1DG4"
+    "01KG7R1ZXWFMWQ4DA1Q6TN1DG4",
+    "dxn:org.dxos.type.calendar:0.1.0",
+    "@dxn:org.dxos.type.calendar:0.1.0"
   ]
 }) {
-  static toDXN(reference, owningSpaceId) {
-    if (reference.startsWith("@dxn:")) {
-      return DXN.parse(reference.slice(1));
-    } else if (reference.startsWith("dxn:")) {
-      return DXN.parse(reference);
-    } else if (/^[A-Z0-9]+:[A-Z0-9]+$/.test(reference)) {
-      const [spaceId, objectId] = reference.split(":");
-      return new DXN(DXN.kind.ECHO, [
-        spaceId === owningSpaceId ? LOCAL_SPACE_TAG : spaceId,
-        objectId
-      ]);
-    } else if (/^[A-Z0-9]+$/.test(reference)) {
-      return DXN.fromLocalObjectId(reference);
+  static toEchoURI(reference, owningSpaceId) {
+    const stripped = reference.startsWith("@") ? reference.slice(1) : reference;
+    if (stripped.startsWith("echo:") || stripped.startsWith("dxn:")) {
+      return EID.parse(stripped);
+    } else if (stripped.includes(":")) {
+      const [spaceId, objectId] = stripped.split(":");
+      if (!SpaceId.isValid(spaceId) || !EntityId.isValid(objectId)) {
+        throw new Error(`Unable to parse object reference: ${reference}`);
+      }
+      return spaceId === owningSpaceId ? EID.make({
+        entityId: objectId
+      }) : EID.make({
+        spaceId,
+        entityId: objectId
+      });
+    } else if (EntityId.isValid(stripped)) {
+      return EID.make({
+        entityId: stripped
+      });
     } else {
       throw new Error(`Unable to parse object reference: ${reference}`);
     }
@@ -61,16 +72,16 @@ var ArtifactId = class extends Schema.String.annotations({
   * Resolves an artifact ID to an object.
   */
   static resolve(schema, ref) {
-    const dxn = ArtifactId.toDXN(ref);
-    return Database.resolve(dxn, schema);
+    const uri = ArtifactURI.toEchoURI(ref);
+    return Database.resolve(Ref.fromURI(uri), schema);
   }
 };
-var RefFromLLM = Schema.transform(ArtifactId, Ref.Ref(Obj.Unknown), {
-  decode: (fromA, fromI) => EncodedReference.fromDXN(ArtifactId.toDXN(fromA)),
-  encode: (toI, toA) => EncodedReference.toDXN(toI).toString(),
+var RefFromLLM = Schema.transform(ArtifactURI, Ref.Ref(Obj.Unknown), {
+  decode: (fromA, fromI) => EncodedReference.fromURI(ArtifactURI.toEchoURI(fromA)),
+  encode: (toI, toA) => EncodedReference.toURI(toI),
   strict: false
 }).annotations({
-  description: ArtifactId.ast.annotations.description
+  description: ArtifactURI.ast.annotations.description
 });
 
 // src/util/diff.ts
@@ -191,6 +202,7 @@ var mapAiError = (err) => Effect.gen(function* () {
 import { AgentStatus } from "@dxos/ai";
 import { Obj as Obj2 } from "@dxos/echo";
 import { MESSAGE_PROPERTY_TOOL_CALL_ID } from "@dxos/functions";
+import { EID as EID2 } from "@dxos/keys";
 import { LogLevel } from "@dxos/log";
 import { ContentBlock, Message } from "@dxos/types";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
@@ -561,7 +573,8 @@ var stringifyRef = (ref) => {
   if (ref.target) {
     return stringifyObject(ref.target);
   }
-  return ref.dxn.asEchoDXN()?.echoId ?? ref.dxn.asQueueDXN()?.objectId ?? "";
+  const echoUri = EID2.tryParse(ref.uri);
+  return (echoUri ? EID2.getEntityId(echoUri) : void 0) ?? "";
 };
 var stringifyObject = (obj) => {
   return Obj2.getLabel(obj) ?? Obj2.getTypename(obj) ?? obj.id;
@@ -747,7 +760,7 @@ var formatSystemPrompt = ({ system, blueprints = [], objects = [] }) => Effect3.
   ].join("\n\n") : void 0));
   const objectDefs = yield* Function.pipe(objects, Effect3.forEach((object) => Effect3.succeed(trim2`
           <object>
-            <dxn>${Obj4.getDXN(object)}</dxn>
+            <dxn>${Obj4.getURI(object)}</dxn>
             <typename>${Obj4.getTypename(object)}</typename>
           </object>
         `)), Effect3.map((objects2) => objects2.length > 0 ? [
@@ -1045,7 +1058,7 @@ var Request = class {
       concurrency: 1,
       unordered: false
     }), Stream.filterMap((_) => _), Stream.runCollect, Effect5.map(Chunk.toArray));
-    log3.info("messages", {
+    log3("messages", {
       messages
     }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 181, S: this });
     const toolCalls = this.getToolCalls();
@@ -1138,7 +1151,8 @@ var enrichToolCallBlock = (block, toolkit) => {
   return {
     ...block,
     operationKey: meta.key,
-    operationName: meta.name
+    operationName: meta.name,
+    operationIcon: meta.icon
   };
 };
 var createSnippet = (text, len = 32) => text.length <= len * 2 ? text : [
@@ -1175,7 +1189,7 @@ __export(AiContext_exports, {
   Bindings: () => Bindings,
   Service: () => Service
 });
-import { Atom, Registry } from "@effect-atom/atom-react";
+import { Atom, Registry as AtomRegistry } from "@effect-atom/atom-react";
 import * as EArray from "effect/Array";
 import * as Context3 from "effect/Context";
 import * as Effect7 from "effect/Effect";
@@ -1184,8 +1198,9 @@ import * as Runtime from "effect/Runtime";
 import * as Schema5 from "effect/Schema";
 import { Blueprint } from "@dxos/compute";
 import { Resource } from "@dxos/context";
-import { DXN as DXN2, Feed, Obj as Obj6, Query, Ref as Ref3, Type as Type2 } from "@dxos/echo";
+import { DXN, Feed, Obj as Obj6, Query, Ref as Ref3, Type as Type2 } from "@dxos/echo";
 import { assertArgument } from "@dxos/invariant";
+import { EID as EID3 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { ComplexSet, isNonNullable as isNonNullable3 } from "@dxos/util";
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/compute/assistant/src/session/AiContext.ts";
@@ -1198,18 +1213,18 @@ var Binding = Schema5.Struct({
     added: Schema5.Array(Ref3.Ref(Obj6.Unknown)),
     removed: Schema5.Array(Ref3.Ref(Obj6.Unknown))
   })
-}).pipe(Type2.object({
-  typename: "org.dxos.type.contextBinding",
-  version: "0.1.0"
-}));
+}).pipe(Type2.makeObject(DXN.make("org.dxos.type.contextBinding", "0.1.0")));
 var Bindings = class {
-  blueprints = new ComplexSet((ref) => ref.dxn.toString());
+  blueprints = new ComplexSet((ref) => ref.uri);
   // TODO(burdon): Some DXNs have the Space prefix so only compare the object ID.
-  objects = new ComplexSet((ref) => ref.dxn.asEchoDXN()?.echoId);
+  objects = new ComplexSet((ref) => {
+    const echoUri = EID3.tryParse(ref.uri);
+    return echoUri ? EID3.getEntityId(echoUri) : void 0;
+  });
   toJSON() {
     return {
-      blueprints: EArray.fromIterable(this.blueprints).map((ref) => ref.dxn.toString()),
-      objects: EArray.fromIterable(this.objects).map((ref) => ref.dxn.toString())
+      blueprints: EArray.fromIterable(this.blueprints).map((ref) => ref.uri),
+      objects: EArray.fromIterable(this.objects).map((ref) => ref.uri)
     };
   }
 };
@@ -1226,7 +1241,7 @@ var Binder = class extends Resource {
     assertArgument(options.runtime, "options.runtime", "Feed runtime is required");
     this._feed = options.feed;
     this._runtime = options.runtime;
-    this._registry = options.registry ?? Registry.make();
+    this._registry = options.registry ?? AtomRegistry.make();
   }
   /**
   * Returns the blueprints atom for subscription.
@@ -1280,12 +1295,12 @@ var Binder = class extends Resource {
       const results = await this.#bindingsQuery.run();
       log4("sync", {
         bindingItems: results.length
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 107, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 108, S: this });
       await this._updateBindings(results);
       log4("sync complete", {
         blueprints: this._registry.get(this._blueprints).length,
         blueprintKeys: this._registry.get(this._blueprints).map((bp) => Blueprint.getKey(bp))
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 111, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 112, S: this });
     }
   }
   async _updateBindings(items) {
@@ -1298,34 +1313,49 @@ var Binder = class extends Resource {
       blueprintRefs: [
         ...bindings.blueprints
       ].map((ref) => ({
-        dxn: ref.dxn.toString(),
+        uri: ref.uri,
         available: ref.isAvailable
       }))
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 123, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 124, S: this });
     const currentBlueprints = this._registry.get(this._blueprints);
     const currentObjects = this._registry.get(this._objects);
     const resolvedBlueprints = await this._resolve(bindings.blueprints, currentBlueprints);
     const resolvedObjects = await this._resolve(bindings.objects, currentObjects);
     log4("_updateBindings resolved", {
       resolvedBlueprints: resolvedBlueprints.length,
-      resolvedBlueprintKeys: resolvedBlueprints.map((bp) => Blueprint.getKey(bp))
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 137, S: this });
-    const reducedBlueprintDxns = new ComplexSet(DXN2.hash, [
+      resolvedBlueprintKeys: resolvedBlueprints.map((bp) => Obj6.getMeta(bp).key ?? "<missing>")
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 138, S: this });
+    const keyedBlueprints = resolvedBlueprints.filter((bp) => {
+      if (Obj6.getMeta(bp).key === void 0) {
+        log4.warn("dropping blueprint with no meta key", {
+          uri: Obj6.getURI(bp)
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 146, S: this });
+        return false;
+      }
+      return true;
+    });
+    const reducedBlueprintDxns = new Set([
       ...bindings.blueprints
-    ].map((ref) => ref.dxn));
-    const reducedObjectDxns = new ComplexSet(DXN2.hash, [
+    ].map((ref) => ref.uri));
+    const reducedObjectDxns = new Set([
       ...bindings.objects
-    ].map((ref) => ref.dxn));
-    const filteredBlueprints = currentBlueprints.filter((obj) => reducedBlueprintDxns.has(Obj6.getDXN(obj)));
-    const filteredObjects = currentObjects.filter((obj) => reducedObjectDxns.has(Obj6.getDXN(obj)));
-    const mergedBlueprints = this._mergeInto(filteredBlueprints, resolvedBlueprints);
+    ].map((ref) => ref.uri));
+    const filteredBlueprints = currentBlueprints.filter((obj) => {
+      const uri = Obj6.getURI(obj);
+      return uri != null && reducedBlueprintDxns.has(uri) && Obj6.getMeta(obj).key !== void 0;
+    });
+    const filteredObjects = currentObjects.filter((obj) => {
+      const uri = Obj6.getURI(obj);
+      return uri != null && reducedObjectDxns.has(uri);
+    });
+    const mergedBlueprints = this._mergeInto(filteredBlueprints, keyedBlueprints);
     const mergedObjects = this._mergeInto(filteredObjects, resolvedObjects);
     this._registry.set(this._blueprints, mergedBlueprints);
     this._registry.set(this._objects, mergedObjects);
     log4("updated bindings", {
       blueprints: mergedBlueprints.length,
       objects: mergedObjects.length
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 155, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 173, S: this });
   }
   async _close() {
     this._registry.set(this._blueprints, []);
@@ -1344,7 +1374,7 @@ var Binder = class extends Resource {
     log4("bind", {
       blueprints: addedBlueprints.length,
       objects: addedObjects.length
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 176, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 194, S: this });
     await Runtime.runPromise(this._runtime)(Feed.append(this._feed, [
       Obj6.make(Binding, {
         blueprints: {
@@ -1362,20 +1392,20 @@ var Binder = class extends Resource {
     if (!blueprints?.length && !objects?.length) {
       return;
     }
-    const removedBlueprintDxns = (blueprints ?? []).map((ref) => ref.dxn);
-    const removedObjectDxns = (objects ?? []).map((ref) => ref.dxn);
+    const removedBlueprintDxns = (blueprints ?? []).map((ref) => ref.uri);
+    const removedObjectDxns = (objects ?? []).map((ref) => ref.uri);
     if (removedBlueprintDxns.length > 0) {
       const current = this._registry.get(this._blueprints);
-      this._registry.set(this._blueprints, current.filter((obj) => !removedBlueprintDxns.some((dxn) => DXN2.equalsEchoId(Obj6.getDXN(obj), dxn))));
+      this._registry.set(this._blueprints, current.filter((obj) => !removedBlueprintDxns.some((uri) => Obj6.getURI(obj) === uri)));
     }
     if (removedObjectDxns.length > 0) {
       const current = this._registry.get(this._objects);
-      this._registry.set(this._objects, current.filter((obj) => !removedObjectDxns.some((dxn) => DXN2.equalsEchoId(Obj6.getDXN(obj), dxn))));
+      this._registry.set(this._objects, current.filter((obj) => !removedObjectDxns.some((uri) => Obj6.getURI(obj) === uri)));
     }
     log4("unbind", {
       blueprints: blueprints?.length,
       objects: objects?.length
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 208, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 226, S: this });
     await Runtime.runPromise(this._runtime)(Feed.append(this._feed, [
       Obj6.make(Binding, {
         blueprints: {
@@ -1403,17 +1433,18 @@ var Binder = class extends Resource {
         next
       };
     }
-    const seen = new Set(current.map((obj) => Obj6.getDXN(obj).toString()));
+    const seen = new Set(current.map((obj) => Obj6.getURI(obj)));
     for (const ref of refs) {
-      const dxn = ref.dxn.toString();
-      if (!seen.has(dxn)) {
-        seen.add(dxn);
-        added.push(ref);
-        if (ref.isAvailable) {
-          const target = ref.target;
-          if (target) {
-            next.push(target);
-          }
+      const uri = ref.uri;
+      if (seen.has(uri)) {
+        continue;
+      }
+      seen.add(uri);
+      added.push(ref);
+      if (ref.isAvailable) {
+        const target = ref.target;
+        if (target) {
+          next.push(target);
         }
       }
     }
@@ -1432,7 +1463,7 @@ var Binder = class extends Resource {
       objects.added.forEach((ref) => context.objects.add(ref));
       objects.removed.forEach((ref) => {
         for (const obj of context.objects) {
-          if (DXN2.equalsEchoId(obj.dxn, ref.dxn)) {
+          if (obj.uri === ref.uri || EID3.tryParse(obj.uri) && EID3.tryParse(ref.uri) && EID3.getEntityId(EID3.tryParse(obj.uri)) === EID3.getEntityId(EID3.tryParse(ref.uri))) {
             context.objects.delete(obj);
           }
         }
@@ -1444,14 +1475,14 @@ var Binder = class extends Resource {
   * Merge resolved items into the current set, adding only items not already present (by DXN).
   */
   _mergeInto(current, resolved) {
-    const seen = new Set(current.map((obj) => Obj6.getDXN(obj).toString()));
+    const seen = new Set(current.map((obj) => Obj6.getURI(obj)));
     const merged = [
       ...current
     ];
     for (const obj of resolved) {
-      const dxn = Obj6.getDXN(obj).toString();
-      if (!seen.has(dxn)) {
-        seen.add(dxn);
+      const uri = Obj6.getURI(obj);
+      if (!seen.has(uri)) {
+        seen.add(uri);
         merged.push(obj);
       }
     }
@@ -1459,6 +1490,8 @@ var Binder = class extends Resource {
   }
   /**
   * Resolve references to objects, loading them first if needed and falling back to existing objects.
+  * DXN refs (e.g. `dxn:org.dxos.blueprint.database`) resolve via the wired-up ECHO ref resolver
+  * which already spans both the space DB and the hypergraph registry.
   */
   async _resolve(refs, current) {
     const refArray = [
@@ -1470,7 +1503,7 @@ var Binder = class extends Resource {
       if (ref.isAvailable) {
         target = ref.target;
       }
-      return target ?? current.find((obj) => Obj6.getDXN(obj).toString() === ref.dxn.toString());
+      return target ?? current.find((obj) => Obj6.getURI(obj) === ref.uri);
     }).filter(isNonNullable3);
   }
 };
@@ -1560,7 +1593,7 @@ var Session = class extends Resource2 {
   */
   makeToolExecutionServices() {
     return ToolExecutionServices.pipe(Layer3.provide(Operation2.withInvocationOptions({
-      conversation: Obj7.getDXN(this._feed).toString()
+      conversation: Obj7.getURI(this._feed)
     })));
   }
   /**
@@ -1629,7 +1662,7 @@ var Session = class extends Resource2 {
     }).pipe(Effect8.provide(Layer3.mergeAll(Layer3.succeed(Service, {
       binder: this.context
     }), Layer3.succeed(Service2, this), Operation2.withInvocationOptions({
-      conversation: Obj7.getDXN(this._feed).toString()
+      conversation: Obj7.getURI(this._feed)
     }))), Effect8.withSpan("AiSession.createRequest"));
   }
 };
@@ -1753,7 +1786,6 @@ export {
   AiModelError,
   AiRequest_exports as AiRequest,
   AiSession_exports as AiSession,
-  ArtifactId,
   CompleteBlock,
   ExecutionGraph,
   GenerationObserver,