@arcote.tech/arc-cli 0.7.14 → 0.7.16

package/dist/index.js

@@ -14018,11 +14018,11 @@ class EventWire {
   reconnectTimeout;
   syncRequested = false;
   viewSubscriptions = new Map;
-  viewSubCounter = 0;
-  pendingViewSubs = [];
-  constructor(baseUrl) {
+  enableEventSync;
+  constructor(baseUrl, options) {
     this.baseUrl = baseUrl;
     this.instanceId = ++eventWireInstanceCounter;
+    this.enableEventSync = options?.enableEventSync ?? true;
   }
   setScopeToken(scope, token) {
     if (token === null) {
@@ -14068,9 +14068,11 @@ class EventWire {
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {
           this.state = "connected";
           this.sendAllScopeTokens();
-          this.requestSync();
+          if (this.enableEventSync) {
+            this.requestSync();
+          }
           this.flushPendingEvents();
-          this.flushPendingViewSubs();
+          this.sendAllViewSubscriptions();
         } else {
           console.log(`[EventWire] onopen called but ws is not OPEN, readyState:`, this.ws?.readyState);
         }
@@ -14146,30 +14148,26 @@ class EventWire {
   onSynced(callback) {
     this.onSyncedCallback = callback;
   }
-  subscribeQuery(descriptor, callback, scope) {
-    const subscriptionId = `qs_${++this.viewSubCounter}_${Date.now()}`;
-    this.viewSubscriptions.set(subscriptionId, callback);
+  subscribeView(element, scope, callbacks) {
+    const key = `${scope}:${element}`;
+    this.viewSubscriptions.set(key, callbacks);
     if (this.state === "connected" && this.ws) {
       this.ws.send(JSON.stringify({
-        type: "subscribe-query",
-        subscriptionId,
-        descriptor,
+        type: "subscribe-view",
+        element,
         scope
       }));
-    } else {
-      this.pendingViewSubs.push({ subscriptionId, descriptor, scope });
     }
-    return subscriptionId;
   }
-  unsubscribeQuery(subscriptionId) {
-    this.viewSubscriptions.delete(subscriptionId);
+  unsubscribeView(element, scope) {
+    this.viewSubscriptions.delete(`${scope}:${element}`);
     if (this.state === "connected" && this.ws) {
       this.ws.send(JSON.stringify({
-        type: "unsubscribe-query",
-        subscriptionId
+        type: "unsubscribe-view",
+        element,
+        scope
       }));
     }
-    this.pendingViewSubs = this.pendingViewSubs.filter((s) => s.subscriptionId !== subscriptionId);
   }
   getState() {
     return this.state;
@@ -14202,10 +14200,17 @@ class EventWire {
           this.lastHostEventId = message.lastHostEventId;
         }
         break;
-      case "query-data": {
-        const cb = this.viewSubscriptions.get(message.subscriptionId);
-        if (cb) {
-          cb(message.data);
+      case "view-snapshot": {
+        const sub = this.viewSubscriptions.get(`${message.scope}:${message.element}`);
+        if (sub) {
+          sub.onSnapshot(message.items ?? []);
+        }
+        break;
+      }
+      case "view-changes": {
+        const sub = this.viewSubscriptions.get(`${message.scope}:${message.element}`);
+        if (sub && Array.isArray(message.changes)) {
+          sub.onChanges(message.changes);
         }
         break;
       }
@@ -14233,18 +14238,19 @@ class EventWire {
       this.pendingEvents = [];
     }
   }
-  flushPendingViewSubs() {
+  sendAllViewSubscriptions() {
     if (!this.ws || this.state !== "connected")
       return;
-    for (const sub of this.pendingViewSubs) {
+    for (const key of this.viewSubscriptions.keys()) {
+      const sepIdx = key.indexOf(":");
+      const scope = key.slice(0, sepIdx);
+      const element = key.slice(sepIdx + 1);
       this.ws.send(JSON.stringify({
-        type: "subscribe-query",
-        subscriptionId: sub.subscriptionId,
-        descriptor: sub.descriptor,
-        scope: sub.scope
+        type: "subscribe-view",
+        element,
+        scope
       }));
     }
-    this.pendingViewSubs = [];
   }
   scheduleReconnect() {
     if (this.reconnectTimeout)
@@ -14261,12 +14267,19 @@ class LocalEventPublisher2 {
   views = [];
   syncCallback;
   subscribers = new Map;
+  viewChangesCallbacks = new Set;
   constructor(dataStorage) {
     this.dataStorage = dataStorage;
   }
   onPublish(callback) {
     this.syncCallback = callback;
   }
+  onViewChanges(callback) {
+    this.viewChangesCallbacks.add(callback);
+    return () => {
+      this.viewChangesCallbacks.delete(callback);
+    };
+  }
   registerViews(views) {
     this.views = views;
   }
@@ -14334,7 +14347,19 @@ class LocalEventPublisher2 {
     });
     const viewChanges = await this.collectViewChanges(event);
     allChanges.push(...viewChanges);
-    await this.dataStorage.commitChanges(allChanges);
+    const viewStoreNames = new Set(viewChanges.map((c2) => c2.store));
+    const committed = await this.dataStorage.commitChanges(allChanges, {
+      captureRowsFor: viewStoreNames
+    });
+    if (committed.length > 0 && this.viewChangesCallbacks.size > 0) {
+      for (const callback of this.viewChangesCallbacks) {
+        try {
+          callback(committed);
+        } catch (error) {
+          console.error(`[EventPublisher] onViewChanges callback error:`, error);
+        }
+      }
+    }
     await this.notifySubscribers(event);
     if (this.syncCallback) {
       this.syncCallback(event);
@@ -14715,8 +14740,9 @@ function typeValidatorBuilder(typeName, comparatorStrategy) {
 }
 
 class DataStorage {
-  async commitChanges(changes) {
+  async commitChanges(changes, _options) {
     await Promise.all(changes.map(({ store, changes: changes2 }) => this.getStore(store).applyChanges(changes2)));
+    return [];
   }
 }
 
@@ -15174,8 +15200,8 @@ class ObservableDataStorage {
   getReadWriteTransaction() {
     return this.source.getReadWriteTransaction();
   }
-  commitChanges(changes) {
-    return this.source.commitChanges(changes);
+  commitChanges(changes, options) {
+    return this.source.commitChanges(changes, options);
   }
   trackQuery(storeName, options, result, listener4) {
     const key = this.getQueryKey(storeName, options);
@@ -15346,7 +15372,7 @@ function executeDescriptor(descriptor, context2, adapters, contextMethod, option
   return method(...descriptor.args);
 }
 
-class ScopedModel4 {
+class ScopedModel3 {
   context;
   scopeName;
   parent;
@@ -15418,13 +15444,6 @@ class ScopedModel4 {
     }
     return wire.query(viewName, options, this.getAuth());
   }
-  subscribeQuery(descriptor, callback) {
-    const wire = this.parent.getAdapters().eventWire;
-    if (!wire) {
-      throw new Error(`Cannot subscribe to query: no eventWire available.`);
-    }
-    return wire.subscribeQuery(descriptor, callback, this.scopeName);
-  }
   get query() {
     return buildContextAccessor(this.context, this.scopedAdapters, "queryContext", (descriptor) => descriptor);
   }
@@ -15474,7 +15493,7 @@ class Model2 {
   scope(name) {
     let s = this.scopes.get(name);
     if (!s) {
-      s = new ScopedModel4(this, name);
+      s = new ScopedModel3(this, name);
       this.scopes.set(name, s);
     }
     return s;
@@ -15486,115 +15505,100 @@ class StreamingQueryCache {
   views = [];
   activeStreams = new Map;
   pendingUnsubscribes = new Map;
-  streamScopes = new Map;
   static UNSUBSCRIBE_DELAY_MS = 5000;
+  storeKey(viewName, scope) {
+    return `${scope ?? DEFAULT_SCOPE}:${viewName}`;
+  }
   registerViews(views) {
     this.views = views;
-    for (const view3 of views) {
-      if (!this.stores.has(view3.name)) {
-        this.stores.set(view3.name, new StreamingStore);
-      }
-    }
   }
-  getStore(viewName) {
-    if (!this.stores.has(viewName)) {
-      this.stores.set(viewName, new StreamingStore);
+  getStore(viewName, scope) {
+    const key = this.storeKey(viewName, scope);
+    if (!this.stores.has(key)) {
+      this.stores.set(key, new StreamingStore);
     }
-    return this.stores.get(viewName);
+    return this.stores.get(key);
   }
-  hasData(viewName) {
-    const store = this.stores.get(viewName);
+  hasData(viewName, scope) {
+    const store = this.stores.get(this.storeKey(viewName, scope));
     return store ? store.hasData() : false;
   }
-  hasActiveStream(viewName) {
-    return this.activeStreams.has(viewName);
-  }
-  registerStream(viewName, createStream) {
-    const pending = this.pendingUnsubscribes.get(viewName);
+  registerStream(key, createStream) {
+    const pending = this.pendingUnsubscribes.get(key);
     if (pending) {
       clearTimeout(pending);
-      this.pendingUnsubscribes.delete(viewName);
+      this.pendingUnsubscribes.delete(key);
     }
-    const existing = this.activeStreams.get(viewName);
+    const existing = this.activeStreams.get(key);
     if (existing) {
       existing.refCount++;
       return {
-        unsubscribe: () => this.unregisterStream(viewName),
+        unsubscribe: () => this.unregisterStream(key),
         wasReused: true
       };
     }
     const streamConn = createStream();
-    this.activeStreams.set(viewName, {
+    this.activeStreams.set(key, {
       unsubscribe: streamConn.unsubscribe,
       refCount: 1
     });
     return {
-      unsubscribe: () => this.unregisterStream(viewName),
+      unsubscribe: () => this.unregisterStream(key),
       wasReused: false
     };
   }
-  unregisterStream(viewName) {
-    const stream2 = this.activeStreams.get(viewName);
+  unregisterStream(key) {
+    const stream2 = this.activeStreams.get(key);
     if (!stream2)
       return;
     stream2.refCount--;
     if (stream2.refCount <= 0) {
       const timeout = setTimeout(() => {
-        this.pendingUnsubscribes.delete(viewName);
-        const current2 = this.activeStreams.get(viewName);
+        this.pendingUnsubscribes.delete(key);
+        const current2 = this.activeStreams.get(key);
         if (current2 && current2.refCount <= 0) {
           current2.unsubscribe();
-          this.activeStreams.delete(viewName);
-          this.streamScopes.delete(viewName);
+          this.activeStreams.delete(key);
         }
       }, StreamingQueryCache.UNSUBSCRIBE_DELAY_MS);
-      this.pendingUnsubscribes.set(viewName, timeout);
+      this.pendingUnsubscribes.set(key, timeout);
     }
   }
-  subscribeQuery(descriptor, eventWire, scope) {
-    const key = descriptor.element;
-    if (scope)
-      this.streamScopes.set(key, scope);
+  subscribeView(viewName, eventWire, scope) {
+    const key = this.storeKey(viewName, scope);
     const { unsubscribe } = this.registerStream(key, () => {
-      const subId = eventWire.subscribeQuery(descriptor, (data) => {
-        this.setViewData(descriptor.element, data);
-      }, scope);
-      return { unsubscribe: () => eventWire.unsubscribeQuery(subId) };
+      const store = this.stores.get(key) ?? new StreamingStore;
+      this.stores.set(key, store);
+      eventWire.subscribeView(viewName, scope ?? DEFAULT_SCOPE, {
+        onSnapshot: (items) => store.setAll(items),
+        onChanges: (changes) => store.applyChanges(changes)
+      });
+      return {
+        unsubscribe: () => eventWire.unsubscribeView(viewName, scope ?? DEFAULT_SCOPE)
+      };
     });
     return unsubscribe;
   }
   invalidateScope(scope) {
-    for (const [viewName, viewScope] of this.streamScopes) {
-      if (viewScope !== scope)
+    const prefix = `${scope}:`;
+    for (const [key, timeout] of this.pendingUnsubscribes) {
+      if (!key.startsWith(prefix))
         continue;
-      const pending = this.pendingUnsubscribes.get(viewName);
-      if (pending) {
-        clearTimeout(pending);
-        this.pendingUnsubscribes.delete(viewName);
-      }
-      const stream2 = this.activeStreams.get(viewName);
-      if (stream2) {
-        try {
-          stream2.unsubscribe();
-        } catch {}
-        this.activeStreams.delete(viewName);
-      }
-      this.streamScopes.delete(viewName);
-      const store = this.stores.get(viewName);
-      if (store)
-        store.clear();
+      clearTimeout(timeout);
+      this.pendingUnsubscribes.delete(key);
     }
-  }
-  setViewData(viewName, data) {
-    const store = this.stores.get(viewName);
-    if (!store)
-      return;
-    if (Array.isArray(data)) {
-      store.setAll(data);
-    } else if (data && typeof data === "object" && "_id" in data) {
-      store.setAll([data]);
-    } else {
-      store.setAll([]);
+    for (const [key, stream2] of this.activeStreams) {
+      if (!key.startsWith(prefix))
+        continue;
+      try {
+        stream2.unsubscribe();
+      } catch {}
+      this.activeStreams.delete(key);
+    }
+    for (const [key, store] of this.stores) {
+      if (!key.startsWith(prefix))
+        continue;
+      store.clear();
     }
   }
   async applyEvent(event3) {
@@ -15603,28 +15607,30 @@ class StreamingQueryCache {
       const handler = handlers[event3.type];
       if (!handler)
         continue;
-      const store = this.stores.get(view3.name);
-      if (!store)
-        continue;
-      const ctx = {
-        set: async (id3, data) => {
-          store.set(String(id3), { _id: String(id3), ...data });
-        },
-        modify: async (id3, data) => {
-          store.modify(String(id3), data);
-        },
-        remove: async (id3) => {
-          store.remove(String(id3));
-        },
-        find: async (options) => {
-          return store.find(options);
-        },
-        findOne: async (where) => {
-          return store.findOne(where);
-        },
-        $auth: {}
-      };
-      await handler(ctx, event3);
+      const suffix = `:${view3.name}`;
+      for (const [key, store] of this.stores) {
+        if (!key.endsWith(suffix))
+          continue;
+        const ctx = {
+          set: async (id3, data) => {
+            store.set(String(id3), { _id: String(id3), ...data });
+          },
+          modify: async (id3, data) => {
+            store.modify(String(id3), data);
+          },
+          remove: async (id3) => {
+            store.remove(String(id3));
+          },
+          find: async (options) => {
+            return store.find(options);
+          },
+          findOne: async (where) => {
+            return store.findOne(where);
+          },
+          $auth: {}
+        };
+        await handler(ctx, event3);
+      }
     }
   }
   clear() {
@@ -15632,7 +15638,6 @@ class StreamingQueryCache {
       stream2.unsubscribe();
     }
     this.activeStreams.clear();
-    this.streamScopes.clear();
     for (const timeout of this.pendingUnsubscribes.values()) {
       clearTimeout(timeout);
     }
@@ -15658,6 +15663,18 @@ class StreamingStore {
     }
     this.notifyListeners(null);
   }
+  applyChanges(events) {
+    if (events.length === 0)
+      return;
+    for (const event3 of events) {
+      if (event3.type === "set" && event3.item) {
+        this.data.set(event3.id, event3.item);
+      } else if (event3.type === "delete") {
+        this.data.delete(event3.id);
+      }
+    }
+    this.notifyListeners(events);
+  }
   set(id3, item) {
     this.data.set(id3, item);
     this.notifyListeners([{ type: "set", id: id3, item }]);
@@ -18125,7 +18142,7 @@ var Operation, PROXY_DRAFT, RAW_RETURN_SYMBOL, iteratorSymbol, dataTypes, intern
     }
     return returnValue(result);
   };
-}, create, constructorString, TOKEN_PREFIX = "arc:token:", eventWireInstanceCounter = 0, EVENT_TABLES, arrayValidator, ArcArray, objectValidator, ArcObject, ScopedDataStorage, ArcPrimitive, stringValidator, ArcString, ArcContextElement, ArcBoolean, ArcId, numberValidator, ArcNumber, ArcEvent, ArcCommand, ArcListener, ArcRoute, ForkedStoreState, ForkedDataStorage, MasterStoreState, MasterDataStorage2, dateValidator, originCache, originStackCache, originError, CLOSE, Query, PostgresError, Errors, types2, Identifier, Parameter, Builder, defaultHandlers, builders, serializers, parsers, mergeUserTypes = function(types22) {
+}, create, constructorString, TOKEN_PREFIX = "arc:token:", eventWireInstanceCounter = 0, EVENT_TABLES, arrayValidator, ArcArray, objectValidator, ArcObject, ScopedDataStorage, ArcPrimitive, stringValidator, ArcString, ArcContextElement, ArcBoolean, ArcId, numberValidator, ArcNumber, ArcEvent, ArcCommand, ArcListener, ArcRoute, ForkedStoreState, ForkedDataStorage, MasterStoreState, MasterDataStorage2, dateValidator, DEFAULT_SCOPE = "default", originCache, originStackCache, originError, CLOSE, Query, PostgresError, Errors, types2, Identifier, Parameter, Builder, defaultHandlers, builders, serializers, parsers, mergeUserTypes = function(types22) {
   const user = typeHandlers(types22 || {});
   return {
     serializers: Object.assign({}, serializers, user.serializers),
@@ -19724,12 +19741,23 @@ var init_dist = __esm(() => {
     constructor(storeName, dataStorage, deserialize) {
       super(storeName, dataStorage, deserialize);
     }
-    async applyChangeAndReturnEvent(transaction, change, transactionCache) {
+    async readExisting(transaction, id2, transactionCache) {
+      const cacheKey = `${this.storeName}:${id2}`;
+      if (transactionCache && transactionCache.has(cacheKey)) {
+        return transactionCache.get(cacheKey);
+      }
+      return transaction.find(this.storeName, { where: { _id: id2 } }).then((results) => results[0]);
+    }
+    async applyChangeAndReturnEvent(transaction, change, transactionCache, options) {
       if (change.type === "set") {
+        let existing;
+        if (options?.captureRows) {
+          existing = await this.readExisting(transaction, change.data._id, transactionCache);
+        }
         await transaction.set(this.storeName, change.data);
         const item = this.deserialize ? this.deserialize(change.data) : change.data;
         if (transactionCache) {
-          transactionCache.set(change.data._id, item);
+          transactionCache.set(`${this.storeName}:${change.data._id}`, item);
         }
         return {
           from: null,
@@ -19738,11 +19766,20 @@ var init_dist = __esm(() => {
             type: "set",
             item: change.data,
             id: change.data._id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: change.data
         };
       }
       if (change.type === "delete") {
+        let existing;
+        if (options?.captureRows) {
+          existing = await this.readExisting(transaction, change.id, transactionCache);
+        }
         await transaction.remove(this.storeName, change.id);
+        if (transactionCache) {
+          transactionCache.delete(`${this.storeName}:${change.id}`);
+        }
         return {
           from: null,
           to: null,
@@ -19750,21 +19787,18 @@ var init_dist = __esm(() => {
             type: "delete",
             item: null,
             id: change.id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: null
         };
       }
       if (change.type === "modify") {
-        let existing;
-        if (transactionCache && transactionCache.has(change.id)) {
-          existing = transactionCache.get(change.id);
-        } else {
-          existing = await transaction.find(this.storeName, { where: { _id: change.id } }).then((results) => results[0]);
-        }
+        const existing = await this.readExisting(transaction, change.id, transactionCache);
         const updated = existing ? deepMerge(existing, change.data) : { _id: change.id, ...change.data };
         await transaction.set(this.storeName, updated);
         const item = this.deserialize ? this.deserialize(updated) : updated;
         if (transactionCache) {
-          transactionCache.set(change.id, item);
+          transactionCache.set(`${this.storeName}:${change.id}`, item);
         }
         return {
           from: null,
@@ -19773,21 +19807,18 @@ var init_dist = __esm(() => {
             type: "set",
             item,
             id: change.id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: updated
         };
       }
       if (change.type === "mutate") {
-        let existing;
-        if (transactionCache && transactionCache.has(change.id)) {
-          existing = transactionCache.get(change.id);
-        } else {
-          existing = await transaction.find(this.storeName, { where: { _id: change.id } }).then((results) => results[0]);
-        }
+        const existing = await this.readExisting(transaction, change.id, transactionCache);
         const updated = apply(existing || {}, change.patches);
         await transaction.set(this.storeName, updated);
         const item = this.deserialize ? this.deserialize(updated) : updated;
         if (transactionCache) {
-          transactionCache.set(change.id, item);
+          transactionCache.set(`${this.storeName}:${change.id}`, item);
         }
         return {
           from: null,
@@ -19796,7 +19827,9 @@ var init_dist = __esm(() => {
             type: "set",
             item,
             id: change.id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: updated
         };
       }
       throw new Error("Unknown change type");
@@ -19873,17 +19906,22 @@ var init_dist = __esm(() => {
     applySerializedChanges(changes) {
       return Promise.all(changes.map(({ store, changes: changes2 }) => this.getStore(store).applySerializedChanges(changes2)));
     }
-    async commitChanges(changes) {
+    async commitChanges(changes, options) {
       const transaction = await this.getReadWriteTransaction();
       const transactionCache = new Map;
       const eventsByStore = new Map;
+      const committed = [];
       for (const { store, changes: storeChanges } of changes) {
         const storeState = this.getStore(store);
         const storeEvents = [];
+        const capture = options?.captureRowsFor?.has(store) ?? false;
         for (const change of storeChanges) {
-          const { event: event3 } = await storeState.applyChangeAndReturnEvent(transaction, change, transactionCache);
+          const { event: event3, oldRow, newRow } = await storeState.applyChangeAndReturnEvent(transaction, change, transactionCache, { captureRows: capture });
           if (event3)
             storeEvents.push(event3);
+          if (capture) {
+            committed.push({ store, id: event3.id, oldRow, newRow });
+          }
         }
         if (storeEvents.length > 0) {
           eventsByStore.set(store, storeEvents);
@@ -19894,6 +19932,7 @@ var init_dist = __esm(() => {
         const storeState = this.getStore(store);
         storeState.notifyListenersPublic(events);
       }
+      return committed;
     }
     fork() {
       return new ForkedDataStorage(this);
@@ -21410,11 +21449,11 @@ class EventWire2 {
   reconnectTimeout;
   syncRequested = false;
   viewSubscriptions = new Map;
-  viewSubCounter = 0;
-  pendingViewSubs = [];
-  constructor(baseUrl) {
+  enableEventSync;
+  constructor(baseUrl, options) {
     this.baseUrl = baseUrl;
     this.instanceId = ++eventWireInstanceCounter2;
+    this.enableEventSync = options?.enableEventSync ?? true;
   }
   setScopeToken(scope, token) {
     if (token === null) {
@@ -21460,9 +21499,11 @@ class EventWire2 {
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {
           this.state = "connected";
           this.sendAllScopeTokens();
-          this.requestSync();
+          if (this.enableEventSync) {
+            this.requestSync();
+          }
           this.flushPendingEvents();
-          this.flushPendingViewSubs();
+          this.sendAllViewSubscriptions();
         } else {
           console.log(`[EventWire] onopen called but ws is not OPEN, readyState:`, this.ws?.readyState);
         }
@@ -21538,30 +21579,26 @@ class EventWire2 {
   onSynced(callback) {
     this.onSyncedCallback = callback;
   }
-  subscribeQuery(descriptor, callback, scope) {
-    const subscriptionId = `qs_${++this.viewSubCounter}_${Date.now()}`;
-    this.viewSubscriptions.set(subscriptionId, callback);
+  subscribeView(element, scope, callbacks) {
+    const key = `${scope}:${element}`;
+    this.viewSubscriptions.set(key, callbacks);
     if (this.state === "connected" && this.ws) {
       this.ws.send(JSON.stringify({
-        type: "subscribe-query",
-        subscriptionId,
-        descriptor,
+        type: "subscribe-view",
+        element,
         scope
       }));
-    } else {
-      this.pendingViewSubs.push({ subscriptionId, descriptor, scope });
     }
-    return subscriptionId;
   }
-  unsubscribeQuery(subscriptionId) {
-    this.viewSubscriptions.delete(subscriptionId);
+  unsubscribeView(element, scope) {
+    this.viewSubscriptions.delete(`${scope}:${element}`);
     if (this.state === "connected" && this.ws) {
       this.ws.send(JSON.stringify({
-        type: "unsubscribe-query",
-        subscriptionId
+        type: "unsubscribe-view",
+        element,
+        scope
       }));
     }
-    this.pendingViewSubs = this.pendingViewSubs.filter((s) => s.subscriptionId !== subscriptionId);
   }
   getState() {
     return this.state;
@@ -21594,10 +21631,17 @@ class EventWire2 {
           this.lastHostEventId = message.lastHostEventId;
         }
         break;
-      case "query-data": {
-        const cb = this.viewSubscriptions.get(message.subscriptionId);
-        if (cb) {
-          cb(message.data);
+      case "view-snapshot": {
+        const sub = this.viewSubscriptions.get(`${message.scope}:${message.element}`);
+        if (sub) {
+          sub.onSnapshot(message.items ?? []);
+        }
+        break;
+      }
+      case "view-changes": {
+        const sub = this.viewSubscriptions.get(`${message.scope}:${message.element}`);
+        if (sub && Array.isArray(message.changes)) {
+          sub.onChanges(message.changes);
         }
         break;
       }
@@ -21625,18 +21669,19 @@ class EventWire2 {
       this.pendingEvents = [];
     }
   }
-  flushPendingViewSubs() {
+  sendAllViewSubscriptions() {
     if (!this.ws || this.state !== "connected")
       return;
-    for (const sub of this.pendingViewSubs) {
+    for (const key of this.viewSubscriptions.keys()) {
+      const sepIdx = key.indexOf(":");
+      const scope = key.slice(0, sepIdx);
+      const element = key.slice(sepIdx + 1);
       this.ws.send(JSON.stringify({
-        type: "subscribe-query",
-        subscriptionId: sub.subscriptionId,
-        descriptor: sub.descriptor,
-        scope: sub.scope
+        type: "subscribe-view",
+        element,
+        scope
       }));
     }
-    this.pendingViewSubs = [];
   }
   scheduleReconnect() {
     if (this.reconnectTimeout)
@@ -21653,12 +21698,19 @@ class LocalEventPublisher3 {
   views = [];
   syncCallback;
   subscribers = new Map;
+  viewChangesCallbacks = new Set;
   constructor(dataStorage) {
     this.dataStorage = dataStorage;
   }
   onPublish(callback) {
     this.syncCallback = callback;
   }
+  onViewChanges(callback) {
+    this.viewChangesCallbacks.add(callback);
+    return () => {
+      this.viewChangesCallbacks.delete(callback);
+    };
+  }
   registerViews(views) {
     this.views = views;
   }
@@ -21726,7 +21778,19 @@ class LocalEventPublisher3 {
     });
     const viewChanges = await this.collectViewChanges(event);
     allChanges.push(...viewChanges);
-    await this.dataStorage.commitChanges(allChanges);
+    const viewStoreNames = new Set(viewChanges.map((c2) => c2.store));
+    const committed = await this.dataStorage.commitChanges(allChanges, {
+      captureRowsFor: viewStoreNames
+    });
+    if (committed.length > 0 && this.viewChangesCallbacks.size > 0) {
+      for (const callback of this.viewChangesCallbacks) {
+        try {
+          callback(committed);
+        } catch (error) {
+          console.error(`[EventPublisher] onViewChanges callback error:`, error);
+        }
+      }
+    }
     await this.notifySubscribers(event);
     if (this.syncCallback) {
       this.syncCallback(event);
@@ -22107,8 +22171,9 @@ function typeValidatorBuilder2(typeName, comparatorStrategy) {
 }
 
 class DataStorage2 {
-  async commitChanges(changes) {
+  async commitChanges(changes, _options) {
     await Promise.all(changes.map(({ store, changes: changes2 }) => this.getStore(store).applyChanges(changes2)));
+    return [];
   }
 }
 
@@ -22566,8 +22631,8 @@ class ObservableDataStorage2 {
   getReadWriteTransaction() {
     return this.source.getReadWriteTransaction();
   }
-  commitChanges(changes) {
-    return this.source.commitChanges(changes);
+  commitChanges(changes, options) {
+    return this.source.commitChanges(changes, options);
   }
   trackQuery(storeName, options, result, listener4) {
     const key = this.getQueryKey(storeName, options);
@@ -22738,7 +22803,7 @@ function executeDescriptor2(descriptor, context2, adapters, contextMethod, optio
   return method(...descriptor.args);
 }
 
-class ScopedModel5 {
+class ScopedModel4 {
   context;
   scopeName;
   parent;
@@ -22810,13 +22875,6 @@ class ScopedModel5 {
     }
     return wire.query(viewName, options, this.getAuth());
   }
-  subscribeQuery(descriptor, callback) {
-    const wire = this.parent.getAdapters().eventWire;
-    if (!wire) {
-      throw new Error(`Cannot subscribe to query: no eventWire available.`);
-    }
-    return wire.subscribeQuery(descriptor, callback, this.scopeName);
-  }
   get query() {
     return buildContextAccessor2(this.context, this.scopedAdapters, "queryContext", (descriptor) => descriptor);
   }
@@ -22866,7 +22924,7 @@ class Model3 {
   scope(name) {
     let s = this.scopes.get(name);
     if (!s) {
-      s = new ScopedModel5(this, name);
+      s = new ScopedModel4(this, name);
       this.scopes.set(name, s);
     }
     return s;
@@ -22878,115 +22936,100 @@ class StreamingQueryCache2 {
   views = [];
   activeStreams = new Map;
   pendingUnsubscribes = new Map;
-  streamScopes = new Map;
   static UNSUBSCRIBE_DELAY_MS = 5000;
+  storeKey(viewName, scope) {
+    return `${scope ?? DEFAULT_SCOPE2}:${viewName}`;
+  }
   registerViews(views) {
     this.views = views;
-    for (const view3 of views) {
-      if (!this.stores.has(view3.name)) {
-        this.stores.set(view3.name, new StreamingStore2);
-      }
-    }
   }
-  getStore(viewName) {
-    if (!this.stores.has(viewName)) {
-      this.stores.set(viewName, new StreamingStore2);
+  getStore(viewName, scope) {
+    const key = this.storeKey(viewName, scope);
+    if (!this.stores.has(key)) {
+      this.stores.set(key, new StreamingStore2);
     }
-    return this.stores.get(viewName);
+    return this.stores.get(key);
   }
-  hasData(viewName) {
-    const store = this.stores.get(viewName);
+  hasData(viewName, scope) {
+    const store = this.stores.get(this.storeKey(viewName, scope));
     return store ? store.hasData() : false;
   }
-  hasActiveStream(viewName) {
-    return this.activeStreams.has(viewName);
-  }
-  registerStream(viewName, createStream) {
-    const pending = this.pendingUnsubscribes.get(viewName);
+  registerStream(key, createStream) {
+    const pending = this.pendingUnsubscribes.get(key);
     if (pending) {
       clearTimeout(pending);
-      this.pendingUnsubscribes.delete(viewName);
+      this.pendingUnsubscribes.delete(key);
     }
-    const existing = this.activeStreams.get(viewName);
+    const existing = this.activeStreams.get(key);
     if (existing) {
       existing.refCount++;
       return {
-        unsubscribe: () => this.unregisterStream(viewName),
+        unsubscribe: () => this.unregisterStream(key),
         wasReused: true
       };
     }
     const streamConn = createStream();
-    this.activeStreams.set(viewName, {
+    this.activeStreams.set(key, {
       unsubscribe: streamConn.unsubscribe,
       refCount: 1
     });
     return {
-      unsubscribe: () => this.unregisterStream(viewName),
+      unsubscribe: () => this.unregisterStream(key),
       wasReused: false
     };
   }
-  unregisterStream(viewName) {
-    const stream2 = this.activeStreams.get(viewName);
+  unregisterStream(key) {
+    const stream2 = this.activeStreams.get(key);
     if (!stream2)
       return;
     stream2.refCount--;
     if (stream2.refCount <= 0) {
       const timeout = setTimeout(() => {
-        this.pendingUnsubscribes.delete(viewName);
-        const current22 = this.activeStreams.get(viewName);
+        this.pendingUnsubscribes.delete(key);
+        const current22 = this.activeStreams.get(key);
         if (current22 && current22.refCount <= 0) {
           current22.unsubscribe();
-          this.activeStreams.delete(viewName);
-          this.streamScopes.delete(viewName);
+          this.activeStreams.delete(key);
         }
       }, StreamingQueryCache2.UNSUBSCRIBE_DELAY_MS);
-      this.pendingUnsubscribes.set(viewName, timeout);
+      this.pendingUnsubscribes.set(key, timeout);
     }
   }
-  subscribeQuery(descriptor, eventWire, scope) {
-    const key = descriptor.element;
-    if (scope)
-      this.streamScopes.set(key, scope);
+  subscribeView(viewName, eventWire, scope) {
+    const key = this.storeKey(viewName, scope);
     const { unsubscribe } = this.registerStream(key, () => {
-      const subId = eventWire.subscribeQuery(descriptor, (data) => {
-        this.setViewData(descriptor.element, data);
-      }, scope);
-      return { unsubscribe: () => eventWire.unsubscribeQuery(subId) };
+      const store = this.stores.get(key) ?? new StreamingStore2;
+      this.stores.set(key, store);
+      eventWire.subscribeView(viewName, scope ?? DEFAULT_SCOPE2, {
+        onSnapshot: (items) => store.setAll(items),
+        onChanges: (changes) => store.applyChanges(changes)
+      });
+      return {
+        unsubscribe: () => eventWire.unsubscribeView(viewName, scope ?? DEFAULT_SCOPE2)
+      };
     });
     return unsubscribe;
   }
   invalidateScope(scope) {
-    for (const [viewName, viewScope] of this.streamScopes) {
-      if (viewScope !== scope)
+    const prefix = `${scope}:`;
+    for (const [key, timeout] of this.pendingUnsubscribes) {
+      if (!key.startsWith(prefix))
         continue;
-      const pending = this.pendingUnsubscribes.get(viewName);
-      if (pending) {
-        clearTimeout(pending);
-        this.pendingUnsubscribes.delete(viewName);
-      }
-      const stream2 = this.activeStreams.get(viewName);
-      if (stream2) {
-        try {
-          stream2.unsubscribe();
-        } catch {}
-        this.activeStreams.delete(viewName);
-      }
-      this.streamScopes.delete(viewName);
-      const store = this.stores.get(viewName);
-      if (store)
-        store.clear();
+      clearTimeout(timeout);
+      this.pendingUnsubscribes.delete(key);
     }
-  }
-  setViewData(viewName, data) {
-    const store = this.stores.get(viewName);
-    if (!store)
-      return;
-    if (Array.isArray(data)) {
-      store.setAll(data);
-    } else if (data && typeof data === "object" && "_id" in data) {
-      store.setAll([data]);
-    } else {
-      store.setAll([]);
+    for (const [key, stream2] of this.activeStreams) {
+      if (!key.startsWith(prefix))
+        continue;
+      try {
+        stream2.unsubscribe();
+      } catch {}
+      this.activeStreams.delete(key);
+    }
+    for (const [key, store] of this.stores) {
+      if (!key.startsWith(prefix))
+        continue;
+      store.clear();
     }
   }
   async applyEvent(event3) {
@@ -22995,28 +23038,30 @@ class StreamingQueryCache2 {
       const handler = handlers[event3.type];
       if (!handler)
         continue;
-      const store = this.stores.get(view3.name);
-      if (!store)
-        continue;
-      const ctx = {
-        set: async (id3, data) => {
-          store.set(String(id3), { _id: String(id3), ...data });
-        },
-        modify: async (id3, data) => {
-          store.modify(String(id3), data);
-        },
-        remove: async (id3) => {
-          store.remove(String(id3));
-        },
-        find: async (options) => {
-          return store.find(options);
-        },
-        findOne: async (where) => {
-          return store.findOne(where);
-        },
-        $auth: {}
-      };
-      await handler(ctx, event3);
+      const suffix = `:${view3.name}`;
+      for (const [key, store] of this.stores) {
+        if (!key.endsWith(suffix))
+          continue;
+        const ctx = {
+          set: async (id3, data) => {
+            store.set(String(id3), { _id: String(id3), ...data });
+          },
+          modify: async (id3, data) => {
+            store.modify(String(id3), data);
+          },
+          remove: async (id3) => {
+            store.remove(String(id3));
+          },
+          find: async (options) => {
+            return store.find(options);
+          },
+          findOne: async (where) => {
+            return store.findOne(where);
+          },
+          $auth: {}
+        };
+        await handler(ctx, event3);
+      }
     }
   }
   clear() {
@@ -23024,7 +23069,6 @@ class StreamingQueryCache2 {
       stream2.unsubscribe();
     }
     this.activeStreams.clear();
-    this.streamScopes.clear();
     for (const timeout of this.pendingUnsubscribes.values()) {
       clearTimeout(timeout);
     }
@@ -23050,6 +23094,18 @@ class StreamingStore2 {
     }
     this.notifyListeners(null);
   }
+  applyChanges(events) {
+    if (events.length === 0)
+      return;
+    for (const event3 of events) {
+      if (event3.type === "set" && event3.item) {
+        this.data.set(event3.id, event3.item);
+      } else if (event3.type === "delete") {
+        this.data.delete(event3.id);
+      }
+    }
+    this.notifyListeners(events);
+  }
   set(id3, item) {
     this.data.set(id3, item);
     this.notifyListeners([{ type: "set", id: id3, item }]);
@@ -23993,7 +24049,7 @@ var Operation2, PROXY_DRAFT2, RAW_RETURN_SYMBOL2, iteratorSymbol2, dataTypes2, i
     }
     return returnValue(result);
   };
-}, create2, constructorString2, TOKEN_PREFIX2 = "arc:token:", eventWireInstanceCounter2 = 0, EVENT_TABLES2, arrayValidator2, ArcArray2, objectValidator2, ArcObject2, ScopedDataStorage2, ArcPrimitive2, stringValidator2, ArcString2, ArcContextElement2, ArcBoolean2, ArcId2, numberValidator2, ArcNumber2, ArcEvent2, ArcCommand2, ArcListener2, ArcRoute2, ForkedStoreState2, ForkedDataStorage2, MasterStoreState2, MasterDataStorage3, dateValidator2, SQLiteReadWriteTransaction, createSQLiteAdapterFactory = (db) => {
+}, create2, constructorString2, TOKEN_PREFIX2 = "arc:token:", eventWireInstanceCounter2 = 0, EVENT_TABLES2, arrayValidator2, ArcArray2, objectValidator2, ArcObject2, ScopedDataStorage2, ArcPrimitive2, stringValidator2, ArcString2, ArcContextElement2, ArcBoolean2, ArcId2, numberValidator2, ArcNumber2, ArcEvent2, ArcCommand2, ArcListener2, ArcRoute2, ForkedStoreState2, ForkedDataStorage2, MasterStoreState2, MasterDataStorage3, dateValidator2, DEFAULT_SCOPE2 = "default", SQLiteReadWriteTransaction, createSQLiteAdapterFactory = (db) => {
   return async (context) => {
     const adapter = new SQLiteAdapter(db, context);
     await adapter.initialize();
@@ -25551,12 +25607,23 @@ var init_dist2 = __esm(() => {
     constructor(storeName, dataStorage, deserialize) {
       super(storeName, dataStorage, deserialize);
     }
-    async applyChangeAndReturnEvent(transaction, change, transactionCache) {
+    async readExisting(transaction, id22, transactionCache) {
+      const cacheKey = `${this.storeName}:${id22}`;
+      if (transactionCache && transactionCache.has(cacheKey)) {
+        return transactionCache.get(cacheKey);
+      }
+      return transaction.find(this.storeName, { where: { _id: id22 } }).then((results) => results[0]);
+    }
+    async applyChangeAndReturnEvent(transaction, change, transactionCache, options) {
       if (change.type === "set") {
+        let existing;
+        if (options?.captureRows) {
+          existing = await this.readExisting(transaction, change.data._id, transactionCache);
+        }
         await transaction.set(this.storeName, change.data);
         const item = this.deserialize ? this.deserialize(change.data) : change.data;
         if (transactionCache) {
-          transactionCache.set(change.data._id, item);
+          transactionCache.set(`${this.storeName}:${change.data._id}`, item);
         }
         return {
           from: null,
@@ -25565,11 +25632,20 @@ var init_dist2 = __esm(() => {
             type: "set",
             item: change.data,
             id: change.data._id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: change.data
         };
       }
       if (change.type === "delete") {
+        let existing;
+        if (options?.captureRows) {
+          existing = await this.readExisting(transaction, change.id, transactionCache);
+        }
         await transaction.remove(this.storeName, change.id);
+        if (transactionCache) {
+          transactionCache.delete(`${this.storeName}:${change.id}`);
+        }
         return {
           from: null,
           to: null,
@@ -25577,21 +25653,18 @@ var init_dist2 = __esm(() => {
             type: "delete",
             item: null,
             id: change.id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: null
         };
       }
       if (change.type === "modify") {
-        let existing;
-        if (transactionCache && transactionCache.has(change.id)) {
-          existing = transactionCache.get(change.id);
-        } else {
-          existing = await transaction.find(this.storeName, { where: { _id: change.id } }).then((results) => results[0]);
-        }
+        const existing = await this.readExisting(transaction, change.id, transactionCache);
         const updated = existing ? deepMerge2(existing, change.data) : { _id: change.id, ...change.data };
         await transaction.set(this.storeName, updated);
         const item = this.deserialize ? this.deserialize(updated) : updated;
         if (transactionCache) {
-          transactionCache.set(change.id, item);
+          transactionCache.set(`${this.storeName}:${change.id}`, item);
         }
         return {
           from: null,
@@ -25600,21 +25673,18 @@ var init_dist2 = __esm(() => {
             type: "set",
             item,
             id: change.id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: updated
         };
       }
       if (change.type === "mutate") {
-        let existing;
-        if (transactionCache && transactionCache.has(change.id)) {
-          existing = transactionCache.get(change.id);
-        } else {
-          existing = await transaction.find(this.storeName, { where: { _id: change.id } }).then((results) => results[0]);
-        }
+        const existing = await this.readExisting(transaction, change.id, transactionCache);
         const updated = apply2(existing || {}, change.patches);
         await transaction.set(this.storeName, updated);
         const item = this.deserialize ? this.deserialize(updated) : updated;
         if (transactionCache) {
-          transactionCache.set(change.id, item);
+          transactionCache.set(`${this.storeName}:${change.id}`, item);
         }
         return {
           from: null,
@@ -25623,7 +25693,9 @@ var init_dist2 = __esm(() => {
             type: "set",
             item,
             id: change.id
-          }
+          },
+          oldRow: existing ?? null,
+          newRow: updated
         };
       }
       throw new Error("Unknown change type");
@@ -25700,17 +25772,22 @@ var init_dist2 = __esm(() => {
     applySerializedChanges(changes) {
       return Promise.all(changes.map(({ store, changes: changes2 }) => this.getStore(store).applySerializedChanges(changes2)));
     }
-    async commitChanges(changes) {
+    async commitChanges(changes, options) {
       const transaction = await this.getReadWriteTransaction();
       const transactionCache = new Map;
       const eventsByStore = new Map;
+      const committed = [];
       for (const { store, changes: storeChanges } of changes) {
         const storeState = this.getStore(store);
         const storeEvents = [];
+        const capture = options?.captureRowsFor?.has(store) ?? false;
         for (const change of storeChanges) {
-          const { event: event3 } = await storeState.applyChangeAndReturnEvent(transaction, change, transactionCache);
+          const { event: event3, oldRow, newRow } = await storeState.applyChangeAndReturnEvent(transaction, change, transactionCache, { captureRows: capture });
           if (event3)
             storeEvents.push(event3);
+          if (capture) {
+            committed.push({ store, id: event3.id, oldRow, newRow });
+          }
         }
         if (storeEvents.length > 0) {
           eventsByStore.set(store, storeEvents);
@@ -25721,6 +25798,7 @@ var init_dist2 = __esm(() => {
         const storeState = this.getStore(store);
         storeState.notifyListenersPublic(events);
       }
+      return committed;
     }
     fork() {
       return new ForkedDataStorage2(this);
@@ -39950,88 +40028,6 @@ function queryHandler(ch) {
     }
   };
 }
-var streamIdCounter = 0;
-var streamConnections = new Map;
-function streamHandler(ch) {
-  return (_req, url, ctx) => {
-    if (!url.pathname.startsWith("/stream/") || _req.method !== "GET")
-      return null;
-    const viewName = url.pathname.split("/stream/")[1];
-    if (!viewName) {
-      return new Response("Invalid stream path", {
-        status: 400,
-        headers: ctx.corsHeaders
-      });
-    }
-    const findOptions = {};
-    const whereParam = url.searchParams.get("where");
-    if (whereParam) {
-      try {
-        findOptions.where = JSON.parse(whereParam);
-      } catch {
-        return new Response("Invalid 'where' parameter", {
-          status: 400,
-          headers: ctx.corsHeaders
-        });
-      }
-    }
-    const orderByParam = url.searchParams.get("orderBy");
-    if (orderByParam) {
-      try {
-        findOptions.orderBy = JSON.parse(orderByParam);
-      } catch {
-        return new Response("Invalid 'orderBy' parameter", {
-          status: 400,
-          headers: ctx.corsHeaders
-        });
-      }
-    }
-    const limitParam = url.searchParams.get("limit");
-    if (limitParam)
-      findOptions.limit = parseInt(limitParam, 10);
-    const streamId = `stream_${++streamIdCounter}_${Date.now()}`;
-    const rawToken = ctx.rawToken;
-    const stream2 = new ReadableStream({
-      start(controller) {
-        const scoped = new ScopedModel2(ch.getModel(), "stream");
-        if (rawToken)
-          scoped.setToken(rawToken);
-        const descriptor = { element: viewName, method: "find", args: [findOptions] };
-        const sendData = async () => {
-          try {
-            const data = await scoped.callQuery(descriptor);
-            controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify({ type: "data", data })}
-
-`));
-          } catch {
-            unsubscribe();
-          }
-        };
-        sendData();
-        const unsubscribe = ch.getEventPublisher().subscribe("*", () => sendData());
-        streamConnections.set(streamId, { id: streamId, controller, unsubscribe });
-        controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify({ type: "connected", streamId })}
-
-`));
-      },
-      cancel() {
-        const conn = streamConnections.get(streamId);
-        if (conn) {
-          conn.unsubscribe();
-          streamConnections.delete(streamId);
-        }
-      }
-    });
-    return new Response(stream2, {
-      headers: {
-        ...ctx.corsHeaders,
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
-        Connection: "keep-alive"
-      }
-    });
-  };
-}
 function eventSyncHandler(ch) {
   return async (req, url, ctx) => {
     if (url.pathname !== "/sync/events" || req.method !== "POST")
@@ -40132,25 +40128,19 @@ function arcHttpHandlers(ch, cm) {
     healthHandler(cm),
     commandHandler(ch),
     queryHandler(ch),
-    streamHandler(ch),
     eventSyncHandler(ch),
     routeHandler(ch)
   ];
 }
-function cleanupStreams() {
-  for (const conn of streamConnections.values())
-    conn.unsubscribe();
-  streamConnections.clear();
-}
 // ../host/src/middleware/ws.ts
-import { ScopedModel as ScopedModel3 } from "@arcote.tech/arc";
-var clientViewSubs = new Map;
+import { LiveQuery } from "@arcote.tech/arc";
+var clientQuerySubs = new Map;
 function cleanupClientSubs(clientId) {
-  const subs = clientViewSubs.get(clientId);
+  const subs = clientQuerySubs.get(clientId);
   if (subs) {
-    for (const unsub of subs.values())
-      unsub();
-    clientViewSubs.delete(clientId);
+    for (const live of subs.values())
+      live.stop();
+    clientQuerySubs.delete(clientId);
   }
 }
 function scopeAuthHandler() {
@@ -40176,6 +40166,8 @@ function syncEventsHandler() {
     for (const c2 of ctx.connectionManager.getAllClients()) {
       if (c2.id === client.id)
         continue;
+      if (!c2.wantsEventSync)
+        continue;
       const clientTokens = ctx.connectionManager.getAllScopeTokens(c2.id);
       const authorized = filterEventsForTokens(clientTokens, persisted, ctx.contextHandler.getEventDefinitions());
       if (authorized.length > 0) {
@@ -40198,6 +40190,7 @@ function requestSyncHandler() {
   return async (client, message, ctx) => {
     if (message.type !== "request-sync")
       return false;
+    client.wantsEventSync = true;
     const allTokens = ctx.connectionManager.getAllScopeTokens(client.id);
     const token = allTokens.length > 0 ? allTokens[0] : null;
     const events = await ctx.contextHandler.getEventsSince(message.lastHostEventId, token);
@@ -40249,70 +40242,58 @@ function executeCommandHandler() {
 function querySubscriptionHandler() {
   return async (client, message, ctx) => {
     if (message.type === "subscribe-query") {
-      const { subscriptionId, descriptor, scope } = message;
-      const scopeToken = scope ? client.scopeTokens.get(scope) : null;
+      const { subscriptionId, descriptor } = message;
+      const scope = message.scope ?? "default";
+      const scopeToken = client.scopeTokens.get(scope) ?? null;
       let rawToken = scopeToken?.raw ?? null;
       if (!rawToken && client.scopeTokens.size > 0) {
         rawToken = client.scopeTokens.values().next().value.raw;
       }
-      const scoped = new ScopedModel3(ctx.contextHandler.getModel(), scope ?? "default");
-      if (rawToken)
-        scoped.setToken(rawToken);
-      let lastResultJson = "";
-      const sendData = async () => {
-        try {
-          const data = await scoped.callQuery(descriptor);
-          const json = JSON.stringify(data ?? null);
-          if (json === lastResultJson)
-            return;
-          lastResultJson = json;
+      clientQuerySubs.get(client.id)?.get(subscriptionId)?.stop();
+      const live = new LiveQuery(ctx.contextHandler.getModel(), descriptor, scope, rawToken, (update) => {
+        if (update.type === "changes") {
           ctx.connectionManager.sendToClient(client.id, {
-            type: "query-data",
+            type: "query-changes",
             subscriptionId,
-            data: data ?? null
+            changes: update.changes
+          });
+        } else {
+          ctx.connectionManager.sendToClient(client.id, {
+            type: "query-snapshot",
+            subscriptionId,
+            result: update.result ?? null
           });
-        } catch (err3) {
-          console.error(`[Arc] Query subscription error:`, err3);
-        }
-      };
-      sendData();
-      const element = ctx.contextHandler.getModel().context.get(descriptor.element);
-      const handlers = element?.getHandlers?.();
-      const eventTypes = handlers ? Object.keys(handlers) : [];
-      let debounceTimer;
-      const debouncedSend = () => {
-        if (debounceTimer)
-          clearTimeout(debounceTimer);
-        debounceTimer = setTimeout(() => sendData(), 50);
-      };
-      const unsubscribes = [];
-      if (eventTypes.length > 0) {
-        for (const eventType of eventTypes) {
-          unsubscribes.push(ctx.contextHandler.getEventPublisher().subscribe(eventType, debouncedSend));
         }
-      } else {
-        unsubscribes.push(ctx.contextHandler.getEventPublisher().subscribe("*", debouncedSend));
+      });
+      if (!clientQuerySubs.has(client.id)) {
+        clientQuerySubs.set(client.id, new Map);
       }
-      const cleanup = () => {
-        if (debounceTimer)
-          clearTimeout(debounceTimer);
-        for (const unsub of unsubscribes)
-          unsub();
-      };
-      if (!clientViewSubs.has(client.id)) {
-        clientViewSubs.set(client.id, new Map);
+      clientQuerySubs.get(client.id).set(subscriptionId, live);
+      try {
+        const result = await live.start();
+        ctx.connectionManager.sendToClient(client.id, {
+          type: "query-snapshot",
+          subscriptionId,
+          result: result ?? null
+        });
+        live.flush();
+      } catch (err3) {
+        live.stop();
+        clientQuerySubs.get(client.id)?.delete(subscriptionId);
+        console.error(`[Arc] Query subscription error (${descriptor?.element}.${descriptor?.method}):`, err3);
+        ctx.connectionManager.sendToClient(client.id, {
+          type: "error",
+          message: `Failed to subscribe to query "${descriptor?.element}.${descriptor?.method}"`
+        });
       }
-      clientViewSubs.get(client.id).set(subscriptionId, cleanup);
       return true;
     }
     if (message.type === "unsubscribe-query") {
-      const subs = clientViewSubs.get(client.id);
-      if (subs) {
-        const unsub = subs.get(message.subscriptionId);
-        if (unsub) {
-          unsub();
-          subs.delete(message.subscriptionId);
-        }
+      const subs = clientQuerySubs.get(client.id);
+      const live = subs?.get(message.subscriptionId);
+      if (live) {
+        live.stop();
+        subs.delete(message.subscriptionId);
       }
       return true;
     }
@@ -40508,7 +40489,6 @@ async function createArcServer(config) {
     cronScheduler,
     stop: () => {
       cronScheduler.stop();
-      cleanupStreams();
       server.stop();
     }
   };