@agentunion/fastaun-browser 0.5.10 → 0.5.11

package/dist/bundle.js

@@ -460,7 +460,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.5.10";
+var VERSION = "0.5.11";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -1296,6 +1296,8 @@ 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: () => {
@@ -1304,6 +1306,7 @@ var _noopLog3 = { error: () => {
 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') {
@@ -1343,11 +1346,19 @@ var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
     __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);
@@ -1355,17 +1366,35 @@ var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
       URL.revokeObjectURL(this._workerUrl);
       throw error;
     }
-    this._worker.onmessage = (event) => this._handleWorkerMessage(event.data);
-    this._worker.onerror = (event) => this._emitError(event.message || "websocket worker error");
-    this._worker.postMessage({ type: "connect", url });
+    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 {
-        this._worker.postMessage({ type: "send", id, data });
+        worker.postMessage({ type: "send", id, data });
       } catch (error) {
         this._pendingSends.delete(id);
         reject(error instanceof Error ? error : new Error(String(error)));
@@ -1375,7 +1404,24 @@ var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
   close(code, reason) {
     if (this.readyState === _WorkerWebSocketProxy.CLOSED) return;
     this.readyState = _WorkerWebSocketProxy.CLOSING;
-    this._worker.postMessage({ type: "close", code, reason });
+    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);
@@ -1387,6 +1433,21 @@ var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
     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;
@@ -1396,6 +1457,8 @@ var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
       return;
     }
     if (reply.type === "open") {
+      this._clearWorkerOpenTimer();
+      this._opened = true;
       this.readyState = _WorkerWebSocketProxy.OPEN;
       const event = new Event("open");
       this.onopen?.(event);
@@ -1409,24 +1472,94 @@ var _WorkerWebSocketProxy = class _WorkerWebSocketProxy {
       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") {
-      this.readyState = _WorkerWebSocketProxy.CLOSED;
-      for (const pending of this._pendingSends.values()) pending.reject(new Error("websocket closed"));
-      this._pendingSends.clear();
-      const event = new CloseEvent("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
-      });
-      this.onclose?.(event);
-      this._emit("close", event);
-      this._worker.terminate();
-      URL.revokeObjectURL(this._workerUrl);
+      }));
     }
   }
+  _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);
@@ -4877,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();
@@ -4905,6 +5058,9 @@ 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);
@@ -4925,6 +5081,7 @@ var MessageDeliveryEngine = class {
     this.runtime = runtime;
   }
   resetInlineAckState() {
+    this.syncStopped("aborted");
     this.inlineGeneration += 1;
     this.deliveryGeneration += 1;
     this.pendingPullDeliveryChanges = null;
@@ -4940,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;
@@ -4967,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;
@@ -4978,7 +5222,7 @@ var MessageDeliveryEngine = class {
   onPullWorkSettled() {
     const pipeline = this.runtime.client._rpcPipeline;
     if (pipeline?.hasAnyPullActivity?.() === true) return;
-    void this.flushPullDeliveryChanges();
+    void this.flushPullDeliveryChanges().finally(() => this.syncStopped("pull_drained"));
   }
   deliveryChangeNamespace(event, payload, ns = "") {
     if (event === "message.received") return "p2p";
@@ -5024,7 +5268,11 @@ var MessageDeliveryEngine = class {
     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, changes });
+    this.runtime.client._dispatcher.enqueue("delivery.changed", {
+      trigger: batch.trigger,
+      source: batch.trigger,
+      changes
+    });
   }
   async flushPullDeliveryChanges() {
     const generation = this.deliveryGeneration;
@@ -5034,7 +5282,11 @@ var MessageDeliveryEngine = class {
     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", changes });
+    this.runtime.client._dispatcher.enqueue("delivery.changed", {
+      trigger: "pull_drained",
+      source: "pull",
+      changes
+    });
   }
   recordPendingPull(ns, seq2) {
     if (!ns || !Number.isSafeInteger(seq2) || seq2 <= 0) return;
@@ -5537,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;
@@ -5608,6 +5860,17 @@ 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, source = "push") {
@@ -5629,11 +5892,11 @@ var MessageDeliveryEngine = class {
   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) {
@@ -5642,7 +5905,7 @@ var MessageDeliveryEngine = class {
     }
     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;
@@ -5653,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";
@@ -5670,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;
@@ -5896,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;
@@ -5915,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;
   }
@@ -5977,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;
@@ -5998,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;
   }
@@ -6061,7 +6329,7 @@ var MessageDeliveryEngine = class {
     }
     if (contig !== contigBefore) this.persistSeq(ns);
   }
-  async publishAppEvent(event, payload, source = "", ns = "", batch) {
+  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)) {
@@ -6082,11 +6350,16 @@ var MessageDeliveryEngine = class {
         client._clientLog.debug(`agent_md etag inject skipped: ${String(exc)}`);
       }
     }
-    client._dispatcher.enqueue(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 (source !== "pull" && source !== "tail" && source !== "pending_retry" && source !== "push" && source !== "inline_push") return;
-    if (source === "push" || source === "inline_push") {
-      const localBatch = batch ?? this.createDeliveryChangeBatch(source);
+    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 {
@@ -6287,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");
       }
     }
   }
@@ -6398,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");
       }
     }
   }
@@ -6406,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) {
@@ -6426,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;
       }
     }
@@ -6453,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");
       }
     }
   }
@@ -6581,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;
@@ -6628,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);
@@ -6645,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);
@@ -6670,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;
@@ -6681,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,
@@ -7919,7 +8207,7 @@ var MessageDeliveryEngine = class {
         if (event === "message.recalled") {
           const published = await client._withPullResponseProcessing(
             ns,
-            () => this.publishMessageRecallTombstone(seq2, payload)
+            () => this.publishMessageRecallTombstone(seq2, payload, source)
           );
           this.ensurePullOperationCurrent();
           return published;
@@ -7941,7 +8229,7 @@ var MessageDeliveryEngine = class {
       if (event === "message.recalled") {
         const published = await client._withPullResponseProcessing(
           ns,
-          () => this.publishMessageRecallTombstone(seqNum, payload)
+          () => this.publishMessageRecallTombstone(seqNum, payload, source)
         );
         this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
@@ -16301,9 +16589,13 @@ var RpcPipeline = class {
       throw new Error("pull invalidated");
     }
     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();
       }
@@ -16428,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;
@@ -16441,11 +16734,13 @@ 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(() => {
@@ -16457,6 +16752,7 @@ 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?.();
     });
   }
@@ -24407,7 +24703,7 @@ var V2E2EECoordinator = class {
         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))}`);
@@ -24434,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}`);
       }
@@ -24513,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 ?? ""),
@@ -24527,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);
@@ -24558,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) {
@@ -24632,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;
@@ -24654,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) {
@@ -24668,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", {
@@ -24679,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);
@@ -24693,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);
@@ -24750,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 ?? ""),
@@ -24774,6 +25124,30 @@ var V2E2EECoordinator = class {
             if (ns) await client._publishPulledMessage(appEvent.event, ns, seq2, appEvent.payload, false);
             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)`);
           }
@@ -24788,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;
         }
@@ -24860,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);
@@ -24870,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;
@@ -24904,6 +25288,7 @@ var V2E2EECoordinator = class {
         pendingAckSeq = 0;
       }
     }
+    client._delivery.onPullWorkSettled?.();
     return decrypted;
   }
   async confirmForwardP2PAck(upToSeq, inlineGeneration) {
@@ -25041,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",
@@ -25070,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) {
@@ -25102,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();
@@ -25117,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",
@@ -25139,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);
@@ -25148,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,
@@ -25208,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 ?? ""),
@@ -25263,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;
         }
@@ -25271,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;
         }
@@ -25343,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);
       }
@@ -25351,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);
@@ -25397,6 +25845,7 @@ var V2E2EECoordinator = class {
         pendingAckSeq = 0;
       }
     }
+    client._delivery.onPullWorkSettled?.();
     return decrypted;
   }
   async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
@@ -25906,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;
@@ -29952,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(".");
@@ -30585,7 +31081,7 @@ var _AUNClient = class _AUNClient {
   _markPublishedSeq(ns, seq2) {
     this._delivery.markPublishedSeq(ns, seq2);
   }
-  async _publishAppEvent(event, payload, source = "", ns = "", batch) {
+  async _publishAppEvent(event, payload, source = "direct", ns = "", batch) {
     await this._delivery.publishAppEvent(event, payload, source, ns, batch);
   }
   _echoTimestamp() {
@@ -30983,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)}`);
@@ -31869,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;
@@ -31957,7 +32454,8 @@ 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);
           this._dispatcher.enqueue(undecryptableEvent, event);
@@ -31998,7 +32496,8 @@ 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);
           this._dispatcher.enqueue(undecryptableEvent, event);
@@ -32034,7 +32533,8 @@ 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);
           this._dispatcher.enqueue(undecryptableEvent, event);