From eee9e7574057880902494b8cb64a20fe11842ada Mon Sep 17 00:00:00 2001
From: Marcus Pousette <marcuspousette@Marcuss-MacBook-Pro-3.local>
Date: Sun, 12 Jul 2026 15:43:03 +0200
Subject: [PATCH] perf(sync): yield between inbound apply batches

---
 .changeset/inbound-sync-batch-yield.md        |  5 ++
 packages/sync-protocol/protocol/src/sync.ts   |  5 +-
 .../protocol/tests/smoke.test.ts              | 74 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/inbound-sync-batch-yield.md

diff --git a/.changeset/inbound-sync-batch-yield.md b/.changeset/inbound-sync-batch-yield.md
new file mode 100644
index 00000000..803cc397
--- /dev/null
+++ b/.changeset/inbound-sync-batch-yield.md
@@ -0,0 +1,5 @@
+---
+'@treecrdt/sync-protocol': patch
+---
+
+Yield between queued inbound sync apply batches so UI work can run between remote opsBatch applies.
diff --git a/packages/sync-protocol/protocol/src/sync.ts b/packages/sync-protocol/protocol/src/sync.ts
index 1ec62114..09ed1637 100644
--- a/packages/sync-protocol/protocol/src/sync.ts
+++ b/packages/sync-protocol/protocol/src/sync.ts
@@ -1675,7 +1675,10 @@ export class SyncPeer<Op> {
       .catch(() => {
         // A prior batch failure should not permanently poison the queue.
       })
-      .then(() => this.onOpsBatch(transport, batch));
+      .then(async () => {
+        await this.onOpsBatch(transport, batch);
+        if (batch.ops.length > 0 && !batch.done) await yieldToMacrotask();
+      });
     this.opsBatchQueues.set(batch.filterId, current);
     try {
       await current;
diff --git a/packages/sync-protocol/protocol/tests/smoke.test.ts b/packages/sync-protocol/protocol/tests/smoke.test.ts
index 3e720b0b..e710c803 100644
--- a/packages/sync-protocol/protocol/tests/smoke.test.ts
+++ b/packages/sync-protocol/protocol/tests/smoke.test.ts
@@ -30,6 +30,16 @@ async function tick(): Promise<void> {
   await new Promise<void>((resolve) => setTimeout(resolve, 0));
 }
 
+function deferredPromise<T = void>() {
+  let resolve!: (value: T | PromiseLike<T>) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
 function orderKeyFromPosition(position: number): Uint8Array {
   if (!Number.isInteger(position) || position < 0) throw new Error(`invalid position: ${position}`);
   const n = position + 1;
@@ -443,6 +453,70 @@ test('syncOnce waits for responder to apply uploaded ops before resolving', asyn
   expect(b.hasOp(replicaHex.a, 3)).toBe(true);
 });
 
+test('incoming opsBatch queue yields to macrotasks between applies', async () => {
+  const docId = 'doc-sync-inbound-apply-yield';
+  const root = '0'.repeat(32);
+  const firstApplyCanFinish = deferredPromise();
+  let applyCalls = 0;
+  let macrotaskRan = false;
+  let secondApplyStartedAfterMacrotask = false;
+
+  class ProbeBackend extends MemoryBackend {
+    override async applyOps(ops: Operation[]): Promise<void> {
+      applyCalls += 1;
+      if (applyCalls === 1) {
+        await firstApplyCanFinish.promise;
+      } else if (applyCalls === 2) {
+        secondApplyStartedAfterMacrotask = macrotaskRan;
+      }
+      await super.applyOps(ops);
+    }
+  }
+
+  const a = new MemoryBackend(docId);
+  const b = new ProbeBackend(docId);
+  const ops = [1, 2, 3].map((counter, index) =>
+    makeOp(replicas.a, counter, counter, {
+      type: 'insert',
+      parent: root,
+      node: nodeIdFromInt(counter),
+      orderKey: orderKeyFromPosition(index),
+    }),
+  );
+
+  const [wa, wb] = createMacrotaskDuplex<Uint8Array>();
+  const ta = wrapDuplexTransportWithCodec(wa, treecrdtSyncV0ProtobufCodec);
+  const tb = wrapDuplexTransportWithCodec(wb, treecrdtSyncV0ProtobufCodec);
+  const pa = new SyncPeer(a);
+  const pb = new SyncPeer(b);
+  pa.attach(ta);
+  pb.attach(tb);
+
+  const pushDone = pa.pushOps(ta, ops, {
+    filterId: 'apply-yield-probe',
+    maxOpsPerBatch: 1,
+  });
+
+  await waitUntil(() => applyCalls === 1, {
+    message: 'expected first inbound apply to start',
+  });
+  await pushDone;
+
+  setImmediate(() => {
+    macrotaskRan = true;
+  });
+  firstApplyCanFinish.resolve();
+
+  await waitUntil(() => applyCalls >= 2, {
+    message: 'expected second inbound apply to start',
+  });
+  expect(secondApplyStartedAfterMacrotask).toBe(true);
+
+  await waitUntil(() => b.hasOp(replicaHex.a, 3), {
+    message: 'expected all pushed ops to apply',
+  });
+});
+
 test('pushOps uploads direct ops without reconcile roundtrips', async () => {
   const docId = 'doc-push-direct';
   const root = '0'.repeat(32);