@agentunion/fastaun-browser 0.5.17 → 0.5.18

package/dist/bundle.js

@@ -460,7 +460,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.5.17";
+var VERSION = "0.5.18";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -6723,6 +6723,16 @@ var MessageDeliveryEngine = class {
     if (typeof senderDevice !== "string" || !senderDevice.trim() || !String(client._deviceId ?? "").trim()) return false;
     return senderDevice.trim() === String(client._deviceId).trim();
   }
+  isSelfSentP2PMessage(message) {
+    if (!isJsonObject(message)) return false;
+    const client = this.runtime.client;
+    if (String(message.direction ?? "").trim() !== "outbound_sync") return false;
+    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;
+    return typeof senderDevice === "string" && Boolean(senderDevice.trim()) && Boolean(String(client._deviceId ?? "").trim()) && senderDevice.trim() === String(client._deviceId).trim();
+  }
   strictTargetString(source, key) {
     if (!Object.prototype.hasOwnProperty.call(source, key)) {
       return { present: false, valid: false, value: "" };
@@ -6828,14 +6838,18 @@ var MessageDeliveryEngine = class {
         await this.processV2P2PNotification(msg, "v1", inlineGeneration);
         return;
       }
+      const encryptedPush = client._isEncryptedPushMessage(msg);
       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());
+        if (encryptedPush) {
+          if (client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillP2pGap());
+          return;
+        }
+        await this.publishPulledMessage("message.received", ns2, legacyPushSeq, msg, true, "push");
         return;
       }
       const seq2 = msg.seq;
