@rei-standard/amsg-server 2.6.0-next.35 → 2.6.0-next.36

package/README.md

@@ -902,8 +902,8 @@ export default createSingleUserCloudflareWorker(buildConfig, {
 });
 ```
 
-- `onError` 放在工厂的第二个参数上，而不是 `buildConfig` 的返回值里：`buildConfig` 自己抛错时配置里的东西一个都读不到，而那恰恰是最需要被看见的一种故障。`stage` 在 cron 路径上是 `config`（配置构建失败 / VAPID 没配齐）或 `tick`（那一跳抛错）。VAPID 没配齐这一支没有异常对象，`error` 为 `null`、`cause.name` 是 `VapidNotConfigured`。
-- `scheduled()` 现在有返回值：`{ ok: true, summary }` 或 `{ ok: false, cause }`。Cloudflare 不看它，是给「自己包一层再转调 `scheduled`」的宿主和测试用的。
+- `onError` 放在工厂的第二个参数上，而不是 `buildConfig` 的返回值里：`buildConfig` 自己抛错时配置里的东西一个都读不到，而那恰恰是最需要被看见的一种故障。`stage` 在 cron 路径上是 `config`（配置构建失败 / VAPID 没配齐）、`tick`（那一跳抛错）或 `cloud-cleanup`（云端数据清理那一步抛错，这一跳的消息照常投递）。VAPID 没配齐这一支没有异常对象，`error` 为 `null`、`cause.name` 是 `VapidNotConfigured`。
+- `scheduled()` 现在有返回值：`{ ok: true, summary }` 或 `{ ok: false, cause }`，`ok` 只看消息投递这一段。云端数据清理那一步出错时，两种返回值上都会多一个 `cloudCleanupCause`。Cloudflare 不看它，是给「自己包一层再转调 `scheduled`」的宿主和测试用的。
 
 ## 导出 API（Exports）
 

package/dist/adapters/d1.d.ts

@@ -119,7 +119,13 @@ export class D1Adapter {
         completed: boolean;
     }>;
     finishCloudMaintenanceBatch(name: any, cursor: any, completed: any): Promise<void>;
-    indexCloudDataRecordWork(userId: any, kind: any, id: any, work: any, expectedWriteToken?: any): Promise<void>;
+    /**
+     * Index a whole repair batch in one statement. Never overwrites an existing schedule, and
+     * skips a record that was rewritten after the batch was read.
+     */
+    indexCloudDataRecordWorkBatch(entries: any): Promise<void>;
+    /** Move an indexed record's schedule, unless the record was rewritten since the caller read it. */
+    rescheduleCloudDataRecordWork(userId: any, kind: any, id: any, work: any, expectedWriteToken?: any): Promise<boolean>;
     readCloudMaintenanceRecord(row: any): Promise<{
         id: any;
         userId: any;

package/dist/adapters/interface.d.ts

@@ -42,7 +42,8 @@ export type DbAdapter = {
      */
     initSchema: () => Promise<InitSchemaResult>;
     /**
-     * （可选）活库里现在实际有哪些表 / 列 / 索引，只读不写。
+     * （可选）活库里现在实际有哪些表 / 列 / 索引 / 触发器，只读不写。`triggers`
+     * 可以不回，不回时触发器这一项不查。
      * `getSchemaVersion` / `ensureSchema`（lib/schema-version.js）拿它跟这一版
      * 需要的清单对照；不实现的适配器调那两个函数会抛错。内置只有 D1 实现。
      */

package/dist/{chunk-INQD6LRY.mjs → chunk-67RM2E46.mjs}

@@ -5481,7 +5481,7 @@ var D1Adapter = class {
       WHERE w.kind='operation' AND w.next_run_at IS NOT NULL AND w.next_run_at<=?
         AND (r.lease_until IS NULL OR r.lease_until<=?)
       ORDER BY w.next_run_at LIMIT ?`).bind(now, now, limit).all();
-    return Promise.all((result.results || []).map((row) => this._cloudRecordForList(row)));
+    return Promise.all((result.results || []).map(async (row) => ({ ...await this._cloudRecordForList(row), writeToken: row.write_token })));
   }
   async cleanupExpiredCloudDataRecords(now = Date.now(), limit = 100) {
     const result = await this._db.prepare(`DELETE FROM cloud_data_records WHERE rowid IN (
@@ -5501,17 +5501,34 @@ var D1Adapter = class {
       marker = await this._db.prepare("SELECT * FROM cloud_data_maintenance WHERE name=?").bind(name).first();
     }
     if (marker.completed) return { rows: [], completed: true };
-    const result = await this._db.prepare(`SELECT rowid AS maintenance_rowid,* FROM ${table}
+    const columns = table === "cloud_data_records" ? "rowid AS maintenance_rowid,user_id,kind,id,updated_at,write_token,CASE WHEN kind='operation' THEN data END AS data" : "rowid AS maintenance_rowid";
+    const result = await this._db.prepare(`SELECT ${columns} FROM ${table}
       WHERE rowid>? AND rowid<=? ORDER BY rowid LIMIT ?`).bind(marker.cursor, marker.upper_bound, limit).all();
     return { rows: result.results || [], upperBound: marker.upper_bound, cursor: marker.cursor, completed: false };
   }
   async finishCloudMaintenanceBatch(name, cursor, completed) {
     await this._db.prepare(`UPDATE cloud_data_maintenance SET cursor=MAX(cursor,?),completed=MAX(completed,?) WHERE name=?`).bind(cursor, completed ? 1 : 0, name).run();
   }
-  async indexCloudDataRecordWork(userId, kind, id, work, expectedWriteToken = null) {
+  /**
+   * Index a whole repair batch in one statement. Never overwrites an existing schedule, and
+   * skips a record that was rewritten after the batch was read.
+   */
+  async indexCloudDataRecordWorkBatch(entries) {
+    if (!entries.length) return;
+    const rows = entries.map(({ userId, kind, id, work, writeToken }) => [userId, kind, id, work.nextRunAt ?? null, work.expiresAt ?? null, writeToken ?? null]);
     await this._db.prepare(`INSERT INTO cloud_data_work (user_id,kind,id,next_run_at,expires_at)
-      SELECT user_id,kind,id,?,? FROM cloud_data_records WHERE user_id=? AND kind=? AND id=? AND write_token IS ?
-      ON CONFLICT (user_id,kind,id) DO NOTHING`).bind(work.nextRunAt ?? null, work.expiresAt ?? null, userId, kind, id, expectedWriteToken).run();
+      SELECT r.user_id,r.kind,r.id,json_extract(j.value,'$[3]'),json_extract(j.value,'$[4]')
+      FROM json_each(?) j JOIN cloud_data_records r ON r.user_id=json_extract(j.value,'$[0]')
+        AND r.kind=json_extract(j.value,'$[1]') AND r.id=json_extract(j.value,'$[2]')
+        AND r.write_token IS json_extract(j.value,'$[5]')
+      WHERE 1 ON CONFLICT (user_id,kind,id) DO NOTHING`).bind(JSON.stringify(rows)).run();
+  }
+  /** Move an indexed record's schedule, unless the record was rewritten since the caller read it. */
+  async rescheduleCloudDataRecordWork(userId, kind, id, work, expectedWriteToken = null) {
+    const result = await this._db.prepare(`UPDATE cloud_data_work SET next_run_at=?,expires_at=?
+      WHERE user_id=? AND kind=? AND id=? AND EXISTS (SELECT 1 FROM cloud_data_records r
+        WHERE r.user_id=cloud_data_work.user_id AND r.kind=cloud_data_work.kind AND r.id=cloud_data_work.id AND r.write_token IS ?)`).bind(work.nextRunAt ?? null, work.expiresAt ?? null, userId, kind, id, expectedWriteToken).run();
+    return result.meta.changes > 0;
   }
   async readCloudMaintenanceRecord(row) {
     return this._cloudRecordForList(row);
@@ -7011,7 +7028,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.35" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.36" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -7816,12 +7833,23 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
   }
   return operation;
 }
+var WORK_INDEX_METHODS = [
+  "listDueCloudDataOperations",
+  "cleanupExpiredCloudDataRecords",
+  "rescheduleCloudDataRecordWork",
+  "getCloudMaintenanceBatch",
+  "finishCloudMaintenanceBatch",
+  "readCloudMaintenanceRecord",
+  "indexCloudDataRecordWorkBatch",
+  "repairCloudResourceMetadata"
+];
+var UNREADABLE_RETRY_MS = 15 * 6e4;
 async function repairLegacyWorkIndex(ctx) {
   const db = ctx.db;
-  if (typeof db.getCloudMaintenanceBatch !== "function") return;
   const name = "management-work-v1";
   const batch = await db.getCloudMaintenanceBatch(name, "cloud_data_records", 100);
   if (batch.completed) return;
+  const entries = [];
   for (const row of batch.rows) {
     let work;
     if (["inventory", "plan"].includes(row.kind)) {
@@ -7832,31 +7860,59 @@ async function repairLegacyWorkIndex(ctx) {
         const key = await deriveUserEncryptionKey(row.user_id, ctx.masterKey);
         work = operationWork(JSON.parse(await decryptFromStorage(record.data, key)));
       } catch {
-        console.warn("[amsg] Legacy cleanup operation could not be indexed");
-        continue;
+        console.warn("[amsg] Legacy cleanup operation could not be read; queued for retry");
+        work = { nextRunAt: 0, expiresAt: null };
       }
     } else continue;
-    await db.indexCloudDataRecordWork(row.user_id, row.kind, row.id, work, row.write_token);
+    entries.push({ userId: row.user_id, kind: row.kind, id: row.id, work, writeToken: row.write_token });
   }
+  await db.indexCloudDataRecordWorkBatch(entries);
   const cursor = batch.rows.at(-1)?.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 (!db?.cloudDataManagement) return;
-  await repairLegacyWorkIndex(ctx);
-  if (typeof db.repairCloudResourceMetadata === "function") await db.repairCloudResourceMetadata(100);
-  if (typeof db.cleanupExpiredCloudDataRecords === "function") await db.cleanupExpiredCloudDataRecords(Date.now(), 100);
-  const rows = typeof db.listDueCloudDataOperations === "function" ? await db.listDueCloudDataOperations(Date.now(), 25) : await db.listCloudDataRecordsAcrossUsers("operation");
+  const indexed = WORK_INDEX_METHODS.every((method) => typeof db[method] === "function");
+  let rows;
+  if (indexed) {
+    await repairLegacyWorkIndex(ctx);
+    await db.repairCloudResourceMetadata(100);
+    await db.cleanupExpiredCloudDataRecords(Date.now(), 100);
+    rows = await db.listDueCloudDataOperations(Date.now(), 25);
+  } else {
+    await db.cleanupCloudDataRecords("inventory", Date.now() - 36e5);
+    await db.cleanupCloudDataRecords("plan", Date.now() - 36e5);
+    rows = await db.listCloudDataRecordsAcrossUsers("operation");
+  }
   for (const row of rows) {
     try {
       const key = await deriveUserEncryptionKey(row.userId, ctx.masterKey);
       const operation = JSON.parse(await decryptFromStorage(row.data, key));
+      const work = operationWork(operation);
+      if (indexed) {
+        if (work.nextRunAt === null || work.nextRunAt > Date.now()) {
+          await db.rescheduleCloudDataRecordWork(row.userId, "operation", row.id, work, row.writeToken);
+          continue;
+        }
+      } else if (work.expiresAt !== null && work.expiresAt <= Date.now()) {
+        await db.deleteCloudDataRecord(row.userId, "operation", row.id);
+        continue;
+      }
       if (["pending", "running"].includes(operation.status)) {
         await advanceCleanup(ctx, db, row.userId, key, operation);
       }
-    } catch {
+    } catch (error) {
       console.warn("[amsg] A cloud cleanup operation could not be resumed");
+      if (!indexed || error?.code === "CLOUD_LEASE_LOST") continue;
+      await db.rescheduleCloudDataRecordWork(
+        row.userId,
+        "operation",
+        row.id,
+        { nextRunAt: Date.now() + UNREADABLE_RETRY_MS, expiresAt: null },
+        row.writeToken
+      ).catch(() => {
+      });
     }
   }
 }
@@ -8343,9 +8399,11 @@ async function getSchemaVersion(db) {
   for (const index of SQLITE_REQUIRED_SCHEMA.indexes) {
     if (!liveIndexes.has(index)) missing.push(`index:${index}`);
   }
-  const liveTriggers = new Set(live?.triggers || []);
-  for (const name of SQLITE_REQUIRED_SCHEMA.triggers) {
-    if (!liveTriggers.has(name)) missing.push(`trigger:${name}`);
+  if (Array.isArray(live?.triggers)) {
+    const liveTriggers = new Set(live.triggers);
+    for (const name of SQLITE_REQUIRED_SCHEMA.triggers) {
+      if (!liveTriggers.has(name)) missing.push(`trigger:${name}`);
+    }
   }
   const ok = missing.length === 0;
   return { current: ok ? SCHEMA_VERSION : null, required: SCHEMA_VERSION, ok, missing };
@@ -8603,12 +8661,13 @@ function createSingleUserCloudflareWorker(buildConfig, options = {}) {
       await reportError({ stage: "config", error, cause, path: null });
       return { ok: false, cause };
     }
+    const cleanup = {};
     try {
       await resumeCloudDataCleanups(buildTickContext(cfg));
     } catch (error) {
-      const cause = summarizeErrorCause(error, "cloud-cleanup");
-      await reportError({ stage: "cloud-cleanup", error, cause, path: null });
-      return { ok: false, cause };
+      console.error("[amsg single-user] scheduled(): cloud cleanup failed:", error && error.message);
+      cleanup.cloudCleanupCause = summarizeErrorCause(error, "cloud-cleanup");
+      await reportError({ stage: "cloud-cleanup", error, cause: cleanup.cloudCleanupCause, path: null });
     }
     if (!pushConfigured(cfg)) {
       console.error("[amsg single-user] scheduled(): VAPID/webpush not configured; skipping tick");
@@ -8617,16 +8676,16 @@ function createSingleUserCloudflareWorker(buildConfig, options = {}) {
         "config"
       );
       await reportError({ stage: "config", error: null, cause, path: null });
-      return { ok: false, cause };
+      return { ok: false, cause, ...cleanup };
     }
     try {
       const summary = await runScheduledTick(buildTickContext(cfg));
-      return { ok: true, summary };
+      return { ok: true, summary, ...cleanup };
     } catch (error) {
       console.error("[amsg single-user] scheduled(): tick failed:", error && error.message);
       const cause = summarizeErrorCause(error, "tick");
       await reportError({ stage: "tick", error, cause, path: null });
-      return { ok: false, cause };
+      return { ok: false, cause, ...cleanup };
     }
   }
   async function runTask2(uuid, env) {

package/dist/{chunk-UG5ZNM5J.cjs → chunk-I4BGZXQA.cjs}

@@ -5481,7 +5481,7 @@ var D1Adapter = class {
       WHERE w.kind='operation' AND w.next_run_at IS NOT NULL AND w.next_run_at<=?
         AND (r.lease_until IS NULL OR r.lease_until<=?)
       ORDER BY w.next_run_at LIMIT ?`).bind(now, now, limit).all();
-    return Promise.all((result.results || []).map((row) => this._cloudRecordForList(row)));
+    return Promise.all((result.results || []).map(async (row) => ({ ...await this._cloudRecordForList(row), writeToken: row.write_token })));
   }
   async cleanupExpiredCloudDataRecords(now = Date.now(), limit = 100) {
     const result = await this._db.prepare(`DELETE FROM cloud_data_records WHERE rowid IN (
@@ -5501,17 +5501,34 @@ var D1Adapter = class {
       marker = await this._db.prepare("SELECT * FROM cloud_data_maintenance WHERE name=?").bind(name).first();
     }
     if (marker.completed) return { rows: [], completed: true };
-    const result = await this._db.prepare(`SELECT rowid AS maintenance_rowid,* FROM ${table}
+    const columns = table === "cloud_data_records" ? "rowid AS maintenance_rowid,user_id,kind,id,updated_at,write_token,CASE WHEN kind='operation' THEN data END AS data" : "rowid AS maintenance_rowid";
+    const result = await this._db.prepare(`SELECT ${columns} FROM ${table}
       WHERE rowid>? AND rowid<=? ORDER BY rowid LIMIT ?`).bind(marker.cursor, marker.upper_bound, limit).all();
     return { rows: result.results || [], upperBound: marker.upper_bound, cursor: marker.cursor, completed: false };
   }
   async finishCloudMaintenanceBatch(name, cursor, completed) {
     await this._db.prepare(`UPDATE cloud_data_maintenance SET cursor=MAX(cursor,?),completed=MAX(completed,?) WHERE name=?`).bind(cursor, completed ? 1 : 0, name).run();
   }
-  async indexCloudDataRecordWork(userId, kind, id, work, expectedWriteToken = null) {
+  /**
+   * Index a whole repair batch in one statement. Never overwrites an existing schedule, and
+   * skips a record that was rewritten after the batch was read.
+   */
+  async indexCloudDataRecordWorkBatch(entries) {
+    if (!entries.length) return;
+    const rows = entries.map(({ userId, kind, id, work, writeToken }) => [userId, kind, id, _nullishCoalesce(work.nextRunAt, () => ( null)), _nullishCoalesce(work.expiresAt, () => ( null)), _nullishCoalesce(writeToken, () => ( null))]);
     await this._db.prepare(`INSERT INTO cloud_data_work (user_id,kind,id,next_run_at,expires_at)
-      SELECT user_id,kind,id,?,? FROM cloud_data_records WHERE user_id=? AND kind=? AND id=? AND write_token IS ?
-      ON CONFLICT (user_id,kind,id) DO NOTHING`).bind(_nullishCoalesce(work.nextRunAt, () => ( null)), _nullishCoalesce(work.expiresAt, () => ( null)), userId, kind, id, expectedWriteToken).run();
+      SELECT r.user_id,r.kind,r.id,json_extract(j.value,'$[3]'),json_extract(j.value,'$[4]')
+      FROM json_each(?) j JOIN cloud_data_records r ON r.user_id=json_extract(j.value,'$[0]')
+        AND r.kind=json_extract(j.value,'$[1]') AND r.id=json_extract(j.value,'$[2]')
+        AND r.write_token IS json_extract(j.value,'$[5]')
+      WHERE 1 ON CONFLICT (user_id,kind,id) DO NOTHING`).bind(JSON.stringify(rows)).run();
+  }
+  /** Move an indexed record's schedule, unless the record was rewritten since the caller read it. */
+  async rescheduleCloudDataRecordWork(userId, kind, id, work, expectedWriteToken = null) {
+    const result = await this._db.prepare(`UPDATE cloud_data_work SET next_run_at=?,expires_at=?
+      WHERE user_id=? AND kind=? AND id=? AND EXISTS (SELECT 1 FROM cloud_data_records r
+        WHERE r.user_id=cloud_data_work.user_id AND r.kind=cloud_data_work.kind AND r.id=cloud_data_work.id AND r.write_token IS ?)`).bind(_nullishCoalesce(work.nextRunAt, () => ( null)), _nullishCoalesce(work.expiresAt, () => ( null)), userId, kind, id, expectedWriteToken).run();
+    return result.meta.changes > 0;
   }
   async readCloudMaintenanceRecord(row) {
     return this._cloudRecordForList(row);
@@ -7011,7 +7028,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.35" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.36" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -7816,12 +7833,23 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
   }
   return operation;
 }
+var WORK_INDEX_METHODS = [
+  "listDueCloudDataOperations",
+  "cleanupExpiredCloudDataRecords",
+  "rescheduleCloudDataRecordWork",
+  "getCloudMaintenanceBatch",
+  "finishCloudMaintenanceBatch",
+  "readCloudMaintenanceRecord",
+  "indexCloudDataRecordWorkBatch",
+  "repairCloudResourceMetadata"
+];
+var UNREADABLE_RETRY_MS = 15 * 6e4;
 async function repairLegacyWorkIndex(ctx) {
   const db = ctx.db;
-  if (typeof db.getCloudMaintenanceBatch !== "function") return;
   const name = "management-work-v1";
   const batch = await db.getCloudMaintenanceBatch(name, "cloud_data_records", 100);
   if (batch.completed) return;
+  const entries = [];
   for (const row of batch.rows) {
     let work;
     if (["inventory", "plan"].includes(row.kind)) {
@@ -7832,31 +7860,59 @@ async function repairLegacyWorkIndex(ctx) {
         const key = await deriveUserEncryptionKey(row.user_id, ctx.masterKey);
         work = operationWork(JSON.parse(await decryptFromStorage(record.data, key)));
       } catch (e11) {
-        console.warn("[amsg] Legacy cleanup operation could not be indexed");
-        continue;
+        console.warn("[amsg] Legacy cleanup operation could not be read; queued for retry");
+        work = { nextRunAt: 0, expiresAt: null };
       }
     } else continue;
-    await db.indexCloudDataRecordWork(row.user_id, row.kind, row.id, work, row.write_token);
+    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', _84 => _84.rows, 'access', _85 => _85.at, 'call', _86 => _86(-1), 'optionalAccess', _87 => _87.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', _88 => _88.cloudDataManagement])) return;
-  await repairLegacyWorkIndex(ctx);
-  if (typeof db.repairCloudResourceMetadata === "function") await db.repairCloudResourceMetadata(100);
-  if (typeof db.cleanupExpiredCloudDataRecords === "function") await db.cleanupExpiredCloudDataRecords(Date.now(), 100);
-  const rows = typeof db.listDueCloudDataOperations === "function" ? await db.listDueCloudDataOperations(Date.now(), 25) : await db.listCloudDataRecordsAcrossUsers("operation");
+  const indexed = WORK_INDEX_METHODS.every((method) => typeof db[method] === "function");
+  let rows;
+  if (indexed) {
+    await repairLegacyWorkIndex(ctx);
+    await db.repairCloudResourceMetadata(100);
+    await db.cleanupExpiredCloudDataRecords(Date.now(), 100);
+    rows = await db.listDueCloudDataOperations(Date.now(), 25);
+  } else {
+    await db.cleanupCloudDataRecords("inventory", Date.now() - 36e5);
+    await db.cleanupCloudDataRecords("plan", Date.now() - 36e5);
+    rows = await db.listCloudDataRecordsAcrossUsers("operation");
+  }
   for (const row of rows) {
     try {
       const key = await deriveUserEncryptionKey(row.userId, ctx.masterKey);
       const operation = JSON.parse(await decryptFromStorage(row.data, key));
+      const work = operationWork(operation);
+      if (indexed) {
+        if (work.nextRunAt === null || work.nextRunAt > Date.now()) {
+          await db.rescheduleCloudDataRecordWork(row.userId, "operation", row.id, work, row.writeToken);
+          continue;
+        }
+      } else if (work.expiresAt !== null && work.expiresAt <= Date.now()) {
+        await db.deleteCloudDataRecord(row.userId, "operation", row.id);
+        continue;
+      }
       if (["pending", "running"].includes(operation.status)) {
         await advanceCleanup(ctx, db, row.userId, key, operation);
       }
-    } catch (e12) {
+    } catch (error) {
       console.warn("[amsg] A cloud cleanup operation could not be resumed");
+      if (!indexed || _optionalChain([error, 'optionalAccess', _89 => _89.code]) === "CLOUD_LEASE_LOST") continue;
+      await db.rescheduleCloudDataRecordWork(
+        row.userId,
+        "operation",
+        row.id,
+        { nextRunAt: Date.now() + UNREADABLE_RETRY_MS, expiresAt: null },
+        row.writeToken
+      ).catch(() => {
+      });
     }
   }
 }
@@ -7907,7 +7963,7 @@ function createCloudDataHandler(ctx) {
         if (!parsed.ok) throw cloudError("INVALID_PAYLOAD", "\u8BF7\u6C42\u683C\u5F0F\u65E0\u6548");
         try {
           input = await decryptPayload(parsed.data, key);
-        } catch (e13) {
+        } catch (e12) {
           throw cloudError("DECRYPTION_FAILED", "\u8BF7\u6C42\u89E3\u5BC6\u5931\u8D25");
         }
         if (!input || typeof input !== "object" || Array.isArray(input))
@@ -7956,7 +8012,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', _89 => _89.owner, 'optionalAccess', _90 => _90.type]) === ownerType && r.owner.id === ownerId)
+                (r) => (!type || r.type === type) && (!ownerId || _optionalChain([r, 'access', _90 => _90.owner, 'optionalAccess', _91 => _91.type]) === ownerType && r.owner.id === ownerId)
               ),
               complete: inventory.complete,
               gaps: inventory.gaps
@@ -7991,7 +8047,7 @@ function createCloudDataHandler(ctx) {
                 JSON.parse(await decryptFromStorage(row.data, key))
               )
             );
-          } catch (e14) {
+          } catch (e13) {
             gaps.push({
               source: "operation",
               code: "UNREADABLE_OPERATION",
@@ -8039,7 +8095,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', _91 => _91.owner, 'optionalAccess', _92 => _92.type]) === owner.type && _optionalChain([op, 'access', _93 => _93.owner, 'optionalAccess', _94 => _94.id]) === owner.id && ["pending", "running"].includes(op.status))
+            if (op.mode === "retire-owner" && _optionalChain([op, 'access', _92 => _92.owner, 'optionalAccess', _93 => _93.type]) === owner.type && _optionalChain([op, 'access', _94 => _94.owner, 'optionalAccess', _95 => _95.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",
@@ -8257,7 +8313,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', _95 => _95.cloudData, 'optionalAccess', _96 => _96.resolveOwner]) }),
+    db: createCloudGuardedAdapter(config.db, { masterKey: config.masterKey, resolveOwner: _optionalChain([config, 'access', _96 => _96.cloudData, 'optionalAccess', _97 => _97.resolveOwner]) }),
     masterKey: config.masterKey,
     serverToken: config.serverToken
   });
@@ -8343,9 +8399,11 @@ async function getSchemaVersion(db) {
   for (const index of SQLITE_REQUIRED_SCHEMA.indexes) {
     if (!liveIndexes.has(index)) missing.push(`index:${index}`);
   }
-  const liveTriggers = new Set(_optionalChain([live, 'optionalAccess', _97 => _97.triggers]) || []);
-  for (const name of SQLITE_REQUIRED_SCHEMA.triggers) {
-    if (!liveTriggers.has(name)) missing.push(`trigger:${name}`);
+  if (Array.isArray(_optionalChain([live, 'optionalAccess', _98 => _98.triggers]))) {
+    const liveTriggers = new Set(live.triggers);
+    for (const name of SQLITE_REQUIRED_SCHEMA.triggers) {
+      if (!liveTriggers.has(name)) missing.push(`trigger:${name}`);
+    }
   }
   const ok = missing.length === 0;
   return { current: ok ? SCHEMA_VERSION : null, required: SCHEMA_VERSION, ok, missing };
@@ -8603,12 +8661,13 @@ function createSingleUserCloudflareWorker(buildConfig, options = {}) {
       await reportError({ stage: "config", error, cause, path: null });
       return { ok: false, cause };
     }
+    const cleanup = {};
     try {
       await resumeCloudDataCleanups(buildTickContext(cfg));
     } catch (error) {
-      const cause = summarizeErrorCause(error, "cloud-cleanup");
-      await reportError({ stage: "cloud-cleanup", error, cause, path: null });
-      return { ok: false, cause };
+      console.error("[amsg single-user] scheduled(): cloud cleanup failed:", error && error.message);
+      cleanup.cloudCleanupCause = summarizeErrorCause(error, "cloud-cleanup");
+      await reportError({ stage: "cloud-cleanup", error, cause: cleanup.cloudCleanupCause, path: null });
     }
     if (!pushConfigured(cfg)) {
       console.error("[amsg single-user] scheduled(): VAPID/webpush not configured; skipping tick");
@@ -8617,16 +8676,16 @@ function createSingleUserCloudflareWorker(buildConfig, options = {}) {
         "config"
       );
       await reportError({ stage: "config", error: null, cause, path: null });
-      return { ok: false, cause };
+      return { ok: false, cause, ...cleanup };
     }
     try {
       const summary = await runScheduledTick(buildTickContext(cfg));
-      return { ok: true, summary };
+      return { ok: true, summary, ...cleanup };
     } catch (error) {
       console.error("[amsg single-user] scheduled(): tick failed:", error && error.message);
       const cause = summarizeErrorCause(error, "tick");
       await reportError({ stage: "tick", error, cause, path: null });
-      return { ok: false, cause };
+      return { ok: false, cause, ...cleanup };
     }
   }
   async function runTask2(uuid, env) {

package/dist/cloudflare/single-user-worker.d.ts

@@ -1,12 +1,12 @@
 /**
  * @param {(env: Object) => Object|Promise<Object>} buildConfig
- * @param {{ onError?: (info: { stage: 'config'|'request'|'tick', error: unknown, cause: import('../lib/errors.js').ErrorCause, path: string|null }) => void|Promise<void> }} [options]
+ * @param {{ onError?: (info: { stage: 'config'|'request'|'tick'|'cloud-cleanup', error: unknown, cause: import('../lib/errors.js').ErrorCause, path: string|null }) => void|Promise<void> }} [options]
  *   `onError` 在 fetch 或 cron 出错时调一次（best-effort，自身抛错只记日志）。
  *   cron 那条路上没有调用方能看到错误响应，这个 hook 是宿主唯一的出口。
  */
 export function createSingleUserCloudflareWorker(buildConfig: (env: any) => any | Promise<any>, options?: {
     onError?: (info: {
-        stage: "config" | "request" | "tick";
+        stage: "config" | "request" | "tick" | "cloud-cleanup";
         error: unknown;
         cause: import("../lib/errors.js").ErrorCause;
         path: string | null;
@@ -16,9 +16,11 @@ export function createSingleUserCloudflareWorker(buildConfig: (env: any) => any
     scheduled: (event: any, env: any) => Promise<{
         ok: true;
         summary: any;
+        cloudCleanupCause?: import("../lib/errors.js").ErrorCause;
     } | {
         ok: false;
         cause: import("../lib/errors.js").ErrorCause;
+        cloudCleanupCause?: import("../lib/errors.js").ErrorCause;
     }>;
     runTask: (uuid: string, env: any) => Promise<{
         ran: false;

package/dist/cloudflare.cjs

@@ -28,7 +28,7 @@
 
 
 
-var _chunkUG5ZNM5Jcjs = require('./chunk-UG5ZNM5J.cjs');
+var _chunkI4BGZXQAcjs = require('./chunk-I4BGZXQA.cjs');
 require('./chunk-7NMQFTDJ.cjs');
 
 
@@ -60,4 +60,4 @@ require('./chunk-7NMQFTDJ.cjs');
 
 
 
-exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkUG5ZNM5Jcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkUG5ZNM5Jcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_DEFER_AFTER_MS = _chunkUG5ZNM5Jcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkUG5ZNM5Jcjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunkUG5ZNM5Jcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkUG5ZNM5Jcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkUG5ZNM5Jcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkUG5ZNM5Jcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkUG5ZNM5Jcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkUG5ZNM5Jcjs.advanceOccurrence; exports.createD1Adapter = _chunkUG5ZNM5Jcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkUG5ZNM5Jcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkUG5ZNM5Jcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkUG5ZNM5Jcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkUG5ZNM5Jcjs.decryptFromStorage; exports.decryptPayload = _chunkUG5ZNM5Jcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkUG5ZNM5Jcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkUG5ZNM5Jcjs.encryptForStorage; exports.ensureSchema = _chunkUG5ZNM5Jcjs.ensureSchema; exports.getSchemaVersion = _chunkUG5ZNM5Jcjs.getSchemaVersion; exports.isNonRetryableError = _chunkUG5ZNM5Jcjs.isNonRetryableError; exports.isValidTimeZoneId = _chunkUG5ZNM5Jcjs.isValidTimeZoneId; exports.measurePushPayload = _chunkUG5ZNM5Jcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkUG5ZNM5Jcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkUG5ZNM5Jcjs.planNextOccurrence; exports.readRequestBody = _chunkUG5ZNM5Jcjs.readRequestBody; exports.runScheduledTick = _chunkUG5ZNM5Jcjs.runScheduledTick; exports.runTask = _chunkUG5ZNM5Jcjs.runTask; exports.summarizeErrorCause = _chunkUG5ZNM5Jcjs.summarizeErrorCause;
+exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkI4BGZXQAcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkI4BGZXQAcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_DEFER_AFTER_MS = _chunkI4BGZXQAcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkI4BGZXQAcjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunkI4BGZXQAcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkI4BGZXQAcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkI4BGZXQAcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkI4BGZXQAcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkI4BGZXQAcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkI4BGZXQAcjs.advanceOccurrence; exports.createD1Adapter = _chunkI4BGZXQAcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkI4BGZXQAcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkI4BGZXQAcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkI4BGZXQAcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkI4BGZXQAcjs.decryptFromStorage; exports.decryptPayload = _chunkI4BGZXQAcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkI4BGZXQAcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkI4BGZXQAcjs.encryptForStorage; exports.ensureSchema = _chunkI4BGZXQAcjs.ensureSchema; exports.getSchemaVersion = _chunkI4BGZXQAcjs.getSchemaVersion; exports.isNonRetryableError = _chunkI4BGZXQAcjs.isNonRetryableError; exports.isValidTimeZoneId = _chunkI4BGZXQAcjs.isValidTimeZoneId; exports.measurePushPayload = _chunkI4BGZXQAcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkI4BGZXQAcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkI4BGZXQAcjs.planNextOccurrence; exports.readRequestBody = _chunkI4BGZXQAcjs.readRequestBody; exports.runScheduledTick = _chunkI4BGZXQAcjs.runScheduledTick; exports.runTask = _chunkI4BGZXQAcjs.runTask; exports.summarizeErrorCause = _chunkI4BGZXQAcjs.summarizeErrorCause;

package/dist/cloudflare.mjs

@@ -28,7 +28,7 @@ import {
   runScheduledTick,
   runTask,
   summarizeErrorCause
-} from "./chunk-INQD6LRY.mjs";
+} from "./chunk-67RM2E46.mjs";
 import "./chunk-GN44PST5.mjs";
 export {
   DEFAULT_MAX_DELIVERY_RETRIES,

package/dist/index.cjs

@@ -73,7 +73,7 @@
 
 
 
-var _chunkUG5ZNM5Jcjs = require('./chunk-UG5ZNM5J.cjs');
+var _chunkI4BGZXQAcjs = require('./chunk-I4BGZXQA.cjs');
 require('./chunk-7NMQFTDJ.cjs');
 
 // src/server/adapters/factory.js
@@ -107,7 +107,7 @@ async function createAdapter(config) {
 // src/server/handlers/init-tenant.js
 function createInitTenantHandler(ctx) {
   async function POST(headers, body) {
-    const initSecret = _chunkUG5ZNM5Jcjs.getHeader.call(void 0, headers, "x-init-secret");
+    const initSecret = _chunkI4BGZXQAcjs.getHeader.call(void 0, headers, "x-init-secret");
     if (ctx.tenant.initSecret && initSecret !== ctx.tenant.initSecret) {
       return {
         status: 401,
@@ -120,7 +120,7 @@ function createInitTenantHandler(ctx) {
         }
       };
     }
-    const parsed = _chunkUG5ZNM5Jcjs.parseJsonBody.call(void 0, body);
+    const parsed = _chunkI4BGZXQAcjs.parseJsonBody.call(void 0, body);
     if (!parsed.ok) {
       return {
         status: 400,
@@ -134,7 +134,7 @@ function createInitTenantHandler(ctx) {
     const tenantId = payload.tenantId || void 0;
     const driver = payload.driver;
     const databaseUrl = payload.databaseUrl || payload.connectionString;
-    if (tenantId && !_chunkUG5ZNM5Jcjs.isValidUUIDv4.call(void 0, tenantId)) {
+    if (tenantId && !_chunkI4BGZXQAcjs.isValidUUIDv4.call(void 0, tenantId)) {
       return {
         status: 400,
         body: {
@@ -254,7 +254,7 @@ function createSendNotificationsHandler(ctx) {
         }
       };
     }
-    const data = await _chunkUG5ZNM5Jcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
+    const data = await _chunkI4BGZXQAcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
     return { status: 200, body: { success: true, data } };
   }
   return { POST };
@@ -276,16 +276,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.${_chunkUG5ZNM5Jcjs.bytesToBase64Url.call(void 0, iv)}.${_chunkUG5ZNM5Jcjs.bytesToBase64Url.call(void 0, authTag)}.${_chunkUG5ZNM5Jcjs.bytesToBase64Url.call(void 0, ciphertext)}`;
+  return `v1.${_chunkI4BGZXQAcjs.bytesToBase64Url.call(void 0, iv)}.${_chunkI4BGZXQAcjs.bytesToBase64Url.call(void 0, authTag)}.${_chunkI4BGZXQAcjs.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 = _chunkUG5ZNM5Jcjs.base64UrlToBytes.call(void 0, parts[1]);
-  const authTag = _chunkUG5ZNM5Jcjs.base64UrlToBytes.call(void 0, parts[2]);
-  const ciphertext = _chunkUG5ZNM5Jcjs.base64UrlToBytes.call(void 0, parts[3]);
+  const iv = _chunkI4BGZXQAcjs.base64UrlToBytes.call(void 0, parts[1]);
+  const authTag = _chunkI4BGZXQAcjs.base64UrlToBytes.call(void 0, parts[2]);
+  const ciphertext = _chunkI4BGZXQAcjs.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");
@@ -353,7 +353,7 @@ function createTenantBlobStore(options) {
 // src/server/tenant/token.js
 
 function sign(input, secret) {
-  return _chunkUG5ZNM5Jcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
+  return _chunkI4BGZXQAcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
 }
 function nowEpochSeconds() {
   return Math.floor(Date.now() / 1e3);
@@ -369,8 +369,8 @@ function createTenantToken(params, secret) {
     v: 1
   };
   const header = { alg: "HS256", typ: "JWT" };
-  const encodedHeader = _chunkUG5ZNM5Jcjs.bytesToBase64Url.call(void 0, _chunkUG5ZNM5Jcjs.utf8.call(void 0, JSON.stringify(header)));
-  const encodedPayload = _chunkUG5ZNM5Jcjs.bytesToBase64Url.call(void 0, _chunkUG5ZNM5Jcjs.utf8.call(void 0, JSON.stringify(payload)));
+  const encodedHeader = _chunkI4BGZXQAcjs.bytesToBase64Url.call(void 0, _chunkI4BGZXQAcjs.utf8.call(void 0, JSON.stringify(header)));
+  const encodedPayload = _chunkI4BGZXQAcjs.bytesToBase64Url.call(void 0, _chunkI4BGZXQAcjs.utf8.call(void 0, JSON.stringify(payload)));
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const signature = sign(signingInput, secret);
   return `${signingInput}.${signature}`;
@@ -389,17 +389,17 @@ function verifyTenantToken(token, secret, options = {}) {
   let receivedBytes;
   let expectedBytes;
   try {
-    receivedBytes = _chunkUG5ZNM5Jcjs.base64UrlToBytes.call(void 0, receivedSignature);
-    expectedBytes = _chunkUG5ZNM5Jcjs.base64UrlToBytes.call(void 0, expectedSignature);
+    receivedBytes = _chunkI4BGZXQAcjs.base64UrlToBytes.call(void 0, receivedSignature);
+    expectedBytes = _chunkI4BGZXQAcjs.base64UrlToBytes.call(void 0, expectedSignature);
   } catch (e) {
     throw new Error("INVALID_TENANT_AUTH");
   }
-  if (!_chunkUG5ZNM5Jcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
+  if (!_chunkI4BGZXQAcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
     throw new Error("INVALID_TENANT_AUTH");
   }
   let payload;
   try {
-    payload = JSON.parse(_chunkUG5ZNM5Jcjs.utf8Decode.call(void 0, _chunkUG5ZNM5Jcjs.base64UrlToBytes.call(void 0, encodedPayload)));
+    payload = JSON.parse(_chunkI4BGZXQAcjs.utf8Decode.call(void 0, _chunkI4BGZXQAcjs.base64UrlToBytes.call(void 0, encodedPayload)));
   } catch (e2) {
     throw new Error("INVALID_TENANT_AUTH");
   }
@@ -627,15 +627,15 @@ async function createReiServer(config) {
   return {
     handlers: {
       initTenant: createInitTenantHandler(ctx),
-      getUserKey: _chunkUG5ZNM5Jcjs.createGetUserKeyHandler.call(void 0, ctx),
-      scheduleMessage: _chunkUG5ZNM5Jcjs.createScheduleMessageHandler.call(void 0, ctx),
+      getUserKey: _chunkI4BGZXQAcjs.createGetUserKeyHandler.call(void 0, ctx),
+      scheduleMessage: _chunkI4BGZXQAcjs.createScheduleMessageHandler.call(void 0, ctx),
       sendNotifications: createSendNotificationsHandler(ctx),
-      updateMessage: _chunkUG5ZNM5Jcjs.createUpdateMessageHandler.call(void 0, ctx),
-      cancelMessage: _chunkUG5ZNM5Jcjs.createCancelMessageHandler.call(void 0, ctx),
-      messages: _chunkUG5ZNM5Jcjs.createMessagesHandler.call(void 0, ctx),
-      getMessage: _chunkUG5ZNM5Jcjs.createGetMessageHandler.call(void 0, ctx),
-      pushSubscription: _chunkUG5ZNM5Jcjs.createPushSubscriptionHandler.call(void 0, ctx),
-      llmCredentials: _chunkUG5ZNM5Jcjs.createLlmCredentialsHandler.call(void 0, ctx)
+      updateMessage: _chunkI4BGZXQAcjs.createUpdateMessageHandler.call(void 0, ctx),
+      cancelMessage: _chunkI4BGZXQAcjs.createCancelMessageHandler.call(void 0, ctx),
+      messages: _chunkI4BGZXQAcjs.createMessagesHandler.call(void 0, ctx),
+      getMessage: _chunkI4BGZXQAcjs.createGetMessageHandler.call(void 0, ctx),
+      pushSubscription: _chunkI4BGZXQAcjs.createPushSubscriptionHandler.call(void 0, ctx),
+      llmCredentials: _chunkI4BGZXQAcjs.createLlmCredentialsHandler.call(void 0, ctx)
     }
   };
 }
@@ -703,4 +703,4 @@ async function createReiServer(config) {
 
 
 
-exports.CORS_ALLOW_HEADERS = _chunkUG5ZNM5Jcjs.CORS_ALLOW_HEADERS; exports.CORS_ALLOW_METHODS = _chunkUG5ZNM5Jcjs.CORS_ALLOW_METHODS; exports.CRED_ID_MAX_LENGTH = _chunkUG5ZNM5Jcjs.CRED_ID_MAX_LENGTH; exports.CRED_PUT_BATCH_MAX = _chunkUG5ZNM5Jcjs.CRED_PUT_BATCH_MAX; exports.CRED_REFS_MAX_ENTRIES = _chunkUG5ZNM5Jcjs.CRED_REFS_MAX_ENTRIES; exports.CRED_ROWS_PER_USER_MAX = _chunkUG5ZNM5Jcjs.CRED_ROWS_PER_USER_MAX; exports.DEFAULT_CLAIM_LEASE_MS = _chunkUG5ZNM5Jcjs.DEFAULT_CLAIM_LEASE_MS; exports.DEFAULT_HEARTBEAT_LEASE_TTL_MS = _chunkUG5ZNM5Jcjs.DEFAULT_HEARTBEAT_LEASE_TTL_MS; exports.DEFAULT_LEASE_HEARTBEAT_MS = _chunkUG5ZNM5Jcjs.DEFAULT_LEASE_HEARTBEAT_MS; exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkUG5ZNM5Jcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkUG5ZNM5Jcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE = _chunkUG5ZNM5Jcjs.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE; exports.DEFAULT_MAX_TOOL_ITERATIONS = _chunkUG5ZNM5Jcjs.DEFAULT_MAX_TOOL_ITERATIONS; exports.DEFAULT_TOTAL_TIMEOUT_MS = _chunkUG5ZNM5Jcjs.DEFAULT_TOTAL_TIMEOUT_MS; exports.DeploymentConfigError = _chunkUG5ZNM5Jcjs.DeploymentConfigError; exports.MAX_DEFER_AFTER_MS = _chunkUG5ZNM5Jcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkUG5ZNM5Jcjs.MAX_PUSH_PAYLOAD_BYTES; exports.MAX_TASK_PAYLOAD_BYTES = _chunkUG5ZNM5Jcjs.MAX_TASK_PAYLOAD_BYTES; exports.MIN_SCHEDULE_LEAD_MS = _chunkUG5ZNM5Jcjs.MIN_SCHEDULE_LEAD_MS; exports.NonRetryableError = _chunkUG5ZNM5Jcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkUG5ZNM5Jcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkUG5ZNM5Jcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkUG5ZNM5Jcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkUG5ZNM5Jcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkUG5ZNM5Jcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunkUG5ZNM5Jcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunkUG5ZNM5Jcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkUG5ZNM5Jcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunkUG5ZNM5Jcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkUG5ZNM5Jcjs.decryptFromStorage; exports.decryptPayload = _chunkUG5ZNM5Jcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkUG5ZNM5Jcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkUG5ZNM5Jcjs.encryptForStorage; exports.ensureSchema = _chunkUG5ZNM5Jcjs.ensureSchema; exports.getSchemaVersion = _chunkUG5ZNM5Jcjs.getSchemaVersion; exports.hasChatCredRef = _chunkUG5ZNM5Jcjs.hasChatCredRef; exports.isNonRetryableError = _chunkUG5ZNM5Jcjs.isNonRetryableError; exports.isValidCredId = _chunkUG5ZNM5Jcjs.isValidCredId; exports.isValidISO8601 = _chunkUG5ZNM5Jcjs.isValidISO8601; exports.isValidTimeZoneId = _chunkUG5ZNM5Jcjs.isValidTimeZoneId; exports.isValidUUID = _chunkUG5ZNM5Jcjs.isValidUUID; exports.isValidUUIDv4 = _chunkUG5ZNM5Jcjs.isValidUUIDv4; exports.isValidUrl = _chunkUG5ZNM5Jcjs.isValidUrl; exports.measurePushPayload = _chunkUG5ZNM5Jcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkUG5ZNM5Jcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkUG5ZNM5Jcjs.planNextOccurrence; exports.readRequestBody = _chunkUG5ZNM5Jcjs.readRequestBody; exports.resolveLlmCredential = _chunkUG5ZNM5Jcjs.resolveLlmCredential; exports.runScheduledTick = _chunkUG5ZNM5Jcjs.runScheduledTick; exports.runTask = _chunkUG5ZNM5Jcjs.runTask; exports.sanitizeErrorSummary = _chunkUG5ZNM5Jcjs.sanitizeErrorSummary; exports.summarizeErrorCause = _chunkUG5ZNM5Jcjs.summarizeErrorCause; exports.supportsLlmCredentialsStore = _chunkUG5ZNM5Jcjs.supportsLlmCredentialsStore; exports.validateAvatarUrl = _chunkUG5ZNM5Jcjs.validateAvatarUrl; exports.validateCredRefs = _chunkUG5ZNM5Jcjs.validateCredRefs; exports.validateCredValue = _chunkUG5ZNM5Jcjs.validateCredValue; exports.validateLlmMessagesArray = _chunkUG5ZNM5Jcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunkUG5ZNM5Jcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunkUG5ZNM5Jcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;
+exports.CORS_ALLOW_HEADERS = _chunkI4BGZXQAcjs.CORS_ALLOW_HEADERS; exports.CORS_ALLOW_METHODS = _chunkI4BGZXQAcjs.CORS_ALLOW_METHODS; exports.CRED_ID_MAX_LENGTH = _chunkI4BGZXQAcjs.CRED_ID_MAX_LENGTH; exports.CRED_PUT_BATCH_MAX = _chunkI4BGZXQAcjs.CRED_PUT_BATCH_MAX; exports.CRED_REFS_MAX_ENTRIES = _chunkI4BGZXQAcjs.CRED_REFS_MAX_ENTRIES; exports.CRED_ROWS_PER_USER_MAX = _chunkI4BGZXQAcjs.CRED_ROWS_PER_USER_MAX; exports.DEFAULT_CLAIM_LEASE_MS = _chunkI4BGZXQAcjs.DEFAULT_CLAIM_LEASE_MS; exports.DEFAULT_HEARTBEAT_LEASE_TTL_MS = _chunkI4BGZXQAcjs.DEFAULT_HEARTBEAT_LEASE_TTL_MS; exports.DEFAULT_LEASE_HEARTBEAT_MS = _chunkI4BGZXQAcjs.DEFAULT_LEASE_HEARTBEAT_MS; exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkI4BGZXQAcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkI4BGZXQAcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE = _chunkI4BGZXQAcjs.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE; exports.DEFAULT_MAX_TOOL_ITERATIONS = _chunkI4BGZXQAcjs.DEFAULT_MAX_TOOL_ITERATIONS; exports.DEFAULT_TOTAL_TIMEOUT_MS = _chunkI4BGZXQAcjs.DEFAULT_TOTAL_TIMEOUT_MS; exports.DeploymentConfigError = _chunkI4BGZXQAcjs.DeploymentConfigError; exports.MAX_DEFER_AFTER_MS = _chunkI4BGZXQAcjs.MAX_DEFER_AFTER_MS; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkI4BGZXQAcjs.MAX_PUSH_PAYLOAD_BYTES; exports.MAX_TASK_PAYLOAD_BYTES = _chunkI4BGZXQAcjs.MAX_TASK_PAYLOAD_BYTES; exports.MIN_SCHEDULE_LEAD_MS = _chunkI4BGZXQAcjs.MIN_SCHEDULE_LEAD_MS; exports.NonRetryableError = _chunkI4BGZXQAcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkI4BGZXQAcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkI4BGZXQAcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkI4BGZXQAcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkI4BGZXQAcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkI4BGZXQAcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunkI4BGZXQAcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunkI4BGZXQAcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkI4BGZXQAcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunkI4BGZXQAcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkI4BGZXQAcjs.decryptFromStorage; exports.decryptPayload = _chunkI4BGZXQAcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkI4BGZXQAcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkI4BGZXQAcjs.encryptForStorage; exports.ensureSchema = _chunkI4BGZXQAcjs.ensureSchema; exports.getSchemaVersion = _chunkI4BGZXQAcjs.getSchemaVersion; exports.hasChatCredRef = _chunkI4BGZXQAcjs.hasChatCredRef; exports.isNonRetryableError = _chunkI4BGZXQAcjs.isNonRetryableError; exports.isValidCredId = _chunkI4BGZXQAcjs.isValidCredId; exports.isValidISO8601 = _chunkI4BGZXQAcjs.isValidISO8601; exports.isValidTimeZoneId = _chunkI4BGZXQAcjs.isValidTimeZoneId; exports.isValidUUID = _chunkI4BGZXQAcjs.isValidUUID; exports.isValidUUIDv4 = _chunkI4BGZXQAcjs.isValidUUIDv4; exports.isValidUrl = _chunkI4BGZXQAcjs.isValidUrl; exports.measurePushPayload = _chunkI4BGZXQAcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkI4BGZXQAcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkI4BGZXQAcjs.planNextOccurrence; exports.readRequestBody = _chunkI4BGZXQAcjs.readRequestBody; exports.resolveLlmCredential = _chunkI4BGZXQAcjs.resolveLlmCredential; exports.runScheduledTick = _chunkI4BGZXQAcjs.runScheduledTick; exports.runTask = _chunkI4BGZXQAcjs.runTask; exports.sanitizeErrorSummary = _chunkI4BGZXQAcjs.sanitizeErrorSummary; exports.summarizeErrorCause = _chunkI4BGZXQAcjs.summarizeErrorCause; exports.supportsLlmCredentialsStore = _chunkI4BGZXQAcjs.supportsLlmCredentialsStore; exports.validateAvatarUrl = _chunkI4BGZXQAcjs.validateAvatarUrl; exports.validateCredRefs = _chunkI4BGZXQAcjs.validateCredRefs; exports.validateCredValue = _chunkI4BGZXQAcjs.validateCredValue; exports.validateLlmMessagesArray = _chunkI4BGZXQAcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunkI4BGZXQAcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunkI4BGZXQAcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;

package/dist/index.mjs

@@ -73,7 +73,7 @@ import {
   validateLlmMessagesArray,
   validateScheduleMessagePayload,
   validateSplitPattern
-} from "./chunk-INQD6LRY.mjs";
+} from "./chunk-67RM2E46.mjs";
 import "./chunk-GN44PST5.mjs";
 
 // src/server/adapters/factory.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "2.6.0-next.35",
+  "version": "2.6.0-next.36",
   "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",