@dxos/index-core 0.8.4-main.fcfe5033a5 → 0.9.0

package/dist/lib/neutral/index.mjs

@@ -1,5 +1,6 @@
 // src/index-engine.ts
 import * as Effect5 from "effect/Effect";
+import { ATTR_TYPE as ATTR_TYPE2 } from "@dxos/echo/internal";
 import * as SqlTransaction from "@dxos/sql-sqlite/SqlTransaction";
 
 // src/index-tracker.ts
@@ -88,6 +89,7 @@ var IndexTracker = class {
 // src/indexes/fts-index.ts
 import * as SqlClient3 from "@effect/sql/SqlClient";
 import * as Effect2 from "effect/Effect";
+var SQL_CHUNK_SIZE = 500;
 var escapeFts5Query = (text) => {
   return text.split(/\s+/).filter(Boolean).map((term) => `"${term.replace(/"/g, '""')}"`).join(" ");
 };
@@ -149,6 +151,7 @@ var FtsIndex = class {
   /**
   * Query snapshots by recordIds.
   * Returns the parsed JSON snapshots for queue objects.
+  * RecordIds not present in the FTS index are silently omitted from the result.
   */
   querySnapshotsJSON(recordIds) {
     return Effect2.gen(function* () {
@@ -156,11 +159,21 @@ var FtsIndex = class {
         return [];
       }
       const sql = yield* SqlClient3.SqlClient;
-      const results = yield* sql`SELECT rowid, snapshot FROM ftsIndex WHERE rowid IN ${sql.in(recordIds)}`;
-      return results.map((r) => ({
-        recordId: r.rowid,
-        snapshot: JSON.parse(r.snapshot)
-      }));
+      const chunks = [];
+      for (let i = 0; i < recordIds.length; i += SQL_CHUNK_SIZE) {
+        chunks.push(recordIds.slice(i, i + SQL_CHUNK_SIZE));
+      }
+      const allResults = [];
+      for (const chunk of chunks) {
+        const rows = yield* sql`SELECT rowid, snapshot FROM ftsIndex WHERE rowid IN ${sql.in(chunk)}`;
+        for (const r of rows) {
+          allResults.push({
+            recordId: r.rowid,
+            snapshot: JSON.parse(r.snapshot)
+          });
+        }
+      }
+      return allResults;
     });
   }
   update = Effect2.fn("FtsIndex.update")((objects) => Effect2.gen(function* () {
@@ -182,30 +195,50 @@ var FtsIndex = class {
   }));
 };
 
-// src/indexes/object-meta-index.ts
+// src/indexes/entity-meta-index.ts
 import * as SqlClient5 from "@effect/sql/SqlClient";
 import * as Effect3 from "effect/Effect";
 import * as Schema2 from "effect/Schema";
 import { ATTR_DELETED, ATTR_PARENT, ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET, ATTR_TYPE } from "@dxos/echo/internal";
-import { DXN } from "@dxos/keys";
+import { DXN, EID, EntityId, SpaceId as SpaceId2, URI } from "@dxos/keys";
+var _normalizeTypeUri = (typeDXN) => {
+  if (!typeDXN.startsWith("echo:")) {
+    return typeDXN;
+  }
+  const eid = EID.tryParse(typeDXN);
+  if (!eid) {
+    return typeDXN;
+  }
+  const entityId = EID.getEntityId(eid);
+  return entityId ? EID.make({
+    entityId
+  }) : typeDXN;
+};
 var _escapeLikePrefix = (prefix) => {
   const escaped = prefix.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
   return `${escaped}:%`;
 };
-var ObjectMeta = Schema2.Struct({
+var EntityMeta = Schema2.Struct({
   recordId: Schema2.Number,
-  objectId: Schema2.String,
+  objectId: EntityId,
+  /** Empty string for non-queue objects. */
   queueId: Schema2.String,
-  spaceId: Schema2.String,
+  /** Queue subspace namespace (e.g. 'data', 'trace'). Empty string for non-queue objects. */
+  queueNamespace: Schema2.String,
+  spaceId: SpaceId2,
   documentId: Schema2.String,
   entityKind: Schema2.String,
-  /** The versioned DXN of the type of the object. */
-  typeDxn: Schema2.String,
+  /**
+  * Type identifier URI for the object — typename DXN for non-stored schemas,
+  * schema-as-object EID for stored (dynamic) schemas. Mirrors the value
+  * written into the object's `system.type`.
+  */
+  typeDXN: URI.Schema,
   deleted: Schema2.Boolean,
-  source: Schema2.NullOr(Schema2.String),
-  target: Schema2.NullOr(Schema2.String),
+  source: Schema2.NullOr(EID.Schema),
+  target: Schema2.NullOr(EID.Schema),
   /** Parent object id (nullable). */
-  parent: Schema2.NullOr(Schema2.String),
+  parent: Schema2.NullOr(EID.Schema),
   /** Monotonically increasing sequence number assigned on insert/update for tracking indexing order. */
   version: Schema2.Number,
   /** Unix ms timestamp when the object was first indexed. */
@@ -230,17 +263,18 @@ var buildSourceCondition = (sql, spaceIds, includeAllQueues, queueIds) => {
   }
   return sql.or(conditions);
 };
-var ObjectMetaIndex = class {
-  migrate = Effect3.fn("ObjectMetaIndex.runMigrations")(function* () {
+var EntityMetaIndex = class {
+  migrate = Effect3.fn("EntityMetaIndex.runMigrations")(function* () {
     const sql = yield* SqlClient5.SqlClient;
     yield* sql`CREATE TABLE IF NOT EXISTS objectMeta (
       recordId INTEGER PRIMARY KEY AUTOINCREMENT,
       objectId TEXT NOT NULL,
       queueId TEXT NOT NULL DEFAULT '',
+      queueNamespace TEXT NOT NULL DEFAULT '',
       spaceId TEXT NOT NULL,
       documentId TEXT NOT NULL DEFAULT '',
       entityKind TEXT NOT NULL,
-      typeDxn TEXT NOT NULL,
+      typeDXN TEXT NOT NULL,
       deleted INTEGER NOT NULL,
       source TEXT,
       target TEXT,
@@ -252,23 +286,26 @@ var ObjectMetaIndex = class {
     yield* Effect3.catchAll(sql`ALTER TABLE objectMeta ADD COLUMN parent TEXT`, () => Effect3.void);
     yield* Effect3.catchAll(sql`ALTER TABLE objectMeta ADD COLUMN createdAt INTEGER`, () => Effect3.void);
     yield* Effect3.catchAll(sql`ALTER TABLE objectMeta ADD COLUMN updatedAt INTEGER`, () => Effect3.void);
+    yield* Effect3.catchAll(sql`ALTER TABLE objectMeta ADD COLUMN queueNamespace TEXT NOT NULL DEFAULT ''`, () => Effect3.void);
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_objectId ON objectMeta(spaceId, objectId)`;
-    yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_typeDxn ON objectMeta(spaceId, typeDxn)`;
+    yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_typeDXN ON objectMeta(spaceId, typeDXN)`;
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_version ON objectMeta(version)`;
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_parent ON objectMeta(spaceId, parent)`;
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_updatedAt ON objectMeta(updatedAt)`;
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_createdAt ON objectMeta(createdAt)`;
   });
-  query = Effect3.fn("ObjectMetaIndex.query")((query) => Effect3.gen(function* () {
+  query = Effect3.fn("EntityMetaIndex.query")((query) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
-    const parsedType = DXN.tryParse(query.typeDxn)?.asTypeDXN();
-    const rows = parsedType && parsedType.version === void 0 ? yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND (typeDxn = ${query.typeDxn} OR typeDxn LIKE ${_escapeLikePrefix(query.typeDxn)} ESCAPE '\\')` : yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND typeDxn = ${query.typeDxn}`;
+    const normalizedTypeDXN = _normalizeTypeUri(query.typeDXN);
+    const parsedDxn = DXN.isDXN(normalizedTypeDXN) ? normalizedTypeDXN : void 0;
+    const hasNoVersion = parsedDxn !== void 0 && DXN.getVersion(parsedDxn) === void 0;
+    const rows = hasNoVersion ? yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND (typeDXN = ${normalizedTypeDXN} OR typeDXN LIKE ${_escapeLikePrefix(normalizedTypeDXN)} ESCAPE '\\')` : yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND typeDXN = ${normalizedTypeDXN}`;
     return rows.map((row) => ({
       ...row,
       deleted: !!row.deleted
     }));
   }));
-  queryAll = Effect3.fn("ObjectMetaIndex.queryAll")((query) => Effect3.gen(function* () {
+  queryAll = Effect3.fn("EntityMetaIndex.queryAll")((query) => Effect3.gen(function* () {
     if (query.spaceIds.length === 0 && (!query.queueIds || query.queueIds.length === 0)) {
       return [];
     }
@@ -280,7 +317,7 @@ var ObjectMetaIndex = class {
       deleted: !!row.deleted
     }));
   }));
-  queryTypes = Effect3.fn("ObjectMetaIndex.queryTypes")(({ spaceIds, typeDxns, inverted = false, includeAllQueues = false, queueIds = null }) => Effect3.gen(function* () {
+  queryTypes = Effect3.fn("EntityMetaIndex.queryTypes")(({ spaceIds, typeDxns, inverted = false, includeAllQueues = false, queueIds = null }) => Effect3.gen(function* () {
     if (spaceIds.length === 0 && (!queueIds || queueIds.length === 0)) {
       return [];
     }
@@ -298,12 +335,15 @@ var ObjectMetaIndex = class {
     }
     const sql = yield* SqlClient5.SqlClient;
     const sourceCondition = buildSourceCondition(sql, spaceIds, includeAllQueues, queueIds);
-    const typeWhere = sql.or(typeDxns.map((typeDxn) => {
-      const parsedType = DXN.tryParse(typeDxn)?.asTypeDXN();
-      return parsedType && parsedType.version === void 0 ? sql.or([
-        sql`typeDxn = ${typeDxn}`,
-        sql`typeDxn LIKE ${_escapeLikePrefix(typeDxn)} ESCAPE '\\'`
-      ]) : sql`typeDxn = ${typeDxn}`;
+    const typeWhere = sql.or(typeDxns.map((typeDXN) => {
+      const normalized = _normalizeTypeUri(typeDXN);
+      const parsedDxn = DXN.isDXN(normalized) ? normalized : void 0;
+      const hasNoVersion = parsedDxn !== void 0 && DXN.getVersion(parsedDxn) === void 0;
+      const exactMatch = sql`typeDXN = ${normalized}`;
+      return hasNoVersion ? sql.or([
+        exactMatch,
+        sql`typeDXN LIKE ${_escapeLikePrefix(normalized)} ESCAPE '\\'`
+      ]) : exactMatch;
     }));
     const rows = inverted ? yield* sql`SELECT * FROM objectMeta WHERE ${sourceCondition} AND NOT ${typeWhere}` : yield* sql`SELECT * FROM objectMeta WHERE ${sourceCondition} AND ${typeWhere}`;
     return rows.map((row) => ({
@@ -311,7 +351,7 @@ var ObjectMetaIndex = class {
       deleted: !!row.deleted
     }));
   }));
-  queryRelations = Effect3.fn("ObjectMetaIndex.queryRelations")(({ endpoint, anchorDxns }) => Effect3.gen(function* () {
+  queryRelations = Effect3.fn("EntityMetaIndex.queryRelations")(({ endpoint, anchorDxns }) => Effect3.gen(function* () {
     if (anchorDxns.length === 0) {
       return [];
     }
@@ -324,10 +364,10 @@ var ObjectMetaIndex = class {
     }));
   }));
   // TODO(dmaretskyi): Update recordId on objects so that we don't need to look it up separately.
-  update = Effect3.fn("ObjectMetaIndex.update")((objects) => Effect3.gen(function* () {
+  update = Effect3.fn("EntityMetaIndex.update")((objects) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
     yield* Effect3.forEach(objects, (object) => Effect3.gen(function* () {
-      const { spaceId, queueId, documentId, data } = object;
+      const { spaceId, queueId, queueNamespace, documentId, data } = object;
       const castData = data;
       const objectId = castData.id;
       let existing;
@@ -342,36 +382,38 @@ var ObjectMetaIndex = class {
       const [{ v }] = result;
       const version = (v ?? 0) + 1;
       const entityKind = castData[ATTR_RELATION_SOURCE] ? "relation" : "object";
-      const typeDxn = castData[ATTR_TYPE] ? String(castData[ATTR_TYPE]) : "type";
+      const typeDXN = URI.make(castData[ATTR_TYPE] ? String(castData[ATTR_TYPE]) : "type");
       const deleted = castData[ATTR_DELETED] ? 1 : 0;
       const source = entityKind === "relation" ? castData[ATTR_RELATION_SOURCE] ?? null : null;
       const target = entityKind === "relation" ? castData[ATTR_RELATION_TARGET] ?? null : null;
       const parent = castData[ATTR_PARENT] ?? null;
-      const sourceTimestamp = object.updatedAt;
+      const updatedAtTimestamp = object.updatedAt;
+      const createdAtTimestamp = object.createdAt ?? updatedAtTimestamp;
       if (existing.length > 0) {
         yield* sql`
                   UPDATE objectMeta SET
                     version = ${version},
+                    queueNamespace = ${queueNamespace ?? ""},
                     entityKind = ${entityKind},
-                    typeDxn = ${typeDxn},
+                    typeDXN = ${typeDXN},
                     deleted = ${deleted},
                     source = ${source},
                     target = ${target},
                     parent = ${parent},
-                    updatedAt = ${sourceTimestamp}
+                    updatedAt = ${updatedAtTimestamp}
                   WHERE recordId = ${existing[0].recordId}
                 `;
       } else {
         yield* sql`
                   INSERT INTO objectMeta (
-                    objectId, queueId, spaceId, documentId, 
-                    entityKind, typeDxn, deleted, source, target, parent, version,
+                    objectId, queueId, queueNamespace, spaceId, documentId,
+                    entityKind, typeDXN, deleted, source, target, parent, version,
                     createdAt, updatedAt
                   ) VALUES (
-                    ${objectId}, ${queueId ?? ""}, ${spaceId}, ${documentId ?? ""}, 
-                    ${entityKind}, ${typeDxn}, ${deleted}, 
+                    ${objectId}, ${queueId ?? ""}, ${queueNamespace ?? ""}, ${spaceId}, ${documentId ?? ""},
+                    ${entityKind}, ${typeDXN}, ${deleted},
                     ${source}, ${target}, ${parent}, ${version},
-                    ${sourceTimestamp}, ${sourceTimestamp}
+                    ${createdAtTimestamp}, ${updatedAtTimestamp}
                   )
                 `;
       }
@@ -380,10 +422,10 @@ var ObjectMetaIndex = class {
     });
   }));
   /**
-  * Look up `recordIds` for objects that are already stored in the ObjectMetaIndex.
+  * Look up `recordIds` for objects that are already stored in the EntityMetaIndex.
   * Mutates the objects in place.
   */
-  lookupRecordIds = Effect3.fn("ObjectMetaIndex.lookupRecordIds")((objects) => Effect3.gen(function* () {
+  lookupRecordIds = Effect3.fn("EntityMetaIndex.lookupRecordIds")((objects) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
     for (const object of objects) {
       const { spaceId, queueId, documentId, data } = object;
@@ -397,7 +439,7 @@ var ObjectMetaIndex = class {
         result = [];
       }
       if (result.length === 0) {
-        return yield* Effect3.die(new Error(`Object not found in ObjectMetaIndex: ${spaceId}/${documentId ?? queueId}/${objectId}`));
+        return yield* Effect3.die(new Error(`Object not found in EntityMetaIndex: ${spaceId}/${documentId ?? queueId}/${objectId}`));
       }
       object.recordId = result[0].recordId;
     }
@@ -405,7 +447,7 @@ var ObjectMetaIndex = class {
   /**
   * Look up object metadata by recordIds.
   */
-  lookupByRecordIds = Effect3.fn("ObjectMetaIndex.lookupByRecordIds")((recordIds) => Effect3.gen(function* () {
+  lookupByRecordIds = Effect3.fn("EntityMetaIndex.lookupByRecordIds")((recordIds) => Effect3.gen(function* () {
     if (recordIds.length === 0) {
       return [];
     }
@@ -417,9 +459,23 @@ var ObjectMetaIndex = class {
     }));
   }));
   /**
+  * Look up object metadata by object id across one or more spaces (space db and queue items).
+  */
+  queryObjectIds = Effect3.fn("EntityMetaIndex.queryObjectIds")((query) => Effect3.gen(function* () {
+    if (query.spaceIds.length === 0 || query.objectIds.length === 0) {
+      return [];
+    }
+    const sql = yield* SqlClient5.SqlClient;
+    const rows = yield* sql`SELECT * FROM objectMeta WHERE ${sql.in("spaceId", query.spaceIds)} AND ${sql.in("objectId", query.objectIds)}`;
+    return rows.map((row) => ({
+      ...row,
+      deleted: !!row.deleted
+    }));
+  }));
+  /**
   * Look up object metadata by objectId, spaceId, and queueId.
   */
-  lookupByObjectId = Effect3.fn("ObjectMetaIndex.lookupByObjectId")((query) => Effect3.gen(function* () {
+  lookupByObjectId = Effect3.fn("EntityMetaIndex.lookupByObjectId")((query) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
     const rows = yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND queueId = ${query.queueId} AND objectId = ${query.objectId} LIMIT 1`;
     if (rows.length === 0) {
@@ -433,7 +489,7 @@ var ObjectMetaIndex = class {
   /**
   * Query objects by timestamp range.
   */
-  queryByTimeRange = Effect3.fn("ObjectMetaIndex.queryByTimeRange")((query) => Effect3.gen(function* () {
+  queryByTimeRange = Effect3.fn("EntityMetaIndex.queryByTimeRange")((query) => Effect3.gen(function* () {
     if (query.spaceIds.length === 0 && (!query.queueIds || query.queueIds.length === 0)) {
       return [];
     }
@@ -460,13 +516,21 @@ var ObjectMetaIndex = class {
   }));
   /**
   * Query children by parent object ids.
+  * Matches both:
+  * - Objects whose `parent` field references one of the given parent ids (standard parent/child hierarchy).
+  * - Queue items whose `queueId` equals one of the parent ids (e.g. items inside a Feed, since a feed's queue
+  *   DXN uses the feed's object id as its queue id — see `Feed.getQueueUri`).
   */
-  queryChildren = Effect3.fn("ObjectMetaIndex.queryChildren")((query) => Effect3.gen(function* () {
+  queryChildren = Effect3.fn("EntityMetaIndex.queryChildren")((query) => Effect3.gen(function* () {
     if (query.parentIds.length === 0) {
       return [];
     }
     const sql = yield* SqlClient5.SqlClient;
-    const rows = yield* sql`SELECT * FROM objectMeta WHERE spaceId IN ${sql.in(query.spaceId)} AND parent IN ${sql.in(query.parentIds.map((id) => DXN.fromLocalObjectId(id).toString()))}`;
+    const parentDzns = query.parentIds.map((id) => EID.make({
+      entityId: id
+    }));
+    const parentDxns = parentDzns;
+    const rows = yield* sql`SELECT * FROM objectMeta WHERE ${sql.in("spaceId", query.spaceId)} AND (${sql.in("parent", parentDxns)} OR ${sql.in("queueId", query.parentIds)})`;
     return rows.map((row) => ({
       ...row,
       deleted: !!row.deleted
@@ -479,6 +543,7 @@ import * as SqlClient7 from "@effect/sql/SqlClient";
 import * as Effect4 from "effect/Effect";
 import * as Schema4 from "effect/Schema";
 import { EncodedReference, isEncodedReference } from "@dxos/echo-protocol";
+import { EID as EID2 } from "@dxos/keys";
 
 // src/utils.ts
 import * as Schema3 from "effect/Schema";
@@ -495,15 +560,7 @@ var EscapedPropPath = class extends Schema3.String.annotations({
     let current = "";
     for (let i = 0; i < path.length; i++) {
       if (path[i] === "\\") {
-        invariant(i + 1 < path.length && (path[i + 1] === "." || path[i + 1] === "\\"), "Malformed escaping.", {
-          F: __dxlog_file,
-          L: 34,
-          S: this,
-          A: [
-            "i + 1 < path.length && (path[i + 1] === '.' || path[i + 1] === '\\\\')",
-            "'Malformed escaping.'"
-          ]
-        });
+        invariant(i + 1 < path.length && (path[i + 1] === "." || path[i + 1] === "\\"), "Malformed escaping.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 25, S: this, A: ["i + 1 < path.length && (path[i + 1] === '.' || path[i + 1] === '\\\\')", "'Malformed escaping.'"] });
         current = current + path[i + 1];
         i++;
       } else if (path[i] === ".") {
@@ -523,14 +580,15 @@ var extractReferences = (data) => {
   const refs = [];
   const visit = (path, value) => {
     if (isEncodedReference(value)) {
-      const dxn = EncodedReference.toDXN(value);
-      const echoId = dxn.asEchoDXN()?.echoId;
-      if (!echoId) {
+      const uri = EncodedReference.toURI(value);
+      const parsedEchoUri = EID2.tryParse(uri);
+      const echoUri = parsedEchoUri ? EID2.getEntityId(parsedEchoUri) : void 0;
+      if (!echoUri || !parsedEchoUri) {
         return;
       }
       refs.push({
         path,
-        targetDxn: dxn.toString()
+        targetDXN: EID2.toLocal(parsedEchoUri)
       });
     } else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
       for (const [key, v] of Object.entries(value)) {
@@ -553,7 +611,7 @@ var extractReferences = (data) => {
 };
 var ReverseRef = Schema4.Struct({
   recordId: Schema4.Number,
-  targetDxn: Schema4.String,
+  targetDXN: EID2.Schema,
   /**
   * Escaped property path within an object.
   *
@@ -570,18 +628,19 @@ var ReverseRefIndex = class {
     const sql = yield* SqlClient7.SqlClient;
     yield* sql`CREATE TABLE IF NOT EXISTS reverseRef (
       recordId INTEGER NOT NULL,
-      targetDxn TEXT NOT NULL,
+      targetDXN TEXT NOT NULL,
       propPath TEXT NOT NULL,
-      PRIMARY KEY (recordId, targetDxn, propPath)
+      PRIMARY KEY (recordId, targetDXN, propPath)
     )`;
-    yield* sql`CREATE INDEX IF NOT EXISTS idx_reverse_ref_target ON reverseRef(targetDxn)`;
+    yield* sql`CREATE INDEX IF NOT EXISTS idx_reverse_ref_target ON reverseRef(targetDXN)`;
   });
   /**
   * Query all references pointing to a target DXN.
   */
-  query = Effect4.fn("ReverseRefIndex.query")(({ targetDxn }) => Effect4.gen(function* () {
+  query = Effect4.fn("ReverseRefIndex.query")(({ targetDXN }) => Effect4.gen(function* () {
     const sql = yield* SqlClient7.SqlClient;
-    const rows = yield* sql`SELECT * FROM reverseRef WHERE targetDxn = ${targetDxn}`;
+    const normalized = EID2.toLocal(targetDXN);
+    const rows = yield* sql`SELECT * FROM reverseRef WHERE targetDXN = ${normalized}`;
     return rows;
   }));
   update = Effect4.fn("ReverseRefIndex.update")((objects) => Effect4.gen(function* () {
@@ -593,7 +652,7 @@ var ReverseRefIndex = class {
       }
       yield* sql`DELETE FROM reverseRef WHERE recordId = ${recordId}`;
       const refs = extractReferences(data);
-      yield* Effect4.forEach(refs, (ref) => sql`INSERT INTO reverseRef (recordId, targetDxn, propPath) VALUES (${recordId}, ${ref.targetDxn}, ${EscapedPropPath.escape(ref.path)})`, {
+      yield* Effect4.forEach(refs, (ref) => sql`INSERT INTO reverseRef (recordId, targetDXN, propPath) VALUES (${recordId}, ${ref.targetDXN}, ${EscapedPropPath.escape(ref.path)})`, {
         discard: true
       });
     }), {
@@ -603,6 +662,33 @@ var ReverseRefIndex = class {
 };
 
 // src/index-engine.ts
+var makeEmptyIndexingResult = () => ({
+  updated: 0,
+  done: true,
+  spaces: /* @__PURE__ */ new Set(),
+  queues: /* @__PURE__ */ new Set(),
+  documents: /* @__PURE__ */ new Set(),
+  types: /* @__PURE__ */ new Set(),
+  objects: /* @__PURE__ */ new Set()
+});
+var accumulateIndexingResult = (acc, objects) => {
+  for (const obj of objects) {
+    acc.spaces.add(obj.spaceId);
+    if (obj.queueId) {
+      acc.queues.add(obj.queueId);
+    }
+    if (obj.documentId) {
+      acc.documents.add(obj.documentId);
+    }
+    const t = obj.data[ATTR_TYPE2];
+    if (t) {
+      acc.types.add(String(t));
+    }
+    if (obj.data.id) {
+      acc.objects.add(obj.data.id);
+    }
+  }
+};
 var IndexEngine = class {
   #tracker;
   #objectMetaIndex;
@@ -610,7 +696,7 @@ var IndexEngine = class {
   #reverseRefIndex;
   constructor(params) {
     this.#tracker = params?.tracker ?? new IndexTracker();
-    this.#objectMetaIndex = params?.objectMetaIndex ?? new ObjectMetaIndex();
+    this.#objectMetaIndex = params?.objectMetaIndex ?? new EntityMetaIndex();
     this.#ftsIndex = params?.ftsIndex ?? new FtsIndex();
     this.#reverseRefIndex = params?.reverseRefIndex ?? new ReverseRefIndex();
   }
@@ -667,35 +753,36 @@ var IndexEngine = class {
   lookupByObjectId(query) {
     return this.#objectMetaIndex.lookupByObjectId(query);
   }
+  queryObjectIds(query) {
+    return this.#objectMetaIndex.queryObjectIds(query);
+  }
   update(ctx, dataSource, opts) {
     return Effect5.gen(this, function* () {
-      let updated = 0;
-      let done = true;
-      const { updated: updatedFtsIndex, done: doneFtsIndex } = yield* this.#update(ctx, this.#ftsIndex, dataSource, {
+      const result = makeEmptyIndexingResult();
+      const { updated: updatedFtsIndex, done: doneFtsIndex, objects: ftsObjects } = yield* this.#update(ctx, this.#ftsIndex, dataSource, {
         indexName: "fts5",
         spaceId: opts.spaceId,
         limit: opts.limit
       });
-      updated += updatedFtsIndex;
-      done = done && doneFtsIndex;
-      const { updated: updatedReverseRefIndex, done: doneReverseRefIndex } = yield* this.#update(ctx, this.#reverseRefIndex, dataSource, {
+      result.updated += updatedFtsIndex;
+      result.done = result.done && doneFtsIndex;
+      accumulateIndexingResult(result, ftsObjects);
+      const { updated: updatedReverseRefIndex, done: doneReverseRefIndex, objects: reverseRefObjects } = yield* this.#update(ctx, this.#reverseRefIndex, dataSource, {
         indexName: "reverseRef",
         spaceId: opts.spaceId,
         limit: opts.limit
       });
-      updated += updatedReverseRefIndex;
-      done = done && doneReverseRefIndex;
-      return {
-        updated,
-        done
-      };
+      result.updated += updatedReverseRefIndex;
+      result.done = result.done && doneReverseRefIndex;
+      accumulateIndexingResult(result, reverseRefObjects);
+      return result;
     }).pipe(Effect5.withSpan("IndexEngine.update"));
   }
   /**
   * Update a dependent index that requires recordId enrichment.
   * This method:
   * 1. Gets changed objects from the source.
-  * 2. Ensures those objects exist in ObjectMetaIndex.
+  * 2. Ensures those objects exist in EntityMetaIndex.
   * 3. Looks up recordIds for those objects.
   * 4. Enriches objects with recordIds.
   * 5. Updates the dependent index.
@@ -703,22 +790,23 @@ var IndexEngine = class {
   #update(ctx, index, source, opts) {
     return Effect5.gen(this, function* () {
       const sqlTransaction = yield* SqlTransaction.SqlTransaction;
+      const cursors = yield* this.#tracker.queryCursors({
+        indexName: opts.indexName,
+        sourceName: source.sourceName,
+        // Pass undefined to get all cursors when spaceId is null.
+        spaceId: opts.spaceId ?? void 0
+      });
+      const { objects, cursors: updatedCursors } = yield* source.getChangedObjects(ctx, cursors, {
+        limit: opts.limit
+      });
+      if (objects.length === 0) {
+        return {
+          updated: 0,
+          done: true,
+          objects: []
+        };
+      }
       return yield* sqlTransaction.withTransaction(Effect5.gen(this, function* () {
-        const cursors = yield* this.#tracker.queryCursors({
-          indexName: opts.indexName,
-          sourceName: source.sourceName,
-          // Pass undefined to get all cursors when spaceId is null.
-          spaceId: opts.spaceId ?? void 0
-        });
-        const { objects, cursors: updatedCursors } = yield* source.getChangedObjects(ctx, cursors, {
-          limit: opts.limit
-        });
-        if (objects.length === 0) {
-          return {
-            updated: 0,
-            done: true
-          };
-        }
         yield* this.#objectMetaIndex.update(objects);
         yield* this.#objectMetaIndex.lookupRecordIds(objects);
         yield* index.update(objects);
@@ -731,18 +819,19 @@ var IndexEngine = class {
         })));
         return {
           updated: objects.length,
-          done: false
+          done: false,
+          objects
         };
       }));
     }).pipe(Effect5.withSpan("IndexEngine.#update"));
   }
 };
 export {
+  EntityMetaIndex,
   EscapedPropPath,
   FtsIndex,
   IndexEngine,
   IndexTracker,
-  ObjectMetaIndex,
   ReverseRefIndex
 };
 //# sourceMappingURL=index.mjs.map