@agentunion/fastaun-browser 0.5.0 → 0.5.1

package/dist/bundle.js

@@ -460,7 +460,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.5.0";
+var VERSION = "0.5.1";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -621,36 +621,6 @@ var E2EEDecryptFailedError = class extends E2EEError {
     this.name = "E2EEDecryptFailedError";
   }
 };
-var E2EEGroupSecretMissingError = class extends E2EEError {
-  constructor(message = "group secret missing", opts) {
-    super(message, { ...opts, code: -32040, localCode: "E2EE_GROUP_SECRET_MISSING" });
-    this.name = "E2EEGroupSecretMissingError";
-  }
-};
-var E2EEGroupEpochMismatchError = class extends E2EEError {
-  constructor(message = "group epoch mismatch", opts) {
-    super(message, { ...opts, code: -32041, localCode: "E2EE_GROUP_EPOCH_MISMATCH" });
-    this.name = "E2EEGroupEpochMismatchError";
-  }
-};
-var E2EEGroupCommitmentInvalidError = class extends E2EEError {
-  constructor(message = "group commitment invalid", opts) {
-    super(message, { ...opts, code: -32042, localCode: "E2EE_GROUP_COMMITMENT_INVALID" });
-    this.name = "E2EEGroupCommitmentInvalidError";
-  }
-};
-var E2EEGroupNotMemberError = class extends E2EEError {
-  constructor(message = "not a group member", opts) {
-    super(message, { ...opts, code: -32043, localCode: "E2EE_GROUP_NOT_MEMBER" });
-    this.name = "E2EEGroupNotMemberError";
-  }
-};
-var E2EEGroupDecryptFailedError = class extends E2EEError {
-  constructor(message = "group message decrypt failed", opts) {
-    super(message, { ...opts, code: -32044, localCode: "E2EE_GROUP_DECRYPT_FAILED" });
-    this.name = "E2EEGroupDecryptFailedError";
-  }
-};
 var CertificateRevokedError = class extends AuthError {
   constructor(message = "peer certificate has been revoked", opts) {
     super(message, { ...opts, code: -32050 });
@@ -669,6 +639,10 @@ var ClientSignatureError = class extends ValidationError {
     this.name = "ClientSignatureError";
   }
 };
+function isTransientGatewayDegradedError(message) {
+  const text3 = message.trim().toLowerCase();
+  return text3.includes("gateway service degraded") || text3.includes("certificate not loaded");
+}
 function mapRemoteError(error) {
   const code = Number(error.code ?? -32603);
   const message = String(error.message ?? "remote error");
@@ -705,20 +679,10 @@ function mapRemoteError(error) {
     Cls = GroupStateError;
   } else if (code >= -33009 && code <= -33004) {
     Cls = GroupError;
-  } else if (code === -32040) {
-    Cls = E2EEGroupSecretMissingError;
-  } else if (code === -32041) {
-    Cls = E2EEGroupEpochMismatchError;
-  } else if (code === -32042) {
-    Cls = E2EEGroupCommitmentInvalidError;
-  } else if (code === -32043) {
-    Cls = E2EEGroupNotMemberError;
-  } else if (code === -32044) {
-    Cls = E2EEGroupDecryptFailedError;
   } else {
     Cls = AUNError;
   }
-  const retryable = Cls === RateLimitError || code >= 5e3 && code < 6e3;
+  const retryable = Cls === RateLimitError || code >= 5e3 && code < 6e3 || isTransientGatewayDegradedError(message);
   return new Cls(message, { code, data, retryable, traceId });
 }
 
@@ -879,55 +843,172 @@ var EventDispatcher = class {
 };
 
 // src/group-id.ts
-function normalizeGroupId(raw, opts) {
-  const value = String(raw ?? "").trim().toLowerCase();
+function trimDots(value) {
+  return value.replace(/^\.+|\.+$/g, "");
+}
+function convertToGroupAid(raw, opts) {
+  const value = String(raw ?? "").trim().replace(/^\/+|\/+$/g, "").toLowerCase();
   if (!value) return "";
   if (value.startsWith("group.") && value.includes("/")) {
     const issuerAndBase = value.slice(6);
     const slashIdx = issuerAndBase.indexOf("/");
     if (slashIdx > 0 && slashIdx < issuerAndBase.length - 1) {
-      const aDomain = issuerAndBase.slice(0, slashIdx).replace(/^\.+|\.+$/g, "");
-      const baseTail = issuerAndBase.slice(slashIdx + 1);
+      const domain = trimDots(issuerAndBase.slice(0, slashIdx));
+      const baseTail = issuerAndBase.slice(slashIdx + 1).replace(/^\/+|\/+$/g, "");
       if (baseTail.includes("@")) {
         const atIdx = baseTail.indexOf("@");
-        const base = baseTail.slice(0, atIdx).replace(/^\.+|\.+$/g, "");
-        const bDomain = baseTail.slice(atIdx + 1).replace(/^\.+|\.+$/g, "");
-        if (base && bDomain) {
-          const merged = aDomain ? `${bDomain}.${aDomain}` : bDomain;
-          return `group.${merged}/${base}`;
+        const base2 = trimDots(baseTail.slice(0, atIdx));
+        const suffixDomain = trimDots(baseTail.slice(atIdx + 1));
+        if (base2 && suffixDomain) {
+          const merged = domain ? `${suffixDomain}.${domain}` : suffixDomain;
+          return `${base2}.${merged}`;
         }
       }
-      return aDomain ? `group.${aDomain}/${baseTail.replace(/^\.+|\.+$/g, "")}` : value;
+      const base = trimDots(baseTail);
+      if (base && domain) return `${base}.${domain}`;
+      return value;
     }
     return value;
   }
   if (value.includes("@")) {
     const atIdx = value.indexOf("@");
-    const base = value.slice(0, atIdx).replace(/^\.+|\.+$/g, "");
-    const domain = value.slice(atIdx + 1).replace(/^\.+|\.+$/g, "");
-    if (base && domain) return `group.${domain}/${base}`;
+    const base = trimDots(value.slice(0, atIdx));
+    const domain = trimDots(value.slice(atIdx + 1));
+    if (base && domain) return `${base}.${domain}`;
     return value;
   }
-  const localIssuer = (opts?.localIssuer ?? "").trim().replace(/^\.+|\.+$/g, "").toLowerCase();
-  if (value.startsWith("g-")) {
-    const rest = value.slice(2);
-    const dotIdx2 = rest.indexOf(".");
-    if (dotIdx2 > 0) {
-      const slug = rest.slice(0, dotIdx2);
-      const domain = rest.slice(dotIdx2 + 1).replace(/^\.+|\.+$/g, "");
-      if (slug && domain) return `group.${domain}/g-${slug}`;
-    }
-    if (localIssuer) return `group.${localIssuer}/g-${rest}`;
-    return value;
-  }
-  const dotIdx = value.indexOf(".");
+  if (value.includes(".")) return value;
+  const localIssuer = trimDots((opts?.localIssuer ?? "").trim().toLowerCase());
+  if (localIssuer) return `${value}.${localIssuer}`;
+  return value;
+}
+function normalizeGroupAid(raw, opts) {
+  return convertToGroupAid(raw, opts);
+}
+function normalizeGroupId(raw, opts) {
+  return convertToGroupAid(raw, opts);
+}
+function splitGroupId(raw) {
+  const groupAid = convertToGroupAid(raw);
+  const dotIdx = groupAid.indexOf(".");
   if (dotIdx > 0) {
-    const base = value.slice(0, dotIdx);
-    const domain = value.slice(dotIdx + 1).replace(/^\.+|\.+$/g, "");
-    if (base && domain) return `group.${domain}/${base}`;
+    return {
+      base: trimDots(groupAid.slice(0, dotIdx)),
+      domain: trimDots(groupAid.slice(dotIdx + 1))
+    };
   }
-  if (localIssuer) return `group.${localIssuer}/${value}`;
-  return value;
+  return { base: trimDots(groupAid), domain: "" };
+}
+function buildDiscoveryHost(raw) {
+  const { domain } = splitGroupId(raw);
+  return domain;
+}
+
+// src/validators.ts
+var AID_NAME_RE = /^[a-z0-9_][a-z0-9_-]{3,63}$/;
+var GROUP_ID_LEGACY_PATTERN = /^g-[a-z0-9]{4,32}$/;
+var GROUP_ID_NEW_BASE_PATTERN = /^[a-z0-9]{5,64}$/;
+var GROUP_NAME_PATTERN = /^[a-z0-9][a-z0-9_-]{3,63}$/;
+var DOMAIN_RE = /^[a-z0-9]([a-z0-9._-]*[a-z0-9])?$/;
+function validateAIDFormat(aid, paramName = "aid") {
+  if (aid === null || aid === void 0 || typeof aid === "string" && aid.trim() === "") {
+    throw new ValidationError(`${paramName} cannot be empty`);
+  }
+  const aidStr = String(aid).trim().toLowerCase();
+  if (!aidStr.includes(".")) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(aid)}': must be in format '{name}.{issuer}'`
+    );
+  }
+  const dotIdx = aidStr.indexOf(".");
+  const name = aidStr.slice(0, dotIdx);
+  const issuer = aidStr.slice(dotIdx + 1);
+  if (!name) {
+    throw new ValidationError(`Invalid ${paramName} '${String(aid)}': name part cannot be empty`);
+  }
+  if (!AID_NAME_RE.test(name)) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(aid)}': name '${name}' must be 4-64 characters, only [a-z0-9_-], cannot start with '-'`
+    );
+  }
+  if (name.startsWith("guest")) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(aid)}': name cannot start with 'guest'`
+    );
+  }
+  if (!issuer) {
+    throw new ValidationError(`Invalid ${paramName} '${String(aid)}': issuer part cannot be empty`);
+  }
+  if (!DOMAIN_RE.test(issuer)) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(aid)}': issuer '${issuer}' is not a valid domain`
+    );
+  }
+  return aidStr;
+}
+function resolveGroupValidationArgs(defaultParamName, paramNameOrOptions, maybeOptions) {
+  if (typeof paramNameOrOptions === "string") {
+    return {
+      paramName: paramNameOrOptions || defaultParamName,
+      localIssuer: maybeOptions?.localIssuer ?? ""
+    };
+  }
+  return {
+    paramName: paramNameOrOptions?.paramName ?? defaultParamName,
+    localIssuer: paramNameOrOptions?.localIssuer ?? ""
+  };
+}
+function validateGroupAidParts(raw, groupAid, paramName) {
+  const stripDots = (s) => s.replace(/^\.+|\.+$/g, "");
+  const dotIdx = groupAid.indexOf(".");
+  const base = dotIdx >= 0 ? stripDots(groupAid.slice(0, dotIdx)) : groupAid;
+  const domain = dotIdx >= 0 ? stripDots(groupAid.slice(dotIdx + 1)) : "";
+  if (!base) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(raw)}': base part cannot be empty`
+    );
+  }
+  const isValidBase = GROUP_ID_LEGACY_PATTERN.test(base) || GROUP_ID_NEW_BASE_PATTERN.test(base) || GROUP_NAME_PATTERN.test(base);
+  if (!isValidBase) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(raw)}': base '${base}' must be one of: legacy format 'g-[a-z0-9]{4,32}', new format '[a-z0-9]{5,64}', or group name format '[a-z0-9][a-z0-9_-]{3,63}'`
+    );
+  }
+  if (domain && !DOMAIN_RE.test(domain)) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(raw)}': domain '${domain}' is not a valid domain`
+    );
+  }
+}
+function validateGroupAIDFormat(groupId, paramNameOrOptions = "group_aid", maybeOptions) {
+  const { paramName, localIssuer } = resolveGroupValidationArgs(
+    "group_aid",
+    paramNameOrOptions,
+    maybeOptions
+  );
+  if (groupId === null || groupId === void 0 || typeof groupId === "string" && groupId.trim() === "") {
+    throw new ValidationError(`${paramName} cannot be empty`);
+  }
+  const rawText = String(groupId).trim();
+  if (rawText.includes("//")) {
+    throw new ValidationError(
+      `Invalid ${paramName} '${String(groupId)}': empty path segment is not allowed`
+    );
+  }
+  const groupAid = convertToGroupAid(rawText, { localIssuer });
+  if (!groupAid) {
+    throw new ValidationError(`${paramName} cannot be empty`);
+  }
+  validateGroupAidParts(groupId, groupAid, paramName);
+  return groupAid;
+}
+function validateGroupIDFormat(groupId, paramNameOrOptions = "group_id", maybeOptions) {
+  const { paramName, localIssuer } = resolveGroupValidationArgs(
+    "group_id",
+    paramNameOrOptions,
+    maybeOptions
+  );
+  return validateGroupAIDFormat(groupId, paramName, { localIssuer });
 }
 
 // src/discovery.ts
@@ -1456,7 +1537,7 @@ var _noopLog3 = { error: () => {
 }, info: () => {
 }, debug: () => {
 } };
