@agentunion/fastaun-browser 0.3.5 → 0.4.0

package/dist/bundle.js

@@ -225,10 +225,10 @@ var init_crypto = __esm({
         const pkcs8 = await crypto.subtle.exportKey("pkcs8", keyPair.privateKey);
         const privateKeyPem = arrayBufferToPem(pkcs8, "PRIVATE KEY");
         const spki = await crypto.subtle.exportKey("spki", keyPair.publicKey);
-        const publicKeyDerB64 = uint8ToBase64(new Uint8Array(spki));
+        const publicKeyDerB642 = uint8ToBase64(new Uint8Array(spki));
         return {
           private_key_pem: privateKeyPem,
-          public_key_der_b64: publicKeyDerB64,
+          public_key_der_b64: publicKeyDerB642,
           curve: _CryptoProvider.curveName
         };
       }
@@ -314,12 +314,12 @@ async function secretPut(storeName, key, value) {
     tx.oncomplete = () => db.close();
   });
 }
-var _noopLog9, SECRET_DB_NAME, SECRET_DB_VERSION, STORE_SECRETS, STORE_MASTER, IndexedDBSecretStore;
+var _noopLog6, SECRET_DB_NAME, SECRET_DB_VERSION, STORE_SECRETS, STORE_MASTER, IndexedDBSecretStore;
 var init_indexeddb_store = __esm({
   "src/secret-store/indexeddb-store.ts"() {
     "use strict";
     init_crypto();
-    _noopLog9 = { error: () => {
+    _noopLog6 = { error: () => {
     }, warn: () => {
     }, info: () => {
     }, debug: () => {
@@ -332,7 +332,7 @@ var init_indexeddb_store = __esm({
       constructor(encryptionSeed) {
         __publicField(this, "_encryptionSeed");
         __publicField(this, "_masterKeyPromise", null);
-        __publicField(this, "_log", _noopLog9);
+        __publicField(this, "_log", _noopLog6);
         this._encryptionSeed = encryptionSeed;
       }
       setLogger(log) {
@@ -453,7 +453,31 @@ var init_indexeddb_store = __esm({
   }
 });
 
+// src/version.ts
+var VERSION = "0.4.0";
+
 // src/types.ts
+var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
+  ConnectionState2["NO_IDENTITY"] = "no_identity";
+  ConnectionState2["STANDBY"] = "standby";
+  ConnectionState2["AUTHENTICATED"] = "authenticated";
+  ConnectionState2["CONNECTING"] = "connecting";
+  ConnectionState2["READY"] = "ready";
+  ConnectionState2["RETRY_BACKOFF"] = "retry_backoff";
+  ConnectionState2["RECONNECTING"] = "reconnecting";
+  ConnectionState2["CONNECTION_FAILED"] = "connection_failed";
+  ConnectionState2["CLOSED"] = "closed";
+  return ConnectionState2;
+})(ConnectionState || {});
+var STATE_TO_PUBLIC = {
+  idle: "no_identity" /* NO_IDENTITY */,
+  authenticating: "connecting" /* CONNECTING */,
+  connected: "ready" /* READY */,
+  disconnected: "standby" /* STANDBY */,
+  terminal_failed: "connection_failed" /* CONNECTION_FAILED */,
+  retry_backoff: "retry_backoff" /* RETRY_BACKOFF */,
+  reconnecting: "reconnecting" /* RECONNECTING */
+};
 function isJsonObject(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
     return false;
@@ -466,12 +490,16 @@ function isJsonObject(value) {
 var AUNError = class extends Error {
   constructor(message, opts) {
     super(message);
+    /** JSON-RPC 错误码（数字，用于 RPC 层） */
     __publicField(this, "code");
+    /** 业务字符串错误码（与 Python/TS SDK error_codes 对齐） */
+    __publicField(this, "stringCode");
     __publicField(this, "data");
     __publicField(this, "retryable");
     __publicField(this, "traceId");
     this.name = "AUNError";
     this.code = opts?.code ?? -1;
+    this.stringCode = opts?.stringCode ?? "";
     this.data = opts?.data ?? null;
     this.retryable = opts?.retryable ?? false;
     this.traceId = opts?.traceId ?? null;
@@ -1185,7 +1213,8 @@ var DIAG_PARAM_FIELDS = [
   "request_id",
   "owner_aid",
   "rotated_by",
-  "action"
+  "action",
+  "force"
 ];
 var DIAG_RESULT_FIELDS = [
   ...DIAG_PARAM_FIELDS,
@@ -1232,6 +1261,8 @@ var RPCTransport = class {
     __publicField(this, "_onDisconnect");
     __publicField(this, "_ws", null);
     __publicField(this, "_closed", true);
+    __publicField(this, "_lastCloseCode", null);
+    __publicField(this, "_lastCloseReason", "");
     __publicField(this, "_challenge", null);
     __publicField(this, "_pending", /* @__PURE__ */ new Map());
     __publicField(this, "_pendingBackground", /* @__PURE__ */ new Set());
@@ -1287,6 +1318,8 @@ var RPCTransport = class {
   async connect(url) {
     const tStart = Date.now();
     this._log.debug(`connect enter: url=${url}`);
+    this._lastCloseCode = null;
+    this._lastCloseReason = "";
     return new Promise((resolve, reject) => {
       const ws = new WebSocket(url);
       this._ws = ws;
@@ -1329,6 +1362,8 @@ var RPCTransport = class {
         }
       };
       ws.onclose = (event) => {
+        this._lastCloseCode = event.code;
+        this._lastCloseReason = event.reason ?? "";
         if (!initialResolved) {
           initialResolved = true;
           this._log.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=closed_before_initial code=${event.code}`);
@@ -1379,7 +1414,7 @@ var RPCTransport = class {
    */
   async call(method, params, timeout, trace, background = false) {
     if (this._closed || !this._ws) {
-      throw new ConnectionError("transport not connected");
+      throw this._notConnectedError();
     }
     const rpcId = `rpc-${String(++_rpcIdCounter).padStart(6, "0")}`;
     const effectiveTimeout = (timeout ?? this._timeout) * 1e3;
@@ -1571,6 +1606,8 @@ var RPCTransport = class {
   _handleClose(event) {
     const wasClosed = this._closed;
     this._closed = true;
+    this._lastCloseCode = event.code;
+    this._lastCloseReason = event.reason ?? "";
     const err = new ConnectionError(`websocket closed: code=${event.code}`);
     for (const [, pending] of this._pending) {
       clearTimeout(pending.timer);
@@ -1596,6 +1633,13 @@ var RPCTransport = class {
       }
     }
   }
+  _notConnectedError() {
+    if (this._lastCloseCode !== null) {
+      const reason = this._lastCloseReason ? ` reason=${this._lastCloseReason}` : "";
+      return new ConnectionError(`transport not connected: last websocket close code=${this._lastCloseCode}${reason}`);
+    }
+    return new ConnectionError("transport not connected");
+  }
   _routeMessage(message) {
     if ("id" in message) {
       const rpcId = String(message.id);
@@ -1702,7 +1746,6 @@ var _noopLog4 = { error: () => {
 }, debug: () => {
 } };
 var AUN_SDK_LANG = "javascript";
-var AUN_SDK_VERSION = "0.3.5";
 function splitPemBundle(bundle) {
   const marker = "-----END CERTIFICATE-----";
   const certs = [];
@@ -2013,7 +2056,13 @@ var _AuthFlow = class _AuthFlow {
       const cert = await this._keystore.loadCert(identity.aid);
       if (cert) identity.cert = cert;
       const instanceState = await this._loadInstanceState(identity.aid);
-      if (instanceState) Object.assign(identity, instanceState);
+      if (instanceState) {
+        for (const key of _AuthFlow._INSTANCE_STATE_FIELDS) {
+          if (key in instanceState) {
+            identity[key] = instanceState[key];
+          }
+        }
+      }
       this._log.debug(`loadIdentity exit: elapsed=${Date.now() - tStart}ms aid=${identity.aid} has_cert=${!!identity.cert}`);
       return identity;
     } catch (err) {
@@ -2532,7 +2581,25 @@ var _AuthFlow = class _AuthFlow {
     });
     return { cert: response.cert };
   }
-  /** 下载服务端当前登记的证书；未注册返回 null */
+  /**
+   * 从服务端下载指定 AID 的证书（公开 API）。
+   *
+   * @param gatewayUrl - Gateway WebSocket URL
+   * @param aid - 目标 AID
+   * @returns 证书 PEM 字符串，如果 AID 未注册则返回 null
+   *
+   * @example
+   * ```typescript
+   * const cert = await auth.fetchPeerCert('wss://gateway.example.com', 'alice.aid.com');
+   * if (cert) {
+   *   console.log('Alice is registered');
+   * }
+   * ```
+   */
+  async fetchPeerCert(gatewayUrl, aid) {
+    return this._downloadRegisteredCert(gatewayUrl, aid);
+  }
+  /** 下载服务端当前登记的证书（内部实现）；未注册返回 null */
   async _downloadRegisteredCert(gatewayUrl, aid) {
     const certUrl = gatewayHttpUrl(gatewayUrl, `/pki/cert/${aid}`);
     try {
@@ -2631,7 +2698,7 @@ var _AuthFlow = class _AuthFlow {
       client: {
         slot_id: String(opts?.slotId ?? this._slotId ?? ""),
         sdk_lang: AUN_SDK_LANG,
-        sdk_version: AUN_SDK_VERSION
+        sdk_version: VERSION
       },
       delivery_mode: opts?.deliveryMode ?? { mode: "fanout" },
       capabilities
@@ -3376,1886 +3443,169 @@ var SeqTracker = class {
   }
 };
 
-// src/namespaces/auth.ts
+// src/client.ts
+init_crypto();
+
+// src/keystore/indexeddb.ts
 init_crypto();
 var _noopLog5 = { error: () => {
 }, warn: () => {
 }, info: () => {
 }, debug: () => {
 } };
-var AGENT_MD_HTTP_TIMEOUT_MS = 3e4;
-var AGENT_MD_SIGNATURE_MARKER = "<!-- AUN-SIGNATURE";
-var AGENT_MD_SIGNATURE_RE = /^<!-- AUN-SIGNATURE\r?\n(?<body>[\s\S]*?)\r?\n-->\s*$/;
-var AGENT_MD_FINGERPRINT_RE = /^sha256:[0-9a-f]{64}$/;
-function agentMdHttpScheme(gatewayUrl) {
-  const raw = String(gatewayUrl ?? "").trim().toLowerCase();
-  return raw.startsWith("ws://") ? "http" : "https";
+function safeAid(aid) {
+  return aid.replace(/[/\\:]/g, "_");
 }
-function agentMdAuthority(aid, discoveryPort) {
-  const host = String(aid ?? "").trim();
-  if (!host) return "";
-  if (discoveryPort && !host.includes(":")) {
-    return `${host}:${discoveryPort}`;
+function extractSpkiB64FromCertPem(certPem) {
+  try {
+    const der = new Uint8Array(pemToArrayBuffer(certPem));
+    const tlv = (d, o) => {
+      let lo = o + 1, len;
+      if (d[lo] & 128) {
+        const n = d[lo] & 127;
+        len = 0;
+        for (let i = 0; i < n; i++) len = len << 8 | d[lo + 1 + i];
+        lo += 1 + n;
+      } else {
+        len = d[lo];
+        lo += 1;
+      }
+      return [lo, len];
+    };
+    const skip = (d, o) => {
+      const [vs2, vl] = tlv(d, o);
+      return vs2 + vl;
+    };
+    let [vs] = tlv(der, 0);
+    let pos = vs;
+    const [tbsVs] = tlv(der, pos);
+    pos = tbsVs;
+    if (der[pos] === 160) pos = skip(der, pos);
+    for (let i = 0; i < 5; i++) pos = skip(der, pos);
+    const spkiEnd = skip(der, pos);
+    const spkiBytes = der.slice(pos, spkiEnd);
+    let b = "";
+    for (let i = 0; i < spkiBytes.length; i++) b += String.fromCharCode(spkiBytes[i]);
+    return btoa(b);
+  } catch {
+    return "";
   }
-  return host;
 }
-function parseAgentMdTailSignature(content) {
-  const idx = content.lastIndexOf(AGENT_MD_SIGNATURE_MARKER);
-  if (idx < 0) {
-    return { payload: content, fields: null };
-  }
-  if (idx > 0 && content[idx - 1] !== "\n" && content[idx - 1] !== "\r") {
-    return { payload: content, fields: null };
-  }
-  const tail = content.slice(idx);
-  const match = tail.match(AGENT_MD_SIGNATURE_RE);
-  if (!match) {
-    return { payload: content.slice(0, idx), fields: null, parseError: "malformed signature block" };
-  }
-  const fields = {};
-  for (const rawLine of match.groups?.body?.split(/\r?\n/) ?? []) {
-    const line = rawLine.trim();
-    if (!line) continue;
-    const colon = line.indexOf(":");
-    if (colon < 0) {
-      return { payload: content.slice(0, idx), fields: null, parseError: `malformed signature field: ${line}` };
-    }
-    const key = line.slice(0, colon).trim().toLowerCase();
-    const value = line.slice(colon + 1).trim();
-    fields[key] = value;
-  }
-  for (const required of ["cert_fingerprint", "timestamp", "signature"]) {
-    if (!fields[required]) {
-      return { payload: content.slice(0, idx), fields: null, parseError: `signature block missing ${required}` };
-    }
-  }
-  if (!AGENT_MD_FINGERPRINT_RE.test(fields.cert_fingerprint.toLowerCase())) {
-    return { payload: content.slice(0, idx), fields: null, parseError: "invalid cert_fingerprint" };
-  }
-  if (!Number.isFinite(Number(fields.timestamp))) {
-    return { payload: content.slice(0, idx), fields: null, parseError: "invalid timestamp" };
-  }
-  return { payload: content.slice(0, idx), fields, parseError: void 0 };
+function encodePart(value) {
+  return encodeURIComponent(value);
 }
-function extractAgentMDAid(payload) {
-  const lines = payload.replace(/^\ufeff/, "").split(/\r?\n/);
-  if (!lines.length || lines[0].trim() !== "---") {
-    return "";
-  }
-  for (const line of lines.slice(1)) {
-    const trimmed = line.trim();
-    if (trimmed === "---") break;
-    if (trimmed.startsWith("aid:")) {
-      let value = trimmed.slice(4).trim();
-      if (value.length >= 2 && value[0] === value[value.length - 1] && (value[0] === '"' || value[0] === "'")) {
-        value = value.slice(1, -1);
-      }
-      return value.trim();
-    }
+function deepClone(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+function isRecord(value) {
+  return isJsonObject(value);
+}
+function toBufferSource2(bytes) {
+  return bytes.slice().buffer;
+}
+function sameJson(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+var _ENC_ALGO = "AES-GCM";
+var _PBKDF2_ITERATIONS = 1e5;
+var SeedMigrationError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SeedMigrationError";
   }
-  return "";
+};
+function _uint8ToBase64(bytes) {
+  let b = "";
+  for (let i = 0; i < bytes.length; i++) b += String.fromCharCode(bytes[i]);
+  return btoa(b);
+}
+function _base64ToUint8(b64) {
+  return Uint8Array.from(atob(b64), (c) => c.charCodeAt(0));
+}
+async function _deriveEncKey(seed, salt) {
+  const raw = new TextEncoder().encode(seed);
+  const base = await crypto.subtle.importKey("raw", raw, "PBKDF2", false, ["deriveKey"]);
+  return crypto.subtle.deriveKey(
+    { name: "PBKDF2", salt, iterations: _PBKDF2_ITERATIONS, hash: "SHA-256" },
+    base,
+    { name: _ENC_ALGO, length: 256 },
+    false,
+    ["encrypt", "decrypt"]
+  );
 }
-function agentMdResult(status, payload, reason = "", aid = "", certFingerprint = "", timestamp) {
-  const result = {
-    status,
-    verified: status === "verified",
-    payload
+async function _encryptPEM(pem, seed) {
+  const salt = crypto.getRandomValues(new Uint8Array(16));
+  const iv = crypto.getRandomValues(new Uint8Array(12));
+  const key = await _deriveEncKey(seed, salt);
+  const ct = await crypto.subtle.encrypt({ name: _ENC_ALGO, iv }, key, new TextEncoder().encode(pem));
+  return {
+    ct: _uint8ToBase64(new Uint8Array(ct)),
+    iv: _uint8ToBase64(iv),
+    salt: _uint8ToBase64(salt)
   };
-  if (reason) result.reason = reason;
-  if (aid) result.aid = aid;
-  if (certFingerprint) result.cert_fingerprint = certFingerprint;
-  if (timestamp !== void 0) result.timestamp = timestamp;
-  return result;
 }
-function normalizeIdentityCertPem(identity) {
-  if (!identity) return "";
-  return String(identity.cert ?? identity.cert_pem ?? "").trim();
+async function _decryptPEM(enc, seed) {
+  const salt = _base64ToUint8(enc.salt);
+  const iv = _base64ToUint8(enc.iv);
+  const ct = _base64ToUint8(enc.ct);
+  const key = await _deriveEncKey(seed, salt);
+  const pt = await crypto.subtle.decrypt({ name: _ENC_ALGO, iv: toBufferSource2(iv) }, key, toBufferSource2(ct));
+  return new TextDecoder().decode(pt);
 }
-function parseAgentMdTimestamp(value) {
-  const parsed = Number(value.trim());
-  return Number.isFinite(parsed) ? Math.trunc(parsed) : void 0;
+function hasEncryptionSeed(seed) {
+  return seed !== void 0;
 }
-function readDerLength(bytes, offset) {
-  const first = bytes[offset];
-  if (first === void 0) return null;
-  if (first < 128) {
-    return { length: first, lengthBytes: 1 };
-  }
-  const count = first & 127;
-  if (count === 0 || count > 4 || offset + count >= bytes.length) {
-    return null;
-  }
-  let length = 0;
-  for (let i = 0; i < count; i++) {
-    length = length << 8 | bytes[offset + 1 + i];
-  }
-  return { length, lengthBytes: 1 + count };
+var DB_NAME = "aun-keystore";
+var DB_VERSION = 6;
+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 STRUCTURED_RECOVERY_RETENTION_MS = 7 * 24 * 3600 * 1e3;
+function metadataStoreKey(aid) {
+  return safeAid(aid);
+}
+function normalizeCertFingerprint(certFingerprint) {
+  const normalized = String(certFingerprint ?? "").trim().toLowerCase();
+  if (!normalized) return "";
+  if (!normalized.startsWith("sha256:")) return "";
+  const hexPart = normalized.slice(7);
+  if (hexPart.length !== 64 || /[^0-9a-f]/.test(hexPart)) return "";
+  return normalized;
 }
-function extractCommonNameFromCertPem(certPem) {
+async function fingerprintFromCertPem(certPem) {
   try {
-    const bytes = new Uint8Array(pemToArrayBuffer(certPem));
-    const oid = [6, 3, 85, 4, 3];
-    const decoder2 = new TextDecoder();
-    let commonName = "";
-    for (let i = 0; i <= bytes.length - oid.length - 2; i++) {
-      let matched = true;
-      for (let j = 0; j < oid.length; j++) {
-        if (bytes[i + j] !== oid[j]) {
-          matched = false;
-          break;
-        }
-      }
-      if (!matched) continue;
-      const tag = bytes[i + oid.length];
-      const lengthInfo = readDerLength(bytes, i + oid.length + 1);
-      if (!lengthInfo) continue;
-      const start = i + oid.length + 1 + lengthInfo.lengthBytes;
-      const end = start + lengthInfo.length;
-      if (end > bytes.length) continue;
-      const valueBytes = bytes.slice(start, end);
-      if (tag === 12 || tag === 19 || tag === 22 || tag === 20 || tag === 30) {
-        commonName = decoder2.decode(valueBytes).trim();
-      } else {
-        commonName = decoder2.decode(valueBytes).trim();
-      }
-    }
-    return commonName;
+    const der = pemToArrayBuffer(certPem);
+    const hash = await crypto.subtle.digest("SHA-256", der);
+    const hex = Array.from(new Uint8Array(hash)).map((b) => b.toString(16).padStart(2, "0")).join("");
+    return `sha256:${hex}`;
   } catch {
     return "";
   }
 }
-function parseCertValidity(certPem) {
-  try {
-    const der = new Uint8Array(pemToArrayBuffer(certPem));
-    const dates = [];
-    for (let i = 0; i < der.length - 2 && dates.length < 2; i++) {
-      const tag = der[i];
-      if (tag !== 23 && tag !== 24) continue;
-      const len = der[i + 1];
-      if (len === 0 || len > 20 || i + 2 + len > der.length) continue;
-      const str = new TextDecoder().decode(der.slice(i + 2, i + 2 + len));
-      const ts = parseAsn1Time2(tag, str);
-      if (ts !== null) {
-        dates.push(ts);
-        i += 1 + len;
-      }
-    }
-    if (dates.length >= 2) {
-      return { notBefore: dates[0], notAfter: dates[1] };
-    }
-    return null;
-  } catch {
-    return null;
-  }
+function certStoreKey(aid, certFingerprint) {
+  const normalized = normalizeCertFingerprint(certFingerprint);
+  if (!normalized) return safeAid(aid);
+  return `${safeAid(aid)}|${encodePart(normalized)}`;
 }
-function parseAsn1Time2(tag, str) {
-  try {
-    if (tag === 23) {
-      const cleaned = str.replace(/Z$/i, "");
-      if (cleaned.length < 12) return null;
-      let year = parseInt(cleaned.slice(0, 2), 10);
-      year += year >= 50 ? 1900 : 2e3;
-      const month = parseInt(cleaned.slice(2, 4), 10) - 1;
-      const day = parseInt(cleaned.slice(4, 6), 10);
-      const hour = parseInt(cleaned.slice(6, 8), 10);
-      const min = parseInt(cleaned.slice(8, 10), 10);
-      const sec = parseInt(cleaned.slice(10, 12), 10);
-      return Date.UTC(year, month, day, hour, min, sec);
-    } else if (tag === 24) {
-      const cleaned = str.replace(/Z$/i, "");
-      if (cleaned.length < 14) return null;
-      const year = parseInt(cleaned.slice(0, 4), 10);
-      const month = parseInt(cleaned.slice(4, 6), 10) - 1;
-      const day = parseInt(cleaned.slice(6, 8), 10);
-      const hour = parseInt(cleaned.slice(8, 10), 10);
-      const min = parseInt(cleaned.slice(10, 12), 10);
-      const sec = parseInt(cleaned.slice(12, 14), 10);
-      return Date.UTC(year, month, day, hour, min, sec);
-    }
-    return null;
-  } catch {
-    return null;
-  }
+function instanceStateStoreKey(aid, deviceId, slotId = "") {
+  const normalizedDevice = normalizeInstanceId(deviceId, "device_id");
+  const normalizedSlot = normalizeInstanceId(slotId, "slot_id", { allowEmpty: true }) || "_singleton";
+  return `${safeAid(aid)}|${encodePart(normalizedDevice)}|${encodePart(normalizedSlot)}`;
 }
-async function fetchWithTimeout(input, init, timeoutMs = AGENT_MD_HTTP_TIMEOUT_MS) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    return await fetch(input, { ...init, signal: controller.signal });
-  } catch (error) {
-    if (controller.signal.aborted) {
-      throw new AUNError(`agent.md request timed out after ${timeoutMs}ms`);
-    }
-    throw error;
-  } finally {
-    clearTimeout(timer);
-  }
+function prekeyPrefix(aid) {
+  return `${safeAid(aid)}|`;
 }
-var AuthNamespace = class {
-  constructor(client) {
-    __publicField(this, "_client");
-    __publicField(this, "_log", _noopLog5);
-    __publicField(this, "_agentMdCache", /* @__PURE__ */ new Map());
-    this._client = client;
-  }
-  setLogger(log) {
-    this._log = log;
-  }
-  get _internal() {
-    return this._client;
-  }
-  /**
-   * 解析 gateway URL。
-   * 优先使用已预置的 gatewayUrl，否则基于 AID 自动发现。
-   *
-   * 发现流程：
-   * 1. 若 gatewayUrl 已预置（内存），直接返回
-   * 2. 从 keystore metadata 读 cached gateway_url（跨进程/会话复用）
-   * 3. https://{aid}/.well-known/aun-gateway（泛域名 nameservice）
-   * 4. https://gateway.{issuer}/.well-known/aun-gateway（Gateway 直连）
-   * 发现成功后写入 keystore metadata，避免每次都做 well-known discovery。
-   */
-  async _resolveGateway(aid) {
-    if (this._client.gatewayUrl) {
-      return this._client.gatewayUrl;
-    }
-    const resolvedAid = aid ?? this._client.aid;
-    if (resolvedAid) {
-      try {
-        const cached = await this._loadCachedGatewayUrl(resolvedAid);
-        if (cached) {
-          this._log.debug(`_resolveGateway from keystore cache aid=${resolvedAid} gateway=${cached}`);
-          this._client.gatewayUrl = cached;
-          return cached;
-        }
-      } catch (exc) {
-        this._log.debug(`_resolveGateway load cache failed: ${exc instanceof Error ? exc.message : String(exc)}`);
-      }
-      const parts = resolvedAid.split(".");
-      const issuerDomain = parts.length > 1 ? parts.slice(1).join(".") : resolvedAid;
-      const port = this._client.configModel.discoveryPort;
-      const portSuffix = port ? `:${port}` : "";
-      const primaryUrl = `https://${resolvedAid}${portSuffix}/.well-known/aun-gateway`;
-      try {
-        const discovered2 = await this._client.discovery.discover(primaryUrl);
-        await this._persistGatewayUrl(resolvedAid, discovered2);
-        return discovered2;
-      } catch {
-      }
-      const fallbackUrl = `https://gateway.${issuerDomain}${portSuffix}/.well-known/aun-gateway`;
-      const discovered = await this._client.discovery.discover(fallbackUrl);
-      await this._persistGatewayUrl(resolvedAid, discovered);
-      return discovered;
-    }
-    throw new ValidationError(
-      "unable to resolve gateway: set client.gatewayUrl or provide 'aid' for auto-discovery"
-    );
-  }
-  /** 从 keystore metadata 读取 cached gateway_url（跨进程/会话复用） */
-  async _loadCachedGatewayUrl(aid) {
-    if (!aid) return "";
-    const ks = this._internal._keystore;
-    if (!ks || typeof ks.getMetadata !== "function") return "";
-    try {
-      const value = await ks.getMetadata(aid, "gateway_url");
-      const raw = String(value ?? "").trim();
-      if (!raw) return "";
-      if (raw.startsWith('"') && raw.endsWith('"')) {
-        try {
-          const parsed = JSON.parse(raw);
-          if (typeof parsed === "string") return parsed.trim();
-        } catch {
-        }
-      }
-      return raw;
-    } catch {
-      return "";
-    }
-  }
-  /** 持久化 gateway_url 到 keystore metadata，供跨进程复用 */
-  async _persistGatewayUrl(aid, gatewayUrl) {
-    if (!gatewayUrl || !aid) return;
-    const ks = this._internal._keystore;
-    if (!ks || typeof ks.setMetadata !== "function") return;
-    try {
-      await ks.setMetadata(aid, "gateway_url", gatewayUrl);
-    } catch (exc) {
-      this._log.debug(`persist gateway_url failed aid=${aid} err=${exc instanceof Error ? exc.message : String(exc)}`);
-    }
-  }
-  /** 内部访问 client 私有属性 */
-  /**
-   * 严格注册新 AID（对齐 TS registerAid）。
-   * 通过 well-known 发现 gateway → 调用 AuthFlow.registerAid 注册。
-   */
-  async registerAid(params) {
-    const tStart = Date.now();
-    const aid = String(params?.aid ?? "");
-    this._log.debug(`registerAid enter: aid=${aid}`);
-    try {
-      if (!aid) throw new ValidationError("auth.registerAid requires 'aid'");
-      const gatewayUrl = await this._resolveGateway(aid);
-      this._client.gatewayUrl = gatewayUrl;
-      const auth = this._internal._auth;
-      const result = await auth.registerAid(gatewayUrl, aid);
-      this._internal._aid = aid;
-      this._internal._identity = await auth.loadIdentityOrNone(aid);
-      this._log.debug(`registerAid exit: elapsed=${Date.now() - tStart}ms aid=${aid}`);
-      return {
-        aid,
-        cert_pem: result.cert,
-        gateway: gatewayUrl
-      };
-    } catch (err) {
-      this._log.debug(`registerAid exit (error): elapsed=${Date.now() - tStart}ms aid=${aid} err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /**
-   * 认证已有 AID（login1 + login2 两阶段认证）。
-   * 通过 well-known 发现 gateway → 调用 AuthFlow.authenticate。
-   */
-  async authenticate(params) {
-    const tStart = Date.now();
-    const aid = params?.aid ?? "";
-    this._log.debug(`authenticate enter: aid=${aid || "<current>"}`);
-    try {
-      const request = { ...params ?? {} };
-      const requestAid = request.aid;
-      const gatewayUrl = await this._resolveGateway(requestAid);
-      this._client.gatewayUrl = gatewayUrl;
-      const auth = this._internal._auth;
-      const result = await auth.authenticate(gatewayUrl, requestAid);
-      this._internal._aid = result.aid ?? null;
-      this._internal._identity = await auth.loadIdentityOrNone(String(result.aid));
-      this._log.debug(`authenticate exit: elapsed=${Date.now() - tStart}ms aid=${result.aid}`);
-      return result;
-    } catch (err) {
-      this._log.debug(`authenticate exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /** 只读加载本地已注册身份（密钥对 + 证书 + 实例状态）。无副作用，不触发网络请求。 */
-  async loadIdentity(params) {
-    const aid = String((params ?? {})?.aid ?? "").trim() || void 0;
-    const identity = await this._internal._auth.loadIdentityOrNone(aid);
-    if (!identity) {
-      throw new StateError(`identity not found for aid: ${aid ?? "<default>"}`);
-    }
-    return identity;
-  }
-  /** 只读加载本地已注册身份，不存在时返回 null。 */
-  async loadIdentityOrNull(params) {
-    const aid = String((params ?? {})?.aid ?? "").trim() || void 0;
-    return await this._internal._auth.loadIdentityOrNone(aid);
-  }
-  /** 获取对端 AID 的证书 PEM（本地缓存优先，未命中走 PKI HTTP + 链验证）。 */
-  async fetchPeerCert(params) {
-    const aid = String(params?.aid ?? "").trim();
-    if (!aid) throw new Error("auth.fetchPeerCert requires 'aid'");
-    const fp = String(params?.cert_fingerprint ?? "").trim() || void 0;
-    if (typeof this._internal._fetchPeerCert !== "function") {
-      throw new Error("client does not support _fetchPeerCert");
-    }
-    return String(await this._internal._fetchPeerCert(aid, fp)).trim();
-  }
-  async signAgentMd(content, opts) {
-    const tStart = Date.now();
-    this._log.debug(`signAgentMd enter: aid=${opts?.aid ?? "<current>"} content_len=${String(content ?? "").length}`);
-    try {
-      const client = this._internal;
-      const targetAid = String(opts?.aid ?? client._aid ?? "").trim();
-      const identity = await client._auth.loadIdentityOrNone(targetAid || void 0);
-      if (!identity) {
-        throw new StateError("no local identity found, call auth.registerAid() first");
-      }
-      const privateKeyPem = String(identity.private_key_pem ?? "").trim();
-      const certPem = normalizeIdentityCertPem(identity);
-      if (!privateKeyPem || !certPem) {
-        throw new StateError("local identity missing private key or certificate");
-      }
-      let payload = parseAgentMdTailSignature(String(content ?? "")).payload;
-      if (payload && !payload.endsWith("\n") && !payload.endsWith("\r")) {
-        payload += "\n";
-      }
-      const privateKey = await importPrivateKeyEcdsa(privateKeyPem);
-      const signatureDer = await ecdsaSignDer(privateKey, new TextEncoder().encode(payload));
-      const fingerprint = await certificateSha256Fingerprint(certPem);
-      if (!fingerprint) {
-        throw new StateError("agent.md cert fingerprint failed");
-      }
-      const signedBlock = [
-        AGENT_MD_SIGNATURE_MARKER,
-        `cert_fingerprint: ${fingerprint}`,
-        `timestamp: ${Math.floor(Date.now() / 1e3)}`,
-        `signature: ${uint8ToBase64(signatureDer)}`,
-        "-->"
-      ].join("\n");
-      this._log.debug(`signAgentMd exit: elapsed=${Date.now() - tStart}ms aid=${targetAid}`);
-      return payload + signedBlock;
-    } catch (err) {
-      this._log.debug(`signAgentMd exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async verifyAgentMd(content, opts) {
-    const tStart = Date.now();
-    this._log.debug(`verifyAgentMd enter: aid=${opts?.aid ?? "<infer>"} content_len=${String(content ?? "").length}`);
-    try {
-      const result = await this._verifyAgentMdImpl(content, opts);
-      this._log.debug(`verifyAgentMd exit: elapsed=${Date.now() - tStart}ms status=${result.status} verified=${!!result.verified}`);
-      return result;
-    } catch (err) {
-      this._log.debug(`verifyAgentMd exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async _verifyAgentMdImpl(content, opts) {
-    const { payload, fields, parseError } = parseAgentMdTailSignature(String(content ?? ""));
-    if (!fields) {
-      if (!parseError) {
-        return agentMdResult("unsigned", payload);
-      }
-      return agentMdResult("invalid", payload, parseError);
-    }
-    let expectedAid = String(opts?.aid ?? "").trim();
-    const payloadAid = extractAgentMDAid(payload);
-    if (expectedAid && payloadAid && expectedAid !== payloadAid) {
-      return agentMdResult("invalid", payload, "aid mismatch", payloadAid);
-    }
-    if (!expectedAid) {
-      expectedAid = payloadAid;
-    }
-    let certPem = String(opts?.certPem ?? opts?.cert_pem ?? "").trim();
-    if (!certPem) {
-      if (!expectedAid) {
-        return agentMdResult("invalid", payload, "aid required to verify agent.md");
-      }
-      if (typeof this._internal._fetchPeerCert !== "function") {
-        return agentMdResult("invalid", payload, "aid required to verify agent.md", expectedAid);
-      }
-      try {
-        certPem = String(await this._internal._fetchPeerCert(expectedAid, fields.cert_fingerprint)).trim();
-      } catch (error) {
-        return agentMdResult("invalid", payload, String(error), expectedAid, fields.cert_fingerprint);
-      }
-    }
-    let publicKey;
-    try {
-      publicKey = await importCertPublicKeyEcdsa(certPem);
-    } catch (error) {
-      return agentMdResult("invalid", payload, `invalid certificate: ${String(error)}`, expectedAid, fields.cert_fingerprint);
-    }
-    const actualFingerprint = await certificateSha256Fingerprint(certPem);
-    if (!actualFingerprint || actualFingerprint.toLowerCase() !== fields.cert_fingerprint.toLowerCase()) {
-      return agentMdResult("invalid", payload, "certificate fingerprint mismatch", expectedAid, fields.cert_fingerprint);
-    }
-    const cn = extractCommonNameFromCertPem(certPem);
-    if (expectedAid && cn && cn !== expectedAid) {
-      return agentMdResult("invalid", payload, "certificate aid mismatch", expectedAid, fields.cert_fingerprint);
-    }
-    let signature;
-    try {
-      signature = base64ToUint8(fields.signature);
-    } catch {
-      return agentMdResult("invalid", payload, "invalid signature", expectedAid, fields.cert_fingerprint);
-    }
-    if (!signature.length) {
-      return agentMdResult("invalid", payload, "invalid signature", expectedAid, fields.cert_fingerprint);
-    }
-    const ok = await ecdsaVerifyDer(publicKey, signature, new TextEncoder().encode(payload));
-    if (!ok) {
-      return agentMdResult("invalid", payload, "signature verification failed", expectedAid, fields.cert_fingerprint, parseAgentMdTimestamp(fields.timestamp));
-    }
-    return agentMdResult("verified", payload, "", expectedAid || payloadAid, fields.cert_fingerprint, parseAgentMdTimestamp(fields.timestamp));
-  }
-  async _resolveAgentMdUrl(aid) {
-    const resolvedAid = String(aid ?? "").trim();
-    if (!resolvedAid) {
-      throw new ValidationError("agent.md requires non-empty aid");
-    }
-    let gatewayUrl = this._client.gatewayUrl ?? "";
-    if (!gatewayUrl) {
-      try {
-        gatewayUrl = await this._resolveGateway(resolvedAid);
-      } catch {
-        gatewayUrl = "";
-      }
-    }
-    const authority = agentMdAuthority(resolvedAid, this._client.configModel.discoveryPort);
-    return `${agentMdHttpScheme(gatewayUrl)}://${authority}/agent.md`;
-  }
-  async _ensureAgentMdUploadToken(aid, gatewayUrl) {
-    const auth = this._internal._auth;
-    let identity = await auth.loadIdentityOrNone(aid);
-    if (!identity) {
-      throw new StateError("no local identity found, call auth.registerAid() first");
-    }
-    const cachedToken = String(identity.access_token ?? "");
-    const expiresAt = auth.getAccessTokenExpiry(identity);
-    if (cachedToken && (expiresAt === null || expiresAt > Date.now() / 1e3 + 30)) {
-      return cachedToken;
-    }
-    if (typeof auth.refreshCachedTokens === "function" && identity.refresh_token) {
-      try {
-        identity = await auth.refreshCachedTokens(gatewayUrl, identity);
-        const refreshedToken = String(identity.access_token ?? "");
-        const refreshedExpiry = auth.getAccessTokenExpiry(identity);
-        if (refreshedToken && (refreshedExpiry === null || refreshedExpiry > Date.now() / 1e3 + 30)) {
-          return refreshedToken;
-        }
-      } catch {
-      }
-    }
-    const result = await this.authenticate({ aid });
-    const token = String(result.access_token ?? "");
-    if (!token) {
-      throw new StateError("authenticate did not return access_token");
-    }
-    return token;
-  }
-  async uploadAgentMd(content) {
-    const tStart = Date.now();
-    this._log.debug(`uploadAgentMd enter: content_len=${String(content ?? "").length}`);
-    try {
-      const auth = this._internal._auth;
-      const identity = await auth.loadIdentityOrNone(this._client.aid ?? void 0);
-      if (!identity) {
-        throw new StateError("no local identity found, call auth.registerAid() first");
-      }
-      const aid = String(identity.aid ?? this._client.aid ?? "").trim();
-      if (!aid) {
-        throw new StateError("no local identity found, call auth.registerAid() first");
-      }
-      const gatewayUrl = await this._resolveGateway(aid);
-      this._client.gatewayUrl = gatewayUrl;
-      const token = await this._ensureAgentMdUploadToken(aid, gatewayUrl);
-      const response = await fetchWithTimeout(await this._resolveAgentMdUrl(aid), {
-        method: "PUT",
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "Content-Type": "text/markdown; charset=utf-8"
-        },
-        body: content
-      });
-      if (response.status === 404) {
-        throw new NotFoundError(`agent.md endpoint not found for aid: ${aid}`);
-      }
-      if (!response.ok) {
-        const message = (await response.text()).trim();
-        throw new AUNError(
-          `upload agent.md failed: HTTP ${response.status}${message ? ` - ${message}` : ""}`
-        );
-      }
-      const payload = await response.json();
-      if (!isJsonObject(payload)) {
-        throw new AUNError("upload agent.md returned invalid JSON payload");
-      }
-      this._log.debug(`uploadAgentMd exit: elapsed=${Date.now() - tStart}ms aid=${aid}`);
-      return payload;
-    } catch (err) {
-      this._log.debug(`uploadAgentMd exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async headAgentMd(aid) {
-    const tStart = Date.now();
-    const targetAid = String(aid ?? "").trim();
-    if (!targetAid) {
-      throw new ValidationError("headAgentMd requires non-empty aid");
-    }
-    this._log.debug(`headAgentMd enter: aid=${targetAid}`);
-    try {
-      const response = await fetchWithTimeout(await this._resolveAgentMdUrl(targetAid), {
-        method: "HEAD",
-        headers: { Accept: "text/markdown" }
-      });
-      const respHeaders = response.headers;
-      const etag = respHeaders ? String(respHeaders.get("ETag") ?? "").trim() : "";
-      const lastModified = respHeaders ? String(respHeaders.get("Last-Modified") ?? "").trim() : "";
-      if (response.status === 404) {
-        this._log.debug(`headAgentMd exit (not_found): elapsed=${Date.now() - tStart}ms aid=${targetAid}`);
-        return { aid: targetAid, found: false, etag: "", last_modified: "", status: 404 };
-      }
-      if (response.status < 200 || response.status >= 300) {
-        throw new AUNError(`head agent.md failed: HTTP ${response.status}`);
-      }
-      if (etag || lastModified) {
-        const cached = this._agentMdCache.get(targetAid) ?? { text: "", etag: "", lastModified: "" };
-        this._agentMdCache.set(targetAid, {
-          text: cached.text ?? "",
-          etag,
-          lastModified
-        });
-      }
-      this._log.debug(`headAgentMd exit: elapsed=${Date.now() - tStart}ms aid=${targetAid} status=${response.status} etag=${etag || "-"}`);
-      return { aid: targetAid, found: true, etag, last_modified: lastModified, status: response.status };
-    } catch (err) {
-      this._log.debug(`headAgentMd exit (error): elapsed=${Date.now() - tStart}ms aid=${targetAid} err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async downloadAgentMd(aid) {
-    const tStart = Date.now();
-    this._log.debug(`downloadAgentMd enter: aid=${aid}`);
-    try {
-      const targetAid = String(aid ?? "").trim();
-      if (!targetAid) {
-        throw new ValidationError("downloadAgentMd requires non-empty aid");
-      }
-      const cached = this._agentMdCache.get(targetAid);
-      const requestHeaders = { Accept: "text/markdown" };
-      const agentMdUrl = await this._resolveAgentMdUrl(targetAid);
-      const response = await fetchWithTimeout(agentMdUrl, {
-        method: "GET",
-        headers: requestHeaders,
-        redirect: "follow"
-      });
-      if (response.status === 304) {
-        if (cached?.text) {
-          this._log.debug(`downloadAgentMd exit (not_modified): elapsed=${Date.now() - tStart}ms aid=${targetAid}`);
-          return cached.text;
-        }
-        this._log.warn(`downloadAgentMd got 304 but no local cache, retrying unconditional GET: aid=${targetAid}`);
-        const retryResp = await fetchWithTimeout(agentMdUrl, {
-          method: "GET",
-          headers: { Accept: "text/markdown" },
-          redirect: "follow"
-        });
-        if (retryResp.status === 404) {
-          throw new NotFoundError(`agent.md not found for aid: ${targetAid}`);
-        }
-        if (!retryResp.ok) {
-          const message = (await retryResp.text()).trim();
-          throw new AUNError(
-            `download agent.md failed (retry): HTTP ${retryResp.status}${message ? ` - ${message}` : ""}`
-          );
-        }
-        const retryText = await retryResp.text();
-        this._log.debug(`downloadAgentMd exit (retry): elapsed=${Date.now() - tStart}ms aid=${targetAid} bytes=${retryText.length}`);
-        return retryText;
-      }
-      if (response.status === 404) {
-        throw new NotFoundError(`agent.md not found for aid: ${targetAid}`);
-      }
-      if (!response.ok) {
-        const message = (await response.text()).trim();
-        throw new AUNError(
-          `download agent.md failed: HTTP ${response.status}${message ? ` - ${message}` : ""}`
-        );
-      }
-      const text = await response.text();
-      const respHeaders = response.headers;
-      const etag = respHeaders ? String(respHeaders.get("ETag") ?? "").trim() : "";
-      const lastModified = respHeaders ? String(respHeaders.get("Last-Modified") ?? "").trim() : "";
-      if (etag || lastModified) {
-        this._agentMdCache.set(targetAid, { text, etag, lastModified });
-      }
-      this._log.debug(`downloadAgentMd exit: elapsed=${Date.now() - tStart}ms aid=${targetAid} bytes=${text.length}`);
-      return text;
-    } catch (err) {
-      this._log.debug(`downloadAgentMd exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /** 下载证书（透传 RPC） */
-  async downloadCert(params) {
-    const tStart = Date.now();
-    this._log.debug("downloadCert enter");
-    try {
-      const r = await this._client.call("auth.download_cert", params ?? {});
-      this._log.debug(`downloadCert exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`downloadCert exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /** 请求签发证书（透传 RPC） */
-  async requestCert(params) {
-    const tStart = Date.now();
-    this._log.debug("requestCert enter");
-    try {
-      const r = await this._client.call("auth.request_cert", params);
-      this._log.debug(`requestCert exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`requestCert exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /** 续期证书（透传 RPC） */
-  async renewCert(params) {
-    const tStart = Date.now();
-    this._log.debug("renewCert enter");
-    try {
-      const r = await this._client.call("auth.renew_cert", params ?? {});
-      this._log.debug(`renewCert exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`renewCert exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /** 密钥轮换（透传 RPC） */
-  async rekey(params) {
-    const tStart = Date.now();
-    this._log.debug("rekey enter");
-    try {
-      const r = await this._client.call("auth.rekey", params ?? {});
-      this._log.debug(`rekey exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`rekey exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /** 获取信任根（透传 RPC） */
-  async trustRoots(params) {
-    const tStart = Date.now();
-    this._log.debug("trustRoots enter");
-    try {
-      const r = await this._client.call("meta.trust_roots", params ?? {});
-      this._log.debug(`trustRoots exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`trustRoots exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  /**
-   * 检查指定 AID 的本地和远程状态。
-   * 与 Python SDK namespaces/auth_namespace.py:check_aid 对应。
-   */
-  async checkAid(params) {
-    const tStart = Date.now();
-    const aid = String(params?.aid ?? "").trim();
-    if (!aid) throw new ValidationError("auth.check_aid requires 'aid'");
-    this._log.debug(`checkAid enter: aid=${aid}`);
-    try {
-      const result = await this._checkLocalAid(aid);
-      const local = result.local;
-      if (!local?.complete) {
-        const remote = await this._checkRemoteAidRegistration(aid);
-        result.remote = remote;
-        const remoteStatus = remote?.status;
-        if (remoteStatus === "available") {
-          result.status = "available";
-          result.can_register = true;
-        } else if (remoteStatus === "registered") {
-          result.status = "registered_remote";
-          result.can_register = false;
-        } else {
-          result.status = "unknown";
-          result.can_register = false;
-        }
-      }
-      this._log.debug(`checkAid exit: elapsed=${Date.now() - tStart}ms aid=${aid} status=${String(result.status)}`);
-      return result;
-    } catch (err) {
-      this._log.debug(`checkAid exit (error): elapsed=${Date.now() - tStart}ms aid=${aid} err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async _checkLocalAid(aid) {
-    const client = this._internal;
-    const ks = client._keystore;
-    const identity = await client._auth.loadIdentityOrNone(aid);
-    let keyPair = null;
-    let keyError = "";
-    try {
-      if (ks && typeof ks.loadKeyPair === "function") {
-        keyPair = await ks.loadKeyPair(aid);
-      }
-    } catch (e) {
-      keyError = e instanceof Error ? e.message : String(e);
-    }
-    let certPem = null;
-    let certError = "";
-    try {
-      if (ks && typeof ks.loadCert === "function") {
-        certPem = await ks.loadCert(aid);
-      }
-    } catch (e) {
-      certError = e instanceof Error ? e.message : String(e);
-    }
-    const privateKeyPresent = !!(keyPair && keyPair.private_key_pem);
-    const publicKeyPresent = !!(keyPair && keyPair.public_key_der_b64);
-    const certPresent = !!certPem;
-    const certInfo = certPresent ? await this._inspectCertBrowser(aid, certPem) : { present: false, valid: false, expired: false };
-    const certValid = !!certInfo.valid;
-    const localComplete = privateKeyPresent && publicKeyPresent && certPresent && certValid;
-    const issues = [];
-    if (!identity) issues.push("local identity not found");
-    if (!privateKeyPresent) issues.push("private key missing");
-    if (!publicKeyPresent) issues.push("public key missing");
-    if (!certPresent) {
-      issues.push("certificate missing");
-    } else if (certInfo.parse_error) {
-      issues.push(`certificate invalid: ${certInfo.parse_error}`);
-    } else if (certInfo.expired) {
-      issues.push("certificate expired");
-    } else if (!certValid) {
-      issues.push("certificate not currently valid");
-    }
-    if (keyError) issues.push(`key load error: ${keyError}`);
-    if (certError) issues.push(`certificate load error: ${certError}`);
-    return {
-      aid,
-      status: localComplete ? "local_ready" : "local_incomplete",
-      can_register: localComplete ? false : null,
-      local: {
-        exists: identity !== null,
-        complete: localComplete,
-        private_key: privateKeyPresent,
-        public_key: publicKeyPresent,
-        certificate: certInfo,
-        issues
-      },
-      remote: {
-        status: localComplete ? "not_checked" : "pending"
-      }
-    };
-  }
-  /** 浏览器环境证书检查（无 node:crypto X509Certificate） */
-  async _inspectCertBrowser(aid, certPem) {
-    const result = { present: true, valid: false, expired: false };
-    try {
-      const fingerprint = await certificateSha256Fingerprint(certPem);
-      const cn = extractCommonNameFromCertPem(certPem);
-      const aidMatches = !cn || cn === aid;
-      const validity = parseCertValidity(certPem);
-      if (validity) {
-        const now = Date.now();
-        const valid = now >= validity.notBefore && now <= validity.notAfter && aidMatches;
-        const expired = now > validity.notAfter;
-        result.valid = valid;
-        result.expired = expired;
-        result.not_before = new Date(validity.notBefore).toISOString();
-        result.not_after = new Date(validity.notAfter).toISOString();
-        result.expires_at = Math.floor(validity.notAfter / 1e3);
-        result.seconds_until_expiry = Math.floor((validity.notAfter - now) / 1e3);
-      } else {
-        result.valid = aidMatches;
-      }
-      result.fingerprint = fingerprint;
-      result.subject_cn = cn;
-      result.aid_matches = aidMatches;
-      if (cn && cn !== aid) {
-        result.valid = false;
-        result.parse_error = `certificate CN mismatch: ${cn}`;
-      }
-    } catch (e) {
-      result.parse_error = e instanceof Error ? e.message : String(e);
-    }
-    return result;
-  }
-  async _checkRemoteAidRegistration(aid) {
-    try {
-      const content = await this.downloadAgentMd(aid);
-      return {
-        status: "registered",
-        registered: true,
-        available: false,
-        source: "agent.md",
-        agent_md_bytes: new TextEncoder().encode(content).length,
-        agent_md_aid: extractAgentMDAid(content)
-      };
-    } catch (err) {
-      if (err instanceof NotFoundError) {
-        return {
-          status: "available",
-          registered: false,
-          available: true,
-          source: "agent.md"
-        };
-      }
-      return {
-        status: "unknown",
-        registered: null,
-        available: null,
-        source: "agent.md",
-        error: err instanceof Error ? err.message : String(err)
-      };
-    }
-  }
-};
-
-// src/namespaces/custody.ts
-var _noopLog6 = { error: () => {
-}, warn: () => {
-}, info: () => {
-}, debug: () => {
-} };
-var CUSTODY_HTTP_TIMEOUT_MS = 3e4;
-function issuerDomainFromAid(aid) {
-  const parts = String(aid || "").trim().split(".", 2);
-  return parts.length > 1 ? parts[1] : parts[0] || "";
-}
-function custodyWellKnownUrls(aid, discoveryPort, verifySsl) {
-  const portSuffix = discoveryPort ? `:${discoveryPort}` : "";
-  const issuerDomain = issuerDomainFromAid(aid);
-  const aidUrl = `https://${aid}${portSuffix}/.well-known/aun-custody`;
-  const fallbackUrl = `https://aid_custody.${issuerDomain}${portSuffix}/.well-known/aun-custody`;
-  const urls = verifySsl ? [aidUrl, fallbackUrl] : [fallbackUrl, aidUrl];
-  return [...new Set(urls)];
-}
-function extractCustodyUrl(payload) {
-  for (const key of ["custody_url", "custodyUrl", "url"]) {
-    const value = String(payload[key] ?? "").trim();
-    if (value) return value;
-  }
-  if (isJsonObject(payload.custody)) {
-    const value = String(payload.custody.url ?? "").trim();
-    if (value) return value;
-  }
-  for (const key of ["custody_services", "custodyServices", "services"]) {
-    const items = payload[key];
-    if (Array.isArray(items)) {
-      const candidates = items.filter(isJsonObject).sort((a, b) => Number(a.priority ?? 999) - Number(b.priority ?? 999));
-      for (const item of candidates) {
-        const value = String(item.url ?? "").trim();
-        if (value) return value;
-      }
-    }
-  }
-  throw new ValidationError("custody well-known missing custody url");
-}
-function normalizeCustodyUrl(url) {
-  const value = String(url ?? "").trim().replace(/\/+$/, "");
-  if (!value) return null;
-  try {
-    const parsed = new URL(value);
-    if (parsed.protocol !== "http:" && parsed.protocol !== "https:" || !parsed.hostname) {
-      return null;
-    }
-    return value;
-  } catch {
-    return null;
-  }
-}
-async function fetchJsonWithTimeout(input, init, timeoutMs = CUSTODY_HTTP_TIMEOUT_MS) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const response = await fetch(input, { ...init, signal: controller.signal });
-    const payload = await response.json();
-    if (response.ok) {
-      return payload;
-    }
-    const error = isJsonObject(payload) && isJsonObject(payload.error) ? payload.error : null;
-    const code = String(error?.code ?? "");
-    const message = String(error?.message ?? "");
-    throw new AUNError(
-      message ? `custody ${code || response.status}: ${message}` : `custody HTTP ${response.status}`
-    );
-  } catch (error) {
-    if (controller.signal.aborted) {
-      throw new AUNError(`custody request timed out after ${timeoutMs}ms`);
-    }
-    throw error;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-var CustodyNamespace = class {
-  constructor(client) {
-    __publicField(this, "_client");
-    __publicField(this, "_custodyUrl", "");
-    __publicField(this, "_log", _noopLog6);
-    this._client = client;
-  }
-  setLogger(log) {
-    this._log = log;
-  }
-  get _internal() {
-    return this._client;
-  }
-  setUrl(url) {
-    this._custodyUrl = String(url ?? "").trim().replace(/\/+$/, "");
-  }
-  configureUrl(url) {
-    this.setUrl(url);
-  }
-  async discoverUrl(params = {}) {
-    const tStart = Date.now();
-    this._log.debug(`discoverUrl enter: aid=${params.aid ?? "<current>"}`);
-    try {
-      const aid = String(params.aid ?? this._client.aid ?? "").trim();
-      if (!aid) {
-        throw new ValidationError("custody.discoverUrl requires aid or authenticated client");
-      }
-      let lastError = null;
-      const urls = custodyWellKnownUrls(aid, this._client.configModel.discoveryPort, this._client.configModel.verifySsl);
-      for (const wellKnownUrl of urls) {
-        try {
-          const payload = await fetchJsonWithTimeout(wellKnownUrl, { method: "GET" }, params.timeout ?? 5e3);
-          if (!isJsonObject(payload)) {
-            throw new ValidationError("custody well-known returned invalid payload");
-          }
-          const custodyUrl = normalizeCustodyUrl(extractCustodyUrl(payload));
-          if (!custodyUrl) {
-            throw new ValidationError("custody well-known returned invalid custody url");
-          }
-          this._custodyUrl = custodyUrl;
-          this._log.debug(`discoverUrl exit: elapsed=${Date.now() - tStart}ms aid=${aid} url=${custodyUrl}`);
-          return custodyUrl;
-        } catch (error) {
-          lastError = error;
-        }
-      }
-      throw new AUNError(`custody discovery failed for ${aid}: ${lastError instanceof Error ? lastError.message : String(lastError)}`);
-    } catch (err) {
-      this._log.debug(`discoverUrl exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async _resolveCustodyUrl(aid) {
-    const custodyUrl = normalizeCustodyUrl(this._custodyUrl);
-    if (custodyUrl) {
-      if (custodyUrl !== this._custodyUrl) {
-        this._custodyUrl = custodyUrl;
-      }
-      return custodyUrl;
-    }
-    return this.discoverUrl({ aid });
-  }
-  _getAccessToken() {
-    const identity = this._internal._identity;
-    if (identity) {
-      const token = String(identity.access_token ?? "").trim();
-      if (token) return token;
-    }
-    throw new ValidationError("no access_token available: call auth.authenticate() first");
-  }
-  async _post(path, body, opts = {}) {
-    const headers = { "Content-Type": "application/json" };
-    const token = String(opts.token ?? "").trim();
-    if (token) {
-      headers.Authorization = `Bearer ${token}`;
-    }
-    const payload = await fetchJsonWithTimeout(
-      `${await this._resolveCustodyUrl(String(body.aid ?? "") || this._client.aid)}${path}`,
-      {
-        method: "POST",
-        headers,
-        body: JSON.stringify(body)
-      }
-    );
-    if (!isJsonObject(payload)) {
-      throw new AUNError("custody returned invalid JSON payload");
-    }
-    return payload;
-  }
-  async sendCode(params) {
-    const tStart = Date.now();
-    this._log.debug(`sendCode enter: aid=${params.aid ?? "<current>"}`);
-    try {
-      const phone = String(params.phone ?? "").trim();
-      const aid = String(params.aid ?? "").trim();
-      if (!phone) {
-        throw new ValidationError("custody.sendCode requires non-empty phone");
-      }
-      const body = { phone };
-      let token = null;
-      if (aid) {
-        body.aid = aid;
-      } else {
-        token = this._getAccessToken();
-      }
-      const r = await this._post("/custody/accounts/send-code", body, { token });
-      this._log.debug(`sendCode exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`sendCode exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async bindPhone(params) {
-    const tStart = Date.now();
-    this._log.debug("bindPhone enter");
-    try {
-      const phone = String(params.phone ?? "").trim();
-      const code = String(params.code ?? "").trim();
-      const cert = String(params.cert ?? "").trim();
-      const key = String(params.key ?? "").trim();
-      if (!phone || !code || !cert || !key) {
-        throw new ValidationError("custody.bindPhone requires phone, code, cert and key");
-      }
-      const body = { phone, code, cert, key };
-      if (params.metadata && isJsonObject(params.metadata)) {
-        body.metadata = params.metadata;
-      }
-      const r = await this._post("/custody/accounts/bind-phone", body, {
-        token: this._getAccessToken()
-      });
-      this._log.debug(`bindPhone exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`bindPhone exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async restorePhone(params) {
-    const tStart = Date.now();
-    this._log.debug(`restorePhone enter: aid=${params.aid}`);
-    try {
-      const phone = String(params.phone ?? "").trim();
-      const code = String(params.code ?? "").trim();
-      const aid = String(params.aid ?? "").trim();
-      if (!phone || !code || !aid) {
-        throw new ValidationError("custody.restorePhone requires phone, code and aid");
-      }
-      const r = await this._post("/custody/accounts/restore-phone", { phone, code, aid });
-      this._log.debug(`restorePhone exit: elapsed=${Date.now() - tStart}ms aid=${aid}`);
-      return r;
-    } catch (err) {
-      this._log.debug(`restorePhone exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async createDeviceCopy(params = {}) {
-    const tStart = Date.now();
-    this._log.debug(`createDeviceCopy enter: aid=${params.aid ?? "<current>"}`);
-    try {
-      const aid = String(params.aid ?? this._client.aid ?? "").trim();
-      if (!aid) {
-        throw new ValidationError("custody.createDeviceCopy requires aid or authenticated client");
-      }
-      const r = await this._post("/custody/transfers", { aid }, { token: this._getAccessToken() });
-      this._log.debug(`createDeviceCopy exit: elapsed=${Date.now() - tStart}ms aid=${aid}`);
-      return r;
-    } catch (err) {
-      this._log.debug(`createDeviceCopy exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async uploadDeviceCopyMaterials(params) {
-    const tStart = Date.now();
-    this._log.debug(`uploadDeviceCopyMaterials enter: aid=${params.aid ?? "<current>"}`);
-    try {
-      const transferCode = String(params.transferCode ?? "").trim();
-      const aid = String(params.aid ?? this._client.aid ?? "").trim();
-      const cert = String(params.cert ?? "").trim();
-      const key = String(params.key ?? "").trim();
-      if (!transferCode || !aid || !cert || !key) {
-        throw new ValidationError("custody.uploadDeviceCopyMaterials requires transferCode, aid, cert and key");
-      }
-      const body = { aid, cert, key };
-      if (params.metadata && isJsonObject(params.metadata)) {
-        body.metadata = params.metadata;
-      }
-      const r = await this._post(`/custody/transfers/${encodeURIComponent(transferCode)}/materials`, body, {
-        token: this._getAccessToken()
-      });
-      this._log.debug(`uploadDeviceCopyMaterials exit: elapsed=${Date.now() - tStart}ms aid=${aid}`);
-      return r;
-    } catch (err) {
-      this._log.debug(`uploadDeviceCopyMaterials exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async claimDeviceCopy(params) {
-    const tStart = Date.now();
-    this._log.debug(`claimDeviceCopy enter: aid=${params.aid}`);
-    try {
-      const aid = String(params.aid ?? "").trim();
-      const transferCode = String(params.transferCode ?? "").trim();
-      if (!aid || !transferCode) {
-        throw new ValidationError("custody.claimDeviceCopy requires aid and transferCode");
-      }
-      const r = await this._post("/custody/transfers/claim", { aid, transfer_code: transferCode });
-      this._log.debug(`claimDeviceCopy exit: elapsed=${Date.now() - tStart}ms aid=${aid}`);
-      return r;
-    } catch (err) {
-      this._log.debug(`claimDeviceCopy exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-};
-
-// src/namespaces/meta.ts
-init_crypto();
-var _noopLog7 = { error: () => {
-}, warn: () => {
-}, info: () => {
-}, debug: () => {
-} };
-var AUTHORITY_ENDPOINT = "https://trust.aun.network/.well-known/aun/trust-roots.json";
-var MAX_CLOCK_SKEW = 300;
-var MetaNamespace = class _MetaNamespace {
-  constructor(client) {
-    __publicField(this, "_log", _noopLog7);
-    __publicField(this, "_client");
-    this._client = client;
-  }
-  setLogger(log) {
-    this._log = log;
-  }
-  get _internal() {
-    return this._client;
-  }
-  // ── RPC 直通 ──────────────────────────────────────────────
-  async ping(params) {
-    const tStart = Date.now();
-    this._log.debug("ping enter");
-    try {
-      const r = await this._client.call("meta.ping", params ?? {});
-      this._log.debug(`ping exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`ping exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async status(params) {
-    const tStart = Date.now();
-    this._log.debug("status enter");
-    try {
-      const r = await this._client.call("meta.status", params ?? {});
-      this._log.debug(`status exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`status exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async trustRoots(params) {
-    const tStart = Date.now();
-    this._log.debug("trustRoots enter");
-    try {
-      const r = await this._client.call("meta.trust_roots", params ?? {});
-      this._log.debug(`trustRoots exit: elapsed=${Date.now() - tStart}ms`);
-      return r;
-    } catch (err) {
-      this._log.debug(`trustRoots exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  // ── 信任根下载 ────────────────────────────────────────────
-  async downloadTrustRoots(opts) {
-    const tStart = Date.now();
-    this._log.debug(`downloadTrustRoots enter: issuer=${opts?.issuer ?? "-"}`);
-    try {
-      const target = this._resolveTrustRootsUrl(
-        opts?.url,
-        opts?.issuer,
-        opts?.gateway_url
-      );
-      if (!target.toLowerCase().startsWith("https://") && !target.toLowerCase().startsWith("http://")) {
-        throw new ValidationError("trust roots url must be http(s)");
-      }
-      const timeoutMs = (opts?.timeout ?? 10) * 1e3;
-      const controller = new AbortController();
-      const timer = setTimeout(() => controller.abort(), timeoutMs);
-      try {
-        const response = await fetch(target, {
-          headers: { Accept: "application/json" },
-          signal: controller.signal
-        });
-        if (!response.ok) {
-          throw new ValidationError(`trust roots download failed: HTTP ${response.status}`);
-        }
-        const payload = await response.json();
-        if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
-          throw new ValidationError("trust roots endpoint returned non-object JSON");
-        }
-        this._log.debug(`downloadTrustRoots exit: elapsed=${Date.now() - tStart}ms`);
-        return payload;
-      } finally {
-        clearTimeout(timer);
-      }
-    } catch (err) {
-      this._log.debug(`downloadTrustRoots exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  async downloadIssuerRootCert(issuer, opts) {
-    const tStart = Date.now();
-    this._log.debug(`downloadIssuerRootCert enter: issuer=${issuer}`);
-    try {
-      const normalizedIssuer = _MetaNamespace._validateIssuer(issuer);
-      const target = opts?.url?.trim() || this._issuerRootCertUrl(normalizedIssuer);
-      if (!target.toLowerCase().startsWith("https://") && !target.toLowerCase().startsWith("http://")) {
-        throw new ValidationError("issuer root certificate url must be http(s)");
-      }
-      const timeoutMs = (opts?.timeout ?? 10) * 1e3;
-      const controller = new AbortController();
-      const timer = setTimeout(() => controller.abort(), timeoutMs);
-      try {
-        const response = await fetch(target, {
-          headers: { Accept: "application/x-pem-file,text/plain" },
-          signal: controller.signal
-        });
-        if (!response.ok) {
-          throw new ValidationError(`issuer root cert download failed: HTTP ${response.status}`);
-        }
-        const certPem = (await response.text()).trim();
-        _MetaNamespace._validateCertPem(certPem, normalizedIssuer);
-        this._log.debug(`downloadIssuerRootCert exit: elapsed=${Date.now() - tStart}ms issuer=${normalizedIssuer}`);
-        return certPem + "\n";
-      } finally {
-        clearTimeout(timer);
-      }
-    } catch (err) {
-      this._log.debug(`downloadIssuerRootCert exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
-  // ── 信任根验证 ────────────────────────────────────────────
-  async verifyTrustRoots(trustList, opts) {
-    if (!trustList || typeof trustList !== "object") {
-      throw new ValidationError("trust roots list must be a JSON object");
-    }
-    const signature = String(trustList.authority_signature ?? "").trim();
-    if (!signature && !opts?.allow_unsigned) {
-      throw new ValidationError("trust roots list missing authority_signature");
-    }
-    _MetaNamespace._validateListMetadata(trustList);
-    if (signature) {
-      const publicKey = await this._loadAuthorityPublicKey(
-        opts?.authority_cert_pem,
-        opts?.authority_public_key_pem,
-        trustList
-      );
-      const signedPayload = _MetaNamespace._canonicalSignedPayload(trustList);
-      const sigBytes = _MetaNamespace._decodeSignature(signature);
-      const ok = await crypto.subtle.verify(
-        { name: "ECDSA", hash: "SHA-256" },
-        publicKey,
-        toBufferSource(sigBytes),
-        toBufferSource(signedPayload)
-      );
-      if (!ok) {
-        throw new ValidationError("trust roots authority_signature verification failed");
-      }
-    }
-    const roots = _MetaNamespace._extractRootEntries(trustList);
-    const imported = [];
-    const skipped = [];
-    for (const item of roots) {
-      const status = String(item.status ?? "active").trim().toLowerCase();
-      const certPem = String(item.certificate ?? item.cert_pem ?? "").trim();
-      const rootId = String(item.id ?? item.agentid ?? "").trim();
-      if (status !== "active") {
-        skipped.push({ id: rootId, reason: `status=${status}` });
-        continue;
-      }
-      _MetaNamespace._validateCertPem(certPem, rootId || "root");
-      const fingerprint = await _MetaNamespace._certFingerprint(certPem);
-      const expectedFp = _MetaNamespace._normalizeFingerprint(item.fingerprint_sha256);
-      if (expectedFp.length !== 64) {
-        throw new ValidationError(`root certificate missing or invalid fingerprint_sha256: ${rootId || fingerprint}`);
-      }
-      if (expectedFp !== fingerprint) {
-        throw new ValidationError(`root certificate fingerprint mismatch: ${rootId || fingerprint}`);
-      }
-      imported.push({ id: rootId || fingerprint, cert_pem: certPem, fingerprint_sha256: fingerprint });
-    }
-    if (imported.length === 0) {
-      throw new ValidationError("trust roots list contains no active root certificates");
-    }
-    return { imported, skipped, count: imported.length };
-  }
-  // ── 信任根导入 ────────────────────────────────────────────
-  async importTrustRoots(trustList, opts) {
-    const verified = await this.verifyTrustRoots(trustList, opts);
-    await this._enforceMonotonicVersion(trustList);
-    const ks = this._internal._keystore;
-    let bundlePath = "";
-    if (typeof ks.saveTrustRoots === "function") {
-      bundlePath = await ks.saveTrustRoots(trustList, verified.imported);
-    } else {
-      this._log.warn("[MetaNamespace] keystore missing saveTrustRoots method, skip persist");
-    }
-    const auth = this._internal._auth;
-    const reloaded = auth.reloadTrustedRoots?.() ?? auth.reload_trusted_roots?.() ?? 0;
-    return {
-      imported: verified.count,
-      skipped: verified.skipped,
-      bundle_path: bundlePath,
-      reloaded_roots: reloaded,
-      fingerprints: verified.imported.map((i) => i.fingerprint_sha256)
-    };
-  }
-  async refreshTrustRoots(opts) {
-    const sourceUrl = this._resolveTrustRootsUrl(opts?.url, opts?.issuer, opts?.gateway_url);
-    const trustList = await this.downloadTrustRoots({ url: sourceUrl, timeout: opts?.timeout });
-    const result = await this.importTrustRoots(trustList, {
-      authority_cert_pem: opts?.authority_cert_pem,
-      authority_public_key_pem: opts?.authority_public_key_pem,
-      allow_unsigned: opts?.allow_unsigned
-    });
-    result.source_url = sourceUrl;
-    return result;
-  }
-  async updateIssuerRootCert(issuer, opts) {
-    const normalizedIssuer = _MetaNamespace._validateIssuer(issuer);
-    const sourceUrl = opts?.url?.trim() || this._issuerRootCertUrl(normalizedIssuer);
-    let rootPem = opts?.cert_pem?.trim() ? opts.cert_pem.trim() + "\n" : "";
-    if (!rootPem) {
-      rootPem = await this.downloadIssuerRootCert(normalizedIssuer, { url: sourceUrl, timeout: opts?.timeout });
-    }
-    _MetaNamespace._validateCertPem(rootPem, normalizedIssuer);
-    const fingerprint = await _MetaNamespace._certFingerprint(rootPem);
-    let effectiveTrustList = opts?.trust_list ?? await this._loadLocalTrustList();
-    let trustSource = "local";
-    if (!effectiveTrustList) {
-      effectiveTrustList = await this.downloadTrustRoots({ issuer: normalizedIssuer, timeout: opts?.timeout });
-      trustSource = this._issuerTrustRootUrl(normalizedIssuer);
-    }
-    const verified = await this.verifyTrustRoots(effectiveTrustList, {
-      authority_cert_pem: opts?.authority_cert_pem,
-      authority_public_key_pem: opts?.authority_public_key_pem,
-      allow_unsigned: opts?.allow_unsigned
-    });
-    await this._enforceMonotonicVersion(effectiveTrustList);
-    const trustedFingerprints = new Set(verified.imported.map((i) => i.fingerprint_sha256));
-    if (!trustedFingerprints.has(fingerprint)) {
-      throw new ValidationError("issuer root certificate is not in trusted root list");
-    }
-    const ks = this._internal._keystore;
-    let certPath = "";
-    let bundlePath = "";
-    if (typeof ks.saveIssuerRootCert === "function") {
-      [certPath, bundlePath] = await ks.saveIssuerRootCert(normalizedIssuer, rootPem, fingerprint);
-    } else {
-      this._log.warn("[MetaNamespace] keystore missing saveIssuerRootCert method, skip persist");
-    }
-    const auth = this._internal._auth;
-    const reloaded = auth.reloadTrustedRoots?.() ?? auth.reload_trusted_roots?.() ?? 0;
-    return {
-      issuer: normalizedIssuer,
-      fingerprint_sha256: fingerprint,
-      cert_path: certPath,
-      bundle_path: bundlePath,
-      reloaded_roots: reloaded,
-      source_url: sourceUrl,
-      trust_source: trustSource
-    };
-  }
-  // ── URL 解析 ──────────────────────────────────────────────
-  _resolveTrustRootsUrl(url, issuer, gatewayUrl) {
-    const target = (url ?? "").trim();
-    if (target) return target;
-    if (issuer) return this._issuerTrustRootUrl(issuer);
-    const gw = (gatewayUrl ?? this._internal._gatewayUrl ?? "").trim();
-    return gw ? this._gatewayTrustRootsUrl(gw) : AUTHORITY_ENDPOINT;
-  }
-  _issuerTrustRootUrl(issuer) {
-    const authority = this._pkiAuthority(issuer);
-    return `https://${authority}/trust-root.json`;
-  }
-  _issuerRootCertUrl(issuer) {
-    const authority = this._pkiAuthority(issuer);
-    return `https://${authority}/root.crt`;
-  }
-  _pkiAuthority(issuer) {
-    const normalized = _MetaNamespace._validateIssuer(issuer);
-    const port = this._internal.configModel.discoveryPort;
-    const portSuffix = port && !normalized.includes(":") ? `:${port}` : "";
-    return `pki.${normalized}${portSuffix}`;
-  }
-  _gatewayTrustRootsUrl(gatewayUrl) {
-    let parsed;
-    try {
-      parsed = new URL(gatewayUrl);
-    } catch {
-      throw new ValidationError("gateway_url must include scheme and host");
-    }
-    if (!parsed.host) {
-      throw new ValidationError("gateway_url must include scheme and host");
-    }
-    const scheme = ["wss:", "https:"].includes(parsed.protocol) ? "https" : "http";
-    return `${scheme}://${parsed.host}/pki/trust-roots.json`;
-  }
-  // ── 内部辅助 ──────────────────────────────────────────────
-  /** 校验 issuer 域名格式 */
-  static _validateIssuer(issuer) {
-    const value = (issuer ?? "").trim().toLowerCase();
-    if (!value || value.includes("://") || value.includes("/") || value.includes("\\") || value.startsWith(".")) {
-      throw new ValidationError("issuer must be a domain name");
-    }
-    return value;
-  }
-  /** 校验信任列表元数据（版本、时间戳） */
-  static _validateListMetadata(trustList) {
-    const version = trustList.version;
-    if (typeof version !== "number" || !Number.isInteger(version) || version < 0) {
-      throw new ValidationError("trust roots list version must be a non-negative integer");
-    }
-    const issuedAt = _MetaNamespace._parseTimestamp(trustList.issued_at, "issued_at");
-    const nextUpdate = _MetaNamespace._parseTimestamp(trustList.next_update, "next_update");
-    if (nextUpdate < issuedAt) {
-      throw new ValidationError("trust roots list next_update must not be earlier than issued_at");
-    }
-    if (issuedAt > Date.now() + MAX_CLOCK_SKEW * 1e3) {
-      throw new ValidationError("trust roots list issued_at is too far in the future");
-    }
-  }
-  static _parseTimestamp(value, field) {
-    const text = String(value ?? "").trim();
-    if (!text) throw new ValidationError(`trust roots list missing ${field}`);
-    const ts = new Date(text).getTime();
-    if (isNaN(ts)) throw new ValidationError(`trust roots list ${field} must be ISO-8601`);
-    return ts;
-  }
-  /** 构建用于签名验证的规范化 JSON 载荷 */
-  static _canonicalSignedPayload(trustList) {
-    const payload = { ...trustList };
-    delete payload.authority_signature;
-    const canonical = _MetaNamespace._stableStringify(payload);
-    return new TextEncoder().encode(canonical);
-  }
-  /** 递归稳定排序 JSON 序列化 */
-  static _stableStringify(obj) {
-    if (obj === null || obj === void 0) return JSON.stringify(obj);
-    if (typeof obj !== "object") return JSON.stringify(obj);
-    if (Array.isArray(obj)) {
-      return "[" + obj.map((v) => _MetaNamespace._stableStringify(v)).join(",") + "]";
-    }
-    const keys = Object.keys(obj).sort();
-    const pairs = keys.map((k) => JSON.stringify(k) + ":" + _MetaNamespace._stableStringify(obj[k]));
-    return "{" + pairs.join(",") + "}";
-  }
-  /** 解码 base64 编码的签名 */
-  static _decodeSignature(signature) {
-    let value = signature.trim();
-    if (value.startsWith("base64:")) {
-      value = value.slice(7);
-    }
-    const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
-    const padding = "=".repeat((4 - normalized.length % 4) % 4);
-    return base64ToUint8(normalized + padding);
-  }
-  /** 提取信任列表中的根 CA 条目 */
-  static _extractRootEntries(trustList) {
-    const roots = trustList.root_cas;
-    if (Array.isArray(roots)) {
-      return roots.filter((item) => item && typeof item === "object");
-    }
-    const legacy = trustList.roots;
-    if (Array.isArray(legacy)) {
-      return legacy.filter((item) => item && typeof item === "object").map((item) => ({
-        id: item.agentid ?? item.id ?? item.cert_sn,
-        certificate: item.cert_pem ?? item.certificate,
-        fingerprint_sha256: item.fingerprint_sha256,
-        status: item.status ?? "active"
-      }));
-    }
-    throw new ValidationError("trust roots list missing root_cas");
-  }
-  /** 规范化指纹字符串（去除前缀和分隔符） */
-  static _normalizeFingerprint(value) {
-    let text = String(value ?? "").trim().toLowerCase();
-    if (text.startsWith("sha256:")) text = text.slice(7);
-    return text.replace(/[^0-9a-f]/g, "");
-  }
-  /** 计算证书 PEM 的 SHA-256 指纹（纯 hex，不含 sha256: 前缀） */
-  static async _certFingerprint(certPem) {
-    const der = pemToArrayBuffer(certPem);
-    const hash = await crypto.subtle.digest("SHA-256", der);
-    return Array.from(new Uint8Array(hash)).map((b) => b.toString(16).padStart(2, "0")).join("");
-  }
-  /** 校验 PEM 格式是否包含 BEGIN CERTIFICATE */
-  static _validateCertPem(certPem, rootId) {
-    if (!certPem.includes("BEGIN CERTIFICATE")) {
-      throw new ValidationError(`root certificate missing PEM data: ${rootId}`);
-    }
-  }
-  /**
-   * 加载权威公钥用于签名验证。
-   * 浏览器环境：从 PEM 提取 SPKI 并导入为 CryptoKey。
-   * 支持 P-256 和 P-384 曲线。
-   */
-  async _loadAuthorityPublicKey(authorityCertPem, authorityPublicKeyPem, trustList) {
-    if (authorityPublicKeyPem) {
-      return this._importPublicKeyPem(authorityPublicKeyPem);
-    }
-    const candidateCert = authorityCertPem || String(trustList?.authority_cert_pem ?? "");
-    if (!candidateCert) {
-      throw new ValidationError("authority certificate/public key is required to verify trust roots");
-    }
-    return this._importCertPublicKey(candidateCert);
-  }
-  /** 从 SPKI PEM 导入公钥（尝试 P-384，降级 P-256） */
-  async _importPublicKeyPem(pem) {
-    const der = pemToArrayBuffer(pem);
-    for (const curve of ["P-384", "P-256"]) {
-      try {
-        return await crypto.subtle.importKey(
-          "spki",
-          der,
-          { name: "ECDSA", namedCurve: curve },
-          true,
-          ["verify"]
-        );
-      } catch {
-      }
-    }
-    throw new ValidationError("invalid authority public key PEM");
-  }
-  /**
-   * 从证书 PEM 提取公钥并导入。
-   * 使用简化 ASN.1 解析提取 SPKI 段。
-   */
-  async _importCertPublicKey(certPem) {
-    if (!certPem.includes("BEGIN CERTIFICATE")) {
-      throw new ValidationError("invalid authority certificate PEM");
-    }
-    const certDer = new Uint8Array(pemToArrayBuffer(certPem));
-    const spki = this._extractSpkiFromDer(certDer);
-    if (!spki) {
-      throw new ValidationError("invalid authority certificate PEM");
-    }
-    for (const curve of ["P-384", "P-256"]) {
-      try {
-        return await crypto.subtle.importKey(
-          "spki",
-          spki,
-          { name: "ECDSA", namedCurve: curve },
-          true,
-          ["verify"]
-        );
-      } catch {
-      }
-    }
-    throw new ValidationError("invalid authority certificate PEM");
-  }
-  /**
-   * 从 X.509 DER 证书中提取 SubjectPublicKeyInfo。
-   * 搜索 EC 公钥 OID (1.2.840.10045.2.1)。
-   */
-  _extractSpkiFromDer(certDer) {
-    const ecOid = [6, 7, 42, 134, 72, 206, 61, 2, 1];
-    for (let i = 0; i < certDer.length - ecOid.length; i++) {
-      let match = true;
-      for (let j = 0; j < ecOid.length; j++) {
-        if (certDer[i + j] !== ecOid[j]) {
-          match = false;
-          break;
-        }
-      }
-      if (!match) continue;
-      for (let back = 1; back <= 4; back++) {
-        const seqStart = i - back;
-        if (seqStart < 0) continue;
-        if (certDer[seqStart] !== 48) continue;
-        const seqLen = this._parseDerLength(certDer, seqStart + 1);
-        if (!seqLen) continue;
-        const totalLen = 1 + seqLen.lenBytes + seqLen.value;
-        if (totalLen < 50 || totalLen > 200) continue;
-        return certDer.slice(seqStart, seqStart + totalLen).buffer;
-      }
-    }
-    return null;
-  }
-  /** 解析 DER 长度字段 */
-  _parseDerLength(data, offset) {
-    if (offset >= data.length) return null;
-    const first = data[offset];
-    if (first < 128) return { value: first, lenBytes: 1 };
-    const numBytes = first & 127;
-    if (numBytes === 0 || numBytes > 4 || offset + 1 + numBytes > data.length) return null;
-    let value = 0;
-    for (let i = 0; i < numBytes; i++) {
-      value = value << 8 | data[offset + 1 + i];
-    }
-    return { value, lenBytes: 1 + numBytes };
-  }
-  /** 版本单调递增检查（通过 keystore 加载已有版本） */
-  async _enforceMonotonicVersion(trustList) {
-    const version = trustList.version;
-    if (typeof version !== "number") return;
-    const ks = this._internal._keystore;
-    if (typeof ks.loadTrustRoots !== "function") return;
-    try {
-      const current = await ks.loadTrustRoots();
-      const currentVersion = current?.version;
-      if (typeof currentVersion === "number" && version < currentVersion) {
-        throw new ValidationError("trust roots list version rollback is not allowed");
-      }
-    } catch (e) {
-      if (e instanceof ValidationError) throw e;
-    }
-  }
-  /** 从 keystore 加载本地已存储的信任列表 */
-  async _loadLocalTrustList() {
-    const ks = this._internal._keystore;
-    if (typeof ks.loadTrustRoots !== "function") return null;
-    try {
-      const payload = await ks.loadTrustRoots();
-      if (!payload || typeof payload !== "object") return null;
-      return payload;
-    } catch {
-      return null;
-    }
-  }
-};
-
-// src/client.ts
-init_crypto();
-
-// src/keystore/indexeddb.ts
-init_crypto();
-var _noopLog8 = { error: () => {
-}, warn: () => {
-}, info: () => {
-}, debug: () => {
-} };
-function safeAid(aid) {
-  return aid.replace(/[/\\:]/g, "_");
-}
-function extractSpkiB64FromCertPem(certPem) {
-  try {
-    const der = new Uint8Array(pemToArrayBuffer(certPem));
-    const tlv = (d, o) => {
-      let lo = o + 1, len;
-      if (d[lo] & 128) {
-        const n = d[lo] & 127;
-        len = 0;
-        for (let i = 0; i < n; i++) len = len << 8 | d[lo + 1 + i];
-        lo += 1 + n;
-      } else {
-        len = d[lo];
-        lo += 1;
-      }
-      return [lo, len];
-    };
-    const skip = (d, o) => {
-      const [vs2, vl] = tlv(d, o);
-      return vs2 + vl;
-    };
-    let [vs] = tlv(der, 0);
-    let pos = vs;
-    const [tbsVs] = tlv(der, pos);
-    pos = tbsVs;
-    if (der[pos] === 160) pos = skip(der, pos);
-    for (let i = 0; i < 5; i++) pos = skip(der, pos);
-    const spkiEnd = skip(der, pos);
-    const spkiBytes = der.slice(pos, spkiEnd);
-    let b = "";
-    for (let i = 0; i < spkiBytes.length; i++) b += String.fromCharCode(spkiBytes[i]);
-    return btoa(b);
-  } catch {
-    return "";
-  }
-}
-function encodePart(value) {
-  return encodeURIComponent(value);
-}
-function deepClone(value) {
-  return JSON.parse(JSON.stringify(value));
-}
-function isRecord(value) {
-  return isJsonObject(value);
-}
-function toBufferSource2(bytes) {
-  return bytes.slice().buffer;
-}
-function sameJson(a, b) {
-  return JSON.stringify(a) === JSON.stringify(b);
-}
-var _ENC_ALGO = "AES-GCM";
-var _PBKDF2_ITERATIONS = 1e5;
-var SeedMigrationError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "SeedMigrationError";
-  }
-};
-function _uint8ToBase64(bytes) {
-  let b = "";
-  for (let i = 0; i < bytes.length; i++) b += String.fromCharCode(bytes[i]);
-  return btoa(b);
-}
-function _base64ToUint8(b64) {
-  return Uint8Array.from(atob(b64), (c) => c.charCodeAt(0));
-}
-async function _deriveEncKey(seed, salt) {
-  const raw = new TextEncoder().encode(seed);
-  const base = await crypto.subtle.importKey("raw", raw, "PBKDF2", false, ["deriveKey"]);
-  return crypto.subtle.deriveKey(
-    { name: "PBKDF2", salt, iterations: _PBKDF2_ITERATIONS, hash: "SHA-256" },
-    base,
-    { name: _ENC_ALGO, length: 256 },
-    false,
-    ["encrypt", "decrypt"]
-  );
-}
-async function _encryptPEM(pem, seed) {
-  const salt = crypto.getRandomValues(new Uint8Array(16));
-  const iv = crypto.getRandomValues(new Uint8Array(12));
-  const key = await _deriveEncKey(seed, salt);
-  const ct = await crypto.subtle.encrypt({ name: _ENC_ALGO, iv }, key, new TextEncoder().encode(pem));
-  return {
-    ct: _uint8ToBase64(new Uint8Array(ct)),
-    iv: _uint8ToBase64(iv),
-    salt: _uint8ToBase64(salt)
-  };
-}
-async function _decryptPEM(enc, seed) {
-  const salt = _base64ToUint8(enc.salt);
-  const iv = _base64ToUint8(enc.iv);
-  const ct = _base64ToUint8(enc.ct);
-  const key = await _deriveEncKey(seed, salt);
-  const pt = await crypto.subtle.decrypt({ name: _ENC_ALGO, iv: toBufferSource2(iv) }, key, toBufferSource2(ct));
-  return new TextDecoder().decode(pt);
-}
-function hasEncryptionSeed(seed) {
-  return seed !== void 0;
-}
-var DB_NAME = "aun-keystore";
-var DB_VERSION = 6;
-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 STRUCTURED_RECOVERY_RETENTION_MS = 7 * 24 * 3600 * 1e3;
-function metadataStoreKey(aid) {
-  return safeAid(aid);
-}
-function normalizeCertFingerprint(certFingerprint) {
-  const normalized = String(certFingerprint ?? "").trim().toLowerCase();
-  if (!normalized) return "";
-  if (!normalized.startsWith("sha256:")) return "";
-  const hexPart = normalized.slice(7);
-  if (hexPart.length !== 64 || /[^0-9a-f]/.test(hexPart)) return "";
-  return normalized;
-}
-async function fingerprintFromCertPem(certPem) {
-  try {
-    const der = pemToArrayBuffer(certPem);
-    const hash = await crypto.subtle.digest("SHA-256", der);
-    const hex = Array.from(new Uint8Array(hash)).map((b) => b.toString(16).padStart(2, "0")).join("");
-    return `sha256:${hex}`;
-  } catch {
-    return "";
-  }
-}
-function certStoreKey(aid, certFingerprint) {
-  const normalized = normalizeCertFingerprint(certFingerprint);
-  if (!normalized) return safeAid(aid);
-  return `${safeAid(aid)}|${encodePart(normalized)}`;
-}
-function instanceStateStoreKey(aid, deviceId, slotId = "") {
-  const normalizedDevice = normalizeInstanceId(deviceId, "device_id");
-  const normalizedSlot = normalizeInstanceId(slotId, "slot_id", { allowEmpty: true }) || "_singleton";
-  return `${safeAid(aid)}|${encodePart(normalizedDevice)}|${encodePart(normalizedSlot)}`;
-}
-function prekeyPrefix(aid) {
-  return `${safeAid(aid)}|`;
-}
-function prekeyStoreKey(aid, prekeyId, deviceId = "") {
-  const normalizedDeviceId = String(deviceId ?? "").trim();
-  if (!normalizedDeviceId) {
-    return `${safeAid(aid)}|${encodePart(prekeyId)}`;
+function prekeyStoreKey(aid, prekeyId, deviceId = "") {
+  const normalizedDeviceId = String(deviceId ?? "").trim();
+  if (!normalizedDeviceId) {
+    return `${safeAid(aid)}|${encodePart(prekeyId)}`;
   }
   return `${safeAid(aid)}|${encodePart(normalizedDeviceId)}|${encodePart(prekeyId)}`;
 }
@@ -5519,7 +3869,7 @@ async function idbDelete(storeName, key) {
 }
 var _IndexedDBKeyStore = class _IndexedDBKeyStore {
   constructor(opts) {
-    __publicField(this, "_log", _noopLog8);
+    __publicField(this, "_log", _noopLog5);
     /** 私钥加密种子；为空时降级为明文存储（向后兼容） */
     __publicField(this, "_encryptionSeed");
     this._encryptionSeed = opts?.encryptionSeed;
@@ -10336,7 +8686,6 @@ function isPlainObject(value) {
 var encoder3 = new TextEncoder();
 var decoder = new TextDecoder();
 var E2EE_SDK_LANG = "javascript";
-var E2EE_SDK_VERSION = "0.3.5";
 async function sha2563(data) {
   const buf = await crypto.subtle.digest("SHA-256", data.slice().buffer);
   return new Uint8Array(buf);
@@ -10507,7 +8856,7 @@ function normalizeProtectedHeaders(headers, payload) {
   }
   normalized.sdk_lang = E2EE_SDK_LANG;
   delete normalized.sdk_vesion;
-  normalized.sdk_version = E2EE_SDK_VERSION;
+  normalized.sdk_version = VERSION;
   return normalized;
 }
 function normalizeProtectedHeaderKey(key) {
@@ -11096,13 +9445,325 @@ var AUNLogger = class {
         break;
     }
   }
-  _now() {
-    const d = /* @__PURE__ */ new Date();
-    const pad = (n, w = 2) => String(n).padStart(w, "0");
-    const date = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
-    const time = `${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
-    const ms = pad(d.getMilliseconds(), 3);
-    return { date, time, ms };
+  _now() {
+    const d = /* @__PURE__ */ new Date();
+    const pad = (n, w = 2) => String(n).padStart(w, "0");
+    const date = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+    const time = `${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+    const ms = pad(d.getMilliseconds(), 3);
+    return { date, time, ms };
+  }
+};
+
+// src/error-codes.ts
+var CERT_NOT_FOUND = "CERT_NOT_FOUND";
+var CERT_PARSE_ERROR = "CERT_PARSE_ERROR";
+var CERT_EXPIRED = "CERT_EXPIRED";
+var CERT_NOT_YET_VALID = "CERT_NOT_YET_VALID";
+var CERT_CHAIN_BROKEN = "CERT_CHAIN_BROKEN";
+var KEYPAIR_MISMATCH = "KEYPAIR_MISMATCH";
+var PRIVATE_KEY_PARSE_ERROR = "PRIVATE_KEY_PARSE_ERROR";
+var IDENTITY_CONFLICT = "IDENTITY_CONFLICT";
+var INVALID_AID_FORMAT = "INVALID_AID_FORMAT";
+var NETWORK_ERROR = "NETWORK_ERROR";
+var SERVER_ERROR = "SERVER_ERROR";
+var AGENTMD_NOT_FOUND = "AGENTMD_NOT_FOUND";
+var CERT_RENEWAL_FAILED = "CERT_RENEWAL_FAILED";
+var REKEY_FAILED = "REKEY_FAILED";
+var PRIVATE_KEY_REQUIRED = "PRIVATE_KEY_REQUIRED";
+var SIGNATURE_OPERATION_ERROR = "SIGNATURE_OPERATION_ERROR";
+var VERIFICATION_OPERATION_ERROR = "VERIFICATION_OPERATION_ERROR";
+var CERT_NOT_VALID = "CERT_NOT_VALID";
+var PRIVATE_KEY_NOT_VALID = "PRIVATE_KEY_NOT_VALID";
+
+// src/cert-utils.ts
+init_crypto();
+var AGENT_MD_SIGNATURE_MARKER = "<!-- AUN-SIGNATURE";
+var AGENT_MD_SIGNATURE_RE = /^<!-- AUN-SIGNATURE\r?\n(?<body>[\s\S]*?)\r?\n-->\s*$/;
+var AGENT_MD_FINGERPRINT_RE = /^sha256:[0-9a-f]{64}$/;
+function parseAgentMdTailSignature(content) {
+  const idx = content.lastIndexOf(AGENT_MD_SIGNATURE_MARKER);
+  if (idx < 0) return { payload: content, fields: null };
+  if (idx > 0 && content[idx - 1] !== "\n" && content[idx - 1] !== "\r") return { payload: content, fields: null };
+  const tail = content.slice(idx);
+  const match = tail.match(AGENT_MD_SIGNATURE_RE);
+  if (!match) return { payload: content.slice(0, idx), fields: null, parseError: "malformed signature block" };
+  const fields = {};
+  for (const rawLine of match.groups?.body?.split(/\r?\n/) ?? []) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    const colon = line.indexOf(":");
+    if (colon < 0) return { payload: content.slice(0, idx), fields: null, parseError: `malformed signature field: ${line}` };
+    fields[line.slice(0, colon).trim().toLowerCase()] = line.slice(colon + 1).trim();
+  }
+  for (const req of ["cert_fingerprint", "timestamp", "signature"]) {
+    if (!fields[req]) return { payload: content.slice(0, idx), fields: null, parseError: `signature block missing ${req}` };
+  }
+  if (!AGENT_MD_FINGERPRINT_RE.test(fields.cert_fingerprint.toLowerCase())) {
+    return { payload: content.slice(0, idx), fields: null, parseError: "invalid cert_fingerprint" };
+  }
+  if (!Number.isFinite(Number(fields.timestamp))) {
+    return { payload: content.slice(0, idx), fields: null, parseError: "invalid timestamp" };
+  }
+  return { payload: content.slice(0, idx), fields };
+}
+function normalizeAgentMdPayload(content) {
+  let payload = parseAgentMdTailSignature(String(content ?? "")).payload;
+  if (payload && !payload.endsWith("\n") && !payload.endsWith("\r")) payload += "\n";
+  return payload;
+}
+function buildAgentMdSignatureBlock(certFingerprint, timestamp, signatureB64) {
+  return [
+    AGENT_MD_SIGNATURE_MARKER,
+    `cert_fingerprint: ${certFingerprint}`,
+    `timestamp: ${Math.trunc(timestamp)}`,
+    `signature: ${signatureB64}`,
+    "-->"
+  ].join("\n");
+}
+function extractAgentMdAid(payload) {
+  const lines = payload.replace(/^\ufeff/, "").split(/\r?\n/);
+  if (!lines.length || lines[0].trim() !== "---") return "";
+  for (const line of lines.slice(1)) {
+    const t = line.trim();
+    if (t === "---") break;
+    if (t.startsWith("aid:")) {
+      let v = t.slice(4).trim();
+      if (v.length >= 2 && v[0] === v[v.length - 1] && (v[0] === '"' || v[0] === "'")) v = v.slice(1, -1);
+      return v.trim();
+    }
+  }
+  return "";
+}
+function readDerLength(data, offset) {
+  if (offset >= data.length) return null;
+  const first = data[offset];
+  if (first < 128) return { value: first, lenBytes: 1 };
+  const numBytes = first & 127;
+  if (numBytes === 0 || numBytes > 4) return null;
+  let value = 0;
+  for (let i = 0; i < numBytes; i++) value = value << 8 | data[offset + 1 + i];
+  return { value, lenBytes: 1 + numBytes };
+}
+function readDerTlv(data, offset) {
+  const len = readDerLength(data, offset + 1);
+  if (!len) return null;
+  const valueStart = offset + 1 + len.lenBytes;
+  const valueEnd = valueStart + len.value;
+  if (valueEnd > data.length) return null;
+  return { tag: data[offset], valueStart, valueEnd, fullEnd: valueEnd };
+}
+function publicKeyDerB64(certPem) {
+  const certDer = new Uint8Array(pemToArrayBuffer(certPem));
+  const cert = readDerTlv(certDer, 0);
+  if (!cert || cert.tag !== 48) return "";
+  const tbs = readDerTlv(certDer, cert.valueStart);
+  if (!tbs || tbs.tag !== 48) return "";
+  let pos = tbs.valueStart;
+  if (certDer[pos] === 160) pos = readDerTlv(certDer, pos)?.fullEnd ?? pos;
+  for (let i = 0; i < 5; i++) pos = readDerTlv(certDer, pos)?.fullEnd ?? pos;
+  const spki = readDerTlv(certDer, pos);
+  if (!spki || spki.tag !== 48) return "";
+  return uint8ToBase64(certDer.slice(pos, spki.fullEnd));
+}
+function extractCommonName(der, nameStart, nameEnd) {
+  let pos = nameStart;
+  while (pos < nameEnd) {
+    const set = readDerTlv(der, pos);
+    if (!set || set.tag !== 49) break;
+    let rpos = set.valueStart;
+    while (rpos < set.valueEnd) {
+      const seq = readDerTlv(der, rpos);
+      if (!seq || seq.tag !== 48) break;
+      const oid = readDerTlv(der, seq.valueStart);
+      if (oid && oid.tag === 6) {
+        const isCN = oid.valueEnd - oid.valueStart === 3 && der[oid.valueStart] === 85 && der[oid.valueStart + 1] === 4 && der[oid.valueStart + 2] === 3;
+        if (isCN) {
+          const val = readDerTlv(der, oid.fullEnd);
+          if (val) return new TextDecoder().decode(der.slice(val.valueStart, val.valueEnd));
+        }
+      }
+      rpos = seq.fullEnd;
+    }
+    pos = set.fullEnd;
+  }
+  return "";
+}
+function parseDerTime(der, offset) {
+  const tlv = readDerTlv(der, offset);
+  if (!tlv) return null;
+  const raw = new TextDecoder().decode(der.slice(tlv.valueStart, tlv.valueEnd));
+  if (tlv.tag === 23) {
+    const yy = parseInt(raw.slice(0, 2), 10);
+    const year = yy >= 50 ? 1900 + yy : 2e3 + yy;
+    const ms = Date.UTC(
+      year,
+      parseInt(raw.slice(2, 4), 10) - 1,
+      parseInt(raw.slice(4, 6), 10),
+      parseInt(raw.slice(6, 8), 10),
+      parseInt(raw.slice(8, 10), 10),
+      parseInt(raw.slice(10, 12), 10)
+    );
+    return Number.isNaN(ms) ? null : new Date(ms);
+  }
+  if (tlv.tag === 24) {
+    const ms = Date.UTC(
+      parseInt(raw.slice(0, 4), 10),
+      parseInt(raw.slice(4, 6), 10) - 1,
+      parseInt(raw.slice(6, 8), 10),
+      parseInt(raw.slice(8, 10), 10),
+      parseInt(raw.slice(10, 12), 10),
+      parseInt(raw.slice(12, 14), 10)
+    );
+    return Number.isNaN(ms) ? null : new Date(ms);
+  }
+  return null;
+}
+function parseCertMetadata(certPem) {
+  const fallback = { subject: "", issuer: "", notBefore: /* @__PURE__ */ new Date(0), notAfter: /* @__PURE__ */ new Date(0) };
+  try {
+    const der = new Uint8Array(pemToArrayBuffer(certPem));
+    const cert = readDerTlv(der, 0);
+    if (!cert || cert.tag !== 48) return fallback;
+    const tbs = readDerTlv(der, cert.valueStart);
+    if (!tbs || tbs.tag !== 48) return fallback;
+    let pos = tbs.valueStart;
+    if (der[pos] === 160) pos = readDerTlv(der, pos)?.fullEnd ?? pos;
+    pos = readDerTlv(der, pos)?.fullEnd ?? pos;
+    pos = readDerTlv(der, pos)?.fullEnd ?? pos;
+    const issuer = readDerTlv(der, pos);
+    if (!issuer || issuer.tag !== 48) return fallback;
+    const issuerCN = extractCommonName(der, issuer.valueStart, issuer.valueEnd);
+    pos = issuer.fullEnd;
+    const validity = readDerTlv(der, pos);
+    if (!validity || validity.tag !== 48) return fallback;
+    const notBefore = parseDerTime(der, validity.valueStart);
+    const nb = readDerTlv(der, validity.valueStart);
+    const notAfter = nb ? parseDerTime(der, nb.fullEnd) : null;
+    pos = validity.fullEnd;
+    const subject = readDerTlv(der, pos);
+    if (!subject || subject.tag !== 48) return fallback;
+    const subjectCN = extractCommonName(der, subject.valueStart, subject.valueEnd);
+    return {
+      subject: subjectCN,
+      issuer: issuerCN,
+      notBefore: notBefore ?? /* @__PURE__ */ new Date(0),
+      notAfter: notAfter ?? /* @__PURE__ */ new Date(0)
+    };
+  } catch {
+    return fallback;
+  }
+}
+async function signBytes(privateKeyPem, payload) {
+  const key = await importPrivateKeyEcdsa(privateKeyPem);
+  return uint8ToBase64(await ecdsaSignDer(key, payload));
+}
+async function verifySignatureWithCert(certPem, signatureB64, data) {
+  try {
+    const key = await importCertPublicKeyEcdsa(certPem);
+    return await ecdsaVerifyDer(key, base64ToUint8(signatureB64), data);
+  } catch {
+    return false;
+  }
+}
+
+// src/result.ts
+function resultOk(data) {
+  return { ok: true, data };
+}
+function resultErr(code, message, cause) {
+  return { ok: false, error: { code, message, ...cause !== void 0 ? { cause } : {} } };
+}
+
+// src/aid.ts
+var AID = class _AID {
+  constructor(params) {
+    __publicField(this, "aid");
+    __publicField(this, "aunPath");
+    __publicField(this, "certPem");
+    __publicField(this, "publicKey");
+    __publicField(this, "certSubject");
+    __publicField(this, "certNotBefore");
+    __publicField(this, "certNotAfter");
+    __publicField(this, "certIssuer");
+    __publicField(this, "deviceId");
+    __publicField(this, "slotId");
+    __publicField(this, "_privateKeyPem");
+    __publicField(this, "_certValid");
+    __publicField(this, "_privateKeyValid");
+    __publicField(this, "_certFingerprint", "");
+    this.aid = params.aid;
+    this.aunPath = params.aunPath;
+    this.deviceId = params.deviceId ?? "";
+    this.slotId = params.slotId ?? "default";
+    this.certPem = params.certPem;
+    this.publicKey = publicKeyDerB64(params.certPem);
+    const meta = parseCertMetadata(params.certPem);
+    this.certSubject = meta.subject;
+    this.certIssuer = meta.issuer;
+    this.certNotBefore = meta.notBefore;
+    this.certNotAfter = meta.notAfter;
+    this._privateKeyPem = params.privateKeyPem;
+    this._certValid = params.certValid;
+    this._privateKeyValid = params.privateKeyValid;
+  }
+  static async create(params) {
+    const aid = new _AID(params);
+    aid._certFingerprint = await certificateSha256Fingerprint(params.certPem);
+    return aid;
+  }
+  get certFingerprint() {
+    return this._certFingerprint;
+  }
+  isCertValid() {
+    return this._certValid;
+  }
+  isPrivateKeyValid() {
+    return this._privateKeyValid;
+  }
+  async sign(payload) {
+    if (!this._privateKeyValid || !this._privateKeyPem) return resultErr(PRIVATE_KEY_NOT_VALID, "private key is not valid");
+    try {
+      const data = typeof payload === "string" ? new TextEncoder().encode(payload) : payload;
+      return resultOk({ signature: await signBytes(this._privateKeyPem, data) });
+    } catch (exc) {
+      return resultErr(SIGNATURE_OPERATION_ERROR, String(exc), exc);
+    }
+  }
+  async verify(payload, signature) {
+    if (!this._certValid) return resultErr(CERT_NOT_VALID, "certificate is not valid");
+    try {
+      const data = typeof payload === "string" ? new TextEncoder().encode(payload) : payload;
+      return resultOk({ valid: await verifySignatureWithCert(this.certPem, signature, data) });
+    } catch (exc) {
+      return resultErr(VERIFICATION_OPERATION_ERROR, String(exc), exc);
+    }
+  }
+  async signAgentMd(content) {
+    if (!this._privateKeyValid || !this._privateKeyPem) return resultErr(PRIVATE_KEY_NOT_VALID, "private key is not valid");
+    try {
+      const payload = normalizeAgentMdPayload(content);
+      const signature = await signBytes(this._privateKeyPem, new TextEncoder().encode(payload));
+      return resultOk({ signed: payload + buildAgentMdSignatureBlock(this.certFingerprint, Date.now() / 1e3, signature) });
+    } catch (exc) {
+      return resultErr(SIGNATURE_OPERATION_ERROR, String(exc), exc);
+    }
+  }
+  async verifyAgentMd(content) {
+    if (!this._certValid) return resultErr(CERT_NOT_VALID, "certificate is not valid");
+    try {
+      const { payload, fields, parseError } = parseAgentMdTailSignature(String(content ?? ""));
+      if (!fields) return resultOk(parseError ? { status: "invalid", payload, reason: parseError } : { status: "unsigned", payload });
+      const payloadAid = extractAgentMdAid(payload);
+      if (payloadAid && payloadAid !== this.aid) return resultOk({ status: "invalid", payload, aid: payloadAid, reason: "aid mismatch" });
+      if (fields.cert_fingerprint.toLowerCase() !== this.certFingerprint.toLowerCase()) {
+        return resultOk({ status: "invalid", payload, aid: this.aid, reason: "certificate fingerprint mismatch" });
+      }
+      const valid = await verifySignatureWithCert(this.certPem, fields.signature, new TextEncoder().encode(payload));
+      return resultOk(valid ? { status: "verified", payload, aid: this.aid, cert_fingerprint: fields.cert_fingerprint, timestamp: Number(fields.timestamp) } : { status: "invalid", payload, aid: this.aid, cert_fingerprint: fields.cert_fingerprint, timestamp: Number(fields.timestamp), reason: "signature verification failed" });
+    } catch (exc) {
+      return resultErr(VERIFICATION_OPERATION_ERROR, String(exc), exc);
+    }
   }
 };
 
@@ -11262,6 +9923,12 @@ var DEFAULT_SESSION_OPTIONS = {
     http: 30
   }
 };
+var PROTECTED_HEADERS_METHODS = /* @__PURE__ */ new Set([
+  "message.send",
+  "group.send",
+  "message.thought.put",
+  "group.thought.put"
+]);
 var RECONNECT_MIN_BASE_DELAY_SECONDS = 1;
 var RECONNECT_MAX_BASE_DELAY_SECONDS = 64;
 var TOKEN_REFRESH_CHECK_INTERVAL_MS = 3e4;
@@ -11309,6 +9976,7 @@ function reconnectSleepDelaySeconds(baseDelay, maxBaseDelay) {
   return baseDelay + Math.random() * maxBaseDelay;
 }
 var PEER_CERT_CACHE_TTL = 3600;
+var AGENT_MD_HTTP_TIMEOUT_MS = 3e4;
 function gatewayHttpUrl2(gatewayUrl, path) {
   try {
     const parsed = new URL(gatewayUrl);
@@ -11335,6 +10003,30 @@ function buildCertUrl(gatewayUrl, aid, certFingerprint) {
   }
   return url.toString();
 }
+function agentMdHttpScheme(gatewayUrl) {
+  const raw = String(gatewayUrl ?? "").trim().toLowerCase();
+  return raw.startsWith("ws://") ? "http" : "https";
+}
+function agentMdAuthority(aid, discoveryPort) {
+  const host = String(aid ?? "").trim();
+  if (!host) return "";
+  if (discoveryPort && !host.includes(":")) return `${host}:${discoveryPort}`;
+  return host;
+}
+async function fetchWithTimeout(input, init, timeoutMs = AGENT_MD_HTTP_TIMEOUT_MS) {
+  const controller = new AbortController();
+  const timer = globalThis.setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(input, { ...init, signal: controller.signal });
+  } catch (error) {
+    if (controller.signal.aborted) {
+      throw new AUNError(`agent.md request timed out after ${timeoutMs}ms`);
+    }
+    throw error;
+  } finally {
+    globalThis.clearTimeout(timer);
+  }
+}
 function resolvePeerGatewayUrl(localGatewayUrl, peerAid) {
   if (!peerAid.includes(".")) return localGatewayUrl;
   const peerIssuer = peerAid.split(".").slice(1).join(".");
@@ -11509,6 +10201,69 @@ function extractV2EnvelopeFromSource(source) {
   }
   return null;
 }
+function truthyBool(value) {
+  if (value === true || value === 1) return true;
+  if (typeof value === "string") {
+    const normalized = value.trim().toLowerCase();
+    return normalized === "true" || normalized === "1" || normalized === "yes" || normalized === "on";
+  }
+  return false;
+}
+function isEncryptedEnvelopePayload(payload) {
+  if (!isJsonObject(payload)) return false;
+  const payloadType = String(payload.type ?? "").trim();
+  if (payloadType.startsWith("e2ee.")) return true;
+  if (!String(payload.ciphertext ?? "").trim()) return false;
+  return payload.nonce !== void 0 || payload.tag !== void 0 || payload.recipient !== void 0 || payload.recipients !== void 0 || payload.wrapped_key !== void 0 || payload.recipients_digest !== void 0;
+}
+function encryptedPushEnvelope(msg) {
+  if (isEncryptedEnvelopePayload(msg.payload)) return msg.payload;
+  if (typeof msg.envelope_json === "string" && msg.envelope_json.trim()) {
+    try {
+      const parsed = JSON.parse(msg.envelope_json);
+      if (isEncryptedEnvelopePayload(parsed)) return parsed;
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+function isEncryptedPushMessage(msg) {
+  if (truthyBool(msg.encrypted)) return true;
+  return encryptedPushEnvelope(msg) !== null;
+}
+function isV2EncryptedEnvelopePayload(envelope) {
+  if (!envelope) return false;
+  const payloadType = String(envelope.type ?? "").trim();
+  if (payloadType === "e2ee.p2p_encrypted" || payloadType === "e2ee.group_encrypted") return true;
+  return String(envelope.version ?? "").trim().toLowerCase() === "v2" && payloadType.startsWith("e2ee.");
+}
+function safeUndecryptablePushEvent(msg, group) {
+  const event = {
+    message_id: msg.message_id ?? null,
+    from: msg.from ?? null,
+    seq: msg.seq ?? null,
+    timestamp: msg.timestamp ?? msg.t_server ?? null,
+    device_id: msg.device_id ?? null,
+    slot_id: msg.slot_id ?? null,
+    _decrypt_error: "encrypted push payload is not decryptable on raw push path",
+    _decrypt_stage: "push_envelope"
+  };
+  if (group) {
+    event.group_id = msg.group_id ?? null;
+  } else {
+    event.to = msg.to ?? null;
+  }
+  const envelope = encryptedPushEnvelope(msg);
+  if (envelope) {
+    event._envelope_type = String(envelope.type ?? "");
+    event._suite = String(envelope.suite ?? "");
+    if (isV2EncryptedEnvelopePayload(envelope)) {
+      attachV2EnvelopeMetadata(event, v2E2eeMeta(envelope));
+    }
+  }
+  return event;
+}
 function metadataWithoutAuth(value) {
   if (!isJsonObject(value)) return null;
   const body = {};
@@ -11552,8 +10307,23 @@ function normalizeDeliveryModeConfig(raw, opts = {}) {
     affinity_ttl_ms: affinityTtlMs
   };
 }
+function assertClientOptions(value, label) {
+  if (value == null) return;
+  if (typeof value !== "object" || Array.isArray(value) || value instanceof AID) {
+    throw new ValidationError(`${label} must be an options object`);
+  }
+}
+function clientOptionsConfig(options) {
+  const raw = { ...options ?? {} };
+  if (Object.prototype.hasOwnProperty.call(raw, "aid")) {
+    throw new ValidationError("AUNClient options must not include aid; pass an AID object as the first argument");
+  }
+  delete raw.debug;
+  delete raw.protected_headers;
+  return raw;
+}
 var _AUNClient = class _AUNClient {
-  constructor(config, _debug = false) {
+  constructor(first, second) {
     /** SDK 配置模型 */
     __publicField(this, "configModel");
     /** 原始配置字典 */
@@ -11561,6 +10331,8 @@ var _AUNClient = class _AUNClient {
     __publicField(this, "_aid", null);
     __publicField(this, "_identity", null);
     __publicField(this, "_state", "idle");
+    __publicField(this, "_currentAid", null);
+    __publicField(this, "_instanceProtectedHeaders", null);
     __publicField(this, "_gatewayUrl", null);
     __publicField(this, "_deviceId");
     __publicField(this, "_slotId");
@@ -11575,12 +10347,6 @@ var _AUNClient = class _AUNClient {
     __publicField(this, "_keystore");
     __publicField(this, "_auth");
     __publicField(this, "_transport");
-    /** 认证命名空间 */
-    __publicField(this, "auth");
-    /** AID 托管命名空间 */
-    __publicField(this, "custody");
-    /** 元数据命名空间（心跳、状态、信任根管理） */
-    __publicField(this, "meta");
     // E2EE 编排状态（内存缓存）
     __publicField(this, "_certCache", /* @__PURE__ */ new Map());
     // 后台任务 handle（浏览器 setInterval/setTimeout）
@@ -11617,7 +10383,7 @@ var _AUNClient = class _AUNClient {
     __publicField(this, "_localAgentMdEtag", "");
     /** gateway 在 RPC envelope._meta.agent_md_etag 注入的服务端 etag；纯观察，无下游依赖。 */
     __publicField(this, "_remoteAgentMdEtag", "");
-    /** 浏览器侧 AgentMDs 逻辑根目录，正文映射到 IndexedDB 里的 {aid}/agent.md。 */
+    /** 浏览器侧 AIDs 逻辑根目录，正文映射到 IndexedDB 里的 {aid}/agent.md。 */
     __publicField(this, "_agentMdPath", "");
     __publicField(this, "_agentMdCache", /* @__PURE__ */ new Map());
     __publicField(this, "_agentMdFetchInflight", /* @__PURE__ */ new Set());
@@ -11641,6 +10407,14 @@ var _AUNClient = class _AUNClient {
     __publicField(this, "_reconnectActive", false);
     __publicField(this, "_reconnectAbort", null);
     __publicField(this, "_serverKicked", false);
+    // 重连状态追踪（对齐 Python client.py）
+    __publicField(this, "_nextRetryAt", null);
+    __publicField(this, "_retryAttempt", 0);
+    __publicField(this, "_retryMaxAttempts", 0);
+    __publicField(this, "_lastError", null);
+    __publicField(this, "_lastErrorCode", null);
+    /** 对端 AID 缓存（aid string → AID 对象） */
+    __publicField(this, "_peerCache", /* @__PURE__ */ new Map());
     /**
      * 缓存最近一次服务端 gateway.disconnect 信息（含 code/reason/detail），
      * 让后续 connection.state(terminal_failed) 也能携带 detail（如配额超限信息）。
@@ -11659,16 +10433,30 @@ var _AUNClient = class _AUNClient {
      */
     __publicField(this, "_v2PullInflight", false);
     __publicField(this, "_v2PullPending", false);
-    const rawConfig = config ?? {};
+    if (typeof first === "string") {
+      throw new ValidationError("AUNClient aid must be an AID object, not a string");
+    }
+    if (typeof second === "boolean") {
+      throw new ValidationError("AUNClient debug must be passed as options.debug");
+    }
+    const inputAid = first instanceof AID ? first : null;
+    if (!inputAid && second !== void 0) {
+      throw new ValidationError("AUNClient options-only construction accepts a single options object");
+    }
+    const options = inputAid ? second ?? {} : first ?? {};
+    assertClientOptions(options, "AUNClient options");
+    const rawConfig = clientOptionsConfig(options);
+    if (inputAid) rawConfig.aun_path = inputAid.aunPath;
+    const _debug = !!options?.debug;
     this.configModel = createConfig(rawConfig);
-    const initAid = String(rawConfig.aid ?? "").trim() || null;
+    const initAid = inputAid ? inputAid.aid : null;
     this.config = {
       aun_path: this.configModel.aunPath,
       root_ca_path: this.configModel.rootCaPem,
       seed_password: this.configModel.seedPassword
     };
     this._agentMdPath = this._agentMdDefaultRoot();
-    this._deviceId = getDeviceId();
+    this._deviceId = inputAid?.deviceId || getDeviceId();
     this._logger = new AUNLogger({ debug: _debug, aunPath: this.configModel.aunPath });
     this._logger.bindDeviceId(this._deviceId);
     this._clientLog = this._logger.for("aun_core.client");
@@ -11681,7 +10469,7 @@ var _AUNClient = class _AUNClient {
     this._dispatcher = new EventDispatcher();
     this._discovery = new GatewayDiscovery();
     this._keystore = new IndexedDBKeyStore({ encryptionSeed: this.configModel.seedPassword ?? void 0 });
-    this._slotId = "";
+    this._slotId = inputAid?.slotId || "default";
     this._connectDeliveryMode = normalizeDeliveryModeConfig({ mode: "fanout" });
     this._defaultConnectDeliveryMode = { ...this._connectDeliveryMode };
     this._auth = new AuthFlow({
@@ -11704,27 +10492,29 @@ var _AUNClient = class _AUNClient {
         this._clientLog.debug(`agent.md meta observer skipped: ${String(exc)}`);
       });
     });
-    this.auth = new AuthNamespace(this);
-    this.custody = new CustodyNamespace(this);
-    this.meta = new MetaNamespace(this);
+    if (inputAid) {
+      if (!inputAid.isPrivateKeyValid()) throw new StateError("AUNClient requires an AID with a valid private key");
+      this._currentAid = inputAid;
+      this._identity = {
+        aid: inputAid.aid,
+        private_key_pem: inputAid._privateKeyPem ?? "",
+        public_key_der_b64: inputAid.publicKey,
+        cert: inputAid.certPem
+      };
+      this._state = "disconnected";
+    }
+    if (options?.protected_headers !== void 0) {
+      this.setProtectedHeaders(options.protected_headers);
+    }
     this._auth.setLogger(this._logAuth);
     this._transport.setLogger(this._logTransport);
     this._dispatcher.setLogger(this._logEvents);
     if (typeof this._discovery.setLogger === "function") {
       this._discovery.setLogger(this._logger.for("aun_core.discovery"));
     }
-    if (typeof this.auth.setLogger === "function") {
-      this.auth.setLogger(this._logger.for("aun_core.namespace.auth"));
-    }
-    if (typeof this.custody.setLogger === "function") {
-      this.custody.setLogger(this._logger.for("aun_core.namespace.custody"));
-    }
     if (typeof this._keystore.setLogger === "function") {
       this._keystore.setLogger(this._logKeystore);
     }
-    if (typeof this.meta.setLogger === "function") {
-      this.meta.setLogger(this._logger.for("aun_core.namespace.meta"));
-    }
     this._dispatcher.subscribe("_raw.message.received", (data) => {
       this._onRawMessageReceived(data);
     });
@@ -11768,17 +10558,169 @@ var _AUNClient = class _AUNClient {
   get aid() {
     return this._aid;
   }
-  setAgentMdPath(root) {
+  _setAgentMdRoot(root) {
     const next = String(root ?? "").trim() || this._agentMdDefaultRoot();
     this._agentMdPath = next;
     this._agentMdCache.clear();
     return next;
   }
-  setAgentMDPath(root) {
-    return this.setAgentMdPath(root);
+  async _resolveAgentMdUrl(aid) {
+    const target = String(aid ?? "").trim();
+    if (!target) throw new ValidationError("agent.md requires non-empty aid");
+    let gatewayUrl = String(this._gatewayUrl ?? "").trim();
+    if (!gatewayUrl) {
+      try {
+        gatewayUrl = await this._resolveGatewayForAid(target);
+      } catch {
+        gatewayUrl = "";
+      }
+    }
+    const authority = agentMdAuthority(target, this.configModel.discoveryPort);
+    return `${agentMdHttpScheme(gatewayUrl)}://${authority}/agent.md`;
+  }
+  async _ensureAgentMdUploadToken(aid, gatewayUrl) {
+    let identity = await this._auth.loadIdentityOrNone(aid);
+    if (!identity && this._identity && String(this._identity.aid ?? "") === aid) {
+      identity = this._identity;
+    }
+    if (!identity) {
+      throw new StateError("no local identity found, register or load an AID first");
+    }
+    const cachedToken = String(identity.access_token ?? "");
+    const expiresAt = this._auth.getAccessTokenExpiry(identity);
+    if (cachedToken && (expiresAt === null || expiresAt > Date.now() / 1e3 + 30)) {
+      return cachedToken;
+    }
+    if (identity.refresh_token) {
+      try {
+        const refreshed = await this._auth.refreshCachedTokens(gatewayUrl, identity);
+        const refreshedToken = String(refreshed.access_token ?? "");
+        const refreshedExpiry = this._auth.getAccessTokenExpiry(refreshed);
+        if (refreshedToken && (refreshedExpiry === null || refreshedExpiry > Date.now() / 1e3 + 30)) {
+          this._identity = refreshed;
+          return refreshedToken;
+        }
+      } catch {
+      }
+    }
+    const result = await this._auth.authenticate(gatewayUrl, aid);
+    const token = String(result.access_token ?? "");
+    if (!token) throw new StateError("authenticate did not return access_token");
+    const fallbackIdentity = {
+      ...identity,
+      access_token: token,
+      refresh_token: String(result.refresh_token ?? identity.refresh_token ?? "")
+    };
+    const fallbackExpiresAt = Number(result.expires_at ?? identity.expires_at ?? NaN);
+    if (Number.isFinite(fallbackExpiresAt)) fallbackIdentity.expires_at = fallbackExpiresAt;
+    this._identity = await this._auth.loadIdentityOrNone(aid) ?? fallbackIdentity;
+    return token;
+  }
+  async _uploadAgentMd(content) {
+    const target = String(this._aid ?? this._currentAid?.aid ?? "").trim();
+    if (!target) throw new StateError("uploadAgentMd requires local AID");
+    const gatewayUrl = await this._resolveGatewayForAid(target);
+    this._gatewayUrl = gatewayUrl;
+    const token = await this._ensureAgentMdUploadToken(target, gatewayUrl);
+    const response = await fetchWithTimeout(await this._resolveAgentMdUrl(target), {
+      method: "PUT",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "text/markdown; charset=utf-8"
+      },
+      body: content
+    });
+    if (response.status === 404) {
+      throw new NotFoundError(`agent.md endpoint not found for aid: ${target}`);
+    }
+    if (!response.ok) {
+      const message = (await response.text()).trim();
+      throw new AUNError(`upload agent.md failed: HTTP ${response.status}${message ? ` - ${message}` : ""}`);
+    }
+    const payload = await response.json();
+    if (!isJsonObject(payload)) throw new AUNError("upload agent.md returned invalid JSON payload");
+    return payload;
+  }
+  async _downloadAgentMd(aid) {
+    const target = String(aid ?? "").trim();
+    if (!target) throw new ValidationError("downloadAgentMd requires non-empty aid");
+    const cached = this._agentMdCache.get(target);
+    const url = await this._resolveAgentMdUrl(target);
+    const response = await fetchWithTimeout(url, {
+      method: "GET",
+      headers: { Accept: "text/markdown" },
+      redirect: "follow"
+    });
+    if (response.status === 304 && typeof cached?.text === "string") {
+      return String(cached.text);
+    }
+    if (response.status === 404) {
+      throw new NotFoundError(`agent.md not found for aid: ${target}`);
+    }
+    if (!response.ok) {
+      const message = (await response.text()).trim();
+      throw new AUNError(`download agent.md failed: HTTP ${response.status}${message ? ` - ${message}` : ""}`);
+    }
+    const text = await response.text();
+    const etag = String(response.headers?.get("ETag") ?? response.headers?.get("etag") ?? "").trim();
+    const lastModified = String(response.headers?.get("Last-Modified") ?? response.headers?.get("last-modified") ?? "").trim();
+    this._agentMdCache.set(target, {
+      ...cached ?? {},
+      text,
+      etag,
+      lastModified,
+      remote_etag: etag,
+      last_modified: lastModified
+    });
+    return text;
+  }
+  async _headAgentMd(aid) {
+    const target = String(aid ?? "").trim();
+    if (!target) throw new ValidationError("headAgentMd requires non-empty aid");
+    const response = await fetchWithTimeout(await this._resolveAgentMdUrl(target), {
+      method: "HEAD",
+      headers: { Accept: "text/markdown" }
+    });
+    const etag = String(response.headers?.get("ETag") ?? response.headers?.get("etag") ?? "").trim();
+    const lastModified = String(response.headers?.get("Last-Modified") ?? response.headers?.get("last-modified") ?? "").trim();
+    if (response.status === 404) {
+      return { aid: target, found: false, etag: "", last_modified: "", status: 404 };
+    }
+    if (!response.ok) {
+      throw new AUNError(`head agent.md failed: HTTP ${response.status}`);
+    }
+    const cached = this._agentMdCache.get(target) ?? {};
+    this._agentMdCache.set(target, {
+      ...cached,
+      etag,
+      lastModified,
+      remote_etag: etag,
+      last_modified: lastModified
+    });
+    return { aid: target, found: true, etag, last_modified: lastModified, status: response.status };
   }
-  SetAgentMDPath(root) {
-    return this.setAgentMdPath(root);
+  async _verifyAgentMd(content, aid) {
+    const target = String(aid ?? "").trim();
+    if (!target) throw new ValidationError("verifyAgentMd requires non-empty aid");
+    let peer = target === this._currentAid?.aid ? this._currentAid : null;
+    if (!peer) {
+      let certPem = String(await this._keystore.loadCert(target) ?? "").trim();
+      if (!certPem) {
+        certPem = String(await this._fetchPeerCert(target) ?? "").trim();
+      }
+      if (!certPem) throw new NotFoundError(`certificate not found for aid: ${target}`);
+      peer = await AID.create({
+        aid: target,
+        aunPath: this.configModel.aunPath,
+        certPem,
+        privateKeyPem: null,
+        certValid: true,
+        privateKeyValid: false
+      });
+    }
+    const result = await peer.verifyAgentMd(content);
+    if (!result.ok) throw new AUNError(result.error.message);
+    return { ...result.data, verified: result.data.status === "verified" };
   }
   /**
    * 浏览器版本 publishAgentMd。默认从 {agentMdPath}/{self_aid}/agent.md 的等价 IndexedDB 正文读取，
@@ -11806,8 +10748,12 @@ var _AUNClient = class _AUNClient {
     if (localContent === null || localContent.length === 0) {
       throw new ValidationError("publishAgentMd requires local agent.md content");
     }
-    const signed = await this.auth.signAgentMd(localContent);
-    const result = await this.auth.uploadAgentMd(signed);
+    const signedResult = await this._currentAid?.signAgentMd(localContent);
+    if (!signedResult?.ok) {
+      throw new StateError(signedResult?.error.message ?? "publishAgentMd requires a valid local AID private key");
+    }
+    const signed = signedResult.data.signed;
+    const result = await this._uploadAgentMd(signed);
     this._localAgentMdEtag = await this._agentMdContentEtag(signed);
     const remoteEtag = isJsonObject(result) ? String(result.etag ?? "").trim() : "";
     if (remoteEtag) this._remoteAgentMdEtag = remoteEtag;
@@ -11826,13 +10772,13 @@ var _AUNClient = class _AUNClient {
    * 浏览器版本 fetchAgentMd。aid 缺省时取自身；下载后的正文固定写入
    * {agentMdPath}/{aid}/agent.md 的等价 IndexedDB 正文，agentmd.json 只保存元数据。
    */
-  async fetchAgentMd(aid) {
+  async _fetchAgentMdCache(aid) {
     const target = String(aid ?? this._aid ?? "").trim();
     if (!target) {
       throw new ValidationError("fetchAgentMd requires aid (or local AID)");
     }
-    const content = await this.auth.downloadAgentMd(target);
-    const signature = await this.auth.verifyAgentMd(content, { aid: target });
+    const content = await this._downloadAgentMd(target);
+    const signature = await this._verifyAgentMd(content, target);
     const isSelf = target === (this._aid ?? "");
     const localEtag = await this._agentMdContentEtag(content);
     const cacheMeta = this._agentMdAuthCacheMeta(target);
@@ -11880,7 +10826,7 @@ var _AUNClient = class _AUNClient {
     return String(this._aid ?? "").trim();
   }
   _agentMdDefaultRoot() {
-    return this._joinAgentMdPath(this.configModel.aunPath || ".", "AgentMDs");
+    return this._joinAgentMdPath(this.configModel.aunPath || ".", "AIDs");
   }
   _joinAgentMdPath(base, name) {
     const left = String(base ?? "").trim().replace(/[\\/]+$/g, "");
@@ -11982,8 +10928,7 @@ var _AUNClient = class _AUNClient {
   }
   _agentMdAuthCacheMeta(aid) {
     try {
-      const store = this.auth._agentMdCache;
-      const record = store?.get(String(aid ?? "").trim());
+      const record = this._agentMdCache.get(String(aid ?? "").trim());
       return record && typeof record === "object" ? { ...record } : {};
     } catch {
       return {};
@@ -12085,7 +11030,7 @@ var _AUNClient = class _AUNClient {
     if (this._agentMdFetchInflight.has(target)) return;
     this._agentMdFetchInflight.add(target);
     try {
-      await this.fetchAgentMd(target);
+      await this._fetchAgentMdCache(target);
     } catch (err) {
       await this._saveAgentMdRecord(target, {
         last_error: err instanceof Error ? err.message : String(err),
@@ -12140,7 +11085,7 @@ var _AUNClient = class _AUNClient {
       "envelope"
     );
   }
-  async checkAgentMd(aid, maxUnsyncedDays = 0) {
+  async _checkAgentMdCache(aid, maxUnsyncedDays = 0) {
     const target = String(aid ?? this._aid ?? "").trim();
     if (!target) throw new ValidationError("checkAgentMd requires aid (or local AID)");
     const before = await this._loadAgentMdRecord(target) ?? {};
@@ -12168,7 +11113,7 @@ var _AUNClient = class _AUNClient {
     const now = Date.now();
     let remote;
     try {
-      remote = await this.auth.headAgentMd(target);
+      remote = await this._headAgentMd(target);
     } catch (err) {
       await this._saveAgentMdRecord(target, { checked_at: now, remote_status: "error", last_error: err instanceof Error ? err.message : String(err) });
       throw err;
@@ -12222,7 +11167,118 @@ var _AUNClient = class _AUNClient {
     }
   }
   get state() {
-    return this._state;
+    return this._publicState(this._state);
+  }
+  _publicState(state) {
+    return STATE_TO_PUBLIC[state] ?? state;
+  }
+  get currentAid() {
+    return this._currentAid;
+  }
+  get hasIdentity() {
+    return this._currentAid !== null && this.state !== "closed" /* CLOSED */;
+  }
+  get canSign() {
+    return this.hasIdentity && !!this._currentAid?.isPrivateKeyValid();
+  }
+  get canConnect() {
+    return this.hasIdentity && this.state !== "closed" /* CLOSED */;
+  }
+  get canSend() {
+    return this.state === "ready" /* READY */;
+  }
+  get isReady() {
+    return this.canSend;
+  }
+  get isOnline() {
+    return this.state === "ready" /* READY */ || this.state === "reconnecting" /* RECONNECTING */ || this.state === "retry_backoff" /* RETRY_BACKOFF */;
+  }
+  get isClosed() {
+    return this.state === "closed" /* CLOSED */;
+  }
+  get aunPath() {
+    return this.hasIdentity ? this._currentAid?.aunPath ?? this.configModel.aunPath : null;
+  }
+  /** 下次重连时间（仅在 retry_backoff 状态时非 null，对齐 Python next_retry_at） */
+  get nextRetryAt() {
+    return this.state === "retry_backoff" /* RETRY_BACKOFF */ ? this._nextRetryAt : null;
+  }
+  /** 距下次重连的剩余秒数（仅在 retry_backoff 状态时非 null，对齐 Python next_retry_in_seconds） */
+  get nextRetryInSeconds() {
+    const t = this.nextRetryAt;
+    if (t === null) return null;
+    return Math.max(0, (t.getTime() - Date.now()) / 1e3);
+  }
+  /** 当前重连尝试次数（对齐 Python retry_attempt） */
+  get retryAttempt() {
+    return this._retryAttempt;
+  }
+  /** 最大重连次数（0 = 无限，对齐 Python retry_max_attempts） */
+  get retryMaxAttempts() {
+    return this._retryMaxAttempts;
+  }
+  /** 最近一次错误（对齐 Python last_error） */
+  get lastError() {
+    return this._lastError;
+  }
+  /** 最近一次错误码（对齐 Python last_error_code） */
+  get lastErrorCode() {
+    return this._lastErrorCode;
+  }
+  loadIdentity(aid) {
+    if (!aid?.isPrivateKeyValid()) throw new StateError("loadIdentity requires an AID with a valid private key");
+    const publicState = this.state;
+    if (publicState !== "no_identity" /* NO_IDENTITY */ && publicState !== "closed" /* CLOSED */) {
+      throw new StateError(`loadIdentity not allowed in state ${publicState}`);
+    }
+    this._currentAid = aid;
+    this._aid = aid.aid;
+    this._identity = {
+      aid: aid.aid,
+      private_key_pem: aid._privateKeyPem ?? "",
+      public_key_der_b64: aid.publicKey,
+      cert: aid.certPem
+    };
+    this._auth._aid = aid.aid;
+    this._state = "disconnected";
+    this._closing = false;
+  }
+  setProtectedHeaders(headers) {
+    if (!headers) {
+      this._instanceProtectedHeaders = null;
+      return;
+    }
+    const cleaned = {};
+    for (const [key, value] of Object.entries(headers)) {
+      if (key === "_auth") continue;
+      cleaned[String(key)] = String(value);
+    }
+    this._instanceProtectedHeaders = Object.keys(cleaned).length ? cleaned : null;
+  }
+  getProtectedHeaders() {
+    return this._instanceProtectedHeaders ? { ...this._instanceProtectedHeaders } : null;
+  }
+  cachePeer(aid) {
+    if (!this.hasIdentity) throw new StateError("cachePeer requires a loaded identity");
+    if (!aid.isCertValid()) throw new ValidationError("cachePeer requires an AID with a valid certificate");
+    this._peerCache.set(aid.aid, aid);
+    return aid;
+  }
+  getPeer(aid) {
+    if (!this.hasIdentity) throw new StateError("getPeer requires a loaded identity");
+    return this._peerCache.get(String(aid ?? "").trim()) ?? null;
+  }
+  async lookupPeer(aid) {
+    if (!this.hasIdentity) throw new StateError("lookupPeer requires a loaded identity");
+    const target = String(aid ?? "").trim();
+    if (!target) throw new ValidationError("lookupPeer requires non-empty aid");
+    const cached = this._peerCache.get(target);
+    if (cached) return cached;
+    throw new NotFoundError(`peer not found in cache: ${target}`);
+  }
+  peers() {
+    if (!this.hasIdentity) throw new StateError("peers requires a loaded identity");
+    return [...this._peerCache.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([, v]) => v);
   }
   get gatewayUrl() {
     return this._gatewayUrl;
@@ -12237,35 +11293,64 @@ var _AUNClient = class _AUNClient {
   get gatewayHealth() {
     return this._discovery.lastHealthy;
   }
-  /** 主动检查 gateway 可用性（GET /health） */
-  async checkGatewayHealth(gatewayUrl, timeout = 5e3) {
+  // ── 生命周期 ──────────────────────────────────────
+  /** 仅认证当前身份，获取/刷新 token，但不建立长连接。 */
+  async authenticate(options = {}) {
     const tStart = Date.now();
-    this._clientLog.debug(`checkGatewayHealth enter: gateway=${gatewayUrl} timeout=${timeout}`);
+    const target = this._currentAid?.aid ?? this._aid ?? "";
+    if (!target || !this._currentAid?.isPrivateKeyValid()) {
+      throw new StateError("authenticate requires a loaded AID with a valid private key");
+    }
+    const publicState = this.state;
+    if (publicState !== "standby" /* STANDBY */ && publicState !== "authenticated" /* AUTHENTICATED */) {
+      throw new StateError(`authenticate not allowed in state ${publicState}`);
+    }
+    if ("aid" in options || "access_token" in options || "token" in options || "kite_token" in options) {
+      throw new ValidationError("authenticate options must not include aid or token fields; load an AID object first");
+    }
+    this._state = "connecting";
     try {
-      const result = await this._discovery.checkHealth(gatewayUrl, timeout);
-      this._clientLog.debug(`checkGatewayHealth exit: elapsed=${Date.now() - tStart}ms healthy=${result}`);
+      const gateway = String(options.gateway ?? this._gatewayUrl ?? await this._resolveGatewayForAid(target)).trim();
+      const result = await this._auth.authenticate(gateway, target);
+      this._gatewayUrl = String(result.gateway ?? gateway);
+      this._identity = await this._auth.loadIdentityOrNone(target);
+      this._state = "authenticated";
+      this._clientLog.debug(`authenticate exit: elapsed=${Date.now() - tStart}ms aid=${target}`);
       return result;
     } catch (err) {
-      this._clientLog.debug(`checkGatewayHealth exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
+      this._state = "disconnected";
+      this._clientLog.debug(`authenticate exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
       throw err;
     }
   }
-  // ── 生命周期 ──────────────────────────────────────
-  /**
-   * 连接到 Gateway。
-   *
-   * @param auth - 认证参数，必须包含 access_token 和 gateway
-   * @param options - 可选的会话选项（auto_reconnect, heartbeat_interval 等）
-   */
-  async connect(auth, options) {
+  /** 连接到 Gateway；身份来自构造函数或 loadIdentity(aid)，认证由 SDK 内部自动完成。 */
+  async connect(options = {}) {
     const tStart = Date.now();
     this._clientLog.debug(`connect enter: state=${this._state} aid=${this._aid ?? "-"}`);
-    if (this._state !== "idle" && this._state !== "closed" && this._state !== "disconnected") {
+    if (arguments.length > 1) {
+      throw new ValidationError("connect accepts a single options object");
+    }
+    if ("aid" in options || "access_token" in options || "token" in options || "kite_token" in options) {
+      throw new ValidationError("connect options must not include aid or token fields; load an AID object first");
+    }
+    const target = this._currentAid?.aid ?? this._aid ?? "";
+    if (!target || !this._currentAid?.isPrivateKeyValid()) {
+      throw new StateError("connect requires a loaded AID with a valid private key");
+    }
+    const publicState = this.state;
+    const allowed = /* @__PURE__ */ new Set([
+      "standby" /* STANDBY */,
+      "authenticated" /* AUTHENTICATED */,
+      "retry_backoff" /* RETRY_BACKOFF */,
+      "connection_failed" /* CONNECTION_FAILED */
+    ]);
+    if (!allowed.has(publicState)) {
       this._clientLog.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=invalid_state state=${this._state}`);
-      throw new StateError(`connect not allowed in state ${this._state}`);
+      throw new StateError(`connect not allowed in state ${publicState}`);
     }
     this._state = "connecting";
-    const params = { ...auth, ...options };
+    const gateway = String(options.gateway ?? this._gatewayUrl ?? await this._resolveGatewayForAid(target)).trim();
+    const params = { ...options, gateway };
     const normalized = this._normalizeConnectParams(params);
     this._sessionParams = normalized;
     this._sessionOptions = this._buildSessionOptions(normalized);
@@ -12276,7 +11361,7 @@ var _AUNClient = class _AUNClient {
     for (const gw of gateways) {
       try {
         const gwParams = { ...normalized, gateway: gw };
-        await this._connectOnce(gwParams, false);
+        await this._connectOnce(gwParams, true);
         this._clientLog.debug(`connect exit: elapsed=${Date.now() - tStart}ms state=${this._state}`);
         return;
       } catch (err) {
@@ -12290,7 +11375,7 @@ var _AUNClient = class _AUNClient {
       }
     }
     if (this._state === "connecting" || this._state === "authenticating") {
-      this._state = "disconnected";
+      this._state = "terminal_failed";
     }
     this._clientLog.debug(`connect exit (error): elapsed=${Date.now() - tStart}ms err=${lastErr instanceof Error ? lastErr.message : String(lastErr)}`);
     throw lastErr;
@@ -12312,52 +11397,9 @@ var _AUNClient = class _AUNClient {
     }
     await this._transport.close();
     this._state = "disconnected";
-    await this._dispatcher.publish("connection.state", { state: this._state });
+    await this._dispatcher.publish("connection.state", { state: this._publicState(this._state) });
     this._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms`);
   }
-  /** 列出本地所有已存储的身份摘要（仅返回有有效私钥的 AID） */
-  async listIdentities() {
-    const tStart = Date.now();
-    this._clientLog.debug("listIdentities enter");
-    try {
-      const listFn = this._keystore.listIdentities;
-      if (typeof listFn !== "function") {
-        this._clientLog.debug(`listIdentities exit: elapsed=${Date.now() - tStart}ms count=0 reason=keystore_no_list`);
-        return [];
-      }
-      const aids = await listFn.call(this._keystore);
-      const summaries = [];
-      for (const aid of [...aids].sort()) {
-        const identity = await this._keystore.loadIdentity(aid);
-        if (!identity || !identity.private_key_pem) continue;
-        const summary = { aid };
-        const loadMeta = this._keystore.loadMetadata;
-        if (typeof loadMeta === "function") {
-          const md = await loadMeta.call(this._keystore, aid);
-          if (md && Object.keys(md).length > 0) {
-            summary.metadata = md;
-          }
-        }
-        if (!summary.metadata) {
-          const metadata = {};
-          for (const [key, value] of Object.entries(identity)) {
-            if (!["aid", "private_key_pem", "public_key_der_b64", "curve", "cert"].includes(key)) {
-              metadata[key] = value;
-            }
-          }
-          if (Object.keys(metadata).length > 0) {
-            summary.metadata = metadata;
-          }
-        }
-        summaries.push(summary);
-      }
-      this._clientLog.debug(`listIdentities exit: elapsed=${Date.now() - tStart}ms count=${summaries.length}`);
-      return summaries;
-    } catch (err) {
-      this._clientLog.debug(`listIdentities exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-      throw err;
-    }
-  }
   /** 关闭连接 */
   async close() {
     const tStart = Date.now();
@@ -12382,7 +11424,7 @@ var _AUNClient = class _AUNClient {
     }
     await this._transport.close();
     this._state = "closed";
-    await this._dispatcher.publish("connection.state", { state: this._state });
+    await this._dispatcher.publish("connection.state", { state: this._publicState(this._state) });
     this._resetSeqTrackingState();
     this._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms`);
   }
@@ -12416,6 +11458,10 @@ var _AUNClient = class _AUNClient {
       throw new PermissionError(`legacy E2EE method is removed in this SDK: ${method}`);
     }
     const p = { ...params ?? {} };
+    if (this._instanceProtectedHeaders && PROTECTED_HEADERS_METHODS.has(method)) {
+      const existing = isJsonObject(p.protected_headers) ? p.protected_headers : {};
+      p.protected_headers = { ...this._instanceProtectedHeaders, ...existing };
+    }
     if (method === "message.send" || method === "group.send") {
       this._normalizeOutboundMessagePayload(p, method);
     }
@@ -12443,7 +11489,7 @@ var _AUNClient = class _AUNClient {
           throw new StateError("V2 session not initialized; encrypted message.send requires V2 (V1 E2EE removed)");
         }
         this._clientLog.debug("call route: message.send \u2192 V2 encrypted send");
-        return await this.sendV2(String(p.to ?? ""), p.payload ?? {}, {
+        return await this._sendV2(String(p.to ?? ""), p.payload ?? {}, {
           messageId: String(p.message_id ?? "") || void 0,
           timestamp: p.timestamp,
           protectedHeaders: this._protectedHeadersFromParams(p),
@@ -12460,7 +11506,7 @@ var _AUNClient = class _AUNClient {
           throw new StateError("V2 session not initialized; encrypted group.send requires V2 (V1 E2EE removed)");
         }
         this._clientLog.debug("call route: group.send \u2192 V2 encrypted send");
-        return await this.sendGroupV2(String(p.group_id ?? ""), p.payload ?? {}, {
+        return await this._sendGroupV2(String(p.group_id ?? ""), p.payload ?? {}, {
           messageId: String(p.message_id ?? "") || void 0,
           timestamp: p.timestamp,
           protectedHeaders: this._protectedHeadersFromParams(p),
@@ -12506,16 +11552,16 @@ var _AUNClient = class _AUNClient {
   async _callImplInner(method, p) {
     if (method === "message.pull" && this._v2Session) {
       this._clientLog.debug("call route: message.pull \u2192 V2 pull");
-      const messages = await this.pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50);
+      const messages = await this._pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
       return { messages };
     }
     if (method === "message.ack" && this._v2Session) {
       this._clientLog.debug("call route: message.ack \u2192 V2 ack");
-      return await this.ackV2(Number(p.seq ?? p.up_to_seq ?? 0) || void 0);
+      return await this._ackV2(Number(p.seq ?? p.up_to_seq ?? 0) || void 0);
     }
     if (method === "group.pull" && this._v2Session && p.group_id) {
       this._clientLog.debug("call route: group.pull \u2192 V2 pull");
-      const messages = await this.pullGroupV2(
+      const messages = await this._pullGroupV2(
         String(p.group_id),
         Number(p.after_seq ?? p.after_message_seq ?? 0) || 0,
         Number(p.limit ?? 50) || 50
@@ -12524,7 +11570,7 @@ var _AUNClient = class _AUNClient {
     }
     if (method === "group.ack_messages" && this._v2Session && p.group_id) {
       this._clientLog.debug("call route: group.ack_messages \u2192 V2 ack");
-      return await this.ackGroupV2(
+      return await this._ackGroupV2(
         String(p.group_id),
         Number(p.seq ?? p.msg_seq ?? p.up_to_seq ?? 0) || void 0
       );
@@ -12619,15 +11665,28 @@ var _AUNClient = class _AUNClient {
     }
     return result;
   }
-  // ── 便利方法 ──────────────────────────────────────
-  async ping(params) {
-    return this.meta.ping(params);
-  }
-  async status(params) {
-    return this.meta.status(params);
-  }
-  async trustRoots(params) {
-    return this.meta.trustRoots(params);
+  async _callRawV2Rpc(method, params) {
+    const p = { ...params ?? {} };
+    delete p._pull_gate_locked;
+    delete p._skip_auto_ack;
+    delete p.skip_auto_ack;
+    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.device_id === void 0) {
+      p.device_id = this._deviceId;
+    }
+    if (method.startsWith("group.") && p.slot_id === void 0) {
+      p.slot_id = this._slotId;
+    }
+    if (SIGNED_METHODS.has(method)) {
+      if (this._shouldSkipClientSignature(method, p)) {
+        delete p.client_signature;
+      } else {
+        await this._signClientOperation(method, p);
+      }
+    }
+    return await this._transport.call(method, p);
   }
   // ── 事件 ──────────────────────────────────────────
   /**
@@ -12662,10 +11721,15 @@ var _AUNClient = class _AUNClient {
         return;
       }
       const seq = msg.seq;
+      const encryptedPush = isEncryptedPushMessage(msg);
       if (seq !== void 0 && seq !== null && this._aid) {
         const ns = `p2p:${this._aid}`;
         if (seq > 0) this._seqTracker.updateMaxSeen(ns, seq);
-        const needPull = this._seqTracker.onMessageSeq(ns, seq);
+        const contigBefore = this._seqTracker.getContiguousSeq(ns);
+        const seqNeedsPull = this._seqTracker.onMessageSeq(ns, seq);
+        const published = encryptedPush ? await this._publishEncryptedPushMessage("message.received", "message.undecryptable", ns, seq, msg, false) : await this._publishOrderedMessage("message.received", ns, seq, msg);
+        const contigAfter = this._seqTracker.getContiguousSeq(ns);
+        const needPull = seqNeedsPull && !published;
         if (needPull) {
           this._safeAsync(this._fillP2pGap());
         }
@@ -12681,12 +11745,13 @@ var _AUNClient = class _AUNClient {
             this._clientLog.warn(`P2P auto-ack failed:${String(e)}`);
           });
         }
-        this._saveSeqTrackerState();
-      }
-      if (seq !== void 0 && seq !== null && this._aid) {
-        const ns = `p2p:${this._aid}`;
-        await this._publishOrderedMessage("message.received", ns, seq, msg);
+        if (contigAfter !== contigBefore) this._saveSeqTrackerState();
+        if (encryptedPush) return;
       } else {
+        if (encryptedPush) {
+          await this._publishEncryptedPushMessage("message.received", "message.undecryptable", "", seq ?? 0, msg, false);
+          return;
+        }
         await this._publishAppEvent("message.received", msg);
       }
     } catch (exc) {
@@ -12754,7 +11819,7 @@ var _AUNClient = class _AUNClient {
       this._gapFillDone.add(dedupKey);
       try {
         this._clientLog.debug(`_onRawGroupV2MessageCreated -> group.v2.pull group=${groupId} after_seq=${afterSeq}`);
-        const messages = await this.pullGroupV2(groupId, afterSeq, 50);
+        const messages = await this._pullGroupV2(groupId, afterSeq, 50);
         this._clientLog.debug(`_onRawGroupV2MessageCreated pulled ${messages.length} msgs for group=${groupId}`);
       } finally {
         this._gapFillDone.delete(dedupKey);
@@ -12788,10 +11853,15 @@ var _AUNClient = class _AUNClient {
         await this._autoPullGroupMessages(msg);
         return;
       }
+      const encryptedPush = isEncryptedPushMessage(msg);
       if (groupId && seq !== void 0 && seq !== null) {
         const ns = `group:${groupId}`;
         if (seq > 0) this._seqTracker.updateMaxSeen(ns, seq);
-        const needPull = this._seqTracker.onMessageSeq(ns, seq);
+        const contigBefore = this._seqTracker.getContiguousSeq(ns);
+        const seqNeedsPull = this._seqTracker.onMessageSeq(ns, seq);
+        const published = encryptedPush ? await this._publishEncryptedPushMessage("group.message_created", "group.message_undecryptable", ns, seq, msg, true) : await this._publishOrderedMessage("group.message_created", ns, seq, msg);
+        const contigAfter = this._seqTracker.getContiguousSeq(ns);
+        const needPull = seqNeedsPull && !published;
         if (needPull) {
           this._safeAsync(this._fillGroupGap(groupId));
         }
@@ -12808,12 +11878,13 @@ var _AUNClient = class _AUNClient {
             this._clientLog.warn("group message auto-ack failed: group=" + groupId, e);
           });
         }
-        this._saveSeqTrackerState();
-      }
-      if (groupId && seq !== void 0 && seq !== null) {
-        const nsKey = `group:${groupId}`;
-        await this._publishOrderedMessage("group.message_created", nsKey, seq, msg);
+        if (contigAfter !== contigBefore) this._saveSeqTrackerState();
+        if (encryptedPush) return;
       } else {
+        if (encryptedPush) {
+          await this._publishEncryptedPushMessage("group.message_created", "group.message_undecryptable", "", seq ?? 0, msg, true);
+          return;
+        }
         await this._publishAppEvent("group.message_created", msg);
       }
     } catch (exc) {
@@ -12833,6 +11904,52 @@ var _AUNClient = class _AUNClient {
       }
     }
   }
+  async _decryptEncryptedPushPayload(msg, group) {
+    const envelope = encryptedPushEnvelope(msg);
+    if (!isV2EncryptedEnvelopePayload(envelope)) return null;
+    const aad = isJsonObject(envelope.aad) ? envelope.aad : {};
+    const fromAid = String(msg.from_aid ?? msg.from ?? msg.sender_aid ?? aad.from ?? "").trim();
+    const plaintext = await this._decryptV2EnvelopeForThought({ envelope, fromAid });
+    if (!plaintext) return null;
+    const e2eeMeta = v2E2eeMeta(envelope);
+    const result = {
+      message_id: String(msg.message_id ?? ""),
+      from: fromAid,
+      seq: msg.seq ?? null,
+      timestamp: msg.t_server ?? msg.timestamp ?? null,
+      payload: plaintext,
+      encrypted: true,
+      e2ee: e2eeMeta
+    };
+    result.direction = fromAid && fromAid === this._aid ? "outbound_sync" : "inbound";
+    if (msg.t_server !== void 0) result.t_server = msg.t_server;
+    if (msg.device_id !== void 0) result.device_id = msg.device_id;
+    if (msg.slot_id !== void 0) result.slot_id = msg.slot_id;
+    if (group) {
+      result.group_id = msg.group_id ?? aad.group_id ?? envelope.group_id ?? null;
+    } else {
+      result.to = msg.to ?? this._aid ?? "";
+    }
+    attachV2EnvelopeMetadata(result, e2eeMeta);
+    return result;
+  }
+  async _publishEncryptedPushAsUndecryptable(event, ns, seq, msg, group) {
+    const safeEvent = safeUndecryptablePushEvent(msg, group);
+    if (ns) {
+      return this._publishOrderedMessage(event, ns, seq, safeEvent);
+    }
+    await this._publishAppEvent(event, safeEvent);
+    return true;
+  }
+  async _publishEncryptedPushMessage(normalEvent, undecryptableEvent, ns, seq, msg, group) {
+    const decrypted = await this._decryptEncryptedPushPayload(msg, group);
+    if (decrypted) {
+      if (ns) return this._publishOrderedMessage(normalEvent, ns, seq, decrypted);
+      await this._publishAppEvent(normalEvent, decrypted);
+      return true;
+    }
+    return this._publishEncryptedPushAsUndecryptable(undecryptableEvent, ns, seq, msg, group);
+  }
   /** 收到不带 payload 的 group.message_created 通知后，自动 pull 最新消息 */
   async _autoPullGroupMessages(notification) {
     const groupId = notification.group_id ?? "";
@@ -14032,7 +13149,7 @@ var _AUNClient = class _AUNClient {
       this._state = "connected";
       this._connectedAt = Date.now();
       await this._dispatcher.publish("connection.state", {
-        state: this._state,
+        state: this._publicState(this._state),
         gateway: gatewayUrl
       });
       if (this._seqTrackerContext !== this._currentSeqTrackerContext()) {
@@ -14041,7 +13158,7 @@ var _AUNClient = class _AUNClient {
       }
       this._startBackgroundTasks();
       try {
-        await this.initV2Session();
+        await this._initV2Session();
       } catch (exc) {
         this._clientLog.warn(`V2 session init failed (non-fatal): ${String(exc)}`);
       }
@@ -14051,10 +13168,52 @@ var _AUNClient = class _AUNClient {
       this._clientLog.debug(`_connectOnce exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
       throw err;
     }
-  }
-  _resolveGateway(params) {
-    const gateways = this._resolveGateways(params);
-    return gateways[0];
+  }
+  _resolveGateway(params) {
+    const gateways = this._resolveGateways(params);
+    return gateways[0];
+  }
+  async _resolveGatewayForAid(aid) {
+    const target = String(aid ?? this._aid ?? "").trim();
+    if (!target) throw new StateError("gateway discovery requires a loaded AID");
+    if (this._gatewayUrl) return this._gatewayUrl;
+    try {
+      const getMetadata = this._keystore.getMetadata;
+      const raw = typeof getMetadata === "function" ? String(await getMetadata.call(this._keystore, target, "gateway_url") ?? "").trim() : "";
+      if (raw) {
+        const gateway = raw.startsWith('"') && raw.endsWith('"') ? String(JSON.parse(raw)).trim() : raw;
+        if (gateway) {
+          this._gatewayUrl = gateway;
+          return gateway;
+        }
+      }
+    } catch {
+    }
+    const dotIdx = target.indexOf(".");
+    const issuerDomain = dotIdx >= 0 ? target.slice(dotIdx + 1) : target;
+    const portSuffix = this.configModel.discoveryPort ? `:${this.configModel.discoveryPort}` : "";
+    const candidates = [
+      `https://${target}${portSuffix}/.well-known/aun-gateway`,
+      `https://gateway.${issuerDomain}${portSuffix}/.well-known/aun-gateway`
+    ];
+    let lastError = null;
+    for (const url of candidates) {
+      try {
+        const gateway = await this._discovery.discover(url);
+        this._gatewayUrl = gateway;
+        try {
+          const setMetadata = this._keystore.setMetadata;
+          if (typeof setMetadata === "function") {
+            await setMetadata.call(this._keystore, target, "gateway_url", gateway);
+          }
+        } catch {
+        }
+        return gateway;
+      } catch (err) {
+        lastError = err;
+      }
+    }
+    throw lastError instanceof Error ? lastError : new ConnectionError(`gateway discovery failed for ${target}`);
   }
   _resolveGateways(params) {
     const topology = isJsonObject(params.topology) ? params.topology : null;
@@ -14102,10 +13261,10 @@ var _AUNClient = class _AUNClient {
   _normalizeConnectParams(params) {
     const request = { ...params };
     const accessToken = String(request.access_token ?? "");
-    if (!accessToken) throw new StateError("connect requires non-empty access_token");
     const gateway = String(request.gateway ?? this._gatewayUrl ?? "");
     if (!gateway) throw new StateError("connect requires non-empty gateway");
-    request.access_token = accessToken;
+    if (accessToken) request.access_token = accessToken;
+    else delete request.access_token;
     request.gateway = gateway;
     request.device_id = this._deviceId;
     request.slot_id = normalizeInstanceId(request.slot_id ?? this._slotId, "slot_id", { allowEmpty: true });
@@ -14301,6 +13460,10 @@ var _AUNClient = class _AUNClient {
         }
         try {
           identity = await this._auth.refreshCachedTokens(this._gatewayUrl, identity);
+          if (this._state !== "connected") {
+            scheduleRefresh();
+            return;
+          }
           this._identity = identity;
           if (this._sessionParams && identity.access_token) {
             this._sessionParams.access_token = identity.access_token;
@@ -14432,7 +13595,7 @@ var _AUNClient = class _AUNClient {
     this._state = "disconnected";
     this._stopBackgroundTasks();
     await this._dispatcher.publish("connection.state", {
-      state: this._state,
+      state: this._publicState(this._state),
       error
     });
     if (!this._sessionOptions.auto_reconnect) return;
@@ -14443,7 +13606,7 @@ var _AUNClient = class _AUNClient {
       this._clientLog.warn(`suppress auto-reconnect: ${reason}`);
       const disconnectInfo = this._lastDisconnectInfo ?? {};
       const eventPayload = {
-        state: this._state,
+        state: this._publicState(this._state),
         error,
         reason
       };
@@ -14476,32 +13639,47 @@ var _AUNClient = class _AUNClient {
       serverInitiated ? 16 : 1,
       maxBaseDelay
     );
+    this._retryAttempt = 0;
+    this._retryMaxAttempts = maxAttempts;
     for (let attempt = 1; !this._reconnectAbort?.signal.aborted; attempt++) {
       if (maxAttempts > 0 && attempt > maxAttempts) {
         this._state = "terminal_failed";
+        this._nextRetryAt = null;
         this._reconnectActive = false;
         this._reconnectAbort = null;
         await this._dispatcher.publish("connection.state", {
-          state: this._state,
+          state: this._publicState(this._state),
           attempt: attempt - 1,
           reason: "max_attempts_exhausted"
         });
         return;
       }
-      this._state = "reconnecting";
+      this._retryAttempt = attempt;
+      const sleepMs = reconnectSleepDelaySeconds(delay, maxBaseDelay) * 1e3;
+      this._nextRetryAt = new Date(Date.now() + sleepMs);
+      this._state = "retry_backoff";
       await this._dispatcher.publish("connection.state", {
-        state: this._state,
-        attempt
+        state: this._publicState(this._state),
+        attempt,
+        next_retry_at: this._nextRetryAt.getTime() / 1e3
       });
       try {
-        await this._sleep(reconnectSleepDelaySeconds(delay, maxBaseDelay) * 1e3);
+        await this._sleep(sleepMs);
+        this._nextRetryAt = null;
         if (this._reconnectAbort?.signal.aborted) {
           this._reconnectActive = false;
           return;
         }
+        this._state = "reconnecting";
+        await this._dispatcher.publish("connection.state", {
+          state: this._publicState(this._state),
+          attempt
+        });
         if (this._gatewayUrl) {
           const healthy = await this._discovery.checkHealth(this._gatewayUrl, 5e3);
           if (!healthy) {
+            this._lastError = new Error("gateway health check failed");
+            this._lastErrorCode = "gateway_unhealthy";
             delay = Math.min(delay * 2, maxBaseDelay);
             continue;
           }
@@ -14511,20 +13689,26 @@ var _AUNClient = class _AUNClient {
           throw new StateError("missing connect params for reconnect");
         }
         await this._connectOnce(this._sessionParams, true);
+        this._lastError = null;
+        this._lastErrorCode = null;
+        this._nextRetryAt = null;
         this._reconnectActive = false;
         this._reconnectAbort = null;
         return;
       } catch (exc) {
+        this._lastError = exc instanceof Error ? exc : new Error(String(exc));
+        this._lastErrorCode = "reconnect_failed";
         await this._dispatcher.publish("connection.error", {
           error: formatCaughtError(exc),
           attempt
         });
         if (!this._shouldRetryReconnect(exc)) {
           this._state = "terminal_failed";
+          this._nextRetryAt = null;
           this._reconnectActive = false;
           this._reconnectAbort = null;
           await this._dispatcher.publish("connection.state", {
-            state: this._state,
+            state: this._publicState(this._state),
             error: formatCaughtError(exc),
             attempt
           });
@@ -14861,9 +14045,27 @@ var _AUNClient = class _AUNClient {
    *
    * connect 成功后自动调用，可幂等手动调用。
    */
-  async initV2Session() {
+  async _initV2Session() {
     if (!this._aid) return;
-    const identity = this._identity;
+    let identity = this._identity;
+    if (!identity?.private_key_pem) {
+      try {
+        const reloaded = await this._keystore.loadIdentity(this._aid);
+        if (reloaded?.private_key_pem) {
+          this._identity = reloaded;
+          identity = reloaded;
+          this._clientLog.warn("V2 session init: identity cache was stale, reloaded from keystore");
+          try {
+            const persistIdentity = this._auth._persistIdentity;
+            if (typeof persistIdentity === "function") {
+              await persistIdentity.call(this._auth, reloaded);
+            }
+          } catch {
+          }
+        }
+      } catch {
+      }
+    }
     if (!identity?.private_key_pem) {
       this._clientLog.warn("V2 session init skipped: no AID private key");
       return;
@@ -15132,7 +14334,7 @@ var _AUNClient = class _AUNClient {
    * @param opts 可选 messageId / timestamp（与 Python 行为一致）
    * @returns 服务端响应
    */
-  async sendV2(to, payload, opts) {
+  async _sendV2(to, payload, opts) {
     if (!this._v2Session) {
       throw new StateError("V2 session not initialized (not connected?)");
     }
@@ -15173,20 +14375,21 @@ var _AUNClient = class _AUNClient {
    * @param afterSeq 从此 seq 之后开始拉取（0/省略 = 从当前 contiguous 开始）
    * @param limit 最多拉取条数
    */
-  async pullV2(afterSeq = 0, limit = 50) {
+  async _pullV2(afterSeq = 0, limit = 50, opts) {
     if (!this._v2Session) {
       throw new StateError("V2 session not initialized (not connected?)");
     }
     const ns = this._aid ? `p2p:${this._aid}` : "";
     const decrypted = [];
-    let nextAfterSeq = afterSeq || (ns ? this._seqTracker.getContiguousSeq(ns) : 0);
+    let nextAfterSeq = opts?.force ? afterSeq : afterSeq || (ns ? this._seqTracker.getContiguousSeq(ns) : 0);
     let pageCount = 0;
     const maxPages = 100;
     while (pageCount < maxPages) {
       pageCount += 1;
-      const result = await this.call("message.v2.pull", {
+      const result = await this._callRawV2Rpc("message.v2.pull", {
         after_seq: nextAfterSeq,
-        limit
+        limit,
+        ...opts?.force ? { force: true } : {}
       });
       const messages = Array.isArray(result?.messages) ? result.messages : [];
       const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq) => Number.isFinite(seq) && seq > 0);
@@ -15256,7 +14459,7 @@ var _AUNClient = class _AUNClient {
           this._saveSeqTrackerState();
         }
         if (messages.length > 0 && contigAdvanced && ackSeq > 0) {
-          this._safeAsync(this.ackV2(ackSeq).then(() => void 0));
+          this._safeAsync(this._ackV2(ackSeq).then(() => void 0));
         }
       }
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
@@ -15273,7 +14476,7 @@ var _AUNClient = class _AUNClient {
    *
    * @param upToSeq 确认到此 seq；省略则用当前 contiguous
    */
-  async ackV2(upToSeq) {
+  async _ackV2(upToSeq) {
     const ns = this._aid ? `p2p:${this._aid}` : "";
     let seq = upToSeq ?? (ns ? this._seqTracker.getContiguousSeq(ns) : 0);
     if (seq <= 0) return { acked: 0 };
@@ -15475,6 +14678,10 @@ var _AUNClient = class _AUNClient {
       encrypted: true,
       e2ee
     };
+    const explicitDirection = String(msg.direction ?? "").trim();
+    result.direction = explicitDirection || (fromAid && fromAid === this._aid ? "outbound_sync" : "inbound");
+    if (msg.device_id !== void 0) result.device_id = msg.device_id;
+    if (msg.slot_id !== void 0) result.slot_id = msg.slot_id;
     attachV2EnvelopeMetadata(result, e2ee);
     return result;
   }
@@ -15486,7 +14693,7 @@ var _AUNClient = class _AUNClient {
    * @param opts 可选 messageId / timestamp
    * @returns 服务端响应
    */
-  async sendGroupV2(groupId, payload, opts) {
+  async _sendGroupV2(groupId, payload, opts) {
     if (!this._v2Session) {
       throw new StateError("V2 session not initialized (not connected?)");
     }
@@ -15541,7 +14748,7 @@ var _AUNClient = class _AUNClient {
     }
   }
   async _pullGroupV2Internal(params) {
-    await this.pullGroupV2(params.group_id, params.after_seq, params.limit);
+    await this._pullGroupV2(params.group_id, params.after_seq, params.limit);
   }
   /**
    * 拉取并解密 V2 Group 消息。
@@ -15550,7 +14757,7 @@ var _AUNClient = class _AUNClient {
    * @param afterSeq 从此 seq 之后开始拉取（0/省略 = 从当前 contiguous 开始）
    * @param limit 最多拉取条数
    */
-  async pullGroupV2(groupId, afterSeq = 0, limit = 50) {
+  async _pullGroupV2(groupId, afterSeq = 0, limit = 50) {
     if (!this._v2Session) {
       throw new StateError("V2 session not initialized (not connected?)");
     }
@@ -15643,7 +14850,7 @@ var _AUNClient = class _AUNClient {
         this._saveSeqTrackerState();
       }
       if (messages.length > 0 && contigAdvanced && ackSeq > 0) {
-        this._safeAsync(this.ackGroupV2(gid, ackSeq).then(() => void 0));
+        this._safeAsync(this._ackGroupV2(gid, ackSeq).then(() => void 0));
       }
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
       if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false) break;
@@ -15660,7 +14867,7 @@ var _AUNClient = class _AUNClient {
    * @param groupId 群 ID
    * @param upToSeq 确认到此 seq；省略则用当前 contiguous
    */
-  async ackGroupV2(groupId, upToSeq) {
+  async _ackGroupV2(groupId, upToSeq) {
     const gid = normalizeGroupId(groupId) || String(groupId ?? "").trim();
     if (!gid) throw new ValidationError("group.ack_messages requires group_id");
     const ns = `group:${gid}`;
@@ -16646,7 +15853,7 @@ var _AUNClient = class _AUNClient {
     try {
       do {
         this._v2PullPending = false;
-        await this.pullV2();
+        await this._pullV2();
         const newContig = ns ? this._seqTracker.getContiguousSeq(ns) : -1;
         this._clientLog.debug(
           `_onV2PushNotification pull done: contiguous_seq=${contigBefore}->${newContig} (push_seq=${pushSeq || "null"})`
@@ -16771,6 +15978,733 @@ function _uuidV4() {
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
 
+// src/aid-store.ts
+init_crypto();
+function _derReadLength(data, offset) {
+  if (offset >= data.length) return null;
+  const first = data[offset];
+  if (first < 128) return { value: first, lenBytes: 1 };
+  const n = first & 127;
+  if (n === 0 || n > 4) return null;
+  let v = 0;
+  for (let i = 0; i < n; i++) v = v << 8 | data[offset + 1 + i];
+  return { value: v, lenBytes: 1 + n };
+}
+function _derSkipTlv(data, offset) {
+  const len = _derReadLength(data, offset + 1);
+  if (!len) return null;
+  return offset + 1 + len.lenBytes + len.value;
+}
+function parseCertValidity(certPem) {
+  try {
+    let parseTime2 = function(offset) {
+      const tag = der[offset];
+      const len = _derReadLength(der, offset + 1);
+      if (!len) return null;
+      const raw = new TextDecoder().decode(der.slice(offset + 1 + len.lenBytes, offset + 1 + len.lenBytes + len.value));
+      if (tag === 23) {
+        const y = parseInt(raw.slice(0, 2), 10);
+        const year = y >= 50 ? 1900 + y : 2e3 + y;
+        return Date.UTC(
+          year,
+          parseInt(raw.slice(2, 4), 10) - 1,
+          parseInt(raw.slice(4, 6), 10),
+          parseInt(raw.slice(6, 8), 10),
+          parseInt(raw.slice(8, 10), 10),
+          parseInt(raw.slice(10, 12), 10)
+        );
+      } else if (tag === 24) {
+        return Date.UTC(
+          parseInt(raw.slice(0, 4), 10),
+          parseInt(raw.slice(4, 6), 10) - 1,
+          parseInt(raw.slice(6, 8), 10),
+          parseInt(raw.slice(8, 10), 10),
+          parseInt(raw.slice(10, 12), 10),
+          parseInt(raw.slice(12, 14), 10)
+        );
+      }
+      return null;
+    };
+    var parseTime = parseTime2;
+    const der = new Uint8Array(pemToArrayBuffer(certPem));
+    const cert = _derSkipTlv(der, -1);
+    const certLen = _derReadLength(der, 1);
+    if (!certLen || der[0] !== 48) return null;
+    const tbsStart = 1 + certLen.lenBytes;
+    if (der[tbsStart] !== 48) return null;
+    const tbsLen = _derReadLength(der, tbsStart + 1);
+    if (!tbsLen) return null;
+    let pos = tbsStart + 1 + tbsLen.lenBytes;
+    if (der[pos] === 160) {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    if (der[pos] !== 48) return null;
+    const valLen = _derReadLength(der, pos + 1);
+    if (!valLen) return null;
+    pos = pos + 1 + valLen.lenBytes;
+    const notBefore = parseTime2(pos);
+    if (notBefore === null) return null;
+    const nbLen = _derReadLength(der, pos + 1);
+    if (!nbLen) return null;
+    const notAfterOffset = pos + 1 + nbLen.lenBytes + nbLen.value;
+    const notAfter = parseTime2(notAfterOffset);
+    if (notAfter === null) return null;
+    return { notBefore, notAfter };
+  } catch {
+    return null;
+  }
+}
+function parseCertCN(certPem) {
+  try {
+    const der = new Uint8Array(pemToArrayBuffer(certPem));
+    if (der[0] !== 48) return null;
+    const certLen = _derReadLength(der, 1);
+    if (!certLen) return null;
+    const tbsStart = 1 + certLen.lenBytes;
+    if (der[tbsStart] !== 48) return null;
+    const tbsLen = _derReadLength(der, tbsStart + 1);
+    if (!tbsLen) return null;
+    let pos = tbsStart + 1 + tbsLen.lenBytes;
+    if (der[pos] === 160) {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    if (der[pos] !== 48) return null;
+    const issuerLen = _derReadLength(der, pos + 1);
+    if (!issuerLen) return null;
+    const issuerEnd = pos + 1 + issuerLen.lenBytes + issuerLen.value;
+    pos = pos + 1 + issuerLen.lenBytes;
+    pos = issuerEnd;
+    {
+      const e = _derSkipTlv(der, pos);
+      if (e === null) return null;
+      pos = e;
+    }
+    if (der[pos] !== 48) return null;
+    const subjectLen = _derReadLength(der, pos + 1);
+    if (!subjectLen) return null;
+    const subjectEnd = pos + 1 + subjectLen.lenBytes + subjectLen.value;
+    pos = pos + 1 + subjectLen.lenBytes;
+    while (pos < subjectEnd) {
+      if (der[pos] !== 49) break;
+      const setLen = _derReadLength(der, pos + 1);
+      if (!setLen) break;
+      const setEnd = pos + 1 + setLen.lenBytes + setLen.value;
+      let rpos = pos + 1 + setLen.lenBytes;
+      while (rpos < setEnd) {
+        if (der[rpos] !== 48) break;
+        const seqLen = _derReadLength(der, rpos + 1);
+        if (!seqLen) break;
+        const seqEnd = rpos + 1 + seqLen.lenBytes + seqLen.value;
+        let apos = rpos + 1 + seqLen.lenBytes;
+        if (der[apos] !== 6) {
+          rpos = seqEnd;
+          continue;
+        }
+        const oidLen = _derReadLength(der, apos + 1);
+        if (!oidLen) {
+          rpos = seqEnd;
+          continue;
+        }
+        const oidBytes = der.slice(apos + 1 + oidLen.lenBytes, apos + 1 + oidLen.lenBytes + oidLen.value);
+        const isCN = oidBytes.length === 3 && oidBytes[0] === 85 && oidBytes[1] === 4 && oidBytes[2] === 3;
+        apos = apos + 1 + oidLen.lenBytes + oidLen.value;
+        if (isCN && apos < seqEnd) {
+          const valLen = _derReadLength(der, apos + 1);
+          if (valLen) {
+            return new TextDecoder().decode(der.slice(apos + 1 + valLen.lenBytes, apos + 1 + valLen.lenBytes + valLen.value));
+          }
+        }
+        rpos = seqEnd;
+      }
+      pos = setEnd;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function normalizeSlotId(slotId) {
+  const value = String(slotId ?? "default").trim();
+  return value || "default";
+}
+function issuerFromAid(aid) {
+  const target = String(aid ?? "").trim();
+  const dotIdx = target.indexOf(".");
+  return dotIdx >= 0 ? target.slice(dotIdx + 1) : target;
+}
+function validateRegisterAidName(aid) {
+  if (!aid) throw new ValidationError("AIDStore.register requires 'aid'");
+  const name = aid.includes(".") ? aid.split(".")[0] : aid;
+  if (!/^[a-z0-9_][a-z0-9_-]{3,63}$/.test(name)) {
+    throw new ValidationError(
+      `Invalid AID name '${name}': must be 4-64 characters, only [a-z0-9_-], cannot start with '-'`
+    );
+  }
+  if (name.startsWith("guest")) {
+    throw new ValidationError("AID name must not start with 'guest'");
+  }
+}
+function gatewayHttpUrl3(gatewayUrl, path) {
+  const parsed = new URL(gatewayUrl);
+  parsed.protocol = parsed.protocol === "wss:" ? "https:" : "http:";
+  parsed.pathname = path;
+  parsed.search = "";
+  parsed.hash = "";
+  return parsed.toString();
+}
+function pkiCertUrl(gatewayUrl, aid) {
+  return gatewayHttpUrl3(gatewayUrl, `/pki/cert/${encodeURIComponent(aid)}`);
+}
+function agentMdUrl(aid, gatewayUrl, discoveryPort) {
+  const scheme = String(gatewayUrl ?? "").trim().toLowerCase().startsWith("ws://") ? "http" : "https";
+  let host = String(aid ?? "").trim();
+  if (discoveryPort && !host.includes(":")) host = `${host}:${discoveryPort}`;
+  return `${scheme}://${host}/agent.md`;
+}
+async function fetchWithTimeout2(input, init = {}, timeoutMs = 3e4) {
+  const controller = new AbortController();
+  const timer = globalThis.setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(input, { ...init, signal: controller.signal });
+  } finally {
+    globalThis.clearTimeout(timer);
+  }
+}
+function resultError(result) {
+  return result.ok ? null : result.error;
+}
+var AIDStore = class {
+  constructor(opts) {
+    __publicField(this, "aunPath");
+    __publicField(this, "deviceId");
+    __publicField(this, "slotId");
+    __publicField(this, "_encryptionSeed");
+    __publicField(this, "_keystore");
+    __publicField(this, "_auth");
+    __publicField(this, "_crypto");
+    __publicField(this, "_discovery");
+    __publicField(this, "_verifySsl");
+    __publicField(this, "_discoveryPort");
+    __publicField(this, "_gatewayCache", /* @__PURE__ */ new Map());
+    __publicField(this, "_agentMdCache", /* @__PURE__ */ new Map());
+    this.aunPath = String(opts.aunPath ?? "");
+    this._encryptionSeed = String(opts.encryptionSeed ?? "");
+    this.deviceId = opts.deviceId ? normalizeInstanceId(opts.deviceId, "deviceId", { allowEmpty: true }) : getDeviceId();
+    this.slotId = normalizeSlotId(opts.slotId);
+    this._verifySsl = opts.verifySsl ?? true;
+    this._discoveryPort = opts.discoveryPort ?? null;
+    this._keystore = new IndexedDBKeyStore({ encryptionSeed: this._encryptionSeed || void 0 });
+    this._crypto = new CryptoProvider();
+    this._discovery = new GatewayDiscovery();
+    this._auth = new AuthFlow({
+      keystore: this._keystore,
+      crypto: this._crypto,
+      deviceId: this.deviceId,
+      slotId: this.slotId,
+      rootCaPem: opts.rootCaPem ?? null,
+      verifySsl: this._verifySsl
+    });
+  }
+  close() {
+    const close = this._keystore.close;
+    if (typeof close === "function") close.call(this._keystore);
+  }
+  async load(aid) {
+    const target = String(aid ?? "").trim();
+    const certPem = await this._keystore.loadCert(target);
+    if (!certPem) return resultErr(CERT_NOT_FOUND, `certificate not found for aid: ${target}`);
+    let certPub = "";
+    try {
+      certPub = publicKeyDerB64(certPem);
+      if (!certPub) return resultErr(CERT_PARSE_ERROR, `certificate parse failed for aid: ${target}`);
+    } catch (exc) {
+      return resultErr(CERT_PARSE_ERROR, `certificate parse failed for aid: ${target}`, exc);
+    }
+    const validity = parseCertValidity(certPem);
+    if (validity) {
+      const now = Date.now();
+      if (now > validity.notAfter) {
+        return resultErr(CERT_EXPIRED, `certificate expired for aid: ${target}`);
+      }
+      if (now < validity.notBefore) {
+        return resultErr(CERT_NOT_YET_VALID, `certificate not yet valid for aid: ${target}`);
+      }
+    }
+    const cn = parseCertCN(certPem);
+    if (cn && cn !== target) {
+      return resultErr(CERT_CHAIN_BROKEN, `certificate CN mismatch: expected ${target}, got ${cn}`);
+    }
+    let keyPair;
+    try {
+      keyPair = await this._keystore.loadKeyPair(target);
+    } catch (exc) {
+      return resultErr(PRIVATE_KEY_PARSE_ERROR, `private key load failed for aid: ${target}`, exc);
+    }
+    if (!keyPair?.private_key_pem) {
+      return resultOk({
+        aid: await AID.create({
+          aid: target,
+          aunPath: this.aunPath,
+          certPem,
+          privateKeyPem: null,
+          certValid: true,
+          privateKeyValid: false,
+          deviceId: this.deviceId,
+          slotId: this.slotId
+        })
+      });
+    }
+    try {
+      const privateKey = await importPrivateKeyEcdsa(String(keyPair.private_key_pem));
+      if (keyPair.public_key_der_b64 && keyPair.public_key_der_b64 !== certPub) {
+        return resultErr(KEYPAIR_MISMATCH, `keypair public key mismatch for aid: ${target}`);
+      }
+      const probe = new TextEncoder().encode("aun-aidstore-private-key-self-test");
+      const sig = await ecdsaSignDer(privateKey, probe);
+      const pubKey = await importCertPublicKeyEcdsa(certPem);
+      const ok = await ecdsaVerifyDer(pubKey, sig, probe);
+      if (!ok) {
+        return resultErr(KEYPAIR_MISMATCH, `private key does not match certificate for aid: ${target}`);
+      }
+    } catch (exc) {
+      return resultErr(PRIVATE_KEY_PARSE_ERROR, `private key parse failed for aid: ${target}`, exc);
+    }
+    return resultOk({
+      aid: await AID.create({
+        aid: target,
+        aunPath: this.aunPath,
+        certPem,
+        privateKeyPem: String(keyPair.private_key_pem),
+        certValid: true,
+        privateKeyValid: true,
+        deviceId: this.deviceId,
+        slotId: this.slotId
+      })
+    });
+  }
+  async list() {
+    try {
+      const aids = await this._keystore.listIdentities();
+      const identities = [];
+      for (const aid of aids.sort()) {
+        const loaded = await this.load(aid);
+        if (loaded.ok && loaded.data.aid.isPrivateKeyValid()) {
+          identities.push({
+            aid: loaded.data.aid.aid,
+            certFingerprint: loaded.data.aid.certFingerprint,
+            certNotAfter: loaded.data.aid.certNotAfter,
+            certIssuer: loaded.data.aid.certIssuer
+          });
+        }
+      }
+      return resultOk({ identities });
+    } catch (exc) {
+      return resultErr("LIST_IDENTITIES_FAILED", String(exc), exc);
+    }
+  }
+  async changeSeed(oldSeed, newSeed) {
+    try {
+      const changed = await this._keystore.changeSeed?.(oldSeed, newSeed);
+      this._encryptionSeed = String(newSeed ?? "");
+      return resultOk({ changed: true, count: changed?.privateKeysMigrated ?? changed?.migrated ?? 0 });
+    } catch (exc) {
+      return resultErr(PRIVATE_KEY_PARSE_ERROR, String(exc), exc);
+    }
+  }
+  async register(aid) {
+    const target = String(aid ?? "").trim();
+    try {
+      validateRegisterAidName(target);
+      const gatewayUrl = await this._resolveGateway(target);
+      await this._auth.registerAid(gatewayUrl, target);
+      return resultOk({ registered: true });
+    } catch (exc) {
+      if (exc instanceof IdentityConflictError) {
+        return resultErr(IDENTITY_CONFLICT, String(exc), exc);
+      }
+      if (exc instanceof ValidationError) {
+        return resultErr(INVALID_AID_FORMAT, String(exc), exc);
+      }
+      const message = exc instanceof Error ? exc.message : String(exc);
+      if (/network|connect|timeout|abort/i.test(message)) {
+        return resultErr(NETWORK_ERROR, message, exc);
+      }
+      return resultErr(SERVER_ERROR, message, exc);
+    }
+  }
+  async exists(aid) {
+    const target = String(aid ?? "").trim();
+    try {
+      const gatewayUrl = await this._resolveGateway(target);
+      const response = await fetchWithTimeout2(pkiCertUrl(gatewayUrl, target), { method: "HEAD" }, 1e4);
+      if (response.status === 200) return resultOk({ exists: true });
+      if (response.status === 404) return resultOk({ exists: false });
+      return resultErr(NETWORK_ERROR, `unexpected PKI HEAD status ${response.status}`);
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, String(exc), exc);
+    }
+  }
+  async resolve(aid, opts) {
+    const target = String(aid ?? "").trim();
+    const forceRefresh = !!opts?.forceRefresh;
+    const skipAgentMd = !!opts?.skipAgentMd;
+    try {
+      let peer;
+      let certFromCache = false;
+      const cached = await this.load(target);
+      if (cached.ok && !forceRefresh) {
+        peer = cached.data.aid;
+        certFromCache = true;
+      } else {
+        const gatewayUrl = await this._resolveGateway(target);
+        const certPem = await this._auth.fetchPeerCert(gatewayUrl, target);
+        if (!certPem) return resultErr(CERT_NOT_FOUND, `certificate not found for aid: ${target}`);
+        await this._keystore.saveCert(target, certPem);
+        const reloaded = await this.load(target);
+        if (!reloaded.ok) return reloaded;
+        peer = reloaded.data.aid;
+      }
+      const source = { certFromCache, cert_from_cache: certFromCache, agentMdFetched: false, agent_md_fetched: false };
+      if (skipAgentMd) return resultOk({ aid: peer, source });
+      const agentMd = await this.fetchAgentMd(target);
+      if (!agentMd.ok) return agentMd;
+      source.agentMdFetched = true;
+      source.agent_md_fetched = true;
+      return resultOk({ aid: peer, agentMd: agentMd.data, agent_md: agentMd.data, source });
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, String(exc), exc);
+    }
+  }
+  async fetchAgentMd(aid) {
+    const target = String(aid ?? "").trim();
+    try {
+      const gatewayUrl = await this._resolveGateway(target);
+      const cached = this._agentMdCache.get(target) ?? {};
+      const headers = { Accept: "text/markdown" };
+      if (cached.etag) headers["If-None-Match"] = cached.etag;
+      if (cached.lastModified) headers["If-Modified-Since"] = cached.lastModified;
+      const response = await fetchWithTimeout2(agentMdUrl(target, gatewayUrl, this._discoveryPort), {
+        method: "GET",
+        headers
+      }, 3e4);
+      let content = "";
+      if (response.status === 304 && cached.content) {
+        content = cached.content;
+      } else if (response.status === 404) {
+        return resultErr(AGENTMD_NOT_FOUND, `agent.md not found for aid: ${target}`);
+      } else if (!response.ok) {
+        return resultErr(NETWORK_ERROR, `download agent.md failed: HTTP ${response.status}`);
+      } else {
+        content = await response.text();
+      }
+      let peer;
+      const loaded = await this.load(target);
+      if (loaded.ok) {
+        peer = loaded.data.aid;
+      } else {
+        const resolved = await this.resolve(target, { skipAgentMd: true });
+        if (!resolved.ok) return resolved;
+        peer = resolved.data.aid;
+      }
+      const verified = await peer.verifyAgentMd(content);
+      if (!verified.ok) return verified;
+      const signature = verified.data;
+      const verification = { status: signature.status };
+      if (signature.reason) verification.reason = signature.reason;
+      const etag = String(response.headers?.get("ETag") ?? response.headers?.get("etag") ?? cached.etag ?? "").trim();
+      const lastModified = String(response.headers?.get("Last-Modified") ?? response.headers?.get("last-modified") ?? cached.lastModified ?? "").trim();
+      this._agentMdCache.set(target, { content, etag, lastModified, updatedAt: Date.now() });
+      return resultOk({
+        aid: target,
+        content,
+        verification,
+        signature,
+        certPem: peer.certPem,
+        cert_pem: peer.certPem,
+        etag,
+        lastModified,
+        last_modified: lastModified,
+        status: response.status
+      });
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, String(exc), exc);
+    }
+  }
+  async headAgentMd(aid) {
+    const target = String(aid ?? "").trim();
+    try {
+      const gatewayUrl = await this._resolveGateway(target);
+      const response = await fetchWithTimeout2(agentMdUrl(target, gatewayUrl, this._discoveryPort), {
+        method: "HEAD",
+        headers: { Accept: "text/markdown" }
+      }, 15e3);
+      if (response.status === 404) {
+        return resultErr(AGENTMD_NOT_FOUND, `agent.md not found for aid: ${target}`);
+      }
+      if (!response.ok) {
+        return resultErr(NETWORK_ERROR, `head agent.md failed: HTTP ${response.status}`);
+      }
+      const etag = String(response.headers?.get("ETag") ?? response.headers?.get("etag") ?? "").trim();
+      const lastModified = String(response.headers?.get("Last-Modified") ?? response.headers?.get("last-modified") ?? "").trim();
+      const contentLength = Number.parseInt(String(response.headers?.get("Content-Length") ?? response.headers?.get("content-length") ?? "0"), 10) || 0;
+      const cached = this._agentMdCache.get(target) ?? {};
+      this._agentMdCache.set(target, { ...cached, etag, lastModified, updatedAt: Date.now() });
+      return resultOk({
+        aid: target,
+        found: true,
+        etag,
+        lastModified,
+        last_modified: lastModified,
+        contentLength,
+        content_length: contentLength,
+        status: response.status
+      });
+    } catch (exc) {
+      return resultErr(NETWORK_ERROR, String(exc), exc);
+    }
+  }
+  async checkAgentMd(aid, ttlDays = 1) {
+    const target = String(aid ?? "").trim();
+    const cached = this._agentMdCache.get(target) ?? {};
+    const head = await this.headAgentMd(target);
+    let remote;
+    if (!head.ok) {
+      if (head.error.code === AGENTMD_NOT_FOUND) {
+        remote = { aid: target, found: false, etag: "", last_modified: "", content_length: 0, status: 404 };
+      } else {
+        return head;
+      }
+    } else {
+      remote = head.data;
+    }
+    const localEtag = String(cached.etag ?? "").trim();
+    const localFound = !!cached.content;
+    const remoteFound = !!remote.found;
+    const remoteEtag = String(remote.etag ?? "").trim();
+    const needsUpdate = remoteFound && (!localFound || !!remoteEtag && remoteEtag !== localEtag);
+    return resultOk({
+      aid: target,
+      localFound,
+      local_found: localFound,
+      remoteFound,
+      remote_found: remoteFound,
+      localEtag,
+      local_etag: localEtag,
+      remoteEtag,
+      remote_etag: remoteEtag,
+      lastModified: String(remote.lastModified ?? remote.last_modified ?? ""),
+      last_modified: String(remote.last_modified ?? remote.lastModified ?? ""),
+      needsUpdate,
+      needs_update: needsUpdate,
+      ttlDays,
+      ttl_days: ttlDays
+    });
+  }
+  async diagnose(aid) {
+    const target = String(aid ?? "").trim();
+    const loaded = await this.load(target);
+    const remote = await this.exists(target);
+    const remoteError = resultError(remote);
+    const localError = resultError(loaded);
+    const localAid = loaded.ok ? loaded.data.aid : null;
+    const localCert = !!localAid?.isCertValid();
+    const localPrivateKey = !!localAid?.isPrivateKeyValid();
+    const localValid = localCert && localPrivateKey;
+    const remoteRegistered = !!(remote.ok && remote.data.exists);
+    const suggestions = [];
+    if (!localPrivateKey) suggestions.push("load or register a local identity with a valid private key");
+    if (!remoteRegistered) suggestions.push("register the AID before using it on the network");
+    if (remoteError) suggestions.push(`remote registration check failed: ${remoteError.message}`);
+    const status = localPrivateKey && remoteRegistered ? "ready" : remoteRegistered ? "registered_remote" : remote.ok ? "available" : "unknown";
+    return resultOk({
+      aid: target,
+      status,
+      localValid,
+      local_valid: localValid,
+      remoteRegistered,
+      remote_registered: remoteRegistered,
+      suggestions,
+      local: { cert: localCert, private_key: localPrivateKey, error: localError },
+      remote: { checked: remote.ok, exists: remote.ok ? remoteRegistered : null, error: remoteError }
+    });
+  }
+  async renewCert(aid) {
+    const target = String(aid ?? "").trim();
+    const loaded = await this.load(target);
+    if (!loaded.ok || !loaded.data.aid.isPrivateKeyValid()) {
+      return resultErr(PRIVATE_KEY_REQUIRED, `private key required for aid: ${target}`);
+    }
+    try {
+      const identity = await this._auth.loadIdentityOrNone(target);
+      if (!identity?.cert || !identity.private_key_pem) {
+        return resultErr(PRIVATE_KEY_REQUIRED, `private key required for aid: ${target}`);
+      }
+      const gatewayUrl = await this._resolveGateway(target);
+      const clientNonce = this._crypto.newClientNonce();
+      const phase1 = await this._auth._shortRpc(gatewayUrl, "auth.aid_login1", {
+        aid: target,
+        cert: identity.cert,
+        client_nonce: clientNonce
+      });
+      const [signature, clientTime] = await this._crypto.signLoginNonce(identity.private_key_pem, String(phase1.nonce ?? ""));
+      const response = await this._auth._shortRpc(gatewayUrl, "auth.renew_cert", {
+        aid: target,
+        request_id: String(phase1.request_id ?? ""),
+        nonce: String(phase1.nonce ?? ""),
+        client_time: clientTime,
+        signature
+      });
+      const certPem = String(response.cert ?? response.cert_pem ?? "").trim();
+      if (!certPem) return resultErr(CERT_RENEWAL_FAILED, "server response missing certificate");
+      await this._keystore.saveCert(target, certPem);
+      const refreshed = await this.load(target);
+      if (!refreshed.ok) return resultErr(CERT_RENEWAL_FAILED, "renewed certificate reload failed");
+      return resultOk({
+        renewed: true,
+        newFingerprint: refreshed.data.aid.certFingerprint,
+        new_fingerprint: refreshed.data.aid.certFingerprint
+      });
+    } catch (exc) {
+      return resultErr(CERT_RENEWAL_FAILED, String(exc), exc);
+    }
+  }
+  async rekey(aid) {
+    const target = String(aid ?? "").trim();
+    const loaded = await this.load(target);
+    if (!loaded.ok || !loaded.data.aid.isPrivateKeyValid()) {
+      return resultErr(PRIVATE_KEY_REQUIRED, `private key required for aid: ${target}`);
+    }
+    try {
+      const identity = await this._auth.loadIdentityOrNone(target);
+      if (!identity?.cert || !identity.private_key_pem) {
+        return resultErr(PRIVATE_KEY_REQUIRED, `private key required for aid: ${target}`);
+      }
+      const gatewayUrl = await this._resolveGateway(target);
+      const newIdentity = await this._crypto.generateIdentity();
+      const clientNonce = this._crypto.newClientNonce();
+      const phase1 = await this._auth._shortRpc(gatewayUrl, "auth.aid_login1", {
+        aid: target,
+        cert: identity.cert,
+        client_nonce: clientNonce
+      });
+      const signPayload = `${String(phase1.nonce ?? "")}${newIdentity.public_key_der_b64}`;
+      const signResult = await loaded.data.aid.sign(signPayload);
+      if (!signResult.ok) return resultErr(REKEY_FAILED, signResult.error.message);
+      const response = await this._auth._shortRpc(gatewayUrl, "auth.rekey", {
+        aid: target,
+        request_id: String(phase1.request_id ?? ""),
+        nonce: String(phase1.nonce ?? ""),
+        new_public_key: newIdentity.public_key_der_b64,
+        signature: signResult.data.signature
+      });
+      const certPem = String(response.cert ?? response.cert_pem ?? "").trim();
+      if (!certPem) return resultErr(REKEY_FAILED, "server response missing certificate");
+      const nextIdentity = {
+        aid: target,
+        private_key_pem: newIdentity.private_key_pem,
+        public_key_der_b64: newIdentity.public_key_der_b64,
+        curve: newIdentity.curve,
+        cert: certPem
+      };
+      await this._keystore.saveIdentity(target, nextIdentity);
+      const refreshed = await this.load(target);
+      if (!refreshed.ok) return resultErr(REKEY_FAILED, "rekeyed identity reload failed");
+      return resultOk({
+        rekeyed: true,
+        newFingerprint: refreshed.data.aid.certFingerprint,
+        new_fingerprint: refreshed.data.aid.certFingerprint
+      });
+    } catch (exc) {
+      return resultErr(REKEY_FAILED, String(exc), exc);
+    }
+  }
+  async _resolveGateway(aid) {
+    const target = String(aid ?? "").trim();
+    if (!target) throw new ValidationError("AIDStore requires non-empty aid to resolve gateway");
+    const issuerDomain = issuerFromAid(target);
+    const cached = this._gatewayCache.get(issuerDomain);
+    if (cached) return cached;
+    const persisted = await this._loadCachedGatewayUrl(target);
+    if (persisted) {
+      this._gatewayCache.set(issuerDomain, persisted);
+      return persisted;
+    }
+    const port = this._discoveryPort ? `:${this._discoveryPort}` : "";
+    const candidates = [
+      `https://${target}${port}/.well-known/aun-gateway`,
+      `https://gateway.${issuerDomain}${port}/.well-known/aun-gateway`
+    ];
+    let lastError = null;
+    for (const url of candidates) {
+      try {
+        const discovered = await this._discovery.discover(url);
+        this._gatewayCache.set(issuerDomain, discovered);
+        await this._persistGatewayUrl(target, discovered);
+        return discovered;
+      } catch (exc) {
+        lastError = exc;
+      }
+    }
+    throw lastError instanceof Error ? lastError : new Error(String(lastError));
+  }
+  async _loadCachedGatewayUrl(aid) {
+    const getMetadata = this._keystore.getMetadata;
+    if (typeof getMetadata !== "function") return "";
+    try {
+      const raw = String(await getMetadata.call(this._keystore, aid, "gateway_url") ?? "").trim();
+      if (!raw) return "";
+      if (raw.startsWith('"') && raw.endsWith('"')) {
+        try {
+          const parsed = JSON.parse(raw);
+          if (typeof parsed === "string") return parsed.trim();
+        } catch {
+          return raw;
+        }
+      }
+      return raw;
+    } catch {
+      return "";
+    }
+  }
+  async _persistGatewayUrl(aid, gatewayUrl) {
+    const setMetadata = this._keystore.setMetadata;
+    if (typeof setMetadata !== "function" || !gatewayUrl) return;
+    try {
+      await setMetadata.call(this._keystore, aid, "gateway_url", gatewayUrl);
+    } catch {
+    }
+  }
+};
+
 // src/index.ts
 init_crypto();
 
@@ -16826,20 +16760,18 @@ var ProtectedHeaders = class _ProtectedHeaders {
     return new _ProtectedHeaders(values ?? {});
   }
 };
-
-// src/index.ts
-var __version__ = "0.3.5";
 export {
+  AID,
+  AIDStore,
   AUNClient,
   AUNError,
   AuthError,
   AuthFlow,
-  AuthNamespace,
   CertificateRevokedError,
   ClientSignatureError,
   ConnectionError,
+  ConnectionState,
   CryptoProvider,
-  CustodyNamespace,
   E2EEDecryptFailedError,
   E2EEDegradedError,
   E2EEError,
@@ -16856,7 +16788,6 @@ export {
   IdentityConflictError,
   IndexedDBKeyStore,
   IndexedDBSecretStore,
-  MetaNamespace,
   NotFoundError,
   PermissionError,
   ProtectedHeaders,
@@ -16873,7 +16804,7 @@ export {
   V2KeyStore,
   V2Session,
   ValidationError,
-  __version__,
+  VERSION as __version__,
   computeStateCommitment,
   createConfig,
   createDefaultSecretStore,
@@ -16882,7 +16813,9 @@ export {
   encryptP2PMessage,
   getDeviceId,
   isJsonObject,
-  mapRemoteError
+  mapRemoteError,
+  resultErr,
+  resultOk
 };
 /*! Bundled license information: