@agentunion/fastaun-browser 0.5.9 → 0.5.11

package/dist/bundle.js

@@ -460,7 +460,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.5.9";
+var VERSION = "0.5.11";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -799,6 +799,15 @@ var EventDispatcher = class {
   constructor() {
     __publicField(this, "_log", _noopLog);
     __publicField(this, "_handlers", /* @__PURE__ */ new Map());
+    __publicField(this, "_queue", []);
+    __publicField(this, "_draining", false);
+    __publicField(this, "_drainScheduled", false);
+    __publicField(this, "_handlerDepth", 0);
+    __publicField(this, "_synchronousHandlerDepth", 0);
+    __publicField(this, "_drainPromise", null);
+    __publicField(this, "_drainResolve", null);
+    __publicField(this, "_closing", false);
+    __publicField(this, "_closed", false);
   }
   setLogger(log) {
     this._log = log;
@@ -827,17 +836,154 @@ var EventDispatcher = class {
       this._handlers.delete(event);
     }
   }
-  /** 发布事件（依次调用所有处理函数，支持异步） */
+  /**
+   * 发布事件。事件总是异步进入 FIFO 队列；调用方 await 时等待该事件处理完成。
+   * drain 中派生事件只入队，不等待自身，避免事件处理器互相等待形成死锁。
+   */
   async publish(event, payload) {
+    if (this._closed || this._closing) return;
+    let resolveItem;
+    const itemDone = new Promise((resolve) => {
+      resolveItem = resolve;
+    });
+    this._queue.push({
+      run: () => this.dispatchNow(event, payload),
+      resolve: resolveItem
+    });
+    if (this._handlerDepth > 0) return;
+    if (this._drainPromise === null) {
+      this._drainPromise = new Promise((resolve) => {
+        this._drainResolve = resolve;
+      });
+    }
+    this.scheduleDrain();
+    await itemDone;
+  }
+  /** 将事件放入异步 FIFO 队列，不等待处理器执行完成。 */
+  enqueue(event, payload) {
+    void this.publish(event, payload).catch((exc) => {
+      this._log.warn(`event ${event} enqueue failed:`, exc);
+    });
+  }
+  /** 将非事件 observer 放入同一 FIFO 队列。 */
+  enqueueTask(task) {
+    if (this._closed || this._closing) return;
+    this._queue.push({
+      run: () => this.dispatchTask(task),
+      resolve: () => {
+      }
+    });
+    if (this._drainPromise === null) {
+      this._drainPromise = new Promise((resolve) => {
+        this._drainResolve = resolve;
+      });
+    }
+    this.scheduleDrain();
+  }
+  /** 关闭调度器，排空已经入队的应用事件后拒绝后续事件。 */
+  async close() {
+    if (this._closed) return;
+    this._closing = true;
+    if (this._synchronousHandlerDepth > 0) return;
+    if (this._drainPromise !== null) await this._drainPromise;
+    this.finishClose();
+  }
+  /** 等待当前队列排空；事件 handler 重入时直接返回，避免自等待。 */
+  async flush() {
+    if (this._synchronousHandlerDepth > 0) return;
+    if (this._drainPromise !== null) await this._drainPromise;
+    await Promise.resolve();
+  }
+  finishClose() {
+    if (!this._closing || this._closed || this._draining || this._drainScheduled || this._queue.length > 0) return;
+    this._closed = true;
+    this._handlers.clear();
+  }
+  scheduleDrain() {
+    if (this._draining || this._drainScheduled || this._queue.length === 0) return;
+    this._drainScheduled = true;
+    queueMicrotask(() => {
+      this._drainScheduled = false;
+      void this._drain();
+    });
+  }
+  async _drain() {
+    if (this._draining) return;
+    this._draining = true;
+    try {
+      while (this._queue.length > 0) {
+        const item = this._queue.shift();
+        try {
+          await item.run();
+        } catch (exc) {
+          this._log.warn("event dispatch failed:", exc);
+        } finally {
+          item.resolve();
+        }
+      }
+    } finally {
+      this._draining = false;
+      const resolve = this._drainResolve;
+      this._drainResolve = null;
+      this._drainPromise = null;
+      resolve?.();
+      this.finishClose();
+      if (this._queue.length > 0 && !this._closed) {
+        if (this._drainPromise === null) {
+          this._drainPromise = new Promise((nextResolve) => {
+            this._drainResolve = nextResolve;
+          });
+        }
+        this.scheduleDrain();
+      }
+    }
+  }
+  /** 当前是否正在调用应用 handler 或 observer。供生命周期入口识别重入。 */
+  isDispatchingHandler() {
+    return this._handlerDepth > 0;
+  }
+  async dispatchTask(task) {
+    let result;
+    this._handlerDepth += 1;
+    try {
+      this._synchronousHandlerDepth += 1;
+      result = task();
+    } catch (exc) {
+      this._log.warn("event task execution exception:", exc);
+      this._handlerDepth -= 1;
+      return;
+    } finally {
+      this._synchronousHandlerDepth -= 1;
+    }
+    try {
+      await result;
+    } catch (exc) {
+      this._log.warn("event task execution exception:", exc);
+    } finally {
+      this._handlerDepth -= 1;
+    }
+  }
+  async dispatchNow(event, payload) {
     const handlers = [...this._handlers.get(event) ?? []];
     for (const handler of handlers) {
+      let result;
+      this._handlerDepth += 1;
       try {
-        const result = handler(payload);
-        if (result instanceof Promise) {
-          await result;
-        }
+        this._synchronousHandlerDepth += 1;
+        result = handler(payload);
       } catch (exc) {
         this._log.warn(`event ${event} handler execution exception:`, exc);
+        this._handlerDepth -= 1;
+        continue;
+      } finally {
+        this._synchronousHandlerDepth -= 1;
+      }
+      try {
+        await result;
+      } catch (exc) {
+        this._log.warn(`event ${event} handler execution exception:`, exc);
+      } finally {
+        this._handlerDepth -= 1;
       }
     }
   }
@@ -1150,12 +1296,293 @@ var GatewayDiscovery = class {
 var MAX_WS_PAYLOAD_SIZE = 1e6;
 var MAX_RPC_INFLIGHT = 16;
 var MAX_BACKGROUND_RPC_INFLIGHT = 8;
+var WORKER_START_TIMEOUT_MS = 2e3;
+var WORKER_OPEN_TIMEOUT_MS = 2e3;
 var _noopLog3 = { error: () => {
 }, warn: () => {
 }, info: () => {
 }, debug: () => {
 } };
 var _rpcIdCounter = 0;
+var WORKER_WEBSOCKET_SOURCE = `
+let socket = null;
+self.postMessage({ type: 'ready' });
+self.onmessage = (event) => {
+  const command = event.data || {};
+  if (command.type === 'connect') {
+    try {
+      socket = new WebSocket(command.url);
+      socket.onopen = () => self.postMessage({ type: 'open' });
+      socket.onmessage = (message) => self.postMessage({ type: 'message', data: message.data });
+      socket.onerror = () => self.postMessage({ type: 'error', message: 'websocket error' });
+      socket.onclose = (close) => self.postMessage({
+        type: 'close', code: close.code, reason: close.reason || '', wasClean: close.wasClean === true,
+      });
+    } catch (error) {
+      self.postMessage({ type: 'error', message: error instanceof Error ? error.message : String(error) });
+    }
+    return;
+  }
+  if (command.type === 'send') {
+    try {
+      if (!socket || socket.readyState !== WebSocket.OPEN) throw new Error('websocket is not open');
+      socket.send(command.data);
+      self.postMessage({ type: 'send_result', id: command.id, ok: true });
+    } catch (error) {
+      self.postMessage({
+        type: 'send_result', id: command.id, ok: false,
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
+    return;
+  }
+  if (command.type === 'close' && socket) socket.close(command.code, command.reason);
+};
+`;
+var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
+  constructor(url) {
+    __publicField(this, "readyState", _WorkerWebSocketProxy.CONNECTING);
+    __publicField(this, "onopen", null);
+    __publicField(this, "onmessage", null);
+    __publicField(this, "onerror", null);
+    __publicField(this, "onclose", null);
+    __publicField(this, "_url");
+    __publicField(this, "_worker");
+    __publicField(this, "_workerUrl");
+    __publicField(this, "_nativeSocket", null);
+    __publicField(this, "_workerReady", false);
+    __publicField(this, "_opened", false);
+    __publicField(this, "_closedEventEmitted", false);
+    __publicField(this, "_workerStartTimer", null);
+    __publicField(this, "_workerOpenTimer", null);
+    __publicField(this, "_listeners", /* @__PURE__ */ new Map());
+    __publicField(this, "_pendingSends", /* @__PURE__ */ new Map());
+    __publicField(this, "_sendSeq", 0);
+    this._url = url;
+    this._workerUrl = URL.createObjectURL(new Blob([WORKER_WEBSOCKET_SOURCE], { type: "text/javascript" }));
+    try {
+      this._worker = new Worker(this._workerUrl);
+    } catch (error) {
+      URL.revokeObjectURL(this._workerUrl);
+      throw error;
+    }
+    const worker = this._worker;
+    worker.onmessage = (event) => this._handleWorkerMessage(event.data);
+    worker.onerror = (event) => {
+      event.preventDefault?.();
+      if (!this._opened) {
+        this._fallbackToNative();
+        return;
+      }
+      this._fallbackToNative(true);
+    };
+    this._workerStartTimer = globalThis.setTimeout(() => this._fallbackToNative(), WORKER_START_TIMEOUT_MS);
+  }
+  send(data) {
+    if (this.readyState !== _WorkerWebSocketProxy.OPEN) return Promise.reject(new Error("websocket is not open"));
+    if (this._nativeSocket) {
+      try {
+        this._nativeSocket.send(data);
+        return Promise.resolve();
+      } catch (error) {
+        return Promise.reject(error instanceof Error ? error : new Error(String(error)));
+      }
+    }
+    const worker = this._worker;
+    if (!worker) return Promise.reject(new Error("websocket worker is not available"));
+    const id = ++this._sendSeq;
+    return new Promise((resolve, reject) => {
+      this._pendingSends.set(id, { resolve, reject });
+      try {
+        worker.postMessage({ type: "send", id, data });
+      } catch (error) {
+        this._pendingSends.delete(id);
+        reject(error instanceof Error ? error : new Error(String(error)));
+      }
+    });
+  }
+  close(code, reason) {
+    if (this.readyState === _WorkerWebSocketProxy.CLOSED) return;
+    this.readyState = _WorkerWebSocketProxy.CLOSING;
+    if (this._nativeSocket) {
+      try {
+        this._nativeSocket.close(code, reason);
+      } catch {
+        this._emitClose(new CloseEvent("close", { code: code ?? 1e3, reason: reason ?? "", wasClean: true }));
+      }
+      return;
+    }
+    if (!this._workerReady || !this._worker) {
+      this._disposeWorker();
+      this._emitClose(new CloseEvent("close", { code: code ?? 1e3, reason: reason ?? "", wasClean: true }));
+      return;
+    }
+    try {
+      this._worker.postMessage({ type: "close", code, reason });
+    } catch {
+      this._fallbackToNative();
+    }
+  }
+  addEventListener(type, listener) {
+    const callback = typeof listener === "function" ? listener : (event) => listener.handleEvent(event);
+    const listeners = this._listeners.get(type) ?? /* @__PURE__ */ new Set();
+    listeners.add(callback);
+    this._listeners.set(type, listeners);
+  }
+  removeEventListener(type, listener) {
+    if (typeof listener === "function") this._listeners.get(type)?.delete(listener);
+  }
+  _handleWorkerMessage(reply) {
+    if (reply.type === "ready") {
+      if (this._workerReady || !this._worker) return;
+      this._workerReady = true;
+      this._clearWorkerStartTimer();
+      try {
+        this._worker.postMessage({ type: "connect", url: this._url });
+        this._workerOpenTimer = globalThis.setTimeout(
+          () => this._fallbackToNative(),
+          WORKER_OPEN_TIMEOUT_MS
+        );
+      } catch {
+        this._fallbackToNative();
+      }
+      return;
+    }
+    if (reply.type === "send_result" && reply.id !== void 0) {
+      const pending = this._pendingSends.get(reply.id);
+      if (!pending) return;
+      this._pendingSends.delete(reply.id);
+      if (reply.ok) pending.resolve();
+      else pending.reject(new Error(reply.error || "websocket send failed"));
+      return;
+    }
+    if (reply.type === "open") {
+      this._clearWorkerOpenTimer();
+      this._opened = true;
+      this.readyState = _WorkerWebSocketProxy.OPEN;
+      const event = new Event("open");
+      this.onopen?.(event);
+      this._emit("open", event);
+      return;
+    }
+    if (reply.type === "message") {
+      const event = new MessageEvent("message", { data: reply.data });
+      this.onmessage?.(event);
+      this._emit("message", event);
+      return;
+    }
+    if (reply.type === "error") {
+      if (!this._opened && this.readyState === _WorkerWebSocketProxy.CONNECTING) {
+        this._fallbackToNative();
+        return;
+      }
+      this._emitError(reply.message || "websocket worker error");
+      return;
+    }
+    if (reply.type === "close") {
+      if (!this._opened && this.readyState === _WorkerWebSocketProxy.CONNECTING) {
+        this._fallbackToNative();
+        return;
+      }
+      this._emitClose(new CloseEvent("close", {
+        code: reply.code ?? 1006,
+        reason: reply.reason ?? "",
+        wasClean: reply.wasClean === true
+      }));
+    }
+  }
+  _fallbackToNative(force = false) {
+    if (this._nativeSocket || this.readyState === _WorkerWebSocketProxy.CLOSED) return;
+    if (!force && (this.readyState !== _WorkerWebSocketProxy.CONNECTING || this._opened)) return;
+    const wasOpened = this._opened;
+    this._opened = false;
+    this.readyState = _WorkerWebSocketProxy.CONNECTING;
+    this._disposeWorker();
+    try {
+      const socket = new WebSocket(this._url);
+      this._nativeSocket = socket;
+      socket.onopen = (event) => {
+        this._opened = true;
+        this.readyState = _WorkerWebSocketProxy.OPEN;
+        if (!wasOpened) {
+          this.onopen?.(event);
+          this._emit("open", event);
+        }
+      };
+      socket.onmessage = (event) => {
+        this.onmessage?.(event);
+        this._emit("message", event);
+      };
+      socket.onerror = (event) => {
+        this.onerror?.(event);
+        this._emit("error", event);
+      };
+      socket.onclose = (event) => this._emitClose(event);
+    } catch (error) {
+      this.readyState = _WorkerWebSocketProxy.CLOSED;
+      this._emitError(error instanceof Error ? error.message : String(error));
+    }
+  }
+  _emitClose(event) {
+    if (this._closedEventEmitted) return;
+    this._closedEventEmitted = true;
+    this.readyState = _WorkerWebSocketProxy.CLOSED;
+    for (const pending of this._pendingSends.values()) pending.reject(new Error("websocket closed"));
+    this._pendingSends.clear();
+    this.onclose?.(event);
+    this._emit("close", event);
+    this._disposeWorker();
+    this._nativeSocket = null;
+  }
+  _clearWorkerStartTimer() {
+    if (this._workerStartTimer === null) return;
+    globalThis.clearTimeout(this._workerStartTimer);
+    this._workerStartTimer = null;
+  }
+  _clearWorkerOpenTimer() {
+    if (this._workerOpenTimer === null) return;
+    globalThis.clearTimeout(this._workerOpenTimer);
+    this._workerOpenTimer = null;
+  }
+  _disposeWorker() {
+    this._clearWorkerStartTimer();
+    this._clearWorkerOpenTimer();
+    for (const pending of this._pendingSends.values()) pending.reject(new Error("websocket worker unavailable"));
+    this._pendingSends.clear();
+    const worker = this._worker;
+    this._worker = null;
+    if (worker) {
+      worker.onmessage = null;
+      worker.onerror = null;
+      worker.terminate();
+    }
+    const workerUrl = this._workerUrl;
+    this._workerUrl = null;
+    if (workerUrl && typeof URL.revokeObjectURL === "function") URL.revokeObjectURL(workerUrl);
+  }
+  _emitError(message) {
+    const event = new ErrorEvent("error", { message });
+    this.onerror?.(event);
+    this._emit("error", event);
+  }
+  _emit(type, event) {
+    for (const listener of [...this._listeners.get(type) ?? []]) listener(event);
+  }
+};
+__publicField(_WorkerWebSocketProxy, "CONNECTING", 0);
+__publicField(_WorkerWebSocketProxy, "OPEN", 1);
+__publicField(_WorkerWebSocketProxy, "CLOSING", 2);
+__publicField(_WorkerWebSocketProxy, "CLOSED", 3);
+var WorkerWebSocketProxy = _WorkerWebSocketProxy;
+function createTransportWebSocket(url) {
+  if (typeof Worker === "function" && typeof Blob === "function" && typeof URL !== "undefined" && typeof URL.createObjectURL === "function" && typeof URL.revokeObjectURL === "function") {
+    try {
+      return new WorkerWebSocketProxy(url);
+    } catch {
+    }
+  }
+  return new WebSocket(url);
+}
 var TRACE_SPAN_DETAIL_FIELDS = [
   "method",
   "route",
@@ -1426,6 +1853,10 @@ var RPCTransport = class {
     __publicField(this, "_traceMode", "off");
     // Trace observer：observer(traceInfo) 在每次 RPC/事件携带 _trace 时调用
     __publicField(this, "_traceObserver", null);
+    // 每个 transport 实例一个轻量级网络 actor。命令只在此处启动网络操作，
+    // 不等待 RPC 响应，避免应用回调中的 send 反向占住收包路径。
+    __publicField(this, "_actorTail", Promise.resolve());
+    __publicField(this, "_actorBusy", false);
     this._dispatcher = opts.eventDispatcher;
     this._timeout = opts.timeout ?? 10;
     this._connectTimeout = opts.timeout ?? 10;
@@ -1455,15 +1886,18 @@ var RPCTransport = class {
   setMetaObserver(observer) {
     this._metaObserver = observer;
   }
-  async _notifyMetaObserver(message) {
-    if (this._metaObserver === null) return;
+  _notifyMetaObserver(message) {
+    const observer = this._metaObserver;
+    if (observer === null) return;
     const meta = message._meta;
     if (!isJsonObject(meta)) return;
-    try {
-      await this._metaObserver(meta);
-    } catch (exc) {
-      this._log.debug(`meta_observer raised: ${String(exc)}`);
-    }
+    this._dispatcher.enqueueTask(async () => {
+      try {
+        await observer(meta);
+      } catch (exc) {
+        this._log.debug(`meta_observer raised: ${String(exc)}`);
+      }
+    });
   }
   /** 设置 trace 模式：off / log / diag */
   setTraceMode(mode) {
@@ -1499,7 +1933,10 @@ var RPCTransport = class {
    * 连接到 WebSocket URL。
    * 等待首条消息，若为 challenge 则返回，否则进入消息路由。
    */
-  async connect(url) {
+  connect(url) {
+    return this._enqueueActorStart(() => this._connectImpl(url));
+  }
+  async _connectImpl(url) {
     const tStart = Date.now();
     this._log.debug(`connect enter: url=${url}`);
     const setup = await this._withConnectionSetup(async () => {
@@ -1508,7 +1945,7 @@ var RPCTransport = class {
       this._lastCloseCode = null;
       this._lastCloseReason = "";
       const handshake = new Promise((resolve, reject) => {
-        const ws = new WebSocket(url);
+        const ws = createTransportWebSocket(url);
         this._ws = ws;
         this._closed = false;
         let initialResolved = false;
@@ -1637,7 +2074,10 @@ var RPCTransport = class {
     return setup.handshake;
   }
   /** 关闭连接 */
-  async close() {
+  close() {
+    return this._enqueueActor(() => this._closeImpl());
+  }
+  async _closeImpl() {
     await this._withConnectionSetup(() => this._closeUnlocked());
   }
   /** 已持有连接建立串行权时关闭当前 WebSocket。 */
@@ -1708,7 +2148,13 @@ var RPCTransport = class {
    * 发起 JSON-RPC 2.0 调用。
    * 返回 result 字段的值；若有 error 字段则抛出映射后的错误。
    */
-  async call(method, params2, timeout, trace, background = false) {
+  call(method, params2, timeout, trace, background = false) {
+    return this._enqueueActorStart(
+      () => this._callImpl(method, params2, timeout, trace, background),
+      () => new TimeoutError(`rpc cancelled: ${method}`, { retryable: true })
+    );
+  }
+  _callImpl(method, params2, timeout, trace, background = false) {
     if (this._closed || !this._ws) {
       throw this._notConnectedError();
     }
@@ -1749,7 +2195,7 @@ var RPCTransport = class {
         this._drainRpcQueue();
       }, effectiveTimeout);
       const pending = {
-        resolve: async (response) => {
+        resolve: (response) => {
           clearTimeout(timer);
           const elapsed = Date.now() - tStart;
           if (response.error !== void 0) {
@@ -1767,7 +2213,7 @@ var RPCTransport = class {
             if (traceId) {
               this._log.info(`[trace=${traceId}] rpc_recv method=${method} rpc_id=${rpcId} duration_ms=${elapsed} status=ok`);
             }
-            await this._notifyMetaObserver(response);
+            this._notifyMetaObserver(response);
             const respTrace = response._trace;
             if (respTrace && typeof respTrace === "object" && !Array.isArray(respTrace)) {
               this._handleResponseTrace(method, "ok", elapsed, respTrace);
@@ -1815,7 +2261,10 @@ var RPCTransport = class {
     return Object.assign(promise, { cancel: () => cancelRpc?.() });
   }
   /** 发送 JSON-RPC 2.0 Notification，不分配 id，也不等待响应。 */
-  async notify(method, params2) {
+  notify(method, params2) {
+    return this._enqueueActorStart(() => this._notifyImpl(method, params2));
+  }
+  async _notifyImpl(method, params2) {
     if (this._closed || !this._ws) {
       throw this._notConnectedError();
     }
@@ -1844,6 +2293,58 @@ var RPCTransport = class {
     });
     return run;
   }
+  _enqueueActor(operation) {
+    this._actorBusy = true;
+    const run = this._actorTail.then(async () => {
+      return await operation();
+    }, async () => {
+      return await operation();
+    });
+    const tail = run.then(() => void 0, () => void 0);
+    this._actorTail = tail;
+    void tail.then(() => {
+      if (this._actorTail === tail) this._actorBusy = false;
+    });
+    return run;
+  }
+  _enqueueActorStart(operation, cancellationError) {
+    let resolveResult;
+    let rejectResult;
+    const result = new Promise((resolve, reject) => {
+      resolveResult = resolve;
+      rejectResult = reject;
+    });
+    let cancel;
+    let cancelRequested = false;
+    const launch = () => {
+      if (cancelRequested) return;
+      try {
+        const inner = operation();
+        cancel = inner.cancel;
+        inner.then(resolveResult, rejectResult);
+      } catch (err) {
+        rejectResult(err);
+      }
+    };
+    if (this._actorBusy) {
+      const gate = this._actorTail.then(launch, launch);
+      const tail = gate.then(() => void 0, () => void 0);
+      this._actorTail = tail;
+      void tail.then(() => {
+        if (this._actorTail === tail) this._actorBusy = false;
+      });
+    } else {
+      launch();
+    }
+    return Object.assign(result, {
+      cancel: () => {
+        if (cancelRequested) return;
+        cancelRequested = true;
+        if (cancel) cancel();
+        else rejectResult(cancellationError?.() ?? new TimeoutError("rpc cancelled", { retryable: true }));
+      }
+    });
+  }
   _sendText(payload, context, beforeSend) {
     return this._enqueueSend(async () => {
       if (beforeSend && !beforeSend()) {
@@ -1854,7 +2355,7 @@ var RPCTransport = class {
       }
       const ws = this._ws;
       try {
-        ws.send(payload);
+        await Promise.resolve(ws.send(payload));
       } catch (err) {
         throw await this._sendFailureError(context, err, ws);
       }
@@ -1978,7 +2479,14 @@ var RPCTransport = class {
       const enriched = { ...respTrace, spans };
       this._log.info(traceDisplay(method, status, elapsedMs, respTrace, spans));
       if (this._traceObserver !== null) {
-        this._traceObserver({ type: "rpc", method, trace: enriched, status, duration_ms: elapsedMs });
+        const observer = this._traceObserver;
+        this._dispatcher.enqueueTask(async () => {
+          try {
+            await observer({ type: "rpc", method, trace: enriched, status, duration_ms: elapsedMs });
+          } catch (err) {
+            this._log.debug(`trace observer raised: ${err instanceof Error ? err.message : String(err)}`);
+          }
+        });
       }
     } catch (err) {
       this._log.debug(`trace handling raised: ${err instanceof Error ? err.message : String(err)}`);
@@ -2019,10 +2527,17 @@ var RPCTransport = class {
     this._backgroundRpcQueue = [];
     if (!wasClosed) {
       const error = new ConnectionError(`websocket closed: code=${event.code} reason=${event.reason}`);
-      this._dispatcher.publish("connection.error", { error });
       if (this._onDisconnect) {
-        this._onDisconnect(error, event.code).catch((exc) => this._log.warn("[aun_core.transport] disconnect callback exception:", exc));
+        const onDisconnect = this._onDisconnect;
+        this._dispatcher.enqueueTask(async () => {
+          try {
+            await onDisconnect(error, event.code);
+          } catch (exc) {
+            this._log.warn("[aun_core.transport] disconnect callback exception:", exc);
+          }
+        });
       }
+      this._dispatcher.enqueue("connection.error", { error });
     }
   }
   _notConnectedError() {
@@ -2050,39 +2565,43 @@ var RPCTransport = class {
     if (method === "challenge") {
       this._challenge = message;
       this._log.debug("challenge received");
-      this._dispatcher.publish("connection.challenge", message.params ?? {});
+      this._dispatcher.enqueue("connection.challenge", message.params ?? {});
       return;
     }
     if (method.startsWith("event/")) {
       const protocolEvent = method.slice(6);
       const sdkEvent = EVENT_NAME_MAP[protocolEvent] ?? protocolEvent;
       this._log.debug(`event recv: event=${sdkEvent} ${summarizeDict(message.params, DIAG_RESULT_FIELDS)}`);
-      void this._notifyMetaObserver(message);
+      this._notifyMetaObserver(message);
       const params2 = message.params ?? {};
       if ("_trace" in params2) {
         const eventTrace = params2._trace;
         delete params2._trace;
         if (eventTrace && typeof eventTrace === "object" && !Array.isArray(eventTrace)) {
           if (this._traceObserver !== null) {
-            try {
-              this._traceObserver({ type: "event", event: sdkEvent, trace: eventTrace });
-            } catch {
-            }
+            const observer = this._traceObserver;
+            const tracePayload = eventTrace;
+            this._dispatcher.enqueueTask(async () => {
+              try {
+                await observer({ type: "event", event: sdkEvent, trace: tracePayload });
+              } catch {
+              }
+            });
           }
           const traceObj = eventTrace;
           this._log.info(`[trace=${String(traceObj.trace_id ?? "")}] event_recv event=${sdkEvent}`);
         }
       }
       if (sdkEvent.startsWith("app.")) {
-        this._dispatcher.publish(sdkEvent, params2);
+        this._dispatcher.enqueue(sdkEvent, params2);
         return;
       }
-      this._dispatcher.publish(`_raw.${sdkEvent}`, params2);
+      this._dispatcher.enqueue(`_raw.${sdkEvent}`, params2);
       return;
     }
-    void this._notifyMetaObserver(message);
+    this._notifyMetaObserver(message);
     this._log.debug(`notification recv: method=${method || "<no-method>"}`);
-    this._dispatcher.publish("notification", message);
+    this._dispatcher.enqueue("notification", message);
   }
   _decodeMessage(raw) {
     if (isJsonObject(raw)) {
@@ -2806,7 +3325,7 @@ var _AuthFlow = class _AuthFlow {
     return new Promise((resolve, reject) => {
       let ws;
       try {
-        ws = new WebSocket(gatewayUrl);
+        ws = createTransportWebSocket(gatewayUrl);
       } catch (e) {
         reject(new AuthError(`WebSocket \u8FDE\u63A5\u5931\u8D25: ${gatewayUrl}`));
         return;
@@ -2849,7 +3368,19 @@ var _AuthFlow = class _AuthFlow {
               params: params2
             });
             this._log.debug(`short RPC request full: ${JSON.stringify(redactRpcLogPayload(JSON.parse(requestPayload)))}`);
-            ws.send(requestPayload);
+            const sendResult = ws.send(requestPayload);
+            if (sendResult && typeof sendResult.then === "function") {
+              void Promise.resolve(sendResult).catch((error) => {
+                if (settled) return;
+                settled = true;
+                globalThis.clearTimeout(timeout);
+                try {
+                  ws.close();
+                } catch {
+                }
+                reject(error instanceof Error ? error : new AuthError(String(error)));
+              });
+            }
             return;
           }
           if (!isJsonObject(msg) || msg.id !== requestId) return;
@@ -4479,6 +5010,26 @@ function nonNegativeSafeSequenceHint(value) {
   if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) return null;
   return value;
 }
+function canonicalDeliverySource(source) {
+  switch (String(source ?? "").trim()) {
+    case "group-push":
+    case "ordered":
+    case "legacy":
+      return "push";
+    case "tail":
+    case "pull-drained":
+    case "pull_drained":
+      return "pull";
+    case "inline-push":
+      return "inline_push";
+    case "pending-retry":
+      return "pending_retry";
+    case "":
+      return "direct";
+    default:
+      return String(source).trim();
+  }
+}
 function deduplicatePlainForwardPageMessages(value, afterSeq) {
   if (!Array.isArray(value)) return [];
   const bySeq = /* @__PURE__ */ new Map();
@@ -4507,6 +5058,11 @@ function p2pAppEventFromPlainPullMessage(message) {
 var MessageDeliveryEngine = class {
   constructor(runtime) {
     __publicField(this, "runtime");
+    __publicField(this, "syncRun", 0);
+    __publicField(this, "syncingNamespaces", /* @__PURE__ */ new Set());
+    __publicField(this, "syncSessions", /* @__PURE__ */ new Map());
+    __publicField(this, "pendingPullDeliveryChanges", null);
+    __publicField(this, "deliveryGeneration", 0);
     __publicField(this, "realtimeTailResults", null);
     __publicField(this, "realtimeSyncing", null);
     __publicField(this, "pendingP2pPullUpper", null);
@@ -4525,7 +5081,10 @@ var MessageDeliveryEngine = class {
     this.runtime = runtime;
   }
   resetInlineAckState() {
+    this.syncStopped("aborted");
     this.inlineGeneration += 1;
+    this.deliveryGeneration += 1;
+    this.pendingPullDeliveryChanges = null;
     void this.runtime.client._rpcPipeline?.invalidatePulls?.();
     this.realtimeSyncing = null;
     this.pendingP2pPullUpper = null;
@@ -4538,6 +5097,8 @@ var MessageDeliveryEngine = class {
     this.pendingP2PInlineAcks = null;
     this.pendingGroupInlineAcks = null;
     this.pendingGroupInlineAckNamespaces = null;
+    this.syncingNamespaces.clear();
+    this.syncSessions.clear();
   }
   isInlineGenerationCurrent(generation) {
     return generation === this.inlineGeneration;
@@ -4565,6 +5126,91 @@ var MessageDeliveryEngine = class {
   endRealtimeSync(ns) {
     this.realtimeSyncing?.delete(ns);
   }
+  onPullStarted(ns) {
+    if (!ns || this.syncingNamespaces.has(ns)) return;
+    if (this.syncingNamespaces.size === 0) {
+      this.syncRun += 1;
+      this.syncSessions.clear();
+      this.runtime.client._dispatcher?.enqueue?.("sync.started", {
+        run_id: this.syncRun,
+        source: "pull",
+        syncing: true,
+        namespaces_pending: 1,
+        received_total: 0,
+        namespace: ns,
+        started_at: Date.now()
+      });
+    }
+    this.syncingNamespaces.add(ns);
+    this.syncSessions.set(ns, { pages: 0, raw: 0, pulled: 0 });
+  }
+  onPullPage(ns, pulledCount, hasMore, maxSeen, remaining, rawCount = pulledCount, currentSeq, targetSeq) {
+    this.onPullStarted(ns);
+    if (!ns) return;
+    const session = this.syncSessions.get(ns) ?? { pages: 0, raw: 0, pulled: 0 };
+    session.pages += 1;
+    session.raw += Math.max(0, rawCount);
+    session.pulled += Math.max(0, pulledCount);
+    this.syncSessions.set(ns, session);
+    const received = session.pulled;
+    const progress = {
+      run_id: this.syncRun,
+      source: "pull",
+      namespace: ns,
+      page: session.pages,
+      page_raw_count: Math.max(0, rawCount),
+      page_pulled_count: Math.max(0, pulledCount),
+      pulled_count: received,
+      received_total: received,
+      batch_size: Math.max(0, pulledCount),
+      estimated_remaining: hasMore ? void 0 : 0,
+      max_seen: maxSeen,
+      has_more: hasMore
+    };
+    if (typeof currentSeq === "number" && Number.isSafeInteger(currentSeq) && currentSeq >= 0) {
+      progress.current_seq = currentSeq;
+    }
+    if (typeof targetSeq === "number" && Number.isSafeInteger(targetSeq) && targetSeq >= 0) {
+      progress.target_seq = targetSeq;
+    }
+    if (typeof remaining === "number" && Number.isSafeInteger(remaining) && remaining >= 0) {
+      progress.remaining = remaining;
+      progress.estimated_remaining = progress.remaining;
+    }
+    this.runtime.client._dispatcher?.enqueue?.("sync.progress", progress);
+  }
+  onPullAborted() {
+    this.syncStopped("aborted");
+  }
+  syncStopped(reason = "pull_drained") {
+    if (this.syncingNamespaces.size === 0) return;
+    const sessions = [...this.syncSessions.entries()];
+    const receivedTotal = sessions.reduce((total, [, session]) => total + session.pulled, 0);
+    this.syncingNamespaces.clear();
+    this.syncSessions.clear();
+    const payload = {
+      run_id: this.syncRun,
+      source: "pull",
+      syncing: false,
+      namespaces_pending: 0,
+      received_total: receivedTotal,
+      reason,
+      stopped_at: Date.now()
+    };
+    if (sessions.length === 1) {
+      const [namespace, session] = sessions[0];
+      payload.namespace = namespace;
+      payload.pages = session.pages;
+      payload.pulled_count = session.pulled;
+    } else if (sessions.length > 1) {
+      payload.namespaces = sessions.map(([namespace]) => namespace);
+      payload.pages = sessions.reduce((total, [, session]) => total + session.pages, 0);
+      payload.pulled_count = receivedTotal;
+    }
+    this.runtime.client._dispatcher?.enqueue?.("sync.stopped", {
+      ...payload
+    });
+  }
   hasPendingPull(ns) {
     const pending = ns.startsWith("p2p:") ? this.pendingP2pPullUpper : this.pendingGroupPullUpper;
     return (pending?.get(ns) ?? 0) > 0;
@@ -4573,6 +5219,75 @@ var MessageDeliveryEngine = class {
     if (!ns) return;
     this.schedulePendingPullIfNeeded(ns, "pull-gate-idle");
   }
+  onPullWorkSettled() {
+    const pipeline = this.runtime.client._rpcPipeline;
+    if (pipeline?.hasAnyPullActivity?.() === true) return;
+    void this.flushPullDeliveryChanges().finally(() => this.syncStopped("pull_drained"));
+  }
+  deliveryChangeNamespace(event, payload, ns = "") {
+    if (event === "message.received") return "p2p";
+    if (event !== "group.message_created") return "";
+    if (!isJsonObject(payload)) return "";
+    const aid = String(this.runtime.client._aid ?? "").trim().toLowerCase();
+    const dot = aid.indexOf(".");
+    const localIssuer = dot > 0 ? aid.slice(dot + 1) : "";
+    const fallback = ns.startsWith("group:") ? ns.slice("group:".length) : "";
+    const groupAid = normalizeGroupAid(payload.group_aid ?? payload.group_id ?? fallback, { localIssuer });
+    return groupAid.includes(".") ? `group:${groupAid}` : "";
+  }
+  isDeliverableMessageBody(event, payload) {
+    if (event !== "message.received" && event !== "group.message_created" || !isJsonObject(payload)) return false;
+    const messageId = typeof payload.message_id === "string" && payload.message_id.trim().length > 0;
+    const seq2 = typeof payload.seq === "number" && Number.isSafeInteger(payload.seq) && payload.seq > 0;
+    return messageId || seq2;
+  }
+  recordDeliveryChange(changes, event, payload, ns, generation) {
+    if (generation !== this.deliveryGeneration || !this.isDeliverableMessageBody(event, payload)) return;
+    const namespace = this.deliveryChangeNamespace(event, payload, ns);
+    if (!namespace) return;
+    changes.set(namespace, (changes.get(namespace) ?? 0) + 1);
+  }
+  deliveryChangesPayload(changes) {
+    return [...changes.entries()].filter(([, deliveredCount]) => deliveredCount > 0).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([namespace, deliveredCount]) => ({ namespace, delivered_count: deliveredCount }));
+  }
+  createDeliveryChangeBatch(trigger) {
+    return { generation: this.deliveryGeneration, trigger, changes: /* @__PURE__ */ new Map(), closed: false };
+  }
+  async flushRealtimeDeliveryChanges(batch) {
+    if (batch.closed) return;
+    batch.closed = true;
+    if (batch.generation !== this.deliveryGeneration) return;
+    if (this.deliveryChangesPayload(batch.changes).length === 0) return;
+    const pendingPull = this.pendingPullDeliveryChanges;
+    this.pendingPullDeliveryChanges = null;
+    if (pendingPull) {
+      for (const [namespace, count] of pendingPull) {
+        batch.changes.set(namespace, (batch.changes.get(namespace) ?? 0) + count);
+      }
+    }
+    if (batch.generation !== this.deliveryGeneration) return;
+    const changes = this.deliveryChangesPayload(batch.changes);
+    if (changes.length === 0) return;
+    this.runtime.client._dispatcher.enqueue("delivery.changed", {
+      trigger: batch.trigger,
+      source: batch.trigger,
+      changes
+    });
+  }
+  async flushPullDeliveryChanges() {
+    const generation = this.deliveryGeneration;
+    const pending = this.pendingPullDeliveryChanges;
+    if (!pending || pending.size === 0 || generation !== this.deliveryGeneration) return;
+    this.pendingPullDeliveryChanges = null;
+    if (generation !== this.deliveryGeneration) return;
+    const changes = this.deliveryChangesPayload(pending);
+    if (changes.length === 0) return;
+    this.runtime.client._dispatcher.enqueue("delivery.changed", {
+      trigger: "pull_drained",
+      source: "pull",
+      changes
+    });
+  }
   recordPendingPull(ns, seq2) {
     if (!ns || !Number.isSafeInteger(seq2) || seq2 <= 0) return;
     const pending = ns.startsWith("p2p:") ? this.pendingP2pPullUpper ?? /* @__PURE__ */ new Map() : this.pendingGroupPullUpper ?? /* @__PURE__ */ new Map();
@@ -5074,7 +5789,7 @@ var MessageDeliveryEngine = class {
         }
         const message = normalizeGroupMentionMode(rawMessage);
         if (this.recallEventFromGroupMessage(message)) {
-          if (await this.publishGroupRecallTombstone(groupId, seq2, message)) {
+          if (await this.publishGroupRecallTombstone(groupId, seq2, message, "pull")) {
             this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seq2);
             publishedCount += 1;
@@ -5145,16 +5860,27 @@ var MessageDeliveryEngine = class {
       this.ensurePullOperationCurrent();
       await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
     }
+    const remaining = typeof response.remaining === "number" && Number.isSafeInteger(response.remaining) && response.remaining >= 0 ? response.remaining : null;
+    this.onPullPage(
+      ns,
+      publishedCount,
+      response.has_more === true,
+      messages.length > 0 ? Number(messages[messages.length - 1].seq ?? 0) : void 0,
+      remaining,
+      messages.length,
+      client._seqTracker.getContiguousSeq(ns),
+      messages.length > 0 ? Number(messages[messages.length - 1].seq ?? 0) : void 0
+    );
     return { rawCount: messages.length, publishedCount };
   }
-  enqueueOrderedMessage(ns, event, seq2, payload) {
+  enqueueOrderedMessage(ns, event, seq2, payload, source = "push") {
     const client = this.runtime.client;
     let queue = client._pendingOrderedMsgs.get(ns);
     if (!queue) {
       queue = /* @__PURE__ */ new Map();
       client._pendingOrderedMsgs.set(ns, queue);
     }
-    queue.set(seq2, { event, payload });
+    queue.set(seq2, { event, payload, source });
     if (queue.size > PENDING_ORDERED_LIMIT) {
       const drop = [...queue.keys()].sort((a, b) => a - b).slice(0, queue.size - PENDING_ORDERED_LIMIT);
       for (const oldSeq of drop) queue.delete(oldSeq);
@@ -5163,23 +5889,23 @@ var MessageDeliveryEngine = class {
   isGroupEventNamespace(ns) {
     return ns.startsWith("group_event:");
   }
-  async publishOrderedQueueItem(ns, event, seq2, payload, pullResponse = false) {
+  async publishOrderedQueueItem(ns, event, seq2, payload, pullResponse = false, source = "push", batch) {
     const client = this.runtime.client;
     if (event === "group.changed" && this.isGroupEventNamespace(ns)) {
-      await this.publishOrderedGroupChanged(payload);
+      await this.publishOrderedGroupChanged(payload, source);
       return;
     }
     if (event === "message.recalled") {
-      await this.publishMessageRecallTombstone(seq2, payload);
+      await this.publishMessageRecallTombstone(seq2, payload, source);
       return;
     }
     if (pullResponse) {
-      await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
+      await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
       return;
     }
-    await client._publishAppEvent(event, payload);
+    await client._publishAppEvent(event, payload, source, ns, batch);
   }
-  async publishOrderedGroupChanged(payload) {
+  async publishOrderedGroupChanged(payload, source = "ordered") {
     const client = this.runtime.client;
     if (isJsonObject(payload)) {
       const eventPayload = payload;
@@ -5190,7 +5916,7 @@ var MessageDeliveryEngine = class {
         if (groupId) client._cleanupDissolvedGroup?.(groupId);
       }
     }
-    await client._publishAppEvent("group.changed", payload);
+    await client._publishAppEvent("group.changed", payload, source);
   }
   isInstanceScopedMessageEvent(event) {
     return event === "message.received" || event === "message.recalled" || event === "message.undecryptable" || event === "group.message_created" || event === "group.message_recalled" || event === "group.message_undecryptable";
@@ -5207,17 +5933,22 @@ var MessageDeliveryEngine = class {
     }
     return result;
   }
-  normalizePublishedMessagePayload(event, payload) {
+  normalizePublishedMessagePayload(event, payload, source = "direct") {
+    let normalized;
     if (this.isInstanceScopedMessageEvent(event)) {
       payload = this.stripInlineInternalFields(payload);
       if (event === "group.message_created") payload = normalizeGroupMentionMode(payload);
-      return this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
-    }
-    if (this.isGroupScopedEvent(event)) {
+      normalized = this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+    } else if (this.isGroupScopedEvent(event)) {
       payload = this.stripInlineInternalFields(payload);
-      return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+      normalized = this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+    } else {
+      normalized = payload;
     }
-    return payload;
+    const canonicalSource = canonicalDeliverySource(source);
+    if (canonicalSource === "direct" || !isJsonObject(normalized)) return normalized;
+    if (!this.isInstanceScopedMessageEvent(event) && !this.isGroupScopedEvent(event)) return normalized;
+    return { ...normalized, source: canonicalSource };
   }
   stripInlineInternalFields(payload) {
     if (!isJsonObject(payload)) return payload;
@@ -5320,6 +6051,7 @@ var MessageDeliveryEngine = class {
     setIfPresent("type", firstValue(body.type, params2.type, params2.message_type, params2.payload_type));
     setIfPresent("kind", firstValue(body.kind, params2.kind));
     setIfPresent("version", firstValue(body.version, params2.version));
+    setIfPresent("message_id", firstValue(params2.message_id, body.message_id, resultObj.message_id));
     setIfPresent("timestamp", firstValue(params2.timestamp, resultObj.timestamp, resultObj.created_at, resultObj.t_server, Date.now()));
     envelope.encrypted = Boolean(encrypted);
     const context = this.envelopeMetadata(params2.context);
@@ -5432,7 +6164,7 @@ var MessageDeliveryEngine = class {
     if (tombstoneId) return `p2p|tombstone:${tombstoneId}`;
     return `p2p|unknown:${Date.now()}:${Math.random()}`;
   }
-  async publishMessageRecallTombstone(seq2, message) {
+  async publishMessageRecallTombstone(seq2, message, source = "push") {
     const client = this.runtime.client;
     const eventPayload = this.recallEventFromMessage(message);
     if (!eventPayload) return false;
@@ -5451,7 +6183,7 @@ var MessageDeliveryEngine = class {
       const drop = [...seen.entries()].sort((a, b) => a[1] - b[1]).slice(0, seen.size - MESSAGE_RECALL_SEEN_LIMIT);
       for (const [oldKey] of drop) seen.delete(oldKey);
     }
-    await client._publishAppEvent("message.recalled", eventPayload);
+    await client._publishAppEvent("message.recalled", eventPayload, source);
     client._clientLog.debug(`message.recalled published: seq=${String(seq2)} ids=${JSON.stringify(eventPayload.message_ids)}`);
     return true;
   }
@@ -5513,7 +6245,7 @@ var MessageDeliveryEngine = class {
     if (tombstoneId) return `${normalizedGroupId}|tombstone:${tombstoneId}`;
     return `${normalizedGroupId}|unknown:${Date.now()}:${Math.random()}`;
   }
-  async publishGroupRecallTombstone(groupId, seq2, message) {
+  async publishGroupRecallTombstone(groupId, seq2, message, source = "push") {
     const client = this.runtime.client;
     const eventPayload = this.recallEventFromGroupMessage(message);
     if (!eventPayload) return false;
@@ -5534,7 +6266,7 @@ var MessageDeliveryEngine = class {
       const drop = [...seen.entries()].sort((a, b) => a[1] - b[1]).slice(0, seen.size - GROUP_RECALL_SEEN_LIMIT);
       for (const [oldKey] of drop) seen.delete(oldKey);
     }
-    await client._publishAppEvent("group.message_recalled", eventPayload);
+    await client._publishAppEvent("group.message_recalled", eventPayload, source);
     client._clientLog.debug(`group.message_recalled published: group=${groupId} seq=${String(seq2)} ids=${JSON.stringify(eventPayload.message_ids)}`);
     return true;
   }
@@ -5597,8 +6329,9 @@ var MessageDeliveryEngine = class {
     }
     if (contig !== contigBefore) this.persistSeq(ns);
   }
-  async publishAppEvent(event, payload) {
+  async publishAppEvent(event, payload, source = "direct", ns = "", batch) {
     const client = this.runtime.client;
+    const generation = this.deliveryGeneration;
     if ((event === "message.received" || event === "group.message_created") && isJsonObject(payload)) {
       client._maybeAppendEchoTraceReceive(payload);
     }
@@ -5617,7 +6350,24 @@ var MessageDeliveryEngine = class {
         client._clientLog.debug(`agent_md etag inject skipped: ${String(exc)}`);
       }
     }
-    await client._dispatcher.publish(event, this.normalizePublishedMessagePayload(event, payload));
+    const canonicalSource = canonicalDeliverySource(source);
+    let normalized = this.normalizePublishedMessagePayload(event, payload, source);
+    if (isJsonObject(normalized) && (this.isInstanceScopedMessageEvent(event) || this.isGroupScopedEvent(event)) && canonicalSource !== "direct") {
+      normalized = { ...normalized, source: canonicalSource };
+    }
+    client._dispatcher.enqueue(event, normalized);
+    if (generation !== this.deliveryGeneration) return;
+    if (canonicalSource !== "pull" && canonicalSource !== "pending_retry" && canonicalSource !== "push" && canonicalSource !== "inline_push") return;
+    if (canonicalSource === "push" || canonicalSource === "inline_push") {
+      const localBatch = batch ?? this.createDeliveryChangeBatch(canonicalSource);
+      this.recordDeliveryChange(localBatch.changes, event, payload, ns, generation);
+      if (!batch) await this.flushRealtimeDeliveryChanges(localBatch);
+    } else {
+      const changes = this.pendingPullDeliveryChanges ?? /* @__PURE__ */ new Map();
+      this.pendingPullDeliveryChanges = changes;
+      this.recordDeliveryChange(changes, event, payload, ns, generation);
+      if (client._rpcPipeline?.hasAnyPullActivity?.() !== true) await this.flushPullDeliveryChanges();
+    }
   }
   messageTargetsCurrentInstance(message) {
     if (!isJsonObject(message)) return true;
@@ -5750,7 +6500,7 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     try {
       if (!isJsonObject(data)) {
-        await client._publishAppEvent("message.received", data);
+        await client._publishAppEvent("message.received", data, "push");
         return;
       }
       const msg = { ...data };
@@ -5795,7 +6545,7 @@ var MessageDeliveryEngine = class {
           await client._publishEncryptedPushMessage("message.received", "message.undecryptable", "", seq2 ?? 0, msg, false);
           return;
         }
-        await client._publishAppEvent("message.received", msg);
+        await client._publishAppEvent("message.received", msg, "push");
       }
     } catch (exc) {
       client._clientLog.warn(`P2P push processing failed:${String(exc)}`);
@@ -5810,7 +6560,7 @@ var MessageDeliveryEngine = class {
           _decrypt_error: String(exc)
         };
         client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-        await client._publishAppEvent("message.undecryptable", safeEvent);
+        await client._publishAppEvent("message.undecryptable", safeEvent, "push");
       }
     }
   }
@@ -5834,7 +6584,7 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     try {
       if (!isJsonObject(data)) {
-        await client._publishAppEvent("group.message_created", data);
+        await client._publishAppEvent("group.message_created", data, "push");
         return;
       }
       const msg = { ...data };
@@ -5906,7 +6656,7 @@ var MessageDeliveryEngine = class {
           await client._publishEncryptedPushMessage("group.message_created", "group.message_undecryptable", "", seq2 ?? 0, msg, true);
           return;
         }
-        await client._publishAppEvent("group.message_created", msg);
+        await client._publishAppEvent("group.message_created", msg, "push");
       }
     } catch (exc) {
       client._clientLog.warn(`group push processing failed:${String(exc)}`);
@@ -5921,7 +6671,7 @@ var MessageDeliveryEngine = class {
           _decrypt_error: String(exc)
         };
         client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-        await client._publishAppEvent("group.message_undecryptable", safeEvent);
+        await client._publishAppEvent("group.message_undecryptable", safeEvent, "push");
       }
     }
   }
@@ -5929,7 +6679,7 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     const groupId = notification.group_id ?? "";
     if (!groupId) {
-      await client._publishAppEvent("group.message_created", notification);
+      await client._publishAppEvent("group.message_created", notification, "push");
       return;
     }
     if (client._sessionOptions?.background_sync === false) {
@@ -5949,7 +6699,7 @@ var MessageDeliveryEngine = class {
         return;
       } catch (exc) {
         client._clientLog.warn(`auto pull group message failed:${String(exc)}`);
-        await client._publishAppEvent("group.message_created", notification);
+        await client._publishAppEvent("group.message_created", notification, "push");
         return;
       }
     }
@@ -5976,7 +6726,7 @@ var MessageDeliveryEngine = class {
     } catch (exc) {
       client._clientLog.warn(`auto pull group message commit/ack failed:${String(exc)}`);
       if (!rawCompleted) {
-        await client._publishAppEvent("group.message_created", notification);
+        await client._publishAppEvent("group.message_created", notification, "push");
       }
     }
   }
@@ -5990,11 +6740,16 @@ var MessageDeliveryEngine = class {
       P2P_GAP_FILL_RETRY_MAX_MS
     );
     client._gapFillDone.add(retryKey);
+    const releasePullWork = client._rpcPipeline?.reservePullWork?.() ?? (() => {
+    });
     client._clientLog.debug(`P2P message gap-fill retry scheduled: ns=${ns} attempt=${retryAttempt} delay_ms=${delayMs}`);
     globalThis.setTimeout(() => {
       client._gapFillDone.delete(retryKey);
-      if (client.state !== "ready" /* READY */ || client._closing) return;
-      client._safeAsync(this.fillP2pGap(retryAttempt));
+      if (client.state !== "ready" /* READY */ || client._closing) {
+        releasePullWork();
+        return;
+      }
+      client._safeAsync(this.fillP2pGap(retryAttempt).finally(releasePullWork));
     }, delayMs);
   }
   async fillP2pGap(retryAttempt = 0) {
@@ -6099,6 +6854,7 @@ var MessageDeliveryEngine = class {
     client._gapFillDone.add(dedupKey);
     this.runtime.delivery.setGapFillActive(true);
     let continuationAfterSeq = 0;
+    let failed = false;
     try {
       let nextAfterSeq = afterSeq;
       const maxPages = singlePage ? 1 : 100;
@@ -6146,6 +6902,7 @@ var MessageDeliveryEngine = class {
         }
         const eventSeqs = [];
         let hasDissolvedEvent = false;
+        let publishedEventCount = 0;
         for (const evt of eventObjects) {
           const eventSeq = Number(evt.event_seq ?? 0);
           if (Number.isFinite(eventSeq) && eventSeq > 0) eventSeqs.push(eventSeq);
@@ -6163,7 +6920,8 @@ var MessageDeliveryEngine = class {
             }
           }
           if (Number.isFinite(eventSeq) && eventSeq > 0 && !client._pushedSeqs.get(ns)?.has(eventSeq)) {
-            this.enqueueOrderedMessage(ns, "group.changed", eventSeq, evt);
+            this.enqueueOrderedMessage(ns, "group.changed", eventSeq, evt, "pull");
+            publishedEventCount += 1;
           }
         }
         const ackContig = client._seqTracker.getContiguousSeq(ns);
@@ -6188,6 +6946,16 @@ var MessageDeliveryEngine = class {
             client._clientLog.warn("group event auto-ack failed: group=" + groupId, e);
           }
         }
+        this.onPullPage(
+          ns,
+          publishedEventCount,
+          result.has_more === true,
+          eventObjects.length > 0 ? Number(eventObjects[eventObjects.length - 1].event_seq ?? 0) : void 0,
+          typeof result.remaining === "number" && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null,
+          eventObjects.length,
+          ackContig,
+          eventObjects.length > 0 ? Number(eventObjects[eventObjects.length - 1].event_seq ?? 0) : void 0
+        );
         const nextAfter = Math.max(eventSeqs.length > 0 ? Math.max(...eventSeqs) : nextAfterSeq, nextAfterSeq);
         if (singlePage && result.has_more === true && nextAfter > nextAfterSeq) {
           continuationAfterSeq = nextAfter;
@@ -6199,10 +6967,12 @@ var MessageDeliveryEngine = class {
         client._clientLog.warn(`group event gap fill reached max_pages=${maxPages} group=${groupId} after_seq=${nextAfterSeq}`);
       }
     } catch (exc) {
+      failed = true;
       client._clientLog.warn(`group event gap-fill failed:${String(exc)}`);
     } finally {
       client._gapFillDone.delete(dedupKey);
       this.runtime.delivery.setGapFillActive(false);
+      if (!client._rpcPipeline) this.syncStopped(failed ? "aborted" : "pull_drained");
       if (singlePage && continuationAfterSeq > afterSeq) {
         this.enqueueOnlineUnreadEventHint({
           group_id: groupId,
@@ -6547,7 +7317,7 @@ var MessageDeliveryEngine = class {
     const tracker = client._seqTracker;
     const snapshot = typeof tracker.snapshotNamespace === "function" ? tracker.snapshotNamespace(ns) : null;
     try {
-      const published = await this.publishPulledMessage(event, ns, seq2, payload);
+      const published = await this.publishPulledMessage(event, ns, seq2, payload, true, "inline_push");
       if (!this.isInlineGenerationCurrent(generation)) return false;
       if (!published) return false;
       const needsPull = Boolean(tracker.onMessageSeq(ns, seq2));
@@ -7035,13 +7805,12 @@ var MessageDeliveryEngine = class {
         }
       }
     } catch (exc) {
-      client._dispatcher.publish("seq_tracker.persist_error", {
+      client._dispatcher.enqueue("seq_tracker.persist_error", {
         phase: "restore",
         aid,
         device_id: deviceId,
         slot_id: slotId,
         error: String(exc)
-      }).catch(() => {
       });
     }
   }
@@ -7232,13 +8001,12 @@ var MessageDeliveryEngine = class {
     } catch (exc) {
       const error = formatDeliveryError(exc);
       client._clientLog.warn(`save SeqTracker state failed: ${error}`);
-      client._dispatcher.publish("seq_tracker.persist_error", {
+      client._dispatcher.enqueue("seq_tracker.persist_error", {
         phase: "save",
         aid,
         device_id: deviceId,
         slot_id: slotId,
         error: String(error)
-      }).catch(() => {
       });
       if (throwOnError) throw exc;
     }
@@ -7343,7 +8111,7 @@ var MessageDeliveryEngine = class {
     }
     return params2;
   }
-  async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
+  async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, batch, source = "pull") {
     const client = this.runtime.client;
     this.ensurePullOperationCurrent();
     const queue = client._pendingOrderedMsgs.get(ns);
@@ -7351,15 +8119,39 @@ var MessageDeliveryEngine = class {
     const contig = client._seqTracker.getContiguousSeq(ns);
     const ready = [...queue.keys()].filter((seq2) => seq2 <= contig && (beforeSeq === void 0 || seq2 < beforeSeq)).sort((a, b) => a - b);
     let delivered = false;
-    for (const seq2 of ready) {
-      this.ensurePullOperationCurrent();
-      const item = queue.get(seq2);
-      queue.delete(seq2);
-      if (!item || client._pushedSeqs.get(ns)?.has(seq2)) continue;
-      await this.publishOrderedQueueItem(ns, item.event, seq2, item.payload, pullResponse);
-      this.ensurePullOperationCurrent();
-      this.markPublishedSeq(ns, seq2);
-      delivered = true;
+    const drainBatches = /* @__PURE__ */ new Map();
+    try {
+      for (const seq2 of ready) {
+        this.ensurePullOperationCurrent();
+        const item = queue.get(seq2);
+        queue.delete(seq2);
+        if (!item || client._pushedSeqs.get(ns)?.has(seq2)) continue;
+        const itemSource = item.source ?? source;
+        let itemBatch = batch;
+        if ((itemSource === "push" || itemSource === "inline_push") && (!batch || batch.trigger !== itemSource)) {
+          itemBatch = drainBatches.get(itemSource);
+          if (!itemBatch) {
+            itemBatch = this.createDeliveryChangeBatch(itemSource);
+            drainBatches.set(itemSource, itemBatch);
+          }
+        }
+        await this.publishOrderedQueueItem(
+          ns,
+          item.event,
+          seq2,
+          item.payload,
+          pullResponse,
+          itemSource,
+          itemBatch
+        );
+        this.ensurePullOperationCurrent();
+        this.markPublishedSeq(ns, seq2);
+        delivered = true;
+      }
+    } finally {
+      for (const drainBatch of drainBatches.values()) {
+        await this.flushRealtimeDeliveryChanges(drainBatch);
+      }
     }
     if (queue.size === 0) {
       client._pendingOrderedMsgs.delete(ns);
@@ -7369,75 +8161,87 @@ var MessageDeliveryEngine = class {
       }
     }
   }
-  async publishOrderedMessage(event, ns, seq2, payload) {
+  async publishOrderedMessage(event, ns, seq2, payload, source = "push", operationBatch) {
     const client = this.runtime.client;
-    const seqNum = Number(seq2);
-    if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
-      await this.publishOrderedQueueItem(ns, event, seqNum, payload);
+    const ownsBatch = !operationBatch && (source === "push" || source === "inline_push");
+    const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : void 0);
+    try {
+      const seqNum = Number(seq2);
+      if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
+        await this.publishOrderedQueueItem(ns, event, seqNum, payload, false, source, batch);
+        return true;
+      }
+      if (client._pushedSeqs.get(ns)?.has(seqNum)) {
+        const queue2 = client._pendingOrderedMsgs.get(ns);
+        queue2?.delete(seqNum);
+        if (queue2 && queue2.size === 0) client._pendingOrderedMsgs.delete(ns);
+        return false;
+      }
+      const contig = client._seqTracker.getContiguousSeq(ns);
+      if (seqNum > contig) {
+        this.enqueueOrderedMessage(ns, event, seqNum, payload, source);
+        return false;
+      }
+      await this.drainOrderedMessages(ns, seqNum, true, true, batch, source);
+      if (client._pushedSeqs.get(ns)?.has(seqNum)) return false;
+      const queue = client._pendingOrderedMsgs.get(ns);
+      queue?.delete(seqNum);
+      if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
+      await this.publishOrderedQueueItem(ns, event, seqNum, payload, false, source, batch);
+      this.markPublishedSeq(ns, seqNum);
+      await this.drainOrderedMessages(ns, void 0, false, true, batch, source);
+      if (!client._pendingOrderedMsgs.get(ns)) await this.saveSeqTrackerState();
       return true;
+    } finally {
+      if (ownsBatch && batch) await this.flushRealtimeDeliveryChanges(batch);
     }
-    if (client._pushedSeqs.get(ns)?.has(seqNum)) {
-      const queue2 = client._pendingOrderedMsgs.get(ns);
-      queue2?.delete(seqNum);
-      if (queue2 && queue2.size === 0) client._pendingOrderedMsgs.delete(ns);
-      return false;
-    }
-    const contig = client._seqTracker.getContiguousSeq(ns);
-    if (seqNum > contig) {
-      this.enqueueOrderedMessage(ns, event, seqNum, payload);
-      return false;
-    }
-    await this.drainOrderedMessages(ns, seqNum, true);
-    if (client._pushedSeqs.get(ns)?.has(seqNum)) return false;
-    const queue = client._pendingOrderedMsgs.get(ns);
-    queue?.delete(seqNum);
-    if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
-    await this.publishOrderedQueueItem(ns, event, seqNum, payload);
-    this.markPublishedSeq(ns, seqNum);
-    await this.drainOrderedMessages(ns);
-    if (!client._pendingOrderedMsgs.get(ns)) await this.saveSeqTrackerState();
-    return true;
   }
-  async publishPulledMessage(event, ns, seq2, payload, persist = true) {
+  async publishPulledMessage(event, ns, seq2, payload, persist = true, source = "pull", operationBatch) {
     const client = this.runtime.client;
-    this.ensurePullOperationCurrent();
-    const seqNum = Number(seq2);
-    if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
+    const ownsBatch = !operationBatch && (source === "push" || source === "inline_push");
+    const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : void 0);
+    try {
+      this.ensurePullOperationCurrent();
+      const seqNum = Number(seq2);
+      if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
+        if (event === "message.recalled") {
+          const published = await client._withPullResponseProcessing(
+            ns,
+            () => this.publishMessageRecallTombstone(seq2, payload, source)
+          );
+          this.ensurePullOperationCurrent();
+          return published;
+        }
+        await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
+        this.ensurePullOperationCurrent();
+        return true;
+      }
+      const queue = client._pendingOrderedMsgs.get(ns);
+      if (client._pushedSeqs.get(ns)?.has(seqNum)) {
+        queue?.delete(seqNum);
+        if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
+        return false;
+      }
+      await this.drainOrderedMessages(ns, seqNum, false, persist, batch, source);
+      this.ensurePullOperationCurrent();
+      queue?.delete(seqNum);
+      if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
       if (event === "message.recalled") {
         const published = await client._withPullResponseProcessing(
           ns,
-          () => this.publishMessageRecallTombstone(seq2, payload)
+          () => this.publishMessageRecallTombstone(seqNum, payload, source)
         );
         this.ensurePullOperationCurrent();
+        this.markPublishedSeq(ns, seqNum);
         return published;
       }
-      await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
-      this.ensurePullOperationCurrent();
-      return true;
-    }
-    const queue = client._pendingOrderedMsgs.get(ns);
-    if (client._pushedSeqs.get(ns)?.has(seqNum)) {
-      queue?.delete(seqNum);
-      if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
-      return false;
-    }
-    await this.drainOrderedMessages(ns, seqNum, false, persist);
-    this.ensurePullOperationCurrent();
-    queue?.delete(seqNum);
-    if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
-    if (event === "message.recalled") {
-      const published = await client._withPullResponseProcessing(
-        ns,
-        () => this.publishMessageRecallTombstone(seqNum, payload)
-      );
+      await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
       this.ensurePullOperationCurrent();
       this.markPublishedSeq(ns, seqNum);
-      return published;
+      return true;
+    } finally {
+      if (ownsBatch && batch) await this.flushRealtimeDeliveryChanges(batch);
     }
-    await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
-    this.ensurePullOperationCurrent();
-    this.markPublishedSeq(ns, seqNum);
-    return true;
   }
 };
 
@@ -7626,12 +8430,7 @@ var LifecycleController = class {
   async publishConnectionEvent(owner, event, payload) {
     const client = this.runtime.client;
     this.assertConnectionAttemptOwner(owner);
-    client._connectEventDispatchDepth = Number(client._connectEventDispatchDepth ?? 0) + 1;
-    try {
-      await client._dispatcher.publish(event, payload);
-    } finally {
-      client._connectEventDispatchDepth -= 1;
-    }
+    client._dispatcher.enqueue(event, payload);
     return this.ownsConnectionAttempt(owner);
   }
   async cancelConnectionAttemptAndWait() {
@@ -7939,14 +8738,9 @@ var LifecycleController = class {
       client._clientLog.warn(`reentrant close failed: ${err instanceof Error ? err.message : String(err)}`);
     });
   }
-  async publishLifecycleStopEvent(payload) {
+  publishLifecycleStopEvent(payload) {
     const client = this.runtime.client;
-    client._lifecycleStopEventDispatchDepth = Number(client._lifecycleStopEventDispatchDepth ?? 0) + 1;
-    try {
-      await client._dispatcher.publish("state_change", payload);
-    } finally {
-      client._lifecycleStopEventDispatchDepth -= 1;
-    }
+    client._dispatcher.enqueue("state_change", payload);
   }
   async withLifecycleStop(operation, kind) {
     const client = this.runtime.client;
@@ -8007,7 +8801,7 @@ var LifecycleController = class {
         client._stopBackgroundTasks();
         if (client._closing) return;
         this.runtime.lifecycle.resetForDisconnect("standby");
-        await this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
+        this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
         client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms`);
       }, "disconnect");
     } finally {
@@ -8017,6 +8811,7 @@ var LifecycleController = class {
   async close() {
     const client = this.runtime.client;
     const tStart = Date.now();
+    const calledFromHandler = client._dispatcher.isDispatchingHandler();
     client._clientLog.debug(`close enter: state=${client._state}`);
     this.runtime.lifecycle.setClosing(true);
     client._delivery.resetInlineAckState();
@@ -8025,34 +8820,39 @@ var LifecycleController = class {
       return;
     }
     return this.withLifecycleStop(async () => {
-      const pullInvalidation = client._rpcPipeline?.invalidatePulls?.();
-      client._rpcPipeline?.stopPullGateWatchdogs?.();
-      client._stopBackgroundTasks();
-      if (client._state === "idle" || client._state === "closed") {
-        const reconnectCancellation2 = client._cancelReconnectAndWait();
-        const connectionCancellation2 = this.cancelConnectionAttemptAndWait();
-        await Promise.all([reconnectCancellation2, connectionCancellation2]);
-        await pullInvalidation;
+      try {
+        const pullInvalidation = client._rpcPipeline?.invalidatePulls?.();
+        client._rpcPipeline?.stopPullGateWatchdogs?.();
+        client._stopBackgroundTasks();
+        if (client._state === "idle" || client._state === "closed") {
+          const reconnectCancellation2 = client._cancelReconnectAndWait();
+          const connectionCancellation2 = this.cancelConnectionAttemptAndWait();
+          await Promise.all([reconnectCancellation2, connectionCancellation2]);
+          await pullInvalidation;
+          await client._saveSeqTrackerState();
+          this.runtime.lifecycle.setState("closed");
+          client._resetSeqTrackingState();
+          client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms reason=already_idle`);
+          return;
+        }
+        const reconnectCancellation = client._cancelReconnectAndWait();
+        const connectionCancellation = this.cancelConnectionAttemptAndWait();
+        try {
+          await client._transport.call("auth.logout", {});
+        } catch (err) {
+          client._clientLog.warn(`auth.logout during close failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        await client._transport.close();
+        await Promise.all([pullInvalidation, reconnectCancellation, connectionCancellation]);
         await client._saveSeqTrackerState();
         this.runtime.lifecycle.setState("closed");
+        this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
         client._resetSeqTrackingState();
-        client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms reason=already_idle`);
-        return;
+        client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms`);
+      } finally {
+        const closing = client._dispatcher.close();
+        if (!calledFromHandler) await closing;
       }
-      const reconnectCancellation = client._cancelReconnectAndWait();
-      const connectionCancellation = this.cancelConnectionAttemptAndWait();
-      try {
-        await client._transport.call("auth.logout", {});
-      } catch (err) {
-        client._clientLog.warn(`auth.logout during close failed: ${err instanceof Error ? err.message : String(err)}`);
-      }
-      await client._transport.close();
-      await Promise.all([pullInvalidation, reconnectCancellation, connectionCancellation]);
-      await client._saveSeqTrackerState();
-      this.runtime.lifecycle.setState("closed");
-      await this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
-      client._resetSeqTrackingState();
-      client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms`);
     }, "close");
   }
 };
@@ -14849,6 +15649,14 @@ var PROTECTED_HEADERS_METHODS = /* @__PURE__ */ new Set([
   "message.thought.put",
   "group.thought.put"
 ]);
+function generateMessageId() {
+  if (typeof crypto.randomUUID === "function") return `m-${crypto.randomUUID().replace(/-/g, "")}`;
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  bytes[6] = bytes[6] & 15 | 64;
+  bytes[8] = bytes[8] & 63 | 128;
+  return `m-${Array.from(bytes, (value) => value.toString(16).padStart(2, "0")).join("")}`;
+}
 var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "message.send",
   "message.v2.put_peer_pk",
@@ -15111,6 +15919,7 @@ var RpcPipeline = class {
     __publicField(this, "runtime");
     __publicField(this, "pullGateStates", /* @__PURE__ */ new Map());
     __publicField(this, "inlineRealtimeScopes", /* @__PURE__ */ new Set());
+    __publicField(this, "pullWorkTokens", /* @__PURE__ */ new Set());
     __publicField(this, "pullGeneration", 0);
     __publicField(this, "pullInvalidationWait", null);
     this.runtime = runtime;
@@ -15318,6 +16127,9 @@ var RpcPipeline = class {
     delete p._rpc_background;
     if (method === "message.send" || method === "group.send") {
       this.normalizeOutboundMessagePayload(p, method);
+      if (!Object.prototype.hasOwnProperty.call(p, "message_id") || p.message_id == null) {
+        p.message_id = generateMessageId();
+      }
     }
     this.normalizeGroupCallIdentifier(method, p);
     this.validateOutboundCall(method, p);
@@ -15622,6 +16434,28 @@ var RpcPipeline = class {
     const matches = (job) => job !== null && job.namespace === ns;
     return matches(state.active) || state.foreground.some(matches) || state.background.some(matches);
   }
+  hasAnyPullActivity() {
+    if (this.pullWorkTokens.size > 0) return true;
+    for (const state of this.pullGateStates.values()) {
+      if (state.active || state.foreground.length > 0 || state.background.length > 0) return true;
+    }
+    return false;
+  }
+  reservePullWork() {
+    const token = Symbol("pull-work");
+    this.pullWorkTokens.add(token);
+    let released = false;
+    return () => {
+      if (released) return;
+      released = true;
+      this.pullWorkTokens.delete(token);
+      this.runtime.client._delivery?.onPullWorkSettled?.();
+    };
+  }
+  releasePullWorkToken(token) {
+    if (!this.pullWorkTokens.delete(token)) return;
+    this.runtime.client._delivery?.onPullWorkSettled?.();
+  }
   async tryRunInlineRealtime(ns, seq2, operation) {
     const normalized = String(ns ?? "").trim();
     if (!normalized.startsWith("p2p:") && !normalized.startsWith("group:") || !Number.isSafeInteger(seq2) || seq2 <= 0 || typeof operation !== "function") {
@@ -15663,7 +16497,8 @@ var RpcPipeline = class {
       invalidated: false,
       cancel: null,
       settled: Promise.resolve(),
-      settledResolve: null
+      settledResolve: null,
+      workToken: Symbol("inline-pull-work")
     };
     this.inlineRealtimeScopes.add(normalized);
     try {
@@ -15725,6 +16560,7 @@ var RpcPipeline = class {
         if (job.running) {
           waits.push(job.settled);
         } else {
+          this.releasePullWorkToken(job.workToken);
           job.settledResolve?.();
           job.settledResolve = null;
         }
@@ -15737,6 +16573,7 @@ var RpcPipeline = class {
       this.drainPullGate(state);
     }
     const wait = Promise.all(waits).then(() => void 0);
+    this.runtime.client._delivery?.onPullWorkSettled?.();
     let tracked;
     tracked = wait.finally(() => {
       if (this.pullInvalidationWait === tracked) this.pullInvalidationWait = null;
@@ -15751,7 +16588,18 @@ var RpcPipeline = class {
     if (this.pullInvalidationInProgress()) {
       throw new Error("pull invalidated");
     }
-    if (!key) return await this.executePullOperation(operation, background);
+    if (!key) {
+      this.runtime.client._delivery?.onPullStarted?.("");
+      const releasePullWork = this.reservePullWork();
+      try {
+        return await this.executePullOperation(operation, background);
+      } catch (error) {
+        this.runtime.client._delivery?.onPullAborted?.();
+        throw error;
+      } finally {
+        releasePullWork();
+      }
+    }
     const state = this.pullGateState(key);
     const namespace = this.pullScopeKey(key);
     const candidate = state.byKey.get(key);
@@ -15765,6 +16613,8 @@ var RpcPipeline = class {
       }
       return await existing.promise;
     }
+    const workToken = Symbol("pull-work");
+    this.pullWorkTokens.add(workToken);
     let resolve;
     let reject;
     let settledResolve;
@@ -15795,7 +16645,8 @@ var RpcPipeline = class {
       invalidated: false,
       cancel: null,
       settled,
-      settledResolve
+      settledResolve,
+      workToken
     };
     (background ? state.background : state.foreground).push(job);
     state.byKey.set(key, job);
@@ -15869,6 +16720,7 @@ var RpcPipeline = class {
     const job = takeRunnable(state.foreground) ?? takeRunnable(state.background);
     if (!job) return;
     state.active = job;
+    this.runtime.client._delivery?.onPullStarted?.(job.namespace);
     if (job.timer) clearTimeout(job.timer);
     job.pullingStartedAt = Date.now();
     job.timedOut = false;
@@ -15882,14 +16734,17 @@ var RpcPipeline = class {
       return;
     }
     job.running = true;
+    let failed = false;
     void this.executePullOperation(job.operation, job.background).then(
       (value) => {
         if (!job.timedOut && !job.invalidated) job.resolve(value);
       },
       (error) => {
+        failed = true;
         if (!job.timedOut && !job.invalidated) job.reject(error);
       }
     ).finally(() => {
+      this.pullWorkTokens.delete(job.workToken);
       state.lifecycle.set(job.namespace, "idle");
       if (state.active === job) state.active = null;
       if (state.byKey.get(job.key) === job) state.byKey.delete(job.key);
@@ -15897,6 +16752,8 @@ var RpcPipeline = class {
       job.settledResolve?.();
       job.settledResolve = null;
       if (!job.invalidated) this.runtime.client._delivery?.onPullGateIdle?.(job.namespace);
+      if (failed || job.invalidated) this.runtime.client._delivery?.onPullAborted?.();
+      this.runtime.client._delivery?.onPullWorkSettled?.();
     });
   }
   armQueuedPullTimers(_state) {
@@ -23793,11 +24650,22 @@ var V2E2EECoordinator = class {
     const fetchKey = this.pendingSenderIKFetchKey(fromAid, senderDeviceId, groupId);
     if (!fromAid || client._v2SenderIKFetching.has(fetchKey)) return;
     client._v2SenderIKFetching.add(fetchKey);
-    client._safeAsync(this.resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey));
+    const releasePullWork = client._rpcPipeline?.reservePullWork?.() ?? (() => {
+    });
+    const generation = client._delivery.captureInlineGeneration?.();
+    client._safeAsync(this.resolveSenderIKPending(
+      fromAid,
+      senderDeviceId,
+      groupId,
+      fetchKey,
+      generation
+    ).finally(releasePullWork));
   }
-  async resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey) {
+  async resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey, generation) {
     const client = this.client;
+    const generationCurrent = () => generation === void 0 || client._delivery.isInlineGenerationCurrent?.(generation) !== false;
     try {
+      if (!generationCurrent()) return;
       const session = client._v2Session;
       if (session && fromAid) {
         try {
@@ -23828,17 +24696,21 @@ var V2E2EECoordinator = class {
           await this.getV2SenderPubDer(fromAid, senderDeviceId);
         }
       }
+      if (!generationCurrent()) return;
       const pendingItems = [...client._v2SenderIKPending.entries()].filter(([, entry]) => entry.fromAid === fromAid && entry.senderDeviceId === senderDeviceId && entry.groupId === groupId);
       for (const [key, entry] of pendingItems) {
+        if (!generationCurrent()) return;
         let plaintext = null;
         const retryStatus = {};
         try {
-          plaintext = await client._decryptV2Message(entry.msg, false, true, true, true, retryStatus);
+          plaintext = await client._decryptV2Message(entry.msg, false, true, true, true, retryStatus, false, "pending_retry");
         } catch (exc) {
+          if (!generationCurrent()) return;
           client._clientLog.warn(`V2 sender IK pending retry raised: key=${key} err=${String(formatE2EEError(exc))}`);
           client._v2SenderIKPending.delete(key);
           continue;
         }
+        if (!generationCurrent()) return;
         if (plaintext === null) {
           if (retryStatus.deferred) {
             client._clientLog.warn(`V2 pending retry still missing key material: key=${key}`);
@@ -23858,9 +24730,9 @@ var V2E2EECoordinator = class {
         if (entry.groupId) {
           plaintext = normalizeGroupMentionMode(plaintext, entry.msg, entry.msg.envelope_json);
           plaintext.group_id = entry.groupId;
-          await client._publishPulledMessage("group.message_created", `group:${entry.groupId}`, seq2, plaintext);
+          await client._publishPulledMessage("group.message_created", `group:${entry.groupId}`, seq2, plaintext, false, "pending_retry");
         } else {
-          await client._publishPulledMessage("message.received", `p2p:${client._aid ?? ""}`, seq2, plaintext);
+          await client._publishPulledMessage("message.received", `p2p:${client._aid ?? ""}`, seq2, plaintext, false, "pending_retry");
         }
         client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
       }
@@ -23890,6 +24762,7 @@ var V2E2EECoordinator = class {
       return client.call("message.send", {
         to: toAid,
         payload: envelope,
+        message_id: opts?.messageId,
         encrypt: false,
         _skip_send_result_envelope: true
       });
@@ -23936,9 +24809,9 @@ var V2E2EECoordinator = class {
     let plaintext = null;
     if (String(msg.version ?? "") === "v1") {
       const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
-      const payload = legacy.payload;
+      const payload = legacy.payload !== void 0 ? legacy.payload : msg.payload;
       const payloadType = isJsonObject(payload) ? String(payload.type ?? "").trim() : "";
-      if (payload !== void 0 && payload !== null && !["e2ee.encrypted", "e2ee.group_encrypted"].includes(payloadType)) {
+      if (payload !== void 0 && payload !== null && !["e2ee.encrypted", "e2ee.group_encrypted", "e2ee.p2p_encrypted"].includes(payloadType)) {
         plaintext = {
           message_id: String(msg.message_id ?? ""),
           from: String(msg.from_aid ?? ""),
@@ -23950,6 +24823,9 @@ var V2E2EECoordinator = class {
           encrypted: false
         };
         attachGatewayProximity(plaintext, msg);
+      } else if (isJsonObject(payload) && ["e2ee.p2p_encrypted", "e2ee.encrypted"].includes(payloadType)) {
+        msg = { ...msg, envelope_json: JSON.stringify(payload) };
+        plaintext = await client._decryptV2Message(msg, false, !history, true, true, void 0, false, source);
       }
     } else {
       plaintext = source === "inline_push" ? await client._decryptV2Message(msg, false, false, false, false) : await client._decryptV2Message(msg, false);
@@ -23966,7 +24842,8 @@ var V2E2EECoordinator = class {
           event.event,
           client._aid ? `p2p:${client._aid}` : "",
           seq2,
-          event.payload
+          event.payload,
+          source
         );
       } else {
         await client._publishAppEvent(event.event, event.payload, source);
@@ -23980,29 +24857,53 @@ var V2E2EECoordinator = class {
     let plaintext = null;
     if (String(msg.version ?? "") === "v1") {
       const payload = msg.payload;
+      const recall = typeof client._delivery?.recallEventFromGroupMessage === "function" ? client._delivery.recallEventFromGroupMessage(msg) : null;
+      if (recall) {
+        const recallPayload = {
+          ...recall,
+          group_id: groupId,
+          group_aid: groupAid,
+          seq: seq2
+        };
+        if (publish) {
+          if (orderedPublish) {
+            await client._delivery.publishOrderedMessage(
+              "group.message_recalled",
+              `group:${groupId}`,
+              seq2,
+              recallPayload,
+              source
+            );
+          } else {
+            await client._publishAppEvent("group.message_recalled", recallPayload, source);
+          }
+        }
+        return recallPayload;
+      }
       if (payload === void 0 || payload === null) {
         if (history) return this.historyDecryptFailure(msg, "legacy payload is missing");
         client._clientLog.warn(`Group Tail \u7F3A\u5C11 payload \u7684 V1 \u884C\u5DF2\u8DF3\u8FC7\uFF0C\u8FDE\u7EED\u6027\u8BC1\u660E\u4ECD\u4FDD\u7559: group=${groupId}, seq=${seq2}`);
         return null;
       }
-      if (isJsonObject(payload) && ["e2ee.encrypted", "e2ee.group_encrypted"].includes(String(payload.type ?? ""))) {
-        if (history) return this.historyDecryptFailure(msg, "unsupported legacy encrypted envelope");
-        client._clientLog.warn(`Group Tail \u4E0D\u652F\u6301\u7684\u65E7\u52A0\u5BC6\u6D88\u606F\u5DF2\u8DF3\u8FC7\uFF0C\u8FDE\u7EED\u6027\u8BC1\u660E\u4ECD\u4FDD\u7559: group=${groupId}, seq=${seq2}`);
-        return null;
+      const payloadType = isJsonObject(payload) ? String(payload.type ?? "").trim() : "";
+      if (isJsonObject(payload) && ["e2ee.group_encrypted", "e2ee.p2p_encrypted", "e2ee.encrypted"].includes(payloadType)) {
+        msg = { ...msg, envelope_json: JSON.stringify(payload) };
+        plaintext = await client._decryptV2Message(msg, false, !history, true, true, void 0, false, source);
+      } else {
+        plaintext = {
+          message_id: String(msg.message_id ?? ""),
+          from: String(msg.from_aid ?? ""),
+          group_id: groupId,
+          group_aid: groupAid,
+          seq: seq2,
+          type: String(msg.type ?? ""),
+          timestamp: msg.t_server,
+          payload,
+          encrypted: false
+        };
+        plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
+        attachGatewayProximity(plaintext, msg);
       }
-      plaintext = {
-        message_id: String(msg.message_id ?? ""),
-        from: String(msg.from_aid ?? ""),
-        group_id: groupId,
-        group_aid: groupAid,
-        seq: seq2,
-        type: String(msg.type ?? ""),
-        timestamp: msg.t_server,
-        payload,
-        encrypted: false
-      };
-      plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
-      attachGatewayProximity(plaintext, msg);
     } else {
       plaintext = source === "inline_push" ? await client._decryptV2Message(msg, false, false, false, false) : await client._decryptV2Message(msg, false);
       if (plaintext) {
@@ -24025,7 +24926,8 @@ var V2E2EECoordinator = class {
           "group.message_created",
           `group:${groupId}`,
           seq2,
-          plaintext
+          plaintext,
+          source
         );
       } else {
         await client._publishAppEvent("group.message_created", plaintext, source);
@@ -24053,6 +24955,7 @@ var V2E2EECoordinator = class {
     const afterSeq = strictWindowSeq(params2.after_seq ?? 0, "after_seq");
     const limit = strictWindowLimit(params2.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
     const ns = client._aid ? `p2p:${client._aid}` : "";
+    if (ns) client._delivery.onPullStarted?.(ns);
     const result = await client._callRawV2Rpc("message.v2.pull", { window_mode: "tail", after_seq: afterSeq, limit, _rpc_foreground: true });
     const floor = Number(result.retention_floor_seq ?? 0);
     const previous = ns ? client._seqTracker.getSyncState(ns) : null;
@@ -24075,6 +24978,17 @@ var V2E2EECoordinator = class {
     }
     const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
     if (previous && ack > previous.ack) await this.ackV2(ack);
+    if (ns) client._delivery.onPullPage?.(
+      ns,
+      decoded.length,
+      result.has_more === true,
+      page.head,
+      typeof result.remaining === "number" && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null,
+      page.messages.length,
+      ack,
+      page.head
+    );
+    client._delivery.onPullWorkSettled?.();
     return { ...result, messages: decoded, raw_count: page.messages.length };
   }
   async historyV2Internal(params2) {
@@ -24089,10 +25003,24 @@ var V2E2EECoordinator = class {
     }
     return { ...result, messages: decoded };
   }
+  async runPullWithLifecycle(ns, operation) {
+    if (ns) this.client._delivery.onPullStarted?.(ns);
+    try {
+      return await operation();
+    } catch (error) {
+      this.client._delivery.onPullAborted?.();
+      throw error;
+    }
+  }
   async pullV2(afterSeq = 0, limit = 50, opts) {
+    const ns = this.client._aid ? `p2p:${this.client._aid}` : "";
+    return await this.runPullWithLifecycle(ns, () => this.pullV2Impl(afterSeq, limit, opts));
+  }
+  async pullV2Impl(afterSeq = 0, limit = 50, opts) {
     const client = this.client;
     await client._ensureV2SessionReady("message.pull");
     const ns = client._aid ? `p2p:${client._aid}` : "";
+    if (ns) client._delivery.onPullStarted?.(ns);
     if (opts?.windowMode === "tail") {
       if (!opts.gateLocked) {
         const key = pullGateKeyForClient(client, "message.v2.pull", {
@@ -24100,7 +25028,7 @@ var V2E2EECoordinator = class {
           after_seq: afterSeq,
           limit
         }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
-        return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
+        return await client._runPullSerialized(key, () => this.pullV2Impl(afterSeq, limit, {
           ...opts ?? {},
           gateLocked: true
         }), false);
@@ -24114,7 +25042,7 @@ var V2E2EECoordinator = class {
         force: opts?.force === true,
         limit
       }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-      return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
+      return await client._runPullSerialized(key, () => this.pullV2Impl(afterSeq, limit, {
         ...opts ?? {},
         gateLocked: true
       }), true);
@@ -24171,15 +25099,16 @@ var V2E2EECoordinator = class {
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
       const deferredKeyFetches = /* @__PURE__ */ new Map();
       let blockedSeq = 0;
+      const pageDecryptedBefore = decrypted.length;
       for (const msg of messages) {
         const seq2 = Number(msg.seq ?? 0);
         if (!Number.isFinite(seq2) || seq2 <= 0) continue;
         const version = String(msg.version ?? "v2");
         if (version === "v1") {
           const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
-          const legacyPayload = legacy.payload;
+          const legacyPayload = legacy.payload !== void 0 ? legacy.payload : msg.payload;
           const payloadType = isJsonObject(legacyPayload) ? String(legacyPayload.type ?? "").trim() : "";
-          if (legacyPayload !== void 0 && legacyPayload !== null && payloadType !== "e2ee.encrypted" && payloadType !== "e2ee.group_encrypted") {
+          if (legacyPayload !== void 0 && legacyPayload !== null && !["e2ee.encrypted", "e2ee.group_encrypted", "e2ee.p2p_encrypted"].includes(payloadType)) {
             const v1Msg = {
               message_id: String(msg.message_id ?? ""),
               from: String(msg.from_aid ?? ""),
@@ -24193,8 +25122,32 @@ var V2E2EECoordinator = class {
             attachGatewayProximity(v1Msg, msg);
             const appEvent = client._delivery.p2pAppEventForMessage(v1Msg);
             if (ns) await client._publishPulledMessage(appEvent.event, ns, seq2, appEvent.payload, false);
-            else await client._publishAppEvent(appEvent.event, appEvent.payload);
+            else await client._publishAppEvent(appEvent.event, appEvent.payload, "pull");
             decrypted.push(v1Msg);
+          } else if (isJsonObject(legacyPayload) && ["e2ee.p2p_encrypted", "e2ee.encrypted"].includes(payloadType)) {
+            const deferStatus2 = {};
+            const plaintext2 = await client._decryptV2Message(
+              { ...msg, envelope_json: JSON.stringify(legacyPayload) },
+              true,
+              true,
+              true,
+              true,
+              deferStatus2,
+              true,
+              "pull"
+            );
+            if (deferStatus2.deferred) {
+              blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
+              if (deferStatus2.fromAid) {
+                const key = `${deferStatus2.fromAid}\0${deferStatus2.senderDeviceId ?? ""}\0${deferStatus2.groupId ?? ""}`;
+                deferredKeyFetches.set(key, { fromAid: deferStatus2.fromAid, senderDeviceId: deferStatus2.senderDeviceId ?? "", groupId: deferStatus2.groupId ?? "" });
+              }
+            }
+            if (plaintext2) {
+              if (ns) await client._publishPulledMessage("message.received", ns, seq2, plaintext2, false);
+              else await client._publishAppEvent("message.received", plaintext2, "pull");
+              decrypted.push(plaintext2);
+            }
           } else {
             client._clientLog.debug(`message.v2.pull skipping V1 envelope seq=${seq2} payload_type=${payloadType || "<none>"} (V1 E2EE removed)`);
           }
@@ -24209,7 +25162,7 @@ var V2E2EECoordinator = class {
           client._v2Session.trackOldSPKMaxSeq(msgSpkId, seq2);
         }
         const deferStatus = {};
-        const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+        const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, "pull");
         if (deferStatus.deferred) {
           blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
         }
@@ -24226,7 +25179,7 @@ var V2E2EECoordinator = class {
           await client._publishPulledMessage("message.received", ns, seq2, plaintext, false);
           decrypted.push(plaintext);
         } else {
-          await client._publishAppEvent("message.received", plaintext);
+          await client._publishAppEvent("message.received", plaintext, "pull");
           decrypted.push(plaintext);
         }
       }
@@ -24281,7 +25234,7 @@ var V2E2EECoordinator = class {
         if (ackNeeded) {
           this.recordForwardAck(ns, ackSeq);
           const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
-          const canContinuePage = messages.length > 0 && nextAfter2 > nextAfterSeq;
+          const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter2 > nextAfterSeq;
           if (canContinuePage) {
             pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
             lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -24291,6 +25244,16 @@ var V2E2EECoordinator = class {
           }
         }
       }
+      if (ns) client._delivery.onPullPage?.(
+        ns,
+        decrypted.length - pageDecryptedBefore,
+        hasMore,
+        pageMaxSeq,
+        typeof result.remaining === "number" && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null,
+        messages.length,
+        client._seqTracker.getContiguousSeq(ns),
+        pageMaxSeq
+      );
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
       const rawCount = messages.length;
       if (blockedSeq > 0) break;
@@ -24325,6 +25288,7 @@ var V2E2EECoordinator = class {
         pendingAckSeq = 0;
       }
     }
+    client._delivery.onPullWorkSettled?.();
     return decrypted;
   }
   async confirmForwardP2PAck(upToSeq, inlineGeneration) {
@@ -24402,7 +25366,8 @@ var V2E2EECoordinator = class {
       });
       return client.call("group.v2.send", withExplicitGroupAid({
         group_id: gid,
-        envelope
+        envelope,
+        message_id: opts?.messageId
       }, groupAid));
     };
     try {
@@ -24461,6 +25426,11 @@ var V2E2EECoordinator = class {
     const afterSeq = strictWindowSeq(params2.after_seq ?? 0, "after_seq");
     const limit = strictWindowLimit(params2.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
     const ns = `group:${groupId}`;
+    const cursorParams = isJsonObject(params2._group_cursor_params) ? params2._group_cursor_params : params2;
+    const requestDeviceId = String(cursorParams.device_id ?? "").trim();
+    const requestSlotId = String(cursorParams.slot_id ?? "").trim();
+    const ownsCursor = (!requestDeviceId || requestDeviceId === String(client._deviceId ?? "")) && (!requestSlotId || requestSlotId === String(client._slotId ?? ""));
+    if (ownsCursor) client._delivery.onPullStarted?.(ns);
     const result = await client._callRawV2Rpc("group.v2.pull", withExplicitGroupAid({
       group_id: groupId,
       window_mode: "tail",
@@ -24490,6 +25460,17 @@ var V2E2EECoordinator = class {
     }
     const ack = client._seqTracker.getContiguousSeq(ns);
     if (ack > previous.ack) await this.ackGroupV2(groupId, ack, groupAid);
+    if (ownsCursor) client._delivery.onPullPage?.(
+      ns,
+      decoded.length,
+      result.has_more === true,
+      page.head,
+      typeof result.remaining === "number" && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null,
+      page.messages.length,
+      ack,
+      page.head
+    );
+    client._delivery.onPullWorkSettled?.();
     return { ...result, messages: decoded, raw_count: page.messages.length };
   }
   async historyGroupV2Internal(params2) {
@@ -24522,6 +25503,13 @@ var V2E2EECoordinator = class {
     });
   }
   async pullGroupV2(groupId, afterSeq = 0, limit = 50, opts) {
+    const lifecycleNs = `group:${String(groupId ?? "").trim()}`;
+    if (opts?.ownsCursor === false) {
+      return await this.pullGroupV2Impl(groupId, afterSeq, limit, opts);
+    }
+    return await this.runPullWithLifecycle(lifecycleNs, () => this.pullGroupV2Impl(groupId, afterSeq, limit, opts));
+  }
+  async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
     const client = this.client;
     await client._ensureV2SessionReady("group.pull");
     const gid = String(groupId ?? "").trim();
@@ -24537,12 +25525,13 @@ var V2E2EECoordinator = class {
           limit,
           _group_cursor_params: opts?.cursorParams
         }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
-        return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
+        return await client._runPullSerialized(key, () => this.pullGroupV2Impl(gid, afterSeq, limit, {
           ...opts ?? {},
           gateLocked: true
         }), false);
       }
       const result = await this.pullGroupV2TailInternal({
+        ...opts?.cursorParams ?? {},
         group_id: String(opts.wireGroupId ?? gid),
         group_aid: groupAid || void 0,
         window_mode: "tail",
@@ -24559,7 +25548,7 @@ var V2E2EECoordinator = class {
         limit,
         _group_cursor_params: opts?.cursorParams
       }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-      return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
+      return await client._runPullSerialized(key, () => this.pullGroupV2Impl(gid, afterSeq, limit, {
         ...opts ?? {},
         gateLocked: true
       }), true);
@@ -24568,6 +25557,7 @@ var V2E2EECoordinator = class {
     const wireGroupId = String(opts?.wireGroupId ?? groupId ?? "").trim() || gid;
     const cursorParams = opts?.cursorParams ?? {};
     const ownsCursor = opts?.ownsCursor !== false;
+    if (ownsCursor) client._delivery.onPullStarted?.(ns);
     let pullGateKey = ownsCursor ? pullGateKeyForClient(client, "group.v2.pull", {
       group_id: gid,
       after_seq: afterSeq,
@@ -24628,26 +25618,28 @@ var V2E2EECoordinator = class {
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
       const deferredKeyFetches = /* @__PURE__ */ new Map();
       let blockedSeq = 0;
+      const pageDecryptedBefore = decrypted.length;
       for (const msg of messages) {
         const seq2 = Number(msg.seq ?? 0);
         if (!Number.isFinite(seq2) || seq2 <= 0) continue;
         const version = String(msg.version ?? "v2");
         if (version === "v1") {
-          const payload = msg.payload;
+          const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
+          const payload = msg.payload !== void 0 ? msg.payload : legacy.payload;
           const payloadObj = isJsonObject(payload) ? payload : null;
-          if (client._delivery.recallEventFromGroupMessage(msg)) {
+          if (typeof client._delivery?.recallEventFromGroupMessage === "function" && client._delivery.recallEventFromGroupMessage(msg)) {
             await client._delivery.publishGroupRecallTombstone(gid, seq2, {
               ...msg,
               group_id: gid,
               group_aid: eventGroupAid
-            });
+            }, "pull");
             client._markPublishedSeq(ns, seq2);
             client._clientLog.debug(`group.v2.pull recall tombstone delivered: group=${gid}, seq=${seq2}`);
             continue;
           }
           if (payloadObj) {
             const payloadType = String(payloadObj.type ?? "").trim();
-            if (payloadType !== "e2ee.encrypted" && payloadType !== "e2ee.group_encrypted") {
+            if (payloadType !== "e2ee.encrypted" && payloadType !== "e2ee.group_encrypted" && payloadType !== "e2ee.p2p_encrypted") {
               let v1Msg = {
                 message_id: String(msg.message_id ?? ""),
                 from: String(msg.from_aid ?? ""),
@@ -24683,6 +25675,32 @@ var V2E2EECoordinator = class {
             decrypted.push(v1Msg);
             continue;
           }
+          if (payloadObj && ["e2ee.group_encrypted", "e2ee.p2p_encrypted", "e2ee.encrypted"].includes(String(payloadObj.type ?? "").trim())) {
+            const deferStatus2 = {};
+            const plaintext2 = await client._decryptV2Message(
+              { ...msg, envelope_json: JSON.stringify(payloadObj) },
+              true,
+              true,
+              true,
+              true,
+              deferStatus2,
+              true,
+              "pull"
+            );
+            if (deferStatus2.deferred) {
+              blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
+              if (deferStatus2.fromAid) {
+                const key = `${deferStatus2.fromAid}\0${deferStatus2.senderDeviceId ?? ""}\0${deferStatus2.groupId ?? ""}`;
+                deferredKeyFetches.set(key, { fromAid: deferStatus2.fromAid, senderDeviceId: deferStatus2.senderDeviceId ?? "", groupId: deferStatus2.groupId ?? "" });
+              }
+            }
+            if (plaintext2) {
+              plaintext2.group_id = gid;
+              plaintext2.group_aid = eventGroupAid;
+              await client._publishPulledMessage("group.message_created", ns, seq2, plaintext2, false);
+              decrypted.push(plaintext2);
+            }
+          }
           client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq2} payload_type=${payloadObj ? String(payloadObj.type ?? "") : "<none>"} (V1 E2EE removed)`);
           continue;
         }
@@ -24691,7 +25709,7 @@ var V2E2EECoordinator = class {
           continue;
         }
         const deferStatus = {};
-        let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+        let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, "pull");
         if (deferStatus.deferred) {
           blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
         }
@@ -24763,6 +25781,16 @@ var V2E2EECoordinator = class {
       for (const fetch2 of deferredKeyFetches.values()) {
         this.scheduleSenderIKFetch(fetch2.fromAid, fetch2.senderDeviceId, fetch2.groupId);
       }
+      client._delivery.onPullPage?.(
+        ns,
+        decrypted.length - pageDecryptedBefore,
+        hasMore,
+        pageMaxSeq,
+        typeof result.remaining === "number" && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null,
+        messages.length,
+        client._seqTracker.getContiguousSeq(ns),
+        pageMaxSeq
+      );
       if (ownsCursor && parsedCursorCurrentSeq !== null && cursorCurrentSeq > ackSeq) {
         this.recordForwardCursor(ns, cursorCurrentSeq, ackSeq);
       }
@@ -24771,7 +25799,7 @@ var V2E2EECoordinator = class {
       if (ackNeeded) {
         this.recordForwardAck(ns, ackSeq);
         const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
-        const canContinuePage = messages.length > 0 && nextAfter2 > nextAfterSeq && ownsCursor;
+        const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter2 > nextAfterSeq && ownsCursor;
         if (canContinuePage) {
           pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
           lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -24817,6 +25845,7 @@ var V2E2EECoordinator = class {
         pendingAckSeq = 0;
       }
     }
+    client._delivery.onPullWorkSettled?.();
     return decrypted;
   }
   async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
@@ -25326,7 +26355,7 @@ var V2E2EECoordinator = class {
   }
   async decryptV2PushMessage(data) {
     if (!isJsonObject(data)) return null;
-    return await this.client._decryptV2Message(data);
+    return await this.client._decryptV2Message(data, false, false, false, false, void 0, false, "inline_push");
   }
   async buildV2P2PEnvelope(opts) {
     const client = this.client;
@@ -25838,7 +26867,7 @@ var GroupStateCoordinator = class {
     if (!isJsonObject(data) || !client._v2Session) return;
     const groupId = groupIdFromRecord(data);
     if (!groupId) return;
-    await client._dispatcher.publish("group.v2.state_proposed", data);
+    client._dispatcher.enqueue("group.v2.state_proposed", data);
     try {
       await client._v2ConfirmPendingProposal(groupId);
     } catch (exc) {
@@ -25850,7 +26879,7 @@ var GroupStateCoordinator = class {
     if (!isJsonObject(data) || !client._v2Session) return;
     const groupId = groupIdFromRecord(data);
     if (!groupId) return;
-    await client._dispatcher.publish("group.v2.state_retry_needed", data);
+    client._dispatcher.enqueue("group.v2.state_retry_needed", data);
     try {
       await client._v2AutoProposeState(groupId, { leaderDelay: true });
     } catch (exc) {
@@ -25868,7 +26897,7 @@ var GroupStateCoordinator = class {
       }
       client._v2AutoProposeLastSnapshot?.delete?.(groupId);
     }
-    await client._dispatcher.publish("group.v2.state_confirmed", data);
+    client._dispatcher.enqueue("group.v2.state_confirmed", data);
   }
   async publishV2GroupSecurityLevel(groupId, bootstrap) {
     const client = this.client;
@@ -25879,7 +26908,7 @@ var GroupStateCoordinator = class {
     const previous = securityLevels.get(gid);
     if (previous === level) return;
     securityLevels.set(gid, level);
-    await client._dispatcher.publish("group.v2.security_level", {
+    client._dispatcher.enqueue("group.v2.security_level", {
       group_id: gid,
       level,
       warning: String(bootstrap.e2ee_security_warning ?? ""),
@@ -25974,7 +27003,7 @@ var GroupStateCoordinator = class {
       } catch {
       }
       client._clientLog.warn(`V2 state chain fork detected: group=${gid} local_chain=${localChain.slice(0, 16)}... server_chain=${serverChain.slice(0, 16)}...`);
-      await client._dispatcher.publish("group.v2.fork_detected", {
+      client._dispatcher.enqueue("group.v2.fork_detected", {
         group_id: gid,
         local_chain: localChain,
         server_chain: serverChain
@@ -26508,7 +27537,7 @@ var GroupStateCoordinator = class {
       }
       if (mode !== "open" && mode !== "invite_code" && mode !== "invite_only") {
         client._clientLog.warn(`V2 state tamper detected: group=${groupId} pending_extra=${extra.sort().join(",")} mode=${mode}`);
-        await client._dispatcher.publish("group.v2.state_tampered", {
+        client._dispatcher.enqueue("group.v2.state_tampered", {
           group_id: groupId,
           pending_extra: extra.sort(),
           mode
@@ -27458,6 +28487,7 @@ function buildDefaultAgentMd(aid, options = {}) {
   ].join("\n");
 }
 var HEAD_HTTP_TIMEOUT_MS = 15e3;
+var AGENT_MD_NEGATIVE_CACHE_TTL_MS = 6e4;
 var noopLogger = {
   error: () => {
   },
@@ -27798,6 +28828,24 @@ var AgentMdManager = class _AgentMdManager {
         ttl_days: Number(ttlDays) || 0
       };
     }
+    const remoteMissingCached = String(before.remote_status ?? "").trim().toLowerCase() === "missing";
+    if (!localFound && !remoteEtagCached && remoteMissingCached && _AgentMdManager.checkedAtFresh(checkedAtCached, ttlDays)) {
+      return {
+        aid: target,
+        local_found: false,
+        remote_found: false,
+        local_etag: "",
+        remote_etag: "",
+        in_sync: false,
+        needs_update: false,
+        last_modified: "",
+        status: 404,
+        cached: true,
+        verify_status: "",
+        verify_error: "",
+        ttl_days: Number(ttlDays) || 0
+      };
+    }
     const now = Date.now();
     let remote;
     try {
@@ -28287,14 +29335,16 @@ var AgentMdManager = class _AgentMdManager {
   async _scheduleFetchIfMissing(aid, record, source = "") {
     const target = String(aid ?? "").trim();
     if (!target || await this._hasLocalContent(target, record)) return;
+    const cached = record ?? await this.loadRecord(target) ?? {};
+    const checkedAt = Number(cached.checked_at ?? 0) || 0;
+    if (String(cached.remote_status ?? "").trim().toLowerCase() === "missing" && checkedAt > 0 && Date.now() - checkedAt <= AGENT_MD_NEGATIVE_CACHE_TTL_MS) return;
     if (this._fetchInflight.has(target)) return;
     this._fetchInflight.add(target);
     try {
       await this.download(target);
     } catch (err) {
       await this.saveRecord(target, {
-        last_error: err instanceof Error ? err.message : String(err),
-        remote_status: "found"
+        last_error: err instanceof Error ? err.message : String(err)
       });
       this._log.debug(`agent.md auto fetch failed: aid=${target} source=${source || "-"} err=${err instanceof Error ? err.message : String(err)}`);
     } finally {
@@ -28718,7 +29768,6 @@ var _AUNClient = class _AUNClient {
     __publicField(this, "_reconnectActive", false);
     __publicField(this, "_reconnectAbort", null);
     __publicField(this, "_reconnectTask", null);
-    __publicField(this, "_reconnectEventDispatchDepth", 0);
     __publicField(this, "_serverKicked", false);
     // 重连状态追踪（对齐 Python client.py）
     __publicField(this, "_nextRetryAt", null);
@@ -28898,7 +29947,7 @@ var _AUNClient = class _AUNClient {
     });
     for (const evt of ["message.ack", "storage.object_changed", "stream/created", "stream/closed"]) {
       this._dispatcher.subscribe(`_raw.${evt}`, (data) => {
-        this._dispatcher.publish(evt, data);
+        this._dispatcher.enqueue(evt, data);
       });
     }
     this._dispatcher.subscribe("_raw.gateway.disconnect", async (data) => {
@@ -29352,6 +30401,53 @@ var _AUNClient = class _AUNClient {
     await this._agentMdManager.upload(await this._agentMdManager.readContent(target) ?? buildDefaultAgentMd(target));
     return true;
   }
+  async _checkIdentityAdmissionAfterConnect() {
+    const aid = String(this._aid ?? this._currentAid?.aid ?? "").trim();
+    if (!aid) return;
+    try {
+      const checked = await this._agentMdManager.check(aid);
+      if (!checked.remote_found) {
+        const content = await this._agentMdManager.readContent(aid) ?? buildDefaultAgentMd(aid);
+        await this._agentMdManager.upload(content);
+      }
+    } catch (exc) {
+      this._clientLog.warn(`post-connect agent.md check failed: ${String(exc)}`);
+    }
+    const store = this._aidStore;
+    if (!store) return;
+    let listed;
+    try {
+      listed = await this.call("group.list_my", {});
+    } catch (exc) {
+      this._clientLog.warn(`post-connect group identity check failed: ${String(exc)}`);
+      return;
+    }
+    const result = isJsonObject(listed) ? listed : {};
+    const groups = Array.isArray(result.groups) ? result.groups : Array.isArray(result.items) ? result.items : [];
+    for (const raw of groups) {
+      if (!isJsonObject(raw)) continue;
+      const role = String(raw.role ?? raw.my_role ?? "").trim().toLowerCase();
+      if (role !== "owner") continue;
+      const groupId = String(raw.group_id ?? raw.groupId ?? raw.group_aid ?? raw.groupAid ?? "").trim();
+      const groupAid = String(raw.group_aid ?? raw.groupAid ?? groupId).trim();
+      if (!groupId || !groupAid) continue;
+      try {
+        await this._runGroupIdentityOperation(groupId, async () => {
+          const loaded = await store.load(groupAid);
+          if (!loaded.ok || !loaded.data?.aid?.isPrivateKeyValid()) {
+            await this.bindGroupAid({ group_id: groupId, group_aid: groupAid }, { aidStore: store });
+            return;
+          }
+          const checked = await this._agentMdManager.check(groupAid);
+          if (!checked.remote_found) {
+            await this._uploadGroupAgentMd(store, groupAid, {}, {}, aid);
+          }
+        });
+      } catch (exc) {
+        this._clientLog.warn(`post-connect group identity check failed: group=${groupId} err=${String(exc)}`);
+      }
+    }
+  }
   async _runGroupIdentityOperation(groupId, operation) {
     const aid = String(this._aid ?? this._currentAid?.aid ?? "").trim();
     const dot = aid.indexOf(".");
@@ -29985,8 +31081,8 @@ var _AUNClient = class _AUNClient {
   _markPublishedSeq(ns, seq2) {
     this._delivery.markPublishedSeq(ns, seq2);
   }
-  async _publishAppEvent(event, payload) {
-    await this._delivery.publishAppEvent(event, payload);
+  async _publishAppEvent(event, payload, source = "direct", ns = "", batch) {
+    await this._delivery.publishAppEvent(event, payload, source, ns, batch);
   }
   _echoTimestamp() {
     const now = /* @__PURE__ */ new Date();
@@ -30024,11 +31120,11 @@ var _AUNClient = class _AUNClient {
   async _drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
     await this._delivery.drainOrderedMessages(ns, beforeSeq, pullResponse, persist);
   }
-  async _publishOrderedMessage(event, ns, seq2, payload) {
-    return this._delivery.publishOrderedMessage(event, ns, seq2, payload);
+  async _publishOrderedMessage(event, ns, seq2, payload, source = "push", batch) {
+    return this._delivery.publishOrderedMessage(event, ns, seq2, payload, source, batch);
   }
-  async _publishPulledMessage(event, ns, seq2, payload, persist = true) {
-    return this._delivery.publishPulledMessage(event, ns, seq2, payload, persist);
+  async _publishPulledMessage(event, ns, seq2, payload, persist = true, source = "pull", batch) {
+    return this._delivery.publishPulledMessage(event, ns, seq2, payload, persist, source, batch);
   }
   _extractGroupIdFromResult(result) {
     const group = isJsonObject(result.group) ? result.group : null;
@@ -30059,7 +31155,7 @@ var _AUNClient = class _AUNClient {
         const groupId = d.group_id ?? d.group_aid ?? "";
         await this._delivery.handleGroupChangedEventSeq(d, groupId);
       } else {
-        await this._dispatcher.publish("group.changed", data);
+        this._dispatcher.enqueue("group.changed", data);
       }
       this._clientLog.debug(`_onRawGroupChanged exit: elapsed=${Date.now() - tStart}ms group_id=${groupIdInit}`);
     } catch (err) {
@@ -30132,7 +31228,7 @@ var _AUNClient = class _AUNClient {
       const ok = await ecdsaVerifyDer(pubKey, sigBytes, signData);
       if (!ok) {
         this._clientLog.warn(`group event sig verify failed aid=%s method=%s${sigAid} ${method}`);
-        this._dispatcher.publish("signature.verification_failed", {
+        this._dispatcher.enqueue("signature.verification_failed", {
           aid: sigAid,
           method,
           error: "ECDSA verification failed"
@@ -30141,7 +31237,7 @@ var _AUNClient = class _AUNClient {
       return ok;
     } catch (exc) {
       this._clientLog.warn(`group event sig verify exception:${String(exc)}`);
-      this._dispatcher.publish("signature.verification_failed", {
+      this._dispatcher.enqueue("signature.verification_failed", {
         aid: sigAid,
         method,
         error: String(exc)
@@ -30359,7 +31455,7 @@ var _AUNClient = class _AUNClient {
           throw new StateError("connection attempt superseded");
         }
       } else {
-        await this._dispatcher.publish("state_change", statePayload);
+        this._dispatcher.enqueue("state_change", statePayload);
       }
       this._assertReconnectOwner(reconnectOwner);
       this._lifecycle.assertConnectionAttemptOwner(connectionOwner);
@@ -30383,6 +31479,7 @@ var _AUNClient = class _AUNClient {
       if (backgroundSyncEnabled) {
         this._safeAsync(this._fillP2pGap());
       }
+      this._safeAsync(this._checkIdentityAdmissionAfterConnect());
       this._clientLog.debug(`_connectOnce exit: elapsed=${Date.now() - tStart}ms aid=${this._aid ?? "-"}`);
     } catch (err) {
       this._clientLog.debug(`_connectOnce exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
@@ -30676,7 +31773,7 @@ var _AUNClient = class _AUNClient {
           if (this._sessionParams && identity.access_token) {
             this._sessionParams.access_token = identity.access_token;
           }
-          await this._dispatcher.publish("token.refreshed", {
+          this._dispatcher.enqueue("token.refreshed", {
             aid: identity.aid,
             expires_at: identity.access_token_expires_at
           });
@@ -30685,7 +31782,7 @@ var _AUNClient = class _AUNClient {
           if (exc instanceof AuthError) {
             if (authErrorRequiresRelogin(exc)) {
               this._clientLog.warn(`token refresh requires relogin, stopping refresh loop and triggering reconnect: ${exc.message}`);
-              await this._dispatcher.publish("token.refresh_exhausted", {
+              this._dispatcher.enqueue("token.refresh_exhausted", {
                 aid: this._identity?.aid ?? null,
                 consecutive_failures: 1,
                 last_error: String(exc),
@@ -30698,7 +31795,7 @@ var _AUNClient = class _AUNClient {
             this._tokenRefreshFailures++;
             if (this._tokenRefreshFailures >= 3) {
               this._clientLog.warn(`token refresh failed ${this._tokenRefreshFailures} consecutive times, stopping refresh loop and triggering reconnect`);
-              await this._dispatcher.publish("token.refresh_exhausted", {
+              this._dispatcher.enqueue("token.refresh_exhausted", {
                 aid: this._identity?.aid ?? null,
                 consecutive_failures: this._tokenRefreshFailures,
                 last_error: String(exc)
@@ -30709,7 +31806,7 @@ var _AUNClient = class _AUNClient {
             }
             this._clientLog.warn(`token refresh failed (${this._tokenRefreshFailures}/3), next retry: ${String(exc)}`);
           } else {
-            this._dispatcher.publish("connection.error", { error: formatCaughtError2(exc) });
+            this._dispatcher.enqueue("connection.error", { error: formatCaughtError2(exc) });
           }
         }
         scheduleRefresh();
@@ -30738,7 +31835,7 @@ var _AUNClient = class _AUNClient {
     this._serverKicked = !retryable;
     this._lastDisconnectInfo = { code, reason, detail };
     try {
-      await this._dispatcher.publish("gateway.disconnect", { code, reason, detail });
+      this._dispatcher.enqueue("gateway.disconnect", { code, reason, detail });
     } catch (exc) {
       this._clientLog.debug(`publish gateway.disconnect failed: ${exc?.message ?? exc}`);
     }
@@ -30757,7 +31854,7 @@ var _AUNClient = class _AUNClient {
     } catch (exc) {
       this._clientLog.debug(`transport cleanup skipped: ${formatCaughtError2(exc)}`);
     }
-    await this._dispatcher.publish("state_change", {
+    this._dispatcher.enqueue("state_change", {
       state: this._publicState(this._state),
       error
     });
@@ -30793,7 +31890,7 @@ var _AUNClient = class _AUNClient {
       if (disconnectInfo.code !== void 0 && disconnectInfo.code !== null) {
         eventPayload.code = disconnectInfo.code;
       }
-      await this._dispatcher.publish("state_change", eventPayload);
+      this._dispatcher.enqueue("state_change", eventPayload);
       if (this._reconnectAbort === reconnectAbort) {
         this._reconnectAbort = null;
         this._reconnectActive = false;
@@ -30824,12 +31921,7 @@ var _AUNClient = class _AUNClient {
   }
   async _publishReconnectEvent(owner, event, payload) {
     if (!this._ownsReconnect(owner)) return false;
-    this._reconnectEventDispatchDepth += 1;
-    try {
-      await this._dispatcher.publish(event, payload);
-    } finally {
-      this._reconnectEventDispatchDepth -= 1;
-    }
+    this._dispatcher.enqueue(event, payload);
     return this._ownsReconnect(owner);
   }
   async _cancelReconnectAndWait() {
@@ -30842,7 +31934,7 @@ var _AUNClient = class _AUNClient {
     } catch (exc) {
       this._clientLog.debug(`reconnect cancellation transport cleanup skipped: ${formatCaughtError2(exc)}`);
     }
-    if (task && this._reconnectEventDispatchDepth === 0) {
+    if (task) {
       try {
         await task;
       } catch (exc) {
@@ -31274,7 +32366,7 @@ var _AUNClient = class _AUNClient {
    * undecryptable 事件、成功消费后触发 SPK 轮换。inline Push 在游标提交和
    * Head/正文绑定校验前调用本入口时必须显式关闭这些副作用。
    */
-  async _decryptV2Message(msg, allowPending = true, emitUndecryptable = true, rotateKeys = true, observeAgentMd = true, deferStatus, deferKeyFetch = false) {
+  async _decryptV2Message(msg, allowPending = true, emitUndecryptable = true, rotateKeys = true, observeAgentMd = true, deferStatus, deferKeyFetch = false, source = "pull") {
     const session = this._v2Session;
     if (!session) return null;
     const envJson = msg.envelope_json;
@@ -31362,10 +32454,11 @@ var _AUNClient = class _AUNClient {
             _decrypt_stage: "spk_lookup",
             _envelope_type: String(envelope.type ?? ""),
             _suite: String(envelope.suite ?? ""),
-            _spk_id: spkId
+            _spk_id: spkId,
+            source
           };
           attachV2EnvelopeMetadata2(event, e2eeMeta);
-          await this._dispatcher.publish(undecryptableEvent, event);
+          this._dispatcher.enqueue(undecryptableEvent, event);
         } catch {
         }
       }
@@ -31403,10 +32496,11 @@ var _AUNClient = class _AUNClient {
             _decrypt_error: "sender_ik_not_found",
             _decrypt_stage: "sender_ik",
             _envelope_type: String(envelope.type ?? ""),
-            _suite: String(envelope.suite ?? "")
+            _suite: String(envelope.suite ?? ""),
+            source
           };
           attachV2EnvelopeMetadata2(event, e2eeMeta);
-          await this._dispatcher.publish(undecryptableEvent, event);
+          this._dispatcher.enqueue(undecryptableEvent, event);
         } catch {
         }
       }
@@ -31439,10 +32533,11 @@ var _AUNClient = class _AUNClient {
             _decrypt_error: String(exc),
             _decrypt_stage: "decrypt",
             _envelope_type: String(envelope.type ?? ""),
-            _suite: String(envelope.suite ?? "")
+            _suite: String(envelope.suite ?? ""),
+            source
           };
           attachV2EnvelopeMetadata2(event, e2eeMeta);
-          await this._dispatcher.publish(undecryptableEvent, event);
+          this._dispatcher.enqueue(undecryptableEvent, event);
         } catch {
         }
       }
@@ -32017,7 +33112,7 @@ var RegisterFlow = class _RegisterFlow {
     return new Promise((resolve, reject) => {
       let ws;
       try {
-        ws = new WebSocket(gatewayUrl);
+        ws = createTransportWebSocket(gatewayUrl);
       } catch {
         reject(new AuthError(`WebSocket \u8FDE\u63A5\u5931\u8D25: ${gatewayUrl}`));
         return;
@@ -32051,7 +33146,19 @@ var RegisterFlow = class _RegisterFlow {
           if (!receivedChallenge) {
             if (!isJsonObject(msg) || msg.method !== "challenge") return;
             receivedChallenge = true;
-            ws.send(JSON.stringify({ jsonrpc: "2.0", id: requestId, method, params: params2 }));
+            const sendResult = ws.send(JSON.stringify({ jsonrpc: "2.0", id: requestId, method, params: params2 }));
+            if (sendResult && typeof sendResult.then === "function") {
+              void Promise.resolve(sendResult).catch((error) => {
+                if (settled) return;
+                settled = true;
+                globalThis.clearTimeout(timeout);
+                try {
+                  ws.close();
+                } catch {
+                }
+                reject(error instanceof Error ? error : new AuthError(String(error)));
+              });
+            }
             return;
           }
           if (!isJsonObject(msg) || msg.id !== requestId) return;