-var AID_NAME_RE = /^[a-z0-9_][a-z0-9_-]{3,63}$/;
+var AID_NAME_RE2 = /^[a-z0-9_][a-z0-9_-]{3,63}$/;
 function _gatewayHttpUrl(gatewayUrl, path) {
   try {
     const parsed = new URL(gatewayUrl);
@@ -1508,7 +1589,7 @@ var RegisterFlow = class _RegisterFlow {
   }
   static validateAidName(aid) {
     const name = aid.includes(".") ? aid.split(".")[0] : aid;
-    if (!AID_NAME_RE.test(name)) {
+    if (!AID_NAME_RE2.test(name)) {
       throw new ValidationError(
         `Invalid AID name '${name}': must be 4-64 characters, only [a-z0-9_-], cannot start with '-'`
       );
@@ -1835,16 +1916,12 @@ var STORE_KEY_PAIRS = "key_pairs";
 var STORE_CERTS = "certs";
 var STORE_METADATA = "metadata";
 var STORE_INSTANCE_STATE = "instance_state";
-var STORE_PREKEYS = "prekeys";
-var STORE_GROUP_CURRENT = "group_current";
-var STORE_GROUP_OLD_EPOCHS = "group_old_epochs";
-var STORE_SESSIONS = "e2ee_sessions";
 var STORE_GROUP_STATE = "group_state";
 var STORE_AGENT_MD_CACHE = "agent_md_cache";
 var STORE_PENDING_IDENTITIES = "pending_identities";
-var STRUCTURED_RECOVERY_RETENTION_MS = 7 * 24 * 3600 * 1e3;
+var STORE_PENDING_BINDS = "pending_binds";
 var DB_NAME = "aun-keystore";
-var DB_VERSION = 7;
+var DB_VERSION = 8;
 function safeAid(aid) {
   return aid.replace(/[/\\:]/g, "_");
 }
@@ -1860,9 +1937,6 @@ function isRecord(value) {
 function toBufferSource2(bytes) {
   return bytes.slice().buffer;
 }
-function sameJson(a, b) {
-  return JSON.stringify(a) === JSON.stringify(b);
-}
 function randomHex(byteLength) {
   const bytes = crypto.getRandomValues(new Uint8Array(byteLength));
   return Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("");
@@ -1898,36 +1972,6 @@ function instanceStateStoreKey(aid, deviceId, slotId = "") {
   const slotKey = slotIsolationKey(slotId) || "_singleton";
   return `${safeAid(aid)}|${encodePart(normalizedDevice)}|${encodePart(slotKey)}`;
 }
-function prekeyPrefix(aid) {
-  return `${safeAid(aid)}|`;
-}
-function prekeyStoreKey(aid, prekeyId, deviceId = "") {
-  const normalizedDeviceId = String(deviceId ?? "").trim();
-  if (!normalizedDeviceId) {
-    return `${safeAid(aid)}|${encodePart(prekeyId)}`;
-  }
-  return `${safeAid(aid)}|${encodePart(normalizedDeviceId)}|${encodePart(prekeyId)}`;
-}
-function groupCurrentPrefix(aid) {
-  return `${safeAid(aid)}|`;
-}
-function groupCurrentStoreKey(aid, groupId) {
-  return `${safeAid(aid)}|${encodePart(groupId)}`;
-}
-function groupOldPrefix(aid, groupId) {
-  const base = `${safeAid(aid)}|`;
-  if (groupId === void 0) return base;
-  return `${base}${encodePart(groupId)}|`;
-}
-function groupOldStoreKey(aid, groupId, epoch) {
-  return `${safeAid(aid)}|${encodePart(groupId)}|${epoch}`;
-}
-function sessionPrefix(aid) {
-  return `${safeAid(aid)}|`;
-}
-function sessionStoreKey(aid, sessionId) {
-  return `${safeAid(aid)}|${encodePart(sessionId)}`;
-}
 function seqTrackerPrefix(aid, deviceId, slotId) {
   const normalizedDevice = normalizeInstanceId(deviceId, "device_id");
   const slotKey = slotIsolationKey(slotId) || "_singleton";
@@ -1946,11 +1990,7 @@ function pendingIdentityPrefix(aid) {
   return `${safeAid(aid)}-`;
 }
 function stripStructuredFields(metadata) {
-  const plain = deepClone(metadata);
-  delete plain.e2ee_prekeys;
-  delete plain.group_secrets;
-  delete plain.e2ee_sessions;
-  return plain;
+  return deepClone(metadata);
 }
 function defaultAgentMdCacheRecord(aid) {
   return {
@@ -2056,13 +2096,10 @@ function openDB() {
         STORE_CERTS,
         STORE_METADATA,
         STORE_INSTANCE_STATE,
-        STORE_PREKEYS,
-        STORE_GROUP_CURRENT,
-        STORE_GROUP_OLD_EPOCHS,
-        STORE_SESSIONS,
         STORE_GROUP_STATE,
         STORE_AGENT_MD_CACHE,
-        STORE_PENDING_IDENTITIES
+        STORE_PENDING_IDENTITIES,
+        STORE_PENDING_BINDS
       ]) {
         if (!db.objectStoreNames.contains(name)) db.createObjectStore(name);
       }
@@ -2671,12 +2708,90 @@ var _IndexedDBIdentityStore = class _IndexedDBIdentityStore {
     const plain = stripStructuredFields(metadata);
     await idbPut(STORE_METADATA, metadataStoreKey(aid), plain);
   }
+  // ── Pending Group Bind (幂等暂存槽位) ────────────────────
+  async savePendingGroupBind(groupId, keyPair) {
+    const gid = groupId.trim();
+    if (!gid) throw new Error("savePendingGroupBind requires non-empty group_id");
+    const privateKeyPem = String(keyPair.private_key_pem || "").trim();
+    const publicKeyDerB642 = String(keyPair.public_key_der_b64 || "").trim();
+    if (!privateKeyPem || !publicKeyDerB642) {
+      throw new Error("savePendingGroupBind requires private_key_pem and public_key_der_b64");
+    }
+    const curve = String(keyPair.curve || "P-256").trim() || "P-256";
+    const record = {
+      public_key_der_b64: publicKeyDerB642,
+      curve
+    };
+    if (hasEncryptionSeed(this._encryptionSeed)) {
+      record._encrypted_pk = await encryptPEM(privateKeyPem, this._encryptionSeed);
+    } else {
+      record.private_key_pem = privateKeyPem;
+    }
+    await idbPut("pending_binds", gid, record);
+  }
+  async loadPendingGroupBind(groupId) {
+    const gid = groupId.trim();
+    if (!gid) return null;
+    try {
+      const data = await idbGet("pending_binds", gid);
+      if (!isRecord(data)) return null;
+      const result = deepClone(data);
+      if (isRecord(result._encrypted_pk) && hasEncryptionSeed(this._encryptionSeed)) {
+        try {
+          const envelope = result._encrypted_pk;
+          result.private_key_pem = await decryptPEM(envelope, this._encryptionSeed);
+          delete result._encrypted_pk;
+        } catch (e) {
+          this._log.warn(`loadPendingGroupBind decrypt failed for ${gid}: ${e instanceof Error ? e.message : String(e)}`);
+          return null;
+        }
+      }
+      return {
+        public_key_der_b64: String(result.public_key_der_b64 || ""),
+        private_key_pem: String(result.private_key_pem || ""),
+        curve: String(result.curve || "P-256")
+      };
+    } catch (e) {
+      this._log.warn(`loadPendingGroupBind failed for ${gid}: ${e instanceof Error ? e.message : String(e)}`);
+      return null;
+    }
+  }
+  async clearPendingGroupBind(groupId) {
+    const gid = groupId.trim();
+    if (!gid) return;
+    try {
+      await idbDelete("pending_binds", gid);
+    } catch (e) {
+      this._log.warn(`clearPendingGroupBind failed for ${gid}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+  }
 };
 __publicField(_IndexedDBIdentityStore, "_aidTails", /* @__PURE__ */ new Map());
 var IndexedDBIdentityStore = _IndexedDBIdentityStore;
 
 // src/keystore/indexeddb-token-store.ts
 init_crypto();
+function groupLookupCandidates(groupId, localIssuer = "") {
+  const raw = String(groupId ?? "").trim();
+  if (!raw) return [];
+  const normalized = convertToGroupAid(raw, { localIssuer });
+  const candidates = [];
+  const add = (value) => {
+    const trimmed = String(value ?? "").trim();
+    if (trimmed && !candidates.includes(trimmed)) candidates.push(trimmed);
+  };
+  add(raw);
+  add(normalized);
+  const dotIdx = normalized.indexOf(".");
+  if (dotIdx > 0 && dotIdx < normalized.length - 1) {
+    const base = normalized.slice(0, dotIdx);
+    const issuer = normalized.slice(dotIdx + 1);
+    add(`group.${issuer}/${base}`);
+    add(`${base}@${issuer}`);
+    if (localIssuer && issuer === localIssuer.replace(/^\.+|\.+$/g, "").toLowerCase()) add(base);
+  }
+  return candidates;
+}
 var _IndexedDBTokenStore = class _IndexedDBTokenStore {
   constructor() {
     __publicField(this, "_log", _noopLog4);
@@ -2774,187 +2889,6 @@ var _IndexedDBTokenStore = class _IndexedDBTokenStore {
       return deepClone(updated);
     });
   }
-  // ── 结构化 prekeys ───────────────────────────────────
-  async loadE2EEPrekeys(aid, deviceId) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      return this._loadPrekeysUnlocked(aid, String(deviceId ?? "").trim());
-    });
-  }
-  /**
-   * 按 prekey_id 单点查询本地 prekey（O(log N) IndexedDB primary-key 查找）。
-   *
-   * 解密入站消息时，envelope 里只带 prekey_id，没有 device_id。优先用 IndexedDB
-   * 主键直查；命中则 O(log N)，未命中再回退到前缀扫描，保证跨 device_id 也能找到。
-   */
-  async loadE2EEPrekeyById(aid, prekeyId) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      return this._loadPrekeyByIdUnlocked(aid, prekeyId);
-    });
-  }
-  async saveE2EEPrekey(aid, prekeyId, prekeyData, deviceId) {
-    await this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      const record = deepClone(prekeyData);
-      record.prekey_id = prekeyId;
-      const normalizedDeviceId = String(deviceId ?? "").trim();
-      if (normalizedDeviceId) {
-        record.device_id = normalizedDeviceId;
-      } else {
-        delete record.device_id;
-      }
-      const targetKey = prekeyStoreKey(aid, prekeyId, normalizedDeviceId);
-      for (const item of await idbGetAllByPrefix(STORE_PREKEYS, prekeyPrefix(aid))) {
-        if (!isRecord(item.value)) continue;
-        const existingPrekeyId = typeof item.value.prekey_id === "string" ? item.value.prekey_id : "";
-        const existingDeviceId = String(item.value.device_id ?? "").trim();
-        if (existingPrekeyId === prekeyId && existingDeviceId === normalizedDeviceId && item.key !== targetKey) {
-          await idbDelete(STORE_PREKEYS, item.key);
-        }
-      }
-      await idbPut(STORE_PREKEYS, targetKey, record);
-    });
-  }
-  async cleanupE2EEPrekeys(aid, cutoffMs, keepLatest = 7, deviceId) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      const normalizedDeviceId = String(deviceId ?? "").trim();
-      const prekeys = await this._loadPrekeysUnlocked(aid, normalizedDeviceId);
-      const retainedIds = new Set(
-        Object.entries(prekeys).sort((left, right) => {
-          const leftMarker = Number(left[1].created_at ?? left[1].updated_at ?? left[1].expires_at ?? 0);
-          const rightMarker = Number(right[1].created_at ?? right[1].updated_at ?? right[1].expires_at ?? 0);
-          if (rightMarker !== leftMarker) return rightMarker - leftMarker;
-          return right[0].localeCompare(left[0]);
-        }).slice(0, keepLatest).map(([prekeyId]) => prekeyId)
-      );
-      const removed = Object.entries(prekeys).filter(
-        ([prekeyId, data]) => Number(data.created_at ?? data.updated_at ?? data.expires_at ?? 0) < cutoffMs && !retainedIds.has(prekeyId)
-      ).map(([prekeyId]) => prekeyId);
-      const removedIds = new Set(removed);
-      for (const item of await idbGetAllByPrefix(STORE_PREKEYS, prekeyPrefix(aid))) {
-        if (!isRecord(item.value)) continue;
-        const recordDeviceId = String(item.value.device_id ?? "").trim();
-        if (recordDeviceId !== normalizedDeviceId) continue;
-        const prekeyId = typeof item.value.prekey_id === "string" ? item.value.prekey_id : "";
-        if (removedIds.has(prekeyId)) await idbDelete(STORE_PREKEYS, item.key);
-      }
-      return removed;
-    });
-  }
-  // ── 结构化群组密钥 ─────────────────────────────────
-  async listGroupSecretIds(aid) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      const ids = /* @__PURE__ */ new Set();
-      for (const item of await idbGetAllByPrefix(STORE_GROUP_CURRENT, groupCurrentPrefix(aid))) {
-        const [, encodedGroupId] = item.key.split("|");
-        if (encodedGroupId) ids.add(decodeURIComponent(encodedGroupId));
-      }
-      for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid))) {
-        const [, encodedGroupId] = item.key.split("|");
-        if (encodedGroupId) ids.add(decodeURIComponent(encodedGroupId));
-      }
-      return [...ids].sort();
-    });
-  }
-  async cleanupGroupOldEpochsState(aid, groupId, cutoffMs) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      let removed = 0;
-      for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid, groupId))) {
-        if (!isRecord(item.value)) continue;
-        if (Number(item.value.updated_at ?? 0) <= cutoffMs) {
-          await idbDelete(STORE_GROUP_OLD_EPOCHS, item.key);
-          removed += 1;
-        }
-      }
-      return removed;
-    });
-  }
-  async loadGroupSecretEpoch(aid, groupId, epoch) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      const current = await idbGet(STORE_GROUP_CURRENT, groupCurrentStoreKey(aid, groupId));
-      if (isRecord(current)) {
-        const record2 = deepClone(current);
-        delete record2.group_id;
-        if (epoch === void 0 || epoch === null || Number(record2.epoch ?? 0) === Number(epoch)) {
-          return record2;
-        }
-      } else if (epoch === void 0 || epoch === null) {
-        return null;
-      }
-      const old = await idbGet(STORE_GROUP_OLD_EPOCHS, groupOldStoreKey(aid, groupId, Number(epoch)));
-      if (!isRecord(old)) return null;
-      const record = deepClone(old);
-      delete record.group_id;
-      return record;
-    });
-  }
-  async loadGroupSecretEpochs(aid, groupId) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      const result = [];
-      const current = await idbGet(STORE_GROUP_CURRENT, groupCurrentStoreKey(aid, groupId));
-      if (isRecord(current)) {
-        const record = deepClone(current);
-        delete record.group_id;
-        result.push(record);
-      }
-      for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid, groupId))) {
-        if (!isRecord(item.value)) continue;
-        const record = deepClone(item.value);
-        delete record.group_id;
-        result.push(record);
-      }
-      return result;
-    });
-  }
-  async storeGroupSecretTransition(aid, groupId, opts) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      return this._storeGroupSecretTransitionUnlocked(aid, groupId, opts);
-    });
-  }
-  async storeGroupSecretEpoch(aid, groupId, opts) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      return this._storeGroupSecretEpochUnlocked(aid, groupId, opts);
-    });
-  }
-  async discardPendingGroupSecretState(aid, groupId, epoch, rotationId) {
-    return this._withAidLock(aid, async () => {
-      const rid = String(rotationId ?? "").trim();
-      if (!rid) return false;
-      await this._migrateLegacyStructuredStateUnlocked(aid);
-      return this._discardPendingGroupSecretUnlocked(aid, groupId, epoch, rid);
-    });
-  }
-  async deleteGroupSecretState(aid, groupId) {
-    await this._withAidLock(aid, async () => {
-      await idbDelete(STORE_GROUP_CURRENT, groupCurrentStoreKey(aid, groupId));
-      for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid, groupId))) {
-        await idbDelete(STORE_GROUP_OLD_EPOCHS, item.key);
-      }
-    });
-  }
-  // ── E2EE Sessions ─────────────────────────────────────
-  async loadE2EESessions(aid) {
-    return this._withAidLock(aid, async () => {
-      await this._migrateLegacySessionsUnlocked(aid);
-      return this._loadSessionsUnlocked(aid);
-    });
-  }
-  async saveE2EESession(aid, sessionId, data) {
-    await this._withAidLock(aid, async () => {
-      await this._migrateLegacySessionsUnlocked(aid);
-      const record = deepClone(data);
-      record.session_id = sessionId;
-      await idbPut(STORE_SESSIONS, sessionStoreKey(aid, sessionId), record);
-    });
-  }
   /**
    * 读取单个 metadata KV（如 gateway_url 等跨进程缓存项）。
    * 不存在时返回空字符串，与 Python keystore 的 get_metadata 语义保持一致。
@@ -3067,18 +3001,23 @@ var _IndexedDBTokenStore = class _IndexedDBTokenStore {
     });
   }
   async loadGroupState(groupId) {
-    const key = encodePart(groupId);
-    const data = await idbGet(STORE_GROUP_STATE, key);
-    if (!data || typeof data.state_version !== "number") return null;
-    return {
-      group_id: groupId,
-      state_version: data.state_version,
-      state_hash: data.state_hash ?? "",
-      key_epoch: data.key_epoch ?? 0,
-      membership_json: data.membership_json ?? "[]",
-      policy_json: data.policy_json ?? "{}",
-      updated_at: data.updated_at ?? 0
-    };
+    for (const candidate of groupLookupCandidates(groupId)) {
+      const key = encodePart(candidate);
+      const data = await idbGet(STORE_GROUP_STATE, key);
+      if (!data || typeof data.state_version !== "number") continue;
+      const storedGroupId = typeof data.group_id === "string" ? data.group_id : candidate;
+      return {
+        group_id: storedGroupId,
+        group_aid: convertToGroupAid(storedGroupId),
+        state_version: data.state_version,
+        state_hash: data.state_hash ?? "",
+        key_epoch: data.key_epoch ?? 0,
+        membership_json: data.membership_json ?? "[]",
+        policy_json: data.policy_json ?? "{}",
+        updated_at: data.updated_at ?? 0
+      };
+    }
+    return null;
   }
   /** 计算 PEM 证书的 SHA-256 指纹（hex，无冒号） */
   async _pemFingerprint(pem) {
@@ -3144,515 +3083,6 @@ var _IndexedDBTokenStore = class _IndexedDBTokenStore {
     const plain = stripStructuredFields(metadata);
     await idbPut(STORE_METADATA, metadataStoreKey(aid), plain);
   }
-  async _migrateLegacyStructuredStateUnlocked(aid) {
-    const metadataOnly = await this._loadMetadataOnlyUnlocked(aid) ?? {};
-    const hasLegacyPrekeys = isRecord(metadataOnly.e2ee_prekeys);
-    const hasLegacyGroups = isRecord(metadataOnly.group_secrets);
-    const hasLegacySessions = Array.isArray(metadataOnly.e2ee_sessions) && metadataOnly.e2ee_sessions.length > 0;
-    if (!hasLegacyPrekeys && !hasLegacyGroups && !hasLegacySessions) {
-      return metadataOnly;
-    }
-    const cleaned = deepClone(metadataOnly);
-    if (hasLegacyPrekeys) {
-      const legacyPrekeys = metadataOnly.e2ee_prekeys;
-      const structuredPrekeys = await this._loadPrekeysUnlocked(aid);
-      let changed = false;
-      if (isRecord(legacyPrekeys)) {
-        for (const [prekeyId, rawData] of Object.entries(legacyPrekeys)) {
-          if (!isRecord(rawData) || structuredPrekeys[prekeyId]) continue;
-          if (!this._isPrekeyRecoverable(rawData)) continue;
-          structuredPrekeys[prekeyId] = deepClone(rawData);
-          changed = true;
-        }
-      }
-      if (changed) {
-        await this._replacePrekeysUnlocked(aid, structuredPrekeys);
-      }
-      delete cleaned.e2ee_prekeys;
-    }
-    if (hasLegacyGroups) {
-      const legacyGroups = metadataOnly.group_secrets;
-      const structuredGroups = await this._loadGroupEntriesUnlocked(aid);
-      let changed = false;
-      if (isRecord(legacyGroups)) {
-        for (const [groupId, rawEntry] of Object.entries(legacyGroups)) {
-          if (!isRecord(rawEntry)) continue;
-          const merged = this._mergeGroupEntryFromLegacy(structuredGroups[groupId], rawEntry);
-          if (!sameJson(structuredGroups[groupId] ?? null, merged)) {
-            if (Object.keys(merged).length > 0) {
-              structuredGroups[groupId] = merged;
-              changed = true;
-            }
-          }
-        }
-      }
-      if (changed) {
-        await this._replaceGroupEntriesUnlocked(aid, structuredGroups);
-      }
-      delete cleaned.group_secrets;
-    }
-    if (hasLegacySessions) {
-      const legacySessions = metadataOnly.e2ee_sessions;
-      for (const session of legacySessions) {
-        const sid = typeof session.session_id === "string" ? session.session_id : "";
-        if (!sid) continue;
-        const record = deepClone(session);
-        record.session_id = sid;
-        await idbPut(STORE_SESSIONS, sessionStoreKey(aid, sid), record);
-      }
-      delete cleaned.e2ee_sessions;
-    }
-    await this._saveMetadataOnlyUnlocked(aid, cleaned);
-    return cleaned;
-  }
-  async _loadPrekeysUnlocked(aid, deviceId = "") {
-    const items = await idbGetAllByPrefix(STORE_PREKEYS, prekeyPrefix(aid));
-    const prefix = prekeyPrefix(aid);
-    const result = {};
-    const normalizedDeviceId = String(deviceId ?? "").trim();
-    for (const item of items) {
-      if (!item.key.startsWith(prefix) || !isRecord(item.value)) continue;
-      const recordDeviceId = String(item.value.device_id ?? "").trim();
-      if (recordDeviceId !== normalizedDeviceId) continue;
-      const prekeyId = typeof item.value.prekey_id === "string" ? item.value.prekey_id : item.key.slice(prefix.length);
-      const record = deepClone(item.value);
-      delete record.prekey_id;
-      delete record.device_id;
-      const canonicalKey = prekeyStoreKey(aid, prekeyId, normalizedDeviceId);
-      if (!(prekeyId in result) || item.key === canonicalKey) {
-        result[prekeyId] = record;
-      }
-    }
-    return result;
-  }
-  async _loadPrekeyByIdUnlocked(aid, prekeyId) {
-    if (!prekeyId) return null;
-    const directKey = prekeyStoreKey(aid, prekeyId, "");
-    const direct = await idbGet(STORE_PREKEYS, directKey);
-    if (isRecord(direct)) {
-      const record = deepClone(direct);
-      delete record.prekey_id;
-      delete record.device_id;
-      return record;
-    }
-    for (const item of await idbGetAllByPrefix(STORE_PREKEYS, prekeyPrefix(aid))) {
-      if (!isRecord(item.value)) continue;
-      const itemPrekeyId = typeof item.value.prekey_id === "string" ? item.value.prekey_id : "";
-      if (itemPrekeyId !== prekeyId) continue;
-      const record = deepClone(item.value);
-      delete record.prekey_id;
-      delete record.device_id;
-      return record;
-    }
-    return null;
-  }
-  async _replacePrekeysUnlocked(aid, prekeys, deviceId = "") {
-    const desired = new Set(Object.keys(prekeys));
-    const normalizedDeviceId = String(deviceId ?? "").trim();
-    for (const item of await idbGetAllByPrefix(STORE_PREKEYS, prekeyPrefix(aid))) {
-      if (!isRecord(item.value)) continue;
-      const recordDeviceId = String(item.value.device_id ?? "").trim();
-      if (recordDeviceId !== normalizedDeviceId) continue;
-      const prekeyId = typeof item.value.prekey_id === "string" ? item.value.prekey_id : "";
-      const canonicalKey = prekeyStoreKey(aid, prekeyId, normalizedDeviceId);
-      if (!desired.has(prekeyId) || item.key !== canonicalKey) {
-        await idbDelete(STORE_PREKEYS, item.key);
-      }
-    }
-    for (const [prekeyId, prekeyData] of Object.entries(prekeys)) {
-      const record = deepClone(prekeyData);
-      if (normalizedDeviceId) {
-        record.device_id = normalizedDeviceId;
-      } else {
-        delete record.device_id;
-      }
-      await idbPut(STORE_PREKEYS, prekeyStoreKey(aid, prekeyId, normalizedDeviceId), { ...record, prekey_id: prekeyId });
-    }
-  }
-  async _loadGroupEntriesUnlocked(aid) {
-    const result = {};
-    for (const item of await idbGetAllByPrefix(STORE_GROUP_CURRENT, groupCurrentPrefix(aid))) {
-      if (!isRecord(item.value)) continue;
-      const groupId = typeof item.value.group_id === "string" ? item.value.group_id : item.key.slice(groupCurrentPrefix(aid).length);
-      const record = deepClone(item.value);
-      delete record.group_id;
-      result[groupId] = record;
-    }
-    for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid))) {
-      if (!isRecord(item.value)) continue;
-      const groupId = typeof item.value.group_id === "string" ? item.value.group_id : "";
-      if (!groupId) continue;
-      const record = deepClone(item.value);
-      delete record.group_id;
-      const entry = result[groupId] ?? {};
-      const oldEpochs = Array.isArray(entry.old_epochs) ? entry.old_epochs : [];
-      oldEpochs.push(record);
-      oldEpochs.sort((a, b) => Number(a.epoch ?? 0) - Number(b.epoch ?? 0));
-      entry.old_epochs = oldEpochs;
-      result[groupId] = entry;
-    }
-    return result;
-  }
-  async _replaceGroupEntriesUnlocked(aid, groups) {
-    const desiredGroups = new Set(Object.keys(groups));
-    for (const item of await idbGetAllByPrefix(STORE_GROUP_CURRENT, groupCurrentPrefix(aid))) {
-      const groupId = isRecord(item.value) && typeof item.value.group_id === "string" ? item.value.group_id : item.key.slice(groupCurrentPrefix(aid).length);
-      if (!desiredGroups.has(groupId)) await idbDelete(STORE_GROUP_CURRENT, item.key);
-    }
-    for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid))) {
-      if (!isRecord(item.value)) continue;
-      const groupId = typeof item.value.group_id === "string" ? item.value.group_id : "";
-      if (!groupId || desiredGroups.has(groupId)) continue;
-      await idbDelete(STORE_GROUP_OLD_EPOCHS, item.key);
-    }
-    for (const [groupId, rawEntry] of Object.entries(groups)) {
-      if (!isRecord(rawEntry)) continue;
-      await this._saveSingleGroupEntryUnlocked(aid, groupId, rawEntry);
-    }
-  }
-  async _saveSingleGroupEntryUnlocked(aid, groupId, entry) {
-    for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid, groupId))) {
-      if (!isRecord(item.value)) continue;
-      if (typeof item.value.group_id === "string" && item.value.group_id === groupId) {
-        await idbDelete(STORE_GROUP_OLD_EPOCHS, item.key);
-      }
-    }
-    const current = deepClone(entry);
-    const oldEpochs = Array.isArray(current.old_epochs) ? current.old_epochs : [];
-    delete current.old_epochs;
-    if (typeof current.epoch === "number") {
-      await idbPut(STORE_GROUP_CURRENT, groupCurrentStoreKey(aid, groupId), { ...current, group_id: groupId });
-    } else {
-      await idbDelete(STORE_GROUP_CURRENT, groupCurrentStoreKey(aid, groupId));
-    }
-    for (const oldEpoch of oldEpochs) {
-      if (!isRecord(oldEpoch) || typeof oldEpoch.epoch !== "number") continue;
-      await idbPut(STORE_GROUP_OLD_EPOCHS, groupOldStoreKey(aid, groupId, oldEpoch.epoch), {
-        ...deepClone(oldEpoch),
-        group_id: groupId
-      });
-    }
-  }
-  async _storeGroupSecretTransitionUnlocked(aid, groupId, opts) {
-    const currentKey = groupCurrentStoreKey(aid, groupId);
-    const currentRaw = await idbGet(STORE_GROUP_CURRENT, currentKey);
-    const now = Date.now();
-    const epoch = Number(opts.epoch);
-    const members = [...opts.memberAids ?? []].map((item) => String(item)).sort();
-    const pendingRotationId = String(opts.pendingRotationId ?? "").trim();
-    if (isRecord(currentRaw)) {
-      const current = deepClone(currentRaw);
-      delete current.group_id;
-      const localEpoch = Number(current.epoch ?? 0);
-      if (epoch < localEpoch) return false;
-      if (epoch === localEpoch && typeof current.secret === "string") {
-        if (current.secret !== opts.secret) {
-          if (String(current.pending_rotation_id ?? "").trim()) {
-            await idbPut(STORE_GROUP_CURRENT, currentKey, {
-              ...this._buildGroupCurrentRecord(groupId, opts, members, now)
-            });
-            return true;
-          }
-          return false;
-        }
-        const updated = { ...current };
-        let changed = false;
-        const oldMembers = Array.isArray(updated.member_aids) ? updated.member_aids.map(String).sort() : [];
-        if (members.length > 0 && JSON.stringify(oldMembers) !== JSON.stringify(members)) {
-          updated.member_aids = members;
-          updated.commitment = opts.commitment;
-          updated.updated_at = now;
-          changed = true;
-        }
-        if (opts.epochChain !== void 0 && updated.epoch_chain !== opts.epochChain) {
-          updated.epoch_chain = opts.epochChain;
-          updated.updated_at = now;
-          changed = true;
-        }
-        if (opts.epochChainUnverified === true) {
-          if (updated.epoch_chain_unverified !== true) {
-            updated.epoch_chain_unverified = true;
-            changed = true;
-          }
-          if (opts.epochChainUnverifiedReason && updated.epoch_chain_unverified_reason !== opts.epochChainUnverifiedReason) {
-            updated.epoch_chain_unverified_reason = opts.epochChainUnverifiedReason;
-            changed = true;
-          }
-        } else if (opts.epochChainUnverified === false) {
-          if ("epoch_chain_unverified" in updated || "epoch_chain_unverified_reason" in updated) {
-            delete updated.epoch_chain_unverified;
-            delete updated.epoch_chain_unverified_reason;
-            changed = true;
-          }
-        }
-        if (pendingRotationId && updated.pending_rotation_id !== pendingRotationId) {
-          updated.pending_rotation_id = pendingRotationId;
-          updated.pending_created_at = now;
-          changed = true;
-        }
-        if (!pendingRotationId && updated.pending_rotation_id) {
-          delete updated.pending_rotation_id;
-          delete updated.pending_created_at;
-          changed = true;
-        }
-        if (changed) {
-          await idbPut(STORE_GROUP_CURRENT, currentKey, { ...updated, group_id: groupId });
-        }
-        return true;
-      }
-      if (localEpoch !== epoch) {
-        const oldEntry = { ...current };
-        oldEntry.expires_at = Number(current.updated_at ?? now) + opts.oldEpochRetentionMs;
-        await idbPut(STORE_GROUP_OLD_EPOCHS, groupOldStoreKey(aid, groupId, localEpoch), {
-          ...oldEntry,
-          group_id: groupId
-        });
-      } else {
-        const merged = { ...current, ...this._buildGroupCurrentRecord(groupId, opts, members, now) };
-        if (!opts.epochChain && current.epoch_chain) {
-          merged.epoch_chain = current.epoch_chain;
-        }
-        if (current.pending_rotation_id && !opts.pendingRotationId) {
-          merged.pending_rotation_id = current.pending_rotation_id;
-          if (current.pending_created_at) merged.pending_created_at = current.pending_created_at;
-        }
-        await idbPut(STORE_GROUP_CURRENT, currentKey, merged);
-        return true;
-      }
-    }
-    await idbPut(STORE_GROUP_CURRENT, currentKey, {
-      ...this._buildGroupCurrentRecord(groupId, opts, members, now)
-    });
-    return true;
-  }
-  async _storeGroupSecretEpochUnlocked(aid, groupId, opts) {
-    const now = Date.now();
-    const epoch = Number(opts.epoch);
-    const members = [...opts.memberAids ?? []].map((item) => String(item)).sort();
-    const pendingRotationId = String(opts.pendingRotationId ?? "").trim();
-    const currentKey = groupCurrentStoreKey(aid, groupId);
-    const currentRaw = await idbGet(STORE_GROUP_CURRENT, currentKey);
-    const newRecord = this._buildGroupCurrentRecord(groupId, opts, members, now);
-    if (!isRecord(currentRaw)) {
-      await idbPut(STORE_GROUP_CURRENT, currentKey, newRecord);
-      return true;
-    }
-    const current = deepClone(currentRaw);
-    delete current.group_id;
-    const localEpoch = Number(current.epoch ?? 0);
-    if (epoch > localEpoch) {
-      const expiresAt = Date.now() + (opts.oldEpochRetentionMs ?? 6048e5);
-      const oldRecord = { ...current, group_id: groupId, expires_at: expiresAt };
-      const oldKey2 = groupOldStoreKey(aid, groupId, localEpoch);
-      await idbPut(STORE_GROUP_OLD_EPOCHS, oldKey2, oldRecord);
-      await idbPut(STORE_GROUP_CURRENT, currentKey, newRecord);
-      return true;
-    }
-    if (epoch === localEpoch) {
-      if (typeof current.secret === "string" && current.secret !== opts.secret) {
-        if (!String(current.pending_rotation_id ?? "").trim()) return false;
-        await idbPut(STORE_GROUP_CURRENT, currentKey, newRecord);
-        return true;
-      }
-      const updated = { ...current };
-      let changed = false;
-      const oldMembers = Array.isArray(updated.member_aids) ? updated.member_aids.map(String).sort() : [];
-      if (members.length > 0 && JSON.stringify(oldMembers) !== JSON.stringify(members)) {
-        updated.member_aids = members;
-        updated.commitment = opts.commitment;
-        updated.updated_at = now;
-        changed = true;
-      }
-      if (opts.epochChain !== void 0 && updated.epoch_chain !== opts.epochChain) {
-        updated.epoch_chain = opts.epochChain;
-        updated.updated_at = now;
-        changed = true;
-      }
-      if (opts.epochChainUnverified === true) {
-        if (updated.epoch_chain_unverified !== true) {
-          updated.epoch_chain_unverified = true;
-          changed = true;
-        }
-        if (opts.epochChainUnverifiedReason && updated.epoch_chain_unverified_reason !== opts.epochChainUnverifiedReason) {
-          updated.epoch_chain_unverified_reason = opts.epochChainUnverifiedReason;
-          changed = true;
-        }
-      } else if (opts.epochChainUnverified === false) {
-        if ("epoch_chain_unverified" in updated || "epoch_chain_unverified_reason" in updated) {
-          delete updated.epoch_chain_unverified;
-          delete updated.epoch_chain_unverified_reason;
-          changed = true;
-        }
-      }
-      if (pendingRotationId && updated.pending_rotation_id !== pendingRotationId) {
-        updated.pending_rotation_id = pendingRotationId;
-        updated.pending_created_at = now;
-        changed = true;
-      }
-      if (!pendingRotationId && updated.pending_rotation_id) {
-        delete updated.pending_rotation_id;
-        delete updated.pending_created_at;
-        changed = true;
-      }
-      if (changed) await idbPut(STORE_GROUP_CURRENT, currentKey, { ...updated, group_id: groupId });
-      return true;
-    }
-    const oldKey = groupOldStoreKey(aid, groupId, epoch);
-    const oldRaw = await idbGet(STORE_GROUP_OLD_EPOCHS, oldKey);
-    if (isRecord(oldRaw)) {
-      const old = deepClone(oldRaw);
-      if (typeof old.secret === "string" && old.secret !== opts.secret) return false;
-    }
-    await idbPut(STORE_GROUP_OLD_EPOCHS, oldKey, {
-      ...newRecord,
-      epoch,
-      expires_at: now + opts.oldEpochRetentionMs
-    });
-    return true;
-  }
-  async _discardPendingGroupSecretUnlocked(aid, groupId, epoch, rotationId) {
-    const currentKey = groupCurrentStoreKey(aid, groupId);
-    const currentRaw = await idbGet(STORE_GROUP_CURRENT, currentKey);
-    if (!isRecord(currentRaw)) return false;
-    const current = deepClone(currentRaw);
-    if (Number(current.epoch ?? 0) !== Number(epoch)) return false;
-    if (String(current.pending_rotation_id ?? "").trim() !== rotationId) return false;
-    let restored = null;
-    let restoredKey = "";
-    for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid, groupId))) {
-      if (!isRecord(item.value)) continue;
-      const old = deepClone(item.value);
-      const oldEpoch = Number(old.epoch ?? 0);
-      if (oldEpoch >= Number(epoch) || !old.secret) continue;
-      if (!restored || oldEpoch > Number(restored.epoch ?? 0)) {
-        restored = old;
-        restoredKey = item.key;
-      }
-    }
-    if (!restored) {
-      await idbDelete(STORE_GROUP_CURRENT, currentKey);
-      for (const item of await idbGetAllByPrefix(STORE_GROUP_OLD_EPOCHS, groupOldPrefix(aid, groupId))) {
-        await idbDelete(STORE_GROUP_OLD_EPOCHS, item.key);
-      }
-      return true;
-    }
-    delete restored.group_id;
-    delete restored.expires_at;
-    await idbPut(STORE_GROUP_CURRENT, currentKey, { ...restored, group_id: groupId, updated_at: Date.now() });
-    if (restoredKey) await idbDelete(STORE_GROUP_OLD_EPOCHS, restoredKey);
-    return true;
-  }
-  _buildGroupCurrentRecord(groupId, opts, memberAids, now) {
-    const record = {
-      group_id: groupId,
-      epoch: opts.epoch,
-      secret: opts.secret,
-      commitment: opts.commitment,
-      member_aids: memberAids,
-      updated_at: now
-    };
-    if (opts.epochChain !== void 0) record.epoch_chain = opts.epochChain;
-    const pendingRotationId = String(opts.pendingRotationId ?? "").trim();
-    if (pendingRotationId) {
-      record.pending_rotation_id = pendingRotationId;
-      record.pending_created_at = now;
-    }
-    if (opts.epochChainUnverified === true) {
-      record.epoch_chain_unverified = true;
-      if (opts.epochChainUnverifiedReason) record.epoch_chain_unverified_reason = opts.epochChainUnverifiedReason;
-    }
-    return record;
-  }
-  _mergeGroupEntryFromLegacy(existing, incoming) {
-    const oldByEpoch = /* @__PURE__ */ new Map();
-    let current = existing && typeof existing.epoch === "number" ? deepClone(Object.fromEntries(
-      Object.entries(existing).filter(([key]) => key !== "old_epochs")
-    )) : null;
-    if (existing && Array.isArray(existing.old_epochs)) {
-      for (const rawOld of existing.old_epochs) {
-        if (typeof rawOld.epoch !== "number") continue;
-        oldByEpoch.set(rawOld.epoch, deepClone(rawOld));
-      }
-    }
-    if (typeof incoming.epoch === "number" && this._isGroupEpochRecoverable(incoming)) {
-      const incomingCurrent = deepClone(Object.fromEntries(
-        Object.entries(incoming).filter(([key]) => key !== "old_epochs")
-      ));
-      if (!current) {
-        current = incomingCurrent;
-      } else if (incomingCurrent.epoch > current.epoch) {
-        oldByEpoch.set(
-          current.epoch,
-          this._preferNewerGroupEpochRecord(oldByEpoch.get(current.epoch), current)
-        );
-        current = incomingCurrent;
-      } else if (incomingCurrent.epoch === current.epoch) {
-        current = this._preferNewerGroupEpochRecord(current, incomingCurrent);
-      } else {
-        oldByEpoch.set(
-          incomingCurrent.epoch,
-          this._preferNewerGroupEpochRecord(oldByEpoch.get(incomingCurrent.epoch), incomingCurrent)
-        );
-      }
-    }
-    const incomingOldEpochs = Array.isArray(incoming.old_epochs) ? incoming.old_epochs : [];
-    for (const rawOld of incomingOldEpochs) {
-      if (typeof rawOld.epoch !== "number" || !this._isGroupEpochRecoverable(rawOld)) continue;
-      oldByEpoch.set(rawOld.epoch, this._preferNewerGroupEpochRecord(oldByEpoch.get(rawOld.epoch), rawOld));
-    }
-    const merged = current ? deepClone(current) : {};
-    if (current && typeof current.epoch === "number") {
-      oldByEpoch.delete(current.epoch);
-    }
-    if (oldByEpoch.size > 0) {
-      merged.old_epochs = [...oldByEpoch.entries()].sort(([a], [b]) => a - b).map(([, value]) => deepClone(value));
-    }
-    return merged;
-  }
-  _preferNewerGroupEpochRecord(existing, incoming) {
-    if (!existing) return deepClone(incoming);
-    return Number(incoming.updated_at ?? 0) > Number(existing.updated_at ?? 0) ? deepClone(incoming) : deepClone(existing);
-  }
-  _isUnexpiredRecord(record, fallbackKey) {
-    const expiresAt = typeof record.expires_at === "number" ? record.expires_at : null;
-    if (expiresAt !== null) return expiresAt >= Date.now();
-    const marker = typeof record[fallbackKey] === "number" ? record[fallbackKey] : null;
-    return marker !== null && marker + STRUCTURED_RECOVERY_RETENTION_MS >= Date.now();
-  }
-  _isPrekeyRecoverable(record) {
-    return this._isUnexpiredRecord(record, "created_at");
-  }
-  _isGroupEpochRecoverable(record) {
-    const secret = record.secret;
-    if (!secret || typeof secret === "string" && secret.length === 0) return false;
-    return this._isUnexpiredRecord(record, "updated_at");
-  }
-  // ── Sessions 内部辅助 ─────────────────────────────────
-  async _loadSessionsUnlocked(aid) {
-    const items = await idbGetAllByPrefix(STORE_SESSIONS, sessionPrefix(aid));
-    const result = [];
-    for (const item of items) {
-      if (!isRecord(item.value)) continue;
-      result.push(deepClone(item.value));
-    }
-    return result;
-  }
-  async _migrateLegacySessionsUnlocked(aid) {
-    const metadataOnly = await this._loadMetadataOnlyUnlocked(aid) ?? {};
-    if (!Array.isArray(metadataOnly.e2ee_sessions) || metadataOnly.e2ee_sessions.length === 0) {
-      return;
-    }
-    for (const session of metadataOnly.e2ee_sessions) {
-      const sid = typeof session.session_id === "string" ? session.session_id : "";
-      if (!sid) continue;
-      const record = deepClone(session);
-      record.session_id = sid;
-      await idbPut(STORE_SESSIONS, sessionStoreKey(aid, sid), record);
-    }
-    const cleaned = deepClone(metadataOnly);
-    delete cleaned.e2ee_sessions;
-    await this._saveMetadataOnlyUnlocked(aid, cleaned);
-  }
 };
 __publicField(_IndexedDBTokenStore, "_aidTails", /* @__PURE__ */ new Map());
 // ── Trust Root Storage（信任根证书存储） ─────────────────
@@ -6877,11 +6307,35 @@ var RPCTransport = class {
       this._ws = ws;
       this._closed = false;
       let initialResolved = false;
+      let connectTimeout = null;
+      const clearConnectTimeout = () => {
+        if (connectTimeout !== null) {
+          clearTimeout(connectTimeout);
+          connectTimeout = null;
+        }
+      };
+      const cleanupHandshake = () => {
+        ws.onopen = null;
+        ws.onerror = null;
+        ws.onmessage = null;
+        ws.onclose = null;
+      };
+      const rollbackHandshake = () => {
+        cleanupHandshake();
+        this._ws = null;
+        this._closed = true;
+        try {
+          ws.close();
+        } catch {
+        }
+      };
       ws.onopen = () => {
       };
       ws.onerror = (event) => {
         if (!initialResolved) {
           initialResolved = true;
+          clearConnectTimeout();
+          rollbackHandshake();
           this._log.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=websocket_error`);
           reject(new ConnectionError(`websocket connection failed to ${url}`));
         }
@@ -6889,6 +6343,7 @@ var RPCTransport = class {
       ws.onmessage = (event) => {
         if (!initialResolved) {
           initialResolved = true;
+          clearConnectTimeout();
           try {
             const message = this._decodeMessage(event.data);
             if (message.method === "challenge") {
@@ -6907,6 +6362,7 @@ var RPCTransport = class {
               resolve(null);
             }
           } catch (err) {
+            rollbackHandshake();
             this._log.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
             reject(err instanceof Error ? err : new ConnectionError(String(err)));
           }
@@ -6918,10 +6374,22 @@ var RPCTransport = class {
         this._lastCloseReason = event.reason ?? "";
         if (!initialResolved) {
           initialResolved = true;
+          clearConnectTimeout();
+          cleanupHandshake();
+          this._ws = null;
+          this._closed = true;
           this._log.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=closed_before_initial code=${event.code}`);
           reject(new ConnectionError(`websocket closed before initial message: code=${event.code}`));
         }
       };
+      connectTimeout = globalThis.setTimeout(() => {
+        if (!initialResolved) {
+          initialResolved = true;
+          rollbackHandshake();
+          this._log.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=connect_timeout`);
+          reject(new ConnectionError("websocket connect timeout"));
+        }
+      }, this._timeout * 1e3);
     });
   }
   /** 关闭连接 */
@@ -7103,20 +6571,66 @@ var RPCTransport = class {
     return run;
   }
   _sendText(payload, context, beforeSend) {
-    return this._enqueueSend(() => {
+    return this._enqueueSend(async () => {
       if (beforeSend && !beforeSend()) {
         throw new ConnectionError(`send cancelled before write: ${context}`);
       }
       if (this._closed || !this._ws) {
         throw this._notConnectedError();
       }
+      const ws = this._ws;
       try {
-        this._ws.send(payload);
+        ws.send(payload);
       } catch (err) {
-        throw new ConnectionError(`failed to send ${context}: ${err instanceof Error ? err.message : String(err)}`);
+        throw await this._sendFailureError(context, err, ws);
       }
     });
   }
+  async _sendFailureError(context, err, ws) {
+    const original = err instanceof Error ? err.message : String(err);
+    const closeCode = await this._waitForCloseCodeIfClosing(ws);
+    if (closeCode !== null) {
+      const reason = this._lastCloseReason ? ` reason=${this._lastCloseReason}` : "";
+      return new ConnectionError(`failed to send ${context}: websocket closed: code=${closeCode}${reason}; original=${original}`, {
+        code: closeCode
+      });
+    }
+    return new ConnectionError(`failed to send ${context}: ${original}`);
+  }
+  async _waitForCloseCodeIfClosing(ws) {
+    if (this._lastCloseCode !== null) return this._lastCloseCode;
+    if (!ws) return null;
+    const readyState = Number(ws.readyState);
+    const closingState = typeof WebSocket !== "undefined" ? WebSocket.CLOSING : 2;
+    const closedState = typeof WebSocket !== "undefined" ? WebSocket.CLOSED : 3;
+    if (readyState !== closingState && readyState !== closedState) return null;
+    return await new Promise((resolve) => {
+      let settled = false;
+      let timer = null;
+      const finish = (code) => {
+        if (settled) return;
+        settled = true;
+        if (timer !== null) clearTimeout(timer);
+        try {
+          ws.removeEventListener("close", onClose);
+        } catch {
+        }
+        if (Number.isFinite(code)) {
+          resolve(Number(code));
+          return;
+        }
+        resolve(this._lastCloseCode);
+      };
+      const onClose = (event) => finish(event.code);
+      try {
+        ws.addEventListener("close", onClose);
+      } catch {
+        resolve(this._lastCloseCode);
+        return;
+      }
+      timer = setTimeout(() => finish(), 100);
+    });
+  }
   /** 从 pending / queue 中移除指定 RPC */
   _removeRpc(rpcId, pending) {
     const current = this._pending.get(rpcId);
@@ -7849,6 +7363,10 @@ var ClientRuntime = class {
 var PUSHED_SEQS_LIMIT = 5e4;
 var PENDING_ORDERED_LIMIT = 5e4;
 var GROUP_RECALL_SEEN_LIMIT = 1e4;
+var SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS = 200;
+var P2P_GAP_FILL_RETRY_LIMIT = 12;
+var P2P_GAP_FILL_RETRY_BASE_MS = 1e3;
+var P2P_GAP_FILL_RETRY_MAX_MS = 5e3;
 var APP_MESSAGE_ENVELOPE_KEYS = [
   "module_id",
   "message_type",
@@ -7898,6 +7416,24 @@ var APP_GROUP_EVENT_ENVELOPE_KEYS = [
 function formatDeliveryError(error) {
   return error instanceof Error ? error : String(error);
 }
+function isTransientGapFillError(error) {
+  const text3 = (error instanceof Error ? error.message : String(error)).toLowerCase();
+  return text3.includes("no_service") || text3.includes("service plane unavailable") || text3.includes("transport not connected") || text3.includes("transport closed") || text3.includes("websocket closed") || text3.includes("websocket is not open") || text3.includes("connection closed") || text3.includes("socket closed");
+}
+function p2pAppEventFromPlainPullMessage(message) {
+  const payload = message.payload;
+  const payloadType = isJsonObject(payload) ? String(payload.type ?? "").trim() : "";
+  if (payloadType === "message.recalled" || payloadType === "message.recall" || message.type === "message.recalled") {
+    return {
+      event: "message.recalled",
+      payload: {
+        ...message,
+        ...isJsonObject(payload) ? payload : {}
+      }
+    };
+  }
+  return { event: "message.received", payload: message };
+}
 var MessageDeliveryEngine = class {
   constructor(runtime) {
     __publicField(this, "runtime");
@@ -7981,7 +7517,8 @@ var MessageDeliveryEngine = class {
       const eventPayload = payload;
       client._groupState?.handleGroupChangedV2Membership?.(eventPayload);
       if (eventPayload.action === "dissolved") {
-        const groupId = normalizeGroupId(String(eventPayload.group_id ?? "")) || String(eventPayload.group_id ?? "").trim();
+        const rawGroupId = eventPayload.group_aid ?? eventPayload.group_id ?? "";
+        const groupId = normalizeGroupId(String(rawGroupId)) || String(rawGroupId).trim();
         if (groupId) client._cleanupDissolvedGroup?.(groupId);
       }
     }
@@ -8305,7 +7842,7 @@ var MessageDeliveryEngine = class {
         client._clientLog.warn("group recall auto-ack failed: group=" + groupId, e);
       });
     }
-    if (contig !== contigBefore) this.saveSeqTrackerState();
+    if (contig !== contigBefore) this.persistSeq(ns);
   }
   async publishAppEvent(event, payload) {
     const client = this.runtime.client;
@@ -8388,7 +7925,7 @@ var MessageDeliveryEngine = class {
             client._clientLog.warn(`P2P auto-ack failed:${String(e)}`);
           });
         }
-        if (contigAfter !== contigBefore) this.saveSeqTrackerState();
+        if (contigAfter !== contigBefore) this.persistSeq(ns);
         if (encryptedPush) return;
       } else {
         if (encryptedPush) {
@@ -8461,7 +7998,7 @@ var MessageDeliveryEngine = class {
               client._clientLog.warn("group recall auto-ack failed: group=" + groupId, e);
             });
           }
-          if (contigAfter2 !== contigBefore) this.saveSeqTrackerState();
+          if (contigAfter2 !== contigBefore) this.persistSeq(ns);
           return;
         }
         const published = encryptedPush ? await client._publishEncryptedPushMessage("group.message_created", "group.message_undecryptable", ns, seq, msg, true) : await this.publishOrderedMessage("group.message_created", ns, seq, msg);
@@ -8483,7 +8020,7 @@ var MessageDeliveryEngine = class {
             client._clientLog.warn("group message auto-ack failed: group=" + groupId, e);
           });
         }
-        if (contigAfter !== contigBefore) this.saveSeqTrackerState();
+        if (contigAfter !== contigBefore) this.persistSeq(ns);
         if (encryptedPush) return;
       } else {
         if (encryptedPush) {
@@ -8561,9 +8098,26 @@ var MessageDeliveryEngine = class {
     }
     await client._publishAppEvent("group.message_created", notification);
   }
-  async fillP2pGap() {
+  scheduleP2pGapRetry(ns, retryAttempt) {
+    const client = this.runtime.client;
+    if (retryAttempt > P2P_GAP_FILL_RETRY_LIMIT) return;
+    const retryKey = `p2p_pull_retry:${ns}`;
+    if (client._gapFillDone.has(retryKey)) return;
+    const delayMs = Math.min(
+      P2P_GAP_FILL_RETRY_BASE_MS * retryAttempt,
+      P2P_GAP_FILL_RETRY_MAX_MS
+    );
+    client._gapFillDone.add(retryKey);
+    client._clientLog.debug(`P2P message gap-fill retry scheduled: ns=${ns} attempt=${retryAttempt} delay_ms=${delayMs}`);
+    globalThis.setTimeout(() => {
+      client._gapFillDone.delete(retryKey);
+      if (client.state !== "ready" /* READY */ || client._closing) return;
+      client._safeAsync(this.fillP2pGap(retryAttempt));
+    }, delayMs);
+  }
+  async fillP2pGap(retryAttempt = 0) {
     const client = this.runtime.client;
-    if (client._state !== "connected" || client._closing) return;
+    if (client.state !== "ready" /* READY */ || client._closing) return;
     if (!client._aid) return;
     const ns = `p2p:${client._aid}`;
     const afterSeq = client._seqTracker.getContiguousSeq(ns);
@@ -8577,18 +8131,51 @@ var MessageDeliveryEngine = class {
       filled = messages.length;
       this.prunePushedSeqs(ns);
     } catch (exc) {
-      client._clientLog.warn(`P2P message gap-fill failed:${String(formatDeliveryError(exc))}`);
+      const transient = isTransientGapFillError(exc);
+      if (transient) {
+        try {
+          filled = await this.fillP2pGapWithPlainPull(ns, afterSeq);
+          this.prunePushedSeqs(ns);
+          client._clientLog.warn(`P2P message gap-fill V2 unavailable, used plain pull fallback:${String(formatDeliveryError(exc))}`);
+        } catch (fallbackExc) {
+          client._clientLog.warn(`P2P message gap-fill plain fallback failed:${String(formatDeliveryError(fallbackExc))}`);
+          this.scheduleP2pGapRetry(ns, retryAttempt + 1);
+        }
+      } else {
+        client._clientLog.warn(`P2P message gap-fill failed:${String(formatDeliveryError(exc))}`);
+      }
     } finally {
       client._gapFillDone.delete(dedupKey);
       this.runtime.delivery.setGapFillActive(false);
-      if (filled > 0 && client._seqTracker.getContiguousSeq(ns) > afterSeq) {
-        client._safeAsync(this.fillP2pGap());
+    }
+  }
+  async fillP2pGapWithPlainPull(ns, afterSeq) {
+    const client = this.runtime.client;
+    const params2 = {
+      after_seq: afterSeq,
+      limit: 50,
+      device_id: client._deviceId,
+      slot_id: client._slotId,
+      _rpc_background: true
+    };
+    const raw = await client._transport.call("message.pull", params2, void 0, void 0, true);
+    const result = typeof client._rpcPipeline?.postprocessResult === "function" ? await client._rpcPipeline.postprocessResult("message.pull", params2, raw) : raw;
+    const messages = isJsonObject(result) && Array.isArray(result.messages) ? result.messages : [];
+    let published = 0;
+    for (const item of messages) {
+      if (!isJsonObject(item)) continue;
+      const msg = item;
+      const seq = Number(msg.seq ?? 0);
+      const appEvent = p2pAppEventFromPlainPullMessage(msg);
+      if (await this.publishPulledMessage(appEvent.event, ns, seq, appEvent.payload)) {
+        published += 1;
       }
     }
+    return published;
   }
   async fillGroupGap(groupId) {
     const client = this.runtime.client;
-    if (client._state !== "connected" || client._closing) return;
+    if (client.state !== "ready" /* READY */ || client._closing) return;
     groupId = normalizeGroupId(groupId) || String(groupId ?? "").trim();
     if (!groupId) return;
     const ns = `group:${groupId}`;
@@ -8614,7 +8201,9 @@ var MessageDeliveryEngine = class {
   }
   async fillGroupEventGap(groupId) {
     const client = this.runtime.client;
-    if (client._state !== "connected" || client._closing) return;
+    if (client.state !== "ready" /* READY */ || client._closing) return;
+    groupId = normalizeGroupId(groupId) || String(groupId ?? "").trim();
+    if (!groupId) return;
     const ns = `group_event:${groupId}`;
     const afterSeq = client._seqTracker.getContiguousSeq(ns);
     const dedupKey = `group_event_pull:${ns}`;
@@ -8676,7 +8265,7 @@ var MessageDeliveryEngine = class {
         const ackContig = client._seqTracker.getContiguousSeq(ns);
         await this.drainOrderedMessages(ns);
         if (ackContig !== pageContigBefore && !hasDissolvedEvent) {
-          this.saveSeqTrackerState();
+          this.persistSeq(ns);
         }
         if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
           const ackSeq = this.clampAckSeq("group.ack_events", "event_seq", ns, ackContig);
@@ -8706,6 +8295,7 @@ var MessageDeliveryEngine = class {
   }
   async handleGroupChangedEventSeq(data, groupId) {
     const client = this.runtime.client;
+    groupId = normalizeGroupId(groupId) || String(groupId ?? "").trim();
     let needPull = false;
     const rawEventSeq = data.event_seq;
     const eventSeq = Number(rawEventSeq);
@@ -8738,7 +8328,7 @@ var MessageDeliveryEngine = class {
     const ackContig = client._seqTracker.getContiguousSeq(ns);
     await this.drainOrderedMessages(ns);
     if (ackContig > 0 && ackContig !== contigBefore) {
-      if (data.action !== "dissolved") this.saveSeqTrackerState();
+      if (data.action !== "dissolved") this.persistSeq(ns);
       const ackSeq = this.clampAckSeq("group.ack_events", "event_seq", ns, ackContig);
       client._transport.call("group.ack_events", {
         group_id: groupId,
@@ -8782,7 +8372,7 @@ var MessageDeliveryEngine = class {
     this.runtime.delivery.setOnlineUnreadHintDrainActive(true);
     try {
       while (client._onlineUnreadHintQueue.size > 0) {
-        if (client.state !== "ready") return;
+        if (client.state !== "ready" /* READY */) return;
         if (client._sessionOptions?.background_sync === false) return;
         const groupId = client._onlineUnreadHintQueue.keys().next().value;
         if (!groupId) return;
@@ -8900,7 +8490,7 @@ var MessageDeliveryEngine = class {
           const published = await client._publishOrderedMessage("message.received", ns, pushSeq, decrypted);
           const newContig = client._seqTracker.getContiguousSeq(ns);
           if (newContig !== contigBefore) {
-            client._saveSeqTrackerState();
+            this.persistSeq(ns);
           }
           if (newContig > 0 && newContig !== contigBefore) {
             const ackSeq = this.clampAckSeq("message.v2.ack", "up_to_seq", ns, newContig);
@@ -9060,49 +8650,130 @@ var MessageDeliveryEngine = class {
     }
     return newState;
   }
-  saveSeqTrackerState() {
+  async saveSeqTrackerState() {
     const client = this.runtime.client;
-    if (!client._aid) return;
+    const context = this.currentSeqTrackerContext();
+    if (!context) {
+      await this.flushSeqTrackerPending();
+      return;
+    }
     const state = client._seqTracker.exportState();
-    if (Object.keys(state).length === 0) return;
+    const pending = this.seqTrackerPending();
+    if (pending.size > 0 && client._seqTrackerPendingPersistContext === context) {
+      const liveNamespaces = new Set(Object.keys(state));
+      for (const ns of [...pending.keys()]) {
+        if (!liveNamespaces.has(ns)) pending.delete(ns);
+      }
+      if (pending.size === 0) client._seqTrackerPendingPersistContext = null;
+    }
+    if (Object.keys(state).length > 0) this.mergeSeqTrackerPending(context, state);
+    await this.flushSeqTrackerPending();
+  }
+  persistSeq(ns, forceSeq) {
+    const client = this.runtime.client;
+    const context = this.currentSeqTrackerContext();
+    if (!context) {
+      void this.flushSeqTrackerPending();
+      return;
+    }
+    const seq = forceSeq ?? client._seqTracker.getContiguousSeq(ns);
+    if (!ns || !Number.isFinite(seq) || seq <= 0) return;
+    if (forceSeq !== void 0) {
+      client._seqTracker.forceContiguousSeq(ns, seq);
+    }
+    this.mergeSeqTrackerPending(context, { [ns]: seq });
+    this.scheduleSeqTrackerFlush();
+  }
+  async flushSeqTrackerPending() {
+    const client = this.runtime.client;
+    this.cancelSeqTrackerFlushTimer();
+    const context = client._seqTrackerPendingPersistContext;
+    const pending = this.seqTrackerPending();
+    if (!context || pending.size === 0) {
+      client._seqTrackerPendingPersistContext = null;
+      return;
+    }
+    const [aid, deviceId, slotId] = JSON.parse(context);
+    const state = Object.fromEntries(pending.entries());
+    pending.clear();
+    client._seqTrackerPendingPersistContext = null;
+    await this.writeSeqTrackerState(aid, deviceId, slotId, state);
+  }
+  dropSeqTrackerPending(ns) {
+    const client = this.runtime.client;
+    const pending = this.seqTrackerPending();
+    pending.delete(ns);
+    if (pending.size === 0) {
+      client._seqTrackerPendingPersistContext = null;
+      this.cancelSeqTrackerFlushTimer();
+    }
+  }
+  currentSeqTrackerContext() {
+    const client = this.runtime.client;
+    if (!client._aid) return null;
+    return JSON.stringify([client._aid, client._deviceId, client._slotId]);
+  }
+  seqTrackerPending() {
+    const client = this.runtime.client;
+    if (!(client._seqTrackerPendingPersist instanceof Map)) {
+      client._seqTrackerPendingPersist = /* @__PURE__ */ new Map();
+    }
+    return client._seqTrackerPendingPersist;
+  }
+  mergeSeqTrackerPending(context, state) {
+    const client = this.runtime.client;
+    const pending = this.seqTrackerPending();
+    const pendingContext = client._seqTrackerPendingPersistContext;
+    if (pendingContext && pendingContext !== context && pending.size > 0) {
+      void this.flushSeqTrackerPending();
+    }
+    client._seqTrackerPendingPersistContext = context;
+    for (const [ns, seq] of Object.entries(state)) {
+      const seqNum = Number(seq);
+      if (ns && Number.isFinite(seqNum) && seqNum > 0) {
+        pending.set(ns, seqNum);
+      }
+    }
+  }
+  scheduleSeqTrackerFlush() {
+    const client = this.runtime.client;
+    const pending = this.seqTrackerPending();
+    if (pending.size === 0) return;
+    if (client._seqTrackerFlushTimer) return;
+    client._seqTrackerFlushTimer = setTimeout(() => {
+      client._seqTrackerFlushTimer = null;
+      void this.flushSeqTrackerPending();
+    }, SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS);
+  }
+  cancelSeqTrackerFlushTimer() {
+    const client = this.runtime.client;
+    if (client._seqTrackerFlushTimer) {
+      clearTimeout(client._seqTrackerFlushTimer);
+      client._seqTrackerFlushTimer = null;
+    }
+  }
+  async writeSeqTrackerState(aid, deviceId, slotId, state) {
+    const client = this.runtime.client;
+    if (!aid || Object.keys(state).length === 0) return;
     try {
       const saveFn = client._tokenStore.saveSeq?.bind(client._tokenStore);
       if (typeof saveFn === "function") {
-        for (const [ns, seq] of Object.entries(state)) {
-          saveFn(client._aid, client._deviceId, client._slotId, ns, seq).catch((exc) => {
-            client._dispatcher.publish("seq_tracker.persist_error", {
-              phase: "save",
-              aid: client._aid,
-              device_id: client._deviceId,
-              slot_id: client._slotId,
-              error: String(exc)
-            }).catch(() => {
-            });
-          });
-        }
+        await Promise.all(Object.entries(state).map(([ns, seq]) => saveFn(aid, deviceId, slotId, ns, seq)));
         return;
       }
       if (typeof client._tokenStore.updateInstanceState === "function") {
-        client._tokenStore.updateInstanceState(client._aid, client._deviceId, client._slotId, (current) => {
-          current.seq_tracker_state = state;
+        await client._tokenStore.updateInstanceState(aid, deviceId, slotId, (current) => {
+          const existing = isJsonObject(current.seq_tracker_state) ? { ...current.seq_tracker_state } : {};
+          current.seq_tracker_state = { ...existing, ...state };
           return current;
-        }).catch((exc) => {
-          client._dispatcher.publish("seq_tracker.persist_error", {
-            phase: "save",
-            aid: client._aid,
-            device_id: client._deviceId,
-            slot_id: client._slotId,
-            error: String(exc)
-          }).catch(() => {
-          });
         });
       }
     } catch (exc) {
       client._dispatcher.publish("seq_tracker.persist_error", {
         phase: "save",
-        aid: client._aid,
-        device_id: client._deviceId,
-        slot_id: client._slotId,
+        aid,
+        device_id: deviceId,
+        slot_id: slotId,
         error: String(exc)
       }).catch(() => {
       });
@@ -9112,6 +8783,7 @@ var MessageDeliveryEngine = class {
     const client = this.runtime.client;
     if (!client._aid || !ns) return;
     const seq = client._seqTracker.getContiguousSeq(ns);
+    this.dropSeqTrackerPending(ns);
     try {
       if (seq > 0 && typeof client._tokenStore.saveSeq === "function") {
         client._tokenStore.saveSeq(client._aid, client._deviceId, client._slotId, ns, seq).catch((exc) => {
@@ -9126,8 +8798,21 @@ var MessageDeliveryEngine = class {
         });
         return;
       }
+      if (seq <= 0 && typeof client._tokenStore.updateInstanceState === "function") {
+        Promise.resolve(client._tokenStore.updateInstanceState(client._aid, client._deviceId, client._slotId, (current) => {
+          if (isJsonObject(current.seq_tracker_state)) {
+            const next = { ...current.seq_tracker_state };
+            delete next[ns];
+            current.seq_tracker_state = next;
+          }
+          return current;
+        })).catch((exc) => {
+          client._clientLog.debug(`delete repaired seq failed: ns=${ns} err=${formatDeliveryError(exc)}`);
+        });
+        return;
+      }
       if (seq > 0) {
-        this.saveSeqTrackerState();
+        void this.saveSeqTrackerState();
       }
     } catch (exc) {
       client._clientLog.debug(`persist repaired seq failed: ns=${ns} err=${formatDeliveryError(exc)}`);
@@ -9179,14 +8864,19 @@ var MessageDeliveryEngine = class {
     if (!queue || queue.size === 0) return;
     const contig = client._seqTracker.getContiguousSeq(ns);
     const ready = [...queue.keys()].filter((seq) => seq <= contig && (beforeSeq === void 0 || seq < beforeSeq)).sort((a, b) => a - b);
+    let delivered = false;
     for (const seq of ready) {
       const item = queue.get(seq);
       queue.delete(seq);
       if (!item || client._pushedSeqs.get(ns)?.has(seq)) continue;
       await this.publishOrderedQueueItem(ns, item.event, seq, item.payload);
       this.markPublishedSeq(ns, seq);
+      delivered = true;
+    }
+    if (queue.size === 0) {
+      client._pendingOrderedMsgs.delete(ns);
+      if (delivered) await this.saveSeqTrackerState();
     }
-    if (queue.size === 0) client._pendingOrderedMsgs.delete(ns);
   }
   async publishOrderedMessage(event, ns, seq, payload) {
     const client = this.runtime.client;
@@ -9214,6 +8904,7 @@ var MessageDeliveryEngine = class {
     await this.publishOrderedQueueItem(ns, event, seqNum, payload);
     this.markPublishedSeq(ns, seqNum);
     await this.drainOrderedMessages(ns);
+    if (!client._pendingOrderedMsgs.get(ns)) await this.saveSeqTrackerState();
     return true;
   }
   async publishPulledMessage(event, ns, seq, payload) {
@@ -9478,7 +9169,7 @@ var LifecycleController = class {
       client._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms reason=not_connected`);
       return;
     }
-    client._saveSeqTrackerState();
+    await client._saveSeqTrackerState();
     client._stopBackgroundTasks();
     if (client._reconnectAbort) {
       client._reconnectAbort.abort();
@@ -9494,7 +9185,7 @@ var LifecycleController = class {
     const tStart = Date.now();
     client._clientLog.debug(`close enter: state=${client._state}`);
     this.runtime.lifecycle.setClosing(true);
-    client._saveSeqTrackerState();
+    await client._saveSeqTrackerState();
     client._stopBackgroundTasks();
     if (client._reconnectAbort) {
       client._reconnectAbort.abort();
@@ -9563,9 +9254,6 @@ var INTERNAL_ONLY_METHODS = /* @__PURE__ */ new Set([
   "auth.refresh_token",
   "initialize"
 ]);
-var REMOVED_E2EE_METHODS = /* @__PURE__ */ new Set([
-  "group.rotate_epoch"
-]);
 var PROTECTED_HEADERS_METHODS = /* @__PURE__ */ new Set([
   "message.send",
   "group.send",
@@ -9592,13 +9280,11 @@ var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "group.add_member",
   "group.leave",
   "group.remove_member",
-  "group.update_rules",
   "group.update",
-  "group.update_announcement",
-  "group.update_join_requirements",
   "group.set_role",
   "group.transfer_owner",
   "group.bind_group_aid",
+  "group.renew_group_aid",
   "group.complete_transfer",
   "group.review_join_request",
   "group.batch_review_join_request",
@@ -9607,10 +9293,14 @@ var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "group.thought.put",
   "message.thought.put",
   "group.set_settings",
+  "group.update_announcement",
+  "group.update_rules",
   "group.fs.mkdir",
   "group.fs.rm",
   "group.fs.cp",
   "group.fs.mv",
+  "group.fs.set_acl",
+  "group.fs.remove_acl",
   "group.fs.mount",
   "group.fs.umount",
   "group.fs.check_upload",
@@ -9671,6 +9361,59 @@ var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "group.suspend",
   "group.resume"
 ]);
+var SIGNING_KEY_CACHE_MAX = 32;
+var signingKeyCache = /* @__PURE__ */ new Map();
+var certFingerprintCache = /* @__PURE__ */ new Map();
+function cacheGet(cache, key) {
+  const value = cache.get(key);
+  if (value !== void 0) {
+    cache.delete(key);
+    cache.set(key, value);
+  }
+  return value;
+}
+function cachePut(cache, key, value) {
+  cache.set(key, value);
+  while (cache.size > SIGNING_KEY_CACHE_MAX) {
+    const first = cache.keys().next().value;
+    if (first === void 0) break;
+    cache.delete(first);
+  }
+  return value;
+}
+async function sha256HexText(text3) {
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(text3));
+  return Array.from(new Uint8Array(digest)).map((b) => b.toString(16).padStart(2, "0")).join("");
+}
+async function signingPrivateKey(privateKeyPem) {
+  const key = await sha256HexText(privateKeyPem);
+  let cached = cacheGet(signingKeyCache, key);
+  if (!cached) {
+    const pkcs8 = pemToArrayBuffer(privateKeyPem);
+    cached = crypto.subtle.importKey(
+      "pkcs8",
+      pkcs8,
+      { name: "ECDSA", namedCurve: "P-256" },
+      false,
+      ["sign"]
+    );
+    cachePut(signingKeyCache, key, cached);
+  }
+  return await cached;
+}
+async function signingCertFingerprint(certPem) {
+  const key = await sha256HexText(certPem);
+  let cached = cacheGet(certFingerprintCache, key);
+  if (!cached) {
+    cached = (async () => {
+      const certDer = pemToArrayBuffer(certPem);
+      const fpBuf = await crypto.subtle.digest("SHA-256", certDer);
+      return "sha256:" + Array.from(new Uint8Array(fpBuf)).map((b) => b.toString(16).padStart(2, "0")).join("");
+    })();
+    cachePut(certFingerprintCache, key, cached);
+  }
+  return await cached;
+}
 var PULL_GATE_STALE_MS = 3e4;
 var NON_IDEMPOTENT_TIMEOUT = 35;
 var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
@@ -9682,10 +9425,9 @@ var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
   "group.remove_member",
   "group.leave",
   "group.dissolve",
-  "group.update_name",
-  "group.update_avatar",
+  "group.set_settings",
   "group.update_announcement",
-  "group.update_settings",
+  "group.update_rules",
   "storage.put_object",
   "storage.delete_object",
   "storage.create_share_link",
@@ -9735,6 +9477,8 @@ var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
   "group.fs.rm",
   "group.fs.cp",
   "group.fs.mv",
+  "group.fs.set_acl",
+  "group.fs.remove_acl",
   "group.fs.mount",
   "group.fs.umount",
   "group.fs.check_upload",
@@ -9751,6 +9495,16 @@ var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
   "collab.tag.rm",
   "collab.tag.prune"
 ]);
+function hasMatchingV2Session(client) {
+  const session = client._v2Session;
+  if (!session) return false;
+  if (session.currentIkPubDer === void 0) return true;
+  return session.aid === client._aid && session.deviceId === client._deviceId;
+}
+function isTransientV2PullFallbackError(error) {
+  const text3 = (error instanceof Error ? error.message : String(error)).toLowerCase();
+  return text3.includes("no_service") || text3.includes("service plane unavailable");
+}
 var RpcPipeline = class {
   constructor(runtime) {
     __publicField(this, "runtime");
@@ -9807,7 +9561,7 @@ var RpcPipeline = class {
           "V2 session not initialized; encrypted group.send requires V2 (V1 E2EE removed)"
         );
         client._clientLog.debug("call route: group.send -> V2 encrypted send");
-        return await client._sendGroupV2(String(p.group_id ?? ""), p.payload ?? {}, {
+        return await client._sendGroupV2(String(p.group_aid ?? p.group_id ?? ""), p.payload ?? {}, {
           messageId: String(p.message_id ?? "") || void 0,
           timestamp: p.timestamp,
           protectedHeaders: client._protectedHeadersFromParams(p),
@@ -9850,20 +9604,27 @@ var RpcPipeline = class {
   }
   async callImplInner(method, p, skipSendResultEnvelope = false) {
     const client = this.runtime.client;
-    if (method === "message.pull") {
-      await client._ensureV2SessionReady("message.pull");
-      client._clientLog.debug("call route: message.pull -> V2 pull");
-      const messages = await client._pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
-      return { messages };
+    if (method === "message.v2.pull" || method === "message.pull" && hasMatchingV2Session(client)) {
+      try {
+        await client._ensureV2SessionReady("message.pull");
+        client._clientLog.debug(`call route: ${method} -> V2 pull`);
+        const messages = await client._pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
+        return { messages };
+      } catch (exc) {
+        if (method !== "message.pull" || !isTransientV2PullFallbackError(exc)) {
+          throw exc;
+        }
+        client._clientLog.warn(`message.pull V2 route unavailable, fallback to plain pull: ${exc instanceof Error ? exc.message : String(exc)}`);
+      }
     }
-    if (method === "message.ack") {
+    if (method === "message.v2.ack" || method === "message.ack" && hasMatchingV2Session(client)) {
       await client._ensureV2SessionReady("message.ack");
-      client._clientLog.debug("call route: message.ack -> V2 ack");
+      client._clientLog.debug(`call route: ${method} -> V2 ack`);
       return await client._ackV2(Number(p.seq ?? p.up_to_seq ?? 0) || void 0);
     }
-    if (method === "group.pull" && p.group_id) {
+    if ((method === "group.v2.pull" || method === "group.pull") && p.group_id && (method === "group.v2.pull" || hasMatchingV2Session(client))) {
       await client._ensureV2SessionReady("group.pull");
-      client._clientLog.debug("call route: group.pull -> V2 pull");
+      client._clientLog.debug(`call route: ${method} -> V2 pull`);
       const hasExplicitAfterSeq = "after_seq" in p || "after_message_seq" in p;
       const cursorParams = client._explicitGroupCursorParams(p);
       const ownsCursor = Object.keys(cursorParams).length === 0 || client._groupCursorTargetsCurrentInstance(cursorParams);
@@ -9871,24 +9632,25 @@ var RpcPipeline = class {
       if (hasExplicitAfterSeq) pullOpts.explicitAfterSeq = true;
       if (Object.keys(cursorParams).length > 0) pullOpts.cursorParams = cursorParams;
       if (!ownsCursor) pullOpts.ownsCursor = false;
+      if (String(p.group_id ?? "").trim()) pullOpts.wireGroupId = String(p.group_id).trim();
       const messages = await client._pullGroupV2(
-        String(p.group_id),
+        String(p.group_aid ?? p.group_id),
         Number(p.after_seq ?? p.after_message_seq ?? 0) || 0,
         Number(p.limit ?? 50) || 50,
         Object.keys(pullOpts).length > 0 ? pullOpts : void 0
       );
       return { messages };
     }
-    if (method === "group.ack_messages" && p.group_id) {
+    if ((method === "group.v2.ack" || method === "group.ack_messages") && p.group_id && (method === "group.v2.ack" || hasMatchingV2Session(client))) {
       await client._ensureV2SessionReady("group.ack_messages");
-      client._clientLog.debug("call route: group.ack_messages -> V2 ack");
+      client._clientLog.debug(`call route: ${method} -> V2 ack`);
       const cursorParams = client._explicitGroupCursorParams(p);
       const ownsCursor = Object.keys(cursorParams).length === 0 || client._groupCursorTargetsCurrentInstance(cursorParams);
       if (!ownsCursor) {
         return await client._rawGroupAckMessages(p);
       }
       return await client._ackGroupV2(
-        String(p.group_id),
+        String(p.group_aid ?? p.group_id),
         Number(p.seq ?? p.msg_seq ?? p.up_to_seq ?? 0) || void 0
       );
     }
@@ -9909,15 +9671,12 @@ var RpcPipeline = class {
   }
   preflight(method, params2) {
     const client = this.runtime.client;
-    if (client._state !== "connected") {
+    if (client.state !== "ready" /* READY */) {
       throw new ConnectionError("client is not connected");
     }
     if (INTERNAL_ONLY_METHODS.has(method)) {
       throw new PermissionError(`method is internal_only: ${method}`);
     }
-    if (method.startsWith("message.e2ee.") || method.startsWith("group.e2ee.") || REMOVED_E2EE_METHODS.has(method)) {
-      throw new PermissionError(`legacy E2EE method is removed in this SDK: ${method}`);
-    }
     const p = { ...params2 ?? {} };
     this.mergeInstanceProtectedHeaders(method, p);
     const rpcBackground = Boolean(p._rpc_background) || client._backgroundRpcDepth > 0;
@@ -9925,6 +9684,7 @@ var RpcPipeline = class {
     if (method === "message.send" || method === "group.send") {
       this.normalizeOutboundMessagePayload(p, method);
     }
+    this.normalizeGroupCallIdentifier(method, p);
     this.validateOutboundCall(method, p);
     this.injectMessageCursorContext(method, p);
     this.captureGroupCursorParams(method, p);
@@ -9954,6 +9714,7 @@ var RpcPipeline = class {
   validateOutboundCall(method, params2) {
     if (method === "message.send") {
       this.validateMessageRecipient(params2.to);
+      validateAIDFormat(params2.to, "message.send.to");
       if ("persist" in params2) {
         throw new ValidationError("message.send no longer accepts 'persist'; configure delivery_mode during connect");
       }
@@ -9962,6 +9723,7 @@ var RpcPipeline = class {
       }
     }
     if (method === "group.send") {
+      validateGroupIDFormat(params2.group_id, "group.send.group_id");
       if ("persist" in params2) {
         throw new ValidationError("group.send does not accept 'persist'; group messages are always fanout");
       }
@@ -9978,17 +9740,28 @@ var RpcPipeline = class {
         throw new ValidationError(`${method} requires context.type + context.id`);
       }
     }
-    if (method === "group.thought.get" && !String(params2.sender_aid ?? "").trim()) {
-      throw new ValidationError("group.thought.get requires sender_aid");
+    if (method === "group.thought.put") {
+      validateGroupIDFormat(params2.group_id, "group.thought.put.group_id");
+    }
+    if (method === "group.thought.get") {
+      if (!String(params2.sender_aid ?? "").trim()) {
+        throw new ValidationError("group.thought.get requires sender_aid");
+      }
+      validateAIDFormat(params2.sender_aid, "group.thought.get.sender_aid");
+      validateGroupIDFormat(params2.group_id, "group.thought.get.group_id");
     }
     if (method === "message.thought.put") {
       this.validateMessageRecipient(params2.to);
       if (!String(params2.to ?? "").trim()) {
         throw new ValidationError("message.thought.put requires to");
       }
+      validateAIDFormat(params2.to, "message.thought.put.to");
     }
-    if (method === "message.thought.get" && !String(params2.sender_aid ?? "").trim()) {
-      throw new ValidationError("message.thought.get requires sender_aid");
+    if (method === "message.thought.get") {
+      if (!String(params2.sender_aid ?? "").trim()) {
+        throw new ValidationError("message.thought.get requires sender_aid");
+      }
+      validateAIDFormat(params2.sender_aid, "message.thought.get.sender_aid");
     }
   }
   injectMessageCursorContext(method, params2) {
@@ -10045,14 +9818,7 @@ var RpcPipeline = class {
       );
       const paramsHash = Array.from(new Uint8Array(paramsHashBuf)).map((b) => b.toString(16).padStart(2, "0")).join("");
       const signData = new TextEncoder().encode(`${method}|${aid}|${ts}|${paramsHash}`);
-      const pkcs8 = pemToArrayBuffer(currentAid.privateKeyPem);
-      const cryptoKey = await crypto.subtle.importKey(
-        "pkcs8",
-        pkcs8,
-        { name: "ECDSA", namedCurve: "P-256" },
-        false,
-        ["sign"]
-      );
+      const cryptoKey = await signingPrivateKey(currentAid.privateKeyPem);
       const sigP1363 = await crypto.subtle.sign(
         { name: "ECDSA", hash: "SHA-256" },
         cryptoKey,
@@ -10062,9 +9828,7 @@ var RpcPipeline = class {
       let certFingerprint = "";
       const certPem = currentAid.certPem;
       if (certPem) {
-        const certDer = pemToArrayBuffer(certPem);
-        const fpBuf = await crypto.subtle.digest("SHA-256", certDer);
-        certFingerprint = "sha256:" + Array.from(new Uint8Array(fpBuf)).map((b) => b.toString(16).padStart(2, "0")).join("");
+        certFingerprint = await signingCertFingerprint(certPem);
       }
       params2.client_signature = {
         aid,
@@ -10084,11 +9848,11 @@ var RpcPipeline = class {
       return client._aid ? `p2p:${client._aid}` : "";
     }
     if (method === "group.pull" || method === "group.v2.pull") {
-      const gid = String(params2.group_id ?? "").trim();
+      const gid = String(params2.group_aid ?? params2.group_id ?? "").trim();
       return gid ? `group:${gid}` : "";
     }
     if (method === "group.pull_events") {
-      const gid = String(params2.group_id ?? "").trim();
+      const gid = String(params2.group_aid ?? params2.group_id ?? "").trim();
       return gid ? `group_event:${gid}` : "";
     }
     return "";
@@ -10200,13 +9964,13 @@ var RpcPipeline = class {
       }
     }
     if (client._seqTracker.getContiguousSeq(ns) !== contigBefore) {
-      client._saveSeqTrackerState?.();
+      client._persistSeq?.(ns);
     }
     result._contig_before = contigBefore;
   }
   postprocessGroupPull(params2, result) {
     const client = this.runtime.client;
-    const gid = String(params2.group_id ?? "").trim();
+    const gid = String(params2.group_aid ?? params2.group_id ?? "").trim();
     if (!gid || !client._seqTracker) {
       return;
     }
@@ -10227,7 +9991,7 @@ var RpcPipeline = class {
       }
     }
     if (client._seqTracker.getContiguousSeq(ns) !== contigBefore) {
-      client._saveSeqTrackerState?.();
+      client._persistSeq?.(ns);
     }
     result._contig_before = contigBefore;
   }
@@ -10245,14 +10009,7 @@ var RpcPipeline = class {
       return;
     }
     const client = this.runtime.client;
-    if (params2.group_id !== void 0 && params2.group_id !== null) {
-      const rawGroupId = String(params2.group_id);
-      const normalizedGroupId2 = normalizeGroupId(rawGroupId);
-      if (normalizedGroupId2 && normalizedGroupId2 !== rawGroupId) {
-        client._clientLog?.debug?.(`call group_id normalized: ${rawGroupId} -> ${normalizedGroupId2} method=${method}`);
-      }
-      params2.group_id = normalizedGroupId2;
-    }
+    this.normalizeGroupCallIdentifier(method, params2);
     if (params2.device_id === void 0) {
       params2.device_id = client._deviceId;
     }
@@ -10260,6 +10017,40 @@ var RpcPipeline = class {
       params2.slot_id = client._slotId;
     }
   }
+  normalizeGroupCallIdentifier(method, params2) {
+    if (!method.startsWith("group.")) {
+      return;
+    }
+    const record = params2;
+    const rawEntries = [
+      ["group_aid", record.group_aid],
+      ["groupAid", record.groupAid],
+      ["group_id", record.group_id],
+      ["groupId", record.groupId]
+    ];
+    const found = rawEntries.find(([, value]) => String(value ?? "").trim());
+    if (found) {
+      const [key, raw] = found;
+      const rawGroupId = String(raw).trim();
+      const normalizedGroupId2 = normalizeGroupId(rawGroupId);
+      if (normalizedGroupId2) {
+        if (normalizedGroupId2 !== rawGroupId) {
+          this.runtime.client._clientLog?.debug?.(`call group identifier normalized: ${key}=${rawGroupId} -> ${normalizedGroupId2} method=${method}`);
+        }
+        const existingGroupId = String(record.group_id ?? record.groupId ?? "").trim();
+        if (key === "group_id" || key === "groupId") {
+          params2.group_id = rawGroupId;
+        } else if (existingGroupId) {
+          params2.group_id = existingGroupId;
+        } else {
+          params2.group_id = normalizedGroupId2;
+        }
+        params2.group_aid = normalizedGroupId2;
+      }
+    }
+    delete record.groupAid;
+    delete record.groupId;
+  }
   groupCursorParams(params2) {
     const cursorParams = {};
     for (const key of ["device_id", "slot_id", "device_name", "device_type"]) {
@@ -10696,6 +10487,15 @@ var StorageLowLevel = class {
       parents: options.parents ?? false
     }), options.path);
   }
+  fsTouch(options) {
+    return this.call("storage.fs.touch", params(options.owner, options.bucket, {
+      path: options.path,
+      parents: options.parents ?? false,
+      no_create: options.noCreate ?? false,
+      mtime: options.mtime,
+      follow_symlinks: options.followSymlinks ?? false
+    }), options.path);
+  }
   fsRemove(options) {
     return this.call("storage.fs.remove", params(options.owner, options.bucket, {
       path: options.path,
@@ -10768,8 +10568,10 @@ var StorageLowLevel = class {
     }), options.mountPath);
   }
   fsInvalidateMembership(options) {
+    const groupId = options.groupId ?? options.groupAid;
     return this.call("storage.fs.invalidate_membership", stripUndefined({
-      group_id: options.groupId,
+      group_id: groupId,
+      group_aid: options.groupAid,
       group_owner_aid: options.groupOwnerAid,
       member_aid: options.memberAid,
       reason: options.reason ?? "membership_changed",
@@ -11021,6 +10823,24 @@ var GroupFSVFS = class {
   mkdir(path, options = {}) {
     return this.call("group.fs.mkdir", { path, parents: options.parents ?? false, ...options }, path);
   }
+  setAcl(path, options = {}) {
+    const grantee = options.grantee_aid ?? options.granteeAid ?? "role:admin";
+    const params2 = { ...options, path, grantee_aid: grantee, perms: options.perms ?? "rwx" };
+    delete params2.granteeAid;
+    return this.call("group.fs.set_acl", params2, path);
+  }
+  removeAcl(path, options = {}) {
+    const grantee = options.grantee_aid ?? options.granteeAid ?? "role:admin";
+    const params2 = { ...options, path, grantee_aid: grantee };
+    delete params2.granteeAid;
+    return this.call("group.fs.remove_acl", params2, path);
+  }
+  getAcl(path, options = {}) {
+    return this.call("group.fs.get_acl", { path, ...options }, path);
+  }
+  listAcl(path, options = {}) {
+    return this.call("group.fs.list_acl", { path, ...options }, path);
+  }
   rm(path, options = {}) {
     return this.call("group.fs.rm", {
       path,
@@ -11030,21 +10850,21 @@ var GroupFSVFS = class {
     }, path);
   }
   async cp(src, dst, options = {}) {
-    const groupId = options.group_id ?? options.groupId;
-    const srcGroupId = options.src_group_id ?? options.srcGroupId;
-    const dstGroupId = options.dst_group_id ?? options.dstGroupId;
-    const srcRemote = typeof src === "string" && isGroupRemoteCopyPath(src, srcGroupId, groupId);
-    const dstRemote = typeof dst === "string" && isGroupRemoteCopyPath(dst, dstGroupId, groupId);
+    const groupRef = options.group_aid ?? options.groupAid ?? options.group_id ?? options.groupId;
+    const srcGroupRef = options.src_group_aid ?? options.srcGroupAid ?? options.src_group_id ?? options.srcGroupId;
+    const dstGroupRef = options.dst_group_aid ?? options.dstGroupAid ?? options.dst_group_id ?? options.dstGroupId;
+    const srcRemote = typeof src === "string" && isGroupRemoteCopyPath(src, srcGroupRef, groupRef);
+    const dstRemote = typeof dst === "string" && isGroupRemoteCopyPath(dst, dstGroupRef, groupRef);
     if (srcRemote && dstRemote) return this.copyRemoteToRemote(src, dst, options);
     if (!srcRemote && dstRemote) return this.uploadToGroup(src, dst, options);
     if (srcRemote && !dstRemote) return this.downloadFromGroup(src, dst, options);
     throw new StorageError("local-to-local copy is not handled by group.fs", "EINVAL", typeof src === "string" ? src : "");
   }
   async mv(src, dst, options = {}) {
-    const groupId = options.group_id ?? options.groupId;
-    const srcGroupId = options.src_group_id ?? options.srcGroupId;
-    const dstGroupId = options.dst_group_id ?? options.dstGroupId;
-    if (!isGroupRemoteCopyPath(src, srcGroupId, groupId) || !isGroupRemoteCopyPath(dst, dstGroupId, groupId)) {
+    const groupRef = options.group_aid ?? options.groupAid ?? options.group_id ?? options.groupId;
+    const srcGroupRef = options.src_group_aid ?? options.srcGroupAid ?? options.src_group_id ?? options.srcGroupId;
+    const dstGroupRef = options.dst_group_aid ?? options.dstGroupAid ?? options.dst_group_id ?? options.dstGroupId;
+    if (!isGroupRemoteCopyPath(src, srcGroupRef, groupRef) || !isGroupRemoteCopyPath(dst, dstGroupRef, groupRef)) {
       throw new StorageError("group.fs.mv only supports group remote paths", "EINVAL", src);
     }
     const params2 = this.remoteCopyParams(src, dst, options);
@@ -11075,10 +10895,16 @@ var GroupFSVFS = class {
     delete params2.source_type;
     delete params2.localPath;
     delete params2.local_path;
+    if (options.groupAid !== void 0) params2.group_aid = options.groupAid;
     if (options.groupId !== void 0) params2.group_id = options.groupId;
+    if (options.srcGroupAid !== void 0) params2.src_group_aid = options.srcGroupAid;
     if (options.srcGroupId !== void 0) params2.src_group_id = options.srcGroupId;
+    if (options.dstGroupAid !== void 0) params2.dst_group_aid = options.dstGroupAid;
     if (options.dstGroupId !== void 0) params2.dst_group_id = options.dstGroupId;
     if (options.followSymlinks !== void 0) params2.follow_symlinks = options.followSymlinks;
+    delete params2.groupAid;
+    delete params2.srcGroupAid;
+    delete params2.dstGroupAid;
     delete params2.followSymlinks;
     if (!options.force) delete params2.force;
     if (!options.recursive) delete params2.recursive;
@@ -11104,10 +10930,13 @@ var GroupFSVFS = class {
   async uploadToGroup(src, dst, options) {
     const { data, contentType } = await this.sourceBytes(src, options);
     const digest = await sha256Hex(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({
       ...options,
       path: dst,
-      group_id: options.group_id ?? options.groupId ?? options.dst_group_id ?? options.dstGroupId,
+      group_aid: groupAid,
+      group_id: groupAid ? void 0 : groupId,
       size_bytes: data.byteLength,
       sha256: digest,
       content_type: options.content_type ?? options.contentType ?? contentType,
@@ -11117,9 +10946,14 @@ var GroupFSVFS = class {
       expected_version: options.expected_version ?? options.expectedVersion
     });
     delete baseParams.groupId;
+    delete baseParams.groupAid;
     delete baseParams.dstGroupId;
+    delete baseParams.dstGroupAid;
+    delete baseParams.dst_group_aid;
     delete baseParams.dst_group_id;
     delete baseParams.srcGroupId;
+    delete baseParams.srcGroupAid;
+    delete baseParams.src_group_aid;
     delete baseParams.src_group_id;
     delete baseParams.contentType;
     delete baseParams.expectedVersion;
@@ -11177,15 +11011,23 @@ var GroupFSVFS = class {
         throw new StorageExistsError(`local path already exists: ${target.localPath}`, "EEXIST", target.localPath);
       }
     }
+    const groupAid = options.group_aid ?? options.groupAid ?? options.src_group_aid ?? options.srcGroupAid;
+    const groupId = options.group_id ?? options.groupId ?? options.src_group_id ?? options.srcGroupId;
     const params2 = stripNil({
       ...options,
       path: src,
-      group_id: options.group_id ?? options.groupId ?? options.src_group_id ?? options.srcGroupId
+      group_aid: groupAid,
+      group_id: groupAid ? void 0 : groupId
     });
     delete params2.groupId;
+    delete params2.groupAid;
     delete params2.srcGroupId;
+    delete params2.srcGroupAid;
+    delete params2.src_group_aid;
     delete params2.src_group_id;
     delete params2.dstGroupId;
+    delete params2.dstGroupAid;
+    delete params2.dst_group_aid;
     delete params2.dst_group_id;
     delete params2.force;
     delete params2.recursive;
@@ -11249,6 +11091,20 @@ function stripNil2(params2) {
   }
   return out;
 }
+function splitAidStore(params2) {
+  const out = stripNil2(params2);
+  const aidStore = out.aidStore ?? out.aid_store;
+  delete out.aidStore;
+  delete out.aid_store;
+  return { params: out, aidStore };
+}
+function settingsToMap(result) {
+  const settings = {};
+  for (const s of result.settings || []) {
+    settings[s.key] = s.value;
+  }
+  return settings;
+}
 var RpcFacade = class {
   constructor(client) {
     __publicField(this, "client");
@@ -11314,13 +11170,20 @@ var GroupFacade = class extends RpcFacade {
     return this._thought;
   }
   create(params2) {
-    return this.call("group.create", params2);
+    const clean2 = stripNil2(params2);
+    if (clean2.group_name && typeof this.client.createGroup === "function") {
+      return this.client.createGroup(clean2);
+    }
+    return this.call("group.create", clean2);
   }
   bindAid(params2) {
     return this.call("group.bind_aid", params2);
   }
-  get(params2) {
-    return this.call("group.get", params2);
+  bindGroupAid(params2) {
+    return this.call("group.bind_group_aid", params2);
+  }
+  renewGroupAid(params2) {
+    return this.call("group.renew_group_aid", params2);
   }
   getInfo(params2) {
     return this.call("group.get_info", params2);
@@ -11337,9 +11200,6 @@ var GroupFacade = class extends RpcFacade {
   search(params2) {
     return this.call("group.search", params2);
   }
-  getPublicInfo(params2) {
-    return this.call("group.get_public_info", params2);
-  }
   suspend(params2) {
     return this.call("group.suspend", params2);
   }
@@ -11349,9 +11209,6 @@ var GroupFacade = class extends RpcFacade {
   dissolve(params2) {
     return this.call("group.dissolve", params2);
   }
-  getStats(params2) {
-    return this.call("group.get_stats", params2);
-  }
   addMember(params2) {
     return this.call("group.add_member", params2);
   }
@@ -11368,10 +11225,18 @@ var GroupFacade = class extends RpcFacade {
     return this.call("group.set_role", params2);
   }
   transferOwner(params2) {
-    return this.call("group.transfer_owner", params2);
+    const split = splitAidStore(params2);
+    if (split.aidStore && typeof this.client.startGroupTransfer === "function") {
+      return this.client.startGroupTransfer(split.params, { aidStore: split.aidStore });
+    }
+    return this.call("group.transfer_owner", split.params);
   }
   completeTransfer(params2) {
-    return this.call("group.complete_transfer", params2);
+    const split = splitAidStore(params2);
+    if (split.aidStore && typeof this.client.completeGroupTransfer === "function") {
+      return this.client.completeGroupTransfer(split.params, { aidStore: split.aidStore });
+    }
+    return this.call("group.complete_transfer", split.params);
   }
   ban(params2) {
     return this.call("group.ban", params2);
@@ -11413,12 +11278,14 @@ var GroupFacade = class extends RpcFacade {
     return this.call("group.get_settings", params2);
   }
   send(params2) {
+    validateGroupIDFormat(params2?.group_id, "group_id");
     return this.call("group.send", params2);
   }
   recall(params2) {
     return this.call("group.recall", params2);
   }
   pull(params2) {
+    validateGroupIDFormat(params2?.group_id, "group_id");
     return this.call("group.pull", params2);
   }
   pullEvents(params2) {
@@ -11430,30 +11297,146 @@ var GroupFacade = class extends RpcFacade {
   ackEvents(params2) {
     return this.call("group.ack_events", params2);
   }
-  getAnnouncement(params2) {
-    return this.call("group.get_announcement", params2);
+  async getAnnouncement(params2) {
+    const merged = params2 || {};
+    const groupId = merged.group_id;
+    if (!groupId) throw new Error("group_id is required");
+    const result = await this.getSettings({
+      group_id: groupId,
+      keys: ["announcement.content", "announcement.attachments"]
+    });
+    const settings = settingsToMap(result);
+    return {
+      group_id: result.group_id,
+      announcement: {
+        group_id: result.group_id,
+        content: settings["announcement.content"] || "",
+        attachments: settings["announcement.attachments"] || [],
+        updated_by: settings["announcement.content.updated_by"] || "",
+        updated_at: settings["announcement.content.updated_at"] || 0
+      }
+    };
   }
-  updateAnnouncement(params2) {
-    return this.call("group.update_announcement", params2);
+  async updateAnnouncement(params2) {
+    const merged = params2 || {};
+    const groupId = merged.group_id;
+    const content = merged.content;
+    const attachments = merged.attachments;
+    if (!groupId) throw new Error("group_id is required");
+    if (content === void 0) throw new Error("content is required");
+    const settingsUpdate = { "announcement.content": content };
+    if (attachments !== void 0) {
+      settingsUpdate["announcement.attachments"] = attachments;
+    }
+    const result = await this.setSettings({
+      group_id: groupId,
+      settings: settingsUpdate
+    });
+    return {
+      group_id: result.group_id,
+      announcement: {
+        group_id: result.group_id,
+        content,
+        attachments: attachments || []
+      }
+    };
   }
-  getRules(params2) {
-    return this.call("group.get_rules", params2);
+  async getRules(params2) {
+    const merged = params2 || {};
+    const groupId = merged.group_id;
+    if (!groupId) throw new Error("group_id is required");
+    const result = await this.getSettings({
+      group_id: groupId,
+      keys: ["rules.content", "rules.attachments"]
+    });
+    const settings = settingsToMap(result);
+    return {
+      group_id: result.group_id,
+      rules: {
+        group_id: result.group_id,
+        content: settings["rules.content"] || "",
+        attachments: settings["rules.attachments"] || [],
+        updated_by: settings["rules.content.updated_by"] || "",
+        updated_at: settings["rules.content.updated_at"] || 0
+      }
+    };
   }
-  updateRules(params2) {
-    return this.call("group.update_rules", params2);
+  async updateRules(params2) {
+    const merged = params2 || {};
+    const groupId = merged.group_id;
+    const content = merged.content;
+    const attachments = merged.attachments;
+    if (!groupId) throw new Error("group_id is required");
+    if (content === void 0) throw new Error("content is required");
+    const settingsUpdate = { "rules.content": content };
+    if (attachments !== void 0) {
+      settingsUpdate["rules.attachments"] = attachments;
+    }
+    const result = await this.setSettings({
+      group_id: groupId,
+      settings: settingsUpdate
+    });
+    return {
+      group_id: result.group_id,
+      rules: {
+        group_id: result.group_id,
+        content,
+        attachments: attachments || []
+      }
+    };
   }
-  getJoinRequirements(params2) {
-    return this.call("group.get_join_requirements", params2);
+  async getJoinRequirements(params2) {
+    const merged = params2 || {};
+    const groupId = merged.group_id;
+    if (!groupId) throw new Error("group_id is required");
+    const result = await this.getSettings({
+      group_id: groupId,
+      keys: ["join.mode", "join.question", "join.auto_approve_patterns", "join.max_pending"]
+    });
+    const settings = settingsToMap(result);
+    return {
+      group_id: result.group_id,
+      join_requirements: {
+        group_id: result.group_id,
+        mode: settings["join.mode"] || "open",
+        question: settings["join.question"] || "",
+        auto_approve_patterns: settings["join.auto_approve_patterns"] || [],
+        max_pending: settings["join.max_pending"] || 100,
+        updated_by: settings["join.mode.updated_by"] || "",
+        updated_at: settings["join.mode.updated_at"] || 0
+      }
+    };
   }
-  updateJoinRequirements(params2) {
-    return this.call("group.update_join_requirements", params2);
+  async updateJoinRequirements(params2) {
+    const merged = params2 || {};
+    const groupId = merged.group_id;
+    if (!groupId) throw new Error("group_id is required");
+    const settingsUpdate = {};
+    if ("mode" in merged) settingsUpdate["join.mode"] = merged.mode;
+    if ("question" in merged) settingsUpdate["join.question"] = merged.question;
+    if ("auto_approve_patterns" in merged) settingsUpdate["join.auto_approve_patterns"] = merged.auto_approve_patterns;
+    if ("max_pending" in merged) settingsUpdate["join.max_pending"] = merged.max_pending;
+    if (Object.keys(settingsUpdate).length === 0) {
+      throw new Error("at least one field to update is required");
+    }
+    const result = await this.setSettings({
+      group_id: groupId,
+      settings: settingsUpdate
+    });
+    return {
+      group_id: result.group_id,
+      join_requirements: {
+        group_id: result.group_id,
+        mode: merged.mode,
+        question: merged.question,
+        auto_approve_patterns: merged.auto_approve_patterns,
+        max_pending: merged.max_pending
+      }
+    };
   }
   getOnlineMembers(params2) {
     return this.call("group.get_online_members", params2);
   }
-  info(params2) {
-    return this.call("group.info", params2);
-  }
 };
 var StreamFacade = class extends RpcFacade {
   create(params2) {
@@ -11782,6 +11765,18 @@ var StorageVFS = class {
     const raw = await this.lowlevel.fsMkdir({ owner: this.owner(options.owner), bucket: options.bucket ?? "default", path: pathToKey(path), parents: options.parents });
     return nodeFromAny(raw.node ?? raw);
   }
+  async touch(path, options = {}) {
+    const raw = await this.lowlevel.fsTouch({
+      owner: this.owner(options.owner),
+      bucket: options.bucket ?? "default",
+      path: pathToKey(path),
+      parents: options.parents,
+      noCreate: options.noCreate,
+      mtime: options.mtime,
+      followSymlinks: options.followSymlinks
+    });
+    return nodeFromAny(raw.node ?? raw);
+  }
   async remove(path, options = {}) {
     const raw = await this.lowlevel.fsRemove({ owner: this.owner(options.owner), bucket: options.bucket ?? "default", path: pathToKey(path), recursive: options.recursive });
     return { path, removedCount: Number(raw.removed_count ?? raw.deleted_count ?? 0) };
@@ -11825,6 +11820,46 @@ var StorageVFS = class {
     const raw = await this.lowlevel.fsDf({ owner, bucket: options.bucket ?? "default" });
     return usageFromAny(raw, owner ?? void 0);
   }
+  async du(path, options = {}) {
+    const nodes = await this.find(path, {
+      owner: options.owner,
+      bucket: options.bucket,
+      page: 1,
+      pageSize: options.pageSize ?? 1e3,
+      token: options.token
+    });
+    const rootParts = pathToKey(path).split("/").filter(Boolean);
+    let sizeBytes = 0;
+    let fileCount = 0;
+    let dirCount = 0;
+    let symlinkCount = 0;
+    let truncated = false;
+    for (const node of nodes) {
+      const nodeParts = pathToKey(node.path).split("/").filter(Boolean);
+      const depth = Math.max(0, nodeParts.length - rootParts.length);
+      if (options.maxDepth !== void 0 && depth > options.maxDepth) {
+        truncated = true;
+        continue;
+      }
+      if (node.type === "file") {
+        fileCount += 1;
+        sizeBytes += node.size;
+      } else if (node.type === "dir") {
+        dirCount += 1;
+      } else if (node.type === "symlink") {
+        symlinkCount += 1;
+      }
+    }
+    return {
+      path,
+      sizeBytes,
+      fileCount,
+      dirCount,
+      symlinkCount,
+      maxDepth: options.maxDepth,
+      truncated
+    };
+  }
   async mount(source, mountPath, options = {}) {
     const owner = this.owner(options.owner);
     const mountRef = parsePathLike(mountPath, owner);
@@ -12137,6 +12172,18 @@ var CollabClient = class {
   unregister(groupAid, collabRoot) {
     return this._call("collab.unregister", { group_aid: groupAid, collab_root: collabRoot });
   }
+  setAcl(collabRoot, granteeAid, options = {}) {
+    return this._call("collab.set_acl", stripNil3({
+      collab_root: collabRoot,
+      grantee_aid: granteeAid,
+      perms: options.perms ?? "w",
+      expires_at: options.expires_at ?? options.expiresAt,
+      max_uses: options.max_uses ?? options.maxUses
+    }));
+  }
+  removeAcl(collabRoot, granteeAid) {
+    return this._call("collab.remove_acl", { collab_root: collabRoot, grantee_aid: granteeAid });
+  }
 };
 
 // src/client/v2-e2ee.ts
@@ -16051,10 +16098,22 @@ var V2Session = class {
     const hex = await sha256Hex3(this._ikPubDer);
     return `sha256:${hex.substring(0, 16)}`;
   }
+  _groupKey(groupId) {
+    return normalizeGroupId(groupId) || String(groupId ?? "").trim();
+  }
+  _groupLookupCandidates(groupId) {
+    const raw = String(groupId ?? "").trim();
+    const normalized = this._groupKey(raw);
+    const out = [];
+    for (const item of [normalized, raw]) {
+      if (item && !out.includes(item)) out.push(item);
+    }
+    return out;
+  }
   _normalizeGroupSPKLookup(groupId, spkId) {
     const nul = spkId.indexOf("\0");
-    if (nul < 0) return { groupId, spkId };
-    return { groupId: spkId.slice(0, nul).trim(), spkId: spkId.slice(nul + 1) };
+    if (nul < 0) return { groupId: this._groupKey(groupId), spkId };
+    return { groupId: this._groupKey(spkId.slice(0, nul)), spkId: spkId.slice(nul + 1) };
   }
   /** SPK 由 AID 私钥（IK）签名背书并上报到 message.v2.put_peer_pk。 */
   async _registerSPK(callFn) {
@@ -16155,10 +16214,13 @@ var V2Session = class {
     return null;
   }
   async _loadGroupSPK(groupId, spkId) {
-    const scoped = await this._store.loadGroupSPK(this._storeDeviceId, groupId, spkId);
-    if (scoped) return scoped;
-    if (this._storeDeviceId !== this._deviceId) {
-      return this._store.loadGroupSPK(this._deviceId, groupId, spkId);
+    for (const candidate of this._groupLookupCandidates(groupId)) {
+      const scoped = await this._store.loadGroupSPK(this._storeDeviceId, candidate, spkId);
+      if (scoped) return scoped;
+      if (this._storeDeviceId !== this._deviceId) {
+        const legacy = await this._store.loadGroupSPK(this._deviceId, candidate, spkId);
+        if (legacy) return legacy;
+      }
     }
     return null;
   }
@@ -16245,7 +16307,7 @@ var V2Session = class {
   /** 判断 spkId 是否为本进程在该群最后一次成功上传的 group SPK。 */
   isLastUploadedGroupSPK(groupId, spkId) {
     if (!spkId) return false;
-    const gk = (groupId || "").trim();
+    const gk = this._groupKey(groupId);
     const lookup = this._normalizeGroupSPKLookup(gk, spkId);
     return this._lastUploadedGroupSPKIds.get(lookup.groupId) === lookup.spkId;
   }
@@ -16253,9 +16315,15 @@ var V2Session = class {
   /** 确保指定群有独立 group SPK，返回 { spkId, priv, pubDer }。 */
   async ensureGroupSPK(groupId) {
     await this.ensureKeys();
-    const gk = (groupId || "").trim();
-    const existing = await this._store.loadCurrentGroupSPK(this._storeDeviceId, gk);
-    if (existing) return existing;
+    const gk = this._groupKey(groupId);
+    for (const candidate of this._groupLookupCandidates(groupId)) {
+      const existing = await this._store.loadCurrentGroupSPK(this._storeDeviceId, candidate);
+      if (existing) return existing;
+      if (this._storeDeviceId !== this._deviceId) {
+        const legacy = await this._store.loadCurrentGroupSPK(this._deviceId, candidate);
+        if (legacy) return legacy;
+      }
+    }
     const [priv, pubDer] = await generateP256Keypair();
     const hex = await sha256Hex3(pubDer);
     const spkId = `sha256:${hex.substring(0, 16)}`;
@@ -16265,11 +16333,14 @@ var V2Session = class {
   /** 注册指定群的 group SPK。group 服务负责成员鉴权。 */
   async ensureGroupRegistered(groupId, callFn) {
     await this.ensureKeys();
-    const gk = (groupId || "").trim();
-    const uploadedSPKId = await this._store.loadLatestUploadedGroupSPKId(this._storeDeviceId, gk);
-    if (uploadedSPKId) {
-      this._lastUploadedGroupSPKIds.set(gk, uploadedSPKId);
-      return;
+    const gk = this._groupKey(groupId);
+    for (const candidate of this._groupLookupCandidates(groupId)) {
+      const uploadedSPKId = await this._store.loadLatestUploadedGroupSPKId(this._storeDeviceId, candidate) || (this._storeDeviceId !== this._deviceId ? await this._store.loadLatestUploadedGroupSPKId(this._deviceId, candidate) : null);
+      if (uploadedSPKId) {
+        this._lastUploadedGroupSPKIds.set(gk, uploadedSPKId);
+        this._lastUploadedGroupSPKIds.set(candidate, uploadedSPKId);
+        return;
+      }
     }
     const { spkId, pubDer } = await this.ensureGroupSPK(gk);
     await this._publishGroupSPK(gk, spkId, pubDer, callFn);
@@ -16277,7 +16348,7 @@ var V2Session = class {
   /** 轮换指定群的 group SPK，保留旧私钥用于缓存窗口内的历史 wrap 解密。 */
   async rotateGroupSPK(groupId, callFn) {
     await this.ensureKeys();
-    const gk = (groupId || "").trim();
+    const gk = this._groupKey(groupId);
     const [priv, pubDer] = await generateP256Keypair();
     const hex = await sha256Hex3(pubDer);
     const spkId = `sha256:${hex.substring(0, 16)}`;
@@ -16288,7 +16359,7 @@ var V2Session = class {
   /** 群消息解密按 group SPK -> device SPK -> IK fallback；仍找不到则显式报错。 */
   async getGroupDecryptKeys(groupId, spkId) {
     await this.ensureKeys();
-    const gk = (groupId || "").trim();
+    const gk = this._groupKey(groupId);
     if (!spkId) return { ikPriv: this._ikPriv };
     const lookup = this._normalizeGroupSPKLookup(gk, spkId);
     const groupSpk = await this._loadGroupSPK(lookup.groupId, lookup.spkId);
@@ -16296,6 +16367,7 @@ var V2Session = class {
     return this.getDecryptKeys(lookup.spkId);
   }
   async _publishGroupSPK(groupId, spkId, spkPubDer, callFn) {
+    const gk = this._groupKey(groupId);
     const spkTimestamp = Math.floor(this._nowFn() / 1e3);
     const enc = new TextEncoder();
     const signData = concatBytes3(
@@ -16305,15 +16377,19 @@ var V2Session = class {
     );
     const signature = await ecdsaSignRaw(this._ikPriv, signData);
     await callFn("group.v2.put_group_pk", {
-      group_id: groupId,
+      group_id: gk,
+      group_aid: gk,
       key_source: "group_device_prekey",
       spk_id: spkId,
       spk_pk: bytesToBase645(spkPubDer),
       spk_signature: bytesToBase645(signature),
       spk_timestamp: spkTimestamp
     });
-    await this._store.markGroupSPKUploaded(this._storeDeviceId, groupId, spkId);
-    this._lastUploadedGroupSPKIds.set(groupId, spkId);
+    await this._store.markGroupSPKUploaded(this._storeDeviceId, gk, spkId);
+    this._lastUploadedGroupSPKIds.set(gk, spkId);
+    if (String(groupId ?? "").trim() && String(groupId ?? "").trim() !== gk) {
+      this._lastUploadedGroupSPKIds.set(String(groupId ?? "").trim(), spkId);
+    }
   }
   cachePeerIK(peerAid, deviceId, ikPubDer) {
     this._peerIKCache.set(`${peerAid}#${deviceId}`, {
@@ -16342,6 +16418,10 @@ var V2Session = class {
 // src/client/v2-e2ee.ts
 var V2_BOOTSTRAP_TTL_MS = 60 * 60 * 1e3;
 var V2_RETRYABLE_CODES = /* @__PURE__ */ new Set([-33011, -33012, -33050, -33052, -33054]);
+var V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
+var V2_SESSION_INIT_RETRY_LIMIT = 12;
+var V2_SESSION_INIT_RETRY_BASE_MS = 1e3;
+var V2_SESSION_INIT_RETRY_MAX_MS = 5e3;
 var MEMBERSHIP_ACTIONS = /* @__PURE__ */ new Set([
   "member_added",
   "member_left",
@@ -16387,6 +16467,10 @@ function v2B64uToBytes(value) {
 function formatE2EEError(error) {
   return error instanceof Error ? error : String(error);
 }
+function isTransientV2SessionInitError(error) {
+  const text3 = (error instanceof Error ? error.message : String(error)).toLowerCase();
+  return text3.includes("no_service") || text3.includes("service plane unavailable") || text3.includes("transport not connected") || text3.includes("transport closed") || text3.includes("websocket closed") || text3.includes("websocket is not open") || text3.includes("connection closed") || text3.includes("socket closed");
+}
 function uuidV4() {
   if (typeof crypto.randomUUID === "function") return crypto.randomUUID();
   const bytes = new Uint8Array(16);
@@ -16519,6 +16603,10 @@ function applyV2WrapPolicyToTargets(targets, policy) {
 var V2E2EECoordinator = class {
   constructor(runtime) {
     __publicField(this, "runtime");
+    __publicField(this, "targetSetCache", /* @__PURE__ */ new Map());
+    __publicField(this, "v2SessionInitRetryTimer", null);
+    __publicField(this, "v2SessionInitRetryBackgroundSync", false);
+    __publicField(this, "v2SessionInitRetryIdentityKey", null);
     this.runtime = runtime;
   }
   get client() {
@@ -16539,28 +16627,146 @@ var V2E2EECoordinator = class {
   }
   deleteBootstrapCacheEntry(key) {
     this.bootstrapCache.delete(key);
+    this.targetSetCache.delete(key);
   }
   clearBootstrapCache() {
     this.bootstrapCache.clear();
+    this.targetSetCache.clear();
   }
   pruneExpiredBootstrapCache(ttlMs, now = Date.now()) {
     for (const [key, entry] of this.bootstrapCache) {
       if (now - Number(entry.cachedAt ?? 0) >= ttlMs) {
         this.bootstrapCache.delete(key);
+        this.targetSetCache.delete(key);
+      }
+    }
+    for (const [key, entry] of this.targetSetCache) {
+      if (now - Number(entry.cachedAt ?? 0) >= ttlMs) {
+        this.targetSetCache.delete(key);
       }
     }
   }
+  getTargetSetCache(key) {
+    const cached = this.targetSetCache.get(key);
+    if (!cached || Date.now() - cached.cachedAt >= V2_BOOTSTRAP_TTL_MS) {
+      if (cached) this.targetSetCache.delete(key);
+      return void 0;
+    }
+    return cached.value;
+  }
+  setTargetSetCache(key, value) {
+    this.targetSetCache.set(key, { cachedAt: Date.now(), value });
+    return value;
+  }
+  cloneP2PTargetSet(value) {
+    return {
+      targets: value.targets.map((target) => ({ ...target })),
+      auditRecipients: value.auditRecipients.map((target) => ({ ...target }))
+    };
+  }
+  cloneGroupTargetSet(value) {
+    return {
+      targets: value.targets.map((target) => ({ ...target }))
+    };
+  }
   async onConnected(opts) {
     const client = this.client;
     try {
       await client._initV2Session();
+      this.clearV2SessionInitRetry();
     } catch (exc) {
       client._clientLog.warn(`V2 session init failed (non-fatal): ${formatE2EEError(exc)}`);
+      if (isTransientV2SessionInitError(exc)) {
+        this.scheduleV2SessionInitRetry(1, opts.backgroundSync, exc);
+      }
     }
     if (opts.backgroundSync && client._v2Session && typeof client._v2AutoConfirmPendingProposals === "function") {
       client._safeAsync(client._v2AutoConfirmPendingProposals());
     }
   }
+  currentV2SessionInitRetryIdentityKey() {
+    const client = this.client;
+    if (!client._aid) return null;
+    return JSON.stringify([
+      client._aid,
+      client._deviceId ?? "",
+      client._currentAid ?? null,
+      Number(client._v2RuntimeGeneration ?? 0)
+    ]);
+  }
+  canRetryV2SessionInit(identityKey) {
+    const client = this.client;
+    return client.state === "ready" /* READY */ && !client._closing && this.currentV2SessionInitRetryIdentityKey() === identityKey;
+  }
+  clearV2SessionInitRetry() {
+    if (this.v2SessionInitRetryTimer) {
+      globalThis.clearTimeout(this.v2SessionInitRetryTimer);
+      this.v2SessionInitRetryTimer = null;
+    }
+    this.v2SessionInitRetryBackgroundSync = false;
+    this.v2SessionInitRetryIdentityKey = null;
+  }
+  scheduleV2SessionInitRetry(attempt, backgroundSync, reason) {
+    const client = this.client;
+    if (attempt > V2_SESSION_INIT_RETRY_LIMIT) {
+      this.v2SessionInitRetryBackgroundSync = false;
+      this.v2SessionInitRetryIdentityKey = null;
+      client._clientLog.warn(`V2 session init retry exhausted: attempts=${V2_SESSION_INIT_RETRY_LIMIT} last_error=${formatE2EEError(reason)}`);
+      return;
+    }
+    const identityKey = this.currentV2SessionInitRetryIdentityKey();
+    if (!identityKey || !this.canRetryV2SessionInit(identityKey)) return;
+    if (this.v2SessionInitRetryIdentityKey && this.v2SessionInitRetryIdentityKey !== identityKey) {
+      this.clearV2SessionInitRetry();
+    }
+    if (this.v2SessionInitRetryTimer) {
+      this.v2SessionInitRetryBackgroundSync = this.v2SessionInitRetryBackgroundSync || backgroundSync;
+      return;
+    }
+    this.v2SessionInitRetryIdentityKey = identityKey;
+    this.v2SessionInitRetryBackgroundSync = this.v2SessionInitRetryBackgroundSync || backgroundSync;
+    const delayMs = Math.min(
+      V2_SESSION_INIT_RETRY_BASE_MS * attempt,
+      V2_SESSION_INIT_RETRY_MAX_MS
+    );
+    client._clientLog.debug(`V2 session init retry scheduled: attempt=${attempt} delay_ms=${delayMs} reason=${formatE2EEError(reason)}`);
+    this.v2SessionInitRetryTimer = globalThis.setTimeout(() => {
+      this.v2SessionInitRetryTimer = null;
+      if (!this.canRetryV2SessionInit(identityKey)) {
+        this.clearV2SessionInitRetry();
+        return;
+      }
+      client._safeAsync(this.retryV2SessionInit(attempt, identityKey));
+    }, delayMs);
+  }
+  async retryV2SessionInit(attempt, identityKey) {
+    const client = this.client;
+    if (!this.canRetryV2SessionInit(identityKey)) {
+      this.clearV2SessionInitRetry();
+      return;
+    }
+    try {
+      await client._initV2Session();
+      const backgroundSync = this.v2SessionInitRetryBackgroundSync;
+      this.clearV2SessionInitRetry();
+      client._clientLog.debug(`V2 session init retry succeeded: attempt=${attempt}`);
+      if (backgroundSync && client._v2Session) {
+        if (typeof client._v2AutoConfirmPendingProposals === "function") {
+          client._safeAsync(client._v2AutoConfirmPendingProposals());
+        }
+        if (typeof client._fillP2pGap === "function") {
+          client._safeAsync(client._fillP2pGap());
+        }
+      }
+    } catch (exc) {
+      client._clientLog.warn(`V2 session init retry failed: attempt=${attempt} err=${formatE2EEError(exc)}`);
+      if (isTransientV2SessionInitError(exc)) {
+        this.scheduleV2SessionInitRetry(attempt + 1, this.v2SessionInitRetryBackgroundSync, exc);
+      } else {
+        this.clearV2SessionInitRetry();
+      }
+    }
+  }
   async initV2Session() {
     const client = this.client;
     if (!client._aid) return;
@@ -16859,6 +17065,7 @@ var V2E2EECoordinator = class {
     const decrypted = [];
     let nextAfterSeq = opts?.force ? afterSeq : afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0);
     let pageCount = 0;
+    let lastAutoAckSeq = 0;
     const maxPages = 100;
     while (pageCount < maxPages) {
       pageCount += 1;
@@ -16867,7 +17074,12 @@ var V2E2EECoordinator = class {
         limit,
         ...opts?.force ? { force: true } : {}
       });
-      const messages = Array.isArray(result?.messages) ? result.messages : [];
+      const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
+      const messages = pageMessages.filter((msg) => {
+        const seq = Number(msg.seq ?? 0);
+        return Number.isFinite(seq) && seq > nextAfterSeq;
+      });
+      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_ack_seq=${String(result.server_ack_seq ?? "")}`);
       const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq) => Number.isFinite(seq) && seq > 0);
       const pageContigBefore = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
@@ -16935,15 +17147,16 @@ var V2E2EECoordinator = class {
         const contigAdvanced = ackSeq !== pageContigBefore;
         if (contigAdvanced) {
           await client._drainOrderedMessages(ns);
-          client._saveSeqTrackerState();
+          client._persistSeq(ns);
         }
-        const ackNeeded = messages.length > 0 && ackSeq > 0 && (contigAdvanced || hasServerAckSeq && ackSeq > serverAckSeq);
+        const ackNeeded = pageMessages.length > 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && (contigAdvanced || hasServerAckSeq && ackSeq > serverAckSeq);
         if (ackNeeded) {
           await this.ackV2(ackSeq);
+          lastAutoAckSeq = ackSeq;
         }
       }
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-      if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false) break;
+      if (messages.length === 0 || nextAfter <= nextAfterSeq) break;
       nextAfterSeq = nextAfter;
     }
     if (pageCount >= maxPages) {
@@ -17011,7 +17224,7 @@ var V2E2EECoordinator = class {
           const ns = `group:${gid}`;
           client._seqTracker.onMessageSeq(ns, seq);
           client._markPublishedSeq(ns, seq);
-          client._saveSeqTrackerState();
+          await client._saveSeqTrackerState();
         }
       }
       return client._delivery.attachSendResultEnvelope("group.send", {
@@ -17034,7 +17247,7 @@ var V2E2EECoordinator = class {
             const ns = `group:${gid}`;
             client._seqTracker.onMessageSeq(ns, seq);
             client._markPublishedSeq(ns, seq);
-            client._saveSeqTrackerState();
+            await client._saveSeqTrackerState();
           }
         }
         return client._delivery.attachSendResultEnvelope("group.send", {
@@ -17059,6 +17272,7 @@ var V2E2EECoordinator = class {
     if (!gid) throw new ValidationError("group.pull requires group_id");
     const ns = `group:${gid}`;
     const decrypted = [];
+    const wireGroupId = String(opts?.wireGroupId ?? groupId ?? "").trim() || gid;
     const cursorParams = opts?.cursorParams ?? {};
     const ownsCursor = opts?.ownsCursor !== false;
     let nextAfterSeq = opts?.explicitAfterSeq ? afterSeq : afterSeq || client._seqTracker.getContiguousSeq(ns);
@@ -17067,7 +17281,8 @@ var V2E2EECoordinator = class {
     while (pageCount < maxPages) {
       pageCount += 1;
       const result = await client._callRawV2Rpc("group.v2.pull", {
-        group_id: gid,
+        group_id: wireGroupId,
+        group_aid: gid,
         after_seq: nextAfterSeq,
         limit,
         ...cursorParams
@@ -17152,7 +17367,7 @@ var V2E2EECoordinator = class {
       const contigAdvanced = ackSeq !== pageContigBefore;
       if (contigAdvanced) {
         await client._drainOrderedMessages(ns);
-        client._saveSeqTrackerState();
+        client._persistSeq(ns);
       }
       const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, "current_seq");
       const ackNeeded = messages.length > 0 && ackSeq > 0 && ownsCursor && (contigAdvanced || hasServerCursor && ackSeq > cursorCurrentSeq);
@@ -17177,7 +17392,7 @@ var V2E2EECoordinator = class {
     let seq = Number(upToSeq ?? client._seqTracker.getContiguousSeq(ns));
     if (!Number.isFinite(seq) || seq <= 0) return { acked: 0 };
     seq = client._clampAckSeq("group.v2.ack", "up_to_seq", ns, seq);
-    return client._callRawV2Rpc("group.v2.ack", { group_id: gid, up_to_seq: seq });
+    return client._callRawV2Rpc("group.v2.ack", { group_id: gid, group_aid: gid, up_to_seq: seq });
   }
   async putMessageThoughtEncryptedV2(params2) {
     const client = this.client;
@@ -17646,6 +17861,7 @@ var V2E2EECoordinator = class {
       auditRaw = cached.auditRecipients ?? [];
       wrapPolicy = cached.wrapPolicy;
     } else {
+      this.targetSetCache.delete(to);
       const bs = await client.call("message.v2.bootstrap", {
         peer_aid: to,
         e2ee_wrap_capabilities: v2WrapCapabilities()
@@ -17665,69 +17881,80 @@ var V2E2EECoordinator = class {
     if (peerDevices.length === 0) {
       throw new E2EEError(`V2 bootstrap: no devices found for ${to}`);
     }
-    const targets = [];
-    for (const dev of peerDevices) {
-      const devId = getV2DeviceId(dev);
-      const target = await client._v2BuildTargetFromDevice({
-        dev,
-        aid: to,
-        deviceId: devId.value,
-        role: "peer",
-        defaultKeySource: "peer_device_prekey"
-      });
-      if (target) targets.push(target);
-    }
-    for (const dev of auditRaw) {
-      const target = await client._v2BuildTargetFromDevice({
-        dev,
-        aid: String(dev.aid ?? ""),
-        deviceId: String(dev.device_id ?? ""),
-        role: "audit",
-        defaultKeySource: "peer_device_prekey"
-      });
-      if (target) targets.push(target);
-    }
-    if (client._aid && client._aid !== to) {
-      try {
-        const selfCached = this.getBootstrapCacheEntry(client._aid);
-        let selfDevices = [];
-        if (selfCached && Date.now() - Number(selfCached.cachedAt ?? 0) < V2_BOOTSTRAP_TTL_MS) {
-          selfDevices = selfCached.devices ?? [];
-        } else {
-          const selfBs = await client.call("message.v2.bootstrap", {
-            peer_aid: client._aid,
-            e2ee_wrap_capabilities: v2WrapCapabilities()
-          });
-          selfDevices = Array.isArray(selfBs?.peer_devices) ? selfBs.peer_devices : [];
-          if (selfDevices.length > 0) {
-            this.setBootstrapCacheEntry(client._aid, {
-              devices: selfDevices,
-              auditRecipients: [],
-              cachedAt: Date.now()
+    let targetSet = useCache ? this.getTargetSetCache(to) : void 0;
+    if (targetSet) {
+      targetSet = this.cloneP2PTargetSet(targetSet);
+    } else {
+      const targets = [];
+      for (const dev of peerDevices) {
+        const devId = getV2DeviceId(dev);
+        const target = await client._v2BuildTargetFromDevice({
+          dev,
+          aid: to,
+          deviceId: devId.value,
+          role: "peer",
+          defaultKeySource: "peer_device_prekey"
+        });
+        if (target) targets.push(target);
+      }
+      const auditTargets = [];
+      for (const dev of auditRaw) {
+        const target = await client._v2BuildTargetFromDevice({
+          dev,
+          aid: String(dev.aid ?? ""),
+          deviceId: String(dev.device_id ?? ""),
+          role: "audit",
+          defaultKeySource: "peer_device_prekey"
+        });
+        if (target) auditTargets.push(target);
+      }
+      if (client._aid && client._aid !== to) {
+        try {
+          const selfCached = this.getBootstrapCacheEntry(client._aid);
+          let selfDevices = [];
+          if (selfCached && Date.now() - Number(selfCached.cachedAt ?? 0) < V2_BOOTSTRAP_TTL_MS) {
+            selfDevices = selfCached.devices ?? [];
+          } else {
+            this.targetSetCache.delete(client._aid);
+            const selfBs = await client.call("message.v2.bootstrap", {
+              peer_aid: client._aid,
+              e2ee_wrap_capabilities: v2WrapCapabilities()
             });
+            selfDevices = Array.isArray(selfBs?.peer_devices) ? selfBs.peer_devices : [];
+            if (selfDevices.length > 0) {
+              this.setBootstrapCacheEntry(client._aid, {
+                devices: selfDevices,
+                auditRecipients: [],
+                cachedAt: Date.now()
+              });
+            }
           }
+          for (const dev of selfDevices) {
+            const devId = getV2DeviceId(dev);
+            if (!devId.present || devId.value === client._deviceId) continue;
+            const target = await client._v2BuildTargetFromDevice({
+              dev,
+              aid: client._aid,
+              deviceId: devId.value,
+              role: "self_sync",
+              defaultKeySource: "peer_device_prekey"
+            });
+            if (target) targets.push(target);
+          }
+        } catch (exc) {
+          client._clientLog.debug(`V2 thought self-sync bootstrap failed (non-fatal): ${String(exc)}`);
         }
-        for (const dev of selfDevices) {
-          const devId = getV2DeviceId(dev);
-          if (!devId.present || devId.value === client._deviceId) continue;
-          const target = await client._v2BuildTargetFromDevice({
-            dev,
-            aid: client._aid,
-            deviceId: devId.value,
-            role: "self_sync",
-            defaultKeySource: "peer_device_prekey"
-          });
-          if (target) targets.push(target);
-        }
-      } catch (exc) {
-        client._clientLog.debug(`V2 thought self-sync bootstrap failed (non-fatal): ${String(exc)}`);
       }
+      targetSet = this.setTargetSetCache(to, {
+        targets: applyV2WrapPolicyToTargets(targets, wrapPolicy),
+        auditRecipients: applyV2WrapPolicyToTargets(auditTargets, wrapPolicy)
+      });
+      targetSet = this.cloneP2PTargetSet(targetSet);
     }
     const sender = await session.getSenderIdentity();
-    const sendTargets = applyV2WrapPolicyToTargets(targets, wrapPolicy);
     const envelope = await encryptP2PMessage(
       sender,
-      { targets: sendTargets, auditRecipients: [] },
+      targetSet,
       opts.payload,
       { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context }
     );
@@ -17739,7 +17966,8 @@ var V2E2EECoordinator = class {
       throw new StateError("V2 session not initialized");
     }
     const session = client._v2Session;
-    const groupId = normalizeGroupId(opts.groupId) || String(opts.groupId ?? "").trim();
+    const rawGroupId = String(opts.groupId ?? "").trim();
+    const groupId = normalizeGroupId(rawGroupId) || rawGroupId;
     if (!groupId) throw new ValidationError("group.send requires 'group_id'");
     const useCache = opts.useCache !== false;
     const cacheKey = `group:${groupId}`;
@@ -17748,14 +17976,25 @@ var V2E2EECoordinator = class {
     let stateCommitment = { state_version: 0, state_hash: "", state_chain: "" };
     let auditRecipientsRaw = [];
     let wrapPolicy;
-    const cached = useCache ? this.getBootstrapCacheEntry(cacheKey) : void 0;
+    let usedCachedBootstrap = false;
+    let cached = useCache ? this.getBootstrapCacheEntry(cacheKey) : void 0;
+    if (!cached && useCache && rawGroupId && rawGroupId !== groupId) {
+      const legacyCacheKey = `group:${rawGroupId}`;
+      cached = this.getBootstrapCacheEntry(legacyCacheKey);
+      if (cached) {
+        this.setBootstrapCacheEntry(cacheKey, cached);
+        this.deleteBootstrapCacheEntry(legacyCacheKey);
+      }
+    }
     if (cached && Date.now() - Number(cached.cachedAt ?? 0) < V2_BOOTSTRAP_TTL_MS) {
       allDevices = cached.devices ?? [];
       epoch = Number(cached.epoch ?? 0) || 0;
       stateCommitment = cached.stateCommitment ?? { state_version: 0, state_hash: "", state_chain: "" };
       auditRecipientsRaw = cached.auditRecipients ?? [];
       wrapPolicy = cached.wrapPolicy;
+      usedCachedBootstrap = true;
     } else {
+      this.targetSetCache.delete(cacheKey);
       const bs = await client.call("group.v2.bootstrap", {
         group_id: groupId,
         e2ee_wrap_capabilities: v2WrapCapabilities()
@@ -17790,41 +18029,64 @@ var V2E2EECoordinator = class {
     if (allDevices.length === 0) {
       throw new E2EEError(`V2 group bootstrap: no devices found for group ${groupId}`);
     }
-    const targets = [];
-    for (const dev of allDevices) {
-      const devAid = String(dev.aid ?? "").trim();
-      const devId = getV2DeviceId(dev);
-      if (devAid === client._aid && devId.present && devId.value === client._deviceId) continue;
-      const role = devAid === client._aid ? "self_sync" : "member";
-      const target = await client._v2BuildTargetFromDevice({
-        dev,
-        aid: devAid,
-        deviceId: devId.value,
-        role,
-        defaultKeySource: "peer_device_prekey"
+    let targetSet = useCache ? this.getTargetSetCache(cacheKey) : void 0;
+    if (targetSet) {
+      targetSet = this.cloneGroupTargetSet(targetSet);
+    } else {
+      const targets = [];
+      for (const dev of allDevices) {
+        const devAid = String(dev.aid ?? "").trim();
+        const devId = getV2DeviceId(dev);
+        if (devAid === client._aid && devId.present && devId.value === client._deviceId) continue;
+        const role = devAid === client._aid ? "self_sync" : "member";
+        const target = await client._v2BuildTargetFromDevice({
+          dev,
+          aid: devAid,
+          deviceId: devId.value,
+          role,
+          defaultKeySource: "peer_device_prekey"
+        });
+        if (target) targets.push(target);
+      }
+      if (targets.length === 0) {
+        if (usedCachedBootstrap) {
+          throw new E2EEError(`V2 group: no target devices for group ${groupId}; bootstrap may be stale`, {
+            code: V2_GROUP_STALE_BOOTSTRAP_CODE,
+            data: { expected_peer_aids: [] }
+          });
+        }
+        throw new E2EEError(`V2 group: no target devices for group ${groupId}`);
+      }
+      for (const dev of auditRecipientsRaw) {
+        const target = await client._v2BuildTargetFromDevice({
+          dev,
+          aid: String(dev.aid ?? ""),
+          deviceId: String(dev.device_id ?? ""),
+          role: "audit",
+          defaultKeySource: "peer_device_prekey"
+        });
+        if (target) targets.push(target);
+      }
+      targetSet = this.setTargetSetCache(cacheKey, {
+        targets: applyV2WrapPolicyToTargets(targets, wrapPolicy)
       });
-      if (target) targets.push(target);
+      targetSet = this.cloneGroupTargetSet(targetSet);
     }
-    if (targets.length === 0) {
+    if (targetSet.targets.length === 0) {
+      if (usedCachedBootstrap) {
+        throw new E2EEError(`V2 group: no target devices for group ${groupId}; bootstrap may be stale`, {
+          code: V2_GROUP_STALE_BOOTSTRAP_CODE,
+          data: { expected_peer_aids: [] }
+        });
+      }
       throw new E2EEError(`V2 group: no target devices for group ${groupId}`);
     }
-    for (const dev of auditRecipientsRaw) {
-      const target = await client._v2BuildTargetFromDevice({
-        dev,
-        aid: String(dev.aid ?? ""),
-        deviceId: String(dev.device_id ?? ""),
-        role: "audit",
-        defaultKeySource: "peer_device_prekey"
-      });
-      if (target) targets.push(target);
-    }
     const sender = await session.getSenderIdentity();
-    const sendTargets = applyV2WrapPolicyToTargets(targets, wrapPolicy);
     const envelope = await encryptGroupMessage(
       sender,
       groupId,
       epoch,
-      sendTargets,
+      targetSet.targets,
       opts.payload,
       { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context },
       stateCommitment
@@ -17843,23 +18105,6 @@ var V2E2EECoordinator = class {
       this.scheduleGroupSpkRotation(groupId, { reason: `group_changed:${action}` });
     }
   }
-  async handleV2EpochRotated(data) {
-    const client = this.client;
-    if (!data || typeof data !== "object" || Array.isArray(data)) return;
-    const d = data;
-    const groupId = String(d.group_id ?? "").trim();
-    if (!groupId) return;
-    const epoch = d.epoch ?? 0;
-    client._clientLog.debug(`_onV2EpochRotated: group=${groupId} epoch=${String(epoch)}`);
-    this.deleteBootstrapCacheEntry(`group:${groupId}`);
-    if (!client._v2Session) return;
-    try {
-      await client._v2Session.rotateSPK(client._v2CallFn());
-      client._clientLog.info(`SPK rotated after epoch change: group=${groupId} epoch=${String(epoch)}`);
-    } catch (exc) {
-      client._clientLog.debug(`SPK rotation after epoch change failed (non-fatal): ${formatE2EEError(exc)}`);
-    }
-  }
 };
 
 // src/client/group-state.ts
@@ -17901,7 +18146,8 @@ async function computeStateCommitment(groupId, epoch, statePayload) {
   }
   const sorted = deepClone2(statePayload);
   sortPayload(sorted);
-  const groupBytes = new TextEncoder().encode(groupId);
+  const groupKey = normalizeGroupId(groupId) || String(groupId ?? "").trim();
+  const groupBytes = new TextEncoder().encode(groupKey);
   const epochBytes = new Uint8Array(4);
   new DataView(epochBytes.buffer).setUint32(0, epoch, false);
   const payloadBytes = canonicalJson(sorted);
@@ -18057,6 +18303,13 @@ function normalizedGroupId(raw) {
   const groupId = String(raw ?? "").trim();
   return normalizeGroupId(groupId) || groupId;
 }
+function groupCacheIds(raw, groupId) {
+  const ids = [];
+  for (const value of [groupId, String(raw ?? "").trim()]) {
+    if (value && !ids.includes(value)) ids.push(value);
+  }
+  return ids;
+}
 var GroupStateCoordinator = class {
   constructor(runtime) {
     __publicField(this, "runtime");
@@ -18086,12 +18339,15 @@ var GroupStateCoordinator = class {
   }
   handleGroupChangedV2Membership(data) {
     const client = this.client;
-    const groupId = normalizedGroupId(data.group_id);
+    const rawGroupId = data.group_aid ?? data.group_id;
+    const groupId = normalizedGroupId(rawGroupId);
     const action = String(data.action ?? "").trim();
     if (!groupId) {
       return;
     }
-    client._v2E2EE?.deleteBootstrapCacheEntry?.(`group:${groupId}`);
+    for (const cacheGroupId of groupCacheIds(rawGroupId, groupId)) {
+      client._v2E2EE?.deleteBootstrapCacheEntry?.(`group:${cacheGroupId}`);
+    }
     const membershipAction = MEMBERSHIP_ACTIONS2.has(action);
     if (client._v2Session && (action === "upsert" || membershipAction)) {
       client._safeAsync(client._v2AutoProposeState(groupId, { leaderDelay: true }));
@@ -18101,7 +18357,7 @@ var GroupStateCoordinator = class {
   async onV2StateProposed(data) {
     const client = this.client;
     if (!isJsonObject(data) || !client._v2Session) return;
-    const groupId = normalizedGroupId(data.group_id);
+    const groupId = normalizedGroupId(data.group_aid ?? data.group_id);
     if (!groupId) return;
     await client._dispatcher.publish("group.v2.state_proposed", data);
     try {
@@ -18113,7 +18369,7 @@ var GroupStateCoordinator = class {
   async onV2StateRetryNeeded(data) {
     const client = this.client;
     if (!isJsonObject(data) || !client._v2Session) return;
-    const groupId = normalizedGroupId(data.group_id);
+    const groupId = normalizedGroupId(data.group_aid ?? data.group_id);
     if (!groupId) return;
     await client._dispatcher.publish("group.v2.state_retry_needed", data);
     try {
@@ -18125,9 +18381,12 @@ var GroupStateCoordinator = class {
   async onV2StateConfirmed(data) {
     const client = this.client;
     if (!isJsonObject(data)) return;
-    const groupId = normalizedGroupId(data.group_id);
+    const rawGroupId = data.group_aid ?? data.group_id;
+    const groupId = normalizedGroupId(rawGroupId);
     if (groupId) {
-      client._v2E2EE?.deleteBootstrapCacheEntry?.(`group:${groupId}`);
+      for (const cacheGroupId of groupCacheIds(rawGroupId, groupId)) {
+        client._v2E2EE?.deleteBootstrapCacheEntry?.(`group:${cacheGroupId}`);
+      }
       client._v2AutoProposeLastSnapshot?.delete?.(groupId);
     }
     await client._dispatcher.publish("group.v2.state_confirmed", data);
@@ -18259,14 +18518,16 @@ var GroupStateCoordinator = class {
   async onGroupStateCommitted(data) {
     const client = this.client;
     const tStart = Date.now();
-    const groupIdInit = String(data?.group_id ?? "");
+    const groupIdInit = String(
+      data?.group_aid ?? data?.group_id ?? ""
+    );
     client._clientLog.debug(`_onGroupStateCommitted enter: group_id=${groupIdInit} state_version=${String(data?.state_version ?? "-")}`);
     try {
       if (!isJsonObject(data)) {
         client._clientLog.debug(`_onGroupStateCommitted exit: elapsed=${Date.now() - tStart}ms reason=non_object`);
         return;
       }
-      const groupId = String(data.group_id ?? "").trim();
+      const groupId = normalizedGroupId(data.group_aid ?? data.group_id);
       if (!groupId) {
         client._clientLog.debug(`_onGroupStateCommitted exit: elapsed=${Date.now() - tStart}ms reason=no_group_id`);
         return;
@@ -18700,7 +18961,7 @@ var GroupStateCoordinator = class {
       const groupsResp = await client.call("group.list_my", {});
       const groups = Array.isArray(groupsResp?.groups) ? groupsResp.groups : Array.isArray(groupsResp?.items) ? groupsResp.items : [];
       for (const g of groups) {
-        const gid = String(g.group_id ?? "").trim();
+        const gid = normalizedGroupId(g.group_aid ?? g.group_id);
         const myRole = String(g.role ?? g.my_role ?? "").trim();
         if (!gid || myRole !== "owner" && myRole !== "admin") continue;
         try {
@@ -18719,7 +18980,7 @@ var GroupStateCoordinator = class {
   extractGroupIdFromMutationResult(result, params2) {
     const client = this.client;
     const extracted = typeof client._extractGroupIdFromResult === "function" ? client._extractGroupIdFromResult(result) : "";
-    return normalizedGroupId(extracted || params2.group_id || "");
+    return normalizedGroupId(extracted || params2.group_aid || params2.group_id || "");
   }
   pruneSigCache(now) {
     const client = this.client;
@@ -18753,8 +19014,16 @@ var GroupStateCoordinator = class {
       if (extra.length === 0) return;
       let mode = "";
       try {
-        const reqResp = await client.call("group.get_join_requirements", { group_id: groupId });
-        mode = isJsonObject(reqResp) ? String(reqResp.mode ?? "").trim() : "";
+        const reqResp = await client.call("group.get_settings", { group_id: groupId, keys: ["join.mode"] });
+        const settings = {};
+        if (isJsonObject(reqResp) && Array.isArray(reqResp.settings)) {
+          for (const s of reqResp.settings) {
+            if (isJsonObject(s) && typeof s.key === "string") {
+              settings[s.key] = s.value;
+            }
+          }
+        }
+        mode = String(settings["join.mode"] ?? "").trim();
       } catch {
         mode = "";
       }
@@ -18813,9 +19082,13 @@ var AUNLogger = class {
       error: (msg, ...args) => this._emit("ERROR", module, msg, args),
       warn: (msg, ...args) => this._emit("WARN", module, msg, args),
       info: (msg, ...args) => this._emit("INFO", module, msg, args),
-      debug: (msg, ...args) => this._emit("DEBUG", module, msg, args)
+      debug: (msg, ...args) => this._emit("DEBUG", module, msg, args),
+      isDebugEnabled: () => this.isDebugEnabled()
     };
   }
+  isDebugEnabled() {
+    return this._debug && this._minLevel <= LEVEL_ORDER.DEBUG;
+  }
   bindAid(aid) {
     this._aid = aid || null;
   }
@@ -19439,9 +19712,6 @@ var _AUNClient = class _AUNClient {
     this._dispatcher.subscribe("_raw.group.v2.message_created", (data) => {
       this._safeAsync(this._onRawGroupV2MessageCreated(data));
     });
-    this._dispatcher.subscribe("_raw.group.v2.epoch_rotated", (data) => {
-      this._safeAsync(this._onV2EpochRotated(data));
-    });
     this._dispatcher.subscribe("_raw.group.v2.state_proposed", (data) => {
       this._safeAsync(this._onV2StateProposed(data));
     });
@@ -19741,7 +20011,18 @@ var _AUNClient = class _AUNClient {
    * 自动解密 message.pull/group.pull、Group E2EE 生命周期编排。
    */
   async call(method, params2) {
-    return await this._rpcPipeline.call(method, params2);
+    try {
+      return await this._rpcPipeline.call(method, params2);
+    } catch (err) {
+      await this._maybeHandleHalfOpenRpcFailure(err);
+      throw err;
+    }
+  }
+  async _maybeHandleHalfOpenRpcFailure(err) {
+    if (this._closing || this.state !== "ready" /* READY */) return;
+    if (!this._sessionOptions?.auto_reconnect || this._reconnectActive) return;
+    if (!(err instanceof ConnectionError) && !(err instanceof TimeoutError)) return;
+    await this._handleTransportDisconnect(err);
   }
   async createGroup(params2 = {}) {
     if (!isJsonObject(params2)) {
@@ -19794,8 +20075,30 @@ var _AUNClient = class _AUNClient {
     if (!store) {
       throw new ValidationError("bindGroupAid requires aidStore");
     }
-    const keyPair = await new CryptoProvider().generateIdentity();
+    const groupId = String(params2.group_id ?? params2.group_aid ?? "").trim();
+    const keystore = store._keystore;
+    let keyPair = null;
+    if (groupId && keystore && typeof keystore.loadPendingGroupBind === "function") {
+      keyPair = await keystore.loadPendingGroupBind(groupId);
+    }
+    if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+      const generated = await new CryptoProvider().generateIdentity();
+      keyPair = {
+        private_key_pem: generated.private_key_pem,
+        public_key_der_b64: generated.public_key_der_b64,
+        curve: generated.curve
+      };
+      if (groupId && keystore && typeof keystore.savePendingGroupBind === "function") {
+        await keystore.savePendingGroupBind(groupId, keyPair);
+      }
+    }
+    if (!keyPair) {
+      throw new ValidationError("bindGroupAid: failed to generate or load key pair");
+    }
     const payload = { ...params2 };
+    if (!String(payload.group_id ?? "").trim() && groupId) {
+      payload.group_id = groupId;
+    }
     payload.public_key = keyPair.public_key_der_b64;
     payload.curve = keyPair.curve;
     const result = await this.call("group.bind_group_aid", payload);
@@ -19816,6 +20119,94 @@ var _AUNClient = class _AUNClient {
     if (!imported.ok) {
       throw new ValidationError(imported.error.message);
     }
+    if (groupId && keystore && typeof keystore.clearPendingGroupBind === "function") {
+      await keystore.clearPendingGroupBind(groupId);
+    }
+    return result;
+  }
+  async renewGroupAid(params2 = {}, options = {}) {
+    if (!isJsonObject(params2)) {
+      throw new ValidationError("renewGroupAid params must be an object");
+    }
+    const store = options.aidStore;
+    if (!store) {
+      throw new ValidationError("renewGroupAid requires aidStore");
+    }
+    const groupId = String(params2.group_id ?? params2.group_aid ?? "").trim();
+    if (!groupId) {
+      throw new ValidationError("renewGroupAid requires group_id or group_aid");
+    }
+    let groupAid = String(params2.group_aid ?? "").trim();
+    if (!groupAid) {
+      const info = await this.call("group.get_info", { group_id: groupId, required: ["member"] });
+      groupAid = String(info?.group_aid ?? "").trim();
+    }
+    if (!groupAid) {
+      throw new ValidationError("renewGroupAid: unable to determine group_aid");
+    }
+    const loaded = await store.load(groupAid);
+    if (!loaded.ok || !loaded.data) {
+      throw new ValidationError(`renewGroupAid: group_aid identity not found: ${groupAid}`);
+    }
+    const oldAidObj = loaded.data.aid;
+    if (!oldAidObj.isPrivateKeyValid() || !oldAidObj.privateKeyPem) {
+      throw new ValidationError(`renewGroupAid: group_aid has no private key: ${groupAid}`);
+    }
+    const oldPublicKey = oldAidObj.publicKey;
+    if (!oldPublicKey) {
+      throw new ValidationError(`renewGroupAid: cannot determine old public key for ${groupAid}`);
+    }
+    const newKeyPair = await new CryptoProvider().generateIdentity();
+    const newPublicKey = newKeyPair.public_key_der_b64;
+    const newPrivateKey = newKeyPair.private_key_pem;
+    const curve = newKeyPair.curve || "P-256";
+    if (!newPublicKey || !newPrivateKey) {
+      throw new ValidationError("renewGroupAid: generated incomplete group identity");
+    }
+    const nonce = globalThis.crypto.randomUUID().replace(/-/g, "");
+    const issuedMs = Date.now();
+    const oldHash = bytesToHex7(new Uint8Array(await globalThis.crypto.subtle.digest("SHA-256", new TextEncoder().encode(oldPublicKey))));
+    const newHash = bytesToHex7(new Uint8Array(await globalThis.crypto.subtle.digest("SHA-256", new TextEncoder().encode(newPublicKey))));
+    const canonical = [
+      "aun-group-aid-renew-v1",
+      groupId.toLowerCase(),
+      groupAid.toLowerCase(),
+      oldHash,
+      newHash,
+      nonce,
+      String(issuedMs)
+    ].join("|");
+    const signed = await oldAidObj.sign(canonical);
+    if (!signed.ok) {
+      throw new ValidationError(`renewGroupAid: sign failed: ${signed.error.message}`);
+    }
+    const payload = { ...params2 };
+    if (!String(payload.group_id ?? "").trim()) {
+      payload.group_id = groupId;
+    }
+    payload.group_aid = groupAid;
+    payload.old_public_key = oldPublicKey;
+    payload.new_public_key = newPublicKey;
+    payload.curve = curve;
+    payload.renew_proof = { nonce, issued_ms: issuedMs, signature: signed.data.signature };
+    const result = await this.call("group.renew_group_aid", payload);
+    const resultMap = isJsonObject(result) ? result : {};
+    const group = isJsonObject(resultMap.group) ? resultMap.group : {};
+    const aidCert = isJsonObject(resultMap.aid_cert) ? resultMap.aid_cert : {};
+    const returnedGroupAid = String(group.group_aid ?? resultMap.group_aid ?? groupAid).trim();
+    const certPem = String(aidCert.cert ?? aidCert.cert_pem ?? resultMap.cert ?? resultMap.cert_pem ?? "").trim();
+    if (!returnedGroupAid || !certPem) {
+      throw new ValidationError("renewGroupAid response missing group.group_aid or aid_cert.cert");
+    }
+    const imported = await store.importGroupIdentity(returnedGroupAid, {
+      private_key_pem: newPrivateKey,
+      public_key_der_b64: newPublicKey,
+      curve,
+      cert_pem: certPem
+    });
+    if (!imported.ok) {
+      throw new ValidationError(`renewGroupAid failed to persist group identity: ${imported.error.message}`);
+    }
     return result;
   }
   async startGroupTransfer(params2 = {}, options = {}) {
@@ -19833,10 +20224,8 @@ var _AUNClient = class _AUNClient {
     }
     let groupAid = String(params2.group_aid ?? "").trim();
     if (!groupAid) {
-      const info = await this.call("group.get", { group_id: groupId });
-      const infoMap = isJsonObject(info) ? info : {};
-      const grp = isJsonObject(infoMap.group) ? infoMap.group : infoMap;
-      groupAid = String(grp.group_aid ?? "").trim();
+      const info = await this.call("group.get_info", { group_id: groupId, required: ["member"] });
+      groupAid = String(info?.group_aid ?? "").trim();
     }
     if (!groupAid) {
       throw new ValidationError("startGroupTransfer: unable to determine group_aid");
@@ -19883,10 +20272,8 @@ var _AUNClient = class _AUNClient {
     }
     let groupAid = String(params2.group_aid ?? "").trim();
     if (!groupAid) {
-      const info = await this.call("group.get", { group_id: groupId });
-      const infoMap = isJsonObject(info) ? info : {};
-      const grp = isJsonObject(infoMap.group) ? infoMap.group : infoMap;
-      groupAid = String(grp.group_aid ?? "").trim();
+      const info = await this.call("group.get_info", { group_id: groupId, required: ["member"] });
+      groupAid = String(info?.group_aid ?? "").trim();
     }
     if (!groupAid) {
       throw new ValidationError("completeGroupTransfer: unable to determine group_aid");
@@ -19974,7 +20361,7 @@ var _AUNClient = class _AUNClient {
       throw new ValidationError("notify payload is too large");
     }
     const targetAid = String(options.to ?? "").trim();
-    const targetGroupId = String(options.group_id ?? options.groupId ?? "").trim();
+    const targetGroupId = String(options.group_aid ?? options.groupAid ?? options.group_id ?? options.groupId ?? "").trim();
     const targetDeviceId = String(options.device_id ?? options.deviceId ?? "").trim();
     const targetSlotId = String(options.slot_id ?? options.slotId ?? "").trim();
     const ttl = _AUNClient._normalizeNotifyTtl(options.ttl_ms ?? options.ttlMs);
@@ -19986,6 +20373,7 @@ var _AUNClient = class _AUNClient {
     }
     if (targetAid) {
       const eventMethod = _AUNClient._validateNotifyEventMethod(method);
+      validateAIDFormat(targetAid, "notify.to");
       const target = { type: "aid", aid: targetAid };
       if (targetDeviceId) target.device_id = targetDeviceId;
       if (targetSlotId) target.slot_id = targetSlotId;
@@ -19999,11 +20387,13 @@ var _AUNClient = class _AUNClient {
     }
     if (targetGroupId) {
       const eventMethod = _AUNClient._validateNotifyEventMethod(method);
+      validateGroupIDFormat(targetGroupId, "notify.group_id");
       const normalizedGroupId2 = normalizeGroupId(targetGroupId);
       if (!normalizedGroupId2) {
         throw new ValidationError("group_id is required for group notify");
       }
       const routeParams = {
+        group_aid: normalizedGroupId2,
         group_id: normalizedGroupId2,
         deliver: { method: eventMethod, params: payload }
       };
@@ -20028,8 +20418,10 @@ var _AUNClient = class _AUNClient {
     delete p._skip_auto_ack;
     delete p.skip_auto_ack;
     delete p._group_cursor_params;
-    if (method.startsWith("group.") && p.group_id !== void 0 && p.group_id !== null) {
-      p.group_id = normalizeGroupId(String(p.group_id)) || String(p.group_id);
+    if (method.startsWith("group.") && p.group_aid !== void 0 && p.group_aid !== null) {
+      p.group_aid = normalizeGroupId(String(p.group_aid)) || String(p.group_aid);
+    } else if (method.startsWith("group.") && p.group_id !== void 0 && p.group_id !== null) {
+      p.group_aid = normalizeGroupId(String(p.group_id)) || String(p.group_id);
     }
     if (method.startsWith("group.") && p.device_id === void 0) {
       p.device_id = this._deviceId;
@@ -20135,17 +20527,17 @@ var _AUNClient = class _AUNClient {
   }
   _extractGroupIdFromResult(result) {
     const group = isJsonObject(result.group) ? result.group : null;
-    const gid = group ? String(group.group_id ?? "") : "";
+    const gid = group ? String(group.group_aid ?? group.group_id ?? "") : "";
     if (gid) return gid;
-    const directGid = String(result.group_id ?? "");
+    const directGid = String(result.group_aid ?? result.group_id ?? "");
     if (directGid) return directGid;
     const member = isJsonObject(result.member) ? result.member : null;
-    return member ? String(member.group_id ?? "") : "";
+    return member ? String(member.group_aid ?? member.group_id ?? "") : "";
   }
   async _onRawGroupChanged(data) {
     const tStart = Date.now();
     const action = String(data?.action ?? "");
-    const groupIdInit = String(data?.group_id ?? "");
+    const groupIdInit = String(data?.group_aid ?? data?.group_id ?? "");
     this._clientLog.debug(`_onRawGroupChanged enter: group_id=${groupIdInit} action=${action}`);
     try {
       if (isJsonObject(data)) {
@@ -20159,7 +20551,7 @@ var _AUNClient = class _AUNClient {
             d._verified = this._isEventSignatureVerified(verified);
           }
         }
-        const groupId = d.group_id ?? "";
+        const groupId = d.group_aid ?? d.group_id ?? "";
         await this._delivery.handleGroupChangedEventSeq(d, groupId);
       } else {
         await this._dispatcher.publish("group.changed", data);
@@ -20188,18 +20580,22 @@ var _AUNClient = class _AUNClient {
     this._v2E2EE.deleteBootstrapCacheEntry(`group:${groupId}`);
     this._v2GroupSecurityLevels.delete(groupId);
     this._v2StateChains.delete(groupId);
-    this._seqTracker.removeNamespace(`group:${groupId}`);
-    this._seqTracker.removeNamespace(`group_event:${groupId}`);
-    this._saveSeqTrackerState();
+    const groupNs = `group:${groupId}`;
+    const groupEventNs = `group_event:${groupId}`;
+    this._seqTracker.removeNamespace(groupNs);
+    this._seqTracker.removeNamespace(groupEventNs);
+    this._persistRepairedSeq(groupNs);
+    this._persistRepairedSeq(groupEventNs);
+    void this._saveSeqTrackerState();
     for (const key of this._gapFillDone.keys()) {
       if (key.includes(groupId)) {
         this._gapFillDone.delete(key);
       }
     }
-    this._pushedSeqs.delete(`group:${groupId}`);
-    this._pushedSeqs.delete(`group_event:${groupId}`);
-    this._pendingOrderedMsgs.delete(`group:${groupId}`);
-    this._pendingOrderedMsgs.delete(`group_event:${groupId}`);
+    this._pushedSeqs.delete(groupNs);
+    this._pushedSeqs.delete(groupEventNs);
+    this._pendingOrderedMsgs.delete(groupNs);
+    this._pendingOrderedMsgs.delete(groupEventNs);
     this._clientLog.info(`cleanup dissolved group ${groupId}  local state`);
   }
   async _verifyEventSignature(_event, cs) {
@@ -20660,7 +21056,7 @@ var _AUNClient = class _AUNClient {
     let consecutiveFailures = 0;
     const maxFailures = 2;
     this._heartbeatTimer = setInterval(async () => {
-      if (this._state !== "connected" || this._closing) return;
+      if (this.state !== "ready" /* READY */ || this._closing) return;
       try {
         const pong = await this._transport.call("meta.ping", {});
         this._heartbeatCount++;
@@ -20690,7 +21086,7 @@ var _AUNClient = class _AUNClient {
       clearInterval(this._heartbeatTimer);
       this._heartbeatTimer = null;
     }
-    if (newInterval > 0 && this._state === "connected" && !this._closing) {
+    if (newInterval > 0 && this.state === "ready" /* READY */ && !this._closing) {
       this._startHeartbeat();
     }
   }
@@ -20704,7 +21100,7 @@ var _AUNClient = class _AUNClient {
       this._tokenRefreshTimer = globalThis.setTimeout(async () => {
         if (this._closing) return;
         this._tokenRefreshTimer = null;
-        if (this._state !== "connected" || !this._gatewayUrl) {
+        if (this.state !== "ready" /* READY */ || !this._gatewayUrl) {
           scheduleRefresh();
           return;
         }
@@ -20722,13 +21118,13 @@ var _AUNClient = class _AUNClient {
           scheduleRefresh();
           return;
         }
-        if (this._state !== "connected" || !this._gatewayUrl || this._closing) {
+        if (this.state !== "ready" /* READY */ || !this._gatewayUrl || this._closing) {
           scheduleRefresh();
           return;
         }
         try {
           identity = await this._auth.refreshCachedTokens(this._gatewayUrl, identity);
-          if (this._state !== "connected") {
+          if (this.state !== "ready" /* READY */) {
             scheduleRefresh();
             return;
           }
@@ -20805,6 +21201,9 @@ var _AUNClient = class _AUNClient {
     if (this._closing || this._state === "closed") return;
     this._state = "standby";
     this._stopBackgroundTasks();
+    void this._transport.close().catch((exc) => {
+      this._clientLog.debug(`transport cleanup skipped: ${formatCaughtError2(exc)}`);
+    });
     await this._dispatcher.publish("state_change", {
       state: this._publicState(this._state),
       error
@@ -20972,6 +21371,7 @@ var _AUNClient = class _AUNClient {
     return JSON.stringify([this._aid, this._deviceId, this._slotId]);
   }
   _resetSeqTrackingState() {
+    void this._saveSeqTrackerState();
     this._resetV2IdentityRuntime();
     this._seqTracker = new SeqTracker();
     this._seqTrackerContext = null;
@@ -20991,6 +21391,7 @@ var _AUNClient = class _AUNClient {
   _refreshSeqTrackerContext() {
     const nextContext = this._currentSeqTrackerContext();
     if (nextContext === this._seqTrackerContext) return;
+    void this._saveSeqTrackerState();
     this._seqTracker = new SeqTracker();
     this._gapFillDone.clear();
     this._pushedSeqs.clear();
@@ -21010,6 +21411,9 @@ var _AUNClient = class _AUNClient {
   _saveSeqTrackerState() {
     return this._delivery.saveSeqTrackerState();
   }
+  _persistSeq(ns, forceSeq) {
+    return this._delivery.persistSeq(ns, forceSeq);
+  }
   _persistRepairedSeq(ns) {
     return this._delivery.persistRepairedSeq(ns);
   }
@@ -21502,12 +21906,6 @@ var _AUNClient = class _AUNClient {
   async _onV2PushNotification(data) {
     return this._delivery.onV2PushNotification(data);
   }
-  /**
-   * 处理 V2 epoch 轮换事件：清除 bootstrap 缓存 + 触发 SPK rotation。
-   */
-  async _onV2EpochRotated(data) {
-    return this._v2E2EE.handleV2EpochRotated(data);
-  }
   /** 安全执行异步操作（不阻塞调用方，错误打 warning 便于排障） */
   _safeAsync(promise) {
     promise.catch((exc) => {
@@ -22826,11 +23224,6 @@ export {
   E2EEDecryptFailedError,
   E2EEDegradedError,
   E2EEError,
-  E2EEGroupCommitmentInvalidError,
-  E2EEGroupDecryptFailedError,
-  E2EEGroupEpochMismatchError,
-  E2EEGroupNotMemberError,
-  E2EEGroupSecretMissingError,
   EmbeddedServiceRegistry,
   EndpointPolicy,
   EventDispatcher,
@@ -22876,7 +23269,9 @@ export {
   V2Session,
   ValidationError,
   VERSION as __version__,
+  buildDiscoveryHost,
   computeStateCommitment,
+  convertToGroupAid,
   createConfig,
   createDefaultSecretStore,
   decryptMessage,
@@ -22887,8 +23282,14 @@ export {
   isJsonObject,
   mapCollabError,
   mapRemoteError,
+  normalizeGroupAid,
+  normalizeGroupId,
   resultErr,
-  resultOk
+  resultOk,
+  splitGroupId,
+  validateAIDFormat,
+  validateGroupAIDFormat,
+  validateGroupIDFormat
 };
 /*! Bundled license information: