@rei-standard/amsg-server 3.1.0-next.0 → 3.1.0-next.1

package/dist/adapters/d1.d.ts

@@ -57,6 +57,7 @@ export class D1Adapter {
     };
     _cloudBatch(statements: any, userId: any, guards?: any[], metadata?: Map<any, any>): Promise<any[]>;
     getCloudResourceMetadata(userId: any, resourceKey: any): Promise<any>;
+    getOutboxPayload(userId: any, messageId: any): Promise<any>;
     listCloudResourceRows(userId: any): Promise<{
         gaps: any[];
     }>;
@@ -148,6 +149,10 @@ export class D1Adapter {
         updatedAt: any;
     }>;
     isCloudOwnerGuardValid(userId: any, guard: any): Promise<boolean>;
+    _rowSnapshotMatch(spec: any, row: any): {
+        predicate: string;
+        values: any[];
+    };
     /** Delete only the exact physical snapshot; no untrusted SQL identifiers. */
     deleteCloudResourceRows(userId: any, locators: any, { operationId, leaseToken }?: {}): Promise<{
         deleted: number;

package/dist/{chunk-3NIYNYZY.cjs → chunk-D4SKSCIY.cjs}

@@ -147,14 +147,33 @@ var _amsgshared = require('@rei-standard/amsg-shared');
 // src/server/lib/encryption.js
 var base64ToBytes = _amsgshared.base64UrlToBytes;
 var TAG_LENGTH_BYTES = 16;
+var AES_KEY_CACHE_MAX = 128;
+var aesKeyCache = /* @__PURE__ */ new Map();
 function importAesKey(hexKey, usage) {
-  return globalThis.crypto.subtle.importKey(
-    "raw",
-    _amsgshared.hexToBytes.call(void 0, hexKey),
-    { name: "AES-GCM" },
-    false,
-    [usage]
-  );
+  const cacheKey = `${usage}:${hexKey}`;
+  const cached = aesKeyCache.get(cacheKey);
+  if (cached) return cached;
+  let promise;
+  try {
+    promise = globalThis.crypto.subtle.importKey(
+      "raw",
+      _amsgshared.hexToBytes.call(void 0, hexKey),
+      { name: "AES-GCM" },
+      false,
+      [usage]
+    ).catch((err6) => {
+      aesKeyCache.delete(cacheKey);
+      throw err6;
+    });
+  } catch (err6) {
+    return Promise.reject(err6);
+  }
+  if (aesKeyCache.size >= AES_KEY_CACHE_MAX) {
+    const oldest = aesKeyCache.keys().next().value;
+    if (oldest !== void 0) aesKeyCache.delete(oldest);
+  }
+  aesKeyCache.set(cacheKey, promise);
+  return promise;
 }
 async function aesGcmSeal(hexKey, iv, plaintextBytes) {
   const key = await importAesKey(hexKey, "encrypt");
@@ -5451,12 +5470,37 @@ var D1Adapter = class {
     const row = await this._db.prepare("SELECT encrypted_value FROM cloud_resource_metadata WHERE user_id=? AND resource_key=?").bind(userId, resourceKey).first();
     return _nullishCoalesce(_optionalChain([row, 'optionalAccess', _52 => _52.encrypted_value]), () => ( null));
   }
+  async getOutboxPayload(userId, messageId) {
+    const row = await this._db.prepare(
+      "SELECT payload FROM message_outbox WHERE user_id = ? AND message_id = ? LIMIT 1"
+    ).bind(userId, messageId).first();
+    return _nullishCoalesce(_optionalChain([row, 'optionalAccess', _53 => _53.payload]), () => ( null));
+  }
   async listCloudResourceRows(userId) {
-    const tables = { task: "scheduled_messages", state: "client_state", credential: "llm_credentials", outbox: "message_outbox", subscription: "push_subscriptions", metadata: "cloud_resource_metadata" };
+    const queries = {
+      task: "SELECT * FROM scheduled_messages WHERE user_id = ?",
+      state: `SELECT user_id, namespace, key,
+        CASE WHEN LENGTH(value) <= 1024 THEN value ELSE NULL END AS value,
+        LENGTH(CAST(value AS BLOB)) AS byte_size,
+        substr(value, 1, 128) AS value_prefix,
+        CASE WHEN LENGTH(value) > 128 THEN substr(value, -64) ELSE '' END AS value_suffix,
+        updated_at
+        FROM client_state WHERE user_id = ?`,
+      credential: "SELECT * FROM llm_credentials WHERE user_id = ?",
+      outbox: `SELECT id, user_id, message_id, task_uuid, session_id, message_index, total_messages,
+        CASE WHEN LENGTH(payload) <= 1024 THEN payload ELSE NULL END AS payload,
+        LENGTH(CAST(payload AS BLOB)) AS byte_size,
+        substr(payload, 1, 128) AS payload_prefix,
+        CASE WHEN LENGTH(payload) > 128 THEN substr(payload, -64) ELSE '' END AS payload_suffix,
+        created_at, delivered_at, acked_at
+        FROM message_outbox WHERE user_id = ?`,
+      subscription: "SELECT * FROM push_subscriptions WHERE user_id = ?",
+      metadata: "SELECT * FROM cloud_resource_metadata WHERE user_id = ?"
+    };
     const result = { gaps: [] };
-    await Promise.all(Object.entries(tables).map(async ([type, table]) => {
+    await Promise.all(Object.entries(queries).map(async ([type, sql]) => {
       try {
-        const response = await this._db.prepare(`SELECT * FROM ${table} WHERE user_id = ?`).bind(userId).all();
+        const response = await this._db.prepare(sql).bind(userId).all();
         result[type] = response.results || [];
       } catch (e4) {
         result[type] = [];
@@ -5521,7 +5565,10 @@ var D1Adapter = class {
     if (idempotencyKey) {
       return this._cloudRecord(await this._db.prepare(`SELECT * FROM cloud_data_records WHERE user_id=? AND kind=? AND idempotency_key=?`).bind(userId, kind, idempotencyKey).first());
     }
-    return this.getCloudDataRecord(userId, kind, id);
+    if (createOnly) {
+      return this.getCloudDataRecord(userId, kind, id);
+    }
+    return { id, userId, kind, data, updatedAt: now };
   }
   async getCloudDataRecord(userId, kind, id) {
     return this._cloudRecord(await this._db.prepare("SELECT * FROM cloud_data_records WHERE user_id=? AND kind=? AND id=?").bind(userId, kind, id).first());
@@ -5654,7 +5701,7 @@ var D1Adapter = class {
     const name = "metadata-sidecars-v1";
     const batch = await this.getCloudMaintenanceBatch(name, "cloud_resource_metadata", limit);
     if (batch.completed) return;
-    const cursor = _nullishCoalesce(_optionalChain([batch, 'access', _53 => _53.rows, 'access', _54 => _54.at, 'call', _55 => _55(-1), 'optionalAccess', _56 => _56.maintenance_rowid]), () => ( batch.upperBound));
+    const cursor = _nullishCoalesce(_optionalChain([batch, 'access', _54 => _54.rows, 'access', _55 => _55.at, 'call', _56 => _56(-1), 'optionalAccess', _57 => _57.maintenance_rowid]), () => ( batch.upperBound));
     if (batch.rows.length) await this.cleanupCloudResourceMetadata(null, { after: batch.cursor, through: cursor });
     await this.finishCloudMaintenanceBatch(name, cursor, batch.rows.length < limit || cursor >= batch.upperBound);
   }
@@ -5728,7 +5775,30 @@ var D1Adapter = class {
     if (!guard) return true;
     const condition = this._cloudGuardPredicate(userId, guard);
     const row = await this._db.prepare(`SELECT ${condition.sql} AS valid`).bind(...condition.args).first();
-    return !!_optionalChain([row, 'optionalAccess', _57 => _57.valid]);
+    return !!_optionalChain([row, 'optionalAccess', _58 => _58.valid]);
+  }
+  _rowSnapshotMatch(spec, row) {
+    const clauses = [];
+    const args = [];
+    for (const column of spec.columns) {
+      if (!Object.hasOwn(row, column)) continue;
+      if ((column === "value" || column === "payload") && row[column] === null && typeof row.byte_size === "number") {
+        clauses.push(
+          `LENGTH(CAST(${column} AS BLOB)) IS ?`,
+          `substr(${column}, 1, 128) IS ?`,
+          `(CASE WHEN LENGTH(${column}) > 128 THEN substr(${column}, -64) ELSE '' END) IS ?`
+        );
+        args.push(
+          row.byte_size,
+          _nullishCoalesce(row[`${column}_prefix`], () => ( null)),
+          _nullishCoalesce(row[`${column}_suffix`], () => ( ""))
+        );
+      } else {
+        clauses.push(`${column} IS ?`);
+        args.push(row[column]);
+      }
+    }
+    return { predicate: clauses.join(" AND "), values: args };
   }
   /** Delete only the exact physical snapshot; no untrusted SQL identifiers. */
   async deleteCloudResourceRows(userId, locators, { operationId, leaseToken } = {}) {
@@ -5777,9 +5847,7 @@ var D1Adapter = class {
         ).bind(userId, namespace, key, "amsg-chunks" + namespace, key + "", key + " ", identities));
       }
       for (const row of locator.rows) {
-        const columns = spec.columns.filter((column) => Object.hasOwn(row, column));
-        const predicate = columns.map((column) => `${column} IS ?`).join(" AND ");
-        const values = columns.map((column) => row[column]);
+        const { predicate, values } = this._rowSnapshotMatch(spec, row);
         const identity = spec.keys.map((column) => `${column} IS ?`).join(" AND ");
         statements.push(this._db.prepare(
           `INSERT INTO cloud_guard_assertions (allowed)
@@ -5788,8 +5856,8 @@ var D1Adapter = class {
         ).bind(...spec.keys.map((column) => row[column]), ...values));
       }
       for (const row of locator.rows) {
-        const columns = spec.columns.filter((column) => Object.hasOwn(row, column));
-        statements.push(this._db.prepare(`DELETE FROM ${spec.table} WHERE ${columns.map((column) => `${column} IS ?`).join(" AND ")}`).bind(...columns.map((column) => row[column])));
+        const { predicate, values } = this._rowSnapshotMatch(spec, row);
+        statements.push(this._db.prepare(`DELETE FROM ${spec.table} WHERE ${predicate}`).bind(...values));
       }
       if (locator.metadataKey) statements.push(this._db.prepare("DELETE FROM cloud_resource_metadata WHERE user_id=? AND resource_key=?").bind(userId, locator.metadataKey));
       try {
@@ -5981,7 +6049,7 @@ var D1Adapter = class {
     ).bind(...values);
     const ownerUser = cloudGuard ? await this._db.prepare("SELECT user_id FROM scheduled_messages WHERE id=?").bind(taskId).first() : null;
     if (cloudGuard && !ownerUser) return null;
-    await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _58 => _58.user_id]), [cloudGuard]);
+    await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _59 => _59.user_id]), [cloudGuard]);
     return this._db.prepare("SELECT * FROM scheduled_messages WHERE id = ?").bind(taskId).first();
   }
   /**
@@ -6106,7 +6174,7 @@ var D1Adapter = class {
     ).bind(...values);
     const ownerUser = cloudGuard ? await this._db.prepare("SELECT user_id FROM scheduled_messages WHERE id=?").bind(taskId).first() : null;
     if (cloudGuard && !ownerUser) return false;
-    const [res] = await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _59 => _59.user_id]), [cloudGuard]);
+    const [res] = await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _60 => _60.user_id]), [cloudGuard]);
     return (res.meta.changes || 0) > 0;
   }
   /**
@@ -6125,7 +6193,7 @@ var D1Adapter = class {
     ).bind(this._iso(leaseUntil), taskId);
     const ownerUser = cloudGuard ? await this._db.prepare("SELECT user_id FROM scheduled_messages WHERE id=?").bind(taskId).first() : null;
     if (cloudGuard && !ownerUser) return false;
-    const [res] = await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _60 => _60.user_id]), [cloudGuard]);
+    const [res] = await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _61 => _61.user_id]), [cloudGuard]);
     return (res.meta.changes || 0) > 0;
   }
   async listTasks(userId, opts = {}) {
@@ -6286,7 +6354,7 @@ var D1Adapter = class {
       result.cleanupOutcomes = probeIndexes.map((probeAt) => {
         if (probeAt === null) return null;
         const row = results[probeAt] && Array.isArray(results[probeAt].results) ? results[probeAt].results[0] : null;
-        return Number(_nullishCoalesce(_optionalChain([row, 'optionalAccess', _61 => _61.n]), () => ( 0))) === 0;
+        return Number(_nullishCoalesce(_optionalChain([row, 'optionalAccess', _62 => _62.n]), () => ( 0))) === 0;
       });
     }
     return result;
@@ -7160,7 +7228,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "3.1.0-next.0" : "0.0.0-dev";
+var SERVER_VERSION = true ? "3.1.0-next.1" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -7328,6 +7396,39 @@ function objectOrText(value) {
     return value;
   }
 }
+function utf8ByteLength(text) {
+  if (typeof text !== "string" || text.length === 0) return 0;
+  return /[^\x00-\x7f]/.test(text) ? encoder.encode(text).length : text.length;
+}
+function rowByteSize(row) {
+  if (typeof row.byte_size === "number") return row.byte_size;
+  return utf8ByteLength(
+    String(
+      _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(row.value, () => ( row.encrypted_payload)), () => ( row.encrypted_value)), () => ( row.payload)), () => ( row.subscription)), () => ( ""))
+    )
+  );
+}
+var STORAGE_PREFIX_RE = /^[0-9a-f]{32}:[0-9a-f]{24,32}:[0-9a-f]*$/i;
+var HEX_RE = /^[0-9a-f]*$/i;
+function isValidStorageCiphertext(fullText, prefix, suffix, byteSize) {
+  if (typeof fullText === "string") {
+    if (!STORAGE_PREFIX_RE.test(fullText)) return false;
+    const secondColon = fullText.indexOf(":", 33);
+    return secondColon > 32 && (fullText.length - secondColon - 1) % 2 === 0;
+  }
+  if (typeof prefix === "string" && typeof byteSize === "number") {
+    if (!STORAGE_PREFIX_RE.test(prefix)) return false;
+    if (typeof suffix === "string" && !HEX_RE.test(suffix)) return false;
+    const secondColon = prefix.indexOf(":", 33);
+    return secondColon > 32 && (byteSize - secondColon - 1) % 2 === 0;
+  }
+  return false;
+}
+function hasCompleteStoredMetadata(stored) {
+  return Boolean(
+    stored && safeOwner(stored.owner) !== null && typeof stored.kind === "string" && stored.kind.length > 0
+  );
+}
 async function buildCloudDataInventory({
   db,
   userId,
@@ -7340,6 +7441,20 @@ async function buildCloudDataInventory({
   const metadata = new Map(
     (raw.metadata || []).map((row) => [row.resource_key, row.encrypted_value])
   );
+  const readStoredMetadata = async (metadataKey) => {
+    const encryptedMetadata = metadata.get(metadataKey) || null;
+    if (!encryptedMetadata) {
+      return { encryptedMetadata: null, stored: null, unreadable: false };
+    }
+    try {
+      const stored = JSON.parse(
+        await decryptFromStorage(encryptedMetadata, userKey)
+      );
+      return { encryptedMetadata, stored, unreadable: false };
+    } catch (e6) {
+      return { encryptedMetadata, stored: null, unreadable: true };
+    }
+  };
   const taskPayloads = /* @__PURE__ */ new Map();
   const taskByUuid = /* @__PURE__ */ new Map();
   for (const row of raw.task || []) {
@@ -7349,7 +7464,7 @@ async function buildCloudDataInventory({
       );
       taskPayloads.set(row.id, payload);
       if (row.uuid) taskByUuid.set(row.uuid, payload);
-    } catch (e6) {
+    } catch (e7) {
     }
   }
   const tasks = (raw.task || []).filter((row) => taskPayloads.has(row.id)).map((row) => ({ ...taskPayloads.get(row.id), uuid: row.uuid }));
@@ -7364,23 +7479,19 @@ async function buildCloudDataInventory({
     status = null,
     namespace,
     key,
-    credId
+    credId,
+    metadataInfo
   }) => {
     const metadataKey = JSON.stringify([type, ...identity]);
     const id = await cloudDataHash(JSON.stringify([userId, metadataKey]));
-    let stored = null;
-    const encryptedMetadata = metadata.get(metadataKey);
-    if (encryptedMetadata) {
-      try {
-        stored = JSON.parse(
-          await decryptFromStorage(encryptedMetadata, userKey)
-        );
-      } catch (e7) {
-        unreadable = true;
-      }
-    }
+    const {
+      encryptedMetadata,
+      stored,
+      unreadable: metadataUnreadable
+    } = await _asyncNullishCoalesce(metadataInfo, async () => ( await readStoredMetadata(metadataKey)));
+    if (metadataUnreadable) unreadable = true;
     let resolved = null;
-    if (resolveOwner) {
+    if (resolveOwner && !hasCompleteStoredMetadata(stored)) {
       try {
         resolved = await resolveOwner({
           type,
@@ -7400,17 +7511,10 @@ async function buildCloudDataInventory({
         });
       }
     }
-    const owner = safeOwner(_optionalChain([stored, 'optionalAccess', _62 => _62.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _63 => _63.__cloudOwnerGuard, 'optionalAccess', _64 => _64.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _65 => _65.metadata, 'optionalAccess', _66 => _66.cloudOwner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _67 => _67.metadata, 'optionalAccess', _68 => _68.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _69 => _69.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _70 => _70.__cloudOwnerGuard, 'optionalAccess', _71 => _71.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _72 => _72.metadata, 'optionalAccess', _73 => _73.cloudOwner])) || safeOwner(_optionalChain([task, 'optionalAccess', _74 => _74.metadata, 'optionalAccess', _75 => _75.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _76 => _76.owner])) || safeOwner(_optionalChain([resolved, 'optionalAccess', _77 => _77.owner]));
-    const kind = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([stored, 'optionalAccess', _78 => _78.kind]), () => ( _optionalChain([payload, 'optionalAccess', _79 => _79.metadata, 'optionalAccess', _80 => _80.kind]))), () => ( _optionalChain([payload, 'optionalAccess', _81 => _81.kind]))), () => ( _optionalChain([resolved, 'optionalAccess', _82 => _82.kind]))), () => ( null));
+    const owner = safeOwner(_optionalChain([stored, 'optionalAccess', _63 => _63.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _64 => _64.__cloudOwnerGuard, 'optionalAccess', _65 => _65.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _66 => _66.metadata, 'optionalAccess', _67 => _67.cloudOwner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _68 => _68.metadata, 'optionalAccess', _69 => _69.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _70 => _70.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _71 => _71.__cloudOwnerGuard, 'optionalAccess', _72 => _72.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _73 => _73.metadata, 'optionalAccess', _74 => _74.cloudOwner])) || safeOwner(_optionalChain([task, 'optionalAccess', _75 => _75.metadata, 'optionalAccess', _76 => _76.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _77 => _77.owner])) || safeOwner(_optionalChain([resolved, 'optionalAccess', _78 => _78.owner]));
+    const kind = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([stored, 'optionalAccess', _79 => _79.kind]), () => ( _optionalChain([payload, 'optionalAccess', _80 => _80.metadata, 'optionalAccess', _81 => _81.kind]))), () => ( _optionalChain([payload, 'optionalAccess', _82 => _82.kind]))), () => ( _optionalChain([resolved, 'optionalAccess', _83 => _83.kind]))), () => ( null));
     const times = rows.map((row) => timestamp(_nullishCoalesce(row.updated_at, () => ( row.created_at)))).filter((time) => time !== null);
-    const byteSize = rows.reduce(
-      (sum, row) => sum + encoder.encode(
-        String(
-          _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(row.value, () => ( row.encrypted_payload)), () => ( row.encrypted_value)), () => ( row.payload)), () => ( row.subscription)), () => ( ""))
-        )
-      ).length,
-      0
-    );
+    const byteSize = rows.reduce((sum, row) => sum + rowByteSize(row), 0);
     const label = type === "state" ? `${namespace}/${key}` : type === "credential" ? credId : type === "task" ? rows[0].uuid || `task row ${rows[0].id}` : type === "outbox" ? rows[0].message_id : "Web Push subscription";
     entries.push({
       resource: {
@@ -7465,22 +7569,75 @@ async function buildCloudDataInventory({
     const slices = chunks.get(group) || [];
     chunks.delete(group);
     const rows = [row, ...slices.sort((a, b) => a.key.localeCompare(b.key))];
-    let value, unreadable = false;
+    const metadataKey = JSON.stringify(["state", row.namespace, row.key]);
+    const metadataInfo = await readStoredMetadata(metadataKey);
+    const skipFullDecrypt = !metadataInfo.unreadable && hasCompleteStoredMetadata(metadataInfo.stored);
+    let value, unreadable = metadataInfo.unreadable;
     try {
-      const count = parseChunkedRootCount(row.value);
-      if (count === null) value = await decryptFromStorage(row.value, userKey);
-      else {
+      const rootMarker = _nullishCoalesce(_nullishCoalesce(row.value, () => ( row.value_prefix)), () => ( ""));
+      const count = parseChunkedRootCount(rootMarker);
+      if (count === null) {
+        if (typeof row.value === "string" && (!skipFullDecrypt || row.value.length <= 1024)) {
+          value = await decryptFromStorage(row.value, userKey);
+        } else if (skipFullDecrypt) {
+          if (!isValidStorageCiphertext(
+            row.value,
+            row.value_prefix,
+            row.value_suffix,
+            row.byte_size
+          )) {
+            throw new Error("Invalid state ciphertext");
+          }
+        } else {
+          const fetched = typeof db.getClientState === "function" ? await db.getClientState(userId, row.namespace, { key: row.key }) : [];
+          const rawValue = _optionalChain([fetched, 'optionalAccess', _84 => _84[0], 'optionalAccess', _85 => _85.value]);
+          if (typeof rawValue !== "string") {
+            throw new Error("Missing state value");
+          }
+          value = await decryptFromStorage(rawValue, userKey);
+        }
+      } else {
         if (count > slices.length) throw new Error("Missing state chunks");
-        const parts = [];
+        const sliceByKey = new Map(
+          slices.map((candidate) => [candidate.key, candidate])
+        );
+        const orderedSlices = [];
         for (let i = 0; i < count; i++) {
-          const slice = slices.find(
-            (candidate) => candidate.key === chunkKeyFor(row.key, i)
-          );
+          const slice = sliceByKey.get(chunkKeyFor(row.key, i));
           if (!slice || slice.updated_at !== row.updated_at)
             throw new Error("Mismatched state chunks");
-          parts.push(await decryptFromStorage(slice.value, userKey));
+          if (!isValidStorageCiphertext(
+            slice.value,
+            slice.value_prefix,
+            slice.value_suffix,
+            slice.byte_size
+          )) {
+            throw new Error("Corrupt state chunk");
+          }
+          orderedSlices.push(slice);
+        }
+        if (!skipFullDecrypt) {
+          let fetchedByKey = null;
+          if (orderedSlices.some((slice) => typeof slice.value !== "string")) {
+            const fetchedSlices = typeof db.getClientState === "function" ? await db.getClientState(
+              userId,
+              CHUNK_NAMESPACE_PREFIX + row.namespace,
+              { keyPrefix: `${row.key}` }
+            ) : [];
+            fetchedByKey = new Map(
+              fetchedSlices.map((candidate) => [candidate.key, candidate.value])
+            );
+          }
+          const parts = [];
+          for (const slice of orderedSlices) {
+            const rawSliceValue = typeof slice.value === "string" ? slice.value : _optionalChain([fetchedByKey, 'optionalAccess', _86 => _86.get, 'call', _87 => _87(slice.key)]);
+            if (typeof rawSliceValue !== "string") {
+              throw new Error("Missing state chunk value");
+            }
+            parts.push(await decryptFromStorage(rawSliceValue, userKey));
+          }
+          value = parts.join("");
         }
-        value = parts.join("");
       }
     } catch (e9) {
       unreadable = true;
@@ -7493,7 +7650,8 @@ async function buildCloudDataInventory({
       rows,
       value,
       unreadable,
-      status: null
+      status: null,
+      metadataInfo
     });
   }
   for (const [group, rows] of chunks) {
@@ -7517,9 +7675,29 @@ async function buildCloudDataInventory({
     });
   }
   for (const row of raw.outbox || []) {
-    let payload, unreadable = false;
+    const metadataKey = JSON.stringify(["outbox", row.message_id]);
+    const metadataInfo = await readStoredMetadata(metadataKey);
+    const skipFullDecrypt = !metadataInfo.unreadable && hasCompleteStoredMetadata(metadataInfo.stored);
+    let payload, unreadable = metadataInfo.unreadable;
     try {
-      payload = objectOrText(await decryptFromStorage(row.payload, userKey));
+      if (typeof row.payload === "string" && (!skipFullDecrypt || row.payload.length <= 1024)) {
+        payload = objectOrText(await decryptFromStorage(row.payload, userKey));
+      } else if (skipFullDecrypt) {
+        if (!isValidStorageCiphertext(
+          row.payload,
+          row.payload_prefix,
+          row.payload_suffix,
+          row.byte_size
+        )) {
+          throw new Error("Invalid outbox ciphertext");
+        }
+      } else {
+        const rawPayload = typeof db.getOutboxPayload === "function" ? await db.getOutboxPayload(userId, row.message_id) : null;
+        if (typeof rawPayload !== "string") {
+          throw new Error("Missing outbox payload");
+        }
+        payload = objectOrText(await decryptFromStorage(rawPayload, userKey));
+      }
     } catch (e10) {
       unreadable = true;
     }
@@ -7530,7 +7708,8 @@ async function buildCloudDataInventory({
       payload,
       task: taskByUuid.get(row.task_uuid),
       unreadable,
-      status: row.acked_at != null ? "acked" : row.delivered_at != null ? "delivered" : "pending"
+      status: row.acked_at != null ? "acked" : row.delivered_at != null ? "delivered" : "pending",
+      metadataInfo
     });
   }
   for (const row of raw.subscription || []) {
@@ -7544,7 +7723,7 @@ async function buildCloudDataInventory({
   const ownerLabels = /* @__PURE__ */ new Map();
   for (const { resource } of entries) {
     const owner = resource.owner;
-    if (!_optionalChain([owner, 'optionalAccess', _83 => _83.label, 'optionalAccess', _84 => _84.trim, 'call', _85 => _85()])) continue;
+    if (!_optionalChain([owner, 'optionalAccess', _88 => _88.label, 'optionalAccess', _89 => _89.trim, 'call', _90 => _90()])) continue;
     const identity = JSON.stringify([owner.type, owner.id]);
     const current = ownerLabels.get(identity);
     if (!current || (_nullishCoalesce(resource.updatedAt, () => ( 0))) > current.updatedAt) {
@@ -7556,7 +7735,7 @@ async function buildCloudDataInventory({
   }
   for (const { resource } of entries) {
     const owner = resource.owner;
-    if (!owner || _optionalChain([owner, 'access', _86 => _86.label, 'optionalAccess', _87 => _87.trim, 'call', _88 => _88()])) continue;
+    if (!owner || _optionalChain([owner, 'access', _91 => _91.label, 'optionalAccess', _92 => _92.trim, 'call', _93 => _93()])) continue;
     const known = ownerLabels.get(JSON.stringify([owner.type, owner.id]));
     if (known) resource.owner = { ...owner, label: known.label };
   }
@@ -7584,7 +7763,7 @@ async function cloudInventory(ctx, db, userId, userKey) {
     db,
     userId,
     userKey,
-    resolveOwner: _optionalChain([ctx, 'access', _89 => _89.cloudData, 'optionalAccess', _90 => _90.resolveOwner])
+    resolveOwner: _optionalChain([ctx, 'access', _94 => _94.cloudData, 'optionalAccess', _95 => _95.resolveOwner])
   });
 }
 function operationWork(operation) {
@@ -7641,7 +7820,7 @@ async function makeCleanupPlan(ctx, db, userId, key, input) {
     throw cloudError("INVALID_CLEANUP_SELECTION", "\u8BF7\u9009\u62E9\u81F3\u5C11\u4E00\u9879\u8D44\u6E90");
   if (types !== void 0 && (!Array.isArray(types) || !types.length || types.some((type) => !CLOUD_RESOURCE_TYPES.includes(type))))
     throw cloudError("INVALID_CLEANUP_SELECTION", "\u8D44\u6E90\u7C7B\u522B\u65E0\u6548");
-  if (mode === "purge" && !owner && !_optionalChain([resourceIds, 'optionalAccess', _91 => _91.length]))
+  if (mode === "purge" && !owner && !_optionalChain([resourceIds, 'optionalAccess', _96 => _96.length]))
     throw cloudError("INVALID_CLEANUP_SELECTION", "\u6E05\u7406\u9700\u8981\u660E\u786E\u8D44\u6E90\u6216\u5F52\u5C5E");
   if (mode === "retire-owner" && (resourceIds || types))
     throw cloudError("INVALID_CLEANUP_SELECTION", "\u5F7B\u5E95\u79FB\u9664\u4E0D\u80FD\u9650\u5236\u8D44\u6E90\u7C7B\u522B");
@@ -7653,10 +7832,12 @@ async function makeCleanupPlan(ctx, db, userId, key, input) {
       "\u4E91\u7AEF\u6E05\u5355\u4E0D\u5B8C\u6574\uFF0C\u6682\u4E0D\u80FD\u751F\u6210\u6E05\u7406\u8BA1\u5212",
       409
     );
+  const resourceIdSet = resourceIds ? new Set(resourceIds) : null;
+  const typeSet = types ? new Set(types) : null;
   const entries = inventory.entries.filter(
-    (e) => (!owner || ownerEquals(e.resource.owner, owner)) && (!resourceIds || resourceIds.includes(e.resource.id)) && (!types || types.includes(e.resource.type))
+    (e) => (!owner || ownerEquals(e.resource.owner, owner)) && (!resourceIdSet || resourceIdSet.has(e.resource.id)) && (!typeSet || typeSet.has(e.resource.type))
   );
-  if (resourceIds && new Set(resourceIds).size !== entries.length)
+  if (resourceIdSet && resourceIdSet.size !== entries.length)
     throw cloudError(
       "CLOUD_RESOURCE_NOT_FOUND",
       "\u90E8\u5206\u9009\u4E2D\u8D44\u6E90\u4E0D\u5B58\u5728\u6216\u4E0D\u5C5E\u4E8E\u5F53\u524D\u8303\u56F4",
@@ -7814,6 +7995,7 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
     if (operation.status === "completed" || operation.status === "failed")
       return operation;
     operation.status = "running";
+    let retirementInventory = null;
     if (operation.mode === "retire-owner") {
       if (operation.fencedGeneration == null) {
         const state = await db.setCloudOwnerActive(
@@ -7841,6 +8023,7 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
           "\u65E0\u6CD5\u786E\u8BA4\u5F85\u6E05\u7406\u8D44\u6E90",
           503
         );
+      retirementInventory = inventory;
       const known = new Set(operation.knownResourceIds || []);
       operation.knownResourceVersions ||= {};
       operation.entries = inventory.entries.filter((entry) => {
@@ -7867,7 +8050,7 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
         ).length;
       await save(db, userId, key, "operation", operation, { leaseToken });
     }
-    const beforeBatch = await cloudInventory(ctx, db, userId, key);
+    const beforeBatch = await _asyncNullishCoalesce(retirementInventory, async () => ( await cloudInventory(ctx, db, userId, key)));
     if (!beforeBatch.complete)
       throw cloudError("CLOUD_INVENTORY_INCOMPLETE", "\u65E0\u6CD5\u786E\u8BA4\u5F85\u6E05\u7406\u8D44\u6E90", 503);
     const currentById = new Map(
@@ -7905,7 +8088,6 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
       delete entry.locator;
       operation.cursor++;
       operation.updatedAt = Date.now();
-      await save(db, userId, key, "operation", operation, { leaseToken });
     }
     await renewLease();
     const current = await cloudInventory(ctx, db, userId, key);
@@ -7916,8 +8098,9 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
         503
       );
     const selected = new Set(operation.entries.map((e) => e.resource.id));
+    const knownIds = new Set(operation.knownResourceIds || []);
     const remaining = current.entries.filter(
-      (e) => operation.mode === "retire-owner" ? ownerEquals(e.resource.owner, operation.owner) || (operation.knownResourceIds || []).includes(e.resource.id) : selected.has(e.resource.id)
+      (e) => operation.mode === "retire-owner" ? ownerEquals(e.resource.owner, operation.owner) || knownIds.has(e.resource.id) : selected.has(e.resource.id)
     );
     for (const count of operation.counts)
       count.remaining = remaining.filter(
@@ -8006,12 +8189,12 @@ async function repairLegacyWorkIndex(ctx) {
     entries.push({ userId: row.user_id, kind: row.kind, id: row.id, work, writeToken: row.write_token });
   }
   await db.indexCloudDataRecordWorkBatch(entries);
-  const cursor = _nullishCoalesce(_optionalChain([batch, 'access', _92 => _92.rows, 'access', _93 => _93.at, 'call', _94 => _94(-1), 'optionalAccess', _95 => _95.maintenance_rowid]), () => ( batch.upperBound));
+  const cursor = _nullishCoalesce(_optionalChain([batch, 'access', _97 => _97.rows, 'access', _98 => _98.at, 'call', _99 => _99(-1), 'optionalAccess', _100 => _100.maintenance_rowid]), () => ( batch.upperBound));
   await db.finishCloudMaintenanceBatch(name, cursor, batch.rows.length < 100 || cursor >= batch.upperBound);
 }
 async function resumeCloudDataCleanups(ctx) {
   const db = ctx.db;
-  if (!_optionalChain([db, 'optionalAccess', _96 => _96.cloudDataManagement])) return;
+  if (!_optionalChain([db, 'optionalAccess', _101 => _101.cloudDataManagement])) return;
   const indexed = WORK_INDEX_METHODS.every((method) => typeof db[method] === "function");
   let rows;
   if (indexed) {
@@ -8043,7 +8226,7 @@ async function resumeCloudDataCleanups(ctx) {
       }
     } catch (error) {
       console.warn("[amsg] A cloud cleanup operation could not be resumed");
-      if (!indexed || _optionalChain([error, 'optionalAccess', _97 => _97.code]) === "CLOUD_LEASE_LOST") continue;
+      if (!indexed || _optionalChain([error, 'optionalAccess', _102 => _102.code]) === "CLOUD_LEASE_LOST") continue;
       await db.rescheduleCloudDataRecordWork(
         row.userId,
         "operation",
@@ -8151,7 +8334,7 @@ function createCloudDataHandler(ctx) {
               summary: inventorySummary(inventory),
               expiresAt: Date.now() + 15 * 60 * 1e3,
               resources: inventory.entries.map((e) => e.resource).filter(
-                (r) => (!type || r.type === type) && (!ownerId || _optionalChain([r, 'access', _98 => _98.owner, 'optionalAccess', _99 => _99.type]) === ownerType && r.owner.id === ownerId)
+                (r) => (!type || r.type === type) && (!ownerId || _optionalChain([r, 'access', _103 => _103.owner, 'optionalAccess', _104 => _104.type]) === ownerType && r.owner.id === ownerId)
               ),
               complete: inventory.complete,
               gaps: inventory.gaps
@@ -8234,7 +8417,7 @@ function createCloudDataHandler(ctx) {
           const rows = await db.listCloudDataRecords(userId, "operation");
           for (const row of rows) {
             const op = JSON.parse(await decryptFromStorage(row.data, key));
-            if (op.mode === "retire-owner" && _optionalChain([op, 'access', _100 => _100.owner, 'optionalAccess', _101 => _101.type]) === owner.type && _optionalChain([op, 'access', _102 => _102.owner, 'optionalAccess', _103 => _103.id]) === owner.id && ["pending", "running"].includes(op.status))
+            if (op.mode === "retire-owner" && _optionalChain([op, 'access', _105 => _105.owner, 'optionalAccess', _106 => _106.type]) === owner.type && _optionalChain([op, 'access', _107 => _107.owner, 'optionalAccess', _108 => _108.id]) === owner.id && ["pending", "running"].includes(op.status))
               throw cloudError(
                 "CLOUD_CLEANUP_IN_PROGRESS",
                 "\u6E05\u7406\u5B8C\u6210\u540E\u624D\u80FD\u91CD\u65B0\u542F\u7528",
@@ -8452,7 +8635,7 @@ function createSingleUserServer(config) {
   if (!config.masterKey) throw new Error("[amsg-server single-user] config.masterKey is required");
   const vapid = config.vapid || {};
   const tenantManager = createSingleUserContextManager({
-    db: createCloudGuardedAdapter(config.db, { masterKey: config.masterKey, resolveOwner: _optionalChain([config, 'access', _104 => _104.cloudData, 'optionalAccess', _105 => _105.resolveOwner]) }),
+    db: createCloudGuardedAdapter(config.db, { masterKey: config.masterKey, resolveOwner: _optionalChain([config, 'access', _109 => _109.cloudData, 'optionalAccess', _110 => _110.resolveOwner]) }),
     masterKey: config.masterKey,
     serverToken: config.serverToken
   });
@@ -8538,7 +8721,7 @@ async function getSchemaVersion(db) {
   for (const index of SQLITE_REQUIRED_SCHEMA.indexes) {
     if (!liveIndexes.has(index)) missing.push(`index:${index}`);
   }
-  if (Array.isArray(_optionalChain([live, 'optionalAccess', _106 => _106.triggers]))) {
+  if (Array.isArray(_optionalChain([live, 'optionalAccess', _111 => _111.triggers]))) {
     const liveTriggers = new Set(live.triggers);
     for (const name of SQLITE_REQUIRED_SCHEMA.triggers) {
       if (!liveTriggers.has(name)) missing.push(`trigger:${name}`);

package/dist/{chunk-6TCZEACV.mjs → chunk-EIM3PKFY.mjs}

@@ -147,14 +147,33 @@ import {
 // src/server/lib/encryption.js
 var base64ToBytes = base64UrlToBytes;
 var TAG_LENGTH_BYTES = 16;
+var AES_KEY_CACHE_MAX = 128;
+var aesKeyCache = /* @__PURE__ */ new Map();
 function importAesKey(hexKey, usage) {
-  return globalThis.crypto.subtle.importKey(
-    "raw",
-    hexToBytes(hexKey),
-    { name: "AES-GCM" },
-    false,
-    [usage]
-  );
+  const cacheKey = `${usage}:${hexKey}`;
+  const cached = aesKeyCache.get(cacheKey);
+  if (cached) return cached;
+  let promise;
+  try {
+    promise = globalThis.crypto.subtle.importKey(
+      "raw",
+      hexToBytes(hexKey),
+      { name: "AES-GCM" },
+      false,
+      [usage]
+    ).catch((err6) => {
+      aesKeyCache.delete(cacheKey);
+      throw err6;
+    });
+  } catch (err6) {
+    return Promise.reject(err6);
+  }
+  if (aesKeyCache.size >= AES_KEY_CACHE_MAX) {
+    const oldest = aesKeyCache.keys().next().value;
+    if (oldest !== void 0) aesKeyCache.delete(oldest);
+  }
+  aesKeyCache.set(cacheKey, promise);
+  return promise;
 }
 async function aesGcmSeal(hexKey, iv, plaintextBytes) {
   const key = await importAesKey(hexKey, "encrypt");
@@ -5451,12 +5470,37 @@ var D1Adapter = class {
     const row = await this._db.prepare("SELECT encrypted_value FROM cloud_resource_metadata WHERE user_id=? AND resource_key=?").bind(userId, resourceKey).first();
     return row?.encrypted_value ?? null;
   }
+  async getOutboxPayload(userId, messageId) {
+    const row = await this._db.prepare(
+      "SELECT payload FROM message_outbox WHERE user_id = ? AND message_id = ? LIMIT 1"
+    ).bind(userId, messageId).first();
+    return row?.payload ?? null;
+  }
   async listCloudResourceRows(userId) {
-    const tables = { task: "scheduled_messages", state: "client_state", credential: "llm_credentials", outbox: "message_outbox", subscription: "push_subscriptions", metadata: "cloud_resource_metadata" };
+    const queries = {
+      task: "SELECT * FROM scheduled_messages WHERE user_id = ?",
+      state: `SELECT user_id, namespace, key,
+        CASE WHEN LENGTH(value) <= 1024 THEN value ELSE NULL END AS value,
+        LENGTH(CAST(value AS BLOB)) AS byte_size,
+        substr(value, 1, 128) AS value_prefix,
+        CASE WHEN LENGTH(value) > 128 THEN substr(value, -64) ELSE '' END AS value_suffix,
+        updated_at
+        FROM client_state WHERE user_id = ?`,
+      credential: "SELECT * FROM llm_credentials WHERE user_id = ?",
+      outbox: `SELECT id, user_id, message_id, task_uuid, session_id, message_index, total_messages,
+        CASE WHEN LENGTH(payload) <= 1024 THEN payload ELSE NULL END AS payload,
+        LENGTH(CAST(payload AS BLOB)) AS byte_size,
+        substr(payload, 1, 128) AS payload_prefix,
+        CASE WHEN LENGTH(payload) > 128 THEN substr(payload, -64) ELSE '' END AS payload_suffix,
+        created_at, delivered_at, acked_at
+        FROM message_outbox WHERE user_id = ?`,
+      subscription: "SELECT * FROM push_subscriptions WHERE user_id = ?",
+      metadata: "SELECT * FROM cloud_resource_metadata WHERE user_id = ?"
+    };
     const result = { gaps: [] };
-    await Promise.all(Object.entries(tables).map(async ([type, table]) => {
+    await Promise.all(Object.entries(queries).map(async ([type, sql]) => {
       try {
-        const response = await this._db.prepare(`SELECT * FROM ${table} WHERE user_id = ?`).bind(userId).all();
+        const response = await this._db.prepare(sql).bind(userId).all();
         result[type] = response.results || [];
       } catch {
         result[type] = [];
@@ -5521,7 +5565,10 @@ var D1Adapter = class {
     if (idempotencyKey) {
       return this._cloudRecord(await this._db.prepare(`SELECT * FROM cloud_data_records WHERE user_id=? AND kind=? AND idempotency_key=?`).bind(userId, kind, idempotencyKey).first());
     }
-    return this.getCloudDataRecord(userId, kind, id);
+    if (createOnly) {
+      return this.getCloudDataRecord(userId, kind, id);
+    }
+    return { id, userId, kind, data, updatedAt: now };
   }
   async getCloudDataRecord(userId, kind, id) {
     return this._cloudRecord(await this._db.prepare("SELECT * FROM cloud_data_records WHERE user_id=? AND kind=? AND id=?").bind(userId, kind, id).first());
@@ -5730,6 +5777,29 @@ var D1Adapter = class {
     const row = await this._db.prepare(`SELECT ${condition.sql} AS valid`).bind(...condition.args).first();
     return !!row?.valid;
   }
+  _rowSnapshotMatch(spec, row) {
+    const clauses = [];
+    const args = [];
+    for (const column of spec.columns) {
+      if (!Object.hasOwn(row, column)) continue;
+      if ((column === "value" || column === "payload") && row[column] === null && typeof row.byte_size === "number") {
+        clauses.push(
+          `LENGTH(CAST(${column} AS BLOB)) IS ?`,
+          `substr(${column}, 1, 128) IS ?`,
+          `(CASE WHEN LENGTH(${column}) > 128 THEN substr(${column}, -64) ELSE '' END) IS ?`
+        );
+        args.push(
+          row.byte_size,
+          row[`${column}_prefix`] ?? null,
+          row[`${column}_suffix`] ?? ""
+        );
+      } else {
+        clauses.push(`${column} IS ?`);
+        args.push(row[column]);
+      }
+    }
+    return { predicate: clauses.join(" AND "), values: args };
+  }
   /** Delete only the exact physical snapshot; no untrusted SQL identifiers. */
   async deleteCloudResourceRows(userId, locators, { operationId, leaseToken } = {}) {
     const specs = {
@@ -5777,9 +5847,7 @@ var D1Adapter = class {
         ).bind(userId, namespace, key, "amsg-chunks" + namespace, key + "", key + " ", identities));
       }
       for (const row of locator.rows) {
-        const columns = spec.columns.filter((column) => Object.hasOwn(row, column));
-        const predicate = columns.map((column) => `${column} IS ?`).join(" AND ");
-        const values = columns.map((column) => row[column]);
+        const { predicate, values } = this._rowSnapshotMatch(spec, row);
         const identity = spec.keys.map((column) => `${column} IS ?`).join(" AND ");
         statements.push(this._db.prepare(
           `INSERT INTO cloud_guard_assertions (allowed)
@@ -5788,8 +5856,8 @@ var D1Adapter = class {
         ).bind(...spec.keys.map((column) => row[column]), ...values));
       }
       for (const row of locator.rows) {
-        const columns = spec.columns.filter((column) => Object.hasOwn(row, column));
-        statements.push(this._db.prepare(`DELETE FROM ${spec.table} WHERE ${columns.map((column) => `${column} IS ?`).join(" AND ")}`).bind(...columns.map((column) => row[column])));
+        const { predicate, values } = this._rowSnapshotMatch(spec, row);
+        statements.push(this._db.prepare(`DELETE FROM ${spec.table} WHERE ${predicate}`).bind(...values));
       }
       if (locator.metadataKey) statements.push(this._db.prepare("DELETE FROM cloud_resource_metadata WHERE user_id=? AND resource_key=?").bind(userId, locator.metadataKey));
       try {
@@ -7160,7 +7228,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "3.1.0-next.0" : "0.0.0-dev";
+var SERVER_VERSION = true ? "3.1.0-next.1" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -7328,6 +7396,39 @@ function objectOrText(value) {
     return value;
   }
 }
+function utf8ByteLength(text) {
+  if (typeof text !== "string" || text.length === 0) return 0;
+  return /[^\x00-\x7f]/.test(text) ? encoder.encode(text).length : text.length;
+}
+function rowByteSize(row) {
+  if (typeof row.byte_size === "number") return row.byte_size;
+  return utf8ByteLength(
+    String(
+      row.value ?? row.encrypted_payload ?? row.encrypted_value ?? row.payload ?? row.subscription ?? ""
+    )
+  );
+}
+var STORAGE_PREFIX_RE = /^[0-9a-f]{32}:[0-9a-f]{24,32}:[0-9a-f]*$/i;
+var HEX_RE = /^[0-9a-f]*$/i;
+function isValidStorageCiphertext(fullText, prefix, suffix, byteSize) {
+  if (typeof fullText === "string") {
+    if (!STORAGE_PREFIX_RE.test(fullText)) return false;
+    const secondColon = fullText.indexOf(":", 33);
+    return secondColon > 32 && (fullText.length - secondColon - 1) % 2 === 0;
+  }
+  if (typeof prefix === "string" && typeof byteSize === "number") {
+    if (!STORAGE_PREFIX_RE.test(prefix)) return false;
+    if (typeof suffix === "string" && !HEX_RE.test(suffix)) return false;
+    const secondColon = prefix.indexOf(":", 33);
+    return secondColon > 32 && (byteSize - secondColon - 1) % 2 === 0;
+  }
+  return false;
+}
+function hasCompleteStoredMetadata(stored) {
+  return Boolean(
+    stored && safeOwner(stored.owner) !== null && typeof stored.kind === "string" && stored.kind.length > 0
+  );
+}
 async function buildCloudDataInventory({
   db,
   userId,
@@ -7340,6 +7441,20 @@ async function buildCloudDataInventory({
   const metadata = new Map(
     (raw.metadata || []).map((row) => [row.resource_key, row.encrypted_value])
   );
+  const readStoredMetadata = async (metadataKey) => {
+    const encryptedMetadata = metadata.get(metadataKey) || null;
+    if (!encryptedMetadata) {
+      return { encryptedMetadata: null, stored: null, unreadable: false };
+    }
+    try {
+      const stored = JSON.parse(
+        await decryptFromStorage(encryptedMetadata, userKey)
+      );
+      return { encryptedMetadata, stored, unreadable: false };
+    } catch {
+      return { encryptedMetadata, stored: null, unreadable: true };
+    }
+  };
   const taskPayloads = /* @__PURE__ */ new Map();
   const taskByUuid = /* @__PURE__ */ new Map();
   for (const row of raw.task || []) {
@@ -7364,23 +7479,19 @@ async function buildCloudDataInventory({
     status = null,
     namespace,
     key,
-    credId
+    credId,
+    metadataInfo
   }) => {
     const metadataKey = JSON.stringify([type, ...identity]);
     const id = await cloudDataHash(JSON.stringify([userId, metadataKey]));
-    let stored = null;
-    const encryptedMetadata = metadata.get(metadataKey);
-    if (encryptedMetadata) {
-      try {
-        stored = JSON.parse(
-          await decryptFromStorage(encryptedMetadata, userKey)
-        );
-      } catch {
-        unreadable = true;
-      }
-    }
+    const {
+      encryptedMetadata,
+      stored,
+      unreadable: metadataUnreadable
+    } = metadataInfo ?? await readStoredMetadata(metadataKey);
+    if (metadataUnreadable) unreadable = true;
     let resolved = null;
-    if (resolveOwner) {
+    if (resolveOwner && !hasCompleteStoredMetadata(stored)) {
       try {
         resolved = await resolveOwner({
           type,
@@ -7403,14 +7514,7 @@ async function buildCloudDataInventory({
     const owner = safeOwner(stored?.owner) || safeOwner(payload?.__cloudOwnerGuard?.owner) || safeOwner(payload?.metadata?.cloudOwner) || safeOwner(payload?.metadata?.owner) || safeOwner(payload?.owner) || safeOwner(task?.__cloudOwnerGuard?.owner) || safeOwner(task?.metadata?.cloudOwner) || safeOwner(task?.metadata?.owner) || safeOwner(task?.owner) || safeOwner(resolved?.owner);
     const kind = stored?.kind ?? payload?.metadata?.kind ?? payload?.kind ?? resolved?.kind ?? null;
     const times = rows.map((row) => timestamp(row.updated_at ?? row.created_at)).filter((time) => time !== null);
-    const byteSize = rows.reduce(
-      (sum, row) => sum + encoder.encode(
-        String(
-          row.value ?? row.encrypted_payload ?? row.encrypted_value ?? row.payload ?? row.subscription ?? ""
-        )
-      ).length,
-      0
-    );
+    const byteSize = rows.reduce((sum, row) => sum + rowByteSize(row), 0);
     const label = type === "state" ? `${namespace}/${key}` : type === "credential" ? credId : type === "task" ? rows[0].uuid || `task row ${rows[0].id}` : type === "outbox" ? rows[0].message_id : "Web Push subscription";
     entries.push({
       resource: {
@@ -7465,22 +7569,75 @@ async function buildCloudDataInventory({
     const slices = chunks.get(group) || [];
     chunks.delete(group);
     const rows = [row, ...slices.sort((a, b) => a.key.localeCompare(b.key))];
-    let value, unreadable = false;
+    const metadataKey = JSON.stringify(["state", row.namespace, row.key]);
+    const metadataInfo = await readStoredMetadata(metadataKey);
+    const skipFullDecrypt = !metadataInfo.unreadable && hasCompleteStoredMetadata(metadataInfo.stored);
+    let value, unreadable = metadataInfo.unreadable;
     try {
-      const count = parseChunkedRootCount(row.value);
-      if (count === null) value = await decryptFromStorage(row.value, userKey);
-      else {
+      const rootMarker = row.value ?? row.value_prefix ?? "";
+      const count = parseChunkedRootCount(rootMarker);
+      if (count === null) {
+        if (typeof row.value === "string" && (!skipFullDecrypt || row.value.length <= 1024)) {
+          value = await decryptFromStorage(row.value, userKey);
+        } else if (skipFullDecrypt) {
+          if (!isValidStorageCiphertext(
+            row.value,
+            row.value_prefix,
+            row.value_suffix,
+            row.byte_size
+          )) {
+            throw new Error("Invalid state ciphertext");
+          }
+        } else {
+          const fetched = typeof db.getClientState === "function" ? await db.getClientState(userId, row.namespace, { key: row.key }) : [];
+          const rawValue = fetched?.[0]?.value;
+          if (typeof rawValue !== "string") {
+            throw new Error("Missing state value");
+          }
+          value = await decryptFromStorage(rawValue, userKey);
+        }
+      } else {
         if (count > slices.length) throw new Error("Missing state chunks");
-        const parts = [];
+        const sliceByKey = new Map(
+          slices.map((candidate) => [candidate.key, candidate])
+        );
+        const orderedSlices = [];
         for (let i = 0; i < count; i++) {
-          const slice = slices.find(
-            (candidate) => candidate.key === chunkKeyFor(row.key, i)
-          );
+          const slice = sliceByKey.get(chunkKeyFor(row.key, i));
           if (!slice || slice.updated_at !== row.updated_at)
             throw new Error("Mismatched state chunks");
-          parts.push(await decryptFromStorage(slice.value, userKey));
+          if (!isValidStorageCiphertext(
+            slice.value,
+            slice.value_prefix,
+            slice.value_suffix,
+            slice.byte_size
+          )) {
+            throw new Error("Corrupt state chunk");
+          }
+          orderedSlices.push(slice);
+        }
+        if (!skipFullDecrypt) {
+          let fetchedByKey = null;
+          if (orderedSlices.some((slice) => typeof slice.value !== "string")) {
+            const fetchedSlices = typeof db.getClientState === "function" ? await db.getClientState(
+              userId,
+              CHUNK_NAMESPACE_PREFIX + row.namespace,
+              { keyPrefix: `${row.key}` }
+            ) : [];
+            fetchedByKey = new Map(
+              fetchedSlices.map((candidate) => [candidate.key, candidate.value])
+            );
+          }
+          const parts = [];
+          for (const slice of orderedSlices) {
+            const rawSliceValue = typeof slice.value === "string" ? slice.value : fetchedByKey?.get(slice.key);
+            if (typeof rawSliceValue !== "string") {
+              throw new Error("Missing state chunk value");
+            }
+            parts.push(await decryptFromStorage(rawSliceValue, userKey));
+          }
+          value = parts.join("");
         }
-        value = parts.join("");
       }
     } catch {
       unreadable = true;
@@ -7493,7 +7650,8 @@ async function buildCloudDataInventory({
       rows,
       value,
       unreadable,
-      status: null
+      status: null,
+      metadataInfo
     });
   }
   for (const [group, rows] of chunks) {
@@ -7517,9 +7675,29 @@ async function buildCloudDataInventory({
     });
   }
   for (const row of raw.outbox || []) {
-    let payload, unreadable = false;
+    const metadataKey = JSON.stringify(["outbox", row.message_id]);
+    const metadataInfo = await readStoredMetadata(metadataKey);
+    const skipFullDecrypt = !metadataInfo.unreadable && hasCompleteStoredMetadata(metadataInfo.stored);
+    let payload, unreadable = metadataInfo.unreadable;
     try {
-      payload = objectOrText(await decryptFromStorage(row.payload, userKey));
+      if (typeof row.payload === "string" && (!skipFullDecrypt || row.payload.length <= 1024)) {
+        payload = objectOrText(await decryptFromStorage(row.payload, userKey));
+      } else if (skipFullDecrypt) {
+        if (!isValidStorageCiphertext(
+          row.payload,
+          row.payload_prefix,
+          row.payload_suffix,
+          row.byte_size
+        )) {
+          throw new Error("Invalid outbox ciphertext");
+        }
+      } else {
+        const rawPayload = typeof db.getOutboxPayload === "function" ? await db.getOutboxPayload(userId, row.message_id) : null;
+        if (typeof rawPayload !== "string") {
+          throw new Error("Missing outbox payload");
+        }
+        payload = objectOrText(await decryptFromStorage(rawPayload, userKey));
+      }
     } catch {
       unreadable = true;
     }
@@ -7530,7 +7708,8 @@ async function buildCloudDataInventory({
       payload,
       task: taskByUuid.get(row.task_uuid),
       unreadable,
-      status: row.acked_at != null ? "acked" : row.delivered_at != null ? "delivered" : "pending"
+      status: row.acked_at != null ? "acked" : row.delivered_at != null ? "delivered" : "pending",
+      metadataInfo
     });
   }
   for (const row of raw.subscription || []) {
@@ -7653,10 +7832,12 @@ async function makeCleanupPlan(ctx, db, userId, key, input) {
       "\u4E91\u7AEF\u6E05\u5355\u4E0D\u5B8C\u6574\uFF0C\u6682\u4E0D\u80FD\u751F\u6210\u6E05\u7406\u8BA1\u5212",
       409
     );
+  const resourceIdSet = resourceIds ? new Set(resourceIds) : null;
+  const typeSet = types ? new Set(types) : null;
   const entries = inventory.entries.filter(
-    (e) => (!owner || ownerEquals(e.resource.owner, owner)) && (!resourceIds || resourceIds.includes(e.resource.id)) && (!types || types.includes(e.resource.type))
+    (e) => (!owner || ownerEquals(e.resource.owner, owner)) && (!resourceIdSet || resourceIdSet.has(e.resource.id)) && (!typeSet || typeSet.has(e.resource.type))
   );
-  if (resourceIds && new Set(resourceIds).size !== entries.length)
+  if (resourceIdSet && resourceIdSet.size !== entries.length)
     throw cloudError(
       "CLOUD_RESOURCE_NOT_FOUND",
       "\u90E8\u5206\u9009\u4E2D\u8D44\u6E90\u4E0D\u5B58\u5728\u6216\u4E0D\u5C5E\u4E8E\u5F53\u524D\u8303\u56F4",
@@ -7814,6 +7995,7 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
     if (operation.status === "completed" || operation.status === "failed")
       return operation;
     operation.status = "running";
+    let retirementInventory = null;
     if (operation.mode === "retire-owner") {
       if (operation.fencedGeneration == null) {
         const state = await db.setCloudOwnerActive(
@@ -7841,6 +8023,7 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
           "\u65E0\u6CD5\u786E\u8BA4\u5F85\u6E05\u7406\u8D44\u6E90",
           503
         );
+      retirementInventory = inventory;
       const known = new Set(operation.knownResourceIds || []);
       operation.knownResourceVersions ||= {};
       operation.entries = inventory.entries.filter((entry) => {
@@ -7867,7 +8050,7 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
         ).length;
       await save(db, userId, key, "operation", operation, { leaseToken });
     }
-    const beforeBatch = await cloudInventory(ctx, db, userId, key);
+    const beforeBatch = retirementInventory ?? await cloudInventory(ctx, db, userId, key);
     if (!beforeBatch.complete)
       throw cloudError("CLOUD_INVENTORY_INCOMPLETE", "\u65E0\u6CD5\u786E\u8BA4\u5F85\u6E05\u7406\u8D44\u6E90", 503);
     const currentById = new Map(
@@ -7905,7 +8088,6 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
       delete entry.locator;
       operation.cursor++;
       operation.updatedAt = Date.now();
-      await save(db, userId, key, "operation", operation, { leaseToken });
     }
     await renewLease();
     const current = await cloudInventory(ctx, db, userId, key);
@@ -7916,8 +8098,9 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
         503
       );
     const selected = new Set(operation.entries.map((e) => e.resource.id));
+    const knownIds = new Set(operation.knownResourceIds || []);
     const remaining = current.entries.filter(
-      (e) => operation.mode === "retire-owner" ? ownerEquals(e.resource.owner, operation.owner) || (operation.knownResourceIds || []).includes(e.resource.id) : selected.has(e.resource.id)
+      (e) => operation.mode === "retire-owner" ? ownerEquals(e.resource.owner, operation.owner) || knownIds.has(e.resource.id) : selected.has(e.resource.id)
     );
     for (const count of operation.counts)
       count.remaining = remaining.filter(

package/dist/cloudflare.cjs

@@ -29,7 +29,7 @@
 
 
 
-var _chunk3NIYNYZYcjs = require('./chunk-3NIYNYZY.cjs');
+var _chunkD4SKSCIYcjs = require('./chunk-D4SKSCIY.cjs');
 require('./chunk-7NMQFTDJ.cjs');
 
 
@@ -62,4 +62,4 @@ require('./chunk-7NMQFTDJ.cjs');
 
 
 
-exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunk3NIYNYZYcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunk3NIYNYZYcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_DEFER_AFTER_MS = _chunk3NIYNYZYcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunk3NIYNYZYcjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunk3NIYNYZYcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunk3NIYNYZYcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunk3NIYNYZYcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunk3NIYNYZYcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunk3NIYNYZYcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunk3NIYNYZYcjs.advanceOccurrence; exports.createD1Adapter = _chunk3NIYNYZYcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunk3NIYNYZYcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunk3NIYNYZYcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunk3NIYNYZYcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunk3NIYNYZYcjs.decryptFromStorage; exports.decryptPayload = _chunk3NIYNYZYcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunk3NIYNYZYcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunk3NIYNYZYcjs.encryptForStorage; exports.encryptPayload = _chunk3NIYNYZYcjs.encryptPayload; exports.ensureSchema = _chunk3NIYNYZYcjs.ensureSchema; exports.getSchemaVersion = _chunk3NIYNYZYcjs.getSchemaVersion; exports.isNonRetryableError = _chunk3NIYNYZYcjs.isNonRetryableError; exports.isValidTimeZoneId = _chunk3NIYNYZYcjs.isValidTimeZoneId; exports.measurePushPayload = _chunk3NIYNYZYcjs.measurePushPayload; exports.nextFutureOccurrence = _chunk3NIYNYZYcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunk3NIYNYZYcjs.planNextOccurrence; exports.readRequestBody = _chunk3NIYNYZYcjs.readRequestBody; exports.runScheduledTick = _chunk3NIYNYZYcjs.runScheduledTick; exports.runTask = _chunk3NIYNYZYcjs.runTask; exports.summarizeErrorCause = _chunk3NIYNYZYcjs.summarizeErrorCause;
+exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkD4SKSCIYcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkD4SKSCIYcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_DEFER_AFTER_MS = _chunkD4SKSCIYcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkD4SKSCIYcjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunkD4SKSCIYcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkD4SKSCIYcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkD4SKSCIYcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkD4SKSCIYcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkD4SKSCIYcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkD4SKSCIYcjs.advanceOccurrence; exports.createD1Adapter = _chunkD4SKSCIYcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkD4SKSCIYcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkD4SKSCIYcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkD4SKSCIYcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkD4SKSCIYcjs.decryptFromStorage; exports.decryptPayload = _chunkD4SKSCIYcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkD4SKSCIYcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkD4SKSCIYcjs.encryptForStorage; exports.encryptPayload = _chunkD4SKSCIYcjs.encryptPayload; exports.ensureSchema = _chunkD4SKSCIYcjs.ensureSchema; exports.getSchemaVersion = _chunkD4SKSCIYcjs.getSchemaVersion; exports.isNonRetryableError = _chunkD4SKSCIYcjs.isNonRetryableError; exports.isValidTimeZoneId = _chunkD4SKSCIYcjs.isValidTimeZoneId; exports.measurePushPayload = _chunkD4SKSCIYcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkD4SKSCIYcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkD4SKSCIYcjs.planNextOccurrence; exports.readRequestBody = _chunkD4SKSCIYcjs.readRequestBody; exports.runScheduledTick = _chunkD4SKSCIYcjs.runScheduledTick; exports.runTask = _chunkD4SKSCIYcjs.runTask; exports.summarizeErrorCause = _chunkD4SKSCIYcjs.summarizeErrorCause;

package/dist/cloudflare.mjs

@@ -29,7 +29,7 @@ import {
   runScheduledTick,
   runTask,
   summarizeErrorCause
-} from "./chunk-6TCZEACV.mjs";
+} from "./chunk-EIM3PKFY.mjs";
 import "./chunk-GN44PST5.mjs";
 export {
   DEFAULT_MAX_DELIVERY_RETRIES,

package/dist/index.cjs

@@ -74,7 +74,7 @@
 
 
 
-var _chunk3NIYNYZYcjs = require('./chunk-3NIYNYZY.cjs');
+var _chunkD4SKSCIYcjs = require('./chunk-D4SKSCIY.cjs');
 require('./chunk-7NMQFTDJ.cjs');
 
 // src/server/adapters/factory.js
@@ -108,7 +108,7 @@ async function createAdapter(config) {
 // src/server/handlers/init-tenant.js
 function createInitTenantHandler(ctx) {
   async function POST(headers, body) {
-    const initSecret = _chunk3NIYNYZYcjs.getHeader.call(void 0, headers, "x-init-secret");
+    const initSecret = _chunkD4SKSCIYcjs.getHeader.call(void 0, headers, "x-init-secret");
     if (ctx.tenant.initSecret && initSecret !== ctx.tenant.initSecret) {
       return {
         status: 401,
@@ -121,7 +121,7 @@ function createInitTenantHandler(ctx) {
         }
       };
     }
-    const parsed = _chunk3NIYNYZYcjs.parseJsonBody.call(void 0, body);
+    const parsed = _chunkD4SKSCIYcjs.parseJsonBody.call(void 0, body);
     if (!parsed.ok) {
       return {
         status: 400,
@@ -135,7 +135,7 @@ function createInitTenantHandler(ctx) {
     const tenantId = payload.tenantId || void 0;
     const driver = payload.driver;
     const databaseUrl = payload.databaseUrl || payload.connectionString;
-    if (tenantId && !_chunk3NIYNYZYcjs.isValidUUIDv4.call(void 0, tenantId)) {
+    if (tenantId && !_chunkD4SKSCIYcjs.isValidUUIDv4.call(void 0, tenantId)) {
       return {
         status: 400,
         body: {
@@ -255,7 +255,7 @@ function createSendNotificationsHandler(ctx) {
         }
       };
     }
-    const data = await _chunk3NIYNYZYcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
+    const data = await _chunkD4SKSCIYcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
     return { status: 200, body: { success: true, data } };
   }
   return { POST };
@@ -277,16 +277,16 @@ function encryptConfig(config, kekBuffer) {
   const plaintext = Buffer.from(JSON.stringify(config), "utf8");
   const ciphertext = Buffer.concat([cipher.update(plaintext), cipher.final()]);
   const authTag = cipher.getAuthTag();
-  return `v1.${_chunk3NIYNYZYcjs.bytesToBase64Url.call(void 0, iv)}.${_chunk3NIYNYZYcjs.bytesToBase64Url.call(void 0, authTag)}.${_chunk3NIYNYZYcjs.bytesToBase64Url.call(void 0, ciphertext)}`;
+  return `v1.${_chunkD4SKSCIYcjs.bytesToBase64Url.call(void 0, iv)}.${_chunkD4SKSCIYcjs.bytesToBase64Url.call(void 0, authTag)}.${_chunkD4SKSCIYcjs.bytesToBase64Url.call(void 0, ciphertext)}`;
 }
 function decryptConfig(encrypted, kekBuffer) {
   const parts = String(encrypted || "").split(".");
   if (parts.length !== 4 || parts[0] !== "v1") {
     throw new Error("INVALID_TENANT_CONFIG");
   }
-  const iv = _chunk3NIYNYZYcjs.base64UrlToBytes.call(void 0, parts[1]);
-  const authTag = _chunk3NIYNYZYcjs.base64UrlToBytes.call(void 0, parts[2]);
-  const ciphertext = _chunk3NIYNYZYcjs.base64UrlToBytes.call(void 0, parts[3]);
+  const iv = _chunkD4SKSCIYcjs.base64UrlToBytes.call(void 0, parts[1]);
+  const authTag = _chunkD4SKSCIYcjs.base64UrlToBytes.call(void 0, parts[2]);
+  const ciphertext = _chunkD4SKSCIYcjs.base64UrlToBytes.call(void 0, parts[3]);
   const decipher = _crypto.createDecipheriv.call(void 0, "aes-256-gcm", kekBuffer, iv);
   decipher.setAuthTag(authTag);
   const plaintext = Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
@@ -354,7 +354,7 @@ function createTenantBlobStore(options) {
 // src/server/tenant/token.js
 
 function sign(input, secret) {
-  return _chunk3NIYNYZYcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
+  return _chunkD4SKSCIYcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
 }
 function nowEpochSeconds() {
   return Math.floor(Date.now() / 1e3);
@@ -370,8 +370,8 @@ function createTenantToken(params, secret) {
     v: 1
   };
   const header = { alg: "HS256", typ: "JWT" };
-  const encodedHeader = _chunk3NIYNYZYcjs.bytesToBase64Url.call(void 0, _chunk3NIYNYZYcjs.utf8.call(void 0, JSON.stringify(header)));
-  const encodedPayload = _chunk3NIYNYZYcjs.bytesToBase64Url.call(void 0, _chunk3NIYNYZYcjs.utf8.call(void 0, JSON.stringify(payload)));
+  const encodedHeader = _chunkD4SKSCIYcjs.bytesToBase64Url.call(void 0, _chunkD4SKSCIYcjs.utf8.call(void 0, JSON.stringify(header)));
+  const encodedPayload = _chunkD4SKSCIYcjs.bytesToBase64Url.call(void 0, _chunkD4SKSCIYcjs.utf8.call(void 0, JSON.stringify(payload)));
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const signature = sign(signingInput, secret);
   return `${signingInput}.${signature}`;
@@ -390,17 +390,17 @@ function verifyTenantToken(token, secret, options = {}) {
   let receivedBytes;
   let expectedBytes;
   try {
-    receivedBytes = _chunk3NIYNYZYcjs.base64UrlToBytes.call(void 0, receivedSignature);
-    expectedBytes = _chunk3NIYNYZYcjs.base64UrlToBytes.call(void 0, expectedSignature);
+    receivedBytes = _chunkD4SKSCIYcjs.base64UrlToBytes.call(void 0, receivedSignature);
+    expectedBytes = _chunkD4SKSCIYcjs.base64UrlToBytes.call(void 0, expectedSignature);
   } catch (e) {
     throw new Error("INVALID_TENANT_AUTH");
   }
-  if (!_chunk3NIYNYZYcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
+  if (!_chunkD4SKSCIYcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
     throw new Error("INVALID_TENANT_AUTH");
   }
   let payload;
   try {
-    payload = JSON.parse(_chunk3NIYNYZYcjs.utf8Decode.call(void 0, _chunk3NIYNYZYcjs.base64UrlToBytes.call(void 0, encodedPayload)));
+    payload = JSON.parse(_chunkD4SKSCIYcjs.utf8Decode.call(void 0, _chunkD4SKSCIYcjs.base64UrlToBytes.call(void 0, encodedPayload)));
   } catch (e2) {
     throw new Error("INVALID_TENANT_AUTH");
   }
@@ -628,15 +628,15 @@ async function createReiServer(config) {
   return {
     handlers: {
       initTenant: createInitTenantHandler(ctx),
-      getUserKey: _chunk3NIYNYZYcjs.createGetUserKeyHandler.call(void 0, ctx),
-      scheduleMessage: _chunk3NIYNYZYcjs.createScheduleMessageHandler.call(void 0, ctx),
+      getUserKey: _chunkD4SKSCIYcjs.createGetUserKeyHandler.call(void 0, ctx),
+      scheduleMessage: _chunkD4SKSCIYcjs.createScheduleMessageHandler.call(void 0, ctx),
       sendNotifications: createSendNotificationsHandler(ctx),
-      updateMessage: _chunk3NIYNYZYcjs.createUpdateMessageHandler.call(void 0, ctx),
-      cancelMessage: _chunk3NIYNYZYcjs.createCancelMessageHandler.call(void 0, ctx),
-      messages: _chunk3NIYNYZYcjs.createMessagesHandler.call(void 0, ctx),
-      getMessage: _chunk3NIYNYZYcjs.createGetMessageHandler.call(void 0, ctx),
-      pushSubscription: _chunk3NIYNYZYcjs.createPushSubscriptionHandler.call(void 0, ctx),
-      llmCredentials: _chunk3NIYNYZYcjs.createLlmCredentialsHandler.call(void 0, ctx)
+      updateMessage: _chunkD4SKSCIYcjs.createUpdateMessageHandler.call(void 0, ctx),
+      cancelMessage: _chunkD4SKSCIYcjs.createCancelMessageHandler.call(void 0, ctx),
+      messages: _chunkD4SKSCIYcjs.createMessagesHandler.call(void 0, ctx),
+      getMessage: _chunkD4SKSCIYcjs.createGetMessageHandler.call(void 0, ctx),
+      pushSubscription: _chunkD4SKSCIYcjs.createPushSubscriptionHandler.call(void 0, ctx),
+      llmCredentials: _chunkD4SKSCIYcjs.createLlmCredentialsHandler.call(void 0, ctx)
     }
   };
 }
@@ -705,4 +705,4 @@ async function createReiServer(config) {
 
 
 
-exports.CORS_ALLOW_HEADERS = _chunk3NIYNYZYcjs.CORS_ALLOW_HEADERS; exports.CORS_ALLOW_METHODS = _chunk3NIYNYZYcjs.CORS_ALLOW_METHODS; exports.CRED_ID_MAX_LENGTH = _chunk3NIYNYZYcjs.CRED_ID_MAX_LENGTH; exports.CRED_PUT_BATCH_MAX = _chunk3NIYNYZYcjs.CRED_PUT_BATCH_MAX; exports.CRED_REFS_MAX_ENTRIES = _chunk3NIYNYZYcjs.CRED_REFS_MAX_ENTRIES; exports.CRED_ROWS_PER_USER_MAX = _chunk3NIYNYZYcjs.CRED_ROWS_PER_USER_MAX; exports.DEFAULT_CLAIM_LEASE_MS = _chunk3NIYNYZYcjs.DEFAULT_CLAIM_LEASE_MS; exports.DEFAULT_HEARTBEAT_LEASE_TTL_MS = _chunk3NIYNYZYcjs.DEFAULT_HEARTBEAT_LEASE_TTL_MS; exports.DEFAULT_LEASE_HEARTBEAT_MS = _chunk3NIYNYZYcjs.DEFAULT_LEASE_HEARTBEAT_MS; exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunk3NIYNYZYcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunk3NIYNYZYcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE = _chunk3NIYNYZYcjs.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE; exports.DEFAULT_MAX_TOOL_ITERATIONS = _chunk3NIYNYZYcjs.DEFAULT_MAX_TOOL_ITERATIONS; exports.DEFAULT_TOTAL_TIMEOUT_MS = _chunk3NIYNYZYcjs.DEFAULT_TOTAL_TIMEOUT_MS; exports.DeploymentConfigError = _chunk3NIYNYZYcjs.DeploymentConfigError; exports.MAX_DEFER_AFTER_MS = _chunk3NIYNYZYcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunk3NIYNYZYcjs.MAX_PUSH_PAYLOAD_BYTES; exports.MAX_TASK_PAYLOAD_BYTES = _chunk3NIYNYZYcjs.MAX_TASK_PAYLOAD_BYTES; exports.MIN_SCHEDULE_LEAD_MS = _chunk3NIYNYZYcjs.MIN_SCHEDULE_LEAD_MS; exports.NonRetryableError = _chunk3NIYNYZYcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunk3NIYNYZYcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunk3NIYNYZYcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunk3NIYNYZYcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunk3NIYNYZYcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunk3NIYNYZYcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunk3NIYNYZYcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunk3NIYNYZYcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunk3NIYNYZYcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunk3NIYNYZYcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunk3NIYNYZYcjs.decryptFromStorage; exports.decryptPayload = _chunk3NIYNYZYcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunk3NIYNYZYcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunk3NIYNYZYcjs.encryptForStorage; exports.encryptPayload = _chunk3NIYNYZYcjs.encryptPayload; exports.ensureSchema = _chunk3NIYNYZYcjs.ensureSchema; exports.getSchemaVersion = _chunk3NIYNYZYcjs.getSchemaVersion; exports.hasChatCredRef = _chunk3NIYNYZYcjs.hasChatCredRef; exports.isNonRetryableError = _chunk3NIYNYZYcjs.isNonRetryableError; exports.isValidCredId = _chunk3NIYNYZYcjs.isValidCredId; exports.isValidISO8601 = _chunk3NIYNYZYcjs.isValidISO8601; exports.isValidTimeZoneId = _chunk3NIYNYZYcjs.isValidTimeZoneId; exports.isValidUUID = _chunk3NIYNYZYcjs.isValidUUID; exports.isValidUUIDv4 = _chunk3NIYNYZYcjs.isValidUUIDv4; exports.isValidUrl = _chunk3NIYNYZYcjs.isValidUrl; exports.measurePushPayload = _chunk3NIYNYZYcjs.measurePushPayload; exports.nextFutureOccurrence = _chunk3NIYNYZYcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunk3NIYNYZYcjs.planNextOccurrence; exports.readRequestBody = _chunk3NIYNYZYcjs.readRequestBody; exports.resolveLlmCredential = _chunk3NIYNYZYcjs.resolveLlmCredential; exports.runScheduledTick = _chunk3NIYNYZYcjs.runScheduledTick; exports.runTask = _chunk3NIYNYZYcjs.runTask; exports.sanitizeErrorSummary = _chunk3NIYNYZYcjs.sanitizeErrorSummary; exports.summarizeErrorCause = _chunk3NIYNYZYcjs.summarizeErrorCause; exports.supportsLlmCredentialsStore = _chunk3NIYNYZYcjs.supportsLlmCredentialsStore; exports.validateAvatarUrl = _chunk3NIYNYZYcjs.validateAvatarUrl; exports.validateCredRefs = _chunk3NIYNYZYcjs.validateCredRefs; exports.validateCredValue = _chunk3NIYNYZYcjs.validateCredValue; exports.validateLlmMessagesArray = _chunk3NIYNYZYcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunk3NIYNYZYcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunk3NIYNYZYcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;
+exports.CORS_ALLOW_HEADERS = _chunkD4SKSCIYcjs.CORS_ALLOW_HEADERS; exports.CORS_ALLOW_METHODS = _chunkD4SKSCIYcjs.CORS_ALLOW_METHODS; exports.CRED_ID_MAX_LENGTH = _chunkD4SKSCIYcjs.CRED_ID_MAX_LENGTH; exports.CRED_PUT_BATCH_MAX = _chunkD4SKSCIYcjs.CRED_PUT_BATCH_MAX; exports.CRED_REFS_MAX_ENTRIES = _chunkD4SKSCIYcjs.CRED_REFS_MAX_ENTRIES; exports.CRED_ROWS_PER_USER_MAX = _chunkD4SKSCIYcjs.CRED_ROWS_PER_USER_MAX; exports.DEFAULT_CLAIM_LEASE_MS = _chunkD4SKSCIYcjs.DEFAULT_CLAIM_LEASE_MS; exports.DEFAULT_HEARTBEAT_LEASE_TTL_MS = _chunkD4SKSCIYcjs.DEFAULT_HEARTBEAT_LEASE_TTL_MS; exports.DEFAULT_LEASE_HEARTBEAT_MS = _chunkD4SKSCIYcjs.DEFAULT_LEASE_HEARTBEAT_MS; exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkD4SKSCIYcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkD4SKSCIYcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE = _chunkD4SKSCIYcjs.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE; exports.DEFAULT_MAX_TOOL_ITERATIONS = _chunkD4SKSCIYcjs.DEFAULT_MAX_TOOL_ITERATIONS; exports.DEFAULT_TOTAL_TIMEOUT_MS = _chunkD4SKSCIYcjs.DEFAULT_TOTAL_TIMEOUT_MS; exports.DeploymentConfigError = _chunkD4SKSCIYcjs.DeploymentConfigError; exports.MAX_DEFER_AFTER_MS = _chunkD4SKSCIYcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkD4SKSCIYcjs.MAX_PUSH_PAYLOAD_BYTES; exports.MAX_TASK_PAYLOAD_BYTES = _chunkD4SKSCIYcjs.MAX_TASK_PAYLOAD_BYTES; exports.MIN_SCHEDULE_LEAD_MS = _chunkD4SKSCIYcjs.MIN_SCHEDULE_LEAD_MS; exports.NonRetryableError = _chunkD4SKSCIYcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkD4SKSCIYcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkD4SKSCIYcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkD4SKSCIYcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkD4SKSCIYcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkD4SKSCIYcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunkD4SKSCIYcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunkD4SKSCIYcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkD4SKSCIYcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunkD4SKSCIYcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkD4SKSCIYcjs.decryptFromStorage; exports.decryptPayload = _chunkD4SKSCIYcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkD4SKSCIYcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkD4SKSCIYcjs.encryptForStorage; exports.encryptPayload = _chunkD4SKSCIYcjs.encryptPayload; exports.ensureSchema = _chunkD4SKSCIYcjs.ensureSchema; exports.getSchemaVersion = _chunkD4SKSCIYcjs.getSchemaVersion; exports.hasChatCredRef = _chunkD4SKSCIYcjs.hasChatCredRef; exports.isNonRetryableError = _chunkD4SKSCIYcjs.isNonRetryableError; exports.isValidCredId = _chunkD4SKSCIYcjs.isValidCredId; exports.isValidISO8601 = _chunkD4SKSCIYcjs.isValidISO8601; exports.isValidTimeZoneId = _chunkD4SKSCIYcjs.isValidTimeZoneId; exports.isValidUUID = _chunkD4SKSCIYcjs.isValidUUID; exports.isValidUUIDv4 = _chunkD4SKSCIYcjs.isValidUUIDv4; exports.isValidUrl = _chunkD4SKSCIYcjs.isValidUrl; exports.measurePushPayload = _chunkD4SKSCIYcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkD4SKSCIYcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkD4SKSCIYcjs.planNextOccurrence; exports.readRequestBody = _chunkD4SKSCIYcjs.readRequestBody; exports.resolveLlmCredential = _chunkD4SKSCIYcjs.resolveLlmCredential; exports.runScheduledTick = _chunkD4SKSCIYcjs.runScheduledTick; exports.runTask = _chunkD4SKSCIYcjs.runTask; exports.sanitizeErrorSummary = _chunkD4SKSCIYcjs.sanitizeErrorSummary; exports.summarizeErrorCause = _chunkD4SKSCIYcjs.summarizeErrorCause; exports.supportsLlmCredentialsStore = _chunkD4SKSCIYcjs.supportsLlmCredentialsStore; exports.validateAvatarUrl = _chunkD4SKSCIYcjs.validateAvatarUrl; exports.validateCredRefs = _chunkD4SKSCIYcjs.validateCredRefs; exports.validateCredValue = _chunkD4SKSCIYcjs.validateCredValue; exports.validateLlmMessagesArray = _chunkD4SKSCIYcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunkD4SKSCIYcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunkD4SKSCIYcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;

package/dist/index.mjs

@@ -74,7 +74,7 @@ import {
   validateLlmMessagesArray,
   validateScheduleMessagePayload,
   validateSplitPattern
-} from "./chunk-6TCZEACV.mjs";
+} from "./chunk-EIM3PKFY.mjs";
 import "./chunk-GN44PST5.mjs";
 
 // src/server/adapters/factory.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "3.1.0-next.0",
+  "version": "3.1.0-next.1",
   "description": "ReiStandard Active Messaging server SDK with pluggable database adapters. Three-axis push schema (messageKind / messageType / messageSubtype) from @rei-standard/amsg-shared. Auto-emits ReasoningPush when the LLM response carries reasoning_content.",
   "repository": {
     "type": "git",