@dxos/client-services 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/dist/lib/browser/{chunk-NGONP3EI.mjs → chunk-YJFGXOFW.mjs}

@@ -395,7 +395,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // src/version.ts
-var DXOS_VERSION = "0.8.4-main.d05539e30a";
+var DXOS_VERSION = "0.8.4-main.d9fc60f731";
 
 // src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -741,7 +741,7 @@ function _ts_dispose_resources(env) {
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
-  return (_ts_dispose_resources = function _ts_dispose_resources5(env2) {
+  return (_ts_dispose_resources = function _ts_dispose_resources6(env2) {
     function fail(e) {
       env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
       env2.hasError = true;
@@ -1275,9 +1275,15 @@ var DataSpaceManager = class extends Resource2 {
     const spacesToActivate = [];
     await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
+        if (spaceMetadata.state === SpaceState.SPACE_DELETED || this.isSpaceDeleted(spaceMetadata.key)) {
+          log4("skipping deleted space", {
+            spaceKey: spaceMetadata.key
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 107, S: this });
+          return;
+        }
         log4("load space", {
           spaceMetadata
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 105, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 112, S: this });
         const space = await this._constructSpace(ctx, spaceMetadata);
         if (this._runtimeProps?.autoActivateSpaces && spaceMetadata.state === SpaceState.SPACE_ACTIVE) {
           spacesToActivate.push(space);
@@ -1286,24 +1292,24 @@ var DataSpaceManager = class extends Resource2 {
         log4.error("Error loading space", {
           spaceMetadata,
           err
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 114, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 121, S: this });
       }
     });
     for (const space of spacesToActivate) {
       log4("auto-activating space", {
         spaceKey: space.key
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 122, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 129, S: this });
       space.activate(ctx).catch((err) => {
         log4.error("Error auto-activating space", {
           spaceKey: space.key,
           err
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 126, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 133, S: this });
       });
     }
     this.updated.emit();
   }
   async _close(ctx) {
-    log4("close", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 135, S: this });
+    log4("close", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 142, S: this });
     for (const space of this._spaces.values()) {
       await space.close(ctx);
     }
@@ -1331,14 +1337,14 @@ var DataSpaceManager = class extends Resource2 {
     log4("creating space...", {
       spaceId,
       spaceKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 159, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 166, S: this });
     const documentIdMapping = {};
     if (options.documents) {
-      invariant3(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 166, S: this, A: ["Object.keys(options.documents).every((documentId)=>/^[a-zA-Z0-9]+$/.test(documentId))", "'Invalid document IDs'"] });
+      invariant3(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 173, S: this, A: ["Object.keys(options.documents).every((documentId)=>/^[a-zA-Z0-9]+$/.test(documentId))", "'Invalid document IDs'"] });
       await Promise.all(Object.entries(options.documents).map(async ([documentId, data]) => {
         log4("creating document...", {
           documentId
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 168, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 175, S: this });
         const newDoc = await this._echoHost.createDoc(data, {
           preserveHistory: true
         });
@@ -1352,12 +1358,12 @@ var DataSpaceManager = class extends Resource2 {
     }
     log4("opening space...", {
       spaceKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 184, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 191, S: this });
     let root;
     if (options.rootUrl) {
       const newRootDocId = documentIdMapping[interpretAsDocumentId(options.rootUrl)] ?? failedInvariant();
       const rootDocHandle = await this._echoHost.loadDoc(ctx, newRootDocId);
-      invariant3(rootDocHandle, "Root document must be available after import.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 191, S: this, A: ["rootDocHandle", "'Root document must be available after import.'"] });
+      invariant3(rootDocHandle, "Root document must be available after import.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 198, S: this, A: ["rootDocHandle", "'Root document must be available after import.'"] });
       DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(ctx, spaceId, `automerge:${newRootDocId}`);
     } else {
@@ -1366,22 +1372,22 @@ var DataSpaceManager = class extends Resource2 {
     await this._echoHost.flush(ctx);
     log4("constructing space...", {
       spaceKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 198, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 205, S: this });
     const space = await this._constructSpace(ctx, metadata);
     await space.open(ctx);
     log4("adding space...", {
       spaceKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 203, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 210, S: this });
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, root.url, tags, options.membershipPolicy);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    invariant3(getCredentialAssertion(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 209, S: this, A: ["getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'", ""] });
+    invariant3(getCredentialAssertion(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 216, S: this, A: ["getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'", ""] });
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline(ctx);
     log4("space ready.", {
       spaceId,
       spaceKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 212, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 219, S: this });
     this.updated.emit();
     return space;
   }
@@ -1394,9 +1400,10 @@ var DataSpaceManager = class extends Resource2 {
   async acceptSpace(ctx, opts) {
     log4("accept space", {
       opts
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 225, S: this });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, "Not open.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 228, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", "'Not open.'"] });
-    invariant3(!this._spaces.has(opts.spaceKey), "Space already exists.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 229, S: this, A: ["!this._spaces.has(opts.spaceKey)", "'Space already exists.'"] });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 232, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, "Not open.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 235, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", "'Not open.'"] });
+    invariant3(!this._spaces.has(opts.spaceKey), "Space already exists.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 236, S: this, A: ["!this._spaces.has(opts.spaceKey)", "'Space already exists.'"] });
+    invariant3(!this.isSpaceDeleted(opts.spaceKey), "Cannot accept a deleted space.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 237, S: this, A: ["!this.isSpaceDeleted(opts.spaceKey)", "'Cannot accept a deleted space.'"] });
     const tags = opts.tags ? Array.from(opts.tags) : [];
     const metadata = {
       key: opts.spaceKey,
@@ -1412,16 +1419,68 @@ var DataSpaceManager = class extends Resource2 {
     this.updated.emit();
     return space;
   }
+  /**
+  * Whether the space has been tombstoned (soft-deleted). Deleted spaces are never opened or replicated.
+  */
+  isSpaceDeleted(spaceKey) {
+    return this._metadataStore.deletedSpaces.some((key) => key.equals(spaceKey)) || this._metadataStore.spaces.some((spaceMetadata) => spaceMetadata.key.equals(spaceKey) && spaceMetadata.state === SpaceState.SPACE_DELETED);
+  }
+  /**
+  * Tombstones (soft-deletes) a space initiated locally on this device.
+  * Records a SpaceDeleted credential in the HALO so the deletion replicates to the user's other devices,
+  * then unloads the space locally. Data is not removed until garbage collection (future work).
+  */
+  async markSpaceDeleted(ctx, spaceKey) {
+    if (this.isSpaceDeleted(spaceKey)) {
+      return;
+    }
+    const credential = await this._signingContext.credentialSigner.createCredential({
+      subject: spaceKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceDeleted",
+        spaceKey,
+        deletedAt: /* @__PURE__ */ new Date()
+      }
+    });
+    await this._signingContext.recordCredential(credential);
+    await this._tombstoneSpace(ctx, spaceKey);
+  }
+  /**
+  * Tombstones a space in response to a SpaceDeleted credential replicated from another device.
+  * Does not write a credential (one already exists in the HALO).
+  */
+  async handleRemoteSpaceDeleted(ctx, spaceKey) {
+    if (this.isSpaceDeleted(spaceKey)) {
+      return;
+    }
+    await this._tombstoneSpace(ctx, spaceKey);
+  }
+  /**
+  * Persists the tombstone and unloads the space if it is currently loaded.
+  * Must be called while holding the DataSpaceManager lock (see callers).
+  */
+  async _tombstoneSpace(ctx, spaceKey) {
+    await this._metadataStore.addDeletedSpace(spaceKey);
+    const space = this._spaces.get(spaceKey);
+    if (space) {
+      if (space.isOpen) {
+        await space.close(ctx);
+      }
+      await space.delete();
+      this._spaces.delete(spaceKey);
+    }
+    this.updated.emit();
+  }
   async admitMember(options) {
     const space = this._spaceManager.spaces.get(options.spaceKey);
-    invariant3(space, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 251, S: this, A: ["space", ""] });
+    invariant3(space, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 310, S: this, A: ["space", ""] });
     if (space.spaceState.getMemberRole(options.identityKey) !== SpaceMember3.Role.REMOVED) {
       throw new AlreadyJoinedError();
     }
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId, space.spaceState.tags);
-    invariant3(credentials[0].credential, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 258, S: this, A: ["credentials[0].credential", ""] });
+    invariant3(credentials[0].credential, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 317, S: this, A: ["credentials[0].credential", ""] });
     const spaceMemberCredential = credentials[0].credential.credential;
-    invariant3(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 260, S: this, A: ["getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'", ""] });
+    invariant3(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 319, S: this, A: ["getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'", ""] });
     await writeMessages(space.controlPipeline.writer, credentials);
     return spaceMemberCredential;
   }
@@ -1451,7 +1510,7 @@ var DataSpaceManager = class extends Resource2 {
   }
   async setSpaceEdgeReplicationSetting(ctx, spaceKey, setting) {
     const space = this._spaces.get(spaceKey);
-    invariant3(space, "Space not found.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 289, S: this, A: ["space", "'Space not found.'"] });
+    invariant3(space, "Space not found.", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 348, S: this, A: ["space", "'Space not found.'"] });
     await this._metadataStore.setSpaceEdgeReplicationSetting(spaceKey, setting);
     if (space.isOpen) {
       switch (setting) {
@@ -1468,7 +1527,7 @@ var DataSpaceManager = class extends Resource2 {
   async _constructSpace(ctx, metadata) {
     log4("construct space", {
       metadata
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 304, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 363, S: this });
     const gossip = new Gossip({
       localPeerId: this._signingContext.deviceKey
     });
@@ -1507,12 +1566,12 @@ var DataSpaceManager = class extends Resource2 {
         } catch (err) {
           log4.warn("error on authorized connection", {
             err
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 343, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 402, S: this });
           await session.close(err);
         }
       }),
       onAuthFailure: () => {
-        log4.warn("auth failure", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 350, S: this });
+        log4.warn("auth failure", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 409, S: this });
       },
       onMemberRolesChanged: async (members) => {
         if (dataSpace?.state === SpaceState.SPACE_READY) {
@@ -1540,13 +1599,13 @@ var DataSpaceManager = class extends Resource2 {
         beforeReady: async () => {
           log4("before space ready", {
             space: space.key
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 376, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 435, S: this });
         },
         afterReady: async () => {
           log4("after space ready", {
             space: space.key,
             open: this._lifecycleState === LifecycleState.OPEN
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 381, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 440, S: this });
           if (this._lifecycleState === LifecycleState.OPEN) {
             await this._createDelegatedInvitations(dataSpace, [
               ...space.spaceState.invitations.entries()
@@ -1560,7 +1619,7 @@ var DataSpaceManager = class extends Resource2 {
         beforeClose: async () => {
           log4("before space close", {
             space: space.key
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 396, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 455, S: this });
         }
       },
       cache: metadata.cache,
@@ -1577,7 +1636,7 @@ var DataSpaceManager = class extends Resource2 {
       } else if (this._echoEdgeReplicator) {
         log4("not connecting edge replicator because of EdgeReplicationSetting", {
           spaceId: dataSpace.id
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 414, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 473, S: this });
       }
     });
     dataSpace.preClose.append(async () => {
@@ -1602,7 +1661,7 @@ var DataSpaceManager = class extends Resource2 {
     if (!replicator) {
       log4.warn("p2p automerge replication disabled", {
         space: space.key
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 439, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 498, S: this });
       return;
     }
     await replicator.authorizeDevice(space.key, session.remotePeerId);
@@ -1630,7 +1689,7 @@ var DataSpaceManager = class extends Resource2 {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 466, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 525, S: this });
     spaceProtocol.updateTopology();
   }
   _handleNewPeerConnected(space, peerState) {
@@ -1640,7 +1699,7 @@ var DataSpaceManager = class extends Resource2 {
       if (session != null) {
         log4("closing a session with a removed peer", {
           peerId: peerState.peerId
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 479, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 538, S: this });
         void session.close().catch(log4.error);
       }
     }
@@ -1705,6 +1764,12 @@ _ts_decorate2([
     op: "lifecycle"
   })
 ], DataSpaceManager.prototype, "acceptSpace", null);
+_ts_decorate2([
+  synchronized
+], DataSpaceManager.prototype, "markSpaceDeleted", null);
+_ts_decorate2([
+  synchronized
+], DataSpaceManager.prototype, "handleRemoteSpaceDeleted", null);
 DataSpaceManager = _ts_decorate2([
   trackLeaks("open", "close"),
   trace.resource({
@@ -1762,13 +1827,16 @@ var detectSpaceArchiveFormat = (archive) => {
 };
 
 // src/packlets/space-export/serialized-space-reader.ts
+import { Type as Type2 } from "@dxos/echo";
 import { assertArgument as assertArgument2 } from "@dxos/invariant";
+import { URI } from "@dxos/keys";
 var ATTR_TYPE = "@type";
 var ATTR_META = "@meta";
 var ATTR_DELETED = "@deleted";
 var ATTR_PARENT = "@parent";
 var ATTR_RELATION_SOURCE = "@relationSource";
 var ATTR_RELATION_TARGET = "@relationTarget";
+var TYPE_KIND_SCHEMA_URI = Type2.getURI(Type2.Type).toString();
 var INTERNAL_KEYS = /* @__PURE__ */ new Set([
   "id",
   ATTR_TYPE,
@@ -1798,13 +1866,13 @@ var objJsonToObjectStructure = (obj) => {
   const type = obj[ATTR_TYPE];
   if (type) {
     system.type = {
-      "/": type
+      "/": URI.make(type)
     };
   }
   const parent = obj[ATTR_PARENT];
   if (typeof parent === "string") {
     system.parent = {
-      "/": parent
+      "/": URI.make(parent)
     };
   }
   const relationSource = obj[ATTR_RELATION_SOURCE];
@@ -1813,14 +1881,16 @@ var objJsonToObjectStructure = (obj) => {
     system.kind = "relation";
     if (typeof relationSource === "string") {
       system.source = {
-        "/": relationSource
+        "/": URI.make(relationSource)
       };
     }
     if (typeof relationTarget === "string") {
       system.target = {
-        "/": relationTarget
+        "/": URI.make(relationTarget)
       };
     }
+  } else if (type === TYPE_KIND_SCHEMA_URI) {
+    system.kind = "type";
   } else {
     system.kind = "object";
   }
@@ -1834,6 +1904,15 @@ var objJsonToObjectStructure = (obj) => {
       keys: meta?.keys ?? [],
       ...meta?.tags ? {
         tags: meta.tags
+      } : {},
+      // Preserve registry-provenance fields so persisted `Type.Type` entities
+      // round-trip with their typename / semver (see the symmetric write in
+      // `objectStructureToObjJson`).
+      ...meta?.key !== void 0 ? {
+        key: meta.key
+      } : {},
+      ...meta?.version !== void 0 ? {
+        version: meta.version
       } : {}
     },
     data
@@ -1958,6 +2037,16 @@ var objectStructureToObjJson = (objectId, structure) => {
       keys: structure.meta.keys ?? [],
       ...structure.meta.tags ? {
         tags: structure.meta.tags
+      } : {},
+      // Preserve the registry-provenance fields (typename / semver) so persisted
+      // `Type.Type` entities round-trip with their `meta.key` / `meta.version`
+      // intact — `Type.getTypename` / `Type.getVersion` read these. Without them
+      // a type loaded from an archive would fall back to its object id.
+      ...structure.meta.key !== void 0 ? {
+        key: structure.meta.key
+      } : {},
+      ...structure.meta.version !== void 0 ? {
+        version: structure.meta.version
       } : {}
     };
   }
@@ -1983,18 +2072,14 @@ var exportFeedData = async (space, echoHost, objects) => {
     if (obj[ATTR_TYPE2] == null) {
       continue;
     }
-    const typeDXN = DXN.tryParse(obj[ATTR_TYPE2]);
-    if (typeDXN?.asTypeDXN()?.type !== FEED_TYPENAME) {
+    const typeDxn = obj[ATTR_TYPE2];
+    const typeDxnNsid = DXN.isDXN(typeDxn) ? DXN.getName(typeDxn) : void 0;
+    if (typeDxnNsid !== FEED_TYPENAME) {
       continue;
     }
     const namespace = obj.namespace === "trace" ? "trace" : "data";
-    const queueDXN = new DXN(DXN.kind.QUEUE, [
-      namespace,
-      spaceId,
-      obj.id
-    ]);
     try {
-      const messages = await collectQueueMessages(echoHost, queueDXN);
+      const messages = await collectQueueMessages(echoHost, spaceId, obj.id, namespace);
       if (messages.length > 0) {
         feeds.push({
           feedObjectId: obj.id,
@@ -2006,25 +2091,23 @@ var exportFeedData = async (space, echoHost, objects) => {
       log5.warn("failed to export feed data", {
         feedObjectId: obj.id,
         error: err
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 179, S: void 0 });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 185, S: void 0 });
     }
   }
   return feeds;
 };
-var collectQueueMessages = async (echoHost, queueDXN) => {
-  const parts = queueDXN.asQueueDXN();
-  invariant4(parts, "Expected a queue DXN", { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 189, S: void 0, A: ["parts", "'Expected a queue DXN'"] });
-  const namespace = parts.subspaceTag === "trace" ? FeedProtocol.WellKnownNamespaces.trace : FeedProtocol.WellKnownNamespaces.data;
+var collectQueueMessages = async (echoHost, spaceId, queueId, namespace) => {
+  const queuesNamespace = namespace === "trace" ? FeedProtocol.WellKnownNamespaces.trace : FeedProtocol.WellKnownNamespaces.data;
   const messages = [];
   let cursor;
   while (true) {
     const result = await echoHost.queuesService.queryQueue({
       query: {
-        spaceId: parts.spaceId,
+        spaceId,
         queueIds: [
-          parts.queueId
+          queueId
         ],
-        queuesNamespace: namespace,
+        queuesNamespace,
         after: cursor
       }
     });
@@ -2037,7 +2120,7 @@ var collectQueueMessages = async (echoHost, queueDXN) => {
         log5.verbose("queue object JSON parse failed; object ignored", {
           encoded,
           error: err
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 210, S: void 0 });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 214, S: void 0 });
         return [];
       }
     });
@@ -2249,7 +2332,7 @@ function _ts_dispose_resources2(env) {
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
-  return (_ts_dispose_resources2 = function _ts_dispose_resources5(env2) {
+  return (_ts_dispose_resources2 = function _ts_dispose_resources6(env2) {
     function fail(e) {
       env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
       env2.hasError = true;
@@ -2310,6 +2393,9 @@ var SpacesServiceImpl = class {
         case SpaceState2.SPACE_INACTIVE:
           await space.deactivate(ctx);
           break;
+        case SpaceState2.SPACE_DELETED:
+          await dataSpaceManager.markSpaceDeleted(ctx, spaceKey);
+          return;
         default:
           throw new ApiError({
             message: "Invalid space state"
@@ -2336,9 +2422,9 @@ var SpacesServiceImpl = class {
       });
     }
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
-    invariant6(credentials[0].credential, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 142, S: this, A: ["credentials[0].credential", ""] });
+    invariant6(credentials[0].credential, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 146, S: this, A: ["credentials[0].credential", ""] });
     const spaceMemberCredential = credentials[0].credential.credential;
-    invariant6(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 144, S: this, A: ["getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'", ""] });
+    invariant6(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 148, S: this, A: ["getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'", ""] });
     await writeMessages2(space.controlPipeline.writer, credentials);
   }
   querySpaces() {
@@ -2348,7 +2434,7 @@ var SpacesServiceImpl = class {
         const spaces = await Promise.all(Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space)));
         log7("update", () => ({
           ids: spaces.map((space) => space.id)
-        }), { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 152, S: this });
+        }), { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 156, S: this });
         await this._updateMetrics();
         next({
           spaces
@@ -2435,10 +2521,10 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        invariant6(!credential.id, "Id on unsigned credentials is not allowed", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 244, S: this, A: ["!credential.id", "'Id on unsigned credentials is not allowed'"] });
-        invariant6(this._identityManager.identity, "Identity is not available", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 245, S: this, A: ["this._identityManager.identity", "'Identity is not available'"] });
+        invariant6(!credential.id, "Id on unsigned credentials is not allowed", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 248, S: this, A: ["!credential.id", "'Id on unsigned credentials is not allowed'"] });
+        invariant6(this._identityManager.identity, "Identity is not available", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 249, S: this, A: ["this._identityManager.identity", "'Identity is not available'"] });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        invariant6(credential.issuer.equals(signer.getIssuer()), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 247, S: this, A: ["credential.issuer.equals(signer.getIssuer())", ""] });
+        invariant6(credential.issuer.equals(signer.getIssuer()), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 251, S: this, A: ["credential.issuer.equals(signer.getIssuer())", ""] });
         const signedCredential = await signer.createCredential({
           subject: credential.subject.id,
           assertion: credential.subject.assertion
@@ -2472,7 +2558,7 @@ var SpacesServiceImpl = class {
     });
   }
   async joinBySpaceKey({ spaceKey }, options) {
-    const ctx = options?.ctx ?? Context5.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 281 });
+    const ctx = options?.ctx ?? Context5.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 285 });
     const dataSpaceManager = await this._getDataSpaceManager();
     const credential = await dataSpaceManager.requestSpaceAdmissionCredential(ctx, spaceKey);
     return this._joinByAdmission(ctx, {
@@ -2535,7 +2621,7 @@ var SpacesServiceImpl = class {
     }
   }
   async importSpace(request, options) {
-    const ctx = options?.ctx ?? Context5.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 344 });
+    const ctx = options?.ctx ?? Context5.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 348 });
     const dataSpaceManager = await this._getDataSpaceManager();
     const format = request.archive.format ?? detectSpaceArchiveFormat(request.archive);
     if (format === SpaceArchive4.Format.JSON) {
@@ -2550,7 +2636,7 @@ var SpacesServiceImpl = class {
       };
     }
     const extracted = await extractSpaceArchive(request.archive);
-    invariant6(extracted.metadata.echo?.currentRootUrl, "Space archive does not contain a root URL", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 359, S: this, A: ["extracted.metadata.echo?.currentRootUrl", "'Space archive does not contain a root URL'"] });
+    invariant6(extracted.metadata.echo?.currentRootUrl, "Space archive does not contain a root URL", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 363, S: this, A: ["extracted.metadata.echo?.currentRootUrl", "'Space archive does not contain a root URL'"] });
     const space = await dataSpaceManager.createSpace(ctx, {
       documents: extracted.documents,
       rootUrl: extracted.metadata.echo?.currentRootUrl,
@@ -2565,7 +2651,7 @@ var SpacesServiceImpl = class {
   * Populate a freshly-created space with the objects and feed messages described in a {@link SerializedSpace}.
   *
   * Objects are written directly into the space's automerge root document as inline
-  * {@link ObjectStructure} entries; feed messages are appended to the appropriate queue
+  * {@link EntityStructure} entries; feed messages are appended to the appropriate queue
   * via {@link EchoHost.queuesService}.
   */
   async _hydrateSpaceFromSerialized(space, serialized) {
@@ -2595,15 +2681,15 @@ var SpacesServiceImpl = class {
         log7.warn("failed to import feed data", {
           feedObjectId: feed.feedObjectId,
           error: err
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 400, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 404, S: this });
       }
     }
   }
   async _joinByAdmission(ctx, { credential }) {
     const assertion = getCredentialAssertion2(credential);
-    invariant6(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 409, S: this, A: ["assertion['@type'] === 'dxos.halo.credentials.SpaceMember'", "'Invalid credential'"] });
+    invariant6(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 413, S: this, A: ["assertion['@type'] === 'dxos.halo.credentials.SpaceMember'", "'Invalid credential'"] });
     const myIdentity = this._identityManager.identity;
-    invariant6(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 411, S: this, A: ["myIdentity && credential.subject.id.equals(myIdentity.identityKey)", ""] });
+    invariant6(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 415, S: this, A: ["myIdentity && credential.subject.id.equals(myIdentity.identityKey)", ""] });
     const dataSpaceManager = await this._getDataSpaceManager();
     let dataSpace = dataSpaceManager.spaces.get(assertion.spaceKey);
     if (!dataSpace) {
@@ -3798,7 +3884,7 @@ function _ts_dispose_resources3(env) {
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
-  return (_ts_dispose_resources3 = function _ts_dispose_resources5(env2) {
+  return (_ts_dispose_resources3 = function _ts_dispose_resources6(env2) {
     function fail(e) {
       env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
       env2.hasError = true;
@@ -4292,6 +4378,24 @@ var DataSpace = class {
     }, { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 563, S: this });
     this.stateUpdate.emit();
   }
+  /**
+  * Tombstones (soft-deletes) the space by moving it to a terminal state.
+  * This is intentionally separate from teardown: the caller is responsible for {@link close}-ing the
+  * space (teardown uses the resource lifecycle, distinct from this state transition).
+  * Terminal: {@link activate} will not re-open a deleted space. Data is not removed until garbage
+  * collection (future work).
+  */
+  async delete() {
+    if (this._state === SpaceState3.SPACE_DELETED) {
+      return;
+    }
+    await this._metadataStore.setSpaceState(this.key, SpaceState3.SPACE_DELETED);
+    this._state = SpaceState3.SPACE_DELETED;
+    log11("new state", {
+      state: SpaceState3[this._state]
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 580, S: this });
+    this.stateUpdate.emit();
+  }
   getEdgeReplicationSetting() {
     return this._metadataStore.getSpaceEdgeReplicationSetting(this.key);
   }
@@ -4353,6 +4457,9 @@ _ts_decorate6([
 _ts_decorate6([
   synchronized2
 ], DataSpace.prototype, "deactivate", null);
+_ts_decorate6([
+  synchronized2
+], DataSpace.prototype, "delete", null);
 DataSpace = _ts_decorate6([
   trackLeaks2("open", "close"),
   trace4.resource()
@@ -6163,143 +6270,596 @@ var locks_exports = {};
 __reExport(locks_exports, locks_platform_star);
 import * as locks_platform_star from "#locks-platform";
 
-// src/packlets/agents/edge-agent-manager.ts
-import { DeferredTask as DeferredTask2, Event as Event9, scheduleTask as scheduleTask8, synchronized as synchronized3 } from "@dxos/async";
+// src/packlets/services/feed-syncer.ts
+import { Encoder, decode as cborXdecode } from "cbor-x";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import { AsyncTask, Mutex as Mutex4, scheduleTask as scheduleTask8 } from "@dxos/async";
 import { Resource as Resource7 } from "@dxos/context";
+import { MessageSchema } from "@dxos/edge-client";
+import { RuntimeProvider } from "@dxos/effect";
+import { SyncClient } from "@dxos/feed";
 import { invariant as invariant21 } from "@dxos/invariant";
-import { PublicKey as PublicKey11 } from "@dxos/keys";
+import { SpaceId as SpaceId3 } from "@dxos/keys";
 import { log as log20 } from "@dxos/log";
-import { EdgeAgentStatus, EdgeCallFailedError as EdgeCallFailedError3 } from "@dxos/protocols";
-import { SpaceState as SpaceState4 } from "@dxos/protocols/proto/dxos/client/services";
-import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
-var __dxlog_file25 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-manager.ts";
-function _ts_decorate10(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var AGENT_STATUS_QUERY_RETRY_INTERVAL = 5e3;
-var AGENT_STATUS_QUERY_RETRY_JITTER = 1e3;
-var AGENT_FEED_ADDED_CHECK_INTERVAL_MS = 3e3;
-var EdgeAgentManager = class extends Resource7 {
-  _edgeFeatures;
-  _edgeHttpClient;
-  _dataSpaceManager;
-  _identity;
-  agentStatusChanged = new Event9();
-  _agentDeviceKey;
-  _agentStatus;
-  _lastKnownDeviceCount = 0;
-  _fetchAgentStatusTask;
-  constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
-    super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity;
-  }
-  get agentStatus() {
-    return this._agentStatus;
-  }
-  get agentExists() {
-    return this._agentStatus && this._agentStatus !== EdgeAgentStatus.NOT_FOUND;
-  }
-  async createAgent(ctx) {
-    invariant21(this.isOpen, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 41, S: this, A: ["this.isOpen", ""] });
-    invariant21(this._edgeHttpClient, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 42, S: this, A: ["this._edgeHttpClient", ""] });
-    invariant21(this._edgeFeatures?.agents, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 43, S: this, A: ["this._edgeFeatures?.agents", ""] });
-    const response = await this._edgeHttpClient.createAgent(ctx, {
-      identityKey: this._identity.identityKey.toHex(),
-      haloSpaceId: this._identity.haloSpaceId,
-      haloSpaceKey: this._identity.haloSpaceKey.toHex()
-    });
-    const deviceKey = PublicKey11.fromHex(response.deviceKey);
-    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
-      log20.info("agent was already added to HALO, ignoring response", {
-        response
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 51, S: this });
-      this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
-      return;
+import { FeedProtocol as FeedProtocol3 } from "@dxos/protocols";
+import { EdgeService as EdgeService2 } from "@dxos/protocols";
+import { createBuf } from "@dxos/protocols/buf";
+import { bufferToArray as bufferToArray2 } from "@dxos/util";
+var __dxlog_file25 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/feed-syncer.ts";
+function _ts_add_disposable_resource4(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
     }
-    await this._identity.admitDevice({
-      deviceKey,
-      controlFeedKey: PublicKey11.fromHex(response.feedKey),
-      // TODO: agents don't have data feed, should be removed
-      dataFeedKey: PublicKey11.random()
-    });
-    log20("agent created", response, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 63, S: this });
-    this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
-  }
-  async _open() {
-    const isEnabled = this._edgeHttpClient && this._edgeFeatures?.agents;
-    log20("edge agent manager open", {
-      isEnabled
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 68, S: this });
-    if (!isEnabled) {
-      return;
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
     }
-    this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
-    this._fetchAgentStatusTask = new DeferredTask2(this._ctx, async () => {
-      await this._fetchAgentStatus(this._ctx);
-    });
-    this._fetchAgentStatusTask.schedule();
-    this._dataSpaceManager.updated.on(this._ctx, () => {
-      if (this._agentDeviceKey) {
-        this._ensureAgentIsInSpaces(this._agentDeviceKey);
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
       }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
     });
-    this._identity.stateUpdate.on(this._ctx, () => {
-      const maybeAgentWasCreated = this._identity.authorizedDeviceKeys.size > this._lastKnownDeviceCount;
-      if (this.agentExists || !maybeAgentWasCreated) {
-        return;
-      }
-      this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
-      this._fetchAgentStatusTask?.schedule();
+  } else if (async) {
+    env.stack.push({
+      async: true
     });
   }
-  async _close() {
-    this._fetchAgentStatusTask = void 0;
-    this._lastKnownDeviceCount = 0;
-  }
-  async _fetchAgentStatus(ctx) {
-    invariant21(this._edgeHttpClient, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 98, S: this, A: ["this._edgeHttpClient", ""] });
-    try {
-      log20("fetching agent status", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 100, S: this });
-      const { agent } = await this._edgeHttpClient.getAgentStatus(ctx, {
-        ownerIdentityKey: this._identity.identityKey
-      });
-      const wasAgentCreatedDuringQuery = this._agentStatus === EdgeAgentStatus.ACTIVE;
-      if (!wasAgentCreatedDuringQuery) {
-        const deviceKey = agent.deviceKey ? PublicKey11.fromHex(agent.deviceKey) : void 0;
-        this._updateStatus(agent.status, deviceKey);
-      }
-    } catch (err) {
-      if (err instanceof EdgeCallFailedError3) {
-        if (!err.isRetryable) {
-          log20.warn("non retryable error on agent status fetch attempt", {
-            err
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 112, S: this });
-          return;
+  return value;
+}
+function _ts_dispose_resources4(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources4 = function _ts_dispose_resources6(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
       }
-      const retryAfterMs = AGENT_STATUS_QUERY_RETRY_INTERVAL + Math.random() * AGENT_STATUS_QUERY_RETRY_JITTER;
-      log20.info("agent status fetching failed", {
-        err,
-        retryAfterMs
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 119, S: this });
-      scheduleTask8(this._ctx, () => this._fetchAgentStatusTask?.schedule(), retryAfterMs);
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
+    return next();
+  })(env);
+}
+var encoder = new Encoder({
+  tagUint8Array: false,
+  useRecords: false
+});
+var DEFAULT_MESSAGE_BLOCKS_LIMIT = 50;
+var DEFAULT_SYNC_CONCURRENCY = 5;
+var DEFAULT_POLLING_INTERVAL = 5e3;
+var DEFAULT_POLL_REQUEST_THROTTLE_MS = 250;
+var DEFAULT_PUSH_FAILURE_BACKOFF_MS = 250;
+var MAX_PUSH_FAILURE_BACKOFF_MS = 3e4;
+var MAX_BLOCKING_SYNC_ITERATIONS = 100;
+var FeedSyncer = class extends Resource7 {
+  #syncNamespaces;
+  #messageBlocksLimit;
+  #syncConcurrency;
+  #pollingInterval;
+  #pollRequestThrottleMs;
+  #backgroundSync;
+  #runtime;
+  #feedStore;
+  #edgeClient;
+  #syncClient;
+  #getSpaceIds;
+  #spacesToPoll = /* @__PURE__ */ new Set();
+  /** Last time full poll was completed. */
+  #lastFullPoll = null;
+  #throttledPollScheduled = false;
+  #lastRequestedPollAt = null;
+  #feedStoreMutex = new Mutex4();
+  #pushFailureBackoffMs = DEFAULT_PUSH_FAILURE_BACKOFF_MS;
+  constructor(options) {
+    super();
+    this.#runtime = options.runtime;
+    this.#feedStore = options.feedStore;
+    this.#edgeClient = options.edgeClient;
+    this.#syncClient = new SyncClient({
+      peerId: options.peerId,
+      feedStore: options.feedStore,
+      sendMessage: this.#sendMessage.bind(this),
+      rpcTimeoutMs: options.syncRpcTimeoutMs
+    });
+    this.#getSpaceIds = options.getSpaceIds;
+    this.#syncNamespaces = options.syncNamespaces;
+    this.#messageBlocksLimit = options.messageBlocksLimit ?? DEFAULT_MESSAGE_BLOCKS_LIMIT;
+    this.#syncConcurrency = options.syncConcurrency ?? DEFAULT_SYNC_CONCURRENCY;
+    this.#pollingInterval = options.pollingInterval ?? DEFAULT_POLLING_INTERVAL;
+    this.#pollRequestThrottleMs = options.pollRequestThrottleMs ?? DEFAULT_POLL_REQUEST_THROTTLE_MS;
+    this.#backgroundSync = options.backgroundSync ?? true;
   }
-  /**
-  * We don't want notarization plugin to always actively poll edge looking for credentials to notarize,
-  * because most of the time we'll be getting an empty response.
-  * Instead, we stay in active polling mode while there are spaces where we don't see our agent's feed.
-  */
-  _ensureAgentIsInSpaces(agentDeviceKey) {
-    let activePollingEnabled = false;
-    for (const space of this._dataSpaceManager.spaces.values()) {
-      if (space.getEdgeReplicationSetting() === EdgeReplicationSetting2.DISABLED) {
-        space.notarizationPlugin.setActiveEdgePollingEnabled(false);
-        continue;
-      }
-      if ([
+  async _open() {
+    this._ctx.onDispose(this.#edgeClient.onMessage((msg) => {
+      if (!msg.serviceId) {
+        return;
+      }
+      const service = msg.serviceId.split(":")[0];
+      if (service !== EdgeService2.QUEUE_REPLICATOR) {
+        return;
+      }
+      log20("feed sync edge ingress", {
+        serviceId: msg.serviceId,
+        payloadByteLength: msg.payload?.value?.byteLength
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 141, S: this });
+      const handleMessageEffect = Effect.gen(this, function* () {
+        const decoded = yield* Effect.try({
+          try: () => cborXdecode(msg.payload.value),
+          catch: (error) => new Error(`Failed to decode feed sync message: ${error}`)
+        });
+        const payload = yield* Schema.validate(FeedProtocol3.ProtocolMessage)(decoded);
+        yield* this.#syncClient.handleMessage(payload);
+      }).pipe(Effect.tapError((cause) => Effect.sync(() => log20("feed sync edge message handling failed", {
+        serviceId: msg.serviceId,
+        payloadByteLength: msg.payload?.value?.byteLength,
+        cause: cause instanceof Error ? cause.message : String(cause)
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 152, S: this }))));
+      void this.#runSerialized(() => RuntimeProvider.runPromise(this.#runtime)(handleMessageEffect));
+    }));
+    if (this.#backgroundSync) {
+      await this.#pollTask.open();
+      await this.#pushTask.open();
+      this.#feedStore.onNewBlocks.on(this._ctx, () => {
+        this.#pushTask.schedule();
+      });
+    }
+    this._ctx.onDispose(
+      // NOTE: Fires immediately (as a microtask) if the connection is already open, and again
+      // on every subsequent reconnect.
+      this.#edgeClient.onReconnected(async () => {
+        log20("feed sync edge reconnected", {
+          peerKey: this.#edgeClient.peerKey,
+          identityKey: this.#edgeClient.identityKey
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 174, S: this });
+        if (this.#backgroundSync) {
+          this.#resetSpacesToPoll();
+          this.#pollTask.schedule();
+          this.#pushTask.schedule();
+        }
+      })
+    );
+    if (this.#backgroundSync) {
+      this.#resetSpacesToPoll();
+      this.#pollTask.schedule();
+      this.#pushTask.schedule();
+    }
+  }
+  async _close() {
+    if (this.#backgroundSync) {
+      await this.#pollTask.close();
+      await this.#pushTask.close();
+    }
+  }
+  /**
+  * Schedules a best-effort pull without blocking the caller.
+  */
+  schedulePoll() {
+    if (!this.#backgroundSync) {
+      return;
+    }
+    this.#resetSpacesToPoll();
+    if (this.#throttledPollScheduled) {
+      return;
+    }
+    const now = Date.now();
+    const delay = this.#lastRequestedPollAt == null ? 0 : Math.max(this.#pollRequestThrottleMs - (now - this.#lastRequestedPollAt), 0);
+    this.#throttledPollScheduled = true;
+    scheduleTask8(this._ctx, () => {
+      this.#throttledPollScheduled = false;
+      this.#lastRequestedPollAt = Date.now();
+      this.#pollTask.schedule();
+    }, delay);
+  }
+  /**
+  * Returns per-namespace queue sync backlog for a space.
+  * `blocksToPull` and `blocksToPush` of 0 mean caught up for that namespace.
+  */
+  async getSyncState(ctx, request) {
+    const spaceId = request.spaceId;
+    invariant21(SpaceId3.isValid(spaceId), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 222, S: this, A: ["SpaceId.isValid(spaceId)", ""] });
+    const namespaces = request.namespaces != null && request.namespaces.length > 0 ? request.namespaces : this.#syncNamespaces;
+    for (const feedNamespace of namespaces) {
+      invariant21(FeedProtocol3.isWellKnownNamespace(feedNamespace), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 225, S: this, A: ["FeedProtocol.isWellKnownNamespace(feedNamespace)", ""] });
+    }
+    return this.#runSerialized(() => RuntimeProvider.runPromise(this.#runtime)(Effect.gen(this, function* () {
+      const namespaceStates = yield* Effect.forEach(namespaces, (feedNamespace) => Effect.gen(this, function* () {
+        const blocksToPush = yield* this.#feedStore.countUnpositionedBlocks({
+          spaceId,
+          feedNamespace
+        });
+        const totalBlocks = yield* this.#feedStore.countNamespaceBlocks({
+          spaceId,
+          feedNamespace
+        });
+        const { blocksToPull } = yield* this.#syncClient.peekPull(ctx, {
+          spaceId,
+          feedNamespace,
+          limit: this.#messageBlocksLimit
+        }).pipe(Effect.catchAll((cause) => Effect.gen(this, function* () {
+          this.#logSyncFailure("peekPull", {
+            spaceId,
+            feedNamespace,
+            cause
+          });
+          return {
+            blocksToPull: 0
+          };
+        })));
+        return {
+          namespace: feedNamespace,
+          blocksToPull: String(blocksToPull),
+          blocksToPush: String(blocksToPush),
+          totalBlocks: String(totalBlocks)
+        };
+      }), {
+        concurrency: "unbounded"
+      });
+      return {
+        namespaces: namespaceStates
+      };
+    })));
+  }
+  /**
+  * Performs queue sync and blocks until there are no pending sync batches.
+  */
+  async syncBlocking(ctx, { spaceId, subspaceTag, shouldPush = true, shouldPull = true }) {
+    invariant21(SpaceId3.isValid(spaceId), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 268, S: this, A: ["SpaceId.isValid(spaceId)", ""] });
+    invariant21(FeedProtocol3.isWellKnownNamespace(subspaceTag), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 269, S: this, A: ["FeedProtocol.isWellKnownNamespace(subspaceTag)", ""] });
+    if (!shouldPush && !shouldPull) {
+      return;
+    }
+    await this.#runSerialized(() => RuntimeProvider.runPromise(this.#runtime)(Effect.gen(this, function* () {
+      let done = false;
+      let iterations = 0;
+      while (!done) {
+        done = true;
+        if (shouldPull) {
+          const pullResult = yield* this.#syncClient.pull(ctx, {
+            spaceId,
+            feedNamespace: subspaceTag,
+            limit: this.#messageBlocksLimit
+          });
+          done &&= pullResult.done;
+        }
+        if (shouldPush) {
+          const pushResult = yield* this.#syncClient.push(ctx, {
+            spaceId,
+            feedNamespace: subspaceTag,
+            limit: this.#messageBlocksLimit
+          });
+          done &&= pushResult.done;
+        }
+        iterations++;
+        if (iterations > MAX_BLOCKING_SYNC_ITERATIONS) {
+          throw new Error("Blocking sync exceeded max iterations.");
+        }
+      }
+    })));
+  }
+  async #runSerialized(run) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
+    try {
+      const _guard = _ts_add_disposable_resource4(env, await this.#feedStoreMutex.acquire("feed-sync"), false);
+      return run();
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
+    } finally {
+      _ts_dispose_resources4(env);
+    }
+  }
+  #schedulePushRetry({ hadFailure, needsMore }) {
+    if (!needsMore) {
+      this.#pushFailureBackoffMs = DEFAULT_PUSH_FAILURE_BACKOFF_MS;
+      return;
+    }
+    if (hadFailure) {
+      const delayMs = this.#pushFailureBackoffMs;
+      this.#pushFailureBackoffMs = Math.min(this.#pushFailureBackoffMs * 2, MAX_PUSH_FAILURE_BACKOFF_MS);
+      log20.info("feed sync push retry scheduled with backoff", {
+        delayMs
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 325, S: this });
+      scheduleTask8(this._ctx, () => this.#pushTask.schedule(), delayMs);
+      return;
+    }
+    this.#pushFailureBackoffMs = DEFAULT_PUSH_FAILURE_BACKOFF_MS;
+    this.#pushTask.schedule();
+  }
+  #resetSpacesToPoll() {
+    this.#spacesToPoll.clear();
+    this.#getSpaceIds().forEach((spaceId) => {
+      this.#spacesToPoll.add(spaceId);
+    });
+    this.#lastFullPoll = Date.now();
+  }
+  #sendMessage(ctx, message) {
+    return Effect.gen(this, function* () {
+      const encoded = encoder.encode(message);
+      const serviceId = this.#getTargetServiceId(message);
+      const rpcTag = "blocks" in message ? "AppendRequest" : "QueryRequest";
+      log20("feed sync edge rpc outgoing", {
+        tag: rpcTag,
+        serviceId,
+        payloadByteLength: encoded.byteLength,
+        spaceId: message.spaceId,
+        feedNamespace: message.feedNamespace,
+        requestId: message.requestId
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 346, S: this });
+      yield* Effect.tryPromise(async () => this.#edgeClient.send(ctx, createBuf(MessageSchema, {
+        source: {
+          identityKey: this.#edgeClient.identityKey,
+          peerKey: this.#edgeClient.peerKey
+        },
+        serviceId,
+        payload: {
+          value: bufferToArray2(encoded)
+        }
+      }))).pipe(Effect.tapError((cause) => Effect.sync(() => log20("feed sync edge send failed", {
+        serviceId,
+        tag: rpcTag,
+        cause: cause instanceof Error ? cause.message : String(cause)
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 363, S: this }))));
+    });
+  }
+  #logSyncFailure(operation, { spaceId, feedNamespace, cause }) {
+    log20("feed sync operation failed", {
+      operation,
+      spaceId,
+      feedNamespace,
+      cause: cause instanceof Error ? cause.message : String(cause),
+      errorTag: cause instanceof Error ? cause.name : void 0
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 371, S: this });
+  }
+  #getTargetServiceId(message) {
+    return FeedProtocol3.encodeServiceId(message.feedNamespace, message.spaceId);
+  }
+  #pollTask = new AsyncTask(async () => Effect.gen(this, function* () {
+    yield* Effect.forEach(this.#spacesToPoll, (spaceId) => Effect.gen(this, function* () {
+      let doneForAllNamespaces = true;
+      for (const feedNamespace of this.#syncNamespaces) {
+        const { done } = yield* this.#syncClient.pull(this._ctx, {
+          spaceId,
+          feedNamespace,
+          limit: this.#messageBlocksLimit
+        }).pipe(Effect.catchAll((cause) => Effect.gen(this, function* () {
+          this.#logSyncFailure("pull", {
+            spaceId,
+            feedNamespace,
+            cause
+          });
+          return {
+            done: false
+          };
+        })));
+        if (!done) {
+          doneForAllNamespaces = false;
+        }
+      }
+      if (doneForAllNamespaces) {
+        this.#spacesToPoll.delete(spaceId);
+      }
+    }), {
+      concurrency: this.#syncConcurrency
+    });
+    if (this.#lastFullPoll == null || Date.now() - this.#lastFullPoll > this.#pollingInterval) {
+      this.#resetSpacesToPoll();
+      this.#pollTask.schedule();
+    } else if (this.#spacesToPoll.size > 0) {
+      this.#pollTask.schedule();
+    } else {
+      this.#resetSpacesToPoll();
+      scheduleTask8(this._ctx, () => this.#pollTask.schedule(), Math.max(this.#pollingInterval - (Date.now() - (this.#lastFullPoll ?? 0)), 0));
+    }
+  }).pipe((effect) => this.#runSerialized(() => RuntimeProvider.runPromise(this.#runtime)(effect))));
+  #pushTask = new AsyncTask(async () => Effect.gen(this, function* () {
+    yield* Effect.forEach(this.#getSpaceIds(), (spaceId) => Effect.gen(this, function* () {
+      let needsMorePush = false;
+      let hadPushFailure = false;
+      for (const feedNamespace of this.#syncNamespaces) {
+        const { done } = yield* this.#syncClient.push(this._ctx, {
+          spaceId,
+          feedNamespace,
+          limit: this.#messageBlocksLimit
+        }).pipe(Effect.tap(() => Effect.sync(() => {
+          this.#pushFailureBackoffMs = DEFAULT_PUSH_FAILURE_BACKOFF_MS;
+        })), Effect.catchAll((cause) => Effect.gen(this, function* () {
+          this.#logSyncFailure("push", {
+            spaceId,
+            feedNamespace,
+            cause
+          });
+          hadPushFailure = true;
+          return {
+            done: false
+          };
+        })));
+        if (!done) {
+          needsMorePush = true;
+        }
+      }
+      this.#schedulePushRetry({
+        hadFailure: hadPushFailure,
+        needsMore: needsMorePush
+      });
+    }), {
+      concurrency: this.#syncConcurrency
+    });
+  }).pipe((effect) => this.#runSerialized(() => RuntimeProvider.runPromise(this.#runtime)(effect))));
+};
+
+// src/packlets/agents/edge-agent-manager.ts
+import { DeferredTask as DeferredTask2, Event as Event9, scheduleTask as scheduleTask9, synchronized as synchronized3 } from "@dxos/async";
+import { Resource as Resource8 } from "@dxos/context";
+import { invariant as invariant22 } from "@dxos/invariant";
+import { PublicKey as PublicKey11 } from "@dxos/keys";
+import { log as log21 } from "@dxos/log";
+import { EdgeAgentStatus, EdgeCallFailedError as EdgeCallFailedError3 } from "@dxos/protocols";
+import { SpaceState as SpaceState4 } from "@dxos/protocols/proto/dxos/client/services";
+import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
+var __dxlog_file26 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-manager.ts";
+function _ts_decorate10(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var AGENT_STATUS_QUERY_RETRY_INTERVAL = 5e3;
+var AGENT_STATUS_QUERY_RETRY_JITTER = 1e3;
+var AGENT_FEED_ADDED_CHECK_INTERVAL_MS = 3e3;
+var EdgeAgentManager = class extends Resource8 {
+  _edgeFeatures;
+  _edgeHttpClient;
+  _dataSpaceManager;
+  _identity;
+  agentStatusChanged = new Event9();
+  _agentDeviceKey;
+  _agentStatus;
+  _lastKnownDeviceCount = 0;
+  _fetchAgentStatusTask;
+  constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
+    super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity;
+  }
+  get agentStatus() {
+    return this._agentStatus;
+  }
+  get agentExists() {
+    return this._agentStatus && this._agentStatus !== EdgeAgentStatus.NOT_FOUND;
+  }
+  async createAgent(ctx) {
+    invariant22(this.isOpen, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 41, S: this, A: ["this.isOpen", ""] });
+    invariant22(this._edgeHttpClient, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 42, S: this, A: ["this._edgeHttpClient", ""] });
+    invariant22(this._edgeFeatures?.agents, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 43, S: this, A: ["this._edgeFeatures?.agents", ""] });
+    const response = await this._edgeHttpClient.createAgent(ctx, {
+      identityKey: this._identity.identityKey.toHex(),
+      haloSpaceId: this._identity.haloSpaceId,
+      haloSpaceKey: this._identity.haloSpaceKey.toHex()
+    });
+    const deviceKey = PublicKey11.fromHex(response.deviceKey);
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      log21.info("agent was already added to HALO, ignoring response", {
+        response
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 51, S: this });
+      this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
+    await this._identity.admitDevice({
+      deviceKey,
+      controlFeedKey: PublicKey11.fromHex(response.feedKey),
+      // TODO: agents don't have data feed, should be removed
+      dataFeedKey: PublicKey11.random()
+    });
+    log21("agent created", response, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 63, S: this });
+    this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
+  }
+  async _open() {
+    const isEnabled = this._edgeHttpClient && this._edgeFeatures?.agents;
+    log21("edge agent manager open", {
+      isEnabled
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 68, S: this });
+    if (!isEnabled) {
+      return;
+    }
+    this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
+    this._fetchAgentStatusTask = new DeferredTask2(this._ctx, async () => {
+      await this._fetchAgentStatus(this._ctx);
+    });
+    this._fetchAgentStatusTask.schedule();
+    this._dataSpaceManager.updated.on(this._ctx, () => {
+      if (this._agentDeviceKey) {
+        this._ensureAgentIsInSpaces(this._agentDeviceKey);
+      }
+    });
+    this._identity.stateUpdate.on(this._ctx, () => {
+      const maybeAgentWasCreated = this._identity.authorizedDeviceKeys.size > this._lastKnownDeviceCount;
+      if (this.agentExists || !maybeAgentWasCreated) {
+        return;
+      }
+      this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
+      this._fetchAgentStatusTask?.schedule();
+    });
+  }
+  async _close() {
+    this._fetchAgentStatusTask = void 0;
+    this._lastKnownDeviceCount = 0;
+  }
+  async _fetchAgentStatus(ctx) {
+    invariant22(this._edgeHttpClient, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 98, S: this, A: ["this._edgeHttpClient", ""] });
+    try {
+      log21("fetching agent status", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 100, S: this });
+      const { agent } = await this._edgeHttpClient.getAgentStatus(ctx, {
+        ownerIdentityKey: this._identity.identityKey
+      });
+      const wasAgentCreatedDuringQuery = this._agentStatus === EdgeAgentStatus.ACTIVE;
+      if (!wasAgentCreatedDuringQuery) {
+        const deviceKey = agent.deviceKey ? PublicKey11.fromHex(agent.deviceKey) : void 0;
+        this._updateStatus(agent.status, deviceKey);
+      }
+    } catch (err) {
+      if (err instanceof EdgeCallFailedError3) {
+        if (!err.isRetryable) {
+          log21.warn("non retryable error on agent status fetch attempt", {
+            err
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 112, S: this });
+          return;
+        }
+      }
+      const retryAfterMs = AGENT_STATUS_QUERY_RETRY_INTERVAL + Math.random() * AGENT_STATUS_QUERY_RETRY_JITTER;
+      log21.info("agent status fetching failed", {
+        err,
+        retryAfterMs
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 119, S: this });
+      scheduleTask9(this._ctx, () => this._fetchAgentStatusTask?.schedule(), retryAfterMs);
+    }
+  }
+  /**
+  * We don't want notarization plugin to always actively poll edge looking for credentials to notarize,
+  * because most of the time we'll be getting an empty response.
+  * Instead, we stay in active polling mode while there are spaces where we don't see our agent's feed.
+  */
+  _ensureAgentIsInSpaces(agentDeviceKey) {
+    let activePollingEnabled = false;
+    for (const space of this._dataSpaceManager.spaces.values()) {
+      if (space.getEdgeReplicationSetting() === EdgeReplicationSetting2.DISABLED) {
+        space.notarizationPlugin.setActiveEdgePollingEnabled(false);
+        continue;
+      }
+      if ([
         SpaceState4.SPACE_INACTIVE,
         SpaceState4.SPACE_CLOSED
       ].includes(space.state)) {
@@ -6311,13 +6871,13 @@ var EdgeAgentManager = class extends Resource7 {
       ].some((feed) => feed.assertion.deviceKey.equals(agentDeviceKey));
       space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
       activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
-      log20.verbose("set active edge polling", {
+      log21.verbose("set active edge polling", {
         enabled: agentFeedNeedsNotarization,
         spaceId: space.id
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 149, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 149, S: this });
     }
     if (activePollingEnabled) {
-      scheduleTask8(this._ctx, () => this._ensureAgentIsInSpaces(agentDeviceKey), AGENT_FEED_ADDED_CHECK_INTERVAL_MS);
+      scheduleTask9(this._ctx, () => this._ensureAgentIsInSpaces(agentDeviceKey), AGENT_FEED_ADDED_CHECK_INTERVAL_MS);
     }
   }
   _updateStatus(status, deviceKey) {
@@ -6327,9 +6887,9 @@ var EdgeAgentManager = class extends Resource7 {
     if (deviceKey) {
       this._ensureAgentIsInSpaces(deviceKey);
     }
-    log20.verbose("agent status update", {
+    log21.verbose("agent status update", {
       status
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 166, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 166, S: this });
   }
 };
 _ts_decorate10([
@@ -6341,7 +6901,7 @@ import { Stream as Stream10 } from "@dxos/codec-protobuf/stream";
 import { Context as Context11 } from "@dxos/context";
 import { EdgeAgentStatus as EdgeAgentStatus2 } from "@dxos/protocols";
 import { EdgeStatus as EdgeStatus2, QueryAgentStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file26 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-service.ts";
+var __dxlog_file27 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-service.ts";
 var EdgeAgentServiceImpl = class {
   _agentManagerProvider;
   _edgeConnection;
@@ -6370,7 +6930,7 @@ var EdgeAgentServiceImpl = class {
     });
   }
   async createAgent(_request, options) {
-    return (await this._agentManagerProvider()).createAgent(options?.ctx ?? Context11.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 37 }));
+    return (await this._agentManagerProvider()).createAgent(options?.ctx ?? Context11.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 37 }));
   }
   queryAgentStatus() {
     return new Stream10(({ ctx, next }) => {
@@ -6404,7 +6964,7 @@ var mapStatus = (agentStatus) => {
 };
 
 // src/packlets/services/service-context.ts
-import { Mutex as Mutex4, Trigger as Trigger6 } from "@dxos/async";
+import { Mutex as Mutex5, Trigger as Trigger6 } from "@dxos/async";
 import { Resource as Resource9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
 import { failUndefined as failUndefined2, warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
@@ -6424,13 +6984,13 @@ import { safeInstanceof } from "@dxos/util";
 // src/packlets/identity/identity-recovery-manager.ts
 import { generateSeedPhrase, keyPairFromSeedPhrase } from "@dxos/credentials";
 import { sign as sign3 } from "@dxos/crypto";
-import { invariant as invariant22 } from "@dxos/invariant";
+import { invariant as invariant23 } from "@dxos/invariant";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log21 } from "@dxos/log";
+import { log as log22 } from "@dxos/log";
 import { EdgeAuthChallengeError as EdgeAuthChallengeError2 } from "@dxos/protocols";
 import { schema as schema6 } from "@dxos/protocols/proto";
 import { Timeframe as Timeframe4 } from "@dxos/timeframe";
-var __dxlog_file27 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts";
+var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts";
 var EdgeIdentityRecoveryManager = class {
   _keyring;
   _edgeClient;
@@ -6444,7 +7004,7 @@ var EdgeIdentityRecoveryManager = class {
   }
   async createRecoveryCredential({ data }) {
     const identity = this._identityProvider();
-    invariant22(identity, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 25, S: this, A: ["identity", ""] });
+    invariant23(identity, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 25, S: this, A: ["identity", ""] });
     let recoveryKey;
     let lookupKey;
     let algorithm;
@@ -6487,7 +7047,7 @@ var EdgeIdentityRecoveryManager = class {
     };
   }
   async requestRecoveryChallenge(ctx) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 68, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
+    invariant23(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 68, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
     const deviceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const request = {
@@ -6509,7 +7069,7 @@ var EdgeIdentityRecoveryManager = class {
     }
   }
   async recoverIdentityWithExternalSignature(ctx, { lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 90, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
+    invariant23(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 90, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
     const request = {
       lookupKey: lookupKey.toHex(),
       deviceKey: deviceKey.toHex(),
@@ -6535,7 +7095,7 @@ var EdgeIdentityRecoveryManager = class {
   * Recovery identity using an opaque token sent to the user's email.
   */
   async recoverIdentityWithToken(ctx, { token }) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 115, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
+    invariant23(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 115, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
     const deviceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const request = {
@@ -6555,7 +7115,7 @@ var EdgeIdentityRecoveryManager = class {
     });
   }
   async recoverIdentity(ctx, { recoveryCode }) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 135, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
+    invariant23(this._edgeClient, "Not connected to EDGE.", { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 135, S: this, A: ["this._edgeClient", "'Not connected to EDGE.'"] });
     const recoveryKeypair = keyPairFromSeedPhrase(recoveryCode);
     const recoveryKey = PublicKey12.from(recoveryKeypair.publicKey);
     const deviceKey = await this._keyring.createKey();
@@ -6578,7 +7138,7 @@ var EdgeIdentityRecoveryManager = class {
         signature: Buffer.from(signature).toString("base64")
       });
     }
-    log21.info("recovering identity", response, { "~LogMeta": "~LogMeta", F: __dxlog_file27, L: 158, S: this });
+    log22.info("recovering identity", response, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 158, S: this });
     await this._acceptRecoveredIdentity({
       authorizedDeviceCredential: decodeCredential(response.deviceAuthCredential),
       haloGenesisFeedKey: PublicKey12.fromHex(response.genesisFeedKey),
@@ -6596,257 +7156,6 @@ var decodeCredential = (credentialBase64) => {
   return codec.decode(credentialBytes);
 };
 
-// src/packlets/services/feed-syncer.ts
-import { Encoder, decode as cborXdecode } from "cbor-x";
-import * as Effect from "effect/Effect";
-import * as Schema from "effect/Schema";
-import { AsyncTask, scheduleTask as scheduleTask9 } from "@dxos/async";
-import { Resource as Resource8 } from "@dxos/context";
-import { MessageSchema } from "@dxos/edge-client";
-import { RuntimeProvider } from "@dxos/effect";
-import { SyncClient } from "@dxos/feed";
-import { invariant as invariant23 } from "@dxos/invariant";
-import { SpaceId as SpaceId3 } from "@dxos/keys";
-import { log as log22 } from "@dxos/log";
-import { FeedProtocol as FeedProtocol3 } from "@dxos/protocols";
-import { EdgeService as EdgeService2 } from "@dxos/protocols";
-import { createBuf } from "@dxos/protocols/buf";
-import { bufferToArray as bufferToArray2 } from "@dxos/util";
-var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/feed-syncer.ts";
-var encoder = new Encoder({
-  tagUint8Array: false,
-  useRecords: false
-});
-var DEFAULT_MESSAGE_BLOCKS_LIMIT = 50;
-var DEFAULT_SYNC_CONCURRENCY = 5;
-var DEFAULT_POLLING_INTERVAL = 5e3;
-var DEFAULT_POLL_REQUEST_THROTTLE_MS = 250;
-var MAX_BLOCKING_SYNC_ITERATIONS = 100;
-var FeedSyncer = class extends Resource8 {
-  #syncNamespaces;
-  #messageBlocksLimit;
-  #syncConcurrency;
-  #pollingInterval;
-  #pollRequestThrottleMs;
-  #runtime;
-  #feedStore;
-  #edgeClient;
-  #syncClient;
-  #getSpaceIds;
-  #spacesToPoll = /* @__PURE__ */ new Set();
-  /** Last time full poll was completed. */
-  #lastFullPoll = null;
-  #throttledPollScheduled = false;
-  #lastRequestedPollAt = null;
-  constructor(options) {
-    super();
-    this.#runtime = options.runtime;
-    this.#feedStore = options.feedStore;
-    this.#edgeClient = options.edgeClient;
-    this.#syncClient = new SyncClient({
-      peerId: options.peerId,
-      feedStore: options.feedStore,
-      sendMessage: this.#sendMessage.bind(this)
-    });
-    this.#getSpaceIds = options.getSpaceIds;
-    this.#syncNamespaces = options.syncNamespaces;
-    this.#messageBlocksLimit = options.messageBlocksLimit ?? DEFAULT_MESSAGE_BLOCKS_LIMIT;
-    this.#syncConcurrency = options.syncConcurrency ?? DEFAULT_SYNC_CONCURRENCY;
-    this.#pollingInterval = options.pollingInterval ?? DEFAULT_POLLING_INTERVAL;
-    this.#pollRequestThrottleMs = options.pollRequestThrottleMs ?? DEFAULT_POLL_REQUEST_THROTTLE_MS;
-  }
-  async _open() {
-    this._ctx.onDispose(this.#edgeClient.onMessage((msg) => {
-      if (!msg.serviceId) {
-        return;
-      }
-      const service = msg.serviceId.split(":")[0];
-      if (service !== EdgeService2.QUEUE_REPLICATOR) {
-        return;
-      }
-      log22("feed sync edge ingress", {
-        serviceId: msg.serviceId,
-        payloadByteLength: msg.payload?.value?.byteLength
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 69, S: this });
-      const handleMessageEffect = Effect.gen(this, function* () {
-        const decoded = yield* Effect.try({
-          try: () => cborXdecode(msg.payload.value),
-          catch: (error) => new Error(`Failed to decode feed sync message: ${error}`)
-        });
-        const payload = yield* Schema.validate(FeedProtocol3.ProtocolMessage)(decoded);
-        yield* this.#syncClient.handleMessage(payload);
-      }).pipe(Effect.tapError((cause) => Effect.sync(() => log22("feed sync edge message handling failed", {
-        serviceId: msg.serviceId,
-        payloadByteLength: msg.payload?.value?.byteLength,
-        cause: cause instanceof Error ? cause.message : String(cause)
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 80, S: this }))));
-      void RuntimeProvider.runPromise(this.#runtime)(handleMessageEffect);
-    }));
-    this._ctx.onDispose(
-      // NOTE: This will fire immediately if the connection is already open.
-      this.#edgeClient.onReconnected(async () => {
-        log22("feed sync edge reconnected", {
-          peerKey: this.#edgeClient.peerKey,
-          identityKey: this.#edgeClient.identityKey
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 89, S: this });
-      })
-    );
-    this.#feedStore.onNewBlocks.on(this._ctx, () => {
-      this.#pushTask.schedule();
-    });
-    await this.#pollTask.open();
-    await this.#pushTask.open();
-    this.#resetSpacesToPoll();
-    this.#pollTask.schedule();
-  }
-  async _close() {
-    await this.#pollTask.close();
-    await this.#pushTask.close();
-  }
-  /**
-  * Schedules a best-effort pull without blocking the caller.
-  */
-  schedulePoll() {
-    this.#resetSpacesToPoll();
-    if (this.#throttledPollScheduled) {
-      return;
-    }
-    const now = Date.now();
-    const delay = this.#lastRequestedPollAt == null ? 0 : Math.max(this.#pollRequestThrottleMs - (now - this.#lastRequestedPollAt), 0);
-    this.#throttledPollScheduled = true;
-    scheduleTask9(this._ctx, () => {
-      this.#throttledPollScheduled = false;
-      this.#lastRequestedPollAt = Date.now();
-      this.#pollTask.schedule();
-    }, delay);
-  }
-  /**
-  * Performs queue sync and blocks until there are no pending sync batches.
-  */
-  async syncBlocking(ctx, { spaceId, subspaceTag, shouldPush = true, shouldPull = true }) {
-    invariant23(SpaceId3.isValid(spaceId), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 125, S: this, A: ["SpaceId.isValid(spaceId)", ""] });
-    invariant23(FeedProtocol3.isWellKnownNamespace(subspaceTag), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 126, S: this, A: ["FeedProtocol.isWellKnownNamespace(subspaceTag)", ""] });
-    if (!shouldPush && !shouldPull) {
-      return;
-    }
-    await RuntimeProvider.runPromise(this.#runtime)(Effect.gen(this, function* () {
-      let done = false;
-      let iterations = 0;
-      while (!done) {
-        done = true;
-        if (shouldPull) {
-          const pullResult = yield* this.#syncClient.pull(ctx, {
-            spaceId,
-            feedNamespace: subspaceTag,
-            limit: this.#messageBlocksLimit
-          });
-          done &&= pullResult.done;
-        }
-        if (shouldPush) {
-          const pushResult = yield* this.#syncClient.push(ctx, {
-            spaceId,
-            feedNamespace: subspaceTag,
-            limit: this.#messageBlocksLimit
-          });
-          done &&= pushResult.done;
-        }
-        iterations++;
-        if (iterations > MAX_BLOCKING_SYNC_ITERATIONS) {
-          throw new Error("Blocking sync exceeded max iterations.");
-        }
-      }
-    }));
-  }
-  #resetSpacesToPoll() {
-    this.#spacesToPoll.clear();
-    this.#getSpaceIds().forEach((spaceId) => {
-      this.#spacesToPoll.add(spaceId);
-    });
-    this.#lastFullPoll = Date.now();
-  }
-  #sendMessage(ctx, message) {
-    return Effect.gen(this, function* () {
-      const encoded = encoder.encode(message);
-      const serviceId = this.#getTargetServiceId(message);
-      const rpcTag = "blocks" in message ? "AppendRequest" : "QueryRequest";
-      log22("feed sync edge rpc outgoing", {
-        tag: rpcTag,
-        serviceId,
-        payloadByteLength: encoded.byteLength,
-        spaceId: message.spaceId,
-        feedNamespace: message.feedNamespace,
-        requestId: message.requestId
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 170, S: this });
-      yield* Effect.tryPromise(async () => this.#edgeClient.send(ctx, createBuf(MessageSchema, {
-        source: {
-          identityKey: this.#edgeClient.identityKey,
-          peerKey: this.#edgeClient.peerKey
-        },
-        serviceId,
-        payload: {
-          value: bufferToArray2(encoded)
-        }
-      }))).pipe(Effect.tapError((cause) => Effect.sync(() => log22("feed sync edge send failed", {
-        serviceId,
-        tag: rpcTag,
-        cause: cause instanceof Error ? cause.message : String(cause)
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file28, L: 187, S: this }))));
-    });
-  }
-  #getTargetServiceId(message) {
-    return FeedProtocol3.encodeServiceId(message.feedNamespace, message.spaceId);
-  }
-  #pollTask = new AsyncTask(async () => Effect.gen(this, function* () {
-    yield* Effect.forEach(this.#spacesToPoll, (spaceId) => Effect.gen(this, function* () {
-      let doneForAllNamespaces = true;
-      for (const feedNamespace of this.#syncNamespaces) {
-        const { done } = yield* this.#syncClient.pull(this._ctx, {
-          spaceId,
-          feedNamespace,
-          limit: this.#messageBlocksLimit
-        });
-        if (!done) {
-          doneForAllNamespaces = false;
-        }
-      }
-      if (doneForAllNamespaces) {
-        this.#spacesToPoll.delete(spaceId);
-      }
-    }), {
-      concurrency: this.#syncConcurrency
-    });
-    if (this.#lastFullPoll == null || Date.now() - this.#lastFullPoll > this.#pollingInterval) {
-      this.#resetSpacesToPoll();
-      this.#pollTask.schedule();
-    } else if (this.#spacesToPoll.size > 0) {
-      this.#pollTask.schedule();
-    } else {
-      this.#resetSpacesToPoll();
-      scheduleTask9(this._ctx, () => this.#pollTask.schedule(), Math.max(this.#pollingInterval - (Date.now() - (this.#lastFullPoll ?? 0)), 0));
-    }
-  }).pipe(RuntimeProvider.runPromise(this.#runtime)));
-  #pushTask = new AsyncTask(async () => Effect.gen(this, function* () {
-    yield* Effect.forEach(this.#getSpaceIds(), (spaceId) => Effect.gen(this, function* () {
-      let doneForAllNamespaces = true;
-      for (const feedNamespace of this.#syncNamespaces) {
-        const { done } = yield* this.#syncClient.push(this._ctx, {
-          spaceId,
-          feedNamespace,
-          limit: this.#messageBlocksLimit
-        });
-        if (!done) {
-          doneForAllNamespaces = false;
-        }
-      }
-      if (!doneForAllNamespaces) {
-        this.#pushTask.schedule();
-      }
-    }), {
-      concurrency: this.#syncConcurrency
-    });
-  }).pipe(RuntimeProvider.runPromise(this.#runtime)));
-};
-
 // src/packlets/services/service-context.ts
 var __dxlog_file29 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 function _ts_decorate11(decorators, target, key, desc) {
@@ -6855,7 +7164,7 @@ function _ts_decorate11(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_add_disposable_resource4(env, value, async) {
+function _ts_add_disposable_resource5(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
     var dispose, inner;
@@ -6888,12 +7197,12 @@ function _ts_add_disposable_resource4(env, value, async) {
   }
   return value;
 }
-function _ts_dispose_resources4(env) {
+function _ts_dispose_resources5(env) {
   var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
-  return (_ts_dispose_resources4 = function _ts_dispose_resources5(env2) {
+  return (_ts_dispose_resources5 = function _ts_dispose_resources6(env2) {
     function fail(e) {
       env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
       env2.hasError = true;
@@ -6930,7 +7239,7 @@ var ServiceContext = class extends Resource9 {
   _runtime;
   _runtimeProps;
   _edgeFeatures;
-  _edgeIdentityUpdateMutex = new Mutex4();
+  _edgeIdentityUpdateMutex = new Mutex5();
   initialized = new Trigger6();
   metadataStore;
   blobStore;
@@ -6998,6 +7307,14 @@ var ServiceContext = class extends Resource9 {
           shouldPush: request.shouldPush,
           shouldPull: request.shouldPull
         });
+      },
+      getSyncState: async (ctx, request) => {
+        if (!this._feedSyncer) {
+          return {
+            namespaces: []
+          };
+        }
+        return this._feedSyncer.getSyncState(ctx, request);
       }
     });
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeProps?.invitationConnectionDefaultProps);
@@ -7035,67 +7352,67 @@ var ServiceContext = class extends Resource9 {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    log23("opening...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 215, S: this });
-    log23("opening identityManager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 216, S: this });
+    log23("opening...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 226, S: this });
+    log23("opening identityManager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 227, S: this });
     await this.identityManager.open(ctx);
     log23("identityManager opened", {
       hasIdentity: !!this.identityManager.identity
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 218, S: this });
-    log23("setting network identity...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 221, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 229, S: this });
+    log23("setting network identity...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 232, S: this });
     await this._setNetworkIdentity({
       identity: this.identityManager.identity
     });
-    log23("network identity set", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 225, S: this });
-    log23("opening edge connection...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 226, S: this });
+    log23("network identity set", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 236, S: this });
+    log23("opening edge connection...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 237, S: this });
     await this._edgeConnection?.open(ctx);
-    log23("edge connection opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 228, S: this });
-    log23("opening signal manager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 229, S: this });
+    log23("edge connection opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 239, S: this });
+    log23("opening signal manager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 240, S: this });
     await this.signalManager.open(ctx);
-    log23("signal manager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 231, S: this });
-    log23("opening network manager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 232, S: this });
+    log23("signal manager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 242, S: this });
+    log23("opening network manager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 243, S: this });
     await this.networkManager.open();
-    log23("network manager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 234, S: this });
-    log23("opening echo host...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 235, S: this });
+    log23("network manager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 245, S: this });
+    log23("opening echo host...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 246, S: this });
     await this.echoHost.open(ctx);
-    log23("echo host opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 237, S: this });
+    log23("echo host opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 248, S: this });
     if (this._meshReplicator) {
-      log23("adding mesh replicator...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 239, S: this });
+      log23("adding mesh replicator...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 250, S: this });
       await this.echoHost.addReplicator(ctx, this._meshReplicator);
-      log23("mesh replicator added", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 241, S: this });
+      log23("mesh replicator added", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 252, S: this });
     }
     if (this._echoEdgeReplicator) {
-      log23("adding edge replicator...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 244, S: this });
+      log23("adding edge replicator...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 255, S: this });
       await this.echoHost.addReplicator(ctx, this._echoEdgeReplicator);
-      log23("edge replicator added", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 246, S: this });
+      log23("edge replicator added", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 257, S: this });
     }
-    log23("loading metadata store...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 248, S: this });
+    log23("loading metadata store...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 259, S: this });
     await this.metadataStore.load();
-    log23("metadata store loaded", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 250, S: this });
-    log23("opening space manager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 251, S: this });
+    log23("metadata store loaded", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 261, S: this });
+    log23("opening space manager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 262, S: this });
     await this.spaceManager.open();
-    log23("space manager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 253, S: this });
+    log23("space manager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 264, S: this });
     if (this.identityManager.identity) {
-      log23("joining network...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 255, S: this });
+      log23("joining network...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 266, S: this });
       await this.identityManager.identity.joinNetwork(ctx);
-      log23("network joined", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 257, S: this });
-      log23("initializing spaces...(calling _initialize)", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 258, S: this });
+      log23("network joined", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 268, S: this });
+      log23("initializing spaces...(calling _initialize)", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 269, S: this });
       await this._initialize(ctx);
-      log23("spaces initialized", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 260, S: this });
+      log23("spaces initialized", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 271, S: this });
     } else {
-      log23("no identity, skipping network join and space initialization", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 262, S: this });
+      log23("no identity, skipping network join and space initialization", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 273, S: this });
     }
-    log23("opening feed syncer...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 264, S: this });
+    log23("opening feed syncer...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 275, S: this });
     await this._feedSyncer?.open(ctx);
-    log23("feed syncer opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 266, S: this });
-    log23("loading persistent invitations...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 267, S: this });
+    log23("feed syncer opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 277, S: this });
+    log23("loading persistent invitations...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 278, S: this });
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations(ctx);
     log23("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 269, S: this });
-    log23("opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 272, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 280, S: this });
+    log23("opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 283, S: this });
   }
   async _close(ctx) {
-    log23("closing...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 275, S: this });
+    log23("closing...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 286, S: this });
     await this._feedSyncer?.close();
     if (this._deviceSpaceSync && this.identityManager.identity) {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
@@ -7110,7 +7427,7 @@ var ServiceContext = class extends Resource9 {
     await this._edgeConnection?.close();
     await this.feedStore.close();
     await this.metadataStore.close();
-    log23("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 290, S: this });
+    log23("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 301, S: this });
   }
   async createIdentity(params = {}, ctx) {
     ctx ??= this._ctx;
@@ -7127,7 +7444,7 @@ var ServiceContext = class extends Resource9 {
       throw new Error("Identity must be created before joining a space.");
     }
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant24(factory, `Unknown invitation kind: ${invitation.kind}`, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 307, S: this, A: ["factory", "`Unknown invitation kind: ${invitation.kind}`"] });
+    invariant24(factory, `Unknown invitation kind: ${invitation.kind}`, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 318, S: this, A: ["factory", "`Unknown invitation kind: ${invitation.kind}`"] });
     return factory(invitation);
   }
   async broadcastProfileUpdate(profile) {
@@ -7157,7 +7474,7 @@ var ServiceContext = class extends Resource9 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log23("_initialize: start", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 338, S: this });
+    log23("_initialize: start", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 349, S: this });
     const identity = this.identityManager.identity ?? failUndefined2();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
@@ -7172,7 +7489,7 @@ var ServiceContext = class extends Resource9 {
         });
       }
     };
-    log23("_initialize: creating DataSpaceManager", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 353, S: this });
+    log23("_initialize: creating DataSpaceManager", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 364, S: this });
     this.dataSpaceManager = new DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
@@ -7188,22 +7505,42 @@ var ServiceContext = class extends Resource9 {
       runtimeProps: this._runtimeProps,
       edgeFeatures: this._edgeFeatures
     });
-    log23("_initialize: opening DataSpaceManager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 369, S: this });
+    log23("_initialize: opening DataSpaceManager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 380, S: this });
     await this.dataSpaceManager.open(ctx);
-    log23("_initialize: DataSpaceManager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 371, S: this });
+    log23("_initialize: DataSpaceManager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 382, S: this });
     this.edgeAgentManager = new EdgeAgentManager(this._edgeFeatures, this._edgeHttpClient, this.dataSpaceManager, identity);
-    log23("_initialize: opening EdgeAgentManager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 373, S: this });
+    log23("_initialize: opening EdgeAgentManager...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 384, S: this });
     await this.edgeAgentManager.open(ctx);
-    log23("_initialize: EdgeAgentManager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 375, S: this });
+    log23("_initialize: EdgeAgentManager opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 386, S: this });
     this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
-      invariant24(this.dataSpaceManager, "dataSpaceManager not initialized yet", { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 377, S: this, A: ["this.dataSpaceManager", "'dataSpaceManager not initialized yet'"] });
+      invariant24(this.dataSpaceManager, "dataSpaceManager not initialized yet", { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 388, S: this, A: ["this.dataSpaceManager", "'dataSpaceManager not initialized yet'"] });
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
     this.initialized.wake();
-    log23("_initialize: initialized.wake() called", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 381, S: this });
+    log23("_initialize: initialized.wake() called", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 392, S: this });
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
         const assertion = getCredentialAssertion5(credential);
+        if (assertion["@type"] === "dxos.halo.credentials.SpaceDeleted") {
+          if (assertion.spaceKey.equals(identity.space.key)) {
+            return;
+          }
+          if (!this.dataSpaceManager) {
+            log23("dataSpaceManager not initialized yet, ignoring space deletion", {
+              details: assertion
+            }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 403, S: this });
+            return;
+          }
+          try {
+            log23("tombstoning space recorded in halo", {
+              details: assertion
+            }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 409, S: this });
+            await this.dataSpaceManager.handleRemoteSpaceDeleted(this._ctx, assertion.spaceKey);
+          } catch (err) {
+            log23.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 414, S: this });
+          }
+          return;
+        }
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -7213,26 +7550,32 @@ var ServiceContext = class extends Resource9 {
         if (!this.dataSpaceManager) {
           log23("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 393, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 426, S: this });
+          return;
+        }
+        if (this.dataSpaceManager.isSpaceDeleted(assertion.spaceKey)) {
+          log23("space is deleted, ignoring space admission", {
+            details: assertion
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 433, S: this });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
           log23("space already exists, ignoring space admission", {
             details: assertion
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 399, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 439, S: this });
           return;
         }
         try {
           log23("accepting space recorded in halo", {
             details: assertion
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 405, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 445, S: this });
           await this.dataSpaceManager.acceptSpace(this._ctx, {
             spaceKey: assertion.spaceKey,
             genesisFeedKey: assertion.genesisFeedKey,
             tags: assertion.tags
           });
         } catch (err) {
-          log23.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 414, S: this });
+          log23.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 454, S: this });
         }
       }
     };
@@ -7245,39 +7588,39 @@ var ServiceContext = class extends Resource9 {
       hasError: false
     };
     try {
-      log23("_setNetworkIdentity: acquiring mutex...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 427, S: this });
-      const _ = _ts_add_disposable_resource4(env, await this._edgeIdentityUpdateMutex.acquire(), false);
-      log23("_setNetworkIdentity: mutex acquired", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 429, S: this });
+      log23("_setNetworkIdentity: acquiring mutex...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 467, S: this });
+      const _ = _ts_add_disposable_resource5(env, await this._edgeIdentityUpdateMutex.acquire(), false);
+      log23("_setNetworkIdentity: mutex acquired", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 469, S: this });
       let edgeIdentity;
       const identity = params?.identity;
       if (identity) {
         log23("_setNetworkIdentity: has identity", {
           identity: identity.identityKey.toHex(),
           hasDeviceCredential: !!params?.deviceCredential
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 433, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 473, S: this });
         if (params?.deviceCredential) {
-          log23("_setNetworkIdentity: creating chain edge identity with device credential...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 438, S: this });
+          log23("_setNetworkIdentity: creating chain edge identity with device credential...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 478, S: this });
           edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, {
             credential: params.deviceCredential
           }, []);
-          log23("_setNetworkIdentity: chain edge identity created", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 442, S: this });
+          log23("_setNetworkIdentity: chain edge identity created", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 482, S: this });
         } else {
-          log23("_setNetworkIdentity: waiting for identity.ready()...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 444, S: this });
+          log23("_setNetworkIdentity: waiting for identity.ready()...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 484, S: this });
           await warnAfterTimeout2(1e4, "Waiting for identity to be ready for edge connection", async () => {
             await identity.ready();
           });
           log23("_setNetworkIdentity: identity.ready() resolved", {
             hasDeviceCredentialChain: !!identity.deviceCredentialChain
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 449, S: this });
-          invariant24(identity.deviceCredentialChain, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 452, S: this, A: ["identity.deviceCredentialChain", ""] });
-          log23("_setNetworkIdentity: creating chain edge identity...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 453, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 489, S: this });
+          invariant24(identity.deviceCredentialChain, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 492, S: this, A: ["identity.deviceCredentialChain", ""] });
+          log23("_setNetworkIdentity: creating chain edge identity...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 493, S: this });
           edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []);
-          log23("_setNetworkIdentity: chain edge identity created", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 455, S: this });
+          log23("_setNetworkIdentity: chain edge identity created", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 495, S: this });
         }
       } else {
-        log23("_setNetworkIdentity: no identity, creating ephemeral edge identity...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 458, S: this });
+        log23("_setNetworkIdentity: no identity, creating ephemeral edge identity...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 498, S: this });
         edgeIdentity = await createEphemeralEdgeIdentity();
-        log23("_setNetworkIdentity: ephemeral edge identity created", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 460, S: this });
+        log23("_setNetworkIdentity: ephemeral edge identity created", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 500, S: this });
       }
       this._edgeConnection?.setIdentity(edgeIdentity);
       this._edgeHttpClient?.setIdentity(edgeIdentity);
@@ -7285,12 +7628,12 @@ var ServiceContext = class extends Resource9 {
         identityKey: edgeIdentity.identityKey,
         peerKey: edgeIdentity.peerKey
       });
-      log23("_setNetworkIdentity: done", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 468, S: this });
+      log23("_setNetworkIdentity: done", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 508, S: this });
     } catch (e) {
       env.error = e;
       env.hasError = true;
     } finally {
-      _ts_dispose_resources4(env);
+      _ts_dispose_resources5(env);
     }
   }
 };
@@ -8218,6 +8561,7 @@ export {
   SpaceInvitationProtocol,
   InvitationsManager,
   locks_exports,
+  FeedSyncer,
   EdgeAgentManager,
   EdgeAgentServiceImpl,
   ServiceContext,
@@ -8226,4 +8570,4 @@ export {
   ServiceRegistry,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-NGONP3EI.mjs.map
+//# sourceMappingURL=chunk-YJFGXOFW.mjs.map