-      const encryptedPush = client._isEncryptedPushMessage(msg);
       const ns = client._aid ? `p2p:${client._aid}` : "";
       const seqNum = positiveSafeSequenceHint(seq2);
       if (ns && seqNum > 0) {
@@ -6848,7 +6862,7 @@ var MessageDeliveryEngine = class {
       }
       if (ns && seq2 !== void 0 && seq2 !== null) {
         await this.publishOrderedMessage("message.received", ns, seq2, msg);
-      } else {
+      } else if (!this.isSelfSentP2PMessage(msg)) {
         await client._publishAppEvent("message.received", msg, "push");
       }
     } catch (exc) {
@@ -6907,9 +6921,18 @@ var MessageDeliveryEngine = class {
       if (groupId && legacyPushSeq > 0) {
         const ns2 = `group:${groupId}`;
         client._seqTracker.updateMaxSeen(ns2, legacyPushSeq);
-        if (client._sessionOptions?.background_sync !== false) client._safeAsync(this.fillGroupGap(groupId));
+        if (client._sessionOptions?.background_sync === false) return;
+        const encryptedPush2 = client._isEncryptedPushMessage(msg);
+        if (encryptedPush2) {
+          client._safeAsync(this.fillGroupGap(groupId));
+          return;
+        }
+        if (!this.isSelfSentGroupMessage(msg)) {
+          await this.publishPulledMessage("group.message_created", ns2, legacyPushSeq, msg, true, "push");
+        }
         return;
       }
+      const encryptedPush = client._isEncryptedPushMessage(msg);
       if (payload === void 0 || payload === null || typeof payload === "object" && Object.keys(payload).length === 0) {
         if (client._v2Session) await this.autoPullGroupMessages(msg);
         else if (groupId && seq2 !== void 0 && seq2 !== null) {
@@ -6923,7 +6946,6 @@ var MessageDeliveryEngine = class {
         } else await client._publishAppEvent("group.message_created", msg, "push");
         return;
       }
-      const encryptedPush = client._isEncryptedPushMessage(msg);
       const ns = groupId ? `group:${groupId}` : "";
       const seqNum = positiveSafeSequenceHint(seq2);
       if (ns && seqNum > 0) {
@@ -7581,7 +7603,8 @@ var MessageDeliveryEngine = class {
     const tracker = client._seqTracker;
     const snapshot = typeof tracker.snapshotNamespace === "function" ? tracker.snapshotNamespace(ns) : null;
     try {
-      const published = await this.publishPulledMessage(event, ns, seq2, payload, true, "inline_push");
+      const selfSync = event === "message.received" && this.isSelfSentP2PMessage(payload) || event === "group.message_created" && this.isSelfSentGroupMessage(payload);
+      const published = selfSync ? (this.markPublishedSeq(ns, seq2), true) : await this.publishPulledMessage(event, ns, seq2, payload, true, "inline_push");
       if (!this.isInlineGenerationCurrent(generation)) return false;
       if (!published) return false;
       const needsPull = Boolean(tracker.onMessageSeq(ns, seq2));
@@ -8448,6 +8471,11 @@ var MessageDeliveryEngine = class {
         if (queue2 && queue2.size === 0) client._pendingOrderedMsgs.delete(ns);
         return false;
       }
+      if (event === "message.received" && this.isSelfSentP2PMessage(payload)) {
+        this.markPublishedSeq(ns, seqNum);
+        client._clientLog.debug(`publish ordered skipped current-device self-sync: ns=${ns}, seq=${seqNum}`);
+        return false;
+      }
       const contig = client._seqTracker.getContiguousSeq(ns);
       if (seqNum > contig) {
         this.enqueueOrderedMessage(ns, event, seqNum, payload, source);
@@ -8494,6 +8522,11 @@ var MessageDeliveryEngine = class {
         if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
         return false;
       }
+      if (event === "message.received" && this.isSelfSentP2PMessage(payload)) {
+        this.markPublishedSeq(ns, seqNum);
+        client._clientLog.debug(`publish pulled skipped current-device self-sync: ns=${ns}, seq=${seqNum}`);
+        return source === "inline_push";
+      }
       await this.drainOrderedMessages(ns, seqNum, false, persist, batch, source);
       if (pullScoped) this.ensurePullOperationCurrent(ns);
       queue?.delete(seqNum);
@@ -9190,8 +9223,11 @@ async function certMatchesFingerprint(certPem, fingerprint) {
   const expected = normalizeFingerprintHex(fingerprint);
   if (!expected) return false;
   const derHex = (await certificateSha256Fingerprint(certPem)).slice("sha256:".length);
-  if (expected.length === 16) return derHex.slice(0, 16) === expected;
-  return derHex === expected;
+  const spkiHex = (await publicKeyFingerprint(certPem)).slice("sha256:".length);
+  if (expected.length === 16) {
+    return derHex.slice(0, 16) === expected || spkiHex.slice(0, 16) === expected;
+  }
+  return derHex === expected || spkiHex === expected;
 }
 async function publicKeyMatchesFingerprint(certPem, fingerprint) {
   const expected = normalizeFingerprintHex(fingerprint);
@@ -15648,6 +15684,241 @@ function parseDocument(source, options = {}) {
   return doc;
 }
 
+// src/v2/crypto/canonical.ts
+var encoder = new TextEncoder();
+var MAX_SAFE_JSON_INTEGER = 9007199254740991;
+function canonicalJson(obj) {
+  return encoder.encode(serialize(obj));
+}
+function serialize(obj) {
+  if (obj === null) return "null";
+  if (obj === true) return "true";
+  if (obj === false) return "false";
+  if (typeof obj === "number") {
+    return serializeNumber(obj);
+  }
+  if (typeof obj === "string") {
+    return serializeString(obj);
+  }
+  if (Array.isArray(obj)) {
+    return serializeArray(obj);
+  }
+  if (typeof obj === "object") {
+    return serializeObject(obj);
+  }
+  throw new TypeError(`canonicalJson: unsupported type ${typeof obj}`);
+}
+function serializeNumber(n) {
+  if (!isFinite(n)) {
+    throw new RangeError("canonicalJson: Infinity and NaN not allowed");
+  }
+  if (Object.is(n, -0)) return "0";
+  if (Number.isInteger(n)) {
+    if (Math.abs(n) > MAX_SAFE_JSON_INTEGER) {
+      throw new RangeError(`canonicalJson: integer outside safe range ${n}`);
+    }
+    return String(n);
+  }
+  return expandExponent(String(n));
+}
+function expandExponent(s) {
+  if (!/[eE]/.test(s)) return s;
+  const match = /^(-?)(\d+)(?:\.(\d+))?[eE]([+-]?\d+)$/.exec(s);
+  if (!match) {
+    throw new TypeError(`canonicalJson: invalid number ${s}`);
+  }
+  const sign = match[1] ?? "";
+  const intPart = match[2] ?? "";
+  const fracPart = match[3] ?? "";
+  const exp = Number(match[4]);
+  const digits = intPart + fracPart;
+  const point = intPart.length + exp;
+  if (point <= 0) {
+    return `${sign}0.${"0".repeat(-point)}${digits}`;
+  }
+  if (point >= digits.length) {
+    return `${sign}${digits}${"0".repeat(point - digits.length)}`;
+  }
+  return `${sign}${digits.slice(0, point)}.${digits.slice(point)}`;
+}
+function serializeString(s) {
+  let result = '"';
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    const code = s.charCodeAt(i);
+    if (ch === '"') {
+      result += '\\"';
+    } else if (ch === "\\") {
+      result += "\\\\";
+    } else if (ch === "\b") {
+      result += "\\b";
+    } else if (ch === "\f") {
+      result += "\\f";
+    } else if (ch === "\n") {
+      result += "\\n";
+    } else if (ch === "\r") {
+      result += "\\r";
+    } else if (ch === "	") {
+      result += "\\t";
+    } else if (code < 32) {
+      result += "\\u" + code.toString(16).padStart(4, "0");
+    } else {
+      result += ch;
+    }
+  }
+  result += '"';
+  return result;
+}
+function serializeArray(arr) {
+  const items = arr.map((item) => serialize(item));
+  return "[" + items.join(",") + "]";
+}
+function serializeObject(obj) {
+  const sortedKeys = Object.keys(obj).sort(compareCodePoints);
+  const pairs2 = sortedKeys.map(
+    (key) => serializeString(key) + ":" + serialize(obj[key])
+  );
+  return "{" + pairs2.join(",") + "}";
+}
+function compareCodePoints(a, b) {
+  const ac = Array.from(a);
+  const bc = Array.from(b);
+  const n = Math.min(ac.length, bc.length);
+  for (let i = 0; i < n; i++) {
+    const av = ac[i].codePointAt(0) ?? 0;
+    const bv = bc[i].codePointAt(0) ?? 0;
+    if (av !== bv) return av - bv;
+  }
+  return ac.length - bc.length;
+}
+
+// src/ownership-proof.ts
+var OWNERSHIP_RELATION_DOMAIN = "AUN-AID-OWNER-RELATION-V1;";
+var PROOF_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
+var FINGERPRINT_RE = /^sha256:[0-9a-f]{64}$/i;
+function sha256Hex(input) {
+  const K = [1116352408, 1899447441, 3049323471, 3921009573, 961987163, 1508970993, 2453635748, 2870763221, 3624381080, 310598401, 607225278, 1426881987, 1925078388, 2162078206, 2614888103, 3248222580, 3835390401, 4022224774, 264347078, 604807628, 770255983, 1249150122, 1555081692, 1996064986, 2554220882, 2821834349, 2952996808, 3210313671, 3336571891, 3584528711, 113926993, 338241895, 666307205, 773529912, 1294757372, 1396182291, 1695183700, 1986661051, 2177026350, 2456956037, 2730485921, 2820302411, 3259730800, 3345764771, 3516065817, 3600352804, 4094571909, 275423344, 430227734, 506948616, 659060556, 883997877, 958139571, 1322822218, 1537002063, 1747873779, 1955562222, 2024104815, 2227730452, 2361852424, 2428436474, 2756734187, 3204031479, 3329325298];
+  const bytes = new Uint8Array(input.length + 1 + ((55 - input.length) % 64 + 64) % 64 + 8);
+  bytes.set(input);
+  bytes[input.length] = 128;
+  const bits = input.length * 8;
+  new DataView(bytes.buffer).setUint32(bytes.length - 4, bits >>> 0, false);
+  new DataView(bytes.buffer).setUint32(bytes.length - 8, Math.floor(bits / 4294967296), false);
+  let h = [1779033703, 3144134277, 1013904242, 2773480762, 1359893119, 2600822924, 528734635, 1541459225];
+  const rotr2 = (x, n) => x >>> n | x << 32 - n;
+  for (let o = 0; o < bytes.length; o += 64) {
+    const w = new Uint32Array(64);
+    for (let i = 0; i < 16; i++) w[i] = new DataView(bytes.buffer).getUint32(o + i * 4, false);
+    for (let i = 16; i < 64; i++) {
+      const x = w[i - 15], y = w[i - 2];
+      w[i] = w[i - 16] + (rotr2(x, 7) ^ rotr2(x, 18) ^ x >>> 3) + w[i - 7] + (rotr2(y, 17) ^ rotr2(y, 19) ^ y >>> 10) >>> 0;
+    }
+    let [a, b, c, d, e, f, g, hh] = h;
+    for (let i = 0; i < 64; i++) {
+      const s1 = rotr2(e, 6) ^ rotr2(e, 11) ^ rotr2(e, 25), ch = e & f ^ ~e & g, t1 = hh + s1 + ch + K[i] + w[i] >>> 0;
+      const s0 = rotr2(a, 2) ^ rotr2(a, 13) ^ rotr2(a, 22), maj = a & b ^ a & c ^ b & c, t2 = s0 + maj >>> 0;
+      [hh, g, f, e, d, c, b, a] = [g, f, e, d + t1 >>> 0, c, b, a, t1 + t2 >>> 0];
+    }
+    h = h.map((v, i) => v + [a, b, c, d, e, f, g, hh][i] >>> 0);
+  }
+  return h.map((v) => v.toString(16).padStart(8, "0")).join("");
+}
+var OwnershipStatement = class _OwnershipStatement {
+  constructor(proofId, subjectAid, ownerAid) {
+    __publicField(this, "proofId");
+    __publicField(this, "subjectAid");
+    __publicField(this, "ownerAid");
+    __publicField(this, "canonicalFact");
+    __publicField(this, "canonicalStatement");
+    __publicField(this, "factHash");
+    __publicField(this, "statementHash");
+    this.proofId = proofId;
+    this.subjectAid = subjectAid;
+    this.ownerAid = ownerAid;
+    this.canonicalFact = canonicalJson({ subject_aid: subjectAid, owner_aid: ownerAid });
+    this.canonicalStatement = canonicalJson({ proof_id: proofId, subject_aid: subjectAid, owner_aid: ownerAid });
+    const signed = new Uint8Array(new TextEncoder().encode(OWNERSHIP_RELATION_DOMAIN).length + this.canonicalStatement.length);
+    signed.set(new TextEncoder().encode(OWNERSHIP_RELATION_DOMAIN));
+    signed.set(this.canonicalStatement, new TextEncoder().encode(OWNERSHIP_RELATION_DOMAIN).length);
+    this.factHash = sha256Hex(this.canonicalFact);
+    this.statementHash = sha256Hex(signed);
+  }
+  static create(proofId, subjectAid, ownerAid) {
+    const id = String(proofId ?? "").trim();
+    if (!PROOF_ID_RE.test(id)) throw new ValidationError("invalid proof_id");
+    let s, o;
+    try {
+      s = validateAIDFormat(subjectAid, "subject_aid");
+      o = validateAIDFormat(ownerAid, "owner_aid");
+    } catch (e) {
+      throw new ValidationError(String(e instanceof Error ? e.message : e));
+    }
+    return new _OwnershipStatement(id, s, o);
+  }
+  get signingBytes() {
+    const p = new TextEncoder().encode(OWNERSHIP_RELATION_DOMAIN), r = new Uint8Array(p.length + this.canonicalStatement.length);
+    r.set(p);
+    r.set(this.canonicalStatement, p.length);
+    return r;
+  }
+};
+function validateOwnershipFrontmatter(frontmatter2, expectedAid) {
+  const op = Object.prototype.hasOwnProperty.call(frontmatter2, "owner"), pp = Object.prototype.hasOwnProperty.call(frontmatter2, "ownership_proof");
+  if (op !== pp) throw new ValidationError("owner and ownership_proof must appear together");
+  const type = String(frontmatter2.type ?? "").trim().toLowerCase();
+  if (type === "human" && (op || pp)) throw new ValidationError("human AID cannot specify owner");
+  if (!op) return;
+  const aid = validateAIDFormat(frontmatter2.aid, "aid"), owner = validateAIDFormat(frontmatter2.owner, "owner");
+  if (String(frontmatter2.aid).trim() !== aid || String(frontmatter2.owner).trim() !== owner) throw new ValidationError("owner and subject AID must be lowercase");
+  if (expectedAid && aid !== expectedAid.trim().toLowerCase()) throw new ValidationError("ownership subject AID does not match expected AID");
+  if (!frontmatter2.ownership_proof || typeof frontmatter2.ownership_proof !== "object" || Array.isArray(frontmatter2.ownership_proof)) throw new ValidationError("ownership_proof must be an object");
+  const raw = frontmatter2.ownership_proof, allowed = /* @__PURE__ */ new Set(["proof_id", "subject_aid", "owner_aid", "fact_hash", "statement_hash", "subject_signature", "owner_signature"]);
+  if (Object.keys(raw).some((k) => !allowed.has(k))) throw new ValidationError("ownership_proof contains unknown fields");
+  const statement = OwnershipStatement.create(String(raw.proof_id ?? ""), String(raw.subject_aid ?? ""), String(raw.owner_aid ?? ""));
+  if (statement.subjectAid !== aid || statement.ownerAid !== owner) throw new ValidationError("ownership_proof does not match agent.md owner");
+  if (raw.fact_hash !== void 0 && String(raw.fact_hash).toLowerCase() !== statement.factHash) throw new ValidationError("fact_hash mismatch");
+  if (raw.statement_hash !== void 0 && String(raw.statement_hash).toLowerCase() !== statement.statementHash) throw new ValidationError("statement_hash mismatch");
+  if (!validSignature(raw.subject_signature)) throw new ValidationError("subject_signature is invalid");
+  if (aid === owner) {
+    if (raw.owner_signature !== void 0) throw new ValidationError("self-owner proof must not contain owner_signature");
+  } else if (!raw.owner_signature || !validSignature(raw.owner_signature)) throw new ValidationError("owner_signature is required");
+}
+function validateOwnershipProof(proof, expectedSubject, expectedOwner) {
+  let s, o;
+  try {
+    s = validateAIDFormat(expectedSubject, "subject_aid");
+    o = validateAIDFormat(expectedOwner, "owner_aid");
+  } catch (e) {
+    throw new ValidationError(String(e instanceof Error ? e.message : e));
+  }
+  if (proof.statement.subjectAid !== s || proof.statement.ownerAid !== o) throw new ValidationError("ownership proof statement does not match owner or subject");
+  if (proof.fact_hash && proof.fact_hash.toLowerCase() !== proof.statement.factHash) throw new ValidationError("fact_hash mismatch");
+  if (proof.statement_hash && proof.statement_hash.toLowerCase() !== proof.statement.statementHash) throw new ValidationError("statement_hash mismatch");
+  if (!validSignature(proof.subject_signature)) throw new ValidationError("subject_signature is invalid");
+  if (s === o) {
+    if (proof.owner_signature) throw new ValidationError("self-owner proof must not contain owner_signature");
+  } else if (!proof.owner_signature || !validSignature(proof.owner_signature)) throw new ValidationError("owner_signature is required");
+}
+function validSignature(s) {
+  return !!s && FINGERPRINT_RE.test(String(s?.cert_fingerprint ?? "").trim()) && isStrictBase64(String(s?.signature ?? ""));
+}
+async function signOwnershipStatement(aid, statement) {
+  const sig = await aid.sign(statement.signingBytes);
+  if (!sig.ok || !sig.data) throw new ValidationError(sig.error?.message ?? "ownership signature failed");
+  if (!FINGERPRINT_RE.test(aid.certFingerprint)) throw new ValidationError("certificate fingerprint is unavailable");
+  return { cert_fingerprint: aid.certFingerprint, signature: sig.data.signature };
+}
+async function verifyOwnershipSignature(certPem, statement, signature) {
+  if (!validSignature(signature)) return false;
+  if ((await certificateSha256Fingerprint(certPem)).toLowerCase() !== signature.cert_fingerprint.toLowerCase()) return false;
+  return verifySignatureWithCert(certPem, signature.signature, new TextEncoder().encode(new TextDecoder().decode(statement.signingBytes)));
+}
+async function verifyOwnershipProof(proof, subjectCertPem, ownerCertPem) {
+  validateOwnershipProof(proof, proof.statement.subjectAid, proof.statement.ownerAid);
+  if (!await verifyOwnershipSignature(subjectCertPem, proof.statement, proof.subject_signature)) return false;
+  return proof.statement.subjectAid === proof.statement.ownerAid || !!ownerCertPem && !!proof.owner_signature && await verifyOwnershipSignature(ownerCertPem, proof.statement, proof.owner_signature);
+}
+
 // src/agent-md-schema.ts
 var AID_RE = /^[A-Za-z0-9_][A-Za-z0-9_-]*(?:\.[A-Za-z0-9_][A-Za-z0-9_-]*)+$/;
 var SEMVER_RE = /^\d+\.\d+\.\d+$/;
@@ -15693,6 +15964,7 @@ function validateAgentMdDocument(content, opts = {}) {
     if (Array.from(meta.avatar).length > 256) throw new ValidationError("agent.md avatar exceeds 256 characters");
   }
   if (meta.tags !== void 0 && (!Array.isArray(meta.tags) || meta.tags.some((item) => typeof item !== "string"))) throw new ValidationError("agent.md tags must be an array of strings");
+  validateOwnershipFrontmatter(meta, opts.expectedAid);
   const fields = parsed.fields;
   if (fields) {
     if (Object.keys(fields).some((key) => !["cert_fingerprint", "public_key_fingerprint", "timestamp", "signature"].includes(key))) throw new ValidationError("agent.md signature contains unknown fields");
@@ -15789,6 +16061,8 @@ var AID = class _AID {
     return this._privateKeyValid;
   }
   async sign(payload) {
+    const now = Date.now();
+    if (!this._certValid || now < this.certNotBefore.getTime() || now > this.certNotAfter.getTime()) return resultErr(CERT_NOT_VALID, "certificate is not valid");
     if (!this._privateKeyValid || !this.privateKeyPem) return resultErr(PRIVATE_KEY_NOT_VALID, "private key is not valid");
     try {
       const data = typeof payload === "string" ? new TextEncoder().encode(payload) : payload;
@@ -15797,7 +16071,8 @@ var AID = class _AID {
       return resultErr(SIGNATURE_OPERATION_ERROR, String(exc), exc);
     }
   }
-  async verify(payload, signature) {
+  async verify(payload, signature, context) {
+    if (context) return this.verifyWithContext(payload, signature, context);
     if (!this._certValid) return resultErr(CERT_NOT_VALID, "certificate is not valid");
     try {
       const data = typeof payload === "string" ? new TextEncoder().encode(payload) : payload;
@@ -15807,6 +16082,8 @@ var AID = class _AID {
     }
   }
   async signAgentMd(content) {
+    const now = Date.now();
+    if (!this._certValid || now < this.certNotBefore.getTime() || now > this.certNotAfter.getTime()) return resultErr(CERT_NOT_VALID, "certificate is not valid");
     if (!this._privateKeyValid || !this.privateKeyPem) return resultErr(PRIVATE_KEY_NOT_VALID, "private key is not valid");
     try {
       const parsed = parseAgentMdTailSignature(String(content ?? ""));
@@ -15828,6 +16105,40 @@ var AID = class _AID {
       return resultErr(SIGNATURE_OPERATION_ERROR, String(exc), exc);
     }
   }
+  async verifyWithContext(payload, signature, context) {
+    try {
+      const expectedAid = String(context.expectedAid ?? context.expected_aid ?? context.aid ?? "").trim();
+      if (!expectedAid) return resultErr(VERIFICATION_OPERATION_ERROR, "expected AID is required");
+      if (expectedAid.toLowerCase() !== this.aid.trim().toLowerCase() || expectedAid.toLowerCase() !== this.certSubject.trim().toLowerCase()) {
+        return resultErr(VERIFICATION_OPERATION_ERROR, "certificate subject does not match AID");
+      }
+      const expectedFingerprint = String(context.certFingerprint ?? context.cert_fingerprint ?? "").trim().toLowerCase().replace(/^sha256:/, "").replace(/:/g, "");
+      const actualFingerprint = this.certFingerprint.trim().toLowerCase().replace(/^sha256:/, "").replace(/:/g, "");
+      if (!/^[0-9a-f]{64}$/.test(expectedFingerprint) || expectedFingerprint !== actualFingerprint) {
+        return resultErr(VERIFICATION_OPERATION_ERROR, "certificate fingerprint mismatch");
+      }
+      const timestampValue = context.signatureTimestamp ?? context.signature_timestamp ?? context.timestamp;
+      if (typeof timestampValue !== "number" || !Number.isFinite(timestampValue) || !Number.isInteger(timestampValue)) {
+        return resultErr(VERIFICATION_OPERATION_ERROR, "signature timestamp is invalid");
+      }
+      const notBefore = this.certNotBefore.getTime() / 1e3;
+      const notAfter = this.certNotAfter.getTime() / 1e3;
+      if (timestampValue < notBefore || timestampValue > notAfter) {
+        return resultErr(VERIFICATION_OPERATION_ERROR, "signature timestamp is outside certificate validity");
+      }
+      const nowValue = context.now instanceof Date ? context.now.getTime() / 1e3 : context.now;
+      const now = nowValue === void 0 ? Date.now() / 1e3 : Number(nowValue);
+      if (!Number.isFinite(now)) return resultErr(VERIFICATION_OPERATION_ERROR, "verification time is invalid");
+      if ((context.requireCurrentValidity ?? context.require_current_validity ?? false) && (now < notBefore || now > notAfter)) {
+        return resultErr(CERT_NOT_VALID, "certificate is expired or not yet valid");
+      }
+      if (!isStrictBase64(signature)) return resultErr(VERIFICATION_OPERATION_ERROR, "invalid base64 signature");
+      const data = typeof payload === "string" ? new TextEncoder().encode(payload) : payload;
+      return resultOk({ valid: await verifySignatureWithCert(this.certPem, signature, data) });
+    } catch (exc) {
+      return resultErr(VERIFICATION_OPERATION_ERROR, String(exc), exc);
+    }
+  }
   async verifyAgentMd(content) {
     try {
       const rawContent = String(content ?? "");
@@ -16577,6 +16888,13 @@ var RpcPipeline = class {
     if (!currentAid?.privateKeyPem) return;
     try {
       const aid = currentAid.aid;
+      const certPem = currentAid.certPem ?? "";
+      if (!certPem) throw new Error("\u7B7E\u540D\u8BC1\u4E66\u4E0D\u53EF\u7528");
+      const certMeta = parseCertMetadata(certPem);
+      const now = Date.now();
+      if (now < certMeta.notBefore.getTime() || now > certMeta.notAfter.getTime()) {
+        throw new Error("\u7B7E\u540D\u8BC1\u4E66\u5DF2\u8FC7\u671F\u6216\u5C1A\u672A\u751F\u6548");
+      }
       const ts = String(Math.floor(Date.now() / 1e3));
       const paramsForHash = {};
       for (const [k, v] of Object.entries(params2)) {
@@ -16599,7 +16917,6 @@ var RpcPipeline = class {
       );
       const sigDer = p1363ToDer(new Uint8Array(sigP1363));
       let certFingerprint = "";
-      const certPem = currentAid.certPem;
       if (certPem) {
         certFingerprint = await signingCertFingerprint(certPem);
       }
@@ -17951,7 +18268,7 @@ function unmountFromAny(input, fallback) {
 }
 
 // src/storage/vfs.ts
-async function sha256Hex(data) {
+async function sha256Hex2(data) {
   const copy = new Uint8Array(data.byteLength);
   copy.set(data);
   const subtle = globalThis.crypto?.subtle;
@@ -18072,7 +18389,7 @@ var StorageVFS = class {
     const owner = this.owner(options.owner);
     const bucket = options.bucket ?? "default";
     const objectKey = pathToKey(path);
-    const sha2566 = await sha256Hex(data);
+    const sha2566 = await sha256Hex2(data);
     const overwrite = options.overwrite ?? false;
     try {
       const check = await this.lowlevel.checkUpload({ owner, bucket, objectKey, size: data.length, sha256: sha2566 });
@@ -18178,7 +18495,7 @@ var StorageVFS = class {
   }
   async downloadFile(path, options = {}) {
     const { data, sha256: expectedSha } = await this.readBytesWithMetadata(path, options);
-    const actualSha = await sha256Hex(data);
+    const actualSha = await sha256Hex2(data);
     const expected = expectedSha.toLowerCase();
     const verified = Boolean(expected) && actualSha.toLowerCase() === expected;
     if (!verified && expected && (options.verifyHash ?? true)) {
@@ -18531,7 +18848,7 @@ function bearerHeaders(client) {
 function toExactArrayBuffer(bytes) {
   return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
 }
-async function sha256Hex2(data) {
+async function sha256Hex3(data) {
   const subtle = globalThis.crypto?.subtle;
   if (!subtle?.digest) throw new StorageError("SHA-256 unavailable", "EUNSUPPORTED");
   const digest = await subtle.digest("SHA-256", toExactArrayBuffer(data));
@@ -18786,7 +19103,7 @@ var GroupFSVFS = class {
   }
   async uploadToGroup(src, dst, options) {
     const { data, contentType } = await this.sourceBytes(src, options);
-    const digest = await sha256Hex2(data);
+    const digest = await sha256Hex3(data);
     const groupAid = options.group_aid ?? options.groupAid ?? options.dst_group_aid ?? options.dstGroupAid;
     const groupId = options.group_id ?? options.groupId ?? options.dst_group_id ?? options.dstGroupId;
     const baseParams = stripNil({
@@ -18910,7 +19227,7 @@ var GroupFSVFS = class {
     const data = await this.lowlevel.httpGet(downloadUrl, bearerHeaders(this.client));
     const expectedSha = text2(rawTicket.sha256);
     const verifyHash = options.verify_hash ?? options.verifyHash ?? true;
-    const verified = !verifyHash || !expectedSha || await sha256Hex2(data) === expectedSha.toLowerCase();
+    const verified = !verifyHash || !expectedSha || await sha256Hex3(data) === expectedSha.toLowerCase();
     if (verifyHash && !verified) {
       throw new StorageConflictError("download hash verification failed", "ECONFLICT", src, ticket);
     }
@@ -18941,114 +19258,6 @@ var GroupFSVFS = class {
   }
 };
 
-// src/v2/crypto/canonical.ts
-var encoder = new TextEncoder();
-var MAX_SAFE_JSON_INTEGER = 9007199254740991;
-function canonicalJson(obj) {
-  return encoder.encode(serialize(obj));
-}
-function serialize(obj) {
-  if (obj === null) return "null";
-  if (obj === true) return "true";
-  if (obj === false) return "false";
-  if (typeof obj === "number") {
-    return serializeNumber(obj);
-  }
-  if (typeof obj === "string") {
-    return serializeString(obj);
-  }
-  if (Array.isArray(obj)) {
-    return serializeArray(obj);
-  }
-  if (typeof obj === "object") {
-    return serializeObject(obj);
-  }
-  throw new TypeError(`canonicalJson: unsupported type ${typeof obj}`);
-}
-function serializeNumber(n) {
-  if (!isFinite(n)) {
-    throw new RangeError("canonicalJson: Infinity and NaN not allowed");
-  }
-  if (Object.is(n, -0)) return "0";
-  if (Number.isInteger(n)) {
-    if (Math.abs(n) > MAX_SAFE_JSON_INTEGER) {
-      throw new RangeError(`canonicalJson: integer outside safe range ${n}`);
-    }
-    return String(n);
-  }
-  return expandExponent(String(n));
-}
-function expandExponent(s) {
-  if (!/[eE]/.test(s)) return s;
-  const match = /^(-?)(\d+)(?:\.(\d+))?[eE]([+-]?\d+)$/.exec(s);
-  if (!match) {
-    throw new TypeError(`canonicalJson: invalid number ${s}`);
-  }
-  const sign = match[1] ?? "";
-  const intPart = match[2] ?? "";
-  const fracPart = match[3] ?? "";
-  const exp = Number(match[4]);
-  const digits = intPart + fracPart;
-  const point = intPart.length + exp;
-  if (point <= 0) {
-    return `${sign}0.${"0".repeat(-point)}${digits}`;
-  }
-  if (point >= digits.length) {
-    return `${sign}${digits}${"0".repeat(point - digits.length)}`;
-  }
-  return `${sign}${digits.slice(0, point)}.${digits.slice(point)}`;
-}
-function serializeString(s) {
-  let result = '"';
-  for (let i = 0; i < s.length; i++) {
-    const ch = s[i];
-    const code = s.charCodeAt(i);
-    if (ch === '"') {
-      result += '\\"';
-    } else if (ch === "\\") {
-      result += "\\\\";
-    } else if (ch === "\b") {
-      result += "\\b";
-    } else if (ch === "\f") {
-      result += "\\f";
-    } else if (ch === "\n") {
-      result += "\\n";
-    } else if (ch === "\r") {
-      result += "\\r";
-    } else if (ch === "	") {
-      result += "\\t";
-    } else if (code < 32) {
-      result += "\\u" + code.toString(16).padStart(4, "0");
-    } else {
-      result += ch;
-    }
-  }
-  result += '"';
-  return result;
-}
-function serializeArray(arr) {
-  const items = arr.map((item) => serialize(item));
-  return "[" + items.join(",") + "]";
-}
-function serializeObject(obj) {
-  const sortedKeys = Object.keys(obj).sort(compareCodePoints);
-  const pairs2 = sortedKeys.map(
-    (key) => serializeString(key) + ":" + serialize(obj[key])
-  );
-  return "{" + pairs2.join(",") + "}";
-}
-function compareCodePoints(a, b) {
-  const ac = Array.from(a);
-  const bc = Array.from(b);
-  const n = Math.min(ac.length, bc.length);
-  for (let i = 0; i < n; i++) {
-    const av = ac[i].codePointAt(0) ?? 0;
-    const bv = bc[i].codePointAt(0) ?? 0;
-    if (av !== bv) return av - bv;
-  }
-  return ac.length - bc.length;
-}
-
 // src/group-index.ts
 var GROUP_INDEX_SCHEMA = "aun.group.index.v1";
 var GROUP_INDEX_KEY = "group.index";
@@ -19156,13 +19365,13 @@ var GroupIndexMetaCache = class {
   }
 };
 async function computeGroupIndexBodyHash(entries) {
-  return `sha256:${await sha256Hex3(entriesBytes(entries))}`;
+  return `sha256:${await sha256Hex4(entriesBytes(entries))}`;
 }
 async function groupIndexEtag(entries) {
-  return `"sha256:${await sha256Hex3(entriesBytes(entries))}"`;
+  return `"sha256:${await sha256Hex4(entriesBytes(entries))}"`;
 }
 async function groupIndexSettingEtag(value) {
-  return `"sha256:${await sha256Hex3(encode(canonicalStringify(value)))}"`;
+  return `"sha256:${await sha256Hex4(encode(canonicalStringify(value)))}"`;
 }
 function groupIndexSigningPayload(meta, entries) {
   const metaWithoutSignature = { ...meta };
@@ -19266,7 +19475,7 @@ function canonicalStringify(value) {
 function encode(text3) {
   return new TextEncoder().encode(text3);
 }
-async function sha256Hex3(data) {
+async function sha256Hex4(data) {
   const digest = await globalThis.crypto.subtle.digest("SHA-256", exactArrayBuffer(data));
   return bytesToHex(new Uint8Array(digest));
 }
@@ -19366,6 +19575,9 @@ var MessageFacade = class extends RpcFacade {
   send(params2) {
     return this.call("message.send", params2);
   }
+  getAuditStatus(params2) {
+    return this.call("message.get_audit_status", params2);
+  }
   pull(params2) {
     return this.call("message.pull", params2);
   }
@@ -19811,6 +20023,9 @@ var GroupFacade = class extends RpcFacade {
     validateGroupIDFormat(params2?.group_id, "group_id");
     return this.call("group.send", params2);
   }
+  getAuditStatus(params2) {
+    return this.call("group.get_audit_status", params2);
+  }
   recall(params2) {
     return this.call("group.recall", params2);
   }
@@ -23900,7 +24115,7 @@ var PEER_KEY_CACHE_TTL_MS = 60 * 60 * 1e3;
 var DESTROY_DELAY_MS = 7 * 24 * 60 * 60 * 1e3;
 var RECENT_GENERATIONS = 7;
 var HARD_LIMIT_MS = 180 * 24 * 60 * 60 * 1e3;
-async function sha256Hex4(data) {
+async function sha256Hex5(data) {
   const buf = await crypto.subtle.digest("SHA-256", data.slice().buffer);
   const arr = new Uint8Array(buf);
   let hex = "";
@@ -23991,7 +24206,7 @@ var V2Session = class {
   }
   async _generateNewSPK() {
     const [priv, pubDer] = await generateP256Keypair();
-    const hex = await sha256Hex4(pubDer);
+    const hex = await sha256Hex5(pubDer);
     const spkId = `sha256:${hex.substring(0, 16)}`;
     await this._store.saveSPK(this._storeDeviceId, spkId, priv, pubDer);
     this._spkId = spkId;
@@ -23999,7 +24214,7 @@ var V2Session = class {
     this._spkPubDer = pubDer;
   }
   async _ikSPKId() {
-    const hex = await sha256Hex4(this._ikPubDer);
+    const hex = await sha256Hex5(this._ikPubDer);
     return `sha256:${hex.substring(0, 16)}`;
   }
   _groupKey(groupId) {
@@ -24229,7 +24444,7 @@ var V2Session = class {
       }
     }
     const [priv, pubDer] = await generateP256Keypair();
-    const hex = await sha256Hex4(pubDer);
+    const hex = await sha256Hex5(pubDer);
     const spkId = `sha256:${hex.substring(0, 16)}`;
     await this._store.saveGroupSPK(this._storeDeviceId, gk, spkId, priv, pubDer);
     return { spkId, priv, pubDer };
@@ -24254,7 +24469,7 @@ var V2Session = class {
     await this.ensureKeys();
     const gk = this._groupKey(groupId);
     const [priv, pubDer] = await generateP256Keypair();
-    const hex = await sha256Hex4(pubDer);
+    const hex = await sha256Hex5(pubDer);
     const spkId = `sha256:${hex.substring(0, 16)}`;
     await this._store.saveGroupSPK(this._storeDeviceId, gk, spkId, priv, pubDer);
     await this._publishGroupSPK(gk, spkId, pubDer, callFn);
@@ -24329,6 +24544,46 @@ var V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
 var V2_PULL_DEFAULT_PAGE_LIMIT = 50;
 var V2_PULL_MAX_PAGE_LIMIT = 50;
 var V2_SENDER_IK_SYNC_FETCH_TIMEOUT_MS = 3e3;
+var V2_PULL_PIPELINE_QUEUE_CAPACITY = 100;
+var V2PullPageQueue = class {
+  constructor(capacity) {
+    this.capacity = capacity;
+    __publicField(this, "items", []);
+    __publicField(this, "takers", []);
+    __publicField(this, "putters", []);
+    __publicField(this, "queuedWeight", 0);
+    __publicField(this, "closed", false);
+  }
+  async put(item, weight = 1) {
+    const itemWeight = Math.max(1, Math.trunc(weight));
+    while (!this.closed && this.items.length > 0 && this.queuedWeight + itemWeight > this.capacity) {
+      await new Promise((resolve) => this.putters.push(resolve));
+    }
+    if (this.closed) return false;
+    const taker = this.takers.shift();
+    if (taker) taker(item);
+    else {
+      this.items.push(item);
+      this.queuedWeight += itemWeight;
+    }
+    return true;
+  }
+  async take() {
+    const item = this.items.shift();
+    if (item !== void 0) {
+      this.queuedWeight = Math.max(0, this.queuedWeight - Math.max(1, Math.trunc(Number(item.weight ?? 1))));
+      this.putters.shift()?.();
+      return item;
+    }
+    if (this.closed) return void 0;
+    return await new Promise((resolve) => this.takers.push(resolve));
+  }
+  close() {
+    this.closed = true;
+    for (const resolve of this.takers.splice(0)) resolve(void 0);
+    for (const resolve of this.putters.splice(0)) resolve();
+  }
+};
 var V2_SESSION_INIT_RETRY_LIMIT = 12;
 var V2_SESSION_INIT_RETRY_BASE_MS = 1e3;
 var V2_SESSION_INIT_RETRY_MAX_MS = 5e3;
@@ -25301,6 +25556,9 @@ var V2E2EECoordinator = class {
           payload,
           encrypted: false
         };
+        if (msg.sender_device_id !== void 0) plaintext.sender_device_id = msg.sender_device_id;
+        const direction = String(msg.direction ?? "").trim();
+        if (direction) plaintext.direction = direction;
         attachGatewayProximity(plaintext, msg);
       } else if (isJsonObject(payload) && ["e2ee.p2p_encrypted", "e2ee.encrypted"].includes(payloadType)) {
         msg = { ...msg, envelope_json: JSON.stringify(payload) };
@@ -25314,6 +25572,9 @@ var V2E2EECoordinator = class {
       client._clientLog.warn(`P2P Tail \u5355\u6761\u6D88\u606F\u89E3\u5BC6\u5931\u8D25\uFF0C\u8FDE\u7EED\u6027\u8BC1\u660E\u4ECD\u4FDD\u7559: seq=${seq2}`);
       return null;
     }
+    if (publish && client._delivery.isSelfSentP2PMessage?.(plaintext)) {
+      return plaintext;
+    }
     if (publish) {
       const event = client._delivery.p2pAppEventForMessage(plaintext);
       if (orderedPublish) {
@@ -25380,6 +25641,7 @@ var V2E2EECoordinator = class {
           payload,
           encrypted: false
         };
+        if (msg.sender_device_id !== void 0) plaintext.sender_device_id = msg.sender_device_id;
         plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
         attachGatewayProximity(plaintext, msg);
       }
@@ -25543,257 +25805,367 @@ var V2E2EECoordinator = class {
     let lastAutoAckSeq = 0;
     let pendingAckSeq = deferredForwardAck;
     const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
-    while (pageCount < maxPages) {
-      pageCount += 1;
-      const volatileCursorBeforePage = volatileCursor;
-      const ackUpToSeq = pendingAckSeq;
-      const pendingInlineGeneration = ackUpToSeq > 0 ? client._delivery?.pendingP2PInlineAckGeneration?.(ns) ?? null : null;
-      let result;
-      try {
-        result = await client._callRawV2Rpc("message.v2.pull", {
-          after_seq: nextAfterSeq,
-          limit,
-          ...volatileCursor ? { after_volatile_cursor: volatileCursor } : {},
-          ...opts?.force ? { force: true } : {},
-          ...ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}
-        }, pullGateKey);
-      } catch (exc) {
-        const text3 = exc instanceof Error ? exc.message : String(exc);
-        if (!volatileCursor || !text3.toLowerCase().includes("volatile cursor epoch mismatch")) throw exc;
-        client._delivery.resetVolatilePullCursor();
-        volatileCursor = "";
-        pageCount -= 1;
-        continue;
-      }
-      if (ackUpToSeq > 0) {
-        const actualAckSeq = client._delivery?.resolveP2PPullAckSeq?.(result, ackUpToSeq) ?? 0;
-        if (actualAckSeq >= ackUpToSeq) {
-          if (pendingInlineGeneration !== null) {
-            client._delivery?.completePendingP2PInlineAckUpTo?.(ns, actualAckSeq, pendingInlineGeneration);
+    let pipelineRunning = false;
+    let pipelineError = null;
+    const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
+    let pipelineProducer = null;
+    let pipelineStopped = false;
+    const startPipeline = (startAfterSeq, startVolatileCursor) => {
+      if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT) return;
+      pipelineRunning = true;
+      pipelineProducer = (async () => {
+        let producerAfterSeq = startAfterSeq;
+        let producerVolatileCursor = startVolatileCursor;
+        for (let produced = pageCount; produced < maxPages; produced += 1) {
+          if (pipelineStopped) break;
+          const requestedVolatileCursor = producerVolatileCursor;
+          const result = await client._callRawV2Rpc("message.v2.pull", {
+            after_seq: producerAfterSeq,
+            limit,
+            ...producerVolatileCursor ? { after_volatile_cursor: producerVolatileCursor } : {},
+            ...opts?.force ? { force: true } : {}
+          }, pullGateKey);
+          if (pipelineStopped) break;
+          const rawPageMessages = Array.isArray(result?.messages) ? result.messages : [];
+          const enqueued = await pipelineQueue.put({
+            result,
+            afterSeq: producerAfterSeq,
+            ackUpToSeq: 0,
+            inlineAckGeneration: null,
+            requestedVolatileCursor,
+            weight: rawPageMessages.length
+          }, rawPageMessages.length);
+          if (!enqueued || pipelineStopped) break;
+          const volatileMessages = client._delivery.volatileMessages(rawPageMessages);
+          if (volatileMessages.length > 0) break;
+          const messages = deduplicateForwardPageMessages(rawPageMessages, producerAfterSeq);
+          const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq2) => Number.isFinite(seq2) && seq2 > 0);
+          const nextAfter = Math.max(contiguousPullSeq(producerAfterSeq, seqs, result.contiguous_seq), producerAfterSeq);
+          const cursor = isJsonObject(result.cursor) ? result.cursor : null;
+          const shouldContinue = shouldContinueForwardPage({
+            rawCount: messages.length,
+            nextAfterSeq: producerAfterSeq,
+            nextAfter,
+            limit,
+            hasMoreField: Object.prototype.hasOwnProperty.call(result, "has_more"),
+            hasMore: result.has_more === true,
+            serverHead: safeNonNegativeSeq(cursor?.latest_seq) ?? 0,
+            observedUpper: Math.max(nextAfter, Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
+            pendingAckSeq: 0
+          });
+          if (!shouldContinue) break;
+          producerAfterSeq = nextAfter;
+          producerVolatileCursor = "";
+        }
+      })().catch((error) => {
+        pipelineError = error;
+      }).finally(() => {
+        pipelineQueue.close();
+      });
+    };
+    const stopPipeline = async () => {
+      pipelineStopped = true;
+      pipelineQueue.close();
+      if (pipelineProducer) {
+        const producer = pipelineProducer;
+        pipelineProducer = null;
+        await producer;
+      }
+      pipelineRunning = false;
+    };
+    try {
+      while (pageCount < maxPages) {
+        let pipelinePage;
+        if (pipelineRunning) {
+          pipelinePage = await pipelineQueue.take();
+          if (!pipelinePage) {
+            pipelineRunning = false;
+            if (pipelineError) throw pipelineError;
+            break;
           }
-          pendingAckSeq = 0;
-          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
-          this.clearForwardAck(ns, ackUpToSeq);
+        }
+        pageCount += 1;
+        const volatileCursorBeforePage = pipelinePage?.requestedVolatileCursor ?? volatileCursor;
+        const ackUpToSeq = pipelinePage?.ackUpToSeq ?? pendingAckSeq;
+        const pendingInlineGeneration = pipelinePage?.inlineAckGeneration ?? (ackUpToSeq > 0 ? client._delivery?.pendingP2PInlineAckGeneration?.(ns) ?? null : null);
+        let result;
+        if (pipelinePage) {
+          nextAfterSeq = pipelinePage.afterSeq;
+          result = pipelinePage.result;
         } else {
-          client._clientLog.warn(`message.v2.pull piggyback ACK below target: requested=${ackUpToSeq}, actual=${actualAckSeq}; fallback terminal ACK`);
-          await this.confirmForwardP2PAck(ackUpToSeq, pendingInlineGeneration ?? void 0);
-          pendingAckSeq = 0;
-          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
-        }
-      }
-      const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
-      const volatileMessages = client._delivery.volatileMessages(pageMessages);
-      if (volatileMessages.length > 0) {
-        decrypted.push(...await this.publishV2VolatileMessages(volatileMessages, "pull", true));
-        volatileCursor = client._delivery.volatilePullCursor();
-      }
-      const volatileAdvanced = Boolean(volatileCursor) && volatileCursor !== volatileCursorBeforePage;
-      const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
-      const cursor = isJsonObject(result.cursor) ? result.cursor : null;
-      const hasMoreField = Object.prototype.hasOwnProperty.call(result, "has_more");
-      const hasMore = result.has_more === true;
-      const serverHead = safeNonNegativeSeq(cursor?.latest_seq) ?? 0;
-      client._clientLog.debug(`message.v2.pull page response: page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? "")}, server_head=${serverHead}, server_ack_seq=${String(result.server_ack_seq ?? "")}`);
-      const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq2) => Number.isFinite(seq2) && seq2 > 0);
-      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 !== void 0 ? legacy.payload : msg.payload;
-          const payloadType = isJsonObject(legacyPayload) ? String(legacyPayload.type ?? "").trim() : "";
-          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 ?? ""),
-              to: String(legacy.to ?? client._aid ?? ""),
-              seq: msg.seq,
-              type: String(msg.type ?? ""),
-              timestamp: msg.t_server,
-              payload: legacyPayload,
-              encrypted: false
-            };
-            attachGatewayProximity(v1Msg, msg);
-            const appEvent = client._delivery.p2pAppEventForMessage(v1Msg);
-            if (ns) await client._publishPulledMessage(appEvent.event, ns, seq2, appEvent.payload, false);
-            else await client._publishAppEvent(appEvent.event, appEvent.payload, "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);
+          try {
+            result = await client._callRawV2Rpc("message.v2.pull", {
+              after_seq: nextAfterSeq,
+              limit,
+              ...volatileCursor ? { after_volatile_cursor: volatileCursor } : {},
+              ...opts?.force ? { force: true } : {},
+              ...ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}
+            }, pullGateKey);
+          } catch (exc) {
+            const text3 = exc instanceof Error ? exc.message : String(exc);
+            if (!volatileCursor || !text3.toLowerCase().includes("volatile cursor epoch mismatch")) throw exc;
+            client._delivery.resetVolatilePullCursor();
+            volatileCursor = "";
+            pageCount -= 1;
+            continue;
+          }
+        }
+        if (ackUpToSeq > 0) {
+          const actualAckSeq = client._delivery?.resolveP2PPullAckSeq?.(result, ackUpToSeq) ?? 0;
+          if (actualAckSeq >= ackUpToSeq) {
+            if (pendingInlineGeneration !== null) {
+              client._delivery?.completePendingP2PInlineAckUpTo?.(ns, actualAckSeq, pendingInlineGeneration);
             }
+            pendingAckSeq = 0;
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+            this.clearForwardAck(ns, ackUpToSeq);
           } else {
-            client._clientLog.debug(`message.v2.pull skipping V1 envelope seq=${seq2} payload_type=${payloadType || "<none>"} (V1 E2EE removed)`);
+            client._clientLog.warn(`message.v2.pull piggyback ACK below target: requested=${ackUpToSeq}, actual=${actualAckSeq}; fallback terminal ACK`);
+            await this.confirmForwardP2PAck(ackUpToSeq, pendingInlineGeneration ?? void 0);
+            pendingAckSeq = 0;
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
           }
-          continue;
-        }
-        if (version !== "v2") {
-          client._clientLog.debug(`message.v2.pull skipping non-V2 row seq=${seq2} version=${String(msg.version ?? "")}`);
-          continue;
         }
-        const msgSpkId = String(msg.spk_id ?? "");
-        if (msgSpkId && client._v2Session && !client._v2Session.isCurrentSPK(msgSpkId)) {
-          client._v2Session.trackOldSPKMaxSeq(msgSpkId, seq2);
-        }
-        const deferStatus = {};
-        const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, "pull");
-        if (deferStatus.deferred) {
-          blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
-        }
-        if (deferStatus.deferred && deferStatus.fromAid) {
-          const key = `${deferStatus.fromAid}\0${deferStatus.senderDeviceId ?? ""}\0${deferStatus.groupId ?? ""}`;
-          deferredKeyFetches.set(key, {
-            fromAid: deferStatus.fromAid,
-            senderDeviceId: deferStatus.senderDeviceId ?? "",
-            groupId: deferStatus.groupId ?? ""
-          });
+        const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
+        const volatileMessages = client._delivery.volatileMessages(pageMessages);
+        if (volatileMessages.length > 0) {
+          decrypted.push(...await this.publishV2VolatileMessages(volatileMessages, "pull", true));
+          volatileCursor = client._delivery.volatilePullCursor();
         }
-        if (plaintext === null) continue;
-        if (ns) {
-          await client._publishPulledMessage("message.received", ns, seq2, plaintext, false);
-          decrypted.push(plaintext);
-        } else {
-          await client._publishAppEvent("message.received", plaintext, "pull");
-          decrypted.push(plaintext);
-        }
-      }
-      const hasServerAckSeq = Object.prototype.hasOwnProperty.call(result, "server_ack_seq");
-      const parsedServerAckSeq = hasServerAckSeq ? safeNonNegativeSeq(result.server_ack_seq) : null;
-      const serverAckSeq = parsedServerAckSeq ?? 0;
-      const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
-      if (ns) {
-        const commitTarget = Math.max(
+        const volatileAdvanced = Boolean(volatileCursor) && volatileCursor !== volatileCursorBeforePage;
+        const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
+        const cursor = isJsonObject(result.cursor) ? result.cursor : null;
+        const hasMoreField = Object.prototype.hasOwnProperty.call(result, "has_more");
+        const hasMore = result.has_more === true;
+        const serverHead = safeNonNegativeSeq(cursor?.latest_seq) ?? 0;
+        client._clientLog.debug(`message.v2.pull page response: page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? "")}, server_head=${serverHead}, server_ack_seq=${String(result.server_ack_seq ?? "")}`);
+        const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq2) => Number.isFinite(seq2) && seq2 > 0);
+        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,
-          Number.isFinite(retentionFloor) ? retentionFloor : 0,
-          pageCount === 1 ? deferredServerCursor : 0,
-          serverAckSeq,
-          blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq
+          seqs,
+          result.contiguous_seq
         );
-        let ackSeq = pageContigBefore;
-        let contigAdvanced = false;
-        try {
-          if (commitTarget > pageContigBefore) {
-            client._seqTracker.forceContiguousSeq(ns, commitTarget);
-            if (retentionFloor > pageContigBefore) {
-              client._clientLog.info(`message.v2.pull retention-floor advance: ns=${ns} contiguous=${pageContigBefore} -> retention_floor_seq=${retentionFloor}`);
+        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 !== void 0 ? legacy.payload : msg.payload;
+            const payloadType = isJsonObject(legacyPayload) ? String(legacyPayload.type ?? "").trim() : "";
+            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 ?? ""),
+                to: String(legacy.to ?? client._aid ?? ""),
+                seq: msg.seq,
+                type: String(msg.type ?? ""),
+                timestamp: msg.t_server,
+                payload: legacyPayload,
+                encrypted: false
+              };
+              const direction = String(msg.direction ?? "").trim();
+              if (direction) v1Msg.direction = direction;
+              else if (String(msg.from_aid ?? "").trim() && String(msg.from_aid ?? "").trim() !== String(client._aid ?? "").trim()) {
+                v1Msg.direction = "inbound";
+              }
+              if (msg.sender_device_id !== void 0) v1Msg.sender_device_id = msg.sender_device_id;
+              attachGatewayProximity(v1Msg, msg);
+              const appEvent = client._delivery.p2pAppEventForMessage(v1Msg);
+              if (ns) await client._publishPulledMessage(appEvent.event, ns, seq2, appEvent.payload, false);
+              else await client._publishAppEvent(appEvent.event, appEvent.payload, "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)`);
+            }
+            continue;
+          }
+          if (version !== "v2") {
+            client._clientLog.debug(`message.v2.pull skipping non-V2 row seq=${seq2} version=${String(msg.version ?? "")}`);
+            continue;
+          }
+          const msgSpkId = String(msg.spk_id ?? "");
+          if (msgSpkId && client._v2Session && !client._v2Session.isCurrentSPK(msgSpkId)) {
+            client._v2Session.trackOldSPKMaxSeq(msgSpkId, seq2);
+          }
+          const deferStatus = {};
+          const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, "pull");
+          if (deferStatus.deferred) {
+            blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
+          }
+          if (deferStatus.deferred && deferStatus.fromAid) {
+            const key = `${deferStatus.fromAid}\0${deferStatus.senderDeviceId ?? ""}\0${deferStatus.groupId ?? ""}`;
+            deferredKeyFetches.set(key, {
+              fromAid: deferStatus.fromAid,
+              senderDeviceId: deferStatus.senderDeviceId ?? "",
+              groupId: deferStatus.groupId ?? ""
+            });
+          }
+          if (plaintext === null) continue;
+          if (ns) {
+            await client._publishPulledMessage("message.received", ns, seq2, plaintext, false);
+            decrypted.push(plaintext);
+          } else {
+            await client._publishAppEvent("message.received", plaintext, "pull");
+            decrypted.push(plaintext);
+          }
+        }
+        const hasServerAckSeq = Object.prototype.hasOwnProperty.call(result, "server_ack_seq");
+        const parsedServerAckSeq = hasServerAckSeq ? safeNonNegativeSeq(result.server_ack_seq) : null;
+        const serverAckSeq = parsedServerAckSeq ?? 0;
+        const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
+        if (ns) {
+          const commitTarget = Math.max(
+            pageContigBefore,
+            Number.isFinite(retentionFloor) ? retentionFloor : 0,
+            pageCount === 1 ? deferredServerCursor : 0,
+            serverAckSeq,
+            blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq
+          );
+          let ackSeq = pageContigBefore;
+          let contigAdvanced = false;
+          try {
+            if (commitTarget > pageContigBefore) {
+              client._seqTracker.forceContiguousSeq(ns, commitTarget);
+              if (retentionFloor > pageContigBefore) {
+                client._clientLog.info(`message.v2.pull retention-floor advance: ns=${ns} contiguous=${pageContigBefore} -> retention_floor_seq=${retentionFloor}`);
+              }
+              if (deferredServerCursor > pageContigBefore && pageCount === 1) {
+                client._clientLog.info(`message.v2.pull restore local A from deferred server ACK cursor: ns=${ns}, contiguous=${pageContigBefore} -> server_ack_seq=${deferredServerCursor}`);
+              }
+              if (seqs.length > 0) {
+                client._clientLog.debug(`message.v2.pull force contiguous: ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+              }
             }
-            if (deferredServerCursor > pageContigBefore && pageCount === 1) {
-              client._clientLog.info(`message.v2.pull restore local A from deferred server ACK cursor: ns=${ns}, contiguous=${pageContigBefore} -> server_ack_seq=${deferredServerCursor}`);
+            ackSeq = client._seqTracker.getContiguousSeq(ns);
+            contigAdvanced = ackSeq !== pageContigBefore;
+            if (contigAdvanced) {
+              await client._commitSeqTrackerState(ns);
+              if (pageCount === 1 && deferredServerCursor > 0) this.clearForwardCursor(ns, ackSeq);
             }
-            if (seqs.length > 0) {
-              client._clientLog.debug(`message.v2.pull force contiguous: ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+          } catch (exc) {
+            if (typeof client._seqTracker.restoreNamespaceSnapshot === "function") {
+              client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
             }
+            client._clientLog.error?.(`message.v2.pull Forward commit rolled back: ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
+            throw exc;
           }
-          ackSeq = client._seqTracker.getContiguousSeq(ns);
-          contigAdvanced = ackSeq !== pageContigBefore;
-          if (contigAdvanced) {
-            await client._commitSeqTrackerState(ns);
-            if (pageCount === 1 && deferredServerCursor > 0) this.clearForwardCursor(ns, ackSeq);
+          if (contigAdvanced) await client._drainOrderedMessages(ns, void 0, false, false);
+          for (const fetch2 of deferredKeyFetches.values()) {
+            this.scheduleSenderIKFetch(fetch2.fromAid, fetch2.senderDeviceId, fetch2.groupId);
           }
-        } catch (exc) {
-          if (typeof client._seqTracker.restoreNamespaceSnapshot === "function") {
-            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+          if (parsedServerAckSeq !== null && serverAckSeq > ackSeq) {
+            this.recordForwardCursor(ns, serverAckSeq, ackSeq);
           }
-          client._clientLog.error?.(`message.v2.pull Forward commit rolled back: ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
-          throw exc;
-        }
-        if (contigAdvanced) await client._drainOrderedMessages(ns, void 0, false, false);
-        for (const fetch2 of deferredKeyFetches.values()) {
-          this.scheduleSenderIKFetch(fetch2.fromAid, fetch2.senderDeviceId, fetch2.groupId);
-        }
-        if (parsedServerAckSeq !== null && serverAckSeq > ackSeq) {
-          this.recordForwardCursor(ns, serverAckSeq, ackSeq);
-        }
-        const knownServerAckSeq = hasServerAckSeq ? serverAckSeq : pageCount === 1 ? deferredServerCursor : 0;
-        const ackNeeded = ackSeq > 0 && ackSeq > lastAutoAckSeq && (hasServerAckSeq && ackSeq > serverAckSeq || contigAdvanced && ackSeq > knownServerAckSeq);
-        if (ackNeeded) {
-          this.recordForwardAck(ns, ackSeq);
-          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);
-          } else {
-            await this.confirmForwardP2PAck(ackSeq);
-            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+          const knownServerAckSeq = hasServerAckSeq ? serverAckSeq : pageCount === 1 ? deferredServerCursor : 0;
+          const ackNeeded = ackSeq > 0 && ackSeq > lastAutoAckSeq && (hasServerAckSeq && ackSeq > serverAckSeq || contigAdvanced && ackSeq > knownServerAckSeq);
+          if (ackNeeded) {
+            this.recordForwardAck(ns, ackSeq);
+            const nextAfter2 = Math.max(pageContiguousSeq, nextAfterSeq);
+            const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter2 > nextAfterSeq;
+            if (canContinuePage && !pipelineRunning) {
+              pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+              lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+            } else {
+              await this.confirmForwardP2PAck(ackSeq);
+              lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+            }
           }
         }
+        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;
+        let shouldContinue = shouldContinueForwardPage({
+          rawCount,
+          nextAfterSeq,
+          nextAfter,
+          limit,
+          hasMoreField,
+          hasMore,
+          serverHead,
+          pendingAckSeq,
+          observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
+        });
+        const volatileHasMoreField = Object.prototype.hasOwnProperty.call(result, "volatile_has_more");
+        const volatileHasMore = result.volatile_has_more === true;
+        if (!shouldContinue && volatileAdvanced && (volatileHasMore || hasMore || !volatileHasMoreField && limit > 0 && pageMessages.length >= limit)) {
+          shouldContinue = true;
+        }
+        const shouldContinueForPipeline = shouldContinueForwardPage({
+          rawCount,
+          nextAfterSeq,
+          nextAfter,
+          limit,
+          hasMoreField,
+          hasMore,
+          serverHead,
+          pendingAckSeq: 0,
+          observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
+        });
+        if (!shouldContinue) break;
+        if (shouldContinueForPipeline && !volatileAdvanced && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
+          if (pendingAckSeq > 0) {
+            await this.confirmForwardP2PAck(pendingAckSeq);
+            pendingAckSeq = 0;
+          }
+          startPipeline(nextAfter, volatileCursor);
+        }
+        if (!pipelineRunning && pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
+          const nextKey = pullGateKeyForClient(client, "message.v2.pull", {
+            after_seq: nextAfter,
+            after_volatile_cursor: volatileCursor,
+            force: opts?.force === true,
+            limit
+          }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
+          await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
+          pullGateKey = nextKey;
+        }
+        const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+        if (tailDelayMs > 0) await v2Sleep(tailDelayMs);
+        nextAfterSeq = nextAfter;
       }
-      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;
-      let shouldContinue = shouldContinueForwardPage({
-        rawCount,
-        nextAfterSeq,
-        nextAfter,
-        limit,
-        hasMoreField,
-        hasMore,
-        serverHead,
-        pendingAckSeq,
-        observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
-      });
-      const volatileHasMoreField = Object.prototype.hasOwnProperty.call(result, "volatile_has_more");
-      const volatileHasMore = result.volatile_has_more === true;
-      if (!shouldContinue && volatileAdvanced && (volatileHasMore || hasMore || !volatileHasMoreField && limit > 0 && pageMessages.length >= limit)) {
-        shouldContinue = true;
-      }
-      if (!shouldContinue) break;
-      if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-        const nextKey = pullGateKeyForClient(client, "message.v2.pull", {
-          after_seq: nextAfter,
-          after_volatile_cursor: volatileCursor,
-          force: opts?.force === true,
-          limit
-        }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-        await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
-        pullGateKey = nextKey;
-      }
-      const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
-      if (tailDelayMs > 0) await v2Sleep(tailDelayMs);
-      nextAfterSeq = nextAfter;
+    } finally {
+      await stopPipeline();
     }
     if (pageCount >= maxPages) {
       client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
@@ -26156,79 +26528,182 @@ var V2E2EECoordinator = class {
     let lastAutoAckSeq = 0;
     let pendingAckSeq = deferredForwardAck;
     const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
-    while (pageCount < maxPages) {
-      pageCount += 1;
-      const ackUpToSeq = ownsCursor ? pendingAckSeq : 0;
-      const pendingInlineGeneration = ackUpToSeq > 0 ? client._delivery?.pendingGroupInlineAckGeneration?.(ns) ?? null : null;
-      const result = await client._callRawV2Rpc("group.v2.pull", withExplicitGroupAid({
-        group_id: wireGroupId,
-        after_seq: nextAfterSeq,
-        limit,
-        ...cursorParams,
-        ...opts?.force ? { force: true } : {},
-        ...ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}
-      }, groupAid), pullGateKey);
-      if (ackUpToSeq > 0) {
-        const actualAckSeq = client._delivery?.resolveGroupPullAckSeq?.(result, ackUpToSeq) ?? 0;
-        if (actualAckSeq >= ackUpToSeq) {
-          if (pendingInlineGeneration !== null) {
-            client._delivery?.completePendingGroupInlineAckUpTo?.(ns, actualAckSeq, pendingInlineGeneration);
+    let pipelineRunning = false;
+    let pipelineError = null;
+    const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
+    let pipelineProducer = null;
+    let pipelineStopped = false;
+    const startPipeline = (startAfterSeq) => {
+      if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT || !ownsCursor) return;
+      pipelineRunning = true;
+      pipelineProducer = (async () => {
+        let producerAfterSeq = startAfterSeq;
+        for (let produced = pageCount; produced < maxPages; produced += 1) {
+          if (pipelineStopped) break;
+          const result = await client._callRawV2Rpc("group.v2.pull", withExplicitGroupAid({
+            group_id: wireGroupId,
+            after_seq: producerAfterSeq,
+            limit,
+            ...cursorParams,
+            ...opts?.force ? { force: true } : {}
+          }, groupAid), pullGateKey);
+          if (pipelineStopped) break;
+          const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
+          const enqueued = await pipelineQueue.put({
+            result,
+            afterSeq: producerAfterSeq,
+            ackUpToSeq: 0,
+            inlineAckGeneration: null,
+            requestedVolatileCursor: "",
+            weight: pageMessages.length
+          }, pageMessages.length);
+          if (!enqueued || pipelineStopped) break;
+          const messages = deduplicateForwardPageMessages(pageMessages, producerAfterSeq);
+          const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq2) => Number.isFinite(seq2) && seq2 > 0);
+          const nextAfter = Math.max(contiguousPullSeq(producerAfterSeq, seqs, result.contiguous_seq), producerAfterSeq);
+          const cursor = isJsonObject(result.cursor) ? result.cursor : null;
+          const shouldContinue = shouldContinueForwardPage({
+            rawCount: messages.length,
+            nextAfterSeq: producerAfterSeq,
+            nextAfter,
+            limit,
+            hasMoreField: Object.prototype.hasOwnProperty.call(result, "has_more"),
+            hasMore: result.has_more === true,
+            serverHead: Math.max(safeNonNegativeSeq(result.latest_message_seq) ?? 0, safeNonNegativeSeq(cursor?.latest_seq) ?? 0),
+            observedUpper: Math.max(nextAfter, typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : 0),
+            pendingAckSeq: 0
+          });
+          if (!shouldContinue) break;
+          producerAfterSeq = nextAfter;
+        }
+      })().catch((error) => {
+        pipelineError = error;
+      }).finally(() => {
+        pipelineQueue.close();
+      });
+    };
+    const stopPipeline = async () => {
+      pipelineStopped = true;
+      pipelineQueue.close();
+      if (pipelineProducer) {
+        const producer = pipelineProducer;
+        pipelineProducer = null;
+        await producer;
+      }
+      pipelineRunning = false;
+    };
+    try {
+      while (pageCount < maxPages) {
+        let pipelinePage;
+        if (pipelineRunning) {
+          pipelinePage = await pipelineQueue.take();
+          if (!pipelinePage) {
+            pipelineRunning = false;
+            if (pipelineError) throw pipelineError;
+            break;
           }
-          pendingAckSeq = 0;
-          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
-          this.clearForwardAck(ns, ackUpToSeq);
+        }
+        pageCount += 1;
+        const ackUpToSeq = ownsCursor ? pipelinePage?.ackUpToSeq ?? pendingAckSeq : 0;
+        const pendingInlineGeneration = pipelinePage?.inlineAckGeneration ?? (ackUpToSeq > 0 ? client._delivery?.pendingGroupInlineAckGeneration?.(ns) ?? null : null);
+        let result;
+        if (pipelinePage) {
+          nextAfterSeq = pipelinePage.afterSeq;
+          result = pipelinePage.result;
         } else {
-          client._clientLog.warn(`group.v2.pull piggyback ACK below target: group=${gid}, requested=${ackUpToSeq}, actual=${actualAckSeq}; fallback terminal ACK`);
-          await this.confirmForwardGroupAck(gid, ackUpToSeq, groupAid);
-          pendingAckSeq = 0;
-          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
-        }
-      }
-      const resultGroupAid = String(result.group_aid ?? result.groupAid ?? "").trim();
-      if (resultGroupAid) groupAid = resultGroupAid;
-      const eventGroupAid = resultGroupAid || groupAid || gid;
-      const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
-      const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
-      const cursor = isJsonObject(result.cursor) ? result.cursor : null;
-      const hasMoreField = Object.prototype.hasOwnProperty.call(result, "has_more");
-      const hasMore = result.has_more === true;
-      const serverHead = Math.max(
-        safeNonNegativeSeq(result.latest_message_seq) ?? 0,
-        safeNonNegativeSeq(cursor?.latest_seq) ?? 0
-      );
-      const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq2) => Number.isFinite(seq2) && seq2 > 0);
-      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 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 (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;
+          result = await client._callRawV2Rpc("group.v2.pull", withExplicitGroupAid({
+            group_id: wireGroupId,
+            after_seq: nextAfterSeq,
+            limit,
+            ...cursorParams,
+            ...opts?.force ? { force: true } : {},
+            ...ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}
+          }, groupAid), pullGateKey);
+        }
+        if (ackUpToSeq > 0) {
+          const actualAckSeq = client._delivery?.resolveGroupPullAckSeq?.(result, ackUpToSeq) ?? 0;
+          if (actualAckSeq >= ackUpToSeq) {
+            if (pendingInlineGeneration !== null) {
+              client._delivery?.completePendingGroupInlineAckUpTo?.(ns, actualAckSeq, pendingInlineGeneration);
+            }
+            pendingAckSeq = 0;
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+            this.clearForwardAck(ns, ackUpToSeq);
+          } else {
+            client._clientLog.warn(`group.v2.pull piggyback ACK below target: group=${gid}, requested=${ackUpToSeq}, actual=${actualAckSeq}; fallback terminal ACK`);
+            await this.confirmForwardGroupAck(gid, ackUpToSeq, groupAid);
+            pendingAckSeq = 0;
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
           }
-          if (payloadObj) {
-            const payloadType = String(payloadObj.type ?? "").trim();
-            if (payloadType !== "e2ee.encrypted" && payloadType !== "e2ee.group_encrypted" && payloadType !== "e2ee.p2p_encrypted") {
+        }
+        const resultGroupAid = String(result.group_aid ?? result.groupAid ?? "").trim();
+        if (resultGroupAid) groupAid = resultGroupAid;
+        const eventGroupAid = resultGroupAid || groupAid || gid;
+        const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
+        const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
+        const cursor = isJsonObject(result.cursor) ? result.cursor : null;
+        const hasMoreField = Object.prototype.hasOwnProperty.call(result, "has_more");
+        const hasMore = result.has_more === true;
+        const serverHead = Math.max(
+          safeNonNegativeSeq(result.latest_message_seq) ?? 0,
+          safeNonNegativeSeq(cursor?.latest_seq) ?? 0
+        );
+        const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq2) => Number.isFinite(seq2) && seq2 > 0);
+        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 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 (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" && payloadType !== "e2ee.p2p_encrypted") {
+                let v1Msg = {
+                  message_id: String(msg.message_id ?? ""),
+                  from: String(msg.from_aid ?? ""),
+                  group_id: gid,
+                  group_aid: eventGroupAid,
+                  seq: msg.seq,
+                  type: String(msg.type ?? ""),
+                  timestamp: msg.t_server,
+                  payload,
+                  encrypted: false
+                };
+                if (msg.sender_device_id !== void 0) v1Msg.sender_device_id = msg.sender_device_id;
+                v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
+                attachGatewayProximity(v1Msg, msg);
+                if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                  await client._publishPulledMessage("group.message_created", ns, seq2, v1Msg, false);
+                } else {
+                  client._markPublishedSeq(ns, seq2);
+                }
+                decrypted.push(v1Msg);
+                continue;
+              }
+            } else if (payload !== void 0 && payload !== null) {
               let v1Msg = {
                 message_id: String(msg.message_id ?? ""),
                 from: String(msg.from_aid ?? ""),
@@ -26240,206 +26715,206 @@ var V2E2EECoordinator = class {
                 payload,
                 encrypted: false
               };
+              if (msg.sender_device_id !== void 0) v1Msg.sender_device_id = msg.sender_device_id;
               v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
               attachGatewayProximity(v1Msg, msg);
-              if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
-                await client._publishPulledMessage("group.message_created", ns, seq2, v1Msg, false);
-              } else {
-                client._markPublishedSeq(ns, seq2);
-              }
+              await client._publishPulledMessage("group.message_created", ns, seq2, v1Msg, false);
               decrypted.push(v1Msg);
               continue;
             }
-          } else if (payload !== void 0 && payload !== null) {
-            let v1Msg = {
-              message_id: String(msg.message_id ?? ""),
-              from: String(msg.from_aid ?? ""),
-              group_id: gid,
-              group_aid: eventGroupAid,
-              seq: msg.seq,
-              type: String(msg.type ?? ""),
-              timestamp: msg.t_server,
-              payload,
-              encrypted: false
-            };
-            v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
-            attachGatewayProximity(v1Msg, msg);
-            await client._publishPulledMessage("group.message_created", ns, seq2, v1Msg, false);
-            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 (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);
+              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);
               }
-              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;
           }
-          client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq2} payload_type=${payloadObj ? String(payloadObj.type ?? "") : "<none>"} (V1 E2EE removed)`);
-          continue;
-        }
-        if (version !== "v2") {
-          client._clientLog.debug(`group.v2.pull skipping non-V2 row group=${gid} seq=${seq2} version=${String(msg.version ?? "")}`);
-          continue;
-        }
-        const deferStatus = {};
-        let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, "pull");
-        if (deferStatus.deferred) {
-          blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
-        }
-        if (deferStatus.deferred && deferStatus.fromAid) {
-          const key = `${deferStatus.fromAid}\0${deferStatus.senderDeviceId ?? ""}\0${deferStatus.groupId ?? ""}`;
-          deferredKeyFetches.set(key, {
-            fromAid: deferStatus.fromAid,
-            senderDeviceId: deferStatus.senderDeviceId ?? "",
-            groupId: deferStatus.groupId ?? ""
-          });
-        }
-        if (plaintext === null) continue;
-        plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
-        plaintext.group_id = gid;
-        plaintext.group_aid = eventGroupAid;
-        if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
-          await client._publishPulledMessage("group.message_created", ns, seq2, plaintext, false);
-        } else {
-          client._markPublishedSeq(ns, seq2);
+          if (version !== "v2") {
+            client._clientLog.debug(`group.v2.pull skipping non-V2 row group=${gid} seq=${seq2} version=${String(msg.version ?? "")}`);
+            continue;
+          }
+          const deferStatus = {};
+          let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, "pull");
+          if (deferStatus.deferred) {
+            blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
+          }
+          if (deferStatus.deferred && deferStatus.fromAid) {
+            const key = `${deferStatus.fromAid}\0${deferStatus.senderDeviceId ?? ""}\0${deferStatus.groupId ?? ""}`;
+            deferredKeyFetches.set(key, {
+              fromAid: deferStatus.fromAid,
+              senderDeviceId: deferStatus.senderDeviceId ?? "",
+              groupId: deferStatus.groupId ?? ""
+            });
+          }
+          if (plaintext === null) continue;
+          plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
+          plaintext.group_id = gid;
+          plaintext.group_aid = eventGroupAid;
+          if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+            await client._publishPulledMessage("group.message_created", ns, seq2, plaintext, false);
+          } else {
+            client._markPublishedSeq(ns, seq2);
+          }
+          decrypted.push(plaintext);
         }
-        decrypted.push(plaintext);
-      }
-      const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, "current_seq");
-      const parsedCursorCurrentSeq = hasServerCursor ? safeNonNegativeSeq(cursor?.current_seq) : null;
-      const cursorCurrentSeq = parsedCursorCurrentSeq ?? 0;
-      const retentionFloor = Math.max(
-        Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0),
-        Number(cursor?.retention_floor_seq ?? 0)
-      );
-      const visibilityFloor = Math.max(
-        0,
-        Math.max(0, Number(result.earliest_available_message_seq ?? 1) - 1),
-        Number(cursor?.join_seq ?? 0)
-      );
-      const effectiveFloor = Math.max(retentionFloor, visibilityFloor);
-      const commitTarget = Math.max(
-        pageContigBefore,
-        Number.isFinite(effectiveFloor) ? effectiveFloor : 0,
-        ownsCursor && pageCount === 1 ? deferredServerCursor : 0,
-        cursorCurrentSeq,
-        blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq
-      );
-      let ackSeq = pageContigBefore;
-      let contigAdvanced = false;
-      if (ownsCursor) {
-        try {
-          if (commitTarget > pageContigBefore) {
-            client._seqTracker.forceContiguousSeq(ns, commitTarget);
-            if (effectiveFloor > pageContigBefore) {
-              client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
+        const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, "current_seq");
+        const parsedCursorCurrentSeq = hasServerCursor ? safeNonNegativeSeq(cursor?.current_seq) : null;
+        const cursorCurrentSeq = parsedCursorCurrentSeq ?? 0;
+        const retentionFloor = Math.max(
+          Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0),
+          Number(cursor?.retention_floor_seq ?? 0)
+        );
+        const visibilityFloor = Math.max(
+          0,
+          Math.max(0, Number(result.earliest_available_message_seq ?? 1) - 1),
+          Number(cursor?.join_seq ?? 0)
+        );
+        const effectiveFloor = Math.max(retentionFloor, visibilityFloor);
+        const commitTarget = Math.max(
+          pageContigBefore,
+          Number.isFinite(effectiveFloor) ? effectiveFloor : 0,
+          ownsCursor && pageCount === 1 ? deferredServerCursor : 0,
+          cursorCurrentSeq,
+          blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq
+        );
+        let ackSeq = pageContigBefore;
+        let contigAdvanced = false;
+        if (ownsCursor) {
+          try {
+            if (commitTarget > pageContigBefore) {
+              client._seqTracker.forceContiguousSeq(ns, commitTarget);
+              if (effectiveFloor > pageContigBefore) {
+                client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
+              }
+              if (deferredServerCursor > pageContigBefore && pageCount === 1) {
+                client._clientLog.info(`group.v2.pull restore local A from deferred server ACK cursor: group=${gid}, ns=${ns}, contiguous=${pageContigBefore} -> current_seq=${deferredServerCursor}`);
+              }
+              if (seqs.length > 0) {
+                client._clientLog.debug(`group.v2.pull force contiguous: group=${gid}, ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+              }
             }
-            if (deferredServerCursor > pageContigBefore && pageCount === 1) {
-              client._clientLog.info(`group.v2.pull restore local A from deferred server ACK cursor: group=${gid}, ns=${ns}, contiguous=${pageContigBefore} -> current_seq=${deferredServerCursor}`);
+            ackSeq = client._seqTracker.getContiguousSeq(ns);
+            contigAdvanced = ackSeq !== pageContigBefore;
+            if (contigAdvanced) {
+              await client._commitSeqTrackerState(ns);
+              if (pageCount === 1 && deferredServerCursor > 0) this.clearForwardCursor(ns, ackSeq);
             }
-            if (seqs.length > 0) {
-              client._clientLog.debug(`group.v2.pull force contiguous: group=${gid}, ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+          } catch (exc) {
+            if (typeof client._seqTracker.restoreNamespaceSnapshot === "function") {
+              client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
             }
+            client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
+            throw exc;
           }
-          ackSeq = client._seqTracker.getContiguousSeq(ns);
-          contigAdvanced = ackSeq !== pageContigBefore;
-          if (contigAdvanced) {
-            await client._commitSeqTrackerState(ns);
-            if (pageCount === 1 && deferredServerCursor > 0) this.clearForwardCursor(ns, ackSeq);
-          }
-        } catch (exc) {
-          if (typeof client._seqTracker.restoreNamespaceSnapshot === "function") {
-            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+          if (contigAdvanced) await client._drainOrderedMessages(ns, void 0, false, false);
+        }
+        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 = ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (hasServerCursor && ackSeq > cursorCurrentSeq || contigAdvanced && ackSeq > knownServerCursorSeq);
+        if (ackNeeded) {
+          this.recordForwardAck(ns, ackSeq);
+          const nextAfter2 = Math.max(pageContiguousSeq, nextAfterSeq);
+          const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter2 > nextAfterSeq && ownsCursor;
+          if (canContinuePage && !pipelineRunning) {
+            pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+          } else {
+            await this.confirmForwardGroupAck(gid, ackSeq, groupAid);
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
           }
-          client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
-          throw exc;
         }
-        if (contigAdvanced) await client._drainOrderedMessages(ns, void 0, false, false);
-      }
-      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 = ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (hasServerCursor && ackSeq > cursorCurrentSeq || contigAdvanced && ackSeq > knownServerCursorSeq);
-      if (ackNeeded) {
-        this.recordForwardAck(ns, ackSeq);
-        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);
-        } else {
-          await this.confirmForwardGroupAck(gid, ackSeq, groupAid);
-          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-        }
-      }
-      const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
-      if (!ownsCursor) break;
-      const rawCount = messages.length;
-      if (blockedSeq > 0) break;
-      const shouldContinue = shouldContinueForwardPage({
-        rawCount,
-        nextAfterSeq,
-        nextAfter,
-        limit,
-        hasMoreField,
-        hasMore,
-        serverHead,
-        pendingAckSeq,
-        observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
-      });
-      if (!shouldContinue) break;
-      if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-        const nextKey = pullGateKeyForClient(client, "group.v2.pull", {
-          group_id: gid,
-          after_seq: nextAfter,
-          force: opts?.force === true,
+        const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
+        if (!ownsCursor) break;
+        const rawCount = messages.length;
+        if (blockedSeq > 0) break;
+        const shouldContinue = shouldContinueForwardPage({
+          rawCount,
+          nextAfterSeq,
+          nextAfter,
+          limit,
+          hasMoreField,
+          hasMore,
+          serverHead,
+          pendingAckSeq,
+          observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
+        });
+        const shouldContinueForPipeline = shouldContinueForwardPage({
+          rawCount,
+          nextAfterSeq,
+          nextAfter,
           limit,
-          _group_cursor_params: cursorParams
-        }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-        await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
-        pullGateKey = nextKey;
+          hasMoreField,
+          hasMore,
+          serverHead,
+          pendingAckSeq: 0,
+          observedUpper: typeof client._seqTracker.getMaxSeenSeq === "function" ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter
+        });
+        if (!shouldContinue) break;
+        if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
+          if (pendingAckSeq > 0) {
+            await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);
+            pendingAckSeq = 0;
+          }
+          startPipeline(nextAfter);
+        }
+        if (!pipelineRunning && pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
+          const nextKey = pullGateKeyForClient(client, "group.v2.pull", {
+            group_id: gid,
+            after_seq: nextAfter,
+            force: opts?.force === true,
+            limit,
+            _group_cursor_params: cursorParams
+          }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
+          await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
+          pullGateKey = nextKey;
+        }
+        const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+        if (tailDelayMs > 0) await v2Sleep(tailDelayMs);
+        nextAfterSeq = nextAfter;
       }
-      const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
-      if (tailDelayMs > 0) await v2Sleep(tailDelayMs);
-      nextAfterSeq = nextAfter;
+    } finally {
+      await stopPipeline();
     }
     if (pageCount >= maxPages) {
       client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
@@ -26922,7 +27397,9 @@ var V2E2EECoordinator = class {
     };
     const senderDeviceId = String(aad.from_device ?? "").trim();
     if (senderDeviceId) result.sender_device_id = senderDeviceId;
-    result.direction = fromAid && fromAid === client._aid ? "outbound_sync" : "inbound";
+    const direction = String(msg.direction ?? "").trim();
+    if (direction) result.direction = direction;
+    else if (fromAid && fromAid !== client._aid) result.direction = "inbound";
     if (msg.t_server !== void 0) result.t_server = msg.t_server;
     if (msg.device_id !== void 0) result.device_id = msg.device_id;
     attachGatewayProximity(result, msg);
@@ -29292,7 +29769,7 @@ var AgentMdManager = class _AgentMdManager {
     this._snapshotLoads.clear();
     return this._agentMdPath;
   }
-  async upload(content) {
+  async upload(content, ownerOperationId) {
     const target = this._ownerAid();
     const current = this._currentAid();
     if (!target || !current) {
@@ -29322,7 +29799,7 @@ var AgentMdManager = class _AgentMdManager {
     }
     const signed = signedResult.data.signed;
     await verifyAgentMdUpload(signed, current.certPem, target);
-    const result = await this._uploadHttp(target, signed);
+    const result = await this._uploadHttp(target, signed, ownerOperationId);
     const localEtag = await _AgentMdManager.contentEtag(signed);
     const remoteEtag = String(result.etag ?? "").trim();
     await this.saveRecord(target, {
@@ -29713,7 +30190,7 @@ var AgentMdManager = class _AgentMdManager {
   _url(aid, gatewayUrl) {
     return `${agentMdHttpScheme(gatewayUrl)}://${this._safeAid(aid)}/agent.md`;
   }
-  async _uploadHttp(aid, content) {
+  async _uploadHttp(aid, content, ownerOperationId) {
     const gatewayUrl = await this._resolveGateway(aid);
     const token = await this._accessToken(aid, gatewayUrl);
     const viaGatewayHost = this._uploadViaGatewayHost && nodeBuiltin("node:http") !== null;
@@ -29722,6 +30199,8 @@ var AgentMdManager = class _AgentMdManager {
       "Content-Type": "text/markdown; charset=utf-8",
       ...viaGatewayHost ? { Host: this._safeAid(aid) } : {}
     };
+    const operationId = String(ownerOperationId ?? "").trim();
+    if (operationId) headers["X-AUN-Owner-Operation-ID"] = operationId;
     let url = this._url(aid, gatewayUrl);
     if (viaGatewayHost) {
       try {
@@ -30607,6 +31086,7 @@ var _AUNClient = class _AUNClient {
   /** transport 的 meta observer：吸收 gateway 注入的 _meta 字段。失败不影响业务。 */
   async _observeRpcMeta(meta) {
     const groupIndexes = isJsonObject(meta.group_indexes) ? meta.group_indexes : {};
+    this._groupIndexMetaCache.observeRpcMeta(meta, { localAid: this._aid ?? "" });
     for (const groupAid of Object.keys(groupIndexes)) {
       await this._loadGroupIndexCache(groupAid);
     }
@@ -32149,6 +32629,11 @@ ${invitee}` : "";
       if (!paramsHash || !timestamp2 || !sigB64) {
         return false;
       }
+      const signedAt = Number(timestamp2) * 1e3;
+      const certMeta = parseCertMetadata(cached.certPem);
+      if (!/^\d+$/.test(timestamp2) || !Number.isSafeInteger(Number(timestamp2)) || signedAt < certMeta.notBefore.getTime() || signedAt > certMeta.notAfter.getTime()) {
+        return false;
+      }
       const pubKey = await importCertPublicKeyEcdsa(cached.certPem);
       const signData = new TextEncoder().encode(`${method}|${sigAid}|${timestamp2}|${paramsHash}`);
       const sigBytes = base64ToUint8(sigB64);
@@ -33472,7 +33957,8 @@ ${invitee}` : "";
     };
     if (senderDeviceId) result.sender_device_id = senderDeviceId;
     const explicitDirection = String(msg.direction ?? "").trim();
-    result.direction = explicitDirection || (fromAid && fromAid === this._aid ? "outbound_sync" : "inbound");
+    if (explicitDirection) result.direction = explicitDirection;
+    else if (fromAid && fromAid !== this._aid) result.direction = "inbound";
     if (msg.device_id !== void 0) result.device_id = msg.device_id;
     attachGatewayProximity2(result, msg);
     attachV2EnvelopeMetadata2(result, e2ee);
@@ -34790,6 +35276,19 @@ function agentMdFailure(exc) {
   }
   return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
 }
+function ownerAgentMd(content, ownerAid, proof) {
+  const marker = content.indexOf("<!-- AUN-SIGNATURE");
+  const payload = marker >= 0 ? content.slice(0, marker) : content;
+  const lines = payload.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+  const end = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
+  if (end < 0) throw new ValidationError("agent.md frontmatter is required for ownership operation");
+  const filtered = lines.filter((line, index) => !(index > 0 && index < end && (/^\s*owner\s*:/.test(line) || /^\s*ownership_proof\s*:/.test(line))));
+  const closed = filtered.findIndex((line, index) => index > 0 && line.trim() === "---");
+  filtered.splice(closed, 0, `owner: ${JSON.stringify(ownerAid)}`, `ownership_proof: ${JSON.stringify(proof)}`);
+  const result = filtered.join("\n");
+  return result.endsWith("\n") ? result : `${result}
+`;
+}
 var AIDStore = class {
   constructor(opts) {
     __publicField(this, "aunPath");
@@ -34975,7 +35474,7 @@ var AIDStore = class {
   listAsync() {
     return this.list();
   }
-  async register(aid) {
+  async registerIdentity(aid, uploadDefault = true) {
     const target = String(aid ?? "").trim();
     try {
       if (!target) throw new ValidationError("AIDStore.register requires 'aid'");
@@ -34993,7 +35492,7 @@ var AIDStore = class {
         });
       }
       await this._persistGatewayUrl(target, gatewayUrl);
-      await this.uploadAgentMd(target, buildDefaultAgentMd(target));
+      if (uploadDefault) await this.uploadAgentMd(target, buildDefaultAgentMd(target));
       return resultOk({ registered: true });
     } catch (exc) {
       if (exc instanceof IdentityConflictError) {
@@ -35009,6 +35508,187 @@ var AIDStore = class {
       return resultErr(SERVER_ERROR, message, exc);
     }
   }
+  async register(aidOrParams) {
+    if (typeof aidOrParams === "string") return await this.registerIdentity(aidOrParams);
+    const params2 = aidOrParams;
+    const target = String(params2?.aid ?? "").trim();
+    const aidType = String(params2?.type ?? "").trim().toLowerCase();
+    const owner = String(params2?.owner ?? params2?.owner_aid ?? "").trim();
+    if (!target || !aidType) return resultErr(INVALID_AID_FORMAT, "register requires aid and type");
+    try {
+      const identity = await this.registerIdentity(target, false);
+      if (!identity.ok) return identity;
+      const gatewayUrl = await this._resolveGateway(target);
+      const prepareParams = { aid: target, type: aidType };
+      if (owner) prepareParams.owner = owner;
+      const idempotencyKey = params2.idempotencyKey ?? params2.idempotency_key;
+      if (idempotencyKey) prepareParams.idempotency_key = idempotencyKey;
+      const prepared = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_register_prepare", prepareParams);
+      const operationId = String(prepared.operation_id ?? "").trim();
+      if (!operationId) throw new ValidationError("aid_register_prepare response missing operation_id");
+      let subjectSignature = params2.subjectSignature ?? params2.subject_signature;
+      const ownerSignature = params2.ownerSignature ?? params2.owner_signature;
+      if (!subjectSignature && owner) {
+        const loaded = await this.load(target);
+        if (loaded.ok) {
+          const statement = OwnershipStatement.create(String(prepared.proof_id ?? ""), target, owner);
+          const signed = await signOwnershipStatement({ certFingerprint: loaded.data.aid.certFingerprint, sign: (payload) => loaded.data.aid.sign(payload) }, statement);
+          subjectSignature = { cert_fingerprint: signed.cert_fingerprint, signature: signed.signature };
+        }
+      }
+      const signatures = {};
+      if (subjectSignature) signatures.subject_signature = subjectSignature;
+      if (ownerSignature) signatures.owner_signature = ownerSignature;
+      let response = prepared;
+      if (Object.keys(signatures).length > 0) response = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_register_submit", { operation_id: operationId, ...signatures });
+      const state = String(response.state ?? response.operation_state ?? "").toLowerCase();
+      const complete = !owner || owner === target || !!ownerSignature && !!subjectSignature;
+      if (complete && state === "agent_md_pending") {
+        let content = params2.agentMd ?? params2.agent_md ?? buildDefaultAgentMd(target, { type: aidType });
+        if (owner) {
+          const proof = { proof_id: prepared.proof_id, subject_aid: target, owner_aid: owner, fact_hash: prepared.fact_hash, statement_hash: prepared.statement_hash, subject_signature: subjectSignature };
+          if (owner !== target) proof.owner_signature = ownerSignature;
+          content = ownerAgentMd(content, owner, proof);
+        }
+        const uploaded = await this.uploadAgentMd(target, content, { ownerOperationId: operationId });
+        if (!uploaded.ok) return uploaded;
+        response = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_register_activate", { operation_id: operationId });
+      }
+      return resultOk(response);
+    } catch (exc) {
+      if (exc instanceof ValidationError) return resultErr(INVALID_AID_FORMAT, exc.message, exc);
+      return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
+    }
+  }
+  async create(params2) {
+    return await this.register(params2);
+  }
+  async bindAid(params2) {
+    const target = String(params2?.aid ?? "").trim();
+    const aidType = String(params2?.type ?? "").trim().toLowerCase();
+    const owner = String(params2?.owner ?? params2?.owner_aid ?? "").trim();
+    if (!target || !aidType) return resultErr(INVALID_AID_FORMAT, "bindAid requires aid and type");
+    try {
+      this._registerFlow.validateAidName(target);
+      const gatewayUrl = await this._resolveGateway(target);
+      const prepareParams = { aid: target, type: aidType };
+      if (owner) prepareParams.owner = owner;
+      const idempotencyKey = params2.idempotencyKey ?? params2.idempotency_key;
+      if (idempotencyKey) prepareParams.idempotency_key = idempotencyKey;
+      const prepared = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_bind_prepare", prepareParams);
+      const operationId = String(prepared.operation_id ?? "").trim();
+      if (!operationId) throw new ValidationError("aid_bind_prepare response missing operation_id");
+      const signatures = {};
+      let subjectSignature = params2.subjectSignature ?? params2.subject_signature;
+      if (!subjectSignature && owner) {
+        const loaded = await this.load(target);
+        if (loaded.ok) {
+          const statement = OwnershipStatement.create(String(prepared.proof_id ?? ""), target, owner);
+          const signed = await signOwnershipStatement(loaded.data.aid, statement);
+          subjectSignature = { cert_fingerprint: signed.cert_fingerprint, signature: signed.signature };
+        }
+      }
+      if (subjectSignature) signatures.subject_signature = subjectSignature;
+      const ownerSignature = params2.ownerSignature ?? params2.owner_signature;
+      if (ownerSignature) signatures.owner_signature = ownerSignature;
+      let response = prepared;
+      if (Object.keys(signatures).length > 0) {
+        response = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_bind_submit", { operation_id: operationId, ...signatures });
+      }
+      const agentMd = params2.agentMd ?? params2.agent_md;
+      if (agentMd !== void 0) {
+        const uploaded = await this.uploadAgentMd(target, agentMd, {
+          ownerOperationId: operationId
+        });
+        if (!uploaded.ok) return uploaded;
+      }
+      const state = String(response.state ?? response.operation_state ?? "").toLowerCase();
+      if (state === "agent_md_pending" || !Object.keys(signatures).length && !owner && String(prepared.state ?? "") === "agent_md_pending") {
+        response = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_bind_activate", { operation_id: operationId });
+      }
+      return resultOk(response);
+    } catch (exc) {
+      if (exc instanceof ValidationError) return resultErr(INVALID_AID_FORMAT, exc.message, exc);
+      return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
+    }
+  }
+  async getAidBindingStatus(aid) {
+    const target = String(aid ?? "").trim();
+    if (!target) return resultErr(INVALID_AID_FORMAT, "getAidBindingStatus requires aid");
+    try {
+      this._registerFlow.validateAidName(target);
+      const gatewayUrl = await this._resolveGateway(target);
+      return resultOk(await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_bind_status", { aid: target }));
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
+    }
+  }
+  async resumeAidBinding(operationId) {
+    const target = String(operationId ?? "").trim();
+    if (!target) return resultErr(INVALID_AID_FORMAT, "resumeAidBinding requires operationId");
+    try {
+      const gatewayUrl = await this._resolveGateway(target);
+      let response = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_operation_get", { operation_id: target });
+      if (String(response.state ?? response.operation_state ?? "").toLowerCase() === "agent_md_pending") {
+        const method = String(response.kind ?? "").toLowerCase() === "owner_change" ? "auth.owner_change_activate" : "auth.aid_bind_activate";
+        response = await this._registerFlow.shortRpc(gatewayUrl, method, { operation_id: target });
+      }
+      return resultOk(response);
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
+    }
+  }
+  async bind_aid(params2) {
+    return this.bindAid(params2);
+  }
+  async get_aid_binding_status(aid) {
+    return this.getAidBindingStatus(aid);
+  }
+  async resume_aid_binding(operationId) {
+    return this.resumeAidBinding(operationId);
+  }
+  async changeOwner(params2) {
+    const subject = String(params2?.subject_aid ?? params2?.aid ?? "").trim();
+    const newOwner = String(params2?.new_owner_aid ?? params2?.new_owner ?? "").trim();
+    if (!subject || !newOwner) return resultErr(INVALID_AID_FORMAT, "changeOwner requires subject_aid and new_owner_aid");
+    try {
+      this._registerFlow.validateAidName(subject);
+      const gatewayUrl = await this._resolveGateway(subject);
+      const prepare = { subject_aid: subject, new_owner_aid: newOwner };
+      if (params2.current_owner_aid ?? params2.owner_aid) prepare.current_owner_aid = params2.current_owner_aid ?? params2.owner_aid;
+      if (params2.expected_relation_version !== void 0) prepare.expected_relation_version = params2.expected_relation_version;
+      if (params2.idempotencyKey ?? params2.idempotency_key) prepare.idempotency_key = params2.idempotencyKey ?? params2.idempotency_key;
+      const prepared = await this._registerFlow.shortRpc(gatewayUrl, "auth.owner_change_prepare", prepare);
+      const operationId = String(prepared.operation_id ?? "").trim();
+      if (!operationId) throw new ValidationError("owner_change_prepare response missing operation_id");
+      const signatures = {};
+      for (const key of ["old_owner_signature", "subject_signature", "new_owner_signature"]) if (params2[key]) signatures[key] = params2[key];
+      let response = prepared;
+      if (Object.keys(signatures).length > 0) response = await this._registerFlow.shortRpc(gatewayUrl, "auth.owner_change_submit", { operation_id: operationId, ...signatures });
+      if (String(response.state ?? response.operation_state ?? "").toLowerCase() === "agent_md_pending" && (params2.agentMd ?? params2.agent_md) !== void 0) {
+        const proof = { proof_id: prepared.proof_id, subject_aid: subject, owner_aid: newOwner, fact_hash: prepared.fact_hash, statement_hash: prepared.statement_hash, subject_signature: params2.subject_signature, owner_signature: params2.new_owner_signature };
+        const content = ownerAgentMd(String(params2.agentMd ?? params2.agent_md), newOwner, proof);
+        const uploaded = await this.uploadAgentMd(subject, content, { ownerOperationId: operationId });
+        if (!uploaded.ok) return uploaded;
+        response = await this._registerFlow.shortRpc(gatewayUrl, "auth.owner_change_activate", { operation_id: operationId });
+      }
+      return resultOk(response);
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
+    }
+  }
+  async resumeOwnerChange(operationId, aid) {
+    const id = String(operationId ?? "").trim();
+    if (!id) return resultErr(INVALID_AID_FORMAT, "resumeOwnerChange requires operationId");
+    try {
+      const gatewayUrl = await this._resolveGateway(String(aid ?? id));
+      let response = await this._registerFlow.shortRpc(gatewayUrl, "auth.aid_operation_get", { operation_id: id });
+      if (String(response.state ?? response.operation_state ?? "").toLowerCase() === "agent_md_pending") response = await this._registerFlow.shortRpc(gatewayUrl, "auth.owner_change_activate", { operation_id: id });
+      return resultOk(response);
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, exc instanceof Error ? exc.message : String(exc), exc);
+    }
+  }
   async exists(aid) {
     const target = String(aid ?? "").trim();
     try {
@@ -35135,7 +35815,8 @@ var AIDStore = class {
         accessTokenResolver: async () => this._uploadAgentMdToken(uploader, await this._resolveGateway(uploaderTarget)),
         aidValidator: (value) => this._registerFlow.validateAidName(value)
       });
-      return resultOk(await manager.upload(content));
+      const ownerOperationId = options.ownerOperationId ?? options.owner_operation_id;
+      return resultOk(await manager.upload(content, ownerOperationId));
     } catch (exc) {
       return agentMdFailure(exc);
     }
@@ -36694,6 +37375,7 @@ export {
   MessageFacade,
   MessageThoughtFacade,
   NotFoundError,
+  OwnershipStatement,
   PermissionError,
   ProtectedHeaders,
   ROOT_CA_PEM,
@@ -36744,13 +37426,18 @@ export {
   prepareGroupSettingsWithIndex,
   resultErr,
   resultOk,
+  signOwnershipStatement,
   splitGroupId,
   validateAIDFormat,
   validateAgentMdDocument,
   validateGroupAIDFormat,
   validateGroupIDFormat,
+  validateOwnershipFrontmatter,
+  validateOwnershipProof,
   verifyAgentMdUpload,
-  verifyGroupIndex
+  verifyGroupIndex,
+  verifyOwnershipProof,
+  verifyOwnershipSignature
 };
 /*! Bundled license information: