@agentunion/fastaun-browser 0.5.10 → 0.5.12

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.12";
 
 // 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);
@@ -1614,6 +1747,9 @@ var EVENT_NAME_MAP = {
   "message.recalled": "message.recalled",
   "message.ack": "message.ack",
   "group.changed": "group.changed",
+  "group.invite_created": "group.invite_created",
+  "group.invite_received": "group.invite_received",
+  "group.invite_finalized": "group.invite_finalized",
   "group.message_created": "group.message_created",
   "group.message_recalled": "group.message_recalled",
   "group.state_committed": "group.state_committed",
@@ -4070,7 +4206,6 @@ var SeqTracker = class {
     if (headSeq === t.headSeq) {
       if (windowStartSeq <= t.tailSeq) return false;
       t.tailSeq = windowStartSeq;
-      this._normalizeWindow(t);
       return true;
     }
     if (t.headSeq + pageLimit < headSeq && windowStartSeq <= t.headSeq + 1) {
@@ -4079,7 +4214,6 @@ var SeqTracker = class {
     if (windowStartSeq > t.headSeq + 1) t.tailSeq = windowStartSeq;
     t.headSeq = headSeq;
     t.maxSeenSeq = Math.max(t.maxSeenSeq, headSeq);
-    this._normalizeWindow(t);
     return true;
   }
   /** Push 专用：只扩展上界 maxSeenSeq，不动 contiguousSeq。 */
@@ -4154,8 +4288,8 @@ var SeqTracker = class {
     }
     return true;
   }
-  /** 提交已校验的 Forward 原始页；页内缺号视为服务端永久空号。 */
-  onPullResult(ns, messages, afterSeq) {
+  /** 提交已校验的 Forward 原始页；缺号只有服务端明确证明时才能跳过。 */
+  onPullResult(ns, messages, afterSeq, contiguousSeq) {
     const t = this._get(ns);
     const pulledSeqs = /* @__PURE__ */ new Set();
     for (const m of messages) {
@@ -4185,6 +4319,7 @@ var SeqTracker = class {
     if (maxPulled > 0) {
       t.maxSeenSeq = Math.max(t.maxSeenSeq, maxPulled);
     }
+    this._tryAdvance(t);
     if (maxPulled > t.contiguousSeq) {
       for (const [key, probe] of t.pendingGaps) {
         if (probe.gapEnd <= maxPulled) t.pendingGaps.delete(key);
@@ -4194,7 +4329,11 @@ var SeqTracker = class {
       }
       t.contiguousSeq = maxPulled;
     }
-    this._tryAdvance(t);
+    let proof = Number.isSafeInteger(contiguousSeq) && contiguousSeq > 0 ? contiguousSeq : 0;
+    if (proof > 0) {
+      if (proof > t.contiguousSeq) this.forceContiguousSeq(ns, proof);
+    }
+    this._normalizeWindow(t);
     const remaining = [...t.receivedSeqs].filter((seq2) => seq2 > t.contiguousSeq);
     if (remaining.length > 0) {
       const firstPending = Math.min(...remaining);
@@ -4373,7 +4512,6 @@ var SeqTracker = class {
       restored.tailSeq = Number(tailRaw);
       restored.headSeq = Number(headRaw);
       restored.maxSeenSeq = Math.max(ack, restored.headSeq);
-      this._normalizeWindow(restored);
       this._trackers.set(ns, restored);
     }
     return issues;
@@ -4873,10 +5011,33 @@ function positiveSafeSequenceHint(value) {
   const parsed = Number(value);
   return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : 0;
 }
+function hasNonEmptyInlineMessage(value) {
+  return isJsonObject(value) && Object.keys(value).length > 0;
+}
 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 +5066,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 +5089,7 @@ var MessageDeliveryEngine = class {
     this.runtime = runtime;
   }
   resetInlineAckState() {
+    this.syncStopped("aborted");
     this.inlineGeneration += 1;
     this.deliveryGeneration += 1;
     this.pendingPullDeliveryChanges = null;
@@ -4940,6 +5105,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 +5134,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 +5230,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 +5276,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 +5290,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,18 +5797,22 @@ 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;
           }
+        } else if (this.isSelfSentGroupMessage(message)) {
+          this.markPublishedSeq(ns, seq2);
         } else if (await this.publishPulledMessage("group.message_created", ns, seq2, message, false)) {
           this.ensurePullOperationCurrent();
           publishedCount += 1;
         }
       }
       this.ensurePullOperationCurrent();
-      if (messages.length > 0) client._seqTracker.onPullResult(ns, messages, afterSeq);
+      const contiguousSeq = Number.isSafeInteger(result.contiguous_seq) ? result.contiguous_seq : void 0;
+      if (contiguousSeq === void 0) client._seqTracker.onPullResult(ns, messages, afterSeq);
+      else client._seqTracker.onPullResult(ns, messages, afterSeq, contiguousSeq);
       const commitTarget = Math.max(
         client._seqTracker.getContiguousSeq(ns),
         retentionFloor,
@@ -5608,6 +5872,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 +5904,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 +5917,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 +5928,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 +5945,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 +6176,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 +6195,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 +6257,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 +6278,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;
   }
@@ -6028,40 +6308,11 @@ var MessageDeliveryEngine = class {
       return;
     }
     const ns = `group:${groupId}`;
-    if (seqNum > 0) {
-      client._seqTracker.updateMaxSeen(ns, seqNum);
-      if (client._seqTracker.getContiguousSeq(ns) === seqNum) {
-        await this.publishGroupRecallTombstone(groupId, seq2, wrapped);
-        return;
-      }
-      client._repairPushContiguousBound(ns, seqNum, true, "_raw.group.message_recalled");
-    }
-    const pushed = client._pushedSeqs.get(ns);
-    const pending = client._pendingOrderedMsgs.get(ns);
-    if (pushed?.has(seqNum) || pending?.has(seqNum)) {
-      await this.publishGroupRecallTombstone(groupId, seq2, wrapped);
-      return;
-    }
-    const contigBefore = client._seqTracker.getContiguousSeq(ns);
-    client._seqTracker.onMessageSeq(ns, seqNum);
+    client._seqTracker.updateMaxSeen(ns, seqNum);
+    if (seqNum > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillGroupGap(groupId));
     await this.publishGroupRecallTombstone(groupId, seq2, wrapped);
-    this.markPublishedSeq(ns, seqNum);
-    const contig = client._seqTracker.getContiguousSeq(ns);
-    if (contig > 0) {
-      const ackSeq = this.clampAckSeq("group.ack_messages", "msg_seq", ns, contig);
-      client._transport.call("group.ack_messages", {
-        group_id: groupId,
-        msg_seq: ackSeq,
-        device_id: client._deviceId,
-        slot_id: client._slotId,
-        _rpc_background: true
-      }).catch((e) => {
-        client._clientLog.warn("group recall auto-ack failed: group=" + groupId, e);
-      });
-    }
-    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 +6333,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 {
@@ -6119,6 +6375,16 @@ var MessageDeliveryEngine = class {
     }
     return true;
   }
+  isSelfSentGroupMessage(message) {
+    if (!isJsonObject(message)) return false;
+    const client = this.runtime.client;
+    const selfAid = String(client._aid ?? "").trim().toLowerCase();
+    const senderAid = String(message.sender_aid ?? message.from_aid ?? message.from ?? "").trim().toLowerCase();
+    if (!selfAid || senderAid !== selfAid) return false;
+    const senderDevice = Object.prototype.hasOwnProperty.call(message, "sender_device_id") ? message.sender_device_id : message.from_device_id;
+    if (typeof senderDevice !== "string" || !senderDevice.trim() || !String(client._deviceId ?? "").trim()) return false;
+    return senderDevice.trim() === String(client._deviceId).trim();
+  }
   strictTargetString(source, key) {
     if (!Object.prototype.hasOwnProperty.call(source, key)) {
       return { present: false, valid: false, value: "" };
@@ -6179,11 +6445,11 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     client._clientLog.debug(`_onRawMessageReceived enter: from=${data?.from ?? "-"} mid=${data?.message_id ?? "-"} seq=${data?.seq ?? "-"}`);
     const ns = isJsonObject(data) && client._aid && data.seq !== void 0 ? `p2p:${client._aid}` : "";
-    const seq2 = isJsonObject(data) && typeof data.seq === "number" ? data.seq : 0;
-    if (client._v2Session && ns && Number.isSafeInteger(seq2) && seq2 > 0 && this.messageTargetsCurrentInstance(data)) {
+    const seq2 = isJsonObject(data) ? positiveSafeSequenceHint(data.seq) : 0;
+    if (client._v2Session && ns && seq2 > 0 && this.messageTargetsCurrentInstance(data)) {
       client._seqTracker.updateMaxSeen(ns, seq2);
     }
-    const hasInlineObject = isJsonObject(data) && isJsonObject(data.inline_message);
+    const hasInlineObject = isJsonObject(data) && hasNonEmptyInlineMessage(data.inline_message);
     const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : void 0;
     const operation = () => this.processAndPublishMessage(data, inlineGeneration);
     client._safeAsync(client._v2Session && ns && !hasInlineObject ? operation() : this.runPushProcessSerialized(ns, operation, inlineGeneration));
@@ -6195,33 +6461,13 @@ var MessageDeliveryEngine = class {
     const msg = { ...data };
     if (!("type" in msg)) msg.type = "message.recalled";
     if (!this.messageTargetsCurrentInstance(msg)) return;
-    const seq2 = msg.seq;
-    if (seq2 !== void 0 && seq2 !== null && client._aid) {
+    const seq2 = positiveSafeSequenceHint(msg.seq);
+    if (client._aid && seq2 > 0) {
       const ns = `p2p:${client._aid}`;
-      if (seq2 > 0) client._seqTracker.updateMaxSeen(ns, seq2);
-      const contigBefore = client._seqTracker.getContiguousSeq(ns);
-      const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq2);
-      const published = await this.publishOrderedMessage("message.recalled", ns, seq2, msg);
-      const contigAfter = client._seqTracker.getContiguousSeq(ns);
-      if (seqNeedsPull && !published && client._sessionOptions?.background_sync !== false) {
-        client._safeAsync(this.fillP2pGap());
-      }
-      const contig = client._seqTracker.getContiguousSeq(ns);
-      if (contig > 0) {
-        const ackSeq = this.clampAckSeq("message.ack", "seq", ns, contig);
-        client._transport.call("message.ack", {
-          seq: ackSeq,
-          device_id: client._deviceId,
-          slot_id: client._slotId,
-          _rpc_background: true
-        }).catch((e) => {
-          client._clientLog.warn(`P2P recall auto-ack failed:${String(e)}`);
-        });
-      }
-      if (contigAfter !== contigBefore) this.persistSeq(ns);
-      return;
+      client._seqTracker.updateMaxSeen(ns, seq2);
+      if (seq2 > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillP2pGap());
     }
-    await this.publishMessageRecallTombstone(seq2, msg);
+    await this.publishMessageRecallTombstone(msg.seq, msg);
   }
   async processAndPublishMessage(data, inlineGeneration) {
     const client = this.runtime.client;
@@ -6235,43 +6481,32 @@ var MessageDeliveryEngine = class {
         return;
       }
       const legacyPushSeq = positiveSafeSequenceHint(msg.seq);
-      const hasInlineField = Object.prototype.hasOwnProperty.call(msg, "inline_message");
+      const hasInlineField = hasNonEmptyInlineMessage(msg.inline_message);
       if (client._v2Session && client._aid && (legacyPushSeq > 0 || hasInlineField)) {
         await this.processV2P2PNotification(msg, "v1", inlineGeneration);
         return;
       }
+      if (client._aid && legacyPushSeq > 0) {
+        const ns2 = `p2p:${client._aid}`;
+        client._seqTracker.updateMaxSeen(ns2, legacyPushSeq);
+        if (client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillP2pGap());
+        return;
+      }
       const seq2 = msg.seq;
       const encryptedPush = client._isEncryptedPushMessage(msg);
-      if (seq2 !== void 0 && seq2 !== null && client._aid) {
-        const ns = `p2p:${client._aid}`;
-        if (seq2 > 0) client._seqTracker.updateMaxSeen(ns, seq2);
-        const contigBefore = client._seqTracker.getContiguousSeq(ns);
-        const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq2);
-        const published = encryptedPush ? await client._publishEncryptedPushMessage("message.received", "message.undecryptable", ns, seq2, msg, false) : await this.publishOrderedMessage("message.received", ns, seq2, msg);
-        const contigAfter = client._seqTracker.getContiguousSeq(ns);
-        const needPull = seqNeedsPull && !published;
-        if (needPull && client._sessionOptions?.background_sync !== false) {
-          client._safeAsync(this.fillP2pGap());
-        }
-        const contig = client._seqTracker.getContiguousSeq(ns);
-        if (contig > 0) {
-          const ackSeq = this.clampAckSeq("message.ack", "seq", ns, contig);
-          client._transport.call("message.ack", {
-            seq: ackSeq,
-            device_id: client._deviceId,
-            slot_id: client._slotId,
-            _rpc_background: true
-          }).catch((e) => {
-            client._clientLog.warn(`P2P auto-ack failed:${String(e)}`);
-          });
-        }
-        if (contigAfter !== contigBefore) this.persistSeq(ns);
-        if (encryptedPush) return;
+      const ns = client._aid ? `p2p:${client._aid}` : "";
+      const seqNum = positiveSafeSequenceHint(seq2);
+      if (ns && seqNum > 0) {
+        client._seqTracker.updateMaxSeen(ns, seqNum);
+        if (seqNum > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillP2pGap());
+      }
+      if (encryptedPush) {
+        await client._publishEncryptedPushMessage("message.received", "message.undecryptable", ns, seq2 ?? 0, msg, false);
+        return;
+      }
+      if (ns && seq2 !== void 0 && seq2 !== null) {
+        await this.publishOrderedMessage("message.received", ns, seq2, msg);
       } else {
-        if (encryptedPush) {
-          await client._publishEncryptedPushMessage("message.received", "message.undecryptable", "", seq2 ?? 0, msg, false);
-          return;
-        }
         await client._publishAppEvent("message.received", msg, "push");
       }
     } catch (exc) {
@@ -6287,7 +6522,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");
       }
     }
   }
@@ -6295,13 +6530,13 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     client._clientLog.debug(`_onRawGroupMessageCreated enter: group_id=${data?.group_id ?? "-"} from=${data?.from ?? "-"} seq=${data?.seq ?? "-"}`);
     const groupId = isJsonObject(data) && typeof data.group_id === "string" ? data.group_id.trim() : "";
-    const seq2 = isJsonObject(data) && typeof data.seq === "number" ? data.seq : 0;
     const kind = isJsonObject(data) ? String(data.kind ?? "").trim() : "";
-    if (client._v2Session && groupId && kind !== "group.online_unread_hint" && Number.isSafeInteger(seq2) && seq2 > 0) {
-      client._seqTracker.updateMaxSeen(`group:${groupId}`, seq2);
-    }
     const ns = groupId ? `group:${groupId}` : "";
-    const hasInlineObject = isJsonObject(data) && isJsonObject(data.inline_message);
+    const seq2 = isJsonObject(data) ? positiveSafeSequenceHint(data.seq) : 0;
+    if (client._v2Session && ns && kind !== "group.online_unread_hint" && seq2 > 0) {
+      client._seqTracker.updateMaxSeen(ns, seq2);
+    }
+    const hasInlineObject = isJsonObject(data) && hasNonEmptyInlineMessage(data.inline_message);
     const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : void 0;
     const operation = () => this.processAndPublishGroupMessage(data, inlineGeneration);
     client._safeAsync(client._v2Session && ns && !hasInlineObject ? operation() : this.runPushProcessSerialized(ns, operation, inlineGeneration));
@@ -6322,69 +6557,56 @@ var MessageDeliveryEngine = class {
         client._groupSynced.add(groupId);
       }
       const legacyPushSeq = positiveSafeSequenceHint(seq2);
-      const hasInlineField = Object.prototype.hasOwnProperty.call(msg, "inline_message");
+      const hasInlineField = hasNonEmptyInlineMessage(msg.inline_message);
       if (client._v2Session && groupId && (legacyPushSeq > 0 || hasInlineField)) {
         await this.processGroupV2MessageCreated(msg, "v1", inlineGeneration);
         return;
       }
+      if (groupId && legacyPushSeq > 0) {
+        const ns2 = `group:${groupId}`;
+        client._seqTracker.updateMaxSeen(ns2, legacyPushSeq);
+        if (client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillGroupGap(groupId));
+        return;
+      }
       if (payload === void 0 || payload === null || typeof payload === "object" && Object.keys(payload).length === 0) {
-        await this.autoPullGroupMessages(msg);
+        if (client._v2Session) await this.autoPullGroupMessages(msg);
+        else if (groupId && seq2 !== void 0 && seq2 !== null) {
+          const ns2 = `group:${groupId}`;
+          const seqNum2 = positiveSafeSequenceHint(seq2);
+          if (seqNum2 > 0) {
+            client._seqTracker.updateMaxSeen(ns2, seqNum2);
+            if (seqNum2 > client._seqTracker.getContiguousSeq(ns2) && client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillGroupGap(groupId));
+          }
+          await this.publishOrderedMessage("group.message_created", ns2, seq2, msg);
+        } else await client._publishAppEvent("group.message_created", msg, "push");
         return;
       }
       const encryptedPush = client._isEncryptedPushMessage(msg);
-      if (groupId && seq2 !== void 0 && seq2 !== null) {
-        const ns = `group:${groupId}`;
-        if (seq2 > 0) client._seqTracker.updateMaxSeen(ns, seq2);
-        const contigBefore = client._seqTracker.getContiguousSeq(ns);
-        const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq2);
-        if (!encryptedPush && this.recallEventFromGroupMessage(msg)) {
-          await this.publishGroupRecallTombstone(groupId, seq2, msg);
-          this.markPublishedSeq(ns, Number(seq2));
-          const contigAfter2 = client._seqTracker.getContiguousSeq(ns);
-          const contig2 = client._seqTracker.getContiguousSeq(ns);
-          if (contig2 > 0) {
-            const ackSeq = this.clampAckSeq("group.ack_messages", "msg_seq", ns, contig2);
-            client._transport.call("group.ack_messages", {
-              group_id: groupId,
-              msg_seq: ackSeq,
-              device_id: client._deviceId,
-              slot_id: client._slotId,
-              _rpc_background: true
-            }).catch((e) => {
-              client._clientLog.warn("group recall auto-ack failed: group=" + groupId, e);
-            });
-          }
-          if (contigAfter2 !== contigBefore) this.persistSeq(ns);
-          return;
-        }
-        const published = encryptedPush ? await client._publishEncryptedPushMessage("group.message_created", "group.message_undecryptable", ns, seq2, msg, true) : await this.publishOrderedMessage("group.message_created", ns, seq2, msg);
-        const contigAfter = client._seqTracker.getContiguousSeq(ns);
-        const needPull = seqNeedsPull && !published;
-        if (needPull && client._sessionOptions?.background_sync !== false) {
-          client._safeAsync(this.fillGroupGap(groupId));
-        }
-        const contig = client._seqTracker.getContiguousSeq(ns);
-        if (contig > 0) {
-          const ackSeq = this.clampAckSeq("group.ack_messages", "msg_seq", ns, contig);
-          client._transport.call("group.ack_messages", {
-            group_id: groupId,
-            msg_seq: ackSeq,
-            device_id: client._deviceId,
-            slot_id: client._slotId,
-            _rpc_background: true
-          }).catch((e) => {
-            client._clientLog.warn("group message auto-ack failed: group=" + groupId, e);
-          });
-        }
-        if (contigAfter !== contigBefore) this.persistSeq(ns);
-        if (encryptedPush) return;
-      } else {
-        if (encryptedPush) {
-          await client._publishEncryptedPushMessage("group.message_created", "group.message_undecryptable", "", seq2 ?? 0, msg, true);
-          return;
-        }
-        await client._publishAppEvent("group.message_created", msg, "push");
+      const ns = groupId ? `group:${groupId}` : "";
+      const seqNum = positiveSafeSequenceHint(seq2);
+      if (ns && seqNum > 0) {
+        client._seqTracker.updateMaxSeen(ns, seqNum);
+        if (seqNum > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillGroupGap(groupId));
+      }
+      if (this.isSelfSentGroupMessage(msg)) return;
+      if (!encryptedPush && this.recallEventFromGroupMessage(msg)) {
+        await this.publishGroupRecallTombstone(groupId, seq2, msg);
+        return;
       }
+      if (encryptedPush) {
+        await client._publishEncryptedPushMessage(
+          "group.message_created",
+          "group.message_undecryptable",
+          ns,
+          seq2 ?? 0,
+          msg,
+          true
+        );
+        return;
+      }
+      if (ns && seq2 !== void 0 && seq2 !== null) {
+        await this.publishOrderedMessage("group.message_created", ns, seq2, msg);
+      } else await client._publishAppEvent("group.message_created", msg, "push");
     } catch (exc) {
       client._clientLog.warn(`group push processing failed:${String(exc)}`);
       if (isJsonObject(data)) {
@@ -6398,7 +6620,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 +6628,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 +6648,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 +6675,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 +6803,8 @@ var MessageDeliveryEngine = class {
     client._gapFillDone.add(dedupKey);
     this.runtime.delivery.setGapFillActive(true);
     let continuationAfterSeq = 0;
+    let pendingAckSeq = 0;
+    let failed = false;
     try {
       let nextAfterSeq = afterSeq;
       const maxPages = singlePage ? 1 : 100;
@@ -6600,9 +6824,9 @@ var MessageDeliveryEngine = class {
         if (!Array.isArray(events)) return;
         const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
         const eventObjects = events.filter((evt) => isJsonObject(evt));
-        if (eventObjects.length > 0) {
-          client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq);
-        }
+        const contiguousSeq = Number.isSafeInteger(result.contiguous_seq) ? result.contiguous_seq : void 0;
+        if (contiguousSeq === void 0) client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq);
+        else client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq, contiguousSeq);
         const cursor = isJsonObject(result.cursor) ? result.cursor : null;
         const retentionFloor = Math.max(
           0,
@@ -6628,6 +6852,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 +6870,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);
@@ -6654,37 +6880,49 @@ var MessageDeliveryEngine = class {
           this.persistSeq(ns);
         }
         if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
-          try {
-            const ackPromise = client._transport.call("group.ack_events", {
-              group_id: groupId,
-              event_seq: ackContig,
-              device_id: client._deviceId,
-              slot_id: client._slotId,
-              _rpc_background: true
-            });
-            if (singlePage) await ackPromise;
-            else ackPromise.catch((e) => {
-              client._clientLog.warn("group event auto-ack failed: group=" + groupId, e);
-            });
-          } catch (e) {
-            client._clientLog.warn("group event auto-ack failed: group=" + groupId, e);
-          }
+          pendingAckSeq = Math.max(pendingAckSeq, ackContig);
         }
+        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) {
+        const needsMore = result.has_more === true || client._seqTracker.getMaxSeenSeq(ns) > nextAfter;
+        if (singlePage && needsMore && nextAfter > nextAfterSeq) {
           continuationAfterSeq = nextAfter;
         }
-        if (eventObjects.length === 0 || nextAfter <= nextAfterSeq || result.has_more !== true) break;
+        if (eventObjects.length === 0 || nextAfter <= nextAfterSeq || !needsMore) break;
         nextAfterSeq = nextAfter;
       }
       if (pageCount >= maxPages) {
         client._clientLog.warn(`group event gap fill reached max_pages=${maxPages} group=${groupId} after_seq=${nextAfterSeq}`);
       }
+      if (pendingAckSeq > 0) {
+        try {
+          await client._transport.call("group.ack_events", {
+            group_id: groupId,
+            event_seq: pendingAckSeq,
+            device_id: client._deviceId,
+            slot_id: client._slotId,
+            _rpc_background: true
+          });
+        } catch (e) {
+          client._clientLog.warn("group event auto-ack failed: group=" + groupId, e);
+        }
+      }
     } 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,
@@ -6713,41 +6951,15 @@ var MessageDeliveryEngine = class {
       this.enqueueOnlineUnreadEventHint(data);
       return;
     }
-    if (this.isSelfJoinGroupChanged(data)) {
-      const contig = client._seqTracker.getContiguousSeq(ns);
-      const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
-      if (contig === 0 && maxSeen === 0 && eventSeq > 1) {
-        client._clientLog.debug(`group.changed self-join baseline: group=${groupId}, event_seq=${eventSeq}, baseline=${eventSeq - 1}`);
-        client._seqTracker.forceContiguousSeq(ns, eventSeq - 1);
-      }
-    }
     const contigBefore = client._seqTracker.getContiguousSeq(ns);
+    client._seqTracker.updateMaxSeen(ns, eventSeq);
     const publishedDuplicate = client._pushedSeqs.get(ns)?.has(eventSeq) === true;
     if (eventSeq <= contigBefore || publishedDuplicate) {
       client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
-      if (eventSeq <= contigBefore) {
-        this.fireGroupEventAck(groupId, ns, eventSeq, "group event covered push ack");
-      } else if (contigBefore > 0) {
-        this.fireGroupEventAck(groupId, ns, contigBefore, "group event covered push ack");
-      }
       return;
     }
     this.enqueueOrderedMessage(ns, "group.changed", eventSeq, data);
-    needPull = client._seqTracker.onMessageSeq(ns, eventSeq);
-    const ackContig = client._seqTracker.getContiguousSeq(ns);
-    await this.drainOrderedMessages(ns);
-    if (ackContig > 0 && ackContig !== contigBefore) {
-      if (data.action !== "dissolved") this.persistSeq(ns);
-      client._transport.call("group.ack_events", {
-        group_id: groupId,
-        event_seq: ackContig,
-        device_id: client._deviceId,
-        slot_id: client._slotId,
-        _rpc_background: true
-      }).catch((e) => {
-        client._clientLog.warn("group event push auto-ack failed: group=" + groupId, e);
-      });
-    }
+    needPull = eventSeq > contigBefore;
     if (needPull && groupId && !data._from_gap_fill && client._sessionOptions?.background_sync !== false) {
       client._safeAsync(this.fillGroupEventGap(groupId));
     }
@@ -7180,16 +7392,18 @@ var MessageDeliveryEngine = class {
     };
     if (forceTail || order[0] === "tail") result = await run(true, false, void 0, false, forceTail);
     const state = this.syncState(ns);
-    const tailMissedDuringPull = tailCompleted && Number(client._seqTracker.getMaxSeenSeq(ns) || 0) > state.head;
     const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
-    const pendingThroughSeq = tailMissedDuringPull ? maxSeen : 0;
-    const tailForward = tailCompleted && (state.ack < state.tail - 1 || tailMissedDuringPull);
+    const pendingUpper = Number(this.pendingP2pPullUpper?.get(ns) ?? 0);
+    const observedUpper = Math.max(maxSeen, pendingUpper);
+    const tailMissedDuringPull = tailCompleted && observedUpper > state.head;
+    const pendingThroughSeq = tailMissedDuringPull ? observedUpper : 0;
+    const tailForward = tailCompleted && (state.ack < state.head || tailMissedDuringPull);
     const backgroundWindowForward = order[0] === "forward" && !headForward;
     if (headForward || tailForward || client._sessionOptions?.background_sync !== false && backgroundWindowForward) {
       const forwardTarget = Math.max(
         headForward ? Math.max(pushSeq, maxSeen) : 0,
         tailForward || backgroundWindowForward ? state.tail - 1 : 0,
-        tailMissedDuringPull ? maxSeen : 0
+        tailMissedDuringPull ? observedUpper : 0
       );
       const forwardMaxPages = this.forwardMaxPages(state.ack, forwardTarget, pageLimit);
       result = await run(
@@ -7248,16 +7462,18 @@ var MessageDeliveryEngine = class {
     };
     if (forceTail || order[0] === "tail") result = await run(true, false, void 0, false, forceTail);
     const state = this.syncState(ns);
-    const tailMissedDuringPull = tailCompleted && Number(client._seqTracker.getMaxSeenSeq(ns) || 0) > state.head;
     const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
-    const pendingThroughSeq = tailMissedDuringPull ? maxSeen : 0;
-    const tailForward = tailCompleted && (state.ack < state.tail - 1 || tailMissedDuringPull);
+    const pendingUpper = Number(this.pendingGroupPullUpper?.get(ns) ?? 0);
+    const observedUpper = Math.max(maxSeen, pendingUpper);
+    const tailMissedDuringPull = tailCompleted && observedUpper > state.head;
+    const pendingThroughSeq = tailMissedDuringPull ? observedUpper : 0;
+    const tailForward = tailCompleted && (state.ack < state.head || tailMissedDuringPull);
     const backgroundWindowForward = order[0] === "forward" && !headForward;
     if (headForward || tailForward || client._sessionOptions?.background_sync !== false && backgroundWindowForward) {
       const forwardTarget = Math.max(
         headForward ? Math.max(pushSeq, maxSeen) : 0,
         tailForward || backgroundWindowForward ? state.tail - 1 : 0,
-        tailMissedDuringPull ? maxSeen : 0
+        tailMissedDuringPull ? observedUpper : 0
       );
       const forwardMaxPages = this.forwardMaxPages(state.ack, forwardTarget, pageLimit);
       result = await run(
@@ -7309,13 +7525,13 @@ var MessageDeliveryEngine = class {
     if (!row) return;
     const groupId = typeof row.group_id === "string" ? row.group_id.trim() : "";
     if (!groupId) return;
-    const seq2 = typeof row.seq === "number" ? row.seq : 0;
     const eventKind = String(row.kind ?? "").trim();
     const ns = this.resolvePendingGroupInlineAckNamespace(`group:${groupId}`);
-    if (client._v2Session && eventKind !== "group.online_unread_hint" && Number.isSafeInteger(seq2) && seq2 > 0) {
+    const seq2 = positiveSafeSequenceHint(row.seq);
+    if (client._v2Session && eventKind !== "group.online_unread_hint" && seq2 > 0) {
       client._seqTracker.updateMaxSeen(ns, seq2);
     }
-    const hasInlineObject = isJsonObject(row.inline_message) && eventKind !== "group.online_unread_hint";
+    const hasInlineObject = hasNonEmptyInlineMessage(row.inline_message) && eventKind !== "group.online_unread_hint";
     const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : void 0;
     const operation = () => this.processGroupV2MessageCreated(data, "v2", inlineGeneration);
     if (hasInlineObject) await this.runPushProcessSerialized(ns, operation, inlineGeneration);
@@ -7327,7 +7543,6 @@ var MessageDeliveryEngine = class {
     if (!isJsonObject(data) || !client._v2Session) return;
     const groupId = typeof data.group_id === "string" ? data.group_id.trim() : "";
     const seq2 = positiveSafeSequenceHint(data.seq);
-    const strictSeq = typeof data.seq === "number" && Number.isSafeInteger(data.seq) && data.seq > 0;
     if (!groupId) return;
     const eventKind = String(data.kind ?? "").trim();
     if (eventKind === "group.online_unread_hint") {
@@ -7336,11 +7551,12 @@ var MessageDeliveryEngine = class {
       return;
     }
     const ns = this.resolvePendingGroupInlineAckNamespace(`group:${groupId}`);
-    const inlinePresent = Object.prototype.hasOwnProperty.call(data, "inline_message");
+    const inlinePresent = hasNonEmptyInlineMessage(data.inline_message);
     if (seq2 <= 0) {
       if (inlinePresent) await this.recoverInvalidGroupRealtimeHead(groupId, ns, data.seq);
       return;
     }
+    client._seqTracker.updateMaxSeen(ns, seq2);
     const inline = this.inlineMessage(data);
     const inlineMatches = inline !== null && this.inlineGroupBindingMatches(data, inline, groupId, seq2, expectedInlineVersion);
     const pendingInline = this.pendingGroupInlineAcks?.get(ns);
@@ -7361,13 +7577,12 @@ var MessageDeliveryEngine = class {
     }
     if (inlineMatches && !this.isInlineGenerationCurrent(inlineGeneration)) return;
     const before = this.syncState(ns);
-    if (strictSeq || !inlinePresent) client._seqTracker.updateMaxSeen(ns, seq2);
     if (seq2 <= before.ack && before.ack >= before.tail - 1) {
       const canonicalNs = this.resolvePendingGroupInlineAckNamespace(ns);
       const pending = this.pendingGroupInlineAcks?.get(canonicalNs);
-      if (pending && seq2 >= pending.seq) {
+      if (inlinePresent && pending && seq2 >= pending.seq) {
         this.retryPendingGroupInlineAck(canonicalNs, pending.seq, "covered inline Group ack", seq2);
-      } else if (!inlinePresent || inlineMatches) {
+      } else if (inlineMatches) {
         this.fireGroupV2Ack(
           groupId,
           ns,
@@ -7406,7 +7621,7 @@ var MessageDeliveryEngine = class {
     if (client._v2Session && Number.isSafeInteger(pushSeq) && pushSeq > 0) {
       client._seqTracker.updateMaxSeen(ns, pushSeq);
     }
-    const hasInlineObject = isJsonObject(data) && isJsonObject(data.inline_message);
+    const hasInlineObject = isJsonObject(data) && hasNonEmptyInlineMessage(data.inline_message);
     const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : void 0;
     const operation = () => this.processV2P2PNotification(data, "v2", inlineGeneration);
     if (hasInlineObject) await this.runPushProcessSerialized(ns, operation, inlineGeneration);
@@ -7417,10 +7632,10 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     if (!client._v2Session) return;
     const pushSeq = isJsonObject(data) ? positiveSafeSequenceHint(data.seq) : 0;
-    const strictSeq = isJsonObject(data) && typeof data.seq === "number" && Number.isSafeInteger(data.seq) && data.seq > 0;
     const ns = client._aid ? `p2p:${client._aid}` : "";
     if (!ns) return;
-    const inlinePresent = isJsonObject(data) && Object.prototype.hasOwnProperty.call(data, "inline_message");
+    if (pushSeq > 0) client._seqTracker.updateMaxSeen(ns, pushSeq);
+    const inlinePresent = isJsonObject(data) && hasNonEmptyInlineMessage(data.inline_message);
     if (pushSeq <= 0) {
       if (inlinePresent) await this.recoverInvalidP2PRealtimeHead(ns, isJsonObject(data) ? data.seq : void 0);
       return;
@@ -7443,10 +7658,9 @@ var MessageDeliveryEngine = class {
     }
     if (inlineMatches && !this.isInlineGenerationCurrent(inlineGeneration)) return;
     const before = this.syncState(ns);
-    if (strictSeq || !inlinePresent) client._seqTracker.updateMaxSeen(ns, pushSeq);
     if (pushSeq <= before.ack && before.ack >= before.tail - 1) {
       const pending = this.pendingP2PInlineAcks?.get(ns);
-      if (pending && pushSeq >= pending.seq) {
+      if (inlinePresent && pending && pushSeq >= pending.seq) {
         this.retryPendingP2PInlineAck(ns, pending.seq, "covered inline P2P ack", pushSeq);
       } else if (inlineMatches) {
         this.fireP2PV2Ack(pushSeq, "P2P inline covered push ack", inlineGeneration);
@@ -7919,7 +8133,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 +8155,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);
@@ -15389,6 +15603,11 @@ var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "group.v2.get_proposal",
   "group.kick",
   "group.add_member",
+  "group.invite_member",
+  "group.list_my_invites",
+  "group.accept_invite",
+  "group.reject_invite",
+  "group.revoke_invite",
   "group.leave",
   "group.remove_member",
   "group.update",
@@ -15541,7 +15760,9 @@ var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
   "mail.send",
   "group.send",
   "group.create",
-  "group.invite",
+  "group.accept_invite",
+  "group.reject_invite",
+  "group.revoke_invite",
   "group.kick",
   "group.remove_member",
   "group.leave",
@@ -16301,9 +16522,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 +16653,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 +16667,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 +16685,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?.();
     });
   }
@@ -16559,6 +16788,8 @@ var RpcPipeline = class {
   }
   postprocessMessagePull(params2, result) {
     const client = this.runtime.client;
+    const isTail = String(result.window_mode ?? params2.window_mode ?? "").trim().toLowerCase() === "tail";
+    if (isTail) return;
     const messages = result.messages;
     const rawMessages = (Array.isArray(messages) ? messages : []).filter(isJsonObject);
     if (!client._aid || !client._seqTracker) {
@@ -16566,9 +16797,9 @@ var RpcPipeline = class {
     }
     const ns = `p2p:${client._aid}`;
     const contigBefore = client._seqTracker.getContiguousSeq(ns);
-    if (rawMessages.length) {
-      client._seqTracker.onPullResult(ns, rawMessages, Number(params2.after_seq ?? 0) || 0);
-    }
+    const contiguousSeq = Number.isSafeInteger(result.contiguous_seq) ? result.contiguous_seq : void 0;
+    if (contiguousSeq === void 0) client._seqTracker.onPullResult(ns, rawMessages, Number(params2.after_seq ?? 0) || 0);
+    else client._seqTracker.onPullResult(ns, rawMessages, Number(params2.after_seq ?? 0) || 0, contiguousSeq);
     const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
     if (retentionFloor > 0) {
       const contig = client._seqTracker.getContiguousSeq(ns);
@@ -16587,6 +16818,8 @@ var RpcPipeline = class {
     if (Array.isArray(result.messages)) {
       result.messages = result.messages.map((message) => normalizeGroupMentionMode(message));
     }
+    const isTail = String(result.window_mode ?? params2.window_mode ?? "").trim().toLowerCase() === "tail";
+    if (isTail) return;
     const gid = String(params2.group_id ?? params2.group_aid ?? "").trim();
     if (!gid || !client._seqTracker) {
       return;
@@ -16595,17 +16828,17 @@ var RpcPipeline = class {
     const rawMessages = (Array.isArray(messages) ? messages : []).filter(isJsonObject);
     const ns = `group:${gid}`;
     const contigBefore = client._seqTracker.getContiguousSeq(ns);
-    if (rawMessages.length) {
-      client._seqTracker.onPullResult(ns, rawMessages, Number(params2.after_message_seq ?? params2.after_seq ?? 0) || 0);
-    }
+    const contiguousSeq = Number.isSafeInteger(result.contiguous_seq) ? result.contiguous_seq : void 0;
+    const afterSeq = Number(params2.after_message_seq ?? params2.after_seq ?? 0) || 0;
+    if (contiguousSeq === void 0) client._seqTracker.onPullResult(ns, rawMessages, afterSeq);
+    else client._seqTracker.onPullResult(ns, rawMessages, afterSeq, contiguousSeq);
     const cursor = isJsonObject(result.cursor) ? result.cursor : null;
     const retentionFloor = Math.max(
       0,
       Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0),
       Number(cursor?.retention_floor_seq ?? 0)
     );
-    const isTail = String(result.window_mode ?? params2.window_mode ?? "").trim().toLowerCase() === "tail";
-    const visibilityFloor = isTail ? 0 : Math.max(
+    const visibilityFloor = Math.max(
       0,
       Math.max(0, Number(result.earliest_available_message_seq ?? 1) - 1),
       Number(cursor?.join_seq ?? 0)
@@ -16614,7 +16847,7 @@ var RpcPipeline = class {
     if (effectiveFloor > 0) {
       const contig = client._seqTracker.getContiguousSeq(ns);
       if (contig < effectiveFloor) {
-        client._clientLog?.info?.(`group.pull floor advance: ns=${ns} contiguous=${contig} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor} mode=${isTail ? "tail" : "forward"}`);
+        client._clientLog?.info?.(`group.pull floor advance: ns=${ns} contiguous=${contig} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor} mode=forward`);
         client._seqTracker.forceContiguousSeq(ns, effectiveFloor);
       }
     }
@@ -18147,6 +18380,21 @@ var MessageFacade = class extends RpcFacade {
     return this.call("message.query_online", params2);
   }
 };
+function normalizeInviteParams(params2) {
+  const out = stripNil2(params2);
+  const rawGroupId = out.group_id ?? out.groupId ?? out.group_aid ?? out.groupAid;
+  if (rawGroupId !== void 0) {
+    out.group_id = normalizeGroupId(rawGroupId);
+    delete out.groupId;
+    delete out.group_aid;
+    delete out.groupAid;
+  }
+  for (const [alias, canonical] of [["inviteId", "invite_id"], ["inviteeAid", "invitee_aid"]]) {
+    if (out[canonical] === void 0 && out[alias] !== void 0) out[canonical] = out[alias];
+    delete out[alias];
+  }
+  return out;
+}
 var MailFacade = class extends RpcFacade {
   send(params2) {
     return this.call("mail.send", params2);
@@ -18259,6 +18507,32 @@ var GroupFacade = class extends RpcFacade {
   addMember(params2) {
     return this.call("group.add_member", params2);
   }
+  async inviteCall(method, params2) {
+    const normalized = normalizeInviteParams(params2);
+    try {
+      const result = await this.call(method, normalized);
+      await this.client._onGroupInviteActionResult?.(method, normalized, result);
+      return result;
+    } catch (error) {
+      await this.client._onGroupInviteActionResult?.(method, normalized, void 0, error);
+      throw error;
+    }
+  }
+  inviteMember(params2) {
+    return this.inviteCall("group.invite_member", params2);
+  }
+  listMyInvites(params2) {
+    return this.inviteCall("group.list_my_invites", params2);
+  }
+  acceptInvite(params2) {
+    return this.inviteCall("group.accept_invite", params2);
+  }
+  rejectInvite(params2) {
+    return this.inviteCall("group.reject_invite", params2);
+  }
+  revokeInvite(params2) {
+    return this.inviteCall("group.revoke_invite", params2);
+  }
   getMembers(params2) {
     return this.call("group.get_members", params2);
   }
@@ -23646,6 +23920,22 @@ function deduplicateForwardPageMessages(value, afterSeq) {
   }
   return [...bySeq.entries()].sort(([a], [b]) => a - b).map(([, row]) => row);
 }
+function contiguousPullSeq(afterSeq, seqs, proof) {
+  let contiguous = seqs.length > 0 ? Math.max(afterSeq, ...seqs) : afterSeq;
+  const serverProof = safeNonNegativeSeq(proof);
+  return serverProof !== null ? Math.max(contiguous, serverProof) : contiguous;
+}
+function deduplicatePulledResults(messages) {
+  const seen = /* @__PURE__ */ new Set();
+  return messages.filter((message) => {
+    if (!isJsonObject(message)) return true;
+    const seq2 = safeNonNegativeSeq(message.seq);
+    if (seq2 === null || seq2 <= 0) return true;
+    if (seen.has(seq2)) return false;
+    seen.add(seq2);
+    return true;
+  });
+}
 function shouldContinueForwardPage({
   rawCount,
   nextAfterSeq,
@@ -23654,10 +23944,11 @@ function shouldContinueForwardPage({
   hasMoreField,
   hasMore,
   serverHead,
-  pendingAckSeq
+  pendingAckSeq,
+  observedUpper
 }) {
   if (rawCount <= 0 || nextAfter <= nextAfterSeq) return false;
-  if (hasMore || serverHead > nextAfter || pendingAckSeq > 0) return true;
+  if (hasMore || serverHead > nextAfter || pendingAckSeq > 0 || observedUpper > nextAfter) return true;
   return !hasMoreField && limit > 0 && rawCount >= limit;
 }
 function validateTailPage(result, afterSeq, pageLimit) {
@@ -24396,7 +24687,7 @@ var V2E2EECoordinator = class {
             client._clientLog.warn(`V2 sender IK pending group bootstrap failed group=${groupId}: ${String(formatE2EEError(exc))}`);
           }
         }
-        if (!session.getPeerIK(fromAid, senderDeviceId)) {
+        if (typeof session.getPeerIK === "function" && !session.getPeerIK(fromAid, senderDeviceId)) {
           await this.getV2SenderPubDer(fromAid, senderDeviceId);
         }
       }
@@ -24407,7 +24698,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))}`);
@@ -24432,11 +24723,12 @@ var V2E2EECoordinator = class {
         client._v2SenderIKPending.delete(key);
         const seq2 = Number(entry.msg.seq ?? 0);
         if (entry.groupId) {
+          if (client._delivery.isSelfSentGroupMessage?.(entry.msg)) continue;
           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 +24805,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 +24819,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 +24853,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) {
@@ -24597,6 +24916,9 @@ var V2E2EECoordinator = class {
       client._clientLog.warn(`Group Tail \u5355\u6761\u6D88\u606F\u89E3\u5BC6\u5931\u8D25\uFF0C\u8FDE\u7EED\u6027\u8BC1\u660E\u4ECD\u4FDD\u7559: group=${groupId}, seq=${seq2}`);
       return null;
     }
+    if (publish && !history && client._delivery.isSelfSentGroupMessage?.(msg)) {
+      return plaintext;
+    }
     if (publish) {
       if (orderedPublish) {
         await client._delivery.publishOrderedMessage(
@@ -24618,13 +24940,6 @@ var V2E2EECoordinator = class {
   async decodeInlineGroupMessage(msg, groupId, groupAid) {
     return await this.decodeGroupWindowMessage(msg, groupId, groupAid, false, false, "inline_push");
   }
-  async applyTailFloor(ns, floor) {
-    const client = this.client;
-    if (!ns || floor <= 0 || client._seqTracker.getContiguousSeq(ns) >= floor) return;
-    client._seqTracker.forceContiguousSeq(ns, floor);
-    client._persistSeq(ns);
-    await client._saveSeqTrackerState?.();
-  }
   async pullV2TailInternal(params2, deferPublish = false) {
     const client = this.client;
     if (params2.window_mode !== "tail") throw new ValidationError("window_mode must equal tail");
@@ -24632,10 +24947,8 @@ 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;
-    await this.applyTailFloor(ns, Number.isSafeInteger(floor) ? floor : 0);
     const page = validateTailPage(result, afterSeq, limit);
     if (ns) {
       client._seqTracker.commitTailWindow(ns, {
@@ -24653,7 +24966,17 @@ var V2E2EECoordinator = class {
       if (plaintext) decoded.push(plaintext);
     }
     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 +24991,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 +25016,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 +25030,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);
@@ -24748,17 +25085,23 @@ var V2E2EECoordinator = class {
       const pageContigBefore = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
       const pageTrackerSnapshot = ns && typeof client._seqTracker.snapshotNamespace === "function" ? client._seqTracker.snapshotNamespace(ns) : null;
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
+      const pageContiguousSeq = contiguousPullSeq(
+        pageContigBefore,
+        seqs,
+        result.contiguous_seq
+      );
       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 +25117,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 +25155,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;
         }
@@ -24814,11 +25181,12 @@ var V2E2EECoordinator = class {
       const serverAckSeq = parsedServerAckSeq ?? 0;
       const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
       if (ns) {
-        const commitTarget = blockedSeq > 0 ? pageContigBefore : Math.max(
+        const commitTarget = Math.max(
           pageContigBefore,
           Number.isFinite(retentionFloor) ? retentionFloor : 0,
           pageCount === 1 ? deferredServerCursor : 0,
-          seqs.length > 0 ? pageMaxSeq : pageContigBefore
+          serverAckSeq,
+          blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq
         );
         let ackSeq = pageContigBefore;
         let contigAdvanced = false;
@@ -24856,11 +25224,11 @@ var V2E2EECoordinator = class {
           this.recordForwardCursor(ns, serverAckSeq, ackSeq);
         }
         const knownServerAckSeq = hasServerAckSeq ? serverAckSeq : pageCount === 1 ? deferredServerCursor : 0;
-        const ackNeeded = blockedSeq <= 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && (hasServerAckSeq && ackSeq > serverAckSeq || contigAdvanced && ackSeq > knownServerAckSeq);
+        const ackNeeded = ackSeq > 0 && ackSeq > lastAutoAckSeq && (hasServerAckSeq && ackSeq > serverAckSeq || contigAdvanced && ackSeq > knownServerAckSeq);
         if (ackNeeded) {
           this.recordForwardAck(ns, ackSeq);
-          const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
-          const canContinuePage = messages.length > 0 && nextAfter2 > nextAfterSeq;
+          const nextAfter2 = Math.max(pageContiguousSeq, nextAfterSeq);
+          const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter2 > nextAfterSeq;
           if (canContinuePage) {
             pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
             lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -24870,7 +25238,17 @@ var V2E2EECoordinator = class {
           }
         }
       }
-      const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+      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(pageContiguousSeq, nextAfterSeq);
       const rawCount = messages.length;
       if (blockedSeq > 0) break;
       const shouldContinue = shouldContinueForwardPage({
@@ -24881,7 +25259,8 @@ var V2E2EECoordinator = class {
         hasMoreField,
         hasMore,
         serverHead,
-        pendingAckSeq
+        pendingAckSeq,
+        observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
       });
       if (!shouldContinue) break;
       if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
@@ -24904,7 +25283,8 @@ var V2E2EECoordinator = class {
         pendingAckSeq = 0;
       }
     }
-    return decrypted;
+    client._delivery.onPullWorkSettled?.();
+    return deduplicatePulledResults(decrypted);
   }
   async confirmForwardP2PAck(upToSeq, inlineGeneration) {
     const ns = this.client._aid ? `p2p:${this.client._aid}` : "";
@@ -24990,10 +25370,7 @@ var V2E2EECoordinator = class {
       if (isJsonObject(result)) {
         const seq2 = Number(result.seq ?? 0);
         if (seq2 > 0) {
-          const ns = `group:${gid}`;
-          client._seqTracker.onMessageSeq(ns, seq2);
-          client._markPublishedSeq(ns, seq2);
-          await client._saveSeqTrackerState();
+          client._markPublishedSeq(`group:${gid}`, seq2);
         }
       }
       return client._delivery.attachSendResultEnvelope("group.send", withExplicitGroupAid({
@@ -25013,10 +25390,7 @@ var V2E2EECoordinator = class {
         if (isJsonObject(result)) {
           const seq2 = Number(result.seq ?? 0);
           if (seq2 > 0) {
-            const ns = `group:${gid}`;
-            client._seqTracker.onMessageSeq(ns, seq2);
-            client._markPublishedSeq(ns, seq2);
-            await client._saveSeqTrackerState();
+            client._markPublishedSeq(`group:${gid}`, seq2);
           }
         }
         return client._delivery.attachSendResultEnvelope("group.send", withExplicitGroupAid({
@@ -25041,6 +25415,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",
@@ -25050,9 +25429,6 @@ var V2E2EECoordinator = class {
     }, groupAid));
     const resultAid = String(result.group_aid ?? result.groupAid ?? "").trim();
     if (resultAid) groupAid = resultAid;
-    const floor = Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0);
-    const previous = client._seqTracker.getSyncState(ns);
-    await this.applyTailFloor(ns, Number.isSafeInteger(floor) ? floor : 0);
     const page = validateTailPage(result, afterSeq, limit);
     client._seqTracker.commitTailWindow(ns, {
       windowStartSeq: page.windowStart,
@@ -25069,7 +25445,17 @@ var V2E2EECoordinator = class {
       if (plaintext) decoded.push(plaintext);
     }
     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 +25488,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 +25510,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 +25533,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 +25542,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,
@@ -25206,28 +25601,35 @@ var V2E2EECoordinator = class {
       const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
       const pageTrackerSnapshot = typeof client._seqTracker.snapshotNamespace === "function" ? client._seqTracker.snapshotNamespace(ns) : null;
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
+      const pageContiguousSeq = contiguousPullSeq(
+        pageContigBefore,
+        seqs,
+        result.contiguous_seq
+      );
       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 ?? ""),
@@ -25241,7 +25643,11 @@ var V2E2EECoordinator = class {
               };
               v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
               attachGatewayProximity(v1Msg, msg);
-              await client._publishPulledMessage("group.message_created", ns, seq2, v1Msg, false);
+              if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                await client._publishPulledMessage("group.message_created", ns, seq2, v1Msg, false);
+              } else {
+                client._markPublishedSeq(ns, seq2);
+              }
               decrypted.push(v1Msg);
               continue;
             }
@@ -25263,6 +25669,36 @@ 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;
+              if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                await client._publishPulledMessage("group.message_created", ns, seq2, plaintext2, false);
+              } else {
+                client._markPublishedSeq(ns, seq2);
+              }
+              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 +25707,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;
         }
@@ -25287,7 +25723,11 @@ var V2E2EECoordinator = class {
         plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
         plaintext.group_id = gid;
         plaintext.group_aid = eventGroupAid;
-        await client._publishPulledMessage("group.message_created", ns, seq2, plaintext, false);
+        if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+          await client._publishPulledMessage("group.message_created", ns, seq2, plaintext, false);
+        } else {
+          client._markPublishedSeq(ns, seq2);
+        }
         decrypted.push(plaintext);
       }
       const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, "current_seq");
@@ -25303,11 +25743,12 @@ var V2E2EECoordinator = class {
         Number(cursor?.join_seq ?? 0)
       );
       const effectiveFloor = Math.max(retentionFloor, visibilityFloor);
-      const commitTarget = blockedSeq > 0 ? pageContigBefore : Math.max(
+      const commitTarget = Math.max(
         pageContigBefore,
         Number.isFinite(effectiveFloor) ? effectiveFloor : 0,
         ownsCursor && pageCount === 1 ? deferredServerCursor : 0,
-        seqs.length > 0 ? pageMaxSeq : pageContigBefore
+        cursorCurrentSeq,
+        blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq
       );
       let ackSeq = pageContigBefore;
       let contigAdvanced = false;
@@ -25343,15 +25784,25 @@ 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);
       }
       const knownServerCursorSeq = hasServerCursor ? cursorCurrentSeq : ownsCursor && pageCount === 1 ? deferredServerCursor : 0;
-      const ackNeeded = blockedSeq <= 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (hasServerCursor && ackSeq > cursorCurrentSeq || contigAdvanced && ackSeq > knownServerCursorSeq);
+      const ackNeeded = ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (hasServerCursor && ackSeq > cursorCurrentSeq || contigAdvanced && ackSeq > knownServerCursorSeq);
       if (ackNeeded) {
         this.recordForwardAck(ns, ackSeq);
-        const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
-        const canContinuePage = messages.length > 0 && nextAfter2 > nextAfterSeq && ownsCursor;
+        const nextAfter2 = Math.max(pageContiguousSeq, nextAfterSeq);
+        const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter2 > nextAfterSeq && ownsCursor;
         if (canContinuePage) {
           pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
           lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -25360,7 +25811,7 @@ var V2E2EECoordinator = class {
           lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
         }
       }
-      const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+      const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
       if (!ownsCursor) break;
       const rawCount = messages.length;
       if (blockedSeq > 0) break;
@@ -25372,7 +25823,8 @@ var V2E2EECoordinator = class {
         hasMoreField,
         hasMore,
         serverHead,
-        pendingAckSeq
+        pendingAckSeq,
+        observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
       });
       if (!shouldContinue) break;
       if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
@@ -25397,7 +25849,8 @@ var V2E2EECoordinator = class {
         pendingAckSeq = 0;
       }
     }
-    return decrypted;
+    client._delivery.onPullWorkSettled?.();
+    return deduplicatePulledResults(decrypted);
   }
   async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
     const ns = `group:${String(groupId ?? "").trim()}`;
@@ -25906,7 +26359,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;
@@ -26234,7 +26687,8 @@ var MEMBERSHIP_MUTATION_METHODS = /* @__PURE__ */ new Set([
   "group.review_join_request",
   "group.batch_review_join_request",
   "group.use_invite_code",
-  "group.request_join"
+  "group.request_join",
+  "group.accept_invite"
 ]);
 var SPK_REGISTRATION_MUTATION_METHODS = /* @__PURE__ */ new Set([
   "group.create",
@@ -28963,6 +29417,7 @@ var RECONNECT_MIN_BASE_DELAY_SECONDS = 1;
 var RECONNECT_MAX_BASE_DELAY_SECONDS = 64;
 var TOKEN_REFRESH_CHECK_INTERVAL_MS = 3e4;
 var MAX_NOTIFY_PAYLOAD_SIZE = 64 * 1024;
+var GROUP_INVITE_METADATA_KEY = "group_invite_pending_v1";
 function clampReconnectDelaySeconds(value, fallback, upper = RECONNECT_MAX_BASE_DELAY_SECONDS) {
   const parsed = Number(value);
   const seconds = Number.isFinite(parsed) ? parsed : fallback;
@@ -29355,6 +29810,9 @@ var _AUNClient = class _AUNClient {
     __publicField(this, "_mailFacade");
     __publicField(this, "_groupFacade");
     __publicField(this, "_streamFacade");
+    __publicField(this, "_groupInvitePending", /* @__PURE__ */ new Map());
+    __publicField(this, "_groupInviteStateAid", null);
+    __publicField(this, "_groupInviteStateLoad", null);
     /**
      * 处理 V2 push 通知：自动 pull + decrypt + emit。
      */
@@ -29478,6 +29936,15 @@ var _AUNClient = class _AUNClient {
     this._dispatcher.subscribe("_raw.group.changed", (data) => {
       this._onRawGroupChanged(data);
     });
+    this._dispatcher.subscribe("_raw.group.invite_created", (data) => {
+      this._safeAsync(this._onRawGroupInviteReceived(data, "push"));
+    });
+    this._dispatcher.subscribe("_raw.group.invite_received", (data) => {
+      this._safeAsync(this._onRawGroupInviteReceived(data, "push"));
+    });
+    this._dispatcher.subscribe("_raw.group.invite_finalized", (data) => {
+      this._safeAsync(this._onRawGroupInviteFinalized(data));
+    });
     this._dispatcher.subscribe("_raw.peer.v2.message_received", (data) => {
       this._safeAsync(this._onV2PushNotification(data));
     });
@@ -29952,6 +30419,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(".");
@@ -29978,6 +30492,8 @@ var _AUNClient = class _AUNClient {
     }
     this._aidStore = store;
     const payload = { ...params2 };
+    const initialMembers = payload.members;
+    delete payload.members;
     if (payload.group_name === void 0 && payload.groupName !== void 0) {
       payload.group_name = payload.groupName;
       delete payload.groupName;
@@ -30007,7 +30523,8 @@ var _AUNClient = class _AUNClient {
       const result2 = { ...createdMap, ...boundMap, group: { ...createdGroup, ...boundGroup } };
       const postprocessParams2 = { ...payload };
       delete postprocessParams2._defer_group_ready_postprocess;
-      return await this._groupState.postprocessResult("group.create", postprocessParams2, result2);
+      const processed2 = await this._groupState.postprocessResult("group.create", postprocessParams2, result2);
+      return await this._inviteInitialGroupMembers(processed2, groupId, initialMembers);
     }
     const pendingKey = `create:${String(payload.group_name).trim().toLowerCase()}`;
     const keystore = store._keystore;
@@ -30057,7 +30574,29 @@ var _AUNClient = class _AUNClient {
     }
     const postprocessParams = { ...payload };
     delete postprocessParams._defer_group_ready_postprocess;
-    return await this._groupState.postprocessResult("group.create", postprocessParams, result);
+    const processed = await this._groupState.postprocessResult("group.create", postprocessParams, result);
+    return await this._inviteInitialGroupMembers(processed, String(group.group_id ?? groupAid).trim(), initialMembers);
+  }
+  async _inviteInitialGroupMembers(result, groupId, members) {
+    const invites = [];
+    const inviteErrors = [];
+    const seen = /* @__PURE__ */ new Set();
+    if (Array.isArray(members)) {
+      for (const item of members) {
+        const aid = typeof item === "string" ? item.trim() : isJsonObject(item) ? String(item.aid ?? "").trim() : "";
+        const memberType = isJsonObject(item) ? String(item.member_type ?? "").trim() : "";
+        if (!aid || aid === String(this._aid ?? this._currentAid?.aid ?? "").trim() || seen.has(aid)) continue;
+        seen.add(aid);
+        const params2 = { group_id: groupId, invitee_aid: aid };
+        if (memberType) params2.member_type = memberType;
+        try {
+          invites.push(await this.group.inviteMember(params2));
+        } catch (err) {
+          inviteErrors.push({ aid, error: err instanceof Error ? err.message : String(err) });
+        }
+      }
+    }
+    return { ...isJsonObject(result) ? result : {}, invites, invite_errors: inviteErrors };
   }
   _groupAgentMdContent(groupAid, params2 = {}, group = {}) {
     const explicit = params2.group_agent_md ?? params2.groupAgentMd ?? params2.content;
@@ -30585,7 +31124,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() {
@@ -30639,6 +31178,239 @@ var _AUNClient = class _AUNClient {
     const member = isJsonObject(result.member) ? result.member : null;
     return member ? String(member.group_id ?? member.groupId ?? member.group_aid ?? member.groupAid ?? "") : "";
   }
+  groupInviteKey(groupId, inviteeAid) {
+    const group = normalizeGroupId(groupId);
+    const invitee = String(inviteeAid ?? "").trim().toLowerCase();
+    return group && invitee ? `${group}
+${invitee}` : "";
+  }
+  async ensureGroupInviteStateLoaded() {
+    const aid = String(this._aid ?? "").trim();
+    if (!aid) {
+      this._groupInvitePending.clear();
+      this._groupInviteStateAid = null;
+      return;
+    }
+    if (this._groupInviteStateAid === aid) return;
+    if (this._groupInviteStateLoad) {
+      await this._groupInviteStateLoad;
+      if (this._groupInviteStateAid === aid) return;
+    }
+    this._groupInviteStateLoad = (async () => {
+      this._groupInvitePending.clear();
+      this._groupInviteStateAid = aid;
+      const getter = this._tokenStore?.getMetadata;
+      if (typeof getter !== "function") return;
+      try {
+        const raw = await getter.call(this._tokenStore, aid, GROUP_INVITE_METADATA_KEY);
+        const parsed = raw ? JSON.parse(String(raw)) : {};
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return;
+        for (const [key, value] of Object.entries(parsed)) {
+          if (value && typeof value === "object" && !Array.isArray(value)) {
+            this._groupInvitePending.set(key, value);
+          }
+        }
+      } catch (exc) {
+        this._clientLog.debug(`group invite state restore skipped: ${String(exc)}`);
+      }
+    })().finally(() => {
+      this._groupInviteStateLoad = null;
+    });
+    return this._groupInviteStateLoad;
+  }
+  async persistGroupInviteState() {
+    const aid = String(this._aid ?? "").trim();
+    const setter = this._tokenStore?.setMetadata;
+    if (!aid || typeof setter !== "function") return;
+    const state = {};
+    for (const [key, value] of this._groupInvitePending) state[key] = value;
+    try {
+      await setter.call(this._tokenStore, aid, GROUP_INVITE_METADATA_KEY, JSON.stringify(state));
+    } catch (exc) {
+      this._clientLog.debug(`group invite state persist skipped: ${String(exc)}`);
+    }
+  }
+  inviteArray(value, singular) {
+    const values = Array.isArray(value) ? value : singular !== void 0 ? [singular] : [];
+    return [...new Set(values.map((item) => String(item ?? "").trim()).filter(Boolean))];
+  }
+  inviteBool(value) {
+    return value === true || value === 1 || String(value ?? "").trim().toLowerCase() === "true";
+  }
+  async _onRawGroupInviteReceived(data, source = "push") {
+    if (!isJsonObject(data)) return;
+    const groupId = normalizeGroupId(data.group_id ?? data.groupId ?? data.group_aid ?? data.groupAid);
+    const inviteeAid = String(data.invitee_aid ?? data.inviteeAid ?? this._aid ?? "").trim();
+    if (!groupId || !inviteeAid || this._aid && inviteeAid.toLowerCase() !== this._aid.toLowerCase()) return;
+    if (String(data.status ?? "pending").trim().toLowerCase() !== "pending") {
+      await this._onRawGroupInviteFinalized(data);
+      return;
+    }
+    await this.ensureGroupInviteStateLoaded();
+    const key = this.groupInviteKey(groupId, inviteeAid);
+    if (!key) return;
+    const inviteIds = this.inviteArray(data.invite_ids, data.invite_id);
+    const inviterAids = this.inviteArray(data.inviter_aids, data.inviter_aid);
+    const existing = this._groupInvitePending.get(key);
+    if (existing) {
+      existing.invite_ids = [.../* @__PURE__ */ new Set([...this.inviteArray(existing.invite_ids), ...inviteIds])];
+      existing.inviter_aids = [.../* @__PURE__ */ new Set([...this.inviteArray(existing.inviter_aids), ...inviterAids])];
+      await this.persistGroupInviteState();
+      return;
+    }
+    const payload = {
+      ...data,
+      group_id: groupId,
+      group_aid: groupId,
+      invitee_aid: inviteeAid,
+      invite_ids: inviteIds,
+      inviter_aids: inviterAids,
+      role: data.role ?? "member",
+      member_type: data.member_type ?? data.memberType ?? "human",
+      created_at: data.created_at ?? data.createdAt ?? 0,
+      expires_at: data.expires_at ?? data.expiresAt ?? 0,
+      status: "pending"
+    };
+    delete payload.groupId;
+    delete payload.groupAid;
+    delete payload.inviteeAid;
+    delete payload.inviterAid;
+    this._groupInvitePending.set(key, payload);
+    await this.persistGroupInviteState();
+    await this._publishAppEvent("group.invite_received", JSON.parse(JSON.stringify(payload)), source);
+  }
+  async _onRawGroupInviteFinalized(data) {
+    if (!isJsonObject(data)) return;
+    await this.ensureGroupInviteStateLoaded();
+    const groupId = normalizeGroupId(data.group_id ?? data.groupId ?? data.group_aid ?? data.groupAid);
+    const inviteeAid = String(data.invitee_aid ?? data.inviteeAid ?? this._aid ?? "").trim();
+    if (this._aid && inviteeAid.toLowerCase() !== this._aid.toLowerCase()) return;
+    const inviteId = String(data.invite_id ?? "").trim();
+    const key = this.groupInviteKey(groupId, inviteeAid);
+    const status = String(data.status ?? "").trim().toLowerCase();
+    const aggregateStatus = String(data.aggregate_status ?? data.aggregateStatus ?? "").trim().toLowerCase();
+    const pendingIds = this.inviteArray(data.pending_invite_ids ?? data.pendingInviteIds);
+    const pendingInviters = this.inviteArray(data.pending_inviter_aids ?? data.pendingInviterAids);
+    const finalizedIds = this.inviteBool(data.remaining_pending) && inviteId ? [inviteId] : this.inviteArray(data.invite_ids, data.invite_id);
+    const finalizedInviters = this.inviteArray(data.inviter_aids, data.inviter_aid);
+    const leavesPending = this.inviteBool(data.remaining_pending) || this.inviteBool(data.pending) || status === "pending" || aggregateStatus === "pending" || pendingIds.length > 0;
+    let changed = false;
+    const candidates = [];
+    if (key) {
+      const current = this._groupInvitePending.get(key);
+      if (current) candidates.push([key, current]);
+    }
+    if (candidates.length === 0 && inviteId) {
+      for (const [itemKey, item] of this._groupInvitePending) {
+        if (this.inviteArray(item.invite_ids).includes(inviteId)) candidates.push([itemKey, item]);
+      }
+    }
+    for (const [itemKey, item] of candidates) {
+      if (!leavesPending) {
+        this._groupInvitePending.delete(itemKey);
+        changed = true;
+        continue;
+      }
+      const currentIds = this.inviteArray(item.invite_ids);
+      const currentInviters = this.inviteArray(item.inviter_aids);
+      const finalizedIndexes = new Set(currentIds.map((id, index) => finalizedIds.includes(id) ? index : -1).filter((index) => index >= 0));
+      const nextIds = pendingIds.length > 0 ? pendingIds : finalizedIds.length > 0 ? currentIds.filter((id) => !finalizedIds.includes(id)) : currentIds;
+      const nextInviters = pendingInviters.length > 0 ? pendingInviters : finalizedInviters.length > 0 ? currentInviters.filter((aid) => !finalizedInviters.includes(aid)) : finalizedIndexes.size > 0 ? currentInviters.filter((_aid, index) => !finalizedIndexes.has(index)) : currentInviters;
+      if (nextIds.length === 0) {
+        this._groupInvitePending.delete(itemKey);
+      } else {
+        item.invite_ids = nextIds;
+        item.inviter_aids = nextInviters;
+      }
+      changed = true;
+    }
+    if (changed) await this.persistGroupInviteState();
+  }
+  async _onGroupInviteActionResult(method, params2, result, error) {
+    if (method === "group.list_my_invites" && !error && (isJsonObject(result) || Array.isArray(result))) {
+      await this.restoreGroupInvitesFromResult(result, params2);
+      return;
+    }
+    if (!["group.accept_invite", "group.reject_invite", "group.revoke_invite"].includes(method)) return;
+    const text3 = String(error instanceof Error ? error.message : error ?? "").toLowerCase();
+    const resultStatus = isJsonObject(result) ? String(result.status ?? "").toLowerCase() : "";
+    const aggregateResultStatus = isJsonObject(result) ? String(result.aggregate_status ?? result.aggregateStatus ?? "").toLowerCase() : "";
+    const terminalStatus = resultStatus || aggregateResultStatus;
+    const pendingResult = resultStatus === "pending" || aggregateResultStatus === "pending" || isJsonObject(result) && (this.inviteBool(result.remaining_pending) || this.inviteBool(result.pending));
+    if (pendingResult) {
+      if (isJsonObject(result) && (this.inviteBool(result.remaining_pending) || this.inviteArray(result.pending_invite_ids ?? result.pendingInviteIds).length > 0)) {
+        await this._onRawGroupInviteFinalized({ ...params2, ...result });
+      }
+      return;
+    }
+    const terminal = !pendingResult && (!error || ["accepted", "rejected", "revoked", "expired", "ended"].includes(terminalStatus) || /ended|expired|not.*pending|no longer.*pending|not found|finalized|already\s+(?:been\s+)?(?:accepted|rejected|revoked)/.test(text3));
+    if (!terminal) return;
+    await this._onRawGroupInviteFinalized({
+      ...params2,
+      ...isJsonObject(result) ? result : {},
+      status: terminalStatus || "ended"
+    });
+  }
+  async restoreGroupInvitesFromResult(result, requestParams = {}) {
+    const seen = /* @__PURE__ */ new Set();
+    const visitedPages = /* @__PURE__ */ new Set();
+    let current = result;
+    let currentParams = { ...requestParams };
+    let finalPage = false;
+    while (!finalPage) {
+      const root = Array.isArray(current) ? null : isJsonObject(current) ? current : null;
+      const nestedValue = root && isJsonObject(root.data) ? root.data : root;
+      const nested = nestedValue ?? {};
+      const rawItems = Array.isArray(nested.items) ? nested.items : Array.isArray(nested.invites) ? nested.invites : Array.isArray(current) ? current : [];
+      for (const item of rawItems) {
+        if (!isJsonObject(item)) continue;
+        const status = String(item.status ?? "pending").toLowerCase();
+        const gid = normalizeGroupId(item.group_id ?? item.group_aid ?? item.groupId ?? item.groupAid);
+        const aid = String(item.invitee_aid ?? item.inviteeAid ?? this._aid ?? "").trim();
+        if (this._aid && aid.toLowerCase() !== this._aid.toLowerCase()) continue;
+        const key = this.groupInviteKey(gid, aid);
+        if (status === "pending" && key) {
+          seen.add(key);
+          await this._onRawGroupInviteReceived(item, "pull");
+        } else if (key) {
+          seen.add(key);
+          await this._onRawGroupInviteFinalized(item);
+        }
+      }
+      const hasMore = this.inviteBool(nested.has_more ?? nested.hasMore ?? (root ? root.has_more ?? root.hasMore : void 0));
+      if (!hasMore) {
+        finalPage = true;
+        break;
+      }
+      const page = Number(nested.page ?? root?.page ?? currentParams.page ?? 1);
+      const nextPageValue = nested.next_page ?? nested.nextPage ?? root?.next_page ?? root?.nextPage;
+      const nextPage = Number(nextPageValue ?? page + 1);
+      if (!Number.isFinite(nextPage) || nextPage <= 0 || visitedPages.has(nextPage) || nextPage === page) break;
+      visitedPages.add(page);
+      currentParams = { ...currentParams, page: nextPage };
+      if (currentParams.size === void 0) {
+        const size = nested.size ?? root?.size;
+        if (size !== void 0) currentParams.size = size;
+      }
+      current = await this.call("group.list_my_invites", currentParams);
+    }
+    await this.ensureGroupInviteStateLoaded();
+    let changed = false;
+    for (const key of this._groupInvitePending.keys()) {
+      if (!seen.has(key)) {
+        this._groupInvitePending.delete(key);
+        changed = true;
+      }
+    }
+    if (changed) await this.persistGroupInviteState();
+  }
+  async restoreGroupInvitesAfterConnect() {
+    if (!this._aid || this._state !== "connected") return;
+    const result = await this.call("group.list_my_invites", { page: 1, size: 200, _rpc_background: true });
+    if (isJsonObject(result) || Array.isArray(result)) {
+      await this.restoreGroupInvitesFromResult(result, { page: 1, size: 200, _rpc_background: true });
+    }
+  }
   async _onRawGroupChanged(data) {
     const tStart = Date.now();
     const action = String(data?.action ?? "");
@@ -30969,6 +31741,7 @@ var _AUNClient = class _AUNClient {
       }
       this._lifecycle.assertConnectionAttemptOwner(connectionOwner);
       this._startBackgroundTasks();
+      this._safeAsync(this.restoreGroupInvitesAfterConnect());
       const connectionKind = String(params2.connection_kind ?? "long");
       const isShortConnection = connectionKind === "short";
       const hasExplicitBackgroundSync = Object.prototype.hasOwnProperty.call(params2, "background_sync");
@@ -30983,6 +31756,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)}`);
@@ -31678,20 +32452,7 @@ var _AUNClient = class _AUNClient {
     return this._delivery.clampAckParams(method, params2);
   }
   _repairPushContiguousBound(ns, pushSeq, hasPayload, label) {
-    if (!ns || !Number.isFinite(pushSeq) || pushSeq <= 0) {
-      return ns ? this._seqTracker.getContiguousSeq(ns) : 0;
-    }
-    const contig = this._seqTracker.getContiguousSeq(ns);
-    const shouldRepair = contig > pushSeq;
-    if (!shouldRepair) return contig;
-    const repairedTo = Math.max(0, pushSeq - 1);
-    this._seqTracker.repairContiguousSeq(ns, repairedTo);
-    const repaired = this._seqTracker.getContiguousSeq(ns);
-    this._persistRepairedSeq(ns);
-    this._clientLog.warn(
-      `${label} push repaired contiguous_seq: ns=${ns} payload=${hasPayload} push_seq=${pushSeq} contiguous=${contig}->${repaired}`
-    );
-    return repaired;
+    return ns ? this._seqTracker.getContiguousSeq(ns) : 0;
   }
   async _ensureV2SessionReady(method, errorMessage3) {
     if (!this._v2SessionMatchesIdentity()) {
@@ -31869,7 +32630,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 +32718,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 +32760,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 +32797,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);